acp-kernel 0.0.82-pr.233.214 → 0.0.82-pr.235.211

package/dist/boundaries.d.ts

@@ -42,8 +42,8 @@ export declare function resolveBoundaries(input: ResolveBoundariesInput): Resolv
  * active block whose raws were pruned becomes unresolvable and cannot be
  * promoted (dog/billion-context-pi#195).
  */
-export declare function visibleBlockAnchor(block: CompressionBlock, indexByMessageId: Map<string, number>): number | null;
-export declare function blockVisibleInRange(block: CompressionBlock, indexByMessageId: Map<string, number>, startIndex: number, endIndex: number): boolean;
-export declare function earliestIndexOfIds(ids: string[], indexByMessageId: Map<string, number>): number | null;
+export declare function visibleBlockAnchor(block: CompressionBlock, indexByMessageId: Map<string, number>, baseIndexById?: Map<string, number>): number | null;
+export declare function blockVisibleInRange(block: CompressionBlock, indexByMessageId: Map<string, number>, startIndex: number, endIndex: number, baseIndexById?: Map<string, number>): boolean;
+export declare function earliestIndexOfIds(ids: string[], indexByMessageId: Map<string, number>, baseIndexById?: Map<string, number>): number | null;
 export declare function toResolvedBoundary(range: ResolvedRange): ResolvedBoundary;
 //# sourceMappingURL=boundaries.d.ts.map

package/dist/boundaries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"boundaries.d.ts","sourceRoot":"","sources":["../src/boundaries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAKD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAehE;AAED;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,wBAAwB;IACrC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;gBAGjC,IAAI,EAAE,SAAS,GAAG,UAAU,EAC5B,QAAQ,EAAE,OAAO,GAAG,KAAK,EACzB,OAAO,EAAE,MAAM;CAQlB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,sBAAsB,GAC5B,aAAa,CAuEf;AAgJD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,GAAG,IAAI,CAIf;AAOD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAcT;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EAAE,EACb,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,GAAG,IAAI,CASf;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,gBAAgB,CAMzE"}
+{"version":3,"file":"boundaries.d.ts","sourceRoot":"","sources":["../src/boundaries.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAKD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAehE;AAED;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,wBAAwB;IACrC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;gBAGjC,IAAI,EAAE,SAAS,GAAG,UAAU,EAC5B,QAAQ,EAAE,OAAO,GAAG,KAAK,EACzB,OAAO,EAAE,MAAM;CAQlB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,sBAAsB,GAC5B,aAAa,CAyFf;AAwJD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,MAAM,GAAG,IAAI,CAQf;AAOD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAeT;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EAAE,EACb,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,MAAM,GAAG,IAAI,CAef;AAcD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,gBAAgB,CAMzE"}

package/dist/compress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AA2GD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAgV7D;AAmmCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AAmHD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAgV7D;AAknCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/decompress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decompress.d.ts","sourceRoot":"","sources":["../src/decompress.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElF,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO1D;AAED,wBAAgB,6BAA6B,CACzC,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,gBAAgB,EAAE,CAUpB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiB1F;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,GAAE,iBAAsB,GAChC,gBAAgB,CAkClB;AAED,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,WAAW,EAAE,EACvB,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,EACnC,KAAK,EAAE,gBAAgB,GACxB,qBAAqB,CA8BvB;AAED,MAAM,WAAW,sBAAsB;IACnC,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,6GAA6G;IAC7G,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IAClC,kKAAkK;IAClK,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,gBAAgB,EACvB,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,WAAW,EAAE,EACvB,OAAO,GAAE,qBAA0B,GACpC,sBAAsB,CAsCxB"}
+{"version":3,"file":"decompress.d.ts","sourceRoot":"","sources":["../src/decompress.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElF,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO1D;AAED,wBAAgB,6BAA6B,CACzC,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,gBAAgB,EAAE,CAYpB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiB1F;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,GAAE,iBAAsB,GAChC,gBAAgB,CAkClB;AAED,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,WAAW,EAAE,EACvB,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,EACnC,KAAK,EAAE,gBAAgB,GACxB,qBAAqB,CAgCvB;AAED,MAAM,WAAW,sBAAsB;IACnC,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,6GAA6G;IAC7G,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IAClC,kKAAkK;IAClK,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,gBAAgB,EACvB,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,WAAW,EAAE,EACvB,OAAO,GAAE,qBAA0B,GACpC,sBAAsB,CA0CxB"}

package/dist/index.js

@@ -496,14 +496,20 @@ function resolveBoundaries(input) {
     );
   }
   const indexByMessageId = /* @__PURE__ */ new Map();
-  input.messages.forEach(
-    (message, index) => indexByMessageId.set(message.id, index)
-  );
+  const baseIndexById = /* @__PURE__ */ new Map();
+  input.messages.forEach((message, index) => {
+    indexByMessageId.set(message.id, index);
+    const base = baseIdOf(message.id);
+    const existing = baseIndexById.get(base);
+    if (existing === void 0 || index < existing)
+      baseIndexById.set(base, index);
+  });
   let snappedBoundaries = [];
   const startAnchor = resolveAnchorIndex(
     start,
     input.state,
     indexByMessageId,
+    baseIndexById,
     "start"
   );
   if (startAnchor.snapped) snappedBoundaries.push(startAnchor.snapped);
@@ -511,6 +517,7 @@ function resolveBoundaries(input) {
     end,
     input.state,
     indexByMessageId,
+    baseIndexById,
     "end"
   );
   if (endAnchor.snapped) snappedBoundaries.push(endAnchor.snapped);
@@ -529,7 +536,13 @@ function resolveBoundaries(input) {
   const nestedBlockIds = [];
   const nestedSeen = /* @__PURE__ */ new Set();
   for (const block of activeBlocks(input.state)) {
-    if (blockVisibleInRange(block, indexByMessageId, startIndex, endIndex)) {
+    if (blockVisibleInRange(
+      block,
+      indexByMessageId,
+      startIndex,
+      endIndex,
+      baseIndexById
+    )) {
       if (!nestedSeen.has(block.blockId)) {
         nestedSeen.add(block.blockId);
         nestedBlockIds.push(block.blockId);
@@ -547,7 +560,7 @@ function resolveBoundaries(input) {
     snappedBoundaries
   };
 }
-function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
+function resolveAnchorIndex(boundary, state, indexByMessageId, baseIndexById, endpoint) {
   const label = endpoint === "start" ? "startId" : "endId";
   if (boundary.kind === "message") {
     const rawId = state.messageRefs.byRef[boundary.raw] ?? state.messageRefs.byRef[formatPaddedRef(boundary.numericId)];
@@ -558,11 +571,11 @@ function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
         `${label}="${boundary.raw}" does not exist in this session (typo or wrong session) \u2014 run acp_status for current refs.`
       );
     }
-    const index = indexByMessageId.get(rawId);
+    const index = indexByMessageId.get(rawId) ?? baseIndexById.get(baseIdOf(rawId));
     if (index !== void 0) {
       return { index, snapped: null };
     }
-    const owner2 = activeOwnerAnchor(state, [rawId], indexByMessageId);
+    const owner2 = activeOwnerAnchor(state, [rawId], indexByMessageId, baseIndexById);
     if (owner2 !== null) {
       return {
         index: owner2,
@@ -584,7 +597,7 @@ function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
     );
   }
   if (block.active) {
-    const anchor = visibleBlockAnchor(block, indexByMessageId);
+    const anchor = visibleBlockAnchor(block, indexByMessageId, baseIndexById);
     if (anchor !== null) {
       return { index: anchor, snapped: null };
     }
@@ -592,7 +605,8 @@ function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
   const owner = activeOwnerAnchor(
     state,
     block.effectiveMessageIds,
-    indexByMessageId
+    indexByMessageId,
+    baseIndexById
   );
   if (owner !== null) {
     return {
@@ -613,9 +627,10 @@ function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
     `${label}="b${boundary.numericId}" is an active block but none of its content (raw messages or rendered summary) is visible in the current context \u2014 run acp_status to verify.`
   );
 }
-function activeOwnerAnchor(state, ownedIds, indexByMessageId) {
+function activeOwnerAnchor(state, ownedIds, indexByMessageId, baseIndexById) {
   if (ownedIds.length === 0) return null;
-  const owned = new Set(ownedIds);
+  const owned = /* @__PURE__ */ new Set();
+  for (const id of ownedIds) owned.add(baseIdOf(id));
   let best = null;
   for (const block of state.blocks) {
     if (!block.active) continue;
@@ -628,7 +643,7 @@ function activeOwnerAnchor(state, ownedIds, indexByMessageId) {
       }
     }
     if (!ownsInherited) continue;
-    const anchor = visibleBlockAnchor(block, indexByMessageId);
+    const anchor = visibleBlockAnchor(block, indexByMessageId, baseIndexById);
     if (anchor === null) continue;
     if (best === null || anchor < best) {
       best = anchor;
@@ -641,39 +656,54 @@ function inheritedContentIds(state, block) {
   for (const childId of block.directBlockIds) {
     const child = blockById(state, childId);
     if (!child) continue;
-    for (const id of child.effectiveMessageIds) ids.add(id);
+    for (const id of child.effectiveMessageIds) ids.add(baseIdOf(id));
   }
   return ids;
 }
 function formatPaddedRef(index) {
   return `m${String(index).padStart(5, "0")}`;
 }
-function visibleBlockAnchor(block, indexByMessageId) {
+function visibleBlockAnchor(block, indexByMessageId, baseIndexById) {
   const summaryIndex = indexByMessageId.get(summaryMessageId(block.blockId));
   if (summaryIndex !== void 0) return summaryIndex;
-  return earliestIndexOfIds(block.effectiveMessageIds, indexByMessageId);
+  return earliestIndexOfIds(
+    block.effectiveMessageIds,
+    indexByMessageId,
+    baseIndexById
+  );
 }
-function blockVisibleInRange(block, indexByMessageId, startIndex, endIndex) {
+function blockVisibleInRange(block, indexByMessageId, startIndex, endIndex, baseIndexById) {
   const summaryIndex = indexByMessageId.get(summaryMessageId(block.blockId));
   if (summaryIndex !== void 0 && summaryIndex >= startIndex && summaryIndex <= endIndex) {
     return true;
   }
   const rawIndex = earliestIndexOfIds(
     block.effectiveMessageIds,
-    indexByMessageId
+    indexByMessageId,
+    baseIndexById
   );
   return rawIndex !== null && rawIndex >= startIndex && rawIndex <= endIndex;
 }
-function earliestIndexOfIds(ids, indexByMessageId) {
+function earliestIndexOfIds(ids, indexByMessageId, baseIndexById) {
+  const baseIndex = baseIndexById ?? deriveBaseIndex(indexByMessageId);
   let earliest = null;
   for (const id of ids) {
-    const index = indexByMessageId.get(id);
+    const index = baseIndex.get(baseIdOf(id));
     if (index !== void 0 && (earliest === null || index < earliest)) {
       earliest = index;
     }
   }
   return earliest;
 }
+function deriveBaseIndex(indexByMessageId) {
+  const baseIndex = /* @__PURE__ */ new Map();
+  for (const [id, index] of indexByMessageId) {
+    const base = baseIdOf(id);
+    const existing = baseIndex.get(base);
+    if (existing === void 0 || index < existing) baseIndex.set(base, index);
+  }
+  return baseIndex;
+}
 
 // src/truncate-tools.ts
 var TRUNCATION_MARKER = "[truncated for context space]";
@@ -2205,20 +2235,26 @@ function estimateTextTokens(text) {
 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;
+function activeBlockCoveredBases(state) {
+  const covered = /* @__PURE__ */ new Set();
   for (const block of state.blocks) {
-    if (block.active && block.effectiveMessageIds.includes(message.id)) return true;
+    if (!block.active) continue;
+    for (const id of block.effectiveMessageIds) covered.add(baseIdOf(id));
   }
-  return false;
+  return covered;
+}
+function isSyntheticOrPruned(message, coveredBases) {
+  if (message.text?.startsWith("[Compressed conversation section]")) return true;
+  return coveredBases.has(baseIdOf(message.id));
 }
 function computeProtectedRefs(messages, state, config, countTokens = estimateTextTokens) {
   const preserveN = config.preserveRecentMessages;
   const preserveTokens = config.preserveRecentTokens;
   const result = /* @__PURE__ */ new Set();
   const visible = [];
+  const coveredBases = activeBlockCoveredBases(state);
   for (const msg of messages) {
-    if (isSyntheticOrPruned(msg, state)) continue;
+    if (isSyntheticOrPruned(msg, coveredBases)) continue;
     if (isNeverPreserveRecent(msg)) continue;
     const ref = state.messageRefs.byRaw[msg.id];
     if (!ref || ref === "BLOCKED") continue;
@@ -2239,7 +2275,7 @@ function computeProtectedRefs(messages, state, config, countTokens = estimateTex
   if (preserveN > 0) {
     for (let i = messages.length - 1; i >= 0; i--) {
       const msg = messages[i];
-      if (msg.role !== "user" || isSyntheticOrPruned(msg, state)) continue;
+      if (msg.role !== "user" || isSyntheticOrPruned(msg, coveredBases)) continue;
       const ref = state.messageRefs.byRaw[msg.id];
       if (ref && ref !== "BLOCKED") result.add(ref);
       break;
@@ -2256,11 +2292,12 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
   let skipSinceCompressible = false;
   let skipSinceProtected = false;
   let msgIndex = -1;
+  const coveredBases = activeBlockCoveredBases(state);
   for (const msg of messages) {
     msgIndex++;
     const ref = state.messageRefs.byRaw[msg.id];
     if (!ref || ref === "BLOCKED") continue;
-    if (isSyntheticOrPruned(msg, state)) {
+    if (isSyntheticOrPruned(msg, coveredBases)) {
       skipSinceCompressible = true;
       skipSinceProtected = true;
       continue;
@@ -2461,16 +2498,22 @@ function refGateDiagnostics(state, requestedRanges, unknownCount) {
 }
 function danglingMessageRefs(state, messages, spec) {
   const visible = new Set(messages.map((m) => m.id));
+  const visibleBases = /* @__PURE__ */ new Set();
+  for (const id of visible) visibleBases.add(baseIdOf(id));
+  const coveredBases = /* @__PURE__ */ new Set();
+  for (const block of state.blocks) {
+    if (!block.active) continue;
+    for (const id of block.effectiveMessageIds) coveredBases.add(baseIdOf(id));
+  }
   const dangling = [];
   for (const ref of [spec.startRef, spec.endRef]) {
     const parsed = parseBoundary(ref);
     if (!parsed || parsed.kind !== "message") continue;
     const rawId = state.messageRefs.byRef[parsed.raw] ?? state.messageRefs.byRef[indexToRef(parsed.numericId)];
-    if (!rawId || visible.has(rawId)) continue;
-    const covered = state.blocks.some(
-      (block) => block.active && block.effectiveMessageIds.includes(rawId)
-    );
-    if (!covered) dangling.push(parsed.raw);
+    if (!rawId) continue;
+    const base = baseIdOf(rawId);
+    if (visible.has(rawId) || visibleBases.has(base)) continue;
+    if (!coveredBases.has(base)) dangling.push(parsed.raw);
   }
   return dangling;
 }
@@ -2977,13 +3020,25 @@ function applySingleRange(input) {
   );
   if (rangeMessageIds.length > resolved.messageIds.length) {
     const indexByMessageId = /* @__PURE__ */ new Map();
-    input.messages.forEach((m, i) => indexByMessageId.set(m.id, i));
+    const baseIndexById = /* @__PURE__ */ new Map();
+    input.messages.forEach((m, i) => {
+      indexByMessageId.set(m.id, i);
+      const base = baseIdOf(m.id);
+      const existing = baseIndexById.get(base);
+      if (existing === void 0 || i < existing) baseIndexById.set(base, i);
+    });
     const adjustedStart = rangeMessageIds.length > 0 ? indexByMessageId.get(rangeMessageIds[0]) ?? resolved.startIndex : resolved.startIndex;
     const adjustedEnd = rangeMessageIds.length > 0 ? indexByMessageId.get(rangeMessageIds[rangeMessageIds.length - 1]) ?? resolved.endIndex : resolved.endIndex;
     const nestedSeen = new Set(resolved.nestedBlockIds);
     for (const block2 of activeBlocks(input.state)) {
       if (nestedSeen.has(block2.blockId)) continue;
-      if (blockVisibleInRange(block2, indexByMessageId, adjustedStart, adjustedEnd)) {
+      if (blockVisibleInRange(
+        block2,
+        indexByMessageId,
+        adjustedStart,
+        adjustedEnd,
+        baseIndexById
+      )) {
         nestedSeen.add(block2.blockId);
         resolved.nestedBlockIds.push(block2.blockId);
       }
@@ -3009,7 +3064,7 @@ function applySingleRange(input) {
     }
   }
   const directMessageIds = [...effectiveMessageIds].filter(
-    (id) => !input.preExistingCoverage.has(id)
+    (id) => !input.preExistingCoverage.has(baseIdOf(id))
   );
   let filteredIds = filterProtectedToolMessages(
     directMessageIds,
@@ -3215,7 +3270,7 @@ function resolveTargetTier(state, nestedBlockIds, isBlockBoundary) {
 function collectCoverage(state) {
   const coverage = /* @__PURE__ */ new Set();
   for (const block of activeBlocks(state)) {
-    for (const id of block.effectiveMessageIds) coverage.add(id);
+    for (const id of block.effectiveMessageIds) coverage.add(baseIdOf(id));
   }
   return coverage;
 }
@@ -3730,10 +3785,12 @@ function parseBlockIdArg(arg) {
 }
 function findBlocksOverlappingMessages(state, messageIds) {
   if (messageIds.size === 0) return [];
+  const messageBases = /* @__PURE__ */ new Set();
+  for (const id of messageIds) messageBases.add(baseIdOf(id));
   const matched = [];
   for (const block of state.blocks) {
     if (!block.active) continue;
-    if (block.effectiveMessageIds.some((id) => messageIds.has(id))) {
+    if (block.effectiveMessageIds.some((id) => messageBases.has(baseIdOf(id)))) {
       matched.push(block);
     }
   }
@@ -3790,13 +3847,15 @@ function deactivateBlock(state, blockIds, options = {}) {
   return { ...state, blocks: final };
 }
 function buildRestoredContentPreview(messages, beforeActiveMessageIds, state) {
+  const coveredBases = /* @__PURE__ */ new Set();
+  for (const b of state.blocks) {
+    if (!b.active) continue;
+    for (const id of b.effectiveMessageIds) coveredBases.add(baseIdOf(id));
+  }
   const restored = [];
   for (const message of messages) {
     if (!beforeActiveMessageIds.has(message.id)) continue;
-    const stillCovered = state.blocks.some(
-      (b) => b.active && b.effectiveMessageIds.includes(message.id)
-    );
-    if (!stillCovered) restored.push(message);
+    if (!coveredBases.has(baseIdOf(message.id))) restored.push(message);
   }
   if (restored.length === 0) return { preview: "", restoredCount: 0 };
   const lines = [];
@@ -3815,9 +3874,10 @@ function buildRestoredContentPreview(messages, beforeActiveMessageIds, state) {
 }
 function collectBlockContent(state, block, messages, options = {}) {
   const full = options.full ?? false;
-  const targetIds = new Set(block.effectiveMessageIds);
+  const targetBases = /* @__PURE__ */ new Set();
+  for (const id of block.effectiveMessageIds) targetBases.add(baseIdOf(id));
   if (full) {
-    const msgs = messages.filter((m) => targetIds.has(m.id));
+    const msgs = messages.filter((m) => targetBases.has(baseIdOf(m.id)));
     if (msgs.length === 0) return { text: "", count: 0 };
     return { text: msgs.map(formatMessage).join("\n\n"), count: msgs.length };
   }
@@ -3827,7 +3887,7 @@ function collectBlockContent(state, block, messages, options = {}) {
     const child = state.blocks.find((b) => b.blockId === childId);
     if (!child?.active) continue;
     nestedChildren.push(child);
-    for (const id of child.effectiveMessageIds) nestedCovered.add(id);
+    for (const id of child.effectiveMessageIds) nestedCovered.add(baseIdOf(id));
   }
   const parts = [];
   for (const child of nestedChildren) {
@@ -3837,7 +3897,8 @@ ${child.summary}`);
   }
   let directCount = 0;
   for (const m of messages) {
-    if (targetIds.has(m.id) && !nestedCovered.has(m.id)) {
+    const base = baseIdOf(m.id);
+    if (targetBases.has(base) && !nestedCovered.has(base)) {
       parts.push(formatMessage(m));
       directCount++;
     }
@@ -3899,7 +3960,7 @@ function collectVisible(messages, state, countTokens) {
   const coveredIds = /* @__PURE__ */ new Set();
   for (const block of state.blocks) {
     if (!block.active) continue;
-    for (const id of block.effectiveMessageIds) coveredIds.add(id);
+    for (const id of block.effectiveMessageIds) coveredIds.add(baseIdOf(id));
   }
   let summaryTokens = 0;
   for (const block of state.blocks) {
@@ -3913,7 +3974,7 @@ function collectVisible(messages, state, countTokens) {
     }
   }
   messages.forEach((message, index) => {
-    if (coveredIds.has(message.id)) return;
+    if (coveredIds.has(baseIdOf(message.id))) return;
     const ref = refForRaw(state.messageRefs, message.id);
     if (!ref) return;
     const tokens = countMessageTokens(message, countTokens);