fix(vscode-ide-companion): 优化 CLI 检测和连接逻辑

packages/vscode-ide-companion/src/cli/CliInstaller.ts

@@ -121,8 +121,11 @@ export class CliInstaller {
             );
 
             const { stdout, stderr } = await execAsync(
-              'npm install -g @qwen-code/qwen-code@latest',
-              { timeout: 120000 }, // 2 minutes timeout
+              installCommand,
+              {
+                timeout: 120000,
+                shell: '/bin/bash',
+              }, // 2 minutes timeout
             );
 
             console.log('[CliInstaller] Installation output:', stdout);
@@ -156,6 +159,7 @@ export class CliInstaller {
             const errorMessage =
               error instanceof Error ? error.message : String(error);
             console.error('[CliInstaller] Installation failed:', errorMessage);
+            console.error('[CliInstaller] Error stack:', error);
 
             vscode.window
               .showErrorMessage(

packages/vscode-ide-companion/src/cli/cliDetector.ts

@@ -40,28 +40,77 @@ export class CliDetector {
       this.cachedResult &&
       now - this.lastCheckTime < this.CACHE_DURATION_MS
     ) {
+      console.log('[CliDetector] Returning cached result');
       return this.cachedResult;
     }
 
+    console.log(
+      '[CliDetector] Starting CLI detection, current PATH:',
+      process.env.PATH,
+    );
+
     try {
       const isWindows = process.platform === 'win32';
       const whichCommand = isWindows ? 'where' : 'which';
 
       // Check if qwen command exists
       try {
-        const { stdout } = await execAsync(`${whichCommand} qwen`, {
+        // Use NVM environment for consistent detection
+        // Fallback chain: default alias -> node alias -> current version
+        const detectionCommand =
+          process.platform === 'win32'
+            ? `${whichCommand} qwen`
+            : 'source ~/.nvm/nvm.sh 2>/dev/null && (nvm use default 2>/dev/null || nvm use node 2>/dev/null || nvm use 2>/dev/null); which qwen';
+
+        console.log(
+          '[CliDetector] Detecting CLI with command:',
+          detectionCommand,
+        );
+
+        const { stdout } = await execAsync(detectionCommand, {
           timeout: 5000,
+          shell: '/bin/bash',
         });
-        const cliPath = stdout.trim().split('\n')[0];
+        // The output may contain multiple lines, with NVM activation messages
+        // We want the last line which should be the actual path
+        const lines = stdout
+          .trim()
+          .split('\n')
+          .filter((line) => line.trim());
+        const cliPath = lines[lines.length - 1];
+
+        console.log('[CliDetector] Found CLI at:', cliPath);
 
         // Try to get version
         let version: string | undefined;
         try {
-          const { stdout: versionOutput } = await execAsync('qwen --version', {
+          // Use NVM environment for version check
+          // Fallback chain: default alias -> node alias -> current version
+          // Also ensure we use the correct Node.js version that matches the CLI installation
+          const versionCommand =
+            process.platform === 'win32'
+              ? 'qwen --version'
+              : 'source ~/.nvm/nvm.sh 2>/dev/null && (nvm use default 2>/dev/null || nvm use node 2>/dev/null || nvm use 2>/dev/null); qwen --version';
+
+          console.log(
+            '[CliDetector] Getting version with command:',
+            versionCommand,
+          );
+
+          const { stdout: versionOutput } = await execAsync(versionCommand, {
             timeout: 5000,
+            shell: '/bin/bash',
           });
-          version = versionOutput.trim();
-        } catch {
+          // The output may contain multiple lines, with NVM activation messages
+          // We want the last line which should be the actual version
+          const versionLines = versionOutput
+            .trim()
+            .split('\n')
+            .filter((line) => line.trim());
+          version = versionLines[versionLines.length - 1];
+          console.log('[CliDetector] CLI version:', version);
+        } catch (versionError) {
+          console.log('[CliDetector] Failed to get CLI version:', versionError);
           // Version check failed, but CLI is installed
         }
 
@@ -72,7 +121,8 @@ export class CliDetector {
         };
         this.lastCheckTime = now;
         return this.cachedResult;
-      } catch (_error) {
+      } catch (detectionError) {
+        console.log('[CliDetector] CLI not found, error:', detectionError);
         // CLI not found
         this.cachedResult = {
           isInstalled: false,
@@ -82,6 +132,7 @@ export class CliDetector {
         return this.cachedResult;
       }
     } catch (error) {
+      console.log('[CliDetector] General detection error:', error);
       const errorMessage =
         error instanceof Error ? error.message : String(error);
       this.cachedResult = {
@@ -115,6 +166,9 @@ export class CliDetector {
         'Install via npm:',
         '  npm install -g @qwen-code/qwen-code@latest',
         '',
+        'If you are using nvm (automatically handled by the plugin):',
+        '  The plugin will automatically use your default nvm version',
+        '',
         'Or install from source:',
         '  git clone https://github.com/QwenLM/qwen-code.git',
         '  cd qwen-code',