@cortexkit/pi-magic-context 0.44.3 → 0.45.0

package/dist/{index-tckvezry.js → index-vxjgsr9m.js}

@@ -1,8 +1,39 @@
+import {
+  OMO_INTERNAL_INITIATOR_MARKER,
+  isSystemDirective,
+  hasMeaningfulUserText2,
+  extractTexts2,
+  extractToolResultBodyTokens,
+  extractToolCallSummaries,
+  estimateTokens,
+  normalizeText,
+  compactRole,
+  formatBlock,
+  compactTextForSummary,
+  mergeCommitHashes
+} from "./index-j0mbc5vj.js";
 import {
   getHarness,
   harnessOwnsOpenCodeStore,
   log
-} from "./index-59dmj4zs.js";
+} from "./index-7n8gb6j3.js";
+import {
+  canonicalModelIdentity,
+  renderToolTemplate
+} from "./index-g0xfx1c2.js";
+import {
+  stableStringify,
+  resolveOpenCodeDbPath,
+  assertOpenCodeStoreGeneration,
+  openCodeDbPathExists,
+  recordOpenCodeDbReadFailure,
+  clearOpenCodeDbReadFailure,
+  claimOpenCodeDbDiagnosticOnce,
+  closeQuietly
+} from "./index-e16q5sd7.js";
+import {
+  Database
+} from "./index-2pbbk3en.js";
 
 // ../plugin/src/features/magic-context/reclaim-protection.ts
 var CTX_REDUCE_KEEP = 3;
@@ -10,337 +41,6 @@ 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));
 }
 
-// ../plugin/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";
-
-// ../plugin/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");
-}
-
-// ../plugin/src/shared/internal-initiator-marker.ts
-var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
-
-// ../plugin/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();
-}
-
-// ../plugin/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 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;
-}
-
 // ../plugin/src/hooks/magic-context/tag-content-primitives.ts
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
@@ -404,26 +104,18 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-// ../plugin/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(",")}}`;
+// ../plugin/src/shared/tag-owner-id.ts
+var TEXT_TAG_IDENTITY_MARKER = ":mc-text-v1:";
+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;
 }
 
 // ../plugin/src/hooks/magic-context/image-token-estimate.ts
@@ -449,7 +141,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")) {
@@ -490,21 +182,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;
@@ -513,7 +230,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;
@@ -1047,6 +764,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) {
@@ -1108,8 +826,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;
@@ -1164,13 +883,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) {
@@ -1243,14 +965,13 @@ function getUpdateTagInputByteSizeStatement(db) {
 function updateTagByteSize(db, sessionId, tagNumber, newByteSize) {
   getUpdateTagByteSizeStatement(db).run(newByteSize, sessionId, tagNumber);
 }
-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);
@@ -1275,7 +996,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);
@@ -1521,7 +1242,21 @@ function insertTag(db, sessionId, messageId, type, byteSize, tagNumber, reasonin
 function updateTagStatus(db, sessionId, tagId, status) {
   getUpdateTagStatusStatement(db).run(status, sessionId, tagId);
 }
-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 = ?
@@ -1703,9 +1438,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);
   }
@@ -1932,6 +1668,13 @@ function getMaxDroppedTagNumber(db, sessionId) {
   const row = getMaxDroppedTagNumberStatement(db).get(sessionId);
   return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
 }
