chatccc 0.2.163 → 0.2.165

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.163",
+  "version": "0.2.165",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/orchestrator.ts

@@ -177,39 +177,47 @@ function updLog(msg: string): void {
   try { appendFileSync(UPDATEG_LOG, `${ts} [UPG-SYNC] ${msg}\n`, "utf-8"); } catch {}
 }
 
-/** 同步更新 npm 全局包并重启（父进程存活等待，避免 systemd KillMode=control-group 杀 watcher） */
+/** 同步更新 npm 全局包。不自行 spawn 新进程，而是 exit(1) 让 systemd Restart=on-failure 拉起新版本。 */
 function syncUpdateAndRestart(): void {
   updLog(`sync update start, pid=${process.pid}`);
+  appendStartupTrace("updateg: sync update start", { pid: process.pid });
 
-  // 1. npm update
   const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+
+  // 1. npm update
+  updLog(`running: ${npmCmd} update -g chatccc`);
+  appendStartupTrace("updateg: npm update begin", { npmCmd });
+  const t0 = Date.now();
   try {
-    const out = execSync(`${npmCmd} update -g chatccc`, { encoding: "utf8", timeout: 120000, windowsHide: true });
-    updLog(`npm update OK: ${out.slice(0, 200)}`);
+    const out = execSync(`${npmCmd} update -g chatccc 2>&1`, { encoding: "utf8", timeout: 120000, windowsHide: true });
+    const elapsed = Date.now() - t0;
+    updLog(`npm update OK (${elapsed}ms): ${out.slice(0, 500)}`);
+    appendStartupTrace("updateg: npm update OK", { elapsedMs: elapsed, outputLen: out.length });
   } catch (e) {
-    const errMsg = (e as Error).message;
-    updLog(`npm update failed: ${errMsg}, falling back to npm install`);
+    const elapsed = Date.now() - t0;
+    const err = e as Error & { stderr?: string; stdout?: string; status?: number };
+    updLog(`npm update failed (${elapsed}ms): message=${err.message}, stderr=${(err.stderr || "").slice(0, 500)}, stdout=${(err.stdout || "").slice(0, 200)}`);
+    appendStartupTrace("updateg: npm update failed", { elapsedMs: elapsed, message: err.message, stderrLen: (err.stderr || "").length });
+
+    // fallback
+    updLog(`fallback: ${npmCmd} install -g chatccc@latest`);
+    appendStartupTrace("updateg: npm install fallback begin", { npmCmd });
+    const t1 = Date.now();
     try {
-      const out2 = execSync(`${npmCmd} install -g chatccc@latest`, { encoding: "utf8", timeout: 120000, windowsHide: true });
-      updLog(`npm install fallback OK: ${out2.slice(0, 200)}`);
+      const out2 = execSync(`${npmCmd} install -g chatccc@latest 2>&1`, { encoding: "utf8", timeout: 120000, windowsHide: true });
+      const elapsed2 = Date.now() - t1;
+      updLog(`npm install fallback OK (${elapsed2}ms): ${out2.slice(0, 500)}`);
+      appendStartupTrace("updateg: npm install fallback OK", { elapsedMs: elapsed2, outputLen: out2.length });
     } catch (e2) {
-      updLog(`npm install fallback also failed: ${(e2 as Error).message}`);
+      const elapsed2 = Date.now() - t1;
+      const err2 = e2 as Error & { stderr?: string; stdout?: string };
+      updLog(`npm install fallback also failed (${elapsed2}ms): message=${err2.message}, stderr=${(err2.stderr || "").slice(0, 500)}`);
+      appendStartupTrace("updateg: npm install fallback failed", { elapsedMs: elapsed2, message: err2.message });
     }
   }
 
-  // 2. spawn new chatccc
-  const npmPrefix = process.env.NPM_PREFIX || "";
-  const binName = process.platform === "win32" ? "chatccc.cmd" : "chatccc";
-  const binPath = npmPrefix ? join(npmPrefix, binName) : "chatccc";
-  try {
-    const child = spawn(binPath, [], { detached: true, stdio: "ignore", shell: true });
-    child.unref();
-    updLog(`spawn new chatccc OK, childPid=${child.pid}, bin=${binPath}`);
-  } catch (e) {
-    updLog(`spawn new chatccc failed: ${(e as Error).message}`);
-  }
-
-  updLog("sync update done, parent exiting in 2s");
+  updLog("sync update done, exiting with code 1 to trigger systemd restart");
+  appendStartupTrace("updateg: sync update done, will exit(1) for systemd restart", { pid: process.pid });
 }
 
 // ---------------------------------------------------------------------------
@@ -267,7 +275,9 @@ export async function handleCommand(
 
   if (textLower === "/updateg") {
     logTrace(tid, "BRANCH", { cmd: "/updateg" });
-    if (!isRunningFromGlobalNpm()) {
+    const isGlobal = isRunningFromGlobalNpm();
+    appendStartupTrace("updateg: command received", { isGlobal, chatId });
+    if (!isGlobal) {
       await platform.sendText(chatId, "当前进程非 npm 全局安装，无法使用 /updateg 更新。请通过 npm install -g chatccc 安装后使用。").catch(() => {});
       logTrace(tid, "DONE", { outcome: "updateg_not_global" });
       return;
@@ -276,7 +286,11 @@ export async function handleCommand(
     logTrace(tid, "DONE", { outcome: "updateg" });
     appendStartupTrace("updateg: sync update begin", { fromPid: process.pid });
     syncUpdateAndRestart();
-    setTimeout(() => process.exit(0), 2000);
+    // exit(1) 而非 exit(0)：systemd KillMode=control-group 下，exit(0) 会让
+    // systemd 判定服务正常结束并清理整个 cgroup（杀死刚 spawn 的子进程）。
+    // exit(1) 触发 Restart=on-failure，由 systemd 重新拉起 ExecStart，此时
+    // npm 已更新到新版本，服务正常重启。
+    setTimeout(() => process.exit(1), 2000);
     return;
   }