duclaw-cli 1.5.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.5.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}`;
@@ -41794,10 +41827,18 @@ var RedisMessageDeduplication = class {
   }
 };
 
+// src/channels/feishu/MessageProcess.ts
+var import_node_path10 = require("node:path");
+var import_node_os4 = require("node:os");
+var import_node_fs5 = require("node:fs");
+
 // src/oss/AliyunOSSClient.ts
 var import_ali_oss = __toESM(require("ali-oss"));
 loadEnv();
 var aliyunOssClient = void 0;
+var isOssConfigured = () => {
+  return !!(process.env.OSS_ACCESS_KEY_ID && process.env.OSS_ACCESS_KEY_SECRET && process.env.OSS_ENDPOINT && process.env.OSS_BUCKET);
+};
 var createAliyunOssClient = () => {
   const key = process.env.OSS_ACCESS_KEY_ID;
   const secret = process.env.OSS_ACCESS_KEY_SECRET;
@@ -41825,6 +41866,26 @@ var createAliyunOssClient = () => {
 };
 
 // src/channels/feishu/MessageProcess.ts
+var saveToLocal = (userId, subDir, fileName, buffer) => {
+  const dir = (0, import_node_path10.join)((0, import_node_os4.homedir)(), ".duclaw", "workspace", userId, subDir);
+  (0, import_node_fs5.mkdirSync)(dir, { recursive: true });
+  const filePath = (0, import_node_path10.join)(dir, fileName);
+  (0, import_node_fs5.writeFileSync)(filePath, buffer);
+  return filePath;
+};
+var tryUploadToOss = async (ossPath, buffer) => {
+  if (!isOssConfigured()) return null;
+  try {
+    const ossClient = createAliyunOssClient();
+    await ossClient.put(ossPath, buffer);
+    const url = await ossClient.signatureUrlV4("GET", 3600, void 0, ossPath);
+    console.log(`[MessageProcess] OSS \u4E0A\u4F20\u6210\u529F\uFF0C\u4E34\u65F6\u8BBF\u95EE\u94FE\u63A5: ${url}`);
+    return url;
+  } catch (err) {
+    console.warn(`[MessageProcess] OSS \u4E0A\u4F20\u5931\u8D25\uFF0C\u4F7F\u7528\u672C\u5730\u8DEF\u5F84: ${err}`);
+    return null;
+  }
+};
 var processImageMsg = async (userRequest) => {
   if (!userRequest.metadata) {
     throw new Error(`[MessageProcess] \u98DE\u4E66\u56FE\u7247\u6D88\u606F\u5E94\u8981\u6709metadata,\u5F53\u524D:${userRequest.metadata}`);
@@ -41839,30 +41900,13 @@ var processImageMsg = async (userRequest) => {
   if (!image_key) {
     throw new Error(`[MessageProcess] \u98DE\u4E66\u56FE\u7247\u6D88\u606F\u5E94\u8981\u6709image_key`);
   }
-  const ossClient = createAliyunOssClient();
-  try {
-    const buffer = await downloadMessageImage(message.message_id, image_key);
-    const result = await ossClient.put(
-      `${userRequest.userId}/images/${image_key}`,
-      buffer
-    );
-    console.log("\u6587\u4EF6\u4E0A\u4F20oss\u5B8C\u6210:", result);
-    const publicReadableUrl = await ossClient.signatureUrlV4(
-      `GET`,
-      3600,
-      // 过期时间（秒），1小时
-      void 0,
-      // 不需要额外的 headers/queries
-      `${userRequest.userId}/images/${image_key}`
-      // obj name
-    );
-    console.log(`[MessageProcess] \u4E34\u65F6\u8BBF\u95EE\u94FE\u63A5: ${publicReadableUrl}\uFF0C\u6709\u6548\u65F6\u957F: 1h`);
-    userRequest.metadata.imageUrl = publicReadableUrl;
-    userRequest.content = `<system-reminder>\u63A5\u6536\u5230\u7528\u6237\u53D1\u6765\u7684\u56FE\u7247\u6D88\u606F,\u56FE\u7247\u5DF2\u5B58\u50A8\u5728\u4E0A\u4E0B\u6587\u4E2D,\u8BF7\u4F7F\u7528image_understand\u5DE5\u5177\u5206\u6790\u56FE\u7247(\u4E0D\u9700\u8981\u4F20image_url\u53C2\u6570,\u5DE5\u5177\u4F1A\u81EA\u52A8\u83B7\u53D6\u56FE\u7247)</system-reminder>`;
-    return userRequest;
-  } catch (err) {
-    throw new Error(`[MessageProcess] \u4E0A\u4F20\u56FE\u7247\u5230\u963F\u91CC\u4E91oss\u5931\u8D25:${err}`);
-  }
+  const buffer = await downloadMessageImage(message.message_id, image_key);
+  const localPath = saveToLocal(userRequest.userId, "images", `${image_key}.png`, buffer);
+  console.log(`[MessageProcess] \u56FE\u7247\u5DF2\u4FDD\u5B58\u5230\u672C\u5730: ${localPath}`);
+  const ossUrl = await tryUploadToOss(`${userRequest.userId}/images/${image_key}`, buffer);
+  userRequest.metadata.imageUrl = ossUrl || localPath;
+  userRequest.content = `<system-reminder>\u63A5\u6536\u5230\u7528\u6237\u53D1\u6765\u7684\u56FE\u7247\u6D88\u606F,\u56FE\u7247\u5DF2\u5B58\u50A8\u5728\u4E0A\u4E0B\u6587\u4E2D,\u8BF7\u4F7F\u7528image_understand\u5DE5\u5177\u5206\u6790\u56FE\u7247(\u4E0D\u9700\u8981\u4F20image_url\u53C2\u6570,\u5DE5\u5177\u4F1A\u81EA\u52A8\u83B7\u53D6\u56FE\u7247)</system-reminder>`;
+  return userRequest;
 };
 var processFileMsg = async (userRequest) => {
   const metadata = userRequest.metadata;
@@ -41875,31 +41919,22 @@ var processFileMsg = async (userRequest) => {
   if (!messageId || !fileKey || !fileName) {
     throw new Error(`[MessageProcess] \u98DE\u4E66\u6587\u4EF6\u6D88\u606F\u7F3A\u5C11 message_id/file_key/file_name`);
   }
-  const ossClient = createAliyunOssClient();
-  try {
-    const buffer = await downloadMessageFile(messageId, fileKey);
-    console.log(`[MessageProcess] \u6587\u4EF6\u4E0B\u8F7D\u5B8C\u6210: ${fileName}, \u5927\u5C0F: ${buffer.length} bytes`);
-    const ossPath = `${userRequest.userId}/files/${fileKey}_${fileName}`;
-    const result = await ossClient.put(ossPath, buffer);
-    console.log("[MessageProcess] \u6587\u4EF6\u4E0A\u4F20oss\u5B8C\u6210:", result);
-    const publicReadableUrl = await ossClient.signatureUrlV4(
-      `GET`,
-      3600,
-      void 0,
-      ossPath
-    );
-    console.log(`[MessageProcess] \u6587\u4EF6\u4E34\u65F6\u8BBF\u95EE\u94FE\u63A5: ${publicReadableUrl}\uFF0C\u6709\u6548\u65F6\u957F: 1h`);
-    userRequest.metadata.fileUrl = publicReadableUrl;
-    userRequest.content = [
-      `\u7528\u6237\u901A\u8FC7\u98DE\u4E66\u53D1\u9001\u4E86\u4E00\u4E2A\u6587\u4EF6\u3002`,
-      `\u6587\u4EF6\u540D: ${fileName}`,
-      `\u6587\u4EF6\u5DF2\u4E0A\u4F20\u81F3\u4E91\u5B58\u50A8\uFF0C\u53EF\u901A\u8FC7\u4EE5\u4E0B URL \u8BBF\u95EE\uFF081\u5C0F\u65F6\u6709\u6548\uFF09:`,
-      publicReadableUrl
-    ].join("\n");
-    return userRequest;
-  } catch (err) {
-    throw new Error(`[MessageProcess] \u4E0A\u4F20\u6587\u4EF6\u5230\u963F\u91CC\u4E91oss\u5931\u8D25:${err}`);
-  }
+  const buffer = await downloadMessageFile(messageId, fileKey);
+  console.log(`[MessageProcess] \u6587\u4EF6\u4E0B\u8F7D\u5B8C\u6210: ${fileName}, \u5927\u5C0F: ${buffer.length} bytes`);
+  const localPath = saveToLocal(userRequest.userId, "files", fileName, buffer);
+  console.log(`[MessageProcess] \u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230\u672C\u5730: ${localPath}`);
+  const ossPath = `${userRequest.userId}/files/${fileKey}_${fileName}`;
+  const ossUrl = await tryUploadToOss(ossPath, buffer);
+  const fileLocation = ossUrl || localPath;
+  userRequest.metadata.fileUrl = fileLocation;
+  userRequest.content = [
+    `\u7528\u6237\u901A\u8FC7\u98DE\u4E66\u53D1\u9001\u4E86\u4E00\u4E2A\u6587\u4EF6\u3002`,
+    `\u6587\u4EF6\u540D: ${fileName}`,
+    ossUrl ? `\u6587\u4EF6\u5DF2\u4E0A\u4F20\u81F3\u4E91\u5B58\u50A8\uFF0C\u53EF\u901A\u8FC7\u4EE5\u4E0B URL \u8BBF\u95EE\uFF081\u5C0F\u65F6\u6709\u6548\uFF09:
+${ossUrl}` : `\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230\u672C\u5730\u8DEF\u5F84:
+${localPath}`
+  ].join("\n");
+  return userRequest;
 };
 
 // src/channels/feishu/feishuChannelsPlugin.ts
@@ -42279,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 {
@@ -46294,7 +46343,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.5.0" : "unknown",
+    version: true ? "1.7.0" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version