duclaw-cli 1.8.34 → 1.8.36

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.34" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.36" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -42304,6 +42304,23 @@ var departmentCreate = {
 
 // src/tools/tools/department/DepartmentCommunicate.ts
 var CEO_MAILBOX_ID = `manager`;
+var getActiveMailboxContext = (actorMailboxId, messageId) => {
+  if (!messageId) return null;
+  const db3 = createSqliteDB();
+  const row = db3.prepare(
+    `SELECT
+            id,
+            from_mailbox_id as fromMailboxId,
+            to_mailbox_id as toMailboxId,
+            origin_user_id as originUserId,
+            origin_platform as originPlatform,
+            thread_id as threadId
+         FROM mailbox
+         WHERE id = ?
+           AND (from_mailbox_id = ? OR to_mailbox_id = ?)`
+  ).get(messageId, actorMailboxId, actorMailboxId);
+  return row ?? null;
+};
 var DESCRIPTION21 = `
 \u5411\u90E8\u95E8\u6210\u5458\u53D1\u9001\u6D88\u606F\u6216\u6307\u4EE4\uFF0C\u662F\u516C\u53F8\u5185\u90E8\u5F02\u6B65\u534F\u4F5C\u901A\u4FE1\u6E20\u9053\u3002
 
@@ -42396,6 +42413,14 @@ var departmentCommunicate = {
     if (!departmentAgentId) {
       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;
+        options.threadId = activeContext.threadId || activeContext.id;
+        options.parentMessageId = activeContext.id;
+      }
     }
     try {
       sendMessage2(fromMailboxId, toMailboxId, content, options);
@@ -46447,7 +46472,10 @@ var discardMailbox = {
                 id,
                 from_mailbox_id as fromMailboxId,
                 to_mailbox_id as toMailboxId,
+                content,
                 status,
+                origin_user_id as originUserId,
+                origin_platform as originPlatform,
                 thread_id as threadId,
                 parent_message_id as parentMessageId
              FROM mailbox WHERE id = ?`
@@ -46462,6 +46490,13 @@ var discardMailbox = {
     if (msg.status !== "pending" && msg.status !== "processing") {
       return `[discardMailbox] \u90AE\u4EF6 ${messageId} \u5F53\u524D\u72B6\u6001\u4E3A ${msg.status}\uFF0C\u5DF2\u5904\u7406\u6216\u4E0D\u53EF\u4E22\u5F03`;
     }
+    if (msg.fromMailboxId === "manager" && msg.originUserId) {
+      return [
+        `[discardMailbox] \u62D2\u7EDD\u4E22\u5F03 manager/CEO \u8F6C\u6765\u7684\u7528\u6237\u4E0A\u4E0B\u6587\u90AE\u4EF6 ${messageId}\u3002`,
+        `\u8FD9\u7C7B\u90AE\u4EF6\u4EE3\u8868\u4E0A\u6E38\u6B63\u5728\u7B49\u5F85\u4E1A\u52A1\u7ED3\u8BBA\u6216\u8FDB\u5EA6\u540C\u6B65\uFF0C\u4E0D\u80FD\u7528 discard_mailbox \u9759\u9ED8\u5173\u95ED\u3002`,
+        `\u8BF7\u6539\u7528 reply_mailbox(message_id="${messageId}", content="...") \u76F4\u63A5\u56DE\u590D\u5F53\u524D\u72B6\u6001\u3001\u6700\u7EC8\u7ED3\u679C\u6216\u660E\u786E\u963B\u585E\u9879\uFF1B\u5982\u4ECD\u9700\u7B49\u5F85\u4E0B\u6E38\uFF0C\u56DE\u590D\u201C\u6B63\u5728\u7B49\u5F85\u8C01/\u54EA\u4E00\u6B65/\u4E0B\u4E00\u6B21\u540C\u6B65\u65F6\u95F4\u201D\u3002`
+      ].join("\n");
+    }
     const changed = updateMailboxMessageStatus(messageId, "cancelled", {
       fromStatus: ["pending", "processing"],
       actorMailboxId: myMailboxId,
@@ -46499,6 +46534,36 @@ var DESCRIPTION41 = `
 1. \u5C06\u56DE\u590D\u5185\u5BB9\u53D1\u9001\u5230\u539F\u53D1\u9001\u8005\u7684\u90AE\u7BB1
 2. \u5C06\u8BE5\u90AE\u4EF6\u6807\u8BB0\u4E3A\u5DF2\u5904\u7406\uFF08done\uFF09
 `;
+var findUpstreamManagerMessage = (myMailboxId, threadId) => {
+  if (!threadId) return null;
+  const db3 = createSqliteDB();
+  const row = db3.prepare(
+    `SELECT
+            id,
+            from_mailbox_id as fromMailboxId,
+            to_mailbox_id as toMailboxId,
+            status
+         FROM mailbox
+         WHERE thread_id = ?
+           AND from_mailbox_id = 'manager'
+           AND to_mailbox_id = ?
+         ORDER BY send_time ASC
+         LIMIT 1`
+  ).get(threadId, myMailboxId);
+  return row ?? null;
+};
+var buildUpstreamReminder = (myMailboxId, repliedToMailboxId, threadId) => {
+  const member = getDepartmentMemberByMailboxId(myMailboxId);
+  if (member?.role !== "department_head") return "";
+  if (repliedToMailboxId === "manager") return "";
+  const upstream = findUpstreamManagerMessage(myMailboxId, threadId);
+  if (!upstream) return "";
+  return [
+    ``,
+    `[replyMailbox] \u63D0\u9192\uFF1A\u4F60\u521A\u521A\u56DE\u590D\u7684\u662F\u4E0B\u6E38\u6210\u5458 ${repliedToMailboxId}\uFF0C\u4F46\u672C\u7EBF\u7A0B\u7684\u4E0A\u6E38 manager \u90AE\u4EF6 ${upstream.id} \u4ECD\u9700\u8981\u4F60\u540C\u6B65\u6700\u7EC8\u9A8C\u6536/\u6C47\u603B\u3002`,
+    `\u5982\u679C\u8FD9\u6B21\u56DE\u590D\u4EE3\u8868\u4EFB\u52A1\u5DF2\u5B8C\u6210\u6216\u5DF2\u9A8C\u6536\uFF0C\u8BF7\u7EE7\u7EED\u8C03\u7528 reply_mailbox(message_id="${upstream.id}", content="...")\uFF08\u82E5\u8BE5\u90AE\u4EF6\u4ECD\u5728 processing\uFF09\uFF0C\u6216 mailbox_followup(message_id="${upstream.id}", content="...", kind="partial_result") \u5C06\u7ED3\u679C\u540C\u6B65\u7ED9 manager\u3002`
+  ].join("\n");
+};
 var replyMailbox = {
   name: `reply_mailbox`,
   description: DESCRIPTION41,
@@ -46543,11 +46608,12 @@ var replyMailbox = {
     if (msg.toMailboxId !== myMailboxId) {
       return `[replyMailbox] \u8BE5\u90AE\u4EF6\u4E0D\u5C5E\u4E8E\u4F60\u7684\u90AE\u7BB1\uFF0C\u65E0\u6CD5\u56DE\u590D`;
     }
-    if (msg.status !== "processing") {
+    if (msg.status !== "pending" && msg.status !== "processing") {
       return `[replyMailbox] \u90AE\u4EF6 ${messageId} \u5F53\u524D\u72B6\u6001\u4E3A ${msg.status}\uFF0C\u5DF2\u5904\u7406\u6216\u4E0D\u53EF\u56DE\u590D\uFF0C\u65E0\u9700\u91CD\u590D\u53D1\u9001`;
     }
+    const claimedFromPending = msg.status === "pending";
     const changed = updateMailboxMessageStatus(messageId, "done", {
-      fromStatus: "processing",
+      fromStatus: ["pending", "processing"],
       actorMailboxId: myMailboxId,
       counterpartMailboxId: msg.fromMailboxId,
       reason: "reply_mailbox"
@@ -46573,7 +46639,8 @@ var replyMailbox = {
         threadId: replyMsg.threadId || msg.threadId || msg.id
       }
     });
-    return `[replyMailbox] \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`;
+    const upstreamReminder = buildUpstreamReminder(myMailboxId, msg.fromMailboxId, msg.threadId || msg.id);
+    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}`;
   }
 };
 
@@ -46692,7 +46759,7 @@ var wakeDepartmentAgent = async (mailboxId, msgIds) => {
     const workspacePath = department?.workpath;
     const agentConfig = getDepartmentAgentConfig(void 0, member.focusOn, workspacePath, department?.name, member.role, member.name);
     const agent = createAgent(agentConfig);
-    const roleSpecificReminder = member.role === "department_head" ? `\u4F60\u662F Department Head\u3002\u8BFB\u53D6\u90AE\u4EF6\u540E\uFF0C\u5982\u679C\u8FD9\u662F\u590D\u6742\u6267\u884C\u5DE5\u4F5C\uFF08\u4F8B\u5982\u5199\u4EE3\u7801\u3001\u8BFB\u4EE3\u7801\u5B9A\u4F4D\u3001\u8DD1\u6D4B\u8BD5\u3001\u8C03\u8BD5\u3001\u90E8\u7F72\u3001\u5168\u9762\u9A8C\u8BC1\u6216\u751F\u6210\u590D\u6742\u4EA7\u7269\uFF09\uFF0C\u4E0D\u8981\u9ED8\u8BA4\u81EA\u5DF1\u4E0B\u573A\u6267\u884C\uFF1B\u5148\u7528 department_member_list \u67E5\u770B\u6210\u5458\uFF0C\u9009\u62E9\u6216\u521B\u5EFA\u5408\u9002 Executor\uFF0C\u5E76\u7528 department_communicate \u5206\u6D3E\u5177\u4F53\u4EFB\u52A1\u3002\u4F60\u8D1F\u8D23\u62C6\u89E3\u3001\u534F\u8C03\u3001\u8FFD\u95EE\u3001\u9A8C\u6536\u548C\u6C47\u603B\u3002` : `\u4F60\u662F Executor\u3002\u8BFB\u53D6\u90AE\u4EF6\u540E\u76F4\u63A5\u5904\u7406\u5206\u6D3E\u7ED9\u4F60\u7684\u5177\u4F53\u6267\u884C\u4EFB\u52A1\uFF1B\u4E0D\u8981\u5C1D\u8BD5\u67E5\u770B\u5B8C\u6574\u90E8\u95E8\u6210\u5458\u76EE\u5F55\u6216\u521B\u5EFA\u6210\u5458\u3002`;
+    const roleSpecificReminder = member.role === "department_head" ? `\u4F60\u662F Department Head\u3002\u8BFB\u53D6\u90AE\u4EF6\u540E\uFF0C\u5982\u679C\u8FD9\u662F\u590D\u6742\u6267\u884C\u5DE5\u4F5C\uFF08\u4F8B\u5982\u5199\u4EE3\u7801\u3001\u8BFB\u4EE3\u7801\u5B9A\u4F4D\u3001\u8DD1\u6D4B\u8BD5\u3001\u8C03\u8BD5\u3001\u90E8\u7F72\u3001\u5168\u9762\u9A8C\u8BC1\u6216\u751F\u6210\u590D\u6742\u4EA7\u7269\uFF09\uFF0C\u4E0D\u8981\u9ED8\u8BA4\u81EA\u5DF1\u4E0B\u573A\u6267\u884C\uFF1B\u5148\u7528 department_member_list \u67E5\u770B\u6210\u5458\uFF0C\u9009\u62E9\u6216\u521B\u5EFA\u5408\u9002 Executor\uFF0C\u5E76\u7528 department_communicate \u5206\u6D3E\u5177\u4F53\u4EFB\u52A1\u3002\u4F60\u8D1F\u8D23\u62C6\u89E3\u3001\u534F\u8C03\u3001\u8FFD\u95EE\u3001\u9A8C\u6536\u548C\u6C47\u603B\u3002\u6536\u5230 Executor \u5B8C\u6210\u56DE\u4FE1\u5E76\u9A8C\u6536\u540E\uFF0C\u5FC5\u987B\u628A\u6700\u7EC8\u7ED3\u679C\u540C\u6B65\u7ED9\u4E0A\u6E38\u8BF7\u6C42\u65B9\uFF08\u901A\u5E38\u662F manager/CEO\uFF09\uFF1B\u53EA\u56DE\u590D Executor \u4E0D\u7B49\u4E8E\u5B8C\u6210\u5BF9\u4E0A\u6E38\u7684\u6C47\u62A5\u3002` : `\u4F60\u662F Executor\u3002\u8BFB\u53D6\u90AE\u4EF6\u540E\u76F4\u63A5\u5904\u7406\u5206\u6D3E\u7ED9\u4F60\u7684\u5177\u4F53\u6267\u884C\u4EFB\u52A1\uFF1B\u4E0D\u8981\u5C1D\u8BD5\u67E5\u770B\u5B8C\u6574\u90E8\u95E8\u6210\u5458\u76EE\u5F55\u6216\u521B\u5EFA\u6210\u5458\u3002`;
     const request = {
       platform: "mailbox",
       userId: mailboxId,
@@ -46943,6 +47010,7 @@ ${workspacePath ? `
 - mailbox_followup \u53EF\u4EE5\u8C03\u7528\u591A\u6B21\uFF0C\u7528\u4E8E\u7EBF\u7A0B\u5185\u6301\u7EED\u534F\u4F5C\uFF1B\u5B83\u4E0D\u4F1A\u7ED3\u675F\u539F\u6D88\u606F
 - reply_mailbox \u8868\u793A\u201C\u5F53\u524D\u8FD9\u5C01\u6D88\u606F\u6211\u5DF2\u5F62\u6210\u6B63\u5F0F\u56DE\u590D\u201D\uFF0C\u4F1A\u7ED3\u675F\u8FD9\u5C01\u6D88\u606F\u7684\u5904\u7406
 - discard_mailbox \u8868\u793A\u201C\u5F53\u524D\u8FD9\u5C01\u6D88\u606F\u65E0\u9700\u4E1A\u52A1\u56DE\u590D\u201D\uFF0C\u4F1A\u7ED3\u675F\u8FD9\u5C01\u6D88\u606F\u4F46\u4E0D\u4F1A\u5411\u53D1\u9001\u8005\u53D1\u9001\u56DE\u4FE1\uFF1B\u4E0D\u8981\u53EA\u7528\u81EA\u7136\u8BED\u8A00\u8BF4\u201C\u5FFD\u7565\u201D
+- \u6765\u81EA manager/CEO \u4E14\u5E26\u6709\u7528\u6237\u4E0A\u4E0B\u6587\u7684\u90AE\u4EF6\uFF0C\u5C24\u5176\u662F\u201C\u73B0\u5728\u600E\u4E48\u6837 / \u56DE\u4E86\u5417 / \u8FDB\u5EA6 / \u62A5\u544A\u51FA\u6765\u6CA1 / \u5361\u5728\u54EA / \u50AC\u4E00\u4E0B\u201D\u8FD9\u7C7B\u8FFD\u95EE\uFF0C\u5FC5\u987B\u4F7F\u7528 reply_mailbox \u76F4\u63A5\u56DE\u590D\u5F53\u524D\u72B6\u6001\u3001\u6700\u7EC8\u7ED3\u679C\u6216\u660E\u786E\u963B\u585E\u9879\uFF1B\u5373\u4F7F\u4F60\u8BA4\u4E3A\u5185\u5BB9\u91CD\u590D\uFF0C\u4E5F\u4E0D\u80FD\u7528 discard_mailbox \u9759\u9ED8\u5173\u95ED
 - \u4E0D\u8981\u628A\u4E00\u6BB5\u6700\u7EC8\u56DE\u590D\u540C\u65F6\u5F53\u4F5C\u591A\u5C01\u90AE\u4EF6\u7684\u7B54\u6848\uFF1B\u6BCF\u5C01\u90AE\u4EF6\u90FD\u5FC5\u987B\u7528\u5B83\u81EA\u5DF1\u7684 message_id \u56DE\u590D
 - \u5982\u679C\u53D1\u9001\u8005\u9700\u8981\u77E5\u9053\u5904\u7406\u7ED3\u8BBA\uFF0C\u5FC5\u987B\u7528 reply_mailbox\uFF1B\u5982\u679C\u53EA\u662F\u65E0\u9700\u56DE\u5E94\u7684\u56DE\u6267/\u91CD\u590D\u901A\u77E5\uFF0C\u624D\u7528 discard_mailbox
 - \u5982\u679C\u9700\u8981\u4E3B\u52A8\u8054\u7CFB\u5176\u4ED6\u90E8\u95E8\u6210\u5458\uFF0C\u4F7F\u7528 department_communicate \u5DE5\u5177
@@ -46962,6 +47030,8 @@ ${workspacePath ? `
 5. Executor \u672A\u56DE\u4FE1\u6216\u8FDB\u5EA6\u6162\uFF0C\u4E0D\u662F Department Head \u81EA\u5DF1\u4E0B\u573A\u5E72\u6D3B\u7684\u7406\u7531\uFF1B\u5E94\u901A\u8FC7 mailbox_followup \u6216 department_communicate \u8FFD\u95EE/\u8865\u5145\u4E0A\u4E0B\u6587\uFF0C\u5E76\u5411\u4E0A\u6E38\u8BF4\u660E\u6B63\u5728\u7B49\u5F85\u6267\u884C\u5C42\u7ED3\u679C\u3002
 6. \u53EA\u6709\u5F53\u90AE\u4EF6\u660E\u786E\u8981\u6C42 Department Head \u4EB2\u81EA\u6267\u884C\u3001\u5F53\u524D\u90E8\u95E8\u6CA1\u6709\u53EF\u7528 Executor \u4E14\u77ED\u671F\u65E0\u6CD5\u521B\u5EFA\u3001\u6216 Executor \u660E\u786E\u5931\u8D25\u4E14\u4E0A\u6E38\u540C\u610F Head \u63A5\u7BA1\u65F6\uFF0CDepartment Head \u624D\u80FD\u4EB2\u81EA\u4F7F\u7528\u6267\u884C\u7C7B\u5DE5\u5177\u5B8C\u6210\u4E13\u4E1A\u6267\u884C\u3002
 7. \u6536\u5230 Executor \u56DE\u4FE1\u540E\uFF0CDepartment Head \u5E94\u505A\u9A8C\u6536\u548C\u6C47\u603B\uFF1A\u5FC5\u8981\u65F6\u53EF\u4EE5\u68C0\u67E5\u5C11\u91CF\u5173\u952E\u8BC1\u636E\uFF0C\u4F46\u4E0D\u8981\u628A Executor \u7684\u5B8C\u6574\u6267\u884C\u804C\u8D23\u91CD\u65B0\u81EA\u5DF1\u505A\u4E00\u904D\u3002
+8. Department Head \u9A8C\u6536 Executor \u7ED3\u679C\u540E\uFF0C\u5FC5\u987B\u56DE\u5230\u4E0A\u6E38\u8BF7\u6C42\u7EBF\u7A0B\u5411\u539F\u53D1\u9001\u8005\u540C\u6B65\u6700\u7EC8\u7ED3\u8BBA\u3002\u82E5\u4E0A\u6E38\u662F manager/CEO\uFF0C\u4F7F\u7528\u539F manager \u90AE\u4EF6\u7684 message_id \u8C03\u7528 reply_mailbox \u6216 mailbox_followup\uFF1B\u4E0D\u8981\u53EA\u628A\u201C\u9A8C\u6536\u901A\u8FC7/\u5B8C\u6210\u6C47\u62A5\u201D\u56DE\u590D\u7ED9 Executor\uFF0C\u5426\u5219 CEO \u548C\u7528\u6237\u4E0D\u4F1A\u6536\u5230\u7ED3\u679C\u3002
+9. \u5982\u679C\u4E0A\u6E38 manager/CEO \u540E\u7EED\u50AC\u95EE\u540C\u4E00\u7EBF\u7A0B\uFF0C\u5373\u4F7F\u4F60\u5DF2\u7ECF\u638C\u63E1\u6700\u7EC8\u62A5\u544A\uFF0C\u4E5F\u8981\u628A\u6700\u7EC8\u62A5\u544A\u6216\u7B80\u660E\u72B6\u6001\u56DE\u7ED9 manager/CEO\uFF1B\u50AC\u95EE\u4E0D\u662F\u53EF\u4E22\u5F03\u901A\u77E5\u3002
 </Department Head Delegation Rules>
 
 <Task Execution>
@@ -51932,7 +52002,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.34" : "unknown",
+    version: true ? "1.8.36" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version