+function getTagById(db, sessionId, tagId) {
+  const result = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number = ?`).get(sessionId, tagId);
+  if (!isTagRow(result)) {
+    return null;
+  }
+  return toTagEntry(result);
+}
 var getToolTagNumberByOwnerStatements = new WeakMap;
 var getNullOwnerToolTagStatements = new WeakMap;
 var adoptNullOwnerToolTagStatements = new WeakMap;
@@ -2032,6 +1775,34 @@ function pickNearestPriorOwner(candidates, currentMessageId, times) {
   }
   return best?.id ?? null;
 }
+// ../plugin/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}"
+};
+
+// ../plugin/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);
+}
 
 // ../plugin/src/hooks/magic-context/host-served-rows.ts
 var HOST_UNSERVED_ROW = "hostUnservedRow";
@@ -2056,479 +1827,6 @@ function retreatPastHostUnservedRows(messages, exclusiveEnd, floor) {
   return end;
 }
 
-// ../plugin/src/shared/opencode-db-path.ts
-import { existsSync as existsSync2, readdirSync, statSync as statSync2 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { isAbsolute, join as join2, resolve as resolve2 } from "node:path";
-var cachedResolution = null;
-var lastReadFailure = null;
-var claimedDiagnostics = new Set;
-function openCodeDataDir(env = process.env, dataHome) {
-  return join2(dataHome ?? env.XDG_DATA_HOME ?? join2(homedir2(), ".local", "share"), "opencode");
-}
-function environmentKey(dataDir, hostGeneration, channel, env) {
-  return [
-    hostGeneration,
-    dataDir,
-    env.OPENCODE_DB ?? "",
-    env.OPENCODE_DISABLE_CHANNEL_DB ?? "",
-    channel ?? env.OPENCODE_CHANNEL ?? ""
-  ].join("\x00");
-}
-function channelPath(dataDir, channel) {
-  return ["latest", "beta", "prod"].includes(channel) ? join2(dataDir, "opencode.db") : join2(dataDir, `opencode-${channel}.db`);
-}
-function discoveredCandidateNames(dataDir) {
-  const names = ["opencode.db", "opencode-local.db", "opencode-dev.db"];
-  try {
-    const discovered = readdirSync(dataDir, { withFileTypes: true }).filter((entry) => /^opencode-.+\.db$/.test(entry.name) && !names.includes(entry.name)).map((entry) => entry.name).sort();
-    names.push(...discovered);
-  } catch {}
-  return names;
-}
-function discoverOpenCodeDb(dataDir) {
-  const candidates = discoveredCandidateNames(dataDir).map((name, order) => {
-    const path = join2(dataDir, name);
-    try {
-      const metadata = statSync2(path);
-      return metadata.isFile() ? { path, order, mtimeMs: metadata.mtimeMs } : null;
-    } catch {
-      return null;
-    }
-  });
-  const existing = candidates.filter((candidate) => candidate !== null).sort((left, right) => right.mtimeMs - left.mtimeMs || left.order - right.order)[0];
-  if (!existing) {
-    return { path: join2(dataDir, "opencode.db"), source: "default", channel: null };
-  }
-  const name = existing.path.slice(dataDir.length + 1);
-  const channel = name === "opencode.db" ? null : name.slice("opencode-".length, -".db".length) || null;
-  return { path: existing.path, source: "discovered", channel };
-}
-function resolveV1Fresh(dataDir, env = process.env) {
-  const explicit = env.OPENCODE_DB;
-  if (explicit !== undefined && explicit.length > 0) {
-    if (explicit === ":memory:") {
-      return { path: explicit, source: "OPENCODE_DB", channel: null };
-    }
-    return {
-      path: isAbsolute(explicit) ? explicit : join2(dataDir, explicit),
-      source: "OPENCODE_DB",
-      channel: null
-    };
-  }
-  const disableChannelDb = env.OPENCODE_DISABLE_CHANNEL_DB;
-  if (disableChannelDb === "1" || disableChannelDb === "true") {
-    return { path: join2(dataDir, "opencode.db"), source: "default", channel: null };
-  }
-  const channel = env.OPENCODE_CHANNEL;
-  if (channel !== undefined && channel.length > 0) {
-    return { path: channelPath(dataDir, channel), source: "channel", channel };
-  }
-  return discoverOpenCodeDb(dataDir);
-}
-function sourceOpenCodeDatabaseFilename(hostGeneration, channel, env = process.env) {
-  if (hostGeneration === "v1") {
-    const explicit = env.OPENCODE_DB;
-    if (explicit !== undefined && explicit.length > 0)
-      return explicit;
-    if (env.OPENCODE_DISABLE_CHANNEL_DB === "1" || env.OPENCODE_DISABLE_CHANNEL_DB === "true") {
-      return "opencode.db";
-    }
-    return ["latest", "beta", "prod"].includes(channel) ? "opencode.db" : `opencode-${channel}.db`;
-  }
-  return env.OPENCODE_DB ?? (["latest", "dev", "beta", "next", "prod"].includes(channel) || env.OPENCODE_DISABLE_CHANNEL_DB === "1" || env.OPENCODE_DISABLE_CHANNEL_DB === "true" ? "opencode.db" : `opencode-${channel.replace(/[^a-zA-Z0-9._-]/g, "")}.db`);
-}
-function resolveV2Fresh(dataDir, channel, env) {
-  const filename = sourceOpenCodeDatabaseFilename("v2", channel, env);
-  const explicit = env.OPENCODE_DB !== undefined;
-  return {
-    path: filename === ":memory:" ? filename : resolve2(dataDir, filename),
-    source: explicit ? "OPENCODE_DB" : env.OPENCODE_CHANNEL ? "channel" : "default",
-    channel: explicit ? null : channel
-  };
-}
-function resolveOpenCodeDbPath(hostGeneration = "v1", options = {}) {
-  const env = options.env ?? process.env;
-  const dataDir = openCodeDataDir(env, options.dataHome);
-  const channel = options.channel ?? env.OPENCODE_CHANNEL;
-  const key = environmentKey(dataDir, hostGeneration, channel, env);
-  if (cachedResolution?.key === key && (!cachedResolution.existed || existsSync2(cachedResolution.resolution.path))) {
-    if (cachedResolution.existed)
-      return cachedResolution.resolution;
-  }
-  const resolution = hostGeneration === "v2" ? resolveV2Fresh(dataDir, channel ?? "latest", env) : resolveV1Fresh(dataDir, env);
-  cachedResolution = {
-    key,
-    resolution,
-    existed: resolution.path !== ":memory:" && existsSync2(resolution.path)
-  };
-  return resolution;
-}
-function schemaTableNames(db, schema = "main") {
-  const rows = db.prepare(`SELECT name FROM ${schema}.sqlite_master WHERE type = 'table' AND name IN ('message', 'part', 'session', 'project', 'session_message', 'session_v2')`).all();
-  return new Set(rows.flatMap((row) => typeof row.name === "string" ? [row.name] : []));
-}
-function hasV1MessageTables(db, schema = "main") {
-  const tables = schemaTableNames(db, schema);
-  return tables.has("message") && tables.has("part");
-}
-function detectOpenCodeStoreGeneration(db, schema = "main") {
-  const tables = schemaTableNames(db, schema);
-  const hasV1Messages = tables.has("message") && tables.has("part");
-  if (hasV1Messages)
-    return "v1";
-  if (tables.has("session_message"))
-    return "v2";
-  if (tables.has("session") || tables.has("project"))
-    return "v1";
-  return "unknown";
-}
-function hasMigratedV2Schema(tables) {
-  return tables.has("session_message") && tables.has("session_v2");
-}
-function isOpenCodeV2Store(db, schema = "main") {
-  return detectOpenCodeStoreGeneration(db, schema) === "v2" || hasMigratedV2Schema(schemaTableNames(db, schema));
-}
-function assertOpenCodeStoreGeneration(db, expected, path, schema = "main") {
-  const actual = detectOpenCodeStoreGeneration(db, schema);
-  if (actual === expected)
-    return;
-  if (expected === "v2" && isOpenCodeV2Store(db, schema))
-    return;
-  if (actual === "unknown")
-    return;
-  throw new Error(`OpenCode store generation mismatch at ${path}: expected ${expected}, found ${actual}; refusing generation-specific database access`);
-}
-function openCodeDbPathExists(resolution = resolveOpenCodeDbPath()) {
-  return resolution.path !== ":memory:" && existsSync2(resolution.path);
-}
-function getOpenCodeDbProbeDescriptions(resolution = resolveOpenCodeDbPath()) {
-  if (resolution.source === "OPENCODE_DB")
-    return [resolution.path];
-  if (resolution.source === "channel" || process.env.OPENCODE_DISABLE_CHANNEL_DB === "1" || process.env.OPENCODE_DISABLE_CHANNEL_DB === "true") {
-    return [resolution.path];
-  }
-  const dataDir = openCodeDataDir();
-  return [
-    join2(dataDir, "opencode.db"),
-    join2(dataDir, "opencode-local.db"),
-    join2(dataDir, "opencode-dev.db"),
-    join2(dataDir, "opencode-<channel>.db")
-  ];
-}
-function recordOpenCodeDbReadFailure(resolution, error) {
-  const message = error instanceof Error ? error.message : String(error);
-  lastReadFailure = { ...resolution, message };
-  return lastReadFailure;
-}
-function clearOpenCodeDbReadFailure(path) {
-  if (path === undefined || lastReadFailure?.path === path)
-    lastReadFailure = null;
-}
-function claimOpenCodeDbDiagnosticOnce(surface, resolution) {
-  const key = `${surface}\x00${resolution.path}\x00${resolution.source}`;
-  if (claimedDiagnostics.has(key))
-    return false;
-  claimedDiagnostics.add(key);
-  return true;
-}
-
-// ../plugin/src/shared/sqlite.ts
-import { AsyncLocalStorage } from "node:async_hooks";
-var reportSlowPrivilegedWrite;
-function registerSlowWriteReporter(reporter) {
-  reportSlowPrivilegedWrite = reporter;
-}
-function detectSqliteRuntime() {
-  const hasBunVersion = typeof process !== "undefined" && typeof process.versions?.bun === "string";
-  const hasBunGlobal = typeof globalThis !== "undefined" && typeof globalThis.Bun !== "undefined";
-  return hasBunVersion || hasBunGlobal ? "Bun" : "Node.js";
-}
-var bunSpec = "bun:" + "sqlite";
-var nodeSpec = "node:" + "sqlite";
-async function importSqliteModule(specifier) {
-  return await import(specifier);
-}
-function isModuleNotFoundError(error, specifier) {
-  const candidate = error;
-  const code = typeof candidate?.code === "string" ? candidate.code : "";
-  const name = typeof candidate?.name === "string" ? candidate.name : "";
-  const message = error instanceof Error ? error.message : String(error ?? "");
-  const details = `${code} ${name} ${message}`.toLowerCase();
-  const mentionsSpecifier = details.includes(specifier.toLowerCase());
-  if (!mentionsSpecifier)
-    return false;
-  return code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNKNOWN_BUILTIN_MODULE" || code === "MODULE_NOT_FOUND" || name === "ResolveMessage" || details.includes("module not found") || details.includes("cannot find module") || details.includes("cannot find package") || details.includes("no such built-in module");
-}
-
-class SqliteRuntimeUnavailableError extends Error {
-  runtime;
-  specifier;
-  constructor(runtime, specifier, cause) {
-    const requirement = specifier === nodeSpec ? "Requires Node.js >= 24, or Bun with bun:sqlite — this Bun build lacks node:sqlite." : "Requires Bun with bun:sqlite, or Node.js >= 24 — this Bun build lacks bun:sqlite.";
-    super(`Magic Context detected ${runtime}, but could not load ${specifier}. ${requirement}`, { cause });
-    this.name = "SqliteRuntimeUnavailableError";
-    this.runtime = runtime;
-    this.specifier = specifier;
-  }
-}
-async function loadSqliteModule(runtime = detectSqliteRuntime(), importer = importSqliteModule) {
-  const specifier = runtime === "Bun" ? bunSpec : nodeSpec;
-  try {
-    return await importer(specifier);
-  } catch (error) {
-    if (isModuleNotFoundError(error, specifier)) {
-      throw new SqliteRuntimeUnavailableError(runtime, specifier, error);
-    }
-    throw error;
-  }
-}
-var detectedRuntime = detectSqliteRuntime();
-var isBun = detectedRuntime === "Bun";
-var sqliteModule = await loadSqliteModule(detectedRuntime);
-var DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
-var trackedSqliteConnections = new Map;
-var nextSqliteConnectionSequence = 1;
-function installTransactionRouting(db, readonly) {
-  const nativeExec = db.exec.bind(db);
-  Object.defineProperty(db, "exec", {
-    configurable: true,
-    writable: true,
-    value: (sql) => {
-      if (/^\s*BEGIN\s+(?:IMMEDIATE|EXCLUSIVE)(?:\s+TRANSACTION)?\s*;?\s*$/i.test(sql)) {
-        if (transformPassScope.getStore()?.active || backgroundWriterScope.getStore())
-          acquireShort(db, () => nativeExec(sql), sql.trim());
-        else
-          nativeExec(sql);
-        return db;
-      }
-      return nativeExec(sql);
-    }
-  });
-  Object.defineProperty(db, "transaction", {
-    configurable: true,
-    writable: true,
-    value: (fn) => {
-      const make = (mode) => function(...args) {
-        const nested = isInTransaction(db);
-        const savepoint = "mc_tx_sp";
-        db.exec(nested ? `SAVEPOINT ${savepoint}` : `BEGIN ${mode}`);
-        try {
-          const result = fn.apply(this, args);
-          db.exec(nested ? `RELEASE ${savepoint}` : "COMMIT");
-          return result;
-        } catch (error) {
-          if (isInTransaction(db)) {
-            if (nested) {
-              db.exec(`ROLLBACK TO ${savepoint}`);
-              db.exec(`RELEASE ${savepoint}`);
-            } else
-              db.exec("ROLLBACK");
-          }
-          throw error;
-        }
-      };
-      const defaultTransaction = make(readonly ? "DEFERRED" : "IMMEDIATE");
-      const variants = {
-        default: defaultTransaction,
-        deferred: make("DEFERRED"),
-        immediate: make("IMMEDIATE"),
-        exclusive: make("EXCLUSIVE"),
-        database: db
-      };
-      for (const transaction of [
-        variants.default,
-        variants.deferred,
-        variants.immediate,
-        variants.exclusive
-      ]) {
-        Object.assign(transaction, variants);
-      }
-      return defaultTransaction;
-    }
-  });
-}
-function trackSqliteConnection(db, filename, options) {
-  const originalClose = db.close.bind(db);
-  const sequence = nextSqliteConnectionSequence++;
-  const metadata = {
-    sequence,
-    filename: typeof filename === "string" ? filename : Buffer.isBuffer(filename) ? "<buffer>" : ":memory:",
-    readonly: Boolean(options) && typeof options === "object" && (options.readonly === true || options.readOnly === true)
-  };
-  installTransactionRouting(db, metadata.readonly);
-  Object.defineProperty(db, "close", {
-    configurable: true,
-    value: (...args) => {
-      try {
-        return originalClose(...args);
-      } finally {
-        trackedSqliteConnections.delete(sequence);
-      }
-    }
-  });
-  trackedSqliteConnections.set(sequence, {
-    ...metadata,
-    reference: new WeakRef(db)
-  });
-  return db;
-}
-var TrackedDatabase = new Proxy(DatabaseImpl, {
-  construct(target, args) {
-    const db = Reflect.construct(target, args, target);
-    return trackSqliteConnection(db, args[0], args[1]);
-  }
-});
-function buildNodeSqliteDatabaseClass(DatabaseSync) {
-
-  class NodeSqliteDatabase extends DatabaseSync {
-    constructor(filename, options) {
-      const translated = { ...options };
-      if (options && "readonly" in options) {
-        translated.readOnly = options.readonly;
-        delete translated.readonly;
-      }
-      super(typeof filename === "string" ? filename : ":memory:", translated);
-    }
-    prepare(sql) {
-      const stmt = super.prepare(sql);
-      for (const method of ["run", "get", "all"]) {
-        const original = stmt[method].bind(stmt);
-        stmt[method] = (...args) => args.length === 1 && Array.isArray(args[0]) ? original(...args[0]) : original(...args);
-      }
-      return stmt;
-    }
-  }
-  return NodeSqliteDatabase;
-}
-var Database = TrackedDatabase;
-function pragmaValue(db, name) {
-  const row = db.prepare(`PRAGMA ${name}`).get();
-  if (!row)
-    return;
-  return row[name] ?? Object.values(row)[0];
-}
-function pragmaNumber(db, name) {
-  try {
-    const value = pragmaValue(db, name);
-    return typeof value === "number" && Number.isFinite(value) ? value : null;
-  } catch {
-    return null;
-  }
-}
-var privilegeDepth = new WeakMap;
-var transformPassScope = new AsyncLocalStorage;
-var admissionScope = new AsyncLocalStorage;
-var backgroundWriterScope = new AsyncLocalStorage;
-function withSqliteBackgroundWriter(operation) {
-  return backgroundWriterScope.run(true, operation);
-}
-function isTransientSqliteError(error) {
-  if (!error || typeof error !== "object")
-    return false;
-  const value = error;
-  return typeof value.code === "string" && /^(SQLITE_BUSY|SQLITE_LOCKED)(_|$)/.test(value.code) || typeof value.errcode === "number" && [5, 6].includes(value.errcode & 255);
-}
-
-class SqliteAcquisitionBusyError extends Error {
-  code = "SQLITE_BUSY";
-  stage;
-  constructor(cause, stage = "BEGIN IMMEDIATE") {
-    super("SQLite writer acquisition remained busy", { cause });
-    this.name = "SqliteAcquisitionBusyError";
-    this.stage = stage;
-  }
-}
-var SHORT_BUSY_TIMEOUT_MS = 25;
-var FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 250;
-function acquireShort(db, acquire, site) {
-  const started = performance.now();
-  const previous = pragmaNumber(db, "busy_timeout");
-  let acquired = false;
-  try {
-    const timeout = transformPassScope.getStore()?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS : SHORT_BUSY_TIMEOUT_MS;
-    db.exec(`PRAGMA busy_timeout=${timeout}`);
-    acquire();
-    acquired = true;
-  } catch (error) {
-    if (transformPassScope.getStore()?.active && isTransientSqliteError(error))
-      throw new SqliteAcquisitionBusyError(error, site);
-    throw error;
-  } finally {
-    if (previous !== null)
-      db.exec(`PRAGMA busy_timeout=${previous}`);
-    const elapsed = performance.now() - started;
-    if (elapsed >= 250)
-      console.warn(`[${new Date().toISOString()}] [magic-context] sqlite acquisition site=${site} lane=${transformPassScope.getStore()?.active ? "foreground" : "background"} elapsed=${Math.round(elapsed)}ms attempts=1 outcome=${acquired ? "acquired" : "busy"}`);
-  }
-}
-function isInTransaction(db) {
-  const candidate = db;
-  return candidate.inTransaction === true || candidate.isTransaction === true;
-}
-function withPrivilegedWriter(db, operation) {
-  const previousDepth = privilegeDepth.get(db) ?? 0;
-  const nested = isInTransaction(db);
-  const savepoint = "mc_privilege_scope";
-  const transactionStartedAt = nested ? undefined : performance.now();
-  if (nested) {
-    db.exec(`SAVEPOINT ${savepoint}`);
-  } else {
-    try {
-      db.exec("BEGIN IMMEDIATE");
-    } catch (error) {
-      if (transformPassScope.getStore()?.active && isTransientSqliteError(error))
-        throw new SqliteAcquisitionBusyError(error);
-      throw error;
-    }
-  }
-  privilegeDepth.set(db, previousDepth + 1);
-  try {
-    db.prepare("INSERT INTO context_privilege_state(id, enabled) VALUES (1, 1) ON CONFLICT(id) DO UPDATE SET enabled = 1").run();
-    const result = operation();
-    if (previousDepth === 0) {
-      db.prepare("UPDATE context_privilege_state SET enabled = 0 WHERE id = 1").run();
-    }
-    if (nested) {
-      db.exec(`RELEASE ${savepoint}`);
-    } else {
-      db.exec("COMMIT");
-      if (transactionStartedAt !== undefined) {
-        reportSlowPrivilegedWrite?.("privileged_writer", transactionStartedAt);
-      }
-    }
-    if (previousDepth > 0)
-      privilegeDepth.set(db, previousDepth);
-    else
-      privilegeDepth.delete(db);
-    return result;
-  } catch (error) {
-    try {
-      if (nested) {
-        db.exec(`ROLLBACK TO ${savepoint}`);
-        db.exec(`RELEASE ${savepoint}`);
-      } else {
-        db.exec("ROLLBACK");
-      }
-    } finally {
-      if (previousDepth > 0)
-        privilegeDepth.set(db, previousDepth);
-      else
-        privilegeDepth.delete(db);
-    }
-    throw error;
-  }
-}
-
-// ../plugin/src/shared/sqlite-helpers.ts
-function closeQuietly(db) {
-  if (!db)
-    return;
-  try {
-    db.close();
-  } catch {}
-}
-
 // ../plugin/src/hooks/magic-context/read-session-db.ts
 function openCodeDbExists() {
   return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath());
@@ -2698,8 +1996,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(", ");
@@ -2710,15 +2008,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
@@ -2727,7 +2032,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
   }));
@@ -2780,8 +2085,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(", ");
@@ -2822,6 +2127,34 @@ function readRawSessionMessageIdOrdinalsFromDb(db, sessionId) {
   }
   return ordinalById;
 }
+function readRawSessionMessageOrdinalPageFromDb(db, sessionId, after, limit) {
+  const pageSize = Math.max(1, Math.floor(limit));
+  const rows = (after ? db.prepare(`SELECT id, data, time_created
+                       FROM message
+                       WHERE session_id = ?
+                         AND (time_created, id) > (?, ?)
+                       ORDER BY time_created ASC, id ASC
+                       LIMIT ?`).all(sessionId, after.timeCreated, after.id, pageSize) : db.prepare(`SELECT id, data, time_created
+                       FROM message
+                       WHERE session_id = ?
+                       ORDER BY time_created ASC, id ASC
+                       LIMIT ?`).all(sessionId, pageSize)).filter(isRawMessageRow);
+  return rows.flatMap((row) => {
+    if (typeof row.time_created !== "number")
+      return [];
+    const info = parseJsonRecord(row.data);
+    return {
+      id: row.id,
+      timeCreated: row.time_created,
+      contributesOrdinal: !isRawCompactionSummaryInfo(info),
+      hasValidInfo: info !== null
+    };
+  });
+}
+function countStoredRawSessionMessagesFromDb(db, sessionId) {
+  const row = db.prepare("SELECT COUNT(*) AS count FROM message WHERE session_id = ?").get(sessionId);
+  return typeof row?.count === "number" ? row.count : 0;
+}
 function isAnchorRow(row) {
   return row !== null && typeof row === "object" && typeof row.time_created === "number" && typeof row.id === "string";
 }
@@ -2875,6 +2208,24 @@ function readRawSessionTailFromDb(db, sessionId, baseOrdinal, anchorMessageId) {
   }
   return { messages, absoluteMessageCount: Math.max(0, ord - 1) };
 }
+function readRawSessionMessagePartsByIdFromDb(db, sessionId, messageId, onQuery) {
+  onQuery?.();
+  const row = db.prepare("SELECT id, data, time_created, time_updated FROM message WHERE session_id = ? AND id = ?").get(sessionId, messageId);
+  if (!row || !isRawMessageRow(row) || typeof row.time_created !== "number")
+    return null;
+  const info = parseJsonRecord(row.data);
+  if (!info || isRawCompactionSummaryInfo(info))
+    return null;
+  onQuery?.();
+  const partRows = db.prepare(RAW_MESSAGE_PARTS_BY_ID_SQL).all(sessionId, messageId).filter(isRawPartRow);
+  return {
+    id: row.id,
+    role: typeof info.role === "string" ? info.role : "unknown",
+    parts: partRows.map((part) => attachRawPartVersion(parseJsonUnknown(part.data), part.time_updated)),
+    createdAt: row.time_created,
+    version: row.time_updated ?? null
+  };
+}
 function readRawSessionMessageOrdinalByIdFromDb(db, sessionId, messageId) {
   const row = db.prepare(`SELECT COUNT(candidate.id) AS ordinal
              FROM message AS target
@@ -2932,6 +2283,44 @@ function readRawSessionMessageByIdFromDb(db, sessionId, messageId) {
     version: row.time_updated ?? null
   };
 }
