acp-kernel 0.0.88 → 0.0.89-pr.177.263

package/dist/index.js

@@ -111,33 +111,45 @@ function summaryMessageId(blockId) {
 function isSummaryMessageId(id) {
   return id.startsWith(SUMMARY_ID_PREFIX);
 }
+function baseIdOf(id) {
+  const hash = id.indexOf("#");
+  return hash > 0 ? id.substring(0, hash) : id;
+}
+function isCovered(id, coveredBases) {
+  return coveredBases.has(baseIdOf(id));
+}
 function isRenderedSummaryMessage(message) {
   return isSummaryMessageId(message.id) && message.role === "system" && message.contentType === "text";
 }
 function prune(messages, state, options = {}) {
   const covered = coveredMessageIds(state);
   if (covered.size === 0) return [...messages];
+  const coveredBases = /* @__PURE__ */ new Set();
+  for (const id of covered) coveredBases.add(baseIdOf(id));
   const inject = options.injectSummaries ?? true;
   const firstUserIndex = messages.findIndex(
     (message) => message.role === "user"
   );
-  const indexById = /* @__PURE__ */ new Map();
+  const baseIndexById = /* @__PURE__ */ new Map();
   const summaryIndexById = /* @__PURE__ */ new Map();
   messages.forEach((message, index) => {
-    indexById.set(message.id, index);
+    const base = baseIdOf(message.id);
+    const existing = baseIndexById.get(base);
+    if (existing === void 0 || index < existing)
+      baseIndexById.set(base, index);
     if (isRenderedSummaryMessage(message))
       summaryIndexById.set(message.id, index);
   });
-  const anchors = inject ? collectSummaryAnchors(state, indexById, summaryIndexById) : [];
+  const anchors = inject ? collectSummaryAnchors(state, baseIndexById, summaryIndexById) : [];
   return stripOrphanedReasoning(
     stripOrphanedToolResults(
       stripOrphanedToolCalls(
-        rebuildMessages(messages, covered, firstUserIndex, anchors)
+        rebuildMessages(messages, coveredBases, firstUserIndex, anchors)
       )
     )
   );
 }
-function collectSummaryAnchors(state, indexById, summaryIndexById) {
+function collectSummaryAnchors(state, baseIndexById, summaryIndexById) {
   const anchors = [];
   for (const block of activeBlocks(state)) {
     const existingIndex = summaryIndexById.get(summaryMessageId(block.blockId));
@@ -152,7 +164,7 @@ function collectSummaryAnchors(state, indexById, summaryIndexById) {
     }
     let earliest = null;
     for (const id of block.effectiveMessageIds) {
-      const index = indexById.get(id);
+      const index = baseIndexById.get(baseIdOf(id));
       if (index !== void 0 && (earliest === null || index < earliest)) {
         earliest = index;
       }
@@ -197,7 +209,7 @@ function pairSafeAnchorIndex(messages, index) {
   }
   return safe;
 }
-function rebuildMessages(messages, covered, firstUserIndex, anchors) {
+function rebuildMessages(messages, coveredBases, firstUserIndex, anchors) {
   const safeAnchors = anchors.map((anchor) => ({
     ...anchor,
     insertAt: pairSafeAnchorIndex(messages, anchor.insertAt)
@@ -215,7 +227,7 @@ function rebuildMessages(messages, covered, firstUserIndex, anchors) {
       result.push(messages[index]);
       continue;
     }
-    if (covered.has(messages[index].id)) continue;
+    if (isCovered(messages[index].id, coveredBases)) continue;
     if (isRenderedSummaryMessage(messages[index]) && anchoredSummaryIds.has(messages[index].id))
       continue;
     result.push(messages[index]);
@@ -281,6 +293,8 @@ function stripOrphanedReasoning(messages) {
 // src/sync.ts
 function syncBlocks(messages, state) {
   const presentIds = new Set(messages.map((message) => message.id));
+  const presentBases = /* @__PURE__ */ new Set();
+  for (const message of messages) presentBases.add(baseIdOf(message.id));
   const deactivated = [];
   const result = {
     blocks: state.blocks.map((block) => ({
@@ -330,7 +344,7 @@ function syncBlocks(messages, state) {
       continue;
     }
     block.active = true;
-    const stillPresent = block.effectiveMessageIds.some((id) => presentIds.has(id)) || presentIds.has(summaryMessageId(block.blockId));
+    const stillPresent = block.effectiveMessageIds.some((id) => presentBases.has(baseIdOf(id))) || presentIds.has(summaryMessageId(block.blockId));
     if (!stillPresent) {
       block.active = false;
       deactivated.push(block.blockId);
@@ -658,14 +672,7 @@ var COMPRESS_PARAMETERS = {
       type: "string",
       description: "Flat single-range form (no content): self-contained summary replacing the range"
     }
-  },
-  anyOf: [
-    { required: ["content"] },
-    {
-      required: ["summary"],
-      anyOf: [{ required: ["startId", "endId"] }, { required: ["startRef", "endRef"] }]
-    }
-  ]
+  }
 };
 var COMPRESS_TOOL = {
   name: COMPRESS_TOOL_NAME,
@@ -1255,7 +1262,12 @@ function hasMediaPayload(msg) {
   if (m.rawOpenaiContent != null) return true;
   if (Array.isArray(m.rawOpenaiContentParts) && m.rawOpenaiContentParts.length > 0)
     return true;
-  if (isObjWith(m.rawAnthropicBlock, "type", "image")) return true;
+  const ab = m.rawAnthropicBlock;
+  if (isObjWith(ab, "type", "image")) return true;
+  if (isObjWith(ab, "type", "tool_result")) {
+    const content = ab.content;
+    if (Array.isArray(content)) return content.some((p) => !isObjWith(p, "type", "text"));
+  }
   const item = m.rawResponsesItem;
   if (isObjWith(item, "type", "input_image")) return true;
   if (item && typeof item === "object") {
@@ -1619,8 +1631,10 @@ function resolveBoundaries(input) {
   if (endAnchor.snapped) snappedBoundaries.push(endAnchor.snapped);
   let startIndex = startAnchor.index;
   let endIndex = endAnchor.index;
+  let reversedNote;
   if (startIndex > endIndex) {
     [startIndex, endIndex] = [endIndex, startIndex];
+    reversedNote = `note: refs were given reversed (${start.raw}\u2192${end.raw}), normalized to ${end.raw}..${start.raw}`;
   }
   const messageIds = [];
   for (let index = startIndex; index <= endIndex; index++) {
@@ -1647,7 +1661,8 @@ function resolveBoundaries(input) {
     nestedBlockIds,
     boundaryKind,
     protectedGaps,
-    snappedBoundaries
+    snappedBoundaries,
+    reversedNote
   };
 }
 function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
@@ -1672,6 +1687,27 @@ function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
         snapped: `${label}="${boundary.raw}" refers to a message already compressed into an active block \u2014 anchored to the active block covering it instead.`
       };
     }
+    const paddedRef = formatPaddedRef(boundary.numericId);
+    if (state.hiddenOrphanRefs?.includes(paddedRef)) {
+      const neighbor = snapToNeighborVisible(
+        state,
+        indexByMessageId,
+        boundary.numericId,
+        endpoint
+      );
+      if (neighbor !== null) {
+        const dir = endpoint === "start" ? "the next visible message after it" : "the previous visible message before it";
+        return {
+          index: neighbor,
+          snapped: `${label}="${boundary.raw}" is a hidden orphan compress call (no matching block) \u2014 snapped to ${dir} instead.`
+        };
+      }
+      throw new BoundaryNotFoundError(
+        "consumed",
+        endpoint,
+        `${label}="${boundary.raw}" is a hidden orphan compress call with no adjacent visible message to anchor to \u2014 run acp_status for current refs.`
+      );
+    }
     throw new BoundaryNotFoundError(
       "consumed",
       endpoint,
@@ -1748,6 +1784,26 @@ function inheritedContentIds(state, block) {
   }
   return ids;
 }
+function snapToNeighborVisible(state, indexByMessageId, refNumber, endpoint) {
+  let bestIndex = null;
+  let bestRef = null;
+  for (const [rawId, index] of indexByMessageId) {
+    const refText = state.messageRefs.byRaw[rawId];
+    if (!refText || refText === BLOCKED_REF) continue;
+    const ref = refToIndex(refText);
+    if (ref === null) continue;
+    if (endpoint === "start") {
+      if (ref > refNumber && (bestRef === null || ref < bestRef)) {
+        bestRef = ref;
+        bestIndex = index;
+      }
+    } else if (ref < refNumber && (bestRef === null || ref > bestRef)) {
+      bestRef = ref;
+      bestIndex = index;
+    }
+  }
+  return bestIndex;
+}
 function formatPaddedRef(index) {
   return `m${String(index).padStart(5, "0")}`;
 }
@@ -1962,14 +2018,26 @@ function hideConsumedCompressCalls(state, messages) {
     }
   }
   let hidden = 0;
+  const hiddenOrphanRefs = [];
+  const rememberHiddenRef = (message) => {
+    if (message.toolCallId && allBlockCallIds.has(message.toolCallId)) {
+      return;
+    }
+    const ref = state.messageRefs.byRaw[message.id];
+    if (ref && ref !== BLOCKED_REF && !hiddenOrphanRefs.includes(ref)) {
+      hiddenOrphanRefs.push(ref);
+    }
+  };
   const result = [];
   for (const message of messages) {
     if (message.toolName === "compress" && message.contentType === "tool-call" && (!message.toolCallId || !keepCallIds.has(message.toolCallId))) {
       hidden++;
+      rememberHiddenRef(message);
       continue;
     }
     if (message.contentType === "tool-result" && message.toolCallId && hiddenCallIds.has(message.toolCallId)) {
       hidden++;
+      rememberHiddenRef(message);
       continue;
     }
     if (message.toolName === "compress" && message.contentType === "tool-call" && message.toolCallId && keepCallIds.has(message.toolCallId)) {
@@ -1989,7 +2057,7 @@ function hideConsumedCompressCalls(state, messages) {
     }
     result.push(message);
   }
-  return { messages: result, hidden };
+  return { messages: result, hidden, hiddenOrphanRefs };
 }
 
 // src/absorb.ts
@@ -3747,6 +3815,11 @@ function createRenderRefsNode(strategy) {
 }
 var renderRefsNode = createRenderRefsNode("all");
 
+// src/message-kind.ts
+function isToolMessage(message) {
+  return message.contentType === "tool-call" || message.contentType === "tool-result";
+}
+
 // src/tool-pairs.ts
 function adjustBoundariesForToolPairs(startIndex, endIndex, messages, maxScan = 20) {
   const callIdsInRange = /* @__PURE__ */ new Set();
@@ -3951,9 +4024,6 @@ function computeIntegrityWithdrawals(messages, foldedIds) {
 function estimateTextTokens(text) {
   return Math.ceil(text.length / 4);
 }
-function isToolMessage(message) {
-  return message.contentType === "tool-call" || message.contentType === "tool-result";
-}
 function isSyntheticOrPruned(message, state) {
   if (message.text?.startsWith("[Compressed conversation section]")) return true;
   for (const block of state.blocks) {
@@ -4282,6 +4352,7 @@ function createCore(ports = {}) {
     let tokensCompressed = 0;
     const errors = [];
     const warnings = [];
+    const notes = [];
     const protectedMessageIds = input.protectedMessageIds ?? computeProtectedRefs(
       input.messages,
       input.state,
@@ -4382,7 +4453,28 @@ function createCore(ports = {}) {
         const danglingRefs = consumedRanges.flatMap(
           (spec) => danglingMessageRefs(state, input.messages, spec)
         );
-        const gateMessage = resolvableCount === 0 && consumedRanges.length === 0 && unknownCount > 0 ? `None of the ${input.ranges.length} requested range(s) resolved \u2014 every ref is unknown to this session. Refs are per-session snapshots, assigned once when a message is first rendered; no compress reassigns them, so unknown refs cannot come from an earlier compress in this session. They come from a different generation: a previous session instance (switching model or upstream mid-conversation starts a fresh session whose refs restart at m00001), the generation before a native-compaction rebase (which also resets refs to m00001), or a typo. ${diagnostics} Run acp_status, then call the compress tool again using only the refs it reports.` : consumedRanges.length > 0 ? danglingRefs.length > 0 ? `Requested range(s) cannot be anchored (e.g. ${firstConsumed.startRef}..${firstConsumed.endRef}) \u2014 the refs exist in this session's ref map, but the messages they point to are no longer in the visible context and no active block covers them: the message content changed (or the message was filtered out of the view) and now carries a new ref, leaving your old refs dangling. ${diagnostics} Run acp_status, then call the compress tool again using only the refs it reports.` : `Requested range(s) already compressed (e.g. ${firstConsumed.startRef}..${firstConsumed.endRef}) \u2014 ${coverDetail}. Nothing new to compress in that window. ${diagnostics} Continue the task, or run acp_status and target one of the CURRENT compressible ranges it reports.${tierActionHint(input.config, state)}` : `Total compressible content too small (${totalRangeChars} chars across ${countedRanges} range(s), min ${input.config.compress.minCompressRange}). Combine more messages into your range(s) to meet the threshold.`;
+        let gateMessage = resolvableCount === 0 && consumedRanges.length === 0 && unknownCount > 0 ? `None of the ${input.ranges.length} requested range(s) resolved \u2014 every ref is unknown to this session. Refs are per-session snapshots, assigned once when a message is first rendered; no compress reassigns them, so unknown refs cannot come from an earlier compress in this session. They come from a different generation: a previous session instance (switching model or upstream mid-conversation starts a fresh session whose refs restart at m00001), the generation before a native-compaction rebase (which also resets refs to m00001), or a typo. ${diagnostics} Run acp_status, then call the compress tool again using only the refs it reports.` : consumedRanges.length > 0 ? danglingRefs.length > 0 ? `Requested range(s) cannot be anchored (e.g. ${firstConsumed.startRef}..${firstConsumed.endRef}) \u2014 the refs exist in this session's ref map, but the messages they point to are no longer in the visible context and no active block covers them: the message content changed (or the message was filtered out of the view) and now carries a new ref, leaving your old refs dangling. ${diagnostics} Run acp_status, then call the compress tool again using only the refs it reports.` : `Requested range(s) already compressed (e.g. ${firstConsumed.startRef}..${firstConsumed.endRef}) \u2014 ${coverDetail}. Nothing new to compress in that window. ${diagnostics} Continue the task, or run acp_status and target one of the CURRENT compressible ranges it reports.${tierActionHint(input.config, state)}` : countedRanges > 0 ? `Total compressible content too small (${totalRangeChars} chars across ${countedRanges} range(s), min ${input.config.compress.minCompressRange}). Combine more messages into your range(s) to meet the threshold.` : null;
+        if (gateMessage === null) {
+          return {
+            state: input.state,
+            result: {
+              blocksCreated: 0,
+              tokensCompressed: 0,
+              errors: [...classificationErrors],
+              warnings: []
+            }
+          };
+        }
+        const reversalNotes = [];
+        for (const [spec, resolution] of classifications) {
+          if (resolution.status === "ok" && !skipSpecs.has(spec)) {
+            const note = resolution.resolved.reversedNote;
+            if (note) reversalNotes.push(note);
+          }
+        }
+        if (reversalNotes.length > 0) {
+          gateMessage += ` ${reversalNotes.join(" ")}`;
+        }
         return {
           state: input.state,
           result: {
@@ -4409,6 +4501,8 @@ function createCore(ports = {}) {
         continue;
       }
       warnings.push(...resolution.resolved.snappedBoundaries);
+      const note = resolution.resolved.reversedNote;
+      if (note) notes.push(note);
       try {
         const outcome = applySingleRange({
           spec,
@@ -4442,7 +4536,13 @@ function createCore(ports = {}) {
     }
     return {
       state,
-      result: { blocksCreated, tokensCompressed, errors, warnings }
+      result: {
+        blocksCreated,
+        tokensCompressed,
+        errors,
+        warnings,
+        ...notes.length > 0 ? { notes } : {}
+      }
     };
   }
   function processTurn(input) {
@@ -4626,7 +4726,11 @@ var hideCompressCallsNode = {
   name: "hide-compress-calls",
   run(io) {
     const hidden = hideConsumedCompressCalls(io.state, io.messages);
-    return { ...io, messages: hidden.messages };
+    return {
+      ...io,
+      messages: hidden.messages,
+      state: { ...io.state, hiddenOrphanRefs: hidden.hiddenOrphanRefs }
+    };
   }
 };
 var recommendNode = {
@@ -5226,7 +5330,7 @@ function computeContextBreakdown(messages, total, growth, countTokens) {
     const tokens = countMessageTokens(msg, count);
     if (msg.text?.startsWith("[Compressed conversation section]")) {
       summaries += tokens;
-    } else if (msg.contentType === "tool-call" || msg.contentType === "tool-result") {
+    } else if (isToolMessage(msg)) {
       tool += tokens;
     } else if (msg.role === "system") {
       system += tokens;
@@ -5258,7 +5362,8 @@ function cloneState(state) {
     nextRuleId: state.nextRuleId,
     terminalStreak: state.terminalStreak,
     nextBlockId: state.nextBlockId,
-    nextRunId: state.nextRunId
+    nextRunId: state.nextRunId,
+    hiddenOrphanRefs: state.hiddenOrphanRefs ? [...state.hiddenOrphanRefs] : void 0
   };
 }
 function scoreRelevance(block, terms) {
@@ -5693,14 +5798,16 @@ function tierLabel(block) {
 }
 function tierBreakdown(blocks, countTokens) {
   const tierTokens = {};
+  const tierCounts = {};
   for (const block of blocks) {
     tierTokens[block.tier] = (tierTokens[block.tier] ?? 0) + summaryTokensOf(block, countTokens);
+    tierCounts[block.tier] = (tierCounts[block.tier] ?? 0) + 1;
   }
   const tiers = Object.keys(tierTokens).map(Number);
   if (tiers.length <= 1) return null;
   const parts = [];
   for (const tier of [1, 2, 3]) {
-    if (tierTokens[tier]) parts.push(`T${tier}: ${formatTokens2(tierTokens[tier])}`);
+    if (tierTokens[tier]) parts.push(`T${tier}: ${formatTokens2(tierTokens[tier])} (${tierCounts[tier]} blocks)`);
   }
   return parts.join(" | ");
 }
@@ -5726,8 +5833,9 @@ function collectVisible(messages, state, countTokens) {
     const ref = refForRaw(state.messageRefs, message.id);
     if (!ref) return;
     const tokens = countMessageTokens(message, countTokens);
-    const tool = isToolMessage(message) ? message.toolName ?? (message.toolCallId ? toolCallNames.get(message.toolCallId) : void 0) ?? "tool" : "text";
-    if (tokens > 0) visible.push({ ref, tokens, tool, index });
+    const isTool = isToolMessage(message);
+    const tool = isTool ? message.toolName ?? (message.toolCallId ? toolCallNames.get(message.toolCallId) : void 0) ?? "tool" : "text";
+    if (tokens > 0) visible.push({ ref, tokens, tool, isTool, index });
   });
   return { visible, summaryTokens };
 }
@@ -5770,8 +5878,8 @@ function renderOverview(visible, summaryTokens, blocks, state, countTokens, limi
     toolTypeMap.set(message.tool, (toolTypeMap.get(message.tool) ?? 0) + message.tokens);
   }
   const topTool = [...toolTypeMap.entries()].sort((a, b) => b[1] - a[1])[0]?.[0];
-  const totalTool = visible.filter((m) => m.tool !== "text").reduce((sum, m) => sum + m.tokens, 0);
-  const totalText = visible.filter((m) => m.tool === "text").reduce((sum, m) => sum + m.tokens, 0);
+  const totalTool = visible.filter((m) => m.isTool).reduce((sum, m) => sum + m.tokens, 0);
+  const totalText = visible.filter((m) => !m.isTool).reduce((sum, m) => sum + m.tokens, 0);
   const total = summaryTokens + totalTool + totalText;
   lines.push("CONTEXT BREAKDOWN");
   lines.push(
@@ -5807,6 +5915,11 @@ function renderOverview(visible, summaryTokens, blocks, state, countTokens, limi
         `  ${block.blockId} (${tierLabel(block)})  ${formatTokens2(eff)}\u2192${formatTokens2(summaryTokensOf(block, countTokens))}  ${block.effectiveMessageIds.length} msgs  "${topic}"`
       );
     }
+    if (blocks.length > limit) {
+      lines.push(
+        `  ... and ${blocks.length - limit} more blocks not shown (scope:"compressed", limit:${blocks.length} for full list)`
+      );
+    }
   }
   lines.push("");
   lines.push(
@@ -7489,7 +7602,11 @@ function build(text) {
 }
 function docFeatures(text) {
   const hit = cache.get(text);
-  if (hit) return hit;
+  if (hit) {
+    cache.delete(text);
+    cache.set(text, hit);
+    return hit;
+  }
   const f = build(text);
   if (text.length > 0 && text.length <= capChars) {
     while (cachedChars + text.length > capChars && cache.size > 0) {
@@ -7600,8 +7717,8 @@ var hybridAlgorithm = {
   score(docs, query) {
     const bm = bm25Algorithm.score(docs, query);
     const fz = fuzzyAlgorithm.score(docs, query);
-    const maxBm = Math.max(...bm.map((r) => r.score), 1e-9);
-    const maxFz = Math.max(...fz.map((r) => r.score), 1e-9);
+    const maxBm = bm.reduce((m, r) => r.score > m ? r.score : m, 1e-9);
+    const maxFz = fz.reduce((m, r) => r.score > m ? r.score : m, 1e-9);
     const bmMap = new Map(bm.map((r) => [r.ref, r.score / maxBm]));
     const fzMap = new Map(fz.map((r) => [r.ref, r.score / maxFz]));
     return docs.map((d) => ({
@@ -7965,6 +8082,7 @@ export {
   applySectionOverrides,
   applySteeringToPrompt,
   assignRefs,
+  baseIdOf,
   blockById,
   blockDocs,
   blockVisibleInRange,
@@ -8041,6 +8159,7 @@ export {
   imageShrinksForRef,
   indexToRef,
   isAbsorbCandidate,
+  isCovered,
   isImageFullRestored,
   isMessageLatestProtected,
   isMessageProtected,
@@ -8048,6 +8167,7 @@ export {
   isRetrievedMessage,
   isStoredPlaceholderText,
   isSummaryMessageId,
+  isToolMessage,
   isValidPackName,
   jsonFoldPlugin,
   leanPack,