@clawos-dev/clawd 0.2.303 → 0.2.304

package/dist/cli.cjs

@@ -52285,9 +52285,7 @@ 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 DEBOUNCE_MS = 1e3;
-var CONTENT_HOLD_MS = 6e4;
 var MAX_IMAGE_BYTES = 8 * 1024 * 1024;
 var EXT_BY_MIME = {
   "image/png": "png",
@@ -52313,69 +52311,72 @@ function safeAttachmentName(raw) {
   return cleaned.slice(0, 100 - ext.length) + ext;
 }
 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;
@@ -52419,26 +52420,10 @@ ${formatLarkSpeakerReminder(speaker)}`;
       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 result = await turn.ended;
     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++) {
@@ -52501,12 +52486,12 @@ ${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)
         });
       }
     },
@@ -59269,7 +59254,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.303".length > 0 ? "0.2.303" : "dev";
+var version = "0.2.304".length > 0 ? "0.2.304" : "dev";
 
 // src/cli-probe/probe.ts
 var fs56 = __toESM(require("fs"), 1);

package/package.json

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