@cortexkit/opencode-magic-context 0.43.0 → 0.43.2

package/dist/v2/server.js

@@ -1675,8 +1675,15 @@ function getHarness() {
 }
 var currentHarness = "opencode", harnessLocked = false;
 
+// src/shared/test-temp-dir.ts
+var STALE_TEMP_DIR_AGE_MS, registeredTempDirs;
+var init_test_temp_dir = __esm(() => {
+  STALE_TEMP_DIR_AGE_MS = 60 * 60 * 1000;
+  registeredTempDirs = new Set;
+});
+
 // src/shared/data-path.ts
-import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 function getDataDir() {
@@ -1764,7 +1771,9 @@ function getLegacyOpenCodeMagicContextStorageDir() {
   return path.join(getOpenCodeStorageDir(), "plugin", "magic-context");
 }
 var GITIGNORE_GUARD_OPEN = "# >>> cortexkit:magic-context", GITIGNORE_GUARD_CLOSE = "# <<< cortexkit:magic-context";
-var init_data_path = () => {};
+var init_data_path = __esm(() => {
+  init_test_temp_dir();
+});
 
 // src/shared/harness-provider-map.ts
 function remapProviderPrefix(ref, map) {
@@ -8994,7 +9003,7 @@ var init_task_registry = __esm(() => {
     "maintain-docs": {
       requiresTools: true,
       transport: "tool-loop",
-      toolLoopPurpose: "needs file read and write tools to update project documentation"
+      toolLoopPurpose: "needs read-only file tools to investigate documentation corrections"
     },
     "evaluate-smart-notes": { requiresTools: false, transport: "single-shot" },
     "review-user-memories": { requiresTools: false, transport: "single-shot" },
@@ -15440,7 +15449,7 @@ var HOST_UNSERVED_ROW = "hostUnservedRow";
 // src/shared/opencode-db-path.ts
 import { existsSync as existsSync8, readdirSync, statSync as statSync7 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { isAbsolute as isAbsolute4, join as join8 } from "node:path";
+import { isAbsolute as isAbsolute4, join as join8, resolve as resolve4 } from "node:path";
 function openCodeDataDir(env = process.env, dataHome) {
   return join8(dataHome ?? env.XDG_DATA_HOME ?? join8(homedir8(), ".local", "share"), "opencode");
 }
@@ -15520,7 +15529,7 @@ function resolveV2Fresh(dataDir, channel, env) {
   const filename = sourceOpenCodeDatabaseFilename("v2", channel, env);
   const explicit = env.OPENCODE_DB !== undefined;
   return {
-    path: filename === ":memory:" ? filename : join8(dataDir, filename),
+    path: filename === ":memory:" ? filename : resolve4(dataDir, filename),
     source: explicit ? "OPENCODE_DB" : env.OPENCODE_CHANNEL ? "channel" : "default",
     channel: explicit ? null : channel
   };
@@ -18005,6 +18014,8 @@ function hasCountableParts(message) {
       case "step-start":
       case "step-finish":
         return true;
+      case "file":
+        return typeof p.url === "string" && p.url.startsWith("data:image/");
       default:
         return false;
     }
@@ -25201,9 +25212,22 @@ function visitMessageContentFields(value, visitor) {
   }
   return visitor.field(LKG_SNAPSHOT_UNDEFINED);
 }
+function contentSnapshotValue(value) {
+  if (!value || typeof value !== "object")
+    return value;
+  const message = value;
+  const info = message.info;
+  const summary = info?.summary;
+  if (!Array.isArray(message.parts) || info?.role !== "user" || summary === null || typeof summary !== "object" || Array.isArray(summary) || Object.keys(summary).length !== 1 || !Array.isArray(summary.diffs) || summary.diffs.length !== 0)
+    return value;
+  return {
+    ...message,
+    info: Object.fromEntries(Object.entries(info).filter(([key]) => key !== "summary"))
+  };
+}
 function messageContentFields(message) {
   const fields = [];
-  const complete = visitMessageContentFields(message, {
+  const complete = visitMessageContentFields(contentSnapshotValue(message), {
     field(value) {
       fields.push(value);
       return true;
@@ -25269,7 +25293,7 @@ function lkgContentFields(value) {
       fields.push(LKG_SNAPSHOT_UNDEFINED);
   };
   try {
-    visit(value);
+    visit(contentSnapshotValue(value));
     return fields;
   } catch {
     return null;
@@ -26109,7 +26133,7 @@ import {
   statSync as statSync9,
   unlinkSync as unlinkSync2
 } from "node:fs";
-import { basename as basename3, dirname as dirname6, join as join9, resolve as resolve4 } from "node:path";
+import { basename as basename3, dirname as dirname6, join as join9, resolve as resolve5 } from "node:path";
 function getSchemaFenceRejection() {
   return lastSchemaFenceRejection;
 }
@@ -26426,7 +26450,7 @@ function isDefaultSharedDatabasePath(dbPath) {
   if (!process.env.XDG_DATA_HOME && (process.env.MAGIC_CONTEXT_TEST_DATA_DIR || false)) {
     return false;
   }
-  return resolve4(dbPath) === resolve4(join9(getMagicContextStorageDir(), "context.db"));
+  return resolve5(dbPath) === resolve5(join9(getMagicContextStorageDir(), "context.db"));
 }
 function migrationBlockingPiPids(dbPath, discovery, discoveredPiPids) {
   if (isDefaultSharedDatabasePath(dbPath))
@@ -28992,6 +29016,7 @@ function emptyOutcome(status, generation, previousGeneration) {
     previousGeneration,
     compartmentsRebased: 0,
     compartmentsUnresolved: 0,
+    compartmentsDerived: 0,
     compartmentsResolvedAgain: 0,
     recompCompartmentsRebased: 0,
     recompCompartmentsUnresolved: 0,
@@ -29045,6 +29070,12 @@ function readCoordinateRebaseNotice(db, sessionId) {
     if (record.generation !== "v1" && record.generation !== "v2")
       return null;
     const count = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
+    const ranges = (value) => Array.isArray(value) ? value.flatMap((entry) => {
+      if (!entry || typeof entry !== "object")
+        return [];
+      const { sequence, start, end } = entry;
+      return typeof sequence === "number" && typeof start === "number" && typeof end === "number" ? [{ sequence, start, end }] : [];
+    }) : [];
     return {
       generation: record.generation,
       previousGeneration: record.previousGeneration === "v1" || record.previousGeneration === "v2" ? record.previousGeneration : null,
@@ -29053,7 +29084,10 @@ function readCoordinateRebaseNotice(db, sessionId) {
       discardedReductions: count(record.discardedReductions),
       droppedDepthRows: count(record.droppedDepthRows),
       healedGaps: count(record.healedGaps),
-      narrativeGaps: count(record.narrativeGaps)
+      narrativeGaps: count(record.narrativeGaps),
+      derivedCompartments: ranges(record.derivedCompartments),
+      unresolvedCompartmentRanges: ranges(record.unresolvedCompartmentRanges),
+      neighbourRecoveryAt: typeof record.neighbourRecoveryAt === "number" && Number.isFinite(record.neighbourRecoveryAt) ? record.neighbourRecoveryAt : null
     };
   } catch {
     return null;
@@ -29090,36 +29124,62 @@ function readCompartmentRows(db, table, sessionId) {
   return db.prepare(`SELECT id, sequence, start_message, end_message, start_message_id, end_message_id, rebase_status
              FROM ${table} WHERE session_id = ? ORDER BY sequence ASC`).all(sessionId).filter(isCompartmentCoordinateRow);
 }
+function resolveAnchor(messageId, resolveOrdinal) {
+  return messageId && messageId.length > 0 ? resolveOrdinal(messageId) : undefined;
+}
 function planCompartments(rows, table, projection) {
-  return rows.map((row) => {
-    const previousStatus = row.rebase_status === "unresolved" ? "unresolved" : "ok";
-    const startId = row.start_message_id ?? "";
-    const endId = row.end_message_id ?? "";
-    const start = startId.length > 0 ? projection.ordinalById.get(startId) : undefined;
-    const end = endId.length > 0 ? projection.ordinalById.get(endId) : undefined;
-    if (start === undefined || end === undefined) {
-      return {
-        table,
-        id: row.id,
-        previousStart: row.start_message,
-        previousEnd: row.end_message,
-        start: row.start_message,
-        end: row.end_message,
-        status: "unresolved",
-        previousStatus
-      };
-    }
-    return {
+  const resolveOrdinal = (messageId) => projection.ordinalById.get(messageId);
+  return recoverFromNeighbours(rows, table, rows.map((row) => ({
+    start: resolveAnchor(row.start_message_id, resolveOrdinal),
+    end: resolveAnchor(row.end_message_id, resolveOrdinal)
+  })));
+}
+function recoverFromNeighbours(rows, table, known) {
+  const plans = rows.map((row, index) => {
+    const own = known[index] ?? { start: undefined, end: undefined };
+    const previousEnd = index === 0 ? 0 : known[index - 1]?.end;
+    const nextStart = index === rows.length - 1 ? undefined : known[index + 1]?.start;
+    const start = own.start ?? (previousEnd === undefined ? undefined : previousEnd + 1);
+    const end = own.end ?? (nextStart === undefined ? undefined : nextStart - 1);
+    const base = {
       table,
       id: row.id,
+      sequence: row.sequence,
       previousStart: row.start_message,
       previousEnd: row.end_message,
-      start,
-      end,
-      status: "ok",
-      previousStatus
+      previousStatus: row.rebase_status === "unresolved" ? "unresolved" : "ok"
+    };
+    if (start !== undefined && end !== undefined && start <= end) {
+      return {
+        ...base,
+        start,
+        end,
+        status: "ok",
+        derived: own.start === undefined || own.end === undefined
+      };
+    }
+    return {
+      ...base,
+      start: start ?? row.start_message,
+      end: end ?? row.end_message,
+      status: "unresolved",
+      derived: false
     };
   });
+  for (let index = 0;index < plans.length; index += 1) {
+    const plan = plans[index];
+    if (plan?.status !== "unresolved")
+      continue;
+    const previous = plans[index - 1];
+    const next = plans[index + 1];
+    if (previous?.status === "ok" && plan.start <= previous.end) {
+      plan.start = previous.end + 1;
+    }
+    if (next?.status === "ok" && plan.end >= next.start) {
+      plan.end = next.start - 1;
+    }
+  }
+  return plans;
 }
 function healNonNarrativeCompartmentGaps(plans, projection) {
   let healed = 0;
@@ -29150,7 +29210,10 @@ function healNonNarrativeCompartmentGaps(plans, projection) {
   return { healed, narrative };
 }
 function compartmentPlanChanges(plan) {
-  return plan.status !== plan.previousStatus || plan.status === "ok" && (plan.start !== plan.previousStart || plan.end !== plan.previousEnd);
+  return plan.status !== plan.previousStatus || plan.start !== plan.previousStart || plan.end !== plan.previousEnd;
+}
+function rangeNotes(plans, predicate) {
+  return plans.filter((plan) => plan.table === "compartments" && predicate(plan)).map((plan) => ({ sequence: plan.sequence, start: plan.start, end: plan.end }));
 }
 function planNotes(db, sessionId, projection) {
   const rows = db.prepare("SELECT id, anchor_ordinal, anchor_block_id FROM notes WHERE session_id = ? AND anchor_ordinal IS NOT NULL").all(sessionId);
@@ -29236,7 +29299,14 @@ function rebaseSessionCoordinates(args) {
   }
   const previousGeneration = readCoordinateGeneration(db, sessionId);
   if (previousGeneration === generation) {
-    return emptyOutcome("unchanged", generation, previousGeneration);
+    const outcome = emptyOutcome("unchanged", generation, previousGeneration);
+    const repair = repairStampedSessionOnce(db, sessionId, args.readMessages);
+    if (repair !== null && repair.rowsRewritten > 0) {
+      outcome.status = "repaired";
+      outcome.compartmentsDerived = repair.derived.length;
+      outcome.compartmentsUnresolved = repair.unresolved.length;
+    }
+    return outcome;
   }
   const impliedGeneration = previousGeneration ?? generationImpliedByHarness(db, sessionId) ?? generation;
   if (impliedGeneration === generation) {
@@ -29300,6 +29370,8 @@ function rebaseSessionCoordinates(args) {
       if (plan.table === "compartments") {
         outcome.compartmentsRebased += rebased;
         outcome.compartmentsUnresolved += unresolved;
+        if (rebased === 1 && plan.derived)
+          outcome.compartmentsDerived += 1;
         if (rebased === 1 && plan.previousStatus === "unresolved")
           outcome.compartmentsResolvedAgain += 1;
       } else {
@@ -29356,7 +29428,10 @@ function rebaseSessionCoordinates(args) {
       discardedReductions: outcome.queuedReductionsDiscarded,
       droppedDepthRows: outcome.compressionDepthRowsDropped,
       healedGaps: outcome.healedGaps,
-      narrativeGaps: outcome.narrativeGaps
+      narrativeGaps: outcome.narrativeGaps,
+      derivedCompartments: rangeNotes(compartmentPlans, (plan) => plan.status === "ok" && plan.derived),
+      unresolvedCompartmentRanges: rangeNotes(compartmentPlans, (plan) => plan.status === "unresolved"),
+      neighbourRecoveryAt: Date.now()
     });
     db.exec("COMMIT");
     committed = true;
@@ -29374,10 +29449,114 @@ function rebaseSessionCoordinates(args) {
   sessionLog(sessionId, formatRebaseLogLine(outcome, performance.now() - startedAt));
   return outcome;
 }
+function recoverUnresolvedCompartments(args) {
+  const { db, sessionId } = args;
+  const rows = readCompartmentRows(db, "compartments", sessionId);
+  const result = { rowsRewritten: 0, derived: [], unresolved: [] };
+  if (!rows.some((row) => row.rebase_status === "unresolved"))
+    return result;
+  const known = rows.map((row) => {
+    if (row.rebase_status !== "unresolved") {
+      return { start: row.start_message, end: row.end_message };
+    }
+    return {
+      start: resolveAnchor(row.start_message_id, args.resolveOrdinal),
+      end: resolveAnchor(row.end_message_id, args.resolveOrdinal)
+    };
+  });
+  const plans = recoverFromNeighbours(rows, "compartments", known);
+  const wasUnresolved = (plan) => plan.previousStatus === "unresolved";
+  result.derived = rangeNotes(plans, (plan) => wasUnresolved(plan) && plan.status === "ok" && plan.derived);
+  result.unresolved = rangeNotes(plans, (plan) => plan.status === "unresolved");
+  const changed = plans.filter(compartmentPlanChanges);
+  const now = Date.now();
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    for (const plan of changed) {
+      db.prepare("UPDATE compartments SET start_message = ?, end_message = ?, rebase_status = ? WHERE id = ?").run(plan.start, plan.end, plan.status, plan.id);
+    }
+    const previous = readCoordinateRebaseNotice(db, sessionId);
+    const generation = previous?.generation ?? readCoordinateGeneration(db, sessionId);
+    if (generation !== null) {
+      const derivedSequences = new Set(result.derived.map((note) => note.sequence));
+      const notice = {
+        generation,
+        previousGeneration: previous?.previousGeneration ?? null,
+        at: previous?.at ?? now,
+        unresolvedCompartments: result.unresolved.length,
+        discardedReductions: previous?.discardedReductions ?? 0,
+        droppedDepthRows: previous?.droppedDepthRows ?? 0,
+        healedGaps: previous?.healedGaps ?? 0,
+        narrativeGaps: previous?.narrativeGaps ?? 0,
+        derivedCompartments: [
+          ...(previous?.derivedCompartments ?? []).filter((note) => !derivedSequences.has(note.sequence)),
+          ...result.derived
+        ],
+        unresolvedCompartmentRanges: result.unresolved,
+        neighbourRecoveryAt: now
+      };
+      ensureSessionMetaRow(db, sessionId);
+      db.prepare("UPDATE session_meta SET coordinate_rebase_notice = ? WHERE session_id = ?").run(JSON.stringify(notice), sessionId);
+    }
+    db.exec("COMMIT");
+    committed = true;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+  result.rowsRewritten = changed.length;
+  sessionLog(sessionId, `INFO compartment neighbour recovery (${args.reason}) rows_rewritten=${changed.length} ` + `derived=${result.derived.map((note) => `${note.start}-${note.end}`).join(",") || "none"} ` + `unresolved=${result.unresolved.map((note) => `${note.start}-${note.end}`).join(",") || "none"}`);
+  return result;
+}
+function unresolvedRowBreaksTiling(rows) {
+  let expectedStart = 1;
+  for (let index = 0;index < rows.length; index += 1) {
+    const row = rows[index];
+    if (!row)
+      continue;
+    const broken = row.start_message !== expectedStart || row.end_message < row.start_message;
+    const touchesUnresolved = row.rebase_status === "unresolved" || rows[index - 1]?.rebase_status === "unresolved";
+    if (broken && touchesUnresolved)
+      return true;
+    expectedStart = row.end_message + 1;
+  }
+  return false;
+}
+function repairStampedSessionOnce(db, sessionId, readMessages) {
+  let checked = repairCheckedSessions.get(db);
+  if (!checked) {
+    checked = new Set;
+    repairCheckedSessions.set(db, checked);
+  }
+  if (checked.has(sessionId))
+    return null;
+  checked.add(sessionId);
+  const rows = readCompartmentRows(db, "compartments", sessionId);
+  if (!rows.some((row) => row.rebase_status === "unresolved"))
+    return null;
+  if (readCoordinateRebaseNotice(db, sessionId)?.neighbourRecoveryAt != null)
+    return null;
+  if (!unresolvedRowBreaksTiling(rows))
+    return null;
+  let ordinalById = null;
+  return recoverUnresolvedCompartments({
+    db,
+    sessionId,
+    resolveOrdinal: (messageId) => {
+      ordinalById ??= buildProjection(readMessages(sessionId)).ordinalById;
+      return ordinalById.get(messageId);
+    },
+    reason: "stamped-session repair"
+  });
+}
 function formatRebaseLogLine(outcome, elapsedMs) {
   const rowsRewritten = outcome.compartmentsRebased + outcome.recompCompartmentsRebased + outcome.notesRebased + outcome.notesCleared + (outcome.priorBoundaryRebased ? 1 : 0) + (outcome.recompPartialRangeRebased ? 1 : 0);
   const unresolved = outcome.compartmentsUnresolved + outcome.recompCompartmentsUnresolved;
-  return `INFO store-generation-rebase ${outcome.previousGeneration ?? "unrecorded"}->${outcome.generation} ` + `rows_rewritten=${rowsRewritten} unresolved=${unresolved} ` + `index_rows_rebuilt=${outcome.indexRowsRebuilt} drops_discarded=${outcome.queuedReductionsDiscarded} ` + `healed_gaps=${outcome.healedGaps} narrative_gaps=${outcome.narrativeGaps} ` + `ms=${Math.round(elapsedMs)} ` + `(chunk_windows_deleted=${outcome.chunkEmbeddingsDeleted} depth_rows_dropped=${outcome.compressionDepthRowsDropped} ` + `part_tags_folded=${outcome.partTagsFolded} lkg_slots_dropped=${outcome.lkgSlotsDropped} ` + `frozen_part_entries_dropped=${outcome.frozenPartEntriesDropped})`;
+  return `INFO store-generation-rebase ${outcome.previousGeneration ?? "unrecorded"}->${outcome.generation} ` + `rows_rewritten=${rowsRewritten} unresolved=${unresolved} derived=${outcome.compartmentsDerived} ` + `index_rows_rebuilt=${outcome.indexRowsRebuilt} drops_discarded=${outcome.queuedReductionsDiscarded} ` + `healed_gaps=${outcome.healedGaps} narrative_gaps=${outcome.narrativeGaps} ` + `ms=${Math.round(elapsedMs)} ` + `(chunk_windows_deleted=${outcome.chunkEmbeddingsDeleted} depth_rows_dropped=${outcome.compressionDepthRowsDropped} ` + `part_tags_folded=${outcome.partTagsFolded} lkg_slots_dropped=${outcome.lkgSlotsDropped} ` + `frozen_part_entries_dropped=${outcome.frozenPartEntriesDropped})`;
 }
 function planPriorBoundary(db, sessionId, plans) {
   const row = db.prepare("SELECT prior_boundary_ordinal FROM session_meta WHERE session_id = ?").get(sessionId);
@@ -29421,11 +29600,13 @@ function indexDisagreesWithProjection(db, sessionId, projection) {
            )`, sessionId);
   return orphanedMapRows > 0;
 }
+var repairCheckedSessions;
 var init_store_generation_rebase = __esm(async () => {
   init_logger();
   init_storage_meta_shared();
   init_storage_tags();
   await init_message_index();
+  repairCheckedSessions = new WeakMap;
 });
 
 // src/hooks/magic-context/derive-budgets.ts
@@ -73985,7 +74166,12 @@ async function runGit(cwd, args) {
       encoding: "utf8"
     });
     return String(result.stdout);
-  } catch {
+  } catch (error) {
+    if (error.killed || error.code === "ETIMEDOUT") {
+      throw new Error(`Git verification command timed out after ${GIT_TIMEOUT_MS2}ms`, {
+        cause: error
+      });
+    }
     return null;
   }
 }
@@ -74408,6 +74594,45 @@ var init_note_nudger = __esm(() => {
   lastDeliveredAt = new Map;
 });
 
+// src/shared/safe-notification-target.ts
+function isDefaultSessionTitle(title) {
+  return DEFAULT_TITLE_RE.test(title);
+}
+async function readSessionTitle(client, sessionId) {
+  try {
+    const c = client;
+    if (typeof c.session?.get !== "function")
+      return null;
+    const raw = await Promise.resolve(c.session.get({ path: { id: sessionId } }));
+    const obj = raw;
+    const title = obj && typeof obj === "object" ? obj.data?.title ?? obj.title : undefined;
+    return typeof title === "string" ? title : null;
+  } catch {
+    return null;
+  }
+}
+async function waitForSafeNotificationTarget(client, sessionId, options) {
+  const attempts = Math.max(1, options?.attempts ?? 4);
+  const delayMs = options?.delayMs ?? 15000;
+  for (let attempt = 0;attempt < attempts; attempt += 1) {
+    const title = await readSessionTitle(client, sessionId);
+    if (title === null)
+      return "safe";
+    if (!isDefaultSessionTitle(title))
+      return "safe";
+    if (attempt < attempts - 1) {
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+  log(`[magic-context] notification skipped: session ${sessionId} still has its default title (would suppress title generation); will retry on a later startup`);
+  return "skip";
+}
+var DEFAULT_TITLE_RE;
+var init_safe_notification_target = __esm(() => {
+  init_logger();
+  DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+});
+
 // src/shared/rpc-notifications.ts
 function registerNotificationSink(sink) {
   sinks.add(sink);
@@ -74508,45 +74733,6 @@ var init_rpc_notifications = __esm(() => {
   sinks = new Set;
 });
 
-// src/shared/safe-notification-target.ts
-function isDefaultSessionTitle(title) {
-  return DEFAULT_TITLE_RE.test(title);
-}
-async function readSessionTitle(client, sessionId) {
-  try {
-    const c = client;
-    if (typeof c.session?.get !== "function")
-      return null;
-    const raw = await Promise.resolve(c.session.get({ path: { id: sessionId } }));
-    const obj = raw;
-    const title = obj && typeof obj === "object" ? obj.data?.title ?? obj.title : undefined;
-    return typeof title === "string" ? title : null;
-  } catch {
-    return null;
-  }
-}
-async function waitForSafeNotificationTarget(client, sessionId, options) {
-  const attempts = Math.max(1, options?.attempts ?? 4);
-  const delayMs = options?.delayMs ?? 15000;
-  for (let attempt = 0;attempt < attempts; attempt += 1) {
-    const title = await readSessionTitle(client, sessionId);
-    if (title === null)
-      return "safe";
-    if (!isDefaultSessionTitle(title))
-      return "safe";
-    if (attempt < attempts - 1) {
-      await new Promise((resolve) => setTimeout(resolve, delayMs));
-    }
-  }
-  log(`[magic-context] notification skipped: session ${sessionId} still has its default title (would suppress title generation); will retry on a later startup`);
-  return "skip";
-}
-var DEFAULT_TITLE_RE;
-var init_safe_notification_target = __esm(() => {
-  init_logger();
-  DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
-});
-
 // src/shared/prompt-context.ts
 function isRecord6(value) {
   return typeof value === "object" && value !== null;
@@ -74908,6 +75094,7 @@ async function sendStatusNotification(_client, sessionId, text, params) {
 var MAX_QUEUED_IGNORED_NOTIFICATIONS = 16, queuedIgnoredNotifications, flushingIgnoredNotifications, idleSessions, lastDeliveredText, activityEpoch, defaultHoldDetector = (sessionId) => !idleSessions.has(sessionId) || shouldHoldIgnoredNotification(sessionId), holdDetector, notificationServerUrl, noticeDeleter, notificationDiagnosticObserverForTests;
 var init_send_session_notification = __esm(async () => {
   init_logger();
+  init_safe_notification_target();
   await init_read_session_db();
   queuedIgnoredNotifications = new Map;
   flushingIgnoredNotifications = new Set;
@@ -75052,6 +75239,74 @@ var init_storage_user_memory = __esm(() => {
   USER_MEMORY_CANDIDATE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 });
 
+// src/shared/assistant-message-extractor.ts
+function asSessionMessage(value) {
+  if (!isRecord3(value))
+    return null;
+  const info = value.info;
+  const parts = value.parts;
+  return {
+    info: isRecord3(info) ? {
+      role: typeof info.role === "string" ? info.role : undefined,
+      time: isRecord3(info.time) ? {
+        created: typeof info.time.created === "number" ? info.time.created : undefined
+      } : undefined,
+      error: info.error,
+      finish: typeof info.finish === "string" ? info.finish : typeof info.finish_reason === "string" ? info.finish_reason : typeof info.finishReason === "string" ? info.finishReason : undefined
+    } : undefined,
+    parts
+  };
+}
+function getCreatedTime(message) {
+  return message.info?.time?.created ?? 0;
+}
+function getTextParts(message) {
+  if (!Array.isArray(message.parts))
+    return [];
+  return message.parts.filter((part) => isRecord3(part)).map((part) => ({
+    type: typeof part.type === "string" ? part.type : undefined,
+    text: typeof part.text === "string" ? part.text : undefined
+  })).filter((part) => part.type === "text" && Boolean(part.text));
+}
+function getLatestAssistantMessage(messages) {
+  if (!Array.isArray(messages) || messages.length === 0)
+    return null;
+  return messages.map(asSessionMessage).filter((message) => message !== null).filter((message) => message.info?.role === "assistant").sort((a, b) => getCreatedTime(b) - getCreatedTime(a))[0] ?? null;
+}
+function extractLatestAssistantText(messages) {
+  const latest = getLatestAssistantMessage(messages);
+  if (!latest)
+    return null;
+  return getTextParts(latest).map((part) => part.text).join(`
+`) || null;
+}
+function extractLatestAssistantFailure(messages) {
+  const latest = getLatestAssistantMessage(messages);
+  if (!latest || latest.info?.error === undefined || latest.info.error === null)
+    return null;
+  return {
+    error: latest.info.error,
+    finish: latest.info.finish ?? null
+  };
+}
+function hasLengthCappedOutput(value) {
+  if (Array.isArray(value))
+    return value.some((item) => hasLengthCappedOutput(item));
+  if (!isRecord3(value))
+    return false;
+  if (value.length_capped === true || value.lengthCapped === true)
+    return true;
+  const finishReason = value.finish_reason ?? value.finishReason ?? value.finish ?? (value.type === "step-finish" ? value.reason : undefined) ?? value.stopReason;
+  if (typeof finishReason === "string") {
+    const normalized = finishReason.toLowerCase();
+    if (normalized === "length" || normalized === "max_tokens" || normalized === "max_output_tokens") {
+      return true;
+    }
+  }
+  return Object.values(value).some((item) => hasLengthCappedOutput(item));
+}
+var init_assistant_message_extractor = () => {};
+
 // src/shared/resolve-fallbacks.ts
 function parseProviderModel(spec) {
   const slash = spec.indexOf("/");
@@ -75343,6 +75598,17 @@ async function attemptAndValidate(client, args, timeoutMs, signal, callContext,
     };
   }
   try {
+    if (!extractLatestAssistantText(output)) {
+      const assistantFailure = extractLatestAssistantFailure(output);
+      if (assistantFailure) {
+        const error = new Error(`Host recorded assistant error: ${String(assistantFailure.error)}`);
+        Object.assign(error, {
+          name: "DreamerProviderOutputFailureError",
+          transient: true
+        });
+        throw error;
+      }
+    }
     const validated = await options.validateOutput(output, attempt);
     return { output, validated, attempt };
   } catch (error) {
@@ -75429,6 +75695,7 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
 var ABORT_CALL_TIMEOUT_MS = 3000, promptFailureDetails;
 var init_model_suggestion_retry = __esm(() => {
   init_overflow_detection();
+  init_assistant_message_extractor();
   init_logger();
   init_redaction();
   promptFailureDetails = new WeakMap;
@@ -75463,14 +75730,14 @@ var CTX_REDUCE_LIGHT_DESCRIPTION = `Stamp an item as no longer needed for the wo
 
 // src/shared/prompt-surface-runtime.ts
 import { existsSync as existsSync12, readFileSync as readFileSync12, statSync as statSync12 } from "node:fs";
-import { dirname as dirname8, isAbsolute as isAbsolute5, resolve as resolve5 } from "node:path";
+import { dirname as dirname8, isAbsolute as isAbsolute5, resolve as resolve6 } from "node:path";
 function promptSurfaceHashMaterial(systemContent, preset = "full") {
   return preset === "full" ? systemContent : `${systemContent}
 \x00magic-context-prompt-surface:${preset}`;
 }
 function resolveUserConfigDirectory(options) {
   if (options.userConfigDirectory)
-    return resolve5(options.userConfigDirectory);
+    return resolve6(options.userConfigDirectory);
   const sharedBase = cortexKitUserConfigBasePath();
   const shared = detectConfigFile(sharedBase);
   if (shared.format !== "none")
@@ -75497,7 +75764,7 @@ function createPromptSurfaceRuntime(options) {
   const readGuidanceOverride = (configuredPath) => {
     if (!configuredPath)
       return;
-    const path = isAbsolute5(configuredPath) ? configuredPath : resolve5(userConfigDirectory, configuredPath);
+    const path = isAbsolute5(configuredPath) ? configuredPath : resolve6(userConfigDirectory, configuredPath);
     let content;
     try {
       if (!statSync12(path).isFile()) {
@@ -75647,6 +75914,11 @@ var init_user_facing_codes = __esm(() => {
       sentence: "Some finished background sessions could not be removed from this host.",
       action: "They are removed automatically the next time Magic Context runs inside a registered OpenCode service."
     },
+    historian_saved_history_misaligned: {
+      code: "MC-H03",
+      sentence: "History compression is paused because this session's saved summaries no longer line up with its messages.",
+      action: "Run /ctx-recomp to rebuild them."
+    },
     recomp_unavailable: {
       code: "MC-R01",
       sentence: "History compression could not be rebuilt.",
@@ -75817,6 +76089,11 @@ var init_user_facing_codes = __esm(() => {
       sentence: "History compression is paused while the engine syncs.",
       action: "Retry in a moment."
     },
+    history_compression_needs_message: {
+      code: "MC-C12",
+      sentence: "History compression has not seen this session since Magic Context reconnected.",
+      action: "Send a message in this session first, then run /ctx-wrapup again."
+    },
     context_service_unavailable: {
       code: "MC-C10",
       sentence: "Magic Context is temporarily unavailable.",
@@ -77636,74 +77913,6 @@ var init_subagent_token_capture = __esm(() => {
   init_logger();
 });
 
-// src/shared/assistant-message-extractor.ts
-function asSessionMessage(value) {
-  if (!isRecord3(value))
-    return null;
-  const info = value.info;
-  const parts = value.parts;
-  return {
-    info: isRecord3(info) ? {
-      role: typeof info.role === "string" ? info.role : undefined,
-      time: isRecord3(info.time) ? {
-        created: typeof info.time.created === "number" ? info.time.created : undefined
-      } : undefined,
-      error: info.error,
-      finish: typeof info.finish === "string" ? info.finish : typeof info.finish_reason === "string" ? info.finish_reason : typeof info.finishReason === "string" ? info.finishReason : undefined
-    } : undefined,
-    parts
-  };
-}
-function getCreatedTime(message) {
-  return message.info?.time?.created ?? 0;
-}
-function getTextParts(message) {
-  if (!Array.isArray(message.parts))
-    return [];
-  return message.parts.filter((part) => isRecord3(part)).map((part) => ({
-    type: typeof part.type === "string" ? part.type : undefined,
-    text: typeof part.text === "string" ? part.text : undefined
-  })).filter((part) => part.type === "text" && Boolean(part.text));
-}
-function getLatestAssistantMessage(messages) {
-  if (!Array.isArray(messages) || messages.length === 0)
-    return null;
-  return messages.map(asSessionMessage).filter((message) => message !== null).filter((message) => message.info?.role === "assistant").sort((a, b) => getCreatedTime(b) - getCreatedTime(a))[0] ?? null;
-}
-function extractLatestAssistantText(messages) {
-  const latest = getLatestAssistantMessage(messages);
-  if (!latest)
-    return null;
-  return getTextParts(latest).map((part) => part.text).join(`
-`) || null;
-}
-function extractLatestAssistantFailure(messages) {
-  const latest = getLatestAssistantMessage(messages);
-  if (!latest || latest.info?.error === undefined || latest.info.error === null)
-    return null;
-  return {
-    error: latest.info.error,
-    finish: latest.info.finish ?? null
-  };
-}
-function hasLengthCappedOutput(value) {
-  if (Array.isArray(value))
-    return value.some((item) => hasLengthCappedOutput(item));
-  if (!isRecord3(value))
-    return false;
-  if (value.length_capped === true || value.lengthCapped === true)
-    return true;
-  const finishReason = value.finish_reason ?? value.finishReason ?? value.finish ?? (value.type === "step-finish" ? value.reason : undefined) ?? value.stopReason;
-  if (typeof finishReason === "string") {
-    const normalized = finishReason.toLowerCase();
-    if (normalized === "length" || normalized === "max_tokens" || normalized === "max_output_tokens") {
-      return true;
-    }
-  }
-  return Object.values(value).some((item) => hasLengthCappedOutput(item));
-}
-var init_assistant_message_extractor = () => {};
-
 // src/shared/keep-subagents.ts
 function shouldKeepSubagents() {
   return keepSubagents;
@@ -78014,6 +78223,14 @@ function buildHistorianFailureNotice(failureCount, _lastError) {
   return [heading, "", renderUserFacingFailure("historian_unavailable")].join(`
 `);
 }
+function buildStoredCompartmentsInvalidNotice() {
+  return [
+    "## Magic Context — History compression",
+    "",
+    renderUserFacingFailure("historian_saved_history_misaligned")
+  ].join(`
+`);
+}
 function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationError, language) {
   const prompt = [
     originalPrompt,
@@ -84697,6 +84914,12 @@ function v2NonNarrativeStoredGapRanges(db, sessionId, compartments) {
   }
   return safeRanges;
 }
+function storedCompartmentFailureBackingOff(db, sessionId, validationError, now = Date.now()) {
+  if (getHistorianFailureState(db, sessionId).lastError !== validationError)
+    return false;
+  const failedAt = loadProtectedTailMeta(db, sessionId).historianDrainFailureAt;
+  return failedAt > 0 && failedAt <= now && now - failedAt < STORED_COMPARTMENT_FAILURE_BACKOFF_MS;
+}
 function shouldSuppressHistorianAlert(sessionId) {
   const lastAlert = lastHistorianAlertBySession.get(sessionId);
   if (lastAlert && Date.now() - lastAlert < HISTORIAN_ALERT_COOLDOWN_MS) {
@@ -84819,13 +85042,37 @@ async function runCompartmentAgent(deps) {
       }
       return;
     }
-    const priorCompartments = getCompartments(db, sessionId);
-    const existingValidationError = validateStoredCompartments(priorCompartments, v2NonNarrativeStoredGapRanges(db, sessionId, priorCompartments));
+    let priorCompartments = getCompartments(db, sessionId);
+    let existingValidationError = validateStoredCompartments(priorCompartments, v2NonNarrativeStoredGapRanges(db, sessionId, priorCompartments));
+    const unresolvedInvolved = existingValidationError !== null && priorCompartments.some((compartment) => compartment.rebaseStatus === "unresolved");
+    if (unresolvedInvolved && existingValidationError && storedCompartmentFailureBackingOff(db, sessionId, existingValidationError)) {
+      sessionLog(sessionId, `historian no-op: stored compartments still invalid ("${existingValidationError}"); backing off`);
+      telemetry.status = "noop";
+      telemetry.failureReason = `existing-validation backoff: ${existingValidationError}`;
+      return;
+    }
+    if (unresolvedInvolved && existingValidationError) {
+      const recovery = recoverUnresolvedCompartments({
+        db,
+        sessionId,
+        resolveOrdinal: (messageId) => readRawSessionMessageOrdinalById(sessionId, messageId) ?? undefined,
+        reason: `historian pre-run check failed: ${existingValidationError}`
+      });
+      if (recovery.rowsRewritten > 0) {
+        priorCompartments = getCompartments(db, sessionId);
+        existingValidationError = validateStoredCompartments(priorCompartments, v2NonNarrativeStoredGapRanges(db, sessionId, priorCompartments));
+      }
+    }
     if (existingValidationError) {
       sessionLog(sessionId, `historian failure: source=existing-validation reason="${existingValidationError}"`);
       const failCount = incrementHistorianFailure(db, sessionId, existingValidationError);
       telemetry.failureReason = `existing-validation: ${existingValidationError}`;
-      await notifyHistorianIssue(buildHistorianFailureNotice(failCount, existingValidationError));
+      if (unresolvedInvolved) {
+        retainDrainReservationForRetryThrottle = true;
+        await notifyHistorianIssue(buildStoredCompartmentsInvalidNotice());
+      } else {
+        await notifyHistorianIssue(buildHistorianFailureNotice(failCount, existingValidationError));
+      }
       return;
     }
     const offset = priorCompartments.length > 0 ? priorCompartments[priorCompartments.length - 1].endMessage + 1 : 1;
@@ -85308,7 +85555,7 @@ ${chunkText}`,
     cleanupHistorianStateFile(stateFilePath);
   }
 }
-var inconsistentProducerWindows, HISTORIAN_ALERT_COOLDOWN_MS, lastHistorianAlertBySession;
+var inconsistentProducerWindows, HISTORIAN_ALERT_COOLDOWN_MS, lastHistorianAlertBySession, STORED_COMPARTMENT_FAILURE_BACKOFF_MS;
 var init_compartment_runner_incremental = __esm(async () => {
   init_compartment_embedding();
   init_compartment_events();
@@ -85351,6 +85598,7 @@ var init_compartment_runner_incremental = __esm(async () => {
   inconsistentProducerWindows = new Set;
   HISTORIAN_ALERT_COOLDOWN_MS = 60 * 1000;
   lastHistorianAlertBySession = new Map;
+  STORED_COMPARTMENT_FAILURE_BACKOFF_MS = 30 * 60 * 1000;
 });
 
 // src/hooks/magic-context/compartment-runner-recomp.ts
@@ -106952,6 +107200,8 @@ var TODOWRITE_TOOL = "todowrite";
 var availabilityBySession = new BoundedSessionMap(1000);
 var permissionDeniedBySession = new BoundedSessionMap(2000);
 var ctxReducePermissionDenyLogged = new BoundedSessionMap(1000);
+var ctxReduceSpawnPermissionDenied = new BoundedSessionMap(1000);
+var ctxReduceSpawnPermissionReads = new Map;
 function permissionCacheKey(toolName, sessionId) {
   return `${toolName}\x00${sessionId}`;
 }
@@ -106970,6 +107220,12 @@ function verdictFromToolsMap(tools, toolName) {
     return false;
   return null;
 }
+function unfrozenVerdict(sessionId, toolName, mapVerdict) {
+  if (toolName === CTX_REDUCE_TOOL && ctxReduceSpawnPermissionDenied.get(sessionId) === true) {
+    return false;
+  }
+  return mapVerdict ?? true;
+}
 function resolveToolAvailabilityFromMessages(sessionId, toolName, messages) {
   if (toolName === CTX_REDUCE_TOOL && !ctxReduceRegisteredGlobally) {
     return { callable: false, frozen: true };
@@ -106981,7 +107237,7 @@ function resolveToolAvailabilityFromMessages(sessionId, toolName, messages) {
   for (const message of messages) {
     if (message.info?.role !== "user")
       continue;
-    const verdict = verdictFromToolsMap(message.info.tools, toolName) ?? true;
+    const verdict = unfrozenVerdict(sessionId, toolName, verdictFromToolsMap(message.info.tools, toolName));
     availabilityBySession.set(key, verdict);
     return { callable: verdict, frozen: true };
   }
@@ -107004,7 +107260,7 @@ function resolveToolAvailability(sessionId, toolName) {
     if (!row)
       return { callable: true, frozen: false };
     const verdict = row.tools === null ? null : verdictFromToolsMap(JSON.parse(row.tools), toolName);
-    const resolved = verdict ?? true;
+    const resolved = unfrozenVerdict(sessionId, toolName, verdict);
     availabilityBySession.set(key, resolved);
     return { callable: resolved, frozen: true };
   } catch (error) {
@@ -107120,6 +107376,58 @@ async function resolveToolPermissionDenied(client, sessionId, toolName, activeAg
   permissionDeniedBySession.set(permissionCacheKey(toolName, sessionId), denied);
   return denied;
 }
+function primeCtxReduceSpawnPermission(client, sessionId, spawnAgent) {
+  if (!ctxReduceSpawnPermissionReadNeeded(sessionId))
+    return Promise.resolve();
+  const inFlight = ctxReduceSpawnPermissionReads.get(sessionId);
+  if (inFlight)
+    return inFlight;
+  const read = (async () => {
+    try {
+      const denied = await resolveToolPermissionDenied(client, sessionId, CTX_REDUCE_TOOL, spawnAgent);
+      ctxReduceSpawnPermissionDenied.set(sessionId, denied);
+      if (denied) {
+        sessionLog(sessionId, `ctx_reduce permission is denied for agent=${spawnAgent ?? "(session default)"}; session freezes without ctx_reduce tags, guidance, or nudges`);
+      }
+    } catch (error) {
+      sessionLog(sessionId, "ctx_reduce permission read before freeze failed (fail-open):", error);
+    } finally {
+      ctxReduceSpawnPermissionReads.delete(sessionId);
+    }
+  })();
+  ctxReduceSpawnPermissionReads.set(sessionId, read);
+  return read;
+}
+function ctxReduceSpawnPermissionReadNeeded(sessionId) {
+  return ctxReduceRegisteredGlobally && availabilityBySession.get(cacheKey2(CTX_REDUCE_TOOL, sessionId)) === undefined && ctxReduceSpawnPermissionDenied.get(sessionId) === undefined;
+}
+function spawnAgentFromMessages(messages) {
+  for (const message of messages) {
+    if (message.info?.role !== "user")
+      continue;
+    const agent = message.info.agent;
+    return typeof agent === "string" && agent.length > 0 ? agent : undefined;
+  }
+  return;
+}
+function spawnAgentFromOpenCodeDb(sessionId) {
+  if (!openCodeDbExists())
+    return { persisted: false };
+  try {
+    const row = withReadOnlySessionDb((db) => db.prepare(`SELECT json_extract(data, '$.agent') AS agent FROM message
+                          WHERE session_id = ? AND json_extract(data, '$.role') = 'user'
+                          ORDER BY time_created ASC LIMIT 1`).get(sessionId));
+    if (!row)
+      return { persisted: false };
+    return {
+      persisted: true,
+      agent: typeof row.agent === "string" && row.agent.length > 0 ? row.agent : undefined
+    };
+  } catch (error) {
+    sessionLog(sessionId, "ctx_reduce spawn agent read failed:", error);
+    return { persisted: false };
+  }
+}
 function todowritePermissionDenied(client, sessionId, activeAgent) {
   return resolveToolPermissionDenied(client, sessionId, TODOWRITE_TOOL, activeAgent);
 }
@@ -108022,9 +108330,26 @@ init_window_geometry();
 init_compartment_storage();
 init_session_decision_calibration();
 init_logger();
+await init_storage();
+
+// src/hooks/magic-context/cache-busting-signals.ts
+function canConsumeDeferredOnThisPass(args) {
+  if (args.justAwaitedPublication)
+    return true;
+  return args.schedulerDecision === "execute" || args.contextPercentage >= (args.forceMaterializationPercentage ?? escalationBands(65).forceMaterializationPercentage);
+}
+function hasReclaimRide(signals) {
+  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory;
+}
+var RECLAIM_RIDE_NAMES = ["hardFold", "force", "explicitFlush", "publishedHistory"];
+function reclaimRideLabel(signals) {
+  const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
+  return `ride=${active.length > 0 ? active.join("+") : "none"}`;
+}
+
+// src/hooks/magic-context/compartment-trigger.ts
 init_read_session_true_raw_tokens();
 await __promiseAll([
-  init_storage(),
   init_protected_tail_boundary(),
   init_read_session_chunk()
 ]);
@@ -108204,7 +108529,7 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
 function formatProjectedPostDropPercentage(value) {
   return value === null ? "none" : `${value.toFixed(1)}%`;
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, clearReasoningAge, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, clearReasoningAge, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide) {
   if (sessionMeta.compartmentInProgress) {
     sessionLog(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
@@ -108262,10 +108587,12 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession(db, sessionId), clearReasoningAge, sessionMeta.clearedReasoningThroughTag, canClearReasoning);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
+  const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
+  const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
   const forceMaterializationPercentage = escalationBands(executeThresholdPercentage).forceMaterializationPercentage;
   if (usage.percentage >= forceMaterializationPercentage) {
-    if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
-      sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — force band is ${forceMaterializationPercentage}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on the next eligible execute pass`);
+    if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
+      sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — force band is ${forceMaterializationPercentage}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on this pass (${rideLabel})`);
       return { shouldFire: false };
     }
     sessionLog(sessionId, `compartment trigger: force-firing at ${usage.percentage.toFixed(1)}% (projected post-drop ${formatProjectedPostDropPercentage(projectedPostDropPercentage)})`);
@@ -108325,8 +108652,8 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     sessionLog(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% — below proactive floor (${proactiveTriggerPercentage}%)`);
     return { shouldFire: false };
   }
-  if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
-    sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — usage is ${usage.percentage.toFixed(1)}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on the next eligible execute pass`);
+  if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
+    sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — usage is ${usage.percentage.toFixed(1)}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on this pass (${rideLabel})`);
     return { shouldFire: false };
   }
   if (!tailInfo.hasProtectedEligibleHead || !tailInfo.isMeaningful) {
@@ -108869,6 +109196,12 @@ function createSystemPromptHashHandler(deps) {
       sessionLog(sessionId, "system-prompt-hash session meta load failed:", error);
     }
     const isSubagentSession = sessionMetaEarly?.isSubagent === true;
+    if (deps.client && ctxReduceSpawnPermissionReadNeeded(sessionId)) {
+      const spawn = spawnAgentFromOpenCodeDb(sessionId);
+      if (spawn.persisted) {
+        await primeCtxReduceSpawnPermission(deps.client, sessionId, spawn.agent);
+      }
+    }
     const availability = resolveCtxReduceAvailability(sessionId);
     const ctxReduceCallable = availability.callable;
     const subagentReduceMode = isSubagentSession && ctxReduceCallable;
@@ -109081,21 +109414,6 @@ init_harness_provider_map();
 init_logger();
 init_models_dev_cache();
 
-// src/hooks/magic-context/cache-busting-signals.ts
-function canConsumeDeferredOnThisPass(args) {
-  if (args.justAwaitedPublication)
-    return true;
-  return args.schedulerDecision === "execute" || args.contextPercentage >= (args.forceMaterializationPercentage ?? escalationBands(65).forceMaterializationPercentage);
-}
-function hasReclaimRide(signals) {
-  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory;
-}
-var RECLAIM_RIDE_NAMES = ["hardFold", "force", "explicitFlush", "publishedHistory"];
-function reclaimRideLabel(signals) {
-  const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
-  return `ride=${active.length > 0 ? active.join("+") : "none"}`;
-}
-
 // src/hooks/magic-context/caveman-cleanup.ts
 init_shared();
 await init_storage();
@@ -115888,7 +116206,7 @@ function rustCaptureDigests(inputs, prior, acceptedInputs) {
 }
 function messageMatchesContentSnapshot(message, snapshot) {
   let fieldIndex = 0;
-  const matched = visitMessageContentFields(message, {
+  const matched = visitMessageContentFields(contentSnapshotValue(message), {
     field(value) {
       if (!Object.is(value, snapshot.fields[fieldIndex]))
         return false;
@@ -116143,6 +116461,7 @@ function ensureState(states, sessionId) {
   if (!state) {
     state = {
       initialized: false,
+      baselineSystemHashOmitted: false,
       consecutiveFailures: 0,
       passCount: 0,
       parked: false,
@@ -117104,6 +117423,7 @@ function createRustModeTransform(deps, options) {
       }
     }
     timings.preflight = performance.now() - passStartedAt;
+    resolveCtxReduceAvailabilityFromMessages(sessionId, messages);
     const reduceAvailability = resolveCtxReduceAvailability(sessionId);
     resolveTodowriteAvailabilityFromMessages(sessionId, messages);
     const todoAvailability = resolveTodowriteAvailability(sessionId);
@@ -117175,6 +117495,8 @@ function createRustModeTransform(deps, options) {
       }
       const effectiveFloor = protectionFloorResolution.floor;
       const historianRun = deps.resolveHistorianRun?.();
+      const observedSystemHash = sessionMeta.systemPromptHash ?? "";
+      const rustSystemHash = state.baselineSystemHashOmitted && sessionMeta.cachedM0SystemHash === observedSystemHash ? "" : observedSystemHash;
       const passInputs = {
         now_ms: requestObservedAtMs,
         model_key: modelKey,
@@ -117196,7 +117518,7 @@ function createRustModeTransform(deps, options) {
         caveman_min_chars: deps.cavemanTextCompression?.minChars ?? 500,
         cache_ttl: sessionMeta.cacheTtl,
         is_subagent: sessionMeta.isSubagent,
-        system_prompt_hash: sessionMeta.systemPromptHash ?? "",
+        system_prompt_hash: rustSystemHash,
         upgrade_state: readUpgradeState(deps.db, sessionId),
         tool_present: toolPresent,
         todo_tool_present: false,
@@ -117471,7 +117793,7 @@ function createRustModeTransform(deps, options) {
         modelKey: modelKey ?? null,
         providerId: model?.providerID ?? null,
         variant: deps.variantBySession?.get(sessionId),
-        systemPromptHash: sessionMeta.systemPromptHash ?? "",
+        systemPromptHash: rustSystemHash,
         upgradeState: String(passInputs.upgrade_state ?? "")
       };
       let body = buildTransformBody({
@@ -117905,6 +118227,9 @@ function createRustModeTransform(deps, options) {
         state.ordinalContinuationBase = ordinalContinuationBase;
       }
       if (!stateSyncRetryBusy) {
+        if (!state.initialized && !observedSystemHash) {
+          state.baselineSystemHashOmitted = true;
+        }
         state.initialized = true;
         state.seedPassPending = false;
       }
@@ -118701,6 +119026,9 @@ function createTransform(deps) {
       passOutcome.record("compaction-mode-transition-failure");
       sessionLog(sessionId, "compaction mode transition failed (retrying next pass):", error);
     }
+    if (deps.client !== undefined && !compactionOff) {
+      await primeCtxReduceSpawnPermission(deps.client, sessionId, spawnAgentFromMessages(messages));
+    }
     if (deps.transformMode === "rust") {
       if (!rustModeTransform) {
         sessionLog(sessionId, "rust transform unavailable; using raw passthrough");
@@ -119033,7 +119361,12 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       const tTrigger = performance.now();
       try {
         const inMemoryTail = buildTriggerInMemoryTail(db, sessionId, extractInMemoryMessageViews(messages));
-        const triggerResult = checkCompartmentTrigger(db, sessionId, sessionMeta, boundaryUsageForProtectedTail, sessionMeta.lastContextPercentage, boundaryExecuteThreshold, deriveTriggerBudget(boundaryContextLimit, boundaryExecuteThreshold), deps.clearReasoningAge, historianRun?.commitClusterTrigger ?? deps.commitClusterTrigger, undefined, boundaryContextLimit, inMemoryTail, taggerFloor, { providerID: resolvedProviderID });
+        const triggerResult = checkCompartmentTrigger(db, sessionId, sessionMeta, boundaryUsageForProtectedTail, sessionMeta.lastContextPercentage, boundaryExecuteThreshold, deriveTriggerBudget(boundaryContextLimit, boundaryExecuteThreshold), deps.clearReasoningAge, historianRun?.commitClusterTrigger ?? deps.commitClusterTrigger, undefined, boundaryContextLimit, inMemoryTail, taggerFloor, { providerID: resolvedProviderID }, {
+          hardFold: false,
+          force: contextUsageEarly.percentage >= forceMaterializationPercentage && (contextUsageEarly.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
+          explicitFlush: deps.pendingMaterializationSessions.has(sessionId),
+          publishedHistory: isCacheBusting
+        });
         if (triggerResult.shouldFire) {
           sessionLog(sessionId, `compartment trigger: firing (reason=${triggerResult.reason})`);
           updateSessionMeta(db, sessionId, { compartmentInProgress: true });
@@ -121720,7 +122053,7 @@ import { join as join15 } from "node:path";
 
 // src/shared/opencode-config-dir.ts
 import { homedir as homedir9 } from "node:os";
-import { join as join14, resolve as resolve6 } from "node:path";
+import { join as join14, resolve as resolve7 } from "node:path";
 function resolveHomeDir() {
   return process.env.HOME?.trim() || homedir9();
 }
@@ -121732,7 +122065,7 @@ function getOpenCodeGlobalConfigDir() {
 }
 function getEnvConfigDir() {
   const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  return envConfigDir ? resolve6(envConfigDir) : undefined;
+  return envConfigDir ? resolve7(envConfigDir) : undefined;
 }
 function getOpenCodeConfigDirs() {
   const dirs = [getOpenCodeGlobalConfigDir(), join14(resolveHomeDir(), ".opencode")];
@@ -122771,9 +123104,33 @@ init_tag_content_primitives();
 var HIDDEN_HISTORIAN_AGENT = "historian";
 var HIDDEN_DREAMER_AGENT = "dreamer-classifier";
 var HIDDEN_CURATE_AGENT = DREAMER_AGENT;
+var READ_TOOLS = ["read", "grep", "glob"];
+var AGENT_TOOLS = {
+  [HIDDEN_HISTORIAN_AGENT]: [],
+  [HIDDEN_DREAMER_AGENT]: [],
+  [HIDDEN_CURATE_AGENT]: ["ctx_memory", "ctx_memory_list"],
+  [DREAMER_MEMORY_MAPPER_AGENT]: READ_TOOLS,
+  [DREAMER_PRIMER_INVESTIGATOR_AGENT]: [...READ_TOOLS, "ctx_search"],
+  [DREAMER_RETROSPECTIVE_AGENT]: ["ctx_search"]
+};
+var AGENT_STEPS = {
+  [HIDDEN_CURATE_AGENT]: 150,
+  [DREAMER_MEMORY_MAPPER_AGENT]: 60,
+  [DREAMER_DOCS_AGENT]: 60,
+  [DREAMER_PRIMER_INVESTIGATOR_AGENT]: 40,
+  [DREAMER_RETROSPECTIVE_AGENT]: 40
+};
+function hiddenAgentFor(identity) {
+  if (identity.kind === "dreamer-task" && identity.agent === DREAMER_DOCS_AGENT)
+    return DREAMER_MEMORY_MAPPER_AGENT;
+  return identity.kind === "dreamer-task" && AGENT_TOOLS[identity.agent] ? identity.agent : identity.kind === "dreamer-task" ? HIDDEN_DREAMER_AGENT : HIDDEN_HISTORIAN_AGENT;
+}
+function hiddenToolLoop(identity) {
+  return identity.kind === "dreamer-task" && AGENT_STEPS[identity.agent] !== undefined;
+}
 async function registerHiddenChildAgents(agent) {
   await agent.transform((editor) => {
-    for (const id of [HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT]) {
+    for (const id of Object.keys(AGENT_TOOLS)) {
       editor.update(id, (config) => {
         config.system = "Magic Context hidden completion carrier.";
         config.description = "Internal Magic Context hidden completion carrier.";
@@ -122782,16 +123139,14 @@ async function registerHiddenChildAgents(agent) {
         config.request.settings = {};
         config.request.headers = {};
         config.request.body = {};
+        config.steps = AGENT_STEPS[id];
         config.permissions = [
           { action: "*", resource: "*", effect: "deny" },
-          ...id === HIDDEN_CURATE_AGENT ? [
-            { action: "tool", resource: "ctx_memory", effect: "allow" },
-            {
-              action: "tool",
-              resource: "ctx_memory_list",
-              effect: "allow"
-            }
-          ] : []
+          ...(AGENT_TOOLS[id] ?? []).map((tool) => ({
+            action: tool,
+            resource: "*",
+            effect: "allow"
+          }))
         ];
       });
     }
@@ -122836,15 +123191,21 @@ function calibratedParts(attempt) {
 class HiddenChildHook {
   childIDs = new Set;
   attempts = new Map;
+  active = new Map;
   registerChild(sessionID) {
     this.childIDs.add(sessionID);
   }
   registerAttempt(marker, attempt) {
     this.registerChild(attempt.childSessionId);
+    attempt.marker = marker;
     this.attempts.set(marker, attempt);
   }
   releaseAttempt(marker) {
+    const attempt = this.attempts.get(marker);
     this.attempts.delete(marker);
+    if (attempt && this.active.get(attempt.childSessionId) === attempt) {
+      this.active.delete(attempt.childSessionId);
+    }
   }
   owns(sessionID) {
     return this.childIDs.has(sessionID);
@@ -122855,19 +123216,43 @@ class HiddenChildHook {
     const raw = newestUserText(draft);
     const stripped = raw === undefined ? undefined : stripWellFormedLeadingTagPrefix(raw);
     const attempt = (raw !== undefined ? this.attempts.get(raw) : undefined) ?? (stripped && stripped !== raw ? this.attempts.get(stripped) : undefined);
-    if (!attempt || attempt.childSessionId !== draft.sessionID) {
+    const current = this.active.get(draft.sessionID);
+    const selected = attempt ?? current;
+    if (!selected || selected.childSessionId !== draft.sessionID || attempt && current && current !== attempt) {
       throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", "Refusing an unregistered prompt on a Magic Context hidden-run session", true);
     }
-    if (attempt.request.signal?.aborted) {
+    if (selected.request.signal?.aborted) {
       throw new Error("Hidden completion prompt aborted");
     }
-    const system = typeof attempt.request.body.system === "string" ? attempt.request.body.system : attempt.identity.system;
+    if (!selected.shaped) {
+      if (!attempt)
+        throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", "Hidden child first step requires a registered marker", true);
+      this.active.set(draft.sessionID, selected);
+    }
+    const steps = (selected.steps ?? 0) + 1;
+    const cap = AGENT_STEPS[selected.identity.agent];
+    if (cap !== undefined && steps > cap) {
+      throw new Error(`Hidden agent exceeded its ${cap}-step limit`);
+    }
+    selected.steps = steps;
+    const system = typeof selected.request.body.system === "string" ? selected.request.body.system : selected.identity.system;
     draft.system = [{ type: "text", text: system }];
-    draft.messages = [{ role: "user", content: calibratedParts(attempt) }];
-    draft.options = authoredOptions(attempt);
-    const dreamerTools = attempt.identity.agent === DREAMER_AGENT ? Object.fromEntries(["ctx_memory", "ctx_memory_list"].flatMap((id) => draft.tools[id] ? [[id, draft.tools[id]]] : [])) : {};
-    draft.tools = dreamerTools;
-    attempt.shaped = true;
+    if (!selected.shaped) {
+      draft.messages = [{ role: "user", content: calibratedParts(selected) }];
+    } else {
+      const first = draft.messages[0];
+      const firstText = first && newestUserText({ ...draft, messages: [first] });
+      const normalized = firstText === undefined ? undefined : stripWellFormedLeadingTagPrefix(firstText);
+      if (normalized !== selected.marker) {
+        throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", "Hidden child history does not begin with this run's registered marker", true);
+      }
+      draft.messages[0] = { ...first, content: calibratedParts(selected) };
+    }
+    draft.options = authoredOptions(selected);
+    const allowed = AGENT_TOOLS[hiddenAgentFor(selected.identity)] ?? [];
+    draft.tools = Object.fromEntries(allowed.flatMap((id) => draft.tools[id] ? [[id, draft.tools[id]]] : []));
+    selected.observedMessages = draft.messages;
+    selected.shaped = true;
     return true;
   }
 }
@@ -122949,9 +123334,9 @@ function resolveOwnerHostService(owner, env = process.env, pid = process.pid) {
   }
   return own;
 }
-async function removeHostSession(sessionID, owner, env = process.env) {
+async function removeHostSession(sessionID, owner, env = process.env, fetchSession = fetch) {
   const service = resolveOwnerHostService(owner, env);
-  const response = await fetch(`${service.url}/api/session/${encodeURIComponent(sessionID)}`, {
+  const response = await fetchSession(`${service.url}/api/session/${encodeURIComponent(sessionID)}`, {
     method: "DELETE",
     headers: service.headers,
     signal: AbortSignal.timeout(60000)
@@ -123153,6 +123538,37 @@ function settledProviderError(row) {
 function successfulReusableAssistant(row) {
   return row !== undefined && (typeof row.data.finish === "string" || assistantOutcome(row) === "succeeded") && row.data.error === undefined && row.data.tokens !== undefined;
 }
+function toolLoopMessages(attempt) {
+  const messages = attempt.observedMessages ?? [];
+  const results = new Map;
+  for (const message of messages) {
+    if (message.role !== "tool")
+      continue;
+    for (const part of message.content) {
+      if (part.type !== "tool-result" || typeof part.id !== "string")
+        continue;
+      const result = part.result;
+      results.set(part.id, { status: result?.type === "error" ? "error" : "completed" });
+    }
+  }
+  return messages.flatMap((message) => {
+    if (message.role !== "assistant")
+      return [];
+    const parts = message.content.flatMap((part) => {
+      if (part.type !== "tool-call" || typeof part.id !== "string" || typeof part.name !== "string")
+        return [];
+      const result = results.get(part.id);
+      return [
+        {
+          type: "tool",
+          tool: part.name,
+          state: { status: result?.status ?? "pending", input: part.input }
+        }
+      ];
+    });
+    return parts.length ? [{ info: { role: "assistant" }, parts }] : [];
+  });
+}
 function assistantText(row) {
   const text = (row.data.content ?? []).flatMap((part) => part.type === "text" && typeof part.text === "string" ? [part.text] : []).join("");
   return text.length > 0 ? text : null;
@@ -123404,7 +123820,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
     }
   };
   return {
-    capabilities: { tools: false, harness: "opencode2" },
+    capabilities: { tools: true, harness: "opencode2" },
     async open(identity) {
       const role = roleFor(identity);
       const releaseRole = await acquireRole(role);
@@ -123413,6 +123829,10 @@ async function createV2HiddenCompletionExecutor(host, options) {
         await options.ensureAgent?.();
         const head = await resolveHead(identity);
         let active = store.read().active[role];
+        if (active && hiddenToolLoop(identity)) {
+          retireChild(active, "fresh-tool-loop-run");
+          active = undefined;
+        }
         if (active && active.generation !== generation) {
           retireChild(active, "host-generation-changed");
           active = undefined;
@@ -123435,7 +123855,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
           const title = roleTitle(role);
           const created = await host.create({
             title,
-            agent: roleAgent(role),
+            agent: hiddenToolLoop(identity) ? hiddenAgentFor(identity) : roleAgent(role),
             model: {
               providerID: head.providerID,
               id: head.modelID,
@@ -123493,6 +123913,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
       await switchChildModel(run, requested);
       const baseline = withReader(options.openReader, (reader) => reader.latestSequence(run.child.id));
       const marker = `mc:hidden:${crypto.randomUUID()}:${crypto.randomUUID()}`;
+      run.completion = undefined;
       const attempt = {
         childSessionId: run.child.id,
         identity: run.identity,
@@ -123552,6 +123973,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         }
         run.completion = {
           text,
+          ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt) } : {},
           reasoning: null,
           usage: reportedInput !== undefined || reportedOutput !== undefined ? {
             input: reportedInput ?? 0,
@@ -123596,7 +124018,9 @@ async function createV2HiddenCompletionExecutor(host, options) {
         return;
       try {
         const reusable = run.failed && !run.unsettledFailure;
-        if (!run.completion && (run.failed || !settlement.promptSettled) && !reusable) {
+        if (hiddenToolLoop(run.identity)) {
+          retire(run, settlement.promptSettled ? "tool-loop-settled" : "tool-loop-failed");
+        } else if (!run.completion && (run.failed || !settlement.promptSettled) && !reusable) {
           retire(run, "hidden-run-failed");
         }
       } finally {
@@ -123876,6 +124300,17 @@ class V2StoreReader {
   range(sessionID, after, through) {
     return trackDecodeOperation("range", () => through <= after ? [] : this.all(sessionID, after, undefined, through));
   }
+  spanRowStamps(sessionID, after, through) {
+    if (!Number.isSafeInteger(after) || !Number.isSafeInteger(through))
+      throw new Error("Invalid seq span");
+    const rows = this.db.prepare(`SELECT seq, id, time_updated AS updated, length(CAST(data AS BLOB)) AS bytes
+                 FROM session_message WHERE session_id = ? AND seq > ? AND seq <= ?
+                 ORDER BY seq ASC`).all(sessionID, after, through);
+    const stamps = new Map;
+    for (const row of rows)
+      stamps.set(row.seq, `${row.id}\x00${row.updated ?? ""}\x00${row.bytes ?? ""}`);
+    return stamps;
+  }
   rawRowsThrough(sessionID, throughSeq, limit) {
     return trackDecodeOperation("rawRowsThrough", () => {
       if (!Number.isSafeInteger(throughSeq))
@@ -125137,13 +125572,13 @@ async function runHiddenSingleShotPrompt(args) {
           throw new Error(`${args.callContext} returned length-capped output`);
         }
         const text = completion.text;
-        if (!text)
+        if (!text && !args.allowEmpty)
           throw new Error(`${args.callContext} returned no output`);
-        return args.parse(text);
+        return args.parse(text ?? "", completion);
       }
     });
     promptSettled = true;
-    return { validated: run.validated, completion: run.output };
+    return { validated: run.validated, completion: run.output, childSessionId: handle.id };
   } finally {
     await args.executor.close(handle, {
       promptSettled,
@@ -125891,8 +126326,11 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
       anchors
     });
     if (moduleRoute) {
-      const run = await runClassifyThroughModule(args, chunk, anchors, signal);
-      recordInvocation(args, startedAt, { status: "completed" });
+      const { accounting, ...run } = await runClassifyThroughModule(args, chunk, anchors, signal);
+      recordInvocation(args, startedAt, {
+        status: "completed",
+        moduleAccounting: accounting
+      });
       return run;
     }
     const executor = resolveHiddenCompletionExecutor(args.hiddenCompletionExecutor, args.client, args.db, args.sessionDirectory, "classify-memories");
@@ -125994,7 +126432,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
       task: "classify",
       command_id: `classify:${args.moduleCommandId ?? Date.now()}:${createHash29("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`,
       authority_generation: args.moduleAuthorityGeneration,
-      ...resolvedModelChain.length > 0 ? { model_chain: resolvedModelChain } : {},
+      model_chain: resolvedModelChain,
       payload: {
         prompt_body: prompt,
         items: chunk.map((candidate) => ({
@@ -126015,6 +126453,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
   if (result.truncated === true) {
     throw new Error("classify returned length-capped output");
   }
+  const accounting = moduleClassifyAccounting(result);
   const parsed = validateClassifyManifest(manifestText, new Set(chunk.map((candidate) => candidate.id)));
   const rows = parsed.map((entry) => {
     const candidate = chunk.find((item) => item.id === entry.id);
@@ -126087,7 +126526,39 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
       throw new Error(`module accepted unknown memory ${moduleId}`);
     return candidate.contextMemory.id;
   });
-  return { classified: acceptedContextIds.length, changed: acceptedContextIds.length };
+  return {
+    classified: acceptedContextIds.length,
+    changed: acceptedContextIds.length,
+    accounting
+  };
+}
+function nonNegativeCount(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
+}
+function moduleClassifyAccounting(result) {
+  const accounting = {};
+  const usage = result.usage;
+  if (usage && typeof usage === "object") {
+    const record = usage;
+    accounting.tokens = {
+      input: nonNegativeCount(record.input),
+      output: nonNegativeCount(record.output),
+      cacheRead: nonNegativeCount(record.cache_read),
+      cacheWrite: nonNegativeCount(record.cache_write)
+    };
+  }
+  const diagnostics = result.diagnostics;
+  const model = diagnostics && typeof diagnostics === "object" ? diagnostics.model : undefined;
+  if (typeof model === "string") {
+    const parsed = parseProviderModel(model);
+    if (parsed) {
+      accounting.providerId = parsed.providerID;
+      accounting.modelId = parsed.modelID;
+    } else if (model.trim()) {
+      accounting.modelId = model.trim();
+    }
+  }
+  return accounting;
 }
 function applyClassifications(args, chunk, manifestText) {
   const byId = new Map(chunk.map((m) => [m.id, m]));
@@ -126132,6 +126603,11 @@ function recordInvocation(args, startedAt, params) {
       providerId: params.completion.providerId,
       modelId: params.completion.modelId
     } : {},
+    ...params.moduleAccounting ? {
+      tokens: params.moduleAccounting.tokens,
+      providerId: params.moduleAccounting.providerId,
+      modelId: params.moduleAccounting.modelId
+    } : {},
     error: params.error
   });
 }
@@ -126226,7 +126702,7 @@ import { createHash as createHash30 } from "node:crypto";
 import {
   existsSync as existsSync16,
   mkdirSync as mkdirSync11,
-  mkdtempSync as mkdtempSync2,
+  mkdtempSync,
   readdirSync as readdirSync6,
   readFileSync as readFileSync16,
   realpathSync as realpathSync4,
@@ -126333,7 +126809,7 @@ function protectedBytes(text) {
   ].map((match) => match[0]);
 }
 function diff(name, before, after) {
-  const dir = mkdtempSync2(join17(tmpdir2(), "mc-doc-diff-"));
+  const dir = mkdtempSync(join17(tmpdir2(), "mc-doc-diff-"));
   try {
     writeFileSync8(join17(dir, "before"), before);
     writeFileSync8(join17(dir, "after"), after);
@@ -128305,8 +128781,36 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
+    const prompt = buildMapMemoriesPrompt(args.projectIdentity, batch);
+    if (args.hiddenCompletionExecutor) {
+      const run = await runHiddenSingleShotPrompt({
+        executor: args.hiddenCompletionExecutor,
+        parentSessionId: args.parentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        agent: DREAMER_MEMORY_MAPPER_AGENT,
+        system: MAP_MEMORIES_SYSTEM_PROMPT,
+        prompt,
+        title: "magic-context-dream-map-memories",
+        callContext: "dreamer:map-memories",
+        model: args.model,
+        fallbackModels: args.fallbackModels,
+        timeoutMs: sliceMs,
+        signal,
+        parse: (text) => validateMapMemoriesManifest(text, new Set(batch.map((memory) => memory.id)))
+      });
+      recordInvocation2(args, startedAt, {
+        status: "completed",
+        messages: run.completion.messages ?? []
+      });
+      const outcome = await applyParsedBatchMappings(args, batch, run.validated);
+      const returnedIds = new Set(run.validated.map((entry) => entry.id));
+      return { ...outcome, requeue: batch.filter((memory) => !returnedIds.has(memory.id)) };
+    }
+    const client = args.client;
+    if (!client)
+      throw new Error("map-memories requires a client or hidden completion executor");
     const createResponse = await createChildSessionWithFence({
-      client: args.client,
+      client,
       db: args.db,
       parentSessionId: args.parentSessionId,
       title: "magic-context-dream-map-memories",
@@ -128318,8 +128822,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     agentSessionId = typeof created?.id === "string" ? created.id : null;
     if (!agentSessionId)
       throw new Error("Could not create map-memories session.");
-    const prompt = buildMapMemoriesPrompt(args.projectIdentity, batch);
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
+    const run = await promptSyncWithValidatedOutputRetry(client, {
       path: { id: agentSessionId },
       query: { directory: args.sessionDirectory },
       body: {
@@ -128334,7 +128837,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:map-memories",
       fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
+        const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory, limit: 100 }
         });
@@ -128377,15 +128880,16 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       }
     };
   } finally {
-    await teardownChildSession({
-      client: args.client,
-      sessionId: agentSessionId,
-      sessionDirectory: args.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] map-memories",
-      log
-    });
+    if (agentSessionId && args.client)
+      await teardownChildSession({
+        client: args.client,
+        sessionId: agentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] map-memories",
+        log
+      });
   }
 }
 async function applyParsedBatchMappings(args, batch, parsed) {
@@ -129001,8 +129505,41 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
+    const prompt = buildInvestigationPrompt(primer, seed.kind, seed.orientation, seed.prePost);
+    if (args.hiddenCompletionExecutor) {
+      const run = await runHiddenSingleShotPrompt({
+        executor: args.hiddenCompletionExecutor,
+        parentSessionId: args.parentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        agent: DREAMER_PRIMER_INVESTIGATOR_AGENT,
+        system: PRIMER_INVESTIGATOR_SYSTEM_PROMPT,
+        prompt,
+        title: "magic-context-dream-refresh-primers",
+        callContext: "dreamer:refresh-primers",
+        model: args.model,
+        fallbackModels: args.fallbackModels,
+        language: args.language,
+        timeoutMs: sliceMs,
+        signal,
+        parse: (text) => parseAnswer([{ info: { role: "assistant" }, parts: [{ type: "text", text }] }], primer.answer)
+      });
+      recordInvocation3(args, startedAt, {
+        status: "completed",
+        messages: run.completion.messages ?? []
+      });
+      const answer = run.validated.trim();
+      if (!answer || investigationToolCallCount(run.completion.messages ?? []) === 0)
+        return false;
+      runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
+        updatePrimerAnswer(args.db, primer.id, answer);
+      });
+      return true;
+    }
+    const client = args.client;
+    if (!client)
+      throw new Error("refresh-primers requires a client or hidden completion executor");
     const createResponse = await createChildSessionWithFence({
-      client: args.client,
+      client,
       db: args.db,
       parentSessionId: args.parentSessionId,
       title: "magic-context-dream-refresh-primers",
@@ -129014,8 +129551,7 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
     agentSessionId = typeof created?.id === "string" ? created.id : null;
     if (!agentSessionId)
       throw new Error("Could not create primer refresh session.");
-    const prompt = buildInvestigationPrompt(primer, seed.kind, seed.orientation, seed.prePost);
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
+    const run = await promptSyncWithValidatedOutputRetry(client, {
       path: { id: agentSessionId },
       query: { directory: args.sessionDirectory },
       body: {
@@ -129030,7 +129566,7 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:refresh-primers",
       fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
+        const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory, limit: 100 }
         });
@@ -129059,15 +129595,16 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
     recordInvocation3(args, startedAt, { status: failedInvocationStatus(error), error });
     throw error;
   } finally {
-    await teardownChildSession({
-      client: args.client,
-      sessionId: agentSessionId,
-      sessionDirectory: args.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] refresh-primers",
-      log
-    });
+    if (agentSessionId && args.client)
+      await teardownChildSession({
+        client: args.client,
+        sessionId: agentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] refresh-primers",
+        log
+      });
   }
 }
 function originSessionIdForPrimer(args, primer) {
@@ -129757,8 +130294,40 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   try {
+    const prompt = buildVerifyPrompt(args.projectIdentity, batch);
+    if (args.hiddenCompletionExecutor) {
+      const run = await runHiddenSingleShotPrompt({
+        executor: args.hiddenCompletionExecutor,
+        parentSessionId: args.parentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        agent: DREAMER_MEMORY_MAPPER_AGENT,
+        system: VERIFY_SYSTEM_PROMPT,
+        prompt,
+        title: "magic-context-dream-verify",
+        callContext: "dreamer:verify",
+        model: args.model,
+        fallbackModels: args.fallbackModels,
+        language: args.language,
+        timeoutMs: sliceMs,
+        signal,
+        parse: (text) => {
+          const providerFailure = providerOutputFailureFromInvalidManifest([], text);
+          if (providerFailure)
+            throw providerFailure;
+          return validateVerifyManifest(text, new Set(batch.map((memory) => memory.id)));
+        }
+      });
+      recordInvocation4(args, startedAt, {
+        status: "completed",
+        messages: run.completion.messages ?? []
+      });
+      return applyParsedVerifyManifest(args, batch, run.validated);
+    }
+    const client = args.client;
+    if (!client)
+      throw new Error("verify requires a client or hidden completion executor");
     const createResponse = await createChildSessionWithFence({
-      client: args.client,
+      client,
       db: args.db,
       parentSessionId: args.parentSessionId,
       title: "magic-context-dream-verify",
@@ -129770,8 +130339,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     agentSessionId = typeof created?.id === "string" ? created.id : null;
     if (!agentSessionId)
       throw new Error("Could not create verify session.");
-    const prompt = buildVerifyPrompt(args.projectIdentity, batch);
-    const run = await promptSyncWithValidatedOutputRetry(args.client, {
+    const run = await promptSyncWithValidatedOutputRetry(client, {
       path: { id: agentSessionId },
       query: { directory: args.sessionDirectory },
       body: {
@@ -129786,7 +130354,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:verify",
       fetchOutput: async () => {
-        const messagesResponse = await args.client.session.messages({
+        const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory, limit: 100 }
         });
@@ -129827,15 +130395,16 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       providerFailure
     };
   } finally {
-    await teardownChildSession({
-      client: args.client,
-      sessionId: agentSessionId,
-      sessionDirectory: args.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] verify",
-      log
-    });
+    if (agentSessionId && args.client)
+      await teardownChildSession({
+        client: args.client,
+        sessionId: agentSessionId,
+        sessionDirectory: args.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] verify",
+        log
+      });
   }
 }
 async function applyParsedVerifyManifest(args, batch, parsed) {
@@ -130003,6 +130572,8 @@ async function applyParsedVerifyManifest(args, batch, parsed) {
 async function normalizeFiles(args, rawFiles) {
   if (rawFiles.length === 0)
     return [];
+  if (args.normalizeFiles)
+    return args.normalizeFiles(rawFiles);
   const normalized = await normalizeVerificationFiles({
     cwd: args.sessionDirectory,
     files: rawFiles
@@ -130336,7 +130907,8 @@ function createDreamTaskExecutor(deps) {
       if (config.task === "map-memories") {
         const result = await mapMemories({
           db,
-          client: requireDreamClient(deps.client),
+          client: deps.client,
+          hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
           projectIdentity,
           parentSessionId: parent,
           sessionDirectory: deps.sessionDirectory,
@@ -130373,7 +130945,8 @@ function createDreamTaskExecutor(deps) {
         const memoryBefore = getMemoryCountsByStatus(db, projectIdentity);
         const result = await runVerify({
           db,
-          client: requireDreamClient(deps.client),
+          client: deps.client,
+          hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
           projectIdentity,
           parentSessionId: parent,
           sessionDirectory: deps.sessionDirectory,
@@ -130474,7 +131047,8 @@ function createDreamTaskExecutor(deps) {
       if (config.task === "refresh-primers") {
         const result = await refreshPrimers({
           db,
-          client: requireDreamClient(deps.client),
+          client: deps.client,
+          hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
           projectIdentity,
           parentSessionId: parent,
           sessionDirectory: deps.sessionDirectory,
@@ -130742,24 +131316,45 @@ async function runRetrospectiveTask(config, ctx, helpers) {
     abortController.abort();
   }, ctx.leaseAcquisition);
   let childSessionId = null;
+  let hiddenHandle = null;
   let promptSettled = false;
   try {
-    const createResponse = await createChildSessionWithFence({
-      client: requireDreamClient(deps.client),
-      db,
-      parentSessionId: parent ?? undefined,
-      title: "magic-context-dream-retrospective",
-      directory: deps.sessionDirectory
-    });
-    const created = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
-    childSessionId = typeof created?.id === "string" ? created.id : null;
-    if (!childSessionId)
-      throw new Error("Retrospective could not create its child session.");
+    if (deps.hiddenCompletionExecutor) {
+      hiddenHandle = await deps.hiddenCompletionExecutor.open({
+        parentSessionId: parent ?? undefined,
+        agent: DREAMER_RETROSPECTIVE_AGENT,
+        kind: "dreamer-task",
+        system: FRICTION_GATE_SYSTEM_PROMPT,
+        model: config.model,
+        configuredModels: [
+          ...config.model ? [config.model] : [],
+          ...config.fallbackModels ?? []
+        ],
+        timeoutMs: Math.max(1, deadline - Date.now()),
+        title: "magic-context-dream-retrospective",
+        directory: deps.sessionDirectory
+      });
+      childSessionId = hiddenHandle.id;
+    } else {
+      const createResponse = await createChildSessionWithFence({
+        client: requireDreamClient(deps.client),
+        db,
+        parentSessionId: parent ?? undefined,
+        title: "magic-context-dream-retrospective",
+        directory: deps.sessionDirectory
+      });
+      const created = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
+      childSessionId = typeof created?.id === "string" ? created.id : null;
+      if (!childSessionId)
+        throw new Error("Retrospective could not create its child session.");
+    }
     const sessionId = childSessionId;
+    if (!sessionId)
+      throw new Error("Retrospective could not create its child session.");
     const runChildTurn = async (system, userText) => {
       const remainingMs = Math.max(0, deadline - Date.now());
       promptSettled = false;
-      const run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
+      const run = await promptSyncWithValidatedOutputRetry(deps.hiddenCompletionExecutor ? undefined : requireDreamClient(deps.client), {
         path: { id: sessionId },
         query: { directory: deps.sessionDirectory },
         body: {
@@ -130773,7 +131368,13 @@ async function runRetrospectiveTask(config, ctx, helpers) {
         signal: abortController.signal,
         fallbackModels: config.fallbackModels,
         callContext: "dreamer:retrospective",
+        ...hiddenHandle && deps.hiddenCompletionExecutor ? {
+          transport: Object.assign((request) => deps.hiddenCompletionExecutor?.attempt(hiddenHandle, request) ?? Promise.reject(new Error("Hidden transport unavailable")), { childSessionId: hiddenHandle.childSessionId })
+        } : {},
         fetchOutput: async () => {
+          if (hiddenHandle && deps.hiddenCompletionExecutor) {
+            return deps.hiddenCompletionExecutor.collect(hiddenHandle, 50);
+          }
           const messagesResponse = await requireDreamClient(deps.client).session.messages({
             path: { id: sessionId },
             query: { directory: deps.sessionDirectory, limit: 50 }
@@ -130783,14 +131384,15 @@ async function runRetrospectiveTask(config, ctx, helpers) {
           });
         },
         validateOutput: (outputMessages) => {
-          const text = extractLatestAssistantText(outputMessages);
+          const text = hiddenHandle ? outputMessages.text : extractLatestAssistantText(outputMessages);
           if (!text)
             throw new Error("Retrospective child returned no output.");
           return text;
         }
       });
       promptSettled = true;
-      return run;
+      const output = hiddenHandle ? run.output.messages ?? [] : run.output;
+      return { ...run, output };
     };
     const finish = (run, watermark) => {
       if (parent && run) {
@@ -130920,15 +131522,23 @@ async function runRetrospectiveTask(config, ctx, helpers) {
     });
   } finally {
     heartbeat.stop();
-    await teardownChildSession({
-      client: requireDreamClient(deps.client),
-      sessionId: childSessionId,
-      sessionDirectory: deps.sessionDirectory,
-      promptSettled,
-      privacySensitive: true,
-      context: "[dreamer] retrospective",
-      log
-    });
+    if (hiddenHandle && deps.hiddenCompletionExecutor) {
+      await deps.hiddenCompletionExecutor.close(hiddenHandle, {
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] retrospective",
+        log
+      });
+    } else
+      await teardownChildSession({
+        client: requireDreamClient(deps.client),
+        sessionId: childSessionId,
+        sessionDirectory: deps.sessionDirectory,
+        promptSettled,
+        privacySensitive: true,
+        context: "[dreamer] retrospective",
+        log
+      });
   }
 }
 async function runAgenticTask(config, ctx, helpers) {
@@ -131002,72 +131612,107 @@ async function runAgenticTask(config, ctx, helpers) {
       docsCurrentTokens: maintainDocsSnapshot ? Math.ceil([...maintainDocsSnapshot.values()].join("").length / 3.5) : 0,
       curate: curateMemories && curateCategory ? { category: curateCategory, memories: curateMemories } : undefined
     });
-    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());
-    const run = await promptSyncWithValidatedOutputRetry(requireDreamClient(deps.client), {
-      path: { id: sessionId },
-      query: { directory: docsDir },
-      body: {
+    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 : 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}`,
+        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}`,
+        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 (leaseLost)
       throw new Error("Dream lease lost during task");
-    const curateRefused = task === "curate" ? takeCurateSafetyRefusalCount(sessionId) : 0;
+    const curateRefused = task === "curate" ? takeCurateSafetyRefusalCount(childSessionId ?? "") : 0;
     if (curateRefused > 0) {
       helpers.reportProgress(curateRefused, curateRefused);
       log(`[dreamer] curate safety summary: refused=${curateRefused}`);
@@ -131137,15 +131782,16 @@ async function runAgenticTask(config, ctx, helpers) {
     heartbeat.stop();
     if (childSessionId)
       takeCurateSafetyRefusalCount(childSessionId);
-    await teardownChildSession({
-      client: requireDreamClient(deps.client),
-      sessionId: childSessionId,
-      sessionDirectory: docsDir,
-      promptSettled,
-      privacySensitive: true,
-      context: `[dreamer] ${task}`,
-      log
-    });
+    if (!deps.hiddenCompletionExecutor)
+      await teardownChildSession({
+        client: requireDreamClient(deps.client),
+        sessionId: childSessionId,
+        sessionDirectory: docsDir,
+        promptSettled,
+        privacySensitive: true,
+        context: `[dreamer] ${task}`,
+        log
+      });
   }
 }
 
@@ -131598,7 +132244,25 @@ async function warmModelLimitCacheFromCatalog(context, options = {}) {
 }
 
 // src/v2/hooks/payload.ts
+init_logger();
 var HEAD_IDS = ["__magic_context_v2_m0__", "__magic_context_v2_m1__"];
+var HOST_CONTENT_TYPES = new Set([
+  "text",
+  "media",
+  "tool-call",
+  "tool-result",
+  "reasoning",
+  "compaction",
+  "effort"
+]);
+function rejectContentPart(message, part, reason) {
+  const type = typeof part.type === "string" ? part.type : "<missing>";
+  const text = `v2 context omitted a content part the host would reject: type=${type} message=${String(message.info.id ?? "<head>")} reason=${reason}`;
+  if (typeof message.info.sessionID === "string")
+    sessionLog(message.info.sessionID, text);
+  else
+    log(text);
+}
 function isHostInstance(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return false;
@@ -131789,6 +132453,56 @@ function adaptPayload(draft, admittedIDs = new Set) {
           const part = candidate;
           const bridge = bridges.get(part) ?? (part.type === "tool" && typeof part.callID === "string" ? bridgesFor(message)?.get(part.callID) : undefined);
           if (!bridge) {
+            if (part.type === "tool") {
+              const state = part.state;
+              if (typeof part.callID !== "string" || typeof part.tool !== "string" || !state || typeof state !== "object") {
+                rejectContentPart(message, part, "tool has no call ID, name, or state");
+                continue;
+              }
+              content.push({
+                type: "tool-call",
+                id: part.callID,
+                name: part.tool,
+                input: state.input
+              });
+              if (state.status === "completed" || state.status === "error") {
+                following.push({
+                  role: "tool",
+                  content: [
+                    {
+                      type: "tool-result",
+                      id: part.callID,
+                      name: part.tool,
+                      result: {
+                        type: state.status === "error" ? "error" : "text",
+                        value: toolStateContent(state)
+                      }
+                    }
+                  ]
+                });
+              }
+              continue;
+            }
+            if (part.type === "file") {
+              const mime = part.mime;
+              const url = part.url;
+              const prefix = `data:${mime};base64,`;
+              if (typeof mime !== "string" || !/^image\/(png|jpeg|gif|webp)$/.test(mime) || typeof url !== "string" || !url.startsWith(prefix)) {
+                rejectContentPart(message, part, "file is not an inline supported image");
+                continue;
+              }
+              const asset = hostMediaAsset(url.slice(prefix.length), mime);
+              if (typeof asset === "string") {
+                rejectContentPart(message, part, `host media unavailable: ${asset}`);
+                continue;
+              }
+              content.push({ type: "media", media: asset });
+              continue;
+            }
+            if (!HOST_CONTENT_TYPES.has(String(part.type))) {
+              rejectContentPart(message, part, "unknown host content type");
+              continue;
+            }
             const { synthetic: _synthetic, ...clean } = part;
             const original = hostPartTypes.has(clean.type) && !containsHostInstance(clean) ? hostParts.get(contentKey(clean)) : undefined;
             content.push(original ?? clean);
@@ -131796,14 +132510,23 @@ function adaptPayload(draft, admittedIDs = new Set) {
           }
           const state = part.state;
           if (bridge.native) {
-            const sourceState = bridge.native.state && typeof bridge.native.state === "object" ? bridge.native.state : {};
-            const nextState = { ...sourceState, input: state.input };
-            if (sourceState.content !== undefined) {
-              nextState.content = state.output === bridge.output ? sourceState.content : [{ type: "text", text: state.output }];
-            } else {
-              nextState.output = state.output;
+            const native = bridge.native;
+            const callID = String(native.id ?? native.callID ?? part.callID);
+            const name = String(native.name ?? native.tool ?? part.tool);
+            content.push({ type: "tool-call", id: callID, name, input: state.input });
+            if (state.status === "completed" || state.status === "error") {
+              following.push({
+                role: "tool",
+                content: [
+                  {
+                    type: "tool-result",
+                    id: callID,
+                    name,
+                    result: { type: "text", value: state.output }
+                  }
+                ]
+              });
             }
-            content.push({ ...bridge.native, state: nextState });
             continue;
           }
           if (bridge.call)
@@ -131857,13 +132580,18 @@ class V2ContextRefusal extends Error {
     this.name = "V2ContextRefusal";
   }
 }
-async function interruptBeforeProvider(session, sessionID) {
+var INTERRUPT_CONFIRMATION_TIMEOUT_MS = 2000;
+var systemTimers = {
+  setTimeout: (callback, ms) => setTimeout(callback, ms),
+  clearTimeout: (handle) => clearTimeout(handle)
+};
+async function interruptBeforeProvider(session, sessionID, timers = systemTimers) {
   let timer;
   try {
     const result = await Promise.race([
       session.interrupt({ sessionID }),
       new Promise((_, reject) => {
-        timer = setTimeout(() => reject(new Error("interrupt exceeded 2000 ms")), 2000);
+        timer = timers.setTimeout(() => reject(new Error(`interrupt exceeded ${INTERRUPT_CONFIRMATION_TIMEOUT_MS} ms`)), INTERRUPT_CONFIRMATION_TIMEOUT_MS);
       })
     ]);
     if (result.interrupted !== true)
@@ -131871,10 +132599,80 @@ async function interruptBeforeProvider(session, sessionID) {
   } catch (cause) {
     throw new V2ContextRefusal(undefined, { cause });
   } finally {
-    clearTimeout(timer);
+    if (timer !== undefined)
+      timers.clearTimeout(timer);
   }
 }
 
+// src/v2/hooks/restore-rows.ts
+class RestoredRowCache {
+  capacity;
+  sessions = new Map;
+  constructor(capacity = 16) {
+    this.capacity = capacity;
+  }
+  rows(reader, sessionID, after, through) {
+    if (through <= after)
+      return [];
+    const kept = this.sessions.get(sessionID) ?? new Map;
+    const stamps = reader.spanRowStamps(sessionID, after, through);
+    const runs = [];
+    let previous = after;
+    let open;
+    for (const [seq, stamp] of stamps) {
+      if (kept.get(seq)?.stamp === stamp) {
+        open = undefined;
+      } else if (open) {
+        open.through = seq;
+      } else {
+        open = { after: previous, through: seq };
+        runs.push(open);
+      }
+      previous = seq;
+    }
+    const fresh = new Map;
+    for (const run of runs)
+      for (const row of readPages(reader, sessionID, run.after, run.through))
+        fresh.set(row.seq, row);
+    const next = new Map;
+    const rows = [];
+    for (const [seq, stamp] of stamps) {
+      const row = fresh.get(seq) ?? kept.get(seq)?.row;
+      if (!row)
+        continue;
+      next.set(seq, { stamp, row });
+      rows.push(row);
+    }
+    this.sessions.delete(sessionID);
+    this.sessions.set(sessionID, next);
+    while (this.sessions.size > this.capacity) {
+      const oldest = this.sessions.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.sessions.delete(oldest);
+    }
+    return structuredClone(rows);
+  }
+  forget(sessionID) {
+    this.sessions.delete(sessionID);
+  }
+  clear() {
+    this.sessions.clear();
+  }
+}
+function readPages(reader, sessionID, after, through) {
+  const rows = [];
+  let cursor = after;
+  while (cursor < through) {
+    const page = reader.page(sessionID, { after: cursor, through, limit: 100 });
+    rows.push(...page.rows);
+    if (page.rows.length < 100 || page.cursor === undefined)
+      break;
+    cursor = page.cursor;
+  }
+  return rows;
+}
+
 // src/hooks/magic-context/live-session-state.ts
 function createLiveSessionState() {
   return {
@@ -145711,7 +146509,7 @@ import { isAbsolute as isAbsolute7 } from "node:path";
 // ../retina-local-fs/src/path-fence.ts
 import { lstat as lstat2, readlink, realpath as realpath2 } from "node:fs/promises";
 import { homedir as homedir12 } from "node:os";
-import { basename as basename4, dirname as dirname10, isAbsolute as isAbsolute6, join as join20, relative, resolve as resolve7, sep } from "node:path";
+import { basename as basename4, dirname as dirname10, isAbsolute as isAbsolute6, join as join20, relative, resolve as resolve8, sep } from "node:path";
 
 // ../retina-local-fs/src/errors.ts
 class ProviderError extends Error {
@@ -145727,7 +146525,7 @@ class ProviderError extends Error {
 async function resolveAndFenceProviderPath(configuredPath, options) {
   const { home, dataDirectory } = await resolveFenceRoots(options);
   const expanded = configuredPath.startsWith("~/") ? join20(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
-  const absolute = isAbsolute6(expanded) ? resolve7(expanded) : resolve7(options.cwd ?? process.cwd(), expanded);
+  const absolute = isAbsolute6(expanded) ? resolve8(expanded) : resolve8(options.cwd ?? process.cwd(), expanded);
   const canonical = await canonicalPath(absolute, options.allowMissing);
   if (isFencedPath(canonical, home, dataDirectory)) {
     throw new ProviderError("fenced_path", `Refusing fenced path: ${canonical}`);
@@ -145735,14 +146533,14 @@ async function resolveAndFenceProviderPath(configuredPath, options) {
   return canonical;
 }
 async function resolveFenceRoots(options) {
-  const configuredHomePath = resolve7(options.homeDirectory ?? process.env.HOME ?? homedir12());
+  const configuredHomePath = resolve8(options.homeDirectory ?? process.env.HOME ?? homedir12());
   let home;
   try {
     home = await realpath2(configuredHomePath);
   } catch (error) {
     throw fsError(configuredHomePath, error);
   }
-  const configuredDataDirectory = resolve7(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join20(home, ".local", "share"));
+  const configuredDataDirectory = resolve8(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join20(home, ".local", "share"));
   const dataDirectory = await canonicalPath(configuredDataDirectory, true);
   return { home, dataDirectory };
 }
@@ -145760,7 +146558,7 @@ async function canonicalPath(path, allowMissing) {
         const metadata = await lstat2(candidate);
         if (metadata.isSymbolicLink()) {
           const target = await readlink(candidate);
-          const resolvedTarget = resolve7(dirname10(candidate), target);
+          const resolvedTarget = resolve8(dirname10(candidate), target);
           return canonicalPath(join20(resolvedTarget, ...suffix), true);
         }
       } catch (candidateError) {
@@ -145784,8 +146582,8 @@ async function canonicalPath(path, allowMissing) {
     }
   }
 }
-function isFencedPath(canonicalPath, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join20(resolve7(homeDirectory), ".local", "share")) {
-  const cortexkitRoot = join20(resolve7(dataDirectory), "cortexkit");
+function isFencedPath(canonicalPath, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join20(resolve8(homeDirectory), ".local", "share")) {
+  const cortexkitRoot = join20(resolve8(dataDirectory), "cortexkit");
   const relativeToCortexkit = relative(cortexkitRoot, canonicalPath);
   const insideCortexkit = relativeToCortexkit !== "" && relativeToCortexkit !== ".." && !relativeToCortexkit.startsWith(`..${sep}`) && !isAbsolute6(relativeToCortexkit);
   const parts = insideCortexkit ? relativeToCortexkit.split(sep) : [];
@@ -147258,6 +148056,7 @@ async function registerContext(context) {
   const historyRefreshSessions = new Set;
   const pendingMaterializationSessions = new Set;
   const lastHeuristicsTurnId = new Map;
+  const restoredRows = new RestoredRowCache;
   const rawProviders = new Map;
   let passDuties;
   let toolDuties;
@@ -147418,6 +148217,7 @@ async function registerContext(context) {
           historyRefreshSessions.delete(sessionID);
           pendingMaterializationSessions.delete(sessionID);
           lastHeuristicsTurnId.delete(sessionID);
+          restoredRows.forget(sessionID);
           systemPromptRefreshSessions.delete(sessionID);
           systemPrompt?.clearSession(sessionID);
           tagger.cleanup(sessionID);
@@ -147642,7 +148442,7 @@ async function registerContext(context) {
           const servedBoundary = boundaryID ? servedBoundaryRow(reader, draft.sessionID, boundaryID) : null;
           const boundary = servedBoundary?.seq ?? reader.sequenceForId(draft.sessionID, boundaryID) ?? (reader.earliestSequence(draft.sessionID) ?? 0) - 1;
           const present = new Set(draft.messages.map((message) => message.id));
-          const restored = reader.range(draft.sessionID, boundary, cut.seq).filter((row) => !present.has(row.id)).flatMap((row) => restoreRow(row, draft.model, hostUsesMediaAssets() ? {
+          const restored = restoredRows.rows(reader, draft.sessionID, boundary, cut.seq).filter((row) => !present.has(row.id)).flatMap((row) => restoreRow(row, draft.model, hostUsesMediaAssets() ? {
             asset: hostMediaAsset,
             unavailable: (detail) => sessionLog(draft.sessionID, `v2 restore: attachment replaced by a note row=${detail.rowID} name=${JSON.stringify(detail.name ?? null)} mediaType=${detail.mediaType} reason=${JSON.stringify(detail.reason)}`)
           } : undefined));
@@ -147795,6 +148595,7 @@ ${baseline}
       for (const release of rawProviders.values())
         release();
       rawProviders.clear();
+      restoredRows.clear();
     }
   };
 }
@@ -147857,7 +148658,7 @@ async function getLatestVersion(channel = "latest", options = {}) {
   try {
     if (options.signal?.aborted)
       return null;
-    const response = await fetch(buildRegistryUrl(options.registryUrl ?? NPM_REGISTRY_URL), {
+    const response = await (options.fetch ?? fetch)(buildRegistryUrl(options.registryUrl ?? NPM_REGISTRY_URL), {
       signal: controller.signal,
       headers: { Accept: "application/json" }
     });
@@ -147895,6 +148696,9 @@ function packageInfo() {
     directory = parent;
   }
 }
+function formatUpdateAvailableMessage(latest, current) {
+  return `Magic Context ${latest} is available (running ${current}). To install it, open /plugins, select Magic Context and press ctrl+u, or run \`opencode plugin update\`. A version-pinned plugin entry must be changed in your OpenCode config instead.`;
+}
 function startUpdateChecks(context, check = (signal) => {
   return packageInfo().development ? Promise.resolve(null) : getLatestVersion("latest", { signal });
 }) {
@@ -147909,10 +148713,11 @@ function startUpdateChecks(context, check = (signal) => {
           continue;
         await context.storage.set("version-check-at", Date.now());
         const latest = await check(controller.signal);
-        const comparison = latest ? compareSemverCore(latest, packageInfo().version) : null;
-        if (!controller.signal.aborted && comparison !== null && comparison > 0) {
+        const current = packageInfo().version;
+        const comparison = latest ? compareSemverCore(latest, current) : null;
+        if (latest && !controller.signal.aborted && comparison !== null && comparison > 0) {
           pushNotification("toast", {
-            message: `Magic Context ${latest} is available. Update the plugin to install it.`,
+            message: formatUpdateAvailableMessage(latest, current),
             variant: "info"
           });
         }