duclaw-cli 1.8.1 → 1.8.2

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.1" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.2" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -37937,20 +37937,29 @@ var getMessages = async (storage, userId, limit = 300, date, cronTitle) => {
   const key = buildMessageKey(userId, date, cronTitle);
   const data = await storage.get(key);
   if (!data) return [];
-  let start = Math.max(0, data.length - limit);
-  if (data[start].role !== "user") {
+  const repair = sanitizeMessagesWithReport(data, {
+    mergeAdjacentNonProtocolMessages: false
+  });
+  const repairedData = repair.messages;
+  if (repair.report.changed) {
+    await storage.set(key, repairedData);
+    logSanitizeRepair(repair.report);
+  }
+  if (repairedData.length === 0) return [];
+  let start = Math.max(0, repairedData.length - limit);
+  if (repairedData[start].role !== "user") {
     let earlier = start - 1;
-    while (earlier >= 0 && data[earlier].role !== "user") earlier--;
+    while (earlier >= 0 && repairedData[earlier].role !== "user") earlier--;
     if (earlier >= 0) {
       start = earlier;
     } else {
       let later = start + 1;
-      while (later < data.length && data[later].role !== "user") later++;
-      if (later >= data.length) return [];
+      while (later < repairedData.length && repairedData[later].role !== "user") later++;
+      if (later >= repairedData.length) return [];
       start = later;
     }
   }
-  return sanitizeMessages(data.slice(start));
+  return sanitizeMessages(repairedData.slice(start));
 };
 var isInjectedMemoryContextMessage = (msg) => {
   if (msg.role !== "user" || msg.content.length === 0) return false;
@@ -37961,44 +37970,113 @@ var isInjectedMemoryContextMessage = (msg) => {
 var hasProtocolBlock = (msg) => {
   return msg.content.some((block) => block.type === "tool_use" || block.type === "tool_result");
 };
-var stripToolResultBlocks = (msg) => {
+var createSanitizeReport = () => ({
+  changed: false,
+  removedToolUses: 0,
+  removedToolResults: 0,
+  removedEmptyMessages: 0,
+  removedMemoryContextMessages: 0,
+  droppedMessages: 0,
+  shiftedLeadingMessages: 0,
+  mergedAdjacentMessages: 0
+});
+var markSanitizeChanged = (report, index) => {
+  report.changed = true;
+  if (report.firstChangedIndex === void 0 || index < report.firstChangedIndex) {
+    report.firstChangedIndex = index;
+  }
+};
+var mergeSanitizeReport = (target, source) => {
+  if (!source.changed) return;
+  target.changed = true;
+  if (source.firstChangedIndex !== void 0 && (target.firstChangedIndex === void 0 || source.firstChangedIndex < target.firstChangedIndex)) {
+    target.firstChangedIndex = source.firstChangedIndex;
+  }
+  target.removedToolUses += source.removedToolUses;
+  target.removedToolResults += source.removedToolResults;
+  target.removedEmptyMessages += source.removedEmptyMessages;
+  target.removedMemoryContextMessages += source.removedMemoryContextMessages;
+  target.droppedMessages += source.droppedMessages;
+  target.shiftedLeadingMessages += source.shiftedLeadingMessages;
+  target.mergedAdjacentMessages += source.mergedAdjacentMessages;
+};
+var stripToolResultBlocks = (msg, report, index) => {
+  const removed = msg.content.filter((block) => block.type === "tool_result").length;
   const content = msg.content.filter((block) => block.type !== "tool_result");
+  if (report && removed > 0 && index !== void 0) {
+    report.removedToolResults += removed;
+    markSanitizeChanged(report, index);
+  }
   if (content.length === 0) return null;
   if (content.every((b) => b.type === "text" && !b.text?.trim())) return null;
   return { ...msg, content };
 };
-var stripToolUseBlocks = (msg) => {
+var stripToolUseBlocks = (msg, report, index) => {
+  const removed = msg.content.filter((block) => block.type === "tool_use").length;
   const content = msg.content.filter((block) => block.type !== "tool_use");
+  if (report && removed > 0 && index !== void 0) {
+    report.removedToolUses += removed;
+    markSanitizeChanged(report, index);
+  }
   if (content.length === 0) return null;
   if (content.every((b) => b.type === "text" && !b.text?.trim())) return null;
   return { ...msg, content };
 };
-var sanitizeMessages = (messages) => {
-  if (messages.length === 0) return messages;
+var recordDroppedMessage = (report, index) => {
+  report.droppedMessages++;
+  markSanitizeChanged(report, index);
+};
+var logSanitizeRepair = (report) => {
+  console.warn(
+    `[sanitize] repaired message history removedToolUses=${report.removedToolUses} removedToolResults=${report.removedToolResults} droppedMessages=${report.droppedMessages} emptyMessages=${report.removedEmptyMessages} memoryContextMessages=${report.removedMemoryContextMessages} shiftedLeadingMessages=${report.shiftedLeadingMessages} firstIndex=${report.firstChangedIndex ?? -1}`
+  );
+};
+var sanitizeMessagesWithReport = (messages, options = {}) => {
+  const report = createSanitizeReport();
+  const mergeAdjacentNonProtocolMessages2 = options.mergeAdjacentNonProtocolMessages ?? true;
+  if (messages.length === 0) {
+    return { messages, report };
+  }
   const result = [];
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
-    if (isInjectedMemoryContextMessage(msg)) continue;
-    if (!msg.content || msg.content.length === 0) continue;
-    if (msg.content.every((b) => b.type === "text" && !b.text?.trim())) continue;
+    if (isInjectedMemoryContextMessage(msg)) {
+      report.removedMemoryContextMessages++;
+      recordDroppedMessage(report, i);
+      continue;
+    }
+    if (!msg.content || msg.content.length === 0) {
+      report.removedEmptyMessages++;
+      recordDroppedMessage(report, i);
+      continue;
+    }
+    if (msg.content.every((b) => b.type === "text" && !b.text?.trim())) {
+      report.removedEmptyMessages++;
+      recordDroppedMessage(report, i);
+      continue;
+    }
     let nextMsg = msg;
     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\u5DF2\u79FB\u9664\u4E0D\u5408\u6CD5\u5DE5\u5177\u8C03\u7528\uFF08index=${i}\uFF09`);
-          nextMsg = stripToolUseBlocks(msg);
-          if (!nextMsg) continue;
+          nextMsg = stripToolUseBlocks(msg, report, i);
+          if (!nextMsg) {
+            recordDroppedMessage(report, i);
+            continue;
+          }
         } else {
           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\u5DF2\u79FB\u9664\u4E0D\u5408\u6CD5\u5DE5\u5177\u8C03\u7528\uFF08index=${i}\uFF09`);
-            nextMsg = stripToolUseBlocks(msg);
-            if (!nextMsg) continue;
+            nextMsg = stripToolUseBlocks(msg, report, i);
+            if (!nextMsg) {
+              recordDroppedMessage(report, i);
+              continue;
+            }
           }
         }
       }
@@ -38012,23 +38090,39 @@ var sanitizeMessages = (messages) => {
         );
         const allResultsMatched = toolResults.every((tr) => prevToolUseIds.has(tr.tool_use_id));
         if (!prev2 || prev2.role !== "assistant" || prevToolUseIds.size === 0 || !allResultsMatched) {
-          console.warn(`[sanitize] \u53D1\u73B0\u5B64\u513F tool_result\uFF0C\u5DF2\u79FB\u9664\u4E0D\u5408\u6CD5\u5DE5\u5177\u7ED3\u679C`);
-          nextMsg = stripToolResultBlocks(nextMsg);
-          if (!nextMsg) continue;
+          nextMsg = stripToolResultBlocks(nextMsg, report, i);
+          if (!nextMsg) {
+            recordDroppedMessage(report, i);
+            continue;
+          }
         }
       }
     }
     const prev = result[result.length - 1];
-    if (prev && prev.role === nextMsg.role && !hasProtocolBlock(prev) && !hasProtocolBlock(nextMsg)) {
+    if (mergeAdjacentNonProtocolMessages2 && prev && prev.role === nextMsg.role && !hasProtocolBlock(prev) && !hasProtocolBlock(nextMsg)) {
       prev.content = [...prev.content, ...nextMsg.content];
+      report.mergedAdjacentMessages++;
+      markSanitizeChanged(report, i);
     } else {
       result.push({ ...nextMsg, content: [...nextMsg.content] });
     }
   }
   while (result.length > 0 && result[0].role !== "user") {
     result.shift();
+    report.shiftedLeadingMessages++;
+    markSanitizeChanged(report, 0);
   }
-  return result;
+  if (report.shiftedLeadingMessages > 0) {
+    const revalidated = sanitizeMessagesWithReport(result, options);
+    if (revalidated.report.changed) {
+      mergeSanitizeReport(report, revalidated.report);
+      return { messages: revalidated.messages, report };
+    }
+  }
+  return { messages: result, report };
+};
+var sanitizeMessages = (messages) => {
+  return sanitizeMessagesWithReport(messages).messages;
 };
 var addMessage = async (storage, userId, message, date, cronTitle) => {
   const key = buildMessageKey(userId, date, cronTitle);
@@ -40566,6 +40660,128 @@ var isTextBlock = (block) => block.type === `text`;
 var isToolUseBlock = (block) => block.type === "tool_use";
 var extractText = (blocks) => blocks.filter(isTextBlock).map((b) => b.text).join("\n");
 
+// src/tools/tools/ImageUnderstandMetering.ts
+var import_node_crypto = require("node:crypto");
+var ImageUnderstandMeteringError = class extends Error {
+  constructor(message, statusCode, meteringStatus) {
+    super(message);
+    this.statusCode = statusCode;
+    this.meteringStatus = meteringStatus;
+    this.name = "ImageUnderstandMeteringError";
+  }
+  statusCode;
+  meteringStatus;
+};
+async function reportImageUnderstandUsage(input) {
+  const baseUrl = input.baseUrl?.trim().replace(/\/+$/, "");
+  const token = input.token?.trim();
+  const tenantId = input.tenantId?.trim();
+  if (!baseUrl || !token || !tenantId) {
+    return { status: "disabled" };
+  }
+  const payload = buildImageUnderstandMeteringPayload({
+    ...input,
+    tenantId
+  });
+  const response = await fetch(`${baseUrl}/internal/metering/image-understand`, {
+    method: "POST",
+    headers: {
+      "content-type": "application/json",
+      authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify(payload)
+  });
+  const body = await parseResponseJson(response);
+  const result = body && typeof body === "object" && "result" in body ? body.result : void 0;
+  if (result?.status === "credit_exhausted") {
+    throw new ImageUnderstandMeteringError(
+      "[ImageUnderstand] credit_exhausted",
+      response.status,
+      result.status
+    );
+  }
+  if (!response.ok || result?.status === "failed") {
+    throw new ImageUnderstandMeteringError(
+      `[ImageUnderstand] \u56FE\u7247\u7406\u89E3\u6263\u8D39\u4E0A\u62A5\u5931\u8D25: ${result?.status ?? response.status}`,
+      response.status,
+      result?.status
+    );
+  }
+  return {
+    status: result?.status === "skipped_existing" ? "skipped_existing" : "charged",
+    creditAmount: result?.creditAmount ?? null
+  };
+}
+function buildImageUnderstandMeteringPayload(input) {
+  const metadata = input.userRequest?.metadata ?? {};
+  const messageId = stringValue(metadata.message_id) ?? nestedMessageId(metadata) ?? stringValue(input.userRequest?.requestId);
+  const imageKey = stringValue(metadata.imageKey) ?? stringValue(metadata.image_key) ?? firstString(metadata.imageKeys);
+  return {
+    tenantId: input.tenantId,
+    provider: input.provider,
+    model: input.model,
+    requestId: stringValue(input.userRequest?.requestId),
+    messageId,
+    imageKey,
+    imageFingerprint: fingerprintImageSource(input.imageSource),
+    toolCallId: stringValue(metadata.toolCallId),
+    promptChars: input.prompt.length,
+    resultChars: input.resultText.length,
+    platform: stringValue(input.userRequest?.platform),
+    occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
+    metadata: {
+      imageSourceKind: imageSourceKind(input.imageSource),
+      chatType: stringValue(input.userRequest?.chatType),
+      authStyle: stringValue(input.authStyle)
+    }
+  };
+}
+function inferImageProvider(baseUrl) {
+  if (!baseUrl) return "moonshot";
+  try {
+    const host = new URL(baseUrl).hostname.toLowerCase();
+    if (host.includes("moonshot")) return "moonshot";
+    if (host.includes("anthropic")) return "anthropic";
+    if (host.includes("bigmodel") || host.includes("zhipu")) return "zhipu";
+    return host.replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "") || "custom";
+  } catch {
+    return "custom";
+  }
+}
+function fingerprintImageSource(imageSource) {
+  return (0, import_node_crypto.createHash)("sha256").update(imageSource).digest("hex");
+}
+function imageSourceKind(imageSource) {
+  if (imageSource.startsWith("http://") || imageSource.startsWith("https://")) return "url";
+  if (imageSource.startsWith("/") || imageSource.startsWith(".") || /^[A-Za-z]:[\\/]/.test(imageSource)) return "local_file";
+  return "base64";
+}
+function nestedMessageId(metadata) {
+  const message = metadata.message;
+  if (!message || typeof message !== "object" || Array.isArray(message)) return null;
+  return stringValue(message.message_id);
+}
+function firstString(value) {
+  if (!Array.isArray(value)) return null;
+  for (const item of value) {
+    const normalized = stringValue(item);
+    if (normalized) return normalized;
+  }
+  return null;
+}
+function stringValue(value) {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim();
+  return normalized ? normalized : null;
+}
+async function parseResponseJson(response) {
+  try {
+    return await response.json();
+  } catch {
+    return null;
+  }
+}
+
 // src/tools/tools/ImageUnderstand.ts
 var guessMediaTypeFromData = (base64Data) => {
   if (base64Data.startsWith("/9j/")) return "image/jpeg";
@@ -40643,11 +40859,12 @@ var imageUnderstand = {
     if (!url) throw new Error(`[ImageUnderstand] TOOL_IMAGE_ANTHROPIC_BASE_URL\u672A\u914D\u7F6E`);
     if (!key) throw new Error(`[ImageUnderstand] TOOL_IMAGE_ANTHROPIC_AUTH_TOKEN\u672A\u914D\u7F6E`);
     if (!model) throw new Error(`[ImageUnderstand] TOOL_IMAGE_ANTHROPIC_MODEL\u672A\u914D\u7F6E`);
+    const authStyle = process.env.TOOL_IMAGE_ANTHROPIC_AUTH_STYLE || "bearer";
     const anthropicOption = {
       baseURL: url,
       apiKey: key,
       model,
-      authStyle: process.env.TOOL_IMAGE_ANTHROPIC_AUTH_STYLE || "bearer"
+      authStyle
     };
     const llmClient = createAnthropicAdapter(anthropicOption);
     const imageBlock = await resolveImageBlock(imageSource);
@@ -40657,7 +40874,20 @@ var imageUnderstand = {
       [imageMessage],
       system
     );
-    return extractText(response.content);
+    const resultText = extractText(response.content);
+    await reportImageUnderstandUsage({
+      baseUrl: process.env.DUCLAW_CONTROL_PLANE_BASE_URL,
+      token: process.env.DUCLAW_CONTROL_PLANE_METERING_TOKEN,
+      tenantId: process.env.DUCLAW_TENANT_ID,
+      provider: inferImageProvider(url),
+      model,
+      prompt,
+      resultText,
+      imageSource,
+      authStyle,
+      userRequest
+    });
+    return resultText;
   }
 };
 
@@ -41084,10 +41314,10 @@ var goalDelete = {
 };
 
 // src/tools/tools/department/DepartmentCreate.ts
-var import_node_crypto3 = require("node:crypto");
+var import_node_crypto4 = require("node:crypto");
 
 // src/department/mailbox/mailbox.ts
-var import_node_crypto2 = require("node:crypto");
+var import_node_crypto3 = require("node:crypto");
 
 // src/db/createDB.ts
 var import_better_sqlite3 = __toESM(require("better-sqlite3"));
@@ -41214,7 +41444,7 @@ var create_mailbox_events_table = () => {
 };
 
 // src/department/mailbox/events.ts
-var import_node_crypto = require("node:crypto");
+var import_node_crypto2 = require("node:crypto");
 var parseDetail = (detailJson) => {
   if (!detailJson) return void 0;
   try {
@@ -41255,7 +41485,7 @@ var mapMailboxEventRow = (row) => {
 var recordMailboxEvent = (input) => {
   const db3 = createSqliteDB();
   const event = {
-    id: (0, import_node_crypto.randomUUID)().slice(0, 12),
+    id: (0, import_node_crypto2.randomUUID)().slice(0, 12),
     messageId: input.messageId,
     mailboxId: input.mailboxId,
     actorMailboxId: input.actorMailboxId,
@@ -41579,7 +41809,7 @@ var sendMessage2 = (fromMailboxId, toMailboxId, content, options) => {
         thread_id,
         parent_message_id
     ) values (?,?,?,?,?,?,?,?,?,?) `);
-  const id = (0, import_node_crypto2.randomUUID)().slice(0, 8);
+  const id = (0, import_node_crypto3.randomUUID)().slice(0, 8);
   const threadId = options?.threadId || id;
   let mailboxMsg = {
     id,
@@ -41694,7 +41924,7 @@ var departmentCreate = {
       return `[departmentCreate] \u4E0D\u5B58\u5728 id=${sourceGoalId} \u7684\u76EE\u6807`;
     }
     let departmentDefinition = {
-      id: (0, import_node_crypto3.randomUUID)().slice(0, 8),
+      id: (0, import_node_crypto4.randomUUID)().slice(0, 8),
       name,
       charter,
       sourceGoalId,
@@ -41908,7 +42138,7 @@ var departmentList = {
 };
 
 // src/tools/tools/department/DepartmentMemberCreate.ts
-var import_node_crypto4 = require("node:crypto");
+var import_node_crypto5 = require("node:crypto");
 var DESCRIPTION24 = `
 \u521B\u5EFA\u90E8\u95E8\u6210\u5458\u3002
 
@@ -41974,7 +42204,7 @@ var departmentMemberCreate = {
       }
     }
     let departmentMember = {
-      id: (0, import_node_crypto4.randomUUID)().slice(0, 8),
+      id: (0, import_node_crypto5.randomUUID)().slice(0, 8),
       name,
       departmentId: department.id,
       mailBoxId: getMailBoxId(department.name, name),
@@ -42157,7 +42387,7 @@ ${replies}`;
 // src/department/learning.ts
 var import_node_fs3 = require("node:fs");
 var import_node_path11 = __toESM(require("node:path"));
-var import_node_crypto5 = require("node:crypto");
+var import_node_crypto6 = require("node:crypto");
 var ensureDir = (dir) => (0, import_node_fs3.mkdirSync)(dir, { recursive: true });
 var readJsonArray = (filePath) => {
   if (!(0, import_node_fs3.existsSync)(filePath)) return [];
@@ -42193,7 +42423,7 @@ var listDepartmentMemories = (departmentName) => {
 var createDepartmentMemory = (departmentName, input) => {
   const now = Date.now();
   const memory = {
-    id: (0, import_node_crypto5.randomUUID)().slice(0, 8),
+    id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
     departmentName,
     title: input.title,
     content: input.content,
@@ -42235,7 +42465,7 @@ var proposeDepartmentSkill = (departmentName, input) => {
   }
   const now = Date.now();
   const skill = {
-    id: (0, import_node_crypto5.randomUUID)().slice(0, 8),
+    id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
     departmentName,
     skillName: input.skillName,
     description: input.description,
@@ -42272,7 +42502,7 @@ var createDepartmentProposal = (input) => {
   const records = readJsonArray(proposalsPath());
   const proposal = {
     ...input,
-    id: (0, import_node_crypto5.randomUUID)().slice(0, 8),
+    id: (0, import_node_crypto6.randomUUID)().slice(0, 8),
     status: "pending",
     createdAt: Date.now()
   };
@@ -43297,7 +43527,7 @@ var readDreamHistoryLimit = () => {
 var import_node_fs5 = require("node:fs");
 var import_node_os2 = require("node:os");
 var import_node_path12 = require("node:path");
-var import_node_crypto6 = require("node:crypto");
+var import_node_crypto7 = require("node:crypto");
 var SkillForgeEngine = class {
   proposalStorage;
   draftRoot;
@@ -43326,7 +43556,7 @@ var SkillForgeEngine = class {
     if (pending.some((p) => p.skillName === skillName)) {
       return null;
     }
-    const id = (0, import_node_crypto6.randomBytes)(4).toString("hex");
+    const id = (0, import_node_crypto7.randomBytes)(4).toString("hex");
     const draftDir = (0, import_node_path12.join)(this.draftRoot, userId, id);
     (0, import_node_fs5.mkdirSync)(draftDir, { recursive: true });
     (0, import_node_fs5.writeFileSync)((0, import_node_path12.join)(draftDir, "SKILL.md"), skillMd, "utf-8");
@@ -43574,7 +43804,7 @@ var skillForgeDrop = (engine) => ({
 });
 
 // src/memory/MemoryEngine.ts
-var import_node_crypto7 = require("node:crypto");
+var import_node_crypto8 = require("node:crypto");
 var MemoryEngine = class {
   storage;
   recallIndexStorage;
@@ -43602,7 +43832,7 @@ var MemoryEngine = class {
     }
     const now = Date.now();
     const memory = {
-      id: (0, import_node_crypto7.randomBytes)(4).toString("hex"),
+      id: (0, import_node_crypto8.randomBytes)(4).toString("hex"),
       userId,
       title,
       content,
@@ -44794,7 +45024,14 @@ ${memoryInjection}` : "") + dreamInjection;
                     }
                   }
                 }
-                const result = await toolExecutor.execute(useBlock.name, useBlock.input, request);
+                const toolRequest = {
+                  ...request,
+                  metadata: {
+                    ...request.metadata ?? {},
+                    toolCallId: useBlock.id
+                  }
+                };
+                const result = await toolExecutor.execute(useBlock.name, useBlock.input, toolRequest);
                 return toolResult(useBlock.id, result);
               } catch (error) {
                 const err = error;
@@ -50313,7 +50550,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.1" : "unknown",
+    version: true ? "1.8.2" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version