@retaw106/mmc-oc 2.5.0 → 2.7.1

package/dist/{context-xx09sh1g.js → context-9q17e52a.js}

@@ -71,21 +71,10 @@ import {
   searchMemoriesFTSUnion,
   clearMemoryVerifications,
   queueMemoryMutation,
-  BoundedSessionMap,
-  registerOwnRpcServerInstance,
-  rpcPortDir,
-  rpcPortFilePath,
-  parseRpcPortFile,
-  inspectProcessesAsync,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
+  scheduleAfterBootQuiet,
   cleanSearchText,
-  keywordRelevance,
+  hintKeywordRelevance,
   matchedSearchSnippet,
-  gaDatabasePath,
-  RAW_MESSAGE_TYPES,
-  V2StoreReaderPool,
   getLastIndexedOrdinal,
   getIndexedMessageIdAtOrdinal,
   getIndexedMessageCorpusSize,
@@ -93,8 +82,11 @@ import {
   isMessageIndexReconciledThrough,
   clearIndexedMessages,
   indexMessagesAfterOrdinal,
-  sweepOrphanedOpenCodeMessageIndexesCooperatively,
-  scheduleAfterBootQuiet,
+  registerOwnRpcServerInstance,
+  rpcPortDir,
+  rpcPortFilePath,
+  parseRpcPortFile,
+  inspectProcessesAsync,
   acquireCompartmentLease,
   releaseCompartmentLeaseBestEffort,
   isCompartmentLeaseHeld,
@@ -103,7 +95,7 @@ import {
   ensureSessionMetaRow,
   clearCachedM0M1,
   clearCachedM0,
-  getCompartments,
+  getTableColumnNames,
   getLastCompartmentEndMessage,
   getLastCompartmentEndMessageId,
   getAuthorityManagedMarker,
@@ -163,6 +155,7 @@ import {
   clearEmergencyRecovery,
   clearDetectedContextLimit,
   getPersistedCompactionMarkerState,
+  clearCompactionMarkerPublicationIntent,
   setPersistedCompactionMarkerState,
   getDeferredClearedCompactionMarkerState,
   retireDeferredClearedCompactionMarkerState,
@@ -191,10 +184,16 @@ import {
   resolveEpochFloorForPass,
   providerResponseFailed,
   isSuccessfulProviderCompletion,
+  dirtyLkgRecoveryRevision,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
   rememberUnpublishedAutoSearchNoHint,
   getUnpublishedAutoSearchNoHint,
   forgetUnpublishedAutoSearchNoHint,
   registerAutoSearchWork,
+  gaDatabasePath,
+  RAW_MESSAGE_TYPES,
+  V2StoreReaderPool,
   getOrCreateSessionMeta,
   updateSessionMeta,
   advanceToolReclaimWatermark,
@@ -226,6 +225,7 @@ import {
   lkgDirtyRevision,
   readLkgRecoveryPrefix,
   noteLkgHealthyPrefix,
+  lkgInputIdentity,
   beginLkgPass,
   getInMemorySlot,
   getSlot,
@@ -277,6 +277,7 @@ import {
   HISTORIAN_RECOMP_AGENT,
   HISTORIAN_EDITOR_AGENT,
   runTokenLog,
+  shouldWaitForNewHistorianHistory,
   extractM0Block,
   TEMPORAL_MARKER_REPLAY_PATTERN,
   collectTemporalCandidates,
@@ -307,7 +308,7 @@ import {
   recordHighPressureNoEligibleHead,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-0d40b4q8.js";
+} from "./index-xrxpbe74.js";
 import {
   getHarness,
   getDataDir,
@@ -450,8 +451,9 @@ import {
   createDroppedInputGuard,
   assertExecutableToolInput,
   isEditTool,
+  BoundedSessionMap,
+  recordToolDefinitionSet,
   getCurrentToolSetHash,
-  recordToolDefinition,
   getMeasuredToolDefinitionTokens,
   describeFinalWireTail,
   estimatePartImageTokens,
@@ -487,13 +489,12 @@ import {
   hasRawSessionMessageById2,
   readRawSessionMessageById2,
   readSessionChunk2
-} from "./index-1vxffj5j.js";
+} from "./index-t0zx3tgz.js";
 import {
   normalizeModelEntry2,
   resolveHistorianModel2
 } from "./index-azbmnekv.js";
 import {
-  Database,
   getSqliteMemoryStats,
   withSqliteBackgroundWriter,
   withSqliteTransformPass,
@@ -520,7 +521,7 @@ import {
   latestRealUserTurnIdFromOpenCodeDb,
   getMessageTimesFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-bpjjcdy9.js";
+} from "./index-8rmt6s4f.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -533,7 +534,7 @@ import {
   getErrorMessage,
   flushIgnoredMessages2,
   sendStatusNotification2
-} from "./index-k25thxq7.js";
+} from "./index-s3ebcy63.js";
 import {
   logSlowWriteTransaction
 } from "./index-yjv8dpht.js";
@@ -6371,6 +6372,26 @@ class EmergencyFailClosedError extends Error {
 }
 
 // src/hooks/magic-context/history-boundary-repair.ts
+function readStoreBoundaries(db, sessionId) {
+  const columns = getTableColumnNames(db, "compartments");
+  const numbers = ["id", "sequence", "start_message", "end_message", "created_at"];
+  const strings = ["session_id", "start_message_id", "end_message_id", "title", "content"];
+  const predicates = [...numbers, ...strings].every((column) => columns.has(column)) ? [
+    ...numbers.map((column) => `typeof(${column}) IN ('integer', 'real')`),
+    ...strings.map((column) => `typeof(${column}) = 'text'`)
+  ] : ["0"];
+  for (const column of ["p1", "p2", "p3", "p4", "episode_type"]) {
+    if (columns.has(column))
+      predicates.push(`typeof(${column}) IN ('text', 'null')`);
+  }
+  for (const column of ["importance", "legacy"]) {
+    if (columns.has(column))
+      predicates.push(`typeof(${column}) IN ('integer', 'real', 'null')`);
+  }
+  return db.prepare(`SELECT sequence, ${columns.has("end_message_id") ? "end_message_id" : "NULL"} AS endMessageId
+             FROM compartments WHERE session_id = ? AND ${predicates.join(" AND ")}
+             ORDER BY sequence ASC`).all(sessionId);
+}
 function readBaseline(db, sessionId) {
   const row = db.prepare("SELECT cached_m0_bytes IS NOT NULL AS hasM0, cached_m0_last_baseline_end_message_id AS boundary FROM session_meta WHERE session_id = ?").get(sessionId);
   return {
@@ -6436,7 +6457,7 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = f
 }
 function repairMissingHistoryBoundary(args) {
   const { db, sessionId, isInHostStore, scope = "store" } = args;
-  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : getCompartments(db, sessionId);
+  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : readStoreBoundaries(db, sessionId);
   let latestIndex = compartments.length - 1;
   while (latestIndex >= 0 && !compartments[latestIndex]?.endMessageId)
     latestIndex -= 1;
@@ -6480,7 +6501,7 @@ function repairMissingHistoryBoundary(args) {
     let dropped;
     let anchorForDrop = anchor;
     try {
-      if (scope === "active-branch" && anchor) {
+      if (anchor) {
         const row = db.prepare("SELECT end_message AS endMessage FROM compartments WHERE session_id = ? AND sequence = ?").get(sessionId, anchor.sequence);
         if (!row)
           return { kind: "unresolved", reason: "busy", missingEndMessageId: missing };
@@ -6571,6 +6592,38 @@ function seedSessionCacheTtlIfUnsynced(args) {
   return true;
 }
 
+// src/features/magic-context/auto-search-diagnostics.ts
+var memoryHintContent = new WeakMap;
+function withMemoryHintContent(result, fullContent) {
+  memoryHintContent.set(result, fullContent);
+  return result;
+}
+function createAutoSearchDiagnostics(threshold) {
+  return {
+    threshold,
+    lanes: {},
+    pool: "unknown",
+    poolRows: null,
+    peek: "not-run",
+    workerStarted: false
+  };
+}
+function autoSearchRelevance(query, result) {
+  const content = result.source === "memory" ? memoryHintContent.get(result) ?? result.content : result.content;
+  if (cleanSearchText(content).length === 0)
+    return 0;
+  return result.source === "message" || "matchType" in result ? hintKeywordRelevance(query, content) : result.score;
+}
+function recordAutoSearchLane(diagnostics, lane, query, results) {
+  if (!diagnostics)
+    return;
+  const scores = results.map((result) => result.relevanceScore ?? autoSearchRelevance(query, result));
+  diagnostics.lanes[lane] = {
+    top: scores.length ? Math.max(...scores) : null,
+    nearMisses: scores.filter((score) => score >= 0.5 && score < diagnostics.threshold).length
+  };
+}
+
 // src/features/magic-context/literal-probes.ts
 var MAX_PROBES = 5;
 var MIN_PROBE_LENGTH = 3;
@@ -7043,7 +7096,7 @@ function mergeMemoryResults(args) {
       suppressedVisibleIds.push(id);
       continue;
     }
-    results.push({
+    results.push(withMemoryHintContent({
       source: "memory",
       content: previewText(memory.content),
       score,
@@ -7051,7 +7104,7 @@ function mergeMemoryResults(args) {
       category: memory.category,
       matchType: "fts",
       sourceName: args.sourceNameByMemoryId?.get(memory.id)
-    });
+    }, memory.content));
   }
   return {
     results: results.sort((left, right) => {
@@ -7648,8 +7701,12 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
       options.diagnostics.suppressedLiveMessageMatches = outcome.suppressedLiveMessageMatches;
     }
     messageResults = outcome.results.filter((result) => result.messageId !== options.excludeMessageId);
+    recordAutoSearchLane(options.autoSearchDiagnostics, "messages", trimmedQuery, messageResults);
+    options.onAutoSearchDiagnostics?.();
   }
   const workspace = resolveSearchWorkspaceContext(db, projectPath);
+  if (options.autoSearchDiagnostics)
+    options.autoSearchDiagnostics.pool = "off";
   const [memoryOutcome, primerResults, noteResults] = await Promise.all([
     runMemory ? searchMemories({
       db,
@@ -7684,6 +7741,10 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   if (options.diagnostics) {
     options.diagnostics.suppressedVisibleMemoryIds = memoryOutcome.suppressedVisibleIds;
   }
+  recordAutoSearchLane(options.autoSearchDiagnostics, "memory", trimmedQuery, memoryOutcome.results);
+  recordAutoSearchLane(options.autoSearchDiagnostics, "primers", trimmedQuery, primerResults);
+  recordAutoSearchLane(options.autoSearchDiagnostics, "notes", trimmedQuery, noteResults);
+  options.onAutoSearchDiagnostics?.();
   const results = [...memoryOutcome.results, ...primerResults, ...messageResults, ...noteResults].sort(compareUnifiedResults).slice(0, limit);
   const countRetrievals = options.countRetrievals ?? true;
   if (countRetrievals) {
@@ -7705,7 +7766,7 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   if (options.autoHint) {
     return results.map((result) => ({
       ...result,
-      relevanceScore: cleanSearchText(result.content).length === 0 ? 0 : keywordRelevance(trimmedQuery, result.content)
+      relevanceScore: autoSearchRelevance(trimmedQuery, result)
     }));
   }
   return results;
@@ -8381,6 +8442,32 @@ function selectAutoSearchResults(results, threshold) {
   return results.filter((result) => relevance(result) >= threshold).sort((left, right) => relevance(right) - relevance(left));
 }
 
+// src/hooks/magic-context/auto-search-observation.ts
+var disabledTurns = new WeakMap;
+function logDisabledAutoSearch(db, sessionId, messageId, threshold, startedAt) {
+  const sessions = disabledTurns.get(db) ?? new Map;
+  disabledTurns.set(db, sessions);
+  if (sessions.get(sessionId) === messageId)
+    return;
+  sessions.set(sessionId, messageId);
+  observeAutoSearch(sessionId, threshold, startedAt).finish("disabled");
+}
+function observeAutoSearch(sessionId, threshold, startedAt) {
+  const diagnostics = createAutoSearchDiagnostics(threshold);
+  let logged = false;
+  return {
+    diagnostics,
+    finish(outcome, reason) {
+      if (logged)
+        return;
+      logged = true;
+      const lanes = Object.entries(diagnostics.lanes).map(([lane, value]) => `${lane}:${value.top?.toFixed(3) ?? "none"}`).join(",");
+      const nearMisses = Object.values(diagnostics.lanes).reduce((sum, lane) => sum + lane.nearMisses, 0);
+      sessionLog(sessionId, `auto-search: decision outcome=${outcome}${reason ? ` reason=${reason}` : ""} lanes=${lanes || "none"} nearMisses=${nearMisses} threshold=${threshold} pool=${diagnostics.pool} rows=${diagnostics.poolRows ?? "unknown"} workerStarted=${diagnostics.workerStarted ?? "unknown"} peek=${diagnostics.peek} elapsedMs=${Math.round(performance.now() - startedAt)}`);
+    }
+  };
+}
+
 // src/hooks/magic-context/transform-message-helpers.ts
 function isMeaningfulUserMessage(msg) {
   return msg.info.role === "user" && hasMeaningfulUserText2(msg.parts);
@@ -8571,8 +8658,12 @@ async function coalesceAutoSearchTurn(db, sessionId, messageId, operation, repla
 async function runAutoSearchHint(args) {
   const startedAt = performance.now();
   const { sessionId, db, messages, options } = args;
-  if (!options.enabled)
+  if (!options.enabled) {
+    const tail = findLatestMeaningfulUserMessage(messages);
+    if (tail && typeof tail.info.id === "string" && messages.at(-1) === tail)
+      logDisabledAutoSearch(db, sessionId, tail.info.id, options.scoreThreshold, startedAt);
     return AUTO_SEARCH_OK;
+  }
   const userMsg = findLatestMeaningfulUserMessage(messages);
   if (!userMsg || typeof userMsg.info.id !== "string")
     return AUTO_SEARCH_OK;
@@ -8615,6 +8706,7 @@ async function runAutoSearchHint(args) {
       } catch {}
       return AUTO_SEARCH_OK;
     }
+    const observation = observeAutoSearch(sessionId, options.scoreThreshold, startedAt);
     const writeNoHintAndReconcile = (reason) => {
       let outcome;
       try {
@@ -8626,20 +8718,23 @@ async function runAutoSearchHint(args) {
       } catch (error) {
         if (isTransientSqliteError(error)) {
           rememberUnpublishedAutoSearchNoHint(sessionId, userMsgId, reason);
+          observation.finish("error", "storage-busy");
           return { ok: false, kind: "storage-busy" };
         }
         throw error;
       }
-      if (!outcome.ok)
+      if (!outcome.ok) {
+        observation.finish("error", "cas-exhausted");
         return { ok: false, kind: "cas-exhaustion" };
+      }
       if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
         appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
       }
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : reason === "below-threshold" ? "below-threshold" : reason === "error" ? "error" : "no-candidates", reason);
       return AUTO_SEARCH_OK;
     };
     const rawPartsText = collectUserPromptParts(userMsg);
     if (hasStackedAugmentation(rawPartsText)) {
-      sessionLog(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
       return writeNoHintAndReconcile("stacked");
     }
     const rawPrompt = extractUserPromptText(userMsg);
@@ -8655,6 +8750,7 @@ async function runAutoSearchHint(args) {
         if (checkDeadline())
           return null;
         const searchOptions = {
+          autoSearchDiagnostics: observation.diagnostics,
           limit: 10,
           autoHint: true,
           maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
@@ -8668,16 +8764,15 @@ async function runAutoSearchHint(args) {
           countRetrievals: false
         });
       }, startedAt);
-    } catch (error) {
+    } catch {
       if (lifecycleSignal.aborted)
         return AUTO_SEARCH_OK;
-      log(`[auto-search] unified search failed for session ${sessionId} (no-hint frozen for this turn): ${error instanceof Error ? error.message : String(error)}`);
       const outcome = writeNoHintAndReconcile("error");
       return outcome.ok ? { ok: false, kind: "search-failure" } : outcome;
     }
     if (results === null) {
       persistAutoSearchSkip(db, sessionId, userMsgId, "timeout");
-      sessionLog(sessionId, `auto-search: timed out after ${AUTO_SEARCH_TIMEOUT_MS}ms, skipping hint for this turn (frozen)`);
+      observation.finish("timeout");
       return { ok: false, kind: "timeout" };
     }
     if (results.length === 0) {
@@ -8685,7 +8780,6 @@ async function runAutoSearchHint(args) {
     }
     results = selectAutoSearchResults(results, options.scoreThreshold);
     if (results.length === 0) {
-      sessionLog(sessionId, `auto-search: no fragment meets relevance threshold ${options.scoreThreshold}`);
       return writeNoHintAndReconcile("below-threshold");
     }
     const hintText = buildAutoSearchHint(results, {
@@ -8704,13 +8798,13 @@ ${hintText}`;
       text: payload
     });
     if (!outcome.ok) {
-      sessionLog(sessionId, `auto-search: CAS exhausted for ${userMsgId}; skipping wire append`);
+      observation.finish("error", "cas-exhausted");
       return { ok: false, kind: "cas-exhaustion" };
     }
     if (outcome.decision.decision === "hint") {
       appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
     }
-    sessionLog(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top score ${results[0].score.toFixed(3)})`);
+    observation.finish(outcome.decision.decision === "hint" ? "attached" : "no-candidates");
     return AUTO_SEARCH_OK;
   }, replayServedDecision);
 }
@@ -11363,6 +11457,8 @@ function reconcileCompactionMode(args) {
     return NO_TRANSITION;
   if (stored === "off_cleanup_pending") {
     const markerCleanup = (args.cleanupMarkers ?? cleanupOffMarkers)(sessionId);
+    if (markerCleanup.verified)
+      clearCompactionMarkerPublicationIntent(db, sessionId);
     return {
       ...NO_TRANSITION,
       recordToWrite: markerCleanup.verified ? "off" : null,
@@ -11377,7 +11473,9 @@ function reconcileCompactionMode(args) {
   if (markerCleanup.removedRows > 0)
     clearedSomething = true;
   if (getPersistedCompactionMarkerState(db, sessionId) !== null) {
-    setPersistedCompactionMarkerState(db, sessionId, null);
+    setPersistedCompactionMarkerState(db, sessionId, null, {
+      preservePending: !markerCleanup.verified
+    });
     clearedSomething = true;
   }
   const pendingMarker = getPendingCompactionMarkerState(db, sessionId);
@@ -11920,6 +12018,13 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     }
     return { shouldFire: false };
   }
+  if (tailInfo.boundarySnapshot && shouldWaitForNewHistorianHistory(tailInfo.boundarySnapshot, {
+    usagePercentage: usage.percentage,
+    emergency: getOverflowState(db, sessionId).needsEmergencyRecovery
+  })) {
+    sessionLog(sessionId, "compartment trigger: waiting for new history after no forward progress");
+    return { shouldFire: false };
+  }
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
@@ -12104,6 +12209,27 @@ function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, execu
   }) / 100) * historyBudgetPercentage);
 }
 
+// src/hooks/magic-context/signed-thinking-fit-snapshot.ts
+function takeSignedThinkingFitSnapshot(args) {
+  let snapshot = null;
+  if (args.held && !args.compactionOff) {
+    try {
+      snapshot = cloneKeepingCoveredInstructionMarks(args.entryOrder);
+    } catch (error) {
+      sessionLog(args.sessionId, `signed thinking fit: could not copy the pass input (${error instanceof Error ? error.message : String(error)}); an over-window held request will be refused rather than retried`);
+    }
+  }
+  snapshotObserver?.({
+    sessionId: args.sessionId,
+    held: args.held,
+    activeAnthropicThinkingTurn: args.activeAnthropicThinkingTurn,
+    compactionOff: args.compactionOff,
+    snapshot
+  });
+  return snapshot;
+}
+var snapshotObserver;
+
 // src/hooks/magic-context/temporal-served-projection.ts
 function readLkgTemporalDecisions(db, sessionId, runtime) {
   const slot = getInMemorySlot(sessionId) ?? loadPersistedLkgSlot(db, sessionId);
@@ -12601,6 +12727,14 @@ var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId) {
   return `[dropped §${tagId}§]`;
 }
+var FROZEN_TEXT_ANNOTATION_SUFFIX = /(?:\n\n(?:<instruction name="deferred_notes">(?:(?!<\/instruction>)[\s\S])*<\/instruction>|<ctx-search-hint>(?:(?!<\/ctx-search-hint>)[\s\S])*<\/ctx-search-hint>))+$/;
+function renderDroppedText(tagId, renderedText) {
+  const placeholder = buildReplacementContent(tagId);
+  if (renderedText?.startsWith(placeholder))
+    return renderedText;
+  const annotations = renderedText?.match(FROZEN_TEXT_ANNOTATION_SUFFIX)?.[0] ?? "";
+  return placeholder + annotations;
+}
 function applyNewToolDrop(target, options) {
   const plan = planNewToolDrop(target, options, !!options.persist);
   if (!plan)
@@ -12682,6 +12816,7 @@ function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options =
                 AND drop_mode IN ('truncated', 'full')
               ORDER BY tag_number`).all(sessionId);
   const rows = readRows(db);
+  options.prepareRemovals?.(rows);
   const identity = JSON.stringify(rows);
   const converted = new Map;
   for (const row of rows) {
@@ -12721,13 +12856,21 @@ function renderConvertedToolSkeletons(targets, converted) {
   return didMutate;
 }
 var PENDING_OPERATION_CHUNK_SIZE = 64;
+var PENDING_OPERATION_REJECTED_LOG_CHUNK = 20;
 function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
   let diagnostics;
-  const reject = (reason) => {
+  const reject = (tagNumber, reason, state = {}) => {
     if (!diagnostics)
       return;
     diagnostics.reasons[reason] = (diagnostics.reasons[reason] ?? 0) + 1;
+    const persisted = state.persisted === true;
+    (diagnostics.rejected ??= []).push({
+      tagNumber,
+      reason,
+      persisted,
+      queueState: state.queueState ?? (persisted ? "removed" : "retained")
+    });
   };
   let admitted = false;
   let startedAt = 0;
@@ -12787,29 +12930,39 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
           for (const { op: pendingOp, synthetic } of chunk) {
             const tagStatus = tagStatusById.get(pendingOp.tagId);
             if (tagStatus === "compacted" || tagStatus === "dropped") {
-              reject("already_reduced");
+              reject(pendingOp.tagId, "already_reduced", {
+                queueState: synthetic ? "none" : "removed"
+              });
               if (!synthetic)
                 removePendingOp(db, sessionId, pendingOp.tagId);
               continue;
             }
             if (removedTagIds.has(pendingOp.tagId)) {
-              reject("drop_incomplete");
+              reject(pendingOp.tagId, "drop_incomplete", {
+                queueState: synthetic ? "none" : "retained"
+              });
               continue;
             }
             const target = targets.get(pendingOp.tagId);
             const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
             if (veto) {
-              reject(veto);
+              reject(pendingOp.tagId, veto, {
+                queueState: synthetic ? "none" : "retained"
+              });
               continue;
             }
             const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
             if (synthetic) {
               if (!isToolTag) {
-                reject("synthetic_non_tool");
+                reject(pendingOp.tagId, "synthetic_non_tool", {
+                  queueState: "none"
+                });
                 continue;
               }
               if (target?.canDrop?.() !== true) {
-                reject("synthetic_target_not_droppable");
+                reject(pendingOp.tagId, "synthetic_target_not_droppable", {
+                  queueState: "none"
+                });
                 continue;
               }
             }
@@ -12822,14 +12975,19 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
               if (editMarkerTagIds.has(pendingOp.tagId)) {
                 const strip = target?.hasAttachments?.() === true;
                 if (target?.canDrop?.() === false || target?.prepareDrop?.() === false || !target) {
-                  reject("edit_marker_incomplete");
+                  reject(pendingOp.tagId, "edit_marker_incomplete", {
+                    queueState: synthetic ? "none" : "retained"
+                  });
                   continue;
                 }
                 persistDrop(strip ? "edit_marker_stripped" : "edit_marker");
                 mutations.push(() => {
                   const markResult = (strip ? target?.editMarkerStripped?.() : target?.editMarker?.()) ?? "absent";
                   if (markResult === "incomplete" || markResult === "absent") {
-                    reject(`edit_marker_${markResult}`);
+                    reject(pendingOp.tagId, `edit_marker_${markResult}`, {
+                      persisted: true,
+                      queueState: synthetic ? "none" : "removed"
+                    });
                     return;
                   }
                   record(true);
@@ -12841,7 +12999,9 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
               } else {
                 const plan = planNewToolDrop(target, { inWindow: skeletonWindow.has(pendingOp.tagId) }, true, plannedRemovals);
                 if (!plan) {
-                  reject("drop_incomplete");
+                  reject(pendingOp.tagId, "drop_incomplete", {
+                    queueState: synthetic ? "none" : "retained"
+                  });
                   continue;
                 }
                 persistDrop(plan.mode);
@@ -12852,7 +13012,10 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
                 mutations.push(() => {
                   const { result: dropResult, mode: appliedMode } = plan.apply();
                   if (dropResult === "incomplete" || synthetic && dropResult !== "removed" && dropResult !== "truncated") {
-                    reject(`drop_${dropResult}`);
+                    reject(pendingOp.tagId, `drop_${dropResult}`, {
+                      persisted: true,
+                      queueState: synthetic ? "none" : "removed"
+                    });
                     return;
                   }
                   if (dropResult === "removed" || dropResult === "truncated") {
@@ -12862,15 +13025,18 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
                       mode: appliedMode === "full" ? "full" : "truncated"
                     });
                   } else {
-                    reject(`drop_${dropResult}`);
+                    reject(pendingOp.tagId, `drop_${dropResult}`, {
+                      persisted: true,
+                      queueState: synthetic ? "none" : "removed"
+                    });
                     record(false);
                   }
                 });
               }
             } else if (target) {
-              const replacement = buildReplacementContent(pendingOp.tagId);
+              const replacement = renderDroppedText(pendingOp.tagId, target.getContent?.());
               if (target.canSetContent?.(replacement) === false) {
-                reject("content_unchanged");
+                reject(pendingOp.tagId, "content_unchanged");
                 continue;
               }
               persistDrop();
@@ -12886,12 +13052,18 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
                     removedCharacters: Math.max(0, originalCharacters - replacement.length)
                   });
                 } else {
-                  reject("content_unchanged");
+                  reject(pendingOp.tagId, "content_unchanged", {
+                    persisted: true,
+                    queueState: "removed"
+                  });
                 }
               });
             } else if (!synthetic) {
-              reject("target_absent");
               persistDrop();
+              reject(pendingOp.tagId, "target_absent", {
+                persisted: true,
+                queueState: "removed"
+              });
               mutations.push(() => record(false));
             }
           }
@@ -12918,6 +13090,15 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
       const reasons = Object.entries(diagnostics.reasons).sort(([left], [right]) => left.localeCompare(right)).map(([reason, count]) => `${reason}:${count}`).join(",");
       sessionLog(sessionId, `pending operations no-op: source=${diagnostics.source} total=${diagnostics.total} persisted=${diagnostics.persistedWithoutMutation} reasons=${reasons || "none"}`);
     }
+    const rejected = diagnostics.rejected;
+    if (rejected && rejected.length > 0) {
+      const lineCount = Math.ceil(rejected.length / PENDING_OPERATION_REJECTED_LOG_CHUNK);
+      for (let offset = 0;offset < rejected.length; offset += PENDING_OPERATION_REJECTED_LOG_CHUNK) {
+        const entries = rejected.slice(offset, offset + PENDING_OPERATION_REJECTED_LOG_CHUNK).map((entry) => `${entry.tagNumber}:${entry.reason}:${entry.queueState}${entry.persisted ? ":persisted" : ""}`).join(",");
+        const chunkLabel = lineCount > 1 ? ` chunk=${Math.floor(offset / PENDING_OPERATION_REJECTED_LOG_CHUNK) + 1}/${lineCount}` : "";
+        sessionLog(sessionId, `pending operations rejected: source=${diagnostics.source} total=${diagnostics.total} mutated=${diagnostics.mutated} persisted=${diagnostics.persistedWithoutMutation}${chunkLabel} rejected=${entries}`);
+      }
+    }
   }
   return didMutateMessage;
 }
@@ -12958,7 +13139,7 @@ function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
           }
         }
       } else if (target) {
-        const changed = target.setContent(buildReplacementContent(tag.tagNumber));
+        const changed = target.setContent(renderDroppedText(tag.tagNumber, target.getContent?.()));
         if (changed)
           didMutateMessage = true;
       }
@@ -16463,7 +16644,7 @@ function createTransform(deps) {
     const startTime = performance.now();
     const historianRun = deps.resolveHistorianRun?.();
     const messages = output.messages;
-    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? cloneKeepingCoveredInstructionMarks(messages) : null;
+    const entryOrderForThinkingFit = messages.slice();
     const coveredHostInstructions = takeCoveredInstructionRows(messages);
     const passOutcome = createPassOutcome();
     const tSessionId = performance.now();
@@ -16478,8 +16659,21 @@ function createTransform(deps) {
     const temporalReplayIds = temporalCandidates ? messages.flatMap((message) => message.info.id ? [message.info.id] : []) : undefined;
     logTransformTiming(sessionId, "findSessionId", tSessionId, `messages=${messages.length}`);
     const tLkgEntry = performance.now();
-    const lkgInput = projectEntry(sessionId, messages);
+    const lkgInput = projectEntry(sessionId, entryOrderForThinkingFit);
     const recovery = deps.compactionOff ? {} : readLkgRecoveryPrefix(sessionId, lkgInput, messages, deps.db);
+    const recoveryTailSources = [];
+    if (recovery.prefix) {
+      const priorIdentities = new Set(recovery.prefix.inputs.map((input) => input.id));
+      lkgInput.forEach((input, index) => {
+        const identity = lkgInputIdentity(input.id, input.role, index);
+        if (!identity || priorIdentities.has(identity))
+          return;
+        recoveryTailSources.push({
+          identity,
+          pristineSystem: input.id === null && input.role === "system" ? structuredClone(entryOrderForThinkingFit[index]) : undefined
+        });
+      });
+    }
     logTransformTiming(sessionId, "lkg.entryProjection", tLkgEntry, entryReuse ? `reused=${entryReuse.reused} retained=${entryReuse.retained} retainedBytes=${entryReuse.retainedBytes}` : undefined);
     const resolvedSessionId = sessionId;
     const runNotificationParams = (sid) => {
@@ -16781,6 +16975,13 @@ function createTransform(deps) {
     activeThinkingTurn ||= hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID);
     activeThinkingPrefixHold ||= activeThinkingTurn && isPrefixBoundThinkingModel(resolvedProviderID, modelForBudget?.modelID);
     freezeM0M1 ||= activeThinkingPrefixHold;
+    const originalForThinkingFit = takeSignedThinkingFitSnapshot({
+      sessionId,
+      entryOrder: entryOrderForThinkingFit,
+      held: activeThinkingPrefixHold,
+      activeAnthropicThinkingTurn: activeThinkingTurn,
+      compactionOff
+    });
     if (freezeM0M1 && prefixHoldLogTurnIds.get(sessionId) !== currentTurnId) {
       prefixHoldLogTurnIds.set(sessionId, currentTurnId);
       const reason = activeThinkingPrefixHold ? "active thinking turn (prefix-bound model)" : "session directory unresolved";
@@ -16805,7 +17006,8 @@ function createTransform(deps) {
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: runNotificationParams(sessionId)?.agent
+          agentName: runNotificationParams(sessionId)?.agent,
+          sessionId
         });
         const incomingTokens = incoming.messageTokens.conversation + incoming.messageTokens.toolCall;
         if (unmanagedOverWindowCarried || isClearlyOverWindow(incomingTokens, resolvedContextLimit)) {
@@ -17293,7 +17495,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         contextUsage = resolveUnknownUsageFromWireEstimate({
           usage: contextUsage,
@@ -17424,9 +17627,15 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       }
     });
     if (recovery.prefix && !recoveryNormalized) {
-      const priorIds = new Set(recovery.prefix.inputs.map((input) => input.id));
-      const newIds = new Set(lkgInput.flatMap((input) => input.id && !priorIds.has(input.id) ? [input.id] : []));
-      const suffix = messages.filter((message) => message.info.id && newIds.has(message.info.id));
+      const renderedById = new Map;
+      for (const message of messages) {
+        if (!message.info.id)
+          continue;
+        const group = renderedById.get(message.info.id) ?? [];
+        group.push(message);
+        renderedById.set(message.info.id, group);
+      }
+      const suffix = recoveryTailSources.flatMap(({ identity, pristineSystem }) => pristineSystem ? [pristineSystem] : renderedById.get(identity) ?? []);
       messages.splice(0, messages.length, ...JSON.parse(recovery.prefix.json), ...suffix);
     }
     const recoveryReleaseReason = recovery.rebuildReason ?? (recoveryNormalized ? "recovery_tail_normalized" : undefined);
@@ -17443,6 +17652,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
           agentName: notificationParams.agent,
+          sessionId,
           systemPromptHash: sessionMeta.systemPromptHash
         }, boundaryContextLimit);
       } catch {
@@ -17457,13 +17667,15 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         providerID: modelForBudget?.providerID,
         modelID: modelForBudget?.modelID,
         agentName: notificationParams.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       }, boundaryContextLimit) : undefined);
       if (finalWireEstimate) {
         sessionLog(sessionId, `transform: final-wire telemetry estimate=${finalWireEstimate.tokens} trusted=${finalWireEstimate.trusted} conversation=${finalWireEstimate.messageTokens.conversation} tools=${finalWireEstimate.messageTokens.toolCall} system=${finalWireEstimate.systemTokens} toolDefinitions=${finalWireEstimate.toolDefinitionTokens ?? "unknown"} tail=${finalWireTail}`);
       }
       if ((finalWireEstimate?.refusalGrade || finalWireEstimate?.refusalBasis === "byte-bound" && finalWireEstimate.refusalTokens !== undefined) && boundaryContextLimit > 0 && (finalWireEstimate.refusalTokens ?? finalWireEstimate.tokens) > boundaryContextLimit) {
-        if (!thinkingFitRetries.has(sessionId) && activeThinkingPrefixHold && originalForThinkingFit && hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID)) {
+        const signedFitRetryWanted = !thinkingFitRetries.has(sessionId) && activeThinkingPrefixHold && hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID);
+        if (signedFitRetryWanted && originalForThinkingFit) {
           thinkingFitRetries.add(sessionId);
           requestPendingMaterialization(deps.pendingMaterializationSessions, sessionId, "fit_retry");
           messages.splice(0, messages.length, ...originalForThinkingFit);
@@ -17474,7 +17686,10 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           }
           return;
         }
-        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit)
+        if (signedFitRetryWanted) {
+          sessionLog(sessionId, "signed thinking fit: the held request is over the window and no copy of the pass input exists to retry from; refusing it");
+        }
+        if (signedFitRetryWanted || thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit)
           throw contextRefusalError("The request remains over the model window after stripping signed thinking and reclaiming context");
       }
       if (postTransformResult.prefixTrimStatus === "refused") {
@@ -17483,7 +17698,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         if (untrimmed.tokens > boundaryContextLimit) {
           sessionLog(sessionId, `history boundary unresolved: prefix trim refused and the untrimmed request estimate ${untrimmed.tokens} (trusted=${untrimmed.trusted}) exceeds the context limit ${boundaryContextLimit}; not sending it`);
@@ -17496,7 +17712,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         const servedTokens = served.toolDefinitionsMeasured ? served.rawTokens ?? served.tokens : Math.max(0, sessionMeta.systemPromptTokens) + served.messageTokens.conversation + served.messageTokens.toolCall;
         if (!Number.isFinite(servedTokens) || servedTokens > unmanagedOverWindowPass.limit) {
@@ -17574,7 +17791,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
             systemPromptTokens: sessionMeta.systemPromptTokens,
             providerID: modelForBudget?.providerID,
             modelID: modelForBudget?.modelID,
-            agentName: notificationParams.agent
+            agentName: notificationParams.agent,
+            sessionId
           });
         } catch (error) {
           sessionLog(sessionId, "degraded pass size guard could not estimate:", error);
@@ -17786,6 +18004,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         providerID: modelForBudget?.providerID,
         modelID: modelForBudget?.modelID,
         agentName: notificationParams.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       });
     try {
@@ -18257,8 +18476,26 @@ WHERE session_id = ?
   AND data IS NOT NULL
   AND (time_created > ? OR (time_created = ? AND id > ?))
 ORDER BY time_created, id`;
-function readAssistantUsageRowsAfter(openCodeDb, sessionId, afterTimeCreated, afterId) {
-  const rows = openCodeDb.prepare(ASSISTANT_USAGE_ROWS_AFTER_SQL).all(sessionId, afterTimeCreated, afterTimeCreated, afterId);
+var V2_ASSISTANT_USAGE_ROWS_AFTER_SQL = `
+WITH newer AS (
+  SELECT id, seq, data FROM session_message
+  WHERE session_id = ? AND type = 'assistant' AND data IS NOT NULL AND seq > ?
+  UNION ALL
+  SELECT id, seq, data FROM session_message
+  WHERE session_id = ? AND type = 'assistant' AND data IS NOT NULL AND seq = ? AND id > ?
+)
+SELECT
+  json_extract(data, '$.agent') AS agent,
+  seq AS time_created,
+  id AS id,
+  COALESCE(json_extract(data, '$.tokens.input'), 0)
+    + COALESCE(json_extract(data, '$.tokens.cache.read'), 0)
+    + COALESCE(json_extract(data, '$.tokens.cache.write'), 0) AS prompt,
+  COALESCE(json_extract(data, '$.tokens.output'), 0) AS output
+FROM newer
+ORDER BY seq, id`;
+function readAssistantUsageRowsAfter(openCodeDb, sessionId, afterTimeCreated, afterId, generation = "v1") {
+  const rows = openCodeDb.prepare(generation === "v2" ? V2_ASSISTANT_USAGE_ROWS_AFTER_SQL : ASSISTANT_USAGE_ROWS_AFTER_SQL).all(...generation === "v2" ? [sessionId, afterTimeCreated, sessionId, afterTimeCreated, afterId] : [sessionId, afterTimeCreated, afterTimeCreated, afterId]);
   return rows.map((r) => ({
     agent: r.agent ?? null,
     timeCreated: Number(r.time_created ?? 0),
@@ -18267,8 +18504,8 @@ function readAssistantUsageRowsAfter(openCodeDb, sessionId, afterTimeCreated, af
     output: Number(r.output ?? 0)
   }));
 }
-function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry) {
-  const rows = readAssistantUsageRowsAfter(openCodeDb, sessionId, carry.lastTimeCreated, carry.lastId);
+function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry, generation = "v1") {
+  const rows = readAssistantUsageRowsAfter(openCodeDb, sessionId, carry.lastTimeCreated, carry.lastId, generation);
   if (rows.length === 0) {
     return { carry, metrics: metricsFromCarry(carry) };
   }
@@ -18466,13 +18703,15 @@ function resolveTailHygieneStatus(tsBaseline, rustBaseline) {
 // src/plugin/rpc-handlers.ts
 var workMetricsCarryBySession = new Map;
 function resolveSidebarWorkMetrics(db, sessionId, persistedNewWork, persistedTotalInput) {
-  if (!openCodeDbExists()) {
+  const generation = getHarness() === "opencode2" ? "v2" : "v1";
+  if (!openCodeDbExists(generation)) {
     return { newWorkTokens: persistedNewWork, totalInputTokens: persistedTotalInput };
   }
   try {
-    const carry = workMetricsCarryBySession.get(sessionId) ?? emptyWorkMetricsCarry();
-    const { carry: nextCarry, metrics } = withReadOnlySessionDb((openCodeDb) => computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry));
-    workMetricsCarryBySession.set(sessionId, nextCarry);
+    const carryKey = `${generation}:${sessionId}`;
+    const carry = workMetricsCarryBySession.get(carryKey) ?? emptyWorkMetricsCarry();
+    const { carry: nextCarry, metrics } = withReadOnlySessionDb((openCodeDb) => computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry, generation), generation);
+    workMetricsCarryBySession.set(carryKey, nextCarry);
     try {
       setSessionWorkMetrics(db, sessionId, metrics.newWorkTokens, metrics.totalInputTokens);
     } catch {}
@@ -18591,7 +18830,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
       if (model) {
         activeProviderID = model.providerID;
         activeModelID = model.modelID;
-        measuredToolDefTokens = getMeasuredToolDefinitionTokens(model.providerID, model.modelID, agent) ?? 0;
+        measuredToolDefTokens = getMeasuredToolDefinitionTokens(model.providerID, model.modelID, agent, sessionId) ?? 0;
       }
     }
     const contextLimit = activeProviderID && activeModelID ? resolveContextLimit(activeProviderID, activeModelID, {
@@ -19077,8 +19316,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await import("./recomp-orchestrator-mmpy5cb7.js");
-    const { sendIgnoredMessage } = await import("./send-session-notification-zpqs213d.js");
+    const { runManagedRecomp } = await import("./recomp-orchestrator-gzd1at06.js");
+    const { sendIgnoredMessage } = await import("./send-session-notification-vdppp5x6.js");
     log(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -19127,7 +19366,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await import("./wrapup-orchestrator-jq589pgr.js");
+    const { runManagedWrapup } = await import("./wrapup-orchestrator-ghq4y406.js");
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -19822,18 +20061,18 @@ var FULL_PARAMETER_DESCRIPTIONS = {
     message: "Message ordinal from a <session-history> heading or a mmc_search hit, not a tag number. Returns that one message in full. Use alone."
   },
   mmc_note: {
-    action: "write | read | update | dismiss. Defaults to write when content is given, else read.",
+    action: "write | read | update | dismiss.",
     content: "Note text for write/update: first line is the title (under 80 chars), then the detail.",
     filter: "Read filter: active (default), all, dismissed.",
     limit: "Rows per read (default 25).",
     offset: "Skip this many newest rows (default 0).",
-    note_ids: "Note ids: one for update, 1–50 for dismiss or read (read returns full bodies). Ignored by write."
+    note_ids: "Note ids: one for update, 1–50 for dismiss, or 1–50 to read those notes in full. Write and a plain read take an empty list."
   },
   mmc_memory: {
     action: "write | update | archive | merge | get",
-    content: "The memory text — one standalone fact (write, update, merge).",
-    category: "Kind of fact (required for write; on update/merge optional, omitted keeps the current category).",
-    ids: "Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get.",
+    content: "The memory text — one standalone fact (write, update, merge). Archive and get take an empty string.",
+    category: "Kind of fact: the new fact's kind for write; on update/merge, the memory's current category to keep it. Archive and get ignore it.",
+    ids: "Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get. Write takes an empty list.",
     reason: "Why it is being archived (optional)."
   },
   mmc_search: {
@@ -19856,18 +20095,18 @@ var LIGHT_PARAMETER_DESCRIPTIONS = {
     message: "Message ordinal from a <session-history> heading or a mmc_search hit, not a tag number. Returns that one message in full. Use alone."
   },
   mmc_note: {
-    action: "write | read | update | dismiss (default: write with content, else read).",
+    action: "write | read | update | dismiss.",
     content: "Note text: first line title (<80 chars), then detail.",
     filter: "Read filter: active (default), all, dismissed.",
     limit: "Rows per read (default 25).",
     offset: "Skip newest rows (default 0).",
-    note_ids: "One id for update, 1–50 for dismiss or read (full bodies). Ignored by write."
+    note_ids: "One id for update, 1–50 for dismiss, or 1–50 to read those notes in full. Write and a plain read take an empty list."
   },
   mmc_memory: {
     action: "write | update | archive | merge | get",
-    content: "One standalone fact (write, update, merge).",
-    category: "Kind of fact (required for write; optional on update/merge).",
-    ids: "Ids from <project-memory>: one for update, 1+ for archive, 2+ for merge, 1–20 for get.",
+    content: "One standalone fact (write, update, merge). Archive and get: empty string.",
+    category: "Kind of fact (write; on update/merge pass the current category to keep it). Archive and get ignore it.",
+    ids: "Ids from <project-memory>: one for update, 1+ for archive, 2+ for merge, 1–20 for get. Write: empty list.",
     reason: "Why it is archived (optional)."
   },
   mmc_search: {
@@ -22427,6 +22666,96 @@ async function createV2HiddenCompletionExecutor(host, options) {
   };
 }
 
+// src/v2/message-times.ts
+function isSettled(entry, readAt) {
+  return (entry.version.type === "user" || entry.time.completed !== undefined) && typeof entry.version.updated === "number" && Number.isFinite(entry.version.updated) && entry.version.updated <= readAt - 1000;
+}
+function sameVersion(a, b) {
+  return a.type === b.type && a.seq === b.seq && a.created === b.created && a.updated === b.updated;
+}
+
+class V2MessageTimesCache {
+  capacity;
+  sessions = new Map;
+  constructor(capacity = 64) {
+    this.capacity = capacity;
+  }
+  delete(sessionID) {
+    this.sessions.delete(sessionID);
+  }
+  deleteMessage(sessionID, messageID) {
+    this.sessions.get(sessionID)?.entries.delete(messageID);
+  }
+  clear() {
+    this.sessions.clear();
+  }
+  pass(sessionID) {
+    const previous = this.sessions.get(sessionID);
+    const current = { entries: new Map };
+    this.sessions.delete(sessionID);
+    this.sessions.set(sessionID, current);
+    while (this.sessions.size > this.capacity) {
+      const oldest = this.sessions.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.sessions.delete(oldest);
+    }
+    const passTimes = new Map;
+    return (reader, ids) => {
+      const missing = [...new Set(ids)].filter((id) => !passTimes.has(id));
+      if (missing.length > 0) {
+        const readAt = Date.now();
+        const identity = reader.hostIdentity();
+        current.identity = identity;
+        const reusable = previous?.identity === identity ? previous.entries : undefined;
+        const known = [];
+        const refresh = [];
+        let first = Infinity;
+        let last = -Infinity;
+        for (const id of missing) {
+          const entry = reusable?.get(id);
+          if (entry && isSettled(entry, readAt)) {
+            known.push(id);
+            first = Math.min(first, entry.version.seq);
+            last = Math.max(last, entry.version.seq);
+          } else
+            refresh.push(id);
+        }
+        const versions = reader.messageTimeVersions(sessionID, known, { first, last });
+        for (const id of known) {
+          const version = versions.get(id);
+          const cached = reusable?.get(id);
+          if (!version) {
+            passTimes.set(id, null);
+          } else if (cached && sameVersion(cached.version, version) && (version.type === "user" || cached.time.completed !== undefined)) {
+            current.entries.set(id, cached);
+            passTimes.set(id, cached.time);
+          } else
+            refresh.push(id);
+        }
+        const times = reader.messageTimes(sessionID, refresh, versions);
+        for (const id of refresh) {
+          const time = times.get(id);
+          const version = versions.get(id);
+          passTimes.set(id, time ?? null);
+          if (time && version) {
+            const entry = { version, time };
+            if (isSettled(entry, readAt))
+              current.entries.set(id, entry);
+          }
+        }
+      }
+      const result = new Map;
+      for (const id of ids) {
+        const time = passTimes.get(id);
+        if (time)
+          result.set(id, { ...time });
+      }
+      return result;
+    };
+  }
+}
+
 // src/v2/hooks/channel2.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
 var pendingCandidates = new WeakMap;
@@ -23365,7 +23694,7 @@ function projectRawMessages(rows, ordinalFor) {
     const message = {
       id: row.id,
       ordinal: ordinalFor(row, index),
-      role: row.type === "assistant" ? "assistant" : "user",
+      role: row.type === "assistant" ? "assistant" : row.type === "system" ? "system" : "user",
       createdAt: row.time_created ?? row.data.time?.created,
       parts: row.type === "assistant" ? (row.data.content ?? []).map((part) => {
         if (part.type !== "tool")
@@ -23741,6 +24070,17 @@ function resolveCtxExpandMode(args, domain) {
 
 // src/tools/ctx-expand/render.ts
 import { createHash as createHash5 } from "node:crypto";
+function recoveryParts(sessionId, message, attachments) {
+  return attachments ? [...message.parts, ...attachments(sessionId, message.id)] : message.parts;
+}
+function attachmentNotice(part) {
+  const field = (value) => typeof value === "string" ? value.trim().replace(/[\r\n]+/g, " ") : "";
+  const source = isRecord4(part.source) ? part.source : {};
+  const location = [part.url, part.path, source.uri, source.url, source.path].map(field).find((value) => value && !/^(data|blob):/i.test(value));
+  const name = field(part.filename) || field(part.name);
+  const mime = field(part.mime) || field(part.mimeType) || field(part.mediaType);
+  return `[file]${name ? ` ${name}` : ""}${mime ? ` (${mime})` : ""}` + `${location ? ` — stored location: ${location}` : ""}` + "; content not recovered. If needed, ask the user to attach it again.";
+}
 function isRecord4(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -23847,8 +24187,8 @@ function renderPartPreview(part, expandTools) {
   if (reasoning !== null)
     return `    • [reasoning] ${truncate2(reasoning, 120)}`;
   const type = typeof part.type === "string" ? part.type : "part";
-  if (type === "file")
-    return "    • [file]";
+  if (type === "file" || type === "image")
+    return `    • ${attachmentNotice(part)}`;
   if (type === "step-start" || type === "step-finish")
     return null;
   return `    • [${type}]`;
@@ -23878,13 +24218,11 @@ ${tool.output}`);
 `);
   }
   const type = typeof part.type === "string" ? part.type : "part";
-  if (type === "file") {
-    const name = typeof part.filename === "string" && part.filename || typeof part.url === "string" && part.url || "";
-    return `  [file]${name ? ` ${name}` : ""}`;
-  }
+  if (type === "file" || type === "image")
+    return `  ${attachmentNotice(part)}`;
   return null;
 }
-function renderMessageByOrdinal(sessionId, ordinal) {
+function renderMessageByOrdinal(sessionId, ordinal, attachments) {
   const found = [];
   visitRawSessionMessages2(sessionId, ordinal, ordinal, (m) => {
     if (m.ordinal === ordinal)
@@ -23895,7 +24233,7 @@ function renderMessageByOrdinal(sessionId, ordinal) {
   if (!msg) {
     return `No message at ordinal ${ordinal} is currently in this session's stored history — ` + `it may have been removed by a session prune/revert, or the ordinal may be wrong. ` + `Re-run the tool if you still need the data.`;
   }
-  const rendered = msg.parts.map(renderPartFull).filter((l) => l !== null);
+  const rendered = recoveryParts(sessionId, msg, attachments).map(renderPartFull).filter((l) => l !== null);
   const lines = [`[${msg.ordinal}] ${roleLabel(msg.role)} — full recovery:`, ""];
   if (rendered.length === 0) {
     lines.push("  (no recoverable content — message had only structural/reasoning parts)");
@@ -23905,14 +24243,14 @@ function renderMessageByOrdinal(sessionId, ordinal) {
   return lines.join(`
 `);
 }
-function renderVerboseRange(sessionId, start, end, tokenBudget, expandTools) {
+function renderVerboseRange(sessionId, start, end, tokenBudget, expandTools, attachments) {
   const out = [];
   let usedTokens = 0;
   let lastOrdinal = start - 1;
   let truncated = false;
   visitRawSessionMessages2(sessionId, start, end, (msg) => {
     const header = `[${msg.ordinal}] ${verboseRoleLabel(msg)}`;
-    const partLines = msg.parts.map((part) => renderPartPreview(part, expandTools)).filter((l) => l !== null);
+    const partLines = recoveryParts(sessionId, msg, attachments).map((part) => renderPartPreview(part, expandTools)).filter((l) => l !== null);
     const block = partLines.length > 0 ? `${header}
 ${partLines.join(`
 `)}` : header;
@@ -23930,7 +24268,23 @@ ${partLines.join(`
 
 `), lastOrdinal, truncated };
 }
-function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
+function renderVerboseRangeForTool(sessionId, start, end, tokenBudget, expandTools, attachments) {
+  const v = renderVerboseRange(sessionId, start, end, tokenBudget, expandTools, attachments);
+  if (!v.text) {
+    return `No messages found in range ${start}-${end}. The range may be outside this session's history.`;
+  }
+  const out = [
+    `Messages ${start}-${v.lastOrdinal} (verbose). Recover any one in full with mmc_expand(message=<ordinal>):`,
+    "",
+    v.text
+  ];
+  if (v.truncated) {
+    out.push("", `Truncated at message ${v.lastOrdinal} (budget: ~${tokenBudget} tokens). Call again with start=${v.lastOrdinal + 1} end=${end} verbose=true for more.`);
+  }
+  return out.join(`
+`);
+}
+function renderItemByTag(db, sessionId, number, textIndexDomain = "part", attachments) {
   const tag = getTagById(db, sessionId, number);
   if (!tag)
     return `no tag ${number} in this session; if ${number} came from a <session-history> heading or a ctx_search hit, it is an ordinal: use message=${number}`;
@@ -23955,17 +24309,19 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
     return rendered.length ? rendered.join(`
 `) : `Tag ${number}'s original tool call is no longer in stored history.`;
   }
-  const scoped = /^(.*):p(\d+)$/.exec(tag.messageId);
+  const scoped = /^(.*):(?:p|file)(\d+)$/.exec(tag.messageId);
   const derived = /^(.*):mc-text-v1:([a-f0-9]+):([a-f0-9]+):o(\d+)$/.exec(tag.messageId);
   const owner = scoped?.[1] ?? derived?.[1] ?? tag.messageId;
   const message = readRawSessionMessageById2(sessionId, owner);
   if (!message)
     return `Tag ${number}'s original text is no longer in stored history.`;
   const index = scoped ? Number(scoped[2]) : 0;
-  const piText = message.parts.filter((part) => isRecord4(part) && part.type === "text");
-  const part = message.parts[index];
+  const attached = attachments?.(sessionId, message.id) ?? [];
+  const parts = [...message.parts, ...attached];
+  const piText = parts.filter((part) => isRecord4(part) && part.type === "text");
+  const part = tag.type === "file" ? attached.find((part) => isRecord4(part) && part.partIndex === index) ?? message.parts[index] : parts[index];
   const matching = derived ? piText.filter((part) => isRecord4(part) && typeof part.text === "string" && createHash5("sha256").update(part.text).digest("hex") === derived[3]) : [];
-  const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" ? piText[index] : part;
+  const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" && tag.type !== "file" ? piText[index] : part;
   if (!selected)
     return `Tag ${number}'s original text part is no longer in stored history.`;
   const renderedPart = renderPartFull(selected);
@@ -24053,10 +24409,10 @@ function createCtxExpandTool(deps) {
           return mode.message;
         }
         if (mode.kind === "tag") {
-          return renderItemByTag(deps.db, sessionId, mode.tag);
+          return renderItemByTag(deps.db, sessionId, mode.tag, "part", deps.recoveryAttachments);
         }
         if (mode.kind === "message") {
-          return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
+          return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message, deps.recoveryAttachments);
         }
         const { start, end, verbose } = mode;
         const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -24068,20 +24424,7 @@ function createCtxExpandTool(deps) {
         if (archived)
           return archived;
         if (verbose) {
-          const v = renderVerboseRange(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools);
-          if (!v.text) {
-            return `No messages found in range ${start}-${effectiveEnd}. The range may be outside this session's history.`;
-          }
-          const out = [
-            `Messages ${start}-${v.lastOrdinal} (verbose). Recover any one in full with mmc_expand(message=<ordinal>):`,
-            "",
-            v.text
-          ];
-          if (v.truncated) {
-            out.push("", `Truncated at message ${v.lastOrdinal} (budget: ~${CTX_EXPAND_TOKEN_BUDGET} tokens). Call again with start=${v.lastOrdinal + 1} end=${effectiveEnd} verbose=true for more.`);
-          }
-          return out.join(`
-`);
+          return renderVerboseRangeForTool(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools, deps.recoveryAttachments);
         }
         const chunk = readSessionChunk2(sessionId, CTX_EXPAND_TOKEN_BUDGET, start, effectiveEnd + 1, { expand: false });
         if (!chunk.text || chunk.messageCount === 0) {
@@ -24296,10 +24639,10 @@ function updateMemoryContentInCurrentTransaction(db, memory, content, normalized
   clearMemoryVerifications(db, memory.id);
 }
 var ctxMemoryArgsShape = {
-  action: tool2.schema.enum([...CTX_MEMORY_ACTIONS]).optional().describe("write | update | archive | merge | get"),
-  content: tool2.schema.string().optional().describe("The memory text — one standalone fact (write, update, merge)."),
-  category: tool2.schema.enum([...V2_MEMORY_CATEGORIES]).optional().describe("Kind of fact (required for write; on update/merge optional, omitted keeps the current category)."),
-  ids: tool2.schema.array(tool2.schema.number()).optional().describe("Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get."),
+  action: tool2.schema.enum([...CTX_MEMORY_ACTIONS]).describe("write | update | archive | merge | get"),
+  content: tool2.schema.string().describe("The memory text — one standalone fact (write, update, merge)."),
+  category: tool2.schema.enum([...V2_MEMORY_CATEGORIES]).describe("Kind of fact (required for write; on update/merge, pass the memory's current category to keep it)."),
+  ids: tool2.schema.array(tool2.schema.number()).describe("Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get."),
   reason: tool2.schema.string().optional().describe("Why it is being archived (optional).")
 };
 var ctxMemoryArgsSchema = tool2.schema.object({ ...ctxMemoryArgsShape }).passthrough();
@@ -24657,7 +25000,7 @@ function renderGlance(notes, options) {
   const remaining = ordered.length - options.offset - page.length;
   const footer = remaining > 0 ? `
 
-Showing ${page.length} of ${ordered.length} — ${remaining} older: mmc_note(action="read", offset=${options.offset + page.length})` : "";
+Showing ${page.length} of ${ordered.length} — ${remaining} older: mmc_note(action="read", content="", note_ids=[], offset=${options.offset + page.length})` : "";
   return `## Notes
 
 ${rows}${footer}`;
@@ -24695,7 +25038,7 @@ function captureAnchorOrdinal(db, sessionId) {
 }
 var DISMISS_FOOTER = `
 
-To dismiss a stale note: mmc_note(action="dismiss", note_ids=[N])`;
+To dismiss a stale note: mmc_note(action="dismiss", note_ids=[N], content="")`;
 var DEFAULT_READ_LIMIT = 25;
 function readGlanceNotes(args) {
   if (args.filter === undefined) {
@@ -24725,12 +25068,12 @@ function noteAuthorityRefusal(action) {
   return renderCapabilityRefusal(isMutation ? "note_change" : "note_access");
 }
 var ctxNoteArgsShape = {
-  action: tool3.schema.enum(["write", "read", "dismiss", "update"]).optional().describe("write | read | update | dismiss. Defaults to write when content is given, else read."),
-  content: tool3.schema.string().optional().describe("Note text for write/update: first line is the title (under 80 chars), then the detail."),
+  action: tool3.schema.enum(["write", "read", "dismiss", "update"]).describe("write | read | update | dismiss."),
+  content: tool3.schema.string().describe("Note text for write/update: first line is the title (under 80 chars), then the detail."),
   filter: tool3.schema.enum(["all", "active", "dismissed"]).optional().describe("Read filter: active (default), all, dismissed."),
   limit: tool3.schema.number().optional().describe("Rows per read (default 25)."),
   offset: tool3.schema.number().optional().describe("Skip this many newest rows (default 0)."),
-  note_ids: tool3.schema.array(tool3.schema.number().int().min(1)).min(1).max(50).optional().describe("Note ids: one for update, 1–50 for dismiss or read (read returns full bodies). Ignored by write.")
+  note_ids: tool3.schema.array(tool3.schema.number().int().min(1)).max(50).describe("Note ids: one for update, 1–50 for dismiss, or 1–50 to read those notes in full. Write and a plain read take an empty list.")
 };
 var ctxNoteArgsSchema = tool3.schema.object(ctxNoteArgsShape).passthrough();
 function formatDismissResults(results) {
@@ -24769,7 +25112,8 @@ function createCtxNoteTool(deps) {
       });
       const sessionId = toolContext.sessionID;
       const action = args.action ?? (args.content?.trim() ? "write" : "read");
-      const noteIds = action === "dismiss" || action === "update" || action === "read" && args.note_ids !== undefined ? parseNoteIds(action, args.note_ids) : undefined;
+      const targetedReadIds = action === "read" && Array.isArray(args.note_ids) && args.note_ids.length === 0 ? undefined : args.note_ids;
+      const noteIds = action === "dismiss" || action === "update" || action === "read" && targetedReadIds !== undefined ? parseNoteIds(action, targetedReadIds) : undefined;
       if (typeof noteIds === "string")
         return noteIds;
       const projectIdentity = deps.resolveProjectPath?.(toolContext.directory);
@@ -25511,16 +25855,23 @@ function applyV2PromptSurfaceTools(draft, runtime, config) {
 function recordV2ToolDefinitions(draft) {
   if (!draft.tools)
     return;
+  const tools = [];
   for (const [id, tool] of Object.entries(draft.tools)) {
     if (!tool)
       continue;
     recordToolParameters(id, tool.input);
-    recordToolDefinition(draft.model.providerID, draft.model.id, draft.agent, id, typeof tool.description === "string" ? tool.description : "", tool.input);
+    tools.push({
+      id,
+      description: typeof tool.description === "string" ? tool.description : "",
+      parameters: tool.input
+    });
   }
+  recordToolDefinitionSet(draft.model.providerID, draft.model.id, draft.agent, tools, draft.sessionID);
 }
 async function registerContext(context) {
   const directory = context.location.directory;
   const config = loadPluginConfigDetailed(directory).config;
+  log(`[magic-context] OpenCode 2 keep_subagents=${config.keep_subagents === true}`);
   setHomeProjectPermission(config.allow_home_project);
   if (!config.enabled)
     return;
@@ -25642,6 +25993,7 @@ async function registerContext(context) {
   };
   let hiddenAgentsReady;
   const readerPool = new V2StoreReaderPool;
+  const messageTimesCache = new V2MessageTimesCache;
   const openStoreReader = () => readerPool.open(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"));
   const createHiddenExecutor = async (database) => {
     await cleanupLegacyOnce(database);
@@ -25762,17 +26114,11 @@ async function registerContext(context) {
     }
   });
   const pagedRead = createV2RawMessageReader(openStoreReader);
-  let orphanSweep;
-  let orphanSweepTimer;
   const prepareHistorySession = (sessionID) => {
     if (!rawProviders.has(sessionID))
       rawProviders.set(sessionID, setBoundedRawMessageProvider2(sessionID, createV2RawMessageProvider(pagedRead, sessionID)));
   };
   if (db && isDatabasePersisted(db)) {
-    const sweepDb = db;
-    orphanSweepTimer = scheduleAfterBootQuiet(() => {
-      orphanSweep = sweepOrphanedOpenCodeMessageIndexesCooperatively(sweepDb, () => new Database(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), { readonly: true, fileMustExist: true })).catch((error) => log("[magic-context] v2 orphan sweep failed:", error));
-    });
     const backfillDb = db;
     scheduleAfterBootQuiet(() => {
       runV2SessionProjectBackfill(backfillDb, openStoreReader, config.allow_home_project).catch((error) => log("[session-project-backfill] OpenCode 2 backfill failed:", error));
@@ -25912,6 +26258,12 @@ async function registerContext(context) {
             if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
               nativeFoldReplay?.onEvent(event);
               restoredRows.forget(sessionID);
+              messageTimesCache.delete(sessionID);
+            }
+            if (event.type === "session.step.started" || event.type === "session.step.ended" || event.type === "session.step.failed") {
+              const messageID = event.data.assistantMessageID;
+              if (typeof messageID === "string")
+                messageTimesCache.deleteMessage(sessionID, messageID);
             }
             if (event.type === "session.revert.committed") {
               committedSourceRefreshes.set(sessionID, {});
@@ -25951,6 +26303,7 @@ async function registerContext(context) {
               rawProviders.get(sessionID)?.();
               rawProviders.delete(sessionID);
               usage.delete(sessionID);
+              messageTimesCache.delete(sessionID);
               hiddenSessionErrors.delete(sessionID);
               storageNoticeBySession.delete(sessionID);
               liveModels.delete(sessionID);
@@ -26022,7 +26375,7 @@ async function registerContext(context) {
       memoryInjectionBudgetTokens: config.memory.injection_budget_tokens,
       hardSignals: {
         systemHash: foldDigest(JSON.stringify(draft.system)),
-        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent),
+        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent, draft.sessionID),
         modelKey: `${draft.model.providerID}/${draft.model.id}`,
         cacheExpired: false,
         lastResponseTime: state.lastResponseTime
@@ -26110,6 +26463,65 @@ async function registerContext(context) {
     }
     return ids;
   };
+  const initializeTransform = (database) => transform ??= createTransform({
+    cacheTtlConfig: config.cache_ttl,
+    cacheTtlConfigured: config.cacheTtlConfigured,
+    sampleCacheTtlConfig: () => liveConfigReader.poll().effective,
+    db: database,
+    tagger,
+    ...createV2ThresholdDeps(config),
+    contextUsageMap: usage,
+    compactionOff,
+    storeGeneration: "v2",
+    normalizeRestoredAssistantText: (text, providerID) => {
+      const normalized = stripCopiedTagNotation(text);
+      return normalized === "" && !modelAcceptsEmptyContent(providerID) ? text : normalized;
+    },
+    refreshSourceContents: (sessionID) => committedSourceRefreshes.has(sessionID),
+    hostCleanupCompactionMarkers: () => ({
+      verified: true,
+      removedLineages: 0,
+      removedRows: 0,
+      retainedLineages: 0
+    }),
+    protectedTokens: config.protected_tokens,
+    protectedTokenTierOverrides: getProtectedTokensTierOverrides(config),
+    protectedTools: config.protected_tools,
+    liveModelBySession: liveModels,
+    getToolSetHash: (sessionId) => {
+      const model = liveModels.get(sessionId);
+      if (!model)
+        return "";
+      return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
+    },
+    channel1StateBySession: channel1,
+    historyRefreshSessions,
+    pendingMaterializationSessions,
+    lastHeuristicsTurnId,
+    variantBySession: variants,
+    keepReasoningTokens: config.keep_reasoning_tokens,
+    directory,
+    sessionDirectoryBySession: sessionDirectories,
+    projectPath: directory,
+    agentBySession: agents,
+    maintenanceConfig: config.maintenance ? () => inheritMaintenanceModelConfig(config) : undefined,
+    hiddenCompletionExecutor,
+    historianRunnable: !compactionOff && hiddenCompletionExecutor !== undefined && config.historian?.disable !== true,
+    historianModel: historianModels.primary,
+    fallbackModels: historianModels.fallbacks,
+    resolveHistorianRun: sampleHistorian,
+    historianTimeoutMs: config.historian_timeout_ms,
+    historianMaxOutputTokens: config.historian?.maxTokens,
+    historianTwoPass: config.historian?.two_pass,
+    historianExpandTools: config.historian?.expand_tools,
+    compactionMarkerStrategy: v2CompactionMarkerStrategy,
+    memoryConfig: {
+      enabled: config.memory.enabled,
+      injectionBudgetTokens: config.memory.injection_budget_tokens,
+      autoPromote: config.memory.auto_promote
+    },
+    ...createHostSeams(context, readAllForConversion, pagedRead, liveModels)
+  });
   const runManagedContext = async (draft) => {
     rememberHostMedia(draft.messages);
     if (hiddenChildHook.apply(draft))
@@ -26139,22 +26551,9 @@ async function registerContext(context) {
     }
     await dropStorageNotices(draft.messages, isMagicContextSynthetic);
     let hostMessagesAtEntry = [...draft.messages];
-    const passTimes = new Map;
+    const cachedTimes = messageTimesCache.pass(draft.sessionID);
     const readTimes = (reader, messages) => {
-      const ids = timeIds(messages);
-      const missing = ids.filter((id) => !passTimes.has(id));
-      if (missing.length) {
-        const read = reader.messageTimes(draft.sessionID, missing);
-        for (const id of missing)
-          passTimes.set(id, read.get(id) ?? null);
-      }
-      const times = new Map;
-      for (const id of ids) {
-        const time = passTimes.get(id);
-        if (time)
-          times.set(id, time);
-      }
-      return times;
+      return cachedTimes(reader, timeIds(messages));
     };
     liveModels.set(draft.sessionID, {
       providerID: draft.model.providerID,
@@ -26405,65 +26804,7 @@ async function registerContext(context) {
           }
         });
       }
-      transform ??= createTransform({
-        cacheTtlConfig: config.cache_ttl,
-        cacheTtlConfigured: config.cacheTtlConfigured,
-        sampleCacheTtlConfig: () => liveConfigReader.poll().effective,
-        db,
-        tagger,
-        ...createV2ThresholdDeps(config),
-        contextUsageMap: usage,
-        compactionOff,
-        storeGeneration: "v2",
-        normalizeRestoredAssistantText: (text, providerID) => {
-          const normalized = stripCopiedTagNotation(text);
-          return normalized === "" && !modelAcceptsEmptyContent(providerID) ? text : normalized;
-        },
-        refreshSourceContents: (sessionID) => committedSourceRefreshes.has(sessionID),
-        hostCleanupCompactionMarkers: () => ({
-          verified: true,
-          removedLineages: 0,
-          removedRows: 0,
-          retainedLineages: 0
-        }),
-        protectedTokens: config.protected_tokens,
-        protectedTokenTierOverrides: getProtectedTokensTierOverrides(config),
-        protectedTools: config.protected_tools,
-        liveModelBySession: liveModels,
-        getToolSetHash: (sessionId) => {
-          const model = liveModels.get(sessionId);
-          if (!model)
-            return "";
-          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId));
-        },
-        channel1StateBySession: channel1,
-        historyRefreshSessions,
-        pendingMaterializationSessions,
-        lastHeuristicsTurnId,
-        variantBySession: variants,
-        keepReasoningTokens: config.keep_reasoning_tokens,
-        directory,
-        sessionDirectoryBySession: sessionDirectories,
-        projectPath: directory,
-        agentBySession: agents,
-        maintenanceConfig: config.maintenance ? () => inheritMaintenanceModelConfig(config) : undefined,
-        hiddenCompletionExecutor,
-        historianRunnable: !compactionOff && hiddenCompletionExecutor !== undefined && config.historian?.disable !== true,
-        historianModel: historianModels.primary,
-        fallbackModels: historianModels.fallbacks,
-        resolveHistorianRun: sampleHistorian,
-        historianTimeoutMs: config.historian_timeout_ms,
-        historianMaxOutputTokens: config.historian?.maxTokens,
-        historianTwoPass: config.historian?.two_pass,
-        historianExpandTools: config.historian?.expand_tools,
-        compactionMarkerStrategy: v2CompactionMarkerStrategy,
-        memoryConfig: {
-          enabled: config.memory.enabled,
-          injectionBudgetTokens: config.memory.injection_budget_tokens,
-          autoPromote: config.memory.auto_promote
-        },
-        ...createHostSeams(context, readAllForConversion, pagedRead, liveModels)
-      });
+      transform = initializeTransform(db);
       const refreshToken = committedSourceRefreshes.get(draft.sessionID);
       if (refreshToken) {
         clearCachedM0(db, draft.sessionID);
@@ -26762,12 +27103,10 @@ async function registerContext(context) {
   }, 0);
   return {
     async dispose() {
+      messageTimesCache.clear();
       usageController.abort();
-      if (orphanSweepTimer)
-        clearTimeout(orphanSweepTimer);
       await hiddenCompletionExecutor?.dispose();
       await usageDone;
-      await orphanSweep;
       rpcStopped = true;
       rpcServer.stop();
       tools?.dispose();