duclaw-cli 1.9.18 → 1.9.19

package/dist/DuclawMac.app/Contents/Info.plist

@@ -6,6 +6,10 @@
   <string>DuclawMac</string>
   <key>CFBundleIdentifier</key>
   <string>dev.duclaw.mac</string>
+  <key>CFBundleIconFile</key>
+  <string>AppIcon</string>
+  <key>CFBundleIconName</key>
+  <string>AppIcon</string>
   <key>CFBundleName</key>
   <string>DuclawMac</string>
   <key>CFBundlePackageType</key>

package/dist/DuclawMac.app/Contents/assetcatalog_generated_info.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>AppIcon</string>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
+</dict>
+</plist>

package/dist/bundle.js

@@ -39957,7 +39957,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.9.18" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.9.19" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -52912,12 +52912,19 @@ var renderAgentEventReminder = (events) => {
     `\u8BFB\u4E00\u904D\uFF0C\u7528\u4F60\u81EA\u5DF1\u7684\u8BDD\u7ED9\u8001\u677F\u6C47\u62A5\u4E00\u6B21\uFF1A\u6709\u591A\u6761\u5C31\u5408\u5E76\u6210\u4E00\u6761\u8BF4\u6E05\u695A\uFF0C\u522B\u4E00\u6761\u4E8B\u4EF6\u56DE\u4E00\u53E5\u3001\u628A\u540C\u4E00\u4EF6\u4E8B\u91CD\u590D\u53D1\u7ED9\u8001\u677F\u3002`,
     `\u5982\u679C\u7ED3\u679C\u8BF4\u660E\u4E8B\u60C5\u8FD8\u6CA1\u505A\u5B8C\u6216\u5361\u4F4F\u4E86\uFF0C\u5C31\u5982\u5B9E\u8FD9\u4E48\u8BB2\uFF0C\u800C\u4E0D\u662F\u542B\u7CCA\u5730\u201C\u7A0D\u540E\u540C\u6B65\u201D\u3002`
   ].join("\n") : "";
+  const hasManagerMailboxMessage = events.some((event) => event.type === "manager.mailbox_message");
+  const managerMailboxInstruction = hasManagerMailboxMessage ? [
+    ``,
+    `\u5176\u4E2D type=manager.mailbox_message \u7684\u4E8B\u4EF6\uFF0C\u662F\u56E2\u961F\u53D1\u7ED9 CEO \u7684\u5185\u90E8\u8FDB\u5C55\u3001\u8865\u5145\u6216\u963B\u585E\u72B6\u6001\u3002`,
+    `\u8FD9\u7C7B\u4E8B\u4EF6\u53EA\u4EE3\u8868\u4F60\u770B\u5230\u4E86\u56E2\u961F\u6D88\u606F\uFF0C\u4E0D\u4EE3\u8868\u7CFB\u7EDF\u8981\u6C42\u4F60\u9010\u6761\u8F6C\u53D1\u3002\u8BF7\u50CF CEO \u4E00\u6837\u5224\u65AD\uFF1A\u5982\u679C\u7528\u6237\u9700\u8981\u77E5\u9053\u3001\u9700\u8981\u884C\u52A8\u3001\u6216\u6B63\u5728\u7B49\u5F85\u5173\u952E\u72B6\u6001\uFF0C\u5C31\u7528 send_message \u7B80\u660E\u8F6C\u8FBE\uFF1B\u5982\u679C\u53EA\u662F\u666E\u901A\u5185\u90E8\u8FDB\u5C55\uFF0C\u5C31\u8BB0\u4F4F\u5E76\u7EE7\u7EED\u534F\u8C03\u3002`
+  ].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
 ${ceoFollowupInstruction}
