@gaiaworks/gaia-cli 0.3.9 → 0.4.0

package/package.json

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

package/scripts/install-wizard.js

@@ -8,22 +8,22 @@ 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 npmInvocation(args) {
-  if (process.platform === 'win32') {
-    const npmCli = process.env.npm_execpath || path.join(
-      path.dirname(process.execPath),
-      'node_modules',
-      'npm',
-      'bin',
-      'npm-cli.js'
-    );
-    return { command: process.execPath, args: [npmCli, ...args] };
-  }
-  return { command: 'npm', args };
-}
+const binaryPath = path.join(__dirname, '..', 'bin', binaryName());
+const shellPathMarker = '# Added by gaia-cli installer';
+
+function npmInvocation(args) {
+  if (process.platform === 'win32') {
+    const npmCli = process.env.npm_execpath || path.join(
+      path.dirname(process.execPath),
+      'node_modules',
+      'npm',
+      'bin',
+      'npm-cli.js'
+    );
+    return { command: process.execPath, args: [npmCli, ...args] };
+  }
+  return { command: 'npm', args };
+}
 
 function parseInstallArgs(args) {
   let mode = 'external';
@@ -80,24 +80,24 @@ function runCapture(command, args) {
   });
 }
 
-function npmGlobalBinDir() {
-  const npm = npmInvocation(['prefix', '-g']);
-  const result = runCapture(npm.command, npm.args);
+function npmGlobalBinDir() {
+  const npm = npmInvocation(['prefix', '-g']);
+  const result = runCapture(npm.command, npm.args);
   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) {
+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 setupCommandPath(packageBinary) {
-  return packageBinary;
-}
+}
+
+function setupCommandPath(packageBinary) {
+  return packageBinary;
+}
 
 function pathContains(dir) {
   if (!dir) return false;
@@ -142,10 +142,10 @@ 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);
+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') : '';
@@ -164,14 +164,21 @@ function installWizard(args) {
   const { explicitMode, mode, npmArgs } = parseInstallArgs(args);
   if (npmArgs.length > 0) {
     throw new Error(`Unsupported install arguments: ${npmArgs.join(' ')}`);
-  }
-
-  ensureLocalBinary();
-  const npm = npmInvocation(['install', '-g', packageSpec]);
-  run(npm.command, npm.args);
-  const globalBinDir = npmGlobalBinDir();
-  const setupCommand = setupCommandPath(binaryPath);
-  run(setupCommand, ['setup', '--mode', mode], { stdio: 'ignore' });
+  }
+
+  ensureLocalBinary();
+  const npm = npmInvocation(['install', '-g', packageSpec]);
+  run(npm.command, npm.args);
+  const globalBinDir = npmGlobalBinDir();
+  const setupCommand = setupCommandPath(binaryPath);
+  console.error('[gaia-cli] 正在安装 Gaia Skill: gaia-shared...');
+  try {
+    run(setupCommand, ['setup', '--mode', mode], { stdio: 'ignore' });
+  } catch (error) {
+    console.error('[gaia-cli] gaia-shared 安装失败。');
+    throw error;
+  }
+  console.error('[gaia-cli] ✓ Gaia Skill gaia-shared 安装完成。');
   const profilePath = ensurePathConfigured(globalBinDir);
   const suffix = explicitMode ? `当前模式: ${mode}。` : '';
   if (profilePath && globalBinDir && !pathContains(globalBinDir)) {
@@ -198,13 +205,13 @@ if (require.main === module) {
 module.exports = {
   ensurePathConfigured,
   ensureWindowsPathConfigured,
-  npmGlobalBinDir,
-  npmGlobalCommandPath,
-  npmInvocation,
+  npmGlobalBinDir,
+  npmGlobalCommandPath,
+  npmInvocation,
   pathContains,
   pathExportBlock,
-  shellProfilePath,
-  setupCommandPath,
+  shellProfilePath,
+  setupCommandPath,
   installWizard,
   parseInstallArgs,
 };