duclaw-cli 1.9.15 → 1.9.16

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.9.15" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.9.16" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -38854,13 +38854,13 @@ var searchChatHistory = async (messageStorage, topicStorage, userId, query, date
     return { matches: [], total, matchCount: 0 };
   }
   const keyCache = /* @__PURE__ */ new Map();
-  const buildKey = (d, c) => {
+  const buildKey2 = (d, c) => {
     let k = `mem:${userId}:${d}`;
     if (c) k += `:${c}`;
     return k;
   };
   const loadMessages = async (d, c) => {
-    const k = buildKey(d, c);
+    const k = buildKey2(d, c);
     if (keyCache.has(k)) return keyCache.get(k);
     const msgs = await messageStorage.get(k);
     keyCache.set(k, msgs);
@@ -43652,6 +43652,45 @@ var departmentCreate = {
   }
 };
 
+// src/tools/tools/department/mailboxQueueGuard.ts
+var states = /* @__PURE__ */ new Map();
+var buildKey = (userRequest) => {
+  const mailboxId = userRequest?.departmentAgentId;
+  const requestId = userRequest?.requestId;
+  if (!mailboxId || !requestId) return null;
+  return `${mailboxId}::${requestId}`;
+};
+var sameMessageSet = (left, right) => {
+  if (left.length !== right.length) return false;
+  const sortedLeft = [...left].sort();
+  const sortedRight = [...right].sort();
+  return sortedLeft.every((id, index) => id === sortedRight[index]);
+};
+var beginMailboxListOrBlock = (userRequest, visibleMessageIds) => {
+  const key = buildKey(userRequest);
+  if (!key) return null;
+  const previous = states.get(key);
+  if (previous?.awaitingAction && sameMessageSet(previous.listedMessageIds, visibleMessageIds)) {
+    return [
+      `[listMailbox] \u5DF2\u963B\u6B62\u91CD\u590D\u67E5\u770B\u540C\u4E00\u6279\u90AE\u7BB1\u961F\u5217\u3002`,
+      `\u4F60\u521A\u521A\u5DF2\u7ECF\u770B\u8FC7\u8FD9\u4E9B\u5F85\u5904\u7406 message_id: ${visibleMessageIds.join(", ") || "-"}`,
+      `\u7981\u6B62\u7A7A\u8F6C list_mailbox\u3002\u4E0B\u4E00\u6B65\u5FC5\u987B\u9009\u62E9\u4E00\u5C01\u8C03\u7528 get_mailbox(message_id="...") \u6253\u5F00\u5904\u7406\uFF0C\u6216\u5BF9\u65E0\u9700\u5904\u7406\u7684\u90AE\u4EF6\u8C03\u7528 discard_mailbox\uFF0C\u6216\u5BF9\u5DF2\u5F62\u6210\u8FDB\u5C55/\u7ED3\u679C\u7684\u90AE\u4EF6\u8C03\u7528 mailbox_followup / reply_mailbox\u3002`,
+      `\u5B8C\u6210\u4E00\u4E2A\u5B9E\u9645\u52A8\u4F5C\u540E\uFF0C\u624D\u53EF\u4EE5\u518D\u6B21\u8C03\u7528 list_mailbox \u91CD\u65B0\u8BC4\u4F30\u961F\u5217\u3002`
+    ].join(`
+`);
+  }
+  states.set(key, {
+    awaitingAction: visibleMessageIds.length > 0,
+    listedMessageIds: visibleMessageIds
+  });
+  return null;
+};
+var markMailboxQueueAction = (userRequest) => {
+  const key = buildKey(userRequest);
+  if (!key) return;
+  states.delete(key);
+};
+
 // src/tools/tools/department/DepartmentCommunicate.ts
 var CEO_MAILBOX_ID = `manager`;
 var MANAGER_ALIAS_PATTERN = /(^|::)(manager|main[-_\s]?manager|ceo)$/i;
@@ -43805,6 +43844,9 @@ var departmentCommunicate = {
     } catch (err) {
       return `[departmentCommunicate] \u53D1\u9001\u6D88\u606F\u5931\u8D25: ${err.message}`;
     }
+    if (departmentAgentId) {
+      markMailboxQueueAction(userRequest);
+    }
     return `[departmentCommunicate] \u6D88\u606F\u5DF2\u53D1\u9001\u5230 ${toMailboxId}`;
   }
 };
@@ -44855,6 +44897,7 @@ var mailboxFollowup = {
         preview: content.slice(0, 200)
       }
     });