+function readRawSeedTailFromDb(db, sessionId, boundaryId) {
+  const rows = db.prepare(`
+        WITH canonical AS (
+            SELECT id, time_created,
+                   ROW_NUMBER() OVER (ORDER BY time_created, id) AS ordinal
+            FROM message WHERE session_id = ?
+              AND NOT (CASE WHEN json_valid(data) THEN COALESCE(json_extract(data, '$.summary'), 0) ELSE 0 END = 1
+                AND CASE WHEN json_valid(data) THEN COALESCE(json_extract(data, '$.finish'), '') ELSE '' END = 'stop')
+        )
+        SELECT c.id, m.data, c.time_created, m.time_updated, c.ordinal,
+               p.data AS part_data, p.time_updated AS part_updated
+        FROM canonical c JOIN message m ON m.id = c.id
+        LEFT JOIN part p ON +p.session_id = ? AND likelihood(p.message_id = c.id, 0.000001)
+        WHERE ? IS NULL OR c.ordinal >= (SELECT ordinal FROM canonical WHERE id = ?)
+        ORDER BY c.ordinal, p.time_created, p.id
+    `).all(sessionId, sessionId, boundaryId, boundaryId);
+  const messages = new Map;
+  for (const row of rows) {
+    if (!messages.has(row.id)) {
+      const info = parseJsonRecord(row.data);
+      if (!info)
+        continue;
+      messages.set(row.id, {
+        id: row.id,
+        ordinal: row.ordinal,
+        role: typeof info.role === "string" ? info.role : "unknown",
+        createdAt: row.time_created,
+        version: row.time_updated,
+        parts: []
+      });
+    }
+    if (row.part_data !== null)
+      messages.get(row.id)?.parts.push(attachRawPartVersion(parseJsonUnknown(row.part_data), row.part_updated ?? undefined));
+  }
+  if (boundaryId !== null && !messages.has(boundaryId))
+    throw new Error("state_sync materialized boundary is missing from raw storage");
+  return messages;
+}
 
 // ../plugin/src/hooks/magic-context/read-session-true-raw-tokens.ts
 function completedToolArcCrossesBoundary(invOrdinal, resOrdinal, boundary) {
@@ -3468,6 +2857,88 @@ function invalidateTrueRawTokenCache(args) {
   args.reason;
 }
 
+// ../plugin/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;
+    }
+  }
+  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();
+}
+
 // ../plugin/src/hooks/magic-context/tag-part-guards.ts
 function isTextPart(part) {
   if (part === null || typeof part !== "object")
@@ -3482,6 +2953,21 @@ function isFilePart(part) {
   return p.type === "file" && typeof p.url === "string";
 }
 
+// ../plugin/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);
+}
+
 // ../plugin/src/features/magic-context/dreamer/token-budget.ts
 class DreamTokenBudgetExceeded extends Error {
   sessionId;
@@ -3518,12 +3004,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) {
@@ -3537,7 +3031,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 };
@@ -3725,37 +3219,6 @@ function applyEditMarkerToInput(input) {
   }
 }
 
