duclaw-cli 1.6.0 → 1.7.0

package/README.md

@@ -132,3 +132,11 @@ pnpm build
 ## License
 
 Private
+
+## 打赏
+
+如果 Duclaw 对你有帮助，欢迎请作者喝杯咖啡 ☕
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/DZCD/agent-template-ts/main/docs/a26aee81e6e5ba739ebb7abfd9dadfad.jpg" alt="打赏二维码" width="300">
+</p>

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.6.0" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.7.0" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -35445,7 +35445,40 @@ var getMessages = async (storage, userId, limit = 100, date, cronTitle) => {
       start = later;
     }
   }
-  return data.slice(start);
+  return sanitizeMessages(data.slice(start));
+};
+var sanitizeMessages = (messages) => {
+  if (messages.length === 0) return messages;
+  const result = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (!msg.content || msg.content.length === 0) continue;
+    if (msg.role === "assistant") {
+      const toolUses = msg.content.filter((b) => b.type === "tool_use");
+      if (toolUses.length > 0) {
+        const next = messages[i + 1];
+        if (!next || next.role !== "user") {
+          console.warn(`[sanitize] \u53D1\u73B0 assistant tool_use \u65E0\u5BF9\u5E94 tool_result\uFF0C\u622A\u65AD\u6D88\u606F\u5386\u53F2\uFF08index=${i}\uFF09`);
+          break;
+        }
+        const resultIds = new Set(
+          next.content.filter((b) => b.type === "tool_result").map((b) => b.tool_use_id)
+        );
+        const allMatched = toolUses.every((tu) => resultIds.has(tu.id));
+        if (!allMatched) {
+          console.warn(`[sanitize] tool_use/tool_result id \u4E0D\u5339\u914D\uFF0C\u622A\u65AD\u6D88\u606F\u5386\u53F2\uFF08index=${i}\uFF09`);
+          break;
+        }
+      }
+    }
+    const prev = result[result.length - 1];
+    if (prev && prev.role === msg.role) {
+      prev.content = [...prev.content, ...msg.content];
+    } else {
+      result.push({ ...msg, content: [...msg.content] });
+    }
+  }
+  return result;
 };
 var addMessage = async (storage, userId, message, date, cronTitle) => {
   let key = `mem:${userId}`;
@@ -42281,9 +42314,23 @@ ${content}
     teamAgentId: "",
     content: replyContent
   };
-  const mainAgent = createAgent();
+  const config2 = getDefaultAgentConfig();
+  const mainAgent = createAgent(config2);
   const result = await mainAgent(request);
   console.log(`[mailbox] \u4E3B agent \u5904\u7406\u5B8C ${fromMailboxId} \u7684\u56DE\u4FE1, alreadySent=${result.alreadySent}`);
+  if (!result.alreadySent && result.content && config2.channelPlugin) {
+    try {
+      await config2.channelPlugin.outbound.sendText({
+        cfg: {},
+        to: origin.originUserId,
+        text: result.content,
+        accountId: replyMsg.id
+      });
+      console.log(`[mailbox] \u4E3B agent \u672A\u4E3B\u52A8\u53D1\u9001\uFF0C\u5DF2\u901A\u8FC7\u6E20\u9053\u8865\u53D1\u7ED3\u679C\u7ED9\u7528\u6237 ${origin.originUserId}`);
+    } catch (sendErr) {
+      console.error(`[mailbox] \u8865\u53D1\u6D88\u606F\u5931\u8D25:`, sendErr);
+    }
+  }
 };
 var wakeTeamAgent = async (mailboxId, msgIds) => {
   try {
@@ -46296,7 +46343,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.6.0" : "unknown",
+    version: true ? "1.7.0" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version