fnva 0.0.7 → 0.0.9

package/bin/fnva.cmd

@@ -17,9 +17,17 @@ REM 构建二进制文件路径
 set PLATFORM_DIR=%OS%-%ARCH%
 set BINARY_PATH=%~dp0..\platforms\%PLATFORM_DIR%\fnva.exe
 
+REM 如果分层结构不存在，尝试扁平结构
+if not exist "%BINARY_PATH%" (
+    set BINARY_PATH=%~dp0..\platforms\fnva.exe
+)
+
 REM 检查二进制文件是否存在
 if not exist "%BINARY_PATH%" (
-    echo 错误: 未找到二进制文件: %BINARY_PATH%
+    echo 错误: 未找到二进制文件
+    echo 尝试的路径:
+    echo   1. %~dp0..\platforms\%PLATFORM_DIR%\fnva.exe
+    echo   2. %~dp0..\platforms\fnva.exe
     echo 请运行 'npm run build' 构建二进制文件
     exit /b 1
 )

package/bin/fnva.js

@@ -74,6 +74,80 @@ function buildBinaryPath() {
   return null;
 }
 
+function isEnvironmentSwitchCommand(args) {
+  return args.length >= 3 &&
+         (args[0] === 'java' || args[0] === 'llm' || args[0] === 'cc') &&
+         args[1] === 'use';
+}
+
+function hasDirectExecuteFlag(args) {
+  return args.includes('--exec') || args.includes('-e');
+}
+
+function parseEnvironmentScript(scriptContent) {
+  if (!scriptContent || scriptContent.trim() === '') {
+    return {};
+  }
+
+  // 将数组输出转换为字符串
+  if (Array.isArray(scriptContent)) {
+    scriptContent = scriptContent.join('\n');
+  }
+
+  const envVars = {};
+  const lines = scriptContent.split('\n');
+
+  for (const line of lines) {
+    const trimmedLine = line.trim();
+
+    // 解析 PowerShell 环境变量设置
+    if (trimmedLine.startsWith('$env:')) {
+      const match = trimmedLine.match(/\$env:(\w+)\s*=\s*"([^"]*)"/);
+      if (match) {
+        envVars[match[1]] = match[2];
+      }
+    }
+
+    // 解析 bash/zsh 环境变量设置
+    if (trimmedLine.startsWith('export ')) {
+      const match = trimmedLine.match(/export\s+(\w+)\s*=\s*"([^"]*)"/);
+      if (match) {
+        envVars[match[1]] = match[2];
+      }
+    }
+
+    // 解析不带引号的环境变量设置
+    const unquotedMatch = trimmedLine.match(/\$env:(\w+)\s*=\s*([^;]+)/);
+    if (unquotedMatch) {
+      envVars[unquotedMatch[1]] = unquotedMatch[2].trim();
+    }
+  }
+
+  return envVars;
+}
+
+function applyEnvironmentVariables(envVars) {
+  for (const [key, value] of Object.entries(envVars)) {
+    process.env[key] = value;
+  }
+}
+
+function displaySuccessMessage(envType, envName, envVars) {
+  console.log(`✅ Switched to ${envType} environment: ${envName}`);
+
+  if (envVars.JAVA_HOME) {
+    console.log(`📁 JAVA_HOME: ${envVars.JAVA_HOME}`);
+  }
+
+  if (envVars.ANTHROPIC_AUTH_TOKEN) {
+    console.log(`🔑 ANTHROPIC_AUTH_TOKEN: [已设置]`);
+  }
+
+  if (envVars.OPENAI_API_KEY) {
+    console.log(`🔑 OPENAI_API_KEY: [已设置]`);
+  }
+}
+
 function run() {
   const binaryPath = buildBinaryPath();
 
@@ -87,16 +161,129 @@ function run() {
     process.exit(1);
   }
 
-  const result = spawnSync(binaryPath, process.argv.slice(2), {
-    stdio: 'inherit',
-  });
+  const args = process.argv.slice(2);
+  const isSwitchCommand = isEnvironmentSwitchCommand(args);
 
-  if (result.error) {
-    console.error(`Failed to execute fnva: ${result.error.message}`);
-    process.exit(result.status ?? 1);
-  }
+  if (isSwitchCommand) {
+    const { spawnSync } = require('child_process');
+    const result = spawnSync(binaryPath, args, {
+      encoding: 'utf8',
+      shell: true
+    });
+
+    if (result.error) {
+      console.error(`Failed to execute fnva: ${result.error.message}`);
+      process.exit(result.status ?? 1);
+    }
+
+    if (result.status !== 0) {
+      process.exit(result.status);
+    }
+
+    // 获取环境切换脚本
+    const stdout = result.stdout || '';
+    if (stdout.includes('JAVA_HOME') || stdout.includes('ANTHROPIC_') || stdout.includes('OPENAI_')) {
+      // 将数组输出转换为字符串
+      const script = Array.isArray(stdout) ? stdout.join('\n') : stdout;
+      const envType = args[0];
+      const envName = args[2];
+
+      // 在 Windows 上：启动新的 PowerShell 会话并自动执行环境切换
+      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';
 
-  process.exit(result.status ?? 0);
+          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) {
+              // 忽略清理错误
+            }
+            console.log('👋 Returned to original session');
+          });
+
+          // 保持当前进程运行直到子进程结束
+          return;
+
+        } catch (error) {
+          console.error(`Failed to start PowerShell session: ${error.message}`);
+          console.log(`📝 Script was: ${script}`);
+        }
+      } else {
+        // Unix-like systems: 显示使用说明
+        console.log(`✅ Switched to ${envType} environment: ${envName}`);
+        console.log('');
+        console.log('💡 To apply this environment, run:');
+        console.log(`  node bin/fnva.js ${args.join(' ')} | bash`);
+      }
+    } else {
+      // 如果不是环境脚本，直接输出
+      console.log(stdout);
+    }
+
+    // 如果有 stderr 输出，也显示出来
+    if (result.stderr) {
+      console.error(result.stderr);
+    }
+
+    process.exit(0);
+  } else {
+    // 对于其他命令，使用原有的 stdio: 'inherit' 方式
+    const result = spawnSync(binaryPath, args, {
+      stdio: 'inherit',
+    });
+
+    if (result.error) {
+      console.error(`Failed to execute fnva: ${result.error.message}`);
+      process.exit(result.status ?? 1);
+    }
+
+    process.exit(result.status ?? 0);
+  }
 }
 
 run();

package/bin/fnva.ps1

@@ -14,9 +14,17 @@ $platformDir = "$os-$arch"
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $binaryPath = Join-Path $scriptDir ".." "platforms" $platformDir "fnva.exe"
 
+# 如果分层结构不存在，尝试扁平结构
+if (-not (Test-Path $binaryPath)) {
+    $binaryPath = Join-Path $scriptDir ".." "platforms" "fnva.exe"
+}
+
 # 检查二进制文件是否存在
 if (-not (Test-Path $binaryPath)) {
-    Write-Host "错误: 未找到二进制文件: $binaryPath" -ForegroundColor Red
+    Write-Host "错误: 未找到二进制文件" -ForegroundColor Red
+    Write-Host "尝试的路径: " -ForegroundColor Yellow
+    Write-Host "  1. $(Join-Path $scriptDir ".." "platforms" $platformDir "fnva.exe")" -ForegroundColor Yellow
+    Write-Host "  2. $(Join-Path $scriptDir ".." "platforms" "fnva.exe")" -ForegroundColor Yellow
     Write-Host "请运行 'npm run build' 构建二进制文件" -ForegroundColor Yellow
     exit 1
 }

package/package.json

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