-// ../plugin/src/features/magic-context/tool-definition-tokens.ts
-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 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);
-  }
-}
-
 // ../plugin/src/hooks/magic-context/tokenizer-calibration-seeds.json
 var tokenizer_calibration_seeds_default = [
   {
@@ -3979,6 +3442,20 @@ var tokenizer_calibration_seeds_default = [
     toolsRatio: 0.850953,
     proseRatio: 1.000017
   },
+  {
+    prefix: "openai/gpt-6-sol",
+    systemRatio: 1.000278,
+    toolsRatio: 0.850953,
+    proseRatio: 1.000017,
+    provenance: "Mirrored from openai/gpt-6-astra; prose inherited-unmeasured. Reported OAuth system/tools counts match GPT-5.5; no independent API-key measurement."
+  },
+  {
+    prefix: "openai/gpt-6.1-sol",
+    systemRatio: 1.000278,
+    toolsRatio: 0.850953,
+    proseRatio: 1.000017,
+    provenance: "Mirrored from openai/gpt-6-astra; prose inherited-unmeasured. Reported OAuth system/tools counts match GPT-5.5; no independent API-key measurement."
+  },
   {
     prefix: "openai/gpt-5",
     systemRatio: 1,
@@ -4082,7 +3559,7 @@ var tokenizer_calibration_seeds_default = [
 // ../plugin/src/hooks/magic-context/tokenizer-calibration.ts
 var CALIBRATION_TABLE = tokenizer_calibration_seeds_default;
 var NEUTRAL = { systemRatio: 1, toolsRatio: 1, proseRatio: 1 };
-var CALIBRATION_TABLE_REVISION = "2026-09-23-model-id-generation-v2";
+var CALIBRATION_TABLE_REVISION = "2026-09-30-sol-tokenizer-seeds-v3";
 var UNKNOWN_FIT_RATIO = Math.max(2, ...CALIBRATION_TABLE.flatMap((entry) => [
   entry.systemRatio,
   entry.toolsRatio,
@@ -4251,6 +3728,241 @@ function historyLocalBudget(providerTokens, modelKey) {
   return ratio === 1 ? providerTokens : localBudget(providerTokens, ratio);
 }
 
+// ../plugin/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;
+var THINKING_BINDING_MISMATCH_PATTERN = /bound to a different conversation/i;
+var THINKING_BINDING_FAILING_PATH_PATTERN = /^\s*(messages\.\d+\.content\.\d+):/;
+var THINKING_BINDING_FIRST_CHANGED_PATTERN = /first at `?(messages\.\d+\.content\.\d+)`?/;
+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);
+}
+function extractExplicitHttpStatus(error) {
+  if (!error || typeof error !== "object")
+    return;
+  const seen = new Set;
+  const queue = [error];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (!current || seen.has(current))
+      continue;
+    seen.add(current);
+    const record = current;
+    for (const key of ["status", "statusCode", "status_code"]) {
+      const value = record[key];
+      if (typeof value === "number")
+        return value;
+    }
+    for (const value of Object.values(record)) {
+      if (value && typeof value === "object")
+        queue.push(value);
+    }
+  }
+  return;
+}
+function detectThinkingBindingMismatch(error) {
+  const message = extractErrorMessage(error);
+  const explicitStatus = extractExplicitHttpStatus(error);
+  if (explicitStatus !== undefined && explicitStatus !== 400 || !THINKING_BINDING_MISMATCH_PATTERN.test(message)) {
+    return { isBindingMismatch: false };
+  }
+  const failingBlockPath = THINKING_BINDING_FAILING_PATH_PATTERN.exec(message)?.[1];
+  const firstChangedPath = THINKING_BINDING_FIRST_CHANGED_PATTERN.exec(message)?.[1];
+  return {
+    isBindingMismatch: true,
+    matchedPattern: "bound to a different conversation",
+    ...failingBlockPath ? { failingBlockPath } : {},
+    ...firstChangedPath ? { firstChangedPath } : {}
+  };
+}
+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;
+}
+
+// ../plugin/src/hooks/magic-context/sentinel.ts
+function modelAcceptsEmptyContent(providerID) {
+  return providerID === "anthropic";
+}
+var REMOVED_REASONING_MARK = Symbol.for("magic-context.removed-reasoning");
+var NEUTRALIZED_ORIGINALS = new WeakMap;
+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");
+}
+
 // ../plugin/src/hooks/magic-context/tool-input-size.ts
 var SKELETON_REAL_INPUT_MAX_BYTES = 1024;
 var encoder2 = new TextEncoder;
@@ -4328,19 +4040,41 @@ 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) {
+  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;
@@ -4356,8 +4090,27 @@ function withRawMessageProvider2(sessionId, provider, fn) {
   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;
@@ -4393,7 +4146,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);
   }
@@ -4405,7 +4158,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();
@@ -4418,7 +4171,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);
   }