+${managerMailboxInstruction}
 </system-reminder>`;
 };
 
@@ -53605,8 +53612,36 @@ 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 recordManagerMailboxAgentEvent = (msg) => {
+  if (msg.toMailboxId !== "manager") return null;
+  if (msg.workItemRole !== "followup") return null;
+  if (!msg.originUserId || !msg.originPlatform) return null;
+  return recordAgentEvent({
+    userId: msg.originUserId,
+    type: "manager.mailbox_message",
+    source: "mailbox",
+    sourceId: msg.id,
+    payload: {
+      ownerMailboxId: "manager",
+      mailboxMessageId: msg.id,
+      fromMailboxId: msg.fromMailboxId,
+      toMailboxId: msg.toMailboxId,
+      threadId: msg.threadId || msg.id,
+      parentMessageId: msg.parentMessageId || null,
+      workItemId: msg.workItemId || null,
+      workItemRole: msg.workItemRole || null,
+      originPlatform: msg.originPlatform,
+      userVisibleRequired: false,
+      contentPreview: msg.content.slice(0, 1200),
+      summary: `\u56E2\u961F\u53D1\u6765\u4E00\u6761\u5185\u90E8\u8FDB\u5C55/\u8865\u5145\u6D88\u606F\uFF0C\u8BF7\u4F60\u4F5C\u4E3A CEO \u5224\u65AD\u662F\u5426\u9700\u8981\u8F6C\u8FBE\u7ED9 Boss/User\uFF1A${msg.content.slice(0, 400)}`
+    }
+  });
+};
 var recordMailboxReceivedAgentEvent = (msg) => {
-  if (msg.toMailboxId === "manager") return;
+  if (msg.toMailboxId === "manager") {
+    recordManagerMailboxAgentEvent(msg);
+    return;
+  }
   recordAgentEvent({
     userId: msg.toMailboxId,
     type: "mailbox.message_received",
@@ -58479,7 +58514,7 @@ var LangSmithRun = class _LangSmithRun {
   id;
   run;
   async child(input) {
-    const child = await this.run.createChild({
+    const child = this.run.createChild({
       name: input.name,
       run_type: input.runType,
       inputs: redactForTrace(input.inputs),
@@ -58489,10 +58524,7 @@ var LangSmithRun = class _LangSmithRun {
     return new _LangSmithRun(child.id ?? (0, import_node_crypto17.randomUUID)(), child);
   }
   async end(result) {
-    await this.run.end({
-      outputs: redactForTrace(result.outputs),
-      error: result.error
-    });
+    await this.run.end(redactForTrace(result.outputs), result.error);
     await this.run.patchRun();
   }
 };
@@ -58507,16 +58539,18 @@ var createRuntimeTracer = () => {
   return {
     enabled: true,
     async startRun(input) {
-      const { RunTree: RunTree2 } = await Promise.resolve().then(() => (init_langsmith(), langsmith_exports));
+      const { Client: Client3, RunTree: RunTree2 } = await Promise.resolve().then(() => (init_langsmith(), langsmith_exports));
       const run = new RunTree2({
         name: input.name,
         run_type: input.runType,
         inputs: redactForTrace(input.inputs),
         extra: { metadata: redactForTrace(input.metadata) },
         project_name: process.env.LANGSMITH_PROJECT || `duclaw-runtime`,
-        apiUrl: process.env.LANGSMITH_ENDPOINT,
-        apiKey: process.env.LANGSMITH_API_KEY,
-        workspaceId: process.env.LANGSMITH_WORKSPACE_ID
+        client: new Client3({
+          apiUrl: process.env.LANGSMITH_ENDPOINT,
+          apiKey: process.env.LANGSMITH_API_KEY,
+          workspaceId: process.env.LANGSMITH_WORKSPACE_ID
+        })
       });
       await run.postRun();
       return new LangSmithRun(run.id ?? (0, import_node_crypto17.randomUUID)(), run);
@@ -60496,11 +60530,12 @@ var markMailboxStatus = (msgId, status) => {
   const fromStatusMap = {
     processing: ["pending"],
     done: ["pending", "processing", "read"],
+    read: ["pending", "processing"],
     failed: ["processing"],
     cancelled: ["pending", "processing"],
     pending: ["processing"]
   };
-  updateMailboxMessageStatus(msgId, status, {
+  return updateMailboxMessageStatus(msgId, status, {
     fromStatus: fromStatusMap[status],
     reason: "mailbox_poller"
   });
@@ -60664,6 +60699,62 @@ var processCeoFollowupGroup = async (followups) => {
     console.error(`[mailbox] CEO followup \u5904\u7406\u5931\u8D25 user=${claimed[0].originUserId}:`, err);
   }
 };
+var handleManagerMailboxEventGroup = async (items) => {
+  const first = items[0];
+  const originUserId = first.message.originUserId;
+  const originPlatform = first.message.originPlatform;
+  if (!originUserId || !originPlatform) return;
+  const eventIds = items.map((item) => item.event.id);
+  const mailboxMessageIds = items.map((item) => item.message.id);
+  const metadata = {
+    internalOnly: true,
+    trigger: "manager.mailbox_message",
+    agentEventIds: eventIds,
+    mailboxMessageIds,
+    mailboxMessageId: first.message.id,
+    threadId: first.message.threadId || first.message.id,
+    parentMessageId: first.message.parentMessageId || null,
+    workItemId: first.message.workItemId || null
+  };
+  if (hasRunningAgent(originUserId)) {
+    queueInterrupt(originUserId, {
+      content: "",
+      metadata
+    });
+    for (const item of items) markMailboxStatus(item.message.id, "read");
+    console.log(`[mailbox] \u4E3B agent \u6B63\u5728\u8FD0\u884C\u4E2D\uFF0C${items.length} \u6761 manager \u5185\u90E8\u6D88\u606F\u5DF2\u4F5C\u4E3A\u4E8B\u4EF6\u5165\u961F user=${originUserId}`);
+    return;
+  }
+  const request = {
+    platform: originPlatform,
+    userId: originUserId,
+    requestId: first.message.id,
+    departmentAgentId: "",
+    content: "",
+    metadata
+  };
+  const config2 = getDefaultAgentConfig();
+  config2.channelPlugin = getCeoFollowupChannelPlugin(originPlatform);
+  const mainAgent = createAgent(config2);
+  const result = await mainAgent(request);
+  for (const item of items) markMailboxStatus(item.message.id, "read");
+  console.log(`[mailbox] \u4E3B agent \u5DF2\u5904\u7406 ${items.length} \u6761 manager \u5185\u90E8\u6D88\u606F, user=${originUserId}, alreadySent=${result.alreadySent}`);
+};
+var processManagerMailboxEventGroup = async (items) => {
+  const claimed = [];
+  for (const item of items) {
+    if (markMailboxStatus(item.message.id, "processing")) {
+      claimed.push(item);
+    }
+  }
+  if (claimed.length === 0) return;
+  try {
+    await handleManagerMailboxEventGroup(claimed);
+  } catch (err) {
+    for (const item of claimed) markMailboxStatus(item.message.id, "pending");
+    console.error(`[mailbox] CEO manager \u5185\u90E8\u6D88\u606F\u5904\u7406\u5931\u8D25 user=${claimed[0].message.originUserId}:`, err);
+  }
+};
 var wakeDepartmentAgent = async (mailboxId, msgIds) => {
   try {
     const [departmentName, memberName] = mailboxId.split("::");
@@ -60846,12 +60937,18 @@ var pollMailbox = async () => {
     const ceoMsgs = grouped.get("manager") || [];
     grouped.delete("manager");
     const newFollowups = [];
+    const managerMailboxEvents = [];
     for (const msg of ceoMsgs) {
       const followup = enqueueCeoFollowupFromMailbox(msg);
       if (followup) {
         newFollowups.push(followup);
       } else {
-        console.warn(`[mailbox] \u6536\u5230\u53D1\u7ED9 manager \u7684\u56DE\u4FE1 ${msg.id}\uFF0C\u4F46\u7F3A\u5C11\u7528\u6237\u4E0A\u4E0B\u6587\uFF0C\u65E0\u6CD5\u521B\u5EFA CEO followup`);
+        const event = recordManagerMailboxAgentEvent(msg);
+        if (event) {
+          managerMailboxEvents.push({ message: msg, event });
+        } else {
+          console.warn(`[mailbox] \u6536\u5230\u53D1\u7ED9 manager \u7684\u56DE\u4FE1 ${msg.id}\uFF0C\u4F46\u7F3A\u5C11\u53EF\u8C03\u5EA6\u4E0A\u4E0B\u6587\uFF0C\u65E0\u6CD5\u521B\u5EFA CEO followup \u6216\u5185\u90E8\u4E8B\u4EF6`);
+        }
       }
     }
     const followups = [...pendingFollowups, ...newFollowups];
@@ -60879,6 +60976,32 @@ var pollMailbox = async () => {
         }
       })();
     }
+    const managerEventsByUser = /* @__PURE__ */ new Map();
+    for (const item of managerMailboxEvents) {
+      const originUserId = item.message.originUserId;
+      if (!originUserId) continue;
+      if (inFlightCeoReplyUsers.has(originUserId)) continue;
+      if (followupsByUser.has(originUserId)) continue;
+      const arr2 = managerEventsByUser.get(originUserId) || [];
+      arr2.push(item);
+      managerEventsByUser.set(originUserId, arr2);
+    }
+    for (const [originUserId, group] of managerEventsByUser) {
+      if (inFlightCeoReplyUsers.has(originUserId)) continue;
+      inFlightCeoReplyUsers.add(originUserId);
+      for (const item of group) inFlightCeoReplyMessages.add(item.message.id);
+      console.log(`[mailbox] \u6536\u5230 ${group.length} \u6761 manager \u5185\u90E8\u6D88\u606F\uFF0C\u6B63\u5728\u5524\u9192\u4E3B agent \u5224\u65AD user=${originUserId}...`);
+      void (async () => {
+        try {
+          await processManagerMailboxEventGroup(group);
+        } catch (err) {
+          console.error(`[mailbox] \u5524\u9192\u4E3B agent \u5904\u7406 manager \u5185\u90E8\u6D88\u606F\u5931\u8D25:`, err);
+        } finally {
+          inFlightCeoReplyUsers.delete(originUserId);
+          for (const item of group) inFlightCeoReplyMessages.delete(item.message.id);
+        }
+      })();
+    }
     for (const [mailboxId, msgs] of grouped.entries()) {
       if (inFlightDepartmentMailboxes.has(mailboxId)) continue;
       inFlightDepartmentMailboxes.add(mailboxId);
@@ -66073,7 +66196,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.9.18" : "unknown",
+    version: true ? "1.9.19" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version