fnva 0.0.48 → 0.0.50

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/package.json

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

package/scripts/install-shell-integration.js

@@ -18,15 +18,24 @@ function detectShell() {
   return process.env.SHELL?.split('/').pop() || 'bash';
 }
 
+function getPowershellProfilePath() {
+  const home = process.env.USERPROFILE || os.homedir();
+  // Check PowerShell 7 first (pwsh), then fall back to Windows PowerShell 5.x
+  const ps7Profile = path.join(home, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1');
+  const ps5Profile = path.join(home, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1');
+  // If PS7 profile already exists, use it; otherwise prefer PS7 path
+  if (fs.existsSync(ps7Profile)) return ps7Profile;
+  if (fs.existsSync(ps5Profile)) return ps5Profile;
+  // Detect which PowerShell is installed via pwsh vs powershell
+  const pwshResult = spawnSync('pwsh', ['-NoProfile', '-Command', 'echo true'], { timeout: 5000 });
+  if (pwshResult.status === 0) return ps7Profile;
+  return ps5Profile;
+}
+
 function getShellConfigPath(shell) {
   switch (shell) {
     case 'powershell':
-      return path.join(
-        process.env.USERPROFILE || os.homedir(),
-        'Documents',
-        'WindowsPowerShell',
-        'Microsoft.PowerShell_profile.ps1'
-      );
+      return getPowershellProfilePath();
     case 'bash':
       return path.join(os.homedir(), '.bashrc');
     case 'zsh':