ccus-cli 0.2.29 → 0.2.30

package/dist/lib/codex-fetcher.js

@@ -20,6 +20,7 @@ const paths_1 = require("./paths");
 // app-server 子进程参数：read-only + never，避免新版 Codex 拒绝已移除的 untrusted 审批策略。
 const CODEX_ARGS = ["-s", "read-only", "-a", "never", "app-server"];
 const DEFAULT_TIMEOUT_MS = 10_000;
+const CLEANUP_TIMEOUT_MS = 2_000;
 // notify 每 turn 触发，额度缓存 5 分钟，命中秒回避免阻塞 Codex 主流程。
 const DEFAULT_TTL_MS = 5 * 60 * 1000;
 // ChatGPT 后端 wham/usage 回退：app-server 未返回可用额度时走，直连读 auth.json 的 OAuth token。
@@ -187,6 +188,38 @@ const defaultSpawn = (command, args, options) => {
     const merged = process.platform === "win32" ? { ...options, shell: true } : options;
     return (0, node_child_process_1.spawn)(command, args, merged);
 };
+/** Windows 必须先清理整棵树，再关闭管道；先杀 shell 会失去后代进程的关联。 */
+async function cleanupCodexChild(child, kill) {
+    try {
+        if (kill) {
+            if (process.platform === "win32" && child.pid !== undefined) {
+                await new Promise((resolve, reject) => {
+                    (0, node_child_process_1.execFile)("taskkill.exe", ["/PID", String(child.pid), "/T", "/F"], {
+                        windowsHide: true,
+                        timeout: CLEANUP_TIMEOUT_MS,
+                    }, (error) => error ? reject(error) : resolve());
+                });
+            }
+            else {
+                child.kill();
+            }
+        }
+    }
+    catch (error) {
+        (0, debug_1.debugLog)("codex", "process cleanup failed", error instanceof Error ? error.message : String(error));
+        try {
+            child.kill();
+        }
+        catch { /* 清理失败不覆盖查询结果。 */ }
+    }
+    finally {
+        // 即使 taskkill 失败，也不让后代继承的管道或进程句柄阻塞 Hook 退出。
+        child.stdin.destroy();
+        child.stdout.destroy();
+        child.stderr.destroy();
+        child.unref();
+    }
+}
 /**
  * spawn `codex app-server` 走 JSON-RPC 握手 + `account/rateLimits/read` 拉额度。
  *
@@ -220,16 +253,12 @@ async function fetchCodexQuota(options = {}) {
                 clearTimeout(timer);
                 timer = null;
             }
-            // settled 标志已保证 resolve 幂等，无需再手动摘 listener；kill 终止子进程后其 stdio 自然关闭。
-            if (kill && child) {
-                try {
-                    child.kill();
-                }
-                catch {
-                    // kill 失败不影响结果。
-                }
+            if (child) {
+                void cleanupCodexChild(child, kill).then(() => resolve(outcome));
+            }
+            else {
+                resolve(outcome);
             }
-            resolve(outcome);
         };
         try {
             child = spawnFn("codex", CODEX_ARGS, {
@@ -247,17 +276,30 @@ async function fetchCodexQuota(options = {}) {
             (0, debug_1.debugLog)("codex", "rpc timeout", { timeoutMs });
             finish(empty("error"), true);
         }, timeoutMs);
+        // 管道错误（例如清理期间的 EPIPE）是异步事件，不能仅靠 write 的 try/catch。
+        for (const stream of [child.stdin, child.stdout, child.stderr]) {
+            stream.on("error", (error) => {
+                (0, debug_1.debugLog)("codex", "stdio error", error.message);
+                finish(empty("error"), true);
+            });
+        }
+        child.stderr.resume();
         const send = (message) => {
+            if (settled)
+                return;
             try {
                 child?.stdin.write(message);
             }
             catch (error) {
                 (0, debug_1.debugLog)("codex", "stdin write failed", error instanceof Error ? error.message : String(error));
+                finish(empty("error"), true);
             }
         };
         const initId = (rpcId += 1);
         send(buildRpcMessage(initId, "initialize", { clientInfo: { name: "ccus", version: "1.0.0" } }));
         child.stdout.on("data", (chunk) => {
+            if (settled)
+                return;
             buffer += chunk.toString();
             let newline;
             while ((newline = buffer.indexOf("\n")) !== -1) {
@@ -292,13 +334,14 @@ async function fetchCodexQuota(options = {}) {
                     const quota = parseRateLimitsResult(message.result);
                     (0, debug_1.debugLog)("codex", "quota parsed", quota);
                     finish({ ...quota, status: "ok" }, true);
+                    return;
                 }
             }
         });
         child.on("error", (err) => {
             const enoent = err.code === "ENOENT";
             (0, debug_1.debugLog)("codex", "spawn error", { code: err.code, message: err.message });
-            finish(empty(enoent ? "unavailable" : "error"));
+            finish(empty(enoent ? "unavailable" : "error"), true);
         });
         child.on("close", (code) => {
             (0, debug_1.debugLog)("codex", "app-server exited before quota", { code });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.2.29",
+  "version": "0.2.30",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {