@lexwdex-org/opencode-dcp 3.4.4 → 3.4.6

package/dist/index.js

@@ -2929,8 +2929,18 @@ function getActiveSummaryTokenUsage(state) {
   }
   return total;
 }
-function resetOnCompaction(state) {
+function resetOnCompaction(state, messages = []) {
   state.toolParameters.clear();
+  if (messages.length === 0) {
+    return;
+  }
+  const liveMessageIds = new Set(messages.map((msg) => msg.info.id));
+  for (const [ref, rawId] of state.messageIds.byRef) {
+    if (!liveMessageIds.has(rawId)) {
+      state.messageIds.byRef.delete(ref);
+      state.messageIds.byRawId.delete(rawId);
+    }
+  }
 }
 
 // lib/state/persistence.ts
@@ -2966,6 +2976,7 @@ async function saveSessionState(sessionState, logger, sessionName) {
     }
     const state = {
       sessionName,
+      manualMode: !!sessionState.manualMode,
       prune: {
         tools: Object.fromEntries(sessionState.prune.tools),
         messages: serializePruneMessagesState(sessionState.prune.messages)
@@ -3157,7 +3168,7 @@ var checkSession = async (client, state, logger, messages, manualModeDefault) =>
   const lastCompactionTimestamp = findLastCompactionTimestamp(messages);
   if (lastCompactionTimestamp > state.lastCompaction) {
     state.lastCompaction = lastCompactionTimestamp;
-    resetOnCompaction(state);
+    resetOnCompaction(state, messages);
     logger.info("Detected compaction - reset stale state", {
       timestamp: lastCompactionTimestamp
     });
@@ -3255,6 +3266,9 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
   if (persisted === null) {
     return;
   }
+  if (typeof persisted.manualMode === "boolean") {
+    state.manualMode = persisted.manualMode ? "active" : false;
+  }
   state.prune.tools = loadPruneMap(persisted.prune.tools);
   state.prune.messages = loadPruneMessagesState(persisted.prune.messages);
   state.nudges.contextLimitAnchors = new Set(persisted.nudges.contextLimitAnchors || []);
@@ -5149,7 +5163,7 @@ Hard constraints
 - If context needs compression, call \`compress\`. Do not write summaries inline.
 - Use Markdown headings (e.g. \`## Analysis\`, \`## Summary\`) to organize information. Never use XML tags.
 
-\`\` and \`\` are environment-injected metadata. Do not output them.
+\`<dcp-message-id>\` and \`<dcp-system-reminder>\` are environment-injected metadata. Do not output them.
 
 When to compress
 
@@ -6107,6 +6121,31 @@ function buildCompressedBlockGuidance(state) {
     "- \u5982\u679C\u4F60\u9009\u62E9\u7684\u538B\u7F29\u8303\u56F4\u5305\u542B\u4EFB\u4F55\u5217\u51FA\u7684\u5757\uFF0C\u5728\u6458\u8981\u4E2D\u4F7F\u7528 `(bN)` \u6070\u597D\u5305\u542B\u6BCF\u4E2A\u5FC5\u9700\u7684\u5360\u4F4D\u7B26\u4E00\u6B21\u3002"
   ].join("\n");
 }
+function buildAvailableMessageIdGuidance(state, messages) {
+  const visibleIds = new Set(
+    messages.filter((msg) => !isIgnoredUserMessage(msg) && !isMessageCompacted(state, msg)).map((msg) => msg.info.id)
+  );
+  const refs = [];
+  for (const [ref, rawId] of state.messageIds.byRef) {
+    if (visibleIds.has(rawId)) {
+      refs.push(ref);
+    }
+  }
+  refs.sort((a, b) => {
+    const numA = Number.parseInt(a.slice(1), 10);
+    const numB = Number.parseInt(b.slice(1), 10);
+    return numA - numB;
+  });
+  if (refs.length === 0) {
+    return "";
+  }
+  const refList = refs.length <= 15 ? refs.join(", ") : `${refs[0]} \u5230 ${refs[refs.length - 1]}\uFF08\u5171 ${refs.length} \u4E2A\uFF09`;
+  return [
+    "\u53EF\u7528\u6D88\u606F\u8FB9\u754C ID\uFF1A",
+    `- \u5F53\u524D\u4E0A\u4E0B\u6587\u4E2D\u53EF\u4F5C\u4E3A compress \u8FB9\u754C\u7684\u5408\u6CD5\u6D88\u606F ID\uFF1A${refList}`,
+    "- \u53EA\u4ECE\u4EE5\u4E0A\u5217\u8868\u4E2D\u9009\u53D6 startId \u548C endId\u3002\u4E0D\u8981\u53D1\u660E\u3001\u5916\u63A8\u6216\u4F7F\u7528\u4E0D\u5728\u5217\u8868\u4E2D\u7684 ID\u3002"
+  ].join("\n");
+}
 function renderMessagePriorityGuidance(priorityLabel, refs) {
   const refList = refs.length > 0 ? refs.join(", ") : "\u65E0";
   const normalized = priorityLabel.toLowerCase();
@@ -6373,8 +6412,9 @@ function collectTurnNudgeAnchors2(state, config, messages) {
   }
   return turnNudgeAnchors;
 }
-function applyRangeModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, compressedBlockGuidance) {
-  const nudgeText = appendGuidanceToDcpTag(baseNudgeText, compressedBlockGuidance);
+function applyRangeModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, compressedBlockGuidance, availableMessageIdGuidance) {
+  const combinedGuidance = [availableMessageIdGuidance, compressedBlockGuidance].filter((g) => g.trim().length > 0).join("\n\n");
+  const nudgeText = appendGuidanceToDcpTag(baseNudgeText, combinedGuidance);
   if (!nudgeText.trim()) {
     return;
   }
@@ -6382,7 +6422,7 @@ function applyRangeModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText,
     injectAnchoredNudge(message, nudgeText);
   }
 }
-function applyMessageModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, compressionPriorities) {
+function applyMessageModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, availableMessageIdGuidance, compressionPriorities) {
   for (const { message, index } of collectAnchoredMessages(anchorMessageIds, messages)) {
     const priorityGuidance = buildMessagePriorityGuidance(
       messages,
@@ -6390,51 +6430,60 @@ function applyMessageModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText
       index,
       MESSAGE_MODE_NUDGE_PRIORITY
     );
-    const nudgeText = appendGuidanceToDcpTag(baseNudgeText, priorityGuidance);
+    const combinedGuidance = [availableMessageIdGuidance, priorityGuidance].filter((g) => g.trim().length > 0).join("\n\n");
+    const nudgeText = appendGuidanceToDcpTag(baseNudgeText, combinedGuidance);
     injectAnchoredNudge(message, nudgeText);
   }
 }
 function applyAnchoredNudges(state, config, messages, prompts, compressionPriorities) {
   const turnNudgeAnchors = collectTurnNudgeAnchors2(state, config, messages);
   if (config.compress.mode === "message") {
+    const availableMessageIdGuidance2 = buildAvailableMessageIdGuidance(state, messages);
     applyMessageModeAnchoredNudge(
       state.nudges.contextLimitAnchors,
       messages,
       prompts.contextLimitNudge,
+      availableMessageIdGuidance2,
       compressionPriorities
     );
     applyMessageModeAnchoredNudge(
       turnNudgeAnchors,
       messages,
       prompts.turnNudge,
+      availableMessageIdGuidance2,
       compressionPriorities
     );
     applyMessageModeAnchoredNudge(
       state.nudges.iterationNudgeAnchors,
       messages,
       prompts.iterationNudge,
+      availableMessageIdGuidance2,
       compressionPriorities
     );
     return;
   }
   const compressedBlockGuidance = buildCompressedBlockGuidance(state);
+  const availableMessageIdGuidance = buildAvailableMessageIdGuidance(state, messages);
   applyRangeModeAnchoredNudge(
     state.nudges.contextLimitAnchors,
     messages,
     prompts.contextLimitNudge,
-    compressedBlockGuidance
+    compressedBlockGuidance,
+    availableMessageIdGuidance
   );
   applyRangeModeAnchoredNudge(
     turnNudgeAnchors,
     messages,
     prompts.turnNudge,
-    compressedBlockGuidance
+    compressedBlockGuidance,
+    availableMessageIdGuidance
   );
   applyRangeModeAnchoredNudge(
     state.nudges.iterationNudgeAnchors,
     messages,
     prompts.iterationNudge,
-    compressedBlockGuidance
+    compressedBlockGuidance,
+    availableMessageIdGuidance
   );
 }
 
@@ -7256,6 +7305,7 @@ async function handleManualToggleCommand(ctx, modeArg) {
   } else {
     state.manualMode = state.manualMode ? false : "active";
   }
+  await saveSessionState(state, logger);
   const params = getCurrentParams(state, messages, logger);
   await sendIgnoredMessage(
     client,