@cortexkit/opencode-magic-context 0.44.3 → 0.44.4

package/dist/v2/server.js

@@ -11755,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));
@@ -11797,7 +11818,11 @@ function resolveProjectIdentityStrict(directory, allowHomeProject = homeProjectP
       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];
@@ -11937,6 +11962,8 @@ function resolveProjectIdentity(directory, allowHomeProject = homeProjectPermiss
   } 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")
@@ -12065,9 +12092,18 @@ function resolveProjectIdentityForSession(directory, allowHomeProject = homeProj
     } 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
@@ -12108,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, homeProjectPermission = false, homeProjectSkipLogged = false, 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();
@@ -12123,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;
@@ -16154,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]);
@@ -16173,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"],
@@ -16414,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;
@@ -16619,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,
@@ -16668,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",
@@ -22313,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(", ");
@@ -22325,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
@@ -22342,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
   }));
@@ -22369,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(", ");
@@ -23238,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);
@@ -23827,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,
@@ -24180,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;
@@ -24828,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: () => {
@@ -24853,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();
@@ -25003,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);
   }
@@ -25010,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;
@@ -25025,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;
 }
@@ -25034,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)
@@ -25047,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;
@@ -25064,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) {
@@ -32787,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 {
@@ -32820,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");
@@ -32862,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);
@@ -74329,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(/\/+$/, "") ?? "";
 }
@@ -74351,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() ?? "";
@@ -74404,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);
     }
@@ -74613,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();
@@ -84124,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}`;
@@ -84138,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) {
@@ -84156,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);
@@ -84173,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) {
@@ -84876,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;
@@ -85057,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)
     }
   };
 }
@@ -85071,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) {
@@ -85141,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) {
@@ -85156,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) {
@@ -85516,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;
@@ -85568,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,
@@ -85668,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);
@@ -85703,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,
@@ -85966,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) {
@@ -85991,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;
@@ -86084,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,
@@ -86450,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;
@@ -106581,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();
@@ -113332,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))
@@ -113396,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);
@@ -113814,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;
@@ -115985,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;
@@ -116023,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,
@@ -116403,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,
@@ -118726,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";
@@ -119307,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;
@@ -119354,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",
@@ -119385,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: {
@@ -124190,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);
@@ -124564,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);
@@ -124687,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
@@ -126158,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;
@@ -126362,7 +126592,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
     };
     return applyStickySnapshotCache(sessionId, fresh);
   } catch (err) {
-    if (!(err instanceof ProjectIdentityError && err.errorClass === "home_project_disabled"))
+    if (!(err instanceof ProjectIdentityError))
       log("[rpc] sidebar-snapshot error:", err);
     throw err;
   }
@@ -126370,6 +126600,8 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
 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 {
@@ -126831,6 +127063,8 @@ function registerRpcHandlers(rpcServer, args) {
     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)
@@ -126853,6 +127087,8 @@ function registerRpcHandlers(rpcServer, args) {
     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" };
@@ -128427,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");
@@ -128438,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);
@@ -134270,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) {
@@ -134282,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,
@@ -134293,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)
@@ -134325,7 +134577,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     }, {
       transport: createPromptAsyncTransport(client, agentSessionId, {
         tokenBudget: args.tokenBudget,
-        onBudgetUpdate: args.onBudgetUpdate
+        onBudgetUpdate
       }),
       timeoutMs: sliceMs,
       signal,
@@ -134352,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);
@@ -134391,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));
@@ -134399,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 = [];
@@ -135958,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;
@@ -135972,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,
@@ -135989,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)
@@ -136019,7 +136279,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     }, {
       transport: createPromptAsyncTransport(client, agentSessionId, {
         tokenBudget: args.tokenBudget,
-        onBudgetUpdate: args.onBudgetUpdate
+        onBudgetUpdate
       }),
       timeoutMs: sliceMs,
       signal,
@@ -136049,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;
@@ -136095,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 = {
@@ -136115,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 };
   }
@@ -138333,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) } : {}
       }
     };
@@ -139421,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();
       }
@@ -139518,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),