duclaw-cli 1.8.31 → 1.8.33

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.31" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.33" : "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}`);
@@ -41404,10 +41407,10 @@ var goalDelete = {
 };
 
 // src/tools/tools/department/DepartmentCreate.ts
-var import_node_crypto4 = require("node:crypto");
+var import_node_crypto5 = require("node:crypto");
 
 // src/department/mailbox/mailbox.ts
-var import_node_crypto3 = require("node:crypto");
+var import_node_crypto4 = require("node:crypto");
 
 // src/db/createDB.ts
 var import_better_sqlite3 = __toESM(require("better-sqlite3"));
@@ -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 [];
@@ -41592,8 +41610,148 @@ var drainInterrupts = (userId) => {
   return messages;
 };
 
-// src/department/mailbox/events.ts
+// src/agent/events.ts
 var import_node_crypto2 = require("node:crypto");
+var rowToEvent = (row) => ({
+  id: row.id,
+  userId: row.userId,
+  type: row.type,
+  source: row.source,
+  sourceId: row.sourceId,
+  status: row.status,
+  payload: JSON.parse(row.payloadJson || "{}"),
+  createdAt: row.createdAt,
+  injectedAt: row.injectedAt ?? void 0,
+  handledAt: row.handledAt ?? void 0,
+  updatedAt: row.updatedAt
+});
+var recordAgentEvent = (input) => {
+  const db3 = createSqliteDB();
+  const now = Date.now();
+  const id = `evt_${(0, import_node_crypto2.randomUUID)().slice(0, 12)}`;
+  const payloadJson = JSON.stringify(input.payload);
+  db3.prepare(`
+        INSERT INTO agent_events (
+            id, user_id, type, source, source_id, status, payload_json, created_at, updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT(type, source, source_id) DO UPDATE SET
+            user_id = excluded.user_id,
+            status = CASE
+                WHEN agent_events.status IN ('handled', 'ignored') THEN agent_events.status
+                ELSE excluded.status
+            END,
+            payload_json = excluded.payload_json,
+            updated_at = excluded.updated_at
+    `).run(
+    id,
+    input.userId,
+    input.type,
+    input.source,
+    input.sourceId,
+    input.status ?? "pending",
+    payloadJson,
+    now,
+    now
+  );
+  const row = db3.prepare(`
+        SELECT
+            id,
+            user_id as userId,
+            type,
+            source,
+            source_id as sourceId,
+            status,
+            payload_json as payloadJson,
+            created_at as createdAt,
+            injected_at as injectedAt,
+            handled_at as handledAt,
+            updated_at as updatedAt
+        FROM agent_events
+        WHERE type = ? AND source = ? AND source_id = ?
+    `).get(input.type, input.source, input.sourceId);
+  return rowToEvent(row);
+};
+var listPendingAgentEvents = (userId, limit = 10) => {
+  const db3 = createSqliteDB();
+  const rows = db3.prepare(`
+        SELECT
+            id,
+            user_id as userId,
+            type,
+            source,
+            source_id as sourceId,
+            status,
+            payload_json as payloadJson,
+            created_at as createdAt,
+            injected_at as injectedAt,
+            handled_at as handledAt,
+            updated_at as updatedAt
+        FROM agent_events
+        WHERE user_id = ?
+          AND status IN ('pending', 'processing')
+        ORDER BY created_at ASC
+        LIMIT ?
+    `).all(userId, limit);
+  return rows.map(rowToEvent);
+};
+var markAgentEventsInjected = (eventIds) => {
+  if (eventIds.length === 0) return;
+  const db3 = createSqliteDB();
+  const now = Date.now();
+  const stmt = db3.prepare(`
+        UPDATE agent_events
+        SET status = CASE WHEN status = 'pending' THEN 'processing' ELSE status END,
+            injected_at = COALESCE(injected_at, ?),
+            updated_at = ?
+        WHERE id = ?
+          AND status IN ('pending', 'processing')
+    `);
+  const tx = db3.transaction((ids) => {
+    for (const id of ids) stmt.run(now, now, id);
+  });
+  tx(eventIds);
+};
+var markAgentEventsHandled = (eventIds, status = "handled") => {
+  if (eventIds.length === 0) return;
+  const db3 = createSqliteDB();
+  const now = Date.now();
+  const stmt = db3.prepare(`
+        UPDATE agent_events
+        SET status = ?,
+            handled_at = COALESCE(handled_at, ?),
+            updated_at = ?
+        WHERE id = ?
+          AND status IN ('pending', 'processing')
+    `);
+  const tx = db3.transaction((ids) => {
+    for (const id of ids) stmt.run(status, now, now, id);
+  });
+  tx(eventIds);
+};
+var renderAgentEventReminder = (events) => {
+  if (events.length === 0) return "";
+  const lines = events.map((event) => {
+    const owner = typeof event.payload.ownerMailboxId === "string" ? event.payload.ownerMailboxId : void 0;
+    const mailboxMessageId = typeof event.payload.mailboxMessageId === "string" ? event.payload.mailboxMessageId : event.sourceId;
+    const summary = typeof event.payload.summary === "string" ? event.payload.summary : typeof event.payload.contentPreview === "string" ? event.payload.contentPreview : "";
+    return [
+      `- eventId=${event.id}`,
+      `type=${event.type}`,
+      owner ? `owner=${owner}` : "",
+      mailboxMessageId ? `mailboxMessageId=${mailboxMessageId}` : "",
+      summary ? `summary=${summary}` : ""
+    ].filter(Boolean).join(" ");
+  }).join("\n");
+  return `<system-reminder>
+\u672C\u8F6E\u6709 ${events.length} \u6761\u5185\u90E8\u4E8B\u4EF6\u53EF\u7528\uFF1A
+${lines}
+
+\u8FD9\u4E9B\u4E8B\u4EF6\u4E0D\u662F\u7528\u6237\u7684\u65B0\u8BF7\u6C42\uFF0C\u4E5F\u4E0D\u5E94\u8BE5\u4F5C\u4E3A\u7528\u6237\u786E\u8BA4\u3002\u82E5\u4E8B\u4EF6\u7C7B\u578B\u662F mailbox.message_received\uFF0C\u8868\u793A\u4F60\u7684 mailbox \u5728\u5F53\u524D\u5DE5\u4F5C\u671F\u95F4\u6536\u5230\u65B0\u5185\u90E8\u534F\u4F5C\u6D88\u606F\uFF1B\u8BF7\u5C3D\u5FEB\u8C03\u7528 list_mailbox \u67E5\u770B\u961F\u5217\uFF0C\u5E76\u5728\u9700\u8981\u65F6\u7528 get_mailbox(message_id) \u9886\u53D6\u5173\u8054\u6D88\u606F\u3002\u4E0D\u8981\u76F4\u63A5\u628A\u4E8B\u4EF6\u5F53\u4F5C\u5DF2\u9886\u53D6\u90AE\u4EF6\u3002\u8BF7\u53EA\u5728\u9700\u8981\u65F6\u81EA\u7136\u5730\u6C47\u603B\u7ED9\u7528\u6237\uFF1B\u5982\u9700\u7EE7\u7EED\u534F\u4F5C\uFF0C\u4F18\u5148\u4F7F\u7528\u4E8B\u4EF6\u4E2D\u5173\u8054\u7684 mailboxMessageId/thread \u7EE7\u7EED\u5904\u7406\u3002\u4E0D\u8981\u590D\u8FF0\u672C system-reminder\u3002
+</system-reminder>`;
+};
+
+// src/department/mailbox/events.ts
+var import_node_crypto3 = require("node:crypto");
 var parseDetail = (detailJson) => {
   if (!detailJson) return void 0;
   try {
@@ -41634,7 +41792,7 @@ var mapMailboxEventRow = (row) => {
 var recordMailboxEvent = (input) => {
   const db3 = createSqliteDB();
   const event = {
-    id: (0, import_node_crypto2.randomUUID)().slice(0, 12),
+    id: (0, import_node_crypto3.randomUUID)().slice(0, 12),
     messageId: input.messageId,
     mailboxId: input.mailboxId,
     actorMailboxId: input.actorMailboxId,
@@ -41979,6 +42137,24 @@ var queueMailboxInterruptIfRunning = (msg) => {
     console.log(`[mailbox] \u76EE\u6807 agent ${msg.toMailboxId} \u6B63\u5728\u8FD0\u884C\uFF0C\u5DF2\u5C06\u65B0\u90AE\u4EF6 ${msg.id} \u4F5C\u4E3A\u4E2D\u65AD\u63D0\u9192\u5165\u961F`);
   }
 };
+var recordMailboxReceivedAgentEvent = (msg) => {
+  if (msg.toMailboxId === "manager") return;
+  recordAgentEvent({
+    userId: msg.toMailboxId,
+    type: "mailbox.message_received",
+    source: "mailbox",
+    sourceId: msg.id,
+    payload: {
+      ownerMailboxId: msg.toMailboxId,
+      mailboxMessageId: msg.id,
+      fromMailboxId: msg.fromMailboxId,
+      toMailboxId: msg.toMailboxId,
+      threadId: msg.threadId || msg.id,
+      contentPreview: msg.content.slice(0, 160),
+      summary: `\u6536\u5230\u6765\u81EA ${msg.fromMailboxId} \u7684\u65B0\u5185\u90E8\u534F\u4F5C\u6D88\u606F\uFF0C\u8BF7\u7528 list_mailbox/get_mailbox \u8BC4\u4F30\u5E76\u9886\u53D6\u3002`
+    }
+  });
+};
 var sendMessage2 = (fromMailboxId, toMailboxId, content, options) => {
   const db3 = createSqliteDB();
   const stmt = db3.prepare(`insert into mailbox (
@@ -41993,7 +42169,7 @@ var sendMessage2 = (fromMailboxId, toMailboxId, content, options) => {
         thread_id,
         parent_message_id
     ) values (?,?,?,?,?,?,?,?,?,?) `);
-  const id = (0, import_node_crypto3.randomUUID)().slice(0, 8);
+  const id = (0, import_node_crypto4.randomUUID)().slice(0, 8);
   const threadId = options?.threadId || id;
   let mailboxMsg = {
     id,
@@ -42031,6 +42207,7 @@ var sendMessage2 = (fromMailboxId, toMailboxId, content, options) => {
     },
     createdAt: mailboxMsg.sendTime
   });
+  recordMailboxReceivedAgentEvent(mailboxMsg);
   queueMailboxInterruptIfRunning(mailboxMsg);
   return mailboxMsg;
 };
@@ -42109,7 +42286,7 @@ var departmentCreate = {
       return `[departmentCreate] \u4E0D\u5B58\u5728 id=${sourceGoalId} \u7684\u76EE\u6807`;
     }
     let departmentDefinition = {
-      id: (0, import_node_crypto4.randomUUID)().slice(0, 8),
+      id: (0, import_node_crypto5.randomUUID)().slice(0, 8),
       name,
       charter,
       sourceGoalId,
@@ -42323,7 +42500,7 @@ var departmentList = {
 };
 
 // src/tools/tools/department/DepartmentMemberCreate.ts
-var import_node_crypto5 = require("node:crypto");
+var import_node_crypto6 = require("node:crypto");
 var DESCRIPTION24 = `
 \u521B\u5EFA\u90E8\u95E8\u6210\u5458\u3002
 
@@ -42389,7 +42566,7 @@ var departmentMemberCreate = {
       }
     }
     let departmentMember = {
-      id: (0, import_node_crypto5.randomUUID)().slice(0, 8),
+      id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
       name,
       departmentId: department.id,
       mailBoxId: getMailBoxId(department.name, name),
@@ -42580,7 +42757,7 @@ ${replies}`;
 // src/department/learning.ts
 var import_node_fs4 = require("node:fs");
 var import_node_path12 = __toESM(require("node:path"));
-var import_node_crypto6 = require("node:crypto");
+var import_node_crypto7 = require("node:crypto");
 
 // src/skill/SkillValidator.ts
 var import_node_fs3 = require("node:fs");
@@ -42818,7 +42995,7 @@ var listDepartmentMemories = (departmentName) => {
 var createDepartmentMemory = (departmentName, input) => {
   const now = Date.now();
   const memory = {
-    id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
+    id: (0, import_node_crypto7.randomUUID)().slice(0, 8),
     departmentName,
     title: input.title,
     content: input.content,
@@ -42869,7 +43046,7 @@ ${formatSkillValidationIssues(validation)}`);
   }
   const now = Date.now();
   const skill = {
-    id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
+    id: (0, import_node_crypto7.randomUUID)().slice(0, 8),
     departmentName,
     skillName: input.skillName,
     description: input.description,
@@ -42921,7 +43098,7 @@ var createDepartmentProposal = (input) => {
   const records = readJsonArray(proposalsPath());
   const proposal = {
     ...input,
-    id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
+    id: (0, import_node_crypto7.randomUUID)().slice(0, 8),
     status: "pending",
     createdAt: Date.now()
   };
@@ -43252,7 +43429,7 @@ var mailboxFollowup = {
 
 // src/tools/tools/Bash.ts
 var import_node_child_process = require("node:child_process");
-var import_node_crypto7 = require("node:crypto");
+var import_node_crypto8 = require("node:crypto");
 var import_node_fs5 = require("node:fs");
 var DESCRIPTION29 = `\u5728\u7CFB\u7EDF shell \u4E2D\u6267\u884C\u547D\u4EE4\u3002
 
@@ -43456,7 +43633,7 @@ var bashTool = {
         ...options,
         stdio: ["pipe", "pipe", "pipe"]
       });
-      const id = (0, import_node_crypto7.randomUUID)().slice(0, 8);
+      const id = (0, import_node_crypto8.randomUUID)().slice(0, 8);
       const session = {
         id,
         command,
@@ -44037,7 +44214,7 @@ var readDreamHistoryLimit = () => {
 var import_node_fs6 = require("node:fs");
 var import_node_os2 = require("node:os");
 var import_node_path13 = require("node:path");
-var import_node_crypto8 = require("node:crypto");
+var import_node_crypto9 = require("node:crypto");
 var SkillForgeEngine = class {
   proposalStorage;
   draftRoot;
@@ -44071,7 +44248,7 @@ ${formatSkillValidationIssues(validation)}`);
     if (pending.some((p) => p.skillName === skillName)) {
       return null;
     }
-    const id = (0, import_node_crypto8.randomBytes)(4).toString("hex");
+    const id = (0, import_node_crypto9.randomBytes)(4).toString("hex");
     const draftDir = (0, import_node_path13.join)(this.draftRoot, userId, id);
     (0, import_node_fs6.mkdirSync)(draftDir, { recursive: true });
     (0, import_node_fs6.writeFileSync)((0, import_node_path13.join)(draftDir, "SKILL.md"), skillMd, "utf-8");
@@ -44353,7 +44530,7 @@ var skillForgeDrop = (engine) => ({
 });
 
 // src/memory/MemoryEngine.ts
-var import_node_crypto9 = require("node:crypto");
+var import_node_crypto10 = require("node:crypto");
 var MemoryEngine = class {
   storage;
   recallIndexStorage;
@@ -44381,7 +44558,7 @@ var MemoryEngine = class {
     }
     const now = Date.now();
     const memory = {
-      id: (0, import_node_crypto9.randomBytes)(4).toString("hex"),
+      id: (0, import_node_crypto10.randomBytes)(4).toString("hex"),
       userId,
       title,
       content,
@@ -45033,146 +45210,6 @@ var microCompactMessages = (messages, config2) => {
   };
 };
 
-// src/agent/events.ts
-var import_node_crypto10 = require("node:crypto");
-var rowToEvent = (row) => ({
-  id: row.id,
-  userId: row.userId,
-  type: row.type,
-  source: row.source,
-  sourceId: row.sourceId,
-  status: row.status,
-  payload: JSON.parse(row.payloadJson || "{}"),
-  createdAt: row.createdAt,
-  injectedAt: row.injectedAt ?? void 0,
-  handledAt: row.handledAt ?? void 0,
-  updatedAt: row.updatedAt
-});
-var recordAgentEvent = (input) => {
-  const db3 = createSqliteDB();
-  const now = Date.now();
-  const id = `evt_${(0, import_node_crypto10.randomUUID)().slice(0, 12)}`;
-  const payloadJson = JSON.stringify(input.payload);
-  db3.prepare(`
-        INSERT INTO agent_events (
-            id, user_id, type, source, source_id, status, payload_json, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT(type, source, source_id) DO UPDATE SET
-            user_id = excluded.user_id,
-            status = CASE
-                WHEN agent_events.status IN ('handled', 'ignored') THEN agent_events.status
-                ELSE excluded.status
-            END,
-            payload_json = excluded.payload_json,
-            updated_at = excluded.updated_at
-    `).run(
-    id,
-    input.userId,
-    input.type,
-    input.source,
-    input.sourceId,
-    input.status ?? "pending",
-    payloadJson,
-    now,
-    now
-  );
-  const row = db3.prepare(`
-        SELECT
-            id,
-            user_id as userId,
-            type,
-            source,
-            source_id as sourceId,
-            status,
-            payload_json as payloadJson,
-            created_at as createdAt,
-            injected_at as injectedAt,
-            handled_at as handledAt,
-            updated_at as updatedAt
-        FROM agent_events
-        WHERE type = ? AND source = ? AND source_id = ?
-    `).get(input.type, input.source, input.sourceId);
-  return rowToEvent(row);
-};
-var listPendingAgentEvents = (userId, limit = 10) => {
-  const db3 = createSqliteDB();
-  const rows = db3.prepare(`
-        SELECT
-            id,
-            user_id as userId,
-            type,
-            source,
-            source_id as sourceId,
-            status,
-            payload_json as payloadJson,
-            created_at as createdAt,
-            injected_at as injectedAt,
-            handled_at as handledAt,
-            updated_at as updatedAt
-        FROM agent_events
-        WHERE user_id = ?
-          AND status IN ('pending', 'processing')
-        ORDER BY created_at ASC
-        LIMIT ?
-    `).all(userId, limit);
-  return rows.map(rowToEvent);
-};
-var markAgentEventsInjected = (eventIds) => {
-  if (eventIds.length === 0) return;
-  const db3 = createSqliteDB();
-  const now = Date.now();
-  const stmt = db3.prepare(`
-        UPDATE agent_events
-        SET status = CASE WHEN status = 'pending' THEN 'processing' ELSE status END,
-            injected_at = COALESCE(injected_at, ?),
-            updated_at = ?
-        WHERE id = ?
-          AND status IN ('pending', 'processing')
-    `);
-  const tx = db3.transaction((ids) => {
-    for (const id of ids) stmt.run(now, now, id);
-  });
-  tx(eventIds);
-};
-var markAgentEventsHandled = (eventIds, status = "handled") => {
-  if (eventIds.length === 0) return;
-  const db3 = createSqliteDB();
-  const now = Date.now();
-  const stmt = db3.prepare(`
-        UPDATE agent_events
-        SET status = ?,
-            handled_at = COALESCE(handled_at, ?),
-            updated_at = ?
-        WHERE id = ?
-          AND status IN ('pending', 'processing')
-    `);
-  const tx = db3.transaction((ids) => {
-    for (const id of ids) stmt.run(status, now, now, id);
-  });
-  tx(eventIds);
-};
-var renderAgentEventReminder = (events) => {
-  if (events.length === 0) return "";
-  const lines = events.map((event) => {
-    const owner = typeof event.payload.ownerMailboxId === "string" ? event.payload.ownerMailboxId : void 0;
-    const mailboxMessageId = typeof event.payload.mailboxMessageId === "string" ? event.payload.mailboxMessageId : event.sourceId;
-    const summary = typeof event.payload.summary === "string" ? event.payload.summary : typeof event.payload.contentPreview === "string" ? event.payload.contentPreview : "";
-    return [
-      `- eventId=${event.id}`,
-      `type=${event.type}`,
-      owner ? `owner=${owner}` : "",
-      mailboxMessageId ? `mailboxMessageId=${mailboxMessageId}` : "",
-      summary ? `summary=${summary}` : ""
-    ].filter(Boolean).join(" ");
-  }).join("\n");
-  return `<system-reminder>
-\u672C\u8F6E\u6709 ${events.length} \u6761\u5185\u90E8\u4E8B\u4EF6\u53EF\u7528\uFF1A
-${lines}
-
-\u8FD9\u4E9B\u4E8B\u4EF6\u4E0D\u662F\u7528\u6237\u7684\u65B0\u8BF7\u6C42\uFF0C\u4E5F\u4E0D\u5E94\u8BE5\u4F5C\u4E3A\u7528\u6237\u786E\u8BA4\u3002\u8BF7\u53EA\u5728\u9700\u8981\u65F6\u81EA\u7136\u5730\u6C47\u603B\u7ED9\u7528\u6237\uFF1B\u5982\u9700\u7EE7\u7EED\u534F\u4F5C\uFF0C\u4F18\u5148\u4F7F\u7528\u4E8B\u4EF6\u4E2D\u5173\u8054\u7684 mailboxMessageId/thread \u7EE7\u7EED\u5904\u7406\u3002\u4E0D\u8981\u590D\u8FF0\u672C system-reminder\u3002
-</system-reminder>`;
-};
-
 // src/agent/createAgent.ts
 var DEFAULT_WORKSPACE_PATH = getDuclawWorkspaceDir();
 var assistantMessageFromResponse = (response) => ({
@@ -45182,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}`;
@@ -45454,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();
@@ -45466,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 {
@@ -45596,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) {
@@ -45690,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);
@@ -45796,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 = {
@@ -45828,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 = {
@@ -45872,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);
     }
@@ -46719,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;
@@ -46735,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 {
@@ -51831,7 +51932,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.31" : "unknown",
+    version: true ? "1.8.33" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version