+    markMailboxQueueAction(userRequest);
     return `[mailboxFollowup] \u5DF2\u5728\u6D88\u606F ${messageId} \u6240\u5C5E\u7EBF\u7A0B\u4E2D\u8FFD\u52A0\u4E00\u6761${kind}\u6D88\u606F\uFF0C\u53D1\u9001\u5230 ${counterpartMailboxId}\uFF08message: ${followupMsg.id}, thread: ${followupMsg.threadId}\uFF09`;
   }
 };
@@ -47024,6 +47067,16 @@ var llmRequestIdForTurn = (request, messages, system, tools) => {
   const hash = (0, import_node_crypto16.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 LLM_CREDIT_EXHAUSTED_MESSAGE = "Credit \u4F59\u989D\u4E0D\u8DB3\uFF0C\u6682\u65F6\u65E0\u6CD5\u7EE7\u7EED\u8C03\u7528\u4E3B\u6A21\u578B\u5904\u7406\u8FD9\u6761\u6D88\u606F\u3002\u8BF7\u5148\u5145\u503C\u6216\u4F7F\u7528\u6FC0\u6D3B\u7801\u589E\u52A0 Credit \u540E\u518D\u8BD5\u3002";
+var isLlmCreditExhaustedError = (error) => {
+  const err = error;
+  const message = [
+    err?.message,
+    err?.error?.type,
+    err?.error?.message
+  ].filter((value) => typeof value === "string").join("\n");
+  return err?.status === 402 || err?.status === 403 && /预扣费额度失败|额度不足|剩余额度|pre_consume.*quota|insufficient.*quota/i.test(message) || /预扣费额度失败|用户剩余额度|Credit balance is insufficient|credit_exhausted/i.test(message);
+};
 var getDefaultAgentConfig = (tools, systemPrompt) => {
   loadEnv();
   (0, import_node_fs8.mkdirSync)(DEFAULT_WORKSPACE_PATH, { recursive: true });
@@ -47579,6 +47632,29 @@ ${memoryInjection}` : "") + dreamInjection;
             await recoverFromContextOverflow("prompt_too_long", messages, effectiveSystemPrompt);
             continue;
           }
+          if (isLlmCreditExhaustedError(error)) {
+            let alreadySent = false;
+            if (config2.channelPlugin && !internalOnly) {
+              if (claimOutboundSend(request.userId, LLM_CREDIT_EXHAUSTED_MESSAGE)) {
+                await config2.channelPlugin.outbound.sendText({
+                  cfg: {},
+                  to: request.userId,
+                  text: LLM_CREDIT_EXHAUSTED_MESSAGE,
+                  accountId: request.requestId,
+                  metadata: request.metadata
+                });
+                alreadySent = true;
+              } else {
+                console.log(`[outbound-dedup] \u8DF3\u8FC7\u5BF9\u7528\u6237 ${request.userId} \u7684\u8FD1\u91CD\u590D LLM \u989D\u5EA6\u4E0D\u8DB3\u63D0\u793A`);
+              }
+            }
+            await addMessage(storage, userId, assistantMessage(text(LLM_CREDIT_EXHAUSTED_MESSAGE)), beijingTime, job?.title);
+            markAgentEventsHandled([...injectedEventIds], "ignored");
+            return {
+              content: LLM_CREDIT_EXHAUSTED_MESSAGE,
+              alreadySent
+            };
+          }
           throw error;
         } finally {
           if (activeTurnAbortController === turnAbortController) {
@@ -48128,6 +48204,11 @@ var listMailbox = {
              ORDER BY send_time ASC`
     );
     const msgs = stmt.all(myMailboxId);
+    const visibleMessageIds = msgs.map((msg) => msg.id);
+    const repeatedListBlock = beginMailboxListOrBlock(userRequest, visibleMessageIds);
+    if (repeatedListBlock) {
+      return repeatedListBlock;
+    }
     if (msgs.length === 0) {
       recordMailboxEvent({
         mailboxId: myMailboxId,
@@ -48135,7 +48216,7 @@ var listMailbox = {
         eventType: "mailbox_listed",
         detail: {
           visibleCount: 0,
-          visibleMessageIds: []
+          visibleMessageIds
         }
       });
       return `[listMailbox] \u4F60\u7684\u90AE\u7BB1\u4E2D\u6CA1\u6709\u5F85\u5904\u7406\u90AE\u4EF6\u3002`;
@@ -48147,10 +48228,10 @@ var listMailbox = {
       eventType: "mailbox_listed",
       detail: {
         visibleCount: msgs.length,
-        visibleMessageIds: msgs.map((msg) => msg.id)
+        visibleMessageIds
       }
     });
-    const list = msgs.map((msg, i) => {
+    const renderMessage2 = (msg, i) => {
       const time = new Date(msg.sendTime).toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
       const preview2 = msg.content.length > 100 ? msg.content.slice(0, 100) + "..." : msg.content;
       return `[${i + 1}] id: ${msg.id}
@@ -48158,10 +48239,22 @@ var listMailbox = {
     \u65F6\u95F4: ${time}
     \u72B6\u6001: ${msg.status}
     \u6458\u8981: ${preview2}`;
-    }).join("\n\n");
-    return `[listMailbox] \u4F60\u6709 ${msgs.length} \u5C01\u5F85\u5904\u7406\u90AE\u4EF6\uFF1A
-
-${list}`;
+    };
+    const pending = msgs.filter((msg) => msg.status === "pending");
+    const processing = msgs.filter((msg) => msg.status === "processing");
+    const sections = [
+      pending.length > 0 ? `\u65B0\u90AE\u4EF6 pending\uFF08\u5C1A\u672A\u9886\u53D6\uFF09\uFF1A
+${pending.map(renderMessage2).join("\n\n")}` : null,
+      processing.length > 0 ? `\u5DF2\u9886\u53D6/\u5904\u7406\u4E2D processing\uFF08\u4ECD\u9700\u7EE7\u7EED\u95ED\u73AF\uFF09\uFF1A
+${processing.map(renderMessage2).join("\n\n")}` : null
+    ].filter(Boolean).join("\n\n");
+    return [
+      `[listMailbox] \u4F60\u6709 ${msgs.length} \u5C01\u5F85\u5904\u7406\u90AE\u4EF6\uFF1A`,
+      ``,
+      sections,
+      ``,
+      `\u4E0B\u4E00\u6B65\u5FC5\u987B\u4ECE\u4EE5\u4E0A message_id \u4E2D\u9009\u62E9\u4E00\u5C01\u8C03\u7528 get_mailbox(message_id="...") \u6253\u5F00\u5904\u7406\uFF1B\u5982\u679C\u786E\u8BA4\u67D0\u5C01\u65E0\u7528/\u8FC7\u65F6\uFF0C\u8C03\u7528 discard_mailbox\uFF1B\u5982\u679C\u5DF2\u7ECF\u6709\u8FDB\u5C55\u6216\u7ED3\u679C\uFF0C\u8C03\u7528 mailbox_followup \u6216 reply_mailbox\u3002\u4E0D\u8981\u8FDE\u7EED\u91CD\u590D\u8C03\u7528 list_mailbox\u3002`
+    ].join("\n");
   }
 };
 
@@ -48269,6 +48362,7 @@ var getMailbox = {
       counterpartMailboxId: msg.fromMailboxId,
       eventType: "message_opened"
     });
