duclaw-cli 1.8.42 → 1.8.43

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.42" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.43" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -32629,7 +32629,7 @@ var chokidar_default = { watch, FSWatcher };
 var import_node_cron = __toESM(require_node_cron());
 
 // src/agent/createAgent.ts
-var import_node_crypto12 = require("node:crypto");
+var import_node_crypto13 = require("node:crypto");
 var import_node_fs7 = require("node:fs");
 
 // src/background/BackgroundManager.ts
@@ -41803,11 +41803,9 @@ var renderAgentEventReminder = (events) => {
   const hasCeoFollowup = events.some((event) => event.type === "ceo.followup_required");
   const ceoFollowupInstruction = hasCeoFollowup ? [
     ``,
-    `CEO followup \u786C\u89C4\u5219\uFF1A`,
-    `- type=ceo.followup_required \u8868\u793A Department Head/Executor \u5DF2\u7ECF\u628A\u5185\u90E8\u7ED3\u679C\u56DE\u7ED9 Main Manager/CEO\u3002`,
-    `- \u8FD9\u4E0D\u662F\u666E\u901A\u63D0\u9192\uFF1BBoss/User \u6B63\u5728\u7B49\u5F85\u6700\u7EC8\u53EF\u89C1\u7ED3\u679C\u3002`,
-    `- \u4F60\u5FC5\u987B\u8BFB\u53D6 summary/contentPreview\uFF0C\u76F4\u63A5\u8C03\u7528 send_message \u5411 Boss/User \u6C47\u62A5\u7ED3\u679C\u3002`,
-    `- \u4E0D\u8981\u53EA\u8BF4\u201C\u6682\u65E0\u56DE\u4FE1/\u8FD8\u5728\u6267\u884C/\u7A0D\u540E\u540C\u6B65\u201D\uFF0C\u9664\u975E summary \u660E\u786E\u8BF4\u660E\u4ECD\u5728\u7B49\u5F85\u6216\u5931\u8D25\u3002`
+    `\u5176\u4E2D type=ceo.followup_required \u7684\u4E8B\u4EF6\uFF0C\u662F\u56E2\u961F\u5DF2\u7ECF\u628A\u7ED3\u679C\u56DE\u5230\u4E86\u4F60\u8FD9\u91CC\u2014\u2014\u8001\u677F\u8FD8\u5728\u7B49\u4F60\u628A\u8FD9\u4E9B\u7ED3\u679C\u8F6C\u8FBE\u7ED9\u4ED6\u3002`,
+    `\u8BFB\u4E00\u904D\uFF0C\u7528\u4F60\u81EA\u5DF1\u7684\u8BDD\u7ED9\u8001\u677F\u6C47\u62A5\u4E00\u6B21\uFF1A\u6709\u591A\u6761\u5C31\u5408\u5E76\u6210\u4E00\u6761\u8BF4\u6E05\u695A\uFF0C\u522B\u4E00\u6761\u4E8B\u4EF6\u56DE\u4E00\u53E5\u3001\u628A\u540C\u4E00\u4EF6\u4E8B\u91CD\u590D\u53D1\u7ED9\u8001\u677F\u3002`,
+    `\u5982\u679C\u7ED3\u679C\u8BF4\u660E\u4E8B\u60C5\u8FD8\u6CA1\u505A\u5B8C\u6216\u5361\u4F4F\u4E86\uFF0C\u5C31\u5982\u5B9E\u8FD9\u4E48\u8BB2\uFF0C\u800C\u4E0D\u662F\u542B\u7CCA\u5730\u201C\u7A0D\u540E\u540C\u6B65\u201D\u3002`
   ].join("\n") : "";
   return `<system-reminder>
 \u672C\u8F6E\u6709 ${events.length} \u6761\u5185\u90E8\u4E8B\u4EF6\u53EF\u7528\uFF1A
@@ -45650,6 +45648,37 @@ var COMPANY_VALUES_PROMPT = `<\u516C\u53F8\u5171\u540C\u4FE1\u5FF5>
 4. \u5224\u65AD\u9AD8\u4E8E\u6D41\u7A0B\uFF1A\u4EE5\u4E0A\u662F\u4F60\u505A\u4E8B\u7684\u672C\u5FC3\uFF0C\u4E0D\u662F\u8981\u4F60\u6B7B\u8BB0\u6B65\u9AA4\u3002\u5177\u4F53\u600E\u4E48\u505A\uFF0C\u4F60\u50CF\u4E00\u4E2A\u6709\u7ECF\u9A8C\u7684\u4EBA\u90A3\u6837\u81EA\u5DF1\u62FF\u634F\uFF1B\u5076\u5C14\u5224\u65AD\u4E0D\u5B8C\u7F8E\u6CA1\u5173\u7CFB\uFF0C\u50CF\u4EBA\u4E00\u6837\u9760\u8C31\u6BD4\u673A\u68B0\u5B88\u89C4\u66F4\u91CD\u8981\u3002
 </\u516C\u53F8\u5171\u540C\u4FE1\u5FF5>`;
 
+// src/agent/outboundDedup.ts
+var import_node_crypto12 = require("node:crypto");
+var DEFAULT_WINDOW_MS = 15e3;
+var recentSends = /* @__PURE__ */ new Map();
+var lastSweepAt = 0;
+var normalize3 = (text2) => text2.replace(/\s+/g, " ").trim();
+var keyFor = (userId, normalized) => {
+  const hash = (0, import_node_crypto12.createHash)("sha1").update(normalized).digest("hex");
+  return `${userId}::${hash}`;
+};
+var sweep = (now, windowMs) => {
+  if (now - lastSweepAt < windowMs) return;
+  lastSweepAt = now;
+  for (const [k, ts] of recentSends) {
+    if (now - ts > windowMs) recentSends.delete(k);
+  }
+};
+var claimOutboundSend = (userId, text2, windowMs = DEFAULT_WINDOW_MS) => {
+  const normalized = normalize3(text2);
+  if (!normalized) return true;
+  const now = Date.now();
+  sweep(now, windowMs);
+  const key = keyFor(userId, normalized);
+  const last = recentSends.get(key);
+  if (last !== void 0 && now - last < windowMs) {
+    return false;
+  }
+  recentSends.set(key, now);
+  return true;
+};
+
 // src/agent/createAgent.ts
 var DEFAULT_WORKSPACE_PATH = getDuclawWorkspaceDir();
 var assistantMessageFromResponse = (response) => ({
@@ -45664,7 +45693,7 @@ var isAbortError2 = (error) => {
   return error.name === "AbortError" || error.message.includes("aborted") || error.message.includes("AbortError");
 };
 var llmRequestIdForTurn = (request, messages, system, tools) => {
-  const hash = (0, import_node_crypto12.createHash)("sha256").update(request.requestId).update("\0").update(system).update("\0").update(JSON.stringify(messages)).update("\0").update(JSON.stringify(tools.map((tool) => tool.name).sort())).digest("hex").slice(0, 40);
+  const hash = (0, import_node_crypto13.createHash)("sha256").update(request.requestId).update("\0").update(system).update("\0").update(JSON.stringify(messages)).update("\0").update(JSON.stringify(tools.map((tool) => tool.name).sort())).digest("hex").slice(0, 40);
   return `dreq_${hash}`;
 };
 var getDefaultAgentConfig = (tools, systemPrompt) => {
@@ -46097,6 +46126,7 @@ ${notifText}
         if (interrupts.length > 0) {
           for (const interrupt of interrupts) {
             markInterruptEventIdsInjected(interrupt.metadata);
+            rememberCeoFollowupIds(ceoFollowupIdsFromMetadata(interrupt.metadata));
             const msg = interrupt.content;
             console.log(`[agent] \u6536\u5230\u4E2D\u65AD\u6D88\u606F\uFF0C\u6CE8\u5165\u5BF9\u8BDD: ${msg.slice(0, 80)}...`);
             if (interrupt.metadata) {
@@ -46251,12 +46281,16 @@ ${memoryInjection}` : "") + dreamInjection;
                       console.log(`channelPlugin: ${JSON.stringify(config2.channelPlugin)}`);
                       const { userId: userId2 } = request;
                       console.log(`request: ${JSON.stringify(request)}`);
