@cortexkit/opencode-magic-context 0.44.2 → 0.44.4

package/dist/v2/server.js

@@ -2901,6 +2901,21 @@ function getSdkOutputLimit(providerID, modelID) {
   loadPersistedApiCacheOnce();
   return lookupMetadataWithTagFallback(apiCache, providerID, modelID)?.outputLimit;
 }
+function getSdkInputLimit(providerID, modelID) {
+  loadPersistedApiCacheOnce();
+  if (!apiCache)
+    return;
+  const direct = apiCache.get(`${providerID}/${modelID}`)?.inputLimit;
+  if (isSaneLimit(direct))
+    return direct;
+  const colon = modelID.indexOf(":");
+  if (colon > 0) {
+    const tagless = apiCache.get(`${providerID}/${modelID.slice(0, colon)}`)?.inputLimit;
+    if (isSaneLimit(tagless))
+      return tagless;
+  }
+  return;
+}
 function lookupMetadataWithTagFallback(cache, providerID, modelID) {
   if (!cache)
     return;
@@ -11660,6 +11675,23 @@ import { createHash as createHash3 } from "node:crypto";
 import { existsSync as existsSync6, realpathSync, statSync as statSync4 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 import path4 from "node:path";
+function setHomeProjectPermission(allowed) {
+  homeProjectPermission = allowed;
+}
+function shouldSkipHomeProjectMemory(directory) {
+  try {
+    assertProjectAllowed(directory, homeProjectPermission);
+    return false;
+  } catch (error) {
+    if (!(error instanceof ProjectIdentityError) || error.errorClass !== "home_project_disabled")
+      throw error;
+    if (!homeProjectSkipLogged) {
+      homeProjectSkipLogged = true;
+      log("[magic-context] home project memory disabled; skipping memory features");
+    }
+    return true;
+  }
+}
 function asError(error) {
   return error instanceof Error ? error : undefined;
 }
@@ -11723,6 +11755,27 @@ function isGitTimeoutError(error) {
   const signal = getErrorSignal(error);
   return code === "ETIMEDOUT" || signal === "SIGTERM" || signal === "SIGKILL" || getErrorKilled(error);
 }
+function hasUnbornHead(directory) {
+  const options = {
+    cwd: directory,
+    encoding: "utf8",
+    env: { ...process.env, LC_ALL: "C", LANG: "C" },
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: GIT_TIMEOUT_MS,
+    windowsHide: true
+  };
+  try {
+    execFileSyncForIdentity("git", ["rev-parse", "--git-dir"], options);
+    try {
+      execFileSyncForIdentity("git", ["rev-parse", "--verify", "--quiet", "HEAD"], options);
+      return false;
+    } catch (error) {
+      return !isGitTimeoutError(error) && typeof error === "object" && error !== null && "status" in error && error.status === 1 && getErrorStderr(error) === "";
+    }
+  } catch {
+    return false;
+  }
+}
 function classifyGitError(error, rawDirectory) {
   if (isGitTimeoutError(error)) {
     return new ProjectIdentityError("git_timeout", rawDirectory, `git rev-list timed out after ${GIT_TIMEOUT_MS}ms`, asError(error));
@@ -11743,7 +11796,7 @@ function classifyGitError(error, rawDirectory) {
   }
   return new ProjectIdentityError("unknown", rawDirectory, "git rev-list failed while resolving project identity", asError(error));
 }
-function resolveProjectIdentityStrict(directory, allowHomeProject = false) {
+function resolveProjectIdentityStrict(directory, allowHomeProject = homeProjectPermission) {
   assertProjectAllowed(directory, allowHomeProject);
   const canonical = path4.resolve(directory);
   const cached = identityCache.get(canonical);
@@ -11765,7 +11818,11 @@ function resolveProjectIdentityStrict(directory, allowHomeProject = false) {
       windowsHide: true
     });
   } catch (error) {
-    throw classifyGitError(error, directory);
+    const classified = classifyGitError(error, directory);
+    if (classified.errorClass === "not_git_repo" && hasUnbornHead(canonical)) {
+      throw new ProjectIdentityError("no_commits", directory, "Git repository has no commits yet");
+    }
+    throw classified;
   }
   const rootCommit = output.split(`
 `).map((line) => line.trim().slice(0, 64)).filter((line) => /^[0-9a-f]{7,64}$/.test(line)).sort()[0];
@@ -11880,7 +11937,7 @@ function assertProjectAllowed(directory, allowHomeProject) {
     throw new ProjectIdentityError("home_project_disabled", directory, "Home project memory is disabled; set allow_home_project to opt in");
   }
 }
-function resolveProjectIdentity(directory, allowHomeProject = false) {
+function resolveProjectIdentity(directory, allowHomeProject = homeProjectPermission) {
   assertProjectAllowed(directory, allowHomeProject);
   const canonical = path4.resolve(directory);
   const cachedFallback = directoryFallbackCache.get(canonical);
@@ -11905,6 +11962,8 @@ function resolveProjectIdentity(directory, allowHomeProject = false) {
   } catch (error) {
     if (error instanceof ProjectIdentityError && shouldUseDirectoryFallback(error)) {
       const fallback = directoryFallback(canonical);
+      if (error.errorClass === "no_commits")
+        return fallback;
       const hasGitMetadata = hasGitDir(canonical);
       if (!hasGitMetadata) {
         if (error.errorClass === "permission_denied")
@@ -11926,7 +11985,7 @@ function resolveProjectIdentity(directory, allowHomeProject = false) {
     throw error;
   }
 }
-function resolveProjectIdentityOrFallback(directory, allowHomeProject = false) {
+function resolveProjectIdentityOrFallback(directory, allowHomeProject = homeProjectPermission) {
   try {
     return resolveProjectIdentity(directory, allowHomeProject);
   } catch (error) {
@@ -12004,7 +12063,7 @@ function describeUnresolvedProjectIdentity(directory) {
 function isUsableProjectIdentity(identity) {
   return typeof identity === "string" && identity.trim().length > 0;
 }
-function resolveProjectIdentityForSession(directory, allowHomeProject = false) {
+function resolveProjectIdentityForSession(directory, allowHomeProject = homeProjectPermission) {
   const resolvedDirectory = path4.resolve(directory);
   const cacheKey = `${allowHomeProject ? "1" : "0"}\x00${resolvedDirectory}`;
   const cached = sessionIdentityCache.get(cacheKey);
@@ -12033,9 +12092,18 @@ function resolveProjectIdentityForSession(directory, allowHomeProject = false) {
     } catch (error) {
       if (!(error instanceof ProjectIdentityError))
         throw error;
+      const reason = error.errorClass === "git_identity_unavailable" ? pausedIdentityReasons.get(resolvedDirectory) ?? error.errorClass : error.errorClass;
+      pausedIdentityReasons.set(resolvedDirectory, reason);
+      const logKey = `${resolvedDirectory}\x00${reason}`;
+      if (!pausedIdentityLogged.has(logKey)) {
+        pausedIdentityLogged.add(logKey);
+        log(`[magic-context] memory features paused for ${resolvedDirectory}: ${reason}`);
+      }
       identity = undefined;
     }
   }
+  if (identity !== undefined)
+    pausedIdentityReasons.delete(resolvedDirectory);
   sessionIdentityCache.set(cacheKey, {
     identity,
     revalidateAt: identity?.startsWith("git:") === true ? null : nowMs() + TRANSIENT_FAILURE_COOLDOWN_MS
@@ -12076,7 +12144,7 @@ function isLinkedGitWorktree(directory) {
   linkedGitWorktreeCache.set(resolvedDirectory, linked);
   return linked;
 }
-var GIT_TIMEOUT_MS = 5000, TRANSIENT_FAILURE_COOLDOWN_MS, identityCache, linkedGitWorktreeCache, lastKnownGitIdentityCache, directoryFallbackCache, transientFailureCooldown, dubiousOwnershipFallbackDirectories, dubiousOwnershipLoggedDirectories, dubiousOwnershipWarnedDirectories, transientGitIdentityReuseLoggedDirectories, sessionIdentityCache, execFileSyncForIdentity, userHomeDirectoryForIdentity = () => homedir6(), nowMs = () => Date.now(), filesystemProbeObserverForTests, ProjectIdentityError;
+var GIT_TIMEOUT_MS = 5000, TRANSIENT_FAILURE_COOLDOWN_MS, identityCache, linkedGitWorktreeCache, lastKnownGitIdentityCache, directoryFallbackCache, transientFailureCooldown, dubiousOwnershipFallbackDirectories, dubiousOwnershipLoggedDirectories, dubiousOwnershipWarnedDirectories, transientGitIdentityReuseLoggedDirectories, sessionIdentityCache, homeProjectPermission = false, homeProjectSkipLogged = false, pausedIdentityReasons, pausedIdentityLogged, execFileSyncForIdentity, userHomeDirectoryForIdentity = () => homedir6(), nowMs = () => Date.now(), filesystemProbeObserverForTests, ProjectIdentityError;
 var init_project_identity = __esm(() => {
   init_logger();
   init_project_identity_cache();
@@ -12091,6 +12159,8 @@ var init_project_identity = __esm(() => {
   dubiousOwnershipWarnedDirectories = new Set;
   transientGitIdentityReuseLoggedDirectories = new Set;
   sessionIdentityCache = new Map;
+  pausedIdentityReasons = new Map;
+  pausedIdentityLogged = new Set;
   execFileSyncForIdentity = execFileSync;
   ProjectIdentityError = class ProjectIdentityError extends Error {
     errorClass;
@@ -16122,18 +16192,14 @@ function parseCsvLine(line) {
 }
 function parseTasklistOutput(output) {
   const entries = [];
-  let sawHeader = false;
   for (const rawLine of output.split(/\r?\n/)) {
     const line = rawLine.trim();
     if (!line)
       continue;
-    if (TASKLIST_NO_TASKS_PATTERN.test(line))
-      return [];
     const fields = parseCsvLine(line);
     if (!fields)
       continue;
     if (fields[1]?.trim().toLowerCase() === "pid") {
-      sawHeader = true;
       continue;
     }
     const pid = Number(fields[1]);
@@ -16141,11 +16207,11 @@ function parseTasklistOutput(output) {
       continue;
     entries.push({ pid, command: fields[0] });
   }
-  return entries.length > 0 || sawHeader ? entries : null;
+  return entries;
 }
 function readWindowsProcess(pid) {
   try {
-    const output = rpcIdentityExecFileSync("tasklist", ["/FO", "CSV", "/FI", `PID eq ${pid}`], {
+    const output = rpcIdentityExecFileSync("tasklist", ["/FO", "CSV", "/NH", "/FI", `PID eq ${pid}`], {
       encoding: "utf8",
       timeout: PS_PROBE_TIMEOUT_MS,
       stdio: ["ignore", "pipe", "pipe"],
@@ -16382,7 +16448,11 @@ function tryReadWindowsCimSnapshot(exec) {
 }
 function tryReadWindowsTasklistSnapshot() {
   try {
-    const output = execProcessList(rpcProcessListExecFileSync, "tasklist", ["/FO", "CSV"]);
+    const output = execProcessList(rpcProcessListExecFileSync, "tasklist", [
+      "/FO",
+      "CSV",
+      "/NH"
+    ]);
     const entries = parseTasklistOutput(output);
     if (entries === null)
       return null;
@@ -16587,7 +16657,7 @@ function inspectProcessesAsync(forceFresh = false) {
             snapshot = snapshotFromFacts(facts, "cim");
         } catch {}
         if (!snapshot) {
-          const entries = parseTasklistOutput(await asyncProcessExec("tasklist", ["/FO", "CSV"], PS_PROBE_TIMEOUT_MS));
+          const entries = parseTasklistOutput(await asyncProcessExec("tasklist", ["/FO", "CSV", "/NH"], PS_PROBE_TIMEOUT_MS));
           if (entries)
             snapshot = snapshotFromFacts(entries.map(({ pid, command }) => ({
               pid,
@@ -16636,13 +16706,25 @@ function inspectProcessesAsync(forceFresh = false) {
   });
   return asyncInspection;
 }
-var ownRpcServerInstanceIds, RPC_IDENTITY_SKEW_TOLERANCE_MS = 120000, LINUX_CLOCK_TICKS_PER_SECOND = 100, PS_PROBE_TIMEOUT_MS = 1000, WINDOWS_CIM_PROBE_TIMEOUT_MS = 5000, WINDOWS_PROCESS_SNAPSHOT_TTL_MS = 2000, MAX_ANCESTOR_WALK_DEPTH = 16, OPEN_CODE_COMMAND_MARKERS, TASKLIST_NO_TASKS_PATTERN, WINDOWS_CIM_COMMAND = "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine,CreationDate | ConvertTo-Json -Compress", PI_HARNESS_ARC_MARKERS, rpcIdentityReadFileSync, rpcIdentityExecFileSync, rpcIdentityProcessKill, rpcProcessListExecFileSync, rpcIdentityPlatform, rpcIdentityNowMs = () => Date.now(), windowsProcessFactsCache = null, windowsProcessSnapshotCache = null, asyncProcessExec, asyncInspection, asyncInspectionExpires = 0, lastAsyncSnapshot = null;
+function inspectWindowsProcessesSync() {
+  const snapshot = tryReadWindowsCimSnapshot(rpcProcessListExecFileSync) ?? tryReadWindowsTasklistSnapshot();
+  const byPid = new Map(snapshot?.facts.map((fact) => [fact.pid, fact]));
+  return {
+    pi: snapshot ? classifyLivePiSnapshot(snapshot) : { state: "unreadable", processIds: [] },
+    ...snapshot ? { processSnapshot: { source: snapshot.source, facts: snapshot.facts } } : {},
+    evidence: (pid) => ({
+      startTime: byPid.get(pid)?.startTime ?? null,
+      commandLine: byPid.get(pid)?.commandLine ?? byPid.get(pid)?.imageName ?? null
+    }),
+    liveness: (pid) => byPid.has(pid) ? "alive" : snapshot ? "dead" : "inconclusive"
+  };
+}
+var ownRpcServerInstanceIds, RPC_IDENTITY_SKEW_TOLERANCE_MS = 120000, LINUX_CLOCK_TICKS_PER_SECOND = 100, PS_PROBE_TIMEOUT_MS = 1000, WINDOWS_CIM_PROBE_TIMEOUT_MS = 5000, WINDOWS_PROCESS_SNAPSHOT_TTL_MS = 2000, MAX_ANCESTOR_WALK_DEPTH = 16, OPEN_CODE_COMMAND_MARKERS, WINDOWS_CIM_COMMAND = "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine,CreationDate | ConvertTo-Json -Compress", PI_HARNESS_ARC_MARKERS, rpcIdentityReadFileSync, rpcIdentityExecFileSync, rpcIdentityProcessKill, rpcProcessListExecFileSync, rpcIdentityPlatform, rpcIdentityNowMs = () => Date.now(), windowsProcessFactsCache = null, windowsProcessSnapshotCache = null, asyncProcessExec, asyncInspection, asyncInspectionExpires = 0, lastAsyncSnapshot = null;
 var init_rpc_utils = __esm(() => {
   init_logger();
   init_pi_executable();
   ownRpcServerInstanceIds = new Set;
   OPEN_CODE_COMMAND_MARKERS = ["opencode", "node", "bun", "electron"];
-  TASKLIST_NO_TASKS_PATTERN = /^INFO:\s+No tasks are running which match the specified criteria\.?$/im;
   PI_HARNESS_ARC_MARKERS = [
     "pi-coding-agent",
     "oh-my-pi",
@@ -17362,7 +17444,10 @@ function installTransactionRouting(db, readonly) {
     writable: true,
     value: (sql) => {
       if (/^\s*BEGIN\s+(?:IMMEDIATE|EXCLUSIVE)(?:\s+TRANSACTION)?\s*;?\s*$/i.test(sql)) {
-        retryAcquisition(() => nativeExec(sql), sql.trim());
+        if (transformPassScope.getStore()?.active || backgroundWriterScope.getStore())
+          acquireShort(db, () => nativeExec(sql), sql.trim());
+        else
+          nativeExec(sql);
         return db;
       }
       return nativeExec(sql);
@@ -17537,6 +17622,9 @@ function getSqliteMemoryStats() {
     connections
   };
 }
+function withSqliteBackgroundWriter(operation) {
+  return backgroundWriterScope.run(true, operation);
+}
 function withSqliteTransformPass(operation) {
   const lease = { active: true };
   return transformPassScope.run(lease, () => {
@@ -17564,22 +17652,71 @@ function isTransientSqliteError(error) {
   const value = error;
   return typeof value.code === "string" && /^(SQLITE_BUSY|SQLITE_LOCKED)(_|$)/.test(value.code) || typeof value.errcode === "number" && [5, 6].includes(value.errcode & 255);
 }
-function retryAcquisition(acquire, stage) {
-  if (!transformPassScope.getStore()?.active) {
+function acquireShort(db, acquire, site) {
+  const started = performance.now();
+  const previous = pragmaNumber(db, "busy_timeout");
+  let acquired = false;
+  try {
+    const timeout = transformPassScope.getStore()?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS : SHORT_BUSY_TIMEOUT_MS;
+    db.exec(`PRAGMA busy_timeout=${timeout}`);
     acquire();
-    return;
+    acquired = true;
+  } catch (error) {
+    if (transformPassScope.getStore()?.active && isTransientSqliteError(error))
+      throw new SqliteAcquisitionBusyError(error, site);
+    throw error;
+  } finally {
+    if (previous !== null)
+      db.exec(`PRAGMA busy_timeout=${previous}`);
+    const elapsed = performance.now() - started;
+    if (elapsed >= 250)
+      console.warn(`[${new Date().toISOString()}] [magic-context] sqlite acquisition site=${site} lane=${transformPassScope.getStore()?.active ? "foreground" : "background"} elapsed=${Math.round(elapsed)}ms attempts=1 outcome=${acquired ? "acquired" : "busy"}`);
   }
-  const delays = [500, 1000];
-  for (let attempt = 0;; attempt++) {
+}
+async function beginSqliteWriterAsync(db, site) {
+  const started = performance.now();
+  let attempts = 0;
+  for (;; ) {
+    attempts++;
     try {
-      acquire();
+      withSqliteBackgroundWriter(() => db.exec("BEGIN IMMEDIATE"));
+      const elapsed = performance.now() - started;
+      if (elapsed >= 250)
+        console.warn(`[${new Date().toISOString()}] [magic-context] sqlite acquisition site=${site} lane=background elapsed=${Math.round(elapsed)}ms attempts=${attempts} outcome=acquired`);
       return;
     } catch (error) {
-      if (error instanceof SqliteAcquisitionBusyError || !isTransientSqliteError(error))
+      if (!isTransientSqliteError(error))
+        throw error;
+      const elapsed = performance.now() - started;
+      if (elapsed >= FOREGROUND_ACQUISITION_BUDGET_MS) {
+        console.warn(`[${new Date().toISOString()}] [magic-context] sqlite acquisition site=${site} lane=background elapsed=${Math.round(elapsed)}ms attempts=${attempts} outcome=busy`);
+        throw error;
+      }
+      await new Promise((resolve) => setTimeout(resolve, Math.min(attempts === 1 ? 500 : 1000, FOREGROUND_ACQUISITION_BUDGET_MS - elapsed)));
+    }
+  }
+}
+async function withAsyncPrivilegedWriter(db, operation) {
+  const started = performance.now();
+  let attempts = 0;
+  for (;; ) {
+    attempts++;
+    try {
+      const result = admissionScope.run(true, () => withSqliteTransformPass(() => withPrivilegedWriter(db, operation)));
+      const elapsed = performance.now() - started;
+      if (elapsed >= 250)
+        console.warn(`[${new Date().toISOString()}] [magic-context] sqlite acquisition site=privileged_writer lane=foreground elapsed=${Math.round(elapsed)}ms attempts=${attempts} outcome=acquired`);
+      return result;
+    } catch (error) {
+      if (!(error instanceof SqliteAcquisitionBusyError))
         throw error;
-      if (attempt === delays.length)
-        throw new SqliteAcquisitionBusyError(error, stage);
-      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delays[attempt]);
+      const elapsed = performance.now() - started;
+      if (elapsed >= FOREGROUND_ACQUISITION_BUDGET_MS) {
+        if (elapsed >= 250)
+          console.warn(`[${new Date().toISOString()}] [magic-context] sqlite acquisition site=privileged_writer lane=foreground elapsed=${Math.round(elapsed)}ms attempts=${attempts} outcome=busy`);
+        throw error instanceof SqliteAcquisitionBusyError ? error : new SqliteAcquisitionBusyError(error);
+      }
+      await new Promise((resolve) => setTimeout(resolve, Math.min(attempts === 1 ? 500 : 1000, FOREGROUND_ACQUISITION_BUDGET_MS - elapsed)));
     }
   }
 }
@@ -17595,7 +17732,13 @@ function withPrivilegedWriter(db, operation) {
   if (nested) {
     db.exec(`SAVEPOINT ${savepoint}`);
   } else {
-    retryAcquisition(() => db.exec("BEGIN IMMEDIATE"), "BEGIN IMMEDIATE");
+    try {
+      db.exec("BEGIN IMMEDIATE");
+    } catch (error) {
+      if (transformPassScope.getStore()?.active && isTransientSqliteError(error))
+        throw new SqliteAcquisitionBusyError(error);
+      throw error;
+    }
   }
   privilegeDepth.set(db, previousDepth + 1);
   try {
@@ -17634,7 +17777,7 @@ function withPrivilegedWriter(db, operation) {
     throw error;
   }
 }
-var reportSlowPrivilegedWrite, bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TrackedDatabase, Database, privilegeDepth, transformPassScope, SqliteAcquisitionBusyError;
+var reportSlowPrivilegedWrite, bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TrackedDatabase, Database, privilegeDepth, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 250, FOREGROUND_ACQUISITION_BUDGET_MS = 16500;
 var init_sqlite = __esm(async () => {
   bunSpec = "bun:" + "sqlite";
   nodeSpec = "node:" + "sqlite";
@@ -17663,11 +17806,13 @@ var init_sqlite = __esm(async () => {
   Database = TrackedDatabase;
   privilegeDepth = new WeakMap;
   transformPassScope = new AsyncLocalStorage;
+  admissionScope = new AsyncLocalStorage;
+  backgroundWriterScope = new AsyncLocalStorage;
   SqliteAcquisitionBusyError = class SqliteAcquisitionBusyError extends Error {
     code = "SQLITE_BUSY";
     stage;
     constructor(cause, stage = "BEGIN IMMEDIATE") {
-      super("SQLite writer acquisition remained busy after 3 attempts", { cause });
+      super("SQLite writer acquisition remained busy", { cause });
       this.name = "SqliteAcquisitionBusyError";
       this.stage = stage;
     }
@@ -22218,8 +22363,8 @@ function readRawSessionMessagesFromDb(db, sessionId) {
     };
   });
 }
-function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER) {
-  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark);
+function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER, after) {
+  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark, after);
   if (messageRows.length === 0)
     return [];
   const placeholders = messageRows.map(() => "?").join(", ");
@@ -22230,15 +22375,22 @@ function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, fin
              ORDER BY message_id ASC, time_created ASC, id ASC`).all(sessionId, ...messageRows.map((row) => row.id)).filter(isRawPartRow);
   return assembleRawMessagePage(messageRows, partRows);
 }
-function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark) {
+function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark, after) {
   const remaining = Math.max(0, Math.floor(finalWatermark) - Math.floor(afterOrdinal));
   const pageSize = Math.min(Math.max(1, Math.floor(limit)), remaining);
   if (pageSize === 0)
     return [];
+  const parameters = [sessionId];
+  if (after)
+    parameters.push(after.timeCreated, after.timeCreated, after.timeCreated, after.id);
+  parameters.push(pageSize);
+  if (!after)
+    parameters.push(Math.max(0, Math.floor(afterOrdinal)));
   return db.prepare(`SELECT id, data, time_created, time_updated
              FROM message
              WHERE session_id = ?
-               AND NOT (
+                ${after ? "AND time_created >= ? AND (time_created > ? OR (time_created = ? AND id > ?))" : ""}
+                AND NOT (
                    CASE WHEN json_valid(data) = 1
                         THEN COALESCE(json_extract(data, '$.summary'), 0)
                         ELSE 0 END = 1
@@ -22247,7 +22399,7 @@ function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWaterma
                             ELSE '' END = 'stop'
                )
              ORDER BY time_created ASC, id ASC
-             LIMIT ? OFFSET ?`).all(sessionId, pageSize, Math.max(0, Math.floor(afterOrdinal))).filter(isRawMessageRow).map((row, index) => ({
+             LIMIT ? ${after ? "" : "OFFSET ?"}`).all(...parameters).filter(isRawMessageRow).map((row, index) => ({
     ...row,
     ordinal: Math.floor(afterOrdinal) + index + 1
   }));
@@ -22274,8 +22426,8 @@ function assembleRawMessagePage(messageRows, partRows) {
 function summaryStringField(jsonPath) {
   return `CASE WHEN json_type(data, '${jsonPath}') = 'text' THEN substr(json_extract(data, '${jsonPath}'), 1, ${RAW_SUMMARY_ARG_MAX_CHARS}) END`;
 }
-function readRawSessionMessageSummaryPageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER) {
-  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark);
+function readRawSessionMessageSummaryPageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER, after) {
+  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark, after);
   if (messageRows.length === 0)
     return [];
   const placeholders = messageRows.map(() => "?").join(", ");
@@ -23143,6 +23295,28 @@ var init_tag_part_guards = __esm(() => {
   init_tag_content_primitives();
 });
 
+// src/shared/user-answer.ts
+function hasUserAnswerMetadata(value) {
+  if (!isRecord3(value))
+    return false;
+  if (value.userAnswer === true)
+    return true;
+  if (Array.isArray(value.answers))
+    return true;
+  if (typeof value.answer === "string")
+    return true;
+  if (Array.isArray(value.selectedOptions) || typeof value.customInput === "string")
+    return true;
+  return Array.isArray(value.results) && value.results.some(hasUserAnswerMetadata);
+}
+function toolPartHasUserAnswer(part) {
+  if (!isRecord3(part))
+    return false;
+  const state = isRecord3(part.state) ? part.state : undefined;
+  return hasUserAnswerMetadata(state?.metadata) || hasUserAnswerMetadata(part.details);
+}
+var init_user_answer = () => {};
+
 // src/features/magic-context/dreamer/token-budget.ts
 function registerBudgetFinalizeChild(sessionId, guard) {
   finalizingChildren.set(sessionId, guard);
@@ -23732,6 +23906,20 @@ var init_tokenizer_calibration_seeds = __esm(() => {
       toolsRatio: 0.850953,
       proseRatio: 1.000017
     },
+    {
+      prefix: "openai/gpt-6-sol",
+      systemRatio: 1.000278,
+      toolsRatio: 0.850953,
+      proseRatio: 1.000017,
+      provenance: "Mirrored from openai/gpt-6-astra; prose inherited-unmeasured. Reported OAuth system/tools counts match GPT-5.5; no independent API-key measurement."
+    },
+    {
+      prefix: "openai/gpt-6.1-sol",
+      systemRatio: 1.000278,
+      toolsRatio: 0.850953,
+      proseRatio: 1.000017,
+      provenance: "Mirrored from openai/gpt-6-astra; prose inherited-unmeasured. Reported OAuth system/tools counts match GPT-5.5; no independent API-key measurement."
+    },
     {
       prefix: "openai/gpt-5",
       systemRatio: 1,
@@ -24085,7 +24273,7 @@ function calibrateBuckets(input) {
     toolCallTokens: toolCalls
   };
 }
-var CALIBRATION_TABLE, NEUTRAL, CALIBRATION_TABLE_REVISION = "2026-09-23-model-id-generation-v2", UNKNOWN_FIT_RATIO;
+var CALIBRATION_TABLE, NEUTRAL, CALIBRATION_TABLE_REVISION = "2026-09-30-sol-tokenizer-seeds-v3", UNKNOWN_FIT_RATIO;
 var init_tokenizer_calibration = __esm(() => {
   init_tokenizer_calibration_seeds();
   CALIBRATION_TABLE = tokenizer_calibration_seeds_default;
@@ -24733,7 +24921,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
     },
     canDrop: () => {
       const entry = index.get(compositeKey);
-      return !!entry && entry.occurrences.length > 0 && entry.hasResult;
+      return !!entry && entry.occurrences.length > 0 && entry.hasResult && !entry.occurrences.some((occurrence) => toolPartHasUserAnswer(occurrence.part));
     },
     requiresToolArcSkeleton: thinkingParts.length > 0 || (index.get(compositeKey)?.occurrences.some((occurrence) => messageHasNativeReasoning(occurrence.message)) ?? false),
     readInput: () => {
@@ -24758,6 +24946,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
 }
 var DROP_PREFIX = "[dropped", IGNORE_PART_TYPES;
 var init_tool_drop_target = __esm(() => {
+  init_user_answer();
   init_dropped_input_guard();
   init_edit_marker();
   init_final_wire_token_estimate();
@@ -24908,6 +25097,8 @@ function getRawSessionMessageOrdinalCount(sessionId) {
 }
 function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal) {
   const provider = sessionProviders.get(sessionId);
+  if (provider?.iterateMessageRange)
+    return [...provider.iterateMessageRange(fromOrdinal, toOrdinal)];
   if (provider && !provider.readMessagePage) {
     return provider.readMessages().filter((message) => message.ordinal >= fromOrdinal && message.ordinal <= toOrdinal);
   }
@@ -24915,9 +25106,10 @@ function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal)
     return [];
   const messages = [];
   let afterOrdinal = fromOrdinal - 1;
+  let after;
   while (afterOrdinal < toOrdinal) {
     const limit = Math.min(RAW_MESSAGE_RANGE_PAGE_SIZE, toOrdinal - afterOrdinal);
-    const page = provider?.readMessagePage ? provider.readMessagePage(afterOrdinal, limit, toOrdinal) : withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, toOrdinal));
+    const page = provider?.readMessagePage ? provider.readMessagePage(afterOrdinal, limit, toOrdinal, after) : withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, toOrdinal, after));
     if (page.length === 0)
       break;
     let nextOrdinal = afterOrdinal;
@@ -24930,6 +25122,8 @@ function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal)
     if (nextOrdinal <= afterOrdinal)
       break;
     afterOrdinal = nextOrdinal;
+    const last = page.at(-1);
+    after = last ? { timeCreated: last.createdAt ?? 0, id: last.id } : undefined;
   }
   return messages;
 }
@@ -24939,6 +25133,13 @@ function visitRawSessionMessages(sessionId, fromOrdinal, toOrdinal, visit, optio
   if (to < from)
     return;
   const provider = sessionProviders.get(sessionId);
+  if (provider?.iterateMessageRange) {
+    for (const message of provider.iterateMessageRange(from, to)) {
+      if (!visit(message))
+        return;
+    }
+    return;
+  }
   if (provider && !provider.readMessagePage) {
     for (const message of provider.readMessages()) {
       if (message.ordinal < from || message.ordinal > to)
@@ -24952,10 +25153,11 @@ function visitRawSessionMessages(sessionId, fromOrdinal, toOrdinal, visit, optio
     return;
   const pageSize = Math.max(1, Math.floor(options.pageSize ?? RAW_MESSAGE_VISIT_PAGE_SIZE));
   let afterOrdinal = from - 1;
+  let after;
   while (afterOrdinal < to) {
     const limit = Math.min(pageSize, to - afterOrdinal);
     const cursor = afterOrdinal;
-    const page = provider?.readMessagePage ? provider.readMessagePage(cursor, limit, to) : withReadOnlySessionDb((db) => options.summary ? readRawSessionMessageSummaryPageFromDb(db, sessionId, cursor, limit, to) : readRawSessionMessagePageFromDb(db, sessionId, cursor, limit, to));
+    const page = provider?.readMessagePage ? provider.readMessagePage(cursor, limit, to, after) : withReadOnlySessionDb((db) => options.summary ? readRawSessionMessageSummaryPageFromDb(db, sessionId, cursor, limit, to, after) : readRawSessionMessagePageFromDb(db, sessionId, cursor, limit, to, after));
     if (page.length === 0)
       return;
     let nextOrdinal = afterOrdinal;
@@ -24969,6 +25171,8 @@ function visitRawSessionMessages(sessionId, fromOrdinal, toOrdinal, visit, optio
     if (nextOrdinal <= afterOrdinal)
       return;
     afterOrdinal = nextOrdinal;
+    const last = page.at(-1);
+    after = last ? { timeCreated: last.createdAt ?? 0, id: last.id } : undefined;
   }
 }
 function readRawSessionMessageRange(sessionId, fromOrdinal, toOrdinal) {
@@ -32692,7 +32896,9 @@ function classifyJunkDiscovery(portFile, raw, staleFiles) {
   log(`[magic-context] removing stale RPC discovery file ${portFile}: ${reason} record older than 10 minutes`);
   return null;
 }
-function inspectRpcServerDiscovery(storageDir, processes) {
+function inspectRpcServerDiscovery(storageDir, processes, options) {
+  const deadline = options?.deadlineMs === undefined ? Number.POSITIVE_INFINITY : Date.now() + options.deadlineMs;
+  let progressAt = Date.now() + 3000;
   const rpcRoot = join9(storageDir, "rpc");
   let projectEntries;
   try {
@@ -32725,11 +32931,19 @@ function inspectRpcServerDiscovery(storageDir, processes) {
   if (portFiles.length === 0) {
     return { state: "absent", serverPids: [], staleFiles: [] };
   }
+  if (!processes && process.platform === "win32")
+    processes = inspectWindowsProcessesSync();
   const pids = new Set;
   const processByPid = new Map;
   const staleFiles = [];
   const inconclusivePids = new Set;
-  for (const portFile of portFiles) {
+  for (const [index, portFile] of portFiles.entries()) {
+    if (Date.now() >= deadline)
+      throw new Error(`RPC holder inspection timed out after ${Math.round((options?.deadlineMs ?? 0) / 1000)} seconds (${index}/${portFiles.length} records checked). Close OpenCode and Pi, then retry.`);
+    if (options?.onProgress && Date.now() >= progressAt) {
+      options.onProgress(index, portFiles.length);
+      progressAt = Date.now() + 3000;
+    }
     let raw;
     try {
       raw = rpcDiscoveryFs.readFileSync(portFile, "utf8");
@@ -32767,7 +32981,7 @@ function inspectRpcServerDiscovery(storageDir, processes) {
       if (!previous || previous.kind === "process" && detected.kind !== "process") {
         processByPid.set(record.pid, detected);
       }
-    } else if (identity === "implausible") {
+    } else if (identity === "implausible" && !((processes?.processSnapshot?.source === "cim" || processes?.processSnapshot?.source === "tasklist") && liveness === "alive")) {
       staleFiles.push(portFile);
     } else {
       inconclusivePids.add(record.pid);
@@ -34390,7 +34604,12 @@ function pruneSynapseBatchLedgerForProject(db, projectIdentity, ttlMs = SYNAPSE_
   const ledgerTable = db.prepare("SELECT 1 AS present FROM sqlite_master WHERE type = 'table' AND name = 'synapse_batch_ledger'").get();
   if (!ledgerTable)
     return 0;
-  return db.prepare("DELETE FROM synapse_batch_ledger WHERE session_id IN (?, ?) AND updated_at < ?").run(projectIdentity, `shadow:${projectIdentity}`, Date.now() - ttlMs).changes;
+  const shadow = `shadow:${projectIdentity}`;
+  const cutoff = Date.now() - ttlMs;
+  const predicate = "session_id IN (?, ?) AND updated_at < ?";
+  if (!db.prepare(`SELECT 1 FROM synapse_batch_ledger WHERE ${predicate} LIMIT 1`).get(projectIdentity, shadow, cutoff))
+    return 0;
+  return db.prepare(`DELETE FROM synapse_batch_ledger WHERE ${predicate}`).run(projectIdentity, shadow, cutoff).changes;
 }
 var MEASUREMENT_CORPUS_SESSION_ROW_CAP = 2000, SYNAPSE_BATCH_LEDGER_TTL_MS;
 var init_storage_embedding_measurements = __esm(() => {
@@ -36219,6 +36438,21 @@ function resolveKnownHistorianContextLimit(historianModelOverride) {
   const limit = getSdkContextLimit(providerID, modelID, undefined, { reservation: "none" });
   return typeof limit === "number" && limit > 0 ? limit : undefined;
 }
+function resolveHistorianProducerLimits(modelKey) {
+  if (!modelKey?.includes("/"))
+    return {};
+  const [provider, ...parts] = modelKey.split("/");
+  const model = parts.join("/");
+  if (!provider || !model)
+    return {};
+  const input = getSdkInputLimit(provider, model);
+  const window2 = getSdkWindowGeometry(provider, model)?.derivation.window;
+  const context = window2 ?? (input === undefined ? resolveKnownHistorianContextLimit(modelKey) : undefined);
+  return {
+    ...context !== undefined ? { context } : {},
+    ...input !== undefined ? { input } : {}
+  };
+}
 function resolveHistorianContextLimit(historianModelOverride) {
   if (typeof historianModelOverride === "string" && historianModelOverride.includes("/")) {
     return resolveKnownHistorianContextLimit(historianModelOverride) ?? DEFAULT_HISTORIAN_CONTEXT_FALLBACK;
@@ -74214,6 +74448,28 @@ var init_embedding_ssrf = __esm(() => {
 });
 
 // src/features/magic-context/memory/embedding-openai.ts
+function capEmbeddingInput(input, maxInputTokens, purpose) {
+  const ratio = purpose === "query" ? CHUNK_WINDOW_SAFETY_RATIO : 1;
+  const budget = Math.max(1, Math.floor(maxInputTokens * ratio));
+  if (estimateTokens(input) <= budget)
+    return input;
+  let low = 0;
+  let high = input.length;
+  while (low < high) {
+    const mid = Math.ceil((low + high) / 2);
+    if (estimateTokens(input.slice(0, mid)) <= budget)
+      low = mid;
+    else
+      high = mid - 1;
+  }
+  if (low > 0 && low < input.length) {
+    const last = input.charCodeAt(low - 1);
+    const next = input.charCodeAt(low);
+    if (last >= 55296 && last <= 56319 && next >= 56320 && next <= 57343)
+      low -= 1;
+  }
+  return input.slice(0, low);
+}
 function normalizeEndpoint3(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
@@ -74236,6 +74492,7 @@ class OpenAICompatibleEmbeddingProvider {
   modelMismatchLogged = false;
   lastFailureReason = null;
   halfOpenProbeInFlight = false;
+  queryTruncationLogged = false;
   constructor(options) {
     this.endpoint = normalizeEndpoint3(options.endpoint);
     this.model = options.model?.trim() ?? "";
@@ -74289,7 +74546,15 @@ class OpenAICompatibleEmbeddingProvider {
       return [];
     }
     const textPrefix = purpose === "query" ? this.queryPrefix : this.documentPrefix;
-    const requestTexts = texts.map((text) => `${textPrefix}${text.trim().length === 0 ? " " : text}`);
+    const requestTexts = texts.map((text) => {
+      const input = `${textPrefix}${text.trim().length === 0 ? " " : text}`;
+      const capped = capEmbeddingInput(input, this.maxInputTokens, purpose);
+      if (purpose === "query" && capped.length < input.length && !this.queryTruncationLogged) {
+        log(`[magic-context] embedding query truncated from ${input.length} to ${capped.length} characters to fit max_input_tokens`);
+        this.queryTruncationLogged = true;
+      }
+      return capped;
+    });
     if (!await this.initialize()) {
       return Array.from({ length: texts.length }, () => null);
     }
@@ -74498,8 +74763,10 @@ class OpenAICompatibleEmbeddingProvider {
 }
 var FAILURE_THRESHOLD = 3, FAILURE_WINDOW_MS = 60000, OPEN_DURATION_MS, FETCH_TIMEOUT_MS = 30000;
 var init_embedding_openai = __esm(() => {
+  init_read_session_formatting();
   init_logger();
   init_redaction();
+  init_compartment_chunk_embedding();
   init_embedding_identity();
   init_embedding_model_match();
   init_embedding_ssrf();
@@ -74831,6 +75098,14 @@ var init_embedding_cache = __esm(() => {
 });
 
 // src/features/magic-context/session-project-storage.ts
+function hasMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath) {
+  let stmt = misScopedProjectChunkStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT 1 FROM (${MIS_SCOPED_PROJECT_CHUNK_IDS_SQL}) LIMIT 1`);
+    misScopedProjectChunkStatements.set(db, stmt);
+  }
+  return !!stmt.get(projectPath, projectPath);
+}
 function getUpsertSessionProjectStatement(db) {
   let stmt = upsertSessionProjectStatements.get(db);
   if (!stmt) {
@@ -74866,23 +75141,11 @@ function getRepairProjectChunkProjectStatement(db) {
   if (!stmt) {
     stmt = db.prepare(`UPDATE compartment_chunk_embeddings
              SET project_path = (
-                 SELECT sp.project_path
-                 FROM session_projects sp
+                 SELECT sp.project_path FROM session_projects sp
                  WHERE sp.session_id = compartment_chunk_embeddings.session_id
                    AND sp.harness = compartment_chunk_embeddings.harness
-                 LIMIT 1
              )
-             WHERE EXISTS (
-                 SELECT 1
-                 FROM session_projects sp
-                 WHERE sp.session_id = compartment_chunk_embeddings.session_id
-                   AND sp.harness = compartment_chunk_embeddings.harness
-                   AND sp.project_path <> compartment_chunk_embeddings.project_path
-                   AND (
-                       sp.project_path = ?
-                       OR compartment_chunk_embeddings.project_path = ?
-                   )
-             )`);
+             WHERE id IN (${MIS_SCOPED_PROJECT_CHUNK_IDS_SQL})`);
     repairProjectChunkProjectStatements.set(db, stmt);
   }
   return stmt;
@@ -74902,14 +75165,24 @@ function recordSessionProjectIdentity(db, sessionId, projectPath) {
 function repairMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath) {
   if (!projectPath)
     return 0;
+  if (!hasMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath))
+    return 0;
   return getRepairProjectChunkProjectStatement(db).run(projectPath, projectPath).changes;
 }
-var SESSION_CHUNK_REPAIR_BATCH_SIZE = 100, upsertSessionProjectStatements, repairSessionChunkProjectStatements, repairProjectChunkProjectStatements;
+var SESSION_CHUNK_REPAIR_BATCH_SIZE = 100, upsertSessionProjectStatements, repairSessionChunkProjectStatements, repairProjectChunkProjectStatements, misScopedProjectChunkStatements, MIS_SCOPED_PROJECT_CHUNK_IDS_SQL = `
+    SELECT e.id FROM compartment_chunk_embeddings e
+    JOIN session_projects sp ON sp.session_id = e.session_id AND sp.harness = e.harness
+    WHERE e.project_path = ? AND sp.project_path <> e.project_path
+    UNION ALL
+    SELECT e.id FROM session_projects sp
+    JOIN compartment_chunk_embeddings e ON e.session_id = sp.session_id
+    WHERE sp.project_path = ? AND e.harness = sp.harness AND e.project_path <> sp.project_path`;
 var init_session_project_storage = __esm(() => {
   init_project_identity();
   upsertSessionProjectStatements = new WeakMap;
   repairSessionChunkProjectStatements = new WeakMap;
   repairProjectChunkProjectStatements = new WeakMap;
+  misScopedProjectChunkStatements = new WeakMap;
 });
 
 // src/features/magic-context/shadow-backfill-state.ts
@@ -75338,6 +75611,14 @@ function recordActiveEmbeddingIdentity(db, projectIdentity, currentProviderIdent
   if (currentProviderIdentity === OFF_PROVIDER_IDENTITY) {
     return;
   }
+  const scopes = [["chunk", currentChunkIdentity]];
+  if (features.memoryEnabled)
+    scopes.push(["memory", currentProviderIdentity]);
+  if (features.gitCommitEnabled)
+    scopes.push(["commit", currentProviderIdentity]);
+  const active = db.prepare("SELECT 1 FROM embedding_identity_active WHERE project_path = ? AND scope = ? AND model_id = ?");
+  if (scopes.every(([scope, model]) => active.get(projectIdentity, scope, model)) && !hasMisScopedCompartmentChunkEmbeddingsForProject(db, projectIdentity))
+    return;
   const now = Date.now();
   const transactionStartedAt = performance.now();
   db.exec("BEGIN IMMEDIATE");
@@ -75385,7 +75666,9 @@ function registerProjectEmbedding(db, projectIdentity, config, features, sourceD
     observationMode: false
   };
   projectRegistrations.set(projectIdentity, registration);
-  persistPrimaryDescriptor(db, registration);
+  if (generationChanged || !db.prepare("SELECT 1 FROM embedding_registrations WHERE project_path = ? AND provider_identity = ? AND chunk_model_id = ? AND generation = ?").get(projectIdentity, providerIdentity, registration.chunkModelId, generation)) {
+    persistPrimaryDescriptor(db, registration);
+  }
   if (!canReuseProvider) {
     disposeProvider(prior?.provider ?? null);
   }
@@ -81925,6 +82208,27 @@ async function teardownChildSession(args) {
 }
 var init_child_session_teardown = () => {};
 
+// src/shared/run-token-log.ts
+function count2(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function runTokenLog(tokens, maxTokens, finish) {
+  const usage = tokens && typeof tokens === "object" ? tokens : {};
+  const cache = usage.cache && typeof usage.cache === "object" ? usage.cache : {};
+  return {
+    input: count2(usage.input ?? usage.input_tokens),
+    output: count2(usage.output ?? usage.output_tokens),
+    reasoning: count2(usage.reasoning ?? usage.reasoning_tokens),
+    cache_read: count2(usage.cacheRead ?? usage.cache_read ?? usage.cached_input_tokens ?? cache.read),
+    cache_write: count2(usage.cacheWrite ?? usage.cache_write ?? usage.cache_write_tokens ?? cache.write),
+    max_tokens: count2(maxTokens),
+    finish_reason: typeof finish === "string" ? finish : null
+  };
+}
+function formatRunTokenLog(tokens) {
+  return `tokens=${JSON.stringify(tokens)}`;
+}
+
 // src/features/magic-context/schema-fence-probe.ts
 function recordStaleFence(persistedVersion, supportedVersion, reason = "newer_schema") {
   state.consecutiveFailures += 1;
@@ -82314,11 +82618,14 @@ function clampProducerAtomChars(text, maxChars, marker) {
   const tailChars = Math.floor(keptChars / 2);
   return `${text.slice(0, headChars)}${marker}${text.slice(text.length - tailChars)}`;
 }
-function producerInputTokenLimit(contextLimitTokens, maxOutputTokens) {
-  if (typeof contextLimitTokens !== "number" || !Number.isFinite(contextLimitTokens) || contextLimitTokens <= 0 || !Number.isFinite(maxOutputTokens) || maxOutputTokens < 0) {
+function producerInputTokenLimit(contextLimitTokens, maxOutputTokens, inputLimitTokens) {
+  if (!Number.isFinite(maxOutputTokens) || maxOutputTokens < 0)
     return;
-  }
-  const usableInputTokens = Math.floor(contextLimitTokens - maxOutputTokens);
+  const shared = typeof contextLimitTokens === "number" && Number.isFinite(contextLimitTokens) && contextLimitTokens > 0 ? contextLimitTokens - maxOutputTokens : undefined;
+  const input = typeof inputLimitTokens === "number" && Number.isFinite(inputLimitTokens) && inputLimitTokens > 0 ? inputLimitTokens : undefined;
+  if (shared === undefined && input === undefined)
+    return;
+  const usableInputTokens = Math.floor(Math.min(shared ?? Infinity, input ?? Infinity));
   if (usableInputTokens <= 0)
     return;
   const limit = Math.floor(usableInputTokens * (1 - PRODUCER_WINDOW_REFUSAL_MARGIN));
@@ -82330,15 +82637,15 @@ function historianProducerReserve(window2, configuredOutput, catalogOutput) {
   return window2 === undefined ? 0 : catalogOutputReserve(window2, catalogOutput);
 }
 function producerWindowFailureReason(input) {
-  const { producerSourceTokens, contextLimitTokens, maxOutputTokens } = input;
-  const producerInputLimitTokens = producerInputTokenLimit(contextLimitTokens, maxOutputTokens);
-  if (producerInputLimitTokens === undefined || typeof contextLimitTokens !== "number" || !Number.isFinite(producerSourceTokens) || producerSourceTokens <= 0) {
+  const { producerSourceTokens, contextLimitTokens, inputLimitTokens, maxOutputTokens } = input;
+  const producerInputLimitTokens = producerInputTokenLimit(contextLimitTokens, maxOutputTokens, inputLimitTokens);
+  if (producerInputLimitTokens === undefined || !Number.isFinite(producerSourceTokens) || producerSourceTokens <= 0) {
     return null;
   }
-  const usableInputTokens = Math.max(0, Math.floor(contextLimitTokens - maxOutputTokens));
+  const usableInputTokens = Math.floor(Math.min(contextLimitTokens === undefined ? Infinity : Math.max(0, contextLimitTokens - maxOutputTokens), inputLimitTokens ?? Infinity));
   if (producerSourceTokens <= producerInputLimitTokens)
     return null;
-  return `producer_source_exceeds_window producer_source_tokens=${Math.round(producerSourceTokens)} usable_input_tokens=${usableInputTokens} producer_input_limit_tokens=${producerInputLimitTokens} context_limit_tokens=${Math.round(contextLimitTokens)} max_output_tokens=${Math.round(maxOutputTokens)} estimator_margin=${PRODUCER_WINDOW_REFUSAL_MARGIN}`;
+  return `producer_source_exceeds_window producer_source_tokens=${Math.round(producerSourceTokens)} usable_input_tokens=${usableInputTokens} producer_input_limit_tokens=${producerInputLimitTokens} context_limit_tokens=${contextLimitTokens === undefined ? "unknown" : Math.round(contextLimitTokens)} max_output_tokens=${Math.round(maxOutputTokens)} estimator_margin=${PRODUCER_WINDOW_REFUSAL_MARGIN}`;
 }
 function splitMarkerPair() {
   return `
@@ -82347,7 +82654,7 @@ ${HISTORIAN_TRUNCATION_MARKER}
 `;
 }
 function fitAtomicHistorianSourceToProducerWindow(args) {
-  const producerInputLimitTokens = producerInputTokenLimit(args.contextLimitTokens, args.maxOutputTokens);
+  const producerInputLimitTokens = producerInputTokenLimit(args.contextLimitTokens, args.maxOutputTokens, args.inputLimitTokens);
   const originalTokens = estimateTokens(args.text);
   if (producerInputLimitTokens === undefined || originalTokens < producerInputLimitTokens || producerInputLimitTokens <= 0) {
     return { text: args.text, producerInputLimitTokens, removedTokens: 0 };
@@ -82381,7 +82688,7 @@ function fitAtomicHistorianSourceToProducerWindow(args) {
   };
 }
 function producerPromptFailureReason(input) {
-  const limit = producerInputTokenLimit(input.contextLimitTokens, input.maxOutputTokens);
+  const limit = producerInputTokenLimit(input.contextLimitTokens, input.maxOutputTokens, input.inputLimitTokens);
   const tokens = providerMass({ prose: input.sourceLocal, system: input.systemLocal, tools: input.toolsLocal }, calibrationForModelKey(input.modelKey), true);
   if (limit === undefined)
     return null;
@@ -82497,12 +82804,15 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
         throw new Error(`Historian host recorded an assistant error${finish}: ${describeAssistantFailure(assistantFailure.error)}`);
       }
       const text = extractLatestAssistantText(messages);
+      const latest = Array.isArray(messages) ? messages.filter((message) => isRecord3(message) && isRecord3(message.info) && message.info.role === "assistant").sort((left, right) => historianMessageCreatedAt(right) - historianMessageCreatedAt(left))[0] : undefined;
+      const info = latest && isRecord3(latest.info) ? latest.info : {};
       return {
         messages,
         text,
         reasoning: text ? null : extractLatestHistorianReasoning(messages),
         lengthCapped: hasLengthCappedOutput(messages),
-        usage: sumTokensFromChildMessages(messages)
+        usage: sumTokensFromChildMessages(messages),
+        tokenLog: runTokenLog(info.tokens, undefined, info.finish ?? info.finish_reason ?? info.finishReason)
       };
     },
     async close(handle, settlement) {
@@ -82521,8 +82831,8 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
     }
   };
 }
-function historianReasoningBudgetDiagnostic(outputTokens) {
-  return `historian ran out of output budget while reasoning (length-capped at ${outputTokens} tokens, no text) — set historian.maxTokens or route historian.model to a low-reasoning lane/variant`;
+function historianReasoningBudgetDiagnostic(outputTokens, tokens) {
+  return `historian ran out of output budget while reasoning (length-capped at ${outputTokens} tokens, no text${tokens ? `; ${formatRunTokenLog(tokens)}` : ""}) — set historian.maxTokens or route historian.model to a low-reasoning lane/variant`;
 }
 async function runValidatedHistorianPass(args) {
   const firstRun = await runHistorianPrompt({
@@ -82711,8 +83021,10 @@ async function runHistorianPrompt(args) {
             const modelKey = selected ? `${selected.providerID}/${selected.modelID}` : undefined;
             const system = withContentLanguageDirective(agentId === HISTORIAN_EDITOR_AGENT ? HISTORIAN_EDITOR_SYSTEM_PROMPT : COMPARTMENT_AGENT_SYSTEM_PROMPT, args.language);
             const contextLimitTokens = selected ? getSdkContextLimit(selected.providerID, selected.modelID, undefined, { reservation: "none" }) : undefined;
-            const reserve = historianProducerReserve(contextLimitTokens, args.maxOutputTokens, selected ? getSdkOutputLimit(selected.providerID, selected.modelID) : undefined);
-            if (contextLimitTokens !== undefined && producerInputTokenLimit(contextLimitTokens, reserve) === undefined && modelKey && !unknownProducerWindows.has(modelKey)) {
+            const producerLimits = selected ? resolveHistorianProducerLimits(modelKey) : {};
+            const producerContext = producerLimits.context ?? (producerLimits.input === undefined ? contextLimitTokens : undefined);
+            const reserve = historianProducerReserve(producerContext, args.maxOutputTokens, selected ? getSdkOutputLimit(selected.providerID, selected.modelID) : undefined);
+            if (contextLimitTokens !== undefined && producerInputTokenLimit(producerContext, reserve, producerLimits.input) === undefined && modelKey && !unknownProducerWindows.has(modelKey)) {
               unknownProducerWindows.add(modelKey);
               sessionLog(parentSessionId, `producer window inconsistent for ${modelKey}: window=${contextLimitTokens} reserve=${reserve}; sending unguarded`);
             }
@@ -82721,7 +83033,8 @@ async function runHistorianPrompt(args) {
               systemLocal: estimateTokens(system),
               toolsLocal: 0,
               modelKey,
-              contextLimitTokens,
+              contextLimitTokens: producerContext,
+              inputLimitTokens: producerLimits.input,
               maxOutputTokens: reserve
             });
             if (failure)
@@ -82755,9 +83068,15 @@ async function runHistorianPrompt(args) {
     }
     completion = await executor.collect(handle, 50);
     const lengthCapped = completion.lengthCapped;
+    const tokens = {
+      ...runTokenLog(undefined, args.maxOutputTokens),
+      ...completion.tokenLog,
+      max_tokens: args.maxOutputTokens ?? null
+    };
+    sessionLog(parentSessionId, `historian response_chars=${(completion.text ?? completion.reasoning ?? "").length} ${formatRunTokenLog(tokens)}`);
     const textResult = completion.text;
     const reasoningResult = textResult ? null : completion.reasoning;
-    const emptyError = !textResult && reasoningResult && lengthCapped ? historianReasoningBudgetDiagnostic(completion.usage.output) : !textResult && !reasoningResult ? "Historian returned no assistant output." : !textResult ? "Historian returned reasoning but no assistant text." : lengthCapped ? "Historian returned length-capped output." : null;
+    const emptyError = !textResult && reasoningResult && lengthCapped ? historianReasoningBudgetDiagnostic(completion.usage.output, tokens) : !textResult && !reasoningResult ? "Historian returned no assistant output." : !textResult ? "Historian returned reasoning but no assistant text." : lengthCapped ? `Historian returned length-capped output. ${formatRunTokenLog(tokens)}` : null;
     const invocationId = recordInvocation({
       status: emptyError ? "empty" : "completed",
       messages: completion.messages,
@@ -82943,6 +83262,7 @@ var init_compartment_runner_historian = __esm(async () => {
   init_compartment_prompt();
   init_compartment_runner_types();
   init_compartment_runner_validation();
+  init_derive_budgets();
   init_producer_window_guard();
   init_read_session_formatting();
   await __promiseAll([
@@ -83956,7 +84276,7 @@ var init_render_trigger = __esm(async () => {
 });
 
 // src/hooks/magic-context/compartment-render-epoch.ts
-function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH, muralEnabled = null, renderBudgetIdentity = null, memoryRenderEpoch = MEMORY_RENDER_FORMAT_EPOCH) {
+function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH, muralEnabled = null, renderBudgetIdentity = null, memoryRenderEpoch = MEMORY_RENDER_FORMAT_EPOCH, renderedBudgets = null) {
   let encoded = upgradeState ?? "";
   if (compartmentRenderEpoch !== null) {
     encoded += `${EPOCH_COMPONENT_PREFIX}${compartmentRenderEpoch}`;
@@ -83970,6 +84290,9 @@ function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = CO
   if (renderBudgetIdentity !== null) {
     encoded += `${BUDGET_COMPONENT_PREFIX}${renderBudgetIdentity}`;
   }
+  if (renderedBudgets !== null) {
+    encoded += `${RENDERED_BUDGETS_COMPONENT_PREFIX}${renderedBudgets}`;
+  }
   return encoded.length > 0 ? encoded : null;
 }
 function component(value, prefix) {
@@ -83988,14 +84311,16 @@ function decodeCachedM0UpgradeIdentity(value) {
       compartmentRenderEpoch: null,
       memoryRenderEpoch: null,
       muralEnabled: null,
-      renderBudgetIdentity: null
+      renderBudgetIdentity: null,
+      renderedBudgets: null
     };
   }
   const componentIndexes = [
     value.indexOf(EPOCH_COMPONENT_PREFIX),
     value.indexOf(MEMORY_EPOCH_COMPONENT_PREFIX),
     value.indexOf(MURAL_COMPONENT_PREFIX),
-    value.indexOf(BUDGET_COMPONENT_PREFIX)
+    value.indexOf(BUDGET_COMPONENT_PREFIX),
+    value.indexOf(RENDERED_BUDGETS_COMPONENT_PREFIX)
   ].filter((index) => index >= 0);
   const identityEnd = componentIndexes.length > 0 ? Math.min(...componentIndexes) : value.length;
   const upgradeState = value.slice(0, identityEnd);
@@ -84005,10 +84330,37 @@ function decodeCachedM0UpgradeIdentity(value) {
     compartmentRenderEpoch: component(value, EPOCH_COMPONENT_PREFIX),
     memoryRenderEpoch: component(value, MEMORY_EPOCH_COMPONENT_PREFIX),
     muralEnabled: muralComponent === "1" ? true : muralComponent === "0" ? false : null,
-    renderBudgetIdentity: component(value, BUDGET_COMPONENT_PREFIX)
+    renderBudgetIdentity: component(value, BUDGET_COMPONENT_PREFIX),
+    renderedBudgets: component(value, RENDERED_BUDGETS_COMPONENT_PREFIX)
   };
 }
-var COMPARTMENT_RENDER_EPOCH = "cre2", MEMORY_RENDER_FORMAT_EPOCH = "mre3", EPOCH_COMPONENT_PREFIX = "|compartment-render:", MEMORY_EPOCH_COMPONENT_PREFIX = "|memory-render:", MURAL_COMPONENT_PREFIX = "|mural-enabled:", BUDGET_COMPONENT_PREFIX = "|render-budgets:";
+function renderBudgetIdentityChanged(cached, current) {
+  const legacy = /^(m[^-]+)-h\d+$/.exec(cached);
+  if (legacy && current.startsWith("m") && current.includes("-hp")) {
+    return legacy[1] !== current.slice(0, current.indexOf("-h"));
+  }
+  return cached !== current;
+}
+function renderedBudgetSnapshot(memoryTokens, historyTokens) {
+  return `m${memoryTokens}-h${historyTokens}`;
+}
+function readRenderedBudgets(value) {
+  const match = value?.match(/^m(\d+(?:\.\d+)?)-h(\d+(?:\.\d+)?)$/);
+  if (!match)
+    return null;
+  const memory = Number(match[1]);
+  const history = Number(match[2]);
+  return Number.isFinite(memory) && Number.isFinite(history) ? { memory, history } : null;
+}
+function renderedBudgetShrinkReason(cached, current) {
+  const before = readRenderedBudgets(cached);
+  const after = readRenderedBudgets(current);
+  if (!before || !after)
+    return null;
+  const shrunk = (oldTokens, newTokens) => oldTokens - newTokens > Math.max(64, oldTokens * 0.01);
+  return shrunk(before.memory, after.memory) || shrunk(before.history, after.history) ? `render_config:budget_shrink(${cached}→${current})` : null;
+}
+var COMPARTMENT_RENDER_EPOCH = "cre2", MEMORY_RENDER_FORMAT_EPOCH = "mre3", EPOCH_COMPONENT_PREFIX = "|compartment-render:", MEMORY_EPOCH_COMPONENT_PREFIX = "|memory-render:", MURAL_COMPONENT_PREFIX = "|mural-enabled:", BUDGET_COMPONENT_PREFIX = "|render-budgets:", RENDERED_BUDGETS_COMPONENT_PREFIX = "|rendered-budgets:";
 
 // src/hooks/magic-context/decay-curve.ts
 function tier(compartmentIndex, importance, budgetPressure) {
@@ -84708,8 +85060,8 @@ function lastCompartmentBoundaryId(compartments) {
   const last = compartments.at(-1);
   return last?.endMessageId && last.endMessageId.length > 0 ? last.endMessageId : null;
 }
-function renderBudgetIdentity(memoryBudget, historyBudget) {
-  return `m${memoryBudget ?? DEFAULT_MEMORY_BUDGET_TOKENS}-h${historyBudget ?? DEFAULT_HISTORY_BUDGET_TOKENS}`;
+function renderBudgetIdentity(memoryBudget, historyBudget, historyPolicy) {
+  return `m${memoryBudget ?? DEFAULT_MEMORY_BUDGET_TOKENS}-h${historyPolicy ?? historyBudget ?? DEFAULT_HISTORY_BUDGET_TOKENS}`;
 }
 function readProjectDocsForM0(projectDirectory, injectDocs) {
   return projectDirectory && injectDocs !== false ? readProjectDocsCanonical(projectDirectory) : EMPTY_PROJECT_DOCS;
@@ -84889,7 +85241,8 @@ function readCurrentM0SnapshotMarkersUncached(args) {
       modelKey: piModelRefToCanonical(hard.modelKey),
       projectIdentity: args.projectPath ?? null,
       muralEnabled: args.memoryEnabled !== false && args.muralEnabled === true,
-      renderBudgetIdentity: renderBudgetIdentity(args.memoryInjectionBudgetTokens, args.historyBudgetTokens)
+      renderBudgetIdentity: renderBudgetIdentity(args.memoryInjectionBudgetTokens, args.historyBudgetTokens, args.historyBudgetPolicyIdentity),
+      renderedBudgets: renderedBudgetSnapshot(args.memoryInjectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS, args.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS)
     }
   };
 }
@@ -84903,7 +85256,8 @@ function refreshVolatileMarkerInputs(markers, args) {
     modelKey: hard.modelKey,
     projectIdentity: args.projectPath ?? null,
     muralEnabled: args.memoryEnabled !== false && args.muralEnabled === true,
-    renderBudgetIdentity: renderBudgetIdentity(args.memoryInjectionBudgetTokens, args.historyBudgetTokens)
+    renderBudgetIdentity: renderBudgetIdentity(args.memoryInjectionBudgetTokens, args.historyBudgetTokens, args.historyBudgetPolicyIdentity),
+    renderedBudgets: renderedBudgetSnapshot(args.memoryInjectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS, args.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS)
   };
 }
 function readCurrentM0SnapshotMarkers(args) {
@@ -84973,7 +85327,8 @@ function snapshotMarkersFromCachedM0(state) {
     projectIdentity: state.cachedM0ProjectIdentity ?? null,
     muralHash: state.cachedM0MuralHash ?? null,
     muralEnabled: cachedUpgradeIdentity.muralEnabled,
-    renderBudgetIdentity: cachedUpgradeIdentity.renderBudgetIdentity
+    renderBudgetIdentity: cachedUpgradeIdentity.renderBudgetIdentity,
+    renderedBudgets: cachedUpgradeIdentity.renderedBudgets
   };
 }
 function cachedMemoryDerivedSurfacePresent(state) {
@@ -84988,14 +85343,26 @@ function mustMaterialize(args) {
   const current = readCurrentM0SnapshotMarkers(args);
   const cachedUpgradeIdentity = decodeCachedM0UpgradeIdentity(args.state.cachedM0UpgradeState);
   if (args.memoryEnabled === false && cachedMemoryDerivedSurfacePresent(args.state)) {
-    return { value: true, reason: "render_config" };
+    return { value: true, reason: "render_config:memory_disabled" };
   }
   if (cachedUpgradeIdentity.compartmentRenderEpoch !== current.compartmentRenderEpoch) {
     return { value: true, reason: "compartment_render_epoch" };
   }
-  if (cachedUpgradeIdentity.muralEnabled !== null && cachedUpgradeIdentity.muralEnabled !== current.muralEnabled || cachedUpgradeIdentity.renderBudgetIdentity !== null && cachedUpgradeIdentity.renderBudgetIdentity !== current.renderBudgetIdentity) {
-    return { value: true, reason: "render_config" };
+  if (cachedUpgradeIdentity.muralEnabled !== null && cachedUpgradeIdentity.muralEnabled !== current.muralEnabled) {
+    return {
+      value: true,
+      reason: `render_config:mural(${cachedUpgradeIdentity.muralEnabled}→${current.muralEnabled})`
+    };
+  }
+  if (cachedUpgradeIdentity.renderBudgetIdentity !== null && current.renderBudgetIdentity != null && renderBudgetIdentityChanged(cachedUpgradeIdentity.renderBudgetIdentity, current.renderBudgetIdentity)) {
+    return {
+      value: true,
+      reason: `render_config:budget(${cachedUpgradeIdentity.renderBudgetIdentity}→${current.renderBudgetIdentity})`
+    };
   }
+  const budgetShrinkReason = renderedBudgetShrinkReason(cachedUpgradeIdentity.renderedBudgets, current.renderedBudgets);
+  if (budgetShrinkReason)
+    return { value: true, reason: budgetShrinkReason };
   const canonicalHardModelKey = piModelRefToCanonical(hard.modelKey);
   const canonicalCachedModelKey = piModelRefToCanonical(args.state.cachedM0ModelKey ?? "");
   if (canonicalHardModelKey !== "" && canonicalHardModelKey !== canonicalCachedModelKey) {
@@ -85348,7 +85715,7 @@ function applyMarkersToState(state, m0Bytes, markers, m1Bytes) {
   state.cachedM0ProjectDocsHash = markers.projectDocsHash;
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
-  state.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch);
+  state.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null);
   state.cachedM0SystemHash = markers.systemHash;
   state.cachedM0ToolSetHash = markers.toolSetHash;
   state.cachedM0ModelKey = markers.modelKey;
@@ -85400,6 +85767,7 @@ function materializeM0(options) {
       muralEnabled: options.muralEnabled,
       memoryInjectionBudgetTokens: options.memoryInjectionBudgetTokens,
       historyBudgetTokens: options.historyBudgetTokens,
+      historyBudgetPolicyIdentity: options.historyBudgetPolicyIdentity,
       hardSignals: options.hardSignals,
       workspaceIdentitySet: {
         identities: workspace.identities,
@@ -85500,7 +85868,8 @@ function materializeM0(options) {
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: projectPath ?? null,
       muralEnabled: snapshotMarkers.muralEnabled,
-      renderBudgetIdentity: snapshotMarkers.renderBudgetIdentity
+      renderBudgetIdentity: snapshotMarkers.renderBudgetIdentity,
+      renderedBudgets: snapshotMarkers.renderedBudgets
     };
     const memoryEpochStale = current.workspaceFingerprint !== null || snapshotMarkers.workspaceFingerprint !== null ? current.workspaceFingerprint !== snapshotMarkers.workspaceFingerprint : current.projectMemoryEpoch !== snapshotMarkers.projectMemoryEpoch;
     const stale = memoryEpochStale || current.projectUserProfileVersion !== snapshotMarkers.projectUserProfileVersion || current.maxCompartmentSeq !== snapshotMarkers.maxCompartmentSeq || current.maxMutationId !== snapshotMarkers.maxMutationId || current.maxMemoryMutationId !== snapshotMarkers.maxMemoryMutationId || current.sessionFactsVersion !== snapshotMarkers.sessionFactsVersion || current.upgradeState !== snapshotMarkers.upgradeState || (current.projectIdentity ?? null) !== (snapshotMarkers.projectIdentity ?? null);
@@ -85535,7 +85904,7 @@ function materializeM0(options) {
       projectDocsHash: snapshotMarkers.projectDocsHash,
       materializedAt: snapshotMarkers.materializedAt,
       sessionFactsVersion: snapshotMarkers.sessionFactsVersion,
-      upgradeState: encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity, snapshotMarkers.memoryRenderEpoch),
+      upgradeState: encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity, snapshotMarkers.memoryRenderEpoch, snapshotMarkers.renderedBudgets ?? null),
       systemHash: snapshotMarkers.systemHash,
       toolSetHash: snapshotMarkers.toolSetHash,
       modelKey: snapshotMarkers.modelKey,
@@ -85798,7 +86167,8 @@ function markersFromCachedRow(row) {
     projectIdentity: row.cached_m0_project_identity ?? null,
     muralHash: row.cached_m0_mural_hash ?? null,
     muralEnabled: cachedUpgradeIdentity.muralEnabled,
-    renderBudgetIdentity: cachedUpgradeIdentity.renderBudgetIdentity
+    renderBudgetIdentity: cachedUpgradeIdentity.renderBudgetIdentity,
+    renderedBudgets: cachedUpgradeIdentity.renderedBudgets
   };
 }
 function cachedRowMatchesState(row, state) {
@@ -85823,7 +86193,7 @@ function applyCachedRowToState(state, row) {
   state.cachedM0ProjectDocsHash = markers.projectDocsHash;
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
-  state.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch);
+  state.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null);
   state.cachedM0SystemHash = markers.systemHash;
   state.cachedM0ToolSetHash = markers.toolSetHash;
   state.cachedM0ModelKey = markers.modelKey;
@@ -85916,6 +86286,7 @@ function renderFreshM0NonPersisted(options) {
     muralEnabled: options.muralEnabled,
     memoryInjectionBudgetTokens: options.memoryInjectionBudgetTokens,
     historyBudgetTokens: options.historyBudgetTokens,
+    historyBudgetPolicyIdentity: options.historyBudgetPolicyIdentity,
     hardSignals: options.hardSignals,
     workspaceIdentitySet: {
       identities: workspace.identities,
@@ -86282,7 +86653,8 @@ function injectM0M1(options) {
     memoryEnabled: options.memoryEnabled,
     muralEnabled: options.muralEnabled,
     memoryInjectionBudgetTokens: options.memoryInjectionBudgetTokens,
-    historyBudgetTokens: options.historyBudgetTokens
+    historyBudgetTokens: options.historyBudgetTokens,
+    historyBudgetPolicyIdentity: options.historyBudgetPolicyIdentity
   });
   let rematerialized = false;
   let contentionExhausted = false;
@@ -89179,6 +89551,8 @@ function findDanglingPublicationBoundary(sessionId, compartments, messageExists
   return null;
 }
 async function runCompartmentAgent(deps) {
+  if (shouldSkipHomeProjectMemory(deps.directory ?? process.cwd()))
+    return;
   const {
     client,
     db,
@@ -89409,11 +89783,14 @@ async function runCompartmentAgent(deps) {
     }
     const producerModel = toModelEntry(deps.model)?.model ?? deps.fallbackModelId;
     const modelParts = producerModel?.split("/");
-    const producerReserve = historianProducerReserve(deps.historianContextLimit, deps.historianMaxOutputTokens, modelParts && modelParts.length > 1 ? getSdkOutputLimit(modelParts[0], modelParts.slice(1).join("/")) : undefined);
+    const producerLimits = resolveHistorianProducerLimits(producerModel);
+    const producerContext = producerLimits.context ?? (producerLimits.input === undefined ? deps.historianContextLimit : undefined);
+    const producerReserve = historianProducerReserve(producerContext, deps.historianMaxOutputTokens, modelParts && modelParts.length > 1 ? getSdkOutputLimit(modelParts[0], modelParts.slice(1).join("/")) : undefined);
     const fittedAtomicSource = chunk.oversizeAtomicUnit ? fitAtomicHistorianSourceToProducerWindow({
       text: chunk.text,
       resultBoundaries: chunk.toolResultBoundaries,
-      contextLimitTokens: deps.historianContextLimit,
+      contextLimitTokens: producerContext,
+      inputLimitTokens: producerLimits.input,
       maxOutputTokens: producerReserve
     }) : null;
     const chunkText = chunk.oversizeAtomicUnit ? fittedAtomicSource?.text ?? chunk.text : truncateHistorianInputIfNeeded(chunk.text, historianChunkTokens);
@@ -89426,10 +89803,11 @@ async function runCompartmentAgent(deps) {
     }
     const producerWindowFailure = producerWindowFailureReason({
       producerSourceTokens,
-      contextLimitTokens: deps.historianContextLimit,
+      contextLimitTokens: producerContext,
+      inputLimitTokens: producerLimits.input,
       maxOutputTokens: producerReserve
     });
-    if (deps.historianContextLimit !== undefined && producerInputTokenLimit(deps.historianContextLimit, producerReserve) === undefined) {
+    if (deps.historianContextLimit !== undefined && producerInputTokenLimit(producerContext, producerReserve, producerLimits.input) === undefined) {
       logInconsistentProducerWindowOnce(sessionId, producerModel ?? "unknown", deps.historianContextLimit, producerReserve);
     }
     if (producerWindowFailure) {
@@ -89589,7 +89967,7 @@ ${chunkText}`,
     const compartmentTagKeys = await getRawSessionTagKeysThrough(sessionId, lastCompartmentEnd, { db, fromMessageIndex: offset });
     let published = false;
     const transactionStartedAt = startHistorianPublishStage(sessionId, "publish-txn");
-    db.exec("BEGIN IMMEDIATE");
+    await beginSqliteWriterAsync(db, "historian-publish");
     try {
       if (!isCompartmentLeaseHeld(db, sessionId, holderId)) {
         db.exec("ROLLBACK");
@@ -89813,6 +90191,7 @@ var init_compartment_runner_incremental = __esm(async () => {
   init_reference_retrieval();
   await __promiseAll([
     init_store_generation_rebase(),
+    init_sqlite(),
     init_memory(),
     init_storage_memory(),
     init_storage(),
@@ -106406,6 +106785,12 @@ function resolveModelKey(providerID, modelID) {
   }
   return piModelRefToCanonical(`${providerID}/${modelID}`);
 }
+function historyBudgetPolicyIdentity(historyBudgetPercentage, executeThresholdPercentage, modelKey, executeThresholdTokens) {
+  if (!historyBudgetPercentage)
+    return "pdefault";
+  const threshold = resolveExecuteThresholdDetail(executeThresholdPercentage ?? 65, modelKey, 65, { tokensConfig: executeThresholdTokens, contextLimit: Number.MAX_SAFE_INTEGER });
+  return `p${historyBudgetPercentage}:${threshold.mode}:${threshold.absoluteTokens ?? threshold.percentage}`;
+}
 
 // src/features/magic-context/scheduler.ts
 init_logger();
@@ -107100,28 +107485,6 @@ class EmergencyFailClosedError extends Error {
     this.name = "EmergencyFailClosedError";
   }
 }
-// src/hooks/magic-context/event-payloads.ts
-function nonEmptyString(value) {
-  return typeof value === "string" && value.length > 0 ? value : undefined;
-}
-function getSessionErrorInfo(properties) {
-  if (!isRecord3(properties))
-    return null;
-  const sessionID = properties.sessionID;
-  if (typeof sessionID !== "string" || sessionID.length === 0)
-    return null;
-  const error = isRecord3(properties.error) ? properties.error : undefined;
-  const data = error && isRecord3(error.data) ? error.data : undefined;
-  const model = isRecord3(properties.model) ? properties.model : error && isRecord3(error.model) ? error.model : data && isRecord3(data.model) ? data.model : undefined;
-  const providerID = nonEmptyString(properties.providerID) ?? nonEmptyString(model?.providerID) ?? nonEmptyString(model?.provider) ?? nonEmptyString(error?.providerID) ?? nonEmptyString(data?.providerID);
-  const modelID = nonEmptyString(properties.modelID) ?? nonEmptyString(model?.modelID) ?? nonEmptyString(model?.id) ?? nonEmptyString(error?.modelID) ?? nonEmptyString(data?.modelID);
-  return {
-    sessionID,
-    error: properties.error,
-    ...providerID ? { providerID } : {},
-    ...modelID ? { modelID } : {}
-  };
-}
 
 // src/features/magic-context/dreamer/verify-read-cap.ts
 var DREAMER_READ_MAX_CHARS = 8000;
@@ -107137,7 +107500,10 @@ function capDreamerReadOutput(input, output) {
 
 // src/features/magic-context/message-index-async.ts
 init_logger();
-await init_message_index();
+await __promiseAll([
+  init_sqlite(),
+  init_message_index()
+]);
 function isDatabaseLockedError(error) {
   if (!error || typeof error !== "object")
     return false;
@@ -107223,7 +107589,7 @@ async function reconcileSessionIndex(db, sessionId, readMessages) {
         const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
         const retainedMessages = fallbackSnapshot ?? messages;
         heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
-        indexMessagesAfterOrdinal(db, sessionId, messages, cursor, pageEnd);
+        withSqliteBackgroundWriter(() => indexMessagesAfterOrdinal(db, sessionId, messages, cursor, pageEnd));
         const nextCursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
         if (nextCursor <= cursor)
           break;
@@ -107249,6 +107615,8 @@ function scheduleReconciliation(db, sessionId, readMessages) {
     defer(() => {
       reconcileSessionIndex(db, sessionId, readMessages).catch((error) => {
         logIndexingError(sessionId, "reconciliation", error);
+        if (isDatabaseLockedError(error))
+          setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000).unref();
       }).finally(() => {
         heapHolder.reconciliationScheduledSessions.delete(sessionId);
       });
@@ -109675,6 +110043,28 @@ function annotateEmptyTaskOutput(tool, output) {
 ${EMPTY_TASK_OUTPUT_SENTINEL}
 The subagent completed without a final text response. Context-fill truncation may have omitted its final output, or its provider may have emitted reasoning only; inspect the child session and retry with a low-reasoning model or variant.`);
 }
+// src/hooks/magic-context/event-payloads.ts
+function nonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+function getSessionErrorInfo(properties) {
+  if (!isRecord3(properties))
+    return null;
+  const sessionID = properties.sessionID;
+  if (typeof sessionID !== "string" || sessionID.length === 0)
+    return null;
+  const error = isRecord3(properties.error) ? properties.error : undefined;
+  const data = error && isRecord3(error.data) ? error.data : undefined;
+  const model = isRecord3(properties.model) ? properties.model : error && isRecord3(error.model) ? error.model : data && isRecord3(data.model) ? data.model : undefined;
+  const providerID = nonEmptyString(properties.providerID) ?? nonEmptyString(model?.providerID) ?? nonEmptyString(model?.provider) ?? nonEmptyString(error?.providerID) ?? nonEmptyString(data?.providerID);
+  const modelID = nonEmptyString(properties.modelID) ?? nonEmptyString(model?.modelID) ?? nonEmptyString(model?.id) ?? nonEmptyString(error?.modelID) ?? nonEmptyString(data?.modelID);
+  return {
+    sessionID,
+    error: properties.error,
+    ...providerID ? { providerID } : {},
+    ...modelID ? { modelID } : {}
+  };
+}
 
 // src/hooks/magic-context/hook-handlers.ts
 init_lkg_slot();
@@ -111976,10 +112366,12 @@ init_project_embedding_registry();
 
 // src/plugin/embedding-bootstrap.ts
 init_config();
+init_migrate_config_location();
 init_embedding();
 init_embedding_cache();
 init_project_identity();
 init_logger();
+import { readFileSync as readFileSync14, statSync as statSync13 } from "node:fs";
 
 // src/plugin/embedding-bootstrap-helpers.ts
 init_embedding();
@@ -112230,12 +112622,41 @@ async function resolveEmbeddingRouting(args) {
 }
 
 // src/plugin/embedding-bootstrap.ts
-async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db) {
+var configCache = new Map;
+function loadRegistrationConfig(directory) {
+  const legacy = resolveLegacyConfigSources(directory);
+  const paths = [cortexKitUserConfigBasePath(), cortexKitProjectConfigBasePath(directory)].flatMap((base) => [`${base}.jsonc`, `${base}.json`]).concat(legacy.user.map((source) => source.path), legacy.project.map((source) => source.path));
+  const key = paths.map((path) => {
+    const stat = statSync13(path, { throwIfNoEntry: false });
+    return `${path}:${stat?.mtimeMs ?? "missing"}:${stat?.size ?? 0}`;
+  }).join("|");
+  const cached = configCache.get(directory);
+  if (cached?.key === key)
+    return cached.detailed;
   const detailed = loadPluginConfigDetailed(directory);
+  const dynamic = paths.some((path) => {
+    try {
+      return /\{(?:env|file):/.test(readFileSync14(path, "utf8"));
+    } catch {
+      return false;
+    }
+  });
+  if (!dynamic) {
+    if (configCache.size >= 64) {
+      const oldest = configCache.keys().next().value;
+      if (oldest !== undefined)
+        configCache.delete(oldest);
+    }
+    configCache.set(directory, { key, detailed });
+  } else
+    configCache.delete(directory);
+  return detailed;
+}
+async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db) {
+  const detailed = loadRegistrationConfig(directory);
   const projectIdentity = resolveProjectIdentityForSession(directory, detailed.config.allow_home_project);
   if (!projectIdentity)
     return;
-  invalidateProject(projectIdentity);
   if (isConfigLoadUntrusted(detailed)) {
     handleUntrustedLoad(db, projectIdentity, directory, detailed);
     return;
@@ -112252,7 +112673,10 @@ async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db) {
     memoryEnabled: detailed.config.memory.enabled,
     gitCommitEnabled: detailed.config.memory.git_commit_indexing.enabled
   };
-  registerProjectEmbedding(db, projectIdentity, routing.primary, features, directory);
+  const before = getProjectEmbeddingSnapshot(projectIdentity);
+  const registered = registerProjectEmbedding(db, projectIdentity, routing.primary, features, directory);
+  if (!before || before.providerIdentity !== registered.providerIdentity || before.runtimeFingerprint !== registered.runtimeFingerprint)
+    invalidateProject(projectIdentity);
   if (routing.shadow) {
     registerProjectShadowEmbedding(db, projectIdentity, routing.shadow, directory);
   } else {
@@ -113118,7 +113542,9 @@ await __promiseAll([
   init_compaction_marker_manager(),
   init_compartment_runner()
 ]);
+
 // src/hooks/magic-context/drop-stale-reduce-calls.ts
+init_user_answer();
 var STALE_TOOL_NAMES = new Set(["ctx_reduce"]);
 function isReduceToolPart(part) {
   if (!isRecord3(part))
@@ -113182,7 +113608,7 @@ function dropStaleReduceCalls(messages, frozenIds, options = {}) {
     const message = messages[i];
     const id = typeof message.info.id === "string" ? message.info.id : undefined;
     const inFrozen = id !== undefined && frozenIds.has(id);
-    const isNewDetection = !inFrozen && detect && i < protectedStart && id !== undefined && messageHasReducePart(message);
+    const isNewDetection = !inFrozen && detect && i < protectedStart && id !== undefined && messageHasReducePart(message) && !message.parts.some(toolPartHasUserAnswer);
     if (!inFrozen && !isNewDetection)
       continue;
     const touched = sentinelizeReduceParts(message);
@@ -113600,6 +114026,8 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
         for (let i = 0;i < group.length - 1; i++) {
           const tag = group[i];
           const target = targets.get(tag.tagNumber);
+          if (target?.canDrop?.() === false)
+            continue;
           const { result, mode } = applyNewToolDrop(target, { inWindow: false });
           if (result === "incomplete")
             continue;
@@ -115771,6 +116199,7 @@ async function runPostTransformPhase(args) {
     muralEnabled: args.m0M1.muralEnabled,
     memoryInjectionBudgetTokens: args.m0M1.memoryInjectionBudgetTokens,
     historyBudgetTokens: args.m0M1.historyBudgetTokens,
+    historyBudgetPolicyIdentity: args.m0M1.historyBudgetPolicyIdentity,
     hardSignals: args.m0M1.hardSignals
   }) : { value: false, reason: null };
   let preparedPrefix;
@@ -115809,6 +116238,7 @@ async function runPostTransformPhase(args) {
         memoryEnabled: args.m0M1.memoryEnabled,
         memoryInjectionBudgetTokens: args.m0M1.memoryInjectionBudgetTokens,
         historyBudgetTokens: args.m0M1.historyBudgetTokens,
+        historyBudgetPolicyIdentity: args.m0M1.historyBudgetPolicyIdentity,
         temporalAwareness: args.m0M1.temporalAwareness,
         isCacheBustingPass: true,
         contentionFallbackPrefix: cachedPrefixBeforePreflight,
@@ -116189,6 +116619,7 @@ async function runPostTransformPhase(args) {
         memoryEnabled: args.m0M1.memoryEnabled,
         memoryInjectionBudgetTokens: args.m0M1.memoryInjectionBudgetTokens,
         historyBudgetTokens: args.m0M1.historyBudgetTokens,
+        historyBudgetPolicyIdentity: args.m0M1.historyBudgetPolicyIdentity,
         temporalAwareness: args.m0M1.temporalAwareness,
         isCacheBustingPass,
         preparedPrefix,
@@ -116764,6 +117195,16 @@ function servedModuleM0Text(sessionId, readSlot = getSlot) {
 init_logger();
 await init_sqlite();
 var STORAGE_BUSY_MESSAGE = "Magic Context's database is busy (another process held it too long); send your message again.";
+function describeStorageBusyCause(cause) {
+  let original = cause;
+  for (let depth = 0;original instanceof SqliteAcquisitionBusyError && depth < 5; depth++) {
+    original = original.cause;
+  }
+  if (!(original instanceof Error))
+    return String(original);
+  return original.stack ? `${original.message}
+${original.stack}` : original.message;
+}
 
 class StorageBusyRefusalError extends Error {
   code = "STORAGE_BUSY_REFUSAL";
@@ -116771,8 +117212,7 @@ class StorageBusyRefusalError extends Error {
   constructor(cause, stage) {
     super(STORAGE_BUSY_MESSAGE, { cause });
     this.name = "StorageBusyRefusalError";
-    const original = cause instanceof SqliteAcquisitionBusyError ? cause.cause : cause;
-    const detail = original instanceof Error ? original.stack ?? original.message : String(original);
+    const detail = describeStorageBusyCause(cause);
     log(`[magic-context] storage-busy refusal stage=${stage}${cause instanceof SqliteAcquisitionBusyError ? ` acquisition=${cause.stage}` : ""}: ${detail}`);
   }
 }
@@ -117219,7 +117659,24 @@ await init_inject_compartments();
 
 // src/hooks/magic-context/lkg-persist.ts
 init_logger();
+import { createHash as createHash25 } from "node:crypto";
+var persistedFingerprints = new WeakMap;
 function saveLkgSlotToDb(db, sessionId, slot) {
+  const fingerprint = createHash25("sha256").update(JSON.stringify([
+    slot.jsonPrefix,
+    slot.inputIdSeq,
+    slot.inputContentDigests,
+    slot.inputContentSignatures,
+    slot.piOutputEntryIds,
+    slot.lastInputMessageId,
+    slot.modelKey,
+    slot.providerKey,
+    slot.rowVersion,
+    slot.captureSequence
+  ])).digest("hex");
+  let saved = persistedFingerprints.get(db);
+  if (saved?.get(sessionId) === fingerprint)
+    return true;
   try {
     db.prepare(`INSERT INTO lkg_slots (
                 session_id, json_prefix, input_id_seq, input_content_digests,
@@ -117241,6 +117698,16 @@ function saveLkgSlotToDb(db, sessionId, slot) {
       inputIds: slot.inputIdSeq,
       piOutputEntryIds: slot.piOutputEntryIds
     } : slot.inputIdSeq), JSON.stringify(slot.inputContentDigests), slot.inputContentSignatures ? JSON.stringify(slot.inputContentSignatures) : null, slot.lastInputMessageId, slot.modelKey, slot.providerKey, slot.capturedAt, slot.rowVersion ?? null, slot.captureSequence ?? null);
+    if (!saved) {
+      saved = new Map;
+      persistedFingerprints.set(db, saved);
+    }
+    if (saved.size >= 1000) {
+      const oldest = saved.keys().next().value;
+      if (oldest !== undefined)
+        saved.delete(oldest);
+    }
+    saved.set(sessionId, fingerprint);
     return true;
   } catch (error) {
     sessionLog(sessionId, "LKG snapshot persistence failed (in-memory slot retained):", error);
@@ -117827,7 +118294,7 @@ await __promiseAll([
 // src/hooks/magic-context/rust-mode-transform.ts
 init_magic_context();
 await init_context_authority();
-import { createHash as createHash26, randomUUID as randomUUID5 } from "node:crypto";
+import { createHash as createHash27, randomUUID as randomUUID5 } from "node:crypto";
 init_project_identity();
 
 // src/features/magic-context/memory/single-store-embedding-drain.ts
@@ -118300,13 +118767,16 @@ class HistorianHostRunner {
             this.log(`producer window unknown for ${key}: sending unguarded`);
           }
           const output = provider && parts.length ? getSdkOutputLimit(provider, parts.join("/")) : undefined;
-          const reserve = historianProducerReserve(window2, undefined, output);
+          const producerLimits = resolveHistorianProducerLimits(key);
+          const context = producerLimits.context ?? (producerLimits.input === undefined ? window2 : undefined);
+          const reserve = historianProducerReserve(context, undefined, output);
           const failure = producerPromptFailureReason({
             sourceLocal: estimateTokens(claim.user),
             systemLocal: estimateTokens(claim.system),
             toolsLocal: 0,
             modelKey: key,
-            contextLimitTokens: window2,
+            contextLimitTokens: context,
+            inputLimitTokens: producerLimits.input,
             maxOutputTokens: reserve
           });
           if (failure)
@@ -118473,6 +118943,7 @@ function timedStateSyncDatabase(db, timing) {
 }
 
 // src/hooks/magic-context/module-wire.ts
+init_user_answer();
 init_read_session_raw();
 await init_read_session_chunk();
 import * as crypto2 from "node:crypto";
@@ -119054,6 +119525,7 @@ function encodeOpenCodeMessagesToCk(messages) {
     const synthetic = syntheticParts.length > 0 && syntheticParts.every((part) => part !== null && typeof part === "object" && (part.synthetic === true || part.syntheticTodoMarker === true));
     const content = [];
     const recoveryToolTitles = {};
+    const userAnswerBlocks = [];
     for (const partValue of parts) {
       if (partValue === null || typeof partValue !== "object")
         continue;
@@ -119101,6 +119573,8 @@ function encodeOpenCodeMessagesToCk(messages) {
           if (title)
             recoveryToolTitles[callId] = title;
           const output = typeof state.output === "string" ? state.output : typeof state.error === "string" ? state.error : "";
+          if (toolPartHasUserAnswer(part))
+            userAnswerBlocks.push(content.length);
           content.push({
             kind: {
               type: "tool_result",
@@ -119132,9 +119606,12 @@ function encodeOpenCodeMessagesToCk(messages) {
       ck: {
         role,
         content,
-        ...Object.keys(recoveryToolTitles).length > 0 ? {
+        ...Object.keys(recoveryToolTitles).length > 0 || userAnswerBlocks.length > 0 ? {
           provider_extras: {
-            opencode: { ctx_expand_tool_titles: recoveryToolTitles }
+            opencode: {
+              ...Object.keys(recoveryToolTitles).length > 0 ? { ctx_expand_tool_titles: recoveryToolTitles } : {},
+              ...userAnswerBlocks.length > 0 ? { user_answer_block_indices: userAnswerBlocks } : {}
+            }
           }
         } : {},
         meta: {
@@ -120748,10 +121225,10 @@ function messageCacheSignature(message) {
   const parts = Array.isArray(message.parts) ? message.parts : [];
   const serializedParts = JSON.stringify(parts) ?? "null";
   const serializedMessage = JSON.stringify(message) ?? "null";
-  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash26("sha256").update(serializedMessage).digest("hex")}`;
+  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash27("sha256").update(serializedMessage).digest("hex")}`;
 }
 function advanceWireFingerprint(previous, encoded) {
-  return createHash26("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
+  return createHash27("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
 }
 function buildWireFingerprint(encoded) {
   let fingerprint = "rust-wire-v1";
@@ -121107,7 +121584,7 @@ function canonicalizeForChecksum(value) {
   return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonicalizeForChecksum(value[key])]));
 }
 function checksumSeedRows(rows) {
-  return createHash26("sha256").update(JSON.stringify(rows.map(canonicalizeForChecksum))).digest("hex");
+  return createHash27("sha256").update(JSON.stringify(rows.map(canonicalizeForChecksum))).digest("hex");
 }
 function authoritySeedRows(db, projectPath, domain) {
   const snapshots = domain === "memories" ? db.prepare("SELECT * FROM memories WHERE project_path = ? ORDER BY id ASC").all(projectPath) : db.prepare(`SELECT n.*
@@ -121335,13 +121812,15 @@ function resolvedHistorianModelLimits(chain) {
   return Object.fromEntries(chain.map((key) => {
     const [provider, ...parts] = key.split("/");
     const output = provider && parts.length ? getSdkOutputLimit(provider, parts.join("/")) : undefined;
-    const known = resolveKnownHistorianContextLimit(key);
+    const producerLimits = resolveHistorianProducerLimits(key);
+    const known = producerLimits.input === undefined ? resolveKnownHistorianContextLimit(key) : undefined;
     const learned = provider && parts.length ? getSdkWindowGeometry(provider, parts.join("/"))?.derivation.window : undefined;
-    const context = known === undefined ? learned : learned === undefined ? known : Math.min(known, learned);
+    const context = producerLimits.context ?? (known === undefined ? learned : learned === undefined ? known : Math.min(known, learned));
     return [
       key,
       {
         ...context !== undefined ? { context } : {},
+        ...producerLimits.input !== undefined ? { input: producerLimits.input } : {},
         ...output !== undefined ? { output } : {}
       }
     ];
@@ -122744,6 +123223,16 @@ function createRustModeTransform(deps, options) {
         }
         pendingWireCache.nativeOutput = moduleMessages;
         if (!replayedFrozenRepresentation) {
+          if (materializedBoundary && !deps.compactionOff) {
+            try {
+              await withAsyncPrivilegedWriter(deps.db, () => {
+                return;
+              });
+            } catch (error) {
+              if (!isTransientSqliteError(error))
+                throw error;
+            }
+          }
           const postprocess = runRustModePostprocess({
             db: deps.db,
             sessionId,
@@ -122968,7 +123457,7 @@ function createRustModeTransform(deps, options) {
               if (mirrorDrain.rowsApplied > 0) {
                 await reembedMirrorInvalidatedMemories(deps.db);
               }
-              await drainSingleStoreEmbeddingWatermarks(deps.db);
+              await withSqliteBackgroundWriter(() => drainSingleStoreEmbeddingWatermarks(deps.db));
               if (mirrorDrain.complete) {
                 state.memoryMirrorProjectionKey = projectionKey;
               } else if (mirrorDrain.budgetExhausted) {
@@ -123925,7 +124414,9 @@ function createTransform(deps) {
     const persistedUsageFreshForBoundary = persistedUsageBeforeResets && Date.now() - persistedUsageBeforeResets.updatedAt <= 10 * 60 * 1000 && (persistedUsageBeforeResets.lastObservedModelKey === null || currentModelKeyForBoundary === undefined || piModelRefToCanonical(persistedUsageBeforeResets.lastObservedModelKey) === piModelRefToCanonical(currentModelKeyForBoundary)) && (resolvedContextLimit === undefined || persistedUsageBeforeResets.lastUsageContextLimit === 0 || persistedUsageBeforeResets.lastUsageContextLimit === resolvedContextLimit) ? persistedUsageBeforeResets.usage : null;
     const boundaryUsageForProtectedTail = persistedUsageFreshForBoundary ?? contextUsageEarly;
     const boundaryUsageSource = persistedUsageFreshForBoundary ? "persisted" : "live";
-    const historyBudgetTokens = resolveHistoryBudgetTokens(deps.historyBudgetPercentage, contextUsageEarly, deps.executeThresholdPercentage, deps.getModelKey?.(sessionId), deps.executeThresholdTokens, resolvedContextLimit);
+    const historyPolicyIdentity = historyBudgetPolicyIdentity(deps.historyBudgetPercentage, deps.executeThresholdPercentage, currentModelKeyForBoundary, deps.executeThresholdTokens);
+    const historyContextLimit = resolvedContextLimit ?? (currentModelKeyForBoundary && persistedUsageBeforeResets?.lastObservedModelKey && piModelRefToCanonical(currentModelKeyForBoundary) === piModelRefToCanonical(persistedUsageBeforeResets.lastObservedModelKey) && persistedUsageBeforeResets.lastUsageContextLimit > 0 ? persistedUsageBeforeResets.lastUsageContextLimit : undefined);
+    const historyBudgetTokens = resolveHistoryBudgetTokens(deps.historyBudgetPercentage, contextUsageEarly, deps.executeThresholdPercentage, deps.getModelKey?.(sessionId), deps.executeThresholdTokens, historyContextLimit);
     const emergencyCeilingLimit = thresholdContextLimit ?? 0;
     const emergencyCeilingTokens = Number.isFinite(emergencyCeilingLimit) && emergencyCeilingLimit > 0 ? Math.floor(emergencyCeilingLimit * (effectiveExecuteThresholdPercentage / 100)) : undefined;
     const schedulerDecision = compactionOff ? "defer" : resolveSchedulerDecision(deps.scheduler, sessionMeta, contextUsageEarly, sessionId, deps.getModelKey?.(sessionId), resolvedContextLimit);
@@ -124299,6 +124790,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       muralEnabled: deps.muralEnabled,
       memoryInjectionBudgetTokens: deps.memoryConfig?.injectionBudgetTokens,
       historyBudgetTokens,
+      historyBudgetPolicyIdentity: historyPolicyIdentity,
       hardSignals: m0HardSignals
     }).value;
     const protectionCacheBustingPass = !compactionOff && (schedulerDecision === "execute" || isCacheBusting || contextUsage.percentage >= forceMaterializationPercentage || deps.pendingMaterializationSessions.has(sessionId) || canConsumeDeferredLate && deferredMaterializationSessions.has(sessionId) || protectionFoldWillBust);
@@ -124422,6 +124914,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         memoryEnabled: deps.memoryConfig?.enabled,
         memoryInjectionBudgetTokens: deps.memoryConfig?.injectionBudgetTokens,
         historyBudgetTokens,
+        historyBudgetPolicyIdentity: historyPolicyIdentity,
         temporalAwareness: deps.experimentalTemporalAwareness,
         hardSignals: m0HardSignals,
         muralEnabled: deps.muralEnabled
@@ -124838,6 +125331,13 @@ function createMessagesTransformHandler(args) {
       }
     })() : null;
     try {
+      if (!args.compactionOff && magicContext) {
+        const admissionDb = openDatabase();
+        if (admissionDb)
+          await withAsyncPrivilegedWriter(admissionDb, () => {
+            return;
+          });
+      }
       await magicContext?.["experimental.chat.messages.transform"]?.(input, output);
       return output.messages;
     } catch (error) {
@@ -125886,7 +126386,9 @@ function resolveConfigValue(cfg, key, modelKey, defaultValue) {
 }
 function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens, config, moduleStatus, compactionEnabled = true) {
   try {
-    const projectIdentity = resolveProjectIdentity(directory);
+    const projectIdentity = resolveProjectIdentityForSession(directory);
+    if (projectIdentity === undefined)
+      throw new ProjectIdentityError("git_identity_unavailable", directory, "Memory features paused while project identity is unavailable");
     const meta = db.prepare("SELECT * FROM session_meta WHERE session_id = ?").get(sessionId);
     const usagePercentage = meta ? Number(meta.last_context_percentage ?? meta.last_usage_percentage ?? 0) : 0;
     const inputTokens = meta ? Number(meta.last_input_tokens ?? 0) : 0;
@@ -126090,11 +126592,16 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
     };
     return applyStickySnapshotCache(sessionId, fresh);
   } catch (err) {
-    log("[rpc] sidebar-snapshot error:", err);
+    if (!(err instanceof ProjectIdentityError))
+      log("[rpc] sidebar-snapshot error:", err);
     throw err;
   }
 }
 function buildSidebarSnapshotRpcResponse(db, sessionId, directory, liveSessionState, injectionBudgetTokens, config, moduleStatus, compactionEnabled = true) {
+  if (shouldSkipHomeProjectMemory(directory))
+    return { sessionId, disabled: true };
+  if (resolveProjectIdentityForSession(directory) === undefined)
+    return { sessionId, disabled: true, paused: true };
   try {
     return buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens, config, moduleStatus, compactionEnabled);
   } catch {
@@ -126111,7 +126618,7 @@ function safeTickFailure(db) {
 function buildStatusDetail(db, sessionId, directory, modelKey, config, liveSessionState, injectionBudgetTokens, moduleStatus, compactionEnabled = true) {
   const base = buildSidebarSnapshot(db, sessionId, directory, liveSessionState, injectionBudgetTokens, config, moduleStatus, compactionEnabled);
   const rustMode = config?.transform_mode === "rust";
-  const projectIdentity = rustMode ? resolveProjectIdentity(directory) : null;
+  const projectIdentity = rustMode && !shouldSkipHomeProjectMemory(directory) ? resolveProjectIdentity(directory) : null;
   const moduleMemoryAuthority = moduleStatus?.authority?.memories;
   const moduleMemoryState = moduleMemoryAuthority?.state;
   const moduleFeedHead = moduleStatus?.memory_mirror?.feed_head;
@@ -126554,6 +127061,10 @@ function registerRpcHandlers(rpcServer, args) {
   rpcServer.handle("status-detail", async (params) => {
     const sessionId = String(params.sessionId ?? "");
     const dir = String(params.directory ?? directory);
+    if (shouldSkipHomeProjectMemory(dir))
+      return { sessionId, disabled: true };
+    if (resolveProjectIdentityForSession(dir) === undefined)
+      return { sessionId, disabled: true, paused: true };
     const modelKey = params.modelKey ? String(params.modelKey) : undefined;
     const db = readDatabase();
     if (!db || !sessionId)
@@ -126574,6 +127085,10 @@ function registerRpcHandlers(rpcServer, args) {
   rpcServer.handle("embed-detail", async (params) => {
     const sessionId = String(params.sessionId ?? "");
     const dir = String(params.directory ?? directory);
+    if (shouldSkipHomeProjectMemory(dir))
+      return { sessionId, disabled: true };
+    if (resolveProjectIdentityForSession(dir) === undefined)
+      return { sessionId, disabled: true, paused: true };
     const db = readDatabase();
     if (!db || !sessionId)
       return { error: "unavailable" };
@@ -127064,7 +127579,7 @@ import {
   chmodSync as chmodSync5,
   mkdirSync as mkdirSync11,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync15,
+  readFileSync as readFileSync16,
   renameSync as renameSync4,
   rmSync as rmSync2,
   unlinkSync as unlinkSync5,
@@ -127211,7 +127726,7 @@ class MagicContextRpcServer {
       for (const entry of readdirSync4(this.portDir)) {
         if (!entry.startsWith("port-") || !entry.endsWith(".json"))
           continue;
-        const record = parseRpcPortFile(readFileSync15(`${this.portDir}/${entry}`, "utf-8"));
+        const record = parseRpcPortFile(readFileSync16(`${this.portDir}/${entry}`, "utf-8"));
         if (!record || record.pid === process.pid)
           continue;
         const processes = await inspectProcessesAsync();
@@ -127603,8 +128118,8 @@ function hostMediaAsset(data, mediaType) {
 }
 
 // src/v2/fold/owner.ts
-import { createHash as createHash27 } from "node:crypto";
-var foldDigest = (value) => createHash27("sha256").update(value).digest("hex");
+import { createHash as createHash28 } from "node:crypto";
+var foldDigest = (value) => createHash28("sha256").update(value).digest("hex");
 
 class FoldOwner {
   storage;
@@ -127907,6 +128422,64 @@ ${data.output?.output ?? ""}`
   return [...content.length ? [make("assistant", content)] : [], ...results];
 }
 
+// src/features/magic-context/dreamer/retrospective-orphan-sweep.ts
+init_logger();
+var HISTORIAN_CHILD_TITLE = "magic-context-compartment";
+var RETROSPECTIVE_CHILD_TITLE = "magic-context-dream-retrospective";
+var USER_MEMORIES_CHILD_TITLE = "magic-context-dream-user-memories";
+var CURATE_CHILD_TITLE = "magic-context-dream-curate";
+var MAINTAIN_DOCS_CHILD_TITLE = "magic-context-dream-maintain-docs";
+var REFRESH_PRIMERS_CHILD_TITLE = "magic-context-dream-refresh-primers";
+var MAP_MEMORIES_CHILD_TITLE = "magic-context-dream-map-memories";
+var VERIFY_CHILD_TITLE = "magic-context-dream-verify";
+var CLASSIFY_CHILD_TITLE = "magic-context-dream-classify";
+var COMPRESS_CUES_CHILD_TITLE = "magic-context-dream-compress-cues";
+var MEMORY_MIGRATION_CHILD_TITLE = "magic-context-memory-migration";
+var SMART_NOTE_COMPILE_CHILD_TITLE_PREFIX = "magic-context-smart-note-compile-";
+var SMART_NOTE_CONFIRM_CHILD_TITLE_PREFIX = "magic-context-smart-note-confirm-";
+var PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES = {
+  exact: [
+    RETROSPECTIVE_CHILD_TITLE,
+    USER_MEMORIES_CHILD_TITLE,
+    CURATE_CHILD_TITLE,
+    MAINTAIN_DOCS_CHILD_TITLE,
+    REFRESH_PRIMERS_CHILD_TITLE,
+    MAP_MEMORIES_CHILD_TITLE,
+    VERIFY_CHILD_TITLE,
+    CLASSIFY_CHILD_TITLE,
+    COMPRESS_CUES_CHILD_TITLE
+  ],
+  prefixes: [SMART_NOTE_COMPILE_CHILD_TITLE_PREFIX, SMART_NOTE_CONFIRM_CHILD_TITLE_PREFIX]
+};
+var RETAINABLE_CHILD_TITLE_MATCHES = {
+  exact: [HISTORIAN_CHILD_TITLE, MEMORY_MIGRATION_CHILD_TITLE],
+  prefixes: []
+};
+var INTERNAL_CHILD_TITLE_MATCHES = {
+  exact: [
+    ...RETAINABLE_CHILD_TITLE_MATCHES.exact,
+    ...PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES.exact
+  ],
+  prefixes: PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES.prefixes
+};
+var DREAMER_DETACHED_WRITER_GRACE_MS = 15 * 60000;
+function retrospectiveOrphanStaleMs(taskTimeoutMinutes) {
+  const timeoutCandidates = Array.isArray(taskTimeoutMinutes) ? taskTimeoutMinutes : [taskTimeoutMinutes];
+  const maxTimeoutMinutes = Math.max(...timeoutCandidates.map((minutes) => Math.max(1, minutes ?? 20)), 20);
+  const timeoutMs = maxTimeoutMinutes * 60000;
+  return Math.max(60 * 60000, timeoutMs * 3 + DREAMER_DETACHED_WRITER_GRACE_MS);
+}
+var HISTORIAN_OUTER_ATTEMPTS = 3;
+var HISTORIAN_MODEL_SUGGESTION_ATTEMPTS = 2;
+var HISTORIAN_MAX_RETRY_BACKOFF_MS = 11000;
+var HISTORIAN_DETACHED_WRITER_GRACE_MS = 15 * 60000;
+function historianOrphanStaleMs(timeoutMs, fallbackModelCount) {
+  const timeout = Math.max(60000, timeoutMs);
+  const fallbackCount = Math.max(0, Math.floor(fallbackModelCount));
+  const fullAttemptBudget = timeout * HISTORIAN_OUTER_ATTEMPTS * HISTORIAN_MODEL_SUGGESTION_ATTEMPTS * (fallbackCount + 1);
+  return Math.max(60 * 60000, fullAttemptBudget + HISTORIAN_MAX_RETRY_BACKOFF_MS + HISTORIAN_DETACHED_WRITER_GRACE_MS);
+}
+
 // src/v2/hidden-completion.ts
 init_token_budget();
 init_compartment_runner_types();
@@ -127917,7 +128490,7 @@ init_hidden_child();
 // src/v2/host-service.ts
 init_data_path();
 await init_sqlite();
-import { readdirSync as readdirSync5, readFileSync as readFileSync16 } from "node:fs";
+import { readdirSync as readdirSync5, readFileSync as readFileSync17 } from "node:fs";
 import { homedir as homedir11 } from "node:os";
 import { join as join17 } from "node:path";
 
@@ -128090,7 +128663,7 @@ class V2StoreReader {
       return { rows, cursor: rows.at(-1)?.seq };
     });
   }
-  messagePage(sessionID, afterOrdinal, limit, finalWatermark) {
+  messagePage(sessionID, afterOrdinal, limit, finalWatermark, after) {
     return trackDecodeOperation("messagePage", () => {
       if (!Number.isSafeInteger(afterOrdinal) || afterOrdinal < 0)
         throw new Error("Invalid raw-message ordinal cursor");
@@ -128101,6 +128674,14 @@ class V2StoreReader {
       const pageSize = Math.min(limit, finalWatermark - afterOrdinal);
       if (pageSize <= 0)
         return [];
+      if (after) {
+        const anchor = this.db.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ?").get(sessionID, after.id);
+        if (anchor) {
+          return this.db.prepare(`SELECT id, session_id, type, seq, time_created, data
+                        FROM session_message WHERE session_id = ? AND seq > ?
+                        AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS}) ORDER BY seq ASC LIMIT ?`).all(sessionID, anchor.seq, ...RAW_MESSAGE_TYPES, pageSize).map(decode2);
+        }
+      }
       const maximumSeq = Number.MAX_SAFE_INTEGER;
       const rows = this.db.prepare(V2_MESSAGE_PAGE_SQL).all(afterOrdinal, sessionID, ...RAW_MESSAGE_TYPES, Math.max(0, afterOrdinal - 1), sessionID, ...RAW_MESSAGE_TYPES, finalWatermark - 1, maximumSeq, sessionID, ...RAW_MESSAGE_TYPES, pageSize);
       return rows.map(decode2);
@@ -128335,7 +128916,7 @@ class HostServiceUnavailable extends Error {
 function parseRegistration(path) {
   let text;
   try {
-    text = readFileSync16(path, "utf8");
+    text = readFileSync17(path, "utf8");
   } catch {
     return;
   }
@@ -128449,8 +129030,8 @@ var POLL_INTERVAL_MS = 200;
 var REMOVAL_SPACING_MS = 250;
 var RETIRED_CHILDREN_LIMIT = 200;
 var LEGACY_CLEANUP_BOOT_LIMIT = 5;
-function hiddenChildrenMetaKey(projectIdentity) {
-  return `${META_PREFIX}${projectIdentity}`;
+function hiddenChildrenMetaKey(projectIdentity, directory) {
+  return directory === undefined ? `${META_PREFIX}${projectIdentity}` : `${META_PREFIX}${JSON.stringify([projectIdentity, directory])}`;
 }
 function emptyMeta() {
   return { version: 1, active: {}, retired_children: [] };
@@ -128512,9 +129093,49 @@ function parseMeta(value) {
 class HiddenChildStateStore {
   db;
   key;
-  constructor(db, projectIdentity) {
+  constructor(db, projectIdentity, directory) {
     this.db = db;
-    this.key = hiddenChildrenMetaKey(projectIdentity);
+    this.key = hiddenChildrenMetaKey(projectIdentity, directory);
+    this.legacyKey = hiddenChildrenMetaKey(projectIdentity);
+  }
+  legacyKey;
+  migrateStale(isStale) {
+    this.db.transaction(() => {
+      const legacyRow = this.db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(this.legacyKey);
+      if (!legacyRow)
+        return;
+      const legacy = parseMeta(legacyRow.value);
+      const scoped = this.read();
+      for (const role of ["historian", "dreamer"]) {
+        const child = legacy.active[role];
+        if (!child || !isStale(child))
+          continue;
+        scoped.retired_children.push({
+          ...child,
+          retired_at: Date.now(),
+          reason: "legacy-directory-scope"
+        });
+        delete legacy.active[role];
+      }
+      const remaining = [];
+      for (const child of legacy.retired_children) {
+        if (isStale(child))
+          scoped.retired_children.push(child);
+        else
+          remaining.push(child);
+      }
+      legacy.retired_children = remaining;
+      const excess = scoped.retired_children.length - RETIRED_CHILDREN_LIMIT;
+      if (excess > 0)
+        scoped.retired_children.splice(0, excess);
+      this.db.prepare(`INSERT INTO schema_migrations_meta (key, value) VALUES (?, ?)
+                ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(this.key, JSON.stringify(scoped));
+      if (Object.keys(legacy.active).length === 0 && legacy.retired_children.length === 0) {
+        this.db.prepare("DELETE FROM schema_migrations_meta WHERE key = ?").run(this.legacyKey);
+      } else {
+        this.db.prepare("UPDATE schema_migrations_meta SET value = ? WHERE key = ?").run(JSON.stringify(legacy), this.legacyKey);
+      }
+    }).immediate();
   }
   read() {
     const row = this.db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(this.key);
@@ -128741,6 +129362,12 @@ async function sleepUntilPoll(signal, deadline) {
       }, delay);
   });
 }
+function isProviderFailure(error) {
+  if (!error || typeof error !== "object")
+    return false;
+  const type = error.type;
+  return typeof type === "string" && (type.startsWith("provider.") || type.toLowerCase().includes("provider"));
+}
 async function awaitAssistantRow(openReader, readSessionError, stepLimit, childID, afterSeq, deadline, signal) {
   for (;; ) {
     const { assistant, idle } = withReader(openReader, (reader) => ({
@@ -128761,7 +129388,7 @@ async function awaitAssistantRow(openReader, readSessionError, stepLimit, childI
           `terminal_row=${errorText(newIdle)}`,
           `session_error=${sessionError === undefined ? "unavailable" : errorText(sessionError)}`
         ];
-        throw sessionError === undefined ? new Error(`Hidden completion failed without a provider error: ${details.join("; ")}`) : new HiddenProviderError(details.join("; "));
+        throw sessionError === undefined || !isProviderFailure(sessionError) ? new Error(`Hidden completion failed: ${details.join("; ")}`) : new HiddenProviderError(details.join("; "));
       }
       if (outcome === "succeeded" && newAssistant)
         return newAssistant;
@@ -128775,7 +129402,7 @@ async function awaitAssistantRow(openReader, readSessionError, stepLimit, childI
           `terminal_row=${errorText(newAssistant)}`,
           `session_error=${sessionError === undefined ? "unavailable" : errorText(sessionError)}`
         ];
-        throw sessionError === undefined ? new Error(`Hidden completion failed without a provider error: ${details.join("; ")}`) : new HiddenProviderError(details.join("; "));
+        throw sessionError === undefined || !isProviderFailure(sessionError) ? new Error(`Hidden completion failed: ${details.join("; ")}`) : new HiddenProviderError(details.join("; "));
       }
       if (newAssistant.data.error !== undefined) {
         throw new HiddenProviderError(errorText(newAssistant.data.error), {
@@ -128815,9 +129442,35 @@ function createLateHiddenExecutor(current) {
 }
 async function createV2HiddenCompletionExecutor(host, options) {
   const runs = new WeakMap;
-  const store = new HiddenChildStateStore(options.db, options.projectIdentity);
+  const store = new HiddenChildStateStore(options.db, options.projectIdentity, options.directory);
   const generation = options.generation ?? "opencode2";
   const roleTails = new Map;
+  const legacy = options.db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(hiddenChildrenMetaKey(options.projectIdentity));
+  if (legacy) {
+    const children = parseMeta(legacy.value);
+    const statuses = new Map;
+    for (const child of [...Object.values(children.active), ...children.retired_children]) {
+      if (!child || !host.status)
+        continue;
+      const directory = child.directory ?? options.directory;
+      if (!statuses.has(directory)) {
+        try {
+          statuses.set(directory, await host.status({ directory }));
+        } catch {
+          statuses.set(directory, undefined);
+        }
+      }
+    }
+    store.migrateStale((child) => {
+      const directory = child.directory ?? options.directory;
+      const state = statuses.get(directory);
+      if (host.status && (!state || state[child.id]?.type === "busy" || state[child.id]?.type === "retry"))
+        return false;
+      const last = Math.max(child.created_at, withReader(options.openReader, (reader) => Math.max(reader.latestAssistant(child.id)?.data.time?.created ?? 0, reader.latestIdle(child.id)?.data.time?.created ?? 0)));
+      const staleMs = child.role === "historian" ? historianOrphanStaleMs(20 * 60000, 3) : retrospectiveOrphanStaleMs(undefined);
+      return Date.now() - last > staleMs;
+    });
+  }
   const persisted = store.read();
   for (const child of [...Object.values(persisted.active), ...persisted.retired_children]) {
     if (child)
@@ -129187,6 +129840,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         }
         run.completion = {
           text,
+          tokenLog: runTokenLog(tokens, run.identity.maxOutputTokens, row.data.finish),
           ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt) } : {},
           reasoning: text ? null : assistantReasoning(row),
           usage: reportedInput !== undefined || reportedOutput !== undefined ? {
@@ -129479,8 +130133,8 @@ await __promiseAll([
   init_context_authority(),
   init_memory()
 ]);
-import { createHash as createHash35 } from "node:crypto";
-import { existsSync as existsSync19, readFileSync as readFileSync19 } from "node:fs";
+import { createHash as createHash36 } from "node:crypto";
+import { existsSync as existsSync19, readFileSync as readFileSync20 } from "node:fs";
 
 // src/features/magic-context/mural/compress-cues.ts
 init_dreamer();
@@ -129488,10 +130142,11 @@ init_compartment_runner_types();
 init_shared();
 init_logger();
 await init_compartment_runner_historian();
-import { createHash as createHash29 } from "node:crypto";
+import { createHash as createHash30 } from "node:crypto";
 
 // src/features/magic-context/dreamer/lease.ts
 init_write_transaction_timing();
+await init_sqlite();
 
 // src/features/magic-context/dreamer/storage-dream-state.ts
 var getDreamStateStatements = new WeakMap;
@@ -129691,7 +130346,7 @@ function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalOrAcquisiti
     }
   };
   beat();
-  const timer = lost ? undefined : setInterval(beat, intervalMs);
+  const timer = lost ? undefined : setInterval(() => withSqliteBackgroundWriter(beat), intervalMs);
   return {
     stop: () => {
       if (timer)
@@ -129860,7 +130515,7 @@ function getModuleMemoryIdentities(db, projectIdentity, contextIds) {
 }
 
 // src/features/magic-context/dreamer/provider-output-failure.ts
-import { createHash as createHash28 } from "node:crypto";
+import { createHash as createHash29 } from "node:crypto";
 var MAX_NEAR_ZERO_OUTPUT_TOKENS = 32;
 
 class DreamerProviderOutputFailureError extends Error {
@@ -129917,7 +130572,7 @@ function providerOutputFailureFromInvalidManifest(messages, responseText) {
   const normalized = responseText.trim().replace(/\s+/g, " ").toLowerCase();
   if (!normalized)
     return null;
-  const fingerprint = createHash28("sha256").update(normalized).digest("hex").slice(0, 16);
+  const fingerprint = createHash29("sha256").update(normalized).digest("hex").slice(0, 16);
   return new DreamerProviderOutputFailureError(fingerprint, completion.outputTokens, completion.reasoningTokens, responseText);
 }
 
@@ -130329,7 +130984,7 @@ async function applyCuesThroughModule(args, chunk, manifestText, signal) {
       log(`[dreamer] compress-cues: skipped cue for memory ${entry.id} (${failure.reason}; rejection ${rejectionCount}/${CUE_REJECTION_LATCH_THRESHOLD})`);
     }
   }
-  const commandId = `mural-cues:${route.moduleCommandId}:${createHash29("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `mural-cues:${route.moduleCommandId}:${createHash30("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
   let response;
   try {
     response = await route.moduleClient.call({
@@ -130433,8 +131088,10 @@ async function runHiddenSingleShotPrompt(args) {
       callContext: args.callContext,
       fetchOutput: () => args.executor.collect(handle, 50),
       validateOutput: (completion) => {
+        const tokens = completion.tokenLog ?? runTokenLog(undefined);
+        sessionLog(args.parentSessionId ?? "dreamer", `${args.callContext} response_chars=${(completion.text ?? completion.reasoning ?? "").length} ${formatRunTokenLog(tokens)}`);
         if (completion.lengthCapped) {
-          throw new Error(completion.reasoning && !completion.text ? `${args.callContext} ran out of output budget while reasoning (length-capped at ${completion.usage.output} tokens, no text) — set dreamer.maxTokens or use a low-reasoning model` : `${args.callContext} returned length-capped output`);
+          throw new Error(completion.reasoning && !completion.text ? `${args.callContext} ran out of output budget while reasoning (length-capped at ${completion.usage.output} tokens, no text; ${formatRunTokenLog(tokens)}) — set dreamer.maxTokens or use a low-reasoning model` : `${args.callContext} returned length-capped output; ${formatRunTokenLog(tokens)}`);
         }
         const text = completion.text;
         if (!text && !args.allowEmpty)
@@ -130913,7 +131570,7 @@ init_dreamer();
 init_language_directive();
 init_compartment_runner_types();
 await init_compartment_runner_historian();
-import { createHash as createHash30 } from "node:crypto";
+import { createHash as createHash31 } from "node:crypto";
 
 // src/plugin/rust-tool-backends.ts
 function toolCallIdFromContext(context) {
@@ -131304,8 +131961,10 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
         fetchOutput: () => executor.collect(opened, 50),
         validateOutput: (completion) => {
           const messages = completion.messages ?? [];
+          const tokens = completion.tokenLog ?? runTokenLog(undefined);
+          sessionLog(args.parentSessionId ?? "dreamer", `dreamer:classify response_chars=${(completion.text ?? completion.reasoning ?? "").length} ${formatRunTokenLog(tokens)}`);
           if (completion.lengthCapped) {
-            throw new Error(completion.reasoning && !completion.text ? `classify ran out of output budget while reasoning (length-capped at ${completion.usage.output} tokens, no text) — set dreamer.maxTokens or use a low-reasoning model` : "classify returned length-capped output");
+            throw new Error(completion.reasoning && !completion.text ? `classify ran out of output budget while reasoning (length-capped at ${completion.usage.output} tokens, no text; ${formatRunTokenLog(tokens)}) — set dreamer.maxTokens or use a low-reasoning model` : `classify returned length-capped output; ${formatRunTokenLog(tokens)}`);
           }
           const text = completion.text;
           if (!text)
@@ -131382,7 +132041,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal, runOnHost)
   });
   const modelChain = [args.model, ...args.fallbackModels ?? []].map(toModelEntry).filter((entry) => entry !== undefined).map((entry) => entry.model);
   const resolvedModelChain = [...new Set(modelChain)];
-  const commandId = `classify:${args.moduleCommandId ?? Date.now()}:${createHash30("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `classify:${args.moduleCommandId ?? Date.now()}:${createHash31("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`;
   const runTask = (hostCompletion) => args.moduleClient?.call({
     sessionId: args.moduleSessionId,
     projectRoot: args.moduleProjectRoot,
@@ -131664,13 +132323,13 @@ function takeCurateSafetyRefusalCount(sessionId) {
 
 // src/features/magic-context/dreamer/docs-proposals.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { createHash as createHash31 } from "node:crypto";
+import { createHash as createHash32 } from "node:crypto";
 import {
   existsSync as existsSync16,
   mkdirSync as mkdirSync12,
   mkdtempSync,
   readdirSync as readdirSync6,
-  readFileSync as readFileSync17,
+  readFileSync as readFileSync18,
   realpathSync as realpathSync5,
   renameSync as renameSync5,
   rmSync as rmSync3,
@@ -131679,12 +132338,12 @@ import {
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join18 } from "node:path";
 var FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
-var hash = (text) => createHash31("sha256").update(text).digest("hex");
+var hash = (text) => createHash32("sha256").update(text).digest("hex");
 var proposalDir = (projectDir) => join18(projectDir, ".cortexkit/magic-context/docs-update-proposals");
 function docsBaseHashes(projectDir) {
   return Object.fromEntries(FILES.map((name) => [
     name,
-    hash(existsSync16(join18(projectDir, name)) ? readFileSync17(join18(projectDir, name), "utf8") : "")
+    hash(existsSync16(join18(projectDir, name)) ? readFileSync18(join18(projectDir, name), "utf8") : "")
   ]));
 }
 function listPendingDocsProposals(projectDir) {
@@ -131693,7 +132352,7 @@ function listPendingDocsProposals(projectDir) {
 }
 function hasCurrentDocsProposal(projectDir) {
   const hashes = docsBaseHashes(projectDir);
-  return listPendingDocsProposals(projectDir).some((path) => Object.entries(hashes).every(([name, value]) => readFileSync17(path, "utf8").includes(`Base SHA-256 ${name}: ${value}`)));
+  return listPendingDocsProposals(projectDir).some((path) => Object.entries(hashes).every(([name, value]) => readFileSync18(path, "utf8").includes(`Base SHA-256 ${name}: ${value}`)));
 }
 function git(projectDir, args) {
   return execFileSync3("git", args, {
@@ -131732,7 +132391,7 @@ function docsChangeSet(projectDir, storedAnchor) {
       const files = [
         ...new Set(changed.flat().filter((file) => file !== "ARCHITECTURE.md" && file !== "STRUCTURE.md" && !/(?:^|[./-])(test|spec)(?:[./-]|$)/.test(file) && !file.endsWith(".lock")))
       ];
-      const docs = FILES.map((file) => existsSync16(join18(projectDir, file)) ? readFileSync17(join18(projectDir, file), "utf8") : "").join(`
+      const docs = FILES.map((file) => existsSync16(join18(projectDir, file)) ? readFileSync18(join18(projectDir, file), "utf8") : "").join(`
 `);
       const relevant = files.some((file) => {
         const directory = file.split("/").slice(0, -1).join("/");
@@ -131877,7 +132536,7 @@ function validateDocsProposal(projectDir, output, budget, expected) {
   let tokens = 0;
   let diffs = "";
   for (const file of FILES) {
-    const before = existsSync16(join18(projectDir, file)) ? readFileSync17(join18(projectDir, file), "utf8") : "";
+    const before = existsSync16(join18(projectDir, file)) ? readFileSync18(join18(projectDir, file), "utf8") : "";
     let after = before;
     const seen = new Set;
     for (const change of changes.filter((item) => item.file === file)) {
@@ -132471,7 +133130,7 @@ function throwIfAborted2(signal) {
 }
 
 // src/features/magic-context/smart-notes/compiler.ts
-import { createHash as createHash32 } from "node:crypto";
+import { createHash as createHash33 } from "node:crypto";
 init_shared();
 init_assistant_message_extractor();
 init_child_session_teardown();
@@ -132785,7 +133444,7 @@ function manifestAdvisoryWarnings(code, manifest) {
   return warnings;
 }
 function hashCheck(surfaceCondition, compiledCheck, manifest, checkCron) {
-  return createHash32("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
+  return createHash33("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
 }
 function extractJsonObject(output) {
   const fenced = output.match(/```(?:json)?\s*([\s\S]*?)```/i);
@@ -133573,7 +134232,7 @@ async function archiveExpiredMemories(args) {
 
 // src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
 init_logger();
-import { existsSync as existsSync17, readFileSync as readFileSync18, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync17, readFileSync as readFileSync19, writeFileSync as writeFileSync10 } from "node:fs";
 import { join as join20 } from "node:path";
 var MAINTAIN_DOCS_SNAPSHOT_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function snapshotMaintainDocsFiles(docsDir) {
@@ -133582,7 +134241,7 @@ function snapshotMaintainDocsFiles(docsDir) {
     const path = join20(docsDir, name);
     try {
       if (existsSync17(path)) {
-        snapshot.set(name, readFileSync18(path, "utf8"));
+        snapshot.set(name, readFileSync19(path, "utf8"));
       }
     } catch {}
   }
@@ -133600,10 +134259,10 @@ await __promiseAll([
   init_child_session_spawn(),
   init_memory()
 ]);
-import { createHash as createHash33 } from "node:crypto";
+import { createHash as createHash34 } from "node:crypto";
 
 // src/features/magic-context/dreamer/map-memories-prompt.ts
-import { existsSync as existsSync18, statSync as statSync13 } from "node:fs";
+import { existsSync as existsSync18, statSync as statSync14 } from "node:fs";
 import path11 from "node:path";
 var MAP_MEMORIES_SYSTEM_PROMPT = `You are a memory mapper for the magic-context system. You map project memories to the repository files that back them.
 
@@ -133641,7 +134300,7 @@ function extractMemoryCandidatePaths(content, repoDir) {
     if (!abs.startsWith(`${root}/`))
       continue;
     try {
-      if (existsSync18(abs) && statSync13(abs).isFile())
+      if (existsSync18(abs) && statSync14(abs).isFile())
         found.add(rel);
     } catch {}
     if (found.size >= MAX_SEED_PATHS_PER_MEMORY)
@@ -133855,6 +134514,11 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
   let agentSessionId = null;
   let promptSettled = false;
   const startedAt = Date.now();
+  let budgetFinalized = false;
+  const onBudgetUpdate = (state) => {
+    budgetFinalized ||= state.finalizeFired;
+    args.onBudgetUpdate?.(state);
+  };
   try {
     const prompt = buildMapMemoriesPrompt(args.projectIdentity, batch);
     if (args.hiddenCompletionExecutor) {
@@ -133867,7 +134531,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         prompt,
         title: "magic-context-dream-map-memories",
         callContext: "dreamer:map-memories",
-        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate: args.onBudgetUpdate },
+        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate },
         model: args.model,
         fallbackModels: args.fallbackModels,
         timeoutMs: sliceMs,
@@ -133878,9 +134542,12 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         status: "completed",
         messages: run.completion.messages ?? []
       });
-      const outcome = await applyParsedBatchMappings(args, batch, run.validated);
+      const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized);
       const returnedIds = new Set(run.validated.map((entry) => entry.id));
-      return { ...outcome, requeue: batch.filter((memory) => !returnedIds.has(memory.id)) };
+      return {
+        ...outcome,
+        requeue: budgetFinalized ? [] : batch.filter((memory) => !returnedIds.has(memory.id))
+      };
     }
     const client = args.client;
     if (!client)
@@ -133910,7 +134577,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     }, {
       transport: createPromptAsyncTransport(client, agentSessionId, {
         tokenBudget: args.tokenBudget,
-        onBudgetUpdate: args.onBudgetUpdate
+        onBudgetUpdate
       }),
       timeoutMs: sliceMs,
       signal,
@@ -133937,11 +134604,11 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     });
     promptSettled = true;
     recordInvocation2(args, startedAt, { status: "completed", messages: run.output });
-    const outcome = await applyParsedBatchMappings(args, batch, run.validated);
+    const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized);
     const returnedIds = new Set(run.validated.filter((entry) => batch.some((memory) => memory.id === entry.id)).map((entry) => entry.id));
     return {
       ...outcome,
-      requeue: batch.filter((memory) => !returnedIds.has(memory.id))
+      requeue: budgetFinalized ? [] : batch.filter((memory) => !returnedIds.has(memory.id))
     };
   } catch (error) {
     const desc = describeError(error);
@@ -133976,7 +134643,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       });
   }
 }
-async function applyParsedBatchMappings(args, batch, parsed) {
+async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = false) {
   const batchIds = new Set(batch.map((memory) => memory.id));
   const valid = parsed.filter((entry) => batchIds.has(entry.id));
   const unknown = parsed.filter((entry) => !batchIds.has(entry.id));
@@ -133984,9 +134651,12 @@ async function applyParsedBatchMappings(args, batch, parsed) {
     log(`[dreamer] map-memories warning: dropping ${unknown.length} unknown mapping entr${unknown.length === 1 ? "y" : "ies"} outside the current batch (${unknown.map((entry) => entry.id).join(", ")})`);
   }
   assertNoDuplicateManifestIds(valid.map((entry) => entry.id), "mappings");
-  if (valid.length * 2 < batch.length) {
+  if (!budgetFinalized && valid.length * 2 < batch.length) {
     throw new Error(`mappings manifest covers ${valid.length}/${batch.length} batch ids after filtering unknown entries; rejecting mostly-wrong manifest`);
   }
+  if (budgetFinalized && valid.length < batch.length) {
+    log(`[dreamer] map-memories: accepted partial manifest after token budget: ${valid.length}/${batch.length}`);
+  }
   if (valid.length === 0)
     return { mapped: 0, independent: 0 };
   const planned = [];
@@ -134065,7 +134735,7 @@ async function applyParsedBatchMappings(args, batch, parsed) {
             memory_project: args.projectIdentity,
             context_store_uuid: args.moduleRoute.moduleContextStoreUuid,
             authority_generation: args.moduleRoute.moduleAuthorityGeneration,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash33("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash34("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -135047,7 +135717,7 @@ await __promiseAll([
   init_child_session_spawn(),
   init_memory()
 ]);
-import { createHash as createHash34 } from "node:crypto";
+import { createHash as createHash35 } from "node:crypto";
 init_token_budget();
 
 // src/features/magic-context/dreamer/verify-diff.ts
@@ -135543,6 +136213,11 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   let agentSessionId = null;
   let promptSettled = false;
   const startedAt = Date.now();
+  let budgetFinalized = false;
+  const onBudgetUpdate = (state) => {
+    budgetFinalized ||= state.finalizeFired;
+    args.onBudgetUpdate?.(state);
+  };
   try {
     const headAtPrompt = await readGitHead(args.sessionDirectory);
     const evidence = !args.forceBroad && batch.every((m) => m.verifiedAt) ? await buildVerifyDiffEvidence(args.sessionDirectory, batch) : null;
@@ -135557,7 +136232,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         prompt,
         title: "magic-context-dream-verify",
         callContext: "dreamer:verify",
-        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate: args.onBudgetUpdate },
+        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate },
         model: args.model,
         fallbackModels: args.fallbackModels,
         language: args.language,
@@ -135574,7 +136249,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         status: "completed",
         messages: run.completion.messages ?? []
       });
-      return applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt);
+      return applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized);
     }
     const client = args.client;
     if (!client)
@@ -135604,7 +136279,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     }, {
       transport: createPromptAsyncTransport(client, agentSessionId, {
         tokenBudget: args.tokenBudget,
-        onBudgetUpdate: args.onBudgetUpdate
+        onBudgetUpdate
       }),
       timeoutMs: sliceMs,
       signal,
@@ -135634,7 +136309,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     });
     promptSettled = true;
     recordInvocation4(args, startedAt, { status: "completed", messages: run.output });
-    return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt);
+    return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized);
   } catch (error) {
     const desc = describeError(error);
     const providerFailure = error instanceof DreamerProviderOutputFailureError ? error : undefined;
@@ -135680,7 +136355,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       });
   }
 }
-async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt) {
+async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budgetFinalized = false) {
   const batchIds = new Set(batch.map((m) => m.id));
   const batchById = new Map(batch.map((memory) => [memory.id, memory]));
   const valid = {
@@ -135700,9 +136375,12 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt) {
   }
   const validIds = [...valid.verified, ...valid.updated, ...valid.archived, ...valid.skipped].map((entry) => entry.id);
   assertNoDuplicateManifestIds(validIds, "verify");
-  if (validIds.length * 2 < batch.length) {
+  if (!budgetFinalized && validIds.length * 2 < batch.length) {
     throw new Error(`verify manifest covers ${validIds.length}/${batch.length} batch ids after filtering unknown entries; rejecting mostly-wrong manifest`);
   }
+  if (budgetFinalized && validIds.length < batch.length) {
+    log(`[dreamer] verify: accepted partial manifest after token budget: ${validIds.length}/${batch.length}`);
+  }
   if (validIds.length === 0) {
     return { verified: 0, updated: 0, archived: 0, skipped: 0, refused: 0 };
   }
@@ -135787,7 +136465,7 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt) {
             memory_project: args.projectIdentity,
             context_store_uuid: args.moduleRoute.moduleContextStoreUuid,
             authority_generation: args.moduleRoute.moduleAuthorityGeneration,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash34("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash35("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -136547,7 +137225,7 @@ function parseFrictionGateVerdict(verdict) {
 }
 function computeRetrospectiveWindowKey(flagged) {
   const anchors = flagged.map((message) => `${message.sessionId}:${message.ts}`).sort().join("|");
-  return createHash35("sha256").update(anchors).digest("hex").slice(0, 32);
+  return createHash36("sha256").update(anchors).digest("hex").slice(0, 32);
 }
 function renderFrictionWindow(messages, flaggedOrdinals, radius = 2) {
   const flagged = new Set(flaggedOrdinals);
@@ -137013,8 +137691,8 @@ async function runAgenticTask(config, ctx, helpers) {
         existingDocs,
         docsChangeSet: changes?.text,
         docsContents: task === "maintain-docs" ? {
-          architecture: existingDocs?.architecture ? readFileSync19(`${docsDir}/ARCHITECTURE.md`, "utf8") : "(missing)",
-          structure: existingDocs?.structure ? readFileSync19(`${docsDir}/STRUCTURE.md`, "utf8") : "(missing)"
+          architecture: existingDocs?.architecture ? readFileSync20(`${docsDir}/ARCHITECTURE.md`, "utf8") : "(missing)",
+          structure: existingDocs?.structure ? readFileSync20(`${docsDir}/STRUCTURE.md`, "utf8") : "(missing)"
         } : undefined,
         docsBudget: config.docsMaxTokens ?? 12000,
         docsCurrentTokens: maintainDocsSnapshot ? Math.ceil([...maintainDocsSnapshot.values()].join("").length / 3.5) : 0,
@@ -137665,10 +138343,19 @@ function startDreamTrigger(context, args) {
 // src/v2/hooks/context.ts
 init_hidden_child();
 
+// src/v2/hooks/hidden-terminal-error.ts
+function hiddenTerminalError(event) {
+  if (event.type === "session.execution.failed")
+    return event.data?.error;
+  if (event.type === "session.error")
+    return getSessionErrorInfo(event.data)?.error;
+  return;
+}
+
 // src/v2/hooks/lkg-system.ts
-import { createHash as createHash36 } from "node:crypto";
+import { createHash as createHash37 } from "node:crypto";
 function identity(slot) {
-  return createHash36("sha256").update(JSON.stringify({
+  return createHash37("sha256").update(JSON.stringify({
     capturedAt: slot.capturedAt,
     captureSequence: slot.captureSequence,
     rowVersion: slot.rowVersion,
@@ -137909,6 +138596,7 @@ function adaptPayload(draft, admittedIDs = new Set) {
         input: structuredClone(call?.input ?? {}),
         status: result ? "completed" : "running",
         ...result ? { output } : {},
+        ...result && (call?.name ?? result.part.name) === "question" ? { metadata: { userAnswer: true } } : {},
         ...files ? { attachments: contentValueAttachments(files) } : {}
       }
     };
@@ -138997,10 +139685,10 @@ function* readV2RawMessagePagesForConversion(openReader, sessionID, pageRows = C
 function createV2RawMessageReader(openReader) {
   const servedBoundaryCache = new Map;
   return {
-    readPage: (sessionID, afterOrdinal, limit, finalWatermark) => {
+    readPage: (sessionID, afterOrdinal, limit, finalWatermark, after) => {
       const reader = openReader();
       try {
-        return rawMessagePage(reader.messagePage(sessionID, afterOrdinal, limit, finalWatermark), afterOrdinal);
+        return rawMessagePage(reader.messagePage(sessionID, afterOrdinal, limit, finalWatermark, after), afterOrdinal);
       } finally {
         reader.close();
       }
@@ -139094,7 +139782,7 @@ function createV2RawMessageReader(openReader) {
 }
 function createV2RawMessageProvider(reader, sessionID) {
   return {
-    readMessagePage: (afterOrdinal, limit, finalWatermark) => reader.readPage(sessionID, afterOrdinal, limit, finalWatermark),
+    readMessagePage: (afterOrdinal, limit, finalWatermark, after) => reader.readPage(sessionID, afterOrdinal, limit, finalWatermark, after),
     readMessageById: (messageID) => reader.findById(sessionID, messageID),
     readMessagePartsById: (messageID) => reader.findPartsById(sessionID, messageID),
     hasMessageById: (messageID) => reader.hasById(sessionID, messageID),
@@ -151434,6 +152122,7 @@ init_agent_disable();
 init_project_identity();
 init_protection_window();
 init_storage_meta_persisted();
+await init_sqlite();
 
 // src/tools/ctx-expand/tools.ts
 init_compartment_storage();
@@ -153470,7 +154159,7 @@ Keep: user messages (never stamp one for its directive), your own conversation t
 
 Look at each tag before stamping it; never blanket-stamp a range like "1-50". Many small targeted stamps beat one sweep. \`drop\` accepts "3-5", "1,2,9", "1-5,8,12-15".`;
 // src/tools/ctx-reduce/tools.ts
-import { createHash as createHash37 } from "node:crypto";
+import { createHash as createHash38 } from "node:crypto";
 init_protection_window();
 
 // src/features/magic-context/range-parser.ts
@@ -153544,11 +154233,11 @@ function createCtxReduceTool(deps) {
       const stableId = `oc-${sessionId}-${callId}`;
       if (Buffer.byteLength(stableId) <= 128)
         return stableId;
-      return `oc-${createHash37("sha256").update(stableId).digest("hex")}`;
+      return `oc-${createHash38("sha256").update(stableId).digest("hex")}`;
     }
     fallbackCommandSequence += 1;
     const monotonicId = `oc-${sessionId}-${fallbackCommandSequence}`;
-    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash37("sha256").update(monotonicId).digest("hex")}`;
+    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash38("sha256").update(monotonicId).digest("hex")}`;
   };
   return tool({
     description: CTX_REDUCE_DESCRIPTION,
@@ -153909,6 +154598,10 @@ async function registerTools(context, db, config, rustToolBackends) {
         input: tool.schema.toJSONSchema(tool.schema.object(definition.args)),
         options: { codemode: false },
         async execute(input, call) {
+          if (name === "ctx_memory" || name === "ctx_note" || name === "ctx_reduce")
+            await withAsyncPrivilegedWriter(db, () => {
+              return;
+            });
           const result = await definition.execute(tool.schema.object(definition.args).parse(input), {
             sessionID: call.sessionID,
             messageID: call.messageID,
@@ -154145,6 +154838,7 @@ async function applyV2SystemPrompt(systemPrompt, draft) {
 async function registerContext(context) {
   const directory = context.location.directory;
   const config = loadPluginConfigDetailed(directory).config;
+  setHomeProjectPermission(config.allow_home_project);
   if (!config.enabled)
     return;
   const liveConfigReader = pluginConfigReader(directory, config);
@@ -154253,6 +154947,7 @@ async function registerContext(context) {
   }, {
     db: database,
     projectIdentity: resolveProjectIdentityForSession(directory, config.allow_home_project) ?? "",
+    directory,
     hook: hiddenChildHook,
     keepSubagents: config.keep_subagents === true,
     ensureAgent: () => hiddenAgentsReady ??= context.agent.reload(),
@@ -154455,8 +155150,8 @@ async function registerContext(context) {
         if (!event.data?.sessionID)
           continue;
         const sessionID = event.data.sessionID;
-        if (event.type === "session.error") {
-          const error = getSessionErrorInfo(event.data)?.error;
+        if (event.type === "session.error" || event.type === "session.execution.failed") {
+          const error = hiddenTerminalError(event);
           if (error !== undefined)
             hiddenSessionErrors.set(sessionID, error);
           continue;
@@ -154579,7 +155274,7 @@ async function registerContext(context) {
     try {
       const admissionDb = db ?? storage.current();
       if (!compactionOff && admissionDb)
-        withPrivilegedWriter(admissionDb, () => {
+        await withAsyncPrivilegedWriter(admissionDb, () => {
           return;
         });
       recordV2ToolDefinitions(draft);
@@ -154965,7 +155660,7 @@ ${baseline}
 }
 
 // src/v2/hooks/update-check.ts
-import { existsSync as existsSync22, readFileSync as readFileSync20 } from "node:fs";
+import { existsSync as existsSync22, readFileSync as readFileSync21 } from "node:fs";
 import { dirname as dirname11, join as join23 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
@@ -155046,7 +155741,7 @@ function packageInfo() {
   let directory = dirname11(fileURLToPath2(import.meta.url));
   for (;; ) {
     try {
-      const pkg = JSON.parse(readFileSync20(join23(directory, "package.json"), "utf8"));
+      const pkg = JSON.parse(readFileSync21(join23(directory, "package.json"), "utf8"));
       if (pkg.name === "@cortexkit/opencode-magic-context" && typeof pkg.version === "string") {
         return {
           version: pkg.version,