opencode-acp 1.18.1-pr.433.184 → 1.18.1-pr.439.185

package/dist/index.js

@@ -6822,6 +6822,33 @@ function buildToolIdList(state, messages) {
 var stripHallucinationsFromString = (text) => {
   return text.replace(DCP_PAIRED_TAG_REGEX, "").replace(DCP_UNPAIRED_TAG_REGEX, "");
 };
+var LEAKED_TRAILING_REF_REGEX = /(?:^|\n)[ \t]*(?:m(\d{4,5})|b([1-9]\d*))\b/g;
+var stripLeakedTrailingRefs = (text, bounds) => {
+  if (typeof text !== "string" || text.length === 0) {
+    return text;
+  }
+  const rawMessageBound = bounds.nextMessageRef;
+  const rawBlockBound = bounds.nextBlockRef;
+  const messageBound = typeof rawMessageBound === "number" && Number.isInteger(rawMessageBound) ? rawMessageBound : null;
+  const blockBound = typeof rawBlockBound === "number" && Number.isInteger(rawBlockBound) ? rawBlockBound : null;
+  if (messageBound === null && blockBound === null) {
+    return text;
+  }
+  const pattern = new RegExp(LEAKED_TRAILING_REF_REGEX.source, "g");
+  let match;
+  while ((match = pattern.exec(text)) !== null) {
+    if (match[1] !== void 0) {
+      if (messageBound !== null && Number(match[1]) >= messageBound) {
+        return text.slice(0, match.index).replace(/[ \t\r\n]*$/, "");
+      }
+    } else if (match[2] !== void 0) {
+      if (blockBound !== null && Number(match[2]) >= blockBound) {
+        return text.slice(0, match.index).replace(/[ \t\r\n]*$/, "");
+      }
+    }
+  }
+  return text;
+};
 var stripHallucinations = (messages) => {
   for (const message of messages) {
     for (const part of message.parts) {
@@ -8182,7 +8209,7 @@ COMPRESSION CANDIDATES:
 - EPISODE identifies a contiguous historical segment made from smaller units.
 - Candidate entries are independent and non-overlapping, so they can be batched in one \`content[]\` array.
 - Candidates are suggestions, not mandatory targets. Choose only content no longer needed for the current task and do not invent a target when none is listed.
-- Use \`acp_status\` for a fresh candidate view if the list is stale or missing.
+- Listed candidates were validated against the current conversation when this nudge was built. Compress them directly; do not call \`acp_status\` before compressing. If a \`compress\` call fails on a stale ID, run \`acp_status\` once and re-issue using only the refs it reports.
 - When the context limit is reached and candidates are listed, select at least one clearly stale candidate and call the \`compress\` tool in your next reply. Batch only additional candidates that are also clearly stale. Do not merely recommend compression.
 </system-reminder>
 `;
@@ -10544,7 +10571,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join4 } from "path";
 import { existsSync as existsSync4 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.18.1-pr.433.184" : "dev";
+var LOG_VERSION = true ? "1.18.1-pr.439.185" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -10778,7 +10805,7 @@ ACP may append a bounded list headed \`COMPRESSION CANDIDATES\` below a nudge or
 - \`MICRO\` is one large plain message or one complete tool transaction, including every message needed to keep its tool call/result structure valid.
 - \`EPISODE\` is a contiguous historical segment made from smaller adjacent units.
 - Candidate ranges are independent, non-overlapping, and can be submitted together as separate \`content[]\` entries.
-- Choose candidates only when their content is no longer needed for the current task. Do not invent a target when no candidate is listed; call \`acp_status\` for a fresh view. If an arbitrary range is unavoidable, verify current visible IDs, protection boundaries, and complete tool-pair coverage first.
+- Listed candidates were validated against the current conversation when the nudge or status report was built. Submit them directly with \`compress\`; do not call \`acp_status\` first. Choose candidates only when their content is no longer needed for the current task. Do not invent a target when no candidate is listed. If an arbitrary range is unavoidable, verify current visible IDs, protection boundaries, and complete tool-pair coverage first.
 - Keep summaries self-contained and use the existing \`compress\` tool. Candidate labels do not replace the semantic judgment to preserve useful context.
 - When a nudge lists a clearly stale candidate, call \`compress\` in that reply before continuing. A repeated nudge means compression was not completed; act on one clearly stale candidate rather than merely recommending compression.`;
 var BREAKDOWN_TAIL_RANGES = `Below the breakdown, the system lists compressible ranges grouped by conversation turn. All listed ranges should be compressed to summary format \u2014 the only exceptions are protected content, content the current step is actively using, or critical content you cannot reconstruct. Compress the largest ranges first when the current step no longer needs them.`;
@@ -10810,6 +10837,7 @@ When you see past \`compress\` tool calls in the conversation, their \`summary\`
 - Do NOT echo, repeat, or continue summary content as your own output. Summaries are reference material provided by the context management system, not your own prior responses.
 - Summaries may contain errors or simplifications. Use \`decompress\` to verify critical details before acting on them.
 - The \`startId\`/\`endId\` in past compress calls are historical \u2014 do NOT reuse them as targets for new compress calls without verifying via \`acp_status\` that the range is still uncompressed.
+- If a \`compress\` call fails because a ref is stale or unknown, do NOT adjust ranges by arithmetic: run \`acp_status\`, then re-issue the \`compress\` in the same turn using only the refs it reports. Submit all target ranges in one batch call.
 
 TOOLS
 
@@ -10857,8 +10885,6 @@ Summaries accumulate as the session grows. When tier-1 summaries pile up, the sy
 
 To compress blocks: use block IDs as boundaries: \`compress({ content: [{ startId: "b3", endId: "b15", summary: "..." }] })\`. Multiple entries create separate blocks: \`compress({ content: [{ startId: "b3", endId: "b10", summary: "..." }, { startId: "b11", endId: "b20", summary: "..." }] })\`. This deactivates the consumed blocks and creates a new higher-tier block per entry. The system prompt at the trigger tells you which rules to follow.
 
-If you are unsure which \`mNNNNN\` refs are still compressible, or which blocks have already consumed which ranges, call \`acp_status\` first. It returns the visible context breakdown and the compressed block list.
-
 CONTEXT BREAKDOWN
 
 When context usage passes a threshold, the system appends a breakdown showing where your context tokens are spent:
@@ -10881,7 +10907,7 @@ var SYSTEM = buildSystemPrompt(true);
 
 // lib/prompts/compress-range.ts
 var CANDIDATE_GUIDANCE_SECTION = `CANDIDATE GUIDANCE
-ACP may display a \`COMPRESSION CANDIDATES\` list in a nudge or \`acp_status\` report. A \`MICRO\` entry targets one large message or complete tool transaction; an \`EPISODE\` entry targets a contiguous historical segment. Displayed candidates are independent and non-overlapping, so they may be batched, but they are advisory: compress only entries whose content is no longer needed. When a nudge lists a clearly stale candidate, use its exact IDs and call \`compress\` before continuing. Keep current intent and active work visible, and use \`acp_status\` when the candidate list is stale.`;
+ACP may display a \`COMPRESSION CANDIDATES\` list in a nudge or \`acp_status\` report. A \`MICRO\` entry targets one large message or complete tool transaction; an \`EPISODE\` entry targets a contiguous historical segment. Displayed candidates are independent and non-overlapping, so they may be batched, but they are advisory: compress only entries whose content is no longer needed. When a nudge lists a clearly stale candidate, use its exact IDs and call \`compress\` before continuing. Keep current intent and active work visible. Do not call \`acp_status\` before compressing listed candidates; if a \`compress\` call fails on a stale ID, run \`acp_status\` and re-issue using only the refs it reports.`;
 function buildCompressRangePrompt(candidatesEnabled) {
   const candidateGuidanceBlock = candidatesEnabled ? `${CANDIDATE_GUIDANCE_SECTION}
 
@@ -12884,9 +12910,30 @@ function createCommandExecuteHandler(client, registry4, logger, config, workingD
     }
   };
 }
-function createTextCompleteHandler() {
-  return async (_input, output) => {
-    output.text = stripHallucinationsFromString(output.text);
+function createTextCompleteHandler(registry4, logger) {
+  return async (input, output) => {
+    if (typeof output.text !== "string" || output.text.length === 0) {
+      return;
+    }
+    let text = stripHallucinationsFromString(output.text);
+    const state = typeof input.sessionID === "string" ? registry4.get(input.sessionID) : void 0;
+    if (state) {
+      const nextBlockId = state.prune?.messages?.nextBlockId;
+      const stripped = stripLeakedTrailingRefs(text, {
+        nextMessageRef: Number.isInteger(state.messageIds.nextRef) ? state.messageIds.nextRef : null,
+        nextBlockRef: Number.isInteger(nextBlockId) ? nextBlockId : null
+      });
+      if (stripped !== text) {
+        logger.warn("Stripped leaked trailing ACP ref from assistant output", {
+          sessionID: input.sessionID,
+          messageID: input.messageID,
+          removedChars: text.length - stripped.length,
+          removedTailPreview: text.slice(stripped.length, stripped.length + 200)
+        });
+        text = stripped;
+      }
+    }
+    output.text = text;
   };
 }
 function createEventHandler(registry4, logger) {
@@ -13228,7 +13275,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.18.1-pr.433.184" : "dev",
+    version: true ? "1.18.1-pr.439.185" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,
@@ -13293,7 +13340,7 @@ var server = (async (ctx) => {
         hostPermissions
       )
     ),
-    "experimental.text.complete": guard(createTextCompleteHandler()),
+    "experimental.text.complete": guard(createTextCompleteHandler(registry4, logger)),
     "command.execute.before": guard(
       createCommandExecuteHandler(
         ctx.client,