@cortexkit/pi-magic-context 0.44.1 → 0.44.2

package/dist/index.js

@@ -49,6 +49,7 @@ import {
   nextDueAtMs,
   resolveModelConfigValue,
   DEFAULT_HISTORIAN_TIMEOUT_MS,
+  DREAM_TASK_PROMOTION_DEFAULTS,
   LIVE_RELOAD_CONFIG_PATHS,
   getProtectedTokensTierOverrides,
   FAIL_CLOSED_DOCTOR_COMMAND,
@@ -59,6 +60,7 @@ import {
   createFailClosedController,
   ProjectIdentityError,
   resolveProjectIdentityStrict,
+  isUserHomeDirectory,
   resolveProjectIdentity,
   isUsableProjectIdentity,
   resolveProjectIdentityForSession,
@@ -66,6 +68,17 @@ import {
   scheduleAfterBootQuiet,
   clearCompressionDepth,
   clearCompressionDepthRange,
+  formatSynapseLaneDescriptor,
+  buildCanonicalChunkTextFromFts,
+  buildCompartmentSummaryFallbackText,
+  canonicalizeInMemoryChunkTextForEmbedding,
+  chunkCanonicalText,
+  chunkEmbeddingWindowsAreCurrent,
+  replaceCompartmentChunkEmbeddings,
+  deleteChunkEmbedBackoffForSession,
+  readSessionActivity,
+  observeSessionActivity,
+  backfillSessionActivity,
   getMessageIndexSourceIdentity,
   isMessageIndexSourceCurrent,
   getLastIndexedOrdinal,
@@ -168,6 +181,12 @@ import {
   retryPendingSessionCleanups,
   retryPendingRustSessionCleanupsForProject,
   recordSessionProjectIdentity,
+  embedPauseBySession,
+  embedRunStateBySession,
+  autoEmbedAttemptedBySession,
+  autoEmbedIdentityBySession,
+  invalidateAutoEmbedSession,
+  getEmbedDrainUiStatus,
   piHarnessKindFromExecutable,
   COMPARTMENT_LEASE_RENEWAL_MS,
   acquireCompartmentLease,
@@ -231,6 +250,7 @@ import {
   runSqliteOptimize,
   openDatabase,
   openDatabaseAsync,
+  closeDatabase,
   queueM0Mutation,
   getMaxM0MutationId,
   queueMemoryMutation,
@@ -325,13 +345,6 @@ import {
   peekCurateCategoryScope,
   beginCurateCategoryRun,
   curateTaskStateAfterSuccess,
-  formatSynapseLaneDescriptor,
-  buildCanonicalChunkTextFromFts,
-  buildCompartmentSummaryFallbackText,
-  canonicalizeInMemoryChunkTextForEmbedding,
-  chunkCanonicalText,
-  chunkEmbeddingWindowsAreCurrent,
-  replaceCompartmentChunkEmbeddings,
   cosineSimilarity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
   acquireGitSweepLease,
@@ -353,6 +366,7 @@ import {
   drainCommitBacklogForProject,
   embedSessionCompartmentChunks,
   getEmbeddingCoverageStatus,
+  getAutoEmbeddingSessionCoverage,
   promoteSessionFactsDurable,
   embedPromotedFacts,
   recordMemoryMapping,
@@ -373,6 +387,7 @@ import {
   embedUnembeddedCommits,
   loadPiConfig,
   loadPiConfigDetailed,
+  unregisterPiProjectEmbeddings,
   ensureProjectRegisteredFromPiDirectory,
   resolvePiHarnessDetection,
   resolvePiHarnessKind,
@@ -408,7 +423,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-mwpk0wn9.js";
+} from "./index-esnhck8v.js";
 import {
   CTX_REDUCE_KEEP,
   newestCtxReduceTagNumbers,
@@ -496,6 +511,12 @@ import {
   buildTrueRawTokenIndex,
   computeRawRangeFingerprint,
   invalidateTrueRawTokenCache,
+  DreamTokenBudgetExceeded,
+  TOKEN_BUDGET_FINALIZE_MESSAGE,
+  TOKEN_BUDGET_TOOL_REFUSAL,
+  registerBudgetFinalizeChild,
+  releaseBudgetFinalizeChild,
+  createDreamTokenBudget,
   droppedInputMarker,
   createDroppedInputGuard,
   isEditTool,
@@ -522,10 +543,14 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-nm3c0sn8.js";
+} from "./index-gsff513e.js";
 import {
   pushNotification2
 } from "./index-b3eqj1g6.js";
+import {
+  subagentStepCap,
+  SubagentTelemetry
+} from "./index-n8kg008j.js";
 import"./index-5fw91enm.js";
 import {
   logSlowWriteTransaction
@@ -822,6 +847,15 @@ var CANONICAL_DREAM_TASKS = [
   "promote-primers",
   "refresh-primers"
 ];
+var DREAM_TOOL_LOOP_TOKEN_BUDGETS = {
+  "map-memories": 1500000,
+  verify: 1700000,
+  "verify-broad": 1700000,
+  curate: 1500000,
+  retrospective: 300000,
+  "maintain-docs": 1600000,
+  "refresh-primers": 350000
+};
 var DREAM_TASK_CAPABILITIES = {
   "map-memories": {
     requiresTools: true,
@@ -934,6 +968,7 @@ function buildDreamTaskRuntimeConfigs(dreamer, harness, language, muralModel) {
       thinkingLevel: harness === "pi" ? resolved.primary?.qualifier : undefined,
       language,
       timeoutMinutes: resolved.timeoutMinutes ?? 20,
+      tokenBudget: task in DREAM_TOOL_LOOP_TOKEN_BUDGETS ? dreamer?.tasks?.[task]?.token_budget ?? DREAM_TOOL_LOOP_TOKEN_BUDGETS[task] : undefined,
       promotionThreshold: resolved.promotionThreshold,
       docsMaxTokens: task === "maintain-docs" ? dreamer?.tasks?.["maintain-docs"]?.max_tokens ?? 12000 : undefined,
       retrospectiveRecencyDays: task === "retrospective" ? dreamer?.tasks?.retrospective?.recency_days ?? 30 : undefined
@@ -1527,7 +1562,7 @@ async function runSessionProjectBackfill(db, source, options = {}) {
   const startedAt = performance.now();
   const harness = getHarness();
   const now = options.now ?? Date.now;
-  const resolveIdentity = options.resolveIdentity ?? resolveProjectIdentity;
+  const resolveIdentity = options.resolveIdentity ?? ((directory) => resolveProjectIdentityForSession(directory, options.allowHomeProject));
   const yieldFn = options.yieldFn ?? defaultYieldFn;
   const holderId = options.holderId ?? randomUUID();
   const readPage = createPageReader(source);
@@ -1541,7 +1576,8 @@ async function runSessionProjectBackfill(db, source, options = {}) {
     skippedEmptyDirectories: 0,
     durationMs: 0
   };
-  const leaseStatus = acquireBackfillLease(db, harness, holderId, now());
+  const leaseKey = options.leaseKey ?? harness;
+  const leaseStatus = acquireBackfillLease(db, leaseKey, holderId, now());
   if (leaseStatus !== "acquired") {
     result.status = leaseStatus;
     result.durationMs = performance.now() - startedAt;
@@ -1553,10 +1589,10 @@ async function runSessionProjectBackfill(db, source, options = {}) {
     return result;
   };
   const yieldAndRenew = async () => {
-    if (!renewBackfillLease(db, harness, holderId, now()))
+    if (!renewBackfillLease(db, leaseKey, holderId, now()))
       return false;
     await yieldFn();
-    return renewBackfillLease(db, harness, holderId, now());
+    return renewBackfillLease(db, leaseKey, holderId, now());
   };
   const existenceCache = new Map;
   const identityCache = new Map;
@@ -1570,7 +1606,7 @@ async function runSessionProjectBackfill(db, source, options = {}) {
       sourcePage = await readPage(afterSessionId, SESSION_PAGE_SIZE);
     } catch (error) {
       try {
-        if (!markBackfillRetryPending(db, harness, holderId, now())) {
+        if (!markBackfillRetryPending(db, leaseKey, holderId, now())) {
           log("[session-projects] backfill lease changed before failure cleanup");
         }
       } catch (releaseError) {
@@ -1595,7 +1631,7 @@ async function runSessionProjectBackfill(db, source, options = {}) {
         result.alreadyMappedSessions += 1;
       } else {
         result.unmappedSessions += 1;
-        if (!session.directory) {
+        if (!session.directory || !options.allowHomeProject && isUserHomeDirectory(session.directory)) {
           result.skippedEmptyDirectories += 1;
         } else {
           const stillExists = existenceCache.get(session.directory) ?? existsSync(session.directory);
@@ -1613,13 +1649,18 @@ async function runSessionProjectBackfill(db, source, options = {}) {
               }
               identity = await resolveIdentity(session.directory);
               identityResolutionsSinceYield += 1;
-              if (!renewBackfillLease(db, harness, holderId, now())) {
+              if (!renewBackfillLease(db, leaseKey, holderId, now())) {
                 return finishWithLostLease();
               }
-              identityCache.set(session.directory, identity);
+              if (identity)
+                identityCache.set(session.directory, identity);
+            }
+            if (identity) {
+              recordSessionProjectIdentity(db, session.sessionId, identity);
+              result.backfilledSessions += 1;
+            } else {
+              result.skippedEmptyDirectories += 1;
             }
-            recordSessionProjectIdentity(db, session.sessionId, identity);
-            result.backfilledSessions += 1;
           }
         }
       }
@@ -1635,11 +1676,11 @@ async function runSessionProjectBackfill(db, source, options = {}) {
   }
   const hasSkippedSessions = result.skippedDeadDirectories > 0 || result.skippedEmptyDirectories > 0;
   if (hasSkippedSessions) {
-    if (!markBackfillRetryPending(db, harness, holderId, now())) {
+    if (!markBackfillRetryPending(db, leaseKey, holderId, now())) {
       return finishWithLostLease();
     }
     result.status = "retry_pending";
-  } else if (!markBackfillCompleted(db, harness, holderId, now())) {
+  } else if (!markBackfillCompleted(db, leaseKey, holderId, now())) {
     return finishWithLostLease();
   }
   result.durationMs = performance.now() - startedAt;
@@ -1709,7 +1750,7 @@ function countFailures(db) {
 function classifyBackfillError(error) {
   if (error instanceof ProjectIdentityError) {
     return {
-      errorClass: error.errorClass === "dubious_ownership" ? "unknown" : error.errorClass,
+      errorClass: error.errorClass === "dubious_ownership" || error.errorClass === "home_project_disabled" || error.errorClass === "git_identity_unavailable" ? "unknown" : error.errorClass,
       errorMessage: error.message
     };
   }
@@ -2313,10 +2354,12 @@ var SMART_NOTE_CHECK_LIVENESS_RECHECK_MS = 24 * 60 * 60 * 1000;
 class SmartNoteNetworkError extends Error {
   isSmartNoteNetworkError = true;
   terminal;
+  persistent;
   constructor(message, options = {}) {
     super(message);
     this.name = "SmartNoteNetworkError";
     this.terminal = options.terminal ?? false;
+    this.persistent = options.persistent ?? false;
   }
 }
 
@@ -2438,6 +2481,7 @@ function storeCompiledSmartNoteCheck(db, args) {
              check_failure_count = 0,
              check_network_failure_count = 0,
              check_quarantined_until = NULL,
+             ready_reason = NULL,
              check_next_due_at = ?,
              check_compiled_at = ?,
              check_false_since_at = COALESCE(check_false_since_at, ?),
@@ -2486,15 +2530,17 @@ function markSmartNoteLivenessChecked(db, noteId, now) {
 function markSmartNoteCheckStatus(db, noteId, status, now) {
   db.prepare(`UPDATE notes SET check_status = ?, updated_at = ? WHERE id = ? AND type = 'smart'`).run(status, now, noteId);
 }
-function markSmartNoteCompilationFailure(db, noteId, now, maxFailures) {
+function markSmartNoteCompilationFailure(db, noteId, now, maxFailures, error, persistent) {
   const failureCount = readFailureCount(db, noteId, "check_failure_count") + 1;
-  const status = failureCount >= maxFailures ? "fallback" : "uncompiled";
+  const status = persistent ? "uncompiled" : failureCount >= maxFailures ? "fallback" : "uncompiled";
+  const nextDueAt = now + (persistent ? 7 * 24 * 60 * 60 * 1000 : backoffMs(failureCount));
   db.prepare(`UPDATE notes
          SET check_failure_count = ?,
              check_status = ?,
              check_next_due_at = ?,
+             ready_reason = ?,
              updated_at = ?
-         WHERE id = ? AND type = 'smart'`).run(failureCount, status, now + backoffMs(failureCount), now, noteId);
+         WHERE id = ? AND type = 'smart'`).run(failureCount, status, nextDueAt, persistent ? `Condition can't be checked: ${error}; rewrite it` : null, now, noteId);
 }
 function readFailureCount(db, noteId, column) {
   if (column !== "check_failure_count" && column !== "check_network_failure_count")
@@ -2542,7 +2588,10 @@ function countCompartmentsSince(db, projectPath, since) {
   return row?.cnt ?? 0;
 }
 function countProjectSessionsSince(db, projectPath, since) {
-  const row = since === null ? db.prepare("SELECT COUNT(*) AS cnt FROM session_projects WHERE project_path = ?").get(projectPath) : db.prepare("SELECT COUNT(*) AS cnt FROM session_projects WHERE project_path = ? AND updated_at > ?").get(projectPath, since);
+  const row = since === null ? db.prepare("SELECT COUNT(*) AS cnt FROM session_projects WHERE project_path = ?").get(projectPath) : db.prepare(`SELECT COUNT(*) AS cnt FROM session_projects sp
+                        JOIN schema_migrations_meta activity
+                          ON activity.key = 'retrospective_activity:' || sp.session_id
+                       WHERE sp.project_path = ? AND CAST(activity.value AS INTEGER) > ?`).get(projectPath, since);
   return row?.cnt ?? 0;
 }
 function countMappedMemories(db, projectPath) {
@@ -2651,12 +2700,14 @@ function getDreamTaskBacklog(db, projectPath, task, options = {}) {
       };
     }
     case "retrospective": {
-      const pending = countProjectSessionsSince(db, projectPath, options.retrospectiveWatermarkMs ?? null);
+      const watermark = options.retrospectiveWatermarkMs !== undefined ? options.retrospectiveWatermarkMs : getTaskScheduleState(db, projectPath, task)?.retrospectiveWatermarkMs;
+      const pending = countProjectSessionsSince(db, projectPath, watermark ?? null);
       return { pending, total: pending };
     }
     case "maintain-docs": {
       const total = countCompartmentsSince(db, projectPath, 0);
-      const pending = countCompartmentsSince(db, projectPath, options.lastRunAt ?? 0);
+      const lastRunAt = options.lastRunAt !== undefined ? options.lastRunAt : getTaskScheduleState(db, projectPath, task)?.lastRunAt;
+      const pending = countCompartmentsSince(db, projectPath, lastRunAt ?? 0);
       return { pending, total };
     }
     case "evaluate-smart-notes": {
@@ -2711,7 +2762,7 @@ function evaluateTaskGate(task, ctx) {
     case "review-user-memories":
       return getUserMemoryCandidates(db).length >= ctx.promotionThreshold;
     case "promote-primers":
-      return countPrimerCandidatesForProject(db, project) >= (ctx.promotionThreshold ?? 2);
+      return countPrimerCandidatesForProject(db, project) >= (ctx.promotionThreshold ?? DREAM_TASK_PROMOTION_DEFAULTS["promote-primers"]);
     case "refresh-primers":
       return getActivePrimers(db, project).some((primer) => !primer.answer.trim() || primer.answerRefreshedAt == null || (primer.lastObservedAt ?? 0) > primer.answerRefreshedAt);
     default: {
@@ -2758,6 +2809,11 @@ var USER_FACING_FAILURES = {
     sentence: "Memory maintenance stopped at its hidden agent step limit.",
     action: "This task needs less work per run; changing the model connection will not help."
   },
+  dream_token_budget: {
+    code: "MC-D11",
+    sentence: "Memory maintenance reached its prompt-token budget.",
+    action: "The unfinished items will be retried on the next run."
+  },
   dream_empty_completion: {
     code: "MC-D03",
     sentence: "Memory maintenance received no usable response.",
@@ -2975,6 +3031,7 @@ var DREAM_FAILURE_KEYS = {
   provider_timeout: "dream_provider_timeout",
   provider_error: "dream_provider_error",
   step_limit: "dream_step_limit",
+  token_budget: "dream_token_budget",
   empty_completion: "dream_empty_completion",
   no_models: "dream_no_models",
   child_aborted: "dream_child_aborted",
@@ -3042,7 +3099,7 @@ function openOpenCodeDb() {
 
 // ../plugin/src/features/magic-context/dreamer/task-executor.ts
 import { createHash as createHash10 } from "node:crypto";
-import { existsSync as existsSync6 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "node:fs";
 
 // ../plugin/src/agents/dreamer.ts
 var DREAMER_AGENT = "dreamer";
@@ -3175,7 +3232,7 @@ var READ_TOOLS = ["read", "grep", "glob"];
 var AGENT_TOOLS = {
   [HIDDEN_HISTORIAN_AGENT]: [],
   [HIDDEN_DREAMER_AGENT]: [],
-  [HIDDEN_CURATE_AGENT]: ["ctx_memory", "ctx_memory_list"],
+  [HIDDEN_CURATE_AGENT]: ["ctx_memory"],
   [DREAMER_MEMORY_MAPPER_AGENT]: READ_TOOLS,
   [DREAMER_PRIMER_INVESTIGATOR_AGENT]: [...READ_TOOLS, "ctx_search"],
   [DREAMER_RETROSPECTIVE_AGENT]: ["ctx_search"]
@@ -3424,7 +3481,7 @@ async function abortChildRun(client, sessionId) {
   }
 }
 function isNonRetryable(error, externalSignal) {
-  if (externalSignal?.aborted || error instanceof HiddenAgentStepLimit)
+  if (externalSignal?.aborted || error instanceof HiddenAgentStepLimit || error instanceof DreamTokenBudgetExceeded)
     return true;
   if (error instanceof Error) {
     if (error.name === "AbortError")
@@ -3450,6 +3507,8 @@ function classifyPromptFailure(error, phase, externalSignal) {
   const message = extractMessage(error);
   if (error instanceof HiddenAgentStepLimit)
     return "step_limit";
+  if (error instanceof DreamTokenBudgetExceeded)
+    return "token_budget";
   if (externalSignal?.aborted || message === "prompt aborted by external signal") {
     return "child_aborted";
   }
@@ -3700,10 +3759,115 @@ function normalizeSDKResponse(response, fallback, options) {
   }
   return fallback;
 }
+// ../plugin/src/features/magic-context/subagent-token-capture.ts
+function asNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function tokenObjectFromMessage(message) {
+  const info = message.info;
+  if (info && typeof info === "object") {
+    const tokens = info.tokens;
+    if (tokens && typeof tokens === "object")
+      return tokens;
+  }
+  const tokens = message.tokens;
+  if (tokens && typeof tokens === "object")
+    return tokens;
+  const usage = message.usage;
+  if (usage && typeof usage === "object")
+    return usage;
+  return null;
+}
+function isAssistantMessage(message) {
+  if (!message || typeof message !== "object")
+    return false;
+  const record = message;
+  const info = record.info;
+  if (info && typeof info === "object") {
+    return info.role === "assistant";
+  }
+  return record.role === "assistant";
+}
+function modelFromMessage(message) {
+  const info = message.info;
+  const source = info && typeof info === "object" ? info : message;
+  return {
+    providerId: typeof source.providerID === "string" ? source.providerID : typeof source.providerId === "string" ? source.providerId : null,
+    modelId: typeof source.modelID === "string" ? source.modelID : typeof source.modelId === "string" ? source.modelId : null
+  };
+}
+function failedInvocationStatus(error) {
+  const message = describeError(error).brief;
+  if (/timed out after \d+ms|prompt timed out/i.test(message))
+    return "timed_out";
+  if (error !== null && typeof error === "object" && error.name === "TimeoutError") {
+    return "timed_out";
+  }
+  if (/length-capped|no (?:assistant )?output|empty (?:assistant )?(?:output|text)/i.test(message)) {
+    return "empty";
+  }
+  return "failed";
+}
+function emptyTokenTotals() {
+  return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+}
+function sumTokensFromChildMessages(messages) {
+  const totals = emptyTokenTotals();
+  for (const message of messages) {
+    if (!isAssistantMessage(message))
+      continue;
+    const tokens = tokenObjectFromMessage(message);
+    if (!tokens)
+      continue;
+    const cache = tokens.cache && typeof tokens.cache === "object" ? tokens.cache : {};
+    totals.input += asNumber(tokens.input);
+    totals.output += asNumber(tokens.output);
+    totals.cacheRead += asNumber(cache.read ?? tokens.cacheRead ?? tokens.cache_read);
+    totals.cacheWrite += asNumber(cache.write ?? tokens.cacheWrite ?? tokens.cache_write);
+  }
+  return totals;
+}
+function findLastAssistantModel(messages) {
+  for (let index = messages.length - 1;index >= 0; index -= 1) {
+    const message = messages[index];
+    if (isAssistantMessage(message))
+      return modelFromMessage(message);
+  }
+  return { providerId: null, modelId: null };
+}
+function recordChildInvocation(input) {
+  if (!input.db)
+    return null;
+  const tokens = input.tokens ?? sumTokensFromChildMessages(input.messages ?? []);
+  const model = input.providerId !== undefined || input.modelId !== undefined ? { providerId: input.providerId ?? null, modelId: input.modelId ?? null } : findLastAssistantModel(input.messages ?? []);
+  try {
+    return recordSubagentInvocation(input.db, {
+      sessionId: input.parentSessionId,
+      harness: input.harness,
+      subagent: input.subagent,
+      task: input.task ?? null,
+      providerId: model.providerId,
+      modelId: model.modelId,
+      startedAt: input.startedAt,
+      endedAt: input.endedAt ?? Date.now(),
+      status: input.status,
+      inputTokens: tokens.input,
+      outputTokens: tokens.output,
+      cacheReadTokens: tokens.cacheRead,
+      cacheWriteTokens: tokens.cacheWrite,
+      error: input.error ? describeError(input.error).brief : null,
+      parentInvocationId: input.parentInvocationId ?? null
+    });
+  } catch (error) {
+    sessionLog(input.parentSessionId, "subagent token accounting failed:", describeError(error).brief);
+    return null;
+  }
+}
+
 // ../plugin/src/shared/prompt-async-transport.ts
 var DEFAULT_POLL_INTERVAL_MS = 1000;
 var DEFAULT_START_GRACE_MS = 30000;
-var MESSAGE_WINDOW = 20;
+var MESSAGE_WINDOW = 100;
 function sessionApi(client) {
   return client?.session;
 }
@@ -3714,7 +3878,8 @@ function supportsPromptAsync(client) {
 function createPromptAsyncTransport(client, childSessionId, options = {}) {
   if (!supportsPromptAsync(client))
     return;
-  return Object.assign((request) => promptAsyncAndWaitForIdle(client, request, options), { childSessionId });
+  const budgetGuard = options.tokenBudget ? createDreamTokenBudget(options.tokenBudget) : undefined;
+  return Object.assign((request) => promptAsyncAndWaitForIdle(client, request, { ...options, budgetGuard }), { childSessionId });
 }
 function infoOf(message) {
   const info = message?.info;
@@ -3730,6 +3895,10 @@ function isSettledAssistant(message) {
     return false;
   return info.time?.completed != null || info.error != null || info.finish != null;
 }
+function isTerminalAssistant(message) {
+  const info = infoOf(message);
+  return isSettledAssistant(message) && info.finish !== "tool-calls" && info.finish !== "tool_use" && !(message && typeof message === "object" && Array.isArray(message.parts) && message.parts.some((part) => part.type === "tool"));
+}
 function unwrapData(response) {
   if (response && typeof response === "object" && "data" in response) {
     return response.data;
@@ -3807,40 +3976,106 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
   const signal = request.signal;
   const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
   const startGraceMs = options.startGraceMs ?? DEFAULT_START_GRACE_MS;
-  const baseline = new Set((await readMessages(session, sessionId, dir, signal)).map(messageId).filter((id) => id !== null));
+  const budget = options.budgetGuard ?? (options.tokenBudget ? createDreamTokenBudget(options.tokenBudget) : undefined);
+  if (budget?.snapshot().finalizeFired)
+    throw new DreamTokenBudgetExceeded(sessionId, budget.snapshot().spent);
+  const seenUsage = new Set;
+  let finalizing = false;
+  let completionBaseline = new Set((await readMessages(session, sessionId, dir, signal)).map(messageId).filter((id) => id !== null));
+  const initialBaseline = new Set(completionBaseline);
   const sent = await session.promptAsync?.(request);
   if (sent && typeof sent === "object" && "error" in sent) {
     const rejection = sent.error;
     if (rejection)
       throw new Error(`prompt_async was rejected: ${describeRejection(rejection)}`);
   }
-  const sentAt = Date.now();
+  let sentAt = Date.now();
   let sawBusy = false;
-  for (;; ) {
-    await sleep(pollIntervalMs, signal);
-    const status = await readStatus(session, sessionId, dir, signal);
-    if (status === "busy" || status === "retry") {
-      sawBusy = true;
-      continue;
-    }
-    if (status === null)
-      continue;
-    const messages = await readMessages(session, sessionId, dir, signal);
-    const last = messages.at(-1);
-    const lastId = messageId(last);
-    if (last && lastId !== null && !baseline.has(lastId) && isSettledAssistant(last))
-      return;
-    const fresh = messages.some((message) => {
-      const id = messageId(message);
-      return id !== null && !baseline.has(id);
-    });
-    if (sawBusy && fresh)
-      return;
-    if (Date.now() - sentAt >= startGraceMs) {
-      if (fresh)
+  try {
+    for (;; ) {
+      await sleep(pollIntervalMs, signal);
+      const status = await readStatus(session, sessionId, dir, signal);
+      const messages = await readMessages(session, sessionId, dir, signal);
+      if (budget) {
+        for (const message of messages) {
+          const id = messageId(message);
+          if (!id || seenUsage.has(id) || infoOf(message).role !== "assistant")
+            continue;
+          if (initialBaseline.has(id))
+            continue;
+          const tokens = sumTokensFromChildMessages([message]);
+          if (tokens.input + tokens.cacheRead + tokens.cacheWrite === 0)
+            continue;
+          seenUsage.add(id);
+          const decision = budget.charge(tokens.input, tokens.cacheRead, tokens.cacheWrite, isTerminalAssistant(message));
+          options.onBudgetUpdate?.({ ...budget.snapshot(), sessionId });
+          if (decision === "stop") {
+            await session.abort?.({ path: { id: sessionId } });
+            throw new DreamTokenBudgetExceeded(sessionId, budget.snapshot().spent);
+          }
+          if (decision === "finalize") {
+            finalizing = true;
+            registerBudgetFinalizeChild(sessionId, budget);
+            if (!session.abort)
+              throw new DreamTokenBudgetExceeded(sessionId, budget.snapshot().spent);
+            await session.abort({ path: { id: sessionId } });
+            const abortDeadline = Date.now() + startGraceMs;
+            while (Date.now() < abortDeadline) {
+              const state = await readStatus(session, sessionId, dir, signal);
+              if (state === "idle")
+                break;
+              await sleep(pollIntervalMs, signal);
+            }
+            if (await readStatus(session, sessionId, dir, signal) !== "idle") {
+              throw new DreamTokenBudgetExceeded(sessionId, budget.snapshot().spent);
+            }
+            completionBaseline = new Set((await readMessages(session, sessionId, dir, signal)).map(messageId).filter((value) => value !== null));
+            const finalizeResponse = await session.promptAsync?.({
+              ...request,
+              body: {
+                ...request.body,
+                parts: [{ type: "text", text: TOKEN_BUDGET_FINALIZE_MESSAGE }]
+              }
+            });
+            if (finalizeResponse && typeof finalizeResponse === "object" && "error" in finalizeResponse && finalizeResponse.error) {
+              throw new DreamTokenBudgetExceeded(sessionId, budget.snapshot().spent);
+            }
+            sentAt = Date.now();
+            sawBusy = false;
+            break;
+          }
+        }
+        if (budget.snapshot().hardStopped) {
+          await session.abort?.({ path: { id: sessionId } });
+          throw new DreamTokenBudgetExceeded(sessionId, budget.snapshot().spent);
+        }
+      }
+      if (status === "busy" || status === "retry") {
+        sawBusy = true;
+        continue;
+      }
+      if (status === null)
+        continue;
+      const current = finalizing ? await readMessages(session, sessionId, dir, signal) : messages;
+      const last = current.at(-1);
+      const lastId = messageId(last);
+      if (last && lastId !== null && !completionBaseline.has(lastId) && isSettledAssistant(last))
         return;
-      throw new Error(`prompt_async did not start a run in child session ${sessionId} within ${startGraceMs}ms`);
+      const fresh = current.some((message) => {
+        const id = messageId(message);
+        return id !== null && !completionBaseline.has(id);
+      });
+      if (sawBusy && fresh)
+        return;
+      if (Date.now() - sentAt >= startGraceMs) {
+        if (fresh)
+          return;
+        throw new Error(`prompt_async did not start a run in child session ${sessionId} within ${startGraceMs}ms`);
+      }
     }
+  } finally {
+    if (budget)
+      releaseBudgetFinalizeChild(sessionId);
   }
 }
 // ../plugin/src/shared/summarize-child-stderr.ts
@@ -3950,111 +4185,6 @@ function forgetHistorianOutputCap(sessionId) {
   historianCaps.delete(sessionId);
 }
 
-// ../plugin/src/features/magic-context/subagent-token-capture.ts
-function asNumber(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : 0;
-}
-function tokenObjectFromMessage(message) {
-  const info = message.info;
-  if (info && typeof info === "object") {
-    const tokens = info.tokens;
-    if (tokens && typeof tokens === "object")
-      return tokens;
-  }
-  const tokens = message.tokens;
-  if (tokens && typeof tokens === "object")
-    return tokens;
-  const usage = message.usage;
-  if (usage && typeof usage === "object")
-    return usage;
-  return null;
-}
-function isAssistantMessage(message) {
-  if (!message || typeof message !== "object")
-    return false;
-  const record = message;
-  const info = record.info;
-  if (info && typeof info === "object") {
-    return info.role === "assistant";
-  }
-  return record.role === "assistant";
-}
-function modelFromMessage(message) {
-  const info = message.info;
-  const source = info && typeof info === "object" ? info : message;
-  return {
-    providerId: typeof source.providerID === "string" ? source.providerID : typeof source.providerId === "string" ? source.providerId : null,
-    modelId: typeof source.modelID === "string" ? source.modelID : typeof source.modelId === "string" ? source.modelId : null
-  };
-}
-function failedInvocationStatus(error) {
-  const message = describeError(error).brief;
-  if (/timed out after \d+ms|prompt timed out/i.test(message))
-    return "timed_out";
-  if (error !== null && typeof error === "object" && error.name === "TimeoutError") {
-    return "timed_out";
-  }
-  if (/length-capped|no (?:assistant )?output|empty (?:assistant )?(?:output|text)/i.test(message)) {
-    return "empty";
-  }
-  return "failed";
-}
-function emptyTokenTotals() {
-  return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-}
-function sumTokensFromChildMessages(messages) {
-  const totals = emptyTokenTotals();
-  for (const message of messages) {
-    if (!isAssistantMessage(message))
-      continue;
-    const tokens = tokenObjectFromMessage(message);
-    if (!tokens)
-      continue;
-    const cache = tokens.cache && typeof tokens.cache === "object" ? tokens.cache : {};
-    totals.input += asNumber(tokens.input);
-    totals.output += asNumber(tokens.output);
-    totals.cacheRead += asNumber(cache.read ?? tokens.cacheRead ?? tokens.cache_read);
-    totals.cacheWrite += asNumber(cache.write ?? tokens.cacheWrite ?? tokens.cache_write);
-  }
-  return totals;
-}
-function findLastAssistantModel(messages) {
-  for (let index = messages.length - 1;index >= 0; index -= 1) {
-    const message = messages[index];
-    if (isAssistantMessage(message))
-      return modelFromMessage(message);
-  }
-  return { providerId: null, modelId: null };
-}
-function recordChildInvocation(input) {
-  if (!input.db)
-    return null;
-  const tokens = input.tokens ?? sumTokensFromChildMessages(input.messages ?? []);
-  const model = input.providerId !== undefined || input.modelId !== undefined ? { providerId: input.providerId ?? null, modelId: input.modelId ?? null } : findLastAssistantModel(input.messages ?? []);
-  try {
-    return recordSubagentInvocation(input.db, {
-      sessionId: input.parentSessionId,
-      harness: input.harness,
-      subagent: input.subagent,
-      task: input.task ?? null,
-      providerId: model.providerId,
-      modelId: model.modelId,
-      startedAt: input.startedAt,
-      endedAt: input.endedAt ?? Date.now(),
-      status: input.status,
-      inputTokens: tokens.input,
-      outputTokens: tokens.output,
-      cacheReadTokens: tokens.cacheRead,
-      cacheWriteTokens: tokens.cacheWrite,
-      error: input.error ? describeError(input.error).brief : null,
-      parentInvocationId: input.parentInvocationId ?? null
-    });
-  } catch (error) {
-    sessionLog(input.parentSessionId, "subagent token accounting failed:", describeError(error).brief);
-    return null;
-  }
-}
-
 // ../plugin/src/hooks/magic-context/historian-prompt.generated.ts
 var COMPARTMENT_AGENT_SYSTEM_PROMPT = `# Historian
 
@@ -6783,7 +6913,7 @@ Project memory uses exactly 5 categories. Every memory belongs to one:
 var CURATE_SYSTEM_PROMPT = `You are a memory-pool curator for the magic-context system. You run during a scheduled dream window to keep a project's cross-session memory store lean and well-formed.
 
 ## Memory operations
-- \`ctx_memory_list(category="...")\` — browse active memories, optionally filter by category
+- The scoped category snapshot arrives in the first message. Do not list or get it again; track mutation deltas.
 - \`action="merge", ids=[N,M,...], content="...", category="..."\` — consolidate duplicates into one canonical memory
 - \`action="update", ids=[N], content="...", superseded_by=M\` — rewrite content; name where removed detail survives when cutting more than half
 - \`action="write", category="...", content="..."\` — create a memory (SPLITS ONLY — never mint new facts)
@@ -6813,7 +6943,7 @@ var PRIMER_INVESTIGATOR_SYSTEM_PROMPT = `You are a read-only code investigator f
 function renderMemoryList(memories) {
   return memories.map((memory) => {
     const files = memory.mappedFiles.length ? memory.mappedFiles.join(", ") : "(none mapped yet)";
-    return `[${memory.id}] ${memory.category}
+    return `[${memory.id}] ${memory.category} importance=${memory.importance} retrieval_count=${memory.retrievalCount} seen_count=${memory.seenCount}
 Content: ${memory.content}
 Mapped files: ${files}${memory.hasNoFileSentinel ? " (file-independent)" : ""}`;
   }).join(`
@@ -6841,9 +6971,41 @@ Rewrite narrative/historical → operational present tense ("X uses Y because Z"
 Archive a redundant memory only when a better ACTIVE memory in the same project and category preserves its information; name that survivor with \`superseded_by\`. A bare "redundant" verdict is deletion and will be refused. Leave standalone low-value or stale entries unchanged for a human to review. The global user profile describes the operator and is never a substitute for project knowledge, so it cannot justify an archive.
 KEEP (overrides archive): constraint/rule language (must/never/always) · explains WHY (because/so that/to prevent) · EXTERNAL-system limit (CONSTRAINTS: archive only if word-for-word duplicated) · path/config WITH context · retrieval_count>0 · priority/philosophy.
 
-### Memory pool
+### Cross-chunk duplicate candidates (normalized content matches)
+${args.crossChunkCandidates?.join(`
+`) || "(none)"}
+
+### Category snapshot (do not re-enumerate)
 ${renderMemoryList(args.memories)}`;
 }
+function chunkCurateMemories(memories, maxCharacters) {
+  const chunks = [];
+  let current = [];
+  let size = 0;
+  for (const memory of memories) {
+    const length = renderMemoryList([memory]).length + 2;
+    if (current.length && size + length > maxCharacters) {
+      chunks.push(current);
+      current = [];
+      size = 0;
+    }
+    current.push(memory);
+    size += length;
+  }
+  if (current.length)
+    chunks.push(current);
+  const keys = new Map;
+  chunks.forEach((chunk, index) => {
+    chunk.forEach((memory) => {
+      const key = memory.content.toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
+      keys.set(key, [...keys.get(key) ?? [], { id: memory.id, chunk: index }]);
+    });
+  });
+  return chunks.map((chunk, index) => ({
+    memories: chunk,
+    crossChunkCandidates: [...keys.values()].filter((matches) => matches.some((match) => match.chunk === index) && matches.some((match) => match.chunk !== index)).map((matches) => `IDs ${matches.map((match) => match.id).join(", ")}`)
+  }));
+}
 var RETROSPECTIVE_SYSTEM_PROMPT = `You are a retrospective learning agent for Magic Context.
 
 You learn only from recurring user-friction moments where the user had to correct, re-explain, or recover from the assistant's repeated behavior. You receive a pre-rendered friction window from the host and may use ctx_search to look for corroborating prior patterns.
@@ -6902,17 +7064,23 @@ Return only XML in this exact shape:
   <learning route="observation">one recurring user preference</learning>
 </learnings>`;
 }
-function buildMaintainDocsPrompt(projectPath, changeSet, existingDocs, budget = 12000, currentTokens = 0) {
+function buildMaintainDocsPrompt(projectPath, changeSet, existingDocs, budget = 12000, currentTokens = 0, currentDocs) {
   return `## Task: Propose documentation corrections
 
 Project: ${projectPath}
 Existing docs: ARCHITECTURE.md ${existingDocs.architecture ? "exists" : "missing"}; STRUCTURE.md ${existingDocs.structure ? "exists" : "missing"}.
 Current combined token count: ${currentTokens}. Combined budget: ${budget} tokens.
 
-Host-collected code changes (commit subjects and changed files, not documentation history):
+Host-collected code changes (diff stat and hunks, or file/line ranges when oversized):
 ${changeSet}
 
-Read the docs and relevant source with read-only tools. These files are short maps read by every agent in every session. Describe how the system works now, never what changed or when: no change log, dates, or commit lists. One short paragraph per subsystem at most. Mechanism detail belongs in docs/architecture/; you may name a docs page for it but never move that detail into these two files. Propose a change only when code contradicts the docs or a major piece is missing. Prefer rewriting a stale sentence to adding one. Propose nothing when nothing is wrong. Keep both files within the combined budget. Never touch protected regions (<!-- mc:protected START ... --> through <!-- mc:protected END -->); preserve their bytes.
+Current ARCHITECTURE.md:
+${currentDocs?.architecture ?? "(read from project)"}
+
+Current STRUCTURE.md:
+${currentDocs?.structure ?? "(read from project)"}
+
+Find claims in these sections that the diff makes wrong or incomplete. Propose one focused change per claim or section. Do not investigate unrelated areas. Read the docs and relevant source with read-only tools. These files are short maps read by every agent in every session. Describe how the system works now, never what changed or when: no change log, dates, or commit lists. One short paragraph per subsystem at most. Mechanism detail belongs in docs/architecture/; you may name a docs page for it but never move that detail into these two files. Propose a change only when code contradicts the docs or a major piece is missing. Prefer rewriting a stale sentence to adding one. Propose nothing when nothing is wrong. Keep both files within the combined budget. Never touch protected regions (<!-- mc:protected START ... --> through <!-- mc:protected END -->); preserve their bytes.
 
 Return ONLY a JSON array (or []), with each entry {"file":"ARCHITECTURE.md"|"STRUCTURE.md","action":"replace"|"add"|"remove","heading":"## Exact section heading","text":"## Full replacement section including heading and body (empty for remove)","reason":"one-line reason"}. A replacement includes the entire section, including its heading. Additions are appended at the end of the file. Do not include any unmodified sections. No file writes.`;
 }
@@ -6922,10 +7090,11 @@ function buildDreamTaskPrompt(task, args) {
       return buildCuratePrompt({
         projectPath: args.projectPath,
         category: args.curate?.category ?? "PROJECT_RULES",
-        memories: args.curate?.memories ?? []
+        memories: args.curate?.memories ?? [],
+        crossChunkCandidates: args.curate?.crossChunkCandidates
       });
     case "maintain-docs":
-      return buildMaintainDocsPrompt(args.projectPath, args.docsChangeSet ?? "", args.existingDocs ?? { architecture: false, structure: false }, args.docsBudget, args.docsCurrentTokens);
+      return buildMaintainDocsPrompt(args.projectPath, args.docsChangeSet ?? "", args.existingDocs ?? { architecture: false, structure: false }, args.docsBudget, args.docsCurrentTokens, args.docsContents);
   }
 }
 
@@ -7858,6 +8027,7 @@ function hasCurrentDocsProposal(projectDir) {
 }
 function git(projectDir, args) {
   return execFileSync("git", args, {
+    windowsHide: true,
     cwd: projectDir,
     encoding: "utf8",
     timeout: 1e4,
@@ -7869,11 +8039,80 @@ function docsChangeSet(projectDir, storedAnchor) {
     if (realpathSync2(git(projectDir, ["rev-parse", "--show-toplevel"])) !== realpathSync2(projectDir))
       return null;
     const head = git(projectDir, ["rev-parse", "HEAD"]);
+    const recorded = Boolean(storedAnchor);
     let anchor = storedAnchor;
-    if (!anchor || !/^[a-f0-9]{40}$/.test(anchor) || !git(projectDir, ["cat-file", "-t", anchor]).includes("commit"))
+    if (anchor && (!/^[a-f0-9]{40}$/.test(anchor) || git(projectDir, ["cat-file", "-t", anchor]) !== "commit"))
+      throw new Error("maintain-docs checkpoint is not a git commit");
+    if (!anchor)
       anchor = git(projectDir, ["log", "-1", "--format=%H", "--", ...FILES]);
     if (!anchor)
       return null;
+    if (recorded && anchor === head)
+      return { head, text: "", unchanged: true, relevant: false };
+    if (recorded) {
+      const changed = git(projectDir, [
+        "diff",
+        "-M",
+        "--name-status",
+        `${anchor}..HEAD`,
+        "--",
+        "."
+      ]).split(`
+`).filter(Boolean).map((line) => line.split("\t").slice(1));
+      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) => existsSync3(join3(projectDir, file)) ? readFileSync3(join3(projectDir, file), "utf8") : "").join(`
+`);
+      const relevant = files.some((file) => {
+        const directory = file.split("/").slice(0, -1).join("/");
+        return docs.includes(file) || directory.length > 2 && docs.includes(directory);
+      });
+      if (!relevant)
+        return { head, text: "", unchanged: false, relevant: false };
+      const stat = git(projectDir, [
+        "diff",
+        "-M",
+        "--stat",
+        `${anchor}..HEAD`,
+        "--",
+        ...files
+      ]);
+      const patch = git(projectDir, [
+        "diff",
+        "-M",
+        "--unified=3",
+        `${anchor}..HEAD`,
+        "--",
+        ...files
+      ]);
+      const budget = 32000;
+      const text = `Changed files:
+${files.join(`
+`)}
+
+Stat:
+${stat}
+
+Hunks:
+${patch}`;
+      if (text.length <= budget)
+        return { head, text, unchanged: false, relevant: true };
+      const ranges = [...patch.matchAll(/^\+\+\+ b\/(.+)$|^@@ .* \+(\d+)(?:,(\d+))? @@/gm)];
+      return {
+        head,
+        unchanged: false,
+        relevant: true,
+        text: `Changed files and ranges (diff exceeds prompt budget):
+${files.join(`
+`)}
+${ranges.map((match) => match[1] ? `file: ${match[1]}` : `line: ${match[2]} +${match[3] ?? 1}`).join(`
+`).slice(0, budget)}
+
+Stat:
+${stat}`
+      };
+    }
     const excluded = [
       "ARCHITECTURE.md",
       "STRUCTURE.md",
@@ -7903,11 +8142,15 @@ function docsChangeSet(projectDir, storedAnchor) {
     const text = raw.slice(0, 24000);
     return {
       head,
+      unchanged: false,
+      relevant: true,
       text: `${text}${raw.length > text.length ? `
 [cut ${raw.length - text.length} bytes]` : ""}${commits.length > 201 ? `
 [cut commits beyond newest 200]` : ""}`
     };
-  } catch {
+  } catch (error) {
+    if (storedAnchor)
+      throw error;
     return null;
   }
 }
@@ -7941,7 +8184,7 @@ function diff(name, before, after) {
     writeFileSync3(join3(dir, "before"), before);
     writeFileSync3(join3(dir, "after"), after);
     try {
-      return execFileSync("git", ["diff", "--no-index", "--", join3(dir, "before"), join3(dir, "after")], { encoding: "utf8" });
+      return execFileSync("git", ["diff", "--no-index", "--", join3(dir, "before"), join3(dir, "after")], { windowsHide: true, encoding: "utf8" });
     } catch (error) {
       return error.stdout?.replaceAll(join3(dir, "before"), `a/${name}`).replaceAll(join3(dir, "after"), `b/${name}`) ?? "";
     }
@@ -8192,7 +8435,7 @@ function requestValidatedAddress(validation, candidate, options) {
         const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
         bytes += buf.byteLength;
         if (bytes > options.bodyLimitBytes) {
-          reject(new SmartNoteNetworkError("SMART_NOTE_NETWORK: response body too large", { terminal: true }));
+          reject(new SmartNoteNetworkError(`SMART_NOTE_NETWORK: response body too large at ${url.href} (received at least ${bytes} bytes; limit ${options.bodyLimitBytes})`, { terminal: true, persistent: true }));
           response.destroy();
           request2.destroy();
           return;
@@ -8529,6 +8772,7 @@ async function runGit(projectRoot, args, signal) {
   throwIfAborted2(signal);
   try {
     const result = await execFileAsync("git", ["-C", projectRoot, ...args], {
+      windowsHide: true,
       timeout: DEFAULT_GIT_TIMEOUT_MS,
       maxBuffer: 128 * 1024,
       signal
@@ -8691,6 +8935,7 @@ async function runCompiledSmartNoteCheckLocked(options, quickjs) {
   const controller = new AbortController;
   let externallyCancelled = false;
   let executionTimedOut = false;
+  let persistentNetworkFailure = false;
   const externalAbort = () => {
     externallyCancelled = true;
     controller.abort(options.signal?.reason);
@@ -8709,7 +8954,19 @@ async function runCompiledSmartNoteCheckLocked(options, quickjs) {
       context.runtime.setMemoryLimit(options.heapLimitBytes ?? DEFAULT_HEAP_LIMIT_BYTES);
       context.runtime.setMaxStackSize(options.stackLimitBytes ?? DEFAULT_STACK_LIMIT_BYTES);
       context.runtime.setInterruptHandler(() => controller.signal.aborted || Date.now() > deadline);
-      installCapabilityObject(context, capabilities);
+      installCapabilityObject(context, {
+        ...capabilities,
+        httpGet: async (url) => {
+          try {
+            return await capabilities.httpGet(url);
+          } catch (error) {
+            if (error instanceof SmartNoteNetworkError && error.persistent) {
+              persistentNetworkFailure = true;
+            }
+            throw error;
+          }
+        }
+      });
       disableAmbientDynamicCode(context);
       const result = await evalCheck(context, options.compiledCheck);
       const checkResult = result;
@@ -8723,14 +8980,14 @@ async function runCompiledSmartNoteCheckLocked(options, quickjs) {
   } catch (error) {
     if (externallyCancelled && !executionTimedOut)
       return cancelledResult(error);
-    return failureResult(formatSandboxError(error), isSmartNoteNetworkError(error));
+    return failureResult(formatSandboxError(error), isSmartNoteNetworkError(error), persistentNetworkFailure);
   } finally {
     clearTimeout(timer);
     options.signal?.removeEventListener("abort", externalAbort);
   }
 }
-function failureResult(error, network) {
-  return { ok: false, cancelled: false, error: truncate(error), network };
+function failureResult(error, network, persistent = false) {
+  return { ok: false, cancelled: false, error: truncate(error), network, persistent };
 }
 function cancelledResult(reason) {
   return {
@@ -8828,7 +9085,12 @@ var MAX_CRON_CHARS = 256;
 var MAX_COMPILER_ERROR_CHARS = 2 * 1024;
 async function compileSmartNoteCheck(args) {
   if (!args.note.surfaceCondition) {
-    return { ok: false, cancelled: false, error: "note has no surface condition" };
+    return {
+      ok: false,
+      cancelled: false,
+      error: "note has no surface condition",
+      persistent: false
+    };
   }
   const prompt = `Compile this smart note condition into a sandbox check.
 
@@ -8935,15 +9197,13 @@ Remember: output only the JSON object described by the system prompt.`;
     const compiledCheck = normalizeCompiledCheck(response.compiled_check);
     const manifest = normalizeManifest(response.manifest);
     const checkCron = normalizeCron(response.check_cron);
-    for (const warning of manifestAdvisoryWarnings(compiledCheck, manifest)) {
+    const dryRun = await dryRunSmartNoteCheck(compiledCheck, args.capabilityFactory, args.signal);
+    for (const warning of [
+      ...manifestAdvisoryWarnings(compiledCheck, manifest),
+      ...dryRun.advisories
+    ]) {
       log(`[dreamer] smart note #${args.note.id}: manifest advisory — ${warning}`);
     }
-    const dryRun = await runCompiledSmartNoteCheck({
-      compiledCheck,
-      capabilityFactory: args.capabilityFactory,
-      signal: args.signal,
-      timeoutMs: 2000
-    });
     if (!dryRun.ok) {
       const error = boundedError(`dry-run failed: ${dryRun.error}`);
       recordInvocation({
@@ -8951,7 +9211,12 @@ Remember: output only the JSON object described by the system prompt.`;
         messages: outputMessages,
         error
       });
-      return { ok: false, cancelled: dryRun.cancelled, error };
+      return {
+        ok: false,
+        cancelled: dryRun.cancelled,
+        error,
+        persistent: !dryRun.cancelled && dryRun.persistent
+      };
     }
     recordInvocation({ status: "completed", messages: outputMessages });
     return {
@@ -8966,7 +9231,7 @@ Remember: output only the JSON object described by the system prompt.`;
     const cancelled = args.signal.aborted;
     const message = boundedError(error instanceof Error ? error.message : String(error));
     recordInvocation({ status: cancelled ? "aborted" : "failed", error: message });
-    return { ok: false, cancelled, error: message };
+    return { ok: false, cancelled, error: message, persistent: false };
   } finally {
     if (args.client) {
       await teardownChildSession({
@@ -8981,6 +9246,29 @@ Remember: output only the JSON object described by the system prompt.`;
     }
   }
 }
+async function dryRunSmartNoteCheck(compiledCheck, capabilityFactory, signal) {
+  const responses = [];
+  const dryRun = await runCompiledSmartNoteCheck({
+    compiledCheck,
+    capabilityFactory: (runSignal) => {
+      const capabilities = capabilityFactory(runSignal);
+      return {
+        ...capabilities,
+        httpGet: async (url) => {
+          const response = await capabilities.httpGet(url);
+          responses.push({ url, status: response.status });
+          return response;
+        }
+      };
+    },
+    signal,
+    timeoutMs: 2000
+  });
+  const advisories = dryRun.ok && responses.length > 0 && responses.every(({ status }) => status === 401 || status === 403 || status === 404) ? [
+    `all HTTP sources currently return 401/403/404: ${responses.map(({ url, status }) => `${url} (HTTP ${status})`).join(", ")}`
+  ] : [];
+  return { ...dryRun, advisories };
+}
 function parseCompilerOutput(output) {
   if (!output)
     throw new Error("smart-note compiler returned no output");
@@ -9435,7 +9723,7 @@ async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld,
         expected: sourceRevisionExpectation(note),
         leaseHeld,
         write: () => {
-          markSmartNoteCompilationFailure(args.db, note.id, now, MAX_COMPILATION_FAILURES);
+          markSmartNoteCompilationFailure(args.db, note.id, now, MAX_COMPILATION_FAILURES, result.error, result.persistent);
         }
       });
       return false;
@@ -9806,7 +10094,7 @@ var MAP_MEMORIES_SYSTEM_PROMPT = `You are a memory mapper for the magic-context
 
 A memory's BACKING FILES are the file(s) whose code the memory makes a claim about — the files you would open to check whether the memory is accurate. You do NOT judge accuracy, rewrite, or remove anything. You only LOCATE backing files.
 
-Tools (read-only): read, grep, glob, aft_search, aft_outline, aft_zoom. Each memory may come with "Likely files" already named in it and confirmed to exist — confirm those FIRST (cheap) instead of searching. Use search/grep to FIND code only when no likely files are given. Do not guess — confirm a file exists and genuinely backs the memory before listing it. Keep reads minimal: you do not need to read a whole file to confirm it backs a one-line claim.
+Tools (read-only): read, grep, glob. Request line ranges rather than full files; use offset/limit for longer files. Each memory may come with "Likely files" already named in it and confirmed to exist — confirm those FIRST (cheap) instead of searching. Use search/grep to FIND code only when no likely files are given. Do not guess — confirm a file exists and genuinely backs the memory before listing it. Keep reads minimal: you do not need to read a whole file to confirm it backs a one-line claim.
 
 For each memory decide ONE of:
 - Backing files found → the COMPLETE set of repo-relative paths whose code the memory is about.
@@ -10063,6 +10351,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 },
         model: args.model,
         fallbackModels: args.fallbackModels,
         timeoutMs: sliceMs,
@@ -10103,7 +10392,10 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         parts: [{ type: "text", text: prompt, synthetic: true }]
       }
     }, {
-      transport: createPromptAsyncTransport(client, agentSessionId),
+      transport: createPromptAsyncTransport(client, agentSessionId, {
+        tokenBudget: args.tokenBudget,
+        onBudgetUpdate: args.onBudgetUpdate
+      }),
       timeoutMs: sliceMs,
       signal,
       fallbackModels: args.fallbackModels,
@@ -10143,7 +10435,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       error,
       messages: await readFailedChildMessages(args.client, agentSessionId, args.sessionDirectory)
     });
-    if (error instanceof DreamerModuleFailureError)
+    if (error instanceof DreamerModuleFailureError || error instanceof DreamTokenBudgetExceeded)
       throw error;
     if (signal.aborted)
       throw error;
@@ -10773,6 +11065,7 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
         prompt,
         title: "magic-context-dream-refresh-primers",
         callContext: "dreamer:refresh-primers",
+        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate: args.onBudgetUpdate },
         model: args.model,
         fallbackModels: args.fallbackModels,
         language: args.language,
@@ -10822,6 +11115,10 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       signal,
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:refresh-primers",
+      transport: createPromptAsyncTransport(client, agentSessionId, {
+        tokenBudget: args.tokenBudget,
+        onBudgetUpdate: args.onBudgetUpdate
+      }),
       fetchOutput: async () => {
         const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
@@ -11034,12 +11331,14 @@ class OpenCodeRetrospectiveRawProvider {
     this.openDb = deps.openOpenCodeDb ?? openOpenCodeDb;
   }
   listProjectSessions(projectIdentity) {
-    const rows = this.deps.contextDb.prepare(`SELECT sp.session_id, sp.updated_at
+    const rows = this.deps.contextDb.prepare(`SELECT sp.session_id, CAST(activity.value AS INTEGER) AS updated_at
                    FROM session_projects sp
+                   JOIN schema_migrations_meta activity
+                     ON activity.key = 'retrospective_activity:' || sp.session_id
                    LEFT JOIN session_meta m ON m.session_id = sp.session_id
                   WHERE sp.project_path = ? AND sp.harness = 'opencode'
                     AND COALESCE(m.is_subagent, 0) = 0
-                  ORDER BY sp.updated_at ASC, sp.session_id ASC`).all(projectIdentity);
+                  ORDER BY updated_at ASC, sp.session_id ASC`).all(projectIdentity);
     return rows.map((row) => ({
       sessionId: row.session_id,
       updatedAt: typeof row.updated_at === "number" ? row.updated_at : undefined
@@ -11058,15 +11357,13 @@ class OpenCodeRetrospectiveRawProvider {
     const db = this.resolveDb();
     if (!db)
       return { messages: [], truncated: false };
-    try {
-      return readOpenCodeMessagesSince(db, sessionId, sinceMs, capPerSession);
-    } catch {
-      return { messages: [], truncated: false };
-    }
+    return readOpenCodeMessagesSince(db, sessionId, sinceMs, capPerSession);
   }
   readOldestMessageTimesSince(sessionIds, sinceMs) {
     const db = this.resolveDb();
-    if (!db || sessionIds.length === 0)
+    if (!db)
+      return null;
+    if (sessionIds.length === 0)
       return new Map;
     return readOpenCodeOldestMessageTimesSince(db, sessionIds, sinceMs);
   }
@@ -11163,6 +11460,11 @@ async function readRetrospectiveScanWindow(provider, projectIdentity, watermarkM
     }
     const droppedSince = [...budgetDropped, ...countDropped];
     let maxScannedTs = scanSinceMs;
+    if (oldestBySession && sinceReads.every((read) => read.messages.length === 0)) {
+      for (const { session } of eligibleSessions) {
+        maxScannedTs = Math.max(maxScannedTs, session.updatedAt ?? scanSinceMs);
+      }
+    }
     for (const row of keptSince) {
       if (row.ts > maxScannedTs)
         maxScannedTs = row.ts;
@@ -11454,6 +11756,127 @@ function insertDreamRun(db, run) {
 // ../plugin/src/features/magic-context/dreamer/verify.ts
 import { createHash as createHash9 } from "node:crypto";
 
+// ../plugin/src/features/magic-context/dreamer/verify-diff.ts
+import { execFile as execFile2 } from "node:child_process";
+import { promisify as promisify2 } from "node:util";
+var exec = promisify2(execFile2);
+var VERIFY_DIFF_BUDGET_TOKENS = 12000;
+var MAX_DIFF_BYTES = 4 * 1024 * 1024;
+async function git2(root, args) {
+  const { stdout } = await exec("git", args, {
+    cwd: root,
+    timeout: 1e4,
+    maxBuffer: MAX_DIFF_BYTES,
+    encoding: "utf8"
+  });
+  return stdout;
+}
+async function buildVerifyDiffEvidence(directory, memories) {
+  const root = await resolveGitTopLevel(directory);
+  const head = root && await readGitHead(root);
+  if (!root || !head || memories.some((m) => !m.verifiedAt))
+    return null;
+  try {
+    const bases = new Map;
+    for (const memory of memories) {
+      const at = memory.verifiedAt;
+      if (!at)
+        return null;
+      const base = memory.verifiedCommit ?? (await git2(root, [
+        "rev-list",
+        "-1",
+        `--before=${new Date(at).toISOString()}`,
+        head
+      ])).trim();
+      if (!/^[0-9a-f]{40}$/i.test(base))
+        return null;
+      bases.set(memory.id, base);
+    }
+    const grouped = new Map;
+    for (const memory of memories) {
+      const at = memory.verifiedAt;
+      const base = bases.get(memory.id);
+      if (!at || !base)
+        return null;
+      for (const file of memory.mappedFiles) {
+        if (!file || file.startsWith("/") || file.split("/").includes(".."))
+          return null;
+        const previous = grouped.get(file);
+        if (!previous)
+          grouped.set(file, {
+            base,
+            time: at,
+            ids: [memory.id]
+          });
+        else {
+          previous.ids.push(memory.id);
+          if (at < previous.time) {
+            previous.time = at;
+            previous.base = base;
+          }
+        }
+      }
+    }
+    const files = [];
+    const namesByBase = new Map;
+    for (const [file, group] of grouped) {
+      let names = namesByBase.get(group.base);
+      if (names === undefined) {
+        names = await git2(root, ["diff", "-M", "--name-status", group.base, head]);
+        namesByBase.set(group.base, names);
+      }
+      const rename = names.split(`
+`).map((line) => line.split("\t")).find((parts) => parts[0]?.startsWith("R") && parts[1] === file);
+      const paths = rename ? [file, rename[2]] : [file];
+      const committed = await git2(root, [
+        "diff",
+        "-M",
+        "--no-ext-diff",
+        group.base,
+        head,
+        "--",
+        ...paths
+      ]);
+      const pending = await git2(root, ["diff", "-M", "--no-ext-diff", head, "--", ...paths]);
+      const status = rename ? `RENAMED ${file} -> ${rename[2]}
+` : names.split(`
+`).some((line) => line === `D	${file}`) ? `DELETED ${file}
+` : "";
+      files.push({
+        path: file,
+        memoryIds: group.ids,
+        text: `${status}${committed}${pending ? `
+Uncommitted changes:
+${pending}` : ""}` || "No changed hunks in mapped file."
+      });
+    }
+    const size = files.reduce((sum, file) => sum + file.text.length, 0);
+    if (size <= VERIFY_DIFF_BUDGET_TOKENS * 3)
+      return { head, mode: "diff", files };
+    return {
+      head,
+      mode: "ranges",
+      files: files.map((file) => {
+        const headers = file.text.split(`
+`).filter((line) => /^(?:@@|diff --git|rename |deleted file mode|new file mode|RENAMED|DELETED|Uncommitted changes:)/.test(line));
+        const lines = file.text.split(`
+`);
+        const added = lines.filter((line) => line.startsWith("+") && !line.startsWith("+++")).length;
+        const removed = lines.filter((line) => line.startsWith("-") && !line.startsWith("---")).length;
+        return {
+          ...file,
+          text: `Changed lines: +${added}/-${removed}.
+${headers.join(`
+`)}
+Read only these changed line ranges if they may affect the claim.`
+        };
+      })
+    };
+  } catch {
+    return null;
+  }
+}
+
 // ../plugin/src/features/magic-context/dreamer/verify-gate.ts
 import path5 from "node:path";
 function minOf(values) {
@@ -11488,12 +11911,24 @@ async function partitionVerifyScope(args) {
   const active = getMemoriesByProject(args.db, args.projectIdentity);
   const verById = getMemoryVerifications(args.db, active.map((m) => m.id));
   const candidates = active.filter((m) => (verById.get(m.id)?.files.length ?? 0) > 0);
-  const toPrompt = (m) => ({
-    id: m.id,
-    category: m.category,
-    content: m.content,
-    mappedFiles: verById.get(m.id)?.files ?? []
-  });
+  const toPrompt = (m) => {
+    const verifiedAt = verById.get(m.id)?.verifiedAt ?? 0;
+    let verifiedCommit = null;
+    try {
+      const metadata = JSON.parse(m.metadataJson ?? "{}");
+      if (metadata.dreamerVerifiedAt === verifiedAt && typeof metadata.dreamerVerifiedCommit === "string" && /^[0-9a-f]{40}$/i.test(metadata.dreamerVerifiedCommit)) {
+        verifiedCommit = metadata.dreamerVerifiedCommit;
+      }
+    } catch {}
+    return {
+      id: m.id,
+      category: m.category,
+      content: m.content,
+      mappedFiles: verById.get(m.id)?.files ?? [],
+      verifiedAt,
+      verifiedCommit
+    };
+  };
   if (args.forceBroad) {
     const broadCycleStartAt = ensureBroadCycleStart({
       db: args.db,
@@ -11573,9 +12008,9 @@ async function partitionVerifyScope(args) {
 // ../plugin/src/features/magic-context/dreamer/verify-prompt.ts
 var VERIFY_SYSTEM_PROMPT = `You are a memory verifier for the magic-context system. You verify project memories against the CURRENT code.
 
-Each memory below comes with its backing file(s) — the code it makes a claim about. For EACH memory: read its backing files (you may read more if needed) and decide whether the memory is still accurate.
+Each memory below comes with its backing file(s) — the code it makes a claim about. For EACH memory: use the provided git diff as evidence when present. If no diff is supplied, read its backing files (you may read more if needed) and decide whether the memory is still accurate.
 
-Tools (read-only): read, grep, glob, aft_search, aft_outline, aft_zoom. You read code to check claims; you change nothing.
+Tools (read-only): read, grep, glob. Request line ranges and keep reads short. You read code only when the evidence requires it; you change nothing.
 
 Decide ONE of four outcomes per memory:
 - VERIFIED — still accurate. Keep it as-is.
@@ -11600,7 +12035,7 @@ Rules:
 - Every input memory id MUST appear exactly once, in exactly one of verified/update/archive/skip.
 - files = the COMPLETE current backing set (repo-relative, comma-separated). It may differ from the given mapping if a file moved — record what you actually verified against.
 - Default to VERIFIED. skip when code cannot decide the claim. update and archive are the exceptions, not the norm.`;
-function buildVerifyPrompt(projectPath, memories) {
+function buildVerifyPrompt(projectPath, memories, evidence) {
   const list = memories.map((m) => `[${m.id}] ${m.category}
 Content: ${m.content}
 Backing files: ${m.mappedFiles.join(", ")}`).join(`
@@ -11610,11 +12045,18 @@ Backing files: ${m.mappedFiles.join(", ")}`).join(`
 
 Project: ${projectPath}
 
-Read each memory's backing files, decide verified / update / archive / skip (default verified; behavioral directives only permit verified or skip), then output ONE <verify> manifest covering every id.
+${evidence ? "The git diff below is the evidence. If changed hunks do not touch a claim, mark it verified without opening files. Open files only when a diff suggests the claim may have changed. A rename or deletion requires an update or archive when positively supported; do not archive on uncertainty." : "Read each memory's backing files to check its claims."} Decide verified / update / archive / skip (default verified; behavioral directives only permit verified or skip), then output ONE <verify> manifest covering every id.
 
 <memories>
 ${list}
-</memories>`;
+</memories>${evidence ? `
+
+<changed-files mode="${evidence.mode}">
+${evidence.files.map((file) => `File: ${file.path} (memories: ${file.memoryIds.join(", ")})
+${file.text}`).join(`
+
+`)}
+</changed-files>` : ""}`;
 }
 function attrOf(s, name) {
   const m = s.match(new RegExp(`\\b${name}\\s*=\\s*"([^"]*)"`));
@@ -11738,8 +12180,11 @@ async function runVerify(args) {
     return result;
   }
   const batches = [];
-  for (let i = 0;i < gate.inScope.length; i += VERIFY_BATCH_SIZE) {
-    batches.push(gate.inScope.slice(i, i + VERIFY_BATCH_SIZE));
+  const groups = !args.forceBroad && gate.mode === "incremental" ? [gate.inScope.filter((m) => m.verifiedAt), gate.inScope.filter((m) => !m.verifiedAt)] : [gate.inScope];
+  for (const group of groups) {
+    for (let i = 0;i < group.length; i += VERIFY_BATCH_SIZE) {
+      batches.push(group.slice(i, i + VERIFY_BATCH_SIZE));
+    }
   }
   const abortController = new AbortController;
   const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, (reason) => abortController.abort(new Error(reason)), args.leaseAcquisition);
@@ -11803,7 +12248,9 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
-    const prompt = buildVerifyPrompt(args.projectIdentity, batch);
+    const headAtPrompt = await readGitHead(args.sessionDirectory);
+    const evidence = !args.forceBroad && batch.every((m) => m.verifiedAt) ? await buildVerifyDiffEvidence(args.sessionDirectory, batch) : null;
+    const prompt = buildVerifyPrompt(args.projectIdentity, batch, evidence);
     if (args.hiddenCompletionExecutor) {
       const run = await runHiddenSingleShotPrompt({
         executor: args.hiddenCompletionExecutor,
@@ -11814,6 +12261,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         prompt,
         title: "magic-context-dream-verify",
         callContext: "dreamer:verify",
+        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate: args.onBudgetUpdate },
         model: args.model,
         fallbackModels: args.fallbackModels,
         language: args.language,
@@ -11830,7 +12278,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         status: "completed",
         messages: run.completion.messages ?? []
       });
-      return applyParsedVerifyManifest(args, batch, run.validated);
+      return applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt);
     }
     const client = args.client;
     if (!client)
@@ -11858,7 +12306,10 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         parts: [{ type: "text", text: prompt, synthetic: true }]
       }
     }, {
-      transport: createPromptAsyncTransport(client, agentSessionId),
+      transport: createPromptAsyncTransport(client, agentSessionId, {
+        tokenBudget: args.tokenBudget,
+        onBudgetUpdate: args.onBudgetUpdate
+      }),
       timeoutMs: sliceMs,
       signal,
       fallbackModels: args.fallbackModels,
@@ -11887,7 +12338,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);
+    return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt);
   } catch (error) {
     const desc = describeError(error);
     const providerFailure = error instanceof DreamerProviderOutputFailureError ? error : undefined;
@@ -11898,7 +12349,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       error,
       messages: await readFailedChildMessages(args.client, agentSessionId, args.sessionDirectory)
     });
-    if (error instanceof DreamerModuleFailureError || signal.aborted)
+    if (error instanceof DreamerModuleFailureError || error instanceof DreamTokenBudgetExceeded || signal.aborted)
       throw error;
     if (promptFailure?.failureClass === "provider_timeout" || isPromptTimeoutError(error)) {
       return {
@@ -11933,7 +12384,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       });
   }
 }
-async function applyParsedVerifyManifest(args, batch, parsed) {
+async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt) {
   const batchIds = new Set(batch.map((m) => m.id));
   const batchById = new Map(batch.map((memory) => [memory.id, memory]));
   const valid = {
@@ -11960,6 +12411,7 @@ async function applyParsedVerifyManifest(args, batch, parsed) {
     return { verified: 0, updated: 0, archived: 0, skipped: 0, refused: 0 };
   }
   const now = Date.now();
+  const verifiedHead = headAtPrompt === undefined ? await readGitHead(args.sessionDirectory) : headAtPrompt;
   const writes = [];
   let refused = 0;
   const skipped = valid.skipped.length;
@@ -12071,6 +12523,8 @@ async function applyParsedVerifyManifest(args, batch, parsed) {
         continue;
       if (w.kind === "verify") {
         recordMemoryVerifications(args.db, w.id, w.files, now);
+        if (verifiedHead)
+          recordVerifiedCommit(args.db, memory, now, verifiedHead);
         verified += 1;
       } else if (w.kind === "update") {
         rewriteMemoryContent(args.db, memory, w.content, w.hash);
@@ -12095,6 +12549,15 @@ async function applyParsedVerifyManifest(args, batch, parsed) {
   });
   return { verified, updated, archived, skipped, refused };
 }
+function recordVerifiedCommit(db, memory, at, head) {
+  let metadata = {};
+  try {
+    const parsed = JSON.parse(memory.metadataJson ?? "{}");
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed))
+      metadata = parsed;
+  } catch {}
+  db.prepare("UPDATE memories SET metadata_json = ? WHERE id = ?").run(JSON.stringify({ ...metadata, dreamerVerifiedAt: at, dreamerVerifiedCommit: head }), memory.id);
+}
 async function normalizeFiles(args, rawFiles) {
   if (rawFiles.length === 0)
     return [];
@@ -12152,6 +12615,16 @@ function dreamRunFailureDetail(error) {
   }
   const described = describeError(error);
   const message = described.brief;
+  if (error instanceof DreamTokenBudgetExceeded) {
+    return {
+      failure_class: "token_budget",
+      model_attempted: null,
+      models_tried: [],
+      provider_error: null,
+      timeout_ms: null,
+      child_session_id: error.sessionId
+    };
+  }
   if (error instanceof Error && error.name === "HiddenAgentStepLimit") {
     return {
       failure_class: "step_limit",
@@ -12196,7 +12669,10 @@ function toCuratePromptMemory(memory, verificationById) {
     category: memory.category,
     content: memory.content,
     mappedFiles: verification?.files ?? [],
-    hasNoFileSentinel: verification?.hasSentinel ?? false
+    hasNoFileSentinel: verification?.hasSentinel ?? false,
+    importance: memory.importance,
+    retrievalCount: memory.retrievalCount,
+    seenCount: memory.seenCount
   };
 }
 function loadActiveMemoryPromptMemories(db, projectIdentity) {
@@ -12236,7 +12712,10 @@ function inspectCurateMemoryOperations(messages) {
       if (!isRecord(part.state) || part.state.status !== "completed")
         continue;
       const input = isRecord(part.state.input) ? part.state.input : null;
-      summary.completedActions.push(typeof input?.action === "string" ? input.action : "unknown");
+      const action = input?.action;
+      const output = typeof part.state.output === "string" ? part.state.output : "";
+      if (output === "completed" && (action === "merge" || action === "archive" || action === "update") || action === "merge" && output.startsWith("Merged memories") || action === "archive" && output.startsWith("Archived memor") || action === "update" && output.startsWith("Updated memory"))
+        summary.completedActions.push(action);
     }
   }
   return summary;
@@ -12284,6 +12763,7 @@ function createDreamTaskExecutor(deps) {
   };
   return async (config, ctx) => {
     const { db, projectIdentity, holderId, leaseKey } = ctx;
+    deps.client?.resetDreamTokenBudget?.(config.task);
     const startedAt = Date.now();
     const leaseAcquisition = ctx.leaseAcquisition ?? acquireLeaseWithAcquisition(db, holderId, leaseKey) ?? (() => {
       throw new Error("Dream lease unavailable during executor setup");
@@ -12342,8 +12822,23 @@ function createDreamTaskExecutor(deps) {
     if (!leaseOwnershipMatches(db, holderId, leaseAcquisition.generation, leaseKey)) {
       throw new Error("Dream lease lost during executor setup");
     }
+    let budgetSpent = 0;
+    let budgetFinalized = false;
+    const childSpending = new Map;
+    const onBudgetUpdate = (state) => {
+      if (state.sessionId) {
+        const previous = childSpending.get(state.sessionId) ?? 0;
+        budgetSpent += Math.max(0, state.spent - previous);
+        childSpending.set(state.sessionId, state.spent);
+      } else
+        budgetSpent = Math.max(budgetSpent, state.spent);
+      budgetFinalized ||= state.finalizeFired;
+    };
     const recordRun = (status, error, extra) => {
       try {
+        const hostBudget = deps.readTokenBudget?.(config.task) ?? deps.client?.readTokenBudget?.(config.task);
+        if (hostBudget)
+          onBudgetUpdate(hostBudget);
         insertDreamRun(db, {
           projectPath: projectIdentity,
           startedAt,
@@ -12359,6 +12854,14 @@ function createDreamTaskExecutor(deps) {
                 failure: extra?.failure ?? dreamRunFailureDetail(error ?? "unknown dreamer failure")
               } : {},
               ...extra?.progress ? { progress: extra.progress } : {},
+              ...config.tokenBudget ? {
+                tokenBudget: {
+                  budget: config.tokenBudget,
+                  spent: budgetSpent,
+                  finalizeFired: budgetFinalized,
+                  banked: extra?.banked ?? processedDreamTaskItems(backlogAtStart.pending, (extra?.backlogAfter ?? getDreamTaskBacklog(db, projectIdentity, config.task)).pending)
+                }
+              } : {},
               backlog: (() => {
                 const end = extra?.backlogAfter ?? getDreamTaskBacklog(db, projectIdentity, config.task);
                 const processed = processedDreamTaskItems(backlogAtStart.pending, end.pending);
@@ -12449,7 +12952,7 @@ function createDreamTaskExecutor(deps) {
           leaseKey,
           deadline,
           leaseAcquisition,
-          promotionThreshold: config.promotionThreshold ?? 3,
+          promotionThreshold: config.promotionThreshold ?? DREAM_TASK_PROMOTION_DEFAULTS["review-user-memories"],
           model: config.model,
           fallbackModels: config.fallbackModels,
           language: config.language ?? deps.language
@@ -12473,6 +12976,8 @@ function createDreamTaskExecutor(deps) {
           model: config.model,
           fallbackModels: config.fallbackModels,
           moduleRoute,
+          tokenBudget: config.tokenBudget,
+          onBudgetUpdate,
           onProgress: (processed) => reportProgress(processed)
         });
         log(`[dreamer] map-memories: committed=${result.mapped + result.independent} mapped=${result.mapped} independent=${result.independent} batches=${result.batches} remaining=${result.remaining} complete=${result.complete}${result.stopReason ? ` stop_reason=${result.stopReason}` : ""}`);
@@ -12513,6 +13018,8 @@ function createDreamTaskExecutor(deps) {
           fallbackModels: config.fallbackModels,
           language: config.language ?? deps.language,
           moduleRoute,
+          tokenBudget: config.tokenBudget,
+          onBudgetUpdate,
           onProgress: (processed, refused) => reportProgress(processed, refused)
         });
         const processed = result.verified + result.updated + result.archived + result.skipped + result.refused;
@@ -12524,7 +13031,8 @@ function createDreamTaskExecutor(deps) {
             recordRun("completed", null, {
               progress: broadProgress,
               memoryChanges: computeMemoryDelta(memoryBefore),
-              backlogAfter
+              backlogAfter,
+              banked: result.verified + result.updated + result.archived
             });
             return { status: "completed" };
           }
@@ -12533,14 +13041,16 @@ function createDreamTaskExecutor(deps) {
           recordRun("failed", error, {
             progress: verificationProgress,
             memoryChanges: computeMemoryDelta(memoryBefore),
-            backlogAfter
+            backlogAfter,
+            banked: result.verified + result.updated + result.archived
           });
           return { status: "failed", transient: !batchTimedOut, error };
         }
         recordRun("completed", null, {
           progress: verificationProgress,
           memoryChanges: computeMemoryDelta(memoryBefore),
-          backlogAfter
+          backlogAfter,
+          banked: result.verified + result.updated + result.archived
         });
         return { status: "completed" };
       }
@@ -12592,7 +13102,7 @@ function createDreamTaskExecutor(deps) {
           leaseKey,
           deadline,
           leaseAcquisition,
-          promotionThreshold: config.promotionThreshold ?? 2,
+          promotionThreshold: config.promotionThreshold ?? DREAM_TASK_PROMOTION_DEFAULTS["promote-primers"],
           ensureProjectRegistered: deps.ensureProjectRegistered
         });
         recordRun("completed", null);
@@ -12615,6 +13125,8 @@ function createDreamTaskExecutor(deps) {
           fallbackModels: config.fallbackModels,
           language: config.language ?? deps.language,
           rawProviderFactory: deps.primerRawProviderFactory,
+          tokenBudget: config.tokenBudget,
+          onBudgetUpdate,
           onProgress: (processed) => reportProgress(processed)
         });
         recordRun("completed", null);
@@ -12645,6 +13157,7 @@ function createDreamTaskExecutor(deps) {
       if (config.task === "retrospective") {
         const memoryBefore = getMemoryCountsByStatus(db, projectIdentity);
         const retro = await runRetrospectiveTask(config, ctx, {
+          onBudgetUpdate,
           deps,
           deadline,
           parent,
@@ -12652,7 +13165,10 @@ function createDreamTaskExecutor(deps) {
           moduleRoute
         });
         recordRun("completed", null, {
-          memoryChanges: computeMemoryDelta(memoryBefore)
+          memoryChanges: computeMemoryDelta(memoryBefore),
+          backlogAfter: retro.retrospectiveWatermarkMs == null ? undefined : getDreamTaskBacklog(db, projectIdentity, "retrospective", {
+            retrospectiveWatermarkMs: retro.retrospectiveWatermarkMs
+          })
         });
         return {
           status: "completed",
@@ -12665,6 +13181,7 @@ function createDreamTaskExecutor(deps) {
         };
       }
       return await runAgenticTask(config, ctx, {
+        onBudgetUpdate,
         deps,
         deadline,
         parent,
@@ -12675,6 +13192,9 @@ function createDreamTaskExecutor(deps) {
         moduleRoute
       });
     } catch (error) {
+      if (error instanceof DreamTokenBudgetExceeded) {
+        budgetSpent = Math.max(budgetSpent, error.spent);
+      }
       const classified = classifyFailure(error);
       const retrospectiveOverflow = error instanceof RetrospectivePromptOverflowError ? error : null;
       const transient = retrospectiveOverflow ? true : classified.transient;
@@ -12833,7 +13353,7 @@ function resolveRetrospectiveUsableInputTokens(config, deps) {
 }
 async function runRetrospectiveTask(config, ctx, helpers) {
   const { db, projectIdentity, holderId, leaseKey } = ctx;
-  const { deps, deadline, parent } = helpers;
+  const { deps, deadline, parent, onBudgetUpdate } = helpers;
   const provider = resolveRetrospectiveProvider(deps, db, projectIdentity);
   if (!provider) {
     log("[dreamer] retrospective: no raw provider available — clean no-op");
@@ -12887,7 +13407,8 @@ async function runRetrospectiveTask(config, ctx, helpers) {
         ],
         timeoutMs: Math.max(1, deadline - Date.now()),
         title: "magic-context-dream-retrospective",
-        directory: deps.sessionDirectory
+        directory: deps.sessionDirectory,
+        metadata: { tokenBudget: config.tokenBudget, onBudgetUpdate }
       });
       childSessionId = hiddenHandle.id;
     } else {
@@ -12923,6 +13444,12 @@ async function runRetrospectiveTask(config, ctx, helpers) {
         signal: abortController.signal,
         fallbackModels: config.fallbackModels,
         callContext: "dreamer:retrospective",
+        ...!hiddenHandle && deps.client ? {
+          transport: createPromptAsyncTransport(deps.client, sessionId, {
+            tokenBudget: config.tokenBudget,
+            onBudgetUpdate
+          })
+        } : {},
         ...hiddenHandle && deps.hiddenCompletionExecutor ? {
           transport: Object.assign((request) => deps.hiddenCompletionExecutor?.attempt(hiddenHandle, request) ?? Promise.reject(new Error("Hidden transport unavailable")), { childSessionId: hiddenHandle.childSessionId })
         } : {},
@@ -13098,7 +13625,7 @@ async function runRetrospectiveTask(config, ctx, helpers) {
 }
 async function runAgenticTask(config, ctx, helpers) {
   const { db, projectIdentity, holderId, leaseKey } = ctx;
-  const { deps, deadline, parent } = helpers;
+  const { deps, deadline, parent, onBudgetUpdate } = helpers;
   const task = config.task;
   const docsDir = deps.sessionDirectory;
   const invocationStartedAt = Date.now();
@@ -13152,122 +13679,178 @@ async function runAgenticTask(config, ctx, helpers) {
         return { status: "completed", detail: progress };
       }
     }
-    if (task === "maintain-docs" && (hasCurrentDocsProposal(docsDir) || !changes)) {
-      const reason = hasCurrentDocsProposal(docsDir) ? "pending proposal matches current docs" : "no relevant commits or no git repository";
-      log(`[dreamer] maintain-docs skipped: ${reason}`);
+    if (task === "maintain-docs" && !changes) {
+      const reason = "no relevant commits or no git repository";
       helpers.recordRun("completed", null, { progress: reason });
       return { status: "completed", detail: reason };
     }
-    const taskPrompt = buildDreamTaskPrompt(task, {
-      projectPath: projectIdentity,
-      lastDreamAt: lastRunAt ? String(lastRunAt) : null,
-      existingDocs,
-      docsChangeSet: changes?.text,
-      docsBudget: config.docsMaxTokens ?? 12000,
-      docsCurrentTokens: maintainDocsSnapshot ? Math.ceil([...maintainDocsSnapshot.values()].join("").length / 3.5) : 0,
-      curate: curateMemories && curateCategory ? { category: curateCategory, memories: curateMemories } : undefined
-    });
-    let run;
-    if (deps.hiddenCompletionExecutor) {
-      const hidden = await runHiddenSingleShotPrompt({
-        executor: deps.hiddenCompletionExecutor,
-        parentSessionId: parent ?? undefined,
-        sessionDirectory: docsDir,
-        agent: task === "maintain-docs" ? DREAMER_DOCS_AGENT : DREAMER_AGENT,
-        system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : CURATE_SYSTEM_PROMPT,
-        prompt: taskPrompt,
-        title: `magic-context-dream-${task}`,
-        callContext: `dreamer:${task}`,
-        allowEmpty: task === "curate",
-        model: config.model,
-        fallbackModels: config.fallbackModels,
-        language: task === "curate" ? config.language ?? deps.language : undefined,
-        timeoutMs: Math.min(Math.max(0, deadline - Date.now()), config.timeoutMinutes * 60 * 1000),
-        signal: abortController.signal,
-        parse: (text, completion) => {
-          if (task !== "curate")
-            return text;
-          const memoryOperations = inspectCurateMemoryOperations(completion.messages);
-          if (text)
-            validateCurateAssistantText(text);
-          if (memoryOperations.totalCalls > 0 && memoryOperations.completedActions.length === 0)
-            throw new Error("Curate returned no completed ctx_memory tool result.");
-          if (!text && memoryOperations.completedActions.length === 0)
-            throw new Error("Dreamer returned no assistant output.");
-          return { text: text || null, memoryOperations };
-        }
-      });
-      childSessionId = hidden.childSessionId;
-      run = { output: hidden.completion.messages ?? [], validated: hidden.validated };
-      promptSettled = true;
-    } else {
-      const createResponse = await createChildSessionWithFence({
-        client: requireDreamClient(deps.client),
-        db,
-        parentSessionId: parent ?? undefined,
-        title: `magic-context-dream-${task}`,
-        directory: docsDir
-      });
-      const created = normalizeSDKResponse(createResponse, null, {
-        preferResponseOnMissingData: true
+    if (task === "maintain-docs" && changes && (changes.unchanged || !changes.relevant)) {
+      const reason = changes.unchanged ? "no commits since last run" : "diff does not describe a documented area";
+      helpers.recordRun("completed", null, { progress: reason });
+      return {
+        status: "completed",
+        detail: reason,
+        schedulePatch: { taskStateJson: JSON.stringify({ head: changes.head }) }
+      };
+    }
+    if (task === "maintain-docs" && hasCurrentDocsProposal(docsDir)) {
+      const reason = "pending proposal matches current docs";
+      helpers.recordRun("completed", null, { progress: reason });
+      return {
+        status: "completed",
+        detail: reason,
+        ...changes ? { schedulePatch: { taskStateJson: JSON.stringify({ head: changes.head }) } } : {}
+      };
+    }
+    const curateChunks = curateMemories ? chunkCurateMemories(curateMemories, Math.max(4000, Math.floor(resolveRetrospectiveUsableInputTokens(config, deps) * 2))) : [];
+    const batches = task === "curate" ? curateChunks : [{ memories: [], crossChunkCandidates: [] }];
+    const completedActions = [];
+    let curateRefused = 0;
+    let run = {
+      output: [],
+      validated: ""
+    };
+    for (const batch of batches) {
+      const taskPrompt = buildDreamTaskPrompt(task, {
+        projectPath: projectIdentity,
+        lastDreamAt: lastRunAt ? String(lastRunAt) : null,
+        existingDocs,
+        docsChangeSet: changes?.text,
+        docsContents: task === "maintain-docs" ? {
+          architecture: existingDocs?.architecture ? readFileSync5(`${docsDir}/ARCHITECTURE.md`, "utf8") : "(missing)",
+          structure: existingDocs?.structure ? readFileSync5(`${docsDir}/STRUCTURE.md`, "utf8") : "(missing)"
+        } : undefined,
+        docsBudget: config.docsMaxTokens ?? 12000,
+        docsCurrentTokens: maintainDocsSnapshot ? Math.ceil([...maintainDocsSnapshot.values()].join("").length / 3.5) : 0,
+        curate: curateMemories && curateCategory ? {
+          category: curateCategory,
+          memories: batch.memories,
+          crossChunkCandidates: batch.crossChunkCandidates
+        } : undefined
       });
-      childSessionId = typeof created?.id === "string" ? created.id : null;
-      if (!childSessionId)
-        throw new Error("Dreamer could not create its child session.");
-      const sessionId = childSessionId;
-      const remainingMs = Math.max(0, deadline - Date.now());
-      run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
-        path: { id: sessionId },
-        query: { directory: docsDir },
-        body: {
+      if (deps.hiddenCompletionExecutor) {
+        const hidden = await runHiddenSingleShotPrompt({
+          executor: deps.hiddenCompletionExecutor,
+          parentSessionId: parent ?? undefined,
+          sessionDirectory: docsDir,
           agent: task === "maintain-docs" ? DREAMER_DOCS_AGENT : DREAMER_AGENT,
-          system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : withContentLanguageDirective(CURATE_SYSTEM_PROMPT, config.language ?? deps.language),
-          ...modelBodyField(config.model),
-          parts: [{ type: "text", text: taskPrompt, synthetic: true }]
-        }
-      }, {
-        timeoutMs: Math.min(remainingMs, config.timeoutMinutes * 60 * 1000),
-        signal: abortController.signal,
-        fallbackModels: config.fallbackModels,
-        callContext: `dreamer:${task}`,
-        fetchOutput: async () => {
-          const messagesResponse = await requireDreamClient(deps.client).session.messages({
-            path: { id: sessionId },
-            query: {
-              directory: docsDir,
-              ...task === "curate" ? {} : { limit: 50 }
+          system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : CURATE_SYSTEM_PROMPT,
+          prompt: taskPrompt,
+          title: `magic-context-dream-${task}`,
+          callContext: `dreamer:${task}`,
+          metadata: { tokenBudget: config.tokenBudget, onBudgetUpdate },
+          allowEmpty: task === "curate",
+          model: config.model,
+          fallbackModels: config.fallbackModels,
+          language: task === "curate" ? config.language ?? deps.language : undefined,
+          timeoutMs: Math.min(Math.max(0, deadline - Date.now()), config.timeoutMinutes * 60 * 1000),
+          signal: abortController.signal,
+          parse: (text, completion) => {
+            if (task !== "curate")
+              return text;
+            const memoryOperations = inspectCurateMemoryOperations(completion.messages);
+            if (text)
+              validateCurateAssistantText(text);
+            if (memoryOperations.totalCalls > 0 && memoryOperations.completedActions.length === 0)
+              throw new Error("Curate returned no completed ctx_memory tool result.");
+            if (!text && memoryOperations.completedActions.length === 0)
+              throw new Error("Dreamer returned no assistant output.");
+            return { text: text || null, memoryOperations };
+          }
+        });
+        childSessionId = hidden.childSessionId;
+        run = { output: hidden.completion.messages ?? [], validated: hidden.validated };
+        promptSettled = true;
+      } else {
+        const createResponse = await createChildSessionWithFence({
+          client: requireDreamClient(deps.client),
+          db,
+          parentSessionId: parent ?? undefined,
+          title: `magic-context-dream-${task}`,
+          directory: docsDir
+        });
+        const created = normalizeSDKResponse(createResponse, null, {
+          preferResponseOnMissingData: true
+        });
+        childSessionId = typeof created?.id === "string" ? created.id : null;
+        if (!childSessionId)
+          throw new Error("Dreamer could not create its child session.");
+        const sessionId = childSessionId;
+        const remainingMs = Math.max(0, deadline - Date.now());
+        run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
+          path: { id: sessionId },
+          query: { directory: docsDir },
+          body: {
+            agent: task === "maintain-docs" ? DREAMER_DOCS_AGENT : DREAMER_AGENT,
+            system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : withContentLanguageDirective(CURATE_SYSTEM_PROMPT, config.language ?? deps.language),
+            ...modelBodyField(config.model),
+            parts: [{ type: "text", text: taskPrompt, synthetic: true }]
+          }
+        }, {
+          timeoutMs: Math.min(remainingMs, config.timeoutMinutes * 60 * 1000),
+          signal: abortController.signal,
+          fallbackModels: config.fallbackModels,
+          callContext: `dreamer:${task}`,
+          transport: createPromptAsyncTransport(requireDreamClient(deps.client), sessionId, { tokenBudget: config.tokenBudget, onBudgetUpdate }),
+          fetchOutput: async () => {
+            const messagesResponse = await requireDreamClient(deps.client).session.messages({
+              path: { id: sessionId },
+              query: {
+                directory: docsDir,
+                ...task === "curate" ? {} : { limit: 50 }
+              }
+            });
+            return normalizeSDKResponse(messagesResponse, [], {
+              preferResponseOnMissingData: true
+            });
+          },
+          validateOutput: (messages) => {
+            const text = extractLatestAssistantText(messages);
+            if (task !== "curate") {
+              if (!text)
+                throw new Error("Dreamer returned no assistant output.");
+              return text;
+            }
+            const memoryOperations = inspectCurateMemoryOperations(messages);
+            if (text)
+              validateCurateAssistantText(text);
+            if (memoryOperations.completedActions.length > 0) {
+              return { text, memoryOperations };
             }
-          });
-          return normalizeSDKResponse(messagesResponse, [], {
-            preferResponseOnMissingData: true
-          });
-        },
-        validateOutput: (messages) => {
-          const text = extractLatestAssistantText(messages);
-          if (task !== "curate") {
             if (!text)
               throw new Error("Dreamer returned no assistant output.");
-            return text;
-          }
-          const memoryOperations = inspectCurateMemoryOperations(messages);
-          if (text)
-            validateCurateAssistantText(text);
-          if (memoryOperations.completedActions.length > 0) {
+            if (memoryOperations.totalCalls > 0) {
+              throw new Error("Curate returned no completed ctx_memory tool result.");
+            }
             return { text, memoryOperations };
           }
-          if (!text)
-            throw new Error("Dreamer returned no assistant output.");
-          if (memoryOperations.totalCalls > 0) {
-            throw new Error("Curate returned no completed ctx_memory tool result.");
-          }
-          return { text, memoryOperations };
-        }
-      });
-      promptSettled = true;
+        });
+        promptSettled = true;
+      }
+      if (task === "curate") {
+        completedActions.push(...run.validated.memoryOperations.completedActions);
+        curateRefused += takeCurateSafetyRefusalCount(childSessionId ?? "");
+      }
+      if (childSessionId && !deps.hiddenCompletionExecutor) {
+        await teardownChildSession({
+          client: requireDreamClient(deps.client),
+          sessionId: childSessionId,
+          sessionDirectory: docsDir,
+          promptSettled,
+          privacySensitive: true,
+          context: `[dreamer] ${task}`,
+          log
+        });
+        childSessionId = null;
+      }
     }
+    if (task === "curate")
+      run.validated = {
+        text: null,
+        memoryOperations: { totalCalls: completedActions.length, completedActions }
+      };
     if (leaseLost)
       throw new Error("Dream lease lost during task");
-    const curateRefused = task === "curate" ? takeCurateSafetyRefusalCount(childSessionId ?? "") : 0;
     if (curateRefused > 0) {
       helpers.reportProgress(curateRefused, curateRefused);
       log(`[dreamer] curate safety summary: refused=${curateRefused}`);
@@ -13288,7 +13871,11 @@ async function runAgenticTask(config, ctx, helpers) {
       try {
         if (run.validated === "[]") {
           helpers.recordRun("completed", null, { progress: "no corrections proposed" });
-          return { status: "completed", detail: "no corrections proposed" };
+          return {
+            status: "completed",
+            detail: "no corrections proposed",
+            schedulePatch: { taskStateJson: JSON.stringify({ head: changes.head }) }
+          };
         }
         const path = writeDocsProposal(docsDir, String(run.validated), config.docsMaxTokens ?? 12000, docsHashes, changes.head);
         helpers.recordRun("completed", null, { progress: `proposal: ${path}` });
@@ -13506,7 +14093,7 @@ async function runDomainGroup(deps, group, cb) {
           projectIdentity,
           lastRunAt: readLastRunAt(db, projectIdentity, due.config.task),
           retrospectiveWatermarkMs: readRetrospectiveWatermark(db, projectIdentity, due.config.task),
-          promotionThreshold: due.config.promotionThreshold ?? 3
+          promotionThreshold: due.config.promotionThreshold ?? (due.config.task === "promote-primers" ? DREAM_TASK_PROMOTION_DEFAULTS["promote-primers"] : DREAM_TASK_PROMOTION_DEFAULTS["review-user-memories"])
         });
         if (!gatePass) {
           advanceAfterRun(db, projectIdentity, due, Date.now(), "skipped", null);
@@ -13586,7 +14173,7 @@ async function runManualDream(deps) {
       projectIdentity: deps.projectIdentity,
       lastRunAt: readLastRunAt(deps.db, deps.projectIdentity, d.config.task),
       retrospectiveWatermarkMs: readRetrospectiveWatermark(deps.db, deps.projectIdentity, d.config.task),
-      promotionThreshold: d.config.promotionThreshold ?? 3
+      promotionThreshold: d.config.promotionThreshold ?? (d.config.task === "promote-primers" ? DREAM_TASK_PROMOTION_DEFAULTS["promote-primers"] : DREAM_TASK_PROMOTION_DEFAULTS["review-user-memories"])
     });
     if (pass)
       gated.push(d);
@@ -13642,7 +14229,7 @@ async function runDueTasksForProject(deps) {
       projectIdentity: deps.projectIdentity,
       lastRunAt: readLastRunAt(deps.db, deps.projectIdentity, d.config.task),
       retrospectiveWatermarkMs: readRetrospectiveWatermark(deps.db, deps.projectIdentity, d.config.task),
-      promotionThreshold: d.config.promotionThreshold ?? 3
+      promotionThreshold: d.config.promotionThreshold ?? (d.config.task === "promote-primers" ? DREAM_TASK_PROMOTION_DEFAULTS["promote-primers"] : DREAM_TASK_PROMOTION_DEFAULTS["review-user-memories"])
     });
     if (pass) {
       gated.push(d);
@@ -14269,7 +14856,7 @@ import * as childProcess from "node:child_process";
 import {
   existsSync as existsSync7,
   mkdtempSync as mkdtempSync2,
-  readFileSync as readFileSync5,
+  readFileSync as readFileSync6,
   realpathSync as realpathSync3,
   rmSync as rmSync2,
   statSync as statSync4,
@@ -14298,7 +14885,7 @@ var DEFAULT_PI_RESOLUTION_FS = {
   existsSync: existsSync7,
   statSync: statSync4,
   realpathSync: realpathSync3,
-  readFileSync: readFileSync5
+  readFileSync: readFileSync6
 };
 function packageHarnessKind(packageName) {
   if (packageName === "@oh-my-pi/pi-coding-agent")
@@ -14595,12 +15182,6 @@ var DREAMER_ACTION_AGENTS = new Set([
   "dreamer",
   "magic-context-dreamer"
 ]);
-var HISTORIAN_AGENTS = new Set([
-  "magic-context-historian",
-  "historian",
-  "historian-recomp",
-  "historian-editor"
-]);
 var SEARCH_ONLY_SUBAGENT_TOOL_AGENTS = new Set([
   "dreamer-retrospective",
   "dreamer-primer-investigator"
@@ -14790,7 +15371,15 @@ class PiSubagentRunner {
   async runOnce(options, runMode, modelRefOverride) {
     const startTime = Date.now();
     let recordedAccounting = false;
+    const cap = subagentStepCap(options.agent);
+    const budget = options.tokenBudget ? createDreamTokenBudget(options.tokenBudget) : undefined;
+    const telemetry = new SubagentTelemetry(options.systemPrompt, (line) => sessionLog(options.accountingSessionId ?? "subagent", line));
+    let loggedTelemetry = false;
     const recordAccounting = (result, messages = []) => {
+      if (!loggedTelemetry) {
+        loggedTelemetry = true;
+        telemetry.finish(options.agent, result.ok ? "completed" : result.reason, cap);
+      }
       if (!options.accountingSessionId || recordedAccounting)
         return;
       recordedAccounting = true;
@@ -14846,7 +15435,9 @@ class PiSubagentRunner {
       return failBeforeSpawn("spawn_failed", `Magic Context: plugin build is older than its database (database=v${fence.failure.persistedVersion}, supported_fence=v${fence.failure.supportedVersion}) — restart Pi.`);
     }
     const promptBytes = Buffer.byteLength(options.userMessage, "utf8");
-    const deliverViaStdin = promptBytes > PROMPT_ARGV_MAX_BYTES || this.platform === "win32";
+    const budgetToolGuardAvailable = SUBAGENT_ENTRY_PATH !== undefined || this.subagentExtensions?.some((extension) => basename(extension) === "subagent-entry.js") === true;
+    const rpcBudget = options.tokenBudget !== undefined && this.invocation.targetHarness === "pi" && budgetToolGuardAvailable;
+    const deliverViaStdin = !rpcBudget && (promptBytes > PROMPT_ARGV_MAX_BYTES || this.platform === "win32");
     let systemPromptTempDir;
     let systemPromptPath;
     const cleanupSystemPromptFile = () => {
@@ -14869,13 +15460,30 @@ class PiSubagentRunner {
         return failBeforeSpawn("spawn_failed", `failed to prepare pi system prompt file: ${error instanceof Error ? error.message : String(error)}`);
       }
     }
+    if (rpcBudget && !systemPromptTempDir) {
+      try {
+        systemPromptTempDir = mkdtempSync2(join5(tmpdir2(), "mc-pi-prompt-"));
+      } catch (error) {
+        return failBeforeSpawn("spawn_failed", `failed to prepare pi budget guard: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
+    const budgetGuardFile = rpcBudget && systemPromptTempDir ? join5(systemPromptTempDir, "budget-guard") : undefined;
+    if (budgetGuardFile) {
+      try {
+        writeFileSync5(budgetGuardFile, "", "utf8");
+      } catch (error) {
+        cleanupSystemPromptFile();
+        return failBeforeSpawn("spawn_failed", `failed to write pi budget guard: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
     const args = buildArgs(options, {
       targetHarness: this.invocation.targetHarness,
       disableDiscoveredExtensions: runMode.disableDiscoveredExtensions,
       subagentExtensions: this.subagentExtensions,
-      omitPositionalMessage: deliverViaStdin,
+      omitPositionalMessage: deliverViaStdin || rpcBudget,
       systemPromptPath,
-      modelRef: modelRefOverride
+      modelRef: modelRefOverride,
+      rpc: rpcBudget
     });
     return new Promise((resolve) => {
       let accountingMessages = [];
@@ -14884,13 +15492,17 @@ class PiSubagentRunner {
         if (settled)
           return;
         settled = true;
+        const outcome = budget ? {
+          ...result,
+          meta: { ...result.meta, tokenBudget: budget.snapshot() }
+        } : result;
         cleanupSystemPromptFile();
         try {
-          recordAccounting(result, accountingMessages);
+          recordAccounting(outcome, accountingMessages);
         } catch (err) {
           sessionLog(options.accountingSessionId ?? "subagent", `subagent accounting failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
         }
-        resolve(result);
+        resolve(outcome);
       };
       const emitProgress = (event) => {
         if (!options.onProgress)
@@ -14902,10 +15514,14 @@ class PiSubagentRunner {
       let child;
       try {
         child = this.spawnImpl(this.invocation.command, [...this.invocation.prefixArgs, ...this.extraArgs, ...args], {
+          windowsHide: true,
           cwd: options.cwd,
           env: {
             ...process.env,
             [MAGIC_CONTEXT_PI_SUBAGENT_ENV]: "1",
+            MAGIC_CONTEXT_SUBAGENT_PROMPT_FILE: systemPromptPath,
+            MAGIC_CONTEXT_SUBAGENT_BUDGET_GUARD_FILE: budgetGuardFile,
+            MAGIC_CONTEXT_SUBAGENT_PROVENANCE_ONLY: /^(magic-context-)?historian(?:-recomp|-editor)?$/.test(options.agent) ? undefined : "1",
             ...options.temperature !== undefined ? {
               MAGIC_CONTEXT_HISTORIAN_TEMPERATURE: String(options.temperature)
             } : {},
@@ -14913,7 +15529,11 @@ class PiSubagentRunner {
               MAGIC_CONTEXT_HISTORIAN_MAX_OUTPUT_TOKENS: String(options.maxOutputTokens)
             } : {}
           },
-          stdio: [deliverViaStdin ? "pipe" : "ignore", "pipe", "pipe"]
+          stdio: [
+            deliverViaStdin || rpcBudget ? "pipe" : "ignore",
+            "pipe",
+            "pipe"
+          ]
         });
       } catch (error) {
         cleanupSystemPromptFile();
@@ -14936,15 +15556,43 @@ class PiSubagentRunner {
         return;
       }
       emitProgress({ type: "spawned", argv: args, pid: child.pid });
-      if (deliverViaStdin && child.stdin) {
+      if (rpcBudget && child.stdin) {
+        child.stdin.on("error", (error) => {
+          terminateChild(child);
+          settle({
+            ok: false,
+            reason: budget?.snapshot().finalizeFired ? "token_budget" : "spawn_failed",
+            error: `Pi RPC input failed: ${error.message}`,
+            durationMs: Date.now() - startTime
+          });
+        });
+        child.stdin.write(`${JSON.stringify({
+          type: "prompt",
+          message: options.userMessage,
+          id: "dreamer-initial"
+        })}
+`);
+      } else if (deliverViaStdin && child.stdin) {
         child.stdin.on("error", () => {});
         try {
           child.stdin.end(options.userMessage, "utf8");
         } catch {}
       }
       let stderr = "";
+      let stderrLine = "";
       child.stderr?.on("data", (chunk) => {
         const text = chunk.toString("utf8");
+        stderrLine += text;
+        const lines = stderrLine.split(`
+`);
+        stderrLine = (lines.pop() ?? "").slice(-4096);
+        for (const line of lines) {
+          if (settled || !line.startsWith('{"type":"mc_system_prompt"'))
+            continue;
+          const parsed = parsePiEventLine(line);
+          if (parsed.ok)
+            telemetry.observe(parsed.event);
+        }
         stderr += text;
         if (stderr.length > 16000) {
           stderr = `…[truncated]${stderr.slice(-16000)}`;
@@ -14980,7 +15628,7 @@ class PiSubagentRunner {
       const accumulatedMessages = [];
       accountingMessages = accumulatedMessages;
       rl.on("line", (line) => {
-        if (line.length === 0)
+        if (settled || line.length === 0)
           return;
         const parsed = parsePiEventLine(line);
         if (!parsed.ok) {
@@ -14993,6 +15641,95 @@ class PiSubagentRunner {
         if (typeof event !== "object" || event === null)
           return;
         const e = event;
+        if (rpcBudget && e.type === "response" && event.success === false) {
+          const reply = event;
+          if (reply.command === "prompt" || reply.command === "steer" && !sawAgentEnd) {
+            terminateChild(child);
+            settle({
+              ok: false,
+              reason: reply.command === "steer" ? "token_budget" : "model_failed",
+              error: reply.error ?? `Pi RPC ${reply.command} failed`,
+              durationMs: Date.now() - startTime
+            });
+            return;
+          }
+        }
+        telemetry.observe(event);
+        if (budget && e.type === "message_end") {
+          const message = e.message;
+          if (message?.role === "assistant") {
+            const usage = message.usage;
+            const finished = message.stopReason === "stop" && !(Array.isArray(message.content) && message.content.some((part) => typeof part === "object" && part !== null && part.type === "toolCall"));
+            const decision = budget.charge(usage?.input ?? 0, usage?.cacheRead ?? 0, usage?.cacheWrite ?? 0, finished, rpcBudget);
+            if (decision === "stop" || decision === "finalize" && !rpcBudget) {
+              terminateChild(child);
+              settle({
+                ok: false,
+                reason: "token_budget",
+                error: "MC-D11: Pi dreamer exceeded its prompt-token budget",
+                durationMs: Date.now() - startTime,
+                meta: { tokenBudget: budget.snapshot() }
+              });
+              return;
+            }
+            if (decision === "finalize" && rpcBudget) {
+              try {
+                if (!budgetGuardFile)
+                  throw new Error("missing budget guard file");
+                writeFileSync5(budgetGuardFile, "finalize", "utf8");
+              } catch {
+                terminateChild(child);
+                settle({
+                  ok: false,
+                  reason: "token_budget",
+                  error: "MC-D11: Pi could not activate its tool guard",
+                  durationMs: Date.now() - startTime
+                });
+                return;
+              }
+              child.stdin?.write(`${JSON.stringify({
+                type: "steer",
+                message: TOKEN_BUDGET_FINALIZE_MESSAGE,
+                id: "dreamer-finalize"
+              })}
+`);
+            }
+          }
+        }
+        const resultParts = event.result?.content;
+        if (budget?.snapshot().finalizeFired && e.type === "tool_execution_end" && resultParts?.some((part) => part.text === TOKEN_BUDGET_TOOL_REFUSAL)) {
+          const refusal = budget.refuseTool();
+          if (refusal?.hardStopped) {
+            terminateChild(child);
+            settle({
+              ok: false,
+              reason: "token_budget",
+              error: "MC-D11: Pi dreamer made two calls after finalize",
+              durationMs: Date.now() - startTime,
+              meta: { tokenBudget: budget.snapshot() }
+            });
+            return;
+          }
+        }
+        if (cap !== undefined && telemetry.steps > cap) {
+          if (e.type === "message_end")
+            accumulatedMessages.push(e.message);
+          if (e.type === "agent_end" && Array.isArray(e.messages))
+            accountingMessages = e.messages;
+          if (timeoutHandle)
+            clearTimeout(timeoutHandle);
+          if (drainTimerHandle)
+            clearTimeout(drainTimerHandle);
+          terminateChild(child);
+          settle({
+            ok: false,
+            reason: "step_limit",
+            error: `MC-D10: Pi subagent ${options.agent} exceeded its ${cap}-step limit`,
+            durationMs: Date.now() - startTime,
+            meta: { cap, steps: telemetry.steps }
+          });
+          return;
+        }
         const isFirstEvent = eventCount === 0;
         eventCount += 1;
         lastEventTimestamp = Date.now();
@@ -15306,9 +16043,9 @@ function buildArgs(options, opts) {
   const targetHarness = opts?.targetHarness ?? resolvePiHarnessKind();
   const ompTarget = targetHarness === "omp";
   const args = [
-    "--print",
+    ...opts?.rpc ? [] : ["--print"],
     "--mode",
-    "json",
+    opts?.rpc ? "rpc" : "json",
     "--no-session",
     "--no-skills",
     ...ompTarget ? ["--no-rules"] : ["--no-prompt-templates", "--no-context-files"]
@@ -15322,7 +16059,7 @@ function buildArgs(options, opts) {
     }
   }
   const subagentEntryPath = opts?.subagentEntryPath ?? SUBAGENT_ENTRY_PATH;
-  const shouldLoadSubagentExtension = subagentEntryPath && (SEARCH_ONLY_SUBAGENT_TOOL_AGENTS.has(options.agent) || DREAMER_ACTION_AGENTS.has(options.agent));
+  const shouldLoadSubagentExtension = subagentEntryPath && (opts?.rpc || SEARCH_ONLY_SUBAGENT_TOOL_AGENTS.has(options.agent) || DREAMER_ACTION_AGENTS.has(options.agent));
   if (shouldLoadSubagentExtension) {
     args.push("--extension", subagentEntryPath);
     if (DREAMER_ACTION_AGENTS.has(options.agent)) {
@@ -15330,7 +16067,7 @@ function buildArgs(options, opts) {
     }
   }
   const historianCalibrationEntryPath = opts?.historianCalibrationEntryPath === undefined ? HISTORIAN_CALIBRATION_ENTRY_PATH : opts.historianCalibrationEntryPath;
-  if (HISTORIAN_AGENTS.has(options.agent) && historianCalibrationEntryPath) {
+  if (subagentStepCap(options.agent) !== undefined && historianCalibrationEntryPath) {
     args.push("--extension", historianCalibrationEntryPath);
   }
   const strictTools = STRICT_TOOL_ALLOWLIST.get(options.agent);
@@ -15559,7 +16296,7 @@ function* sessionEntries(path) {
 }
 
 // src/dreamer/pi-session-api.ts
-import { existsSync as existsSync8, readFileSync as readFileSync6, realpathSync as realpathSync4, statSync as statSync5 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync7, realpathSync as realpathSync4, statSync as statSync5 } from "node:fs";
 import {
   basename as basename2,
   dirname as dirname2,
@@ -15588,7 +16325,7 @@ function isScriptEntry(filePath) {
 }
 function readManifest(pkgJsonPath) {
   try {
-    const pkg = JSON.parse(readFileSync6(pkgJsonPath, "utf8"));
+    const pkg = JSON.parse(readFileSync7(pkgJsonPath, "utf8"));
     return pkg && typeof pkg === "object" ? pkg : null;
   } catch {
     return null;
@@ -15752,7 +16489,7 @@ async function loadDefaultPiSessionApi(loaders) {
     throw new Error("Pi session APIs unavailable: expected SessionManager.listAll on pi-coding-agent");
   }
   const loadEntriesFromFile = mod.loadEntriesFromFile ?? ((filePath) => {
-    const content = readFileSync6(filePath, "utf8");
+    const content = readFileSync7(filePath, "utf8");
     return mod.parseSessionEntries?.(content) ?? [];
   });
   return {
@@ -15900,11 +16637,14 @@ class PiRetrospectiveRawProvider {
         continue;
       if (typeof info.cwd !== "string" || resolve2(info.cwd) !== projectCwd)
         continue;
+      const activity = this.deps.contextDb ? readSessionActivity(this.deps.contextDb, info.id) : typeof info.modified === "number" ? info.modified : undefined;
+      if (this.deps.contextDb && activity === undefined)
+        continue;
       this.sessionPathById.set(info.id, info.path);
       result.push({
         sessionId: info.id,
         path: info.path,
-        updatedAt: typeof info.modified === "number" ? info.modified : undefined
+        updatedAt: activity
       });
     }
     return result.sort((a, b) => (a.updatedAt ?? 0) - (b.updatedAt ?? 0));
@@ -16051,6 +16791,12 @@ var inFlightDreams = (() => {
   globals[PI_DREAMER_IN_FLIGHT] = dreams;
   return dreams;
 })();
+var dreamAbortControllers = new Map;
+function abortInFlightDreamers(registrationOwner) {
+  for (const controller of dreamAbortControllers.get(registrationOwner) ?? []) {
+    controller.abort();
+  }
+}
 var sessionCounter = 0;
 var piSubagentRunnerFactory = () => new PiSubagentRunner;
 var startDreamScheduleTimerFn = startDreamScheduleTimer;
@@ -16079,7 +16825,7 @@ function registerPiDreamerProject(opts) {
   const client = createPiDreamerClient(opts, notifyOwnersOfAdjunctRefresh, () => {
     const current = registeredProjects2.get(opts.projectIdentity);
     return current?.generation === generation && current.owners.get(opts.registrationOwner)?.projectDir === opts.projectDir;
-  }, () => opts.sampleDreamRun ? opts.sampleDreamRun().dreamerConfig?.maxTokens : opts.config.maxTokens);
+  }, () => opts.sampleDreamRun ? opts.sampleDreamRun().dreamerConfig?.maxTokens : opts.config.maxTokens, () => opts.sampleDreamRun?.().dreamerConfig ?? opts.config);
   let cleanup;
   let cancelled = false;
   const modelRegistry = opts.modelRegistry;
@@ -16098,7 +16844,10 @@ function registerPiDreamerProject(opts) {
     retinaHandoff: opts.retinaHandoff,
     mural: opts.mural,
     ensureRegistered: ensureProjectRegisteredFromPiDirectory,
-    retrospectiveRawProvider: () => new PiRetrospectiveRawProvider({ projectCwd: opts.projectDir }),
+    retrospectiveRawProvider: () => new PiRetrospectiveRawProvider({
+      projectCwd: opts.projectDir,
+      contextDb: opts.db
+    }),
     primerRawProviderFactory: createPiPrimerRawProviderFactory()
   }).then((timerCleanup) => {
     if (cancelled) {
@@ -16117,7 +16866,7 @@ function registerPiDreamerProject(opts) {
     const sampled = manualOpts.sampleDreamRun?.();
     const dreamerConfig = sampled?.dreamerConfig ?? manualOpts.config;
     const mural = sampled?.mural ?? manualOpts.mural;
-    const manualClient = createPiDreamerClient(manualOpts, notifyOwnersOfAdjunctRefresh, () => owners.get(manualOpts.registrationOwner)?.projectDir === manualOpts.projectDir, () => dreamerConfig.maxTokens);
+    const manualClient = createPiDreamerClient(manualOpts, notifyOwnersOfAdjunctRefresh, () => owners.get(manualOpts.registrationOwner)?.projectDir === manualOpts.projectDir, () => dreamerConfig.maxTokens, () => dreamerConfig);
     const manualRun = runManualDream({
       db: manualOpts.db,
       projectIdentity: manualOpts.projectIdentity,
@@ -16127,7 +16876,8 @@ function registerPiDreamerProject(opts) {
         sessionDirectory: manualOpts.projectDir,
         openOpenCodeDb,
         retrospectiveRawProvider: new PiRetrospectiveRawProvider({
-          projectCwd: manualOpts.projectDir
+          projectCwd: manualOpts.projectDir,
+          contextDb: manualOpts.db
         }),
         primerRawProviderFactory: createPiPrimerRawProviderFactory(),
         userMemoryCollectionEnabled: userMemoryCollectionEnabled(dreamerConfig),
@@ -16197,8 +16947,9 @@ async function awaitInFlightDreamers(registrationOwner) {
     return;
   await Promise.allSettled(runs);
 }
-function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRefreshNeeded, isRegistrationOwnerActive = () => true, getMaxOutputTokens = () => opts.config.maxTokens) {
+function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRefreshNeeded, isRegistrationOwnerActive = () => true, getMaxOutputTokens = () => opts.config.maxTokens, getDreamerConfig = () => opts.config) {
   const runner = piSubagentRunnerFactory();
+  const budgetStates = new Map;
   const assertRegistrationOwnerActive = () => {
     if (!isRegistrationOwnerActive()) {
       throw new Error(`Pi dreamer registration is no longer active for project ${opts.projectIdentity}`);
@@ -16228,6 +16979,13 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
       const systemPrompt = extractSystemPrompt(args);
       const perTaskModel = extractBodyModel(args);
       const requestedAgent = extractBodyAgent(args) ?? "magic-context-dreamer";
+      const controller = new AbortController;
+      let controllers = dreamAbortControllers.get(opts.registrationOwner);
+      if (!controllers) {
+        controllers = new Set;
+        dreamAbortControllers.set(opts.registrationOwner, controllers);
+      }
+      controllers.add(controller);
       const runPromise = runner.run({
         agent: requestedAgent,
         systemPrompt,
@@ -16236,18 +16994,39 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
         fallbackModels: undefined,
         timeoutMs: 30 * 60 * 1000,
         cwd: dreamSession.directory,
-        signal: args.signal ?? undefined,
+        signal: args.signal ? AbortSignal.any([args.signal, controller.signal]) : controller.signal,
         thinkingLevel: extractBodyVariant(args),
         maxOutputTokens: getMaxOutputTokens(),
         accountingSessionId: opts.projectIdentity,
         accountingSubagent: "dreamer",
-        accountingTask: accountingTaskFromTitle(dreamSession.title)
+        accountingTask: accountingTaskFromTitle(dreamSession.title),
+        tokenBudget: (() => {
+          const task = accountingTaskFromTitle(dreamSession.title);
+          if (!task)
+            return;
+          return buildDreamTaskRuntimeConfigs(getDreamerConfig(), opts.harness).find((entry) => entry.task === task)?.tokenBudget;
+        })()
       });
       inFlightDreams.set(runPromise, opts.registrationOwner);
       try {
         const result = await runPromise;
+        const budget = result.meta?.tokenBudget;
+        const budgetTask = accountingTaskFromTitle(dreamSession.title);
+        if (budgetTask && budget && typeof budget.spent === "number") {
+          const prior = budgetStates.get(budgetTask);
+          budgetStates.set(budgetTask, {
+            spent: (prior?.spent ?? 0) + budget.spent,
+            finalizeFired: (prior?.finalizeFired ?? false) || budget.finalizeFired === true
+          });
+        }
         assertRegistrationOwnerActive();
         if (!result.ok) {
+          if (result.reason === "token_budget") {
+            throw new DreamTokenBudgetExceeded(dreamSession.id, Number(result.meta?.tokenBudget?.spent ?? 0));
+          }
+          if (result.reason === "step_limit") {
+            throw new HiddenAgentStepLimit("pi-dreamer", Number(result.meta?.cap));
+          }
           const error = new Error(`Pi dreamer subagent failed (${result.reason}): ${result.error}`);
           if (result.transient) {
             error.transient = true;
@@ -16264,6 +17043,9 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
         onAdjunctsRefreshNeeded?.(opts.projectIdentity);
       } finally {
         inFlightDreams.delete(runPromise);
+        controllers.delete(controller);
+        if (controllers.size === 0)
+          dreamAbortControllers.delete(opts.registrationOwner);
       }
     },
     messages: async (args) => {
@@ -16276,7 +17058,11 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
       return {};
     }
   };
-  return { session };
+  return {
+    session,
+    readTokenBudget: (task) => budgetStates.get(task),
+    resetDreamTokenBudget: (task) => budgetStates.delete(task)
+  };
 }
 function readDirectory(args) {
   const query = args.query;
@@ -16585,6 +17371,7 @@ Unknown task "${requested}".`,
       try {
         await deps.ensureRegistered?.(ctx);
         const result = await runPiDreamForProject(project.projectIdentity, task, deps.registrationOwner);
+        const backlogAfter = getDreamTaskBacklogs(deps.db, project.projectIdentity, backlogTasks);
         const lines = [];
         if (result.ran.length > 0)
           lines.push(`Ran: ${result.ran.join(", ")}`);
@@ -16600,8 +17387,8 @@ Unknown task "${requested}".`,
           lines.push(`Skipped (no work): ${result.skippedNoWork.join(", ")}`);
         if (result.deferredBusy.length > 0)
           lines.push(`Busy: ${result.deferredBusy.join(", ")} — another dream task holds this domain's lease; retry in a minute`);
-        if (Object.keys(result.backlogAfter ?? {}).length > 0) {
-          lines.push("", "Backlog at run end:", formatDreamTaskBacklogs(result.backlogAfter));
+        if (Object.keys(backlogAfter).length > 0) {
+          lines.push("", "Backlog at run end:", formatDreamTaskBacklogs(backlogAfter, backlogTasks));
         }
         if (lines.length === 0)
           lines.push("No enabled dream tasks to run.");
@@ -16630,26 +17417,6 @@ Unknown task "${requested}".`,
   });
 }
 
-// ../plugin/src/hooks/magic-context/embed-session-state.ts
-var embedPauseBySession = new Set;
-var embedRunStateBySession = new Map;
-var autoEmbedAttemptedBySession = new Set;
-function getEmbedDrainUiStatus(sessionId, progress) {
-  if (embedPauseBySession.has(sessionId)) {
-    return { status: "paused" };
-  }
-  const activeRun = embedRunStateBySession.get(sessionId);
-  if (activeRun && !activeRun.signal.aborted || progress?.kind === "embed" && progress.phase === "recomp") {
-    return { status: "running" };
-  }
-  if (progress?.kind === "embed" && (progress.phase === "failed" || progress.phase === "skipped") && progress.message) {
-    if (/provider/i.test(progress.message)) {
-      return { status: "stopped", detail: progress.message };
-    }
-  }
-  return { status: "idle" };
-}
-
 // ../plugin/src/hooks/magic-context/format-embed-failure.ts
 function formatEmbedFailureSummary(embedded, remaining, failure, style = "markdown") {
   const historyBlocks = `history block${embedded === 1 ? "" : "s"}`;
@@ -16713,7 +17480,7 @@ function clearPiEmbedSessionState(sessionId) {
     ctrl.abort();
     embedRunStateBySession.delete(sessionId);
   }
-  autoEmbedAttemptedBySession.delete(sessionId);
+  invalidateAutoEmbedSession(sessionId);
 }
 async function runEmbedDrain(db, projectIdentity, sessionId, options = {}) {
   const activeCtrl = embedRunStateBySession.get(sessionId);
@@ -16895,28 +17662,34 @@ ${statusText}`,
 function maybeAutoEmbedPiSession(deps, sessionId, projectDir, projectIdentity) {
   if (!isUsableProjectIdentity(projectIdentity))
     return;
+  const snapshot = getProjectEmbeddingSnapshot(projectIdentity);
+  const embedIdentity = snapshot ? JSON.stringify([
+    snapshot.providerIdentity,
+    snapshot.chunkModelId,
+    snapshot.runtimeFingerprint
+  ]) : "off";
+  if (autoEmbedIdentityBySession.get(sessionId) !== embedIdentity)
+    invalidateAutoEmbedSession(sessionId);
   if (autoEmbedAttemptedBySession.has(sessionId))
     return;
   if (embedPauseBySession.has(sessionId))
     return;
   autoEmbedAttemptedBySession.add(sessionId);
+  autoEmbedIdentityBySession.set(sessionId, embedIdentity);
   (async () => {
-    let drainReachedTerminal = false;
     try {
       await new Promise((resolve) => setTimeout(resolve, 0));
       await ensureProjectRegisteredFromPiDirectory(projectDir, deps.db);
-      const coverage = getEmbeddingCoverageStatus(deps.db, projectIdentity, sessionId);
-      if (!coverage.enabled)
+      const coverage = await getAutoEmbeddingSessionCoverage(deps.db, projectIdentity, sessionId);
+      if (!coverage.enabled) {
+        invalidateAutoEmbedSession(sessionId);
         return;
-      const remaining = coverage.session.total - coverage.session.embedded;
+      }
+      const remaining = coverage.total - coverage.embedded;
       if (remaining <= 0)
         return;
       await runEmbedDrain(deps.db, projectIdentity, sessionId);
-      drainReachedTerminal = true;
-    } catch {} finally {
-      if (!drainReachedTerminal)
-        autoEmbedAttemptedBySession.delete(sessionId);
-    }
+    } catch {}
   })();
 }
 
@@ -25659,7 +26432,7 @@ function readFrozenM0InputsPi(state, db, docs = readProjectDocsForPiM0(state), m
     };
     return { docs, markers, compartments, memories, userProfile, workspace };
   });
-  return read();
+  return read.deferred();
 }
 function renderFreshM0PiNonPersisted(state, db) {
   const docs = readProjectDocsForPiM0(state);
@@ -27136,19 +27909,22 @@ function validateAnthropicReasoningRuns(messages) {
       index += 1;
       continue;
     }
-    let thinkingBlocks = 0;
+    let firstMessageInRun = null;
     let sawOtherContent = false;
     while (index < messages.length && messageRole(messages[index]) === "assistant") {
       for (const part of messageParts(messages[index])) {
-        if (partIsAnthropicThinking(part)) {
-          thinkingBlocks += 1;
-          if (thinkingBlocks > 1 || sawOtherContent)
-            return false;
-        } else if (partEndsAnthropicAssistantRun(part)) {
-          thinkingBlocks = 0;
+        if (partEndsAnthropicAssistantRun(part)) {
+          firstMessageInRun = null;
           sawOtherContent = false;
         } else if (!partIsOpenCodeStepMetadata(part)) {
-          sawOtherContent = true;
+          if (firstMessageInRun === null)
+            firstMessageInRun = index;
+          if (partIsAnthropicThinking(part)) {
+            if (sawOtherContent || index !== firstMessageInRun)
+              return false;
+          } else {
+            sawOtherContent = true;
+          }
         }
       }
       index += 1;
@@ -27256,6 +28032,8 @@ function replayLkg(args) {
     dropSlot(args.sessionId, "lkg_seam_invalid");
     return { ok: false, reason: "lkg_seam_invalid" };
   }
+  const replayed = [...prefix, ...entry.pristineTail];
+  args.prepareReplay?.(replayed);
   if (!args.skipSeamValidation) {
     if (!validateLkgSeamBoundary(prefix, entry.pristineTail)) {
       dropSlot(args.sessionId, "lkg_unsafe_seam");
@@ -27266,7 +28044,6 @@ function replayLkg(args) {
       return { ok: false, reason: "lkg_seam_invalid" };
     }
   }
-  const replayed = [...prefix, ...entry.pristineTail];
   if (requestedModelKeys.providerKey === "anthropic" && !validateAnthropicReasoningRuns(replayed)) {
     dropSlot(args.sessionId, "lkg_anthropic_reasoning_run_invalid");
     return { ok: false, reason: "lkg_anthropic_reasoning_run_invalid" };
@@ -28731,13 +29508,10 @@ function capturePiServedArray(sessionId, messages, options = {}) {
 process.once("beforeExit", flushPiServedArrayLedger);
 
 // src/strip-placeholders-pi.ts
-var DROPPED_SEGMENT_PATTERN = /^\[dropped(?: §[^§]+§)?\]$/;
-function isDroppedOnlyText(text) {
+var MARKER_ONLY_PATTERN = /^(?:(?:§\d+§|\[dropped(?: §\d+§)?\]|\[cleared\])\s*)+$/;
+function isPiMarkerOnlyText(text) {
   const trimmed = text.trim();
-  if (trimmed.length === 0)
-    return true;
-  const segments = trimmed.split(/(?=\[dropped(?: §[^§]+§)?\])/).map((segment) => segment.trim()).filter((segment) => segment.length > 0);
-  return segments.length > 0 && segments.every((s) => DROPPED_SEGMENT_PATTERN.test(s));
+  return trimmed.length > 0 && MARKER_ONLY_PATTERN.test(trimmed);
 }
 function messageIsPlaceholderOnly(message) {
   if (!message || typeof message !== "object")
@@ -28746,7 +29520,7 @@ function messageIsPlaceholderOnly(message) {
   if (msg.role !== "assistant")
     return false;
   if (typeof msg.content === "string")
-    return isDroppedOnlyText(msg.content);
+    return msg.content.trim().length === 0 || isPiMarkerOnlyText(msg.content);
   if (!Array.isArray(msg.content))
     return false;
   if (msg.content.length === 0)
@@ -28756,12 +29530,11 @@ function messageIsPlaceholderOnly(message) {
     if (!part || typeof part !== "object")
       return false;
     const p = part;
-    if (p.type !== "text")
-      return false;
-    if (typeof p.text !== "string")
+    const text = p.type === "text" ? p.text : p.type === "thinking" ? p.thinking : null;
+    if (typeof text !== "string")
       return false;
     sawVisibleContent = true;
-    if (!isDroppedOnlyText(p.text))
+    if (text.trim().length > 0 && !isPiMarkerOnlyText(text))
       return false;
   }
   return sawVisibleContent;
@@ -29651,6 +30424,7 @@ var deferredHistoryRefreshSessions = new Set;
 var deferredMaterializationSessions = new Set;
 var sessionsByProject = new Map;
 var lastSeenProjectIdentityBySession = new Map;
+var persistedProjectIdentityBySession = new Map;
 var rawMessageProviderUnregistersBySession = new Map;
 var activeContextHandlerSessions = new Set;
 var lastHeuristicsTurnIdBySession = new Map;
@@ -29872,9 +30646,10 @@ function updateSessionProjectTracking(sessionId, projectIdentity, db) {
       sessionsByProject.delete(prev);
     clearPiSystemPromptSession(sessionId);
   }
-  if (db && prev !== projectIdentity) {
+  if (db && persistedProjectIdentityBySession.get(sessionId) !== projectIdentity) {
     try {
       recordSessionProjectIdentity(db, sessionId, projectIdentity);
+      persistedProjectIdentityBySession.set(sessionId, projectIdentity);
     } catch {}
   }
   trackSessionForProject(projectIdentity, sessionId);
@@ -31233,6 +32008,10 @@ function registerPiContextHandler(pi, baseOptions) {
   log("[magic-context][pi] registered context handler (tagging + drops + nudges)");
 }
 var inFlightHistorian = new Map;
+var historianAbortControllers = new Map;
+function abortInFlightHistorians(sessionId) {
+  historianAbortControllers.get(sessionId)?.abort();
+}
 async function awaitInFlightHistorians(sessionId) {
   const runs = sessionId ? [inFlightHistorian.get(sessionId)].filter((run) => run !== undefined) : [...inFlightHistorian.values()];
   if (runs.length === 0)
@@ -31345,7 +32124,11 @@ function spawnPiHistorianRun(args) {
     fallbackModelId
   } = args;
   const holderId = crypto3.randomUUID();
+  const controller = new AbortController;
+  historianAbortControllers.set(sessionId, controller);
   const runPromise = (async () => {
+    if (controller.signal.aborted)
+      return;
     const lease = acquireCompartmentLease(db, sessionId, holderId);
     if (!lease) {
       sessionLog(sessionId, "historian skipped: compartment lease held by another process");
@@ -31366,6 +32149,7 @@ function spawnPiHistorianRun(args) {
         appendCompaction: resolvePiAppendCompaction(ctx),
         readBranchEntries: resolvePiReadBranchEntries(ctx),
         runner: historian.runner,
+        signal: controller.signal,
         historianModel: historian.model,
         fallbackModels: historian.fallbackModels,
         fallbackModelId,
@@ -31434,6 +32218,8 @@ function spawnPiHistorianRun(args) {
   }).finally(() => {
     try {
       inFlightHistorian.delete(sessionId);
+      if (historianAbortControllers.get(sessionId) === controller)
+        historianAbortControllers.delete(sessionId);
       unregister();
       if (isContextHandlerSessionActive(sessionId)) {
         historian.onStatusChange?.(ctx, sessionId);
@@ -31636,6 +32422,8 @@ Historian previously failed ${failureCount} time(s), so Magic Context is retryin
       }
       return;
     }
+    if (!ctx.hasUI)
+      return;
     triggered = true;
     sessionLog(sessionId, `historian trigger fired (reason=${trigger.reason ?? "unknown"}) usage=${usage.percentage.toFixed(1)}% — spawning subagent`);
     spawnPiHistorianRun({
@@ -32831,6 +33619,7 @@ function clearContextHandlerSession(sessionId) {
   lastHeuristicsTurnIdBySession.delete(sessionId);
   routinePressureAppliedBySession.delete(sessionId);
   lastSeenProjectIdentityBySession.delete(sessionId);
+  persistedProjectIdentityBySession.delete(sessionId);
   for (const [projectIdentity, sessions] of sessionsByProject) {
     sessions.delete(sessionId);
     if (sessions.size === 0)
@@ -32985,6 +33774,7 @@ function promoteRecompStagingWithM0Mutation(db, sessionId, holderId) {
       finished = true;
       return null;
     }
+    deleteChunkEmbedBackoffForSession(db, sessionId);
     db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
     insertRecompCompartmentRows(db, sessionId, staging.compartments, now);
@@ -32999,6 +33789,7 @@ function promoteRecompStagingWithM0Mutation(db, sessionId, holderId) {
     clearCachedM0M1(db, sessionId);
     db.exec("COMMIT");
     finished = true;
+    invalidateAutoEmbedSession(sessionId);
     logSlowWriteTransaction("historian-publish:recomp", transactionStartedAt);
     return { compartments: staging.compartments, facts: staging.facts };
   } finally {
@@ -35025,7 +35816,7 @@ function buildStatusView(source, options) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.44.1",
+  version: "0.44.2",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -35143,6 +35934,11 @@ async function showStatusDialog(pi, ctx, deps) {
     overlayOptions: { anchor: "center", width: 78 }
   });
 }
+var openStatusDialogs = new Set;
+function stopStatusDialogRefresh() {
+  for (const dialog of openStatusDialogs)
+    dialog.close();
+}
 
 class StatusDialogComponent {
   props;
@@ -35152,6 +35948,7 @@ class StatusDialogComponent {
   constructor(props) {
     this.props = props;
     this.detail = buildPiStatusDetail(props.pi, props.ctx, props.deps, props.sessionId);
+    openStatusDialogs.add(this);
     this.refreshTimer = setInterval(() => {
       if (this.closed)
         return;
@@ -35169,11 +35966,7 @@ class StatusDialogComponent {
   close() {
     if (this.closed)
       return;
-    this.closed = true;
-    if (this.refreshTimer) {
-      clearInterval(this.refreshTimer);
-      this.refreshTimer = null;
-    }
+    this.dispose();
     this.props.done(undefined);
   }
   invalidate() {}
@@ -35183,6 +35976,8 @@ class StatusDialogComponent {
     return drawBorder(inner, width, this.props.theme);
   }
   dispose() {
+    this.closed = true;
+    openStatusDialogs.delete(this);
     if (this.refreshTimer) {
       clearInterval(this.refreshTimer);
       this.refreshTimer = null;
@@ -35726,7 +36521,10 @@ No active Pi session is available.`,
         });
         return;
       }
-      const currentDeps = deps.resolveRuntimeDeps?.(ctx) ?? deps;
+      const currentDeps = {
+        ...deps.resolveRuntimeDeps?.(ctx) ?? deps,
+        shutdownSignal: deps.shutdownSignal
+      };
       if (currentDeps.compactionOff) {
         sendStatus({
           title: "/ctx-wrapup",
@@ -35859,6 +36657,8 @@ No runnable wrapup boundary is available yet; wrapped up 0 messages into 0 compa
         console.warn(`[magic-context][pi] /ctx-wrapup marker renewal failed for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
       }
     }, 60000);
+    const stopRenewal = () => clearInterval(renewal);
+    deps.shutdownSignal?.addEventListener("abort", stopRenewal, { once: true });
     try {
       sendStatus({
         title: "/ctx-wrapup",
@@ -35925,7 +36725,7 @@ Eligible history is about ${initialPlan.snapshot.trueRawEligibleTokens.toLocaleS
 Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.eligibleEndOrdinal - 1} (~${plan.snapshot.trueRawEligibleTokens.toLocaleString()} eligible tokens remain).`,
           level: "info"
         });
-        const leaseResult = await acquireCompartmentLeaseEventually(deps.db, sessionId, renewWrapupMarker, resolveWrapupLeaseWaitTimeout(deps));
+        const leaseResult = await acquireCompartmentLeaseEventually(deps.db, sessionId, renewWrapupMarker, resolveWrapupLeaseWaitTimeout(deps), deps.shutdownSignal);
         if (!leaseResult.ok) {
           failure = ownershipLost ? `${ownershipLostReason}; wrapped up through message ${lastEnd}. Run /ctx-wrapup again to continue.` : leaseResult.reason === "timeout" ? `Timed out waiting for another process to release the compartment-state lease; wrapped up through message ${lastEnd}. Run /ctx-wrapup again to continue.` : "Another Magic Context rebuild started while wrapup was waiting. Run /ctx-wrapup again to continue.";
           break;
@@ -35938,6 +36738,10 @@ Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.e
             console.warn(`[magic-context][pi] /ctx-wrapup compartment lease renewal failed for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
           }
         }, COMPARTMENT_LEASE_RENEWAL_MS);
+        const stopLeaseRenewal = () => clearInterval(leaseRenewal);
+        deps.shutdownSignal?.addEventListener("abort", stopLeaseRenewal, {
+          once: true
+        });
         try {
           const runHistorian = deps.runPiHistorianForWrapup ?? runPiHistorian;
           await runHistorian({
@@ -35946,6 +36750,7 @@ Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.e
             directory: ctx.cwd,
             provider,
             runner: deps.runner,
+            signal: deps.shutdownSignal,
             historianModel: deps.historianModel,
             fallbackModels: deps.historianFallbacks,
             fallbackModelId: modelKey,
@@ -35989,6 +36794,7 @@ Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.e
           });
         } finally {
           clearInterval(leaseRenewal);
+          deps.shutdownSignal?.removeEventListener("abort", stopLeaseRenewal);
           releaseCompartmentLeaseBestEffort(deps.db, sessionId, leaseHolder, sessionLog);
         }
         const afterEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -36018,6 +36824,7 @@ Wrapped up ${messagesWrapped} messages into ${compartmentsCreated} compartments;
 Wrapped up ${messagesWrapped} messages into ${compartmentsCreated} compartments. The compacted history is queued and materializes on your next message.`;
     } finally {
       clearInterval(renewal);
+      deps.shutdownSignal?.removeEventListener("abort", stopRenewal);
       releaseWrapupInProgress(deps.db, sessionId, holderId);
     }
   } finally {
@@ -36039,10 +36846,12 @@ function resolvePiContextLimit(ctx, db, sessionId) {
     detectedContextLimit
   }) ?? 128000;
 }
-async function acquireCompartmentLeaseEventually(db, sessionId, renewWrapupMarker, maxWaitMs) {
+async function acquireCompartmentLeaseEventually(db, sessionId, renewWrapupMarker, maxWaitMs, signal) {
   const waitStartedAt = Date.now();
   const remainingMs = () => Math.max(0, waitStartedAt + maxWaitMs - Date.now());
   for (;; ) {
+    if (signal?.aborted)
+      return { ok: false, reason: "ownership_lost" };
     if (remainingMs() <= 0)
       return { ok: false, reason: "timeout" };
     const holderId = crypto4.randomUUID();
@@ -36051,7 +36860,17 @@ async function acquireCompartmentLeaseEventually(db, sessionId, renewWrapupMarke
       return { ok: true, holderId };
     if (!renewWrapupMarker({}))
       return { ok: false, reason: "ownership_lost" };
-    await new Promise((resolve) => setTimeout(resolve, Math.min(LEASE_WAIT_MS, remainingMs())));
+    await new Promise((resolve) => {
+      const finish = () => {
+        clearTimeout(timer);
+        signal?.removeEventListener("abort", finish);
+        resolve();
+      };
+      const timer = setTimeout(finish, Math.min(LEASE_WAIT_MS, remainingMs()));
+      signal?.addEventListener("abort", finish, { once: true });
+      if (signal?.aborted)
+        finish();
+    });
   }
 }
 function estimateChunks(tokens, chunkTokens) {
@@ -36075,6 +36894,32 @@ function readBranchEntries(ctx) {
   return Array.isArray(branch?.entries) ? branch.entries : [];
 }
 
+// src/dreamer/session-activity-pi.ts
+function observePiMessageActivity(db, sessionId, timestamp) {
+  observeSessionActivity(db, sessionId, timestamp);
+}
+function latestPiMessageTime(path) {
+  let latest = 0;
+  for (const entry of sessionEntries(path)) {
+    const row = entry;
+    if (row.type === "message" && typeof row.message?.timestamp === "number")
+      latest = Math.max(latest, row.message.timestamp);
+  }
+  return latest || undefined;
+}
+async function backfillPiSessionActivity(db, harness, paths) {
+  await backfillSessionActivity(db, harness, (sessionId) => {
+    const path = paths.get(sessionId);
+    if (!path)
+      return;
+    try {
+      return latestPiMessageTime(path);
+    } catch {
+      return;
+    }
+  });
+}
+
 // src/dropped-input-guard-pi.ts
 function createPiDroppedInputGuard(options = {}) {
   const guard = createDroppedInputGuard({
@@ -36273,6 +37118,8 @@ function stripTagPrefixFromAssistantMessage(message) {
 var PI_HARNESS_DETECTION = await resolvePiHarnessDetection();
 var PI_HARNESS_KIND = PI_HARNESS_DETECTION.kind;
 var PREFIX2 = `[magic-context][${PI_HARNESS_KIND}]`;
+var databaseExitHookRegistered = false;
+var activePiRuntimes = new Set;
 var PI_BOOT_DEADLINE_MS = 15000;
 var PI_CHILD_INIT_CONTEXT = Symbol.for("magic-context.pi.child-init-context");
 var SUBAGENT_CHILD_SESSION_CREATED = "subagents:child:session-created";
@@ -36720,6 +37567,10 @@ async function src_default(pi) {
     cacheSizeMb: bootConfig.config.sqlite.cache_size_mb,
     mmapSizeMb: bootConfig.config.sqlite.mmap_size_mb
   });
+  if (!databaseExitHookRegistered) {
+    process.once("exit", closeDatabase);
+    databaseExitHookRegistered = true;
+  }
   const storageDir = getMagicContextStorageDir();
   const dbPath = join11(storageDir, "context.db");
   let openFailureCause = null;
@@ -36793,6 +37644,13 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
             const offset = afterSessionId === null ? 0 : sessions.findIndex((session) => session.sessionId === afterSessionId) + 1;
             return sessions.slice(offset, offset + limit);
           });
+          const api = await loadDefaultPiSessionApi();
+          const paths = new Map;
+          for (const session of await api.listSessions()) {
+            if (typeof session.id === "string" && typeof session.path === "string")
+              paths.set(session.id, session.path);
+          }
+          await backfillPiSessionActivity(database, PI_HARNESS_KIND, paths);
         } catch (err) {
           warn(`[session-projects] background runner failed: ${err}`);
         }
@@ -36802,6 +37660,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   const projectDir = process.cwd();
   const seenDreamerProjectIdentities = new Set;
   const dreamerRegistrationOwner = {};
+  activePiRuntimes.add(dreamerRegistrationOwner);
   const commandLifecycleController = new AbortController;
   registerCtxStatusLifecycleSignal(pi, commandLifecycleController.signal);
   let sessionShuttingDown = false;
@@ -37055,7 +37914,8 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     projectDepsByDir.delete(ctx.cwd);
     const current = resolveCurrentProjectDeps(ctx);
     activeModelRegistry = ctx.modelRegistry;
-    syncDreamerProjectRegistration(current, ctx.modelRegistry);
+    if (ctx.hasUI)
+      syncDreamerProjectRegistration(current, ctx.modelRegistry);
     syncCtxMemoryToolEnabled(pi, current.config.memory.enabled);
     const failuresToShow = claimConfigParseFailuresOnce("pi", current.configParseFailures);
     if (ctx.hasUI && failuresToShow.length > 0) {
@@ -37190,6 +38050,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   });
   info("registered /ctx-recomp");
   registerCtxWrapupCommand(pi, {
+    shutdownSignal: commandLifecycleController.signal,
     db,
     runner: wrapupRunner,
     historianModel: bootProjectDeps.historianConfig?.model,
@@ -37241,7 +38102,10 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     dreamerEnabled: bootProjectDeps.dreamerEnabled,
     resolveDreamerEnabled: (ctx) => resolveCurrentProjectDeps(ctx).dreamerEnabled,
     onProjectSeen: (identity) => seenDreamerProjectIdentities.add(identity),
-    ensureRegistered: (ctx) => syncDreamerProjectRegistration(resolveCurrentProjectDeps(ctx), ctx.modelRegistry),
+    ensureRegistered: (ctx) => {
+      if (ctx.hasUI)
+        syncDreamerProjectRegistration(resolveCurrentProjectDeps(ctx), ctx.modelRegistry);
+    },
     registrationOwner: dreamerRegistrationOwner
   });
   info("registered /ctx-dream");
@@ -37260,7 +38124,6 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   info("registered /ctx-embed");
   const dreamerConfig = bootProjectDeps.dreamerConfig;
   if (dreamerConfig) {
-    syncDreamerProjectRegistration(bootProjectDeps);
     info(`registered dreamer (${summarizeDreamSchedule(dreamerConfig)})`);
   } else {
     info(bootProjectDeps.dreamerEnabled ? "registered dreamer: DISABLED (no dreamer config)" : "registered dreamer: DISABLED (dreamer.disable=true or no dreamer config)");
@@ -37293,7 +38156,8 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       const effectiveConfig = effectiveProjectDeps.config;
       try {
         activeModelRegistry = ctx.modelRegistry;
-        syncDreamerProjectRegistration(effectiveProjectDeps, ctx.modelRegistry);
+        if (ctx.hasUI)
+          syncDreamerProjectRegistration(effectiveProjectDeps, ctx.modelRegistry);
       } catch (err) {
         warn("before_agent_start: dreamer registration sync threw:", err);
       }
@@ -37389,6 +38253,8 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     } catch (err) {
       log(`agent_end: channel2 delivery skipped: ${String(err)}`);
     }
+    if (!ctx.hasUI)
+      flushLogger();
   });
   pi.on("tool_execution_start", async (event, ctx) => {
     try {
@@ -37469,6 +38335,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       if (typeof sessionId !== "string" || sessionId.length === 0)
         return;
       const endedMsg = event.message;
+      observePiMessageActivity(db, sessionId, endedMsg?.timestamp);
       if (endedMsg?.role === "assistant" && typeof endedMsg.id === "string" && endedMsg.id.length > 0) {
         const messageId = endedMsg.id;
         scheduleIncrementalIndex(db, sessionId, messageId, () => {
@@ -37549,6 +38416,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
   pi.on("session_shutdown", async (_event, ctx) => {
     sessionShuttingDown = true;
     commandLifecycleController.abort();
+    stopStatusDialogRefresh();
     const SHUTDOWN_DRAIN_MS = 5000;
     const sessionId = resolveSessionId(ctx);
     try {
@@ -37562,6 +38430,8 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       warn("shutdown: unregisterPiDreamerProject threw:", err);
     }
     if (sessionId) {
+      abortInFlightHistorians(sessionId);
+      abortInFlightRecomps(sessionId);
       try {
         await withTimeout(awaitInFlightHistorians(sessionId), SHUTDOWN_DRAIN_MS);
       } catch (err) {
@@ -37574,6 +38444,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       }
       abortInFlightRecomps(sessionId);
     }
+    abortInFlightDreamers(dreamerRegistrationOwner);
     try {
       await withTimeout(awaitInFlightDreamers(dreamerRegistrationOwner), SHUTDOWN_DRAIN_MS);
     } catch (err) {
@@ -37588,6 +38459,9 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
         clearContextHandlerSession(sessionId);
       }
     } catch {}
+    activePiRuntimes.delete(dreamerRegistrationOwner);
+    if (activePiRuntimes.size === 0)
+      unregisterPiProjectEmbeddings(db);
   });
   pi.on("session_before_switch", (_event, ctx) => {
     try {