@retaw106/mmc-oc 2.5.0 → 2.6.0

package/dist/{context-xx09sh1g.js → context-cfbjrr0n.js}

@@ -71,21 +71,10 @@ import {
   searchMemoriesFTSUnion,
   clearMemoryVerifications,
   queueMemoryMutation,
-  BoundedSessionMap,
-  registerOwnRpcServerInstance,
-  rpcPortDir,
-  rpcPortFilePath,
-  parseRpcPortFile,
-  inspectProcessesAsync,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
+  scheduleAfterBootQuiet,
   cleanSearchText,
   keywordRelevance,
   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-xk1dz6q9.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 };
@@ -11363,6 +11384,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 +11400,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 +11945,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 +12136,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 +12654,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 +12743,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 +12783,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 +12857,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 +12902,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 +12926,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 +12939,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 +12952,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 +12979,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 +13017,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 +13066,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 +16571,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 +16586,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 +16902,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 +16933,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 +17422,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 +17554,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 +17579,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 +17594,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 +17613,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 +17625,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 +17639,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 +17718,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 +17931,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 +18403,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 +18431,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 +18630,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 +18757,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 +19243,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-51xyaexp.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 +19293,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-g0mww1h4.js");
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -19822,17 +19988,17 @@ 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).",
+    category: "Kind of fact (required for write; on update/merge, pass the memory's current category to keep it).",
     ids: "Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get.",
     reason: "Why it is being archived (optional)."
   },
@@ -19856,17 +20022,17 @@ 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).",
+    category: "Kind of fact (required for write; on update/merge pass the current category to keep it).",
     ids: "Ids from <project-memory>: one for update, 1+ for archive, 2+ for merge, 1–20 for get.",
     reason: "Why it is archived (optional)."
   },
@@ -22427,6 +22593,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 +23621,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")
@@ -24296,10 +24552,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 +24913,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 +24951,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 +24981,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 +25025,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 +25768,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 +25906,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 +26027,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 +26171,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 +26216,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 +26288,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 +26376,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 +26464,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 +26717,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 +27016,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();