duclaw-cli 1.8.39 → 1.8.41

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.39" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.41" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -42682,6 +42682,18 @@ var departmentCreate = {
 
 // src/tools/tools/department/DepartmentCommunicate.ts
 var CEO_MAILBOX_ID = `manager`;
+var MANAGER_ALIAS_PATTERN = /(^|::)(manager|main[-_\s]?manager|ceo)$/i;
+var looksLikePseudoManagerMailbox = (mailboxId) => {
+  if (mailboxId === CEO_MAILBOX_ID) return true;
+  if (!mailboxId.includes(`::`)) return false;
+  return MANAGER_ALIAS_PATTERN.test(mailboxId.trim());
+};
+var buildManagerRoutingRejection = (activeContext) => [
+  `[departmentCommunicate] \u62D2\u7EDD\u53D1\u9001\u5230\u4F2A manager mailbox\u3002`,
+  `Main Manager/CEO \u4E0D\u662F\u90E8\u95E8\u6210\u5458\uFF0C\u4E0D\u80FD\u7528 department_communicate \u53D1\u9001\u5230 manager\u3001Department::Manager\u3001CEO::Manager \u7B49\u5730\u5740\u3002`,
+  activeContext ? `\u5982\u679C\u8981\u5411\u4E0A\u6E38 CEO \u6C47\u62A5\uFF0C\u8BF7\u8C03\u7528 reply_mailbox(message_id="${activeContext.id}", content="...") \u6B63\u5F0F\u56DE\u590D\u539F\u90AE\u4EF6\uFF1B\u82E5\u53EA\u662F\u540C\u6B65\u9636\u6BB5\u8FDB\u5C55\uFF0C\u8BF7\u8C03\u7528 mailbox_followup(message_id="${activeContext.id}", content="...", kind="progress")\u3002` : `\u5982\u679C\u8981\u5411\u4E0A\u6E38 CEO \u6C47\u62A5\uFF0C\u8BF7\u56DE\u5230\u539F manager \u90AE\u4EF6\uFF0C\u4F7F\u7528 reply_mailbox(message_id="\u539F\u90AE\u4EF6ID", content="...") \u6216 mailbox_followup(message_id="\u539F\u90AE\u4EF6ID", content="...", kind="progress")\u3002`
+].join(`
+`);
 var getActiveMailboxContext = (actorMailboxId, messageId) => {
   if (!messageId) return null;
   const db3 = createSqliteDB();
@@ -42708,6 +42720,7 @@ var DESCRIPTION21 = `
 - CEO \u9ED8\u8BA4\u901A\u8FC7 department_list \u53EA\u770B\u5230\u90E8\u95E8\u548C Department Head\uFF0C\u4E0D\u4E3B\u52A8\u66B4\u9732 Executor\u3002
 - Department Head \u9ED8\u8BA4\u7BA1\u7406\u672C\u90E8\u95E8\u6210\u5458\u3002
 - \u5982\u679C\u667A\u80FD\u4F53\u5DF2\u7ECF\u901A\u8FC7\u6B63\u5E38\u6C9F\u901A\u77E5\u9053\u4E86\u5176\u4ED6\u6210\u5458\u7684 mailbox \u5730\u5740\uFF0C\u5DE5\u5177\u4E0D\u4F1A\u786C\u6027\u963B\u6B62\u901A\u4FE1\uFF1B\u8FD9\u7C7B\u975E\u9ED8\u8BA4\u8DEF\u5F84\u4F1A\u5199\u5165\u5BA1\u8BA1\u4FE1\u606F\u3002
+- Main Manager/CEO \u7684 mailbox id \u56FA\u5B9A\u662F manager\u3002Department agent \u4E0D\u5E94\u4F7F\u7528 department_communicate \u7ED9 manager \u6216 Department::Manager \u53D1\u4FE1\uFF1B\u8981\u56DE\u590D\u4E0A\u6E38\u5FC5\u987B\u4F7F\u7528\u539F\u90AE\u4EF6\u7684 reply_mailbox \u6216 mailbox_followup\u3002
 
 \u53C2\u6570\u8BF4\u660E\uFF1A
 - department_name + member_name: \u9ED8\u8BA4\u5BFB\u5740\u65B9\u5F0F\u3002
@@ -42752,18 +42765,6 @@ var departmentCommunicate = {
     const targetMailboxId = input.target_mailbox_id;
     const content = input.content;
     const reason = input.reason;
-    let toMailboxId = targetMailboxId;
-    let targetMember = targetMailboxId ? getDepartmentMemberByMailboxId(targetMailboxId) : null;
-    if (!toMailboxId) {
-      if (!departmentName || !memberName) {
-        return `[departmentCommunicate] department_name/member_name \u6216 target_mailbox_id \u81F3\u5C11\u9700\u8981\u63D0\u4F9B\u4E00\u79CD`;
-      }
-      targetMember = getDepartmentMemberByName(departmentName, memberName);
-      if (!targetMember) {
-        return `[departmentCommunicate] \u4E0D\u5B58\u5728 ${departmentName} \u90E8\u95E8\u7684\u6210\u5458: ${memberName}`;
-      }
-      toMailboxId = getMailBoxId(departmentName, memberName);
-    }
     let fromMailboxId;
     const departmentAgentId = userRequest.departmentAgentId;
     const actorMember = departmentAgentId ? getDepartmentMemberByMailboxId(
@@ -42778,6 +42779,30 @@ var departmentCommunicate = {
     } else {
       fromMailboxId = CEO_MAILBOX_ID;
     }
+    const activeContext = departmentAgentId ? getActiveMailboxContext(fromMailboxId, userRequest.requestId) : null;
+    let toMailboxId = targetMailboxId;
+    let targetMember = targetMailboxId ? getDepartmentMemberByMailboxId(targetMailboxId) : null;
+    if (departmentAgentId && targetMailboxId && looksLikePseudoManagerMailbox(targetMailboxId)) {
+      return buildManagerRoutingRejection(activeContext);
+    }
+    if (departmentAgentId && targetMailboxId && !targetMember) {
+      return [
+        `[departmentCommunicate] \u62D2\u7EDD\u53D1\u9001\u5230\u4E0D\u5B58\u5728\u7684 mailbox: ${targetMailboxId}`,
+        `Department agent \u4F7F\u7528 target_mailbox_id \u65F6\uFF0C\u76EE\u6807\u5FC5\u987B\u662F\u5DF2\u5B58\u5728\u7684\u90E8\u95E8\u6210\u5458 mailbox\u3002`,
+        `\u5982\u679C\u4F60\u60F3\u56DE\u590D\u4E0A\u6E38 CEO/Main Manager\uFF0C\u8BF7\u4E0D\u8981\u4F2A\u9020 manager \u5730\u5740\uFF1B\u8BF7\u4F7F\u7528\u539F\u90AE\u4EF6\u7684 reply_mailbox \u6216 mailbox_followup\u3002`
+      ].join(`
+`);
+    }
+    if (!toMailboxId) {
+      if (!departmentName || !memberName) {
+        return `[departmentCommunicate] department_name/member_name \u6216 target_mailbox_id \u81F3\u5C11\u9700\u8981\u63D0\u4F9B\u4E00\u79CD`;
+      }
+      targetMember = getDepartmentMemberByName(departmentName, memberName);
+      if (!targetMember) {
+        return `[departmentCommunicate] \u4E0D\u5B58\u5728 ${departmentName} \u90E8\u95E8\u7684\u6210\u5458: ${memberName}`;
+      }
+      toMailboxId = getMailBoxId(departmentName, memberName);
+    }
     const isCrossDepartment = Boolean(actorMember && targetMember && actorMember.departmentId !== targetMember.departmentId);
     const isKnownAddressPath = Boolean(targetMailboxId);
     const options = {
@@ -42794,7 +42819,6 @@ var departmentCommunicate = {
       options.originUserId = userRequest.userId;
       options.originPlatform = userRequest.platform;
     } else {
-      const activeContext = getActiveMailboxContext(fromMailboxId, userRequest.requestId);
       if (activeContext) {
         options.originUserId = activeContext.originUserId;
         options.originPlatform = activeContext.originPlatform;
@@ -45912,6 +45936,32 @@ var createAgent = (config2 = getDefaultAgentConfig()) => {
       for (const id of ids) injectedEventIds.add(id);
       markAgentEventsInjected(ids);
     };
+    const ceoFollowupIdsFromMetadata = (metadata) => {
+      const ids = /* @__PURE__ */ new Set();
+      if (typeof metadata?.ceoFollowupId === "string") ids.add(metadata.ceoFollowupId);
+      if (Array.isArray(metadata?.ceoFollowupIds)) {
+        for (const id of metadata.ceoFollowupIds) {
+          if (typeof id === "string") ids.add(id);
+        }
+      }
+      return Array.from(ids);
+    };
+    const rememberCeoFollowupIds = (ids) => {
+      if (ids.length === 0) return;
+      const current = ceoFollowupIdsFromMetadata(request.metadata);
+      request.metadata = {
+        ...request.metadata ?? {},
+        ceoFollowupIds: Array.from(/* @__PURE__ */ new Set([...current, ...ids]))
+      };
+    };
+    const completeUserVisibleCeoFollowups = () => {
+      const ids = ceoFollowupIdsFromMetadata(request.metadata);
+      if (ids.length > 0) {
+        for (const id of ids) completeCeoFollowup(id);
+        return;
+      }
+      completePendingCeoFollowupsForUser(request.userId);
+    };
     const queuePendingDurableEvents = () => {
       try {
         const events = listPendingAgentEvents(userId, 10).filter((event) => !injectedEventIds.has(event.id)).filter((event) => !interruptQueuedEventIds.has(event.id));
@@ -46099,6 +46149,7 @@ ${msg}</user-interrupt>`;
         if (pendingEvents.length > 0) {
           for (const event of pendingEvents) injectedEventIds.add(event.id);
           markAgentEventsInjected(pendingEvents.map((event) => event.id));
+          rememberCeoFollowupIds(pendingEvents.filter((event) => event.type === "ceo.followup_required").map((event) => event.payload.ceoFollowupId).filter((id) => typeof id === "string"));
         }
         if (messages.length === 0 && internalOnly && eventReminder) {
           messages = [userMessage(text(eventReminder))];
@@ -46237,7 +46288,7 @@ ${memoryInjection}` : "") + dreamInjection;
                     }
                     hasSentMessage = true;
                     sentMessageContent = answer;
-                    completePendingCeoFollowupsForUser(request.userId);
+                    completeUserVisibleCeoFollowups();
                   }
                 }
                 if (useBlock.name === `send_file`) {
@@ -46307,6 +46358,18 @@ ${msg}</user-interrupt>`
             }
             continue;
           }
+          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
+            });
+            hasSentMessage = true;
+            sentMessageContent = textContent;
+            completeUserVisibleCeoFollowups();
+          }
           if (topicStorage) {
             const topicSummary = hasSentMessage ? sentMessageContent : textContent;
             await updateTopicSummary(topicStorage, userId, beijingTime, topicSummary, job?.title);
@@ -47056,6 +47119,7 @@ var replyMailbox = {
 // src/cron/mailbox.ts
 var db2 = createSqliteDB();
 var DEFAULT_MAILBOX_PROCESSING_STALE_MS = 15 * 6e4;
+var PSEUDO_MANAGER_MAILBOX_PATTERN = /(^|::)(manager|main[-_\s]?manager|ceo)$/i;
 var selectStmt = db2.prepare(`select
         id,
         to_mailbox_id as toMailboxId,
@@ -47095,6 +47159,7 @@ var getMailboxLivenessSnapshot = () => {
   };
 };
 var hasUnresolvedInternalWork = (snapshot) => snapshot.pendingMailbox > 0 || snapshot.processingMailbox > 0 || snapshot.pendingCeoFollowups > 0 || snapshot.processingCeoFollowups > 0 || snapshot.failedCeoFollowups > 0;
+var looksLikePseudoManagerMailbox2 = (mailboxId) => mailboxId !== "manager" && mailboxId.includes("::") && PSEUDO_MANAGER_MAILBOX_PATTERN.test(mailboxId.trim());
 var reportMailboxLiveness = async (snapshot) => {
   if (!hasUnresolvedInternalWork(snapshot)) return;
   await reportRuntimeActivity({
@@ -47180,7 +47245,8 @@ var handleCeoFollowup = async (followup) => {
       metadata: {
         internalOnly: true,
         eventId: event.id,
-        trigger: "ceo.followup_required"
+        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}`);
@@ -47249,6 +47315,11 @@ var wakeDepartmentAgent = async (mailboxId, msgIds) => {
     const member = getDepartmentMemberByName(departmentName, memberName);
     if (!member) {
       console.warn(`[mailbox] \u76EE\u6807\u6210\u5458\u4E0D\u5B58\u5728\uFF08\u53EF\u80FD\u5DF2\u88AB\u5220\u9664\uFF09: ${mailboxId}`);
+      if (looksLikePseudoManagerMailbox2(mailboxId)) {
+        for (const id of msgIds) markMailboxStatus(id, "cancelled");
+        console.warn(`[mailbox] \u5DF2\u53D6\u6D88\u4F2A manager mailbox \u6295\u9012 ${mailboxId}\uFF0C\u4E0D\u518D\u751F\u6210 CEO \u7CFB\u7EDF\u566A\u58F0`);
+        return;
+      }
       const notifyContent = `[\u7CFB\u7EDF\u901A\u77E5] \u90E8\u95E8\u6210\u5458 ${mailboxId} \u4E0D\u5B58\u5728\uFF08\u53EF\u80FD\u6240\u5C5E\u90E8\u95E8\u5DF2\u89E3\u6563\u6216\u6210\u5458\u5DF2\u88AB\u5220\u9664\uFF09\uFF0C\u4EE5\u4E0B\u6D88\u606F\u65E0\u6CD5\u6295\u9012\u5DF2\u88AB\u53D6\u6D88\u3002\u8BF7\u6839\u636E\u60C5\u51B5\u51B3\u5B9A\u662F\u5426\u9700\u8981\u91CD\u65B0\u7EC4\u5EFA\u90E8\u95E8\u6216\u8C03\u6574\u8BA1\u5212\u3002`;
       const originStmt = db2.prepare(
         `SELECT origin_user_id as originUserId, origin_platform as originPlatform 
@@ -52520,7 +52591,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.39" : "unknown",
+    version: true ? "1.8.41" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version