@@ -4426,9 +4181,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;
@@ -4441,16 +4197,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)
@@ -4462,12 +4227,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;
@@ -4481,6 +4247,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) {
@@ -4517,7 +4285,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;
@@ -4564,26 +4332,70 @@ function primeInMemoryTailRawMessageCache2(args) {
   activeAbsoluteCountCache?.set(sessionId, absoluteMessageCount);
   return true;
 }
+function readRawSessionMessageOrdinalPage2(sessionId, after, limit) {
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider?.readMessageOrdinalPage)
+    return provider.readMessageOrdinalPage(after, limit);
+  if (provider) {
+    const rows = provider.readMessages().map((message) => ({
+      id: message.id,
+      timeCreated: message.createdAt ?? message.ordinal,
+      contributesOrdinal: true,
+      hasValidInfo: true
+    })).filter((row) => !after || row.timeCreated > after.timeCreated || row.timeCreated === after.timeCreated && row.id > after.id).sort((left, right) => left.timeCreated - right.timeCreated || left.id.localeCompare(right.id));
+    return rows.slice(0, Math.max(1, Math.floor(limit)));
+  }
+  if (!openCodeDbExists())
+    return [];
+  return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalPageFromDb(db, sessionId, after, limit));
+}
+function getRawSessionStoredMessageCount2(sessionId) {
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider?.getStoredMessageCount)
+    return provider.getStoredMessageCount();
+  if (provider)
+    return provider.readMessages().length;
+  if (!openCodeDbExists())
+    return 0;
+  return withReadOnlySessionDb((db) => countStoredRawSessionMessagesFromDb(db, sessionId));
+}
 function readRawSessionMessageIdOrdinalsForRange2(sessionId, fromOrdinal, toOrdinal) {
   const from = Math.max(1, Math.floor(fromOrdinal));
   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)?.provider;
