@gaiaworks/gaia-cli 0.0.3 → 0.0.5

package/README.md

@@ -14,17 +14,17 @@ npx @gaiaworks/gaia-cli version
 
 ```bash
 npx @gaiaworks/gaia-cli@latest install
-gaia-cli version
+gaia version
 ```
 
 安装模式：
 
 ```bash
 npx @gaiaworks/gaia-cli@latest install
-npx @gaiaworks/gaia-cli@latest install --mode saas
-npx @gaiaworks/gaia-cli@latest install --mode work
+npx @gaiaworks/gaia-cli@latest install --mode external
+npx @gaiaworks/gaia-cli@latest install --mode internal
 ```
 
-未指定 `--mode` 时默认写入 `saas`。安装脚本会在全局安装完成后执行 `gaia-cli config set mode <saas|work>`，用于后续区分内部/外部登录流程和 shared skill 规则。
+未指定 `--mode` 时默认写入 `external`。安装脚本会执行 `gaia setup --mode <external|internal>`，用于初始化本地 `install_mode` 和 Agent Skills。
 
 安装时会根据 npm 包版本，从 OSS 的同版本目录下载当前平台对应的 `gaia-cli` 二进制。

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@gaiaworks/gaia-cli",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "JavaScript launcher for gaia-cli.",
   "license": "UNLICENSED",
   "private": false,
   "bin": {
-    "gaia-cli": "scripts/run.js"
+    "gaia": "scripts/run.js"
   },
   "os": [
     "darwin",

package/scripts/install-wizard.js

@@ -9,9 +9,10 @@ const { binaryName, install } = require('./install');
 const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'));
 const packageSpec = `${packageJson.name}@${packageJson.version}`;
 const binaryPath = path.join(__dirname, '..', 'bin', binaryName());
+const shellPathMarker = '# Added by gaia-cli installer';
 
 function parseInstallArgs(args) {
-  let mode = 'saas';
+  let mode = 'external';
   let explicitMode = false;
   const npmArgs = [];
 
@@ -20,7 +21,7 @@ function parseInstallArgs(args) {
     if (arg === '--mode') {
       const value = args[i + 1];
       if (!value) {
-        throw new Error('--mode requires a value: work or saas');
+        throw new Error('--mode requires a value: external or internal');
       }
       mode = value;
       explicitMode = true;
@@ -35,8 +36,8 @@ function parseInstallArgs(args) {
     npmArgs.push(arg);
   }
 
-  if (mode !== 'work' && mode !== 'saas') {
-    throw new Error(`Unsupported mode: ${mode}. Expected work or saas.`);
+  if (mode !== 'external' && mode !== 'internal') {
+    throw new Error(`Unsupported mode: ${mode}. Expected external or internal.`);
   }
 
   return { explicitMode, mode, npmArgs };
@@ -45,6 +46,7 @@ function parseInstallArgs(args) {
 function run(command, args, options = {}) {
   const result = spawnSync(command, args, {
     stdio: options.stdio || 'inherit',
+    encoding: 'utf8',
   });
 
   if (result.error) {
@@ -57,6 +59,83 @@ function run(command, args, options = {}) {
   }
 }
 
+function runCapture(command, args) {
+  return spawnSync(command, args, {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    encoding: 'utf8',
+  });
+}
+
+function npmGlobalBinDir() {
+  const result = runCapture('npm', ['prefix', '-g']);
+  if (result.error || result.status !== 0) return null;
+  const prefix = result.stdout.trim();
+  if (!prefix) return null;
+  return process.platform === 'win32' ? prefix : path.join(prefix, 'bin');
+}
+
+function npmGlobalCommandPath(binDir, platform = process.platform) {
+  if (!binDir) return null;
+  if (platform === 'win32') return path.win32.join(binDir, 'gaia.cmd');
+  return path.posix.join(binDir, 'gaia');
+}
+
+function pathContains(dir) {
+  if (!dir) return false;
+  const entries = (process.env.PATH || '').split(path.delimiter).filter(Boolean);
+  return entries.some((entry) => path.resolve(entry) === path.resolve(dir));
+}
+
+function shellProfilePath(env = process.env) {
+  if (process.platform === 'win32') return null;
+  const home = env.HOME;
+  if (!home) return null;
+  const shell = path.basename(env.SHELL || '');
+  if (shell === 'zsh') return path.join(home, '.zshrc');
+  if (shell === 'bash') return path.join(home, '.bashrc');
+  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",
+  });
+  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";
+}
+
+function pathExportBlock(binDir) {
+  return `${shellPathMarker}\nexport PATH="${binDir}:$PATH"\n`;
+}
+
+function ensurePathConfigured(binDir, profilePath = shellProfilePath()) {
+  if (!binDir) return null;
+  if (process.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 ensureLocalBinary() {
   if (fs.existsSync(binaryPath)) return;
   install();
@@ -70,11 +149,21 @@ function installWizard(args) {
 
   ensureLocalBinary();
   run('npm', ['install', '-g', packageSpec]);
-  run(binaryPath, ['config', 'set', 'mode', mode], { stdio: 'ignore' });
+  const globalBinDir = npmGlobalBinDir();
+  const globalCommand = npmGlobalCommandPath(globalBinDir);
+  const setupCommand = globalCommand && fs.existsSync(globalCommand) ? globalCommand : binaryPath;
+  run(setupCommand, ['setup', '--mode', mode], { stdio: 'ignore' });
+  const profilePath = ensurePathConfigured(globalBinDir);
+  const suffix = explicitMode ? `当前模式: ${mode}。` : '';
+  if (profilePath && globalBinDir && !pathContains(globalBinDir)) {
+    console.error(`[gaia-cli] 安装完成，${suffix}已更新 PATH 配置: ${profilePath}`);
+    console.error(`[gaia-cli] 重新打开终端后可以执行: gaia version`);
+    return;
+  }
   if (explicitMode) {
-    console.error(`[gaia-cli] 安装完成，当前模式: ${mode}。可以执行: gaia-cli version`);
+    console.error(`[gaia-cli] 安装完成，当前模式: ${mode}。可以执行: gaia version`);
   } else {
-    console.error('[gaia-cli] 安装完成。可以执行: gaia-cli version');
+    console.error('[gaia-cli] 安装完成。可以执行: gaia version');
   }
 }
 
@@ -88,6 +177,13 @@ if (require.main === module) {
 }
 
 module.exports = {
+  ensurePathConfigured,
+  ensureWindowsPathConfigured,
+  npmGlobalBinDir,
+  npmGlobalCommandPath,
+  pathContains,
+  pathExportBlock,
+  shellProfilePath,
   installWizard,
   parseInstallArgs,
 };