fnva 0.0.42 → 0.0.44

package/README.md

@@ -14,16 +14,19 @@ Cross-platform environment switcher for Java, Claude Code (CC), and LLM setups.
 
 ## Quick start
 
-- Init shell (Bash/Zsh): `eval "$(fnva env env --shell bash)"`  
-  PowerShell: `fnva env env --shell powershell | Out-String | Invoke-Expression`
+- Init shell (Bash/Zsh): `eval "$(fnva env --shell bash)"`
+  PowerShell: `fnva env --shell powershell | Out-String | Invoke-Expression`
+  Fish: `fnva env --shell fish | source`
 - Scan Java: `fnva java scan`
-- Switch Java for current session: `eval "$(fnva java use jdk-17)"`
-- Switch CC profile: `eval "$(fnva cc use glmcc)"`
+- Switch Java for current session: `fnva java use jdk-17` (with shell integration)
+- Switch CC profile: `fnva cc use glmcc` (with shell integration)
+- 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/bin/fnva.js

@@ -44,16 +44,12 @@ function buildBinaryPath() {
     return null;
   }
 
-  // 如果设置了 FNVA_AUTO_MODE，自动使用 Node.js 模式
-  if (process.env.FNVA_AUTO_MODE === '1') {
-    return null;
-  }
-
   const platform = resolvePlatform();
   const binaryCandidates = [];
 
   // 1. Prebuilt binary shipped with the npm package
-  binaryCandidates.push(platformBinaryPath(platform));
+  const npmBinaryPath = platformBinaryPath(platform);
+  binaryCandidates.push(npmBinaryPath);
 
   // 2. User-provided override via environment variable
   if (process.env.FNVA_NATIVE_PATH) {
@@ -70,12 +66,32 @@ function buildBinaryPath() {
     binaryCandidates.push(path.join(targetDir, 'debug', 'fnva'));
   }
 
+  // Debug: Show all candidates and their existence
+  if (process.env.FNVA_DEBUG === '1') {
+    console.log('[DEBUG] Looking for fnva binary...');
+    console.log('[DEBUG] Platform:', platform, 'Arch:', resolveArch());
+    console.log('[DEBUG] Binary candidates:');
+    binaryCandidates.forEach((candidate, index) => {
+      const exists = candidate && fs.existsSync(candidate);
+      console.log(`  ${index + 1}. ${candidate} - ${exists ? 'EXISTS' : 'MISSING'}`);
+    });
+  }
+
   for (const candidate of binaryCandidates) {
     if (candidate && fs.existsSync(candidate)) {
+      if (process.env.FNVA_DEBUG === '1') {
+        console.log(`[DEBUG] Found binary at: ${candidate}`);
+      }
       return candidate;
     }
   }
 
+  if (process.env.FNVA_DEBUG === '1') {
+    console.log('[DEBUG] No binary found, falling back to Node.js mode');
+    console.log('[DEBUG] Expected npm package binary path:', npmBinaryPath);
+    console.log('[DEBUG] npmBinaryPath exists:', fs.existsSync(npmBinaryPath));
+  }
+
   return null;
 }
 
@@ -280,15 +296,20 @@ function handleNodeOnlyMode(args) {
   const path = require('path');
   const os = require('os');
 
-  // 简单的命令处理
-  if (args.length === 0) {
-    console.log('fnva - 环境管理工具 (Node.js 模式)');
+  // 只支持基本帮助信息
+  if (args.length === 0 || args[0] === '--help' || args[0] === '-h') {
+    console.log('fnva - 环境管理工具 (Node.js 降级模式)');
     console.log('');
-    console.log('支持的命令:');
+    console.log('⚠️  当前运行在 Node.js 降级模式，功能有限');
+    console.log('');
+    console.log('解决方法:');
+    console.log('1. 确保 npm 包包含平台二进制文件');
+    console.log('2. 重新安装: npm install -g fnva --force');
+    console.log('3. 或者直接下载原生二进制文件');
+    console.log('');
+    console.log('临时可用功能:');
     console.log('  java list     - 列出 Java 环境');
     console.log('  java use <n>  - 切换 Java 环境');
-    console.log('');
-    console.log('注意: Node.js 模式功能有限，建议使用原生二进制版本。');
     return;
   }
 
@@ -368,7 +389,14 @@ function handleNodeOnlyMode(args) {
       process.exit(1);
     }
   } else {
-    console.error(`Command '${args[0]}' not supported in Node.js mode`);
+    console.error(`❌ Command '${args[0]}' requires native binary mode`);
+    console.error('');
+    console.error('当前运行在 Node.js 降级模式，不支持此命令');
+    console.error('');
+    console.error('解决方案:');
+    console.error('1. 重新安装 npm 包: npm install -g fnva --force');
+    console.error('2. 从 GitHub Release 下载原生二进制文件');
+    console.error('3. 或者设置 FNVA_SKIP_NATIVE=1 强制使用此模式（功能受限）');
     process.exit(1);
   }
 }
