@cortexkit/opencode-magic-context 0.49.34 → 0.49.36

package/dist/{index-97spytxq.js → index-gnmhbyyc.js}

@@ -25,13 +25,15 @@ import {
 } from "./index-g2q4htwp.js";
 import {
   sanitizeDiagnosticText,
-  hasShareabilitySensitiveText,
+  hasShareabilitySensitiveText
+} from "./index-z4p0ry94.js";
+import {
   classifyStalePluginBuild,
   importPluginModule,
   log2,
   sessionLog2,
   getLoggerDiagnostics2
-} from "./index-h7tgn49j.js";
+} from "./index-jrfre9ah.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -46,6 +48,7 @@ import {
 import {
   inRootAsyncContext2,
   Database2,
+  getSqliteDatabasePath2,
   getSqliteMemoryStats2,
   withSqliteBackgroundWriter2,
   withSqliteTransformPass2,
@@ -69,7 +72,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-kq5w68dp.js";
+} from "./index-txs8tce6.js";
 import {
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity,
@@ -79,7 +82,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-kfyb3k6n.js";
+} from "./index-jz5bk7xd.js";
 import {
   getMagicContextBuiltinCommands,
   formatConfigParseStatusLine,
@@ -101,82 +104,6 @@ import {
   DREAMER_CLASSIFIER_AGENT,
   DREAMER_DOCS_AGENT,
   DREAMER_REVIEWER_AGENT,
-  getCompartments,
-  getLastCompartmentEndMessage,
-  getLastCompartmentEndMessageId,
-  providerResponseFailed,
-  LkgRecoveryFenceError,
-  lkgServedArrayDigest,
-  hasCleanLkgRecoveryFence,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  prepareLkgCaptureFence,
-  certifyCommittedLkgCapture,
-  markLkgRecoveryDirty,
-  getOrCreateSessionMeta,
-  updateSessionMeta,
-  retryPendingSessionCleanups,
-  retryPendingRustSessionCleanupsForProject,
-  requestPendingMaterialization,
-  hasPendingMaterializationOrigin,
-  clearPendingMaterialization,
-  recordSystemPromptForRequest,
-  recordHeldHeadForRequest,
-  isHeldHeadForRequest,
-  deferDeliveredSystemRefresh,
-  retirePendingSystemPromptDelivery,
-  claimLkgRequestIdentity,
-  currentLkgRequestIdentity,
-  noteCapturedLkgRequest,
-  measuredLkgPrefix,
-  saveLkgSlotToDb,
-  clearPersistedLkgSlotStrict,
-  loadPersistedLkgSlot,
-  drainStaleLkgSlots,
-  resolveLkgModelKeys,
-  createLkgEntryProjector,
-  captureLkgSlot,
-  validateAnthropicReasoningRuns,
-  validateLkgSeam,
-  replayLkg,
-  coldStartRawServedIndex,
-  coldStartUncapturedReplay,
-  noteUncertifiedNormalLkg,
-  hasProcessLocalLkgProof,
-  lkgDirtyRevision,
-  rememberLkgDirtyRevision,
-  readPersistedLkgUntaggedInputIds,
-  persistLkgUntaggedInputIds,
-  noteLkgRecoveryPrefix,
-  readLkgRecoveryPrefix,
-  noteLkgHealthyPrefix,
-  lkgRecoveryReplayUnproven,
-  lkgRecoveryEntryUnproven,
-  lkgInputIdentity,
-  beginLkgPass,
-  visitMessageContentFields,
-  contentSnapshotValue,
-  messageContentFields,
-  signatureForFields,
-  exactReusablePrefix,
-  incrementalLkgContentDigests,
-  lkgSlotRejection,
-  captureSlot,
-  getInMemorySlot,
-  getSlot,
-  forgetInMemorySlot,
-  dropSlot,
-  noteEntry,
-  getLkgSlotHeapStats,
-  TOOL_SWEEP_SCOPED_MARKER,
-  useScopedToolSweep,
-  createPreAdoptionToolSweepResolver,
-  queueMemoryMutation,
-  getMaxMemoryMutationIdForProjects,
-  GLOBAL_USER_PROFILE_PROJECT_PATH,
-  getProjectState,
-  bumpProjectUserProfileVersion,
   createChildSessionWithFence,
   HiddenCompletionRefusal,
   DreamerProviderOutputFailureError,
@@ -264,7 +191,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-atekmqef.js";
+} from "./index-9tdvbdv1.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -276,7 +203,7 @@ import {
   deriveTriggerBudget2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianProducerLimits2
-} from "./index-spwjbkc7.js";
+} from "./index-dnqqqc5f.js";
 import {
   resolveModelCalibration,
   calibrateBuckets,
@@ -290,7 +217,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-b88dwwrh.js";
+} from "./index-4xyjr62e.js";
 import {
   protectedToolTokenCount,
   peelLeadingMcTagNotation,
@@ -298,6 +225,7 @@ import {
   currentReclaimableToolOutputCount,
   isRecord,
   contentTagOwnerMessageId,
+  providerVisiblePart,
   normalizeTodoStateJson,
   computeSyntheticCallId,
   CHANNEL1_SENTINEL,
@@ -325,15 +253,21 @@ import {
   getDroppedTagsBySession2,
   getTagsByNumbers2,
   getDroppedTagsByNumbers2,
-  getMaxDroppedTagNumber2,
-  getTagById2
-} from "./index-np3rgfw4.js";
+  getMaxDroppedTagNumber2
+} from "./index-8jjjmhab.js";
 import {
   observeTemporalDecisions,
   stableStringify
-} from "./index-xrnsygfq.js";
+} from "./index-9wnbnx8f.js";
 import {
   withContentLanguageDirective,
+  string,
+  number,
+  boolean,
+  array,
+  object,
+  tuple,
+  literal,
   parseCron,
   nextOccurrence,
   nextDueAtMs,
@@ -344,14 +278,14 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./index-nxrsns5x.js";
+} from "./index-c5dzns43.js";
 import {
   areRustHistorianSyntheticParts2,
   isRawCompactionSummaryInfo2,
   extractInMemoryMessageViews2,
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2
-} from "./index-rverk2vz.js";
+} from "./index-r2epb000.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -359,17 +293,15 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-y1qwzvxn.js";
+} from "./index-vd2ywmfe.js";
 import {
-  expandToolPart,
   askAnswerLines,
-  takeCoveredInstructionRows,
-  cloneKeepingCoveredInstructionMarks,
   estimateTrueRawMessageTokens,
   isTextPart,
   toolPartHasUserAnswer,
   DreamTokenBudgetExceeded,
   isEditTool,
+  createFinalWireIncompleteLogger,
   decodeMergedReasoningParts,
   MAX_EXECUTE_THRESHOLD,
   escalationBands,
@@ -437,7 +369,6 @@ import {
   getPendingCompactionMarkerState,
   getCompactionMarkerHealth,
   clearPendingCompactionMarkerStateIf,
-  setSessionWorkMetrics,
   getObservedEpochFloor,
   resolveEpochFloorForPass,
   detectLatestTurnThinkingMismatch,
@@ -466,6 +397,7 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget,
+  rawMessageWorkerSource2,
   setRawMessageProvider2,
   cleanUserText2,
   withRawSessionMessageCache2,
@@ -484,35 +416,37 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-7g9dr8gy.js";
+} from "./index-tn9drm1a.js";
 import {
   BoundedSessionMap,
   getMeasuredToolDefinitionTokens
-} from "./index-s1n8dd2n.js";
+} from "./index-jkanybgq.js";
 import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
-  resolveAgentNameFromMessages,
-  getUnconfirmedMigrationHolders,
-  getSchemaFenceRejection,
-  getMigrationOnOpenRefusal,
-  LATEST_SUPPORTED_VERSION,
-  getDatabasePath,
-  getPersistedSchemaVersion,
-  runSqliteOptimize,
-  openDatabase,
-  openCurrentDatabase
-} from "./index-fm36bjv4.js";
+  resolveAgentNameFromMessages
+} from "./index-wh9fxds5.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
   rpcPortFilePath,
   parseRpcPortFile,
   inspectProcessesAsync
-} from "./index-c7phnbvk.js";
+} from "./index-2p37txes.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fb3zxn06.js";
+import {
+  getUnconfirmedMigrationHolders,
+  getSchemaFenceRejection,
+  getMigrationOnOpenRefusal,
+  LATEST_SUPPORTED_VERSION,
+  getDatabasePath,
+  getPersistedSchemaVersion,
+  runSqliteOptimize,
+  openDatabase,
+  openCurrentDatabase
+} from "./index-9fgmkfaf.js";
 import {
   unescapeXml,
   resolveWorkspaceShareCategories,
@@ -521,7 +455,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-7kkphb6c.js";
+} from "./index-nj360hcs.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -534,26 +468,8 @@ import {
   autoEmbedIdentityBySession,
   autoEmbedRetryAfterBySession,
   invalidateAutoEmbedSession,