+    markMailboxQueueAction(userRequest);
     const time = new Date(msg.sendTime).toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
     const threadId = msg.threadId || msg.id;
     const upstreamContext = buildUpstreamContext(msg);
@@ -48381,6 +48475,7 @@ var discardMailbox = {
         parentMessageId: msg.parentMessageId || null
       }
     });
+    markMailboxQueueAction(userRequest);
     return `[discardMailbox] \u5DF2\u4E22\u5F03\u90AE\u4EF6 ${messageId}\uFF0C\u539F\u56E0\uFF1A${reason}`;
   }
 };
@@ -48532,6 +48627,7 @@ var replyMailbox = {
       }
     });
     const upstreamReminder = buildUpstreamReminder(myMailboxId, msg.fromMailboxId, msg.threadId || msg.id, msg.workItemId);
+    markMailboxQueueAction(userRequest);
     return `[replyMailbox] ${claimedFromPending ? "\u5DF2\u9886\u53D6\u5E76" : "\u5DF2"}\u6B63\u5F0F\u56DE\u590D\u90AE\u4EF6 ${messageId}\uFF0C\u56DE\u590D\u6D88\u606F ${replyMsg.id} \u5DF2\u53D1\u9001\u5230 ${msg.fromMailboxId} \u7684\u90AE\u7BB1\uFF08thread: ${replyMsg.threadId}\uFF09${upstreamReminder}`;
   }
 };
