duclaw-cli 1.8.44 → 1.8.46

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.44" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.46" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -37985,8 +37985,8 @@ var getMessages = async (storage, userId, limit = 300, date, cronTitle) => {
 var isInjectedMemoryContextMessage = (msg) => {
   if (msg.role !== "user" || msg.content.length === 0) return false;
   if (!msg.content.every((block) => block.type === "text")) return false;
-  const textContent = msg.content.map((block) => block.type === "text" ? block.text : "").join("\n").trim();
-  return textContent.startsWith("<memory-context>") && textContent.endsWith("</memory-context>");
+  const textContent2 = msg.content.map((block) => block.type === "text" ? block.text : "").join("\n").trim();
+  return textContent2.startsWith("<memory-context>") && textContent2.endsWith("</memory-context>");
 };
 var hasProtocolBlock = (msg) => {
   return msg.content.some((block) => block.type === "tool_use" || block.type === "tool_result");
@@ -38226,12 +38226,12 @@ var searchChatHistory = async (messageStorage, topicStorage, userId, query, date
     for (let j = from; j <= to; j++) {
       const msg = messages[j];
       if (!msg) continue;
-      const textContent = msg.content.filter((b) => b.type === "text").map((b) => b.text).join(" ").slice(0, 200);
-      if (textContent) {
+      const textContent2 = msg.content.filter((b) => b.type === "text").map((b) => b.text).join(" ").slice(0, 200);
+      if (textContent2) {
         snippets.push({
           index: j,
           role: msg.role,
-          text: textContent,
+          text: textContent2,
           isMatch: j === match2.i
         });
       }
@@ -45235,9 +45235,10 @@ var getCompactConfig = () => ({
   enabled: readBoolean("COMPACT_ENABLED", true),
   contextWindowTokens: readNumber("COMPACT_CONTEXT_WINDOW_TOKENS", 2e5),
   outputReserveTokens: readNumber("COMPACT_OUTPUT_RESERVE_TOKENS", 2e4),
-  bufferTokens: readNumber("COMPACT_BUFFER_TOKENS", 13e3),
+  bufferTokens: readNumber("COMPACT_BUFFER_TOKENS", 0),
   warningBufferTokens: readNumber("COMPACT_WARNING_BUFFER_TOKENS", 2e4),
   hotTailMessages: readNumber("COMPACT_HOT_TAIL_MESSAGES", 24),
+  compactUserMessageMaxTokens: readNumber("COMPACT_USER_MESSAGE_MAX_TOKENS", 2e4),
   maxFailures: readNumber("COMPACT_MAX_FAILURES", 3),
   microCompactKeepToolResults: readNumber("MICRO_COMPACT_KEEP_TOOL_RESULTS", 5),
   microCompactToolResultChars: readNumber("MICRO_COMPACT_TOOL_RESULT_CHARS", 1200)
@@ -45363,70 +45364,50 @@ var tokenCountWithEstimation = (messages, systemPrompt = "") => {
 };
 
 // src/compact/compactPrompt.ts
-var stringify2 = (value) => {
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return "[unserializable]";
-  }
-};
-var renderBlock2 = (block) => {
-  switch (block.type) {
-    case "text":
-      return block.text;
-    case "tool_use":
-      return `[tool_use id=${block.id} name=${block.name} input=${stringify2(block.input)}]`;
-    case "tool_result":
-      return `[tool_result tool_use_id=${block.tool_use_id} content=${block.content}]`;
-    case "image":
-      return `[image source=${block.source.type}]`;
-    case "thinking":
-      return `[thinking ${block.thinking}]`;
-    default:
-      return stringify2(block);
-  }
-};
-var renderMessagesForCompact = (messages) => messages.map((message, index) => {
-  const content = message.content.map(renderBlock2).join("\n");
-  return `<message index="${index}" role="${message.role}">
-${content}
-</message>`;
-}).join("\n\n");
-var COMPACT_SYSTEM_PROMPT = `\u4F60\u662F Duclaw \u7684\u4F1A\u8BDD\u538B\u7F29\u5668\u3002\u4F60\u53EA\u8D1F\u8D23\u628A\u7814\u53D1\u667A\u80FD\u4F53\u7684\u5386\u53F2\u5BF9\u8BDD\u538B\u7F29\u6210\u53EF\u7EE7\u7EED\u5DE5\u4F5C\u7684\u7ED3\u6784\u5316\u6458\u8981\uFF0C\u4E0D\u8C03\u7528\u5DE5\u5177\uFF0C\u4E0D\u548C\u7528\u6237\u804A\u5929\u3002
-
-\u8981\u6C42\uFF1A
-1. \u4FDD\u7559\u5F53\u524D\u7528\u6237\u76EE\u6807\u3001\u6700\u65B0\u660E\u786E\u8981\u6C42\u3001\u7EA6\u675F\u548C\u504F\u597D\u3002
-2. \u4FDD\u7559\u5F53\u524D\u4EFB\u52A1\u72B6\u6001\u3001\u5DF2\u5B8C\u6210\u5DE5\u4F5C\u3001\u672A\u5B8C\u6210\u4E8B\u9879\u548C\u4E0B\u4E00\u6B65\u3002
-3. \u4FDD\u7559\u5173\u952E\u6587\u4EF6\u8DEF\u5F84\u3001\u547D\u4EE4\u3001\u9519\u8BEF\u539F\u6587\u7247\u6BB5\u3001\u5916\u90E8\u6587\u6863/\u63A5\u53E3\u7ED3\u8BBA\u3002
-4. \u4FDD\u7559\u91CD\u8981\u5DE5\u5177\u7ED3\u679C\uFF0C\u4F46\u4E0D\u8981\u7C98\u8D34\u957F\u65E5\u5FD7\uFF1B\u53EA\u5199\u53EF\u884C\u52A8\u7ED3\u8BBA\u3002
-5. \u6807\u51FA\u5DF2\u4E22\u5F03\u6216\u4E0D\u518D\u91CD\u8981\u7684\u4FE1\u606F\u7C7B\u578B\u3002
-6. \u5982\u679C\u5386\u53F2\u4E2D\u6709 Department Head\u3001Executor\u3001mailbox\u3001cron \u7EBF\u7D22\uFF0C\u8BB0\u5F55\u8D23\u4EFB\u4EBA\u548C\u7EBF\u7A0B\u72B6\u6001\u3002
-7. \u8F93\u51FA\u5FC5\u987B\u662F\u7EAF\u6587\u672C\uFF0C\u5E76\u4E25\u683C\u4F7F\u7528\u4E0B\u9762\u7ED3\u6784\uFF1A
+var COMPACT_SUMMARIZATION_PROMPT = `You are performing a CONTEXT CHECKPOINT COMPACTION. Create a handoff summary for another LLM that will resume the task.
+
+The summary must be concise, factual, and directly useful for continuing the work. Do not invent missing details. Clearly separate confirmed facts from assumptions or items that still need verification.
+
+Use this exact schema:
 
 <compact-summary>
-1. \u7528\u6237\u76EE\u6807\uFF1A
-2. \u5F53\u524D\u4EFB\u52A1\u72B6\u6001\uFF1A
-3. \u5DF2\u5B8C\u6210\u5DE5\u4F5C\uFF1A
-4. \u5DF2\u67E5\u770B/\u4FEE\u6539\u7684\u6587\u4EF6\uFF1A
-5. \u5173\u952E\u5DE5\u5177\u7ED3\u679C\uFF1A
-6. \u9519\u8BEF\u4E0E\u4FEE\u590D\uFF1A
-7. \u7528\u6237\u660E\u786E\u7EA6\u675F\uFF1A
-8. \u672A\u5B8C\u6210\u4E8B\u9879\uFF1A
-9. \u4E0B\u4E00\u6B65\u5EFA\u8BAE\uFF1A
-10. \u5DF2\u4E22\u5F03\u4FE1\u606F\uFF1A
-</compact-summary>`;
-var buildCompactUserPrompt = (messages, reason) => `\u8BF7\u538B\u7F29\u4E0B\u9762\u7684\u4F1A\u8BDD\u5386\u53F2\uFF0C\u89E6\u53D1\u539F\u56E0\uFF1A${reason}\u3002
-
-<conversation>
-${renderMessagesForCompact(messages)}
-</conversation>`;
+1. \u7528\u6237\u6700\u65B0\u76EE\u6807:
+2. \u7528\u6237\u786C\u6027\u7EA6\u675F:
+3. \u5F53\u524D\u4E8B\u5B9E\u72B6\u6001:
+4. \u5DF2\u5B8C\u6210\u52A8\u4F5C:
+5. \u6587\u4EF6/\u547D\u4EE4/\u8BC1\u636E:
+6. mailbox/department \u7EBF\u7A0B:
+7. \u7528\u6237\u53EF\u89C1\u627F\u8BFA:
+8. \u672A\u5B8C\u6210\u4E8B\u9879:
+9. \u5F53\u524D\u963B\u585E\u4E0E\u7B49\u5F85\u5BF9\u8C61:
+10. \u4E0B\u4E00\u6B65\u5FC5\u987B\u52A8\u4F5C:
+11. \u4E0D\u786E\u5B9A/\u5F85\u786E\u8BA4:
+12. \u5DF2\u4E22\u5F03\u4FE1\u606F:
+</compact-summary>
+
+Field guidance:
+- \u7528\u6237\u6700\u65B0\u76EE\u6807: the latest user intent, not stale earlier goals.
+- \u7528\u6237\u786C\u6027\u7EA6\u675F: explicit user constraints, safety boundaries, deployment/data-persistence constraints, style preferences, or "do not" instructions.
+- \u5F53\u524D\u4E8B\u5B9E\u72B6\u6001: verified state only. Say "\u65E0" if there is no verified fact.
+- \u5DF2\u5B8C\u6210\u52A8\u4F5C: concrete actions already performed by the agent or team.
+- \u6587\u4EF6/\u547D\u4EE4/\u8BC1\u636E: important paths, commands, test results, errors, URLs, versions, sandbox IDs, mailbox IDs, and other evidence required to continue.
+- mailbox/department \u7EBF\u7A0B: responsible owner, mailbox thread/message IDs, CEO followups, department head/executor status, who owes a reply to whom, and whether the user-visible closure is complete.
+- \u7528\u6237\u53EF\u89C1\u627F\u8BFA: what the user has been told or promised, including pending follow-ups.
+- \u672A\u5B8C\u6210\u4E8B\u9879: work still not done.
+- \u5F53\u524D\u963B\u585E\u4E0E\u7B49\u5F85\u5BF9\u8C61: blockers, external waits, running commands, pending approvals, or a named agent/person/system being waited on.
+- \u4E0B\u4E00\u6B65\u5FC5\u987B\u52A8\u4F5C: the minimal next actions the next LLM should take, in order.
+- \u4E0D\u786E\u5B9A/\u5F85\u786E\u8BA4: assumptions, ambiguous facts, or things that must be re-checked.
+- \u5DF2\u4E22\u5F03\u4FE1\u606F: categories of old details intentionally omitted, such as long logs, obsolete failed attempts, or completed transient steps.
+
+If a field does not apply, write "\u65E0".`;
+var COMPACT_SUMMARY_PREFIX = `Another language model started to solve this problem and produced a summary of its thinking process. You also have access to the state of the tools that were used by that language model. Use this to build on the work that has already been done and avoid duplicating work. Here is the summary produced by the other language model, use the information in this summary to assist with your own analysis:`;
+var COMPACT_SYSTEM_PROMPT = `You are Duclaw's context compaction worker. Produce only the requested handoff summary. Do not call tools and do not chat with the user.`;
+var buildCompactUserPrompt = (_messages, reason) => `${COMPACT_SUMMARIZATION_PROMPT}
+
+Compaction trigger: ${reason}`;
 
 // src/compact/CompactEngine.ts
 var buildCompactSummaryKey = (userId, date, cronTitle) => `compact:summary:${userId}:${date}${cronTitle ? `:${cronTitle}` : ""}`;
-var assistantAck = {
-  role: "assistant",
-  content: [text("\u6211\u5DF2\u8BFB\u53D6\u538B\u7F29\u6458\u8981\uFF0C\u5C06\u57FA\u4E8E\u8BE5\u72B6\u6001\u7EE7\u7EED\u3002")]
-};
 var extractSummaryText = (message) => message.content.filter((block) => block.type === "text").map((block) => block.text).join("\n").trim();
 var stripAssistantUsage = (message) => {
   if (message.role !== "assistant") return { ...message, content: [...message.content] };
@@ -45435,20 +45416,28 @@ var stripAssistantUsage = (message) => {
     content: [...message.content]
   };
 };
-var selectProtocolSafeHotTail = (messages, hotTailMessages) => {
-  if (messages.length === 0 || hotTailMessages <= 0) return [];
-  let start = Math.max(0, messages.length - hotTailMessages);
-  while (start > 0) {
-    while (start > 0 && messages[start]?.role !== "user") {
-      start--;
-    }
-    const startsWithToolResult = messages[start]?.role === "user" && messages[start]?.content.some((block) => block.type === "tool_result");
-    if (!startsWithToolResult) break;
-    start--;
-  }
-  const tail = sanitizeMessages(messages.slice(start).map(stripAssistantUsage));
-  return tail.slice(-Math.max(hotTailMessages, tail.length));
-};
+var textContent = (message) => message.content.filter((block) => block.type === "text").map((block) => block.text).join("\n").trim();
+var isSummaryUserMessage = (message) => message.role === "user" && textContent(message).startsWith(COMPACT_SUMMARY_PREFIX);
+var isRawTextUserMessage = (message) => message.role === "user" && message.content.length > 0 && message.content.every((block) => block.type === "text") && !isSummaryUserMessage(message);
+var collectRecentUserMessages = (messages, maxTokens) => {
+  if (maxTokens <= 0) return [];
+  const selected = [];
+  let usedTokens = 0;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (!message || !isRawTextUserMessage(message)) continue;
+    const messageTokens = roughTokenEstimateText(textContent(message));
+    if (selected.length > 0 && usedTokens + messageTokens > maxTokens) break;
+    if (messageTokens > maxTokens && selected.length === 0) continue;
+    selected.push({ role: "user", content: [...message.content] });
+    usedTokens += messageTokens;
+  }
+  return selected.reverse();
+};
+var buildCompactionRequestMessages = (messages, reason) => sanitizeMessagesWithReport([
+  ...messages.map(stripAssistantUsage),
+  userMessage(text(buildCompactUserPrompt(messages, reason)))
+], { mergeAdjacentNonProtocolMessages: false }).messages;
 var CompactEngine = class {
   storage;
   summaryStorage;
@@ -45469,20 +45458,21 @@ var CompactEngine = class {
     }
     const tokenCountBefore = tokenCountWithEstimation(sourceMessages, input.systemPrompt);
     const response = await this.llm.chat(
-      [userMessage(text(buildCompactUserPrompt(sourceMessages, input.reason)))],
+      buildCompactionRequestMessages(sourceMessages, input.reason),
       COMPACT_SYSTEM_PROMPT,
       []
     );
-    const summary = extractSummaryText(response);
-    if (!summary) {
+    const rawSummary = extractSummaryText(response);
+    if (!rawSummary) {
       throw new Error("[compact] compact LLM \u6CA1\u6709\u8FD4\u56DE\u6458\u8981\u6587\u672C");
     }
-    const hotTail = selectProtocolSafeHotTail(sourceMessages, this.config.hotTailMessages);
-    const compactedMessages = sanitizeMessages([
-      userMessage(text(summary)),
-      assistantAck,
-      ...hotTail
-    ]);
+    const summary = `${COMPACT_SUMMARY_PREFIX}
+${rawSummary}`.trim();
+    const recentUserMessages = collectRecentUserMessages(sourceMessages, this.config.compactUserMessageMaxTokens);
+    const compactedMessages = sanitizeMessagesWithReport([
+      ...recentUserMessages,
+      userMessage(text(summary))
+    ], { mergeAdjacentNonProtocolMessages: false }).messages;
     if (compactedMessages.length === 0) {
       throw new Error("[compact] compact \u540E\u6CA1\u6709\u53EF\u5199\u56DE\u7684\u5408\u6CD5\u6D88\u606F");
     }
@@ -45494,7 +45484,7 @@ var CompactEngine = class {
       ...input.threadId ? { threadId: input.threadId } : {},
       summary,
       sourceMessageCount: sourceMessages.length,
-      hotTailCount: hotTail.length,
+      hotTailCount: recentUserMessages.length,
       contextTokensBefore: tokenCountBefore.tokens,
       contextTokensAfter: roughTokenEstimateMessages(compactedMessages),
       tokenCountSource: tokenCountBefore.source,
@@ -45534,7 +45524,7 @@ var CompactEngine = class {
 
 // src/compact/microCompact.ts
 var COMPACTED_MARKER = "[\u65E7\u5DE5\u5177\u7ED3\u679C\u5DF2\u538B\u7F29]";
-var stringify3 = (value) => {
+var stringify2 = (value) => {
   try {
     return JSON.stringify(value);
   } catch {
@@ -45582,7 +45572,7 @@ var stripAssistantUsage2 = (message) => {
 };
 var buildCompactedToolResultContent = (block, toolUse, maxChars) => {
   const toolName = toolUse?.name ?? "unknown";
-  const toolInput = toolUse ? stringify3(toolUse.input) : "{}";
+  const toolInput = toolUse ? stringify2(toolUse.input) : "{}";
   const previewChars = Math.max(200, Math.floor(maxChars * 0.6));
   return `${COMPACTED_MARKER}
 \u5DE5\u5177: ${toolName}
@@ -46338,9 +46328,9 @@ ${memoryInjection}` : "") + dreamInjection;
         const textBlocks = response.content.filter(
           (b) => b.type === "text"
         );
-        const textContent = textBlocks.map((b) => b.text).join(`
+        const textContent2 = textBlocks.map((b) => b.text).join(`
 `).trim();
-        if (textContent) {
+        if (textContent2) {
           await addMessage(storage, userId, assistantMessageFromResponse(response), beijingTime, job?.title);
           const lateInterrupts = drainInterrupts(userId);
           if (lateInterrupts.length > 0) {
@@ -46367,27 +46357,27 @@ ${msg}</user-interrupt>`
           }
           const visibleCeoFollowupIds = ceoFollowupIdsFromMetadata(request.metadata);
           if (!hasSentMessage && visibleCeoFollowupIds.length > 0 && config2.channelPlugin) {
-            if (claimOutboundSend(request.userId, textContent)) {
+            if (claimOutboundSend(request.userId, textContent2)) {
               await config2.channelPlugin.outbound.sendText({
                 cfg: {},
                 to: request.userId,
-                text: textContent,
+                text: textContent2,
                 accountId: request.requestId
               });
             } else {
               console.log(`[outbound-dedup] \u8DF3\u8FC7\u5BF9\u7528\u6237 ${request.userId} \u7684\u8FD1\u91CD\u590D\u515C\u5E95\u53D1\u9001`);
             }
             hasSentMessage = true;
-            sentMessageContent = textContent;
+            sentMessageContent = textContent2;
             completeUserVisibleCeoFollowups();
           }
           if (topicStorage) {
-            const topicSummary = hasSentMessage ? sentMessageContent : textContent;
+            const topicSummary = hasSentMessage ? sentMessageContent : textContent2;
             await updateTopicSummary(topicStorage, userId, beijingTime, topicSummary, job?.title);
           }
           markAgentEventsHandled([...injectedEventIds]);
           return {
-            content: hasSentMessage ? sentMessageContent : textContent,
+            content: hasSentMessage ? sentMessageContent : textContent2,
             alreadySent: hasSentMessage
           };
         }
@@ -52610,7 +52600,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.44" : "unknown",
+    version: true ? "1.8.46" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version