opencode-acp 1.14.17-pr.304.12 → 1.14.17-pr.304.13

package/dist/index.js

@@ -2075,7 +2075,7 @@ THE FORMAT OF COMPRESS
   ]
 }
 \`\`\`
-Each entry MAY have a topic. Missing topics fall back to the top-level topic, then to an automatic one derived from the summary.`;
+Each entry needs a topic \u2014 either its own or the top-level fallback.`;
 
 // lib/state/persistence.ts
 import * as fs from "fs/promises";
@@ -3756,11 +3756,8 @@ function filterProtectedRecentMessages(selection, searchContext, state, compress
 
 // lib/compress/range-utils.ts
 var BLOCK_PLACEHOLDER_REGEX = /\(b(\d+)\)|\{block_(\d+)\}/gi;
-function deriveFallbackTopic(summary) {
-  const firstLine = summary.split("\n").map((line) => line.replace(/^#{1,6}\s*/, "").trim()).find((line) => line.length > 0) ?? "compressed range";
-  return firstLine.length > 80 ? `${firstLine.slice(0, 77)}...` : firstLine;
-}
 function validateArgs(args) {
+  const hasTopLevelTopic = typeof args.topic === "string" && args.topic.trim().length > 0;
   if (!Array.isArray(args.content) || args.content.length === 0) {
     throw new Error("content is required and must be a non-empty array");
   }
@@ -3776,12 +3773,18 @@ function validateArgs(args) {
     if (typeof entry?.summary !== "string" || entry.summary.trim().length === 0) {
       throw new Error(`${prefix}.summary is required and must be a non-empty string`);
     }
+    const hasEntryTopic = typeof entry?.topic === "string" && entry.topic.trim().length > 0;
+    if (!hasEntryTopic && !hasTopLevelTopic) {
+      throw new Error(
+        `${prefix} needs a topic \u2014 provide ${prefix}.topic or the top-level topic`
+      );
+    }
   }
 }
 function resolveRanges(args, searchContext, state, logger) {
   return args.content.map((entry, index) => {
     const normalizedEntry = {
-      topic: typeof entry.topic === "string" && entry.topic.trim().length > 0 ? entry.topic.trim() : typeof args.topic === "string" && args.topic.trim().length > 0 ? void 0 : deriveFallbackTopic(entry.summary),
+      topic: typeof entry.topic === "string" && entry.topic.trim().length > 0 ? entry.topic.trim() : void 0,
       startId: entry.startId.trim(),
       endId: entry.endId.trim(),
       summary: entry.summary
@@ -5669,6 +5672,11 @@ exact values, errors). Then add "acknowledgeRisk": true to the compress tool cal
 Without acknowledgeRisk: true, the compression will be rejected again.`;
   return new Error(message);
 }
+function buildPreemptiveAcknowledgeError() {
+  return new Error(
+    'Parameter "acknowledgeRisk": true was provided, but no quality gate rejection is pending. This parameter is only valid immediately after a compression was rejected by the quality gate. Remove it and try again.'
+  );
+}
 
 // lib/compress/pipeline.ts
 function snapshotCompressionState(state) {
@@ -6142,13 +6150,13 @@ function createCompressRangeTool(factoryCtx) {
       }
       const acknowledgeRisk = args.acknowledgeRisk === true;
       const qualityGateRetryPendingBefore = ctx.state.qualityGateRetryPending;
-      const bypassQuality = acknowledgeRisk && ctx.state.qualityGateRetryPending;
-      const ignoredAcknowledgeRisk = acknowledgeRisk && !ctx.state.qualityGateRetryPending;
-      if (ignoredAcknowledgeRisk) {
-        ctx.logger.warn("compress: acknowledgeRisk ignored \u2014 no quality gate rejection pending");
+      if (acknowledgeRisk && !ctx.state.qualityGateRetryPending) {
+        throw buildPreemptiveAcknowledgeError();
       }
-      ctx.state.qualityGateRetryPending = false;
-      if (!bypassQuality) {
+      if (acknowledgeRisk) {
+        ctx.state.qualityGateRetryPending = false;
+      } else {
+        ctx.state.qualityGateRetryPending = false;
         for (const plan of preparedPlans) {
           const result = evaluatePreCommitQuality(
             rawMessages,
@@ -6224,10 +6232,7 @@ function createCompressRangeTool(factoryCtx) {
       const skippedNote = phantomSkipNotice !== null ? `
 \u26A0\uFE0F ${phantomSkipNotice}
 ` : "";
-      const ackNote = ignoredAcknowledgeRisk ? `
-\u26A0\uFE0F acknowledgeRisk was ignored: no quality gate rejection was pending, so quality checks ran normally. Only pass it when retrying immediately after a quality gate rejection.
-` : "";
-      return `Compressed ${totalCompressedMessages} messages into ${COMPRESSED_BLOCK_HEADER}.${skippedNote}${ackNote}
+      return `Compressed ${totalCompressedMessages} messages into ${COMPRESSED_BLOCK_HEADER}.${skippedNote}
 IMPORTANT: This was an automatic context compression. You MUST continue your previous task exactly where you left off. Do NOT ask the user what to do next.
 \u{1F4A1} Tip: Use search_context('keyword') to find compressed content when you need it later.`;
     }
@@ -8944,7 +8949,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join3 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.14.17-pr.304.12" : "dev";
+var LOG_VERSION = true ? "1.14.17-pr.304.13" : "dev";
 var Logger = class {
   logDir;
   enabled;
@@ -9272,7 +9277,7 @@ Rules:
 BATCHING
 When multiple independent ranges are ready and their boundaries do not overlap, include all of them as separate entries in the \`content\` array of a single tool call. Each entry should have its own \`startId\`, \`endId\`, and \`summary\`.
 
-When the ranges cover unrelated topics, give each entry its own \`topic\` for better summary quality \u2014 do not force unrelated content under a single shared topic. The top-level \`topic\` is an optional fallback; when no topic is provided at all, one is derived from the summary's first line automatically.
+When the ranges cover unrelated topics, give each entry its own \`topic\` for better summary quality \u2014 do not force unrelated content under a single shared topic. Omit the top-level \`topic\` when every entry has its own. Use the top-level \`topic\` only as a fallback when entries don't specify one.
 
 \`\`\`
 compress({ content: [