@@ -48656,6 +48752,10 @@ var recoverStaleProcessingWork = () => {
     console.warn(`[mailbox] \u5DF2\u6062\u590D stale processing: mailbox=${mailboxRecovered}, ceo_followups=${followupsRecovered}`);
   }
 };
+var isMaxIterationsError = (err) => {
+  const message = err?.message ?? "";
+  return /达到最大迭代次数|max iterations?/i.test(message);
+};
 var markMailboxStatus = (msgId, status) => {
   const fromStatusMap = {
     processing: ["pending"],
@@ -48669,6 +48769,55 @@ var markMailboxStatus = (msgId, status) => {
     reason: "mailbox_poller"
   });
 };
+var failDepartmentWakeupMessages = (mailboxId, msgIds, reason) => {
+  const rows = msgIds.map((id) => db2.prepare(
+    `SELECT
+                id,
+                from_mailbox_id as fromMailboxId,
+                status,
+                origin_user_id as originUserId,
+                origin_platform as originPlatform,
+                thread_id as threadId
+             FROM mailbox
+             WHERE id = ?`
+  ).get(id)).filter(
+    (row) => Boolean(row && (row.status === "pending" || row.status === "processing"))
+  );
+  const bySender = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const senderRows = bySender.get(row.fromMailboxId) ?? [];
+    senderRows.push(row);
+    bySender.set(row.fromMailboxId, senderRows);
+  }
+  for (const [senderMailboxId, senderRows] of bySender.entries()) {
+    const changedRows = senderRows.filter((row) => updateMailboxMessageStatus(row.id, "failed", {
+      fromStatus: ["pending", "processing"],
+      actorMailboxId: mailboxId,
+      counterpartMailboxId: senderMailboxId,
+      reason: "department_agent_wakeup_terminal_failed"
+    }));
+    if (changedRows.length === 0) continue;
+    const first = changedRows[0];
+    const ids = changedRows.map((row) => row.id).join(", ");
+    sendMessage2(mailboxId, senderMailboxId, [
+      `[\u7CFB\u7EDF\u901A\u77E5] ${mailboxId} \u672C\u8F6E\u5904\u7406\u672A\u80FD\u6B63\u5E38\u5B8C\u6210\uFF0C\u5DF2\u505C\u6B62\u81EA\u52A8\u91CD\u8BD5\uFF0C\u907F\u514D\u540C\u4E00\u6279\u90AE\u4EF6\u88AB\u53CD\u590D\u6295\u9012\u3002`,
+      `\u5931\u8D25\u539F\u56E0: ${reason}`,
+      `\u53D7\u5F71\u54CD\u90AE\u4EF6: ${ids}`,
+      `\u8BF7\u4E0A\u6E38\u6839\u636E\u9700\u8981\u91CD\u65B0\u59D4\u6D3E\u3001\u8865\u5145\u4E0A\u4E0B\u6587\uFF0C\u6216\u4EBA\u5DE5\u68C0\u67E5\u8BE5\u8D1F\u8D23\u4EBA\u3002`
+    ].join("\n"), {
+      originUserId: first.originUserId,
+      originPlatform: first.originPlatform,
+      threadId: first.threadId || first.id,
+      parentMessageId: first.id,
+      auditDetail: {
+        fallbackReason: "department_agent_wakeup_terminal_failed",
+        affectedMessageIds: changedRows.map((row) => row.id),
+        error: reason
+      }
+    });
+    console.warn(`[mailbox] department agent ${mailboxId} \u7EC8\u6B62\u5931\u8D25\uFF0C\u5DF2\u5C06 ${changedRows.length} \u5C01\u90AE\u4EF6\u6807\u8BB0 failed \u5E76\u901A\u77E5 ${senderMailboxId}`);
+  }
+};
 var handleCeoFollowupGroup = async (followups) => {
   const originUserId = followups[0].originUserId;
   const originPlatform = followups[0].originPlatform;
@@ -48817,6 +48966,10 @@ var wakeDepartmentAgent = async (mailboxId, msgIds) => {
     finalizeDepartmentAgentUnrepliedMessages(mailboxId, msgIds, result);
   } catch (err) {
     console.error(`[mailbox] \u5524\u9192 department agent ${mailboxId} \u5931\u8D25:`, err);
+    if (isMaxIterationsError(err)) {
+      failDepartmentWakeupMessages(mailboxId, msgIds, err.message);
+      return;
+    }
     for (const id of msgIds) {
       updateMailboxMessageStatus(id, "pending", {
         fromStatus: "processing",
@@ -48932,10 +49085,14 @@ var pollMailbox = async () => {
     const livenessSnapshot = getMailboxLivenessSnapshot();
     logMailboxPollerHeartbeat(livenessSnapshot);
     await reportMailboxLiveness(livenessSnapshot);
-    const mailBoxMsgs = selectStmt.all("pending");
+    const allPendingMailboxMsgs = selectStmt.all("pending");
+    const mailBoxMsgs = allPendingMailboxMsgs.filter(
+      (msg) => msg.toMailboxId === "manager" || !inFlightDepartmentMailboxes.has(msg.toMailboxId)
+    );
     const pendingFollowups = listPendingCeoFollowups();
     if (mailBoxMsgs.length === 0 && pendingFollowups.length === 0) return;
-    console.log(`[mailbox] \u62C9\u53D6\u5230 ${mailBoxMsgs.length} \u6761\u5F85\u5904\u7406\u6D88\u606F`);
+    const skippedInFlight = allPendingMailboxMsgs.length - mailBoxMsgs.length;
+    console.log(`[mailbox] \u62C9\u53D6\u5230 ${mailBoxMsgs.length} \u6761\u53EF\u8C03\u5EA6\u5F85\u5904\u7406\u6D88\u606F${skippedInFlight > 0 ? `\uFF0C\u8DF3\u8FC7 ${skippedInFlight} \u6761 in-flight mailbox \u6D88\u606F` : ""}`);
     const grouped = /* @__PURE__ */ new Map();
     for (const msg of mailBoxMsgs) {
       const group = grouped.get(msg.toMailboxId) || [];
@@ -49079,6 +49236,7 @@ ${workspacePath ? `
 ` : ""}
 <Mailbox \u5DE5\u4F5C\u65B9\u5F0F>
 \u4F60\u901A\u8FC7\u90AE\u7BB1\u548C\u540C\u4E8B\u534F\u4F5C\u3002\u6536\u5230\u65B0\u90AE\u4EF6\u63D0\u9192\u540E\uFF0C\u7528 list_mailbox \u770B\u770B\u6709\u54EA\u4E9B\u5F85\u5904\u7406\u7684\u90AE\u4EF6\uFF0C\u6311\u4E00\u5C01\u7528 get_mailbox \u9886\u53D6\u5E76\u8BFB\u5168\u6587\uFF0C\u628A\u5B83\u505A\u5B8C\u6216\u95EE\u6E05\u695A\uFF0C\u518D\u56DE\u590D\u3002\u5904\u7406\u5B8C\u4E00\u5C01\u7EE7\u7EED list_mailbox \u770B\u4E0B\u4E00\u5C01\u3002
+list_mailbox \u53EA\u662F\u961F\u5217\u5165\u53E3\uFF0C\u4E0D\u662F\u7B49\u5F85\u52A8\u4F5C\uFF1B\u540C\u4E00\u8F6E\u770B\u8FC7\u5217\u8868\u540E\uFF0C\u4E0B\u4E00\u6B65\u5FC5\u987B\u5BF9\u5176\u4E2D\u4E00\u5C01\u90AE\u4EF6\u8C03\u7528 get_mailbox\u3001reply_mailbox\u3001mailbox_followup\u3001discard_mailbox \u6216 department_communicate\uFF0C\u7981\u6B62\u8FDE\u7EED\u91CD\u590D list_mailbox \u7A7A\u8F6C\u3002
 
 \u51E0\u4E2A\u5DE5\u5177\u7684\u542B\u4E49\u8981\u5206\u6E05\uFF0C\u522B\u53EA\u7528\u81EA\u7136\u8BED\u8A00\u8BF4\u8BF4\u5C31\u7B97\u6570\uFF1A
 - mailbox_followup(message_id, content)\uFF1A\u5728\u540C\u4E00\u7EBF\u7A0B\u91CC\u7EE7\u7EED\u6C9F\u901A\u2014\u2014\u540C\u6B65\u8FDB\u5C55\u3001\u8865\u5145\u7ED3\u679C\u3001\u8865\u5145\u4E0A\u4E0B\u6587\u6216\u8BE2\u95EE\u72B6\u6001\uFF1B\u53EF\u4EE5\u591A\u6B21\uFF0C\u4E0D\u4F1A\u7ED3\u675F\u8FD9\u5C01\u90AE\u4EF6\u3002
@@ -54107,7 +54265,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.9.15" : "unknown",
+    version: true ? "1.9.16" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version