@cortexkit/opencode-magic-context 0.44.3 → 0.45.0

package/dist/{index-dgg5y7er.js → v2/server-hfjfbg59.js}

@@ -1,17 +1,42 @@
+import {
+  OMO_INTERNAL_INITIATOR_MARKER,
+  isSystemDirective,
+  hasMeaningfulUserText2,
+  extractTexts2,
+  extractToolResultBodyTokens,
+  extractToolCallSummaries,
+  estimateTokens,
+  normalizeText,
+  compactRole,
+  formatBlock,
+  compactTextForSummary,
+  mergeCommitHashes
+} from "./server-rhdgxp1t.js";
 import {
   getHarness
-} from "./index-s70wtd8k.js";
+} from "./server-ckpc8pxy.js";
+import {
+  renderToolTemplate
+} from "./server-remp7e2g.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-4an2p8qa.js";
+} from "./server-w99cyt6a.js";
+import {
+  stableStringify,
+  getLargestMeasuredToolDefinitionTokens,
+  getMeasuredToolDefinitionTokens
+} from "./server-r7cmye3k.js";
 import {
   UNKNOWN_FIT_RATIO,
   resolveDecisionCalibration,
   providerMass
-} from "./index-y5145x8k.js";
+} from "./server-n96ag4rk.js";
+import {
+  canonicalModelIdentity
+} from "./server-avwt563y.js";
 
 // src/features/magic-context/reclaim-protection.ts
 var CTX_REDUCE_KEEP = 3;
@@ -19,411 +44,14 @@ function newestCtxReduceTagNumbers(tags) {
   return new Set(tags.filter((tag) => tag.toolName === "ctx_reduce").sort((left, right) => right.tagNumber - left.tagNumber).slice(0, CTX_REDUCE_KEEP).map((tag) => tag.tagNumber));
 }
 
