billion-context-omp 0.3.2 → 0.3.3-pr.145.10

package/README.md

@@ -1,7 +1,22 @@
-# billion-context-omp
+# billion-context-omp — DEPRECATED
+
+> [!WARNING]
+> **This package is deprecated.** For omp (oh-my-pi) context compression, use the
+> [billion-context](https://github.com/ranxianglei/billion-context) proxy, which now
+> supports omp directly:
+>
+> ```bash
+> npm i -g billion-context && bili setup omp
+> ```
+>
+> The proxy runs the same compression engine ([acp-kernel](https://github.com/ranxianglei/acp-kernel))
+> at the HTTP layer, works with every omp model/provider (no extension API dependency),
+> and is where all active development happens. This plugin repository is maintenance-only.
 
 [English](./README.md) | [中文](./README.zh-CN.md)
 
+---
+
 <p align="center">
 <strong>Billion-Context</strong> for <a href="https://github.com/can1357/oh-my-pi">omp (oh-my-pi)</a>
 <br />
@@ -10,12 +25,6 @@ The model decides <em>when</em> and <em>what</em> to compress — not a hard lim
 
 ---
 
-<p align="center">
-<a href="https://www.npmjs.com/package/billion-context-omp"><img src="https://img.shields.io/npm/v/billion-context-omp.svg?style=flat-square" alt="npm"></a>
-<a href="https://github.com/ranxianglei/billion-context-omp/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/billion-context-omp.svg?style=flat-square" alt="license"></a>
-<a href="https://github.com/ranxianglei/billion-context-omp"><img src="https://img.shields.io/badge/GitHub-ranxianglei%2Fbillion--context--omp-181717?style=flat-square&logo=github" alt="GitHub"></a>
-</p>
-
 <p align="center">
 <code>omp install billion-context-omp</code>
 </p>

package/README.zh-CN.md

@@ -1,12 +1,17 @@
-[English](./README.md) | [中文](./README.zh-CN.md)
-
-# billion-context-omp
+# billion-context-omp — 已废弃
+
+> [!WARNING]
+> **本包已废弃。** omp (oh-my-pi) 的上下文压缩请改用
+> [billion-context](https://github.com/ranxianglei/billion-context) 代理版本，现已直接支持 omp：
+>
+> ```bash
+> npm i -g billion-context && bili setup omp
+> ```
+>
+> 代理在 HTTP 层运行同一压缩引擎（[acp-kernel](https://github.com/ranxianglei/acp-kernel)），
+> 适配 omp 的全部模型/供应商（不依赖插件扩展 API），后续开发都在那边进行。本插件仓库仅保留维护。
 
-<p align="center">
-面向 <a href="https://github.com/can1357/oh-my-pi">omp (oh-my-pi)</a> 的 <strong>Billion-Context</strong>
-<br />
-由模型决定<em>何时</em>压缩、<em>压缩什么</em> —— 而不是硬截断。
-</p>
+[English](./README.md) | [中文](./README.zh-CN.md)
 
 ---
 

package/dist/index.js

@@ -2348,6 +2348,144 @@ function countOccurrences(haystack, needle) {
   }
   return count;
 }
+var COMPRESS_TOOL_NAME = "compress";
+var DECOMPRESS_TOOL_NAME = "decompress";
+var SEARCH_CONTEXT_TOOL_NAME = "search_context";
+var ACP_STATUS_TOOL_NAME = "acp_status";
+var COMPRESS_TOOL = {
+  name: COMPRESS_TOOL_NAME,
+  description: "Replace a contiguous range of older conversation with a detailed summary you write. Use when content is genuinely consumed. Batch form: content=[{startId,endId,summary,topic?}]. REQUIRED \u2014 compress without content is invalid.",
+  input_schema: {
+    type: "object",
+    properties: {
+      topic: { type: "string", description: "Optional short title for the compressed range" },
+      content: {
+        type: "array",
+        description: "One or more ranges to compress into separate summary blocks",
+        items: {
+          type: "object",
+          properties: {
+            topic: { type: "string" },
+            startId: { type: "string", description: "mNNNNN ref at the start of the range" },
+            endId: { type: "string", description: "mNNNNN ref at the end of the range" },
+            summary: { type: "string", description: "Self-contained summary replacing the range" }
+          },
+          required: ["startId", "endId", "summary"]
+        }
+      }
+    },
+    required: ["content"]
+  }
+};
+var COMPRESS_TOOL_OPENAI = {
+  type: "function",
+  function: {
+    name: COMPRESS_TOOL_NAME,
+    description: COMPRESS_TOOL.description,
+    parameters: {
+      type: "object",
+      properties: {
+        topic: { type: "string", description: "Optional short title for the compressed range" },
+        content: {
+          type: "array",
+          description: "One or more ranges to compress into separate summary blocks. REQUIRED \u2014 compress without content is invalid.",
+          items: {
+            type: "object",
+            properties: {
+              topic: { type: "string" },
+              startId: { type: "string", description: "mNNNNN ref at the start of the range" },
+              endId: { type: "string", description: "mNNNNN ref at the end of the range" },
+              summary: { type: "string", description: "Self-contained summary replacing the range" }
+            },
+            required: ["startId", "endId", "summary"]
+          }
+        }
+      },
+      required: ["content"]
+    }
+  }
+};
+var DECOMPRESS_TOOL_OPENAI = {
+  type: "function",
+  function: {
+    name: DECOMPRESS_TOOL_NAME,
+    description: "Restores previously compressed content. Use when you need exact details lost in compression. By default restores one tier up. Use full:true for all the way to original messages. Use toFile to write to file instead of inflating context.",
+    parameters: {
+      type: "object",
+      properties: {
+        blockId: { type: "string", description: "Block ID to decompress (e.g. b5)" },
+        toFile: { type: "string", description: "Optional: write content to file instead of context" },
+        full: { type: "boolean", description: "Restore all the way to original messages" }
+      },
+      required: ["blockId"]
+    }
+  }
+};
+var SEARCH_CONTEXT_TOOL_OPENAI = {
+  type: "function",
+  function: {
+    name: SEARCH_CONTEXT_TOOL_NAME,
+    description: "Search through compressed block summaries by keyword. Use BEFORE decompressing to find the right block.",
+    parameters: {
+      type: "object",
+      properties: {
+        query: { type: "string", description: "Search query" },
+        limit: { type: "number", description: "Max results (default 5)" }
+      },
+      required: ["query"]
+    }
+  }
+};
+var ACP_STATUS_TOOL_OPENAI = {
+  type: "function",
+  function: {
+    name: ACP_STATUS_TOOL_NAME,
+    description: "Show context usage and compressible ranges. No args = overview. Use to find what to compress next.",
+    parameters: {
+      type: "object",
+      properties: {}
+    }
+  }
+};
+var DECOMPRESS_TOOL = {
+  name: DECOMPRESS_TOOL_NAME,
+  description: DECOMPRESS_TOOL_OPENAI.function.description,
+  input_schema: DECOMPRESS_TOOL_OPENAI.function.parameters
+};
+var SEARCH_CONTEXT_TOOL = {
+  name: SEARCH_CONTEXT_TOOL_NAME,
+  description: SEARCH_CONTEXT_TOOL_OPENAI.function.description,
+  input_schema: SEARCH_CONTEXT_TOOL_OPENAI.function.parameters
+};
+var ACP_STATUS_TOOL = {
+  name: ACP_STATUS_TOOL_NAME,
+  description: ACP_STATUS_TOOL_OPENAI.function.description,
+  input_schema: ACP_STATUS_TOOL_OPENAI.function.parameters
+};
+var COMPRESS_TOOL_RESPONSES = {
+  type: "function",
+  name: COMPRESS_TOOL_NAME,
+  description: COMPRESS_TOOL.description,
+  parameters: COMPRESS_TOOL_OPENAI.function.parameters
+};
+var DECOMPRESS_TOOL_RESPONSES = {
+  type: "function",
+  name: DECOMPRESS_TOOL_OPENAI.function.name,
+  description: DECOMPRESS_TOOL_OPENAI.function.description,
+  parameters: DECOMPRESS_TOOL_OPENAI.function.parameters
+};
+var SEARCH_CONTEXT_TOOL_RESPONSES = {
+  type: "function",
+  name: SEARCH_CONTEXT_TOOL_OPENAI.function.name,
+  description: SEARCH_CONTEXT_TOOL_OPENAI.function.description,
+  parameters: SEARCH_CONTEXT_TOOL_OPENAI.function.parameters
+};
+var ACP_STATUS_TOOL_RESPONSES = {
+  type: "function",
+  name: ACP_STATUS_TOOL_OPENAI.function.name,
+  description: ACP_STATUS_TOOL_OPENAI.function.description,
+  parameters: ACP_STATUS_TOOL_OPENAI.function.parameters
+};
 function parseBlockIdArg(arg) {
   const normalized = arg.trim().toLowerCase();
   const refMatch = /^b0*(\d+)$/.exec(normalized);
@@ -3529,6 +3667,7 @@ When context usage passes a threshold, the system appends a breakdown showing wh
 
 // node_modules/acp-kernel/dist/wire/index.js
 import { createHash as createHash2 } from "crypto";
+import { createHash as createHash22 } from "crypto";
 function hashId(s) {
   return createHash2("sha256").update(s, "utf8").digest("hex").slice(0, 16);
 }
@@ -4359,12 +4498,6 @@ function mirrorResponsesToCore(view, systemText) {
   });
   return msgs;
 }
-
-// src/messages.ts
-import { createHash as createHash3 } from "crypto";
-var REF_TAG_SOURCE = "(?:<acp\\s[^>]*>m\\d+</acp>|\\[m\\d+\\])";
-var REF_TAG = new RegExp(`^${REF_TAG_SOURCE}\\s?\\n?`);
-var TRAILING_REF_TAG = new RegExp(`\\n*${REF_TAG_SOURCE}\\s*$`);
 function compressToolArgs(call) {
   let args = call.arguments;
   if (typeof args === "string") {
@@ -4395,12 +4528,159 @@ function compressToolArgs(call) {
   const ia = inner;
   return Array.isArray(ia.content) ? { content: ia.content, topic: ia.topic, summaryMaxChars: ia.summaryMaxChars } : { content: [ia] };
 }
+function toolCallNames(msgs) {
+  const names = /* @__PURE__ */ new Map();
+  for (const m of msgs) {
+    if (m.contentType === "tool-call" && m.toolCallId && m.toolName) names.set(m.toolCallId, m.toolName);
+  }
+  return names;
+}
+function toolResultTextsCore(msgs) {
+  const results = /* @__PURE__ */ new Map();
+  for (const m of msgs) {
+    if (m.contentType !== "tool-result" || !m.toolCallId) continue;
+    results.set(m.toolCallId, m.text ?? "");
+  }
+  return results;
+}
+function findCompressCallsCore(msg) {
+  if (msg.contentType !== "tool-call" || !msg.toolName) return [];
+  const args = compressToolArgs({ name: msg.toolName, arguments: msg.text });
+  if (!args) return [];
+  const content = args.content;
+  if (!Array.isArray(content)) return [];
+  const ranges = [];
+  const callTopic = typeof args.topic === "string" ? args.topic : void 0;
+  for (const item of content) {
+    const r = item;
+    if (typeof r.startId !== "string" || typeof r.endId !== "string" || typeof r.summary !== "string" || r.summary.length === 0) continue;
+    ranges.push({
+      startRef: r.startId,
+      endRef: r.endId,
+      summary: r.summary,
+      topic: typeof r.topic === "string" ? r.topic : callTopic,
+      summaryMaxChars: typeof args.summaryMaxChars === "number" ? args.summaryMaxChars : void 0,
+      compressCallId: msg.toolCallId ?? ""
+    });
+  }
+  return ranges.length > 0 ? [{ id: msg.toolCallId ?? "", ranges }] : [];
+}
+function corePieceKey(cm) {
+  return `${cm.role}|${cm.contentType}|${cm.toolName ?? ""}|${(cm.text ?? "").slice(0, 4096)}`;
+}
+function spanFingerprintCore(coreMessages, startId, endId) {
+  const find = (id) => coreMessages.find((cm) => cm.id === id);
+  const first = find(startId);
+  const last = find(endId);
+  if (!first || !last) return "";
+  return createHash22("sha1").update(`${corePieceKey(first)}\0${corePieceKey(last)}`).digest("hex").slice(0, 8);
+}
+function spanFingerprintCoreIdx(coreMessages, startIdx, endIdx) {
+  const first = coreMessages[startIdx];
+  const last = coreMessages[endIdx];
+  if (!first || !last) return "";
+  return createHash22("sha1").update(`${corePieceKey(first)}\0${corePieceKey(last)}`).digest("hex").slice(0, 8);
+}
+function boundaryRawCore(ref, byRef, blocks, coreMessages, pick) {
+  const raw = byRef[ref];
+  if (raw) return raw;
+  const m = /^b(\d+)$/i.exec(ref.trim());
+  if (!m) return "";
+  const block = blocks.find((b) => b.blockId.toLowerCase() === `b${m[1]}`);
+  if (!block) return "";
+  const idx = (id) => coreMessages.findIndex((cm) => cm.id === (byRef[id] ?? id));
+  let best = -1;
+  for (const id of block.effectiveMessageIds) {
+    const i = idx(id);
+    if (i < 0) continue;
+    if (best < 0 || (pick === "min" ? i < best : i > best)) best = i;
+  }
+  return best < 0 ? "" : coreMessages[best]?.id ?? "";
+}
+function boundaryIndexCore(ref, byRef, blocks, coreMessages, pick, fallbackIdx = -1) {
+  const id = boundaryRawCore(ref, byRef, blocks, coreMessages, pick);
+  if (id) {
+    const i = coreMessages.findIndex((cm) => cm.id === id);
+    if (i >= 0) return i;
+  }
+  return fallbackIdx >= 0 && fallbackIdx < coreMessages.length ? fallbackIdx : -1;
+}
+function refOfPieceCore(coreMessages, idx, byRef) {
+  const id = coreMessages[idx]?.id;
+  if (!id) return "";
+  for (const [ref, mapped] of Object.entries(byRef)) if (mapped === id) return ref;
+  return "";
+}
+function staleRangeCore(r, rangeIndex, resultText, coreMessages, callIndex, byRef, blocks) {
+  const pm = resultText.match(/\[pos=([0-9,-]+)\]/);
+  const pair = pm ? pm[1].split(",")[rangeIndex] ?? "-" : "-";
+  const hinted = pair !== "-";
+  const [ps, pe] = pair === "-" ? ["", ""] : pair.split("-");
+  const fbStart = ps && ps !== "" ? Number.parseInt(ps, 10) : -1;
+  const fbEnd = pe && pe !== "" ? Number.parseInt(pe, 10) : -1;
+  const startRaw = boundaryRawCore(r.startRef, byRef, blocks, coreMessages, "min");
+  const endRaw = boundaryRawCore(r.endRef, byRef, blocks, coreMessages, "max");
+  const rawStartIdx = startRaw ? coreMessages.findIndex((cm) => cm.id === startRaw) : -1;
+  const rawEndIdx = endRaw ? coreMessages.findIndex((cm) => cm.id === endRaw) : -1;
+  const startIdx = rawStartIdx >= 0 ? rawStartIdx : fbStart >= 0 && fbStart < coreMessages.length ? fbStart : -1;
+  const endIdx = rawEndIdx >= 0 ? rawEndIdx : fbEnd >= 0 && fbEnd < coreMessages.length ? fbEnd : -1;
+  if (startIdx < 0 || endIdx < 0) {
+    if (!/^b\d+$/i.test(r.startRef.trim()) && !/^b\d+$/i.test(r.endRef.trim()))
+      return { reject: `unresolved ${r.startRef}..${r.endRef} -> ${startIdx}..${endIdx}`, ...hinted ? { hint: true } : {} };
+    return {};
+  }
+  if (endIdx > callIndex) return { reject: `end idx ${endIdx} > callIndex ${callIndex}`, ...hinted ? { hint: true } : {} };
+  const m = resultText.match(/\[fp=([0-9a-f,-]+)\]/);
+  if (m) {
+    const want = m[1].split(",")[rangeIndex];
+    if (want !== void 0 && want !== "-") {
+      const got = spanFingerprintCoreIdx(coreMessages, startIdx, endIdx);
+      if (want !== got) return { reject: `fp ${r.startRef}..${r.endRef} want ${want} got ${got} @${startIdx}..${endIdx}`, ...hinted ? { hint: true } : {} };
+    }
+  }
+  const remap = {};
+  if (/^m\d+$/i.test(r.startRef.trim()) && rawStartIdx < 0) {
+    const ref = refOfPieceCore(coreMessages, startIdx, byRef);
+    if (!ref) return { reject: `recovered ${r.startRef} @${startIdx} has no ref (protected piece)`, ...hinted ? { hint: true } : {} };
+    remap.startRef = ref;
+  }
+  if (/^m\d+$/i.test(r.endRef.trim()) && rawEndIdx < 0) {
+    const ref = refOfPieceCore(coreMessages, endIdx, byRef);
+    if (!ref) return { reject: `recovered ${r.endRef} @${endIdx} has no ref (protected piece)`, ...hinted ? { hint: true } : {} };
+    remap.endRef = ref;
+  }
+  if (!remap.startRef && !remap.endRef) return {};
+  return { remap, recovered: { pos: pair, startIdx, endIdx } };
+}
+function rangeFingerprintsCore(ranges, coreMessages, byRef, blocks) {
+  return ranges.map((r) => {
+    const start = boundaryRawCore(r.startRef, byRef, blocks, coreMessages, "min");
+    const end = start ? boundaryRawCore(r.endRef, byRef, blocks, coreMessages, "max") : "";
+    if (start && end) {
+      const fp = spanFingerprintCore(coreMessages, start, end);
+      if (fp.length > 0) return fp;
+    }
+    return "-";
+  });
+}
+function rangePositionsCore(ranges, coreMessages, byRef, blocks) {
+  return ranges.map((r) => {
+    const s = boundaryIndexCore(r.startRef, byRef, blocks, coreMessages, "min");
+    const e = s >= 0 ? boundaryIndexCore(r.endRef, byRef, blocks, coreMessages, "max") : -1;
+    return s >= 0 && e >= 0 ? `${s}-${e}` : "-";
+  });
+}
+
+// src/messages.ts
+import { createHash as createHash3 } from "crypto";
+var REF_TAG_SOURCE = "(?:<acp\\s[^>]*>m\\d+</acp>|\\[m\\d+\\])";
+var REF_TAG = new RegExp(`^${REF_TAG_SOURCE}\\s?\\n?`);
+var TRAILING_REF_TAG = new RegExp(`\\n*${REF_TAG_SOURCE}\\s*$`);
 function stripRefTag(text) {
   return text.replace(REF_TAG, "").replace(TRAILING_REF_TAG, "");
 }
 
 // src/wire-fold.ts
-import { createHash as createHash4 } from "crypto";
 function detectProviderWireFormat(payload) {
   const fmt2 = detectWireFormat(payload);
   if (fmt2 === "anthropic" || fmt2 === "openai" || fmt2 === "responses") return fmt2;
@@ -4565,148 +4845,6 @@ function coreIdentity(msg) {
     text: stripRefTag(msg.text ?? "")
   });
 }
-function toolCallNames(msgs) {
-  const names = /* @__PURE__ */ new Map();
-  for (const m of msgs) {
-    if (m.contentType === "tool-call" && m.toolCallId && m.toolName) names.set(m.toolCallId, m.toolName);
-  }
-  return names;
-}
-function toolResultTextsCore(msgs) {
-  const results = /* @__PURE__ */ new Map();
-  for (const m of msgs) {
-    if (m.contentType !== "tool-result" || !m.toolCallId) continue;
-    results.set(m.toolCallId, m.text ?? "");
-  }
-  return results;
-}
-function findCompressCallsCore(msg) {
-  if (msg.contentType !== "tool-call" || !msg.toolName) return [];
-  const args = compressToolArgs({ name: msg.toolName, arguments: msg.text });
-  if (!args) return [];
-  const content = args.content;
-  if (!Array.isArray(content)) return [];
-  const ranges = [];
-  const callTopic = typeof args.topic === "string" ? args.topic : void 0;
-  for (const item of content) {
-    const r = item;
-    if (typeof r.startId !== "string" || typeof r.endId !== "string" || typeof r.summary !== "string" || r.summary.length === 0) continue;
-    ranges.push({
-      startRef: r.startId,
-      endRef: r.endId,
-      summary: r.summary,
-      topic: typeof r.topic === "string" ? r.topic : callTopic,
-      summaryMaxChars: typeof args.summaryMaxChars === "number" ? args.summaryMaxChars : void 0,
-      compressCallId: msg.toolCallId ?? ""
-    });
-  }
-  return ranges.length > 0 ? [{ id: msg.toolCallId ?? "", ranges }] : [];
-}
-function corePieceKey(cm) {
-  return `${cm.role}|${cm.contentType}|${cm.toolName ?? ""}|${(cm.text ?? "").slice(0, 4096)}`;
-}
-function spanFingerprintCore(coreMessages, startId, endId) {
-  const find = (id) => coreMessages.find((cm) => cm.id === id);
-  const first = find(startId);
-  const last = find(endId);
-  if (!first || !last) return "";
-  return createHash4("sha1").update(`${corePieceKey(first)}\0${corePieceKey(last)}`).digest("hex").slice(0, 8);
-}
-function spanFingerprintCoreIdx(coreMessages, startIdx, endIdx) {
-  const first = coreMessages[startIdx];
-  const last = coreMessages[endIdx];
-  if (!first || !last) return "";
-  return createHash4("sha1").update(`${corePieceKey(first)}\0${corePieceKey(last)}`).digest("hex").slice(0, 8);
-}
-function boundaryRawCore(ref, byRef, blocks, coreMessages, pick) {
-  const raw = byRef[ref];
-  if (raw) return raw;
-  const m = /^b(\d+)$/i.exec(ref.trim());
-  if (!m) return "";
-  const block = blocks.find((b) => b.blockId.toLowerCase() === `b${m[1]}`);
-  if (!block) return "";
-  const idx = (id) => coreMessages.findIndex((cm) => cm.id === (byRef[id] ?? id));
-  let best = -1;
-  for (const id of block.effectiveMessageIds) {
-    const i = idx(id);
-    if (i < 0) continue;
-    if (best < 0 || (pick === "min" ? i < best : i > best)) best = i;
-  }
-  return best < 0 ? "" : coreMessages[best]?.id ?? "";
-}
-function boundaryIndexCore(ref, byRef, blocks, coreMessages, pick, fallbackIdx = -1) {
-  const id = boundaryRawCore(ref, byRef, blocks, coreMessages, pick);
-  if (id) {
-    const i = coreMessages.findIndex((cm) => cm.id === id);
-    if (i >= 0) return i;
-  }
-  return fallbackIdx >= 0 && fallbackIdx < coreMessages.length ? fallbackIdx : -1;
-}
-function refOfPieceCore(coreMessages, idx, byRef) {
-  const id = coreMessages[idx]?.id;
-  if (!id) return "";
-  for (const [ref, mapped] of Object.entries(byRef)) if (mapped === id) return ref;
-  return "";
-}
-function staleRangeCore(r, rangeIndex, resultText, coreMessages, callIndex, byRef, blocks) {
-  const pm = resultText.match(/\[pos=([0-9,-]+)\]/);
-  const pair = pm ? pm[1].split(",")[rangeIndex] ?? "-" : "-";
-  const hinted = pair !== "-";
-  const [ps, pe] = pair === "-" ? ["", ""] : pair.split("-");
-  const fbStart = ps && ps !== "" ? Number.parseInt(ps, 10) : -1;
-  const fbEnd = pe && pe !== "" ? Number.parseInt(pe, 10) : -1;
-  const startRaw = boundaryRawCore(r.startRef, byRef, blocks, coreMessages, "min");
-  const endRaw = boundaryRawCore(r.endRef, byRef, blocks, coreMessages, "max");
-  const rawStartIdx = startRaw ? coreMessages.findIndex((cm) => cm.id === startRaw) : -1;
-  const rawEndIdx = endRaw ? coreMessages.findIndex((cm) => cm.id === endRaw) : -1;
-  const startIdx = rawStartIdx >= 0 ? rawStartIdx : fbStart >= 0 && fbStart < coreMessages.length ? fbStart : -1;
-  const endIdx = rawEndIdx >= 0 ? rawEndIdx : fbEnd >= 0 && fbEnd < coreMessages.length ? fbEnd : -1;
-  if (startIdx < 0 || endIdx < 0) {
-    if (!/^b\d+$/i.test(r.startRef.trim()) && !/^b\d+$/i.test(r.endRef.trim()))
-      return { reject: `unresolved ${r.startRef}..${r.endRef} -> ${startIdx}..${endIdx}`, ...hinted ? { hint: true } : {} };
-    return {};
-  }
-  if (endIdx > callIndex) return { reject: `end idx ${endIdx} > callIndex ${callIndex}`, ...hinted ? { hint: true } : {} };
-  const m = resultText.match(/\[fp=([0-9a-f,-]+)\]/);
-  if (m) {
-    const want = m[1].split(",")[rangeIndex];
-    if (want !== void 0 && want !== "-") {
-      const got = spanFingerprintCoreIdx(coreMessages, startIdx, endIdx);
-      if (want !== got) return { reject: `fp ${r.startRef}..${r.endRef} want ${want} got ${got} @${startIdx}..${endIdx}`, ...hinted ? { hint: true } : {} };
-    }
-  }
-  const remap = {};
-  if (/^m\d+$/i.test(r.startRef.trim()) && rawStartIdx < 0) {
-    const ref = refOfPieceCore(coreMessages, startIdx, byRef);
-    if (!ref) return { reject: `recovered ${r.startRef} @${startIdx} has no ref (protected piece)`, ...hinted ? { hint: true } : {} };
-    remap.startRef = ref;
-  }
-  if (/^m\d+$/i.test(r.endRef.trim()) && rawEndIdx < 0) {
-    const ref = refOfPieceCore(coreMessages, endIdx, byRef);
-    if (!ref) return { reject: `recovered ${r.endRef} @${endIdx} has no ref (protected piece)`, ...hinted ? { hint: true } : {} };
-    remap.endRef = ref;
-  }
-  if (!remap.startRef && !remap.endRef) return {};
-  return { remap, recovered: { pos: pair, startIdx, endIdx } };
-}
-function rangeFingerprintsCore(ranges, coreMessages, byRef, blocks) {
-  return ranges.map((r) => {
-    const start = boundaryRawCore(r.startRef, byRef, blocks, coreMessages, "min");
-    const end = start ? boundaryRawCore(r.endRef, byRef, blocks, coreMessages, "max") : "";
-    if (start && end) {
-      const fp = spanFingerprintCore(coreMessages, start, end);
-      if (fp.length > 0) return fp;
-    }
-    return "-";
-  });
-}
-function rangePositionsCore(ranges, coreMessages, byRef, blocks) {
-  return ranges.map((r) => {
-    const s = boundaryIndexCore(r.startRef, byRef, blocks, coreMessages, "min");
-    const e = s >= 0 ? boundaryIndexCore(r.endRef, byRef, blocks, coreMessages, "max") : -1;
-    return s >= 0 && e >= 0 ? `${s}-${e}` : "-";
-  });
-}
 function toMirrorView(view) {
   const out = [];
   for (const message of view) {
@@ -4769,7 +4907,7 @@ function isViewFlip(foldedLen, lcp) {
 }
 function preserveCompressedSlot(prev) {
   const slot = freshSlot(prev);
-  slot.state = { ...slot.state, blocks: prev.state.blocks, messageRefs: prev.state.messageRefs, stats: prev.state.stats };
+  slot.state = { ...slot.state, blocks: prev.state.blocks, messageRefs: prev.state.messageRefs, stats: prev.state.stats, nextBlockId: prev.state.nextBlockId, nextRunId: prev.state.nextRunId };
   slot.appliedCallIds = new Set(prev.appliedCallIds);
   return slot;
 }
@@ -4832,6 +4970,14 @@ function createRuntime(adapter) {
       coreSlots.set(sid, slot);
       lcp = 0;
     }
+    if (lcp === 0 && slot.state.blocks.length > 0) {
+      const presentIds = new Set(stream.map((m) => m.id));
+      const surviving = slot.state.blocks.filter((b) => b.active === false || b.effectiveMessageIds.some((id) => presentIds.has(id)));
+      if (surviving.length < slot.state.blocks.length) {
+        debug.event("fold-purge-stale-blocks", { sid, before: slot.state.blocks.length, after: surviving.length });
+        slot.state = { ...slot.state, blocks: surviving };
+      }
+    }
     const coreMessages = stream;
     const config = configFor(ctx);
     const names = toolCallNames(stream);
@@ -4967,17 +5113,31 @@ ${acp}`);
       logInfo("fold", { sid, event: "fold-restore-empty" });
       return false;
     }
+    const byId = /* @__PURE__ */ new Map();
+    for (const b of r.state.blocks) {
+      const prev = byId.get(b.blockId);
+      if (!prev || b.createdAt > prev.createdAt) byId.set(b.blockId, b);
+    }
+    const blocks = [...byId.values()];
+    if (blocks.length < r.state.blocks.length) {
+      logInfo("fold", { sid, event: "fold-restore-dedup", before: r.state.blocks.length, after: blocks.length });
+    }
+    const maxId = blocks.reduce((m, b) => {
+      const n = /^b(\d+)$/i.exec(b.blockId);
+      return n ? Math.max(m, Number.parseInt(n[1], 10)) : m;
+    }, 0);
+    const state = { ...r.state, blocks, nextBlockId: Math.max(r.state.nextBlockId ?? 1, maxId + 1) };
     coreSlots.set(sid, {
       identities: r.identities,
       foldedLen: r.foldedLen,
       preview: false,
       live: true,
-      state: r.state,
+      state,
       coreMessages: r.coreMessages,
       appliedCallIds: r.appliedCallIds,
       rejectStreak: r.rejectStreak
     });
-    logInfo("fold", { sid, event: "fold-restore", blocks: r.state.blocks.length, foldedLen: r.foldedLen });
+    logInfo("fold", { sid, event: "fold-restore", blocks: state.blocks.length, foldedLen: r.foldedLen, nextBlockId: state.nextBlockId });
     return true;
   }
   function snapshotOf(slot) {
@@ -5780,7 +5940,7 @@ async function statusReport(runtime, ctx) {
   const coveredIds = collectCoveredMessageIds(state);
   const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: sentTokens });
-  const versionStr = "0.3.2" ? `billion-context-omp@${"0.3.2"}` : void 0;
+  const versionStr = "0.3.3" ? `billion-context-omp@${"0.3.3"}` : void 0;
   return buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -6131,7 +6291,7 @@ async function autoInstallLatest(latest, npmDirOverride) {
     logWarn("update", { event: "install-abort", reason: "npmroot-not-found", extDir });
     return "failed";
   }
-  const prevVersion = (await readPackageJson(join4(npmDir, "node_modules", PACKAGE_NAME, "package.json")))?.version ?? "0.3.2";
+  const prevVersion = (await readPackageJson(join4(npmDir, "node_modules", PACKAGE_NAME, "package.json")))?.version ?? "0.3.3";
   try {
     const keepAlive = setInterval(() => {
     }, 500);
@@ -6143,7 +6303,7 @@ async function autoInstallLatest(latest, npmDirOverride) {
       }
       const verify = await verifyInstall(npmDir, latest);
       if (!verify.ok) {
-        const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.3.2";
+        const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.3.3";
         logWarn("update", { event: "auto-install-verify-failed", latest, reason: verify.reason, rollbackTo });
         const rb = await runNpm(installArgs(rollbackTo), npmDir);
         logInfo("update", { event: "rollback", from: latest, to: rollbackTo, ok: rb.code === 0 });
@@ -6183,7 +6343,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.3.2";
+    const current = runtimeVersion ?? "0.3.3";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -6438,7 +6598,7 @@ function wireSessionLifecycle(pi, runtime) {
   pi.on("session_start", async (_event, ctx) => {
     const sid = ctx.sessionManager.getSessionId();
     const modelInfo = ctx.model;
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.3.2" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.3.3" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     if (!hostMeetsMinimum()) {
       logWarn("session", { event: "host-too-old", version: VERSION2, min: MIN_HOST_VERSION.join(".") });
       try {
@@ -6449,7 +6609,7 @@ function wireSessionLifecycle(pi, runtime) {
       }
     }
     const selfPath = import.meta.url;
-    const conflict = stampAndDetect(selfPath, true ? "0.3.2" : null);
+    const conflict = stampAndDetect(selfPath, true ? "0.3.3" : null);
     if (conflict) {
       logWarn("instance", { event: "dual-instance", self: selfPath, other: conflict.path, otherPid: conflict.pid, otherVersion: conflict.version });
       try {