@lexwdex-org/opencode-dcp 3.4.9 → 3.4.10

package/README.md

@@ -124,6 +124,12 @@ DCP 使用自己的配置文件，按以下顺序搜索：
         // reminders are off (compression less likely). At/above this, reminders
         // are on. Accepts: number or "X%" of model context window.
         "minContextLimit": "50%",
+        // When true (default), DCP injects a soft turn-boundary reminder at every
+        // new user turn, after session.idle, and after vcs.branch.updated events —
+        // regardless of minContextLimit, and only while below maxContextLimit —
+        // asking the model to compress the previous task when the topic changed
+        // (throttled by nudgeFrequency).
+        "boundaryNudge": true,
         // Optional per-model override for maxContextLimit by providerID/modelID.
         // If present, this wins over the global maxContextLimit.
         // Accepts: number or "X%".

package/dist/index.js

@@ -934,6 +934,7 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.summaryBuffer",
   "compress.maxContextLimit",
   "compress.minContextLimit",
+  "compress.boundaryNudge",
   "compress.modelMaxLimits",
   "compress.modelMinLimits",
   "compress.nudgeFrequency",
@@ -1142,6 +1143,13 @@ function validateConfigTypes(config) {
           actual: typeof compress.summaryBuffer
         });
       }
+      if (compress.boundaryNudge !== void 0 && typeof compress.boundaryNudge !== "boolean") {
+        errors.push({
+          key: "compress.boundaryNudge",
+          expected: "boolean",
+          actual: typeof compress.boundaryNudge
+        });
+      }
       if (compress.nudgeFrequency !== void 0 && typeof compress.nudgeFrequency !== "number") {
         errors.push({
           key: "compress.nudgeFrequency",
@@ -1430,6 +1438,7 @@ var defaultConfig = {
     summaryBuffer: true,
     maxContextLimit: "85%",
     minContextLimit: "50%",
+    boundaryNudge: true,
     nudgeFrequency: 2,
     iterationNudgeThreshold: 15,
     nudgeForce: "strong",
@@ -1552,6 +1561,7 @@ function mergeCompress(base, override) {
     summaryBuffer: override.summaryBuffer ?? base.summaryBuffer,
     maxContextLimit: override.maxContextLimit ?? base.maxContextLimit,
     minContextLimit: override.minContextLimit ?? base.minContextLimit,
+    boundaryNudge: override.boundaryNudge ?? base.boundaryNudge,
     modelMaxLimits: override.modelMaxLimits ?? base.modelMaxLimits,
     modelMinLimits: override.modelMinLimits ?? base.modelMinLimits,
     nudgeFrequency: override.nudgeFrequency ?? base.nudgeFrequency,
@@ -3028,6 +3038,18 @@ function resetOnCompaction(state, messages = []) {
   for (const callId of state.subAgentResultCache.keys()) {
     if (!liveToolIds.has(callId)) state.subAgentResultCache.delete(callId);
   }
+  const anchorSets = [
+    state.nudges.contextLimitAnchors,
+    state.nudges.turnNudgeAnchors,
+    state.nudges.iterationNudgeAnchors
+  ];
+  for (const anchorSet of anchorSets) {
+    for (const anchorId of anchorSet) {
+      if (!liveMessageIds.has(anchorId)) {
+        anchorSet.delete(anchorId);
+      }
+    }
+  }
 }
 
 // lib/concurrency.ts
@@ -3096,7 +3118,8 @@ async function saveSessionState(sessionState, logger, sessionName) {
     nudges: {
       contextLimitAnchors: Array.from(sessionState.nudges.contextLimitAnchors),
       turnNudgeAnchors: Array.from(sessionState.nudges.turnNudgeAnchors),
-      iterationNudgeAnchors: Array.from(sessionState.nudges.iterationNudgeAnchors)
+      iterationNudgeAnchors: Array.from(sessionState.nudges.iterationNudgeAnchors),
+      boundaryPending: sessionState.nudges.boundaryPending === true
     },
     stats: { ...sessionState.stats },
     lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
@@ -3180,6 +3203,7 @@ async function loadSessionState(sessionId, logger) {
       });
     }
     state.nudges.iterationNudgeAnchors = dedupedIterationAnchors;
+    state.nudges.boundaryPending = state.nudges.boundaryPending === true;
     logger.info("Loaded session state from disk", {
       sessionId
     });
@@ -3314,6 +3338,11 @@ var SessionStateStore = class {
   peek(sessionId) {
     return this.states.get(sessionId);
   }
+  forEach(callback) {
+    for (const [sessionId, state] of this.states) {
+      callback(state, sessionId);
+    }
+  }
   async initialize(sessionId, initializer) {
     const state = this.get(sessionId);
     const previous = this.initializationQueues.get(sessionId) ?? Promise.resolve();
@@ -3478,7 +3507,8 @@ function createSessionState() {
     nudges: {
       contextLimitAnchors: /* @__PURE__ */ new Set(),
       turnNudgeAnchors: /* @__PURE__ */ new Set(),
-      iterationNudgeAnchors: /* @__PURE__ */ new Set()
+      iterationNudgeAnchors: /* @__PURE__ */ new Set(),
+      boundaryPending: false
     },
     stats: {
       pruneTokenCounter: 0,
@@ -3517,7 +3547,8 @@ function resetSessionState(state) {
   state.nudges = {
     contextLimitAnchors: /* @__PURE__ */ new Set(),
     turnNudgeAnchors: /* @__PURE__ */ new Set(),
-    iterationNudgeAnchors: /* @__PURE__ */ new Set()
+    iterationNudgeAnchors: /* @__PURE__ */ new Set(),
+    boundaryPending: false
   };
   state.stats = {
     pruneTokenCounter: 0,
@@ -3576,6 +3607,7 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
   state.nudges.iterationNudgeAnchors = new Set(
     persisted.nudges.iterationNudgeAnchors || []
   );
+  state.nudges.boundaryPending = persisted.nudges.boundaryPending === true;
   state.stats = {
     pruneTokenCounter: persisted.stats?.pruneTokenCounter || 0,
     totalPruneTokens: persisted.stats?.totalPruneTokens || 0
@@ -6721,10 +6753,28 @@ function buildMessagePriorityGuidance(messages, compressionPriorities, anchorInd
   const priorityLabel = `${priority[0].toUpperCase()}${priority.slice(1)}`;
   return renderMessagePriorityGuidance(priorityLabel, refs);
 }
-function injectAnchoredNudge(message, nudgeText) {
+function normalizeNudgeSignature(baseNudgeText) {
+  return baseNudgeText.replace(/<\/dcp-system-reminder>\s*$/, "").replace(/^\n+/, "").trim();
+}
+function messageContainsNudgeSignature(message, baseNudgeText) {
+  const signature = normalizeNudgeSignature(baseNudgeText);
+  if (!signature) {
+    return false;
+  }
+  for (const part of message.parts) {
+    if (part.type === "text" && typeof part.text === "string" && part.text.includes(signature)) {
+      return true;
+    }
+  }
+  return false;
+}
+function injectAnchoredNudge(message, nudgeText, baseNudgeText) {
   if (!nudgeText.trim()) {
     return;
   }
+  if (messageContainsNudgeSignature(message, baseNudgeText)) {
+    return;
+  }
   if (message.info.role === "user") {
     if (appendToLastTextPart(message, nudgeText)) {
       return;
@@ -6785,7 +6835,7 @@ function applyRangeModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText,
     return;
   }
   for (const { message } of collectAnchoredMessages(anchorMessageIds, messages)) {
-    injectAnchoredNudge(message, nudgeText);
+    injectAnchoredNudge(message, nudgeText, baseNudgeText);
   }
 }
 function applyMessageModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, availableMessageIdGuidance, compressionPriorities) {
@@ -6798,7 +6848,7 @@ function applyMessageModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText
     );
     const combinedGuidance = [availableMessageIdGuidance, priorityGuidance].filter((g) => g.trim().length > 0).join("\n\n");
     const nudgeText = appendGuidanceToDcpTag(baseNudgeText, combinedGuidance);
-    injectAnchoredNudge(message, nudgeText);
+    injectAnchoredNudge(message, nudgeText, baseNudgeText);
   }
 }
 function applyAnchoredNudges(state, config, messages, prompts, compressionPriorities) {
@@ -6854,11 +6904,44 @@ function applyAnchoredNudges(state, config, messages, prompts, compressionPriori
 }
 
 // lib/messages/inject/inject.ts
+function userMessagesAfterLastAnchor(state, messages) {
+  let latestAnchorIndex = -1;
+  for (let index = messages.length - 1; index >= 0; index--) {
+    if (state.nudges.turnNudgeAnchors.has(messages[index].info.id)) {
+      latestAnchorIndex = index;
+      break;
+    }
+  }
+  let userCount = 0;
+  for (let index = latestAnchorIndex + 1; index < messages.length; index++) {
+    const message = messages[index];
+    if (message.info.role === "user" && !isIgnoredUserMessage(message)) {
+      userCount++;
+    }
+  }
+  return userCount;
+}
 var injectCompressNudges = (state, config, logger, messages, prompts, compressionPriorities) => {
+  const clearPendingBoundary = () => {
+    if (!state.nudges.boundaryPending) {
+      return;
+    }
+    state.nudges.boundaryPending = false;
+    if (!state.sessionId) {
+      return;
+    }
+    void saveSessionState(state, logger).catch(
+      (error) => logger.warn("Failed to persist boundary nudge cleanup", {
+        error: error instanceof Error ? error.message : String(error)
+      })
+    );
+  };
   if (compressPermission(state, config) === "deny") {
+    clearPendingBoundary();
     return;
   }
   if (state.manualMode) {
+    clearPendingBoundary();
     return;
   }
   const lastMessage = findLastNonIgnoredMessage(messages);
@@ -6884,6 +6967,7 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     state.nudges.contextLimitAnchors.clear();
     state.nudges.turnNudgeAnchors.clear();
     state.nudges.iterationNudgeAnchors.clear();
+    state.nudges.boundaryPending = false;
     void saveSessionState(state, logger).catch(
       (error) => logger.warn("Failed to persist context-limit nudge", {
         error: error instanceof Error ? error.message : String(error)
@@ -6892,6 +6976,7 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     return;
   }
   const { providerId, modelId } = getModelInfo(messages);
+  const boundaryNudgeEnabled = config.compress.boundaryNudge !== false;
   let anchorsChanged = false;
   const { overMaxLimit, overMinLimit } = isContextOverLimits(
     config,
@@ -6901,13 +6986,18 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     messages
   );
   if (!overMinLimit) {
-    const hadTurnAnchors = state.nudges.turnNudgeAnchors.size > 0;
     const hadIterationAnchors = state.nudges.iterationNudgeAnchors.size > 0;
-    if (hadTurnAnchors || hadIterationAnchors) {
-      state.nudges.turnNudgeAnchors.clear();
+    if (hadIterationAnchors) {
       state.nudges.iterationNudgeAnchors.clear();
       anchorsChanged = true;
     }
+    if (!boundaryNudgeEnabled) {
+      const hadTurnAnchors = state.nudges.turnNudgeAnchors.size > 0;
+      if (hadTurnAnchors) {
+        state.nudges.turnNudgeAnchors.clear();
+        anchorsChanged = true;
+      }
+    }
   }
   if (overMaxLimit) {
     if (lastMessage) {
@@ -6925,7 +7015,7 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     }
   } else if (overMinLimit) {
     const isLastMessageUser = lastMessage?.message.info.role === "user";
-    if (isLastMessageUser && lastAssistantMessage) {
+    if (!boundaryNudgeEnabled && isLastMessageUser && lastAssistantMessage) {
       const previousSize = state.nudges.turnNudgeAnchors.size;
       state.nudges.turnNudgeAnchors.add(lastMessage.message.info.id);
       state.nudges.turnNudgeAnchors.add(lastAssistantMessage.info.id);
@@ -6957,6 +7047,33 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
       }
     }
   }
+  if (boundaryNudgeEnabled && !overMaxLimit) {
+    const lastUserMessage = getLastUserMessage(messages);
+    const isLastMessageUser = lastMessage?.message.info.role === "user";
+    const hasPendingBoundary = state.nudges.boundaryPending;
+    if (lastUserMessage && lastAssistantMessage) {
+      const lastUserMessageIndex = messages.findIndex(
+        (message) => message.info.id === lastUserMessage.info.id
+      );
+      const lastAssistantMessageIndex = messages.findIndex(
+        (message) => message.info.id === lastAssistantMessage.info.id
+      );
+      const alreadyAnchored = state.nudges.turnNudgeAnchors.has(lastUserMessage.info.id) && state.nudges.turnNudgeAnchors.has(lastAssistantMessage.info.id);
+      if (!alreadyAnchored && lastUserMessageIndex >= 0 && lastAssistantMessageIndex >= 0) {
+        const interval = getNudgeFrequency(config);
+        const shouldAnchor = hasPendingBoundary || isLastMessageUser && userMessagesAfterLastAnchor(state, messages) >= interval;
+        if (shouldAnchor) {
+          state.nudges.turnNudgeAnchors.add(lastAssistantMessage.info.id);
+          state.nudges.turnNudgeAnchors.add(lastUserMessage.info.id);
+          anchorsChanged = true;
+        }
+      }
+      if (hasPendingBoundary) {
+        state.nudges.boundaryPending = false;
+        anchorsChanged = true;
+      }
+    }
+  }
   applyAnchoredNudges(state, config, messages, prompts, compressionPriorities);
   if (anchorsChanged) {
     void saveSessionState(state, logger).catch(
@@ -8374,8 +8491,50 @@ function createTextCompleteHandler() {
     output.text = stripHallucinationsFromString(output.text);
   };
 }
-function createEventHandler(target, logger) {
+function createEventHandler(target, logger, config) {
+  const markBoundaryPending = async (state) => {
+    if (!state) return;
+    if (config.compress.boundaryNudge === false) return;
+    if (state.manualMode) return;
+    if (state.isSubAgent && !config.experimental.allowSubAgents) return;
+    if (compressPermission(state, config) === "deny") return;
+    if (!state.sessionId) return;
+    if (state.nudges.boundaryPending) return;
+    state.nudges.boundaryPending = true;
+    await saveSessionState(state, logger);
+    logger.debug("Marked boundary nudge pending", { sessionId: state.sessionId });
+  };
   return async (input) => {
+    if (input.event.type === "session.idle") {
+      const sessionId = input.event.properties?.sessionID;
+      if (typeof sessionId === "string") {
+        const state2 = target instanceof SessionStateStore ? target.peek(sessionId) : target.sessionId === sessionId ? target : void 0;
+        await markBoundaryPending(state2).catch(
+          (error) => logger.warn("Failed to persist boundary nudge", {
+            error: error instanceof Error ? error.message : String(error)
+          })
+        );
+      }
+      return;
+    }
+    if (input.event.type === "vcs.branch.updated") {
+      if (target instanceof SessionStateStore) {
+        const sessions = [];
+        target.forEach((state2) => sessions.push(state2));
+        await Promise.all(
+          sessions.map(
+            (state2) => markBoundaryPending(state2).catch(
+              (error) => logger.warn("Failed to persist boundary nudge", {
+                error: error instanceof Error ? error.message : String(error)
+              })
+            )
+          )
+        );
+      } else {
+        await markBoundaryPending(target);
+      }
+      return;
+    }
     const eventTime = typeof input.event?.time === "number" && Number.isFinite(input.event.time) ? input.event.time : typeof input.event?.properties?.time === "number" && Number.isFinite(input.event.properties.time) ? input.event.properties.time : void 0;
     if (input.event.type !== "message.part.updated") {
       return;
@@ -8641,7 +8800,7 @@ var server = (async (ctx) => {
       ctx.directory,
       hostPermissions
     ),
-    event: createEventHandler(states, logger),
+    event: createEventHandler(states, logger, config),
     tool: {
       ...config.compress.permission !== "deny" && {
         compress: config.compress.mode === "message" ? createCompressMessageTool(compressToolContext) : createCompressRangeTool(compressToolContext)