fnva 0.0.41 → 0.0.43

package/README.md

@@ -14,16 +14,18 @@ Cross-platform environment switcher for Java, Claude Code (CC), and LLM setups.
 
 ## Quick start
 
-- Init shell (Bash/Zsh): `eval "$(fnva env env --shell bash)"`  
+- Init shell (Bash/Zsh): `eval "$(fnva env env --shell bash)"`
   PowerShell: `fnva env env --shell powershell | Out-String | Invoke-Expression`
 - Scan Java: `fnva java scan`
 - Switch Java for current session: `eval "$(fnva java use jdk-17)"`
 - Switch CC profile: `eval "$(fnva cc use glmcc)"`
+- New terminals auto-restore your last active environment
 
 ## What it does
 
 - Manages multiple Java, CC, and generic LLM configurations.
 - Generates shell snippets to activate environments per session or by default.
+- **Auto-restore** — new terminals automatically restore the last active CC/Java environment.
 - Stores config at `~/.fnva/config.toml` (Windows: `%USERPROFILE%\.fnva\config.toml`).
 - Ships as a single binary; no background daemon.
 

package/package.json

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

package/scripts/install-shell-integration.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
 // Shell integration installer for fnva (npm postinstall helper).
-// Generates a minimal shell function that invokes the real fnva binary.
+// Uses fnva's built-in template system for shell integration scripts.
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { spawnSync } = require('child_process');
 
 // Absolute path to the packaged fnva shim (bin/fnva.js)
 const FNVA_SHIM = path.resolve(__dirname, '..', 'bin', 'fnva.js');
@@ -37,49 +38,70 @@ function getShellConfigPath(shell) {
   }
 }
 
+// Get integration script from fnva command (uses Rust templates)
+function getIntegrationScript(shell) {
+  try {
+    const result = spawnSync('node', [FNVA_SHIM, 'env', 'shell-integration', '-s', shell], {
+      encoding: 'utf8',
+      cwd: path.resolve(__dirname, '..')
+    });
+
+    if (result.status === 0 && result.stdout) {
+      return result.stdout;
+    }
+
+    console.log(`Warning: Failed to get integration script from fnva (exit code: ${result.status})`);
+    if (result.stderr) {
+      console.log(`stderr: ${result.stderr}`);
+    }
+    return '';
+  } catch (error) {
+    console.log(`Warning: Failed to call fnva for integration script: ${error.message}`);
+    return '';
+  }
+}
+
 function getPowerShellFunction() {
+  // Get integration script from Rust template
+  const integrationScript = getIntegrationScript('powershell');
+
   return `
+${integrationScript}
+
 # fnva auto integration (added by npm install)
 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 = Join-Path $env:TEMP ("fnva_script_" + (Get-Random) + ".ps1")
 
         try {
-            $output = cmd.exe /c "fnva $args" 2>&1
+            # Directly pipe output to temp file to avoid encoding issues
+            & fnva.cmd @args 2>&1 | Out-File -FilePath $tempFile -Encoding UTF8
 
-            if ($output -match '\\$env:' -or $output -match 'Write-Host') {
-                $output | Out-File -FilePath $tempFile -Encoding UTF8
-                try { & $tempFile } catch { Write-Host "Error executing script: $_" -ForegroundColor Red }
+            # Check if file contains environment variables
+            $content = Get-Content $tempFile -Raw -Encoding UTF8
+            if ($content -match '\\$env:' -or $content -match 'Write-Host') {
+                # Use dot sourcing to execute in current scope
+                . $tempFile
             } else {
-                $output
+                $content
             }
         } finally {
             if (Test-Path $tempFile) { Remove-Item $tempFile -ErrorAction SilentlyContinue }
         }
     } else {
-        try { cmd.exe /c "fnva $args" } finally { }
+        & fnva.cmd @args
     }
 }
 `;
 }
 
-function resolveBinaryPath() {
-  // Prefer real binary, avoid this function name
-  if (process.platform === 'win32') {
-    return process.argv[0];
-  }
-  let bin = '';
-  try {
-    const which = require('child_process').spawnSync('which', ['fnva'], { encoding: 'utf8' });
-    if (which.status === 0) {
-      bin = (which.stdout || '').trim();
-    }
-  } catch {}
-  return bin;
-}
-
 function getBashFunction() {
+  // Get integration script from Rust template
+  const integrationScript = getIntegrationScript('bash');
+
   return `
+${integrationScript}
+
 # fnva auto integration (added by npm install)
 fnva() {
     local __fnva_bin="${FNVA_SHIM}"
@@ -104,7 +126,12 @@ fnva() {
 }
 
 function getFishFunction() {
+  // Get integration script from Rust template
+  const integrationScript = getIntegrationScript('fish');
+
   return `
+${integrationScript}
+
 # fnva auto integration (added by npm install)
 function fnva
     set __fnva_bin "${FNVA_SHIM}"
@@ -132,7 +159,7 @@ function getShellFunction(shell) {
       return getPowerShellFunction();
     case 'bash':
     case 'zsh':
-      return getBashFunction();
+      return getBashFunction(); // zsh 使用和 bash 相同的语法
     case 'fish':
       return getFishFunction();
     default:
@@ -171,6 +198,11 @@ function installShellIntegration() {
 
     const functionCode = getShellFunction(shell);
 
+    if (!functionCode) {
+      console.log('Failed to generate shell integration script');
+      return false;
+    }
+
     if (fs.existsSync(configPath)) {
       const content = fs.readFileSync(configPath, 'utf8');
       fs.writeFileSync(configPath, content + '\n' + functionCode);