@clawos-dev/clawd 0.2.488 → 0.2.489

package/dist/cli.cjs

@@ -48974,11 +48974,14 @@ var SessionManager = class {
    * 该群的专属 guest session，turn-idle 后从 reducer buffer 提取回复文本。
    *
    * 跟 createShiftSession 的差异：
-   *   - **find-or-create**：按 capId `lark-<chatId>` 找现存 session（一群一条，D3），
-   *     没有才建；daemon `create` 的无 dedupe 语义不变——dedupe 是本方法私有实现
+   *   - **find-or-create**：按 capId `lark-<chatId>` 找现存 session，没有才建；daemon
+   *     `create` 的无 dedupe 语义不变——dedupe 是本方法私有实现。
+   *     粒度由云端给的 chatId 决定，daemon 只当它是不透明 key：群消息是虚拟三段式
+   *     `<真实 chat_id>:<thread_id>:<open_id>`（spec 2026-09-10，一话题一人一条），
+   *     p2p 是裸 chat_id，文档评论是 `doc:<fileToken>`
    *   - guest scope + 沙箱：群成员 query 不带 owner 权限；10min guest idle-kill + resume
-   *   - turn-idle 后**不 kill**（session 常驻，记忆即价值）；延迟 settleDelayMs 等尾随
-   *     text 落盘（schemas.ts turn_end 注释：CC 写 turn_end 早于尾段正文）再读 buffer
+   *   - turn-idle 后**不 kill**（session 常驻，记忆即价值）；TUI 下延迟 settleDelayMs 等
+   *     尾随 text 落盘（schemas.ts turn_end 注释 ②）再读 buffer，SDK / codex 同步读
    *   - 回复提取：extractLarkReplyText（最后一条 user_text 之后的 text 事件拼接）
    */
   runLarkChatTurn(args) {
@@ -49045,21 +49048,23 @@ var SessionManager = class {
       if (!r) return;
       r.input({ kind: "command", command: { kind: "stop" } });
     };
-    const settleDelayMs = args.settleDelayMs ?? 500;
+    const settleDelayMs = args.settleDelayMs ?? (this.deps.mode === "tui" ? 500 : 0);
+    const extractAndSettle = () => {
+      try {
+        const events = this.readHistoryEventsForScope(sessionId, scope);
+        const replyText = extractLarkReplyText(events);
+        settle(replyText ? { ok: true, replyText } : { error: "empty reply" });
+      } catch (err) {
+        settle({ error: err.message });
+      }
+    };
     unsubscribe = this.subscribe(
       sessionId,
       scope,
       makeEndFrameHandler(sessionId, (info) => {
         if (info.kind === "idle") {
-          setTimeout(() => {
-            try {
-              const events = this.readHistoryEventsForScope(sessionId, scope);
-              const replyText = extractLarkReplyText(events);
-              settle(replyText ? { ok: true, replyText } : { error: "empty reply" });
-            } catch (err) {
-              settle({ error: err.message });
-            }
-          }, settleDelayMs);
+          if (settleDelayMs === 0) extractAndSettle();
+          else setTimeout(extractAndSettle, settleDelayMs);
         } else if (info.kind === "stopped") {
           settle({ error: "session stopped before reply" });
         } else {
@@ -56413,6 +56418,18 @@ init_protocol();
 var ERROR_REPLY_TEXT = "\u5904\u7406\u51FA\u9519\u4E86\uFF0C\u8BF7\u91CD\u8BD5";
 var LOCAL_TURN_RETRIES = 2;
 var STOPPED_ERROR = "session stopped before reply";
+var isChatOf = (key, realChatId) => key === realChatId || key.startsWith(`${realChatId}:`);
+var THREAD_TITLE_MAX = 20;
+var threadTitleOf = (env) => {
+  const root = env.threadContext?.[0]?.text?.trim();
+  if (!root) return void 0;
+  return root.length > THREAD_TITLE_MAX ? `${root.slice(0, THREAD_TITLE_MAX)}\u2026` : root;
+};
+var sessionNameOf = (env) => {
+  if (env.type === "doc_comment" || (env.chatType ?? "group") !== "group") return env.chatName;
+  const speaker = env.senderName || env.senderOpenId;
+  return [env.chatName, threadTitleOf(env), speaker].filter(Boolean).join("\xB7") || void 0;
+};
 var DEBOUNCE_MS = 1e3;
 var MAX_IMAGE_BYTES = 8 * 1024 * 1024;
 var EXT_BY_MIME = {
@@ -56517,9 +56534,23 @@ function createLarkChatRouter(deps) {
     if (lines.length === 0) lines.push("[\u6709\u4EBA\u5728\u98DE\u4E66\u6587\u6863\u91CC @ \u4E86\u4F60\uFF0C\u4F46\u8BC4\u8BBA\u5185\u5BB9\u62C9\u53D6\u5931\u8D25]");
     return lines.join("\n");
   };
+  const buildThreadContextSection = async (env, batchMessageIds) => {
+    const rows = (env.threadContext ?? []).filter((r) => !batchMessageIds.has(r.messageId));
+    if (rows.length === 0) return void 0;
+    const head = env.threadContextTruncated ? `[\u8BDD\u9898\u4E0A\u4E0B\u6587 \xB7 \u5171 ${rows.length} \u6761\uFF0C\u66F4\u65E9\u7684\u5DF2\u7565]` : `[\u8BDD\u9898\u4E0A\u4E0B\u6587 \xB7 \u5171 ${rows.length} \u6761]`;
+    const lines = [head];
+    for (const row of rows) {
+      lines.push(`${row.senderName}\uFF1A${row.text?.trim() ?? ""}`);
+      lines.push(...await imageLinesFor(env, row.messageId, row.imageKeys ?? []));
+      lines.push(...await fileLinesFor(env, row.messageId, row.files ?? []));
+    }
+    lines.push("---");
+    return lines.join("\n");
+  };
   const buildSection = async (env) => {
     if (env.type === "doc_comment") return buildDocCommentSection(env);
     const parentLines = env.parentMessageId ? [
+      ...env.parentText?.trim() ? [`[\u88AB\u5F15\u7528\u7684\u6D88\u606F] ${env.parentText.trim()}`] : [],
       ...await imageLinesFor(env, env.parentMessageId, env.parentImageKeys ?? []),
       ...await fileLinesFor(env, env.parentMessageId, env.parentFiles ?? [])
     ] : [];
@@ -56560,19 +56591,21 @@ ${body}
       const section = [quoteAnnotation(env, i, idxByMessageId), sectionBody].filter(Boolean).join("\n");
       if (section) sections.push(section);
     }
-    const body = sections.join("\n") || "[\u975E\u6587\u672C\u6D88\u606F]";
+    const threadSection = await buildThreadContextSection(envs[0], new Set(idxByMessageId.keys()));
+    const body = [threadSection, ...sections].filter(Boolean).join("\n") || "[\u975E\u6587\u672C\u6D88\u606F]";
     const runTurn = (text) => {
       const turn = deps.manager.runLarkChatTurn({
         personaId: last.personaId,
         chatId: last.chatId,
-        chatName: last.chatName,
+        chatName: sessionNameOf(last),
         chatType: last.chatType ?? "group",
         senderOpenId: last.senderOpenId ?? "",
         senderName: last.senderName ?? last.senderOpenId ?? "\u672A\u77E5\u6210\u5458",
         text
       });
-      activity.set(last.chatId, {
-        chatId: last.chatId,
+      const activityChatId = last.realChatId ?? last.chatId;
+      activity.set(activityChatId, {
+        chatId: activityChatId,
         chatName: last.chatName,
         lastActiveAt: Date.now(),
         personaId: last.personaId
@@ -56607,7 +56640,8 @@ ${formatLarkSpeakerReminder(speaker)}`
       try {
         await deps.cloud.reply({
           appId: last.appId,
-          chatId: last.chatId,
+          // 回复走真身：chatId 自 spec 2026-09-10 起是虚拟三段式，只作会话 key 用
+          chatId: last.realChatId ?? last.chatId,
           // envs 已过滤保证锚点非空
           replyToMessageId: replyAnchorOf(last),
           text: replyText,
@@ -56650,11 +56684,13 @@ ${formatLarkSpeakerReminder(speaker)}`
       if (env.type === "bot_removed") {
         deps.store.addRemovedChat(env.personaId, env.chatId);
         activity.delete(env.chatId);
-        queues.delete(env.chatId);
-        const p2 = pending.get(env.chatId);
-        if (p2) {
+        for (const key2 of [...queues.keys()]) {
+          if (isChatOf(key2, env.chatId)) queues.delete(key2);
+        }
+        for (const [key2, p2] of [...pending.entries()]) {
+          if (!isChatOf(key2, env.chatId)) continue;
           clearTimeout(p2.timer);
-          pending.delete(env.chatId);
+          pending.delete(key2);
         }
         deps.logger?.info(`larkBot removed from chat ${env.chatId} (persona ${env.personaId})`);
         return;
@@ -65428,7 +65464,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.488".length > 0 ? "0.2.488" : "dev";
+var version = "0.2.489".length > 0 ? "0.2.489" : "dev";
 
 // src/cli-probe/probe.ts
 var fs72 = __toESM(require("fs"), 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.488",
+  "version": "0.2.489",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",