fnva 0.0.9 → 0.0.11

package/README.md

@@ -28,6 +28,17 @@ yarn global add fnva
 
 # 使用 pnpm
 pnpm add -g fnva
+
+function fnva {
+  if ($args.Count -ge 2 -and ($args[0] -eq "java" -or $args[0] -eq "llm" -or $args[0] -eq "cc") -and $args[1] -eq "use") {
+      $tempFile = "$env:TEMP\fnva_script_$(Get-Random).ps1"
+      & node bin\fnva.js $args | Out-File -FilePath $tempFile -Encoding UTF8
+      & $tempFile
+      Remove-Item $tempFile -ErrorAction SilentlyContinue
+  } else {
+      & node bin\fnva.js $args
+  }
+}
 ```
 
 ### 方式二：从 Releases 下载二进制文件

package/bin/fnva.js

@@ -84,6 +84,62 @@ function hasDirectExecuteFlag(args) {
   return args.includes('--exec') || args.includes('-e');
 }
 
+function getShellArg(args) {
+  const idx = args.indexOf('--shell');
+  if (idx !== -1 && idx + 1 < args.length) {
+    return args[idx + 1];
+  }
+  return null;
+}
+
+function detectShell() {
+  if (process.platform === 'win32') {
+    return 'powershell';
+  }
+  return 'bash';
+}
+
+function hasSessionFlag(args) {
+  return args.includes('--session');
+}
+
+function hasApplyFlag(args) {
+  return args.includes('--apply');
+}
+
+function hasAutoExecuteFlag(args) {
+  return args.includes('--auto');
+}
+
+function removeAutoFlag(args) {
+  const index = args.indexOf('--auto');
+  if (index > -1) {
+    return args.slice(0, index).concat(args.slice(index + 1));
+  }
+  return args;
+}
+
+function createTempScriptFile(script, envType, envName) {
+  try {
+    const os = require('os');
+    const fs = require('fs');
+    const path = require('path');
+
+    const tempDir = os.tmpdir();
+    const scriptFile = path.join(tempDir, `fnva_${envType}_${envName}_${Date.now()}.ps1`);
+
+    fs.writeFileSync(scriptFile, script, 'utf8');
+
+    console.log('');
+    console.log('💡 环境已切换到当前进程。要在新的 PowerShell 窗口中使用此环境，运行：');
+    console.log(`   ${scriptFile}`);
+    console.log('   或者: fnva', envType, 'use', envName, '--auto');
+
+  } catch (error) {
+    console.warn('⚠️  无法创建临时脚本文件:', error.message);
+  }
+}
+
 function parseEnvironmentScript(scriptContent) {
   if (!scriptContent || scriptContent.trim() === '') {
     return {};
@@ -101,10 +157,25 @@ function parseEnvironmentScript(scriptContent) {
     const trimmedLine = line.trim();
 
     // 解析 PowerShell 环境变量设置
-    if (trimmedLine.startsWith('$env:')) {
-      const match = trimmedLine.match(/\$env:(\w+)\s*=\s*"([^"]*)"/);
+    if (trimmedLine.includes('$env:')) {
+      // 匹配 $env:VARNAME = "value" 格式
+      let match = trimmedLine.match(/\$env:(\w+)\s*=\s*"([^"]*)"/);
       if (match) {
         envVars[match[1]] = match[2];
+        continue;
+      }
+
+      // 匹配 $env:VARNAME = 'value' 格式
+      match = trimmedLine.match(/\$env:(\w+)\s*=\s*'([^']*)'/);
+      if (match) {
+        envVars[match[1]] = match[2];
+        continue;
+      }
+
+      // 匹配 $env:VARNAME = value 格式（不带引号）
+      match = trimmedLine.match(/\$env:(\w+)\s*=\s*([^;]+)/);
+      if (match) {
+        envVars[match[1]] = match[2].trim().replace(/['"]/g, '');
       }
     }
 
@@ -115,12 +186,6 @@ function parseEnvironmentScript(scriptContent) {
         envVars[match[1]] = match[2];
       }
     }
-
-    // 解析不带引号的环境变量设置
-    const unquotedMatch = trimmedLine.match(/\$env:(\w+)\s*=\s*([^;]+)/);
-    if (unquotedMatch) {
-      envVars[unquotedMatch[1]] = unquotedMatch[2].trim();
-    }
   }
 
   return envVars;
@@ -148,6 +213,65 @@ function displaySuccessMessage(envType, envName, envVars) {
   }
 }
 
+function generateSimpleScript(envVars, envType, envName) {
+  const lines = [];
+
+  if (process.platform === 'win32') {
+    // Windows PowerShell
+    lines.push(`Write-Host "Switched to ${envType} environment: ${envName}" -ForegroundColor Green`);
+
+    if (envVars.JAVA_HOME) {
+      lines.push(`$env:JAVA_HOME = "${envVars.JAVA_HOME}"`);
+      // 对于 PATH，我们需要智能处理：移除旧的 Java 路径，添加新的
+      lines.push(`# Remove existing Java paths from PATH`);
+      lines.push(`$pathParts = $env:PATH -split ';'`);
+      lines.push(`$cleanPath = @()`);
+      lines.push(`foreach ($part in $pathParts) {`);
+      lines.push(`    if ($part -notmatch 'java' -and $part -notmatch 'jdk') {`);
+      lines.push(`        $cleanPath += $part`);
+      lines.push(`    }`);
+      lines.push(`}`);
+      lines.push(`$env:PATH = "${envVars.JAVA_HOME}\\bin;" + ($cleanPath -join ';')`);
+      lines.push(`Write-Host "JAVA_HOME: $env:JAVA_HOME" -ForegroundColor Yellow`);
+    }
+
+    if (envVars.ANTHROPIC_AUTH_TOKEN) {
+      lines.push(`$env:ANTHROPIC_AUTH_TOKEN = "${envVars.ANTHROPIC_AUTH_TOKEN}"`);
+      lines.push(`Write-Host "ANTHROPIC_AUTH_TOKEN: [已设置]" -ForegroundColor Yellow`);
+    }
+
+    if (envVars.OPENAI_API_KEY) {
+      lines.push(`$env:OPENAI_API_KEY = "${envVars.OPENAI_API_KEY}"`);
+      lines.push(`Write-Host "OPENAI_API_KEY: [已设置]" -ForegroundColor Yellow`);
+    }
+  } else {
+    // Unix-like systems
+    lines.push(`echo "Switched to ${envType} environment: ${envName}"`);
+
+    if (envVars.JAVA_HOME) {
+      lines.push(`export JAVA_HOME="${envVars.JAVA_HOME}"`);
+      // 对于 PATH，我们也需要智能处理
+      lines.push(`# Remove existing Java paths from PATH`);
+      lines.push(`echo $PATH | tr ':' '\\n' | grep -v java | grep -v jdk | tr '\\n' ':' | sed 's/:$//' > /tmp/clean_path`);
+      lines.push(`export PATH="${envVars.JAVA_HOME}/bin:$(cat /tmp/clean_path)"`);
+      lines.push(`rm -f /tmp/clean_path`);
+      lines.push(`echo "JAVA_HOME: $JAVA_HOME"`);
+    }
+
+    if (envVars.ANTHROPIC_AUTH_TOKEN) {
+      lines.push(`export ANTHROPIC_AUTH_TOKEN="${envVars.ANTHROPIC_AUTH_TOKEN}"`);
+      lines.push(`echo "ANTHROPIC_AUTH_TOKEN: [已设置]"`);
+    }
+
+    if (envVars.OPENAI_API_KEY) {
+      lines.push(`export OPENAI_API_KEY="${envVars.OPENAI_API_KEY}"`);
+      lines.push(`echo "OPENAI_API_KEY: [已设置]"`);
+    }
+  }
+
+  return lines.join('\n');
+}
+
 function run() {
   const binaryPath = buildBinaryPath();
 
@@ -161,14 +285,33 @@ function run() {
     process.exit(1);
   }
 
-  const args = process.argv.slice(2);
+  let args = process.argv.slice(2);
+
+  // 如果设置了 FNVA_AUTO_EXECUTE，则为环境切换命令启用自动执行
+  if (process.env.FNVA_AUTO_EXECUTE === '1' && isEnvironmentSwitchCommand(args) && !hasSessionFlag(args)) {
+    // 添加 --auto 标志来启用自动执行
+    args = args.concat('--auto');
+  }
   const isSwitchCommand = isEnvironmentSwitchCommand(args);
 
   if (isSwitchCommand) {
+    const shellArg = getShellArg(args);
+    if (!shellArg || shellArg === 'auto') {
+      const detected = detectShell();
+      if (shellArg === 'auto') {
+        const idx = args.indexOf('--shell');
+        if (idx !== -1 && idx + 1 < args.length) {
+          args[idx + 1] = detected;
+        }
+      } else {
+        args.push('--shell', detected);
+      }
+    }
+
     const { spawnSync } = require('child_process');
     const result = spawnSync(binaryPath, args, {
       encoding: 'utf8',
-      shell: true
+      shell: false
     });
 
     if (result.error) {
@@ -188,70 +331,74 @@ function run() {
       const envType = args[0];
       const envName = args[2];
 
-      // 在 Windows 上：启动新的 PowerShell 会话并自动执行环境切换
+      // Windows：默认不启动新的会话；可通过 --session 开启旧行为
       if (process.platform === 'win32') {
-        console.log(`✅ Switched to ${envType} environment: ${envName}`);
-        console.log(`🚀 Starting new PowerShell session with ${envName} environment...`);
-        console.log(`Type "exit" to return to previous session\n`);
-
-        try {
-          // 创建临时脚本文件
-          const os = require('os');
-          const fs = require('fs');
-          const tempScript = os.tmpdir() + '\\fnva_env_' + Date.now() + '.ps1';
-
-          // 写入环境设置脚本 + 启动交互式会话
-          const fullScript = script + '\n\n' +
-            'Write-Host "✨ Environment ready! You are now in fnva: ' + envName + '" -ForegroundColor Green\n' +
-            'Write-Host "Current Java version:" -ForegroundColor Yellow\n' +
-            'java --version\n' +
-            'Write-Host ""\n' +
-            'Write-Host "Type "exit" to return to previous session." -ForegroundColor Cyan\n' +
-            'Write-Host ""\n' +
-            '$Host.UI.RawUI.WindowTitle = "fnva: ' + envName + '"\n' +
-            '# Start interactive prompt\n' +
-            'while ($true) {\n' +
-            '    try {\n' +
-            '        $input = Read-Host "PS fnva:' + envName + '"\n' +
-            '        if ($input -eq "exit") { break }\n' +
-            '        if ($input.Trim() -ne "") {\n' +
-            '            try {\n' +
-            '                Invoke-Expression $input\n' +
-            '            } catch {\n' +
-            '                Write-Host "Error: $($_.Exception.Message)" -ForegroundColor Red\n' +
-            '            }\n' +
-            '        }\n' +
-            '    } catch {\n' +
-            '        break\n' +
-            '    }\n' +
-            '}\n' +
-            'Write-Host "👋 Returning to original session..." -ForegroundColor Cyan\n';
-
-          fs.writeFileSync(tempScript, fullScript, 'utf8');
-
-          // 启动新的交互式 PowerShell 会话
-          const { spawn } = require('child_process');
-          const ps = spawn('powershell', ['-NoExit', '-ExecutionPolicy', 'Bypass', '-File', tempScript], {
-            stdio: 'inherit',
-            shell: false  // 避免 shell 注入问题
-          });
-
-          ps.on('exit', (code) => {
-            // 清理临时文件
-            try {
-              fs.unlinkSync(tempScript);
-            } catch (e) {
-              // 忽略清理错误
+        if (hasSessionFlag(args)) {
+          console.log(`✅ Switched to ${envType} environment: ${envName}`);
+          console.log(`🚀 Starting new PowerShell session with ${envName} environment...`);
+          console.log(`Type "exit" to return to previous session\n`);
+
+          try {
+            const os = require('os');
+            const fs = require('fs');
+            const tempScript = os.tmpdir() + '\\fnva_env_' + Date.now() + '.ps1';
+            const fullScript = script + '\n';
+            fs.writeFileSync(tempScript, fullScript, 'utf8');
+            const { spawn } = require('child_process');
+            const ps = spawn('powershell', ['-NoExit', '-ExecutionPolicy', 'Bypass', '-File', tempScript], {
+              stdio: 'inherit',
+              shell: false
+            });
+            ps.on('exit', () => {
+              try { fs.unlinkSync(tempScript); } catch (_) {}
+              console.log('👋 Returned to original session');
+            });
+            return;
+          } catch (error) {
+            console.error(`Failed to start PowerShell session: ${error.message}`);
+            console.log(`📝 Script was: ${script}`);
+          }
+        } else {
+          // 检查是否使用了 --apply 参数
+          if (hasApplyFlag(args)) {
+            // 直接应用环境变量到当前进程
+            const envVars = parseEnvironmentScript(script);
+            applyEnvironmentVariables(envVars);
+            displaySuccessMessage(envType, envName, envVars);
+          } else {
+            // 在 Windows 中，智能处理环境设置
+            const envVars = parseEnvironmentScript(script);
+            const simpleScript = generateSimpleScript(envVars, envType, envName);
+
+            // 尝试自动执行（如果可能）
+            if (process.env.FNVA_AUTO_EXECUTE === '1') {
+              const os = require('os');
+              const fs = require('fs');
+              const path = require('path');
+              const { spawn } = require('child_process');
+
+              try {
+                const tempFile = path.join(os.tmpdir(), `fnva_auto_${Date.now()}.ps1`);
+                fs.writeFileSync(tempFile, simpleScript, 'utf8');
+
+                // 使用 PowerShell 执行脚本
+                spawn('powershell', ['-ExecutionPolicy', 'Bypass', '-File', tempFile], {
+                  stdio: 'inherit',
+                  shell: false
+                }).on('exit', () => {
+                  try { fs.unlinkSync(tempFile); } catch (_) {}
+                });
+
+                console.log('✅ 环境已自动切换');
+                return;
+              } catch (error) {
+                console.warn('⚠️  自动执行失败，回退到脚本输出');
+              }
             }
-            console.log('👋 Returned to original session');
-          });
-
-          // 保持当前进程运行直到子进程结束
-          return;
 
-        } catch (error) {
-          console.error(`Failed to start PowerShell session: ${error.message}`);
-          console.log(`📝 Script was: ${script}`);
+            // 默认输出脚本
+            process.stdout.write(simpleScript);
+          }
         }
       } else {
         // Unix-like systems: 显示使用说明

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "跨平台环境切换工具，支持 Java 和 LLM 环境配置",
   "author": "protagonistss",
   "license": "MIT",