-  getEmbedDrainUiStatus,
-  describeShadowBackfillWriteRefusal2,
-  markProjectLoadUntrusted2,
-  drainProjectEmbeddingIdentityMaintenance2,
-  drainStaleEmbeddingIdentitiesForProject2,
-  registerProjectEmbedding2,
-  registerProjectShadowEmbedding2,
-  enqueueShadowEmbeddingItems2,
-  registerProjectInObservationMode2,
-  unregisterProjectShadowEmbedding2,
-  getProjectEmbeddingSnapshot2,
-  embedTextForProject2,
-  embedBatchForProject2,
-  embedUnembeddedMemoriesForProject2,
-  embedUnembeddedMemoriesForProjectOutcome2,
-  drainCommitBacklogForProject2,
-  embedSessionCompartmentChunks2,
-  getEmbeddingCoverageStatus2,
-  getAutoEmbeddingSessionCoverage2
-} from "./index-2743x98y.js";
+  getEmbedDrainUiStatus
+} from "./index-2amn2s73.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -561,18 +477,89 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./index-wfybj1dw.js";
+} from "./index-g4t7850m.js";
+import {
+  getCompartments,
+  getLastCompartmentEndMessage,
+  getLastCompartmentEndMessageId,
+  providerResponseFailed,
+  LkgRecoveryFenceError,
+  lkgServedArrayDigest,
+  hasCleanLkgRecoveryFence,
+  dirtyLkgRecoveryRevision,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  prepareLkgCaptureFence,
+  certifyCommittedLkgCapture,
+  markLkgRecoveryDirty,
+  getOrCreateSessionMeta,
+  updateSessionMeta,
+  retryPendingSessionCleanups,
+  retryPendingRustSessionCleanupsForProject,
+  requestPendingMaterialization,
+  hasPendingMaterializationOrigin,
+  clearPendingMaterialization,
+  recordSystemPromptForRequest,
+  recordHeldHeadForRequest,
+  isHeldHeadForRequest,
+  deferDeliveredSystemRefresh,
+  retirePendingSystemPromptDelivery,
+  claimLkgRequestIdentity,
+  currentLkgRequestIdentity,
+  noteCapturedLkgRequest,
+  measuredLkgPrefix,
+  saveLkgSlotToDb,
+  clearPersistedLkgSlotStrict,
+  loadPersistedLkgSlot,
+  drainStaleLkgSlots,
+  resolveLkgModelKeys,
+  createLkgEntryProjector,
+  captureLkgSlot,
+  validateAnthropicReasoningRuns,
+  validateLkgSeam,
+  replayLkg,
+  coldStartRawServedIndex,
+  coldStartUncapturedReplay,
+  noteUncertifiedNormalLkg,
+  hasProcessLocalLkgProof,
+  lkgDirtyRevision,
+  rememberLkgDirtyRevision,
+  readPersistedLkgUntaggedInputIds,
+  persistLkgUntaggedInputIds,
+  noteLkgRecoveryPrefix,
+  readLkgRecoveryPrefix,
+  noteLkgHealthyPrefix,
+  lkgRecoveryReplayUnproven,
+  lkgRecoveryEntryUnproven,
+  lkgInputIdentity,
+  beginLkgPass,
+  visitMessageContentFields,
+  contentSnapshotValue,
+  messageContentFields,
+  signatureForFields,
+  exactReusablePrefix,
+  incrementalLkgContentDigests,
+  lkgSlotRejection,
+  captureSlot,
+  getInMemorySlot,
+  getSlot,
+  forgetInMemorySlot,
+  dropSlot,
+  noteEntry,
+  getLkgSlotHeapStats,
+  TOOL_SWEEP_SCOPED_MARKER,
+  useScopedToolSweep,
+  createPreAdoptionToolSweepResolver,
+  queueMemoryMutation,
+  getMaxMemoryMutationIdForProjects,
+  GLOBAL_USER_PROFILE_PROJECT_PATH,
+  getProjectState,
+  bumpProjectUserProfileVersion
+} from "./index-72czy45z.js";
 import {
   getLastIndexedOrdinal
-} from "./index-9gpw8hrm.js";
+} from "./index-2rs7912w.js";
 import {
-  renderUserFacingFailure,
-  userFacingFailureCode,
-  renderCapabilityRefusal,
-  capabilityRefusalCode,
-  renderDreamFailure,
-  dreamFailureCode,
-  renderEmbeddingFailure,
   SESSION_NOTE_CONDITION_ERROR,
   getNoteByIdInScope,
   getNotes,
@@ -596,19 +583,8 @@ import {
   getActivePrimers,
   createPrimer,
   updatePrimerSupport,
-  updatePrimerAnswer,
-  recordMemoryMapping,
-  recordMemoryVerifications,
-  getUnmappedMemoryIds,
-  clearMemoryVerifications,
-  getMemoryVerifications,
-  resolveGitTopLevel,
-  readGitHead,
-  readGitChangedFilesSince,
-  readGitFileChangeTimesSince,
-  verificationFileExists,
-  normalizeVerificationFiles
-} from "./index-as2amvn3.js";
+  updatePrimerAnswer
+} from "./index-2qbtqg1w.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -620,7 +596,27 @@ import {
   getCachedLocalEmbeddingPooling,
   preflightLocalEmbeddingPooling,
   getLocalEmbeddingNativeMemoryStats
-} from "./index-51rdvtkz.js";
+} from "./index-xd2p95m7.js";
+import {
+  describeShadowBackfillWriteRefusal2,
+  markProjectLoadUntrusted2,
+  drainProjectEmbeddingIdentityMaintenance2,
+  drainStaleEmbeddingIdentitiesForProject2,
+  registerProjectEmbedding2,
+  registerProjectShadowEmbedding2,
+  enqueueShadowEmbeddingItems2,
+  registerProjectInObservationMode2,
+  unregisterProjectShadowEmbedding2,
+  getProjectEmbeddingSnapshot2,
+  embedTextForProject2,
+  embedBatchForProject2,
+  embedUnembeddedMemoriesForProject2,
+  embedUnembeddedMemoriesForProjectOutcome2,
+  drainCommitBacklogForProject2,
+  embedSessionCompartmentChunks2,
+  getEmbeddingCoverageStatus2,
+  getAutoEmbeddingSessionCoverage2
+} from "./index-21fgrfrf.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -628,7 +624,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-rfxzazzy.js";
+} from "./index-ty4vhe4n.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -648,12 +644,33 @@ import {
   getMemoryById2,
   getMemoriesByIds2,
   updateMemorySeenCount2,
+  updateMemoryVerification2,
   setMemoryClassification2,
   supersededMemory2,
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
 } from "./index-jjvbk92s.js";
+import {
+  renderUserFacingFailure,
+  userFacingFailureCode,
+  renderCapabilityRefusal,
+  capabilityRefusalCode,
+  renderDreamFailure,
+  dreamFailureCode,
+  renderEmbeddingFailure,
+  recordMemoryMapping,
+  recordMemoryVerifications,
+  getUnmappedMemoryIds,
+  clearMemoryVerifications,
+  getMemoryVerifications,
+  resolveGitTopLevel,
+  readGitHead,
+  readGitChangedFilesSince,
+  readGitFileChangeTimesSince,
+  verificationFileExists,
+  normalizeVerificationFiles
+} from "./index-xnm0wq1r.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -674,23 +691,23 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-0677w9sd.js";
+} from "./index-wcwhhtdh.js";
 import {
   scheduleReconciliation,
   scheduleIncrementalIndex,
   getMessageIndexQueueHeapStats,
   clearSessionTracking
-} from "./index-04z754rd.js";
+} from "./index-dz48h1wx.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-waktfbjy.js";
+} from "./index-ae1ar4v1.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-ftr84kkv.js";
+} from "./index-ys7j6679.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -734,11 +751,13 @@ import {
   replayCavemanCompression,
   DegradedPassRefusalError,
   degradedPassError,
+  isStructuralNoiseSentinel,
+  stripStructuralNoise,
+  prepareStructuralSentinelChoices,
   renderDroppedText,
   applyFlushedStatuses,
   prewarmTagOwners,
   waitForTagOwners,
-  stripStructuralNoise,
   isLegacyForeignTextTag,
   withTransformTimingSummary,
   logTransformTiming,
@@ -753,7 +772,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-hbx7m8he.js";
+} from "./index-dfdg2cgg.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -764,14 +783,26 @@ import {
 import {
   resolvePromptContext2
 } from "./index-fmsr7v69.js";
+import {
+  renderMessageByOrdinal2,
+  renderVerboseRangeForTool2,
+  renderItemByTag2
+} from "./index-j105mf16.js";
+import {
+  readV2ArchiveOffThread2
+} from "./index-prw8apnc.js";
 import {
   renderSearchArchiveOffThread2
-} from "./index-m1x9ghk5.js";
+} from "./index-4ks89h5a.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
   isCompactionEnabled
 } from "./index-ksdyrrav.js";
+import {
+  takeCoveredInstructionRows,
+  cloneKeepingCoveredInstructionMarks
+} from "./index-z9zygwse.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -796,7 +827,7 @@ import {
 } from "./index-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./index-t5pck3ss.js";
