fnva 0.0.8 → 0.0.10

package/bin/fnva.js

@@ -74,6 +74,99 @@ 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 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 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 +180,114 @@ 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 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: false
+    });
+
+    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：默认不启动新的会话；可通过 --session 开启旧行为
+      if (process.platform === 'win32') {
+        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 {
+          console.log(`✅ Switched to ${envType} environment: ${envName}`);
+          if (process.stdout.isTTY) {
+            console.log('');
+            console.log('💡 在当前会话应用环境：');
+            console.log(`  fnva ${envType} use ${envName} --shell powershell | Invoke-Expression`);
+          } else {
+            process.stdout.write(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);
+    }
 
-  process.exit(result.status ?? 0);
+    // 如果有 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/package.json

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