duclaw-cli 1.8.32 → 1.8.34

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.32" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.34" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -37599,7 +37599,10 @@ var createAnthropicAdapter = (options) => {
         }, chatOptions?.requestId ? {
           headers: {
             "X-Duclaw-Request-Id": chatOptions.requestId
-          }
+          },
+          signal: chatOptions.signal
+        } : chatOptions?.signal ? {
+          signal: chatOptions.signal
         } : void 0);
         if (!sdkResponse.stop_reason) {
           console.error(`${sdkResponse}`);
@@ -41567,7 +41570,7 @@ var markRunning = (userId) => {
     current.startedAt = Date.now();
     return;
   }
-  registry.set(userId, { messages: [], startedAt: Date.now() });
+  registry.set(userId, { messages: [], startedAt: Date.now(), listeners: /* @__PURE__ */ new Set() });
 };
 var markDone = (userId) => {
   registry.delete(userId);
@@ -41581,8 +41584,23 @@ var queueInterrupt = (userId, message) => {
   const interruptMessage = typeof message === "string" ? { content: message } : message;
   entry.messages.push(interruptMessage);
   console.log(`[interrupt] \u7528\u6237 ${userId} \u65B0\u6D88\u606F\u5DF2\u5165\u961F\uFF0C\u5F53\u524D\u961F\u5217\u957F\u5EA6: ${entry.messages.length}`);
+  for (const listener of entry.listeners) {
+    try {
+      listener();
+    } catch (err) {
+      console.warn(`[interrupt] \u7528\u6237 ${userId} \u4E2D\u65AD\u76D1\u542C\u5668\u6267\u884C\u5931\u8D25: ${err.message}`);
+    }
+  }
   return true;
 };
+var registerInterruptListener = (userId, listener) => {
+  const entry = registry.get(userId);
+  if (!entry) return () => void 0;
+  entry.listeners.add(listener);
+  return () => {
+    entry.listeners.delete(listener);
+  };
+};
 var drainInterrupts = (userId) => {
   const entry = registry.get(userId);
   if (!entry || entry.messages.length === 0) return [];
@@ -42713,7 +42731,7 @@ var checkDepartmentReplies = {
         `- \u8FD9\u4E0D\u662F\u8BA9 CEO \u4EB2\u81EA read/bash/\u6D4B\u8BD5/\u6539\u4EE3\u7801\u7684\u4FE1\u53F7\u3002`,
         `- \u5982\u679C\u7528\u6237\u6B63\u5728\u7B49\u5F85\uFF0C\u8BF7\u5148\u7528 send_message \u7B80\u77ED\u8BF4\u660E\u201C\u8D1F\u8D23\u4EBA\u8FD8\u5728\u5904\u7406\uFF0C\u6211\u7A0D\u540E\u540C\u6B65\u7ED3\u679C\u201D\u3002`,
         `- \u5982\u679C\u5DF2\u7ECF\u7B49\u5F85\u8F83\u4E45\uFF0C\u4F7F\u7528 mailbox_followup \u6216 department_communicate \u50AC\u95EE\u5BF9\u5E94 Department Head \u7684\u771F\u5B9E\u8FDB\u5C55\u3001\u963B\u585E\u9879\u548C\u9884\u8BA1\u5B8C\u6210\u65F6\u95F4\u3002`,
-        `- \u4E4B\u540E\u518D\u8C03\u7528 check_department_replies \u67E5\u770B\u56DE\u4FE1\u3002`
+        `- \u672C\u8F6E\u4E0D\u8981\u8FDE\u7EED\u91CD\u590D\u8C03\u7528 check_department_replies\uFF1B\u7B49\u5F85\u65B0\u7684\u90E8\u95E8\u56DE\u4FE1\u4E8B\u4EF6\u3001\u7528\u6237\u8FFD\u95EE\u6216\u50AC\u529E\u56DE\u4FE1\u540E\u518D\u67E5\u770B\u3002`
       ].join("\n");
     }
     const updateStmt = db3.prepare(`UPDATE mailbox SET status = 'read' WHERE id = ?`);
@@ -45201,6 +45219,10 @@ var assistantMessageFromResponse = (response) => ({
   ...response.providerResponseId ? { providerResponseId: response.providerResponseId } : {},
   ...response.model ? { model: response.model } : {}
 });
+var isAbortError2 = (error) => {
+  if (!(error instanceof Error)) return false;
+  return error.name === "AbortError" || error.message.includes("aborted") || error.message.includes("AbortError");
+};
 var llmRequestIdForTurn = (request, messages, system, tools) => {
   const hash = (0, import_node_crypto11.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}`;
@@ -45281,7 +45303,7 @@ The user will primarily request you perform software engineering tasks. This inc
 - \u53EA\u8981\u7EC4\u7EC7\u91CC\u5DF2\u7ECF\u5B58\u5728\u804C\u8D23\u5339\u914D\u7684 Department \u6216 Department Head\uFF0CCEO \u9ED8\u8BA4\u4E0D\u4EB2\u81EA\u505A\u8BE5\u4E13\u4E1A\u56E2\u961F\u8986\u76D6\u7684\u6267\u884C\u5DE5\u4F5C\u3002
 - \u201C\u4E13\u4E1A\u56E2\u961F\u8986\u76D6\u201D\u5305\u62EC\u4F46\u4E0D\u9650\u4E8E\uFF1A\u5199\u4EE3\u7801\u3001\u8BFB\u4EE3\u7801\u5B9A\u4F4D\u95EE\u9898\u3001\u6539\u6587\u4EF6\u3001\u8DD1\u6D4B\u8BD5\u3001\u8C03\u8BD5\u3001\u90E8\u7F72\u3001\u6570\u636E\u5904\u7406\u3001\u6587\u6863/\u97F3\u9891/\u56FE\u7247\u5904\u7406\u3001\u5916\u90E8 API \u9A8C\u8BC1\u3001\u62A5\u544A\u751F\u6210\u7B49\u3002
 - CEO \u7684\u6B63\u786E\u52A8\u4F5C\u662F department_list \u5B9A\u4F4D\u56E2\u961F\uFF0Cdepartment_communicate \u59D4\u6D3E\u6216\u8FFD\u95EE\uFF0Cmailbox_followup \u50AC\u529E/\u8865\u5145\u4E0A\u4E0B\u6587\uFF0Ccheck_department_replies \u6536\u96C6\u7ED3\u679C\uFF0C\u7136\u540E\u6C47\u603B\u7ED9\u7528\u6237\u3002
-- Department Head \u6682\u65E0\u56DE\u4FE1\u3001\u56DE\u590D\u6162\u3001\u6216 check_department_replies \u8FD4\u56DE\u7A7A\uFF0C\u4E0D\u6784\u6210 CEO \u4E0B\u573A\u5E72\u6D3B\u7684\u7406\u7531\uFF1B\u5E94\u8BE5\u7A0D\u540E\u518D\u67E5\u3001\u50AC\u95EE\u8D1F\u8D23\u4EBA\uFF0C\u6216\u7528 send_message \u544A\u8BC9\u7528\u6237\u201C\u56E2\u961F\u4ECD\u5728\u5904\u7406\uFF0C\u6211\u7A0D\u540E\u540C\u6B65\u201D\u3002
+- Department Head \u6682\u65E0\u56DE\u4FE1\u3001\u56DE\u590D\u6162\u3001\u6216 check_department_replies \u8FD4\u56DE\u7A7A\uFF0C\u4E0D\u6784\u6210 CEO \u4E0B\u573A\u5E72\u6D3B\u7684\u7406\u7531\uFF1B\u672C\u8F6E\u4E0D\u8981\u8FDE\u7EED\u91CD\u590D\u8C03\u7528 check_department_replies\uFF0C\u5E94\u8BE5\u50AC\u95EE\u8D1F\u8D23\u4EBA\uFF0C\u6216\u7528 send_message \u544A\u8BC9\u7528\u6237\u201C\u56E2\u961F\u4ECD\u5728\u5904\u7406\uFF0C\u6211\u7A0D\u540E\u540C\u6B65\u201D\u5E76\u7ED3\u675F\u5F53\u524D\u8F6E\u6B21\uFF0C\u7B49\u5F85\u65B0\u7684\u90E8\u95E8\u56DE\u4FE1\u4E8B\u4EF6\u6216\u7528\u6237\u8FFD\u95EE\u3002
 - \u53EA\u6709\u5728\u7528\u6237\u660E\u786E\u8981\u6C42\u201CCEO/\u4F60\u4EB2\u81EA\u505A\u201D\u3001\u6CA1\u6709\u4EFB\u4F55\u804C\u8D23\u5339\u914D\u56E2\u961F/\u8D1F\u8D23\u4EBA\u3001\u6216\u56E2\u961F\u660E\u786E\u5931\u8D25\u4E14\u7528\u6237\u540C\u610F CEO \u63A5\u7BA1\u65F6\uFF0CCEO \u624D\u80FD\u8D8A\u8FC7\u56E2\u961F\u4EB2\u81EA\u6267\u884C\u4E13\u4E1A\u5DE5\u4F5C\u3002
 
 ## \u8D23\u4EFB\u5F52\u5C5E\u786C\u89C4\u5219
@@ -45473,6 +45495,32 @@ var createAgent = (config2 = getDefaultAgentConfig()) => {
     const { userId, content, job } = request;
     const internalOnly = request.metadata?.internalOnly === true;
     const injectedEventIds = /* @__PURE__ */ new Set();
+    const interruptQueuedEventIds = /* @__PURE__ */ new Set();
+    let durableEventPoller;
+    let activeTurnAbortController;
+    let unregisterInterruptListener;
+    const markInterruptEventIdsInjected = (metadata) => {
+      const ids = Array.isArray(metadata?.agentEventIds) ? metadata.agentEventIds.filter((id) => typeof id === "string") : [];
+      if (ids.length === 0) return;
+      for (const id of ids) injectedEventIds.add(id);
+      markAgentEventsInjected(ids);
+    };
+    const queuePendingDurableEvents = () => {
+      try {
+        const events = listPendingAgentEvents(userId, 10).filter((event) => !injectedEventIds.has(event.id)).filter((event) => !interruptQueuedEventIds.has(event.id));
+        if (events.length === 0) return;
+        for (const event of events) interruptQueuedEventIds.add(event.id);
+        queueInterrupt(userId, {
+          content: renderAgentEventReminder(events),
+          metadata: {
+            trigger: "agent_events.pending",
+            agentEventIds: events.map((event) => event.id)
+          }
+        });
+      } catch (err) {
+        console.warn(`[agent_events] durable event poll failed: ${err.message}`);
+      }
+    };
     const prev = signals.get(userId);
     if (prev) {
       prev.abort();
@@ -45485,6 +45533,10 @@ var createAgent = (config2 = getDefaultAgentConfig()) => {
     };
     signals.set(userId, signal);
     markRunning(userId);
+    unregisterInterruptListener = registerInterruptListener(userId, () => {
+      activeTurnAbortController?.abort();
+    });
+    durableEventPoller = setInterval(queuePendingDurableEvents, 1e3);
     try {
       if (dreamEngine) {
         try {
@@ -45615,6 +45667,7 @@ ${notifText}
         const interrupts = drainInterrupts(userId);
         if (interrupts.length > 0) {
           for (const interrupt of interrupts) {
+            markInterruptEventIdsInjected(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) {
@@ -45709,19 +45762,32 @@ ${memoryInjection}` : "") + dreamInjection;
           }
         }
         let response;
