chatccc 0.2.156 → 0.2.158

package/package.json

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

package/src/agent-stop-stuck.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
 
 import { readUtf8JsonBody } from "./agent-rpc-body.ts";
-import { activePrompts, getChatsForSession, cancelQueuedMessage } from "./session-chat-binding.ts";
+import { activePrompts, getChatsForSession } from "./session-chat-binding.ts";
 import { getPlatformForChat } from "./session.ts";
 import { readStreamState, writeStreamState } from "./stream-state.ts";
 import { ts } from "./config.ts";
@@ -78,8 +78,8 @@ export async function handleAgentStopStuckRequest(
     }
   }
 
-  // 丢弃缓存队列中的消息
-  cancelQueuedMessage(sessionId);
+  // 不丢弃缓存队列中的消息，让 runAgentSession 的 finally 块正常消费，
+  // 确保 stop-stuck-loop 结束后排队的消息仍能被正常处理。
 
   const finalReply = typeof body?.final_reply === "string" ? body.final_reply.trim() : "";
 

package/src/session.ts

@@ -167,15 +167,15 @@ function formatTerminalHeader(status: "running" | "done" | "stopped" | "error"):
   return { title: "完成" };
 }
 
-function turnFinalStatus(status: "running" | "done" | "stopped" | "error"): "done" | "stopped" {
-  return status === "stopped" || status === "error" ? "stopped" : "done";
-}
-
-function isCardKitSequenceConflict(err: unknown): boolean {
-  return err instanceof Error && err.message.includes("300317");
-}
-
-function startPromptProcessMonitor(sessionId: string, info: ToolProcessInfo): void {
+function turnFinalStatus(status: "running" | "done" | "stopped" | "error"): "done" | "stopped" {
+  return status === "stopped" || status === "error" ? "stopped" : "done";
+}
+
+function isCardKitSequenceConflict(err: unknown): boolean {
+  return err instanceof Error && err.message.includes("300317");
+}
+
+function startPromptProcessMonitor(sessionId: string, info: ToolProcessInfo): void {
   const prompt = activePrompts.get(sessionId);
   if (!prompt) return;
   prompt.processPid = info.pid;
@@ -1161,11 +1161,11 @@ export async function runAgentSession(
     // 标记 prompt 结束
     resourceMonitor.off("stuck", onResourceStuck);
     const prompt = activePrompts.get(sessionId);
-    const wasStopped = prompt?.stopped ?? false;
-    const wasAbnormalExit = prompt?.abnormalExit ?? false;
-    const wasResourceStuck = prompt?.resourceStuck ?? false;
-    clearPromptProcessMonitor(sessionId);
-    activePrompts.delete(sessionId);
+    const wasStopped = prompt?.stopped ?? false;
+    const wasAbnormalExit = prompt?.abnormalExit ?? false;
+    const wasResourceStuck = prompt?.resourceStuck ?? false;
+    clearPromptProcessMonitor(sessionId);
+    activePrompts.delete(sessionId);
 
     // 先写最终状态（done/stopped），确保 display loop 在下一轮消费前
     // 读到新状态并终结旧卡片。否则 setImmediate 在 CHECK 阶段先于
@@ -1175,14 +1175,19 @@ export async function runAgentSession(
     const finalReply = pickFinalReply(state).trim();
 
     // stop-stuck-loop 接口可能在 fire-and-forget 中已写入带 final_reply 的
-    // stream state，finally 不应覆盖它。
-    let finalReplyToWrite = finalReply;
-    try {
-      const existing = await readStreamState(sessionId);
-      if (existing && existing.finalReply.length > finalReply.length) {
-        finalReplyToWrite = existing.finalReply;
-      }
-    } catch {}
+    // stream state，finally 不应覆盖它。同时保留 stuckAt 标记，防止
+    // stop-stuck-loop 结束后 session 被错误恢复。
+    let finalReplyToWrite = finalReply;
+    let preserveStuckAt: number | undefined;
+    try {
+      const existing = await readStreamState(sessionId);
+      if (existing) {
+        if (existing.finalReply.length > finalReply.length) {
+          finalReplyToWrite = existing.finalReply;
+        }
+        preserveStuckAt = existing.stuckAt;
+      }
+    } catch {}
 
     await writeStreamState({
       sessionId,
@@ -1191,11 +1196,12 @@ export async function runAgentSession(
       finalReply: finalReplyToWrite,
       chunkCount: state.chunkCount,
       turnCount: nextTurnCount,
-      contextTokens: existingInfo?.lastContextTokens ?? 0,
-      updatedAt: Date.now(),
-      cwd,
-      tool,
-    });
+      contextTokens: existingInfo?.lastContextTokens ?? 0,
+      updatedAt: Date.now(),
+      cwd,
+      tool,
+      ...(preserveStuckAt ? { stuckAt: preserveStuckAt } : {}),
+    });
 
     // 消费队列中的缓存消息（异步，不阻塞后续清理）
     // 用户 /stop 后应丢弃队列消息，避免用户停止后又自动开始新轮
@@ -1360,42 +1366,42 @@ export function startUnifiedDisplayLoop(): void {
               displayCards.delete(chatId);
             } else {
               // 发送最终结果（卡片平台）
-              while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
-              const promptStillActive = activePrompts.has(sessionId);
-              if (
-                promptStillActive &&
-                display.lastSentAccLen === state.accumulatedContent.length &&
-                display.lastSentFinalReply === state.finalReply
-              ) {
-                continue;
-              }
-              const nextSeq = display.sequence + 1;
+              while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
+              const promptStillActive = activePrompts.has(sessionId);
+              if (
+                promptStillActive &&
+                display.lastSentAccLen === state.accumulatedContent.length &&
+                display.lastSentFinalReply === state.finalReply
+              ) {
+                continue;
+              }
+              const nextSeq = display.sequence + 1;
               const { title: headerTitle, template: headerTemplate } = formatTerminalHeader(state.status);
               const cardContent = truncateContent(state.accumulatedContent + state.finalReply) || " ";
               const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
-              let terminalCardUpdateAccepted = false;
-              await p.cardUpdate(display.cardId, doneCard, nextSeq).then(() => {
-                display.sequence = nextSeq;
-                terminalCardUpdateAccepted = true;
-              }).catch(err => {
-                console.error(`[${ts()}] [DISPLAY] terminal cardUpdate failed: ${(err as Error).message}`);
-                if (isCardKitSequenceConflict(err)) {
-                  display.sequence = nextSeq;
-                  terminalCardUpdateAccepted = true;
-                }
-              });
+              let terminalCardUpdateAccepted = false;
+              await p.cardUpdate(display.cardId, doneCard, nextSeq).then(() => {
+                display.sequence = nextSeq;
+                terminalCardUpdateAccepted = true;
+              }).catch(err => {
+                console.error(`[${ts()}] [DISPLAY] terminal cardUpdate failed: ${(err as Error).message}`);
+                if (isCardKitSequenceConflict(err)) {
+                  display.sequence = nextSeq;
+                  terminalCardUpdateAccepted = true;
+                }
+              });
 
               // 若 session 仍在 activePrompts 中，说明 runAgentSession 的 finally
               // 还没执行，当前 stream state 可能是 stopSession fire-and-forget
               // 写入的，finalReply 滞后于内存态。卡片已更新为终态外观，但不发送
               // 文本、不删除 display 条目，留给 finally 落盘后的下一次 tick 处理。
-              if (promptStillActive) {
-                if (terminalCardUpdateAccepted) {
-                  display.lastSentAccLen = state.accumulatedContent.length;
-                  display.lastSentFinalReply = state.finalReply;
-                }
-                continue;
-              }
+              if (promptStillActive) {
+                if (terminalCardUpdateAccepted) {
+                  display.lastSentAccLen = state.accumulatedContent.length;
+                  display.lastSentFinalReply = state.finalReply;
+                }
+                continue;
+              }
 
               const finalSt = turnFinalStatus(state.status);
               finalizeTurnCards(sessionId, state.turnCount, finalSt).catch(() => {});

package/src/web-ui.ts

@@ -158,6 +158,30 @@ function spawnService(): { ok: boolean; pid?: number; error?: string } {
   }
 }
 
+/**
+ * 安排一次真正的进程重启：先回复 HTTP 请求，再 spawn 一个延迟启动的子进程，
+ * 然后退出当前进程。延迟是为了让当前进程完全退出并释放端口。
+ */
+function scheduleRestart(): void {
+  const indexPath = join(PROJECT_ROOT, "src", "index.ts");
+  if (!existsSync(indexPath)) return;
+  if (process.platform === "win32") {
+    // Windows: ping 作为 sleep（ping 自己 3 次 ≈ 2 秒延迟）
+    spawn("cmd.exe", ["/c", "ping -n 3 127.0.0.1 > nul && npx tsx src/index.ts"], {
+      cwd: PROJECT_ROOT,
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+    }).unref();
+  } else {
+    spawn("bash", ["-c", "sleep 2 && npx tsx src/index.ts"], {
+      cwd: PROJECT_ROOT,
+      detached: true,
+      stdio: "ignore",
+    }).unref();
+  }
+}
+
 function stopService(): { ok: boolean; error?: string } {
   const pid = getServicePid();
   if (!pid) return { ok: false, error: "No PID file found" };
@@ -396,23 +420,10 @@ async function handleStartService(_req: IncomingMessage, res: ServerResponse): P
   }
 
   if (path === "reload") {
-    // service 已经在跑（通常就是当前进程自己）。仅把磁盘上刚保存的 config.json
-    // 刷进进程内的 export let 常量，不走真重启。下次创建会话时新值即生效。
-    if (!reloadConfigHook) {
-      // 没注册 reload hook 视为编程错误：index.ts 必须在 main() 里调用
-      // setReloadConfigHook()；返回 500 让前端有提示，避免静默"看似生效但没生效"。
-      jsonReply(res, 500, {
-        ok: false,
-        error: "reload hook 未注册（应在 main() 调用 setReloadConfigHook）",
-      });
-      return;
-    }
-    try {
-      await reloadConfigHook();
-      jsonReply(res, 200, { ok: true, pid: process.pid, mode: "reload" });
-    } catch (err) {
-      jsonReply(res, 500, { ok: false, error: (err as Error).message });
-    }
+    // service 已经在跑，执行真正的进程重启让所有配置（含 WSClient domain）生效
+    jsonReply(res, 200, { ok: true, pid: process.pid, mode: "restart" });
+    scheduleRestart();
+    process.exit(0);
     return;
   }
 
@@ -437,14 +448,10 @@ async function handleStopService(req: IncomingMessage, res: ServerResponse): Pro
   });
 }
 
