@gaiaworks/gaia-cli 0.4.7 → 0.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaiaworks/gaia-cli",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "JavaScript launcher for gaia-cli.",
   "license": "UNLICENSED",
   "private": false,

package/scripts/install-wizard.js

@@ -115,45 +115,54 @@ function shellProfilePath(env = process.env) {
   return path.join(home, '.profile');
 }
 
-function ensureWindowsPathConfigured(binDir) {
-  if (!binDir || process.platform !== 'win32' || pathContains(binDir)) return null;
-  const command = [
-    "$dir = $args[0]",
-    "$current = [Environment]::GetEnvironmentVariable('Path', 'User')",
-    "if (-not $current) { $current = '' }",
-    "$parts = $current -split ';' | Where-Object { $_ }",
-    "if ($parts -notcontains $dir) {",
-    "  $next = (@($dir) + $parts) -join ';'",
-    "  [Environment]::SetEnvironmentVariable('Path', $next, 'User')",
-    "}",
-  ].join("; ");
-  const result = spawnSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command, binDir], {
-    stdio: ["ignore", "pipe", "pipe"],
-    encoding: "utf8",
-  });
+function ensureWindowsPathConfigured(binDir, options = {}) {
+  const platform = options.platform || process.platform;
+  const spawn = options.spawnSync || spawnSync;
+  if (!binDir || platform !== 'win32') return null;
+  const command = [
+    "$dir = $env:GAIA_CLI_PATH_DIR",
+    "$current = [Environment]::GetEnvironmentVariable('Path', 'User')",
+    "if (-not $current) { $current = '' }",
+    "$parts = $current -split ';' | Where-Object { $_ }",
+    "$normalize = { param($value) [Environment]::ExpandEnvironmentVariables($value.Trim().Trim([char]34).TrimEnd([char[]]'\\/')) }",
+    "$target = & $normalize $dir",
+    "$exists = @($parts | Where-Object { (& $normalize $_) -ieq $target }).Count -gt 0",
+    "if (-not $exists) {",
+    "  $next = (@($dir) + $parts) -join ';'",
+    "  [Environment]::SetEnvironmentVariable('Path', $next, 'User')",
+    "  Write-Output '[gaia-cli:path-updated]'",
+    "} else {",
+    "  Write-Output '[gaia-cli:path-unchanged]'",
+    "}",
+  ].join("; ");
+  const result = spawn("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf8",
+    env: { ...process.env, GAIA_CLI_PATH_DIR: binDir },
+  });
   if (result.error || result.status !== 0) {
-    const detail = result.error ? result.error.message : `${result.stdout || ""}${result.stderr || ""}`.trim();
-    throw new Error(`Failed to update user PATH: ${detail}`);
-  }
-  return "Windows user PATH";
+    const detail = result.error ? result.error.message : `${result.stdout || ""}${result.stderr || ""}`.trim();
+    throw new Error(`Failed to update user PATH: ${detail}`);
+  }
+  return (result.stdout || '').includes('[gaia-cli:path-updated]') ? 'Windows user PATH' : null;
 }
 
 function pathExportBlock(binDir) {
   return `${shellPathMarker}\nexport PATH="${binDir}:$PATH"\n`;
 }
 
-function ensurePathConfigured(binDir, profilePath = shellProfilePath(), platform = process.platform) {
-  if (!binDir) return null;
-  if (platform === 'win32') {
-    return ensureWindowsPathConfigured(binDir);
-  }
-  if (!profilePath || pathContains(binDir)) return null;
-  const existing = fs.existsSync(profilePath) ? fs.readFileSync(profilePath, 'utf8') : '';
-  if (existing.includes(binDir) || existing.includes(shellPathMarker)) return profilePath;
-  const prefix = existing && !existing.endsWith('\n') ? '\n' : '';
-  fs.appendFileSync(profilePath, `${prefix}${pathExportBlock(binDir)}`);
-  return profilePath;
-}
+function ensurePathConfigured(binDir, profilePath = shellProfilePath(), platform = process.platform) {
+  if (!binDir) return null;
+  if (platform === 'win32') {
+    return ensureWindowsPathConfigured(binDir);
+  }
+  if (!profilePath) return null;
+  const existing = fs.existsSync(profilePath) ? fs.readFileSync(profilePath, 'utf8') : '';
+  if (existing.includes(binDir)) return null;
+  const prefix = existing && !existing.endsWith('\n') ? '\n' : '';
+  fs.appendFileSync(profilePath, `${prefix}${pathExportBlock(binDir)}`);
+  return profilePath;
+}
 
 function ensureLocalBinary() {
   if (fs.existsSync(binaryPath)) return;
@@ -181,7 +190,7 @@ function installWizard(args) {
   console.error('[gaia-cli] ✓ Gaia 内置 Skill 安装完成。');
   const profilePath = ensurePathConfigured(globalBinDir);
   const suffix = explicitMode ? `当前模式: ${mode}。` : '';
-  if (profilePath && globalBinDir && !pathContains(globalBinDir)) {
+  if (profilePath && globalBinDir) {
     console.error(`[gaia-cli] 安装完成，${suffix}已更新 PATH 配置: ${profilePath}`);
     console.error(`[gaia-cli] 重新打开终端后可以执行: gaia version`);
     return;