+  if (provider?.readMessagePartsById)
+    return provider.readMessagePartsById(messageId);
+  if (provider?.readMessageById)
+    return provider.readMessageById(messageId);
+  if (provider) {
+    return provider.readMessages().find((message) => message.id === messageId) ?? null;
+  }
+  if (!openCodeDbExists())
+    return null;
+  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 readRawSessionMessageById(sessionId, messageId) !== null;
+  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);
   }
@@ -4620,7 +4432,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;
@@ -4643,8 +4455,8 @@ function compareRawSessionMessageOrder2(sessionId, leftId, rightId) {
     return left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
   });
 }
-function readRawSessionMessageById(sessionId, messageId) {
-  const provider = sessionProviders.get(sessionId);
+function readRawSessionMessageById2(sessionId, messageId) {
+  const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessageById) {
     return provider.readMessageById(messageId);
   }
@@ -4656,7 +4468,7 @@ function readRawSessionMessageById(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())
@@ -4664,7 +4476,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();
@@ -4675,7 +4487,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;
@@ -4693,7 +4505,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)
@@ -4791,11 +4603,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) {
@@ -4903,8 +4746,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;
@@ -4944,8 +4792,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) {
@@ -5021,4 +4879,29 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     toolResultBoundaries
   };
 }
-export { registerSlowWriteReporter, detectSqliteRuntime, Database, withSqliteBackgroundWriter, withPrivilegedWriter, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, textMentionsRecentCommit, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, extractToolCallSummaries, preloadTokenizer, estimateTokens, normalizeText, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isRecord, stableStringify, estimateImageTokensFromDataUrl, TODO_STATUSES, TODO_PRIORITIES, TITLE_DONE_STATUSES, normalizeTodoStateJson, buildSyntheticTodoPart, stripChannel1ReminderSpans, compareMeasuredTailPrefix, formatTailHygienePrefixMismatch, freezeTailHygieneMeasurement, effectiveTailHygiene, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, decideChannel1, evaluateChannel2, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, planEmergencyDrop, measureEmergencyTag, updateTagByteSize, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, updateTagInputByteSize, updateTagTokenCount, getPersistedToolTagAccounting, getAllStatusTagTokenTotalsFlat, updateTagInputTokenCount, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, hasPiFallbackMessageTags, findAdoptableFallbackTags, hasPiFallbackToolOwnerTags, findPiFallbackToolOwnerTags, adoptPiFallbackToolOwnerTag, adoptPiFallbackMessageTag, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTagsForPendingOperations, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, retreatPastHostUnservedRows, resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, openCodeDbPathExists, getOpenCodeDbProbeDescriptions, recordOpenCodeDbReadFailure, clearOpenCodeDbReadFailure, claimOpenCodeDbDiagnosticOnce, closeQuietly, withReadOnlySessionDb, RAW_SUMMARY_TEXT_MAX_CHARS, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, TOKEN_BUDGET_TOOL_REFUSAL, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, droppedInputMarker, createDroppedInputGuard, isEditTool, applyEditMarkerToInput, setDatabase, loadToolDefinitionMeasurements, resolveDecisionCalibration, providerMass, localBudget, calibrationForModelKey, historyLocalBudget, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };
+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)?.provider;
+  if (provider) {
+    const boundaryOrdinal = boundaryId === null ? 1 : readRawSessionMessageOrdinalById2(sessionId, boundaryId);
+    if (boundaryOrdinal === null)
+      throw new Error("state_sync materialized boundary is missing from raw provider");
+    const messages = readRawSessionMessageRange2(sessionId, boundaryOrdinal, getRawSessionMessageOrdinalCount2(sessionId));
+    return new Map(messages.map((message) => [message.id, message]));
+  }
+  if (!openCodeDbExists()) {
+    if (boundaryId !== null)
+      throw new Error("state_sync raw storage is unavailable for materialized boundary");
+    return new Map;
+  }
+  return withReadOnlySessionDb((db) => {
+    onQuery?.();
+    return readRawSeedTailFromDb(db, sessionId, boundaryId);
+  });
+}
+
+export { detectThinkingBindingMismatch, isPrefixBoundThinkingModel, detectOverflow, resolveDecisionCalibration, providerMass, localBudget, calibrationForModelKey, historyLocalBudget, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isRecord, TEXT_TAG_IDENTITY_MARKER, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, TODO_STATUSES, TODO_PRIORITIES, TITLE_DONE_STATUSES, normalizeTodoStateJson, buildSyntheticTodoPart, stripChannel1ReminderSpans, compareMeasuredTailPrefix, formatTailHygienePrefixMismatch, freezeTailHygieneMeasurement, effectiveTailHygiene, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, decideChannel1, evaluateChannel2, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, planEmergencyDrop, measureEmergencyTag, updateTagByteSize, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, updateTagInputByteSize, updateTagTokenCount, getPersistedToolTagAccounting, getAllStatusTagTokenTotalsFlat, updateTagInputTokenCount, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, hasPiFallbackMessageTags, findAdoptableFallbackTags, hasPiFallbackToolOwnerTags, findPiFallbackToolOwnerTags, adoptPiFallbackToolOwnerTag, adoptPiFallbackMessageTag, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTagsForPendingOperations, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, withReadOnlySessionDb, expandToolPart, retreatPastHostUnservedRows, RAW_SUMMARY_TEXT_MAX_CHARS, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, hasUserAnswerMetadata, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, TOKEN_BUDGET_TOOL_REFUSAL, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, droppedInputMarker, createDroppedInputGuard, isEditTool, applyEditMarkerToInput, modelAcceptsEmptyContent, variantChangeBustsProviderCache, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, 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 };