@cortexkit/opencode-magic-context 0.43.1 → 0.43.2

package/dist/v2/server.js

@@ -15449,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");
 }
@@ -15529,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
   };
@@ -26133,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;
 }
@@ -26450,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))
@@ -29016,6 +29016,7 @@ function emptyOutcome(status, generation, previousGeneration) {
     previousGeneration,
     compartmentsRebased: 0,
     compartmentsUnresolved: 0,
+    compartmentsDerived: 0,
     compartmentsResolvedAgain: 0,
     recompCompartmentsRebased: 0,
     recompCompartmentsUnresolved: 0,
@@ -29069,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,
@@ -29077,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;
@@ -29114,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;
@@ -29174,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);
@@ -29260,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) {
@@ -29324,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 {
@@ -29380,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;
@@ -29398,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);
@@ -29445,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
@@ -75573,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")
@@ -75607,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()) {
@@ -75757,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.",
@@ -75927,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.",
@@ -78056,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,
@@ -84739,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) {
@@ -84861,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;
@@ -85350,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();
@@ -85393,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
@@ -106994,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}`;
 }
@@ -107012,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 };
@@ -107023,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 };
   }
@@ -107046,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) {
@@ -107162,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);
 }
@@ -108930,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;
@@ -118754,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");
@@ -121778,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();
 }
@@ -121790,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")];
@@ -124025,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))
@@ -126040,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");
@@ -126143,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) => ({
@@ -126164,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);
@@ -126236,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]));
@@ -126281,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
   });
 }
@@ -132253,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)
@@ -132267,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 {
@@ -146107,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 {
@@ -146123,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}`);
@@ -146131,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 };
 }
@@ -146156,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) {
@@ -146180,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) : [];
@@ -147654,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;
@@ -147814,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);
@@ -148038,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));
@@ -148191,6 +148595,7 @@ ${baseline}
       for (const release of rawProviders.values())
         release();
       rawProviders.clear();
+      restoredRows.clear();
     }
   };
 }
@@ -148291,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 });
 }) {
@@ -148305,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"
           });
         }