-                      await config2.channelPlugin.outbound.sendText({
-                        cfg: {},
-                        to: userId2,
-                        text: answer,
-                        accountId: request.requestId
-                      });
+                      if (claimOutboundSend(userId2, answer)) {
+                        await config2.channelPlugin.outbound.sendText({
+                          cfg: {},
+                          to: userId2,
+                          text: answer,
+                          accountId: request.requestId
+                        });
+                      } else {
+                        console.log(`[outbound-dedup] \u8DF3\u8FC7\u5BF9\u7528\u6237 ${userId2} \u7684\u8FD1\u91CD\u590D\u53D1\u9001\uFF08\u5355\u4E00\u58F0\u97F3\u515C\u5E95\uFF09`);
+                      }
                     }
                     hasSentMessage = true;
                     sentMessageContent = answer;
@@ -46313,6 +46347,7 @@ ${memoryInjection}` : "") + dreamInjection;
             console.log(`[agent] \u9000\u51FA\u524D\u53D1\u73B0 ${lateInterrupts.length} \u6761\u8FDF\u5230\u7684\u4E2D\u65AD\u6D88\u606F\uFF0C\u7EE7\u7EED\u5904\u7406`);
             for (const interrupt of lateInterrupts) {
               markInterruptEventIdsInjected(interrupt.metadata);
+              rememberCeoFollowupIds(ceoFollowupIdsFromMetadata(interrupt.metadata));
               const msg = interrupt.content;
               if (interrupt.metadata) {
                 request.metadata = {
@@ -46332,12 +46367,16 @@ ${msg}</user-interrupt>`
           }
           const visibleCeoFollowupIds = ceoFollowupIdsFromMetadata(request.metadata);
           if (!hasSentMessage && visibleCeoFollowupIds.length > 0 && config2.channelPlugin) {
-            await config2.channelPlugin.outbound.sendText({
-              cfg: {},
-              to: request.userId,
-              text: textContent,
-              accountId: request.requestId
-            });
+            if (claimOutboundSend(request.userId, textContent)) {
+              await config2.channelPlugin.outbound.sendText({
+                cfg: {},
+                to: request.userId,
+                text: textContent,
+                accountId: request.requestId
+              });
+            } else {
+              console.log(`[outbound-dedup] \u8DF3\u8FC7\u5BF9\u7528\u6237 ${request.userId} \u7684\u8FD1\u91CD\u590D\u515C\u5E95\u53D1\u9001`);
+            }
             hasSentMessage = true;
             sentMessageContent = textContent;
             completeUserVisibleCeoFollowups();
@@ -46358,6 +46397,7 @@ ${msg}</user-interrupt>`
             console.log(`[agent] \u9000\u51FA\u524D\u53D1\u73B0 ${lateInterrupts.length} \u6761\u8FDF\u5230\u7684\u4E2D\u65AD\u6D88\u606F\uFF0C\u7EE7\u7EED\u5904\u7406`);
             for (const interrupt of lateInterrupts) {
               markInterruptEventIdsInjected(interrupt.metadata);
+              rememberCeoFollowupIds(ceoFollowupIdsFromMetadata(interrupt.metadata));
               const msg = interrupt.content;
               if (interrupt.metadata) {
                 request.metadata = {
@@ -47193,8 +47233,10 @@ var markMailboxStatus = (msgId, status) => {
     reason: "mailbox_poller"
   });
 };
-var handleCeoFollowup = async (followup) => {
-  const event = recordAgentEvent({
+var handleCeoFollowupGroup = async (followups) => {
+  const originUserId = followups[0].originUserId;
+  const originPlatform = followups[0].originPlatform;
+  const events = followups.map((followup) => recordAgentEvent({
     userId: followup.originUserId,
     type: "ceo.followup_required",
     source: "ceo_followup",
@@ -47207,73 +47249,87 @@ var handleCeoFollowup = async (followup) => {
       parentMessageId: followup.parentMessageId || null,
       workItemId: followup.workItemId || null,
       contentPreview: followup.content.slice(0, 1200),
-      summary: `\u90E8\u95E8\u5DF2\u56DE\u4FE1\uFF0CMain Manager/CEO \u5FC5\u987B\u5C06\u7ED3\u679C\u901A\u8FC7 send_message \u6C47\u62A5\u7ED9 Boss/User\uFF1A${followup.content.slice(0, 400)}`,
+      summary: `\u56E2\u961F\u5DF2\u56DE\u4FE1\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u8FD8\u7B49\u7740\u4F60\u8F6C\u8FBE\u7ED9\u8001\u677F\uFF08Boss/User\uFF09\uFF1A${followup.content.slice(0, 400)}`,
       originPlatform: followup.originPlatform
     }
-  });
-  if (hasRunningAgent(followup.originUserId)) {
-    queueInterrupt(followup.originUserId, {
-      content: "",
-      metadata: {
-        internalOnly: true,
-        eventId: event.id,
-        trigger: "ceo.followup_required",
-        ceoFollowupId: followup.id
-      }
+  }));
+  if (hasRunningAgent(originUserId)) {
+    followups.forEach((followup, i) => {
+      queueInterrupt(originUserId, {
+        content: "",
+        metadata: {
+          internalOnly: true,
+          eventId: events[i].id,
+          trigger: "ceo.followup_required",
+          ceoFollowupId: followup.id
+        }
+      });
     });
-    console.log(`[mailbox] \u4E3B agent \u6B63\u5728\u8FD0\u884C\u4E2D\uFF0C${followup.fromMailboxId} \u7684\u56DE\u4FE1\u5DF2\u5165\u961F\u7B49\u5F85\u4E2D\u65AD\u6CE8\u5165 followup=${followup.id}`);
+    console.log(`[mailbox] \u4E3B agent \u6B63\u5728\u8FD0\u884C\u4E2D\uFF0C${followups.length} \u5C01\u56DE\u4FE1\u5DF2\u5165\u961F\u7B49\u5F85\u4E2D\u65AD\u6CE8\u5165 user=${originUserId}`);
     return "queued";
   }
+  const primary = followups[followups.length - 1];
   const request = {
-    platform: followup.originPlatform,
-    userId: followup.originUserId,
-    requestId: followup.sourceMessageId,
+    platform: originPlatform,
+    userId: originUserId,
+    requestId: primary.sourceMessageId,
     departmentAgentId: "",
     content: "",
     metadata: {
       internalOnly: true,
-      eventId: event.id,
+      eventId: events[events.length - 1].id,
       trigger: "ceo.followup_required",
-      ceoFollowupId: followup.id
+      ceoFollowupId: primary.id,
+      ceoFollowupIds: followups.map((f) => f.id)
     }
   };
   const config2 = getDefaultAgentConfig();
   const mainAgent = createAgent(config2);
   const result = await mainAgent(request);
-  console.log(`[mailbox] \u4E3B agent \u5904\u7406\u5B8C ${followup.fromMailboxId} \u7684\u56DE\u4FE1, alreadySent=${result.alreadySent}`);
+  console.log(`[mailbox] \u4E3B agent \u5904\u7406\u5B8C ${followups.length} \u5C01\u56DE\u4FE1, user=${originUserId}, alreadySent=${result.alreadySent}`);
   if (result.alreadySent) return "completed";
-  const fallback = result.content?.trim() || followup.content;
+  const fallback = result.content?.trim() || followups.map((f) => f.content).join("\n\n---\n\n");
   if (fallback && config2.channelPlugin) {
-    try {
-      await config2.channelPlugin.outbound.sendText({
-        cfg: {},
-        to: followup.originUserId,
-        text: fallback,
-        accountId: followup.sourceMessageId
-      });
-      console.log(`[mailbox] \u4E3B agent \u672A\u4E3B\u52A8\u53D1\u9001\uFF0C\u5DF2\u901A\u8FC7\u6E20\u9053\u8865\u53D1 followup=${followup.id} \u7ED9\u7528\u6237 ${followup.originUserId}`);
-      return "completed";
-    } catch (sendErr) {
-      console.error(`[mailbox] \u8865\u53D1\u6D88\u606F\u5931\u8D25:`, sendErr);
-      throw sendErr;
+    if (claimOutboundSend(originUserId, fallback)) {
+      try {
+        await config2.channelPlugin.outbound.sendText({
+          cfg: {},
+          to: originUserId,
+          text: fallback,
+          accountId: primary.sourceMessageId
+        });
+        console.log(`[mailbox] \u4E3B agent \u672A\u4E3B\u52A8\u53D1\u9001\uFF0C\u5DF2\u901A\u8FC7\u6E20\u9053\u8865\u53D1 user=${originUserId}`);
+      } catch (sendErr) {
+        console.error(`[mailbox] \u8865\u53D1\u6D88\u606F\u5931\u8D25:`, sendErr);
+        throw sendErr;
+      }
+    } else {
+      console.log(`[mailbox] \u8DF3\u8FC7\u5BF9\u7528\u6237 ${originUserId} \u7684\u8FD1\u91CD\u590D\u8865\u53D1\uFF08\u5355\u4E00\u58F0\u97F3\u515C\u5E95\uFF09`);
     }
+    return "completed";
   }
   if (fallback && !config2.channelPlugin) return "completed";
-  throw new Error(`ceo_followup_no_user_visible_message:${followup.id}`);
+  throw new Error(`ceo_followup_no_user_visible_message:${primary.id}`);
 };
-var processCeoFollowup = async (followup) => {
-  const claimed = claimCeoFollowup(followup.id);
-  if (!claimed) return;
+var processCeoFollowupGroup = async (followups) => {
+  const claimed = [];
+  for (const followup of followups) {
+    const c = claimCeoFollowup(followup.id);
+    if (c) claimed.push(c);
+  }
+  if (claimed.length === 0) return;
   try {
-    markMailboxStatus(claimed.sourceMessageId, "processing");
-    const outcome = await handleCeoFollowup(claimed);
+    for (const c of claimed) markMailboxStatus(c.sourceMessageId, "processing");
+    const outcome = await handleCeoFollowupGroup(claimed);
     if (outcome === "queued") return;
-    completeCeoFollowup(claimed.id);
-    markMailboxStatus(claimed.sourceMessageId, "done");
+    for (const c of claimed) {
+      completeCeoFollowup(c.id);
+      markMailboxStatus(c.sourceMessageId, "done");
+    }
   } catch (err) {
     const message = err.message;
-    failCeoFollowup(claimed.id, message);
-    console.error(`[mailbox] CEO followup \u5904\u7406\u5931\u8D25 followup=${claimed.id}:`, err);
+    for (const c of claimed) failCeoFollowup(c.id, message);
+    console.error(`[mailbox] CEO followup \u5904\u7406\u5931\u8D25 user=${claimed[0].originUserId}:`, err);
   }
 };
 var wakeDepartmentAgent = async (mailboxId, msgIds) => {
@@ -47427,6 +47483,7 @@ var finalizeDepartmentAgentUnrepliedMessages = (mailboxId, msgIds, result) => {
 var polling = false;
 var inFlightDepartmentMailboxes = /* @__PURE__ */ new Set();
 var inFlightCeoReplyMessages = /* @__PURE__ */ new Set();
+var inFlightCeoReplyUsers = /* @__PURE__ */ new Set();
 var pollMailbox = async () => {
   if (polling) return;
   polling = true;
@@ -47456,17 +47513,26 @@ var pollMailbox = async () => {
     }
     const followups = [...pendingFollowups, ...newFollowups];
     const uniqueFollowups = Array.from(new Map(followups.map((followup) => [followup.id, followup])).values());
+    const followupsByUser = /* @__PURE__ */ new Map();
     for (const followup of uniqueFollowups) {
       if (inFlightCeoReplyMessages.has(followup.id)) continue;
-      inFlightCeoReplyMessages.add(followup.id);
-      console.log(`[mailbox] \u6536\u5230 department agent \u56DE\u4FE1\uFF08\u6765\u81EA ${followup.fromMailboxId}\uFF09\uFF0C\u6B63\u5728\u5524\u9192\u4E3B agent followup=${followup.id}...`);
+      const arr = followupsByUser.get(followup.originUserId) || [];
+      arr.push(followup);
+      followupsByUser.set(followup.originUserId, arr);
+    }
+    for (const [originUserId, group] of followupsByUser) {
+      if (inFlightCeoReplyUsers.has(originUserId)) continue;
+      inFlightCeoReplyUsers.add(originUserId);
+      for (const f of group) inFlightCeoReplyMessages.add(f.id);
+      console.log(`[mailbox] \u6536\u5230 ${group.length} \u5C01 department \u56DE\u4FE1\uFF0C\u6B63\u5728\u5408\u5E76\u5524\u9192\u4E3B agent user=${originUserId}...`);
       void (async () => {
         try {
-          await processCeoFollowup(followup);
+          await processCeoFollowupGroup(group);
         } catch (err) {
           console.error(`[mailbox] \u5524\u9192\u4E3B agent \u5904\u7406\u56DE\u4FE1\u5931\u8D25:`, err);
         } finally {
-          inFlightCeoReplyMessages.delete(followup.id);
+          inFlightCeoReplyUsers.delete(originUserId);
+          for (const f of group) inFlightCeoReplyMessages.delete(f.id);
         }
       })();
     }
@@ -52544,7 +52610,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.42" : "unknown",
+    version: true ? "1.8.43" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version