+        const turnAbortController = new AbortController();
+        activeTurnAbortController = turnAbortController;
         try {
           response = await llm.chat(
             messages,
             effectiveSystemPrompt,
             tools,
-            { requestId: llmRequestIdForTurn(request, messages, effectiveSystemPrompt, tools) }
+            {
+              requestId: llmRequestIdForTurn(request, messages, effectiveSystemPrompt, tools),
+              signal: turnAbortController.signal
+            }
           );
         } catch (error) {
+          if (isAbortError2(error)) {
+            console.log(`[agent] \u5F53\u524D LLM \u8C03\u7528\u88AB\u4E2D\u65AD\uFF0C\u51C6\u5907\u6CE8\u5165 interrupt \u540E\u91CD\u65B0\u51B3\u7B56 userId=${userId}`);
+            continue;
+          }
           if (compactConfig.enabled && isPromptTooLongError(error) && contextRecoveryAttempts < compactConfig.maxFailures) {
             await recoverFromContextOverflow("prompt_too_long", messages, effectiveSystemPrompt);
             continue;
           }
           throw error;
+        } finally {
+          if (activeTurnAbortController === turnAbortController) {
+            activeTurnAbortController = void 0;
+          }
         }
         if (response.stopReason === "model_context_window_exceeded") {
           await recoverFromContextOverflow("model_context_window_exceeded", messages, effectiveSystemPrompt);
@@ -45815,6 +45881,7 @@ ${memoryInjection}` : "") + dreamInjection;
           if (lateInterrupts.length > 0) {
             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);
               const msg = interrupt.content;
               if (interrupt.metadata) {
                 request.metadata = {
@@ -45847,6 +45914,7 @@ ${msg}</user-interrupt>`
           if (lateInterrupts.length > 0) {
             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);
               const msg = interrupt.content;
               if (interrupt.metadata) {
                 request.metadata = {
@@ -45891,6 +45959,9 @@ ${msg}</user-interrupt>`
       }
       throw new Error(`\u8FBE\u5230\u6700\u5927\u8FED\u4EE3\u6B21\u6570:${maxIterations}`);
     } finally {
+      if (durableEventPoller) clearInterval(durableEventPoller);
+      unregisterInterruptListener?.();
+      activeTurnAbortController?.abort();
       markDone(userId);
       signals.delete(userId);
     }
@@ -46738,6 +46809,8 @@ var finalizeDepartmentAgentUnrepliedMessages = (mailboxId, msgIds, result) => {
   }
 };
 var polling = false;
+var inFlightDepartmentMailboxes = /* @__PURE__ */ new Set();
+var inFlightCeoReplyMessages = /* @__PURE__ */ new Set();
 var pollMailbox = async () => {
   if (polling) return;
   polling = true;
@@ -46754,21 +46827,30 @@ var pollMailbox = async () => {
     const ceoMsgs = grouped.get("manager") || [];
     grouped.delete("manager");
     for (const msg of ceoMsgs) {
+      if (inFlightCeoReplyMessages.has(msg.id)) continue;
+      inFlightCeoReplyMessages.add(msg.id);
       console.log(`[mailbox] \u6536\u5230 department agent \u56DE\u4FE1\uFF08\u6765\u81EA ${msg.fromMailboxId}\uFF09\uFF0C\u6B63\u5728\u5524\u9192\u4E3B agent...`);
-      try {
-        markMailboxStatus(msg.id, "processing");
-        await handleCeoReply(msg);
-        markMailboxStatus(msg.id, "done");
-      } catch (err) {
-        console.error(`[mailbox] \u5524\u9192\u4E3B agent \u5904\u7406\u56DE\u4FE1\u5931\u8D25:`, err);
-        markMailboxStatus(msg.id, "failed");
-      }
+      void (async () => {
+        try {
+          markMailboxStatus(msg.id, "processing");
+          await handleCeoReply(msg);
+          markMailboxStatus(msg.id, "done");
+        } catch (err) {
+          console.error(`[mailbox] \u5524\u9192\u4E3B agent \u5904\u7406\u56DE\u4FE1\u5931\u8D25:`, err);
+          markMailboxStatus(msg.id, "failed");
+        } finally {
+          inFlightCeoReplyMessages.delete(msg.id);
+        }
+      })();
     }
-    const tasks = Array.from(grouped.entries()).map(async ([mailboxId, msgs]) => {
+    for (const [mailboxId, msgs] of grouped.entries()) {
+      if (inFlightDepartmentMailboxes.has(mailboxId)) continue;
+      inFlightDepartmentMailboxes.add(mailboxId);
       const msgIds = msgs.map((m) => m.id);
-      await wakeDepartmentAgent(mailboxId, msgIds);
-    });
-    await Promise.all(tasks);
+      void wakeDepartmentAgent(mailboxId, msgIds).finally(() => {
+        inFlightDepartmentMailboxes.delete(mailboxId);
+      });
+    }
   } catch (err) {
     console.error("[mailbox] \u62C9\u53D6\u5931\u8D25:", err);
   } finally {
@@ -51850,7 +51932,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.32" : "unknown",
+    version: true ? "1.8.34" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version