acp-kernel 0.0.96-pr.465.320 → 0.0.96-pr.466.321

package/dist/compress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAgBvD,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;mEAC+D;IAC/D,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACvE,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;IAC5B;8DAC0D;IAC1D,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;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;AAqND,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAie7D;AAgrCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAgBvD,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;mEAC+D;IAC/D,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACvE,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;IAC5B;8DAC0D;IAC1D,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;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;AAqND,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CA6d7D;AA+qCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/index.js

@@ -102,46 +102,6 @@ function highestUsedIndex(map) {
   return highest;
 }
 
-// src/instance-reid.ts
-var CONTENT_HASH_ROOT = /^h_([0-9a-f]{16})(?:_\d+)?(?:#.*)?$/;
-function clusterRoot(id) {
-  const m = CONTENT_HASH_ROOT.exec(id);
-  return m ? `h_${m[1]}` : null;
-}
-function remintCoveredLiveIds(messages, state) {
-  const lastPass = state.lastPassIds;
-  if (lastPass === void 0) return messages;
-  const covered = new Set(coveredMessageIds(state));
-  if (covered.size === 0) return messages;
-  const seenLastPass = new Set(lastPass);
-  const groups = /* @__PURE__ */ new Map();
-  for (let i = 0; i < messages.length; i++) {
-    const root = clusterRoot(messages[i].id);
-    if (root === null) continue;
-    const idxs = groups.get(root);
-    if (idxs) idxs.push(i);
-    else groups.set(root, [i]);
-  }
-  const next = [...messages];
-  let changed = false;
-  for (const [root, idxs] of groups) {
-    const conflict = idxs.some((i) => covered.has(messages[i].id));
-    if (!conflict) continue;
-    let k = 1;
-    for (const i of idxs) {
-      const id = messages[i].id;
-      if (covered.has(id) && seenLastPass.has(id)) continue;
-      while (covered.has(`${root}_${k}`)) k++;
-      const hash = id.indexOf("#");
-      const tail = hash > 0 ? id.slice(hash) : "";
-      next[i] = { ...messages[i], id: `${root}_${k}${tail}` };
-      k++;
-      changed = true;
-    }
-  }
-  return changed ? next : messages;
-}
-
 // src/prune.ts
 var SUMMARY_HEADER = "[Compressed conversation section]";
 var SUMMARY_ID_PREFIX = "acp_summary_";
@@ -331,6 +291,9 @@ function stripOrphanedReasoning(messages) {
 }
 
 // src/sync.ts
+function isBlockStillPresent(block, presentBases, presentIds) {
+  return block.effectiveMessageIds.some((id) => presentBases.has(baseIdOf(id))) || presentIds.has(summaryMessageId(block.blockId));
+}
 function syncBlocks(messages, state) {
   const presentIds = new Set(messages.map((message) => message.id));
   const presentBases = /* @__PURE__ */ new Set();
@@ -358,8 +321,7 @@ function syncBlocks(messages, state) {
     nextRuleId: state.nextRuleId,
     terminalStreak: state.terminalStreak,
     nextBlockId: state.nextBlockId,
-    nextRunId: state.nextRunId,
-    lastPassIds: state.lastPassIds ? [...state.lastPassIds] : void 0
+    nextRunId: state.nextRunId
   };
   const liveRefs = new Set(
     messages.map((m) => result.messageRefs.byRaw[m.id]).filter((r) => typeof r === "string")
@@ -387,8 +349,7 @@ function syncBlocks(messages, state) {
       continue;
     }
     block.active = true;
-    const stillPresent = block.effectiveMessageIds.some((id) => presentBases.has(baseIdOf(id))) || presentIds.has(summaryMessageId(block.blockId));
-    if (!stillPresent) {
+    if (!isBlockStillPresent(block, presentBases, presentIds)) {
       block.active = false;
       deactivated.push(block.blockId);
     }
@@ -396,6 +357,101 @@ function syncBlocks(messages, state) {
   return { state: result, deactivated };
 }
 
+// src/instance-reid.ts
+var CONTENT_HASH_ROOT = /^h_([0-9a-f]{16})(?:_\d+)?(?:#.*)?$/;
+function clusterRoot(id) {
+  const m = CONTENT_HASH_ROOT.exec(id);
+  return m ? `h_${m[1]}` : null;
+}
+function instanceNumber(id, root) {
+  if (!id.startsWith(`${root}_`)) return null;
+  const n = Number(id.slice(root.length + 1));
+  return Number.isInteger(n) && n > 0 ? n : null;
+}
+function remintCoveredLiveIds(messages, state) {
+  const liveBases = /* @__PURE__ */ new Set();
+  const liveIds = /* @__PURE__ */ new Set();
+  for (const message of messages) {
+    if (typeof message.id !== "string") continue;
+    liveIds.add(message.id);
+    liveBases.add(baseIdOf(message.id));
+  }
+  const consumed = /* @__PURE__ */ new Set();
+  for (const block of state.blocks) {
+    for (const id of block.directBlockIds) consumed.add(id);
+  }
+  const coverersByBase = /* @__PURE__ */ new Map();
+  const coveredBases = /* @__PURE__ */ new Set();
+  let anyCoverage = false;
+  for (const block of state.blocks) {
+    if (consumed.has(block.blockId) || block.expanded) continue;
+    if (!isBlockStillPresent(block, liveBases, liveIds)) continue;
+    const bases = /* @__PURE__ */ new Set();
+    for (const id of block.effectiveMessageIds) bases.add(baseIdOf(id));
+    let allPresent = bases.size > 0;
+    for (const base of bases) {
+      if (!liveBases.has(base)) {
+        allPresent = false;
+        break;
+      }
+    }
+    const replaying = allPresent && !liveIds.has(summaryMessageId(block.blockId));
+    anyCoverage = true;
+    for (const base of bases) {
+      coveredBases.add(base);
+      const flags = coverersByBase.get(base);
+      if (flags) flags.push(replaying);
+      else coverersByBase.set(base, [replaying]);
+    }
+  }
+  if (!anyCoverage) return messages;
+  const groups = /* @__PURE__ */ new Map();
+  for (let i = 0; i < messages.length; i++) {
+    const id = messages[i].id;
+    if (typeof id !== "string") continue;
+    const root = clusterRoot(id);
+    if (root === null) continue;
+    const idxs = groups.get(root);
+    if (idxs) idxs.push(i);
+    else groups.set(root, [i]);
+  }
+  const next = [...messages];
+  let changed = false;
+  for (const [root, idxs] of groups) {
+    const remintIdx = [];
+    for (const i of idxs) {
+      const flags = coverersByBase.get(baseIdOf(messages[i].id));
+      if (!flags) continue;
+      const positionalReplay = flags.every((replaying) => replaying);
+      if (positionalReplay) continue;
+      remintIdx.push(i);
+    }
+    if (remintIdx.length === 0) continue;
+    const reminting = new Set(remintIdx);
+    const taken = /* @__PURE__ */ new Set();
+    for (const base of coveredBases) {
+      const n = instanceNumber(base, root);
+      if (n !== null) taken.add(n);
+    }
+    for (const i of idxs) {
+      if (reminting.has(i)) continue;
+      const n = instanceNumber(baseIdOf(messages[i].id), root);
+      if (n !== null) taken.add(n);
+    }
+    let k = 1;
+    for (const i of remintIdx) {
+      while (taken.has(k)) k++;
+      const id = messages[i].id;
+      const hash = id.indexOf("#");
+      const tail = hash > 0 ? id.slice(hash) : "";
+      next[i] = { ...messages[i], id: `${root}_${k}${tail}` };
+      taken.add(k);
+      changed = true;
+    }
+  }
+  return changed ? next : messages;
+}
+
 // src/config.ts
 function defaultConfig(modelContextLimit, overrides = {}) {
   const base = {
@@ -5032,7 +5088,6 @@ function createCore(ports = {}) {
       countTokens,
       contentStore
     };
-    const inboundIds = input.messages.map((m) => m.id);
     const initial = {
       messages: input.messages,
       state: input.state,
@@ -5044,10 +5099,7 @@ function createCore(ports = {}) {
     const ccrEffect = result.effects.ccr;
     return {
       messages: result.messages,
-      // This pass's inbound ids become the NEXT pass's echo discriminator
-      // (#462). Written here — not by a node — so reconcile-live-ids reads the
-      // PREVIOUS pass's snapshot during this one.
-      state: { ...result.state, lastPassIds: inboundIds },
+      state: result.state,
       nudge: result.effects.nudge,
       terminalEscape: result.effects.terminalEscape,
       truncationSkipped: result.effects.truncationSkipped,
@@ -5865,8 +5917,7 @@ function cloneState(state) {
     terminalStreak: state.terminalStreak,
     nextBlockId: state.nextBlockId,
     nextRunId: state.nextRunId,
-    hiddenOrphanRefs: state.hiddenOrphanRefs ? [...state.hiddenOrphanRefs] : void 0,
-    lastPassIds: state.lastPassIds ? [...state.lastPassIds] : void 0
+    hiddenOrphanRefs: state.hiddenOrphanRefs ? [...state.hiddenOrphanRefs] : void 0
   };
 }
 function scoreRelevance(block, terms) {