-async function handleRestartService(req: IncomingMessage, res: ServerResponse): Promise<void> {
+async function handleRestartService(_req: IncomingMessage, res: ServerResponse): Promise<void> {
   jsonReply(res, 200, { ok: true, message: "Restarting..." });
-  setImmediate(() => {
-    stopService();
-    setTimeout(() => {
-      spawnService();
-    }, 1000);
-  });
+  scheduleRestart();
+  process.exit(0);
 }
 
 async function handleValidate(req: IncomingMessage, res: ServerResponse): Promise<void> {
@@ -1309,20 +1316,20 @@ async function saveAndStart() {
   document.getElementById('btn-save-start').innerHTML = '<span class="spinner"></span> 应用中...';
   var result = await api('/api/start', 'POST');
   if (result.ok) {
-    // 后端按 mode 区分场景，前端给出更贴切的 toast：
-    //   - inplace：setup → service 首次激活，进程内启动飞书 service
-    //   - reload ：service 已经在跑，仅刷新进程内 config（不真重启）
-    //   - spawn  ：旧 service 已退出，spawn 新子进程
     var msg;
-    if (result.mode === 'reload') {
-      msg = '配置已保存并生效（无须重启）';
+    if (result.mode === 'restart') {
+      msg = '配置已保存，服务正在重启…';
     } else if (result.mode === 'inplace') {
       msg = '服务已启动! PID: ' + result.pid;
     } else {
       msg = '服务已启动! PID: ' + (result.pid || '?');
     }
     toast(msg);
-    setTimeout(function(){ location.reload(); }, 1500);
+    if (result.mode === 'restart') {
+      pollUntilRunning();
+    } else {
+      setTimeout(function(){ location.reload(); }, 1500);
+    }
   } else {
     toast('保存失败: ' + (result.error || '未知错误'), 'error');
     document.getElementById('btn-save-start').disabled = false;
@@ -1458,16 +1465,21 @@ async function restartService() {
   if (!confirm('确定要重启服务吗？')) return;
   document.getElementById('btn-restart').disabled = true;
   document.getElementById('btn-restart').textContent = '重启中...';
-  await api('/api/start', 'POST');
-  // Wait and refresh
-  setTimeout(async function(){
-    var s = await api('/api/status');
-    state.running = s.running;
-    state.pid = s.pid;
-    updateDashboardUI();
-    document.getElementById('btn-restart').disabled = false;
-    document.getElementById('btn-restart').textContent = '重启';
-  }, 2000);
+  await api('/api/restart', 'POST');
+  pollUntilRunning();
+}
+
+async function pollUntilRunning() {
+  for (var i = 0; i < 30; i++) {
+    await new Promise(function(r) { setTimeout(r, 1000); });
+    try {
+      var s = await api('/api/status');
+      if (s.running) { location.reload(); return; }
+    } catch(e) {}
+  }
+  toast('重启超时，请在终端手动运行 chatccc', 'error');
+  document.getElementById('btn-restart').disabled = false;
+  document.getElementById('btn-restart').textContent = '重启';
 }
 
 // ---- Edit Modal ----
@@ -1602,6 +1614,7 @@ async function handleRequest(req: IncomingMessage, res: ServerResponse): Promise
   if (url === "/api/status" && method === "GET") return handleGetStatus(req, res);
   if (url === "/api/start" && method === "POST") return handleStartService(req, res);
   if (url === "/api/stop" && method === "POST") return handleStopService(req, res);
+  if (url === "/api/restart" && method === "POST") return handleRestartService(req, res);
   if (url === "/api/validate" && method === "POST") return handleValidate(req, res);
   if (url === "/api/ilink/forget" && method === "POST") return handleForgetIlink(req, res);