-// src/hooks/magic-context/read-session-formatting.ts
-import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
-import { createRequire } from "node:module";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-
-// src/shared/commit-detection.ts
-var HASH_HEX = "[0-9a-f]{7,12}";
-var COMMIT_HASH_TEST_PATTERN = new RegExp(`\\b${HASH_HEX}\\b`, "i");
-var COMMIT_VERB_PATTERN = /\b(?:commit(?:ted|ting|s)?|cherry-?pick(?:ed|ing|s)?|merge[ds]?|merging|rebas(?:e|ed|es|ing))\b/i;
-function textMentionsRecentCommit(text) {
-  return COMMIT_HASH_TEST_PATTERN.test(text) && COMMIT_VERB_PATTERN.test(text);
-}
-function createCommitHashExtractPattern() {
-  return new RegExp(`\`?\\b(${HASH_HEX})\\b\`?`, "gi");
-}
-
-// src/shared/internal-initiator-marker.ts
-var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
-
-// src/shared/system-directive.ts
-var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: MAGIC-CONTEXT";
-function isSystemDirective(text) {
-  return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
-}
-function removeSystemReminders(text) {
-  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
-}
-
-// src/hooks/magic-context/read-session-formatting.ts
-var MAX_COMMITS_PER_BLOCK = 5;
-function hasMeaningfulUserText2(parts) {
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const candidate = part;
-    if (candidate.type !== "text" || typeof candidate.text !== "string")
-      continue;
-    if (candidate.ignored === true)
-      continue;
-    const cleaned = removeSystemReminders(candidate.text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
-    if (!cleaned)
-      continue;
-    if (isSystemDirective(cleaned))
-      continue;
-    return true;
-  }
-  return false;
-}
-function extractTexts2(parts) {
-  const texts = [];
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const p = part;
-    if (p.type === "text" && typeof p.text === "string" && p.text.trim().length > 0) {
-      texts.push(p.text.trim());
-    }
-  }
-  return texts;
-}
-function extractToolResultBodyTokens(parts) {
-  let tokens = 0;
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const p = part;
-    if (p.type !== "tool")
-      continue;
-    const state = p.state;
-    if (!state || typeof state !== "object")
-      continue;
-    const body = state.output ?? state.error;
-    if (body === undefined)
-      continue;
-    const text = typeof body === "string" ? body : JSON.stringify(body);
-    tokens += Math.ceil(text.length / 4);
-  }
-  return tokens;
-}
-function extractToolCallSummaries(parts) {
-  const summaries = [];
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const p = part;
-    if (p.type !== "tool" || typeof p.tool !== "string")
-      continue;
-    const state = p.state;
-    if (!state || typeof state !== "object")
-      continue;
-    const input = state.input;
-    const metadata = state.metadata;
-    const description = input && typeof input.description === "string" && input.description || metadata && typeof metadata.description === "string" && metadata.description;
-    if (description) {
-      summaries.push(`TC: ${description}`);
-      continue;
-    }
-    const toolName = p.tool;
-    const keyArg = extractKeyArg(toolName, input);
-    summaries.push(keyArg ? `TC: ${toolName}(${keyArg})` : `TC: ${toolName}`);
-  }
-  return summaries;
-}
-function extractKeyArg(_toolName, input) {
-  if (!input)
-    return null;
-  if (typeof input.filePath === "string")
-    return truncateArg(input.filePath);
-  if (typeof input.path === "string")
-    return truncateArg(input.path);
-  if (typeof input.pattern === "string")
-    return truncateArg(input.pattern);
-  if (typeof input.query === "string")
-    return truncateArg(input.query);
-  if (typeof input.symbol === "string")
-    return input.symbol;
-  if (typeof input.module === "string")
-    return input.module;
-  if (typeof input.action === "string")
-    return input.action;
-  return null;
-}
-function truncateArg(value, maxLen = 60) {
-  if (value.length <= maxLen)
-    return value;
-  return `${value.slice(0, maxLen)}…`;
-}
-var TOKENIZER_PACKAGE_DIRS = [
-  ["@cortexkit", "opencode-magic-context"],
-  ["@cortexkit", "pi-magic-context"]
-];
-var tokenizer;
-var tokenizerLoadAttempted = false;
-var tokenizerLoadPromise;
-var tokenizerWarningSent = false;
-var tokenizerEncodingPath;
-var tokenizerSerializedTableBytes;
-function tokenizerPackageRoots() {
-  const cwd = process.cwd();
-  const openCodeCache = join(process.env.XDG_CACHE_HOME ?? join(homedir(), ".cache"), "opencode");
-  const roots = [cwd, openCodeCache];
-  const candidates = [];
-  for (const root of roots) {
-    for (const packageDir of TOKENIZER_PACKAGE_DIRS) {
-      candidates.push(join(root, "node_modules", ...packageDir, "node_modules", "ai-tokenizer"));
-    }
-    candidates.push(join(root, "node_modules", "ai-tokenizer"));
-  }
-  let ancestor = process.argv[1] ? dirname(resolve(process.argv[1])) : cwd;
-  while (true) {
-    candidates.push(join(ancestor, "node_modules", "ai-tokenizer"));
-    const parent = dirname(ancestor);
-    if (parent === ancestor)
-      break;
-    ancestor = parent;
-  }
-  return [...new Set(candidates)];
-}
-function packageImportTarget(value) {
-  if (typeof value === "string")
-    return value;
-  if (!value || typeof value !== "object")
-    return;
-  const conditions = value;
-  return packageImportTarget(conditions.import) ?? packageImportTarget(conditions.default);
-}
-function findTokenizerImportPaths() {
-  for (const packageRoot of tokenizerPackageRoots()) {
-    const packageJsonPath = join(packageRoot, "package.json");
-    if (!existsSync(packageJsonPath))
-      continue;
-    try {
-      const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-      const tokenizerTarget = packageImportTarget(packageJson.exports?.["."]) ?? (typeof packageJson.module === "string" ? packageJson.module : undefined) ?? (typeof packageJson.main === "string" ? packageJson.main : undefined);
-      const encodingTarget = packageImportTarget(packageJson.exports?.["./encoding/claude"]);
-      if (!tokenizerTarget || !encodingTarget)
-        continue;
-      return {
-        tokenizerPath: realpathSync(join(packageRoot, tokenizerTarget)),
-        encodingPath: realpathSync(join(packageRoot, encodingTarget))
-      };
-    } catch {}
-  }
-  return;
-}
-function constructTokenizer(tokenizerModule, claudeEncoding) {
-  const typedModule = tokenizerModule;
-  const Tokenizer = typedModule.default ?? typedModule.Tokenizer;
-  if (!Tokenizer) {
-    throw new Error("ai-tokenizer does not expose a Tokenizer constructor");
-  }
-  return new Tokenizer(claudeEncoding);
-}
-function loadTokenizer() {
-  const requireFromThisModule = createRequire(import.meta.url);
-  const encodingSpecifier = "ai-tokenizer/encoding/" + "claude";
-  tokenizerEncodingPath = requireFromThisModule.resolve(encodingSpecifier);
-  tokenizerSerializedTableBytes = undefined;
-  return constructTokenizer(requireFromThisModule("ai-" + "tokenizer"), requireFromThisModule(encodingSpecifier));
-}
-async function loadTokenizerFromInstalledPackage() {
-  const installedPaths = findTokenizerImportPaths();
-  if (!installedPaths) {
-    throw new Error("ai-tokenizer was not found under the project, runtime, or OpenCode cache node_modules roots");
-  }
-  const [tokenizerModule, claudeEncoding] = await Promise.all([
-    import(pathToFileURL(installedPaths.tokenizerPath).href),
-    import(pathToFileURL(installedPaths.encodingPath).href)
-  ]);
-  tokenizerEncodingPath = installedPaths.encodingPath;
-  tokenizerSerializedTableBytes = undefined;
-  return constructTokenizer(tokenizerModule, claudeEncoding);
-}
-function serializedTokenizerTableBytes(entryPath) {
-  const root = dirname(entryPath);
-  const pending = [entryPath];
-  const visited = new Set;
-  let total = 0;
-  try {
-    while (pending.length > 0) {
-      const nextPath = pending.pop();
-      if (!nextPath)
-        break;
-      const path = realpathSync(nextPath);
-      if (visited.has(path))
-        continue;
-      visited.add(path);
-      total += statSync(path).size;
-      const source = readFileSync(path, "utf8");
-      const localImports = source.matchAll(/(?:require\(|\bfrom\s+|\bimport\()\s*["'](\.\.?\/[^"']+)["']/g);
-      for (const match of localImports) {
-        const specifier = match[1];
-        if (!specifier)
-          continue;
-        const dependency = resolve(dirname(path), specifier);
-        if (dependency.startsWith(root))
-          pending.push(dependency);
-      }
-    }
-    return total;
-  } catch {
-    return null;
-  }
-}
-function getTokenizerNativeMemoryStats() {
-  if (tokenizerSerializedTableBytes === undefined) {
-    tokenizerSerializedTableBytes = tokenizerEncodingPath ? serializedTokenizerTableBytes(tokenizerEncodingPath) : null;
-  }
-  return {
-    loaded: tokenizer !== undefined,
-    loadAttempted: tokenizerLoadAttempted || tokenizerLoadPromise !== undefined,
-    tableBytes: tokenizerSerializedTableBytes,
-    tablePath: tokenizerEncodingPath ?? null
-  };
-}
-function warnTokenizerFallback(error) {
-  if (tokenizerWarningSent)
-    return;
-  tokenizerWarningSent = true;
-  const reason = error instanceof Error ? error.message : String(error);
-  console.warn("[magic-context] ai-tokenizer is unavailable; using approximate character-based token counts for this process. Token budgets, persisted per-message counts, and protected-tail/compartment boundaries may be less accurate until restart:", reason);
-}
-async function preloadTokenizer() {
-  if (tokenizer)
-    return true;
-  if (tokenizerLoadAttempted)
-    return false;
-  if (tokenizerLoadPromise)
-    return tokenizerLoadPromise;
-  tokenizerLoadPromise = (async () => {
-    try {
-      try {
-        tokenizer = loadTokenizer();
-      } catch {
-        tokenizer = await loadTokenizerFromInstalledPackage();
-      }
-      tokenizerLoadAttempted = true;
-      return true;
-    } catch (error) {
-      tokenizerLoadAttempted = true;
-      warnTokenizerFallback(error);
-      return false;
-    } finally {
-      tokenizerLoadPromise = undefined;
-    }
-  })();
-  return tokenizerLoadPromise;
-}
-function getTokenizer() {
-  if (tokenizer || tokenizerLoadAttempted)
-    return tokenizer;
-  tokenizerLoadAttempted = true;
-  try {
-    tokenizer = loadTokenizer();
-  } catch (error) {
-    warnTokenizerFallback(error);
-  }
-  return tokenizer;
-}
-function estimateTokensHeuristically(text) {
-  return Math.ceil(text.length / 3.5);
-}
-function estimateTokens(text) {
-  if (!text)
-    return 0;
-  const activeTokenizer = getTokenizer();
-  if (!activeTokenizer)
-    return estimateTokensHeuristically(text);
-  try {
-    return activeTokenizer.encode(text, "all").length;
-  } catch (error) {
-    tokenizer = undefined;
-    tokenizerLoadAttempted = true;
-    warnTokenizerFallback(error);
-    return estimateTokensHeuristically(text);
-  }
-}
-function normalizeText(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function compactRole(role) {
-  if (role === "assistant")
-    return "A";
-  if (role === "user")
-    return "U";
-  return role.slice(0, 1).toUpperCase() || "M";
-}
-function formatBlock(block) {
-  const range = block.startOrdinal === block.endOrdinal ? `[${block.startOrdinal}]` : `[${block.startOrdinal}-${block.endOrdinal}]`;
-  const commitSuffix = block.commitHashes.length > 0 ? ` commits: ${block.commitHashes.join(", ")}` : "";
-  return `${range} ${block.role}:${commitSuffix} ${block.parts.join(" / ")}`;
-}
-function extractCommitHashes(text) {
-  const hashes = [];
-  const seen = new Set;
-  for (const match of text.matchAll(createCommitHashExtractPattern())) {
-    const hash = match[1]?.toLowerCase();
-    if (!hash || seen.has(hash))
-      continue;
-    seen.add(hash);
-    hashes.push(hash);
-    if (hashes.length >= MAX_COMMITS_PER_BLOCK)
-      break;
-  }
-  return hashes;
-}
-function compactTextForSummary(text, role) {
-  const commitHashes = role === "assistant" ? extractCommitHashes(text) : [];
-  if (commitHashes.length === 0 || !COMMIT_VERB_PATTERN.test(text)) {
-    return { text, commitHashes };
-  }
-  const withoutHashes = text.replace(createCommitHashExtractPattern(), "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
-  return {
-    text: withoutHashes.length > 0 ? withoutHashes : text,
-    commitHashes
-  };
-}
-function mergeCommitHashes(existing, next) {
-  if (next.length === 0)
-    return existing;
-  const merged = [...existing];
-  for (const hash of next) {
-    if (merged.includes(hash))
-      continue;
-    merged.push(hash);
-    if (merged.length >= MAX_COMMITS_PER_BLOCK)
-      break;
-  }
-  return merged;
-}
-
 // src/hooks/magic-context/tag-content-primitives.ts
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
-var DANGLING_TAG_GLOBAL_REGEX = /\u00a7\d+(?!\.\d)[^\s\u00a7\w.]?/g;
 var DANGLING_TAG_PREFIX_REGEX = /^(?:\u00a7\d+(?!\.\d)[^\s\u00a7\w.]?\s*)+/;
-var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
-var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
-var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
 function stripWellFormedLeadingTagPrefix(value) {
   return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
 }
-function stripCompleteTagPairsGlobally(value) {
-  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
-}
-function stripMalformedTagNotationGlobally(value) {
-  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
-}
-function stripDanglingTagNotationGlobally(value) {
-  return value.replace(DANGLING_TAG_GLOBAL_REGEX, "");
-}
-function stripTagSectionCharacters(value) {
-  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
-}
-function stripPersistedAssistantText(value) {
-  let text = stripWellFormedLeadingTagPrefix(value);
-  text = stripCompleteTagPairsGlobally(text);
-  text = stripMalformedTagNotationGlobally(text);
-  text = stripDanglingTagNotationGlobally(text);
-  text = stripTagSectionCharacters(text);
-  return text.trim();
-}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
@@ -461,26 +89,17 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-// src/shared/stable-json.ts
-function stableStringify(value, seen = new WeakSet) {
-  if (value === undefined)
-    return "undefined";
-  if (value === null || typeof value !== "object")
-    return JSON.stringify(value) ?? String(value);
-  if (seen.has(value))
-    return '"[Circular]"';
-  seen.add(value);
-  if (Array.isArray(value)) {
-    return `[${value.map((item) => stableStringify(item, seen)).join(",")}]`;
-  }
-  const entries = Object.entries(value).sort(([a], [b]) => {
-    if (a < b)
-      return -1;
-    if (a > b)
-      return 1;
-    return 0;
-  });
-  return `{${entries.map(([key, child]) => `${JSON.stringify(key)}:${stableStringify(child, seen)}`).join(",")}}`;
+// src/shared/tag-owner-id.ts
+var POSITIONAL_CONTENT_SUFFIX = /:(?:p|file)\d+$/;
+var CONTENT_DERIVED_TEXT_SUFFIX = /:mc-text-v1:[0-9a-f]+:[0-9a-f]+:o\d+$/;
+function contentTagOwnerMessageId(contentId) {
+  const positional = POSITIONAL_CONTENT_SUFFIX.exec(contentId);
+  if (positional)
+    return contentId.slice(0, positional.index);
+  const derived = CONTENT_DERIVED_TEXT_SUFFIX.exec(contentId);
+  if (derived)
+    return contentId.slice(0, derived.index);
+  return contentId;
 }
 
 // src/hooks/magic-context/image-token-estimate.ts
@@ -506,7 +125,7 @@ function estimateImageTokensFromDataUrl(url) {
     if (dims)
       return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
   } else if (header.includes("image/jpeg") || header.includes("image/jpg")) {
-    const dims = parseJpegDimensions(bytes);
+    const dims = parseJpegDimensions(createBase64ByteReader(payload, bytes));
     if (dims)
       return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
   } else if (header.includes("image/webp")) {
@@ -564,21 +183,46 @@ function parsePngDimensions(b) {
     return null;
   return { w, h };
 }
-function parseJpegDimensions(b) {
-  if (b.length < 4 || b[0] !== 255 || b[1] !== 216)
+var READER_PREVIEW_CHARS = 512;
+var READER_PREVIEW_BYTES = 384;
+var READER_WINDOW_CHARS = 4096;
+var READER_WINDOW_BYTES = 3072;
+function createBase64ByteReader(payload, preview) {
+  const windows = new Map;
+  return (offset) => {
+    if (offset < READER_PREVIEW_BYTES)
+      return preview[offset];
+    const index = Math.floor((offset - READER_PREVIEW_BYTES) / READER_WINDOW_BYTES);
+    let window = windows.get(index);
+    if (window === undefined) {
+      const start = READER_PREVIEW_CHARS + index * READER_WINDOW_CHARS;
+      const chars = payload.slice(start, start + READER_WINDOW_CHARS);
+      try {
+        window = chars.length > 0 ? base64Decode(chars) : null;
+      } catch {
+        window = null;
+      }
+      windows.set(index, window);
+    }
+    return window?.[offset - READER_PREVIEW_BYTES - index * READER_WINDOW_BYTES];
+  };
+}
+var JPEG_SCAN_LIMIT_BYTES = 256 * 1024;
+function parseJpegDimensions(byteAt) {
+  if (byteAt(0) !== 255 || byteAt(1) !== 216 || byteAt(3) === undefined)
     return null;
   let i = 2;
-  while (i < b.length - 8) {
-    if (b[i] !== 255) {
+  while (i < JPEG_SCAN_LIMIT_BYTES && byteAt(i + 8) !== undefined) {
+    if (byteAt(i) !== 255) {
       i++;
       continue;
     }
-    const marker = b[i + 1];
+    const marker = byteAt(i + 1);
     if (marker === undefined)
       break;
     if (isSofMarker(marker)) {
-      const h = b[i + 5] << 8 | b[i + 6];
-      const w = b[i + 7] << 8 | b[i + 8];
+      const h = byteAt(i + 5) << 8 | byteAt(i + 6);
+      const w = byteAt(i + 7) << 8 | byteAt(i + 8);
       if (w && h)
         return { w, h };
       return null;
@@ -587,7 +231,7 @@ function parseJpegDimensions(b) {
       i += 2;
       continue;
     }
-    const segLen = b[i + 2] << 8 | b[i + 3];
+    const segLen = byteAt(i + 2) << 8 | byteAt(i + 3);
     if (segLen < 2)
       return null;
     i += 2 + segLen;
@@ -978,7 +622,7 @@ function toolInputText(part) {
 function messageIdForTag(tag) {
   if (tag.type === "tool")
     return tag.toolOwnerMessageId;
-  return tag.messageId.replace(/:(?:p|file)\d+$/, "");
+  return contentTagOwnerMessageId(tag.messageId);
 }
 function resolveProtectedTagNumbers(tags, protectedTagNumbersInput) {
   const protectedNumbers = new Set(protectedTagNumbersInput);
@@ -1868,6 +1512,7 @@ ${body}${hintText}
 var TARGET_FRACTION = 0.3;
 var TIER_RECENCY_RESERVE = 0.2;
 var EMERGENCY_REARM_MIN_TOKENS = 2000;
+var EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS = EMERGENCY_REARM_MIN_TOKENS;
 var T1_TOOLS = new Set(["read", "todowrite", "task", "aft_outline", "aft_zoom"]);
 var T2_TOOLS = new Set(["edit", "write", "apply_patch", "grep", "glob", "aft_search"]);
 function normalizeToolName(toolName) {
@@ -1929,8 +1574,9 @@ function planEmergencyDrop(input) {
   const workingSpan = Math.max(ceilingTokens - fixedFloor, 0);
   const target = fixedFloor + TARGET_FRACTION * workingSpan;
   const reclaimTokens = Math.round(currentTotalInputTokens - target);
+  const floorNote = fixedFloor > ceilingTokens ? `; fixed floor ≈${Math.round(fixedFloor)} already exceeds ceiling ${Math.round(ceilingTokens)}: tool drops cannot reach the target` : "";
   if (reclaimTokens <= EMERGENCY_REARM_MIN_TOKENS) {
-    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})`);
+    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})${floorNote}`);
   }
   const cutoff = input.protectedCutoff;
   const windowYields = absoluteEmergency;
@@ -1985,13 +1631,16 @@ function planEmergencyDrop(input) {
       }
     }
   if (selected.length === 0) {
-    return noop("no-candidates");
+    return noop(`no-candidates${floorNote}`);
+  }
+  if (!input.passAlreadyPriced && reclaimed < EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS) {
+    return noop(`achievable reclaim below minimum (${selected.length} tags, reclaim≈${Math.round(reclaimed)} < ${EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS} against gap ${reclaimTokens})${floorNote}`);
   }
   return {
     shouldDrop: true,
     tagNumbers: selected,
     reclaimTokens,
-    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})`
+    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})${floorNote}`
   };
 }
 function measureEmergencyTag(tag, target, calibration, skeleton) {
@@ -2045,14 +1694,13 @@ function getUpdateTagDropModeStatement(db) {
 }
 var updateTagByteSizeStatements = new WeakMap;
 var updateTagInputByteSizeStatements = new WeakMap;
-var CONTENT_ID_SUFFIX = /:(?:p|file)\d+$/;
 var RECENT_OWNER_SCAN_PAGE_SIZE = 128;
 var recentTagOwnerStatements = new WeakMap;
 function ownerMessageIdForTagRow(row) {
   if (row.type === "tool") {
     return row.tool_owner_message_id ?? row.message_id;
   }
-  return row.message_id.replace(CONTENT_ID_SUFFIX, "");
+  return contentTagOwnerMessageId(row.message_id);
 }
 function getRecentTagOwnerStatement(db) {
   let statement = recentTagOwnerStatements.get(db);
@@ -2077,7 +1725,7 @@ function getRecentTagOwnerMessageIds(db, sessionId, maxOwners) {
     for (const row of rows) {
       if (typeof row.type !== "string" || typeof row.message_id !== "string")
         continue;
-      const ownerId = row.type === "tool" ? typeof row.tool_owner_message_id === "string" ? row.tool_owner_message_id : null : row.message_id.replace(CONTENT_ID_SUFFIX, "");
+      const ownerId = row.type === "tool" ? typeof row.tool_owner_message_id === "string" ? row.tool_owner_message_id : null : contentTagOwnerMessageId(row.message_id);
       if (!ownerId || recent.has(ownerId))
         continue;
       recent.add(ownerId);
@@ -2243,22 +1891,6 @@ function getUpdateTagMessageIdStatement(db) {
   }
   return stmt;
 }
-function getTagNumbersByMessageIdStatement(db) {
-  let stmt = getTagNumbersByMessageIdStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT tag_number FROM tags WHERE session_id = ? AND (message_id = ? OR message_id LIKE ? ESCAPE '\\' OR message_id LIKE ? ESCAPE '\\') ORDER BY tag_number ASC");
-    getTagNumbersByMessageIdStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getDeleteTagsByMessageIdStatement(db) {
-  let stmt = deleteTagsByMessageIdStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM tags WHERE session_id = ? AND (message_id = ? OR message_id LIKE ? ESCAPE '\\' OR message_id LIKE ? ESCAPE '\\')");
-    deleteTagsByMessageIdStatements.set(db, stmt);
-  }
-  return stmt;
-}
 function getMaxTagNumberBySessionStatement(db) {
   let stmt = getMaxTagNumberBySessionStatements.get(db);
   if (!stmt) {
@@ -2332,9 +1964,6 @@ function isMaxTagNumberRow(row) {
   const r = row;
   return typeof r.max_tag_number === "number";
 }
-function escapeLikePattern(value) {
-  return value.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
-}
 function insertTag(db, sessionId, messageId, type, byteSize, tagNumber, reasoningByteSize = 0, toolName = null, inputByteSize = 0, toolOwnerMessageId = null, entryFingerprint = null, tokenCounts = null) {
   getInsertTagStatement(db).run(sessionId, messageId, type, byteSize, reasoningByteSize, tagNumber, toolName, inputByteSize, getHarness(), toolOwnerMessageId, entryFingerprint, tokenCounts?.tokenCount ?? null, tokenCounts?.inputTokenCount ?? null, tokenCounts?.reasoningTokenCount ?? null);
   return tagNumber;
@@ -2349,7 +1978,21 @@ function markWhitespaceAssistantTagInert(db, sessionId, tagNumber, contentId) {
              entry_fingerprint = ?
          WHERE session_id = ? AND tag_number = ? AND type = 'message'`).run(`${WHITESPACE_ASSISTANT_INERT_MESSAGE_PREFIX}${tagNumber}`, `${WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX}${contentId}`, sessionId, tagNumber);
 }
-function getInertWhitespaceAssistantTags(db, sessionId) {
+function getInertWhitespaceAssistantTags(db, sessionId, messageIds) {
+  if (messageIds) {
+    const statement = db.prepare(`SELECT tag_number AS tagNumber, entry_fingerprint AS entryFingerprint
+             FROM tags
+             WHERE session_id = ? AND type = 'message' AND status = 'compacted'
+               AND entry_fingerprint >= ? AND entry_fingerprint < ?`);
+    return [...new Set(messageIds)].flatMap((messageId) => {
+      const prefix = `${WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX}${messageId}:p`;
+      const rows = statement.all(sessionId, prefix, `${prefix.slice(0, -1)}q`);
+      return rows.map((row) => ({
+        tagNumber: row.tagNumber,
+        contentId: row.entryFingerprint.slice(WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX.length)
+      }));
+    });
+  }
   const rows = db.prepare(`SELECT tag_number AS tagNumber, entry_fingerprint AS entryFingerprint
              FROM tags
              WHERE session_id = ?
@@ -2452,9 +2095,10 @@ function deleteFoldedDuplicateTag(db, sessionId, tagNumber) {
   foldStatement(db, "DELETE FROM tags WHERE session_id = ? AND tag_number = ?").run(sessionId, tagNumber);
   foldStatement(db, "DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?").run(sessionId, tagNumber);
 }
-function foldDuplicateIntoSurvivor(db, sessionId, survivor, duplicate, duplicateMayHaveQueuedOps = true) {
+function foldDuplicateIntoSurvivor(db, sessionId, survivor, duplicate, duplicateMayHaveQueuedOps = true, propagateDroppedStatus = true) {
   mergeSizeAndTokenColumnsIntoSurvivor(db, sessionId, survivor, duplicate);
-  applyDroppedStatusIfNeeded(db, sessionId, survivor, duplicate);
+  if (propagateDroppedStatus)
+    applyDroppedStatusIfNeeded(db, sessionId, survivor, duplicate);
   if (duplicateMayHaveQueuedOps) {
     retargetPendingOps(db, sessionId, duplicate.tagNumber, survivor.tagNumber);
   }
@@ -2549,7 +2193,7 @@ function foldShrunkPartTags(db, sessionId, messages) {
     for (const orphan of orphans) {
       if (orphan.tagNumber === survivor.tagNumber)
         continue;
-      foldDuplicateIntoSurvivor(db, sessionId, survivor, orphan, queuedTags.any.has(orphan.tagNumber));
+      foldDuplicateIntoSurvivor(db, sessionId, survivor, orphan, queuedTags.any.has(orphan.tagNumber), false);
       result.foldedTagNumbers.push(orphan.tagNumber);
     }
   }
@@ -2558,56 +2202,69 @@ function foldShrunkPartTags(db, sessionId, messages) {
   return result;
 }
 function markTagsCompactedByMessageIds(db, sessionId, messageIds) {
-  const update = db.prepare(`UPDATE tags
-         SET status = 'compacted'
-         WHERE session_id = ?
-           AND status IN ('active', 'dropped')
-           AND (
-               message_id = ?
-               OR message_id LIKE ? ESCAPE '\\'
-               OR message_id LIKE ? ESCAPE '\\'
-               OR tool_owner_message_id = ?
-           )
-         RETURNING id`);
-  return db.transaction(() => {
-    let changed = 0;
-    for (const messageId of new Set(messageIds)) {
-      const escaped = escapeLikePattern(messageId);
-      changed += update.all(sessionId, messageId, `${escaped}:p%`, `${escaped}:file%`, messageId).length;
-    }
-    return changed;
-  }).immediate();
-}
-function deleteTagsByMessageId(db, sessionId, messageId) {
-  const deleteTransaction = db.transaction(() => {
-    const escapedMessageId = escapeLikePattern(messageId);
-    const textPartPattern = `${escapedMessageId}:p%`;
-    const filePartPattern = `${escapedMessageId}:file%`;
-    const messageScopedTags = getTagNumbersByMessageIdStatement(db).all(sessionId, messageId, textPartPattern, filePartPattern).filter(isTagNumberRow).map((row) => row.tag_number);
-    const ownerScopedTagNumbers = getOwnerScopedToolTagNumbers(db, sessionId, messageId);
-    if (messageScopedTags.length === 0 && ownerScopedTagNumbers.length === 0) {
-      return [];
-    }
-    if (messageScopedTags.length > 0) {
-      getDeleteTagsByMessageIdStatement(db).run(sessionId, messageId, textPartPattern, filePartPattern);
-    }
-    if (ownerScopedTagNumbers.length > 0) {
-      deleteToolTagsByOwner(db, sessionId, messageId);
+  const ids = new Set(messageIds);
+  if (ids.size === 0)
+    return 0;
+  const asciiLower = (value) => value.replace(/[A-Z]/g, (char) => char.toLowerCase());
+  const foldedIds = new Set(Array.from(ids, asciiLower));
+  const nulPrefixes = new Set(Array.from(ids).filter((id) => id.includes("\x00")).map((id) => asciiLower(id.split("\x00")[0])));
+  const matches = (messageId, owner) => {
+    if (messageId !== null && ids.has(messageId))
+      return true;
+    if (owner !== null && ids.has(owner))
+      return true;
+    if (messageId === null)
+      return false;
+    const nul = messageId.indexOf("\x00");
+    const value = nul < 0 ? messageId : messageId.slice(0, nul);
+    if (nulPrefixes.size > 0 && nulPrefixes.has(asciiLower(value)))
+      return true;
+    for (let colon = value.indexOf(":");colon >= 0; colon = value.indexOf(":", colon + 1)) {
+      const suffix = value[colon + 1];
+      if ((suffix === "p" || suffix === "P" || asciiLower(value.slice(colon + 1, colon + 5)) === "file") && foldedIds.has(asciiLower(value.slice(0, colon))))
+        return true;
     }
-    const merged = new Set([...messageScopedTags, ...ownerScopedTagNumbers]);
-    return Array.from(merged).sort((a, b) => a - b);
+    return false;
+  };
+  const rows = db.prepare(`WITH ids AS MATERIALIZED (
+            SELECT value AS source_id, lower(value) AS folded_id FROM json_each(?)
+        )
+        SELECT id, message_id, tool_owner_message_id FROM tags INDEXED BY idx_tags_session_tag_number
+        WHERE session_id = ? AND status IN ('active', 'dropped') AND (
+            message_id IN (SELECT source_id FROM ids)
+            OR tool_owner_message_id IN (SELECT source_id FROM ids)
+            OR (instr(lower(message_id), ':p') > 0 AND
+                lower(substr(message_id, 1, instr(lower(message_id), ':p') - 1)) IN (SELECT folded_id FROM ids))
+            OR (instr(lower(message_id), ':file') > 0 AND
+                lower(substr(message_id, 1, instr(lower(message_id), ':file') - 1)) IN (SELECT folded_id FROM ids))
+            OR (? AND instr(message_id, ':') > 0)
+            OR ?
+        )`).all(JSON.stringify(Array.from(ids)), sessionId, Array.from(ids).some((id) => id.includes(":")) ? 1 : 0, nulPrefixes.size > 0 ? 1 : 0);
+  const candidates = rows.filter((row) => matches(row.message_id, row.tool_owner_message_id));
+  if (candidates.length === 0)
+    return 0;
+  const update = db.prepare(`UPDATE tags SET status = 'compacted'
+         WHERE id = ? AND session_id = ?
+            AND status IN ('active', 'dropped')
+            AND message_id IS ? AND tool_owner_message_id IS ?
+          RETURNING id`);
+  let cursor = 0;
+  let changed = 0;
+  const batch = db.transaction(() => {
+    const start = performance.now();
+    let processed = 0;
+    do {
+      const row = candidates[cursor++];
+      if (update.get(row.id, sessionId, row.message_id, row.tool_owner_message_id))
+        changed++;
+      processed++;
+    } while (cursor < candidates.length && processed < 128 && performance.now() - start < 8);
   });
-  return deleteTransaction.immediate();
+  while (cursor < candidates.length)
+    batch.immediate();
+  return changed;
 }
 var getOwnerScopedToolTagNumbersStatements = new WeakMap;
-function getOwnerScopedToolTagNumbers(db, sessionId, ownerMsgId) {
-  let stmt = getOwnerScopedToolTagNumbersStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("SELECT tag_number FROM tags WHERE session_id = ? AND type = 'tool' AND tool_owner_message_id = ? ORDER BY tag_number ASC");
-    getOwnerScopedToolTagNumbersStatements.set(db, stmt);
-  }
-  return stmt.all(sessionId, ownerMsgId).filter(isTagNumberRow).map((row) => row.tag_number);
-}
 function getMaxTagNumberBySession(db, sessionId) {
   const row = getMaxTagNumberBySessionStatement(db).get(sessionId);
   return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
@@ -2722,11 +2379,14 @@ function getTailHygieneTags(db, sessionId) {
   return active;
 }
 function getDroppedTagsBySession(db, sessionId, scope) {
-  const rows = (scope ? db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags
-        WHERE session_id = ? AND status = 'dropped'
-          AND ((type = 'tool' AND tool_owner_message_id IN (SELECT value FROM json_each(?)))
-            OR (type != 'tool' AND message_id IN (SELECT value FROM json_each(?))))
-        ORDER BY tag_number ASC, id ASC`).all(sessionId, JSON.stringify(scope.ownerIds), JSON.stringify(scope.messageAddresses)) : getDroppedTagsBySessionStatement(db).all(sessionId)).filter(isTagRow);
+  const rows = (scope ? db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags INDEXED BY idx_tags_pi_fallback_tool_owner
+        WHERE session_id = ? AND type = 'tool' AND +status = 'dropped'
+          AND tool_owner_message_id IN (SELECT value FROM json_each(?))
+        UNION ALL
+        SELECT ${TAG_SELECT_COLUMNS} FROM tags INDEXED BY idx_tags_session_message_id
+        WHERE session_id = ? AND type != 'tool' AND +status = 'dropped'
+          AND message_id IN (SELECT value FROM json_each(?))
+        ORDER BY tag_number ASC, id ASC`).all(sessionId, JSON.stringify(scope.ownerIds), sessionId, JSON.stringify(scope.messageAddresses)) : getDroppedTagsBySessionStatement(db).all(sessionId)).filter(isTagRow);
   return rows.map(toTagEntry);
 }
 function getTagsByNumbers(db, sessionId, tagNumbers) {
@@ -2868,20 +2528,33 @@ function pickNearestPriorOwner(candidates, currentMessageId, times) {
   }
   return best?.id ?? null;
 }
-function getDeleteToolTagsByOwnerStatement(db) {
-  let stmt = deleteToolTagsByOwnerStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare(`DELETE FROM tags
-             WHERE session_id = ?
-               AND type = 'tool'
-               AND tool_owner_message_id = ?
-             RETURNING id`);
-    deleteToolTagsByOwnerStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function deleteToolTagsByOwner(db, sessionId, ownerMsgId) {
-  return getDeleteToolTagsByOwnerStatement(db).all(sessionId, ownerMsgId).length;
+// src/shared/historian-tool-defaults.json
+var historian_tool_defaults_default = {
+  ctx_note: "Note ${input.action} ${input.note_ids}: ${input.content} → ${output.truncate(160)}",
+  ctx_memory: "Memory ${input.action} ${input.category} ${input.ids}: ${input.content} → ${output.truncate(160)}",
+  todowrite: 'Todos (${input.todos.count}): ${input.todos.each("${status}: ${content}")}',
+  question: 'Asked user: ${input.questions[*].question.join(" / ")} → ${output}',
+  task: "Task ${input.subagent_type}: ${input.prompt} → ${output.truncate(200)}",
+  ask: 'Asked: ${input.question.truncate(250)} [options: ${input.options.join(" / ")}] ${input.resolution} → ${output.truncate(300)}',
+  peer_send: "PM to ${input.agent}${input.agent_id}: ${input.message.truncate(400)}",
+  board: 'Board ${input.verb}: ${input.ops.each("${op} ${item}${lane.title} ${state}${lane.status}${props.text} ${lane.items[*].text}")}',
+  room: "Room ${input.action} ${input.room_id}: ${input.text.truncate(400)}",
+  work: "Work ${input.action} ${input.id}: ${input.prompt_file}${input.prompt.truncate(200)}${input.notes.truncate(200)} → ${output.truncate(160)}",
+  knowhow: "Looked up how-to: ${input.query}${input.id}"
+};
+
+// src/shared/historian-tool-expansions.ts
+function expandToolPart(part, overrides) {
+  if (!part || typeof part !== "object")
+    return null;
+  const p = part;
+  if (p.type !== "tool" || typeof p.tool !== "string")
+    return null;
+  const template = overrides && Object.hasOwn(overrides, p.tool) ? overrides[p.tool] : Object.hasOwn(historian_tool_defaults_default, p.tool) ? historian_tool_defaults_default[p.tool] : undefined;
+  if (typeof template !== "string")
+    return null;
+  const state = p.state;
+  return renderToolTemplate(template, state?.input, state?.output ?? state?.error);
 }
 
 // src/hooks/magic-context/host-served-rows.ts
@@ -3050,8 +2723,8 @@ function readRawSessionMessagesFromDb(db, sessionId) {
     };
   });
 }
-function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER) {
-  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark);
+function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER, after) {
+  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark, after);
   if (messageRows.length === 0)
     return [];
   const placeholders = messageRows.map(() => "?").join(", ");
@@ -3062,15 +2735,22 @@ function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, fin
              ORDER BY message_id ASC, time_created ASC, id ASC`).all(sessionId, ...messageRows.map((row) => row.id)).filter(isRawPartRow);
   return assembleRawMessagePage(messageRows, partRows);
 }
-function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark) {
+function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark, after) {
   const remaining = Math.max(0, Math.floor(finalWatermark) - Math.floor(afterOrdinal));
   const pageSize = Math.min(Math.max(1, Math.floor(limit)), remaining);
   if (pageSize === 0)
     return [];
+  const parameters = [sessionId];
+  if (after)
+    parameters.push(after.timeCreated, after.timeCreated, after.timeCreated, after.id);
+  parameters.push(pageSize);
+  if (!after)
+    parameters.push(Math.max(0, Math.floor(afterOrdinal)));
   return db.prepare(`SELECT id, data, time_created, time_updated
              FROM message
              WHERE session_id = ?
-               AND NOT (
+                ${after ? "AND time_created >= ? AND (time_created > ? OR (time_created = ? AND id > ?))" : ""}
+                AND NOT (
                    CASE WHEN json_valid(data) = 1
                         THEN COALESCE(json_extract(data, '$.summary'), 0)
                         ELSE 0 END = 1
@@ -3079,7 +2759,7 @@ function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWaterma
                             ELSE '' END = 'stop'
                )
              ORDER BY time_created ASC, id ASC
-             LIMIT ? OFFSET ?`).all(sessionId, pageSize, Math.max(0, Math.floor(afterOrdinal))).filter(isRawMessageRow).map((row, index) => ({
+             LIMIT ? ${after ? "" : "OFFSET ?"}`).all(...parameters).filter(isRawMessageRow).map((row, index) => ({
     ...row,
     ordinal: Math.floor(afterOrdinal) + index + 1
   }));
@@ -3132,8 +2812,8 @@ var RAW_SUMMARY_PART_DATA_SQL = `CASE
         )
     )
 END`;
-function readRawSessionMessageSummaryPageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER) {
-  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark);
+function readRawSessionMessageSummaryPageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER, after) {
+  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark, after);
   if (messageRows.length === 0)
     return [];
   const placeholders = messageRows.map(() => "?").join(", ");
@@ -3941,18 +3621,87 @@ function computeRawRangeFingerprint(messages, startInclusive, endExclusive) {
   }
   return pieces.join("|");
 }
-function invalidateTrueRawTokenCache(args) {
-  const sessionNeedle = args.sessionId ? `${args.sessionId}` : null;
-  const messageNeedle = args.messageId ? `\x00${args.messageId}\x00` : null;
-  for (const [key, value] of messageEstimateCache) {
-    const sessionMatches = sessionNeedle === null || key.includes(sessionNeedle);
-    const messageMatches = messageNeedle === null || key.includes(messageNeedle);
-    if (sessionMatches && messageMatches) {
-      messageEstimateCache.delete(key);
-      messageEstimateCacheBytes -= value.keyEstimateBytes;
+
+// src/hooks/magic-context/system-injection-stripper.ts
+var SYSTEM_INJECTION_MARKERS = [
+  "<!-- OMO_INTERNAL_INITIATOR -->",
+  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
+  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
+  "[Category+Skill Reminder]",
+  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
+  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
+  "[EMERGENCY CONTEXT WINDOW WARNING]",
+  "Unstable background agent appears idle",
+  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
+];
+var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
+var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
+var STEERING_WRAPPER_REGEX = /<system-reminder>\nThe user sent the following message:\n[\s\S]*?\n\nPlease address this message and continue with your tasks\.\n<\/system-reminder>/g;
+function stripSystemInjection(text) {
+  STEERING_WRAPPER_REGEX.lastIndex = 0;
+  if (!STEERING_WRAPPER_REGEX.test(text))
+    return stripInjectedRegions(text);
+  STEERING_WRAPPER_REGEX.lastIndex = 0;
+  let result = "";
+  let changed = false;
+  let cursor = 0;
+  const keepOrStrip = (segment) => {
+    const stripped = stripInjectedRegions(segment);
+    if (stripped === null) {
+      result += segment;
+    } else {
+      result += stripped;
+      changed = true;
+    }
+  };
+  for (const match of text.matchAll(STEERING_WRAPPER_REGEX)) {
+    keepOrStrip(text.slice(cursor, match.index));
+    result += match[0];
+    cursor = match.index + match[0].length;
+  }
+  keepOrStrip(text.slice(cursor));
+  return changed ? result.trim() : null;
+}
+function stripOutsideSteeringWrappers(text, strip) {
+  STEERING_WRAPPER_REGEX.lastIndex = 0;
+  let result = "";
+  let cursor = 0;
+  for (const match of text.matchAll(STEERING_WRAPPER_REGEX)) {
+    result += strip(text.slice(cursor, match.index));
+    result += match[0];
+    cursor = match.index + match[0].length;
+  }
+  return result + strip(text.slice(cursor));
+}
+function stripInjectedRegions(text) {
+  let hasInjection = false;
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (text.includes(marker)) {
+      hasInjection = true;
+      break;
     }
   }
-  args.reason;
+  if (SYSTEM_REMINDER_REGEX.test(text))
+    hasInjection = true;
+  SYSTEM_REMINDER_REGEX.lastIndex = 0;
+  if (!hasInjection)
+    return null;
+  let cleaned = text;
+  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
+  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
+  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
+      continue;
+    const idx = cleaned.indexOf(marker);
+    if (idx === -1)
+      continue;
+    const blockEnd = cleaned.indexOf(`
+
+`, idx + marker.length);
+    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
+  }
+  return cleaned.trim();
 }
 
 // src/hooks/magic-context/tag-part-guards.ts
@@ -3984,6 +3733,27 @@ function buildFileSourceContent(parts) {
   return content.length > 0 ? content : null;
 }
 
+// src/shared/user-answer.ts
+function hasUserAnswerMetadata(value) {
+  if (!isRecord(value))
+    return false;
+  if (value.userAnswer === true)
+    return true;
+  if (Array.isArray(value.answers))
+    return true;
+  if (typeof value.answer === "string")
+    return true;
+  if (Array.isArray(value.selectedOptions) || typeof value.customInput === "string")
+    return true;
+  return Array.isArray(value.results) && value.results.some(hasUserAnswerMetadata);
+}
+function toolPartHasUserAnswer(part) {
+  if (!isRecord(part))
+    return false;
+  const state = isRecord(part.state) ? part.state : undefined;
+  return hasUserAnswerMetadata(state?.metadata) || hasUserAnswerMetadata(part.details);
+}
+
 // src/features/magic-context/dreamer/token-budget.ts
 class DreamTokenBudgetExceeded extends Error {
   sessionId;
@@ -4004,9 +3774,6 @@ function registerBudgetFinalizeChild(sessionId, guard) {
 function releaseBudgetFinalizeChild(sessionId) {
   finalizingChildren.delete(sessionId);
 }
-function refuseBudgetedToolCall(sessionId) {
-  return finalizingChildren.get(sessionId)?.refuseTool() ?? null;
-}
 function createDreamTokenBudget(budget) {
   if (!Number.isSafeInteger(budget) || budget <= 0)
     throw new Error("Invalid token budget");
@@ -4023,12 +3790,20 @@ function createDreamTokenBudget(budget) {
   });
   return {
     snapshot,
+    finalize() {
+      if (finalizeFired)
+        return "continue";
+      finalizeFired = true;
+      return "finalize";
+    },
     charge(input, cacheRead, cacheWrite, completed = false, canFinalize = true) {
       for (const value of [input, cacheRead, cacheWrite]) {
         if (!Number.isSafeInteger(value) || value < 0)
           throw new Error("Invalid prompt usage");
       }
       spent += input + cacheRead + cacheWrite;
+      if (completed)
+        return "continue";
       if (spent >= budget)
         return "stop";
       if (!completed && !finalizeFired && spent >= budget * 0.8) {
@@ -4042,7 +3817,7 @@ function createDreamTokenBudget(budget) {
       return "continue";
     },
     refuseTool() {
-      if (!finalizeFired)
+      if (!finalizeFired && !snapshot().hardStopped)
         return null;
       refusedCalls += 1;
       return { message: TOKEN_BUDGET_TOOL_REFUSAL, hardStopped: snapshot().hardStopped };
@@ -4211,23 +3986,6 @@ function assertExecutableToolInput(guard, call) {
   if (refusal !== undefined)
     throw new Error(refusal);
 }
-function createDroppedInputToolExecuteBeforeHook() {
-  const guard = createDroppedInputGuard();
-  return async (input, output) => {
-    const call = isRecord2(input) ? input : {};
-    const args = isRecord2(output) ? output.args : undefined;
-    if (typeof call.sessionID === "string") {
-      const refusal = refuseBudgetedToolCall(call.sessionID);
-      if (refusal)
-        throw new Error(refusal.message);
-    }
-    assertExecutableToolInput(guard, {
-      sessionID: typeof call.sessionID === "string" ? call.sessionID : undefined,
-      toolName: typeof call.tool === "string" ? call.tool : undefined,
-      input: args
-    });
-  };
-}
 
 // src/hooks/magic-context/edit-marker.ts
 var TRUNCATION_SENTINEL = "...[truncated]";
@@ -4259,110 +4017,6 @@ function applyEditMarkerToInput(input) {
   }
 }
 
-// src/features/magic-context/tool-definition-tokens.ts
-import { createHash as createHash2 } from "node:crypto";
-var measurements = new Map;
-var fingerprints = new Map;
-var persistenceDb = null;
-var cachedInsertStmt = null;
-function keyFor(providerID, modelID, agentName) {
-  const agent = agentName && agentName.length > 0 ? agentName : "default";
-  return `${providerID}/${modelID}/${agent}`;
-}
-function fingerprintFor(description, parameters) {
-  return createHash2("sha256").update(description).update("\x00").update(stableStringify(parameters)).digest("hex");
-}
-function getCurrentToolSetHash(providerID, modelID, agentName) {
-  if (!providerID || !modelID)
-    return "";
-  const toolIds = measurements.get(keyFor(providerID, modelID, agentName));
-  if (!toolIds || toolIds.size === 0)
-    return "";
-  return createHash2("sha256").update(Array.from(toolIds.keys()).sort().join("\x00")).digest("hex");
-}
-function setDatabase(db) {
-  persistenceDb = db;
-  cachedInsertStmt = null;
-}
-function loadToolDefinitionMeasurements(db) {
-  let rows = [];
-  try {
-    rows = db.prepare("SELECT provider_id, model_id, agent_name, tool_id, token_count FROM tool_definition_measurements").all();
-  } catch {
-    return;
-  }
-  for (const row of rows) {
-    const key = keyFor(row.provider_id, row.model_id, row.agent_name);
-    let inner = measurements.get(key);
-    if (!inner) {
-      inner = new Map;
-      measurements.set(key, inner);
-    }
-    inner.set(row.tool_id, row.token_count);
-  }
-}
-function recordToolDefinition(providerID, modelID, agentName, toolID, description, parameters) {
-  if (!providerID || !modelID || !toolID)
-    return;
-  const key = keyFor(providerID, modelID, agentName);
-  const fp = fingerprintFor(description ?? "", parameters);
-  let innerFp = fingerprints.get(key);
-  if (innerFp && innerFp.get(toolID) === fp)
-    return;
-  let paramsText = "";
-  try {
-    paramsText = parameters === undefined ? "" : JSON.stringify(parameters);
-  } catch {
-    paramsText = "";
-  }
-  const tokens = estimateTokens(description ?? "") + estimateTokens(paramsText);
-  let inner = measurements.get(key);
-  if (!inner) {
-    inner = new Map;
-    measurements.set(key, inner);
-  }
-  inner.set(toolID, tokens);
-  if (!innerFp) {
-    innerFp = new Map;
-    fingerprints.set(key, innerFp);
-  }
-  innerFp.set(toolID, fp);
-  if (persistenceDb) {
-    try {
-      const agent = agentName && agentName.length > 0 ? agentName : "default";
-      if (!cachedInsertStmt) {
-        cachedInsertStmt = persistenceDb.prepare(`INSERT OR REPLACE INTO tool_definition_measurements
-                     (provider_id, model_id, agent_name, tool_id, token_count, recorded_at)
-                     VALUES (?, ?, ?, ?, ?, ?)`);
-      }
-      cachedInsertStmt.run(providerID, modelID, agent, toolID, tokens, Date.now());
-    } catch {
-      cachedInsertStmt = null;
-    }
-  }
-}
-function getLargestMeasuredToolDefinitionTokens() {
-  let largest = 0;
-  for (const tools of measurements.values()) {
-    let total = 0;
-    for (const tokens of tools.values())
-      total += tokens;
-    largest = Math.max(largest, total);
-  }
-  return largest > 0 ? largest : undefined;
-}
-function getMeasuredToolDefinitionTokens(providerID, modelID, agentName) {
-  if (!providerID || !modelID)
-    return;
-  const inner = measurements.get(keyFor(providerID, modelID, agentName));
-  if (!inner || inner.size === 0)
-    return;
-  let total = 0;
-  for (const tokens of inner.values())
-    total += tokens;
-  return total;
-}
-
 // src/hooks/magic-context/final-wire-token-estimate.ts
 function compactWireLabel(value, fallback) {
   if (typeof value !== "string" || value.length === 0)
@@ -4387,75 +4041,104 @@ function describeFinalWireTail(messages) {
     return `${role}:${kinds}`;
   }).join(", ")}]`;
 }
-function serializedTokens(value) {
+function serializedText(value) {
   if (value === undefined)
-    return 0;
-  const serialized = typeof value === "string" ? value : JSON.stringify(value);
+    return "";
+  return (typeof value === "string" ? value : JSON.stringify(value)) ?? "";
+}
+function serializedTokens(value) {
+  const serialized = serializedText(value);
   return serialized ? estimateTokens(serialized) : 0;
 }
-function estimateMessageTokens(message) {
-  let conversation = 0;
-  let toolCall = 0;
+function visitWireContent(message, visit) {
   for (const part of message.parts) {
     if (!part || typeof part !== "object")
       continue;
     const p = part;
     if (p.ignored)
       continue;
+    const text = (value) => {
+      if (typeof value === "string")
+        visit.text("conversation", value);
+    };
+    const tool = (value) => visit.text("toolCall", value);
     switch (p.type) {
       case "text":
-        if (typeof p.text === "string")
-          conversation += estimateTokens(p.text);
+        text(p.text);
         break;
-      case "reasoning": {
-        if (typeof p.text === "string")
-          conversation += estimateTokens(p.text);
-        const signature = p.metadata?.anthropic?.signature;
-        if (typeof signature === "string")
-          conversation += estimateTokens(signature);
+      case "reasoning":
+        text(p.text);
+        text(p.metadata?.anthropic?.signature);
         break;
-      }
       case "thinking":
-        if (typeof p.thinking === "string")
-          conversation += estimateTokens(p.thinking);
-        if (typeof p.signature === "string")
-          conversation += estimateTokens(p.signature);
+        text(p.thinking);
+        text(p.signature);
         break;
       case "redacted_thinking":
-        if (typeof p.data === "string")
-          conversation += estimateTokens(p.data);
+        text(p.data);
         break;
       case "file":
         if (typeof p.mime === "string" && p.mime.startsWith("image/")) {
-          conversation += typeof p.url === "string" && p.url.startsWith("data:") ? estimateImageTokensFromDataUrl(p.url) : 1200;
+          visit.image("conversation", typeof p.url === "string" && p.url.startsWith("data:") ? estimateImageTokensFromDataUrl(p.url) : 1200);
         }
         break;
       case "tool":
-        toolCall += serializedTokens(p.state?.input ?? p.input ?? p.args);
-        toolCall += serializedTokens(p.state?.output ?? p.state?.content ?? p.output ?? p.result ?? p.content);
-        toolCall += serializedTokens(p.state?.error);
-        toolCall += estimateToolAttachmentImageTokens(p.state);
+        tool(p.state?.input ?? p.input ?? p.args);
+        tool(p.state?.output ?? p.state?.content ?? p.output ?? p.result ?? p.content);
+        tool(p.state?.error);
+        visit.image("toolCall", estimateToolAttachmentImageTokens(p.state));
         break;
       case "tool-call":
-        toolCall += serializedTokens(p.input ?? p.args);
+        tool(p.input ?? p.args);
         break;
       case "tool-invocation":
-        toolCall += serializedTokens(p.args ?? p.input);
-        toolCall += serializedTokens(p.result ?? p.output ?? p.state?.output);
-        toolCall += serializedTokens(p.state?.error);
+        tool(p.args ?? p.input);
+        tool(p.result ?? p.output ?? p.state?.output);
+        tool(p.state?.error);
         break;
       case "tool-result":
-        toolCall += serializedTokens(p.result ?? p.content ?? p.output);
+        tool(p.result ?? p.content ?? p.output);
         break;
       case "tool_use":
-        toolCall += serializedTokens(p.input ?? p.args);
+        tool(p.input ?? p.args);
         break;
       case "tool_result":
-        toolCall += serializedTokens(p.content ?? p.result ?? p.output);
+        tool(p.content ?? p.result ?? p.output);
         break;
     }
   }
-  return { conversation, toolCall };
+}
+function estimateMessageTokens(message) {
+  const total = { conversation: 0, toolCall: 0 };
+  visitWireContent(message, {
+    text: (bucket, value) => {
+      total[bucket] += serializedTokens(value);
+    },
+    image: (bucket, tokens) => {
+      total[bucket] += tokens;
+    }
+  });
+  return total;
+}
+function wireContentBytes(messages, abortAboveBytes, bytesPerToken) {
+  let bytes = 0;
+  try {
+    for (const message of messages) {
+      visitWireContent(message, {
+        text: (_bucket, value) => {
+          bytes += Buffer.byteLength(serializedText(value));
+        },
+        image: (_bucket, tokens) => {
+          bytes += tokens * bytesPerToken;
+        }
+      });
+      if (bytes > abortAboveBytes)
+        return { bytes, aborted: true };
+    }
+  } catch {
+    return null;
+  }
+  return { bytes, aborted: false };
 }
 function estimateFinalWireInputTokens(input) {
   const messageTokens = input.messages.reduce((total, message) => {
@@ -4486,7 +4169,8 @@ function estimateFinalWireInputTokens(input) {
     componentsComplete: toolDefinitions !== undefined && input.messages.every(hasCountableParts),
     messageTokens,
     systemTokens,
-    toolDefinitionTokens
+    toolDefinitionTokens,
+    toolDefinitionsMeasured: measuredToolDefinitions !== undefined
   };
 }
 function hasCountableParts(message) {
@@ -4531,6 +4215,310 @@ function hasCountableParts(message) {
   });
 }
 
+// src/features/magic-context/overflow-detection.ts
+var OVERFLOW_PATTERNS = [
+  /prompt is too long/i,
+  /input is too long for requested model/i,
+  /exceeds the context window/i,
+  /input token count.*exceeds the maximum/i,
+  /maximum prompt length is \d+/i,
+  /reduce the length of the messages/i,
+  /maximum context length is \d+ tokens/i,
+  /maximum model length is \d+/i,
+  /exceeds the limit of \d+/i,
+  /exceeds the available context size/i,
+  /greater than the context length/i,
+  /context window exceeds limit/i,
+  /exceeded model token limit/i,
+  /context[_ ]length[_ ]exceeded/i,
+  /request entity too large/i,
+  /context length is only \d+ tokens/i,
+  /input length.*exceeds.*context length/i,
+  /prompt too long; exceeded (?:max )?context length/i,
+  /too large for model with \d+ maximum context length/i,
+  /model_context_window_exceeded/i,
+  /context size has been exceeded/i,
+  /prepared prompt exceeds engine max_context/i,
+  /prompt exceeds (?:the )?.{0,32}\bmax_context\b/i
+];
+var LIMIT_EXTRACTION_PATTERNS = [
+  { pattern: /maximum prompt length is (\d+)/i, provenance: "prompt_only" },
+  {
+    pattern: /maximum context length is (\d+) tokens?/i,
+    provenance: "combined"
+  },
+  { pattern: /maximum model length is (\d+)/i, provenance: "combined" },
+  { pattern: /context length is only (\d+) tokens?/i, provenance: "combined" },
+  { pattern: /exceeds the limit of (\d+)/i, provenance: "unknown" },
+  {
+    pattern: /too large for model with (\d+) maximum context length/i,
+    provenance: "combined"
+  },
+  { pattern: /context size[^0-9]{0,40}(\d{4,})\s*tokens?/i, provenance: "combined" },
+  { pattern: /exceeds? the context length of (\d+)/i, provenance: "combined" },
+  {
+    pattern: />\s*(\d+)\s*(?:tokens?\s*)?(?:maximum|max|limit)\b/i,
+    provenance: "prompt_only"
+  },
+  {
+    pattern: /maximum number of tokens allowed\s*\(?\s*(\d+)/i,
+    provenance: "prompt_only"
+  },
+  { pattern: /prepared prompt exceeds engine max_context\s+(\d+)/i, provenance: "unknown" },
+  { pattern: /prompt exceeds (?:the )?.{0,32}\bmax_context\s+(\d+)/i, provenance: "unknown" },
+  { pattern: /max(?:imum)?.*context.*?(\d+)/i, provenance: "unknown" }
+];
+var MIN_PLAUSIBLE_LIMIT = 1024;
+var MAX_PLAUSIBLE_LIMIT = 1e7;
+function extractErrorMessage(error) {
+  if (!error)
+    return "";
+  if (typeof error === "string")
+    return error;
+  if (typeof error === "object") {
+    const obj = error;
+    const nested = obj.error;
+    if (nested && typeof nested.message === "string" && nested.message.length > 0) {
+      return nested.message;
+    }
+  }
+  if (error instanceof Error)
+    return error.message;
+  if (typeof error === "object") {
+    const obj = error;
+    if (typeof obj.message === "string")
+      return obj.message;
+    if (typeof obj.responseBody === "string")
+      return obj.responseBody;
+    try {
+      return JSON.stringify(error);
+    } catch {
+      return String(error);
+    }
+  }
+  return String(error);
+}
+var PREFIX_BOUND_THINKING_MODELS = [
+  ["fable", 5, 1],
+  ["opus", 5, 5],
+  ["sonnet", 5, 5]
+];
+var PREFIX_BOUND_THINKING_PATTERN = new RegExp(`(?:^|[-_.:/])(?:${PREFIX_BOUND_THINKING_MODELS.map(([family, major, minor]) => `${family}[-_.]?${major}[-_.]${minor}`).join("|")})(?:$|[-_.:/@])`, "i");
+function isPrefixBoundThinkingModel(_providerID, modelID) {
+  if (!modelID)
+    return false;
+  return PREFIX_BOUND_THINKING_PATTERN.test(modelID);
+}
+function isFable51ThinkingBindingModel(providerID, modelID) {
+  if (providerID?.toLowerCase() !== "anthropic" || !modelID)
+    return false;
+  return /(?:^|[-_.])fable[-_.]?5[-_.]1(?:$|[-_.])/i.test(modelID);
+}
+function detectOverflow(error) {
+  const message = extractErrorMessage(error);
+  if (!message) {
+    return { isOverflow: false };
+  }
+  const hasStatus413 = /\b413\b/.test(message) && /(entity|payload|context|prompt)/i.test(message);
+  let matched;
+  for (const pattern of OVERFLOW_PATTERNS) {
+    if (pattern.test(message)) {
+      matched = pattern;
+      break;
+    }
+  }
+  if (!matched && !hasStatus413) {
+    return { isOverflow: false };
+  }
+  const reportedLimit = parseReportedLimit(message);
+  const reportedInputTokens = parseReportedInputTokens(message);
+  return {
+    isOverflow: true,
+    reportedInputTokens,
+    reportedLimit: reportedLimit?.value,
+    reportedLimitProvenance: reportedLimit?.provenance,
+    matchedPattern: matched?.source
+  };
+}
+function parseReportedInputTokens(message) {
+  if (!message)
+    return;
+  const patterns = [
+    /prompt is too long:\s*(\d+)/i,
+    /input token count\s*\(?\s*(\d+)/i,
+    /input length\s*(\d+)/i,
+    /prompt was\s*(\d+)/i,
+    /messages resulted in\s*(\d+)\s*tokens?/i
+  ];
+  for (const pattern of patterns) {
+    const raw = message.match(pattern)?.[1];
+    if (!raw)
+      continue;
+    const value = Number.parseInt(raw, 10);
+    if (Number.isFinite(value) && value > 0)
+      return value;
+  }
+  return;
+}
+function parseReportedLimit(message) {
+  if (!message)
+    return;
+  for (const { pattern, provenance } of LIMIT_EXTRACTION_PATTERNS) {
+    const match = message.match(pattern);
+    if (!match)
+      continue;
+    const raw = match[1];
+    if (!raw)
+      continue;
+    const value = Number.parseInt(raw, 10);
+    if (!Number.isFinite(value))
+      continue;
+    if (value < MIN_PLAUSIBLE_LIMIT || value > MAX_PLAUSIBLE_LIMIT)
+      continue;
+    return { value, provenance };
+  }
+  return;
+}
+
+// src/hooks/magic-context/sentinel.ts
+var WHOLE_MESSAGE_PLACEHOLDER_TEXT = "[dropped]";
+function modelAcceptsEmptyContent(providerID) {
+  return providerID === "anthropic";
+}
+function isAnthropicFamilyRoute(providerID, modelID) {
+  const provider = (providerID ?? "").toLowerCase();
+  const model = (modelID ?? "").toLowerCase();
+  return provider.includes("anthropic") || model.includes("claude") || model.includes("anthropic");
+}
+var REMOVED_REASONING_MARK = Symbol.for("magic-context.removed-reasoning");
+var NEUTRALIZED_ORIGINALS = new WeakMap;
+function neutralizeDroppedReasoningPart(part) {
+  if (!isRecord(part))
+    return;
+  if (part.thinking === undefined && part.text === undefined)
+    return;
+  if (part.type === "text")
+    return;
+  NEUTRALIZED_ORIGINALS.set(part, { ...part });
+  const cacheControl = part.cache_control;
+  const cacheControlCamel = part.cacheControl;
+  for (const key of Object.keys(part))
+    delete part[key];
+  part.type = "text";
+  part.text = "";
+  if (cacheControl !== undefined)
+    part.cache_control = cacheControl;
+  if (cacheControlCamel !== undefined)
+    part.cacheControl = cacheControlCamel;
+  Object.defineProperty(part, REMOVED_REASONING_MARK, {
+    value: true,
+    enumerable: false,
+    configurable: true
+  });
+}
+function restoreNeutralizedReasoningPart(part, legacyCleared) {
+  if (!isRecord(part))
+    return false;
+  const original = NEUTRALIZED_ORIGINALS.get(part);
+  if (!original)
+    return false;
+  for (const key of Object.keys(part))
+    delete part[key];
+  Object.assign(part, original);
+  if (legacyCleared) {
+    if (part.thinking !== undefined)
+      part.thinking = "[cleared]";
+    if (part.text !== undefined)
+      part.text = "[cleared]";
+  }
+  NEUTRALIZED_ORIGINALS.delete(part);
+  delete part[REMOVED_REASONING_MARK];
+  return true;
+}
+function isNeutralizedReasoningPart(part) {
+  return isRecord(part) && part[REMOVED_REASONING_MARK] === true;
+}
+var VARIANT_CACHE_PRESERVING_MODELS = {
+  "anthropic/claude-fable-5-1": "2026-09-02",
+  "openai/gpt-6-astra": "2026-09-05",
+  "anthropic/claude-opus-5-5": "2026-09-23"
+};
+function canonicalVariantModelIdentity(providerID, modelID) {
+  const normalizedProviderID = providerID.toLowerCase();
+  const isAnthropicFamily = normalizedProviderID === "anthropic" || normalizedProviderID === "google-vertex-anthropic" || normalizedProviderID.includes("bedrock");
+  if (isAnthropicFamily && isFable51ThinkingBindingModel("anthropic", modelID)) {
+    return "anthropic/claude-fable-5-1";
+  }
+  return canonicalModelIdentity(`${providerID}/${modelID}`).toLowerCase();
+}
+function variantChangeBustsProviderCache(providerID, modelID) {
+  if (!providerID || !modelID)
+    return false;
+  const identity = canonicalVariantModelIdentity(providerID, modelID);
+  if (Object.hasOwn(VARIANT_CACHE_PRESERVING_MODELS, identity))
+    return false;
+  const normalizedProviderID = providerID.toLowerCase();
+  return normalizedProviderID === "anthropic" || normalizedProviderID === "google-vertex-anthropic" || normalizedProviderID.includes("bedrock");
+}
+function makeSentinel(originalPart) {
+  const sentinel = {
+    type: "text",
+    text: ""
+  };
+  if (isRecord(originalPart)) {
+    if (originalPart.cache_control !== undefined) {
+      sentinel.cache_control = originalPart.cache_control;
+    }
+    if (originalPart.cacheControl !== undefined) {
+      sentinel.cacheControl = originalPart.cacheControl;
+    }
+  }
+  return sentinel;
+}
+function makeWholeMessageSentinel(providerID) {
+  return {
+    type: "text",
+    text: modelAcceptsEmptyContent(providerID) ? "" : WHOLE_MESSAGE_PLACEHOLDER_TEXT
+  };
+}
+function isSentinel(part) {
+  if (!isRecord(part))
+    return false;
+  if (part.type !== "text")
+    return false;
+  if (typeof part.text !== "string")
+    return false;
+  return part.text === "" || part.text === WHOLE_MESSAGE_PLACEHOLDER_TEXT;
+}
+function replaySentinelByMessageIds(messages, ids, providerID, hiddenSeamIds = new Set) {
+  if (ids.size === 0)
+    return { replayed: 0, missingIds: [] };
+  const seen = new Set;
+  let replayed = 0;
+  for (let index = messages.length - 1;index >= 0; index -= 1) {
+    const msg = messages[index];
+    const id = msg.info.id;
+    if (!id || !ids.has(id))
+      continue;
+    seen.add(id);
+    if (!modelAcceptsEmptyContent(providerID) && hiddenSeamIds.has(id)) {
+      messages.splice(index, 1);
+      replayed += 1;
+      continue;
+    }
+    if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
+      continue;
+    msg.parts.length = 0;
+    msg.parts.push(makeWholeMessageSentinel(providerID));
+    replayed += 1;
+  }
+  const missingIds = [];
+  for (const id of ids)
+    if (!seen.has(id))
+      missingIds.push(id);
+  return { replayed, missingIds };
+}
+
 // src/hooks/magic-context/tool-input-size.ts
 var SKELETON_REAL_INPUT_MAX_BYTES = 1024;
 var encoder2 = new TextEncoder;
@@ -4713,12 +4701,8 @@ function hasMeaningfulPart(part) {
   return true;
 }
 function clearThinkingParts(thinkingParts) {
-  for (const part of thinkingParts) {
-    if (part.thinking !== undefined)
-      part.thinking = "[cleared]";
-    if (part.text !== undefined)
-      part.text = "[cleared]";
-  }
+  for (const part of thinkingParts)
+    neutralizeDroppedReasoningPart(part);
 }
 function messageHasNativeReasoning(message) {
   return message.parts.some((part) => {
@@ -4963,7 +4947,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
     },
     canDrop: () => {
       const entry = index.get(compositeKey);
-      return !!entry && entry.occurrences.length > 0 && entry.hasResult;
+      return !!entry && entry.occurrences.length > 0 && entry.hasResult && !entry.occurrences.some((occurrence) => toolPartHasUserAnswer(occurrence.part));
     },
     requiresToolArcSkeleton: thinkingParts.length > 0 || (index.get(compositeKey)?.occurrences.some((occurrence) => messageHasNativeReasoning(occurrence.message)) ?? false),
     readInput: () => {
@@ -5012,29 +4996,77 @@ var sessionProviders = new Map;
 function resolveHostServedBoundaryId2(sessionId, messageId) {
   if (messageId.length === 0)
     return messageId;
-  return sessionProviders.get(sessionId)?.readServedBoundaryId?.(messageId) ?? messageId;
+  return sessionProviders.get(sessionId)?.provider.readServedBoundaryId?.(messageId) ?? messageId;
 }
 function hasRawMessageProvider2(sessionId) {
   return sessionProviders.has(sessionId);
 }
 function setRawMessageProvider2(sessionId, provider) {
-  sessionProviders.set(sessionId, provider);
+  const current = sessionProviders.get(sessionId);
+  const registration = current?.provider === provider ? current : { provider, scopes: 0 };
+  registration.scopes += 1;
+  sessionProviders.set(sessionId, registration);
+  let active = true;
   return () => {
-    const current = sessionProviders.get(sessionId);
-    if (current === provider)
+    if (!active)
+      return;
+    active = false;
+    registration.scopes -= 1;
+    if (registration.scopes === 0 && sessionProviders.get(sessionId) === registration) {
       sessionProviders.delete(sessionId);
+    }
   };
 }
+var boundedProviderWrappers = new WeakMap;
 function setBoundedRawMessageProvider2(sessionId, provider) {
-  return setRawMessageProvider2(sessionId, {
-    ...provider,
-    readMessages: () => {
-      throw new Error("Bounded raw-message providers cannot read complete history; full reads are reserved for store-generation conversion");
-    }
-  });
+  let wrapper = boundedProviderWrappers.get(provider);
+  if (!wrapper) {
+    wrapper = {
+      ...provider,
+      readMessages: () => {
+        throw new Error("Bounded raw-message providers cannot read complete history; full reads are reserved for store-generation conversion");
+      }
+    };
+    boundedProviderWrappers.set(provider, wrapper);
+  }
+  return setRawMessageProvider2(sessionId, wrapper);
+}
+function withRawMessageProvider2(sessionId, provider, fn) {
+  const cleanup = setRawMessageProvider2(sessionId, provider);
+  let result;
+  try {
+    result = fn();
+  } catch (error) {
+    cleanup();
+    throw error;
+  }
+  if (result !== null && typeof result === "object" && typeof result.then === "function") {
+    return result.finally(cleanup);
+  }
+  cleanup();
+  return result;
 }
+var SYSTEM_REMINDER_BLOCK_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
 function cleanUserText2(text) {
-  return removeSystemReminders(text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
+  return stripOutsideSteeringWrappers(text, (segment) => segment.replace(SYSTEM_REMINDER_BLOCK_REGEX, "").replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
+}
+function hasMeaningfulChunkUserText(parts) {
+  for (const part of parts) {
+    if (part === null || typeof part !== "object")
+      continue;
+    const candidate = part;
+    if (candidate.type !== "text" || typeof candidate.text !== "string")
+      continue;
+    if (candidate.ignored === true)
+      continue;
+    const cleaned = cleanUserText2(candidate.text);
+    if (!cleaned)
+      continue;
+    if (isSystemDirective(cleaned))
+      continue;
+    return true;
+  }
+  return false;
 }
 function withRawSessionMessageCache2(fn) {
   const outerCache = activeRawMessageCache;
@@ -5070,7 +5102,7 @@ function readRawSessionMessages2(sessionId) {
   return readRawSessionMessagesFromSource(sessionId);
 }
 function readRawSessionMessagePage2(sessionId, afterOrdinal, limit, finalWatermark) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessagePage) {
     return provider.readMessagePage(afterOrdinal, limit, finalWatermark);
   }
@@ -5082,7 +5114,7 @@ function readRawSessionMessagePage2(sessionId, afterOrdinal, limit, finalWaterma
   return withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark));
 }
 function getRawSessionMessageOrdinalCount2(sessionId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
     if (provider.getMessageCount)
       return provider.getMessageCount();
@@ -5095,7 +5127,9 @@ function getRawSessionMessageOrdinalCount2(sessionId) {
 }
 var RAW_MESSAGE_RANGE_PAGE_SIZE = 100;
 function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider?.iterateMessageRange)
+    return [...provider.iterateMessageRange(fromOrdinal, toOrdinal)];
   if (provider && !provider.readMessagePage) {
     return provider.readMessages().filter((message) => message.ordinal >= fromOrdinal && message.ordinal <= toOrdinal);
   }
@@ -5103,9 +5137,10 @@ function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal)
     return [];
   const messages = [];
   let afterOrdinal = fromOrdinal - 1;
+  let after;
   while (afterOrdinal < toOrdinal) {
     const limit = Math.min(RAW_MESSAGE_RANGE_PAGE_SIZE, toOrdinal - afterOrdinal);
-    const page = provider?.readMessagePage ? provider.readMessagePage(afterOrdinal, limit, toOrdinal) : withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, toOrdinal));
+    const page = provider?.readMessagePage ? provider.readMessagePage(afterOrdinal, limit, toOrdinal, after) : withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, toOrdinal, after));
     if (page.length === 0)
       break;
     let nextOrdinal = afterOrdinal;
@@ -5118,16 +5153,25 @@ function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal)
     if (nextOrdinal <= afterOrdinal)
       break;
     afterOrdinal = nextOrdinal;
+    const last = page.at(-1);
+    after = last ? { timeCreated: last.createdAt ?? 0, id: last.id } : undefined;
   }
   return messages;
 }
-var RAW_MESSAGE_VISIT_PAGE_SIZE = 50;
+var RAW_MESSAGE_VISIT_PAGE_SIZE2 = 50;
 function visitRawSessionMessages2(sessionId, fromOrdinal, toOrdinal, visit, options = {}) {
   const from = Math.max(1, Math.floor(fromOrdinal));
   const to = Math.floor(toOrdinal);
   if (to < from)
     return;
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider?.iterateMessageRange) {
+    for (const message of provider.iterateMessageRange(from, to)) {
+      if (!visit(message))
+        return;
+    }
+    return;
+  }
   if (provider && !provider.readMessagePage) {
     for (const message of provider.readMessages()) {
       if (message.ordinal < from || message.ordinal > to)
@@ -5139,12 +5183,13 @@ function visitRawSessionMessages2(sessionId, fromOrdinal, toOrdinal, visit, opti
   }
   if (!provider && !openCodeDbExists())
     return;
-  const pageSize = Math.max(1, Math.floor(options.pageSize ?? RAW_MESSAGE_VISIT_PAGE_SIZE));
+  const pageSize = Math.max(1, Math.floor(options.pageSize ?? RAW_MESSAGE_VISIT_PAGE_SIZE2));
   let afterOrdinal = from - 1;
+  let after;
   while (afterOrdinal < to) {
     const limit = Math.min(pageSize, to - afterOrdinal);
     const cursor = afterOrdinal;
-    const page = provider?.readMessagePage ? provider.readMessagePage(cursor, limit, to) : withReadOnlySessionDb((db) => options.summary ? readRawSessionMessageSummaryPageFromDb(db, sessionId, cursor, limit, to) : readRawSessionMessagePageFromDb(db, sessionId, cursor, limit, to));
+    const page = provider?.readMessagePage ? provider.readMessagePage(cursor, limit, to, after) : withReadOnlySessionDb((db) => options.summary ? readRawSessionMessageSummaryPageFromDb(db, sessionId, cursor, limit, to, after) : readRawSessionMessagePageFromDb(db, sessionId, cursor, limit, to, after));
     if (page.length === 0)
       return;
     let nextOrdinal = afterOrdinal;
@@ -5158,6 +5203,8 @@ function visitRawSessionMessages2(sessionId, fromOrdinal, toOrdinal, visit, opti
     if (nextOrdinal <= afterOrdinal)
       return;
     afterOrdinal = nextOrdinal;
+    const last = page.at(-1);
+    after = last ? { timeCreated: last.createdAt ?? 0, id: last.id } : undefined;
   }
 }
 function readRawSessionMessageRange2(sessionId, fromOrdinal, toOrdinal) {
@@ -5194,7 +5241,7 @@ function primeTailRawMessageCache2(args) {
     return false;
   if (lastCompartmentEnd < 1 || !anchorMessageId)
     return false;
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
     if (!provider.readMessagePage || !provider.getMessageCount)
       return false;
@@ -5242,7 +5289,7 @@ function primeInMemoryTailRawMessageCache2(args) {
   return true;
 }
 function readRawSessionMessageOrdinalPage2(sessionId, after, limit) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessageOrdinalPage)
     return provider.readMessageOrdinalPage(after, limit);
   if (provider) {
@@ -5259,7 +5306,7 @@ function readRawSessionMessageOrdinalPage2(sessionId, after, limit) {
   return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalPageFromDb(db, sessionId, after, limit));
 }
 function getRawSessionStoredMessageCount2(sessionId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.getStoredMessageCount)
     return provider.getStoredMessageCount();
   if (provider)
@@ -5273,15 +5320,19 @@ function readRawSessionMessageIdOrdinalsForRange2(sessionId, fromOrdinal, toOrdi
   const to = Math.floor(toOrdinal);
   if (to < from)
     return new Map;
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessageIdOrdinalsForRange) {
     return provider.readMessageIdOrdinalsForRange(from, to);
   }
   const all = provider?.readMessageIdOrdinals ? provider.readMessageIdOrdinals() : provider ? new Map(provider.readMessages().map((message) => [message.id, message.ordinal])) : !openCodeDbExists() ? new Map : withReadOnlySessionDb((db) => readRawSessionMessageIdOrdinalsFromDb(db, sessionId));
   return new Map([...all].filter(([, ordinal]) => ordinal >= from && ordinal <= to));
 }
+function readRawSessionMessageIdOrdinals2(sessionId) {
+  const count = getRawSessionMessageOrdinalCount2(sessionId);
+  return readRawSessionMessageIdOrdinalsForRange2(sessionId, 1, count);
+}
 function readRawSessionMessagePartsById2(sessionId, messageId, onQuery) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessagePartsById)
     return provider.readMessagePartsById(messageId);
   if (provider?.readMessageById)
@@ -5294,13 +5345,13 @@ function readRawSessionMessagePartsById2(sessionId, messageId, onQuery) {
   return withReadOnlySessionDb((db) => readRawSessionMessagePartsByIdFromDb(db, sessionId, messageId, onQuery));
 }
 function hasRawSessionMessageById2(sessionId, messageId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.hasMessageById)
     return provider.hasMessageById(messageId);
   return readRawSessionMessageById2(sessionId, messageId) !== null;
 }
 function readRawSessionMessageOrdinalById2(sessionId, messageId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessageOrdinalById) {
     return provider.readMessageOrdinalById(messageId);
   }
@@ -5337,7 +5388,7 @@ function readRawSessionMessageOrdinalById2(sessionId, messageId) {
   return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalByIdFromDb(db, sessionId, messageId));
 }
 function compareRawSessionMessageOrder2(sessionId, leftId, rightId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
     if (!provider.readMessageOrdinalById)
       return null;
@@ -5361,7 +5412,7 @@ function compareRawSessionMessageOrder2(sessionId, leftId, rightId) {
   });
 }
 function readRawSessionMessageById2(sessionId, messageId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessageById) {
     return provider.readMessageById(messageId);
   }
@@ -5373,7 +5424,7 @@ function readRawSessionMessageById2(sessionId, messageId) {
   return withReadOnlySessionDb((db) => readRawSessionMessageByIdFromDb(db, sessionId, messageId));
 }
 function readRawSessionMessagesFromSource(sessionId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider)
     return provider.readMessages();
   if (!openCodeDbExists())
@@ -5381,7 +5432,7 @@ function readRawSessionMessagesFromSource(sessionId) {
   return withReadOnlySessionDb((db) => readRawSessionMessagesFromDb(db, sessionId));
 }
 function getRawSessionMessageCount2(sessionId) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
     if (provider.getMessageCount)
       return provider.getMessageCount();
@@ -5392,7 +5443,7 @@ function getRawSessionMessageCount2(sessionId) {
     return 0;
   return withReadOnlySessionDb((db) => getRawSessionMessageCountFromDb(db, sessionId));
 }
-var RAW_SESSION_TAG_KEY_PAGE_SIZE = 32;
+var RAW_SESSION_TAG_KEY_PAGE_SIZE2 = 32;
 function yieldRawSessionTagKeyPage() {
   return new Promise((resolve) => {
     const immediate = globalThis.setImmediate;
@@ -5410,7 +5461,7 @@ async function getRawSessionTagKeysThrough2(sessionId, upToMessageIndex, options
   const candidateOwnersByCallId = new Map;
   const messageTimesById = new Map;
   const finalWatermark = Number.isFinite(upToMessageIndex) ? Math.max(0, Math.floor(upToMessageIndex)) : getRawSessionMessageOrdinalCount2(sessionId);
-  const pageSize = Number.isFinite(options.pageSize) ? Math.max(1, Math.floor(options.pageSize ?? RAW_SESSION_TAG_KEY_PAGE_SIZE)) : RAW_SESSION_TAG_KEY_PAGE_SIZE;
+  const pageSize = Number.isFinite(options.pageSize) ? Math.max(1, Math.floor(options.pageSize ?? RAW_SESSION_TAG_KEY_PAGE_SIZE2)) : RAW_SESSION_TAG_KEY_PAGE_SIZE2;
   const yieldToEventLoop = options.yieldToEventLoop ?? yieldRawSessionTagKeyPage;
   const nearestPersistedOwner = (callId, currentMessageId) => {
     if (!options.db)
@@ -5508,11 +5559,42 @@ function getLegacyProtectedTailStartOrdinal2(sessionId) {
   }
   return userOrdinals.length < PROTECTED_TAIL_USER_TURNS ? 1 : userOrdinals[PROTECTED_TAIL_USER_TURNS - 1] ?? 1;
 }
-function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal) {
+function getProtectedTailStartOrdinal2(sessionId) {
+  return getLegacyProtectedTailStartOrdinal2(sessionId);
+}
+function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal, options = {}) {
   const totalMessageCount = getCachedAbsoluteMessageCount2(sessionId) ?? getRawSessionMessageOrdinalCount2(sessionId);
   const startOrdinal = Math.max(1, offset);
   const finalOrdinal = eligibleEndOrdinal === undefined ? totalMessageCount : Math.min(totalMessageCount, eligibleEndOrdinal - 1);
   const messages = readRawSessionMessageRange2(sessionId, Math.max(1, startOrdinal - 1), finalOrdinal);
+  const expandedParts = new Map;
+  const expandedResults = new Set;
+  if (options.expand !== false) {
+    const calls = new Map;
+    for (const message of messages)
+      for (const part of message.parts) {
+        if (!part || typeof part !== "object")
+          continue;
+        const p = part;
+        if (p.type !== "tool")
+          continue;
+        const state = p.state;
+        if (state?.input !== undefined && typeof p.callID === "string")
+          calls.set(p.callID, p);
+        expandedParts.set(part, expandToolPart(part, options.expandTools));
+        if (state?.input === undefined && state?.output !== undefined && typeof p.callID === "string") {
+          const call = calls.get(p.callID);
+          if (call) {
+            const expansion = expandToolPart({ ...call, state: { ...call.state, output: state.output } }, options.expandTools);
+            if (expansion !== null) {
+              expandedParts.set(call, expansion);
+              expandedResults.add(part);
+            }
+            calls.delete(p.callID);
+          }
+        }
+      }
+  }
   const completedToolArcs = buildToolArcs(messages).flatMap((arc) => arc.resOrdinal === null ? [] : [{ start: arc.invOrdinal, end: arc.resOrdinal }]);
   const completedToolComponents = [];
   for (const arc of completedToolArcs) {
@@ -5620,8 +5702,13 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     const meta = { ordinal: msg.ordinal, messageId: msg.id };
     if (isHostUnservedRow(msg))
       markHostUnservedRow(meta);
-    if (msg.role === "user" && !hasMeaningfulUserText2(msg.parts)) {
-      const tcSummaries = extractToolCallSummaries(msg.parts);
+    if (msg.role === "user" && !hasMeaningfulChunkUserText(msg.parts)) {
+      const tcSummaries = msg.parts.flatMap((part) => {
+        if (expandedResults.has(part))
+          return [];
+        const expansion = expandedParts.get(part) ?? null;
+        return expansion === null ? extractToolCallSummaries([part]) : [`TC: ${expansion}`];
+      });
       if (tcSummaries.length === 0) {
         recordFilteredNoise(meta);
         continue;
@@ -5661,8 +5748,18 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     }
     const role = compactRole(msg.role);
     const textParts = extractTexts2(msg.parts).map((t) => msg.role === "user" ? cleanUserText2(t) : t).map(normalizeText).filter((value) => value.length > 0);
-    const toolSummaries = textParts.length === 0 ? extractToolCallSummaries(msg.parts) : [];
-    const allParts = [...textParts, ...toolSummaries];
+    const allParts = options.expand === false ? [
+      ...textParts,
+      ...textParts.length === 0 ? extractToolCallSummaries(msg.parts) : []
+    ] : msg.parts.flatMap((part) => {
+      if (expandedResults.has(part))
+        return [];
+      const expansion = expandedParts.get(part) ?? null;
+      if (expansion !== null)
+        return [`TC: ${expansion}`];
+      const texts = extractTexts2([part]).map((t) => msg.role === "user" ? cleanUserText2(t) : t).map(normalizeText).filter(Boolean);
+      return texts.length ? texts : textParts.length === 0 ? extractToolCallSummaries([part]) : [];
+    });
     const compacted = compactTextForSummary(allParts.join(" / "), msg.role);
     const text = compacted.text;
     if (!text) {
@@ -5738,8 +5835,13 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     toolResultBoundaries
   };
 }
+function getRawSessionMessageIdsThrough2(sessionId, endOrdinal) {
+  if (endOrdinal < 1)
+    return [];
+  return [...readRawSessionMessageIdOrdinalsForRange2(sessionId, 1, endOrdinal).entries()].sort((left, right) => left[1] - right[1]).map(([id]) => id);
+}
 function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
-  const provider = sessionProviders.get(sessionId);
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
     const boundaryOrdinal = boundaryId === null ? 1 : readRawSessionMessageOrdinalById2(sessionId, boundaryId);
     if (boundaryOrdinal === null)
@@ -5758,4 +5860,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { textMentionsRecentCommit, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, extractToolCallSummaries, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, normalizeText, stableStringify, getCurrentToolSetHash, setDatabase, loadToolDefinitionMeasurements, recordToolDefinition, getMeasuredToolDefinitionTokens, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, deleteTagsByMessageId, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, isStrictGapHealingMessage, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, describeFinalWireTail, estimateMessageTokens, estimateFinalWireInputTokens, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2, readRawSessionSeedTail2 };
+export { isPrefixBoundThinkingModel, detectOverflow, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, stripWellFormedLeadingTagPrefix, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, isStrictGapHealingMessage, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, describeFinalWireTail, estimateMessageTokens, wireContentBytes, estimateFinalWireInputTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };