billion-context-omp 0.2.8 → 0.3.0

package/dist/index.js

@@ -395,8 +395,13 @@ function resolveBoundaries(input) {
   input.messages.forEach(
     (message, index) => indexByRawId.set(message.id, index)
   );
-  let startIndex = resolveAnchorIndex(start, input.state, indexByRawId, "start");
-  let endIndex = resolveAnchorIndex(end, input.state, indexByRawId, "end");
+  let snappedBoundaries = [];
+  const startAnchor = resolveAnchorIndex(start, input.state, indexByRawId, "start");
+  if (startAnchor.snapped) snappedBoundaries.push(startAnchor.snapped);
+  const endAnchor = resolveAnchorIndex(end, input.state, indexByRawId, "end");
+  if (endAnchor.snapped) snappedBoundaries.push(endAnchor.snapped);
+  let startIndex = startAnchor.index;
+  let endIndex = endAnchor.index;
   if (startIndex > endIndex) {
     [startIndex, endIndex] = [endIndex, startIndex];
   }
@@ -424,7 +429,8 @@ function resolveBoundaries(input) {
     messageIds,
     nestedBlockIds,
     boundaryKind,
-    protectedGaps
+    protectedGaps,
+    snappedBoundaries
   };
 }
 function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
@@ -439,14 +445,21 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
       );
     }
     const index = indexByRawId.get(rawId);
-    if (index === void 0) {
-      throw new BoundaryNotFoundError(
-        "consumed",
-        endpoint,
-        `${label}="${boundary.raw}" not found in visible context (likely consumed by an existing block).`
-      );
+    if (index !== void 0) {
+      return { index, snapped: null };
     }
-    return index;
+    const owner2 = activeOwnerAnchor(state, [rawId], indexByRawId);
+    if (owner2 !== null) {
+      return {
+        index: owner2,
+        snapped: `${label}="${boundary.raw}" refers to a message already compressed into an active block \u2014 anchored to that block's summary instead.`
+      };
+    }
+    throw new BoundaryNotFoundError(
+      "consumed",
+      endpoint,
+      `${label}="${boundary.raw}" not found in visible context (likely consumed by an existing block).`
+    );
   }
   const block = blockById(state, `b${boundary.numericId}`);
   if (!block) {
@@ -456,6 +469,19 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
       `${label}="b${boundary.numericId}" does not exist in this session (typo or wrong session) \u2014 run acp_status for current refs.`
     );
   }
+  if (block.active) {
+    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
+    if (anchor !== null) {
+      return { index: anchor, snapped: null };
+    }
+  }
+  const owner = activeOwnerAnchor(state, block.effectiveMessageIds, indexByRawId);
+  if (owner !== null) {
+    return {
+      index: owner,
+      snapped: `${label}="b${boundary.numericId}" was consumed by a higher-tier block \u2014 anchored to the active block covering its content instead.`
+    };
+  }
   if (!block.active) {
     throw new BoundaryNotFoundError(
       "consumed",
@@ -463,15 +489,26 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
       `${label}="b${boundary.numericId}" not found in visible context (block distilled/consumed by a higher-tier block).`
     );
   }
-  const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
-  if (anchor === null) {
-    throw new BoundaryNotFoundError(
-      "consumed",
-      endpoint,
-      `${label}="b${boundary.numericId}" not found in visible context (block messages consumed by a higher-tier block).`
-    );
+  throw new BoundaryNotFoundError(
+    "consumed",
+    endpoint,
+    `${label}="b${boundary.numericId}" not found in visible context (block messages consumed by a higher-tier block).`
+  );
+}
+function activeOwnerAnchor(state, ownedIds, indexByRawId) {
+  if (ownedIds.length === 0) return null;
+  const owned = new Set(ownedIds);
+  let best = null;
+  for (const block of state.blocks) {
+    if (!block.active) continue;
+    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
+    if (anchor === null) continue;
+    const ownsContent = block.effectiveMessageIds.some((id) => owned.has(id));
+    if (ownsContent && (best === null || anchor < best)) {
+      best = anchor;
+    }
   }
-  return anchor;
+  return best;
 }
 function formatPaddedRef(index) {
   return `m${String(index).padStart(5, "0")}`;
@@ -1092,6 +1129,10 @@ function runPipeline(nodes, initial, ctx) {
 function rangeError(spec, message) {
   return `range ${spec.startRef}..${spec.endRef}: ${message}`;
 }
+function numericBlockId(id) {
+  const parsed = /^b(\d+)$/.exec(id);
+  return parsed ? Number(parsed[1]) : 0;
+}
 function createCore(ports = {}) {
   const countTokens = ports.countTokens ?? defaultCountTokens;
   function applyCompression(input) {
@@ -1137,6 +1178,12 @@ function createCore(ports = {}) {
         }
       }
     }
+    let resolvableCount = 0;
+    let unknownCount = 0;
+    for (const resolution of classifications.values()) {
+      if (resolution.status === "ok") resolvableCount++;
+      else if (resolution.status === "unknown") unknownCount++;
+    }
     const rangeIndexSets = [];
     for (const [spec, resolution] of classifications) {
       if (resolution.status !== "ok") continue;
@@ -1181,7 +1228,9 @@ function createCore(ports = {}) {
         }
       }
       if (!hasBlockBoundaryRange && totalRangeChars < input.config.compress.minCompressRange) {
-        const gateMessage = consumedRanges.length > 0 ? `Requested range(s) already compressed (e.g. ${consumedRanges[0].startRef}..${consumedRanges[0].endRef}); remaining compressible content ${totalRangeChars} chars < min ${input.config.compress.minCompressRange}. Nothing to do \u2014 run acp_status to see current compressible ranges.` : `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.`;
+        const live = activeBlocks(state).map((b) => b.blockId).sort((x, y) => numericBlockId(x) - numericBlockId(y));
+        const liveHint = live.length > 0 ? ` Current active blocks span ${live[0]}..${live[live.length - 1]} \u2014 retry with startId/endId set to active block IDs in that span.` : "";
+        const gateMessage = resolvableCount === 0 && consumedRanges.length === 0 && unknownCount > 0 ? `None of the ${input.ranges.length} requested range(s) resolved \u2014 every ref failed with "does not exist in this session". Refs recorded before an earlier compress are stale: each successful compress renumbers the remaining refs. Run acp_status, then re-issue the compress in the same turn using only the refs it reports.` : consumedRanges.length > 0 ? `Requested range(s) already compressed (e.g. ${consumedRanges[0].startRef}..${consumedRanges[0].endRef}); remaining compressible content ${totalRangeChars} chars < min ${input.config.compress.minCompressRange}. Nothing to do.${liveHint}` : `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.`;
         return {
           state: input.state,
           result: {
@@ -1207,6 +1256,7 @@ function createCore(ports = {}) {
         errors.push(rangeError(spec, resolution.error.message));
         continue;
       }
+      warnings.push(...resolution.resolved.snappedBoundaries);
       try {
         const outcome = applySingleRange({
           spec,
@@ -2422,24 +2472,6 @@ function renderCompressedDrilldown(blocks, state, sort, limit, countTokens) {
   }
   return lines.join("\n");
 }
-var substringAlgorithm = {
-  name: "substring",
-  description: "Exact substring counting (original baseline). Predictable, no normalization.",
-  score(docs, query) {
-    const terms = query.toLowerCase().trim().split(/\s+/).filter((t) => t.length > 0);
-    if (terms.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
-    return docs.map((d) => {
-      const haystack = d.text.toLowerCase();
-      let score = 0;
-      for (const term of terms) score += countOccurrences2(haystack, term);
-      return { ref: d.ref, score };
-    });
-  }
-};
-function countOccurrences2(haystack, needle) {
-  if (!needle) return 0;
-  return haystack.split(needle).length - 1;
-}
 function stem(word) {
   let w = word;
   if (w.length <= 3) return w;
@@ -2458,8 +2490,17 @@ function stem(word) {
   return w;
 }
 var CJK = /[\u3400-\u9fff\uf900-\ufaff\u3040-\u30ff\uac00-\ud7af]/;
-var CJK_RUN = new RegExp(`${CJK.source}+`, "g");
 var LATIN_WORD = /[a-z][a-z0-9_]*[a-z0-9]|[a-z0-9]/g;
+var cjkSegmenter = new Intl.Segmenter("zh", { granularity: "word" });
+function cjkRunTokens(segs) {
+  const words = segs.filter((w) => w.length >= 2);
+  if (words.length > 0) return words;
+  const run = segs.join("");
+  const out = [];
+  for (let i = 0; i < run.length - 1; i++) out.push(run.slice(i, i + 2));
+  for (const ch of run) out.push(ch);
+  return out;
+}
 function tokenize(text, opts = {}) {
   const lower = text.toLowerCase();
   const tokens = [];
@@ -2470,15 +2511,23 @@ function tokenize(text, opts = {}) {
       tokens.push(w);
     }
   }
-  const cjkRuns = lower.match(CJK_RUN) ?? [];
-  for (const run of cjkRuns) {
-    if (run.length === 1) {
-      tokens.push(run);
-    } else {
-      for (let i = 0; i < run.length - 1; i++) tokens.push(run.slice(i, i + 2));
-      for (const ch of run) tokens.push(ch);
+  if (!CJK.test(lower)) return tokens;
+  const runSegs = [];
+  let cur = null;
+  for (const s of cjkSegmenter.segment(lower)) {
+    const t = s.segment;
+    if (t.length === 0) continue;
+    if (CJK.test(t)) {
+      (cur ??= []).push(t);
+    } else if (cur) {
+      runSegs.push(cur);
+      cur = null;
     }
   }
+  if (cur) runSegs.push(cur);
+  for (const segs of runSegs) {
+    tokens.push(...cjkRunTokens(segs));
+  }
   return tokens;
 }
 function charBigrams(text) {
@@ -2494,6 +2543,50 @@ function tfMap(text, stem22) {
   for (const t of tokenize(text, { stem: stem22 })) m.set(t, (m.get(t) ?? 0) + 1);
   return m;
 }
+var DEFAULT_CAP_CHARS = 8 * 1024 * 1024;
+var capChars = DEFAULT_CAP_CHARS;
+var cache = /* @__PURE__ */ new Map();
+var cachedChars = 0;
+function build(text) {
+  const tf = tfMap(text, true);
+  let len = 0;
+  for (const v of tf.values()) len += v;
+  const lower = text.toLowerCase();
+  return { tf, len, lower, grams: new Set(charBigrams(lower)) };
+}
+function docFeatures(text) {
+  const hit = cache.get(text);
+  if (hit) return hit;
+  const f = build(text);
+  if (text.length > 0 && text.length <= capChars) {
+    while (cachedChars + text.length > capChars && cache.size > 0) {
+      const k = cache.keys().next().value;
+      cachedChars -= k.length;
+      cache.delete(k);
+    }
+    cache.set(text, f);
+    cachedChars += text.length;
+  }
+  return f;
+}
+var substringAlgorithm = {
+  name: "substring",
+  description: "Exact substring counting (original baseline). Predictable, no normalization.",
+  score(docs, query) {
+    const terms = query.toLowerCase().trim().split(/\s+/).filter((t) => t.length > 0);
+    if (terms.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
+    return docs.map((d) => {
+      const haystack = docFeatures(d.text).lower;
+      let score = 0;
+      for (const term of terms) score += countOccurrences2(haystack, term);
+      return { ref: d.ref, score };
+    });
+  }
+};
+function countOccurrences2(haystack, needle) {
+  if (!needle) return 0;
+  return haystack.split(needle).length - 1;
+}
 var bm25Algorithm = {
   name: "bm25",
   description: "BM25 with stemming + CJK bigram tokenization. IR-standard relevance ranking.",
@@ -2502,11 +2595,8 @@ var bm25Algorithm = {
     const k1 = 1.2;
     const b = 0.75;
     const parsed = docs.map((d) => {
-      const text = d.text;
-      const tf = tfMap(text, true);
-      let len = 0;
-      for (const v of tf.values()) len += v;
-      return { id: d.ref, tf, len };
+      const f = docFeatures(d.text);
+      return { id: d.ref, tf: f.tf, len: f.len };
     });
     const avgdl = parsed.reduce((s, d) => s + d.len, 0) / (N || 1);
     const qTerms = tokenize(query, { stem: true });
@@ -2533,14 +2623,13 @@ var fuzzyAlgorithm = {
   name: "fuzzy",
   description: "Character bigram overlap. Typo-tolerant, script-agnostic, high recall.",
   score(docs, query) {
-    const qTokens = query.toLowerCase().split(/[\s,]+/).filter((t) => t.length >= 4);
+    const qTokens = query.toLowerCase().split(/[\s,]+/).filter((t) => t.length >= 4 || t.length >= 2 && CJK.test(t));
     if (qTokens.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
     const qGrams = /* @__PURE__ */ new Set();
     for (const t of qTokens) for (const g of charBigrams(t)) qGrams.add(g);
     if (qGrams.size === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
     return docs.map((d) => {
-      const haystack = d.text.toLowerCase();
-      const docGrams = new Set(charBigrams(haystack));
+      const docGrams = docFeatures(d.text).grams;
       let hits = 0;
       for (const g of qGrams) if (docGrams.has(g)) hits++;
       return { ref: d.ref, score: hits / qGrams.size };
@@ -2916,6 +3005,27 @@ function resolveTransformMode(adapter, model, hostVersion = VERSION) {
   if (api === "openai-completions" && hostVersionAtLeast(OPENAI_COMPLETIONS_VIABLE_FROM, hostVersion)) return "provider";
   return "context";
 }
+function providerDeliveryWarning(adapter, model, hostVersion = VERSION) {
+  if (adapter.transformMode !== "provider") return void 0;
+  const api = model?.api;
+  const dropWarning = (target) => ({
+    key: `drop:${target}`,
+    reason: `host < 17.3.8 drops the before_provider_request replacement on ${target} (fixed upstream pi-ai 17.3.8, can1357/oh-my-pi#8717)`,
+    message: `\u26A0 billion-context-omp: transformMode "provider" is set, but this host (pi-ai < 17.3.8) discards the rewritten payload on ${target} \u2014 compression is NOT applied. Upgrade the host (omp update) or remove the transformMode override.`
+  });
+  if (api === "openai-completions" && !hostVersionAtLeast(OPENAI_COMPLETIONS_VIABLE_FROM, hostVersion)) {
+    return dropWarning(api);
+  }
+  if (api === "amazon-bedrock" || api === "cursor") {
+    if (!hostVersionAtLeast(OPENAI_COMPLETIONS_VIABLE_FROM, hostVersion)) return dropWarning(api);
+    return {
+      key: `nocodec:${api}`,
+      reason: `${api} honors the replacement from 17.3.8 but its wire body has no codec path yet (issue #83)`,
+      message: `\u26A0 billion-context-omp: transformMode "provider" is set, but the ${api} wire body has no codec path yet (#83) \u2014 compression is NOT applied. Remove the transformMode override to use context mode.`
+    };
+  }
+  return void 0;
+}
 
 // node_modules/acp-kernel/dist/wire/index.js
 import { createHash } from "crypto";
@@ -3099,14 +3209,17 @@ function openaiToCore(body) {
       }
       case "user": {
         const text = stringContent(m.content);
-        const img = firstImagePart(m.content);
+        const imgs = allImageParts(m.content);
+        const firstImg = imgs[0];
+        const firstUrl = firstImg ? firstImg.image_url.url : void 0;
+        const firstParsed = firstUrl ? parseDataUrl(firstUrl) : void 0;
         const base = deriveMessageId("user", "text", text);
         msgs.push({
           id: clusters.next(base),
           role: "user",
           contentType: "text",
           text,
-          ...img ? { rawOpenaiContent: img.part, imageMediaType: img.mediaType, imageBase64: img.base64 } : {}
+          ...imgs.length === 1 && firstParsed ? { rawOpenaiContent: imgs[0], imageMediaType: firstParsed.mediaType, imageBase64: firstParsed.base64 } : imgs.length > 1 ? { rawOpenaiContentParts: imgs } : {}
         });
         break;
       }
@@ -3201,10 +3314,12 @@ function coreToOpenai(messages) {
       if (m.role === "system") {
         out.push({ role: m.originalRole === "developer" ? "developer" : "system", content: m.text ?? "" });
       } else if (m.role === "user") {
-        if (m.rawOpenaiContent || m.imageBase64) {
+        if (m.rawOpenaiContent || m.imageBase64 || m.rawOpenaiContentParts) {
           const parts = [];
           if (m.text) parts.push({ type: "text", text: m.text });
-          if (m.rawOpenaiContent) {
+          if (m.rawOpenaiContentParts && m.rawOpenaiContentParts.length > 0) {
+            for (const part of m.rawOpenaiContentParts) parts.push(part);
+          } else if (m.rawOpenaiContent) {
             parts.push(m.rawOpenaiContent);
           } else if (m.imageBase64 && m.imageMediaType) {
             parts.push({ type: "image_url", image_url: { url: `data:${m.imageMediaType};base64,${m.imageBase64}` } });
@@ -3229,19 +3344,17 @@ function stringContent(content) {
   }
   return "";
 }
-function firstImagePart(content) {
-  if (!Array.isArray(content)) return void 0;
+function allImageParts(content) {
+  if (!Array.isArray(content)) return [];
+  const out = [];
   for (const p of content) {
-    if (p && typeof p === "object" && p.type === "image_url") {
-      const iu = p.image_url;
-      const url = iu?.url;
-      if (typeof url === "string") {
-        const parsed = parseDataUrl(url);
-        if (parsed) return { part: p, mediaType: parsed.mediaType, base64: parsed.base64 };
-      }
-    }
+    if (typeof p !== "object" || p === null) continue;
+    if (!("type" in p) || p.type !== "image_url" || !("image_url" in p)) continue;
+    const imagePart = p;
+    const url = imagePart.image_url.url;
+    if (typeof url === "string" && parseDataUrl(url)) out.push(p);
   }
-  return void 0;
+  return out;
 }
 function createSubagentNamespaces() {
   const anchors = /* @__PURE__ */ new Map();
@@ -3307,6 +3420,22 @@ function toolResultTexts(stream) {
   }
   return results;
 }
+function lastRejectedCompressPair(stream) {
+  for (let i = stream.length - 1; i >= 0; i--) {
+    const m = stream[i];
+    if (m.role !== "toolResult" || m.toolName !== "compress" || !m.toolCallId) continue;
+    if (!extractText(m.content).includes("No changes applied")) continue;
+    for (let j = stream.length - 1; j >= 0; j--) {
+      if (j === i) continue;
+      const c = stream[j];
+      if (c.role !== "assistant") continue;
+      if (!allToolCalls(c.content).some((call) => call.id === m.toolCallId && compressToolArgs(call))) continue;
+      return [stream[j], stream[i]];
+    }
+    return null;
+  }
+  return null;
+}
 function findCompressCalls(message) {
   const out = [];
   for (const call of allToolCalls(message.content)) {
@@ -3725,10 +3854,16 @@ function unrepresentableOpenaiMessage(message) {
   if (typeof role !== "string" || !OPENAI_CODEC_ROLES.has(role)) {
     return `openai role ${JSON.stringify(role) ?? "missing"}`;
   }
+  for (const field of ["function_call", "audio", "annotations"]) {
+    if (message[field] !== void 0) {
+      return `openai ${field} field is dropped by the rebuild`;
+    }
+  }
+  const refusal = message.refusal;
+  if (refusal !== null && refusal !== void 0) return "openai refusal content is dropped by the rebuild";
   const content = message.content;
   if (content == null || typeof content === "string") return null;
   if (!Array.isArray(content)) return "content neither string nor part array";
-  let dataImages = 0;
   for (const part of content) {
     if (typeof part === "string") continue;
     const type5 = part?.type;
@@ -3736,13 +3871,45 @@ function unrepresentableOpenaiMessage(message) {
     if (type5 === "image_url" && role === "user") {
       const url = part?.image_url?.url;
       if (typeof url !== "string" || !url.startsWith("data:")) return "image_url without a data: URL is dropped";
-      if (++dataImages > 1) return "second image_url in one message is dropped";
       continue;
     }
     return `openai content part type ${JSON.stringify(type5) ?? "missing"}`;
   }
   return null;
 }
+function restoreOpenaiWireFidelity(originalMessages, rebuilt) {
+  const detailsByCall = /* @__PURE__ */ new Map();
+  for (const message of originalMessages) {
+    if (message === null || typeof message !== "object") continue;
+    const calls = message.tool_calls;
+    const details = message.reasoning_details;
+    if (!Array.isArray(calls) || !Array.isArray(details) || details.length === 0) continue;
+    for (const call of calls) {
+      const id = call?.id;
+      if (typeof id === "string" && !detailsByCall.has(id)) detailsByCall.set(id, details);
+    }
+  }
+  return rebuilt.map((message) => {
+    if (message === null || typeof message !== "object") return message;
+    const m = message;
+    if (m.role !== "assistant") return message;
+    const calls = Array.isArray(m.tool_calls) ? m.tool_calls : [];
+    const attached = [];
+    for (const call of calls) {
+      const id = call?.id;
+      if (typeof id !== "string") continue;
+      const d = detailsByCall.get(id);
+      if (d) attached.push(...d);
+    }
+    const hasReasoningField = m.reasoning_content !== void 0 || m.reasoning !== void 0 || m.reasoning_text !== void 0;
+    const emptyContent = m.content === null && (calls.length > 0 || hasReasoningField);
+    if (attached.length === 0 && !emptyContent) return message;
+    const out = { ...m };
+    if (emptyContent) out.content = "";
+    if (attached.length > 0) out.reasoning_details = attached;
+    return out;
+  });
+}
 var renderRefsAll = createRenderRefsNode("all");
 function applyWireTagContract(msgs, state, scope) {
   const stripAssistantTags = (m) => m.contentType === "text" && m.role === "assistant" ? { ...m, text: stripRefTag(m.text ?? "") } : m;
@@ -3783,6 +3950,18 @@ function toolResultTextsCore(msgs) {
   }
   return results;
 }
+function lastRejectedPairCore(msgs) {
+  const names = toolCallNames(msgs);
+  for (let i = msgs.length - 1; i >= 0; i--) {
+    const m = msgs[i];
+    if (m.contentType !== "tool-result" || !m.toolCallId) continue;
+    if (!(m.text ?? "").includes("No changes applied")) continue;
+    if (names.get(m.toolCallId) !== "compress") continue;
+    const call = msgs.find((c) => c.contentType === "tool-call" && c.toolCallId === m.toolCallId);
+    return call ? [call, m] : null;
+  }
+  return null;
+}
 function findCompressCallsCore(msg) {
   if (msg.contentType !== "tool-call" || !msg.toolName) return [];
   const args = compressToolArgs({ name: msg.toolName, arguments: msg.text });
@@ -3901,22 +4080,23 @@ function viewToCoreStream(view, systemText) {
       if (text) messages.push({ role: "user", content: text });
     } else if (m.role === "assistant") {
       const blocks = Array.isArray(m.content) ? m.content : [];
-      const calls = blocks.filter(
-        (b) => b !== null && typeof b === "object" && b.type === "toolCall"
-      );
+      const typed = blocks;
+      const calls = typed.filter((b) => b !== null && typeof b === "object" && b.type === "toolCall");
+      const reasoning = typed.filter((b) => b !== null && typeof b === "object" && b.type === "thinking" && typeof b.thinking === "string" && b.thinking.trim().length > 0).map((b) => b.thinking).join("\n");
       const text = extractViewText(m.content);
       if (calls.length > 0) {
         messages.push({
           role: "assistant",
           content: text,
+          ...reasoning ? { reasoning_content: reasoning } : {},
           tool_calls: calls.map((c) => ({
             id: c.id,
             type: "function",
             function: { name: c.name ?? "", arguments: JSON.stringify(c.arguments ?? {}) }
           }))
         });
-      } else if (text) {
-        messages.push({ role: "assistant", content: text });
+      } else if (text || reasoning) {
+        messages.push({ role: "assistant", content: text, ...reasoning ? { reasoning_content: reasoning } : {} });
       }
     } else if (m.role === "toolResult") {
       messages.push({ role: "tool", tool_call_id: m.toolCallId ?? "", content: extractViewText(m.content) });
@@ -3937,20 +4117,27 @@ function viewToAnthropicCore(view) {
       if (text) messages.push({ role: "user", content: [{ type: "text", text }] });
     } else if (m.role === "assistant") {
       const blocks = Array.isArray(m.content) ? m.content : [];
-      const calls = blocks.filter(
-        (b) => b !== null && typeof b === "object" && b.type === "toolCall"
-      );
-      const text = extractViewText(m.content);
+      const typed = blocks;
       const content = [];
-      if (text) content.push({ type: "text", text });
-      for (const c of calls) {
-        let input = {};
-        try {
-          input = c.arguments && typeof c.arguments === "object" ? c.arguments : JSON.parse(JSON.stringify(c.arguments ?? {}));
-        } catch {
-          input = {};
+      for (const b of typed) {
+        if (b === null || typeof b !== "object") continue;
+        if (b.type === "thinking" && typeof b.thinking === "string" && b.thinking.trim().length > 0) {
+          content.push({
+            type: "thinking",
+            thinking: b.thinking,
+            ...typeof b.thinkingSignature === "string" && b.thinkingSignature ? { signature: b.thinkingSignature } : {}
+          });
+        } else if (b.type === "text" && typeof b.text === "string" && stripRefTag(b.text).trim().length > 0) {
+          content.push({ type: "text", text: stripRefTag(b.text) });
+        } else if (b.type === "toolCall") {
+          let input = {};
+          try {
+            input = b.arguments && typeof b.arguments === "object" ? b.arguments : JSON.parse(JSON.stringify(b.arguments ?? {}));
+          } catch {
+            input = {};
+          }
+          content.push({ type: "tool_use", id: b.id, name: b.name ?? "", input });
         }
-        content.push({ type: "tool_use", id: c.id, name: c.name ?? "", input });
       }
       if (content.length > 0) messages.push({ role: "assistant", content });
     } else if (m.role === "toolResult") {
@@ -4263,6 +4450,9 @@ ${acp}`);
     slot.rejectStreak = ok ? 0 : slot.rejectStreak + 1;
     return slot.rejectStreak;
   }
+  function rejectStreakFor(ctx) {
+    return slotForMode(ctx, sidOf(ctx)).rejectStreak;
+  }
   return {
     core,
     get adapter() {
@@ -4285,6 +4475,7 @@ ${acp}`);
     commitFoldState,
     recordRebuiltOutput,
     noteCompressOutcome,
+    rejectStreakFor,
     forgetSession,
     primeFold,
     acquireLock
@@ -5096,7 +5287,7 @@ function stem2(word) {
   return w;
 }
 var CJK2 = /[\u3400-\u9fff\uf900-\ufaff\u3040-\u30ff\uac00-\ud7af]/;
-var CJK_RUN2 = new RegExp(`${CJK2.source}+`, "g");
+var CJK_RUN = new RegExp(`${CJK2.source}+`, "g");
 var LATIN_WORD2 = /[a-z][a-z0-9_]*[a-z0-9]|[a-z0-9]/g;
 function tokenize2(text, opts = {}) {
   const lower = text.toLowerCase();
@@ -5108,7 +5299,7 @@ function tokenize2(text, opts = {}) {
       tokens.push(w);
     }
   }
-  const cjkRuns = lower.match(CJK_RUN2) ?? [];
+  const cjkRuns = lower.match(CJK_RUN) ?? [];
   for (const run of cjkRuns) {
     if (run.length === 1) {
       tokens.push(run);
@@ -5472,7 +5663,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.2.8" ? `billion-context-omp@${"0.2.8"}` : void 0;
+  const versionStr = "0.3.0" ? `billion-context-omp@${"0.3.0"}` : void 0;
   return buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -5637,7 +5828,7 @@ function stampAndDetect(selfPath, version, now = Date.now()) {
 }
 
 // src/update.ts
-import { readFile, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
+import { readFile, writeFile as writeFile2, mkdir as mkdir2, access } from "fs/promises";
 import { join as join4, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 import { execFile } from "child_process";
@@ -5703,43 +5894,112 @@ async function findExtensionDir() {
     dir = parent;
   }
 }
-async function autoInstallLatest(latest) {
+var runNpmImpl = (args, cwd) => new Promise((resolve2) => {
+  execFile(
+    "npm",
+    args,
+    { cwd, timeout: 6e4, shell: process.platform === "win32", maxBuffer: 4 * 1024 * 1024 },
+    (err, stdout, stderr) => {
+      if (err) logWarn("update", { event: "install-exec-failed", error: err.message, stderr: String(stderr).slice(0, 300) });
+      resolve2({ code: err ? 1 : 0, stdout: String(stdout), stderr: String(stderr) });
+    }
+  );
+});
+var runNpm = runNpmImpl;
+var runNodeImpl = (args) => new Promise((resolve2) => {
+  execFile(
+    process.execPath,
+    args,
+    { timeout: 15e3, maxBuffer: 4 * 1024 * 1024, shell: false },
+    (err, stdout, stderr) => {
+      resolve2({ code: err ? 1 : 0, stdout: String(stdout), stderr: String(stderr) });
+    }
+  );
+});
+var runNode = runNodeImpl;
+function declaredEntries(pkg) {
+  const entries = /* @__PURE__ */ new Set();
+  for (const ext of pkg.omp?.extensions ?? []) {
+    if (typeof ext === "string") entries.add(ext);
+  }
+  const dot = pkg.exports?.["."];
+  if (typeof dot === "string") entries.add(dot);
+  else if (dot && typeof dot.import === "string") entries.add(dot.import);
+  if (typeof pkg.main === "string") entries.add(pkg.main);
+  return [...entries];
+}
+async function verifyInstall(npmDir, latest) {
+  const extDir = join4(npmDir, "node_modules", PACKAGE_NAME);
+  const pkg = await readPackageJson(join4(extDir, "package.json"));
+  if (!pkg) return { ok: false, reason: "package-json-missing" };
+  if (pkg.version !== latest) return { ok: false, reason: `version-mismatch:${pkg.version ?? "none"}` };
+  const entries = declaredEntries(pkg);
+  if (entries.length === 0) return { ok: false, reason: "no-entry-declared" };
+  for (const rel of entries) {
+    try {
+      await access(join4(extDir, rel));
+    } catch {
+      return { ok: false, reason: `entry-missing:${rel}` };
+    }
+  }
+  const smokeEntry = pkg.omp?.extensions?.[0] ?? entries[0];
+  if (!smokeEntry) return { ok: false, reason: "no-entry-declared" };
+  const smoke = `const{pathToFileURL}=require("node:url");import(pathToFileURL(process.argv[1]).href).then(()=>{},(e)=>{console.error(e&&e.stack||e);process.exit(1)});`;
+  const r = await runNode(["-e", smoke, join4(extDir, smokeEntry)]);
+  if (r.code !== 0) return { ok: false, reason: `entry-import-failed:${r.stderr.slice(0, 500)}` };
+  return { ok: true };
+}
+var installArgs = (version) => [
+  "install",
+  `${PACKAGE_NAME}@${version}`,
+  // --no-save: the auto-updater must never mutate the host's package.json
+  // or lockfile.
+  "--no-save",
+  "--silent",
+  "--no-audit",
+  "--no-fund"
+];
+async function autoInstallLatest(latest, npmDirOverride) {
   if (!SEMVER_RE.test(latest)) {
     logWarn("update", { event: "install-abort", reason: "semver", latest });
-    return false;
+    return "failed";
   }
   const extDir = await findExtensionDir();
   if (!extDir) {
     logWarn("update", { event: "install-abort", reason: "extdir-not-found", moduleUrl: import.meta.url });
-    return false;
+    return "failed";
   }
-  const npmDir = findNpmRoot(extDir);
+  const npmDir = npmDirOverride ?? findNpmRoot(extDir);
   if (!npmDir) {
     logWarn("update", { event: "install-abort", reason: "npmroot-not-found", extDir });
-    return false;
+    return "failed";
   }
+  const prevVersion = (await readPackageJson(join4(npmDir, "node_modules", PACKAGE_NAME, "package.json")))?.version ?? "0.3.0";
   try {
     const keepAlive = setInterval(() => {
     }, 500);
     try {
-      const code = await new Promise((resolve2) => {
-        execFile(
-          "npm",
-          ["install", `${PACKAGE_NAME}@${latest}`, "--silent", "--no-audit", "--no-fund"],
-          { cwd: npmDir, timeout: 6e4, shell: process.platform === "win32" },
-          (err, _stdout, stderr) => {
-            if (err) logWarn("update", { event: "install-exec-failed", error: err.message, stderr: String(stderr).slice(0, 300) });
-            resolve2(err ? 1 : 0);
-          }
-        );
-      });
-      return code === 0;
+      const res = await runNpm(installArgs(latest), npmDir);
+      if (res.code !== 0) {
+        logWarn("update", { event: "auto-install-failed", latest, stderr: res.stderr.slice(0, 2e3) });
+        return "failed";
+      }
+      const verify = await verifyInstall(npmDir, latest);
+      if (!verify.ok) {
+        const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.3.0";
+        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 });
+        return "rolled-back";
+      }
+      logInfo("update", { event: "auto-installed", from: prevVersion, to: latest });
+      return "ok";
     } finally {
       clearInterval(keepAlive);
     }
   } catch (e) {
     logWarn("update", { event: "install-throw", error: e instanceof Error ? e.message : String(e) });
-    return false;
+    return "failed";
   }
 }
 async function checkForUpdate(autoUpdate, notify) {
@@ -5766,7 +6026,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.2.8";
+    const current = runtimeVersion ?? "0.3.0";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -5775,16 +6035,16 @@ async function checkForUpdate(autoUpdate, notify) {
     });
     logInfo("update", { event: "check", current, latest, hasUpdate });
     if (hasUpdate) {
-      const installed = await autoInstallLatest(latest);
-      if (installed && notify) {
+      const outcome = await autoInstallLatest(latest);
+      if (!notify) return;
+      if (outcome === "ok") {
+        notify(`\x1B[32m\u2714 ACP auto-updated ${current} \u2192 ${latest}. Restart omp to finish.\x1B[0m`);
+      } else if (outcome === "rolled-back") {
         notify(
-          `\x1B[32m\u2714 ACP auto-updated ${current} \u2192 ${latest}. Restart omp to finish.\x1B[0m`
-        );
-        logInfo("update", { event: "auto-installed", from: current, to: latest });
-      } else if (!installed && notify) {
-        notify(
-          `${PACKAGE_NAME} ${latest} available (you have ${current}). Run: omp install ${PACKAGE_NAME}@latest`
+          `\x1B[33m\u26A0 ${PACKAGE_NAME} ${latest} failed verification and was rolled back. Keeping ${current}. A later release will auto-update.\x1B[0m`
         );
+      } else {
+        notify(`${PACKAGE_NAME} ${latest} available (you have ${current}). Run: omp install ${PACKAGE_NAME}@latest`);
       }
     }
   } catch (e) {
@@ -6022,10 +6282,11 @@ function applyUserConfig(adapter, user) {
 function createAcpExtension(adapter = {}) {
   return (pi) => {
     const runtime = createRuntime(adapter);
+    const warnDelivery = makeDeliveryWarner();
     wireSessionLifecycle(pi, runtime);
-    wireContextTransform(pi, runtime);
+    wireContextTransform(pi, runtime, warnDelivery);
     wireSystemPrompt(pi, runtime);
-    wireProviderTransform(pi, runtime);
+    wireProviderTransform(pi, runtime, warnDelivery);
     wireProviderDebug(pi);
     wireToolGuardrails(pi, runtime);
     pi.registerTool(makeCompressTool(runtime));
@@ -6039,26 +6300,14 @@ function createAcpExtension(adapter = {}) {
 }
 var index_default = createAcpExtension();
 function wireSessionLifecycle(pi, runtime) {
-  pi.on("session_start", async (_event, ctx) => {
+  const prepareAndPrime = async (ctx, phase) => {
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.2.8" : null });
-    const selfPath = import.meta.url;
-    const conflict = stampAndDetect(selfPath, true ? "0.2.8" : null);
-    if (conflict) {
-      logWarn("instance", { event: "dual-instance", self: selfPath, other: conflict.path, otherPid: conflict.pid, otherVersion: conflict.version });
-      try {
-        if (ctx.hasUI) {
-          ctx.ui.notify(`\u26A0 billion-context-omp loaded TWICE (also from ${conflict.path}). Two instances corrupt compression state \u2014 remove one (check 'omp plugin list' vs config.yml extensions).`);
-        }
-      } catch {
-      }
-    }
     try {
       const user = await loadUserConfig(ctx.cwd);
       runtime.setAdapter(applyUserConfig(runtime.adapter, user));
       if (runtime.adapter.debug !== void 0) setDebugEnabled(runtime.adapter.debug);
     } catch (e) {
-      logThrow("config", e, { sid, phase: "session_start" });
+      logThrow("config", e, { sid, phase });
     }
     try {
       runtime.setPrompts(resolvePrompts(runtime.adapter.prompts, { acknowledgeRisk: runtime.adapter.acknowledgePromptsRisk === true }));
@@ -6067,10 +6316,35 @@ function wireSessionLifecycle(pi, runtime) {
       runtime.setPrompts(defaultPrompts);
     }
     runtime.primeFold(ctx);
+  };
+  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.0" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    const selfPath = import.meta.url;
+    const conflict = stampAndDetect(selfPath, true ? "0.3.0" : null);
+    if (conflict) {
+      logWarn("instance", { event: "dual-instance", self: selfPath, other: conflict.path, otherPid: conflict.pid, otherVersion: conflict.version });
+      try {
+        if (ctx.hasUI) {
+          ctx.ui.notify(`\u26A0 billion-context-omp loaded TWICE (also from ${conflict.path}). Two instances corrupt compression state \u2014 remove one (check 'omp plugin list' vs config.yml extensions).`);
+        }
+      } catch {
+      }
+    }
+    await prepareAndPrime(ctx, "session_start");
     void checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
       if (ctx.hasUI) ctx.ui.notify(msg);
     }).catch((e) => logThrow("update", e, { sid, phase: "session_start" }));
   });
+  pi.on("session_switch", async (event, ctx) => {
+    logInfo("session", { event: "switch", sid: ctx.sessionManager.getSessionId(), reason: event.reason, previous: event.previousSessionFile ?? null });
+    await prepareAndPrime(ctx, "session_switch");
+  });
+  pi.on("session_branch", async (_event, ctx) => {
+    logInfo("session", { event: "branch", sid: ctx.sessionManager.getSessionId() });
+    await prepareAndPrime(ctx, "session_branch");
+  });
   pi.on("session_shutdown", (_event, ctx) => {
     try {
       runtime.forgetSession(ctx.sessionManager.getSessionId());
@@ -6114,6 +6388,7 @@ async function transformStream(ctx, runtime, input, mode) {
     runtime.commitFoldState(ctx, turn.state);
     logInfo("turn", {
       sid,
+      model: ctx.model?.id ?? null,
       inMsgs: coreMessages.length,
       outMsgs: turn.messages.length,
       tokens: tokenCount,
@@ -6141,6 +6416,11 @@ async function transformStream(ctx, runtime, input, mode) {
       activeAfter: turn.state.blocks.filter((b) => b.active).length
     });
     const rebuilt = coreOutToAgentMessages(turn.messages, originalById);
+    const rejectedPair = lastRejectedCompressPair(input);
+    if (rejectedPair) {
+      rebuilt.push(...rejectedPair);
+      debug.event("rejected-pair-visible", { sid, callId: rejectedPair[1].toolCallId ?? null });
+    }
     debug.event("core-out", {
       sid,
       coreOutMsgs: turn.messages.length,
@@ -6152,38 +6432,48 @@ async function transformStream(ctx, runtime, input, mode) {
     if (turn.nudge?.shouldInject) {
       const lastUser = [...input].reverse().find((m) => m.role === "user");
       const tailText = lastUser ? JSON.stringify(lastUser.content ?? "") : "";
-      const isFeedbackView = tailText.includes("efficiency nudge to compress early") || tailText.includes("Context limit reached");
+      const isFeedbackView = tailText.includes("efficiency nudge to compress early") || tailText.includes("Context limit reached") || tailText.includes("compress calls were rejected in a row");
       if (isFeedbackView) {
         debug.event("nudge-feedback-skip", { sid: ctx.sessionManager.getSessionId(), msgs: input.length });
       } else {
         const emergency = turn.nudge.breakdown?.emergencyOverride === 1;
+        const rejectStreak = runtime.rejectStreakFor(ctx);
         const epochReset = turn.state.nudge.lastPerMessageNudgeTokens !== preTurnNudgeBaseline;
-        const prevShown = epochReset ? 0 : preTurnNudgeShownTokens;
-        const cadenceFloor = turn.nudge.breakdown?.growthFloor ?? 0;
-        const suppressed = !emergency && prevShown > 0 && tokenCount - prevShown < cadenceFloor;
-        if (suppressed) {
-          turn.state.nudge.lastNudgeShownTokens = prevShown;
+        if (rejectStreak >= LOOP_GUARD_STOP) {
+          turn.state.nudge.lastNudgeShownTokens = epochReset ? 0 : preTurnNudgeShownTokens;
           turn.state.nudge.lastShownByTier = preTurnNudgeShownByTier;
-          logInfo("nudge", { sid, event: "cadence-suppressed", growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
-          debug.event("nudge-suppressed", { sid, growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
-        } else {
           nudgeInjected = true;
-          {
-            turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
-            const rendered = renderNudgeText(turn.nudge, runtime.prompts);
-            const top = [...turn.nudge.compressibleRanges].sort((a, b) => b.tokens - a.tokens)[0];
-            const example = top ? `
+          rebuilt.push(holdMessage(rejectStreak));
+          logInfo("nudge", { sid, event: "hold-injected", streak: rejectStreak, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
+          debug.event("nudge-hold", { sid, streak: rejectStreak });
+        } else {
+          const prevShown = epochReset ? 0 : preTurnNudgeShownTokens;
+          const cadenceFloor = turn.nudge.breakdown?.growthFloor ?? 0;
+          const suppressed = !emergency && prevShown > 0 && tokenCount - prevShown < cadenceFloor;
+          if (suppressed) {
+            turn.state.nudge.lastNudgeShownTokens = prevShown;
+            turn.state.nudge.lastShownByTier = preTurnNudgeShownByTier;
+            logInfo("nudge", { sid, event: "cadence-suppressed", growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
+            debug.event("nudge-suppressed", { sid, growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
+          } else {
+            nudgeInjected = true;
+            {
+              turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
+              const rendered = renderNudgeText(turn.nudge, runtime.prompts);
+              const top = [...turn.nudge.compressibleRanges].sort((a, b) => b.tokens - a.tokens)[0];
+              const example = top ? `
 
 Example: compress({ content: [{ startId: "${top.startRef}", endId: "${top.endRef}", summary: "..." }] })` : "";
-            rebuilt.push(nudgeMessage(turn.nudge, turn.state.blocks.filter((b) => b.active), runtime.prompts, example));
-            if (emergency) {
-              logWarn("nudge", { sid: ctx.sessionManager.getSessionId(), event: "emergency-inject", pct: Math.round(turn.nudge.contextUsage * 100), voice: rendered.voice, compressible: turn.nudge.compressibleRanges.length });
-            }
-            if (debugOn2 && ctx.hasUI) {
-              ctx.ui.notify(`[ACP nudge \u2192 context]${emergency ? " [EMERGENCY]" : ""}
+              rebuilt.push(nudgeMessage(turn.nudge, turn.state.blocks.filter((b) => b.active), runtime.prompts, example));
+              if (emergency) {
+                logWarn("nudge", { sid: ctx.sessionManager.getSessionId(), event: "emergency-inject", pct: Math.round(turn.nudge.contextUsage * 100), voice: rendered.voice, compressible: turn.nudge.compressibleRanges.length });
+              }
+              if (debugOn2 && ctx.hasUI) {
+                ctx.ui.notify(`[ACP nudge \u2192 context]${emergency ? " [EMERGENCY]" : ""}
 ${rendered.text}${example}`);
+              }
+              debug.event("nudge-injected", { sid: ctx.sessionManager.getSessionId(), voice: rendered.voice, channels: ["context", debugOn2 ? "terminal" : null].filter(Boolean), emergency, text: rendered.text + example });
             }
-            debug.event("nudge-injected", { sid: ctx.sessionManager.getSessionId(), voice: rendered.voice, channels: ["context", debugOn2 ? "terminal" : null].filter(Boolean), emergency, text: rendered.text + example });
           }
         }
       }
@@ -6208,10 +6498,13 @@ ${rendered.text}${example}`);
   }).catch((e) => logThrow("update", e, { sid, phase: "context" }));
   return result;
 }
-function wireContextTransform(pi, runtime) {
+function wireContextTransform(pi, runtime, warnDelivery) {
   pi.on("context", async (event, ctx) => {
     if (resolveTransformMode(runtime.adapter, ctx.model) === "provider") {
-      debug.event("context-observer-skip", { sid: ctx.sessionManager.getSessionId(), msgs: event.messages?.length ?? 0 });
+      const sid = ctx.sessionManager.getSessionId();
+      debug.event("context-observer-skip", { sid, msgs: event.messages?.length ?? 0 });
+      const warning = providerDeliveryWarning(runtime.adapter, ctx.model);
+      if (warning) warnDelivery(ctx, sid, warning);
       return void 0;
     }
     const result = await transformStream(ctx, runtime, event.messages ?? [], "context");
@@ -6219,7 +6512,20 @@ function wireContextTransform(pi, runtime) {
     return { messages: result.rebuilt };
   });
 }
-function wireProviderTransform(pi, runtime) {
+function makeDeliveryWarner() {
+  const warned = /* @__PURE__ */ new Set();
+  return (ctx, sid, warning) => {
+    const dedup = `${sid}:${warning.key}`;
+    if (warned.has(dedup)) return;
+    warned.add(dedup);
+    logWarn("provider-transform", { sid, event: "undelivered", reason: warning.reason });
+    try {
+      if (ctx.hasUI) ctx.ui.notify(warning.message);
+    } catch {
+    }
+  };
+}
+function wireProviderTransform(pi, runtime, warnDelivery) {
   pi.on("before_provider_request", async (event, ctx) => {
     if (resolveTransformMode(runtime.adapter, ctx.model) !== "provider") return void 0;
     const payload = event.payload;
@@ -6228,6 +6534,13 @@ function wireProviderTransform(pi, runtime) {
     const fmt2 = detectProviderWireFormat(payload);
     if (fmt2 === null) {
       debug.event("provider-transform-unknown-format", { sid });
+      if (runtime.adapter.transformMode === "provider") {
+        warnDelivery(ctx, sid, {
+          key: "unknown-wire-format",
+          reason: "explicit provider mode but the wire body has no codec path (unknown format) \u2014 payload passes through",
+          message: '\u26A0 billion-context-omp: transformMode "provider" is set, but this wire body has no codec path \u2014 compression is NOT applied here. Remove the override to use context mode.'
+        });
+      }
       return void 0;
     }
     const representable = payloadRepresentable(payload, fmt2);
@@ -6241,13 +6554,15 @@ function wireProviderTransform(pi, runtime) {
       if (msgs.length === 0) return void 0;
       const result = await transformStreamCore(ctx, runtime, msgs, fmt2);
       if (!result) return void 0;
-      const outMsgs = coreToPayloadMessages(result.coreOut, fmt2, cacheControls).length;
-      const inMsgs = payload.messages?.length ?? 0;
+      const inMessages = payload.messages ?? [];
+      const rebuilt = fmt2 === "openai" ? restoreOpenaiWireFidelity(inMessages, coreToPayloadMessages(result.coreOut, fmt2, cacheControls)) : coreToPayloadMessages(result.coreOut, fmt2, cacheControls);
+      const outMsgs = rebuilt.length;
+      const inMsgs = inMessages.length;
       if (outMsgs !== inMsgs) {
         logInfo("provider-transform", { sid, fmt: fmt2, inMsgs, outMsgs, nudge: result.nudgeInjected ? "injected" : "idle" });
       }
       debug.event("provider-transform", { sid, fmt: fmt2, inMsgs, outMsgs, nudgeInjected: result.nudgeInjected });
-      return { ...payload, messages: coreToPayloadMessages(result.coreOut, fmt2, cacheControls) };
+      return { ...payload, messages: rebuilt };
     } catch (e) {
       logThrow("provider-transform", e, { sid, fmt: fmt2 });
       return void 0;
@@ -6321,42 +6636,57 @@ async function transformStreamCore(ctx, runtime, wireMsgs, fmt2) {
       turn.state,
       { config, tokenCount }
     );
+    const rejectedPair = lastRejectedPairCore(wireMsgs);
+    if (rejectedPair) {
+      coreOut.push(...rejectedPair);
+      debug.event("rejected-pair-visible", { sid, space: "core", callId: rejectedPair[1]?.toolCallId ?? null });
+    }
     let nudgeInjected = false;
     if (turn.nudge?.shouldInject) {
       const lastUser = [...wireMsgs].reverse().find((m) => m.role === "user");
       const tailText = lastUser ? lastUser.text ?? "" : "";
-      const isFeedbackView = tailText.includes("efficiency nudge to compress early") || tailText.includes("Context limit reached");
+      const isFeedbackView = tailText.includes("efficiency nudge to compress early") || tailText.includes("Context limit reached") || tailText.includes("compress calls were rejected in a row");
       if (isFeedbackView) {
         debug.event("nudge-feedback-skip", { sid, msgs: wireMsgs.length });
       } else {
         const emergency = turn.nudge.breakdown?.emergencyOverride === 1;
         const epochReset = turn.state.nudge.lastPerMessageNudgeTokens !== preTurnNudgeBaseline;
-        const prevShown = epochReset ? 0 : preTurnNudgeShownTokens;
-        const cadenceFloor = turn.nudge.breakdown?.growthFloor ?? 0;
-        const suppressed = !emergency && prevShown > 0 && tokenCount - prevShown < cadenceFloor;
-        if (suppressed) {
-          turn.state.nudge.lastNudgeShownTokens = prevShown;
+        const rejectStreak = runtime.rejectStreakFor(ctx);
+        if (rejectStreak >= LOOP_GUARD_STOP) {
+          turn.state.nudge.lastNudgeShownTokens = epochReset ? 0 : preTurnNudgeShownTokens;
           turn.state.nudge.lastShownByTier = preTurnNudgeShownByTier;
-          logInfo("nudge", { sid, event: "cadence-suppressed", growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
-          debug.event("nudge-suppressed", { sid, growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
-        } else {
           nudgeInjected = true;
-          turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
-          const rendered = renderNudgeText(turn.nudge, runtime.prompts);
-          const top = [...turn.nudge.compressibleRanges].sort((a, b) => b.tokens - a.tokens)[0];
-          const example = top ? `
+          coreOut.push({ id: `acp_hold_${Date.now()}`, role: "user", contentType: "text", text: holdText(rejectStreak) });
+          logInfo("nudge", { sid, event: "hold-injected", streak: rejectStreak, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
+          debug.event("nudge-hold", { sid, streak: rejectStreak });
+        } else {
+          const prevShown = epochReset ? 0 : preTurnNudgeShownTokens;
+          const cadenceFloor = turn.nudge.breakdown?.growthFloor ?? 0;
+          const suppressed = !emergency && prevShown > 0 && tokenCount - prevShown < cadenceFloor;
+          if (suppressed) {
+            turn.state.nudge.lastNudgeShownTokens = prevShown;
+            turn.state.nudge.lastShownByTier = preTurnNudgeShownByTier;
+            logInfo("nudge", { sid, event: "cadence-suppressed", growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
+            debug.event("nudge-suppressed", { sid, growth: tokenCount - prevShown, floor: cadenceFloor, pct: Math.round(turn.nudge.contextUsage * 100), reason: turn.nudge.reason });
+          } else {
+            nudgeInjected = true;
+            turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
+            const rendered = renderNudgeText(turn.nudge, runtime.prompts);
+            const top = [...turn.nudge.compressibleRanges].sort((a, b) => b.tokens - a.tokens)[0];
+            const example = top ? `
 
 Example: compress({ content: [{ startId: "${top.startRef}", endId: "${top.endRef}", summary: "..." }] })` : "";
-          if (emergency) {
-            logWarn("nudge", { sid, event: "emergency-inject", pct: Math.round(turn.nudge.contextUsage * 100), voice: rendered.voice, compressible: turn.nudge.compressibleRanges.length });
-          }
-          const debugOn2 = debug.enabled;
-          if (debugOn2 && ctx.hasUI) {
-            ctx.ui.notify(`[ACP nudge \u2192 context]${emergency ? " [EMERGENCY]" : ""}
+            if (emergency) {
+              logWarn("nudge", { sid, event: "emergency-inject", pct: Math.round(turn.nudge.contextUsage * 100), voice: rendered.voice, compressible: turn.nudge.compressibleRanges.length });
+            }
+            const debugOn2 = debug.enabled;
+            if (debugOn2 && ctx.hasUI) {
+              ctx.ui.notify(`[ACP nudge \u2192 context]${emergency ? " [EMERGENCY]" : ""}
 ${rendered.text}${example}`);
+            }
+            debug.event("nudge-injected", { sid, voice: rendered.voice, channels: ["wire", debugOn2 ? "terminal" : null].filter(Boolean), emergency, text: rendered.text + example });
+            coreOut.push({ id: `acp_nudge_${Date.now()}`, role: "user", contentType: "text", text: nudgeText(turn.nudge, turn.state.blocks.filter((b) => b.active), runtime.prompts, example) });
           }
-          debug.event("nudge-injected", { sid, voice: rendered.voice, channels: ["wire", debugOn2 ? "terminal" : null].filter(Boolean), emergency, text: rendered.text + example });
-          coreOut.push({ id: `acp_nudge_${Date.now()}`, role: "user", contentType: "text", text: nudgeText(turn.nudge, turn.state.blocks.filter((b) => b.active), runtime.prompts, example) });
         }
       }
     }
@@ -6389,18 +6719,18 @@ function wireProviderDebug(pi) {
   pi.on("after_provider_response", (event, ctx) => {
     if (!debug.enabled) return;
     const h = event.headers;
-    const cache = {};
+    const cache2 = {};
     for (const [k, v] of Object.entries(h)) {
       const lk = k.toLowerCase();
       if (lk.includes("cache") || lk.includes("usage") || lk.includes("token") || lk.includes("rate") || lk.includes("x-")) {
-        cache[lk] = v;
+        cache2[lk] = v;
       }
     }
     debug.event("provider-response", {
       sid: ctx.sessionManager.getSessionId(),
       status: event.status,
       requestId: event.requestId ?? null,
-      cache
+      cache: cache2
     });
   });
 }
@@ -6432,6 +6762,16 @@ function nudgeMessage(nudge, blocks, prompts, example) {
     timestamp: Date.now()
   };
 }
+function holdText(streak) {
+  return `[ACP hold] Your last ${streak} compress calls were rejected in a row. Do NOT call compress again now and do NOT retry the same range \u2014 the compress reminder is suspended until context actually changes. Continue the actual task. If context still needs relief, run acp_status first and target ONLY a range that meets the minimum size.`;
+}
+function holdMessage(streak) {
+  return {
+    role: "user",
+    content: [{ type: "text", text: holdText(streak) }],
+    timestamp: Date.now()
+  };
+}
 export {
   createAcpExtension,
   index_default as default