aico-cli 0.4.6 → 0.4.8

package/dist/chunks/simple-config.mjs

@@ -13,7 +13,7 @@ import { join as join$1 } from 'node:path';
 import { join, dirname, basename } from 'pathe';
 import { fileURLToPath } from 'node:url';
 
-const version = "0.4.6";
+const version = "0.4.8";
 
 function displayBanner(subtitle) {
   const defaultSubtitle = "\u4E00\u952E\u914D\u7F6E\u4F60\u7684\u5F00\u53D1\u73AF\u5883";

package/dist/cli.mjs

@@ -47,32 +47,57 @@ class ProcessManager extends EventEmitter {
       this.cleanup();
     });
   }
+  /**
+   * 获取适用于当前平台的命令路径
+   */
+  getPlatformCommand(command) {
+    const isWindows = process.platform === "win32";
+    if (isWindows) {
+      const commandMappings = {
+        "npm": "npm.cmd",
+        "npx": "npx.cmd",
+        "node": "node.exe",
+        "claude": "claude.cmd"
+      };
+      return commandMappings[command] || command;
+    }
+    return command;
+  }
+  /**
+   * 检查命令是否存在
+   */
+  async checkCommandExists(command) {
+    try {
+      const { execSync } = await import('node:child_process');
+      const isWindows = process.platform === "win32";
+      if (isWindows) {
+        execSync(`where ${command}`, { stdio: "ignore" });
+      } else {
+        execSync(`which ${command}`, { stdio: "ignore" });
+      }
+      return true;
+    } catch {
+      return false;
+    }
+  }
   /**
    * 启动进程
    */
   async spawn(command, args = [], options = {}) {
     const startTime = Date.now();
     const processName = options.name || command;
-    const isWindows = process.platform === "win32";
     this.log(`\u542F\u52A8\u8FDB\u7A0B: ${processName}`, "info");
     try {
-      let finalCommand = command;
-      let finalArgs = args;
-      if (isWindows) {
-        if (command === "npx") {
-          finalCommand = "npx.cmd";
-        } else if (command === "claude") {
-          finalCommand = "claude.cmd";
-        }
+      const platformCommand = this.getPlatformCommand(command);
+      const commandExists = await this.checkCommandExists(platformCommand);
+      if (!commandExists) {
+        throw new Error(`\u547D\u4EE4 '${platformCommand}' \u4E0D\u5B58\u5728\uFF0C\u8BF7\u786E\u4FDD\u5DF2\u5B89\u88C5\u5E76\u6DFB\u52A0\u5230PATH\u73AF\u5883\u53D8\u91CF`);
       }
-      const child = spawn(finalCommand, finalArgs, {
+      const child = spawn(platformCommand, args, {
         cwd: options.cwd || process.cwd(),
         env: { ...process.env, ...options.env },
         stdio: options.stdio || "pipe",
-        shell: false,
-        // 禁用shell模式，避免进程泄漏
-        windowsHide: isWindows
-        // Windows上隐藏子进程窗口
+        shell: options.shell || process.platform === "win32"
       });
       this.registerProcess(child, processName);
       let timeoutId;
@@ -104,13 +129,25 @@ class ProcessManager extends EventEmitter {
       const exitCode = await new Promise((resolve, reject) => {
         child.on("close", (code) => {
           if (timeoutId) clearTimeout(timeoutId);
-          this.unregisterProcess(child.pid);
+          if (child.pid) {
+            this.unregisterProcess(child.pid);
+          }
           resolve(code ?? 0);
         });
         child.on("error", (error) => {
           if (timeoutId) clearTimeout(timeoutId);
-          this.unregisterProcess(child.pid);
-          reject(error);
+          if (child.pid) {
+            this.unregisterProcess(child.pid);
+          }
+          let enhancedError = error;
+          if (error.message?.includes("ENOENT")) {
+            const isWindows = process.platform === "win32";
+            const commandInfo = isWindows ? `\u547D\u4EE4 '${platformCommand}' \u4E0D\u5B58\u5728\u3002\u5728Windows\u4E0A\uFF0C\u8BF7\u786E\u4FDD\u5DF2\u5B89\u88C5Node.js\u5E76\u6DFB\u52A0\u5230PATH\u73AF\u5883\u53D8\u91CF\u3002\u5C1D\u8BD5\u4F7F\u7528\u5B8C\u6574\u8DEF\u5F84\u6216\u68C0\u67E5\u547D\u4EE4\u662F\u5426\u6B63\u786E\u3002` : `\u547D\u4EE4 '${platformCommand}' \u4E0D\u5B58\u5728\u3002\u8BF7\u786E\u4FDD\u5DF2\u5B89\u88C5\u5E76\u6DFB\u52A0\u5230PATH\u73AF\u5883\u53D8\u91CF\u3002`;
+            enhancedError = new Error(`${error.message}
+${commandInfo}`);
+            enhancedError.stack = error.stack;
+          }
+          reject(enhancedError);
         });
       });
       const duration = Date.now() - startTime;
@@ -143,6 +180,12 @@ class ProcessManager extends EventEmitter {
   registerProcess(child, name) {
     if (!child.pid) {
       this.log(`\u65E0\u6CD5\u6CE8\u518C\u8FDB\u7A0B ${name}: \u6CA1\u6709PID`, "error");
+      child.on("close", (code) => {
+        this.log(`\u8FDB\u7A0B ${name} (\u65E0PID) \u5DF2\u5173\u95ED\uFF0C\u9000\u51FA\u7801: ${code}`, "info");
+      });
+      child.on("error", (error) => {
+        this.log(`\u8FDB\u7A0B ${name} (\u65E0PID) \u53D1\u751F\u9519\u8BEF: ${error}`, "error");
+      });
       return;
     }
     if (this.processes.has(child.pid)) {
@@ -186,6 +229,10 @@ class ProcessManager extends EventEmitter {
    * 注销进程
    */
   unregisterProcess(pid) {
+    if (!pid) {
+      this.log(`\u5C1D\u8BD5\u6CE8\u9500\u65E0\u6548\u7684\u8FDB\u7A0B (PID: undefined)`, "warning");
+      return;
+    }
     const info = this.processes.get(pid);
     if (info) {
       this.log(`\u6CE8\u9500\u8FDB\u7A0B: ${info.name} (PID: ${pid})`, "info");
@@ -443,15 +490,8 @@ class ProcessManager extends EventEmitter {
     try {
       this.cleanup();
       const { spawn: spawn2 } = await import('node:child_process');
-      let finalCommand = command;
-      let finalArgs = args;
-      if (isWindows) {
-        if (command === "npx") {
-          finalCommand = "npx.cmd";
-        } else if (command === "claude") {
-          finalCommand = "claude.cmd";
-        }
-      }
+      const finalCommand = this.getPlatformCommand(command);
+      const finalArgs = args;
       const child = spawn2(finalCommand, finalArgs, {
         stdio: "inherit",
         // 继承所有 stdio

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aico-cli",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "packageManager": "pnpm@9.15.9",
   "description": "AI CLI",
   "repository": {