aico-cli 0.4.6 → 0.4.9

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

package/dist/cli.mjs

@@ -53,26 +53,13 @@ class ProcessManager extends EventEmitter {
   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 child = spawn(finalCommand, finalArgs, {
+      const child = spawn(command, 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;
@@ -259,20 +246,14 @@ class ProcessManager extends EventEmitter {
    * 清理所有进程
    */
   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();
   }
   /**
@@ -354,18 +335,9 @@ class ProcessManager extends EventEmitter {
   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);
@@ -377,56 +349,6 @@ class ProcessManager extends EventEmitter {
     }
     return cleanedCount;
   }
-  /**
-   * 深度清理进程，包括可能的残留进程
-   */
-  deepCleanup() {
-    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;
-    }
-    this.log(`\u6DF1\u5EA6\u6E05\u7406\u5B8C\u6210\uFF0C\u603B\u5171\u6E05\u7406\u4E86 ${totalCleaned} \u4E2A\u8FDB\u7A0B`, "info");
-    return totalCleaned;
-  }
-  /**
-   * Windows平台特定的进程清理
-   * 针对Windows的进程管理特点进行优化
-   */
-  cleanupWindowsProcesses() {
-    const isWindows = process.platform === "win32";
-    if (!isWindows) {
-      return 0;
-    }
-    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++;
-        }
-      } catch (error) {
-        this.log(`\u5F3A\u5236\u6E05\u7406Windows\u8FDB\u7A0B: ${process2.name} (PID: ${process2.pid})`, "error");
-        this.unregisterProcess(process2.pid);
-        cleanedCount++;
-      }
-    }
-    if (cleanedCount > 0) {
-      this.log(`Windows\u5E73\u53F0\u6E05\u7406\u4E86 ${cleanedCount} \u4E2A\u8FDB\u7A0B`, "info");
-    }
-    return cleanedCount;
-  }
   /**
    * 添加进程到列表（用于测试）
    */
@@ -439,59 +361,33 @@ class ProcessManager extends EventEmitter {
    */
   async replaceProcess(command, args = [], options = {}) {
     const processName = options.name || command;
-    const isWindows = process.platform === "win32";
     try {
+      this.log(`\u6E05\u7406 ${this.processes.size} \u4E2A\u7BA1\u7406\u8FDB\u7A0B...`, "info");
       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 child = spawn2(finalCommand, finalArgs, {
+      const child = spawn2(command, args, {
         stdio: "inherit",
         // 继承所有 stdio
         cwd: options.cwd || process.cwd(),
         env: { ...process.env, ...options.env },
-        shell: false,
-        // 禁用shell模式，避免进程泄漏
-        // Windows上使用更严格的进程控制
-        windowsHide: isWindows
-        // Windows上隐藏子进程窗口
+        shell: options.shell || process.platform === "win32"
+        // 移除 detached: true，避免子进程脱离管理
+        // detached: false 是默认值，子进程会随着父进程退出而退出
       });
       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);
     }
   }

package/package.json

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