@clawos-dev/clawd 0.2.298 → 0.2.300

package/dist/cli.cjs

@@ -52021,14 +52021,15 @@ function createLarkBotCloudClient(opts) {
       const json = await request("POST", "/api/lark-bot/events/claim");
       return json.items ?? [];
     },
-    async fetchResource(appId, messageId, fileKey, maxBytes) {
+    async fetchResource(appId, messageId, fileKey, maxBytes, type) {
       const ac = new AbortController();
       const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? 15e3);
       const qs = new URLSearchParams({
         appId,
         messageId,
         fileKey,
-        ...maxBytes ? { maxBytes: String(maxBytes) } : {}
+        ...maxBytes ? { maxBytes: String(maxBytes) } : {},
+        ...type ? { type } : {}
       }).toString();
       let res;
       try {
@@ -52063,6 +52064,8 @@ 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",
@@ -52072,27 +52075,43 @@ var EXT_BY_MIME = {
 };
 var IMAGE_OVERSIZE_TEXT = "[\u56FE\u7247\u6D88\u606F\uFF0C\u8D85\u51FA\u5927\u5C0F\u9650\u5236]";
 var IMAGE_UNAVAILABLE_TEXT = "[\u56FE\u7247\u6D88\u606F\uFF0C\u6682\u4E0D\u652F\u6301\u67E5\u770B]";
+var MAX_FILE_BYTES = 20 * 1024 * 1024;
+var FILE_OVERSIZE_TEXT = (name) => `[\u6587\u4EF6: ${name}\uFF0C\u8D85\u51FA\u5927\u5C0F\u9650\u5236]`;
+var FILE_UNAVAILABLE_TEXT = (name) => `[\u6587\u4EF6: ${name}\uFF0C\u62C9\u53D6\u5931\u8D25]`;
 function safeMediaName(raw) {
   const cleaned = raw.replace(/[^a-zA-Z0-9_\-.]/g, "_").replace(/^\.+/, (d) => "_".repeat(d.length));
   return (cleaned || "msg").replace(/\.\./g, "__");
 }
+function safeAttachmentName(raw) {
+  const cleaned = raw.replace(/[/\\\u0000-\u001f]/g, "_").replace(/\.\./g, "__").replace(/^\.+/, (d) => "_".repeat(d.length));
+  if (!cleaned) return "file";
+  if (cleaned.length <= 100) return cleaned;
+  const dot = cleaned.lastIndexOf(".");
+  const ext = dot > 0 && cleaned.length - dot <= 20 ? cleaned.slice(dot) : "";
+  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 runOne = async (env) => {
-    if (!env.messageId) {
-      deps.logger?.warn(`larkBot chat-router: message envelope missing messageId, drop ${env.eventId}`);
-      return;
-    }
-    const speaker = env.senderName || env.senderOpenId || "\u672A\u77E5\u6210\u5458";
+  const pending = /* @__PURE__ */ new Map();
+  const buildSection = async (env) => {
     const imageLines = [];
     for (const [i, key] of (env.imageKeys ?? []).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);
+        const r = await deps.fetchResource(env.appId, env.messageId, 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);
@@ -52114,25 +52133,69 @@ function createLarkChatRouter(deps) {
         imageLines.push(IMAGE_UNAVAILABLE_TEXT);
       }
     }
-    const rawBody = [env.text?.trim(), ...imageLines].filter(Boolean).join("\n");
-    const body = rawBody || "[\u975E\u6587\u672C\u6D88\u606F]";
+    const fileLines = [];
+    for (const [i, f] of (env.files ?? []).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");
+        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));
+          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)}`);
+        import_node_fs27.default.writeFileSync(p2, r.data);
+        fileLines.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));
+      }
+    }
+    return [env.text?.trim(), ...imageLines, ...fileLines].filter(Boolean).join("\n");
+  };
+  const quoteAnnotation = (env, i, idxByMessageId) => {
+    if (!env.parentMessageId) return void 0;
+    const j = idxByMessageId.get(env.parentMessageId);
+    if (j === void 0) return "[\u56DE\u590D\u66F4\u65E9\u7684\u4E00\u6761\u6D88\u606F]";
+    if (j === i - 1) return void 0;
+    return `[\u56DE\u590D\u7B2C${j + 1}\u6761]`;
+  };
+  const runBatch = async (batchEnvs) => {
+    const envs = batchEnvs.filter((e) => {
+      if (e.messageId) return true;
+      deps.logger?.warn(`larkBot chat-router: message envelope missing messageId, drop ${e.eventId}`);
+      return false;
+    });
+    if (envs.length === 0) return;
+    const last = envs[envs.length - 1];
+    const speaker = last.senderName || last.senderOpenId || "\u672A\u77E5\u6210\u5458";
+    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");
+      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: env.personaId,
-      chatId: env.chatId,
-      chatName: env.chatName,
-      chatType: env.chatType ?? "group",
-      senderOpenId: env.senderOpenId ?? "",
-      senderName: env.senderName ?? env.senderOpenId ?? "\u672A\u77E5\u6210\u5458",
+      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(env.chatId, {
-      chatId: env.chatId,
-      chatName: env.chatName,
+    activity.set(last.chatId, {
+      chatId: last.chatId,
+      chatName: last.chatName,
       lastActiveAt: Date.now(),
-      personaId: env.personaId
+      personaId: last.personaId
     });
     let timedOut = false;
     let timer;
@@ -52152,46 +52215,78 @@ ${formatLarkSpeakerReminder(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"} (${env.chatId}): ${result.error}`
+        `larkBot turn ${timedOut ? "timeout" : "error"} (${last.chatId}): ${result.error}`
       );
     }
