fnva 0.0.49 → 0.0.51

package/README.md

@@ -15,7 +15,7 @@ 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: `Invoke-Expression (& fnva env env --shell powershell | Out-String)`
+  PowerShell: `fnva env env --shell powershell | Out-String | Invoke-Expression`
   Fish: `fnva env env --shell fish | source`
 - Scan Java: `fnva java scan`
 - Switch Java for current session: `fnva java use jdk-17` (with shell integration)

package/bin/fnva.js

@@ -651,6 +651,31 @@ function run() {
 
     process.exit(0);
   } else {
+    // For env commands, capture output and write as single string to avoid
+    // PowerShell splitting multi-line output into Object[] (which breaks
+    // the standard | Out-String | Invoke-Expression profile pattern).
+    const isEnvOutputCommand = args[0] === 'env' && args[1] === 'env';
+    if (isEnvOutputCommand) {
+      const result = spawnSync(binaryPath, args, {
+        encoding: 'utf8',
+        shell: false,
+      });
+
+      if (result.error) {
+        console.error(`[ERROR] Failed to execute fnva: ${result.error.message}`);
+        process.exit(result.status ?? 1);
+      }
+
+      if (result.stdout) {
+        process.stdout.write(result.stdout);
+      }
+      if (result.stderr) {
+        process.stderr.write(result.stderr);
+      }
+
+      process.exit(result.status ?? 0);
+    }
+
     // 对于其他命令，使用原有的 stdio: 'inherit' 方式
     const result = spawnSync(binaryPath, args, {
       stdio: 'inherit',

package/bin/fnva.ps1

@@ -1,37 +1,31 @@
-# fnva - Windows PowerShell 启动脚本
+#!/usr/bin/env pwsh
+# fnva PowerShell wrapper - calls native binary directly
+# PowerShell prefers .ps1 over .cmd, avoiding Object[] output splitting
 
-param(
-    [Parameter(ValueFromRemainingArguments=$true)]
-    [string[]]$Arguments
-)
-
-# 检测平台和架构
-$os = "win32"
-$arch = if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { "arm64" } else { "x64" }
-
-# 构建二进制文件路径
-$platformDir = "$os-$arch"
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-$binaryPath = Join-Path $scriptDir ".." "platforms" $platformDir "fnva.exe"
+$arch = if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { "arm64" } else { "x64" }
+$platformDir = "win32-$arch"
 
-# 如果分层结构不存在，尝试扁平结构
-if (-not (Test-Path $binaryPath)) {
-    $binaryPath = Join-Path $scriptDir ".." "platforms" "fnva.exe"
+# Try native binary in npm package
+$binaryPath = Join-Path $scriptDir "..\platforms\$platformDir\fnva.exe"
+if (Test-Path $binaryPath) {
+    & $binaryPath @args
+    exit $LASTEXITCODE
 }
 
-# 检查二进制文件是否存在
-if (-not (Test-Path $binaryPath)) {
-    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
+# Fallback: local dev build
+$devPath = Join-Path $scriptDir "..\target\release\fnva.exe"
+if (Test-Path $devPath) {
+    & $devPath @args
+    exit $LASTEXITCODE
 }
 
-# 执行二进制文件
-& $binaryPath $Arguments
-
-if ($LASTEXITCODE) {
+# Last resort: node wrapper
+$nodeScript = Join-Path $scriptDir "fnva.js"
+if (Test-Path $nodeScript) {
+    & node $nodeScript @args
     exit $LASTEXITCODE
-}
+}
+
+Write-Error "fnva: native binary not found. Reinstall with: npm install -g fnva --force"
+exit 1

package/package.json

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

package/scripts/install-shell-integration.js

@@ -50,7 +50,7 @@ function getShellConfigPath(shell) {
 function getIntegrationLine(shell) {
   switch (shell) {
     case 'powershell':
-      return 'Invoke-Expression (& fnva env env --shell powershell | Out-String)';
+      return 'fnva env env --shell powershell | Out-String | Invoke-Expression';
     case 'bash':
     case 'zsh':
       return 'eval "$(fnva env env --shell bash)"';
@@ -142,12 +142,46 @@ function promptInstallation() {
   });
 }
 
+function getNpmGlobalBinDir() {
+  // Try npm_config_prefix first (set by npm during install)
+  if (process.env.npm_config_prefix) {
+    return process.env.npm_config_prefix;
+  }
+  // Fallback: find where fnva.cmd lives
+  try {
+    const result = spawnSync('npm', ['prefix', '-g'], { encoding: 'utf8', timeout: 10000 });
+    if (result.status === 0 && result.stdout.trim()) {
+      return result.stdout.trim();
+    }
+  } catch (_) {}
+  // Last resort: derive from node executable path
+  return path.dirname(process.execPath);
+}
+
+function installPowershellWrapper() {
+  if (process.platform !== 'win32') return;
+
+  const srcPs1 = path.resolve(__dirname, '..', 'bin', 'fnva.ps1');
+  if (!fs.existsSync(srcPs1)) return;
+
+  const npmBinDir = getNpmGlobalBinDir();
+  const destPs1 = path.join(npmBinDir, 'fnva.ps1');
+
+  try {
+    fs.copyFileSync(srcPs1, destPs1);
+    console.log(`PowerShell wrapper installed: ${destPs1}`);
+  } catch (error) {
+    console.log(`PowerShell wrapper install skipped: ${error.message}`);
+  }
+}
+
 function main() {
   console.log('fnva shell integration installer');
   console.log(`Node.js version: ${process.version}`);
   console.log(`CWD: ${process.cwd()}`);
 
   if (process.argv.includes('--auto') || process.argv.includes('--yes')) {
+    installPowershellWrapper();
     const result = installShellIntegration();
     console.log(`Install result: ${result ? 'success' : 'failed'}`);
   } else {