chatccc 0.2.281 → 0.2.282

package/README.md

@@ -448,6 +448,8 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 `/restart safe`（短别名 `/restartsf`）与 `/update safe`（短别名 `/updatesf`）会先建立全局准入门禁：指令到达前已经运行或进入单会话缓存队列的工作会继续完成，之后到达的新普通任务会被提示在维护完成后重发。维护任务持久化到 `~/.chatccc/state/safe-maintenance.json`，进程意外退出后可继续排空；依赖安装、会话收尾、自动恢复和 Agent Teams 执行也计入等待条件。内存缓存随重启自然重建，磁盘会话、看板、图片等持久数据不会被清理。
 
 ChatCCC 的内部重启和更新使用跨平台父子进程握手：替代进程完成启动预检后通知父进程退出，再等待旧监听端口实际释放并接管 PID；替代进程未就绪或握手超时时，父进程会保留并继续服务。
+
+飞书接收长连接启用 15 秒握手超时和 30 秒心跳应答超时；首次启动最多等待 45 秒真实连接确认后才提示就绪。运行期间连接持续异常 90 秒时，会关闭并重新建立接收连接，保留会话、消息去重和正在执行的任务。没有用户消息不会触发重连。连接状态与恢复记录写入运行日志和 `startup-trace.log`（`FEISHU-CONNECTION` / `feishu-connection`）。卡片更新遇到网络失败或序号冲突时不会当成送达成功，错误通知保留文本兜底；TLS 断线会明确显示为网络连接失败，已中断的 Agent 任务不会因此自动重放。
 
 > **模型切换**：`/model` 查看当前会话 Agent 的可选模型清单，`/model <名称>` 模糊匹配切换，`/model clear` 恢复默认。可选模型来自当前 Agent 的配置：Claude 使用 `claude.model` / `claude.subagentModel`；Cursor、Codex、CCC Agent 和 DSH 使用各自的 `model` / `alternativeModel`。
 

package/dist/src/cardkit.js

@@ -103,7 +103,31 @@ export async function streamCardKitElement(token, cardId, elementId, content, se
     // success log is intentionally sparse — uncomment to debug streaming throughput
     // console.log(`[${ts()}] [CARDIKT] streamElement OK cardId=${cardId} seq=${sequence}`);
 }
-export async function updateCardKitCard(token, cardId, cardJson, sequence) {
+// Keep bounded per-card sequence history; never reuse an attempted sequence
+// because a failed fetch can mean the response (not the update) was lost.
+const cardUpdateQueues = new Map();
+export function updateCardKitCard(token, cardId, cardJson, sequence) {
+    let state = cardUpdateQueues.get(cardId);
+    if (!state) {
+        for (const [key, candidate] of cardUpdateQueues) {
+            if (cardUpdateQueues.size < 512)
+                break;
+            if (candidate.pending === 0)
+                cardUpdateQueues.delete(key);
+        }
+        state = { sequence: 0, tail: Promise.resolve(), pending: 0 };
+        cardUpdateQueues.set(cardId, state);
+    }
+    const queue = state;
+    queue.pending++;
+    const result = queue.tail.then(async () => {
+        queue.sequence = Math.max(sequence, queue.sequence + 1);
+        await performCardKitUpdate(token, cardId, cardJson, queue.sequence);
+    });
+    queue.tail = result.catch(() => { }).finally(() => { queue.pending--; });
+    return result;
+}
+async function performCardKitUpdate(token, cardId, cardJson, sequence) {
     const { resp, respText } = await fetchCardKit(`${BASE_URL}/cardkit/v1/cards/${cardId}`, {
         method: "PUT",
         headers: {

package/dist/src/feishu-connection.js

@@ -0,0 +1,144 @@
+import { sanitizeTerminalErrorDetail } from "./terminal-error.js";
+/** Owns only the receiving transport. It never resets sessions or replays tasks. */
+export function createFeishuConnectionSupervisor(options) {
+    const stalledAfterMs = options.stalledAfterMs ?? 90_000;
+    let stopped = false;
+    let client;
+    let timer;
+    let startupTimer;
+    let startup;
+    let resolveStartup;
+    let rejectStartup;
+    let unhealthySince;
+    let lastState = "idle";
+    let connected = false;
+    let launching = false;
+    let lastAttempt = 0;
+    const log = (event, detail) => {
+        try {
+            options.log(event, detail);
+        }
+        catch { /* diagnostics cannot break recovery */ }
+    };
+    const reportError = (error) => {
+        if (stopped)
+            return;
+        connected = false;
+        unhealthySince ??= Date.now();
+        log("connection error", { reason: sanitizeTerminalErrorDetail(error instanceof Error ? error.message : String(error)) });
+    };
+    const becameConnected = () => {
+        if (stopped) {
+            // A handshake already in flight can finish after close(); never resurrect
+            // a transport belonging to a stopped setup attempt or shutting-down app.
+            try {
+                client?.close({ force: true });
+            }
+            catch { /* best effort */ }
+            return;
+        }
+        if (connected)
+            return;
+        connected = true;
+        unhealthySince = undefined;
+        lastState = "connected";
+        log("connected");
+        if (startupTimer)
+            clearTimeout(startupTimer);
+        resolveStartup?.();
+        resolveStartup = undefined;
+        rejectStartup = undefined;
+        void Promise.resolve().then(() => stopped ? undefined : options.onConnected()).catch((error) => {
+            log("binding recovery failed", { reason: sanitizeTerminalErrorDetail(String(error)) });
+        });
+    };
+    const stop = () => {
+        if (stopped)
+            return;
+        stopped = true;
+        if (timer)
+            clearInterval(timer);
+        if (startupTimer)
+            clearTimeout(startupTimer);
+        try {
+            client?.close({ force: true });
+        }
+        catch { /* best effort shutdown */ }
+        rejectStartup?.(new Error("飞书长连接在就绪前已停止"));
+        resolveStartup = undefined;
+        rejectStartup = undefined;
+        log("stopped");
+    };
+    const launch = () => {
+        if (stopped || launching || !client)
+            return;
+        launching = true;
+        lastAttempt = Date.now();
+        unhealthySince = lastAttempt;
+        void Promise.resolve().then(() => stopped ? undefined : client.start())
+            .catch(reportError).finally(() => { launching = false; });
+    };
+    const check = () => {
+        if (stopped || !client)
+            return;
+        try {
+            const status = client.getConnectionStatus();
+            if (status.state !== lastState) {
+                lastState = status.state;
+                log("state", { ...status });
+            }
+            if (status.state === "connected") {
+                becameConnected();
+                return;
+            }
+            connected = false;
+            unhealthySince ??= Date.now();
+            // SDK gets a bounded chance to recover. Silence from users is irrelevant.
+            if (launching || Date.now() - unhealthySince < stalledAfterMs
+                || Date.now() - lastAttempt < stalledAfterMs)
+                return;
+            log("restarting receiving connection", { ...status, disconnectedForMs: Date.now() - unhealthySince });
+            client.close({ force: true });
+            launch();
+        }
+        catch (error) {
+            reportError(error);
+        }
+    };
+    const start = () => {
+        if (startup)
+            return startup;
+        if (stopped)
+            return Promise.reject(new Error("飞书长连接已停止"));
+        startup = new Promise((resolve, reject) => { resolveStartup = resolve; rejectStartup = reject; });
+        startupTimer = setTimeout(() => {
+            rejectStartup?.(new Error("飞书长连接握手超时，尚未收到连接成功确认"));
+            rejectStartup = undefined;
+            stop();
+        }, options.startupTimeoutMs ?? 45_000);
+        try {
+            client = options.createClient({
+                onReady: becameConnected,
+                onReconnected: becameConnected,
+                onReconnecting() {
+                    if (stopped)
+                        return;
+                    connected = false;
+                    unhealthySince ??= Date.now();
+                    log("reconnecting");
+                },
+                onError: reportError,
+            });
+            timer = setInterval(check, options.checkIntervalMs ?? 10_000);
+            timer.unref();
+            launch();
+        }
+        catch (error) {
+            rejectStartup?.(error instanceof Error ? error : new Error(String(error)));
+            rejectStartup = undefined;
+            stop();
+        }
+        return startup;
+    };
+    return { start, stop };
+}

package/dist/src/index.js

@@ -23,6 +23,7 @@
  */
 import { createServer } from "node:http";
 import { WSClient, EventDispatcher, Domain } from "@larksuiteoapi/node-sdk";
+import { createFeishuConnectionSupervisor } from "./feishu-connection.js";
 import WebSocket from "ws";
 import { appendStartupTrace, attachRelayWebSocket, ensureSingleInstance, freeRelayListenPort, installCrashLogging, installEpipeGuard, waitForPortFree } from "./shared.js";
 import { createUiRouter, setExtraApiHandler, setReloadConfigHook, startSetupMode } from "./web-ui.js";
@@ -256,6 +257,7 @@ async function startBotService(opts) {
         throw err;
     }
 }
+let feishuConnection;
 async function startBotServiceCore() {
     const modeTag = USE_LOCAL ? " (local relay mode)" : "";
     console.log(`${"=".repeat(60)}`);
@@ -420,20 +422,33 @@ async function startBotServiceCore() {
         //   - 已处理消息的去重 set 必须保留,避免 SDK 重推老消息时 prompt 跑两遍
         // 历史 bug:此处曾误调 resetState() 导致重连即让所有后台任务变孤儿,
         // 同一 session 还可能双开 prompt(详见 session.ts::resetState 注释)。
-        const wsClient = new WSClient({
-            appId: APP_ID,
-            appSecret: APP_SECRET,
-            domain: FEISHU_PLATFORM_TYPE === "lark" ? Domain.Lark : Domain.Feishu,
-            onReady: async () => {
-                await rebuildBindingsFromRegistry().catch((err) => console.error(`[${ts()}] [SDK READY] rebuild bindings failed: ${err.message}`));
+        feishuConnection?.stop();
+        feishuConnection = createFeishuConnectionSupervisor({
+            createClient(callbacks) {
+                const client = new WSClient({
+                    appId: APP_ID,
+                    appSecret: APP_SECRET,
+                    domain: FEISHU_PLATFORM_TYPE === "lark" ? Domain.Lark : Domain.Feishu,
+                    autoReconnect: true,
+                    handshakeTimeoutMs: 15_000,
+                    wsConfig: { pingTimeout: 30 },
+                    ...callbacks,
+                });
+                return {
+                    start: () => client.start({ eventDispatcher }),
+                    close: (options) => client.close(options),
+                    getConnectionStatus: () => client.getConnectionStatus(),
+                };
             },
-            onReconnected: async () => {
-                await rebuildBindingsFromRegistry().catch((err) => console.error(`[${ts()}] [SDK RECONNECT] rebuild bindings failed: ${err.message}`));
+            onConnected: rebuildBindingsFromRegistry,
+            log(event, detail) {
+                appendStartupTrace(`feishu-connection: ${event}`, detail);
+                console.log(`[${ts()}] [FEISHU-CONNECTION] ${event}${detail ? ` ${JSON.stringify(detail)}` : ""}`);
             },
         });
         console.log(`\n[启动 6/7] 飞书长连接：正在通过 SDK 建立 WebSocket …`);
         try {
-            await wsClient.start({ eventDispatcher });
+            await feishuConnection.start();
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -790,6 +805,7 @@ function installShutdownHandlers(httpServer, serviceLifecycle) {
     process.on("SIGINT", () => {
         console.log("\nShutting down...");
         serviceLifecycle.beginShutdown("SIGINT");
+        feishuConnection?.stop();
         wechatSignal.stopped = true;
         stopChromeDevtoolsGuard();
         httpServer.close();
@@ -797,6 +813,7 @@ function installShutdownHandlers(httpServer, serviceLifecycle) {
     });
     process.on("SIGTERM", () => {
         serviceLifecycle.beginShutdown("SIGTERM");
+        feishuConnection?.stop();
         wechatSignal.stopped = true;
         stopChromeDevtoolsGuard();
         httpServer.close();

package/dist/src/session.js

@@ -1785,7 +1785,6 @@ export function startUnifiedDisplayLoop() {
                                         console.error(`[${ts()}] [DISPLAY] terminal cardUpdate failed: ${err.message}`);
                                         if (isCardKitSequenceConflict(err)) {
                                             display.sequence = nextSeq;
-                                            terminalCardUpdateAccepted = true;
                                         }
                                     });
                                     if (terminalCardUpdateAccepted) {
@@ -1943,6 +1942,8 @@ export function startUnifiedDisplayLoop() {
                                     catch (err) {
                                         const errMsg = err.message;
                                         console.error(`[${ts()}] CardKit update error: chatId=${chatId} ${errMsg}`);
+                                        display.lastSentContent = "";
+                                        display.lastSentHeaderTitle = "";
                                         if (errMsg.includes("300317")) {
                                             display.sequence = mySeq;
                                         }
@@ -1977,6 +1978,8 @@ export function startUnifiedDisplayLoop() {
                                 catch (err) {
                                     const errMsg = err.message;
                                     console.error(`[${ts()}] CardKit update error: chatId=${chatId} ${errMsg}`);
+                                    display.lastSentContent = "";
+                                    display.lastSentHeaderTitle = "";
                                     if (errMsg.includes("300317")) {
                                         display.sequence = mySeq;
                                     }

package/dist/src/terminal-error.js

@@ -64,7 +64,7 @@ export function classifyTerminalError(error, occurredAt = Date.now()) {
             occurredAt,
         };
     }
-    if (/econnrefused|econnreset|enotfound|eai_again|socket hang up|network error|cannot connect/.test(lower)) {
+    if (/econnrefused|econnreset|enotfound|eai_again|socket hang up|network error|cannot connect|tls handshake|before secure tls connection|stream disconnected before completion|websocket closed/.test(lower)) {
         return {
             kind: "network",
             title: "无法连接模型服务",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.281",
+  "version": "0.2.282",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
@@ -53,7 +53,7 @@
   "dependencies": {
     "@ai-sdk/anthropic": "^3.0.105",
     "@ai-sdk/openai-compatible": "^2.0.47",
-    "@larksuiteoapi/node-sdk": "^1.59.0",
+    "@larksuiteoapi/node-sdk": "^1.66.1",
     "@openilink/openilink-sdk-node": "^0.6.0",
     "@vscode/ripgrep": "^1.18.0",
     "ai": "^6.0.184",