+} from "./index-fxbk7gk3.js";
 import {
   shouldEnforcePrivateStoragePermissions,
   ensureStorageDirectorySync,
@@ -2340,7 +2371,7 @@ function recordRetrospectiveWindowProcessed(db, projectPath, windowKey) {
 }
 
 // src/features/magic-context/dreamer/task-executor.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
 
 // src/features/magic-context/mural/compress-cues.ts
@@ -8378,12 +8409,17 @@ function countCompartmentsSince(db, projectPath, since) {
   return row?.cnt ?? 0;
 }
 function countProjectSessionsSince(db, projectPath, since) {
-  const row = since === null ? db.prepare("SELECT COUNT(*) AS cnt FROM session_projects WHERE project_path = ?").get(projectPath) : db.prepare(`SELECT COUNT(*) AS cnt FROM session_projects sp
-                        LEFT JOIN schema_migrations_meta activity
-                          ON activity.key = 'retrospective_activity:' || sp.session_id
-                        LEFT JOIN message_history_index history ON history.session_id = sp.session_id
-                       WHERE sp.project_path = ?
-                         AND COALESCE(CAST(activity.value AS INTEGER), history.updated_at) > ?`).get(projectPath, since);
+  const scope = `FROM session_projects sp
+        LEFT JOIN session_meta m ON m.session_id = sp.session_id
+       WHERE sp.project_path = ? AND sp.harness = ?
+         AND COALESCE(m.is_subagent, 0) = 0`;
+  const row = since === null ? db.prepare(`SELECT COUNT(*) AS cnt ${scope}`).get(projectPath, getHarness2()) : db.prepare(`SELECT COUNT(*) AS cnt ${scope}
+                          AND COALESCE(
+                              (SELECT CAST(value AS INTEGER) FROM schema_migrations_meta
+                               WHERE key = 'retrospective_activity:' || sp.session_id),
+                              (SELECT updated_at FROM message_history_index
+                               WHERE session_id = sp.session_id AND harness = sp.harness)
+                          ) > ?`).get(projectPath, getHarness2(), since);
   return row?.cnt ?? 0;
 }
 function countMappedMemories(db, projectPath) {
@@ -8396,6 +8432,10 @@ function countMappedMemories(db, projectPath) {
                 AND v.file_path <> ''`).get(projectPath, Date.now());
   return row?.cnt ?? 0;
 }
+var CURRENT_VERIFY_SKIP_SQL = `COALESCE(CASE WHEN json_valid(m.metadata_json) THEN
+    json_extract(m.metadata_json, '$.dreamerVerifySkip.contentHash') = m.normalized_hash
+    AND json_type(m.metadata_json, '$.dreamerVerifySkip.fingerprint') = 'text'
+    ELSE 0 END, 0)`;
 function countUnverifiedMappedMemories(db, projectPath) {
   const row = db.prepare(`SELECT COUNT(DISTINCT m.id) AS cnt
                FROM memories m
@@ -8404,7 +8444,8 @@ function countUnverifiedMappedMemories(db, projectPath) {
                 AND m.status IN ('active','permanent')
                 AND (m.expires_at IS NULL OR m.expires_at > ?)
                 AND v.file_path <> ''
-                AND v.verified_at = 0`).get(projectPath, Date.now());
+                AND v.verified_at = 0
+                AND NOT (${CURRENT_VERIFY_SKIP_SQL})`).get(projectPath, Date.now());
   return row?.cnt ?? 0;
 }
 function countBroadCycleCandidates(db, projectPath, cycleStartAt) {
@@ -8413,6 +8454,7 @@ function countBroadCycleCandidates(db, projectPath, cycleStartAt) {
               WHERE m.project_path = ?
                 AND m.status IN ('active','permanent')
                 AND (m.expires_at IS NULL OR m.expires_at > ?)
+                AND NOT (${CURRENT_VERIFY_SKIP_SQL})
                 AND (
                     SELECT MAX(v.verified_at)
                       FROM memory_verifications v
@@ -8521,7 +8563,7 @@ function getDreamTaskBacklog(db, projectPath, task, options = {}) {
     case "verify-broad": {
       const total = countMappedMemories(db, projectPath);
       const cycleStartAt = getTaskScheduleState(db, projectPath, "verify-broad")?.lastBroadRunAt;
-      const pending = cycleStartAt == null ? total : countBroadCycleCandidates(db, projectPath, cycleStartAt);
+      const pending = countBroadCycleCandidates(db, projectPath, cycleStartAt ?? Number.MAX_SAFE_INTEGER);
       return { pending, total };
     }
     case "curate": {
@@ -8648,6 +8690,7 @@ function getDreamTaskBacklogs(db, projectPath, tasks = CANONICAL_DREAM_TASKS, op
   }
   const optionKey = (value) => value === undefined ? "omitted" : value === null ? "null" : `number:${value}`;
   const key = JSON.stringify([
+    getHarness2(),
     projectPath,
     tasks,
     optionKey(options.lastRunAt),
@@ -8701,7 +8744,7 @@ function evaluateTaskGate(task, ctx) {
 }
 
 // src/features/magic-context/dreamer/verify.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 
 // src/features/magic-context/dreamer/verify-diff.ts
 import { execFile as execFile3 } from "node:child_process";
@@ -8822,7 +8865,56 @@ Read only these changed line ranges if they may affect the claim.`
 }
 
 // src/features/magic-context/dreamer/verify-gate.ts
+import path5 from "node:path";
+
+// src/features/magic-context/dreamer/verify-state.ts
+import { createHash as createHash6 } from "node:crypto";
+import { readFile, realpath as realpath2 } from "node:fs/promises";
 import path4 from "node:path";
+function verificationMetadata(memory) {
+  try {
+    const parsed = JSON.parse(memory.metadataJson ?? "{}");
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed))
+      return parsed;
+  } catch {}
+  return {};
+}
+async function verificationFilesFingerprint(directory, files) {
+  const root = await resolveGitTopLevel(directory) ?? path4.resolve(directory);
+  const hash = createHash6("sha256");
+  for (const file of [...new Set(files)].sort()) {
+    const absolute = path4.resolve(root, file);
+    const withinRoot = (candidate) => {
+      const relative = path4.relative(root, candidate);
+      return relative !== ".." && !relative.startsWith(`..${path4.sep}`) && !path4.isAbsolute(relative);
+    };
+    if (!withinRoot(absolute))
+      return null;
+    hash.update(JSON.stringify(file));
+    try {
+      if (!withinRoot(await realpath2(absolute)))
+        return null;
+      hash.update(createHash6("sha256").update(await readFile(absolute)).digest("hex"));
+    } catch (error) {
+      if (error.code !== "ENOENT")
+        return null;
+      hash.update("missing");
+    }
+  }
+  return hash.digest("hex");
+}
+function recordVerificationVerdict(db, memory, verdict, at, fingerprint = null) {
+  const metadata = verificationMetadata(memory);
+  delete metadata.dreamerVerifySkip;
+  if (verdict === "skip" && fingerprint) {
+    metadata.dreamerVerifySkip = { contentHash: memory.normalizedHash, fingerprint, at };
+  }
+  metadata.dreamerVerifyVerdict = verdict;
+  metadata.dreamerVerifyAttemptedAt = at;
+  db.prepare("UPDATE memories SET metadata_json = ? WHERE id = ?").run(JSON.stringify(metadata), memory.id);
+}
+
+// src/features/magic-context/dreamer/verify-gate.ts
 function minOf(values) {
   return values.reduce((acc, v) => v < acc ? v : acc, Number.POSITIVE_INFINITY);
 }
@@ -8854,7 +8946,22 @@ async function partitionVerifyScope(args) {
   const runStartedAt = args.now ?? Date.now();
   const active = getMemoriesByProject2(args.db, args.projectIdentity);
   const verById = getMemoryVerifications(args.db, active.map((m) => m.id));
-  const candidates = active.filter((m) => (verById.get(m.id)?.files.length ?? 0) > 0);
+  const candidates = [];
+  const unchangedSkippedIds = [];
+  const changedSkippedIds = new Set;
+  for (const memory of active) {
+    const files = verById.get(memory.id)?.files ?? [];
+    if (!files.length)
+      continue;
+    const skip = verificationMetadata(memory).dreamerVerifySkip;
+    if (skip && skip.contentHash === memory.normalizedHash && typeof skip.fingerprint === "string" && skip.fingerprint === await verificationFilesFingerprint(args.projectDirectory, files)) {
+      unchangedSkippedIds.push(memory.id);
+    } else {
+      candidates.push(memory);
+      if (skip)
+        changedSkippedIds.add(memory.id);
+    }
+  }
   const toPrompt = (m) => {
     const verifiedAt = verById.get(m.id)?.verifiedAt ?? 0;
     let verifiedCommit = null;
@@ -8881,7 +8988,7 @@ async function partitionVerifyScope(args) {
       leaseKey: args.leaseKey,
       runStartedAt
     });
-    const broadCandidates = candidates.filter((m) => (verById.get(m.id)?.verifiedAt ?? 0) < broadCycleStartAt).sort((a, b) => {
+    const broadCandidates = candidates.filter((m) => changedSkippedIds.has(m.id) || (verById.get(m.id)?.verifiedAt ?? 0) < broadCycleStartAt).sort((a, b) => {
       const verifiedAtA = verById.get(a.id)?.verifiedAt ?? 0;
       const verifiedAtB = verById.get(b.id)?.verifiedAt ?? 0;
       return verifiedAtA - verifiedAtB || a.id - b.id;
@@ -8892,7 +8999,10 @@ async function partitionVerifyScope(args) {
       mode: "broad",
       inScope: broadCandidates.map(toPrompt),
       inScopeIds: broadCandidates.map((m) => m.id),
-      skippedIds: candidates.filter((m) => !broadIds.has(m.id)).map((m) => m.id),
+      skippedIds: [
+        ...unchangedSkippedIds,
+        ...candidates.filter((m) => !broadIds.has(m.id)).map((m) => m.id)
+      ],
       broadCycleStartAt,
       reason: `broad cycle (${broadCandidates.length} remain; started ${broadCycleStartAt})`
     };
@@ -8903,7 +9013,7 @@ async function partitionVerifyScope(args) {
       mode: "incremental",
       inScope: [],
       inScopeIds: [],
-      skippedIds: [],
+      skippedIds: unchangedSkippedIds,
       reason: "no file-mapped memories in scope"
     };
   }
@@ -8912,11 +9022,11 @@ async function partitionVerifyScope(args) {
     mode,
     inScope: candidates.map(toPrompt),
     inScopeIds: candidates.map((m) => m.id),
-    skippedIds: [],
+    skippedIds: unchangedSkippedIds,
     reason
   });
   const resolvedGitRoot = await resolveGitTopLevel(args.projectDirectory);
-  const gitRoot = resolvedGitRoot ?? path4.resolve(args.projectDirectory);
+  const gitRoot = resolvedGitRoot ?? path5.resolve(args.projectDirectory);
   const verifiedTimes = candidates.map((m) => verById.get(m.id)?.verifiedAt ?? 0).filter((t) => t > 0);
   const sinceMs = verifiedTimes.length > 0 ? minOf(verifiedTimes) : runStartedAt;
   const changeTimes = await readGitFileChangeTimesSince(args.projectDirectory, sinceMs, resolvedGitRoot ?? undefined);
@@ -8926,11 +9036,11 @@ async function partitionVerifyScope(args) {
   const head = await readGitHead(args.projectDirectory);
   const uncommitted = head ? await readGitChangedFilesSince(args.projectDirectory, head, resolvedGitRoot ?? undefined) ?? new Set : new Set;
   const inScope = [];
-  const skippedIds = [];
+  const skippedIds = [...unchangedSkippedIds];
   for (const m of candidates) {
     const v = verById.get(m.id);
     const verifiedAt = v?.verifiedAt ?? 0;
-    if (verifiedAt === 0) {
+    if (verifiedAt === 0 || changedSkippedIds.has(m.id)) {
       inScope.push(toPrompt(m));
       continue;
     }
@@ -9300,6 +9410,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
   let budgetFinalized = false;
   let failedCompletion;
   let headAtPrompt = null;
+  const skipSnapshots = new Map;
   const onBudgetUpdate = (state) => {
     budgetFinalized ||= state.finalizeFired;
     args.onBudgetUpdate?.({
@@ -9316,6 +9427,11 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     });
   };
   try {
+    if (!args.moduleRoute) {
+      for (const memory of batch) {
+        skipSnapshots.set(memory.id, await raceWithSignal(verificationFilesFingerprint(args.sessionDirectory, memory.mappedFiles), batchSignal));
+      }
+    }
     headAtPrompt = await raceWithSignal(readGitHead(args.sessionDirectory), batchSignal);
     const evidence = !args.forceBroad && batch.every((m) => m.verifiedAt) ? await raceWithSignal(buildVerifyDiffEvidence(args.sessionDirectory, batch), batchSignal) : null;
     const prompt = buildVerifyPrompt(args.projectIdentity, await raceWithSignal(seedVerifyCandidates(batch, args.sessionDirectory), batchSignal), evidence);
@@ -9357,7 +9473,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         tokens: run.completion.usage
       });
       reportUsage(run.completion.messages ?? [], run.childSessionId, run.completion.usage.input + (run.completion.usage.cacheRead ?? 0) + (run.completion.usage.cacheWrite ?? 0));
-      return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized);
+      return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized, skipSnapshots);
     }
     const client = args.client;
     if (!client)
@@ -9417,7 +9533,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     promptSettled = true;
     recordInvocation4(args, startedAt, { status: "completed", messages: run.output });
     reportUsage(run.output, agentSessionId);
-    return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized);
+    return await applyParsedVerifyManifest(args, batch, run.validated, evidence?.head ?? headAtPrompt, budgetFinalized, skipSnapshots);
   } catch (error) {
     const desc = describeError(error);
     const providerFailure = error instanceof DreamerProviderOutputFailureError ? error : undefined;
@@ -9437,7 +9553,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     if (interrupted) {
       const text = verifyAssistantText(messages) ?? failedCompletion?.text ?? "";
       const recovered = parsePartialVerifyManifest(text, new Set(batch.map((m) => m.id)));
-      const counts = await applyParsedVerifyManifest(args, batch, recovered, headAtPrompt, true);
+      const counts = await applyParsedVerifyManifest(args, batch, recovered, headAtPrompt, true, skipSnapshots);
       return {
         ...counts,
         timedOut: !(error instanceof DreamTokenBudgetExceeded),
@@ -9469,7 +9585,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
     signal.removeEventListener("abort", abort);
   }
 }
-async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budgetFinalized = false) {
+async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budgetFinalized = false, skipSnapshots) {
   const batchIds = new Set(batch.map((m) => m.id));
   const batchById = new Map(batch.map((memory) => [memory.id, memory]));
   const valid = {
@@ -9548,6 +9664,15 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
     }
     writes.push({ kind: "archive", id: a.id, reason: a.reason });
   }
+  if (!args.moduleRoute) {
+    for (const entry of valid.skipped) {
+      const original = batchById.get(entry.id);
+      if (!original)
+        continue;
+      const fingerprint = skipSnapshots ? skipSnapshots.get(entry.id) ?? null : await verificationFilesFingerprint(args.sessionDirectory, original.mappedFiles);
+      writes.push({ kind: "skip", id: entry.id, fingerprint });
+    }
+  }
   let verified = 0;
   let updated = 0;
   let archived = 0;
@@ -9577,7 +9702,7 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
           name: "memory.set_verification",
           arguments: {
             memory_project: args.projectIdentity,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash6("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash7("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -9609,9 +9734,17 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
         continue;
       if (w.kind === "verify") {
         recordMemoryVerifications(args.db, w.id, w.files, now);
-        if (verifiedHead)
-          recordVerifiedCommit(args.db, memory, now, verifiedHead);
+        updateMemoryVerification2(args.db, w.id, "verified");
+        recordVerificationVerdict(args.db, memory, "verified", now);
+        const verifiedMemory = getMemoryById2(args.db, w.id);
+        if (verifiedHead && verifiedMemory)
+          recordVerifiedCommit(args.db, verifiedMemory, now, verifiedHead);
         verified += 1;
+      } else if (w.kind === "skip") {
+        if (memory.content !== batchById.get(w.id)?.content)
+          continue;
+        updateMemoryVerification2(args.db, w.id, "unverified");
+        recordVerificationVerdict(args.db, memory, "skip", now, w.fingerprint);
       } else if (w.kind === "update") {
         const duplicate = getMemoryByHash2(args.db, memory.projectPath, memory.category, w.hash);
         if (duplicate && duplicate.id !== memory.id) {
@@ -9620,6 +9753,8 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
           continue;
         }
         rewriteMemoryContent(args.db, memory, w.content, w.hash);
+        updateMemoryVerification2(args.db, w.id, "unverified");
+        recordVerificationVerdict(args.db, memory, "update", now);
         queueMemoryMutation(args.db, {
           projectPath: args.projectIdentity,
           mutationType: "update",
@@ -9630,6 +9765,8 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
         updated += 1;
       } else {
         archiveMemory2(args.db, w.id, w.reason);
+        updateMemoryVerification2(args.db, w.id, "stale");
+        recordVerificationVerdict(args.db, memory, "archive", now);
         queueMemoryMutation(args.db, {
           projectPath: args.projectIdentity,
           mutationType: "archive",
@@ -10423,7 +10560,7 @@ function parseFrictionGateVerdict(verdict) {
 }
 function computeRetrospectiveWindowKey(flagged) {
   const anchors = flagged.map((message) => `${message.sessionId}:${message.ts}`).sort().join("|");
-  return createHash7("sha256").update(anchors).digest("hex").slice(0, 32);
+  return createHash8("sha256").update(anchors).digest("hex").slice(0, 32);
 }
 function renderFrictionWindow(messages, flaggedOrdinals, radius = 2) {
   const flagged = new Set(flaggedOrdinals);
@@ -12021,7 +12158,7 @@ function createDreamTimerModuleClient(moduleClient) {
 import { readFileSync as readFileSync4, statSync as statSync3 } from "node:fs";
 
 // src/plugin/embedding-bootstrap-helpers.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
@@ -12069,7 +12206,7 @@ var EMBEDDING_WARNING_TERMS = [
 ];
 var loggedFailureSignatures = new Map;
 function sha256Prefix(value, length = 16) {
-  return createHash8("sha256").update(value).digest("hex").slice(0, length);
+  return createHash9("sha256").update(value).digest("hex").slice(0, length);
 }
 function warningLooksEmbeddingRelated(message) {
   const lower = message.toLowerCase();
@@ -12433,13 +12570,19 @@ function modelMatchedPersistedUsage(db, sessionID, modelKey) {
   return;
 }
 function modelMatchedProvenContextLimit(db, sessionID, modelKey) {
-  const persisted = modelMatchedPersistedUsage(db, sessionID, modelKey);
-  return isSaneLimit(persisted?.observedSafeInputTokens) ? persisted.observedSafeInputTokens : undefined;
+  if (!db || !sessionID || !modelKey)
+    return;
+  try {
+    const provenLimit = resolveOpenCodeProvenInputFloor(db, sessionID, modelKey);
+    return isSaneLimit(provenLimit) ? provenLimit : undefined;
+  } catch {
+    return;
+  }
 }
-function applySessionProvenFloor(geometry, persisted, ctx) {
-  const provenLimit = isSaneLimit(persisted?.observedSafeInputTokens) ? persisted.observedSafeInputTokens : undefined;
+function applySessionProvenFloor(geometry, provenLimit, ctx) {
   const result = applyProvenInputFloor(geometry, provenLimit);
   if (result.refused && ctx?.db && ctx.sessionID) {
+    const persisted = loadPersistedUsage(ctx.db, ctx.sessionID);
     const impossiblePressure = persisted?.usage.inputTokens ? persisted.usage.inputTokens > result.refused.absoluteWall : false;
     updateSessionMeta(ctx.db, ctx.sessionID, {
       observedSafeInputTokens: 0,
@@ -12473,7 +12616,7 @@ function resolveContextWindowGeometry(providerID, modelID, ctx) {
   });
   if (!geometry || detected !== undefined)
     return geometry;
-  return applySessionProvenFloor(geometry, modelMatchedPersistedUsage(ctx?.db, ctx?.sessionID, modelKey), ctx);
+  return applySessionProvenFloor(geometry, modelMatchedProvenContextLimit(ctx?.db, ctx?.sessionID, modelKey), ctx);
 }
 function resolveContextLimit(providerID, modelID, ctx) {
   const modelKey = resolveModelKey(providerID, modelID);
@@ -12991,6 +13134,78 @@ function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry, gen
   return { carry, metrics: metricsFromCarry(view) };
 }
 
+// src/features/magic-context/work-metrics-carry-storage.ts
+var STATE_KEY = "magicContextWorkMetrics";
+var storedCarry = object({
+  version: literal(1),
+  source: string(),
+  newWorkSum: number(),
+  lastTimeCreated: number(),
+  lastId: string(),
+  perAgent: array(tuple([
+    string(),
+    object({
+      prevPrompt: number(),
+      phaseId: number(),
+      phasePeak: number(),
+      phaseHasQualifying: boolean(),
+      closedPhaseSum: number(),
+      lastOutput: number(),
+      seen: boolean()
+    })
+  ]))
+});
+function readState2(db, sessionId) {
+  const row = db.prepare("SELECT deferred_execute_state, new_work_tokens, total_input_tokens FROM session_meta WHERE session_id = ?").get(sessionId);
+  let root = {};
+  try {
+    const value = JSON.parse(row?.deferred_execute_state ?? "null");
+    if (value !== null && typeof value === "object" && !Array.isArray(value))
+      root = value;
+  } catch {}
+  return { root, newWorkTokens: row?.new_work_tokens, totalInputTokens: row?.total_input_tokens };
+}
+function matchesStoredState(state, source, carry, metrics) {
+  const parsed = storedCarry.safeParse(state.root[STATE_KEY]);
+  if (!parsed.success)
+    return false;
+  const previous = parsed.data;
+  if (previous.source !== source || previous.newWorkSum !== carry.newWorkSum || previous.lastTimeCreated !== carry.lastTimeCreated || previous.lastId !== carry.lastId || previous.perAgent.length !== carry.perAgent.size || state.newWorkTokens !== metrics.newWorkTokens || state.totalInputTokens !== metrics.totalInputTokens)
+    return false;
+  return previous.perAgent.every(([key, agent]) => {
+    const current = carry.perAgent.get(key);
+    return current !== undefined && agent.prevPrompt === current.prevPrompt && agent.phaseId === current.phaseId && agent.phasePeak === current.phasePeak && agent.phaseHasQualifying === current.phaseHasQualifying && agent.closedPhaseSum === current.closedPhaseSum && agent.lastOutput === current.lastOutput && agent.seen === current.seen;
+  });
+}
+function readSessionWorkMetricsCarry(db, sessionId, source) {
+  const parsed = storedCarry.safeParse(readState2(db, sessionId).root[STATE_KEY]);
+  if (!parsed.success || parsed.data.source !== source)
+    return;
+  return {
+    perAgent: new Map(parsed.data.perAgent),
+    newWorkSum: parsed.data.newWorkSum,
+    lastTimeCreated: parsed.data.lastTimeCreated,
+    lastId: parsed.data.lastId
+  };
+}
+function setSessionWorkMetricsCarry(db, sessionId, source, carry, metrics) {
+  const normalized = {
+    newWorkTokens: Math.max(0, Math.floor(metrics.newWorkTokens)),
+    totalInputTokens: Math.max(0, Math.floor(metrics.totalInputTokens))
+  };
+  if (matchesStoredState(readState2(db, sessionId), source, carry, normalized))
+    return;
+  db.transaction(() => {
+    const state = readState2(db, sessionId);
+    if (matchesStoredState(state, source, carry, normalized))
+      return;
+    ensureSessionMetaRow(db, sessionId);
+    const { root } = state;
+    root[STATE_KEY] = { ...carry, version: 1, source, perAgent: [...carry.perAgent] };
+    db.prepare("UPDATE session_meta SET deferred_execute_state = ?, new_work_tokens = ?, total_input_tokens = ? WHERE session_id = ?").run(JSON.stringify(root), normalized.newWorkTokens, normalized.totalInputTokens, sessionId);
+  }).immediate();
+}
+
 // src/hooks/magic-context/format-embed-failure.ts
 function formatEmbedFailureSummary(embedded, remaining, failure, style = "markdown") {
   const historyBlocks = `history block${embedded === 1 ? "" : "s"}`;
@@ -15261,7 +15476,6 @@ function pluginPackageVersion(moduleUrl = import.meta.url) {
 }
 
 // src/plugin/rpc-handlers.ts
-var workMetricsCarryBySession = new Map;
 async function executeRustRecompRpc(moduleClient, sessionId, projectRoot) {
   if (!moduleClient)
     return { ok: false, error: "Rust module client is unavailable" };
@@ -15301,12 +15515,11 @@ function resolveSidebarWorkMetrics(db, sessionId, persistedNewWork, persistedTot
     return { newWorkTokens: persistedNewWork, totalInputTokens: persistedTotalInput };
   }
   try {
-    const carryKey = `${generation}:${sessionId}`;
-    const carry = workMetricsCarryBySession.get(carryKey) ?? emptyWorkMetricsCarry();
+    const source = `${generation}:${resolveOpenCodeDbPath(generation).path}`;
+    const carry = readSessionWorkMetricsCarry(db, sessionId, source) ?? 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);
+      setSessionWorkMetricsCarry(db, sessionId, source, nextCarry, metrics);
     } catch {}
     return metrics;
   } catch {
@@ -16153,7 +16366,7 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-pqybnx09.js"));
+    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-htj16n4x.js"));
     const { resolveHistorianModel } = await importPluginModule(() => import("./model-resolution-280gmqvd.js"));
     const { userObservationCollectionEnabled, userObservationsRequested } = await importPluginModule(() => import("./task-config-t6bpyka7.js"));
     const DEFAULT_HISTORIAN_TIMEOUT_MS = 10 * 60 * 1000;
@@ -16186,7 +16399,7 @@ function registerRpcHandlers(rpcServer, args) {
       return { ok: false, error: "no session" };
     const readDirectory = args.readSessionDirectory;
     if (readDirectory) {
-      const { handoffHistoryWork } = await import("./history-owner-36wp3mkb.js");
+      const { handoffHistoryWork } = await import("./history-owner-0z620wgz.js");
       const handed = await handoffHistoryWork({
         storageDir: args.storageDir ?? getMagicContextStorageDir(),
         directory,
@@ -16205,8 +16418,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-0y983w7h.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-vz86nt79.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-wk509qkp.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-14p3yje4.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -16264,7 +16477,7 @@ function registerRpcHandlers(rpcServer, args) {
   rpcServer.handle("wrapup", async (params) => {
     const readDirectory = args.readSessionDirectory;
     if (readDirectory && params.sessionId) {
-      const { handoffHistoryWork } = await import("./history-owner-36wp3mkb.js");
+      const { handoffHistoryWork } = await import("./history-owner-0z620wgz.js");
       const sessionId = String(params.sessionId);
       const handed = await handoffHistoryWork({
         storageDir: args.storageDir ?? getMagicContextStorageDir(),
@@ -16290,7 +16503,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-ys2nrkkb.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-xg9avt2p.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -17261,6 +17474,44 @@ function createPassOutcome() {
   };
 }
 
+// src/hooks/magic-context/release-recovery-prefix.ts
+function groups(messages) {
+  const result = new Map;
+  for (const message of messages) {
+    if (!message.info.id)
+      continue;
+    const group = result.get(message.info.id) ?? [];
+    group.push(message);
+    result.set(message.info.id, group);
+  }
+  return result;
+}
+function visibleGroup(group) {
+  return JSON.stringify(group.map((message) => ({
+    role: message.info.role,
+    parts: message.parts.filter((part) => !isStructuralNoiseSentinel(part) && !(isRecord(part) && (part.type === "step-start" || part.type === "step-finish" || part.type === "meta"))).map(providerVisiblePart)
+  })));
+}
+function snapshotRecoveryMessages(messages) {
+  return new Map([...groups(messages)].map(([id, group]) => [id, visibleGroup(group)]));
+}
+function releaseRecoveryPrefix(args) {
+  const frozen = groups(args.frozen);
+  const rendered = groups(args.after);
+  const emitted = new Set;
+  return args.after.flatMap((message) => {
+    const id = message.info.id;
+    if (!id)
+      return [message];
+    if (emitted.has(id))
+      return [];
+    emitted.add(id);
+    const group = rendered.get(id) ?? [message];
+    const previous = frozen.get(id);
+    return previous && args.before.get(id) === visibleGroup(group) ? previous : group;
+  });
+}
+
 // src/hooks/magic-context/render-options.ts
 function createM0RenderOptions(controls, contextUsage, modelKey, resolvedContextLimit, projectPath) {
   return {
@@ -17292,7 +17543,7 @@ function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, execu
 }
 
 // src/hooks/magic-context/rust-mode-transform.ts
-import { createHash as createHash12, randomUUID as randomUUID6 } from "node:crypto";
+import { createHash as createHash13, randomUUID as randomUUID6 } from "node:crypto";
 
 // src/features/magic-context/memory/single-store-embedding-drain.ts
 function isWatermarkRow(row) {
@@ -17356,7 +17607,7 @@ function advanceEmbeddedWatermark(db, projectPath, upTo) {
 }
 
 // src/features/magic-context/mural/source-revision.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 var statements = new WeakMap;
 function muralSourceRevision(db, projectPath) {
   let statement = statements.get(db);
@@ -17373,7 +17624,7 @@ function muralSourceRevision(db, projectPath) {
     statements.set(db, statement);
   }
   const row = statement.get(projectPath, Date.now());
-  return createHash9("sha256").update(row.revision).digest("hex");
+  return createHash10("sha256").update(row.revision).digest("hex");
 }
 
 // src/features/magic-context/install-instance-id.ts
@@ -19834,7 +20085,7 @@ function noteExternalLkgReplay(participant, sessionId, inputMessages, servedMess
 }
 
 // src/hooks/magic-context/rust-served-raw.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 class RustServedRawConflict extends EmergencyFailClosedError {
   reason;
   messageIds;
@@ -19848,7 +20099,7 @@ class RustServedRawConflict extends EmergencyFailClosedError {
 }
 function partDigest(part) {
   const serialized = JSON.stringify(part);
-  return createHash11("sha256").update(stableStringify(serialized === undefined ? undefined : JSON.parse(serialized))).digest("hex");
+  return createHash12("sha256").update(stableStringify(serialized === undefined ? undefined : JSON.parse(serialized))).digest("hex");
 }
 function records(doc) {
   if (doc.rustServedRaw === undefined)
@@ -20082,6 +20333,32 @@ class StorageBusyRefusalError extends Error {
 }
 
 // src/hooks/magic-context/transform-context-state.ts
+var usageRefusals = new WeakMap;
+function recordUsageRefusal(db, sessionId, refusedAt = Date.now()) {
+  let sessions = usageRefusals.get(db);
+  if (!sessions) {
+    sessions = new Map;
+    usageRefusals.set(db, sessions);
+  }
+  if (!sessions.has(sessionId))
+    sessions.set(sessionId, refusedAt);
+}
+function shouldResetRefusedUsage(db, sessionId, meta, liveReading) {
+  const refusals = usageRefusals.get(db);
+  const refusedAt = refusals?.get(sessionId);
+  if (refusedAt === undefined)
+    return false;
+  const readingAt = liveReading?.hasUsageTokens ? liveReading.updatedAt : meta.lastResponseTime;
+  if (readingAt > refusedAt) {
+    refusals?.delete(sessionId);
+    return false;
+  }
+  const now = Date.now();
+  const foldedAt = meta.cachedM0MaterializedAt ?? 0;
+  if (foldedAt > refusedAt && foldedAt <= now)
+    return true;
+  return !!db.prepare("SELECT 1 FROM compartments WHERE session_id = ? AND harness = ? AND created_at > ? AND created_at <= ? LIMIT 1").get(sessionId, getHarness2(), refusedAt, now);
+}
 function loadPersistedUsageWatermark(db, sessionId) {
   const result = db.prepare("SELECT last_response_time FROM session_meta WHERE session_id = ?").get(sessionId);
   if (result === null || typeof result !== "object")
@@ -20521,10 +20798,10 @@ function messageCacheSignature(message) {
   const parts = Array.isArray(message.parts) ? message.parts : [];
   const serializedParts = JSON.stringify(parts) ?? "null";
   const serializedMessage = JSON.stringify(message) ?? "null";
-  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash12("sha256").update(serializedMessage).digest("hex")}`;
+  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash13("sha256").update(serializedMessage).digest("hex")}`;
 }
 function advanceWireFingerprint(previous, encoded) {
-  return createHash12("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
+  return createHash13("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
 }
 function buildWireFingerprint(encoded) {
   let fingerprint = "rust-wire-v1";
@@ -22316,7 +22593,7 @@ function createRustModeTransform(deps, options) {
         const id = messageIdOf(message) ?? `index:${todoStart + offset}`;
         const parts = message.parts?.filter((part) => isRecord3(part) && part.type === "tool" && part.tool === "todowrite");
         if (parts?.length) {
-          todoCalls.set(id, createHash12("sha256").update(JSON.stringify(parts)).digest("hex"));
+          todoCalls.set(id, createHash13("sha256").update(JSON.stringify(parts)).digest("hex"));
         } else {
           todoCalls.delete(id);
         }
@@ -23930,7 +24207,7 @@ async function runCompartmentPhaseImpl(args) {
         awaitedCompartmentRun = true;
         compartmentInProgress = false;
       } else {
-        sessionLog2(args.sessionId, "transform: proceeding after 95% timeout — historian still running in background");
+        sessionLog2(args.sessionId, "transform: historian join timed out — reclaim and final fit checks continue; historian keeps running in the background");
       }
     }
   }
@@ -24183,6 +24460,7 @@ function createTransform(deps) {
         return;
       throw degradedPassError(site, error);
     };
+    const structuralSentinelUpgradeFailed = deps.storeGeneration === "v1" && !deps.compactionOff && deps.transformMode !== "rust" && prepareStructuralSentinelChoices({ db, sessionId, messages }).structuralSentinelUpgrade === undefined;
     if (deps.storeGeneration !== undefined) {
       try {
         if (rustModeTransform && readCoordinateGeneration(db, sessionId) !== deps.storeGeneration) {
@@ -24404,10 +24682,13 @@ function createTransform(deps) {
     loadedSessions.add(sessionId);
     const earlyStateSnapshot = loadTransformPassStateSnapshot(db, sessionId);
     const historianFailureState = earlyStateSnapshot.historianFailure;
-    if (isFirstTransformPassForSession && sessionMeta) {
+    const liveUsageBeforeReset = deps.contextUsageMap.get(sessionId);
+    const usageResetAfterRefusal = shouldResetRefusedUsage(db, sessionId, sessionMeta, liveUsageBeforeReset);
+    if ((isFirstTransformPassForSession || usageResetAfterRefusal) && sessionMeta) {
       const persistedPct = sessionMeta.lastContextPercentage ?? 0;
-      if (persistedPct > 0) {
-        sessionLog2(sessionId, `transform: first pass reset — percentage=${persistedPct.toFixed(1)}% — clearing stale usage state`);
+      if (persistedPct > 0 || usageResetAfterRefusal && (sessionMeta.lastInputTokens > 0 || deps.contextUsageMap.has(sessionId))) {
+        const resetPct = persistedPct || liveUsageBeforeReset?.usage.percentage || 0;
+        sessionLog2(sessionId, `transform: ${isFirstTransformPassForSession ? "first pass" : "refused turn recovery"} reset — percentage=${resetPct.toFixed(1)}% — clearing stale usage state`);
         updateSessionMeta(db, sessionId, {
           lastContextPercentage: 0,
           lastInputTokens: 0
@@ -24816,10 +25097,15 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     let taggingSucceeded = false;
     let recoveryBatch = null;
     let recoveryNormalized = false;
+    let recoveryReleased = false;
     const untaggedReplayTailServed = !!recovery.prefix || untaggedReplayIds.size > 0 && messages.some((message) => untaggedReplayIds.has(message.info.id ?? ""));
+    const releaseRecoveryReplay = untaggedReplayTailServed ? () => {
+      recoveryReleased = true;
+    } : undefined;
     const normalizeRecoveryTail = untaggedReplayTailServed ? () => {
       if (recoveryNormalized)
         return;
+      recoveryReleased = true;
       const tail = messages.filter((message) => untaggedReplayIds.has(message.info.id ?? ""));
       const tagged = tagMessages(sessionId, tail, deps.tagger, db, {
         skipPrefixInjection: !ctxReduceCallable,
@@ -24895,6 +25181,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const targetTagNumbers = [...targets.keys()];
     const targetsSliceTags = compactionOff ? [] : getDroppedTagsByNumbers2(db, sessionId, targetTagNumbers);
     logTransformTiming(sessionId, "getDroppedTagsByNumbers", t1b, `targets=${targetTagNumbers.length} fetched=${targetsSliceTags.length}`);
+    const recoveryBeforePostprocess = recovery.prefix ? snapshotRecoveryMessages(messages) : undefined;
     let didMutateFromFlushedStatuses = false;
     if (taggingSucceeded) {
       try {
@@ -25039,7 +25326,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     let contextUsageFromEstimate = hostOverWindow;
     if (contextUsage.inputTokens <= 0 && protectionCacheBustingPass) {
       const overflowRecoveryPass = usagePercentageSynthetic || emergencyRecoveryArmed;
-      const savedProviderReading = overflowRecoveryPass ? null : savedProviderReadingForPass({
+      const savedProviderReading = overflowRecoveryPass || usageResetAfterRefusal ? null : savedProviderReadingForPass({
         persisted: persistedUsageBeforeResets,
         currentModelKey: currentModelKeyForBoundary ?? (hardModelKey || undefined),
         contextLimit: resolvedContextLimit,
@@ -25106,7 +25393,10 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const tPostProcess = performance.now();
     dropProjectionEmergency = contextUsage.percentage >= 95;
     const postTransformResult = await runPostTransformPhase2({
+      opencode1: deps.storeGeneration === "v1",
       opencode2: deps.storeGeneration === "v2",
+      structuralSentinelUpgradeFailed,
+      releaseRecoveryPrefix: releaseRecoveryReplay,
       normalizeRecoveryTail,
       compactionMarkerStrategy: deps.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy2,
       sessionId,
@@ -25201,7 +25491,17 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       }
     });
     compactionModeTransitionPending.delete(sessionId);
-    if (recovery.prefix && !recoveryNormalized) {
+    if (recovery.prefix && recoveryReleased && !recoveryNormalized) {
+      if (!recoveryBeforePostprocess)
+        throw new Error("Cannot release recovery without its pre-edit snapshot");
+      const released = releaseRecoveryPrefix({
+        frozen: JSON.parse(recovery.prefix.json),
+        before: recoveryBeforePostprocess,
+        after: messages
+      });
+      messages.splice(0, messages.length, ...released);
+    }
+    if (recovery.prefix && !recoveryReleased) {
       const renderedById = new Map;
       for (const message of messages) {
         if (!message.info.id)
@@ -25213,11 +25513,12 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       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);
+    const recoveryReleaseReason = recovery.rebuildReason ?? (recoveryNormalized ? "recovery_tail_normalized" : recoveryReleased ? "recovery_prefix_released" : undefined);
     if (recoveryReleaseReason)
       postTransformResult.bustedThisPass = true;
     passOutcome.markFinalized();
     const finalWireTail = describeFinalWireTail(messages);
+    const logIncompleteFinalWire = createFinalWireIncompleteLogger(sessionId);
     const signedFitPreviouslyRefused = !compactionOff && activeThinkingPrefixHold && getMergedReasoningStrippedIds(db, sessionId).has(SIGNED_FIT_REFUSED_MARKER);
     let finalWireEstimate;
     if (postTransformResult.bustedThisPass) {
@@ -25247,6 +25548,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         systemPromptHash: sessionMeta.systemPromptHash
       }, boundaryContextLimit) : undefined);
       if (finalWireEstimate) {
+        logIncompleteFinalWire(finalWireEstimate, messages);
         sessionLog2(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) {
@@ -25346,6 +25648,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         }
         try {
           await host.hostRefuse(deps.client, sessionId);
+          recordUsageRefusal(db, sessionId);
         } catch (error) {
           sessionLog2(sessionId, "transform: emergency fail-closed abort failed; refusing to return a sendable prompt:", getErrorMessage(error));
           throw new EmergencyFailClosedError("Emergency recovery abort failed", {
@@ -25385,6 +25688,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         }
       }
     }
+    logIncompleteFinalWire(finalWireEstimate, messages);
     if (!finalWireEstimate) {
       sessionLog2(sessionId, `transform: final-wire telemetry estimate=unavailable trusted=false conversation=unknown tools=unknown system=unknown toolDefinitions=unknown tail=${finalWireTail}`);
     }
@@ -25592,7 +25896,16 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       });
     deps.onPassPermission?.(sessionId, postTransformResult.prefixMutationPermitted);
   };
-  const timedTransform = (input, output) => withTransformTimingSummary(() => transform(input, output));
+  const timedTransform = (input, output) => withTransformTimingSummary(async () => {
+    const sessionId = findSessionId(output.messages);
+    try {
+      await transform(input, output);
+    } catch (error) {
+      if (sessionId && !deps.compactionOff && error instanceof EmergencyFailClosedError)
+        recordUsageRefusal(deps.db, sessionId);
+      throw error;
+    }
+  });
   return Object.assign(timedTransform, {
     clearSessionLogState,
     invalidateRustWireState(sessionId) {
@@ -25815,12 +26128,12 @@ function systemPromptDates(prompt, sticky) {
 }
 
 // src/hooks/magic-context/system-prompt-diagnostics.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 function snapshotSystemPrompt(system, preset) {
   return { elements: system.map((element) => Buffer.from(element)), preset };
 }
 function describeSystemPromptChange(previous, current) {
-  const metadata = (element) => element === undefined ? "absent" : `bytes=${element.length},md5=${createHash13("md5").update(element).digest("hex")}`;
+  const metadata = (element) => element === undefined ? "absent" : `bytes=${element.length},md5=${createHash14("md5").update(element).digest("hex")}`;
   const elements = [];
   for (let index = 0;index < Math.max(previous?.elements.length ?? 0, current.elements.length); index++) {
     const before = previous?.elements[index];
@@ -26844,236 +27157,6 @@ function resolveCtxExpandMode(args, domain) {
   return { kind: "error", message: rangeError(domain) };
 }
 
-// src/tools/ctx-expand/render.ts
-import { createHash as createHash14 } from "node:crypto";
-function isRecord4(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function roleLabel(role) {
-  if (role === "assistant")
-    return "A (assistant)";
-  if (role === "user")
-    return "U (user)";
-  return role;
-}
-function verboseRoleLabel(msg) {
-  if (msg.role === "user" && msg.parts.length > 0 && msg.parts.every((part) => {
-    if (!isRecord4(part))
-      return false;
-    if (part.type === "tool_result")
-      return true;
-    return part.type === "tool" && asToolPart(part)?.output != null;
-  }))
-    return "tool results";
-  return roleLabel(msg.role);
-}
-function truncate2(value, max) {
-  const t = value.trim();
-  return t.length <= max ? t : `${t.slice(0, max)}…`;
-}
-function keyArg(input) {
-  if (!input)
-    return "";
-  for (const k of ["filePath", "path", "pattern", "query", "symbol", "module", "action"]) {
-    const v = input[k];
-    if (typeof v === "string" && v.length > 0)
-      return truncate2(v, 60);
-  }
-  if (typeof input.description === "string")
-    return truncate2(input.description, 60);
-  return "";
-}
-function asToolPart(part) {
-  const type = typeof part.type === "string" ? part.type : "";
-  if (type === "tool") {
-    const state = isRecord4(part.state) ? part.state : null;
-    const output = state && typeof state.output === "string" ? state.output : state && state.output != null ? JSON.stringify(state.output) : null;
-    const metadata = state && isRecord4(state.metadata) ? state.metadata : null;
-    const title = state && typeof state.title === "string" && state.title || metadata && typeof metadata.title === "string" && metadata.title || null;
-    return {
-      name: typeof part.tool === "string" ? part.tool : "tool",
-      callId: typeof part.callID === "string" ? part.callID : "",
-      title,
-      input: state && isRecord4(state.input) ? state.input : null,
-      output
-    };
-  }
-  if (type === "tool_use") {
-    return {
-      name: typeof part.name === "string" ? part.name : "tool",
-      callId: typeof part.id === "string" ? part.id : "",
-      title: null,
-      input: isRecord4(part.input) ? part.input : null,
-      output: null
-    };
-  }
-  if (type === "tool_result") {
-    const content = part.content;
-    const output = typeof content === "string" ? content : content != null ? JSON.stringify(content) : null;
-    return {
-      name: "tool_result",
-      callId: typeof part.tool_use_id === "string" ? part.tool_use_id : "",
-      title: null,
-      input: null,
-      output
-    };
-  }
-  return null;
-}
-function textOf(part) {
-  if (part.type === "text" && typeof part.text === "string")
-    return part.text;
-  return null;
-}
-function reasoningOf(part) {
-  if ((part.type === "reasoning" || part.type === "thinking") && typeof part.text === "string") {
-    return part.text;
-  }
-  return null;
-}
-function renderPartPreview(part, expandTools) {
-  if (!isRecord4(part))
-    return null;
-  const expansion = expandToolPart(part, expandTools, true);
-  if (expansion !== null)
-    return `    • tool ${part.tool}: ${expansion}`;
-  const text = textOf(part);
-  if (text !== null) {
-    const t = truncate2(text, 200);
-    return t.length > 0 ? `    • ${t}` : null;
-  }
-  const tool = asToolPart(part);
-  if (tool) {
-    const arg = keyArg(tool.input);
-    const head = arg ? `${tool.name}(${arg})` : tool.name;
-    return tool.output !== null ? `    • tool ${head} → output ~${estimateTokens(tool.output)} tok` : `    • tool ${head}`;
-  }
-  const reasoning = reasoningOf(part);
-  if (reasoning !== null)
-    return `    • [reasoning] ${truncate2(reasoning, 120)}`;
-  const type = typeof part.type === "string" ? part.type : "part";
-  if (type === "file")
-    return "    • [file]";
-  if (type === "step-start" || type === "step-finish")
-    return null;
-  return `    • [${type}]`;
-}
-function renderPartFull(part) {
-  if (!isRecord4(part))
-    return null;
-  const text = textOf(part);
-  if (text !== null) {
-    return text.trim().length > 0 ? `  [text]
-${text}` : null;
-  }
-  const tool = asToolPart(part);
-  if (tool) {
-    const lines = [];
-    const idSuffix = tool.callId ? ` #${tool.callId}` : "";
-    lines.push(`  [tool: ${tool.name}${idSuffix}]`);
-    if (tool.title && tool.title.trim().length > 0) {
-      lines.push(`  description: ${tool.title.trim()}`);
-    }
-    if (tool.input)
-      lines.push(`  input: ${JSON.stringify(tool.input)}`);
-    if (tool.output !== null)
-      lines.push(`  output:
-${tool.output}`);
-    return lines.join(`
-`);
-  }
-  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}` : ""}`;
-  }
-  return null;
-}
-function renderMessageByOrdinal(sessionId, ordinal) {
-  const found = [];
-  visitRawSessionMessages2(sessionId, ordinal, ordinal, (m) => {
-    if (m.ordinal === ordinal)
-      found.push(m);
-    return false;
-  });
-  const msg = found[0];
-  if (!msg) {
-    return `No message at ordinal ${ordinal} in this session's stored history — it was deleted ` + `(session prune/revert) or the ordinal is wrong, so it can't be recovered. ` + `Re-run the tool if you still need the data.`;
-  }
-  const rendered = msg.parts.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)");
-  } else {
-    lines.push(...rendered);
-  }
-  return lines.join(`
-`);
-}
-function renderVerboseRange(sessionId, start, end, tokenBudget, expandTools) {
-  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 block = partLines.length > 0 ? `${header}
-${partLines.join(`
-`)}` : header;
-    const blockTokens = estimateTokens(block);
-    if (usedTokens + blockTokens > tokenBudget && out.length > 0) {
-      truncated = true;
-      return false;
-    }
-    out.push(block);
-    usedTokens += blockTokens;
-    lastOrdinal = msg.ordinal;
-    return true;
-  });
-  return { text: out.join(`
-
-`), lastOrdinal, truncated };
-}
-function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
-  const tag = getTagById2(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}`;
-  if (tag.type === "tool") {
-    const owner = tag.toolOwnerMessageId;
-    if (!owner)
-      return `Tag ${number}'s tool owner is unknown; its original call cannot be resolved safely.`;
-    const message = readRawSessionMessageById2(sessionId, owner);
-    if (!message)
-      return `Tag ${number}'s original tool owner is no longer in stored history.`;
-    const parts = message?.parts.filter((part) => isRecord4(part) && asToolPart(part)?.callId === tag.messageId) ?? [];
-    if (!parts.some((part) => isRecord4(part) && asToolPart(part)?.output !== null)) {
-      visitRawSessionMessages2(sessionId, message.ordinal + 1, Number.MAX_SAFE_INTEGER, (candidate) => {
-        const matching = candidate.parts.filter((part) => isRecord4(part) && asToolPart(part)?.callId === tag.messageId);
-        if (matching.some((part) => isRecord4(part) && part.type === "tool_use"))
-          return false;
-        parts.push(...matching);
-        return matching.length === 0;
-      });
-    }
-    const rendered = parts.map(renderPartFull).filter((part) => part !== null);
-    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 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 matching = derived ? piText.filter((part) => isRecord4(part) && typeof part.text === "string" && createHash14("sha256").update(part.text).digest("hex") === derived[3]) : [];
-  const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" ? piText[index] : part;
-  return selected ? renderPartFull(selected) ?? "" : `Tag ${number}'s original text part is no longer in stored history.`;
-}
-
 // src/tools/ctx-expand/tools.ts
 var CTX_EXPAND_RUST_TAG_REFUSAL = "Tag lookup isn't available on this session: its §N§ tags are numbered by the Rust transform engine and ctx_expand cannot resolve those numbers, so no content was returned. Expand by message instead: ctx_expand(message=<ordinal>) or ctx_expand(start=<ordinal>, end=<ordinal>), using ordinals from a <session-history> heading or a ctx_search hit.";
 var ctxExpandArgsShape = {
@@ -27107,11 +27190,36 @@ function createCtxExpandTool(deps) {
       if (mode.kind === "error") {
         return mode.message;
       }
+      const source = rawMessageWorkerSource2(sessionId);
+      const path = getSqliteDatabasePath2(deps.db);
       if (mode.kind === "tag") {
-        return renderItemByTag(deps.db, sessionId, mode.tag);
+        if (source) {
+          if (!path)
+            throw new Error("Search archive worker unavailable: private archive has no off-thread source");
+          const text = await readV2ArchiveOffThread2(path, source.path, sessionId, {
+            kind: "tag",
+            tag: mode.tag
+          });
+          if (text === null)
+            throw new Error("Search archive worker unavailable: unexpected tag reply");
+          return text;
+        }
+        return renderItemByTag2(deps.db, sessionId, mode.tag, "part", deps.recoveryAttachments);
       }
       if (mode.kind === "message") {
-        return await renderSearchArchiveOffThread2(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
+        if (source) {
+          if (!path)
+            throw new Error("Search archive worker unavailable: private archive has no off-thread source");
+          const text = await readV2ArchiveOffThread2(path, source.path, sessionId, {
+            kind: "message",
+            message: mode.message,
+            tokenBudget: CTX_EXPAND_TOKEN_BUDGET
+          });
+          if (text === null)
+            throw new Error("Search archive worker unavailable: unexpected message reply");
+          return text;
+        }
+        return await renderSearchArchiveOffThread2(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal2(sessionId, mode.message, deps.recoveryAttachments);
       }
       const { start, end, verbose } = mode;
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -27119,24 +27227,25 @@ function createCtxExpandTool(deps) {
         return `Range ${start}-${end} is entirely within the live tail (after the last compacted message ${lastCompartmentEnd}); those messages are already visible in context.`;
       }
       const effectiveEnd = lastCompartmentEnd >= 0 ? Math.min(end, lastCompartmentEnd) : end;
+      if (verbose && source) {
+        if (!path)
+          throw new Error("Search archive worker unavailable: private archive has no off-thread source");
+        const text = await readV2ArchiveOffThread2(path, source.path, sessionId, {
+          kind: "verbose",
+          start,
+          end: effectiveEnd,
+          tokenBudget: CTX_EXPAND_TOKEN_BUDGET,
+          expandTools: deps.expandTools
+        });
+        if (text === null)
+          throw new Error("Search archive worker unavailable: unexpected verbose reply");
+        return text;
+      }
       const archived = await renderSearchArchiveOffThread2(deps.db, sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
       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 ctx_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 renderVerboseRangeForTool2(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) {
@@ -27855,7 +27964,7 @@ import { existsSync as existsSync8 } from "node:fs";
 import { isAbsolute as isAbsolute2 } from "node:path";
 
 // ../retina-local-fs/src/path-fence.ts
-import { lstat as lstat2, realpath as realpath2 } from "node:fs/promises";
+import { lstat as lstat2, realpath as realpath3 } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname as dirname2, isAbsolute, join as join6, relative, resolve, sep } from "node:path";
 
@@ -27885,7 +27994,7 @@ async function resolveFenceRoots(options) {
   const configuredHomePath = resolve(options.homeDirectory ?? process.env.HOME ?? homedir());
   let home;
   try {
-    home = await realpath2(configuredHomePath);
+    home = await realpath3(configuredHomePath);
   } catch (error) {
     throw fsError(configuredHomePath, error);
   }
@@ -27915,7 +28024,7 @@ function fenceCandidates(canonical, aliases) {
 }
 async function canonicalPath(path, allowMissing) {
   try {
-    return await realpath2(path);
+    return await realpath3(path);
   } catch (error) {
     if (!allowMissing || !isMissingError(error)) {
       throw fsError(path, error);
@@ -27940,7 +28049,7 @@ async function canonicalPath(path, allowMissing) {
       suffix.unshift(basename(candidate));
       candidate = parent;
       try {
-        return join6(await realpath2(candidate), ...suffix);
+        return join6(await realpath3(candidate), ...suffix);
       } catch (parentError) {
         if (!isMissingError(parentError)) {
           throw fsError(path, parentError);
@@ -29555,4 +29664,4 @@ function applyHiddenSubagentTemperature(input, output, log) {
     output.temperature = temperature;
 }
 
-export { logConfigDependencyNotesOnce, openOpenCodeDb, DREAMER_SYSTEM_PROMPT, runSessionProjectBackfill, SMART_NOTE_COMPILER_SYSTEM_PROMPT, createLiveSessionState, RETROSPECTIVE_MAX_USER_MESSAGE_CHARS, RETROSPECTIVE_MESSAGE_TRUNCATION_MARKER, OpenCodeRetrospectiveRawProvider, createDreamTaskExecutor, runManualDream, runDueTasksForProject, startDreamScheduleTimer, createDreamTimerModuleClient, ensureProjectRegisteredFromOpenCodeDirectory, recordOpenCodeProvenInputFloor, resolveOpenCodeProvenInputFloor, resolveContextWindowGeometry, resolveContextLimit, resolveExecuteThresholdDetail, resolveModelKey, resolveSessionId, createScheduler, describeStorageUnavailability, resolveSessionCacheTtl, runEmbedHistoryDrain, pauseEmbedHistoryDrain, formatEmbedStatusText, getSessionProperties, getSessionCreatedInfo, getMessageUpdatedAssistantInfo, getMessageUpdatedInfo, getSessionErrorInfo, getMessageRemovedInfo, summarizeManualDream, createMagicContextCommandHandler, getLiveNotificationParams, createChatMessageHook, createEventHook, createCommandExecuteBeforeHook, createToolExecuteAfterHook, recordHiddenVariantWarning, buildStatusDetail, isDebugRpcEnabled, registerRpcHandlers, maybeAutoEmbedSessionBackfill, clearTransformDecisionSession, scheduleOpenCodeTransformDecisionWrite, stageOpenCodeV2TransformDecision, bindOpenCodeV2TransformDecision, maybeDeliverChannel2, armLatestThinkingRecovery, armBindingRecoverySafely, armLatestThinkingRecoveryFromError, createM0RenderOptions, lkgReplayLimit, measureLkgReplay, STORAGE_BUSY_MESSAGE, StorageBusyRefusalError, bindSystemDateRequestIdentity, bindSystemDateOutput, registerSystemDateRefresh, rustWrapupHistorianFields, UnmanagedOverWindowError, UnresolvedHistoryBoundaryError, clearMessageTokensCache, createTransform, createSubcModuleClient, createModuleToolBackends, createRustRefusalRecovery, createSystemPromptHashHandler, tryMessagesTransformLkgReplay, createMessagesTransformHandler, primaryOnlyToolIds, subagentToolRefusal, guardSubagentTools, hideSubagentTools, removePrimaryOnlyTools, storedSubagentMode, createCtxExpandTools, CTX_MEMORY_LIST_TOOL_NAME, CTX_MEMORY_ACTIONS, createCtxMemoryTools, createCtxMemoryListTools, CTX_NOTE_DESCRIPTION, withoutSmartNoteText, createCtxNoteTools, createCtxReduceTools, createCtxSearchTools, parameterDescriptionsFor, applyJsonSchemaParameterDescriptions, MagicContextRpcServer, subagentTemperature, applyHiddenSubagentTemperature };
+export { logConfigDependencyNotesOnce, openOpenCodeDb, DREAMER_SYSTEM_PROMPT, runSessionProjectBackfill, SMART_NOTE_COMPILER_SYSTEM_PROMPT, createLiveSessionState, RETROSPECTIVE_MAX_USER_MESSAGE_CHARS, RETROSPECTIVE_MESSAGE_TRUNCATION_MARKER, OpenCodeRetrospectiveRawProvider, createDreamTaskExecutor, runManualDream, runDueTasksForProject, startDreamScheduleTimer, createDreamTimerModuleClient, ensureProjectRegisteredFromOpenCodeDirectory, recordOpenCodeProvenInputFloor, resolveOpenCodeProvenInputFloor, resolveContextWindowGeometry, resolveContextLimit, resolveExecuteThresholdDetail, resolveModelKey, resolveSessionId, parseCacheTtl, createScheduler, computeHardCacheExpired, describeStorageUnavailability, resolveSessionCacheTtl, runEmbedHistoryDrain, pauseEmbedHistoryDrain, formatEmbedStatusText, getSessionProperties, getSessionCreatedInfo, getMessageUpdatedAssistantInfo, getMessageUpdatedInfo, getSessionErrorInfo, getMessageRemovedInfo, summarizeManualDream, createMagicContextCommandHandler, getLiveNotificationParams, createChatMessageHook, createEventHook, createCommandExecuteBeforeHook, createToolExecuteAfterHook, recordHiddenVariantWarning, buildStatusDetail, isDebugRpcEnabled, registerRpcHandlers, maybeAutoEmbedSessionBackfill, clearTransformDecisionSession, scheduleOpenCodeTransformDecisionWrite, stageOpenCodeV2TransformDecision, bindOpenCodeV2TransformDecision, maybeDeliverChannel2, armLatestThinkingRecovery, armBindingRecoverySafely, armLatestThinkingRecoveryFromError, createM0RenderOptions, lkgReplayLimit, measureLkgReplay, STORAGE_BUSY_MESSAGE, StorageBusyRefusalError, bindSystemDateRequestIdentity, bindSystemDateOutput, registerSystemDateRefresh, rustWrapupHistorianFields, UnmanagedOverWindowError, UnresolvedHistoryBoundaryError, clearMessageTokensCache, createTransform, createSubcModuleClient, createModuleToolBackends, createRustRefusalRecovery, createSystemPromptHashHandler, tryMessagesTransformLkgReplay, createMessagesTransformHandler, primaryOnlyToolIds, subagentToolRefusal, guardSubagentTools, hideSubagentTools, removePrimaryOnlyTools, storedSubagentMode, createCtxExpandTools, CTX_MEMORY_LIST_TOOL_NAME, CTX_MEMORY_ACTIONS, createCtxMemoryTools, createCtxMemoryListTools, CTX_NOTE_DESCRIPTION, withoutSmartNoteText, createCtxNoteTools, createCtxReduceTools, createCtxSearchTools, parameterDescriptionsFor, applyJsonSchemaParameterDescriptions, MagicContextRpcServer, subagentTemperature, applyHiddenSubagentTemperature };