@@ -377,23 +405,90 @@ function run() {
   // 设置Windows控制台编码
   EncodingUtils.setWindowsConsoleEncoding();
 
+  // 强制显示调试信息
+  const showDebug = process.env.FNVA_DEBUG === '1' || process.argv.includes('--debug');
+
+  if (showDebug) {
+    console.log('=== FNVA DEBUG INFORMATION ===');
+    console.log('Node.js version:', process.version);
+    console.log('Platform:', process.platform);
+    console.log('Architecture:', process.arch);
+    console.log('Node binary:', process.execPath);
+    console.log('Script directory:', __dirname);
+    console.log('Working directory:', process.cwd());
+    console.log('Environment variables:');
+    console.log('  FNVA_DEBUG:', process.env.FNVA_DEBUG);
+    console.log('  FNVA_SKIP_NATIVE:', process.env.FNVA_SKIP_NATIVE);
+    console.log('Command line args:', process.argv);
+    console.log('');
+  }
+
   const binaryPath = buildBinaryPath();
 
+  if (showDebug) {
+    console.log('=== BINARY SEARCH RESULTS ===');
+    console.log('Binary path found:', binaryPath);
+
+    // 手动检查所有可能的路径
+    const fs = require('fs');
+    const path = require('path');
+
+    const scriptDir = __dirname;
+    const projectRoot = path.resolve(scriptDir, '..');
+    const platform = process.platform;
+    const arch = process.arch;
+    const platformDir = `${platform}-${arch}`;
+    const binaryName = platform === 'win32' ? 'fnva.exe' : 'fnva';
+    const expectedPath = path.join(projectRoot, 'platforms', platformDir, binaryName);
+
+    console.log('Expected binary path:', expectedPath);
+    console.log('Expected path exists:', fs.existsSync(expectedPath));
+
+    // 检查platforms目录结构
+    console.log('');
+    console.log('=== PLATFORMS DIRECTORY ===');
+    const platformsDir = path.join(projectRoot, 'platforms');
+    if (fs.existsSync(platformsDir)) {
+      const platforms = fs.readdirSync(platformsDir, { withFileTypes: true });
+      platforms.forEach(item => {
+        if (item.isDirectory()) {
+          const platformPath = path.join(platformsDir, item.name);
+          const files = fs.readdirSync(platformPath);
+          console.log(`platforms/${item.name}/:`, files);
+        }
+      });
+    } else {
+      console.log('platforms directory does not exist');
+    }
+
+    console.log('=== END DEBUG ===');
+    console.log('');
+  }
+
   if (!binaryPath) {
-    if (process.env.FNVA_SKIP_NATIVE === '1' || process.env.FNVA_AUTO_MODE === '1') {
+    if (process.env.FNVA_SKIP_NATIVE === '1') {
+      if (showDebug) {
+        console.log('Falling back to Node.js mode (FNVA_SKIP_NATIVE set)');
+      }
       // 纯 Node.js 模式 - 实现基本的环境切换功能
       const args = process.argv.slice(2);
       handleNodeOnlyMode(args);
       return;
     }
 
-    console.error('Error: fnva native binary not found.');
+    console.error('❌ Error: fnva native binary not found.');
     console.error('');
-    console.error("Please either:");
-    console.error("  1) Run 'npm run build' (or 'npm run build:all') to produce platform binaries,");
-    console.error("  2) Install a release package that includes the platforms directory, or");
-    console.error("  3) Set FNVA_NATIVE_PATH to the full path of an existing fnva executable.");
-    console.error("  4) Set FNVA_SKIP_NATIVE=1 to use Node.js mode (limited functionality).");
+
+    if (showDebug) {
+      console.error('🔍 Debug information is shown above');
+      console.error('');
+    }
+
+    console.error("💡 Solutions:");
+    console.error("  1) Reinstall npm package: npm install -g fnva --force");
+    console.error("  2) Download binary from GitHub Release");
+    console.error("  3) Set FNVA_SKIP_NATIVE=1 to use Node.js mode (limited functionality)");
+    console.error("  4) Set FNVA_DEBUG=1 to show debug information");
     process.exit(1);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "跨平台环境切换工具，支持 Java 和 LLM 环境配置",
   "author": "protagonistss",
   "license": "MIT",
@@ -17,7 +17,7 @@
     "build:platforms:sh": "bash scripts/build-platforms.sh",
     "build:all": "scripts/build-all.sh",
     "check-permissions": "node scripts/check-permissions.js",
-    "postuninstall": "echo 'Uninstalling fnva shell integration...' && node scripts/uninstall-shell-integration.js"
+    "postuninstall": "node scripts/uninstall-shell-integration.js"
   },
   "files": [
     "bin/",

package/scripts/install-shell-integration.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
 // Shell integration installer for fnva (npm postinstall helper).
-// Generates a minimal shell function that invokes the real fnva binary.
+// Writes a single line into the shell profile: eval "$(fnva env --shell <shell>)"
+// The fnva binary generates the full init script (autoload + wrapper).
 
 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');
 
 function detectShell() {
@@ -37,118 +38,26 @@ function getShellConfigPath(shell) {
   }
 }
 
-function getPowerShellFunction() {
-  return `
-# 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")
-
-        $env:FNVAAUTOMODE = "1"
-        try {
-            $output = cmd.exe /c "set FNVA_AUTO_MODE=%FNVAAUTOMODE% && fnva $args" 2>&1
-
-            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 }
-            } else {
-                $output
-            }
-        } finally {
-            $env:FNVAAUTOMODE = ""
-            if (Test-Path $tempFile) { Remove-Item $tempFile -ErrorAction SilentlyContinue }
-        }
-    } else {
-        $env:FNVAAUTOMODE = "1"
-        try { cmd.exe /c "set FNVA_AUTO_MODE=%FNVAAUTOMODE% && fnva $args" } finally { $env:FNVAAUTOMODE = "" }
-    }
-}
-`;
-}
-
-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() {
-  return `
-# fnva auto integration (added by npm install)
-fnva() {
-    local __fnva_bin="${FNVA_SHIM}"
-    if [[ ! -x "$__fnva_bin" ]]; then
-        echo "fnva: binary not found in PATH" >&2
-        return 127
-    fi
-
-    if [[ $# -ge 2 && ("$1" == "java" || "$1" == "llm" || "$1" == "cc") && "$2" == "use" ]]; then
-        local temp_file
-        temp_file="$(mktemp)"
-        chmod +x "$temp_file"
-
-        FNVA_AUTO_MODE=1 "$__fnva_bin" "$@" > "$temp_file"
-        source "$temp_file"
-        rm -f "$temp_file"
-    else
-        FNVA_AUTO_MODE=1 "$__fnva_bin" "$@"
-    fi
-}
-`;
-}
-
-function getFishFunction() {
-  return `
-# fnva auto integration (added by npm install)
-function fnva
-    set __fnva_bin "${FNVA_SHIM}"
-    if test ! -x "$__fnva_bin"
-        echo "fnva: binary not found in PATH" >&2
-        return 127
-    end
-
-    if test (count $argv) -ge 2; and string match -q -r "^(java|llm|cc)$" $argv[1]; and test $argv[2] = "use"
-        set temp_file (mktemp)
-        chmod +x $temp_file
-        env FNVA_AUTO_MODE=1 "$__fnva_bin" $argv > $temp_file
-        source $temp_file
-        rm -f $temp_file
-    else
-        env FNVA_AUTO_MODE=1 "$__fnva_bin" $argv
-    end
-end
-`;
-}
-
-function getShellFunction(shell) {
+function getIntegrationLine(shell) {
   switch (shell) {
     case 'powershell':
-      return getPowerShellFunction();
+      return 'fnva env --shell powershell | Out-String | Invoke-Expression';
     case 'bash':
     case 'zsh':
-      return getBashFunction();
+      return 'eval "$(fnva env --shell bash)"';
     case 'fish':
-      return getFishFunction();
+      return 'fnva env --shell fish | source';
     default:
-      return '';
+      return null;
   }
 }
 
-function isFunctionInstalled(configPath) {
+function isInstalled(configPath) {
   if (!fs.existsSync(configPath)) {
     return false;
   }
   const content = fs.readFileSync(configPath, 'utf8');
-  return content.includes('fnva auto integration (added by npm install)');
+  return content.includes('fnva env --shell');
 }
 
 function installShellIntegration() {
@@ -161,24 +70,30 @@ function installShellIntegration() {
     return false;
   }
 
-  if (isFunctionInstalled(configPath)) {
+  if (isInstalled(configPath)) {
     console.log(`fnva shell integration already present: ${configPath}`);
     return true;
   }
 
+  const line = getIntegrationLine(shell);
+  if (!line) {
+    console.log(`Unsupported shell: ${shell}`);
+    return false;
+  }
+
   try {
     const dir = path.dirname(configPath);
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
 
-    const functionCode = getShellFunction(shell);
+    const marker = `\n# fnva shell integration\n${line}\n`;
 
     if (fs.existsSync(configPath)) {
       const content = fs.readFileSync(configPath, 'utf8');
-      fs.writeFileSync(configPath, content + '\n' + functionCode);
+      fs.writeFileSync(configPath, content + marker);
     } else {
-      fs.writeFileSync(configPath, functionCode);
+      fs.writeFileSync(configPath, marker);
     }
 
     console.log(`fnva shell integration installed at: ${configPath}`);
@@ -238,7 +153,7 @@ if (require.main === module) {
 module.exports = {
   detectShell,
   getShellConfigPath,
-  getShellFunction,
-  isFunctionInstalled,
+  getIntegrationLine,
+  isInstalled,
   installShellIntegration,
 };

package/scripts/uninstall-shell-integration.js

@@ -113,33 +113,48 @@ function removeShellIntegration(configPath, shell) {
 
 function main() {
   console.log('🧹 fnva shell integration uninstaller');
+  console.log('npm install location:', __dirname);
+  console.log('Current platform:', process.platform);
+  console.log('Detected shell:', process.env.SHELL || 'unknown');
 
   const shell = detectShell();
   const paths = getShellConfigPaths(shell);
 
+  console.log(`Config paths for ${shell}:`, paths);
+
   if (!paths.length) {
     console.log(`⚠️  Unsupported shell: ${shell}`);
+    console.log('No config files found for this shell');
     return;
   }
 
+  console.log(`Attempting to clean config files...`);
   const success = removeShellIntegration(null, shell);
 
   if (success) {
+    console.log('✅ Shell integration successfully removed');
     console.log('🔄 Reload your shell config:');
     switch (shell) {
       case 'powershell':
         console.log('   . $PROFILE');
+        console.log('   Or start new PowerShell instance');
         break;
       case 'bash':
         console.log('   source ~/.bashrc');
+        console.log('   Or: exec bash');
         break;
       case 'zsh':
         console.log('   source ~/.zshrc');
+        console.log('   Or: exec zsh');
         break;
       case 'fish':
         console.log('   source ~/.config/fish/config.fish');
+        console.log('   Or: exec fish');
         break;
     }
+  } else {
+    console.log('⚠️  No fnva shell integration found in any config files');
+    console.log('   (This is normal if shell integration was never installed)');
   }
 }