@cortexkit/opencode-magic-context 0.38.1 → 0.40.0

package/dist/{index-5znjkjws.js → index-axpym70t.js}

@@ -3,9 +3,6 @@ import {
   modelSupportsVision,
   shouldEnforcePrivateStoragePermissions
 } from "./index-mg1yx1ph.js";
-import {
-  parseProviderModel
-} from "./index-td9depx5.js";
 import {
   describeError,
   getErrorMessage,
@@ -17,7 +14,7 @@ import {
   ensureSessionMetaRow,
   persistCachedM0,
   updateSessionMeta
-} from "./index-22mw8km4.js";
+} from "./index-rw0qrkvq.js";
 import {
   modelRefLookupOrder,
   piModelRefToCanonical
@@ -401,9 +398,163 @@ function buildPrimaryLanguageDirective(language) {
   return `Use ${target} for your natural-language replies to the user unless the user explicitly asks for another language. Keep code, identifiers, file paths, commands, logs, and quoted text verbatim.`;
 }
 
+// src/shared/redaction.ts
+import { homedir, userInfo } from "node:os";
+function escapeRegex(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var SECRET_WORDS = [
+  "key",
+  "token",
+  "secret",
+  "password",
+  "auth",
+  "authorization",
+  "bearer",
+  "credential"
+];
+var SECRET_SEGMENT_PATTERN = new RegExp(`^(?:${SECRET_WORDS.map((w) => `${w}s?`).join("|")})$`, "i");
+var TRAILING_DESCRIPTORS = new Set(["id", "ids", "value", "values", "header", "headers"]);
+function redactionTypeForKey(key) {
+  const normalized = key.trim().toLowerCase().replace(/[^a-z0-9_.-]+/g, "_");
+  const suffix = normalized.split(".").filter(Boolean).at(-1) ?? normalized;
+  return suffix || "secret";
+}
+function isNonSecretScalarValue(value) {
+  const v = value.trim();
+  if (v === "true" || v === "false" || v === "null" || v === "undefined")
+    return true;
+  return /^[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(v);
+}
+var SECRET_QUALIFIERS = new Set([
+  "api",
+  "access",
+  "private",
+  "client",
+  "auth",
+  "authorization",
+  "secret",
+  "bearer",
+  "session",
+  "refresh",
+  "service",
+  "x",
+  "openai",
+  "anthropic",
+  "google",
+  "github",
+  "huggingface",
+  "aws",
+  "azure"
+]);
+function sanitizePathString(value) {
+  const home = homedir();
+  const username = userInfo().username;
+  let sanitized = value;
+  if (home) {
+    sanitized = sanitized.replace(new RegExp(escapeRegex(home), "g"), "~");
+  }
+  sanitized = sanitized.replace(/\/Users\/[^/]+\//g, "/Users/<USER>/");
+  sanitized = sanitized.replace(/\/home\/[^/]+\//g, "/home/<USER>/");
+  sanitized = sanitized.replace(/C:\\Users\\[^\\]+\\/g, "C:\\Users\\<USER>\\");
+  if (username) {
+    sanitized = sanitized.replace(new RegExp(escapeRegex(username), "g"), "<USER>");
+  }
+  return sanitized;
+}
+var SECRET_TEXT_PATTERNS = [
+  {
+    pattern: /\bsk-ant-(?:api03-)?[A-Za-z0-9_-]{32,}/g,
+    replacement: "<ANTHROPIC_API_KEY_REDACTED>"
+  },
+  {
+    pattern: /\bsk-(?:proj-)?[A-Za-z0-9_-]{32,}/g,
+    replacement: "<OPENAI_API_KEY_REDACTED>"
+  },
+  {
+    pattern: /\bgithub_pat_[A-Za-z0-9_]{20,}/g,
+    replacement: "<GITHUB_PAT_REDACTED>"
+  },
+  {
+    pattern: /\b(?:gh[opsu]|ghr)_[A-Za-z0-9]{30,}/g,
+    replacement: "<GITHUB_TOKEN_REDACTED>"
+  },
+  {
+    pattern: /\bhf_[A-Za-z0-9]{30,}/g,
+    replacement: "<HUGGINGFACE_TOKEN_REDACTED>"
+  },
+  {
+    pattern: /\b(?:AKIA|ASIA)[0-9A-Z]{16}\b/g,
+    replacement: "<AWS_ACCESS_KEY_ID_REDACTED>"
+  },
+  {
+    pattern: /\bxox[abprsuvc]-[A-Za-z0-9-]{10,}/g,
+    replacement: "<SLACK_TOKEN_REDACTED>"
+  },
+  {
+    pattern: /\bAIza[A-Za-z0-9_-]{35}\b/g,
+    replacement: "<GOOGLE_API_KEY_REDACTED>"
+  },
+  {
+    pattern: /\b(Authorization\s*:\s*Bearer\s+)([A-Za-z0-9._~+/=-]{8,})/gi,
+    replacement: (_full, prefix) => `${prefix}<REDACTED:bearer>`
+  },
+  {
+    pattern: /\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g,
+    replacement: "<JWT_REDACTED>"
+  },
+  {
+    pattern: /(["'])([^"']*(?:key|token|secret|password|auth|bearer|credential)[^"']*)\1(\s*:\s*)(["'])([^"']*)\4/gi,
+    replacement: (full, quote, key, separator, valueQuote, value) => isNonSecretScalarValue(value) ? full : `${quote}${key}${quote}${separator}${valueQuote}<REDACTED:${redactionTypeForKey(key)}>${valueQuote}`
+  },
+  {
+    pattern: /\b([A-Za-z0-9_.-]*(?:key|token|secret|password|auth|bearer|credential)[A-Za-z0-9_.-]*)\s*=\s*([^\s'"`]+)/gi,
+    replacement: (full, key, value) => isNonSecretScalarValue(value) ? full : `${key}=<REDACTED:${redactionTypeForKey(key)}>`
+  }
+];
+function redactSecretText(value) {
+  let redacted = value;
+  for (const { pattern, replacement } of SECRET_TEXT_PATTERNS) {
+    if (typeof replacement === "string") {
+      redacted = redacted.replace(pattern, replacement);
+    } else {
+      redacted = redacted.replace(pattern, replacement);
+    }
+  }
+  return redacted;
+}
+function sanitizeDiagnosticText(value) {
+  return redactSecretText(sanitizePathString(value));
+}
+var SHAREABILITY_SENSITIVE_PATTERNS = [
+  /\bC:\/Users\/[^/\s]+/i,
+  /(?:^|\s)~\/[^\s]+/,
+  /\b(?:api[_-]?key|secret|token|password|passwd|pwd|client[_-]?secret|access[_-]?key)\b\s*[:=]\s*\S+/i,
+  /\b(?:localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\])(?::\d+)?\b/i,
+  /\b(?:10|127)\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/,
+  /\b192\.168\.\d{1,3}\.\d{1,3}\b/,
+  /\b172\.(?:1[6-9]|2\d|3[01])\.\d{1,3}\.\d{1,3}\b/
+];
+function hasShareabilitySensitiveText(text) {
+  try {
+    if (sanitizeDiagnosticText(text) !== text)
+      return true;
+    return SHAREABILITY_SENSITIVE_PATTERNS.some((pattern) => pattern.test(text));
+  } catch {
+    return true;
+  }
+}
+
 // src/features/magic-context/fail-closed-block.ts
 var FAIL_CLOSED_DOCTOR_COMMAND = "npx @cortexkit/magic-context@latest doctor";
 var FAIL_CLOSED_REPROBE_EVERY_N = 5;
+function attachFailClosedBlockingProcessEvidence(process2, evidence) {
+  Object.defineProperties(process2, {
+    startTime: { configurable: true, value: evidence.startTime },
+    commandLine: { configurable: true, value: evidence.commandLine }
+  });
+  return process2;
+}
 
 class FailClosedBlockingError extends Error {
   code = "FAIL_CLOSED_BLOCKING";
@@ -426,6 +577,7 @@ function isMagicContextHiddenAgentName(agent) {
   return false;
 }
 var MAX_FORMATTED_BLOCKING_PROCESSES = 8;
+var MAX_FORMATTED_COMMAND_LINE_LENGTH = 80;
 function normalizeFailClosedProcessKind(process2) {
   switch (process2.kind) {
     case "OpenCode server":
@@ -448,13 +600,61 @@ function normalizeFailClosedProcessKind(process2) {
       return "process";
   }
 }
+function formatFailClosedProcessStartTime(startTime) {
+  if (!Number.isFinite(startTime) || startTime <= 0)
+    return "unverified";
+  try {
+    const parts = new Intl.DateTimeFormat("en-US", {
+      day: "numeric",
+      hour: "2-digit",
+      minute: "2-digit",
+      month: "short",
+      hour12: false
+    }).formatToParts(new Date(startTime));
+    const values = Object.fromEntries(parts.map(({ type, value }) => [type, value]));
+    if (!values.month || !values.day || !values.hour || !values.minute)
+      return "unverified";
+    return `${values.month} ${values.day} ${values.hour}:${values.minute}`;
+  } catch {
+    return "unverified";
+  }
+}
+function formatFailClosedCommandLine(commandLine) {
+  if (typeof commandLine !== "string" || commandLine.trim().length === 0)
+    return "unverified";
+  try {
+    const normalized = commandLine.replaceAll("\x00", " ").replace(/\s+/g, " ").trim();
+    if (normalized.length === 0)
+      return "unverified";
+    const sanitized = sanitizeDiagnosticText(normalized).trim();
+    if (sanitized.length === 0)
+      return "unverified";
+    return sanitized.length > MAX_FORMATTED_COMMAND_LINE_LENGTH ? `${sanitized.slice(0, MAX_FORMATTED_COMMAND_LINE_LENGTH - 3)}...` : sanitized;
+  } catch {
+    return "unverified";
+  }
+}
 function formatFailClosedBlockingProcesses(processes) {
   const uniqueProcesses = new Map;
   for (const process2 of processes) {
     if (!Number.isInteger(process2.pid) || process2.pid <= 0)
       continue;
-    const kind = normalizeFailClosedProcessKind(process2);
-    uniqueProcesses.set(`${kind}\x00${process2.pid}`, { kind, pid: process2.pid });
+    const candidate = {
+      kind: normalizeFailClosedProcessKind(process2),
+      pid: process2.pid,
+      startTime: process2.startTime,
+      commandLine: process2.commandLine
+    };
+    const previous = uniqueProcesses.get(process2.pid);
+    if (!previous || previous.kind === "process" && candidate.kind !== "process") {
+      uniqueProcesses.set(process2.pid, candidate);
+    } else {
+      uniqueProcesses.set(process2.pid, {
+        ...previous,
+        startTime: previous.startTime ?? candidate.startTime,
+        commandLine: previous.commandLine ?? candidate.commandLine
+      });
+    }
   }
   const entries = [...uniqueProcesses.values()];
   const visible = entries.slice(0, MAX_FORMATTED_BLOCKING_PROCESSES);
@@ -464,10 +664,12 @@ function formatFailClosedBlockingProcesses(processes) {
     rendered.push(`${omitted} more blocking process(es)`);
   if (rendered.length === 0)
     return "a live process";
-  if (rendered.length === 1)
-    return rendered[0];
-  const last = rendered.pop();
-  return `${rendered.join(", ")}, and ${last}`;
+  const summary = rendered.length === 1 ? rendered[0] : `${rendered.slice(0, -1).join(", ")}, and ${rendered.at(-1)}`;
+  const evidence = entries.map(({ kind, pid, startTime, commandLine }) => `- PID ${pid}: ${kind}, started ${formatFailClosedProcessStartTime(startTime)}, cmd: ${formatFailClosedCommandLine(commandLine)}`).join(`
+`);
+  return `${summary}
+Blocking process evidence:
+${evidence}`;
 }
 function formatFailClosedBlockingMessage(reason) {
   if (reason.kind === "migration_guard") {
@@ -690,6 +892,17 @@ function readPsProcessStartTime(pid) {
     return null;
   }
 }
+function readProcessStartTime(pid) {
+  if (!Number.isInteger(pid) || pid <= 0)
+    return null;
+  return rpcIdentityPlatform === "linux" ? readLinuxProcessStartTime(pid) : rpcIdentityPlatform === "win32" ? null : readPsProcessStartTime(pid);
+}
+function readProcessProbeEvidence(pid) {
+  return {
+    startTime: readProcessStartTime(pid),
+    commandLine: readProcessCommand(pid)
+  };
+}
 function parseCsvLine(line) {
   const fields = [];
   let field = "";
@@ -822,16 +1035,16 @@ function commandLooksLikeOpenCode(command) {
   const normalized = command.toLowerCase();
   return OPEN_CODE_COMMAND_MARKERS.some((marker) => normalized.includes(marker));
 }
-function isPidIdentityPlausible(record) {
+function isPidIdentityPlausible(record, evidence) {
   if (!Number.isInteger(record.pid) || record.pid <= 0)
     return "implausible";
   if (Number.isFinite(record.started_at) && record.started_at > 0) {
-    const processStartTime = rpcIdentityPlatform === "linux" ? readLinuxProcessStartTime(record.pid) : rpcIdentityPlatform === "win32" ? null : readPsProcessStartTime(record.pid);
+    const processStartTime = evidence ? evidence.startTime : readProcessStartTime(record.pid);
     if (processStartTime === null)
       return "inconclusive";
     return processStartTime <= record.started_at + RPC_IDENTITY_SKEW_TOLERANCE_MS ? "plausible" : "implausible";
   }
-  const command = rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(record.pid) : rpcIdentityPlatform === "win32" ? readWindowsProcess(record.pid).command ?? null : readPsProcessCommand(record.pid);
+  const command = evidence ? evidence.commandLine : rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(record.pid) : rpcIdentityPlatform === "win32" ? readWindowsProcess(record.pid).command ?? null : readPsProcessCommand(record.pid);
   if (command === null)
     return "inconclusive";
   return commandLooksLikeOpenCode(command) ? "plausible" : "implausible";
@@ -2410,7 +2623,7 @@ var CATEGORY_DEFAULT_TTL = {
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
 import { existsSync, realpathSync, statSync } from "node:fs";
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import path from "node:path";
 var GIT_TIMEOUT_MS = 5000;
 var TRANSIENT_FAILURE_COOLDOWN_MS = 5 * 60 * 1000;
@@ -2424,7 +2637,7 @@ var dubiousOwnershipLoggedDirectories = new Set;
 var dubiousOwnershipWarnedDirectories = new Set;
 var transientGitIdentityReuseLoggedDirectories = new Set;
 var execFileSyncForIdentity = execFileSync2;
-var userHomeDirectoryForIdentity = () => homedir();
+var userHomeDirectoryForIdentity = () => homedir2();
 var nowMs = () => Date.now();
 
 class ProjectIdentityError extends Error {
@@ -5161,6 +5374,37 @@ var MIGRATIONS = [
       ensureColumn(db, "transform_decisions", "m0_model_key_prev", "TEXT");
       ensureColumn(db, "transform_decisions", "m0_model_key_new", "TEXT");
     }
+  },
+  {
+    version: 80,
+    description: "record observed m[0] tool-set hash comparisons",
+    up(db) {
+      if (!tableExists2(db, "transform_decisions"))
+        return;
+      ensureColumn(db, "transform_decisions", "m0_tool_set_hash_prev", "TEXT");
+      ensureColumn(db, "transform_decisions", "m0_tool_set_hash_new", "TEXT");
+    }
+  },
+  {
+    version: 81,
+    description: "persist last-known-good transform snapshots across restarts",
+    up(db) {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS lkg_slots (
+                    session_id TEXT PRIMARY KEY,
+                    json_prefix TEXT NOT NULL,
+                    input_id_seq TEXT NOT NULL,
+                    input_content_digests TEXT NOT NULL,
+                    input_content_signatures TEXT,
+                    last_input_message_id TEXT NOT NULL,
+                    model_key TEXT,
+                    provider_key TEXT,
+                    captured_at INTEGER NOT NULL,
+                    row_version INTEGER,
+                    capture_sequence INTEGER
+                );
+            `);
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -5280,7 +5524,7 @@ import { createHash as createHash5 } from "node:crypto";
 // src/hooks/magic-context/read-session-formatting.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, realpathSync as realpathSync2 } from "node:fs";
 import { createRequire } from "node:module";
-import { homedir as homedir2 } from "node:os";
+import { homedir as homedir3 } from "node:os";
 import { dirname, join as join2, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 
@@ -5397,7 +5641,7 @@ var tokenizerLoadPromise;
 var tokenizerWarningSent = false;
 function tokenizerPackageRoots() {
   const cwd = process.cwd();
-  const openCodeCache = join2(process.env.XDG_CACHE_HOME ?? join2(homedir2(), ".cache"), "opencode");
+  const openCodeCache = join2(process.env.XDG_CACHE_HOME ?? join2(homedir3(), ".cache"), "opencode");
   const roots = [cwd, openCodeCache];
   const candidates = [];
   for (const root of roots) {
@@ -5616,6 +5860,14 @@ function keyFor(providerID, modelID, agentName) {
 function fingerprintFor(description, parameters) {
   return createHash5("sha256").update(description).update("\x00").update(stableStringify(parameters)).digest("hex");
 }
+function getCurrentToolSetHash(providerID, modelID, agentName) {
+  if (!providerID || !modelID)
+    return "";
+  const toolIds = measurements.get(keyFor(providerID, modelID, agentName));
+  if (!toolIds || toolIds.size === 0)
+    return "";
+  return createHash5("sha256").update(Array.from(toolIds.keys()).sort().join("\x00")).digest("hex");
+}
 function setDatabase(db) {
   persistenceDb = db;
   cachedInsertStmt = null;
@@ -5957,7 +6209,7 @@ function getSchemaFenceRejection() {
 function getMigrationOnOpenRefusal() {
   return lastMigrationOnOpenRefusal;
 }
-var LATEST_SUPPORTED_VERSION = 79;
+var LATEST_SUPPORTED_VERSION = 81;
 var PERMISSIONS_ENFORCEABLE = process.platform !== "win32";
 var defaultStoragePermissionFs = { chmodSync, mkdirSync };
 var storagePermissionFs = defaultStoragePermissionFs;
@@ -6123,8 +6375,8 @@ function classifyDiscoveryRecordKind(record) {
   }
   return null;
 }
-function classifyRpcProcess(record) {
-  return classifyDiscoveryRecordKind(record) ?? classifyProcessKind(readProcessCommand(record.pid));
+function classifyRpcProcess(record, commandLine) {
+  return classifyDiscoveryRecordKind(record) ?? classifyProcessKind(commandLine === undefined ? readProcessProbeEvidence(record.pid).commandLine : commandLine);
 }
 function classifyJunkDiscovery(portFile, raw, staleFiles) {
   let mtimeMs;
@@ -6201,18 +6453,23 @@ function inspectRpcServerDiscovery(storageDir) {
       continue;
     }
     const liveness = isPidAlive(record.pid);
-    const identity = liveness === "dead" ? "implausible" : isPidIdentityPlausible(record);
-    if (liveness === "alive" && identity === "plausible") {
+    if (liveness === "dead") {
+      staleFiles.push(portFile);
+      continue;
+    }
+    const evidence = readProcessProbeEvidence(record.pid);
+    const identity = isPidIdentityPlausible(record, evidence);
+    if (identity === "plausible") {
       pids.add(record.pid);
-      const detected = {
-        kind: classifyRpcProcess(record),
+      const detected = attachFailClosedBlockingProcessEvidence({
+        kind: classifyRpcProcess(record, evidence.commandLine),
         pid: record.pid
-      };
+      }, evidence);
       const previous = processByPid.get(record.pid);
       if (!previous || previous.kind === "process" && detected.kind !== "process") {
         processByPid.set(record.pid, detected);
       }
-    } else if (liveness === "dead" || identity === "implausible") {
+    } else if (identity === "implausible") {
       staleFiles.push(portFile);
     } else {
       inconclusivePids.add(record.pid);
@@ -6245,6 +6502,9 @@ function inspectRpcServerDiscovery(storageDir) {
   }
   return { state: "stale", serverPids: [], staleFiles };
 }
+function createPiBlockingProcess(pid) {
+  return attachFailClosedBlockingProcessEvidence({ kind: "Pi", pid }, readProcessProbeEvidence(pid));
+}
 function formatInconclusiveOpenCodeMigrationWarning(dbPath, pids) {
   return `[magic-context] storage warning: continuing migration for ${dbPath}; OpenCode server PID ${pids.join(", ")} was not confirmed because its liveness or identity check could not run. This commonly means an OS sandbox denied kill(0) or ps. No live OpenCode server was confirmed.`;
 }
@@ -6286,10 +6546,7 @@ function enforceMigrationOnOpenGuard(db, dbPath, dbDir, latestSupportedVersion)
   const piDiscovery = inspectLivePiProcesses();
   const piPids = migrationBlockingPiPids(dbPath, discovery, piDiscovery.processIds);
   const serverProcesses = discovery.serverProcesses ?? (discovery.state === "live" ? discovery.serverPids.map((pid) => ({ kind: "process", pid })) : []);
-  const blockingProcesses = [
-    ...serverProcesses,
-    ...piPids.map((pid) => ({ kind: "Pi", pid }))
-  ];
+  const blockingProcesses = [...serverProcesses, ...piPids.map(createPiBlockingProcess)];
   if ((discovery.state === "absent" || discovery.state === "stale" || discovery.state === "inconclusive") && piPids.length === 0) {
     lastMigrationOnOpenRefusal = null;
     logInconclusiveMigrationProbes(dbPath, discovery, piDiscovery.state);
@@ -7109,10 +7366,12 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       decision           TEXT    NOT NULL,
       materialized       INTEGER NOT NULL DEFAULT 0,
       materialize_reason TEXT,
-      system_hash_prev   TEXT,
-      system_hash_new    TEXT,
-      m0_model_key_prev  TEXT,
-      m0_model_key_new   TEXT,
+      system_hash_prev      TEXT,
+      system_hash_new       TEXT,
+      m0_tool_set_hash_prev TEXT,
+      m0_tool_set_hash_new  TEXT,
+      m0_model_key_prev     TEXT,
+      m0_model_key_new      TEXT,
       emergency          INTEGER NOT NULL DEFAULT 0,
       dropped_tokens     INTEGER NOT NULL DEFAULT 0,
       dropped_count      INTEGER NOT NULL DEFAULT 0,
@@ -7450,10 +7709,12 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
         decision           TEXT    NOT NULL,
         materialized       INTEGER NOT NULL DEFAULT 0,
         materialize_reason TEXT,
-        system_hash_prev   TEXT,
-        system_hash_new    TEXT,
-        m0_model_key_prev  TEXT,
-        m0_model_key_new   TEXT,
+      system_hash_prev      TEXT,
+      system_hash_new       TEXT,
+      m0_tool_set_hash_prev TEXT,
+      m0_tool_set_hash_new  TEXT,
+      m0_model_key_prev     TEXT,
+      m0_model_key_new      TEXT,
         emergency          INTEGER NOT NULL DEFAULT 0,
         dropped_tokens     INTEGER NOT NULL DEFAULT 0,
         dropped_count      INTEGER NOT NULL DEFAULT 0,
@@ -10680,6 +10941,7 @@ function clearEmergencyDropSample(db, sessionId) {
     db.prepare("UPDATE session_meta SET last_emergency_input_sample = 0 WHERE session_id = ?").run(sessionId);
   })();
 }
+var EMPTY_CHANNEL1_NUDGE_STATE = { level: "", ordinal: 0 };
 function isLastNudgeUndroppedRow(row) {
   return typeof row === "object" && row !== null && typeof row.last_nudge_undropped === "number";
 }
@@ -10689,6 +10951,24 @@ function isLastNudgeLevelRow(row) {
 function normalizeLastNudgeLevel(value) {
   return value === "gentle" || value === "firm" || value === "urgent" ? value : "";
 }
+function parseChannel1NudgeState(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+      return {
+        level: normalizeLastNudgeLevel(parsed.level),
+        ordinal: typeof parsed.ordinal === "number" ? Math.max(0, Math.round(parsed.ordinal)) : 0
+      };
+    }
+  } catch {}
+  return { level: normalizeLastNudgeLevel(raw), ordinal: 0 };
+}
+function serializeChannel1NudgeState(value) {
+  return JSON.stringify({
+    level: normalizeLastNudgeLevel(value.level),
+    ordinal: Math.max(0, Math.round(value.ordinal))
+  });
+}
 function getLastNudgeUndropped(db, sessionId) {
   const result = db.prepare("SELECT last_nudge_undropped FROM session_meta WHERE session_id = ?").get(sessionId);
   return isLastNudgeUndroppedRow(result) ? result.last_nudge_undropped : 0;
@@ -10699,27 +10979,27 @@ function setLastNudgeUndropped(db, sessionId, value) {
     db.prepare("UPDATE session_meta SET last_nudge_undropped = ? WHERE session_id = ?").run(Math.max(0, Math.round(value)), sessionId);
   })();
 }
-function getLastNudgeLevel(db, sessionId) {
+function getChannel1NudgeState(db, sessionId) {
   const result = db.prepare("SELECT last_nudge_level FROM session_meta WHERE session_id = ?").get(sessionId);
-  return isLastNudgeLevelRow(result) ? normalizeLastNudgeLevel(result.last_nudge_level) : "";
+  return isLastNudgeLevelRow(result) ? parseChannel1NudgeState(result.last_nudge_level) : EMPTY_CHANNEL1_NUDGE_STATE;
 }
-function setLastNudgeLevel(db, sessionId, value) {
+function setChannel1NudgeState(db, sessionId, value) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET last_nudge_level = ? WHERE session_id = ?").run(normalizeLastNudgeLevel(value), sessionId);
+    db.prepare("UPDATE session_meta SET last_nudge_level = ? WHERE session_id = ?").run(serializeChannel1NudgeState(value), sessionId);
   })();
 }
 function resetLastNudgeCycle(db, sessionId) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET last_nudge_undropped = 0, last_nudge_level = '' WHERE session_id = ?").run(sessionId);
+    db.prepare("UPDATE session_meta SET last_nudge_undropped = 0, last_nudge_level = ? WHERE session_id = ?").run(serializeChannel1NudgeState(EMPTY_CHANNEL1_NUDGE_STATE), sessionId);
   })();
 }
 function resetLastNudgeCycleIfTailShrank(db, sessionId, measuredUndropped) {
   let changed = false;
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
-    const result = db.prepare("UPDATE session_meta SET last_nudge_undropped = 0, last_nudge_level = '' WHERE session_id = ? AND last_nudge_undropped > ?").run(sessionId, Math.max(0, Math.round(measuredUndropped)));
+    const result = db.prepare("UPDATE session_meta SET last_nudge_undropped = 0, last_nudge_level = ? WHERE session_id = ? AND last_nudge_undropped > ?").run(serializeChannel1NudgeState(EMPTY_CHANNEL1_NUDGE_STATE), sessionId, Math.max(0, Math.round(measuredUndropped)));
     changed = (result.changes ?? 0) > 0;
   })();
   return changed;
@@ -12417,12 +12697,27 @@ function collectToolPartIdentities(messages) {
   }
   return identities;
 }
+function isMachineGeneratedUserPart(part) {
+  if (!isRecord(part))
+    return false;
+  const metadata = isRecord(part.metadata) ? part.metadata : null;
+  const marker = metadata && isRecord(metadata.marker) ? metadata.marker : null;
+  return part.synthetic === true || part.ignored === true || marker?.kind != null || isSyntheticTodoPart(part);
+}
 function isSyntheticMessage(message) {
-  const structuralHead = message.info.id === undefined && message.info.role === "user" && message.parts.length > 0 && message.parts.every((part) => isRecord(part) && part.synthetic === true);
-  return structuralHead || message.info.summary === true || message.info.id === TODO_HEAD_ANCHOR_ID;
+  const syntheticUserRow = message.info.role === "user" && message.parts.length > 0 && message.parts.every(isMachineGeneratedUserPart);
+  return syntheticUserRow || message.info.summary === true || message.info.id === TODO_HEAD_ANCHOR_ID;
+}
+function countRealUserMessages(messages) {
+  let count = 0;
+  for (const message of messages) {
+    if (message.info.role === "user" && !isSyntheticMessage(message))
+      count += 1;
+  }
+  return count;
 }
 function isSyntheticPart(part) {
-  return isRecord(part) && part.synthetic === true || isSyntheticTodoPart(part);
+  return isMachineGeneratedUserPart(part);
 }
 function stripChannel1ReminderSpans(output) {
   let stripped = output;
@@ -12583,7 +12878,8 @@ function snapshot(args) {
   const memo = memoizedContent(args.kind, args.content);
   const tag = args.tag;
   const isProtected = tag ? args.protectedNumbers.has(tag.tagNumber) : false;
-  const uTokens = tag?.status === "active" && !isProtected && args.kind !== "excluded" ? args.tokens : 0;
+  const queuedForDrop = tag ? args.pendingDropTagNumbers.has(tag.tagNumber) : false;
+  const uTokens = tag?.status === "active" && !isProtected && !queuedForDrop && args.kind !== "excluded" ? args.tokens : 0;
   return {
     key: args.key,
     contentHash: memo.hash,
@@ -12592,7 +12888,8 @@ function snapshot(args) {
     uTokens,
     tagNumber: tag?.tagNumber ?? null,
     tagStatus: tag?.status ?? null,
-    protected: isProtected
+    protected: isProtected,
+    queuedForDrop
   };
 }
 function excludedSnapshot(key, part) {
@@ -12603,7 +12900,8 @@ function excludedSnapshot(key, part) {
     content,
     tokens: 0,
     tag: undefined,
-    protectedNumbers: new Set
+    protectedNumbers: new Set,
+    pendingDropTagNumbers: new Set
   });
 }
 function fileContentAndTokens(part) {
@@ -12639,6 +12937,7 @@ function sameTailHygieneStructuralSignature(expected, actual) {
   return expected.partCounts.every((count, index) => count === actual.partCounts[index]);
 }
 function measureTailHygiene(input) {
+  const pendingDropTagNumbers = input.pendingDropTagNumbers ?? new Set;
   const toolIdentities = collectToolPartIdentities(input.messages);
   const attribution = buildTagAttribution({
     messages: input.messages,
@@ -12688,7 +12987,8 @@ function measureTailHygiene(input) {
           content,
           tokens: memo.tokens,
           tag,
-          protectedNumbers: attribution.protectedNumbers
+          protectedNumbers: attribution.protectedNumbers,
+          pendingDropTagNumbers
         });
         parts.push(measured);
         t += measured.tokens;
@@ -12708,7 +13008,8 @@ function measureTailHygiene(input) {
           content: file.content,
           tokens: file.tokens,
           tag,
-          protectedNumbers: attribution.protectedNumbers
+          protectedNumbers: attribution.protectedNumbers,
+          pendingDropTagNumbers
         });
         parts.push(measured);
         t += measured.tokens;
@@ -12732,7 +13033,8 @@ function measureTailHygiene(input) {
             content: inputText,
             tokens: memo.tokens,
             tag,
-            protectedNumbers: attribution.protectedNumbers
+            protectedNumbers: attribution.protectedNumbers,
+            pendingDropTagNumbers
           });
           parts.push(measured);
           t += measured.tokens;
@@ -12751,7 +13053,8 @@ function measureTailHygiene(input) {
               content: output,
               tokens: memo.tokens,
               tag,
-              protectedNumbers: attribution.protectedNumbers
+              protectedNumbers: attribution.protectedNumbers,
+              pendingDropTagNumbers
             });
             parts.push(measured);
             t += measured.tokens;
@@ -12774,26 +13077,35 @@ function measureTailHygiene(input) {
   };
 }
 function sameMeasuredPrefix(baseline, current) {
-  if (current.length < baseline.length)
-    return { valid: false, boundaryAdvanceU: 0 };
+  if (current.length < baseline.length) {
+    return { valid: false, boundaryAdvanceU: 0, queuedDropDeltaU: 0 };
+  }
   let boundaryAdvanceU = 0;
+  let queuedDropDeltaU = 0;
   for (let index = 0;index < baseline.length; index += 1) {
     const before = baseline[index];
     const after = current[index];
     if (before.key !== after.key || before.contentHash !== after.contentHash || before.kind !== after.kind || before.tokens !== after.tokens || before.tagNumber !== after.tagNumber || before.tagStatus !== after.tagStatus) {
-      return { valid: false, boundaryAdvanceU: 0 };
+      return { valid: false, boundaryAdvanceU: 0, queuedDropDeltaU: 0 };
+    }
+    if (!before.protected && after.protected) {
+      return { valid: false, boundaryAdvanceU: 0, queuedDropDeltaU: 0 };
     }
-    if (!before.protected && after.protected)
-      return { valid: false, boundaryAdvanceU: 0 };
     if (before.protected && !after.protected) {
-      if (after.tagStatus !== "active")
-        return { valid: false, boundaryAdvanceU: 0 };
-      boundaryAdvanceU += after.tokens;
+      if (after.tagStatus !== "active") {
+        return { valid: false, boundaryAdvanceU: 0, queuedDropDeltaU: 0 };
+      }
+      boundaryAdvanceU += after.uTokens;
+    } else if (before.queuedForDrop !== after.queuedForDrop) {
+      if (before.tagStatus !== "active" || after.tagStatus !== "active") {
+        return { valid: false, boundaryAdvanceU: 0, queuedDropDeltaU: 0 };
+      }
+      queuedDropDeltaU += after.uTokens - before.uTokens;
     } else if (before.uTokens !== after.uTokens) {
-      return { valid: false, boundaryAdvanceU: 0 };
+      return { valid: false, boundaryAdvanceU: 0, queuedDropDeltaU: 0 };
     }
   }
-  return { valid: true, boundaryAdvanceU };
+  return { valid: true, boundaryAdvanceU, queuedDropDeltaU };
 }
 function refreshTailHygieneBaseline(input) {
   const measured = measureTailHygiene(input);
@@ -12825,7 +13137,7 @@ function refreshTailHygieneBaseline(input) {
     };
   }
   let turnDeltaT = 0;
-  let turnDeltaU = prefix.boundaryAdvanceU;
+  let turnDeltaU = prefix.boundaryAdvanceU + prefix.queuedDropDeltaU;
   for (let index = input.previous.baselineParts.length;index < measured.parts.length; index += 1) {
     const part = measured.parts[index];
     turnDeltaT += part.tokens;
@@ -12951,26 +13263,44 @@ function formatOldestReclaimableHint(hint) {
   return rendered.length > 0 ? `
 oldest reclaimable: ${rendered}.` : "";
 }
-function buildChannel2Reminder(undroppedTokens, hint) {
+function buildChannel2Reminder(undroppedTokens, usableWindowTokens, hint) {
   const amount = approxThousands(undroppedTokens);
+  const usableWindow = approxThousands(usableWindowTokens);
   const hintText = formatOldestReclaimableHint(hint);
   return `<system-reminder>
-` + `Routine context housekeeping is near: a large span of this session will be comparted soon, ` + `and ~${amount} tokens of tool output remain unreduced. Drop spent outputs with ctx_reduce ` + `first so the archived span is the part that matters.${hintText}
+` + `Routine housekeeping: an older span of this session folds into compact history automatically — nothing is lost and nothing pauses. ` + `Drop spent tool outputs with ctx_reduce first so the archive keeps only what matters (~${amount} of ~${usableWindow} reclaimable).${hintText}
 ` + `</system-reminder>`;
 }
-function buildChannel1Reminder(level, undroppedTokens, hint) {
-  const amount = approxThousands(undroppedTokens);
+var CHANNEL1_STICKY_REAL_USER_TURN_GAP = 3;
+function shouldUseStickyChannel1Reminder(input) {
+  if (input.lastLevel !== input.level)
+    return false;
+  if (input.lastOrdinal > input.currentRealUserTurnCount)
+    return false;
+  const gap = input.currentRealUserTurnCount - input.lastOrdinal;
+  return gap >= 0 && gap < CHANNEL1_STICKY_REAL_USER_TURN_GAP;
+}
+function buildChannel1Reminder(level, undroppedTokens, usableWindowTokens, hint, sticky = false) {
   const hintText = formatOldestReclaimableHint(hint);
+  if (sticky) {
+    return `
+
+<system-reminder>
+Reminder: ctx_reduce housekeeping still pending —${hintText}
+</system-reminder>`;
+  }
+  const amount = approxThousands(undroppedTokens);
+  const usableWindow = approxThousands(usableWindowTokens);
   let body;
   switch (level) {
     case "gentle":
-      body = `You have ~${amount} tokens of content you have not reduced. ` + `When you are done with earlier outputs, dropping them with ctx_reduce keeps context lean.`;
+      body = `Housekeeping: some earlier tool outputs are spent and can be dropped with ctx_reduce when you are done with them. ` + `Context is managed automatically — this is tidiness, never a reason to rush or narrow scope.`;
       break;
     case "firm":
-      body = `~${amount} tokens of unreduced content has built up. ` + `At your next natural stopping point, consider dropping what you have already processed with ctx_reduce.`;
+      body = `Housekeeping: ~${amount} of this session's ~${usableWindow} window is spent tool output. ` + `Drop what you have already processed with ctx_reduce at a natural stopping point. ` + `Not a limit — nothing is lost either way.`;
       break;
     case "urgent":
-      body = `~${amount} tokens of unreduced content remain across most of the live tail. ` + `Consider dropping spent outputs with ctx_reduce so the archived span is the part that matters.`;
+      body = `Housekeeping backlog: ~${amount} of this session's ~${usableWindow} window is spent tool output — worth a ctx_reduce pass now. ` + `This is routine and lossless; it is never a reason to change scope.`;
       break;
   }
   return `
@@ -13181,8 +13511,14 @@ function getOldestActiveUnprotectedToolTags(db, sessionId, protectedTags = 0, li
   const params = protectedTags > 0 ? [sessionId, AGE_RECLAIM_MIN_TOKENS, sessionId, protectedTags - 1] : [sessionId, AGE_RECLAIM_MIN_TOKENS];
   const rows = db.prepare(`SELECT tag_number, tool_name
              FROM tags
-             WHERE session_id = ? AND status = 'active' AND type = 'tool'
-             ${valueFloor}
+               WHERE session_id = ? AND status = 'active' AND type = 'tool'
+                    AND NOT EXISTS (
+                        SELECT 1 FROM pending_ops
+                        WHERE pending_ops.session_id = tags.session_id
+                          AND pending_ops.tag_id = tags.tag_number
+                          AND pending_ops.operation = 'drop'
+                    )
+                    ${valueFloor}
              ${whereProtected}
              ORDER BY tag_number ASC, id ASC`).all(...params);
   return rows.filter((row) => typeof row.tag_number === "number").map((row) => ({
@@ -13821,6 +14157,59 @@ function parseReportedLimit(message) {
   return;
 }
 
+// src/shared/resolve-fallbacks.ts
+function resolveFallbackChain(userFallbacks) {
+  const userList = normalizeUserFallbacks(userFallbacks);
+  return dedupe(userList.filter(isValidModelSpec));
+}
+function normalizeUserFallbacks(userFallbacks) {
+  if (!userFallbacks)
+    return [];
+  if (typeof userFallbacks === "string") {
+    const trimmed = userFallbacks.trim();
+    return trimmed ? [trimmed] : [];
+  }
+  return userFallbacks.map((s) => s.trim()).filter((s) => s.length > 0);
+}
+function isValidModelSpec(spec) {
+  const slash = spec.indexOf("/");
+  return slash > 0 && slash < spec.length - 1;
+}
+function dedupe(list) {
+  const seen = new Set;
+  const out = [];
+  for (const item of list) {
+    if (seen.has(item))
+      continue;
+    seen.add(item);
+    out.push(item);
+  }
+  return out;
+}
+function parseProviderModel(spec) {
+  const slash = spec.indexOf("/");
+  if (slash < 1 || slash >= spec.length - 1)
+    return null;
+  return {
+    providerID: spec.slice(0, slash).trim(),
+    modelID: spec.slice(slash + 1).trim()
+  };
+}
+function modelBodyField(spec) {
+  const entry = toModelEntry(spec);
+  if (!entry)
+    return {};
+  const parsed = parseProviderModel(entry.model);
+  return parsed ? { model: parsed, ...entry.qualifier ? { variant: entry.qualifier } : {} } : {};
+}
+function toModelEntry(spec) {
+  if (typeof spec === "string") {
+    const model = spec.trim();
+    return model ? { model } : undefined;
+  }
+  return spec;
+}
+
 // src/shared/model-suggestion-retry.ts
 var ABORT_CALL_TIMEOUT_MS = 3000;
 function copyPromptArgs(args, body) {
@@ -13985,15 +14374,18 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
     log(`[${callContext}] primary (${explicitPrimaryLabel}) failed: ${shortErr(error)}; trying ${fallbacks.length} fallback(s)`);
   }
   for (let i = 0;i < fallbacks.length; i += 1) {
-    const parsed = parseProviderModel(fallbacks[i]);
+    const fallback = toModelEntry(fallbacks[i]);
+    const parsed = fallback ? parseProviderModel(fallback.model) : null;
     if (!parsed) {
-      log(`[${callContext}] skipping invalid fallback spec: ${fallbacks[i]}`);
+      log(`[${callContext}] skipping invalid fallback spec: ${String(fallbacks[i])}`);
       continue;
     }
     const label = `${parsed.providerID}/${parsed.modelID}`;
+    const { variant: _primaryVariant, ...bodyWithoutPrimaryVariant } = baseBody;
     const attemptArgs = copyPromptArgs(baseArgs, {
-      ...baseBody,
-      model: parsed
+      ...bodyWithoutPrimaryVariant,
+      model: parsed,
+      ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
     try {
       await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label);
@@ -14009,7 +14401,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       }
     }
   }
-  log(`[${callContext}] all models exhausted; tried: ${[explicitPrimaryLabel, ...fallbacks].join(", ")}; last error: ${shortErr(lastError)}`);
+  log(`[${callContext}] all models exhausted; tried: ${[explicitPrimaryLabel, ...fallbacks.map((fallback) => toModelEntry(fallback)?.model ?? String(fallback))].join(", ")}; last error: ${shortErr(lastError)}`);
   throw lastError ?? new Error("All fallback models failed");
 }
 async function attemptAndValidate(client, args, timeoutMs, signal, callContext, attempt, options) {
@@ -14047,15 +14439,18 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
     log(`[${callContext}] primary (${explicitPrimaryLabel}) failed validation/prompt: ${shortErr(error)}; trying ${fallbacks.length} fallback(s)`);
   }
   for (let i = 0;i < fallbacks.length; i += 1) {
-    const parsed = parseProviderModel(fallbacks[i]);
+    const fallback = toModelEntry(fallbacks[i]);
+    const parsed = fallback ? parseProviderModel(fallback.model) : null;
     if (!parsed) {
-      log(`[${callContext}] skipping invalid fallback spec: ${fallbacks[i]}`);
+      log(`[${callContext}] skipping invalid fallback spec: ${String(fallbacks[i])}`);
       continue;
     }
     const label = `${parsed.providerID}/${parsed.modelID}`;
+    const { variant: _primaryVariant, ...bodyWithoutPrimaryVariant } = baseBody;
     const attemptArgs = copyPromptArgs(baseArgs, {
-      ...baseBody,
-      model: parsed
+      ...bodyWithoutPrimaryVariant,
+      model: parsed,
+      ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
     const attempt = {
       label,
@@ -14080,7 +14475,7 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
       }
     }
   }
-  log(`[${callContext}] all models exhausted; tried: ${[explicitPrimaryLabel, ...fallbacks].join(", ")}; original error: ${shortErr(firstError)}; last error: ${shortErr(lastError)}`);
+  log(`[${callContext}] all models exhausted; tried: ${[explicitPrimaryLabel, ...fallbacks.map((fallback) => toModelEntry(fallback)?.model ?? String(fallback))].join(", ")}; original error: ${shortErr(firstError)}; last error: ${shortErr(lastError)}`);
   throw firstError ?? lastError ?? new Error("All fallback models failed validation");
 }
 // src/shared/normalize-sdk-response.ts
@@ -14206,15 +14601,15 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync
 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 import { basename as basename2, dirname as dirname3, isAbsolute, join as join5 } from "node:path";
 var CONFIG_FILE_BASENAME = "magic-context";
 var MOVED_MARKER_SUFFIX = ".MOVED_READPLEASE";
 function homeDir() {
   if (process.platform === "win32") {
-    return process.env.USERPROFILE || process.env.HOME || homedir3();
+    return process.env.USERPROFILE || process.env.HOME || homedir4();
   }
-  return process.env.HOME || homedir3();
+  return process.env.HOME || homedir4();
 }
 function configHome() {
   const xdg = process.env.XDG_CONFIG_HOME;
@@ -16753,7 +17148,7 @@ function countSessionCompartmentEmbedCoverage(db, projectPath, sessionId, modelI
 import { createHash as createHash14, randomUUID as randomUUID2 } from "node:crypto";
 
 // src/config/schema/magic-context.ts
-import { homedir as homedir4 } from "node:os";
+import { homedir as homedir5 } from "node:os";
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -17380,7 +17775,7 @@ __export(exports_util, {
   createTransparentProxy: () => createTransparentProxy,
   defineLazy: () => defineLazy,
   esc: () => esc,
-  escapeRegex: () => escapeRegex,
+  escapeRegex: () => escapeRegex2,
   explicitlyAborted: () => explicitlyAborted,
   extend: () => extend,
   finalizeIssue: () => finalizeIssue,
@@ -17657,7 +18052,7 @@ var primitiveTypes = /* @__PURE__ */ new Set([
   "symbol",
   "undefined"
 ]);
-function escapeRegex(str) {
+function escapeRegex2(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function clone(inst, def, params) {
@@ -18367,7 +18762,7 @@ function emoji() {
 var ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
 var ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
 var mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+  const escapedDelim = escapeRegex2(delimiter ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 };
 var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -18868,7 +19263,7 @@ var $ZodCheckUpperCase = /* @__PURE__ */ $constructor("$ZodCheckUpperCase", (ins
 });
 var $ZodCheckIncludes = /* @__PURE__ */ $constructor("$ZodCheckIncludes", (inst, def) => {
   $ZodCheck.init(inst, def);
-  const escapedRegex = escapeRegex(def.includes);
+  const escapedRegex = escapeRegex2(def.includes);
   const pattern = new RegExp(typeof def.position === "number" ? `^.{${def.position}}${escapedRegex}` : escapedRegex);
   def.pattern = pattern;
   inst._zod.onattach.push((inst2) => {
@@ -18892,7 +19287,7 @@ var $ZodCheckIncludes = /* @__PURE__ */ $constructor("$ZodCheckIncludes", (inst,
 });
 var $ZodCheckStartsWith = /* @__PURE__ */ $constructor("$ZodCheckStartsWith", (inst, def) => {
   $ZodCheck.init(inst, def);
-  const pattern = new RegExp(`^${escapeRegex(def.prefix)}.*`);
+  const pattern = new RegExp(`^${escapeRegex2(def.prefix)}.*`);
   def.pattern ?? (def.pattern = pattern);
   inst._zod.onattach.push((inst2) => {
     const bag = inst2._zod.bag;
@@ -18915,7 +19310,7 @@ var $ZodCheckStartsWith = /* @__PURE__ */ $constructor("$ZodCheckStartsWith", (i
 });
 var $ZodCheckEndsWith = /* @__PURE__ */ $constructor("$ZodCheckEndsWith", (inst, def) => {
   $ZodCheck.init(inst, def);
-  const pattern = new RegExp(`.*${escapeRegex(def.suffix)}$`);
+  const pattern = new RegExp(`.*${escapeRegex2(def.suffix)}$`);
   def.pattern ?? (def.pattern = pattern);
   inst._zod.onattach.push((inst2) => {
     const bag = inst2._zod.bag;
@@ -20562,7 +20957,7 @@ var $ZodEnum = /* @__PURE__ */ $constructor("$ZodEnum", (inst, def) => {
   const values = getEnumValues(def.entries);
   const valuesSet = new Set(values);
   inst._zod.values = valuesSet;
-  inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex(o) : o.toString()).join("|")})$`);
+  inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex2(o) : o.toString()).join("|")})$`);
   inst._zod.parse = (payload, _ctx) => {
     const input = payload.value;
     if (valuesSet.has(input)) {
@@ -20584,7 +20979,7 @@ var $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
   }
   const values = new Set(def.values);
   inst._zod.values = values;
-  inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex(o) : o ? escapeRegex(o.toString()) : String(o)).join("|")})$`);
+  inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex2(o) : o ? escapeRegex2(o.toString()) : String(o)).join("|")})$`);
   inst._zod.parse = (payload, _ctx) => {
     const input = payload.value;
     if (values.has(input)) {
@@ -20949,7 +21344,7 @@ var $ZodTemplateLiteral = /* @__PURE__ */ $constructor("$ZodTemplateLiteral", (i
       const end = source.endsWith("$") ? source.length - 1 : source.length;
       regexParts.push(source.slice(start, end));
     } else if (part === null || primitiveTypes.has(typeof part)) {
-      regexParts.push(escapeRegex(`${part}`));
+      regexParts.push(escapeRegex2(`${part}`));
     } else {
       throw new Error(`Invalid template literal part: ${part}`);
     }
@@ -31227,16 +31622,134 @@ var PromptSurfaceConfigSchema = exports_external.object({
     message: "tool description values must not be empty or whitespace-only"
   })).optional().describe("USER-LEVEL ONLY top-level description overrides keyed by ctx_* tool ID; parameter schemas and descriptions are unchanged.")
 }).describe("Prompt-surface preset routing. Project config may select default/models, while guidance_override_path and tool_descriptions are user-level only.");
+var PER_HARNESS_MIGRATION_INVENTORY = {
+  historian: {
+    retained: [
+      "temperature",
+      "top_p",
+      "prompt",
+      "tools",
+      "disable",
+      "description",
+      "mode",
+      "color",
+      "maxSteps",
+      "permission",
+      "maxTokens",
+      "two_pass",
+      "disallowed_tools"
+    ],
+    migrated_execution: ["model", "fallback_models", "variant", "thinking_level"]
+  },
+  dreamer: {
+    retained: [
+      "temperature",
+      "top_p",
+      "prompt",
+      "tools",
+      "disable",
+      "description",
+      "mode",
+      "color",
+      "maxSteps",
+      "permission",
+      "maxTokens",
+      "inject_docs"
+    ],
+    migrated_execution: ["model", "fallback_models", "variant", "thinking_level"]
+  },
+  task: {
+    retained: ["schedule", "promotion_threshold"],
+    migrated_execution: [
+      "model",
+      "fallback_models",
+      "variant",
+      "thinking_level",
+      "timeout_minutes"
+    ]
+  }
+};
+var OcEntryObjectSchema = exports_external.object({
+  model: exports_external.string().describe("OpenCode model ID (for example, provider/model)."),
+  variant: exports_external.string().optional().describe("OpenCode reasoning variant for this entry.")
+}).strict();
+var OcEntrySchema = exports_external.union([exports_external.string(), OcEntryObjectSchema]);
+var PiEntryObjectSchema = exports_external.object({
+  model: exports_external.string().describe("Pi model ID (for example, provider/model)."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
+}).strict();
+var PiEntrySchema = exports_external.union([exports_external.string(), PiEntryObjectSchema]);
+var OpenCodeHarnessBlockSchema = exports_external.object({
+  model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
+  fallback_models: exports_external.array(OcEntrySchema).optional().describe("Ordered fallback OpenCode entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
+  variant: exports_external.string().optional().describe("OpenCode reasoning variant for the primary entry when it declares none. Fallback entries declare variants per-entry.")
+}).strict().describe("Strict OpenCode model-resolution block. It accepts no Pi vocabulary.");
+var PiHarnessBlockSchema = exports_external.object({
+  model: PiEntrySchema.optional().describe("Primary Pi model entry."),
+  fallback_models: exports_external.array(PiEntrySchema).optional().describe("Ordered fallback Pi entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry.")
+}).strict().describe("Strict Pi model-resolution block. It accepts no OpenCode vocabulary.");
+var OpenCodeTaskExecutionSchema = exports_external.object({
+  model: OcEntrySchema.optional().describe("OpenCode model entry for this task."),
+  fallback_models: exports_external.array(OcEntrySchema).optional().describe("Ordered OpenCode fallback entries for this task."),
+  variant: exports_external.string().optional().describe("OpenCode reasoning variant for this task's primary entry when it declares none. Fallback entries declare variants per-entry."),
+  timeout_minutes: exports_external.number().min(5).optional().describe("Minutes allowed for this task before it is aborted.")
+}).strict();
+var PiTaskExecutionSchema = exports_external.object({
+  model: PiEntrySchema.optional().describe("Pi model entry for this task."),
+  fallback_models: exports_external.array(PiEntrySchema).optional().describe("Ordered Pi fallback entries for this task."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this task's primary entry when it declares none. Fallback entries declare thinking levels per-entry."),
+  timeout_minutes: exports_external.number().min(5).optional().describe("Minutes allowed for this task before it is aborted.")
+}).strict();
+var DreamerOpenCodeHarnessBlockSchema = exports_external.object({
+  model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
+  fallback_models: exports_external.array(OcEntrySchema).optional().describe("Ordered fallback OpenCode entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
+  variant: exports_external.string().optional().describe("OpenCode reasoning variant for the primary entry when it declares none. Fallback entries declare variants per-entry."),
+  tasks: exports_external.record(exports_external.string(), OpenCodeTaskExecutionSchema).optional().describe("OpenCode task execution overrides. Each named task accepts only model, fallback_models, variant, and timeout_minutes.")
+}).strict().describe("Strict OpenCode dreamer model-resolution block. It accepts no Pi vocabulary.");
+var DreamerPiHarnessBlockSchema = exports_external.object({
+  model: PiEntrySchema.optional().describe("Primary Pi model entry."),
+  fallback_models: exports_external.array(PiEntrySchema).optional().describe("Ordered fallback Pi entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry."),
+  tasks: exports_external.record(exports_external.string(), PiTaskExecutionSchema).optional().describe("Pi task execution overrides. Each named task accepts only model, fallback_models, thinking_level, and timeout_minutes.")
+}).strict().describe("Strict Pi dreamer model-resolution block. It accepts no OpenCode vocabulary.");
+var ProfileOpenCodeModelBlockSchema = exports_external.object({
+  model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
+  fallback_models: exports_external.array(OcEntrySchema).optional().describe("Ordered fallback OpenCode model entries."),
+  variant: exports_external.string().optional().describe("OpenCode reasoning variant for the primary model entry.")
+}).strict().describe("Strict profile-only OpenCode model-selection block.");
+var ProfilePiModelBlockSchema = exports_external.object({
+  model: PiEntrySchema.optional().describe("Primary Pi model entry."),
+  fallback_models: exports_external.array(PiEntrySchema).optional().describe("Ordered fallback Pi model entries."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary model entry.")
+}).strict().describe("Strict profile-only Pi model-selection block.");
+var ProfileHistorianSchema = exports_external.object({
+  opencode: ProfileOpenCodeModelBlockSchema.optional(),
+  pi: ProfilePiModelBlockSchema.optional()
+}).strict();
+var ProfileDreamerSchema = exports_external.object({
+  opencode: ProfileOpenCodeModelBlockSchema.optional(),
+  pi: ProfilePiModelBlockSchema.optional()
+}).strict();
+var ProfileSidekickSchema = AgentOverrideConfigSchema.pick({
+  model: true,
+  fallback_models: true,
+  variant: true
+}).extend({
+  thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the sidekick model selection.")
+}).strict();
+var ConfigProfileSchema = exports_external.object({
+  historian: ProfileHistorianSchema.optional(),
+  dreamer: ProfileDreamerSchema.optional(),
+  sidekick: ProfileSidekickSchema.optional()
+}).strict().describe("User-owned model-selection overlay. Only historian/dreamer harness model blocks and sidekick model-selection fields are allowed.");
+var ConfigProfilesSchema = exports_external.record(exports_external.string().trim().min(1, "Profile names must not be empty or whitespace-only."), ConfigProfileSchema);
 var CronScheduleSchema = exports_external.string().refine((s) => s.trim() === "" || isValidCron(s), {
   message: 'Invalid schedule: use a 5-field cron expression (e.g. "0 3 * * *" for 3am daily, "0 3 * * 0" for Sunday 3am, "0 */6 * * *" every 6h) or "" to disable.'
 }).describe('5-field cron schedule (e.g. "0 3 * * *"), or "" to disable this task.');
 var DreamTaskBaseConfigSchema = exports_external.object({
-  schedule: CronScheduleSchema.default(""),
-  model: exports_external.string().optional().describe("Per-task model override (inherits dreamer.model)"),
-  fallback_models: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional().describe("Per-task fallback chain (inherits dreamer.fallback_models)"),
-  thinking_level: PiThinkingLevelSchema.describe("Pi only: per-task thinking level"),
-  timeout_minutes: exports_external.number().min(5).default(20).describe("Minutes allowed for this task before it is aborted")
-});
+  schedule: CronScheduleSchema.default("")
+}).strict();
 var PromotionThresholdSchema = exports_external.number().min(2).max(20).optional().describe("review-user-memories: min candidate observations before promotion is considered (default: 3)");
 var PrimerPromotionThresholdSchema = exports_external.number().min(2).max(20).optional().describe("promote-primers: min recurring source days before promotion is considered (default: 2)");
 var DreamTaskConfigSchema = DreamTaskBaseConfigSchema.extend({
@@ -31283,29 +31796,44 @@ var DreamTasksSchema = exports_external.object({
   "review-user-memories": ReviewUserMemoriesTaskConfigSchema.default(() => ReviewUserMemoriesTaskConfigSchema.parse(defaultTaskConfig("review-user-memories"))),
   "promote-primers": PromotePrimersTaskConfigSchema.default(() => PromotePrimersTaskConfigSchema.parse(defaultTaskConfig("promote-primers"))),
   "refresh-primers": DreamTaskBaseConfigSchema.default(() => DreamTaskBaseConfigSchema.parse(defaultTaskConfig("refresh-primers")))
-}).describe("Per-task scheduling + model config. Each task has its own cron schedule and may override the dreamer-level model.");
-var DreamerConfigSchema = AgentOverrideConfigSchema.merge(exports_external.object({
+}).describe("Harness-independent task metadata. schedule, promotion_threshold, and other task metadata remain here; execution settings live under dreamer.opencode.tasks or dreamer.pi.tasks.");
+var AgentMetadataSchema = AgentOverrideConfigSchema.pick({
+  temperature: true,
+  top_p: true,
+  prompt: true,
+  tools: true,
+  disable: true,
+  description: true,
+  mode: true,
+  color: true,
+  maxSteps: true,
+  permission: true,
+  maxTokens: true
+});
+var DreamerConfigSchema = AgentMetadataSchema.extend({
+  opencode: DreamerOpenCodeHarnessBlockSchema.optional(),
+  pi: DreamerPiHarnessBlockSchema.optional(),
   tasks: DreamTasksSchema.default(() => DreamTasksSchema.parse({})),
-  inject_docs: exports_external.boolean().default(true).describe("Inject ARCHITECTURE.md and STRUCTURE.md into the m[0] `<project-docs>` block (default true)"),
-  thinking_level: PiThinkingLevelSchema.describe("Pi only: default thinking level for dreamer subagent invocations. See historian.thinking_level.")
-}));
+  inject_docs: exports_external.boolean().default(true).describe("Inject ARCHITECTURE.md and STRUCTURE.md into the m[0] `<project-docs>` block (default true)")
+});
 var SidekickConfigSchema = AgentOverrideConfigSchema.extend({
   timeout_ms: exports_external.number().default(30000).describe("Timeout for sidekick calls in milliseconds"),
   system_prompt: exports_external.string().optional().describe("Custom system prompt for sidekick"),
-  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level for sidekick subagent invocations. See historian.thinking_level.")
+  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level for sidekick subagent invocations. See historian.pi.thinking_level.")
 }).optional();
-var HistorianConfigSchema = AgentOverrideConfigSchema.extend({
+var HistorianConfigSchema = AgentMetadataSchema.extend({
+  opencode: OpenCodeHarnessBlockSchema.optional(),
+  pi: PiHarnessBlockSchema.optional(),
   two_pass: exports_external.boolean().default(false).describe("Run a second editor pass over historian output to clean low-signal U: lines and cross-compartment duplicates. Adds ~1 extra API call and ~1.3x cost per historian run. Useful for models without extended thinking support. (default: false)"),
-  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level passed as --thinking <level> to Pi historian subagent invocations. Required when using reasoning models (e.g. github-copilot/gpt-5.4) because Pi's default thinking-level resolution can pick a value the provider rejects. OpenCode users set variant instead. Valid: off | minimal | low | medium | high | xhigh | max"),
   disallowed_tools: exports_external.array(exports_external.enum(["*", "read", "aft_outline", "aft_zoom", "aft_search"])).default([]).describe(`OpenCode only. Tools to REMOVE from the historian's default allow-list [read, aft_outline, aft_zoom, aft_search]. Applies to both historian and historian-editor agents. Use ["*"] to strip all tool definitions from the model request — this prevents weak instruction-following models (e.g. mistral-small-latest) from entering tool-calling loops. Individual tool names remove just that tool. Note: a user-supplied historian.permission override can re-allow a tool that disallowed_tools removed — disallowed_tools sets the baseline, permission overrides take precedence. (default: [])`)
 }).optional();
 var EmbeddingFallbackProviderSchema = exports_external.enum(["local", "openai-compatible", "off"]);
 function expandConfigPath(value) {
   const trimmed = value.trim();
   if (trimmed === "~")
-    return homedir4();
+    return homedir5();
   if (trimmed.startsWith("~/"))
-    return `${homedir4()}/${trimmed.slice(2)}`;
+    return `${homedir5()}/${trimmed.slice(2)}`;
   return trimmed;
 }
 var BaseEmbeddingConfigSchema = exports_external.object({
@@ -31406,8 +31934,10 @@ var MagicContextConfigSchema = exports_external.object({
   transform_mode: exports_external.enum(["ts", "rust"]).default("ts").describe('Experimental: routes the entire Magic Context runtime for the project through the ck-mc Rust module over subc (requires user-level `subc` config); "ts" is the current TypeScript pipeline.'),
   auto_update: exports_external.boolean().optional().describe("Enable automatic npm self-update checks for the OpenCode plugin. Security: USER-only in config loader, so hostile project configs cannot suppress updates."),
   language: exports_external.string().trim().toLowerCase().refine((s) => isValidLanguageCode(s), 'language must be a 2-letter ISO 639-1 code (e.g. "tr", "es", "de")').optional().describe("Output language for Magic Context's generated content and guidance, as a " + '2-letter ISO 639-1 code (e.g. "tr", "es", "de", "ja", "pt"). When set, the ' + "historian, dreamer, sidekick, and the agent-guidance block instruct the model to " + "write its PROSE in this language while keeping all structural tokens (XML tags, " + "the five memory category names, code identifiers, file paths) in English. " + "USER-LEVEL ONLY (ignored in project config for security). Unset = today's " + "behavior (model mirrors the conversation; English scaffolding). Changing it " + "triggers one cache re-materialization; existing compartments/memories keep their " + "original language until naturally rewritten."),
-  historian: HistorianConfigSchema.describe("Historian agent configuration (model, fallback_models, variant, temperature, maxTokens, permission, two_pass, etc.)"),
-  dreamer: DreamerConfigSchema.optional().describe("Dreamer agent + scheduling configuration (model, fallback_models, disable, schedule, tasks, etc.)"),
+  profile: exports_external.string().trim().min(1).optional().describe("Select a named user-owned model profile. A valid project name overrides this user default; an empty string, null, or other non-string project value is ignored with a warning so the user selection still applies. Unknown names warn and use the base configuration."),
+  profiles: ConfigProfilesSchema.optional().describe("User-level named model profiles. A profile may contain only historian/dreamer model, fallback_models, OpenCode variant, and Pi thinking_level fields plus sidekick model-selection fields; task execution policy (including timeout_minutes) is excluded. Project configs may select a name but cannot define profiles."),
+  historian: HistorianConfigSchema.describe("Historian metadata plus independent strict OpenCode and Pi execution blocks. Retained metadata stays at historian; model, fallback_models, variant, and thinking_level belong only in historian.opencode or historian.pi."),
+  dreamer: DreamerConfigSchema.optional().describe("Dreamer metadata and scheduling plus independent strict OpenCode and Pi execution blocks. schedule and promotion_threshold stay at dreamer.tasks; model, fallback_models, variant, thinking_level, and timeout_minutes belong only in the matching harness block."),
   smart_notes: exports_external.object({
     retina_handoff: exports_external.boolean().default(false).describe("When true, dreamer skips smart notes whose surface conditions compiled to retina provider configs at authoring time. Default false keeps both paths active until the retina consumer is deployed.")
   }).default({ retina_handoff: false }).describe("Smart-note ownership transition controls."),
@@ -31822,6 +32352,25 @@ function releaseGitSweepLease(db, projectPath, holderId) {
   });
 }
 
+// src/features/magic-context/memory/embedding-failure.ts
+function dominantEmbeddingFailure(failures) {
+  const counts = new Map;
+  for (const failure of failures) {
+    const key = `${failure.class}\x00${failure.reason}`;
+    const current = counts.get(key);
+    if (current)
+      current.count += 1;
+    else
+      counts.set(key, { failure, count: 1 });
+  }
+  let dominant;
+  for (const candidate of counts.values()) {
+    if (!dominant || candidate.count > dominant.count)
+      dominant = candidate;
+  }
+  return dominant?.failure;
+}
+
 // src/features/magic-context/memory/embedding-synapse.ts
 import { createHash as createHash13 } from "node:crypto";
 
@@ -34201,6 +34750,7 @@ class OpenAICompatibleEmbeddingProvider {
   circuitOpenUntil = 0;
   openLogged = false;
   modelMismatchLogged = false;
+  lastFailureReason = null;
   halfOpenProbeInFlight = false;
   constructor(options) {
     this.endpoint = normalizeEndpoint2(options.endpoint);
@@ -34290,41 +34840,59 @@ class OpenAICompatibleEmbeddingProvider {
         signal: internalController.signal
       });
       if (!response.ok) {
-        log(`[magic-context] openai-compatible embedding request failed: ${response.status} ${response.statusText}`);
-        this.recordFailure(isProbe);
+        const excerpt = await response.text().catch(() => "");
+        const failure = this.failure("http_error", `HTTP ${response.status} from endpoint${this.bodyExcerpt(excerpt)}`, response.status >= 500 || response.status === 408 || response.status === 429);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
         return Array.from({ length: texts.length }, () => null);
       }
       const rawBody = await response.text();
       if (rawBody.trim().length === 0) {
-        log(`[magic-context] openai-compatible embedding request returned empty body (status=${response.status}, content-type=${response.headers.get("content-type") ?? "none"})`);
-        this.recordFailure(isProbe);
+        const failure = this.failure("invalid_envelope", "response body was empty", false);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
         return Array.from({ length: texts.length }, () => null);
       }
       let body;
       try {
         body = JSON.parse(rawBody);
-      } catch (parseError) {
-        const snippet = rawBody.slice(0, 200).replace(/\s+/g, " ");
-        log(`[magic-context] openai-compatible embedding response was not JSON (status=${response.status}, ${rawBody.length}B body, snippet="${snippet}"):`, parseError instanceof Error ? parseError.message : parseError);
-        this.recordFailure(isProbe);
+      } catch {
+        const failure = this.failure("invalid_envelope", `response body was not valid JSON${this.bodyExcerpt(rawBody)}`, false);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
         return Array.from({ length: texts.length }, () => null);
       }
       const servedModel = typeof body.model === "string" ? body.model : "";
       if (this.model && servedModel && !embeddingModelsMatch(servedModel, this.model)) {
         if (!this.modelMismatchLogged) {
-          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${this.model}" served="${servedModel}". Check that the endpoint serves the requested model; variant suffixes and vendor prefixes are matched automatically.`);
+          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${sanitizeDiagnosticText(this.model)}" served="${sanitizeDiagnosticText(servedModel)}". Check that the endpoint serves the requested model; variant suffixes and vendor prefixes are matched automatically.`);
           this.modelMismatchLogged = true;
         }
-        this.recordFailure(isProbe);
+        this.recordFailure(isProbe, this.failure("substitution_rejected", `served model '${sanitizeDiagnosticText(servedModel)}' does not match requested '${sanitizeDiagnosticText(this.model)}' (substitution guard)`, false));
+        return Array.from({ length: texts.length }, () => null);
+      }
+      const responseKeys = Object.keys(body).sort();
+      if (!Array.isArray(body.data)) {
+        const failure = this.failure("invalid_envelope", `response had keys [${responseKeys.join(", ")}] but data[] was absent`, false);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
+        return Array.from({ length: texts.length }, () => null);
+      }
+      if (body.data.length === 0) {
+        const failure = this.failure("empty_result", "response data[] was empty", true);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
         return Array.from({ length: texts.length }, () => null);
       }
-      const items = Array.isArray(body.data) ? body.data : [];
+      const items = body.data;
       const results = Array.from({ length: texts.length }, (_, index) => {
         const embedding = items[index]?.embedding;
         return Array.isArray(embedding) ? Float32Array.from(embedding) : null;
       });
       if (results.every((r) => r === null)) {
-        this.recordFailure(isProbe);
+        const failure = this.failure("invalid_envelope", `response had keys [${responseKeys.join(", ")}] but data[].embedding was absent`, false);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
       } else {
         this.recordSuccess();
       }
@@ -34334,11 +34902,14 @@ class OpenAICompatibleEmbeddingProvider {
       if (isAbort) {
         if (signal?.aborted) {} else {
           log(`[magic-context] openai-compatible embedding request timed out after ${FETCH_TIMEOUT_MS}ms`);
-          this.recordFailure(isProbe);
+          const failure = this.failure("transport_error", `request timed out after ${FETCH_TIMEOUT_MS}ms`, true);
+          this.recordFailure(isProbe, failure);
         }
       } else {
-        log("[magic-context] openai-compatible embedding request failed:", error51);
-        this.recordFailure(isProbe);
+        const detail = error51 instanceof Error ? error51.message : String(error51);
+        const failure = this.failure("transport_error", `transport error: ${sanitizeDiagnosticText(detail)}`, true);
+        log(`[magic-context] openai-compatible embedding request failed: ${failure.reason}`);
+        this.recordFailure(isProbe, failure);
       }
       return Array.from({ length: texts.length }, () => null);
     } finally {
@@ -34370,14 +34941,23 @@ class OpenAICompatibleEmbeddingProvider {
       return "short_circuit";
     }
     this.halfOpenProbeInFlight = true;
-    log("[magic-context] openai-compatible embedding: circuit half-open, probing endpoint");
+    log(`[magic-context] openai-compatible embedding: circuit half-open, probing endpoint after ${this.lastFailureReason?.reason ?? "unknown failure"}`);
     return "probe";
   }
-  recordFailure(isProbe) {
+  failure(failureClass, reason, retryable) {
+    return { class: failureClass, reason, retryable };
+  }
+  bodyExcerpt(body) {
+    const excerpt = sanitizeDiagnosticText(body).replace(/\s+/g, " ").trim().slice(0, 200);
+    return excerpt ? `: ${excerpt}` : "";
+  }
+  recordFailure(isProbe, failure) {
+    if (failure)
+      this.lastFailureReason = failure;
     if (isProbe) {
       this.circuitOpenUntil = Date.now() + OPEN_DURATION_MS;
       if (!this.openLogged) {
-        log(`[magic-context] openai-compatible embedding: probe failed, re-opening circuit for ${OPEN_DURATION_MS / 60000}min`);
+        log(`[magic-context] openai-compatible embedding: probe failed (${failure?.reason ?? this.lastFailureReason?.reason ?? "unknown failure"}), re-opening circuit for ${OPEN_DURATION_MS / 60000}min`);
         this.openLogged = true;
       }
       this.failureTimes = [];
@@ -34390,7 +34970,7 @@ class OpenAICompatibleEmbeddingProvider {
     if (this.failureTimes.length >= FAILURE_THRESHOLD) {
       this.circuitOpenUntil = now + OPEN_DURATION_MS;
       if (!this.openLogged) {
-        log(`[magic-context] openai-compatible embedding: opening circuit for ${OPEN_DURATION_MS / 60000}min after ${this.failureTimes.length} failures in ${FAILURE_WINDOW_MS / 1000}s`);
+        log(`[magic-context] openai-compatible embedding: opening circuit for ${OPEN_DURATION_MS / 60000}min after ${this.failureTimes.length} failures in ${FAILURE_WINDOW_MS / 1000}s (${failure?.reason ?? this.lastFailureReason?.reason ?? "unknown failure"})`);
         this.openLogged = true;
       }
       this.failureTimes = [];
@@ -34403,6 +34983,10 @@ class OpenAICompatibleEmbeddingProvider {
     this.failureTimes = [];
     this.circuitOpenUntil = 0;
     this.openLogged = false;
+    this.lastFailureReason = null;
+  }
+  getLastFailureReason() {
+    return this.lastFailureReason;
   }
   _getCircuitState() {
     if (this.circuitOpenUntil === 0)
@@ -34420,6 +35004,7 @@ class OpenAICompatibleEmbeddingProvider {
     this.circuitOpenUntil = 0;
     this.openLogged = false;
     this.halfOpenProbeInFlight = false;
+    this.lastFailureReason = null;
   }
 }
 
@@ -35669,11 +36254,16 @@ async function drainCommitBacklogForProject(db, projectIdentity, deadline) {
   }
   return total;
 }
+function getLastEmbeddingFailureForProject(projectIdentity) {
+  const registration = projectRegistrations.get(projectIdentity);
+  return registration?.provider?.getLastFailureReason?.() ?? null;
+}
 async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates, signal) {
   const noWork = [];
   const failed = [];
+  const failureReasons = [];
   if (candidates.length === 0)
-    return { embedded: 0, noWork, failed };
+    return { embedded: 0, noWork, failed, failureReasons };
   const maxInputTokens = getProjectEmbeddingMaxInputTokens(projectIdentity);
   const prepared = [];
   for (const candidate of candidates) {
@@ -35690,7 +36280,7 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
     prepared.push({ candidate, windows });
   }
   if (prepared.length === 0)
-    return { embedded: 0, noWork, failed };
+    return { embedded: 0, noWork, failed, failureReasons };
   let embedded = 0;
   let i = 0;
   while (i < prepared.length) {
@@ -35722,6 +36312,11 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
       }
       if (signal?.aborted)
         break;
+      if (!result || result.vectors.size === 0) {
+        const failure = getLastEmbeddingFailureForProject(projectIdentity);
+        if (failure)
+          failureReasons.push(failure);
+      }
       if (result) {
         for (const item of slice) {
           if (persistedIds.has(item.candidate.id))
@@ -35763,7 +36358,7 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
       }
     }
   }
-  return { embedded, noWork, failed };
+  return { embedded, noWork, failed, failureReasons };
 }
 async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, options) {
   const snapshot2 = getProjectEmbeddingSnapshot(projectIdentity);
@@ -35801,6 +36396,7 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
   let aborted2 = false;
   let providerDown = false;
   let consecutiveFailedBatches = 0;
+  const failureReasons = [];
   try {
     options?.onProgress?.({ embedded, total });
     for (;; ) {
@@ -35814,7 +36410,8 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
       const {
         embedded: n,
         noWork,
-        failed
+        failed,
+        failureReasons: batchFailureReasons
       } = await embedCandidateChunkBatch(db, projectIdentity, snapshot2.chunkModelId, candidates, drainAbort.signal);
       if (leaseLost || !renewGitSweepLease(db, projectIdentity, holderId)) {
         leaseLost = true;
@@ -35822,6 +36419,7 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
         aborted2 = true;
         break;
       }
+      failureReasons.push(...batchFailureReasons);
       for (const id of noWork)
         skipIds.push(id);
       for (const id of failed)
@@ -35853,7 +36451,14 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
   if (providerDown || failedIds.length > 0) {
     const remaining = Math.max(0, countUnembeddedSessionCompartments(db, projectIdentity, sessionId, snapshot2.chunkModelId) - skipIds.length);
     if (remaining > 0) {
-      return { status: "stalled", embedded, total, remaining, failed: failedIds.length };
+      return {
+        status: "stalled",
+        embedded,
+        total,
+        remaining,
+        failed: failedIds.length,
+        failure: dominantEmbeddingFailure(failureReasons)
+      };
     }
   }
   return { status: "done", embedded, total, failed: failedIds.length };
@@ -38578,6 +39183,7 @@ async function runValidatedHistorianPass(args) {
   const firstRun = await runHistorianPrompt({
     ...args,
     dumpLabel: `${args.dumpLabelBase}-initial`,
+    modelOverride: args.model,
     agentId: args.agentId
   });
   if (!firstRun.ok || !firstRun.result) {
@@ -38606,6 +39212,7 @@ async function runValidatedHistorianPass(args) {
     ...args,
     prompt: repairPrompt,
     dumpLabel: `${args.dumpLabelBase}-repair`,
+    modelOverride: args.model,
     agentId: args.agentId
   });
   if (!repairRun.ok || !repairRun.result) {
@@ -38646,7 +39253,8 @@ async function runEditorPassOrFallback(args) {
     timeoutMs: args.timeoutMs,
     dumpLabel: `${args.dumpLabelBase}-editor`,
     agentId: HISTORIAN_EDITOR_AGENT,
-    parentInvocationId: args.draftInvocationId ?? null
+    parentInvocationId: args.draftInvocationId ?? null,
+    modelOverride: args.model
   });
   if (!editorRun.ok || !editorRun.result) {
     sessionLog(args.parentSessionId, "historian two-pass: editor call failed", {
@@ -38699,7 +39307,7 @@ async function runHistorianPrompt(args) {
     });
   };
   try {
-    sessionLog(parentSessionId, `historian: creating child session (agent=${agentId}, model=${modelOverride ? `${modelOverride.providerID}/${modelOverride.modelID}` : `agent:${agentId}`})`);
+    sessionLog(parentSessionId, `historian: creating child session (agent=${toModelEntry(modelOverride)?.model ?? `agent:${agentId}`})`);
     const createResponse = await createChildSessionWithFence({
       client,
       db,
@@ -38723,7 +39331,7 @@ async function runHistorianPrompt(args) {
           query: { directory: sessionDirectory },
           body: {
             agent: agentId,
-            ...modelOverride ? { model: modelOverride } : {},
+            ...modelBodyField(modelOverride),
             parts: [{ type: "text", text: prompt, synthetic: true }]
           }
         }, {
@@ -38793,10 +39401,21 @@ async function runHistorianPrompt(args) {
 async function runFallbackHistorianPass(args) {
   const seen = new Set;
   const chain = [];
-  for (const candidate of [...args.fallbackModels ?? [], args.fallbackModelId ?? ""]) {
-    if (!candidate || seen.has(candidate))
+  const primary = toModelEntry(args.model);
+  for (const candidateInput of [
+    ...args.fallbackModels ?? [],
+    ...args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
+  ]) {
+    const candidate = toModelEntry(candidateInput);
+    if (!candidate)
+      continue;
+    const key = `${candidate.model}\x00${candidate.qualifier ?? ""}`;
+    if (!candidate.model || seen.has(key))
       continue;
-    seen.add(candidate);
+    if (primary?.model === candidate.model && primary.qualifier === candidate.qualifier) {
+      continue;
+    }
+    seen.add(key);
     chain.push(candidate);
   }
   if (chain.length === 0) {
@@ -38804,9 +39423,9 @@ async function runFallbackHistorianPass(args) {
   }
   let lastError = args.error;
   for (let i = 0;i < chain.length; i += 1) {
-    const modelId = chain[i];
-    const modelOverride = parseModelOverride(modelId);
-    if (!modelOverride)
+    const modelOverride = chain[i];
+    const modelId = modelOverride.model;
+    if (!parseModelOverride(modelId))
       continue;
     const isSessionModelLastResort = modelId === args.fallbackModelId && i === chain.length - 1;
     sessionLog(args.parentSessionId, `compartment agent: retrying historian with ${modelId} (${isSessionModelLastResort ? "session-model last resort" : "configured fallback"} ${i + 1}/${chain.length})`);
@@ -40351,6 +40970,7 @@ function isDroppedPlaceholder(text) {
 }
 var EMPTY_HARD_SIGNALS = {
   systemHash: "",
+  toolSetHash: "",
   modelKey: "",
   cacheExpired: false,
   lastResponseTime: 0
@@ -40654,6 +41274,7 @@ function readCurrentM0SnapshotMarkersUncached(args) {
       upgradeState: getUpgradeState(args.db, args.sessionId),
       compartmentRenderEpoch: COMPARTMENT_RENDER_EPOCH,
       systemHash: hard.systemHash,
+      toolSetHash: hard.toolSetHash ?? "",
       modelKey: piModelRefToCanonical(hard.modelKey),
       projectIdentity: args.projectPath ?? null,
       muralEnabled: args.muralEnabled === true,
@@ -40669,6 +41290,7 @@ function refreshVolatileMarkerInputs(markers, args) {
     projectDocsHash: projectDirectory && args.injectDocs !== false ? computeProjectDocsHash(projectDirectory) : "",
     materializedAt: Date.now(),
     systemHash: hard.systemHash,
+    toolSetHash: hard.toolSetHash ?? "",
     modelKey: hard.modelKey,
     projectIdentity: args.projectPath ?? null,
     muralEnabled: args.muralEnabled === true,
@@ -40736,6 +41358,7 @@ function snapshotMarkersFromCachedM0(state2) {
     upgradeState: cachedUpgradeIdentity.upgradeState,
     compartmentRenderEpoch: cachedUpgradeIdentity.compartmentRenderEpoch,
     systemHash: state2.cachedM0SystemHash ?? "",
+    toolSetHash: state2.cachedM0ToolSetHash ?? "",
     modelKey: state2.cachedM0ModelKey ?? "",
     projectIdentity: state2.cachedM0ProjectIdentity ?? null,
     muralHash: state2.cachedM0MuralHash ?? null,
@@ -40776,8 +41399,14 @@ function mustMaterialize(args) {
       systemHashNew: hard.systemHash
     };
   }
+  const liveToolSetHash = hard.toolSetHash ?? "";
+  const toolSetHashComparison = liveToolSetHash !== "" ? {
+    m0ToolSetHashPrev: args.state.cachedM0ToolSetHash,
+    m0ToolSetHashNew: liveToolSetHash
+  } : null;
+  const withToolSetHashComparison = (decision) => toolSetHashComparison ? { ...decision, ...toolSetHashComparison } : decision;
   if (hard.cacheExpired && hard.lastResponseTime > 0 && hard.lastResponseTime > (args.state.cachedM0MaterializedAt ?? 0)) {
-    return { value: true, reason: "ttl_idle" };
+    return withToolSetHashComparison({ value: true, reason: "ttl_idle" });
   }
   if (current.projectIdentity !== null) {
     const cachedProjectIdentity = args.state.cachedM0ProjectIdentity ?? null;
@@ -40785,23 +41414,23 @@ function mustMaterialize(args) {
       args.state.cachedM0ProjectIdentity = current.projectIdentity;
       args.db.prepare("UPDATE session_meta SET cached_m0_project_identity = ? WHERE session_id = ?").run(current.projectIdentity, args.sessionId);
     } else if (cachedProjectIdentity !== current.projectIdentity) {
-      return { value: true, reason: "project_change" };
+      return withToolSetHashComparison({ value: true, reason: "project_change" });
     }
   }
   if (current.workspaceFingerprint !== null || (args.state.cachedM0WorkspaceFingerprint ?? null) !== null) {
     if ((args.state.cachedM0WorkspaceFingerprint ?? null) !== current.workspaceFingerprint) {
-      return { value: true, reason: "project_memory_epoch" };
+      return withToolSetHashComparison({ value: true, reason: "project_memory_epoch" });
     }
   } else if (args.state.cachedM0ProjectMemoryEpoch !== current.projectMemoryEpoch) {
     return { value: true, reason: "project_memory_epoch" };
   }
   if (args.state.cachedM0MaxMutationId !== current.maxMutationId) {
-    return { value: true, reason: "max_mutation_id" };
+    return withToolSetHashComparison({ value: true, reason: "max_mutation_id" });
   }
   if (cachedUpgradeIdentity.upgradeState !== current.upgradeState) {
-    return { value: true, reason: "upgrade_state" };
+    return withToolSetHashComparison({ value: true, reason: "upgrade_state" });
   }
-  return { value: false, reason: null };
+  return withToolSetHashComparison({ value: false, reason: null });
 }
 function trimMemoriesToBudgetV2(sessionId, memories, budgetTokens, renderOptions = {}) {
   const selectionOrder = [...memories].sort(memorySelectionOrder);
@@ -41088,6 +41717,7 @@ function applyMarkersToState(state2, m0Bytes, markers, m1Bytes) {
   state2.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
   state2.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity);
   state2.cachedM0SystemHash = markers.systemHash;
+  state2.cachedM0ToolSetHash = markers.toolSetHash;
   state2.cachedM0ModelKey = markers.modelKey;
   state2.cachedM0ProjectIdentity = markers.projectIdentity;
   state2.cachedM0MuralHash = markers.muralHash ?? null;
@@ -41230,6 +41860,7 @@ function materializeM0(options) {
       upgradeState: getUpgradeState(options.db, options.sessionId),
       compartmentRenderEpoch: COMPARTMENT_RENDER_EPOCH,
       systemHash: snapshotMarkers.systemHash,
+      toolSetHash: snapshotMarkers.toolSetHash,
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: projectPath ?? null,
       muralEnabled: snapshotMarkers.muralEnabled,
@@ -41270,6 +41901,7 @@ function materializeM0(options) {
       sessionFactsVersion: snapshotMarkers.sessionFactsVersion,
       upgradeState: encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity),
       systemHash: snapshotMarkers.systemHash,
+      toolSetHash: snapshotMarkers.toolSetHash,
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: snapshotMarkers.projectIdentity
     });
@@ -41466,9 +42098,10 @@ function readCachedM0M1Row(db, sessionId) {
                     cached_m0_project_docs_hash,
                     cached_m0_materialized_at,
                     cached_m0_session_facts_version,
-                    cached_m0_upgrade_state,
-                    cached_m0_system_hash,
-                    cached_m0_model_key,
+                     cached_m0_upgrade_state,
+                     cached_m0_system_hash,
+                     cached_m0_tool_set_hash,
+                     cached_m0_model_key,
                     cached_m0_project_identity,
                     memory_block_ids
                FROM session_meta
@@ -41506,6 +42139,7 @@ function markersFromCachedRow(row) {
     upgradeState: cachedUpgradeIdentity.upgradeState,
     compartmentRenderEpoch: cachedUpgradeIdentity.compartmentRenderEpoch,
     systemHash: row.cached_m0_system_hash ?? "",
+    toolSetHash: row.cached_m0_tool_set_hash ?? "",
     modelKey: row.cached_m0_model_key ?? "",
     projectIdentity: row.cached_m0_project_identity ?? null,
     muralHash: row.cached_m0_mural_hash ?? null,
@@ -41514,7 +42148,7 @@ function markersFromCachedRow(row) {
   };
 }
 function cachedRowMatchesState(row, state2) {
-  return bufferEqualsNullable(row.cached_m0_bytes, state2.cachedM0Bytes) && (row.cached_m0_mural_data_url ?? null) === (state2.cachedM0MuralDataUrl ?? null) && (row.cached_m0_mural_hash ?? null) === (state2.cachedM0MuralHash ?? null) && row.cached_m0_project_memory_epoch === state2.cachedM0ProjectMemoryEpoch && (row.cached_m0_workspace_fingerprint ?? null) === (state2.cachedM0WorkspaceFingerprint ?? null) && row.cached_m0_project_user_profile_version === state2.cachedM0ProjectUserProfileVersion && row.cached_m0_max_compartment_seq === state2.cachedM0MaxCompartmentSeq && row.cached_m0_max_memory_id === state2.cachedM0MaxMemoryId && row.cached_m0_max_mutation_id === state2.cachedM0MaxMutationId && row.cached_m0_max_memory_mutation_id === state2.cachedM0MaxMemoryMutationId && row.cached_m0_materialized_at === state2.cachedM0MaterializedAt && row.cached_m0_session_facts_version === state2.cachedM0SessionFactsVersion && (row.cached_m0_upgrade_state ?? null) === (state2.cachedM0UpgradeState ?? null) && (row.cached_m0_system_hash ?? "") === (state2.cachedM0SystemHash ?? "") && piModelRefToCanonical(row.cached_m0_model_key ?? "") === piModelRefToCanonical(state2.cachedM0ModelKey ?? "") && (row.cached_m0_project_identity ?? null) === (state2.cachedM0ProjectIdentity ?? null);
+  return bufferEqualsNullable(row.cached_m0_bytes, state2.cachedM0Bytes) && (row.cached_m0_mural_data_url ?? null) === (state2.cachedM0MuralDataUrl ?? null) && (row.cached_m0_mural_hash ?? null) === (state2.cachedM0MuralHash ?? null) && row.cached_m0_project_memory_epoch === state2.cachedM0ProjectMemoryEpoch && (row.cached_m0_workspace_fingerprint ?? null) === (state2.cachedM0WorkspaceFingerprint ?? null) && row.cached_m0_project_user_profile_version === state2.cachedM0ProjectUserProfileVersion && row.cached_m0_max_compartment_seq === state2.cachedM0MaxCompartmentSeq && row.cached_m0_max_memory_id === state2.cachedM0MaxMemoryId && row.cached_m0_max_mutation_id === state2.cachedM0MaxMutationId && row.cached_m0_max_memory_mutation_id === state2.cachedM0MaxMemoryMutationId && row.cached_m0_materialized_at === state2.cachedM0MaterializedAt && row.cached_m0_session_facts_version === state2.cachedM0SessionFactsVersion && (row.cached_m0_upgrade_state ?? null) === (state2.cachedM0UpgradeState ?? null) && (row.cached_m0_system_hash ?? "") === (state2.cachedM0SystemHash ?? "") && (row.cached_m0_tool_set_hash ?? "") === (state2.cachedM0ToolSetHash ?? "") && piModelRefToCanonical(row.cached_m0_model_key ?? "") === piModelRefToCanonical(state2.cachedM0ModelKey ?? "") && (row.cached_m0_project_identity ?? null) === (state2.cachedM0ProjectIdentity ?? null);
 }
 function applyCachedRowToState(state2, row) {
   const markers = markersFromCachedRow(row);
@@ -41537,6 +42171,7 @@ function applyCachedRowToState(state2, row) {
   state2.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
   state2.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity);
   state2.cachedM0SystemHash = markers.systemHash;
+  state2.cachedM0ToolSetHash = markers.toolSetHash;
   state2.cachedM0ModelKey = markers.modelKey;
   state2.cachedM0ProjectIdentity = markers.projectIdentity;
   state2.snapshotMarkers = markers;
@@ -45006,6 +45641,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         sequenceOffset: candidateCompartments.length,
         dumpLabelBase: `recomp-${sessionId}-${chunk.startIndex}-${chunk.endIndex}-pass-${passCount + 1}`,
         timeoutMs: historianTimeoutMs,
+        model: deps.model,
         fallbackModelId: deps.fallbackModelId,
         fallbackModels: deps.fallbackModels,
         twoPass: deps.historianTwoPass,
@@ -45426,6 +46062,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         sequenceOffset: candidateCompartments.length,
         dumpLabelBase: `partial-recomp-${sessionId}-${chunk.startIndex}-${chunk.endIndex}-pass-${passCount + 1}`,
         timeoutMs: historianTimeoutMs,
+        model: deps.model,
         fallbackModelId: deps.fallbackModelId,
         fallbackModels: deps.fallbackModels,
         twoPass: deps.historianTwoPass,
@@ -45675,6 +46312,10 @@ var LKG_SINGLE_SLOT_BYTES = 24 * 1024 * 1024;
 var LKG_METADATA_BYTES = 256;
 var slots = new Map;
 var totalBytes = 0;
+var persistenceBackend;
+function registerLkgPersistence(backend) {
+  persistenceBackend = backend;
+}
 function slotBytes(slot) {
   const digestBytes = slot.inputContentDigests.reduce((total, digest) => total + 2 * digest.length, 0);
   return 2 * slot.jsonPrefix.length + digestBytes + LKG_METADATA_BYTES;
@@ -45808,24 +46449,91 @@ function captureSlot(sessionId, slot) {
   totalBytes += bytes;
   return true;
 }
+function installHydratedSlot(sessionId, slot) {
+  const bytes = slotBytes(slot);
+  if (bytes > LKG_SINGLE_SLOT_BYTES)
+    return false;
+  const prior = slots.get(sessionId);
+  if (prior)
+    totalBytes -= prior.bytes;
+  slots.delete(sessionId);
+  while (totalBytes + bytes > LKG_TOTAL_BYTES) {
+    const oldest = slots.keys().next().value;
+    if (oldest === undefined)
+      break;
+    const evicted = slots.get(oldest);
+    slots.delete(oldest);
+    if (evicted)
+      totalBytes -= evicted.bytes;
+  }
+  if (totalBytes + bytes > LKG_TOTAL_BYTES) {
+    if (prior) {
+      slots.set(sessionId, prior);
+      totalBytes += prior.bytes;
+    }
+    return false;
+  }
+  const entry = {
+    slot: {
+      ...slot,
+      inputIdSeq: [...slot.inputIdSeq],
+      inputContentDigests: [...slot.inputContentDigests],
+      inputContentSignatures: slot.inputContentSignatures ? [...slot.inputContentSignatures] : undefined
+    },
+    bytes
+  };
+  slots.set(sessionId, entry);
+  totalBytes += bytes;
+  return true;
+}
+function hydrateSlotFromPersistence(sessionId) {
+  const backend = persistenceBackend;
+  if (!backend)
+    return;
+  let loaded;
+  try {
+    loaded = backend.load(sessionId);
+  } catch (error51) {
+    sessionLog(sessionId, "LKG durable hydration failed:", error51);
+    return;
+  }
+  if (!loaded)
+    return;
+  if (!installHydratedSlot(sessionId, loaded))
+    return;
+  sessionLog(sessionId, "lkg_hydrated_from_disk");
+  const entry = slots.get(sessionId);
+  return entry ? copySlotForRead(entry.slot) : undefined;
+}
+function copySlotForRead(slot) {
+  return {
+    ...slot,
+    inputIdSeq: [...slot.inputIdSeq],
+    inputContentDigests: [...slot.inputContentDigests],
+    inputContentSignatures: slot.inputContentSignatures ? [...slot.inputContentSignatures] : undefined
+  };
+}
 function getSlot(sessionId) {
   const entry = slots.get(sessionId);
   if (!entry)
-    return;
+    return hydrateSlotFromPersistence(sessionId);
   touch(sessionId, entry);
-  return {
-    ...entry.slot,
-    inputIdSeq: [...entry.slot.inputIdSeq],
-    inputContentDigests: [...entry.slot.inputContentDigests],
-    inputContentSignatures: entry.slot.inputContentSignatures ? [...entry.slot.inputContentSignatures] : undefined
-  };
+  return copySlotForRead(entry.slot);
 }
 function dropSlot(sessionId, _reason) {
   const entry = slots.get(sessionId);
-  if (!entry)
+  if (entry) {
+    slots.delete(sessionId);
+    totalBytes -= entry.bytes;
+  }
+  const backend = persistenceBackend;
+  if (!backend)
     return;
-  slots.delete(sessionId);
-  totalBytes -= entry.bytes;
+  try {
+    backend.clear(sessionId);
+  } catch (error51) {
+    sessionLog(sessionId, "LKG durable clear failed:", error51);
+  }
 }
 function noteEntry(sessionId, messages) {
   const slot = getSlot(sessionId);
@@ -45938,6 +46646,7 @@ function buildRecompDeps(ctx, sessionId) {
     directory: ctx.directory,
     memoryEnabled: ctx.memoryEnabled,
     autoPromote: ctx.autoPromote,
+    model: ctx.historianModel,
     fallbackModels: ctx.fallbackModels,
     language: ctx.language,
     fallbackModelId: ctx.fallbackModelId ?? resolveLiveModelKey(ctx.liveSessionState, sessionId),
@@ -46076,7 +46785,7 @@ async function runUpgradeMemoryMigration(ctx, sessionId, migrationDirectory) {
       directory: migrationDirectory,
       parentSessionId: sessionId,
       primaryModelId: ctx.fallbackModelId ?? resolveLiveModelKey(ctx.liveSessionState, sessionId),
-      fallbackModels: ctx.fallbackModels,
+      fallbackModels: ctx.fallbackModels.map((entry) => typeof entry === "string" ? entry : entry.model),
       timeoutMs: ctx.historianTimeoutMs,
       userMemoriesEnabled: ctx.userMemoriesEnabled,
       language: ctx.language
@@ -46087,4 +46796,4 @@ async function runUpgradeMemoryMigration(ctx, sessionId, migrationDirectory) {
   }
 }
 
-export { withContentLanguageDirective, buildPrimaryLanguageDirective, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, resolveLegacyConfigSourcesForHarness, migrateMagicContextConfigLocations, exports_external, DEFAULT_PROTECTED_TAGS, parseCron, nextOccurrence, nextDueAtMs, promptSurfaceConfigIdentity, resolvePromptSurface, resolveModelConfigOrDefault, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, DEFAULT_HISTORIAN_TIMEOUT_MS, DEFAULT_LOCAL_EMBEDDING_MODEL, MagicContextConfigSchema, getOpenCodeDbPath, removeMcOwnedCompactionMarkers, isFailClosedBlockingError, shouldBypassFailClosedBlock, resolveAgentNameFromMessages, createFailClosedController, recordHookInitFailure, clearHookInitFailure, getLastHookInitFailure, ProjectIdentityError, resolveProjectIdentityStrict, takeDubiousOwnershipProjectIdentityWarning, resolveProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, isLinkedGitWorktree, recordSessionProjectIdentity, beginBootQuietPeriod, bootQuietRemainingMs, scheduleAfterBootQuiet, rpcPortDir, rpcPortFilePath, isPidAlive, parseRpcPortFile, registerModuleNoteEvaluationBridge, getModuleNoteEvaluationBridge, getContextStoreUuid, ensureContextStoreUuid, getAuthorityManagedMarker, reconcileAuthorityProject, checksumAuthoritySeedRows, prepareAuthority, drainAuthority, getMirrorCursor, applyMirroredNoteCompileFields, applyMirrorPage, pullMemoryMirrorOnce, V2_MEMORY_CATEGORIES, CATEGORY_PRIORITY, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, resolveStoredPathWorkspaceIdentity, storedPathBelongsToWorkspace, sourceNameForMemory, computeWorkspaceEpochFingerprint, textMentionsRecentCommit, hasMeaningfulUserText, extractTexts, extractToolCallSummaries, preloadTokenizer, estimateTokens, normalizeText, recordToolDefinition, getMeasuredToolDefinitionTokens, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getDatabasePath, getPersistedSchemaVersion, setSqlitePragmaConfig, runSqliteOptimize, openDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, clearRecompStaging, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, isRecord, estimateTrueRawMessageTokens, invalidateTrueRawTokenCache, stripPersistedAssistantText, byteSize, stripTagPrefix, prependTag, isThinkingPart, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, isEditTool, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, setRawMessageProvider, cleanUserText, withRawSessionMessageCache, readRawSessionMessages, primeTailRawMessageCache, primeInMemoryTailRawMessageCache, readRawSessionMessageOrdinalPage, getRawSessionStoredMessageCount, readRawSessionMessagePartsById, readRawSessionMessageOrdinalById, readRawSessionMessageById, readSessionChunk, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, deleteIndexedMessage, clearIndexedMessages, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, recordEmbeddingMeasurement, getMaxM0MutationId, queueMemoryMutation, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationIdForProjects, MAX_EXECUTE_THRESHOLD, escalationBands, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, getEmergencyRecoveryArmedAt, loadPersistedUsage, loadProtectedTailMeta, resetProtectedTailNoEligibleHead, getWrapupInProgressState, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getPersistedReasoningWatermark, setPersistedReasoningWatermark, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getLastNudgeLevel, setLastNudgeLevel, resetLastNudgeCycle, resetLastNudgeCycleIfTailShrank, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, getNoteNudgeAnchors, getAutoSearchHintDecisions, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, pruneAutoSearchHintDecisions, removeNoteNudgeAnchorByMessageId, removeAutoSearchHintDecisionByMessageId, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, setNoteLastReadAt, getHistorianFailureState, clearHistorianFailureState, getOverflowState, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, removeStrippedPlaceholderId, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, clearPendingCompactionMarkerStateIf, peekDeferredExecutePending, setDeferredExecutePendingIfAbsent, clearDeferredExecutePendingIfMatches, getSessionsWithPendingMarker, setSessionWorkMetrics, getNotes, addNote, getSessionNotes, getPendingSmartNotes, getReadySmartNotes, updateNote, dismissNote, markNoteReady, markNoteChecked, queuePendingOp, getPendingOps, clearPendingOps, removePendingOp, PRIMER_CANDIDATE_TTL_MS, PRIMER_CANDIDATE_MAX_AGE_MS, primerOccurrenceKey, primerOccurrenceUtcDay, updatePrimerCandidateEmbedding, getPrimerCandidatesByIds, getPrimerCandidatesForPromotion, countPrimerCandidatesForProject, getActivePrimers, createPrimer, updatePrimerSupport, updatePrimerAnswer, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectMemoryEpoch, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, CTX_REDUCE_KEEP, estimateImageTokensFromDataUrl, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, toolOutputTokens, decideChannel1, evaluateChannel2, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, updateTagDropMode, updateCavemanDepth, updateTagMessageId, deleteTagsByMessageId, getMaxTagNumberBySession, getTagNumberByMessageId, deriveTagLoadFloor, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getMaxDroppedTagNumber, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, createChildSessionWithFence, detectOverflow, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, extractLatestAssistantText, hasLengthCappedOutput, setKeepSubagents, shouldKeepSubagents, recordChildInvocation, COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_EDITOR_SYSTEM_PROMPT, COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, Priority, AdmissionClass, StaleRouteHandleError, SocketClosedError, SocketTimeoutError, SubcClient, isConsumerReconnectTransient, connectionFileExists, getCompartmentEvents, loadCompartmentChunkEmbeddingsForSearch, cosineSimilarity, SYNAPSE_DEFAULT_MODEL, SynapseEmbeddingProvider, computeNormalizedHash, saveCommitEmbedding, loadProjectCommitEmbeddings, loadUnembeddedCommits, countEmbeddedCommits, upsertCommits, getLatestIndexedCommitTimeMs, enforceProjectCap, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, saveEmbeddingIfHashMatches, getProjectEmbeddings, peekProjectEmbeddings, invalidateProject, invalidateMemory, markProjectLoadUntrusted, contentSha256, sweepStaleEmbeddingIdentitiesForProject, registerProjectEmbedding, registerProjectShadowEmbedding, getShadowEmbeddingMeasurementCohort, getPrimaryEmbeddingMeasurementCohort, embedShadowTextForProject, enqueueShadowEmbeddingItems, registerProjectInObservationMode, getProjectEmbeddingSnapshot, embedTextForProject, embedBatchForProject, embedItemsForProject, embedUnembeddedMemoriesForProject, drainCommitBacklogForProject, embedSessionCompartmentChunks, getEmbeddingCoverageStatus, isEmbeddingEnabled, embedText, ensureMemoryEmbeddings, computeCueContentHash, hasMuralCueColumns, getMuralCueState, memoryNeedsCue, setMuralCue, recordMuralCueRejection, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, getUnclassifiedMemoryIds, ModuleMemoryAuthorityError, insertMemory, insertMemoryIdempotent, getMemoryByHash, getMemoriesByProject, buildWorkspaceMemorySqlFilter, getMemoriesByProjects, getMaxMemoryIdForProjects, readNewMemoriesForM1Union, getMemoryById, getMemoriesByIds, updateMemorySeenCount, updateMemoryRetrievalCount, setMemoryClassification, supersededMemory, mergeMemoryStats, archiveMemory, getMemoryCountsByStatus, sanitizeFtsQuery, searchMemoriesFTS, searchMemoriesFTSUnion, recordMemoryMapping, recordMemoryVerifications, getUnmappedMemoryIds, clearMemoryVerifications, getMemoryVerifications, resolveGitTopLevel, readGitHead, readGitChangedFilesSince, readGitFileChangeTimesSince, verificationFileExists, normalizeVerificationFiles, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, MARKER_SUMMARY_TEXT, applyDeferredCompactionMarker, removeCompactionMarkerForSession, checkCompactionMarkerConsistency, getMural, resolveMuralWire, BoundedSessionMap, extractM0Block, formatDate, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, prepareCompartmentInjection, renderCompartmentInjection, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, injectM0M1, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, resetNoteNudgeCooldownOnly, clearNoteNudgeTriggerOnly, RECOVERY_NO_HEAD_LIMIT, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, snapRangeToCompartments, LKG_SNAPSHOT_ARRAY, LKG_SNAPSHOT_OBJECT, LKG_SNAPSHOT_KEY, LKG_SNAPSHOT_STRING, LKG_SNAPSHOT_NUMBER, LKG_SNAPSHOT_BOOLEAN, LKG_SNAPSHOT_NULL, LKG_SNAPSHOT_UNDEFINED, incrementalLkgContentDigests, lkgContentDigest, captureSlot, getSlot, dropSlot, noteEntry, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure, isRecompSkip, isRecompComplete, extractRecompReason, contextualizeUpgradeReason, setRecompStarting, setRecompNote, setRecompTerminal, runManagedRecomp, runManagedUpgrade };
+export { withContentLanguageDirective, buildPrimaryLanguageDirective, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, resolveLegacyConfigSourcesForHarness, migrateMagicContextConfigLocations, exports_external, DEFAULT_PROTECTED_TAGS, parseCron, nextOccurrence, nextDueAtMs, promptSurfaceConfigIdentity, resolvePromptSurface, resolveModelConfigOrDefault, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, DEFAULT_HISTORIAN_TIMEOUT_MS, DEFAULT_LOCAL_EMBEDDING_MODEL, PER_HARNESS_MIGRATION_INVENTORY, ConfigProfilesSchema, MagicContextConfigSchema, getOpenCodeDbPath, removeMcOwnedCompactionMarkers, hasShareabilitySensitiveText, isFailClosedBlockingError, shouldBypassFailClosedBlock, resolveAgentNameFromMessages, createFailClosedController, recordHookInitFailure, clearHookInitFailure, getLastHookInitFailure, ProjectIdentityError, resolveProjectIdentityStrict, takeDubiousOwnershipProjectIdentityWarning, resolveProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, isLinkedGitWorktree, recordSessionProjectIdentity, beginBootQuietPeriod, bootQuietRemainingMs, scheduleAfterBootQuiet, rpcPortDir, rpcPortFilePath, isPidAlive, parseRpcPortFile, registerModuleNoteEvaluationBridge, getModuleNoteEvaluationBridge, getContextStoreUuid, ensureContextStoreUuid, getAuthorityManagedMarker, reconcileAuthorityProject, checksumAuthoritySeedRows, prepareAuthority, drainAuthority, getMirrorCursor, applyMirroredNoteCompileFields, applyMirrorPage, pullMemoryMirrorOnce, V2_MEMORY_CATEGORIES, CATEGORY_PRIORITY, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, resolveStoredPathWorkspaceIdentity, storedPathBelongsToWorkspace, sourceNameForMemory, computeWorkspaceEpochFingerprint, textMentionsRecentCommit, hasMeaningfulUserText, extractTexts, extractToolCallSummaries, preloadTokenizer, estimateTokens, normalizeText, getCurrentToolSetHash, recordToolDefinition, getMeasuredToolDefinitionTokens, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getDatabasePath, getPersistedSchemaVersion, setSqlitePragmaConfig, runSqliteOptimize, openDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, clearRecompStaging, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, isRecord, estimateTrueRawMessageTokens, invalidateTrueRawTokenCache, stripPersistedAssistantText, byteSize, stripTagPrefix, prependTag, isThinkingPart, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, isEditTool, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, setRawMessageProvider, cleanUserText, withRawSessionMessageCache, readRawSessionMessages, primeTailRawMessageCache, primeInMemoryTailRawMessageCache, readRawSessionMessageOrdinalPage, getRawSessionStoredMessageCount, readRawSessionMessagePartsById, readRawSessionMessageOrdinalById, readRawSessionMessageById, readSessionChunk, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, deleteIndexedMessage, clearIndexedMessages, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, recordEmbeddingMeasurement, getMaxM0MutationId, queueMemoryMutation, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationIdForProjects, MAX_EXECUTE_THRESHOLD, escalationBands, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, getEmergencyRecoveryArmedAt, loadPersistedUsage, loadProtectedTailMeta, resetProtectedTailNoEligibleHead, getWrapupInProgressState, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getPersistedReasoningWatermark, setPersistedReasoningWatermark, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, resetLastNudgeCycle, resetLastNudgeCycleIfTailShrank, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, getNoteNudgeAnchors, getAutoSearchHintDecisions, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, pruneAutoSearchHintDecisions, removeNoteNudgeAnchorByMessageId, removeAutoSearchHintDecisionByMessageId, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, setNoteLastReadAt, getHistorianFailureState, clearHistorianFailureState, getOverflowState, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, removeStrippedPlaceholderId, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, clearPendingCompactionMarkerStateIf, peekDeferredExecutePending, setDeferredExecutePendingIfAbsent, clearDeferredExecutePendingIfMatches, getSessionsWithPendingMarker, setSessionWorkMetrics, getNotes, addNote, getSessionNotes, getPendingSmartNotes, getReadySmartNotes, updateNote, dismissNote, markNoteReady, markNoteChecked, queuePendingOp, getPendingOps, clearPendingOps, removePendingOp, PRIMER_CANDIDATE_TTL_MS, PRIMER_CANDIDATE_MAX_AGE_MS, primerOccurrenceKey, primerOccurrenceUtcDay, updatePrimerCandidateEmbedding, getPrimerCandidatesByIds, getPrimerCandidatesForPromotion, countPrimerCandidatesForProject, getActivePrimers, createPrimer, updatePrimerSupport, updatePrimerAnswer, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectMemoryEpoch, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, CTX_REDUCE_KEEP, estimateImageTokensFromDataUrl, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, toolOutputTokens, decideChannel1, evaluateChannel2, buildChannel2Reminder, shouldUseStickyChannel1Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, updateTagDropMode, updateCavemanDepth, updateTagMessageId, deleteTagsByMessageId, getMaxTagNumberBySession, getTagNumberByMessageId, deriveTagLoadFloor, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getMaxDroppedTagNumber, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, createChildSessionWithFence, detectOverflow, resolveFallbackChain, modelBodyField, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, extractLatestAssistantText, hasLengthCappedOutput, setKeepSubagents, shouldKeepSubagents, recordChildInvocation, COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_EDITOR_SYSTEM_PROMPT, COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, Priority, AdmissionClass, StaleRouteHandleError, SocketClosedError, SocketTimeoutError, SubcClient, isConsumerReconnectTransient, connectionFileExists, getCompartmentEvents, loadCompartmentChunkEmbeddingsForSearch, cosineSimilarity, SYNAPSE_DEFAULT_MODEL, SynapseEmbeddingProvider, computeNormalizedHash, saveCommitEmbedding, loadProjectCommitEmbeddings, loadUnembeddedCommits, countEmbeddedCommits, upsertCommits, getLatestIndexedCommitTimeMs, enforceProjectCap, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, saveEmbeddingIfHashMatches, getProjectEmbeddings, peekProjectEmbeddings, invalidateProject, invalidateMemory, markProjectLoadUntrusted, contentSha256, sweepStaleEmbeddingIdentitiesForProject, registerProjectEmbedding, registerProjectShadowEmbedding, getShadowEmbeddingMeasurementCohort, getPrimaryEmbeddingMeasurementCohort, embedShadowTextForProject, enqueueShadowEmbeddingItems, registerProjectInObservationMode, getProjectEmbeddingSnapshot, embedTextForProject, embedBatchForProject, embedItemsForProject, embedUnembeddedMemoriesForProject, drainCommitBacklogForProject, embedSessionCompartmentChunks, getEmbeddingCoverageStatus, isEmbeddingEnabled, embedText, ensureMemoryEmbeddings, computeCueContentHash, hasMuralCueColumns, getMuralCueState, memoryNeedsCue, setMuralCue, recordMuralCueRejection, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, getUnclassifiedMemoryIds, ModuleMemoryAuthorityError, insertMemory, insertMemoryIdempotent, getMemoryByHash, getMemoriesByProject, buildWorkspaceMemorySqlFilter, getMemoriesByProjects, getMaxMemoryIdForProjects, readNewMemoriesForM1Union, getMemoryById, getMemoriesByIds, updateMemorySeenCount, updateMemoryRetrievalCount, setMemoryClassification, supersededMemory, mergeMemoryStats, archiveMemory, getMemoryCountsByStatus, sanitizeFtsQuery, searchMemoriesFTS, searchMemoriesFTSUnion, recordMemoryMapping, recordMemoryVerifications, getUnmappedMemoryIds, clearMemoryVerifications, getMemoryVerifications, resolveGitTopLevel, readGitHead, readGitChangedFilesSince, readGitFileChangeTimesSince, verificationFileExists, normalizeVerificationFiles, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getMural, BoundedSessionMap, registerLkgPersistence, LKG_SNAPSHOT_ARRAY, LKG_SNAPSHOT_OBJECT, LKG_SNAPSHOT_KEY, LKG_SNAPSHOT_STRING, LKG_SNAPSHOT_NUMBER, LKG_SNAPSHOT_BOOLEAN, LKG_SNAPSHOT_NULL, LKG_SNAPSHOT_UNDEFINED, incrementalLkgContentDigests, lkgContentDigest, captureSlot, getSlot, dropSlot, noteEntry, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, resetNoteNudgeCooldownOnly, clearNoteNudgeTriggerOnly, extractM0Block, resolveMuralWire, MARKER_SUMMARY_TEXT, applyDeferredCompactionMarker, removeCompactionMarkerForSession, checkCompactionMarkerConsistency, formatDate, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, prepareCompartmentInjection, renderCompartmentInjection, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, injectM0M1, RECOVERY_NO_HEAD_LIMIT, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, snapRangeToCompartments, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure, isRecompSkip, isRecompComplete, extractRecompReason, contextualizeUpgradeReason, setRecompStarting, setRecompNote, setRecompTerminal, runManagedRecomp, runManagedUpgrade };