aico-cli 0.4.8 → 0.5.0

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.8";
+const version = "0.5.0";
 
 function displayBanner(subtitle) {
   const defaultSubtitle = "\u4E00\u952E\u914D\u7F6E\u4F60\u7684\u5F00\u53D1\u73AF\u5883";

package/dist/cli.mjs

@@ -47,39 +47,6 @@ 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;
-    }
-  }
   /**
    * 启动进程
    */
@@ -88,12 +55,7 @@ class ProcessManager extends EventEmitter {
     const processName = options.name || command;
     this.log(`\u542F\u52A8\u8FDB\u7A0B: ${processName}`, "info");
     try {
-      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(platformCommand, args, {
+      const child = spawn(command, args, {
         cwd: options.cwd || process.cwd(),
         env: { ...process.env, ...options.env },
         stdio: options.stdio || "pipe",
@@ -129,25 +91,13 @@ class ProcessManager extends EventEmitter {
       const exitCode = await new Promise((resolve, reject) => {
         child.on("close", (code) => {
           if (timeoutId) clearTimeout(timeoutId);
-          if (child.pid) {
-            this.unregisterProcess(child.pid);
-          }
+          this.unregisterProcess(child.pid);
           resolve(code ?? 0);
         });
         child.on("error", (error) => {
           if (timeoutId) clearTimeout(timeoutId);
-          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);
+          this.unregisterProcess(child.pid);
+          reject(error);
         });
       });
       const duration = Date.now() - startTime;
@@ -180,12 +130,6 @@ ${commandInfo}`);
   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)) {
@@ -229,10 +173,6 @@ ${commandInfo}`);
    * 注销进程
    */
   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");
@@ -306,20 +246,14 @@ ${commandInfo}`);
    * 清理所有进程
    */
   cleanup() {
-    const isWindows = process.platform === "win32";
-    if (isWindows) {
-      this.cleanupWindowsProcesses();
-    }
     for (const [pid, info] of this.processes) {
       if (info.status === "running") {
         try {
-          const signal = isWindows ? "SIGTERM" : "SIGKILL";
-          info.process.kill(signal);
+          info.process.kill("SIGKILL");
         } catch {
         }
       }
     }
-    this.cleanupZombieProcesses();
     this.processes.clear();
   }
   /**
@@ -396,81 +330,38 @@ ${commandInfo}`);
     return report;
   }
   /**
-   * 强制清理僵尸进程（状态为运行中但实际已退出的进程）
-   */
-  cleanupZombieProcesses() {
-    let cleanedCount = 0;
-    const runningProcesses = this.getRunningProcessList();
-    const isWindows = process.platform === "win32";
-    this.log(`\u5F00\u59CB\u6E05\u7406\u50F5\u5C38\u8FDB\u7A0B\uFF0C\u5F53\u524D\u8FD0\u884C\u4E2D\u8FDB\u7A0B\u6570: ${runningProcesses.length}`, "info");
-    for (const process2 of runningProcesses) {
-      try {
-        process2.process.kill(0);
-        if (isWindows) {
-          if (process2.process.exitCode !== null) {
-            this.log(`\u6E05\u7406Windows\u50F5\u5C38\u8FDB\u7A0B: ${process2.name} (PID: ${process2.pid})`, "warning");
-            this.unregisterProcess(process2.pid);
-            cleanedCount++;
-          }
-        }
-      } catch (error) {
-        this.log(`\u6E05\u7406\u50F5\u5C38\u8FDB\u7A0B: ${process2.name} (PID: ${process2.pid})`, "warning");
-        this.unregisterProcess(process2.pid);
-        cleanedCount++;
-      }
-    }
-    if (cleanedCount > 0) {
-      this.log(`\u6E05\u7406\u4E86 ${cleanedCount} \u4E2A\u50F5\u5C38\u8FDB\u7A0B`, "info");
-    }
-    return cleanedCount;
-  }
-  /**
-   * 深度清理进程，包括可能的残留进程
+   * 获取适用于当前平台的命令路径
    */
-  deepCleanup() {
+  getPlatformCommand(command) {
     const isWindows = process.platform === "win32";
-    let totalCleaned = 0;
-    this.log("\u5F00\u59CB\u6DF1\u5EA6\u6E05\u7406\u8FDB\u7A0B...", "info");
-    totalCleaned += this.cleanupZombieProcesses();
     if (isWindows) {
-      totalCleaned += this.cleanupWindowsProcesses();
-    }
-    const remainingProcesses = this.getProcessCount();
-    if (remainingProcesses > 0) {
-      this.log(`\u5F3A\u5236\u6E05\u7406\u5269\u4F59\u7684 ${remainingProcesses} \u4E2A\u8FDB\u7A0B`, "warning");
-      this.cleanup();
-      totalCleaned += remainingProcesses;
+      const commandMappings = {
+        "npm": "npm.cmd",
+        "npx": "npx.cmd",
+        "node": "node.exe",
+        "claude": "claude.cmd"
+      };
+      return commandMappings[command] || command;
     }
-    this.log(`\u6DF1\u5EA6\u6E05\u7406\u5B8C\u6210\uFF0C\u603B\u5171\u6E05\u7406\u4E86 ${totalCleaned} \u4E2A\u8FDB\u7A0B`, "info");
-    return totalCleaned;
+    return command;
   }
   /**
-   * Windows平台特定的进程清理
-   * 针对Windows的进程管理特点进行优化
+   * 强制清理僵尸进程（状态为运行中但实际已退出的进程）
    */
-  cleanupWindowsProcesses() {
-    const isWindows = process.platform === "win32";
-    if (!isWindows) {
-      return 0;
-    }
+  cleanupZombieProcesses() {
     let cleanedCount = 0;
     const runningProcesses = this.getRunningProcessList();
-    this.log("\u6267\u884CWindows\u5E73\u53F0\u7279\u5B9A\u8FDB\u7A0B\u6E05\u7406...", "info");
     for (const process2 of runningProcesses) {
       try {
-        if (process2.process.exitCode !== null) {
-          this.log(`\u6E05\u7406Windows\u8FDB\u7A0B: ${process2.name} (PID: ${process2.pid})`, "warning");
-          this.unregisterProcess(process2.pid);
-          cleanedCount++;
-        }
+        process2.process.kill(0);
       } catch (error) {
-        this.log(`\u5F3A\u5236\u6E05\u7406Windows\u8FDB\u7A0B: ${process2.name} (PID: ${process2.pid})`, "error");
+        this.log(`\u6E05\u7406\u50F5\u5C38\u8FDB\u7A0B: ${process2.name} (PID: ${process2.pid})`, "warning");
         this.unregisterProcess(process2.pid);
         cleanedCount++;
       }
     }
     if (cleanedCount > 0) {
-      this.log(`Windows\u5E73\u53F0\u6E05\u7406\u4E86 ${cleanedCount} \u4E2A\u8FDB\u7A0B`, "info");
+      this.log(`\u6E05\u7406\u4E86 ${cleanedCount} \u4E2A\u50F5\u5C38\u8FDB\u7A0B`, "info");
     }
     return cleanedCount;
   }
@@ -486,52 +377,47 @@ ${commandInfo}`);
    */
   async replaceProcess(command, args = [], options = {}) {
     const processName = options.name || command;
-    const isWindows = process.platform === "win32";
     try {
       this.cleanup();
       const { spawn: spawn2 } = await import('node:child_process');
-      const finalCommand = this.getPlatformCommand(command);
-      const finalArgs = args;
-      const child = spawn2(finalCommand, finalArgs, {
+      const isWindows = process.platform === "win32";
+      let finalCommand = this.getPlatformCommand(command);
+      let finalArgs = args;
+      const spawnOptions = {
         stdio: "inherit",
         // 继承所有 stdio
         cwd: options.cwd || process.cwd(),
         env: { ...process.env, ...options.env },
-        shell: false,
-        // 禁用shell模式，避免进程泄漏
-        // Windows上使用更严格的进程控制
         windowsHide: isWindows
         // Windows上隐藏子进程窗口
-      });
+      };
+      if (isWindows) {
+        if (finalCommand.endsWith(".cmd")) {
+          spawnOptions.shell = true;
+          const fullCommand = `${finalCommand} ${finalArgs.join(" ")}`;
+          finalCommand = fullCommand;
+          finalArgs = [];
+        } else {
+          spawnOptions.shell = false;
+        }
+      } else {
+        spawnOptions.shell = false;
+      }
+      const child = spawn2(finalCommand, finalArgs, spawnOptions);
       child.on("error", (error) => {
         this.log(`\u8FDB\u7A0B\u66FF\u6362\u5931\u8D25: ${error}`, "error");
-        this.cleanup();
         process.exit(1);
       });
       child.on("exit", (code) => {
         this.log(`\u66FF\u6362\u8FDB\u7A0B\u5DF2\u9000\u51FA\uFF0C\u9000\u51FA\u7801: ${code}`, "info");
-        this.cleanup();
         process.exit(code || 0);
       });
       this.registerProcess(child, processName);
-      if (isWindows) {
-        const checkInterval = setInterval(() => {
-          if (child.exitCode !== null) {
-            clearInterval(checkInterval);
-            this.cleanup();
-            process.exit(child.exitCode || 0);
-          }
-        }, 1e3);
-        child.on("exit", () => {
-          clearInterval(checkInterval);
-        });
-      }
       await new Promise(() => {
       });
       process.exit(0);
     } catch (error) {
       this.log(`\u8FDB\u7A0B\u66FF\u6362\u5931\u8D25: ${error}`, "error");
-      this.cleanup();
       process.exit(1);
     }
   }
@@ -646,15 +532,15 @@ promisify$1(exec$1);
 promisify$1(exec$1);
 
 async function tryStartClaude(command, args, options) {
-  const isWindows = process.platform === "win32";
-  await processManager.replaceProcess(command, args, {
+  process.platform === "win32";
+  const spawnOptions = {
     name: "Claude Code",
-    cwd: options.cwd,
-    stdio: "inherit",
+    cwd: options.cwd || process.cwd(),
+    stdio: "inherit"
     // 必须继承 stdio 才能正确交互
-    shell: isWindows ? false : options.shell
-    // Windows上禁用shell避免进程泄漏
-  });
+    // shell选项由processManager内部处理
+  };
+  await processManager.replaceProcess(command, args, spawnOptions);
 }
 async function startClaudeCodeEditor(_lang) {
   try {
@@ -670,7 +556,7 @@ async function startClaudeCodeEditor(_lang) {
     };
     try {
       const command = isWindows ? "claude.cmd" : "claude";
-      const args = ["--dangerously-skip-permissions"];
+      const args = [];
       if (isWindows) {
         await tryStartClaude(command, args, spawnOptions);
       } else {
@@ -681,7 +567,7 @@ async function startClaudeCodeEditor(_lang) {
       if (firstError.code === "ENOENT") {
         console.log(ansis.yellow("\u26A0\uFE0F  \u76F4\u63A5\u8C03\u7528 claude \u5931\u8D25\uFF0C\u5C1D\u8BD5\u4F7F\u7528 npx..."));
         try {
-          const npxArgs = ["@anthropic-ai/claude-code", "--dangerously-skip-permissions"];
+          const npxArgs = ["@anthropic-ai/claude-code"];
           if (isWindows) {
             await tryStartClaude("npx.cmd", npxArgs, spawnOptions);
           } else {

package/package.json

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