fnva 0.0.51 → 0.0.53

package/bin/fnva.ps1

@@ -6,22 +6,55 @@ $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $arch = if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { "arm64" } else { "x64" }
 $platformDir = "win32-$arch"
 
-# Try native binary in npm package
-$binaryPath = Join-Path $scriptDir "..\platforms\$platformDir\fnva.exe"
-if (Test-Path $binaryPath) {
-    & $binaryPath @args
+# Search paths for native binary (in priority order)
+$searchPaths = @(
+    # npm global install: fnva.ps1 is in <prefix>/, binary is in <prefix>/node_modules/fnva/platforms/
+    (Join-Path $scriptDir "node_modules\fnva\platforms\$platformDir\fnva.exe"),
+    # npm global install (flat): binary next to fnva.ps1
+    (Join-Path $scriptDir "fnva.exe"),
+    # Source tree: fnva.ps1 is in bin/, binary is in platforms/
+    (Join-Path $scriptDir "..\platforms\$platformDir\fnva.exe"),
+    # Local dev build
+    (Join-Path $scriptDir "..\target\release\fnva.exe")
+)
+
+function Invoke-FnvaNative {
+    param([string]$BinPath, [string[]]$CliArgs)
+
+    # For env commands, capture output and re-emit as single string
+    # to avoid PS splitting native exe output into Object[]
+    if ($CliArgs.Length -ge 2 -and $CliArgs[0] -eq 'env' -and $CliArgs[1] -eq 'env') {
+        $output = & $BinPath @CliArgs 2>$null
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        $output -join "`n"
+        return
+    }
+
+    # For switch commands, also capture to avoid Object[] issues
+    if ($CliArgs.Length -ge 3 -and $CliArgs[1] -eq 'use') {
+        $output = & $BinPath @CliArgs 2>$null
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        $output -join "`n"
+        return
+    }
+
+    # Other commands: pass through directly
+    & $BinPath @CliArgs
     exit $LASTEXITCODE
 }
 
-# Fallback: local dev build
-$devPath = Join-Path $scriptDir "..\target\release\fnva.exe"
-if (Test-Path $devPath) {
-    & $devPath @args
-    exit $LASTEXITCODE
+foreach ($binaryPath in $searchPaths) {
+    if (Test-Path $binaryPath) {
+        Invoke-FnvaNative -BinPath $binaryPath -CliArgs $args
+        return
+    }
 }
 
 # Last resort: node wrapper
-$nodeScript = Join-Path $scriptDir "fnva.js"
+$nodeScript = Join-Path $scriptDir "node_modules\fnva\bin\fnva.js"
+if (-not (Test-Path $nodeScript)) {
+    $nodeScript = Join-Path $scriptDir "fnva.js"
+}
 if (Test-Path $nodeScript) {
     & node $nodeScript @args
     exit $LASTEXITCODE

package/package.json

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