abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-19 09:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vscode-ide-companion/cli): improve Windows compatibility for shell commands

Browse Source 
fix(vscode-ide-companion/session): improve timeout configuration for different methods
This commit is contained in:
yiliang114
2025-12-13 18:28:50 +08:00
parent 0ac191e2db
commit 4590138a1e
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/vscode-ide-companion/src/cli/cliDetector.ts
View File

@@ -186,7 +186,7 @@ export class CliDetector {
const { stdout } = await execAsync(detectionCommand, { const { stdout } = await execAsync(detectionCommand, {
timeout: 5000, timeout: 5000,
shell: '/bin/bash', shell: isWindows ? undefined : '/bin/bash',
}); });
// The output may contain multiple lines, with NVM activation messages // The output may contain multiple lines, with NVM activation messages
// We want the last line which should be the actual path // We want the last line which should be the actual path
@@ -216,7 +216,7 @@ export class CliDetector {
const { stdout: versionOutput } = await execAsync(versionCommand, { const { stdout: versionOutput } = await execAsync(versionCommand, {
timeout: 5000, timeout: 5000,
shell: '/bin/bash', shell: isWindows ? undefined : '/bin/bash',
}); });
// The output may contain multiple lines, with NVM activation messages // The output may contain multiple lines, with NVM activation messages
// We want the last line which should be the actual version // We want the last line which should be the actual version

2
packages/vscode-ide-companion/src/cli/cliInstaller.ts
View File

@@ -124,7 +124,7 @@ export class CliInstaller {
installCommand, installCommand,
{ {
timeout: 120000, timeout: 120000,
shell: '/bin/bash', shell: process.platform === 'win32' ? undefined : '/bin/bash',
}, // 2 minutes timeout }, // 2 minutes timeout
); );

10
packages/vscode-ide-companion/src/services/acpSessionManager.ts
View File

@@ -54,8 +54,14 @@ export class AcpSessionManager {
}; };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const timeoutDuration = // different timeout durations based on methods
method === AGENT_METHODS.session_prompt ? 120000 : 60000; let timeoutDuration = 60000; // default 60 seconds
if (
method === AGENT_METHODS.session_prompt ||
method === AGENT_METHODS.initialize
) {
timeoutDuration = 120000; // 2min for session_prompt and initialize
}
const timeoutId = setTimeout(() => { const timeoutId = setTimeout(() => {
pendingRequests.delete(id); pendingRequests.delete(id);