@clawos-dev/clawd 0.2.303 → 0.2.305

package/dist/cli.cjs

@@ -52240,8 +52240,18 @@ function createLarkBotCloudClient(opts) {
       await request("POST", "/api/lark-bot/reply", { ...args });
     },
     async claimEvents() {
-      const json = await request("POST", "/api/lark-bot/events/claim");
-      return json.items ?? [];
+      const json = await request("POST", "/api/lark-bot/events/claim?v=2");
+      const items = json.items ?? [];
+      return items.map((it) => {
+        const rec3 = it;
+        if (rec3 && typeof rec3 === "object" && "payload" in rec3) {
+          return {
+            status: rec3.status === "forwarded" ? "forwarded" : "received",
+            payload: rec3.payload
+          };
+        }
+        return { status: "received", payload: it };
+      });
     },
     async fetchResource(appId, messageId, fileKey, maxBytes, type) {
       const ac = new AbortController();
@@ -52285,9 +52295,9 @@ var import_node_fs27 = __toESM(require("fs"), 1);
 var import_node_path28 = __toESM(require("path"), 1);
 init_protocol();
 var ERROR_REPLY_TEXT = "\u5904\u7406\u51FA\u9519\u4E86\uFF0C\u8BF7\u91CD\u8BD5";
-var DEFAULT_TURN_TIMEOUT_MS = 10 * 60 * 1e3;
+var LOCAL_TURN_RETRIES = 2;
+var STOPPED_ERROR = "session stopped before reply";
 var DEBOUNCE_MS = 1e3;
-var CONTENT_HOLD_MS = 6e4;
 var MAX_IMAGE_BYTES = 8 * 1024 * 1024;
 var EXT_BY_MIME = {
   "image/png": "png",
@@ -52312,70 +52322,83 @@ function safeAttachmentName(raw) {
   const ext = dot > 0 && cleaned.length - dot <= 20 ? cleaned.slice(dot) : "";
   return cleaned.slice(0, 100 - ext.length) + ext;
 }
+function routeClaimedEvents(items, opts) {
+  const resume = [];
+  for (const it of items) {
+    opts.dedupe.add(it.payload.eventId);
+    const env = { ...it.payload, iat: opts.nowSec, exp: opts.nowSec + 300 };
+    if (it.status === "forwarded" && it.payload.type === "message") resume.push(env);
+    else opts.router.handleEnvelope(env);
+  }
+  if (resume.length > 0) opts.router.handleResume(resume);
+}
 function createLarkChatRouter(deps) {
-  const timeoutMs = deps.turnTimeoutMs ?? DEFAULT_TURN_TIMEOUT_MS;
   const replyDelays = deps.replyRetryDelaysMs ?? [2e3, 8e3, 3e4];
   const sleep2 = deps.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const debounceMs = deps.debounceMs ?? DEBOUNCE_MS;
-  const contentHoldMs = deps.contentHoldMs ?? CONTENT_HOLD_MS;
-  const timerMsFor = (envs) => {
-    if (envs.some((e) => e.text?.trim())) return debounceMs;
-    const hasContent = envs.some(
-      (e) => (e.imageKeys?.length ?? 0) > 0 || (e.files?.length ?? 0) > 0
-    );
-    return hasContent ? contentHoldMs : debounceMs;
-  };
   const queues = /* @__PURE__ */ new Map();
   const activity = /* @__PURE__ */ new Map();
   const pending = /* @__PURE__ */ new Map();
-  const buildSection = async (env) => {
-    const imageLines = [];
-    for (const [i, key] of (env.imageKeys ?? []).entries()) {
+  const imageLinesFor = async (env, ownerMessageId, keys) => {
+    const lines = [];
+    for (const [i, key] of keys.entries()) {
       try {
         if (!deps.fetchResource || !deps.mediaRootFor) throw new Error("resource pipeline not wired");
-        const r = await deps.fetchResource(env.appId, env.messageId, key, MAX_IMAGE_BYTES, "image");
+        const r = await deps.fetchResource(env.appId, ownerMessageId, key, MAX_IMAGE_BYTES, "image");
         if (r.data.byteLength > MAX_IMAGE_BYTES) {
           deps.logger?.warn(`larkBot image oversize ${key}: ${r.data.byteLength}B`);
-          imageLines.push(IMAGE_OVERSIZE_TEXT);
+          lines.push(IMAGE_OVERSIZE_TEXT);
           continue;
         }
         const ext = EXT_BY_MIME[r.contentType];
         if (!ext) {
           deps.logger?.warn(`larkBot image unsupported mime ${key}: ${r.contentType}`);
-          imageLines.push(IMAGE_UNAVAILABLE_TEXT);
+          lines.push(IMAGE_UNAVAILABLE_TEXT);
           continue;
         }
         const dir = deps.mediaRootFor(env.chatId);
         import_node_fs27.default.mkdirSync(dir, { recursive: true });
-        const p2 = import_node_path28.default.join(dir, `${safeMediaName(env.messageId)}-${i}.${ext}`);
+        const p2 = import_node_path28.default.join(dir, `${safeMediaName(ownerMessageId)}-${i}.${ext}`);
         import_node_fs27.default.writeFileSync(p2, r.data);
-        imageLines.push(`[\u56FE\u7247: ${p2}]\uFF08\u7528 Read \u5DE5\u5177\u67E5\u770B\uFF09`);
+        lines.push(`[\u56FE\u7247: ${p2}]\uFF08\u7528 Read \u5DE5\u5177\u67E5\u770B\uFF09`);
       } catch (err) {
         deps.logger?.warn(`larkBot image fetch failed ${key}: ${err.message}`);
-        imageLines.push(IMAGE_UNAVAILABLE_TEXT);
+        lines.push(IMAGE_UNAVAILABLE_TEXT);
       }
     }
-    const fileLines = [];
-    for (const [i, f] of (env.files ?? []).entries()) {
+    return lines;
+  };
+  const fileLinesFor = async (env, ownerMessageId, entries) => {
+    const lines = [];
+    for (const [i, f] of entries.entries()) {
       try {
         if (!deps.fetchResource || !deps.mediaRootFor) throw new Error("resource pipeline not wired");
-        const r = await deps.fetchResource(env.appId, env.messageId, f.key, MAX_FILE_BYTES, "file");
+        const r = await deps.fetchResource(env.appId, ownerMessageId, f.key, MAX_FILE_BYTES, "file");
         if (r.data.byteLength > MAX_FILE_BYTES) {
           deps.logger?.warn(`larkBot file oversize ${f.key}: ${r.data.byteLength}B`);
-          fileLines.push(FILE_OVERSIZE_TEXT(f.name));
+          lines.push(FILE_OVERSIZE_TEXT(f.name));
           continue;
         }
         const dir = deps.mediaRootFor(env.chatId);
         import_node_fs27.default.mkdirSync(dir, { recursive: true });
-        const p2 = import_node_path28.default.join(dir, `${safeMediaName(env.messageId)}-${i}-${safeAttachmentName(f.name)}`);
+        const p2 = import_node_path28.default.join(dir, `${safeMediaName(ownerMessageId)}-${i}-${safeAttachmentName(f.name)}`);
         import_node_fs27.default.writeFileSync(p2, r.data);
-        fileLines.push(`[\u6587\u4EF6: ${p2}]\uFF08\u7528 Read \u5DE5\u5177\u67E5\u770B\uFF09`);
+        lines.push(`[\u6587\u4EF6: ${p2}]\uFF08\u7528 Read \u5DE5\u5177\u67E5\u770B\uFF09`);
       } catch (err) {
         deps.logger?.warn(`larkBot file fetch failed ${f.key}: ${err.message}`);
-        fileLines.push(FILE_UNAVAILABLE_TEXT(f.name));
+        lines.push(FILE_UNAVAILABLE_TEXT(f.name));
       }
     }
-    return [env.text?.trim(), ...imageLines, ...fileLines].filter(Boolean).join("\n");
+    return lines;
+  };
+  const buildSection = async (env) => {
+    const parentLines = env.parentMessageId ? [
+      ...await imageLinesFor(env, env.parentMessageId, env.parentImageKeys ?? []),
+      ...await fileLinesFor(env, env.parentMessageId, env.parentFiles ?? [])
+    ] : [];
+    const imageLines = await imageLinesFor(env, env.messageId, env.imageKeys ?? []);
+    const fileLines = await fileLinesFor(env, env.messageId, env.files ?? []);
+    return [...parentLines, env.text?.trim(), ...imageLines, ...fileLines].filter(Boolean).join("\n");
   };
   const quoteAnnotation = (env, i, idxByMessageId) => {
     if (!env.parentMessageId) return void 0;
@@ -52384,7 +52407,15 @@ function createLarkChatRouter(deps) {
     if (j === i - 1) return void 0;
     return `[\u56DE\u590D\u7B2C${j + 1}\u6761]`;
   };
-  const runBatch = async (batchEnvs) => {
+  const makeResumeText = (body, speaker) => `\u7EE7\u7EED
+
+<system-reminder>\u300C\u7EE7\u7EED\u300D\u7531\u7CFB\u7EDF\u4EE3\u53D1\uFF1A\u6B64\u524D\u5904\u7406\u4EE5\u4E0B\u6D88\u606F\u65F6\u6267\u884C\u88AB\u6253\u65AD\u3002\u82E5\u4E0A\u6587\u5DF2\u6709\u5B83\u7684\u5904\u7406\u8FDB\u5EA6\uFF0C\u63A5\u7740\u5B8C\u6210\u672A\u5B8C\u6210\u7684\u90E8\u5206\uFF1B\u82E5\u4E0A\u6587\u6CA1\u6709\u76F8\u5173\u8BB0\u5F55\uFF0C\u628A\u4EE5\u4E0B\u5185\u5BB9\u5F53\u4F5C\u65B0\u6536\u5230\u7684\u6D88\u606F\u5904\u7406\u3002\u5904\u7406\u5B8C\u6309\u5E73\u5E38\u65B9\u5F0F\u56DE\u590D\uFF1A
+---
+${body}
+---
+\uFF08\u6765\u81EA\u98DE\u4E66\u7FA4\u6210\u5458 ${speaker}\uFF09</system-reminder>`;
+  const runBatch = async (batchEnvs, opts) => {
+    if (deps.isShuttingDown?.()) return;
     const envs = batchEnvs.filter((e) => {
       if (e.messageId) return true;
       deps.logger?.warn(`larkBot chat-router: message envelope missing messageId, drop ${e.eventId}`);
@@ -52396,49 +52427,50 @@ function createLarkChatRouter(deps) {
     const idxByMessageId = new Map(envs.map((e, i) => [e.messageId, i]));
     const sections = [];
     for (const [i, env] of envs.entries()) {
-      const body2 = await buildSection(env);
-      const section = [quoteAnnotation(env, i, idxByMessageId), body2].filter(Boolean).join("\n");
+      const sectionBody = await buildSection(env);
+      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 text = `${body}
-
-${formatLarkSpeakerReminder(speaker)}`;
-    const turn = deps.manager.runLarkChatTurn({
-      personaId: last.personaId,
-      chatId: last.chatId,
-      chatName: last.chatName,
-      chatType: last.chatType ?? "group",
-      senderOpenId: last.senderOpenId ?? "",
-      senderName: last.senderName ?? last.senderOpenId ?? "\u672A\u77E5\u6210\u5458",
-      text
-    });
-    activity.set(last.chatId, {
-      chatId: last.chatId,
-      chatName: last.chatName,
-      lastActiveAt: Date.now(),
-      personaId: last.personaId
-    });
-    let timedOut = false;
-    let timer;
-    const timeout = new Promise((resolve6) => {
-      timer = setTimeout(() => {
-        timedOut = true;
-        turn.kill();
-        resolve6({ error: "turn timeout" });
-      }, timeoutMs);
-    });
-    let result;
-    try {
-      result = await Promise.race([turn.ended, timeout]);
-    } finally {
-      clearTimeout(timer);
+    const runTurn = (text) => {
+      const turn = deps.manager.runLarkChatTurn({
+        personaId: last.personaId,
+        chatId: last.chatId,
+        chatName: last.chatName,
+        chatType: last.chatType ?? "group",
+        senderOpenId: last.senderOpenId ?? "",
+        senderName: last.senderName ?? last.senderOpenId ?? "\u672A\u77E5\u6210\u5458",
+        text
+      });
+      activity.set(last.chatId, {
+        chatId: last.chatId,
+        chatName: last.chatName,
+        lastActiveAt: Date.now(),
+        personaId: last.personaId
+      });
+      return turn.ended;
+    };
+    let result = await runTurn(
+      opts?.resume ? makeResumeText(body, speaker) : `${body}
+
+${formatLarkSpeakerReminder(speaker)}`
+    );
+    for (let retry = 0; !("ok" in result); ) {
+      if (deps.isShuttingDown?.()) {
+        deps.logger?.info(`larkBot turn interrupted by shutdown (${last.chatId}), left for claim`);
+        return;
+      }
+      if (result.error === STOPPED_ERROR) break;
+      if (retry >= LOCAL_TURN_RETRIES) break;
+      retry++;
+      deps.logger?.warn(
+        `larkBot turn error (${last.chatId}): ${result.error}; resume retry ${retry}/${LOCAL_TURN_RETRIES}`
+      );
+      result = await runTurn(makeResumeText(body, speaker));
     }
     const replyText = "ok" in result && result.ok ? result.replyText : ERROR_REPLY_TEXT;
     if (!("ok" in result)) {
-      deps.logger?.warn(
-        `larkBot turn ${timedOut ? "timeout" : "error"} (${last.chatId}): ${result.error}`
-      );
+      deps.logger?.warn(`larkBot turn error (${last.chatId}): ${result.error}`);
     }
     const absorbed = envs.slice(0, -1).map((e) => e.eventId);
     for (let attempt = 0; attempt <= replyDelays.length; attempt++) {
@@ -52460,11 +52492,11 @@ ${formatLarkSpeakerReminder(speaker)}`;
       }
     }
   };
-  const enqueueBatch = (batchEnvs) => {
+  const enqueueBatch = (batchEnvs, opts) => {
     const chatId = batchEnvs[0].chatId;
     const prev = queues.get(chatId) ?? Promise.resolve();
     const next = prev.then(
-      () => runBatch(batchEnvs).catch(
+      () => runBatch(batchEnvs, opts).catch(
         (err) => deps.logger?.warn(`larkBot chat-router runBatch failed: ${err.message}`)
       )
     );
@@ -52501,15 +52533,26 @@ ${formatLarkSpeakerReminder(speaker)}`;
       if (batch) {
         batch.envelopes.push(env);
         clearTimeout(batch.timer);
-        batch.timer = setTimeout(() => flushPending(env.chatId), timerMsFor(batch.envelopes));
+        batch.timer = setTimeout(() => flushPending(env.chatId), debounceMs);
       } else {
         pending.set(env.chatId, {
           envelopes: [env],
           senderOpenId: sender,
-          timer: setTimeout(() => flushPending(env.chatId), timerMsFor([env]))
+          timer: setTimeout(() => flushPending(env.chatId), debounceMs)
         });
       }
     },
+    handleResume(envelopes) {
+      const groups = /* @__PURE__ */ new Map();
+      for (const env of envelopes) {
+        if (env.type !== "message") continue;
+        const key = `${env.chatId}|${env.senderOpenId ?? ""}`;
+        const group = groups.get(key);
+        if (group) group.push(env);
+        else groups.set(key, [env]);
+      }
+      for (const group of groups.values()) enqueueBatch(group, { resume: true });
+    },
     listLarkSessions(personaId2) {
       return [...activity.values()].filter((a) => a.personaId === personaId2).map((a) => ({ chatId: a.chatId, chatName: a.chatName, lastActiveAt: a.lastActiveAt }));
     }
@@ -59269,7 +59312,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.303".length > 0 ? "0.2.303" : "dev";
+var version = "0.2.305".length > 0 ? "0.2.305" : "dev";
 
 // src/cli-probe/probe.ts
 var fs56 = __toESM(require("fs"), 1);
@@ -63283,6 +63326,7 @@ async function startDaemon(config) {
     deviceId: authFile.deviceId,
     displayName: ownerDisplayName
   });
+  let larkDraining = false;
   const larkChatRouter = createLarkChatRouter({
     manager,
     cloud: larkBotCloud,
@@ -63290,6 +63334,7 @@ async function startDaemon(config) {
     fetchResource: (appId, messageId, fileKey, maxBytes, type) => larkBotCloud.fetchResource(appId, messageId, fileKey, maxBytes, type),
     // 图片落 guest userWorkDir 下（capId = lark-<chat_id>）：CC 经 --add-dir + allowRead carve 可 Read
     mediaRootFor: (chatId) => import_node_path65.default.join(deriveUserWorkDir(`lark-${chatId}`, usersRoot), "lark-media"),
+    isShuttingDown: () => larkDraining,
     logger: {
       warn: (msg) => logger.warn(msg),
       info: (msg) => logger.info(msg)
@@ -63558,11 +63603,11 @@ async function startDaemon(config) {
         if (larkBotDeps.listBoundPersonaIds().length === 0) return;
         try {
           const items = await larkBotCloud.claimEvents();
-          const nowSec = Math.floor(Date.now() / 1e3);
-          for (const it of items) {
-            larkEventDedupe.add(it.eventId);
-            larkChatRouter.handleEnvelope({ ...it, iat: nowSec, exp: nowSec + 300 });
-          }
+          routeClaimedEvents(items, {
+            router: larkChatRouter,
+            dedupe: larkEventDedupe,
+            nowSec: Math.floor(Date.now() / 1e3)
+          });
           if (items.length > 0) logger.info("larkBot pending events claimed", { count: items.length });
         } catch (err) {
           logger.warn("larkBot pending events claim failed", { err: err.message });
@@ -63638,6 +63683,7 @@ ${bar}
   attachmentGcInterval.unref();
   const shutdown = async () => {
     logger.info("stopping clawd");
+    larkDraining = true;
     clearInterval(attachmentGcInterval);
     observer.stopAll();
     manager.stopAll();

package/package.json

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