+    const absorbed = envs.slice(0, -1).map((e) => e.eventId);
     for (let attempt = 0; attempt <= replyDelays.length; attempt++) {
       if (attempt > 0) await sleep2(replyDelays[attempt - 1]);
       try {
         await deps.cloud.reply({
-          appId: env.appId,
-          chatId: env.chatId,
-          replyToMessageId: env.messageId,
+          appId: last.appId,
+          chatId: last.chatId,
+          replyToMessageId: last.messageId,
           text: replyText,
-          eventId: env.eventId
+          eventId: last.eventId,
+          ...absorbed.length > 0 ? { absorbedEventIds: absorbed } : {}
         });
         return;
       } catch (err) {
         deps.logger?.warn(
-          `larkBot reply attempt ${attempt + 1} failed (${env.chatId}): ${err.message}`
+          `larkBot reply attempt ${attempt + 1} failed (${last.chatId}): ${err.message}`
         );
       }
     }
   };
+  const enqueueBatch = (batchEnvs) => {
+    const chatId = batchEnvs[0].chatId;
+    const prev = queues.get(chatId) ?? Promise.resolve();
+    const next = prev.then(
+      () => runBatch(batchEnvs).catch(
+        (err) => deps.logger?.warn(`larkBot chat-router runBatch failed: ${err.message}`)
+      )
+    );
+    queues.set(chatId, next);
+    void next.finally(() => {
+      if (queues.get(chatId) === next) queues.delete(chatId);
+    });
+  };
+  const flushPending = (chatId) => {
+    const batch = pending.get(chatId);
+    if (!batch) return;
+    clearTimeout(batch.timer);
+    pending.delete(chatId);
+    enqueueBatch(batch.envelopes);
+  };
   return {
     handleEnvelope(env) {
       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) {
+          clearTimeout(p2.timer);
+          pending.delete(env.chatId);
+        }
         deps.logger?.info(`larkBot removed from chat ${env.chatId} (persona ${env.personaId})`);
         return;
       }
-      const prev = queues.get(env.chatId) ?? Promise.resolve();
-      const next = prev.then(
-        () => runOne(env).catch(
-          (err) => deps.logger?.warn(`larkBot chat-router runOne failed: ${err.message}`)
-        )
-      );
-      queues.set(env.chatId, next);
-      void next.finally(() => {
-        if (queues.get(env.chatId) === next) queues.delete(env.chatId);
-      });
+      const sender = env.senderOpenId ?? "";
+      const cur = pending.get(env.chatId);
+      if (cur && cur.senderOpenId !== sender) flushPending(env.chatId);
+      const batch = pending.get(env.chatId);
+      if (batch) {
+        batch.envelopes.push(env);
+        clearTimeout(batch.timer);
+        batch.timer = setTimeout(() => flushPending(env.chatId), timerMsFor(batch.envelopes));
+      } else {
+        pending.set(env.chatId, {
+          envelopes: [env],
+          senderOpenId: sender,
+          timer: setTimeout(() => flushPending(env.chatId), timerMsFor([env]))
+        });
+      }
     },
     listLarkSessions(personaId2) {
       return [...activity.values()].filter((a) => a.personaId === personaId2).map((a) => ({ chatId: a.chatId, chatName: a.chatName, lastActiveAt: a.lastActiveAt }));
@@ -52934,7 +53029,7 @@ var import_node_fs28 = __toESM(require("fs"), 1);
 var import_node_os8 = __toESM(require("os"), 1);
 var import_node_path30 = __toESM(require("path"), 1);
 init_protocol();
-var MAX_FILE_BYTES = 2 * 1024 * 1024;
+var MAX_FILE_BYTES2 = 2 * 1024 * 1024;
 function resolveInsideCwd(cwd, subpath) {
   const absCwd = import_node_path30.default.resolve(cwd);
   const joined = import_node_path30.default.resolve(absCwd, subpath ?? ".");
@@ -52990,8 +53085,8 @@ var WorkspaceBrowser = class {
     if (!st.isFile()) {
       throw new ClawdError(ERROR_CODES.INVALID_PATH, `not a file: ${args.path}`);
     }
-    if (st.size > MAX_FILE_BYTES) {
-      throw new ClawdError(ERROR_CODES.FILE_TOO_LARGE, `file > ${MAX_FILE_BYTES} bytes`);
+    if (st.size > MAX_FILE_BYTES2) {
+      throw new ClawdError(ERROR_CODES.FILE_TOO_LARGE, `file > ${MAX_FILE_BYTES2} bytes`);
     }
     const buf = import_node_fs28.default.readFileSync(full);
     const isBinary = buf.includes(0);
@@ -58950,7 +59045,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.298".length > 0 ? "0.2.298" : "dev";
+var version = "0.2.300".length > 0 ? "0.2.300" : "dev";
 
 // src/cli-probe/probe.ts
 var fs56 = __toESM(require("fs"), 1);
@@ -62968,7 +63063,7 @@ async function startDaemon(config) {
     manager,
     cloud: larkBotCloud,
     store: larkBotStore,
-    fetchResource: (appId, messageId, fileKey, maxBytes) => larkBotCloud.fetchResource(appId, messageId, fileKey, maxBytes),
+    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"),
     logger: {

package/package.json

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