@cortexkit/opencode-magic-context 0.49.19 → 0.49.20

package/dist/{index-3esx8tkf.js → index-t7hx3qcb.js}

@@ -13,7 +13,7 @@ import {
   compareTaskOrder,
   buildDreamTaskRuntimeConfigs2,
   userMemoryCollectionEnabled2
-} from "./index-p5y3k4g7.js";
+} from "./index-nda0zgna.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -31,7 +31,7 @@ import {
   log2,
   sessionLog2,
   getLoggerDiagnostics2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -55,7 +55,7 @@ import {
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-beht37jy.js";
+} from "./index-1zx2pa5d.js";
 import {
   pruneMissingProjectIdentities,
   shouldSkipHomeProjectMemory,
@@ -71,7 +71,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-2vxtcb95.js";
+} from "./index-vkc1ca9p.js";
 import {
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity,
@@ -81,7 +81,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-rr2bb45z.js";
+} from "./index-c4b76d4t.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -93,7 +93,7 @@ import {
   deriveTriggerBudget2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianProducerLimits2
-} from "./index-v10f1rjv.js";
+} from "./index-spwjbkc7.js";
 import {
   resolveModelCalibration,
   calibrateBuckets,
@@ -107,7 +107,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   protectedToolTokenCount,
   peelLeadingMcTagNotation,
@@ -144,11 +144,11 @@ import {
   getDroppedTagsByNumbers2,
   getMaxDroppedTagNumber2,
   getTagById2
-} from "./index-cf74k5ak.js";
+} from "./index-305y133n.js";
 import {
   observeTemporalDecisions,
   stableStringify
-} from "./index-bp5083x2.js";
+} from "./index-x9k3mqrf.js";
 import {
   withContentLanguageDirective,
   parseCron,
@@ -168,7 +168,7 @@ import {
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./index-s734jcsr.js";
+} from "./index-35qc6606.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -176,7 +176,7 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-kq82mtg0.js";
+} from "./index-11zf2wwc.js";
 import {
   expandToolPart,
   takeCoveredInstructionRows,
@@ -300,10 +300,10 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-9zcsy3hh.js";
+} from "./index-x4k3f4mf.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./index-ke416mdc.js";
+} from "./index-j76ah6d7.js";
 import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
@@ -317,14 +317,14 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-jrr131e0.js";
+} from "./index-rmd0069m.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
   rpcPortFilePath,
   parseRpcPortFile,
   inspectProcessesAsync
-} from "./index-nj7yykkx.js";
+} from "./index-c7phnbvk.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fb3zxn06.js";
@@ -336,7 +336,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-63k48rv9.js";
+} from "./index-pnjwa6qa.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -442,6 +442,7 @@ import {
   raceWithSignal,
   promptSyncWithValidatedOutputRetry,
   normalizeSDKResponse,
+  annotateSubagentInvocationError,
   failedInvocationStatus,
   sumTokensFromChildMessages,
   recordChildInvocation,
@@ -511,7 +512,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-rpxdjkm0.js";
+} from "./index-v7r4td4c.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -539,7 +540,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-ze7mvk54.js";
+} from "./index-2yhtnfcf.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -547,11 +548,12 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./index-6x57ar45.js";
+} from "./index-adk2z5d8.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
   lkgServedArrayDigest,
+  takeLkgRecoveryLockSweepPage,
   hasCleanLkgRecoveryFence,
   dirtyLkgRecoveryRevision,
   ownsLkgDirtyFence,
@@ -569,7 +571,7 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./index-se4m2g6w.js";
+} from "./index-48stjd56.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -613,7 +615,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-3h4dp9wb.js";
+} from "./index-1pefp8ar.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -622,8 +624,10 @@ import {
   isTuiConnected2
 } from "./index-x8a7jmkh.js";
 import {
+  getCachedLocalEmbeddingPooling,
+  preflightLocalEmbeddingPooling,
   getLocalEmbeddingNativeMemoryStats
-} from "./index-bjcnntmz.js";
+} from "./index-0wthn7fp.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -631,7 +635,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-24fezq97.js";
+} from "./index-jr5na10t.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -656,7 +660,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-n37sebck.js";
+} from "./index-y4a3nhtk.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -677,17 +681,17 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-dxmq29t1.js";
+} from "./index-dc8hy95c.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-s74zqahq.js";
+} from "./index-kc9pn495.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-c1p88z1y.js";
+} from "./index-jfh3cktr.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -704,10 +708,17 @@ import {
   cachedToolPermissionDenied,
   resolveTodowriteAvailabilityFromMessages,
   resolveTodowriteAvailability,
+  diagnosticStateChanged,
+  clearDiagnosticLogState,
   canConsumeDeferredOnThisPass,
   hasReclaimRide,
   reclaimRidePermitted,
   reclaimRideLabel,
+  pendingDropEligibilityKey,
+  createPendingDropEligibilityCache,
+  readExecuteReclaimState,
+  writeExecuteReclaimState,
+  maintainExecuteFloorMark,
   captureOpencodeReasoningBudgetStatus,
   reasoningBudgetStatusLine,
   ENGINE_RECONNECTING_USER_MESSAGE,
@@ -724,8 +735,6 @@ import {
   replayCavemanCompression,
   DegradedPassRefusalError,
   degradedPassError,
-  pendingDropEligibilityKey,
-  createPendingDropEligibilityCache,
   applyFlushedStatuses,
   prewarmTagOwners,
   waitForTagOwners,
@@ -734,6 +743,7 @@ import {
   logTransformTiming,
   hasRecentAssistantCommit,
   tagMessages,
+  servesThinkingBlock2,
   rustModeServedKeyAfterPersistedStrips2,
   replayRustModeBindingMismatchStrips2,
   clearRustModeBoundaryRecord2,
@@ -742,7 +752,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-jhghdnsm.js";
+} from "./index-67nyj0gy.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -755,7 +765,7 @@ import {
 } from "./index-fmsr7v69.js";
 import {
   renderSearchArchiveOffThread2
-} from "./index-edmpdxcw.js";
+} from "./index-d6rp4dxh.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -785,7 +795,7 @@ import {
 } from "./index-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./index-k29z4aqh.js";
+} from "./index-t5pck3ss.js";
 import {
   shouldEnforcePrivateStoragePermissions,
   ensureStorageDirectorySync,
@@ -2696,7 +2706,9 @@ async function compressOneChunk(args, chunk, sliceMs, signal) {
         status: "completed",
         tokens: run.output.usage,
         providerId: run.output.providerId,
-        modelId: run.output.modelId
+        modelId: run.output.modelId,
+        attemptedModel: args.model,
+        configuredModels: args.fallbackModels
       });
     }
     stage = "apply";
@@ -2888,6 +2900,7 @@ async function runHiddenSingleShotPrompt(args) {
       });
   }).catch(() => {});
   const handle = await raceWithSignal(opening, args.signal);
+  let completion;
   args.onOpened?.(handle.id);
   let promptSettled = false;
   try {
@@ -2909,7 +2922,10 @@ async function runHiddenSingleShotPrompt(args) {
       ...args.signal ? { signal: args.signal } : {},
       fallbackModels: args.fallbackModels,
       callContext: args.callContext,
-      fetchOutput: () => args.executor.collect(handle, 50),
+      fetchOutput: async () => {
+        completion = await args.executor.collect(handle, 50);
+        return completion;
+      },
       validateOutput: (completion) => {
         const tokens = completion.tokenLog ?? runTokenLog(undefined);
         sessionLog2(args.parentSessionId ?? "dreamer", `${args.callContext} response_chars=${(completion.text ?? completion.reasoning ?? "").length} ${formatRunTokenLog(tokens)}`);
@@ -2925,6 +2941,12 @@ async function runHiddenSingleShotPrompt(args) {
     promptSettled = true;
     return { validated: run.validated, completion: run.output, childSessionId: handle.id };
   } catch (error) {
+    const configuredModel = toModelEntry(args.model);
+    annotateSubagentInvocationError(error, {
+      attemptedModel: completion?.attemptedModel ?? handle.attemptedModel ?? configuredModel?.model,
+      modelConfigKey: completion?.modelConfigKey ?? handle.modelConfigKey ?? configuredModel?.sourceConfigKey,
+      ...completion?.hostError === undefined ? {} : { hostError: completion.hostError }
+    });
     if (args.onFailureOutput) {
       let timer;
       try {
@@ -3053,6 +3075,8 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
       startedAt,
       status: params.status,
       messages: params.messages,
+      attemptedModel: args.model,
+      configuredModels: args.fallbackModels,
       error: params.error
     });
   };
@@ -3840,6 +3864,8 @@ function recordInvocation(args, startedAt, params) {
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     ...params.completion && !params.completion.messages ? {
       tokens: params.completion.usage,
       providerId: params.completion.providerId,
@@ -5577,6 +5603,8 @@ Remember: output only the JSON object described by the system prompt.`;
       startedAt,
       status: params.status,
       messages: params.messages,
+      attemptedModel: args.model,
+      configuredModels: args.fallbackModels,
       error: params.error
     });
   };
@@ -6563,6 +6591,8 @@ async function confirmReadOnly(args, noteId, content, surfaceCondition, leaseSig
       startedAt,
       status: params.status,
       messages: params.messages,
+      attemptedModel: args.model,
+      configuredModels: args.fallbackModels,
       error: params.error
     });
   };
@@ -7477,12 +7507,14 @@ function recordInvocation2(args, startedAt, params) {
   recordChildInvocation({
     db: args.db,
     parentSessionId: args.parentSessionId,
-    harness: "opencode",
+    harness: args.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
     subagent: "dreamer",
     task: "map-memories",
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     error: params.error
   });
 }
@@ -8107,12 +8139,14 @@ function recordInvocation3(args, startedAt, params) {
   recordChildInvocation({
     db: args.db,
     parentSessionId: args.parentSessionId,
-    harness: "opencode",
+    harness: args.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
     subagent: "dreamer",
     task: "refresh-primers",
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     error: params.error
   });
 }
@@ -9569,12 +9603,14 @@ function recordInvocation4(args, startedAt, params) {
   recordChildInvocation({
     db: args.db,
     parentSessionId: args.parentSessionId,
-    harness: "opencode",
+    harness: args.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
     subagent: "dreamer",
     task: args.forceBroad ? "verify-broad" : "verify",
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     error: params.error
   });
 }
@@ -10450,6 +10486,25 @@ async function runRetrospectiveTask(config, ctx, helpers) {
   let childSessionId = null;
   let hiddenHandle = null;
   let promptSettled = false;
+  let invocationRecorded = false;
+  const recordInvocation = (status, messages, error) => {
+    if (!parent || !childSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db,
+      parentSessionId: parent,
+      harness: deps.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
+      subagent: "dreamer",
+      task: config.task,
+      startedAt: helpers.invocationStartedAt,
+      status,
+      messages,
+      attemptedModel: config.model,
+      configuredModels: config.fallbackModels,
+      error
+    });
+  };
   try {
     if (deps.hiddenCompletionExecutor) {
       hiddenHandle = await deps.hiddenCompletionExecutor.open({
@@ -10534,18 +10589,8 @@ async function runRetrospectiveTask(config, ctx, helpers) {
       return { ...run, output };
     };
     const finish = (run, watermark) => {
-      if (parent && run) {
-        recordChildInvocation({
-          db,
-          parentSessionId: parent,
-          harness: "opencode",
-          subagent: "dreamer",
-          task: config.task,
-          startedAt: helpers.invocationStartedAt,
-          status: "completed",
-          messages: run.output
-        });
-      }
+      if (run)
+        recordInvocation("completed", run.output);
       return completedWindow(watermark);
     };
     const userLines = renderGateUserLines(messages);
@@ -10638,6 +10683,7 @@ async function runRetrospectiveTask(config, ctx, helpers) {
     log2(`[dreamer] retrospective: flagged=${flagged.length} learnings=${learnings.length} memory=${applied.memoryWritten} observations=${applied.observationsInserted} dropped=${applied.observationsDropped} rejected=${applied.rejected.length}`);
     return finish(deepenRun, scan.maxScannedTs);
   } catch (error) {
+    recordInvocation(abortController.signal.aborted ? "aborted" : failedInvocationStatus(error), undefined, error);
     if (!detectOverflow(error).isOverflow)
       throw error;
     const failures = (activeOverflow?.failures ?? 0) + 1;
@@ -10709,6 +10755,25 @@ async function runAgenticTask(config, ctx, helpers) {
   let childSessionId = null;
   let promptSettled = false;
   let expiredArchived = 0;
+  let invocationRecorded = false;
+  const recordInvocation = (status, messages, error) => {
+    if (!parent || !childSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db,
+      parentSessionId: parent,
+      harness: deps.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
+      subagent: "dreamer",
+      task,
+      startedAt: invocationStartedAt,
+      status,
+      messages,
+      attemptedModel: config.model,
+      configuredModels: config.fallbackModels,
+      error
+    });
+  };
   try {
     let curateMemories;
     let curateCategory;
@@ -10797,6 +10862,9 @@ async function runAgenticTask(config, ctx, helpers) {
           callContext: `dreamer:${task}`,
           metadata: { tokenBudget: config.tokenBudget, onBudgetUpdate },
           allowEmpty: task === "curate",
+          onOpened: (sessionId) => {
+            childSessionId = sessionId;
+          },
           model: config.model,
           fallbackModels: config.fallbackModels,
           language: task === "curate" ? config.language ?? deps.language : undefined,
@@ -10912,18 +10980,7 @@ async function runAgenticTask(config, ctx, helpers) {
       helpers.reportProgress(curateRefused, curateRefused);
       log2(`[dreamer] curate safety summary: refused=${curateRefused}`);
     }
-    if (parent) {
-      recordChildInvocation({
-        db,
-        parentSessionId: parent,
-        harness: "opencode",
-        subagent: "dreamer",
-        task,
-        startedAt: invocationStartedAt,
-        status: "completed",
-        messages: run.output
-      });
-    }
+    recordInvocation("completed", run.output);
     if (task === "maintain-docs" && docsHashes && changes) {
       try {
         if (run.validated === "[]") {
@@ -10977,6 +11034,9 @@ async function runAgenticTask(config, ctx, helpers) {
         }
       } : {}
     };
+  } catch (error) {
+    recordInvocation(abortController.signal.aborted ? "aborted" : failedInvocationStatus(error), undefined, error);
+    throw error;
   } finally {
     heartbeat.stop();
     if (childSessionId)
@@ -11629,6 +11689,11 @@ async function indexSingleMessageOffThread(db, sessionId, message) {
   return result.inserted;
 }
 async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  if (getHarness2() === "opencode" || getHarness2() === "opencode2")
+    options = {
+      ...options,
+      fenceLockNames: options.fenceLockNames ?? takeLkgRecoveryLockSweepPage()
+    };
   if (getHarness2() === "opencode2")
     openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
       readonly: true,
@@ -12476,7 +12541,7 @@ function loadRegistrationConfig(directory) {
     configCache.delete(directory);
   return detailed;
 }
-async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db) {
+async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db, options = {}) {
   const detailed = loadRegistrationConfig(directory);
   const projectIdentity = resolveProjectIdentityForSession(directory, detailed.config.allow_home_project);
   if (!projectIdentity)
@@ -12497,6 +12562,9 @@ async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db) {
     memoryEnabled: detailed.config.memory.enabled,
     gitCommitEnabled: detailed.config.memory.git_commit_indexing.enabled
   };
+  if (options.preflightLocalPooling && routing.primary.provider === "local") {
+    await preflightLocalEmbeddingPooling(routing.primary.model ?? "Xenova/all-MiniLM-L6-v2");
+  }
   const before = getProjectEmbeddingSnapshot2(projectIdentity);
   const registered = registerProjectEmbedding2(db, projectIdentity, routing.primary, features, directory);
   if (!before || before.providerIdentity !== registered.providerIdentity || before.runtimeFingerprint !== registered.runtimeFingerprint)
@@ -13520,6 +13588,14 @@ function getMessageRemovedInfo(properties) {
   };
 }
 
+// src/hooks/magic-context/nudge-evaluation-log.ts
+function logNudgeEvaluation(sessionId, phase, line) {
+  const category = `${phase}:${line.split(":", 1)[0]}`;
+  const state = line.split(" ").filter((field) => /^(ctx_reduce|band|dampening|verdict|reason|lease)=/.test(field)).join(" ");
+  if (diagnosticStateChanged(sessionId, category, state))
+    sessionLog2(sessionId, line);
+}
+
 // src/hooks/magic-context/command-handler.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 
@@ -13959,7 +14035,7 @@ function resolveBoundaryContextLimit(usage, fallbackContextLimit) {
   }
   return 128000;
 }
-function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, inMemoryTail, taggerFloor = 0) {
+function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, inMemoryTail, taggerFloor = 0, liftLivePromptFloor = false) {
   return withRawSessionMessageCache2(() => {
     try {
       const memoryPrimed = inMemoryTail ? primeInMemoryTailRawMessageCache2({
@@ -13989,7 +14065,8 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
         executeThresholdPercentage,
         usage,
         usageSource: "live",
-        taggerFloor
+        taggerFloor,
+        liftLivePromptFloor
       });
       const hasProtectedEligibleHead = boundary.offset < Math.min(boundary.protectedTailStart, boundary.eligibleEndOrdinal);
       if (!hasProtectedEligibleHead) {
@@ -14025,7 +14102,10 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
 function formatProjectedPostDropPercentage(value) {
   return value === null ? "none" : `${value.toFixed(1)}%`;
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, eligiblePendingDropTagIds) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, eligiblePendingDropTagIds, primaryExecute = false) {
+  if (usage.percentage < executeThresholdPercentage) {
+    writeExecuteReclaimState(db, sessionId, { floorOrdinal: null, floorPromptId: null });
+  }
   if (sessionMeta.compartmentInProgress) {
     sessionLog2(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
@@ -14078,7 +14158,22 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
       resolvedInMemoryTail = undefined;
     }
   }
-  const tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor);
+  let tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor);
+  const markState = readExecuteReclaimState(db, sessionId);
+  const mark = markState.floorOrdinal;
+  const livePromptOrdinal = tailInfo.boundarySnapshot?.diagnostics?.livePromptFloor.ordinal;
+  let consumedFloorMark = false;
+  if (mark !== null) {
+    const consumed = writeExecuteReclaimState(db, sessionId, {
+      floorOrdinal: null,
+      floorPromptId: null
+    });
+    if (consumed && mark === livePromptOrdinal && markState.floorPromptId === tailInfo.boundarySnapshot?.diagnostics?.livePromptFloor.messageId && usage.percentage >= executeThresholdPercentage) {
+      consumedFloorMark = true;
+      sessionLog2(sessionId, `compartment trigger: live-prompt floor mark consumed at ${mark}`);
+      tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor, true);
+    }
+  }
   if (!tailInfo.hasNewRawHistory) {
     try {
       const lastCompartmentEnd = getLastCompartmentEndMessage(db, sessionId);
@@ -14162,7 +14257,21 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     return { shouldFire: false };
   }
   if (!tailInfo.hasProtectedEligibleHead || !tailInfo.isMeaningful) {
-    sessionLog2(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% because unsummarized tail from ${tailInfo.nextStartOrdinal} is too small`);
+    let floorOnly = false;
+    const boundary = tailInfo.boundarySnapshot;
+    const floor = boundary?.diagnostics?.livePromptFloor;
+    if (!consumedFloorMark && floor?.ordinal && floor.from > floor.to) {
+      const withoutFloor = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor, true);
+      floorOnly = withoutFloor.hasProtectedEligibleHead && withoutFloor.isMeaningful;
+      if (floorOnly && primaryExecute && usage.percentage >= executeThresholdPercentage && writeExecuteReclaimState(db, sessionId, {
+        floorOrdinal: floor.ordinal,
+        floorPromptId: floor.messageId ?? null
+      })) {
+        sessionLog2(sessionId, `compartment trigger: live-prompt floor mark set at ${floor.ordinal}`);
+      }
+    }
+    const refusal = floorOnly ? `no eligible head (live-prompt floor at ${floor?.ordinal})` : tailInfo.hasProtectedEligibleHead ? "below meaningfulness" : "no eligible head";
+    sessionLog2(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% — ${refusal}; offset=${tailInfo.nextStartOrdinal} protectedStart=${boundary?.protectedTailStart ?? "none"} eligibleEnd=${boundary?.eligibleEndOrdinal ?? "none"} rawTokens=${tailInfo.trueRawEligibleTokens} chunkTokens=${tailInfo.tokenEstimate}`);
     return { shouldFire: false };
   }
   sessionLog2(sessionId, `compartment trigger: proactive fire at ${usage.percentage.toFixed(1)}% (floor=${proactiveTriggerPercentage}% projected post-drop=${formatProjectedPostDropPercentage(projectedPostDropPercentage)} target=${relativePostDropTarget.toFixed(1)}%)`);
@@ -15156,7 +15265,7 @@ function maybeInjectChannel1Nudge(args, sessionId, tool, output) {
     evaluable: state.evaluable,
     generationInvalidated: state.generationInvalidated
   });
-  sessionLog2(sessionId, formatChannel1Evaluation(decision));
+  logNudgeEvaluation(sessionId, "tool-completion", formatChannel1Evaluation(decision));
   setLastNudgeUndropped(args.db, sessionId, decision.nextLastNudge);
   const nextNudgeState = {
     ...nudgeState,
@@ -15978,6 +16087,7 @@ function buildDebugMemoryUsage(runtimeHolders = {}) {
   const lkg = getLkgSlotHeapStats();
   const tagger = runtimeHolders.taggerCache ?? EMPTY_TAGGER_HEAP_STATS;
   const wire = runtimeHolders.wireCache ?? EMPTY_WIRE_HEAP_STATS;
+  const replay = runtimeHolders.generateReplay ?? { totalBytes: 0, sessions: [] };
   const messageIndexQueue = getMessageIndexQueueHeapStats();
   const sessions = new Map;
   const session = (sessionId) => {
@@ -15991,7 +16101,8 @@ function buildDebugMemoryUsage(runtimeHolders = {}) {
         wireRawMessages: 0,
         wireMessages: 0,
         wireContentSnapshots: 0,
-        wireEstimatedBytes: 0
+        wireEstimatedBytes: 0,
+        generateReplayBytes: 0
       };
       sessions.set(sessionId, current);
     }
@@ -16011,6 +16122,8 @@ function buildDebugMemoryUsage(runtimeHolders = {}) {
     target.wireContentSnapshots += entry.rawContentSnapshots;
     target.wireEstimatedBytes += entry.estimatedBytes;
   }
+  for (const entry of replay.sessions)
+    session(entry.sessionId).generateReplayBytes += entry.bytes;
   return {
     pid: process.pid,
     bunVersion: typeof Bun !== "undefined" && typeof Bun.version === "string" ? Bun.version : "unavailable",
@@ -16041,6 +16154,10 @@ function buildDebugMemoryUsage(runtimeHolders = {}) {
         estimatedBytes: wire.estimatedBytes
       },
       compartmentMirrors: { entries: 0 },
+      generateReplay: {
+        sessionCount: replay.sessions.length,
+        estimatedBytes: replay.totalBytes
+      },
       messageIndexQueue,
       sessions: [...sessions.values()].sort((a, b) => a.sessionId.localeCompare(b.sessionId))
     }
@@ -16257,9 +16374,9 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-zn7yzd2d.js"));
-    const { resolveHistorianModel } = await importPluginModule(() => import("./model-resolution-nx97z3x7.js"));
-    const { userObservationCollectionEnabled, userObservationsRequested } = await importPluginModule(() => import("./task-config-x3qmayd2.js"));
+    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-pqybnx09.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;
     const runConfig = historianRunConfig(config, currentPluginConfigReader(directory)?.poll().effective ?? config);
     const historianModel = resolveHistorianModel(runConfig, "opencode");
@@ -16290,7 +16407,7 @@ function registerRpcHandlers(rpcServer, args) {
       return { ok: false, error: "no session" };
     const readDirectory = args.readSessionDirectory;
     if (readDirectory) {
-      const { handoffHistoryWork } = await import("./history-owner-xp3pngv7.js");
+      const { handoffHistoryWork } = await import("./history-owner-36wp3mkb.js");
       const handed = await handoffHistoryWork({
         storageDir: args.storageDir ?? getMagicContextStorageDir(),
         directory,
@@ -16309,8 +16426,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-999jj4bc.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-6ve0e8p4.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-61vyha9j.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-0k6qzydk.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -16368,7 +16485,7 @@ function registerRpcHandlers(rpcServer, args) {
   rpcServer.handle("wrapup", async (params) => {
     const readDirectory = args.readSessionDirectory;
     if (readDirectory && params.sessionId) {
-      const { handoffHistoryWork } = await import("./history-owner-xp3pngv7.js");
+      const { handoffHistoryWork } = await import("./history-owner-36wp3mkb.js");
       const sessionId = String(params.sessionId);
       const handed = await handoffHistoryWork({
         storageDir: args.storageDir ?? getMagicContextStorageDir(),
@@ -16394,7 +16511,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-whhbjmaz.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-mnvt2g8m.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -16469,6 +16586,13 @@ function registerRpcHandlers(rpcServer, args) {
 }
 
 // src/hooks/magic-context/auto-embed-session.ts
+function localPoolingPreflightPending(projectIdentity) {
+  const snapshot = getProjectEmbeddingSnapshot2(projectIdentity);
+  if (snapshot?.provider !== "local")
+    return false;
+  const metadata = getCachedLocalEmbeddingPooling(snapshot.model);
+  return !metadata || metadata.status === "unresolved";
+}
 function embeddingIdentity(projectIdentity) {
   const snapshot = getProjectEmbeddingSnapshot2(projectIdentity);
   return JSON.stringify([
@@ -16489,7 +16613,8 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
     invalidateAutoEmbedSession(sessionId);
     autoEmbedIdentityBySession.set(sessionId, identity);
   }
-  if (autoEmbedAttemptedBySession.has(sessionId) || embedPauseBySession.has(sessionId) || embedRunStateBySession.has(sessionId) || Date.now() < (autoEmbedRetryAfterBySession.get(sessionId) ?? 0))
+  const poolingPreflightPending = localPoolingPreflightPending(deps.projectIdentity);
+  if (embedPauseBySession.has(sessionId) || embedRunStateBySession.has(sessionId) || Date.now() < (autoEmbedRetryAfterBySession.get(sessionId) ?? 0) || autoEmbedAttemptedBySession.has(sessionId) && !poolingPreflightPending)
     return;
   const controller = new AbortController;
   embedRunStateBySession.set(sessionId, controller);
@@ -16499,6 +16624,7 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
     let started = false;
     let reason = "error";
     let registeredIdentity = identity;
+    let poolingPendingAfterRegistration = poolingPreflightPending;
     try {
       await new Promise((resolve) => setTimeout(resolve, 0));
       if (controller.signal.aborted)
@@ -16506,6 +16632,7 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
       await deps.ensureRegistered();
       if (controller.signal.aborted)
         return;
+      poolingPendingAfterRegistration = localPoolingPreflightPending(deps.projectIdentity);
       markActive();
       registeredIdentity = embeddingIdentity(deps.projectIdentity);
       autoEmbedIdentityBySession.set(sessionId, registeredIdentity);
@@ -16513,7 +16640,9 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
       if (controller.signal.aborted || !coverage.enabled)
         return;
       if (coverage.embedded === coverage.total) {
-        complete = true;
+        complete = !poolingPendingAfterRegistration;
+        if (!complete)
+          retryDelay = 60000;
         return;
       }
       const model = getProjectEmbeddingSnapshot2(deps.projectIdentity)?.model;
@@ -16522,8 +16651,11 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
       const outcome = await embedSessionCompartmentChunks2(deps.db, deps.projectIdentity, sessionId, { signal: controller.signal, automatic: true });
       reason = outcome.status;
       const after = await getAutoEmbeddingSessionCoverage2(deps.db, deps.projectIdentity, sessionId);
-      complete = after.enabled && after.embedded === after.total;
-      if (!complete && outcome.status !== "busy" && outcome.status !== "aborted") {
+      complete = after.enabled && after.embedded === after.total && !poolingPendingAfterRegistration;
+      if (poolingPendingAfterRegistration) {
+        retryDelay = 60000;
+        reason = "pooling metadata unavailable";
+      } else if (!complete && outcome.status !== "busy" && outcome.status !== "aborted") {
         retryDelay = 60000;
         if (outcome.status === "nothing" || outcome.status === "done")
           reason = "deferred";
@@ -16930,7 +17062,7 @@ async function maybeDeliverChannel2(sessionId, deps) {
     return false;
   }
   const evaluation = evaluateChannel2(deps.baseline);
-  sessionLog2(sessionId, formatChannel2Evaluation(evaluation, { leaseBefore: "pending", leaseAfter: "pending" }));
+  logNudgeEvaluation(sessionId, "delivery", formatChannel2Evaluation(evaluation, { leaseBefore: "pending", leaseAfter: "pending" }));
   if (deps.directiveText === undefined && !evaluation.evaluable) {
     return false;
   }
@@ -23893,8 +24025,8 @@ async function runCompartmentPhaseImpl(args) {
     }
     return "completed";
   }
-  if (!historianRunnable && args.sessionMeta.compartmentInProgress) {
-    sessionLog2(args.sessionId, "transform: historian disabled; clearing stale compartmentInProgress flag");
+  if ((!historianRunnable || !args.canRunCompartments && !getActiveCompartmentRun(args.sessionId)) && args.sessionMeta.compartmentInProgress) {
+    sessionLog2(args.sessionId, "transform: historian unavailable; clearing stale compartmentInProgress flag");
     updateSessionMeta(args.db, args.sessionId, { compartmentInProgress: false });
     compartmentInProgress = false;
   }
@@ -24154,8 +24286,10 @@ function createTransform(deps) {
   const loadedSessions = new Set;
   const prefixHoldLogTurnIds = new Map;
   const thinkingFitRetries = new Set;
+  const compactionModeTransitionPending = new Set;
   const clearSessionLogState = (sessionId) => {
     prefixHoldLogTurnIds.delete(sessionId);
+    clearDiagnosticLogState(sessionId);
   };
   const unmanagedOverWindowSessions = new Set;
   const rustModeTransform = deps.transformMode === "rust" && deps.rustModeModuleClient ? createRustModeTransform(deps, {
@@ -24296,6 +24430,7 @@ function createTransform(deps) {
       const hasTransitionEffects = transition.recordToWrite !== null || transition.notice !== null || transition.invalidatedM0Baseline || transition.clearedCompartmentInProgress || transition.historianCatchUpSignaled;
       if (hasTransitionEffects) {
         if (transition.invalidatedM0Baseline) {
+          compactionModeTransitionPending.add(sessionId);
           sessionMeta = {
             ...sessionMeta,
             cachedM0Bytes: null,
@@ -24628,6 +24763,8 @@ function createTransform(deps) {
       contextLimit: boundaryContextLimit
     });
     let _boundarySnapshotCache;
+    if (fullFeatureMode && !compactionOff)
+      maintainExecuteFloorMark(db, sessionId, currentTurnId, boundaryUsageForProtectedTail.percentage < boundaryExecuteThreshold);
     const getRunnableBoundaryForCompartment = (emergencyTailScale) => {
       if (!canRunCompartments)
         return null;
@@ -24753,8 +24890,9 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       recordedSessionProjectIdentity.set(sessionId, sessionIdentityForBinding);
     }
     const taggerFloor = compactionOff ? 0 : deriveTaggerLoadFloor(messages, sessionId, db);
-    if (!compactionOff && taggerFloor === 0 && messages.length > 0) {
-      sessionLog2(sessionId, `tag floor: 0 (full-scan fallback) — no leading wire message resolved a tag across ${messages.length} msgs`);
+    const tagFloorMode = compactionOff || messages.length === 0 ? "inactive" : taggerFloor === 0 ? "fallback" : "scoped";
+    if (diagnosticStateChanged(sessionId, "tag-floor", tagFloorMode) && tagFloorMode !== "inactive") {
+      sessionLog2(sessionId, taggerFloor === 0 ? `tag floor: 0 (full-scan fallback) — no scoped floor above the safety margin across ${messages.length} msgs` : `tag floor: ${taggerFloor} (scoped load)`);
     }
     const ownerRatio = sessionDecisionCalibration(db, sessionId).proseRatio;
     noteTransformPassForExactOrdinalReads(sessionId);
@@ -24791,7 +24929,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
             idleExpiry: false,
             emergency: contextUsageEarly.percentage >= forceMaterializationPercentage
           }
-        }, pendingDropEligibility.read(sessionId, dropProjectionKey()));
+        }, pendingDropEligibility.read(sessionId, dropProjectionKey()), schedulerDecision === "execute");
         if (triggerResult.shouldFire) {
           sessionLog2(sessionId, `compartment trigger: firing (reason=${triggerResult.reason})`);
           updateSessionMeta(db, sessionId, { compartmentInProgress: true });
@@ -25162,6 +25300,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       activeThinkingPrefixHold,
       directoryPrefixHold: unresolvedDirectoryHold,
       forceSignedRebuildForFit: thinkingFitRetries.has(sessionId) || !!recovery.rebuildReason,
+      compactionModeTransition: compactionModeTransitionPending.has(sessionId),
       readLastServedMessages: () => {
         const slot = getInMemorySlot(sessionId) ?? loadPersistedLkgSlot(db, sessionId);
         try {
@@ -25219,6 +25358,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         hardSignals: m0HardSignals
       }
     });
+    compactionModeTransitionPending.delete(sessionId);
     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] : []));
@@ -25396,7 +25536,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       if (JSON.stringify([...new Set(stillUntagged)].sort()) !== JSON.stringify([...new Set(persistedUntaggedInputIds)].sort()) && !persistLkgUntaggedInputIds(db, sessionId, stillUntagged))
         throw new Error("Cannot persist the last-good untagged-message record");
     }
-    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold && postTransformResult.openTurnSignedThinkingKept !== true || postTransformResult.thinkingReleasedForFit === true, postTransformResult.openTurnSignedThinkingKept === true);
+    const signedThinkingServed = isPrefixBoundThinkingModel(modelForBudget?.providerID, modelForBudget?.modelID) && servesThinkingBlock2(messages, modelForBudget?.providerID, modelForBudget?.modelID);
+    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold && !signedThinkingServed || postTransformResult.thinkingReleasedForFit === true, signedThinkingServed);
     if (activeThinkingPrefixHold && !postTransformResult.thinkingReleasedForFit && sessionMeta.cachedM0Bytes != null && sessionMeta.cachedM1Bytes != null) {
       recordHeldHeadForRequest(sessionId, currentLkgRequestIdentity(sessionId), (ownsHistory) => deferDeliveredSystemRefresh(deps, sessionId, ownsHistory));
     }
@@ -25554,7 +25695,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           postReduceGraceBaselineU: channel1State.postReduceGraceBaselineU,
           postReduceGracePreLevel: channel1State.postReduceGracePreLevel
         });
-        sessionLog2(sessionId, formatChannel1Evaluation(channel1Decision));
+        logNudgeEvaluation(sessionId, "transform", formatChannel1Evaluation(channel1Decision));
         const channel2Evaluation = evaluateChannel2(channelBaseline);
         const leaseBefore = getChannel2NudgeState(db, sessionId);
         if (channelBaseline.evaluable && !channelBaseline.generationInvalidated && !channelBaseline.reducedSinceRefresh) {
@@ -25565,7 +25706,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           }
         }
         const leaseAfter = getChannel2NudgeState(db, sessionId);
-        sessionLog2(sessionId, formatChannel2Evaluation(channel2Evaluation, {
+        logNudgeEvaluation(sessionId, "transform", formatChannel2Evaluation(channel2Evaluation, {
           leaseBefore,
           leaseAfter,
           gateHoldReason: channelBaseline.reducedSinceRefresh ? "recent-reduce-refresh" : undefined
@@ -25834,6 +25975,35 @@ function describeSystemPromptChange(previous, current) {
   return `presetChanged=${previous ? previous.preset !== current.preset : "unknown"} elements=[${elements.join("; ")}]`;
 }
 
+// src/hooks/magic-context/system-prompt-sticky-date.ts
+var STICKY_DATE_KEY = "systemPromptStickyDate";
+function readPersistedSystemPromptStickyDate(db, sessionId) {
+  try {
+    const saved = readReplayEnvelope(db, sessionId, "read")[STICKY_DATE_KEY];
+    return typeof saved === "string" && saved.length > 0 ? saved : undefined;
+  } catch (error) {
+    sessionLog2(sessionId, "system prompt sticky date record unreadable:", error);
+    return;
+  }
+}
+function persistSystemPromptStickyDate(db, sessionId, stickyDate) {
+  try {
+    const written = updateReplayDocument(db, sessionId, (doc) => {
+      if (doc[STICKY_DATE_KEY] === stickyDate)
+        return false;
+      doc.version = 2;
+      doc[STICKY_DATE_KEY] = stickyDate;
+      return true;
+    });
+    if (!written)
+      sessionLog2(sessionId, "system prompt sticky date record not written");
+    return written;
+  } catch (error) {
+    sessionLog2(sessionId, "system prompt sticky date record write failed:", error);
+    return false;
+  }
+}
+
 // src/hooks/magic-context/system-prompt-hash.ts
 var MAGIC_CONTEXT_MARKER = "## Magic Context";
 var SYSTEM_PROMPT_GUIDANCE_SEPARATOR = `
@@ -25856,6 +26026,15 @@ function createSystemPromptHashHandler(deps) {
   });
   const guidanceEpochs = createPromptSurfaceGuidanceEpochCache(promptSurfaceRuntime);
   const stickyDateBySession = new Map;
+  const recordedStickyDateBySession = new Map;
+  const recordedStickyDate = (sessionId) => {
+    let recorded = recordedStickyDateBySession.get(sessionId);
+    if (recorded === undefined) {
+      recorded = readPersistedSystemPromptStickyDate(deps.db, sessionId) ?? null;
+      recordedStickyDateBySession.set(sessionId, recorded);
+    }
+    return recorded ?? undefined;
+  };
   const diagnosticPrompts = new Map;
   const processSystemPrompt = async (input, output) => {
     const sessionId = input.sessionID;
@@ -25923,9 +26102,34 @@ function createSystemPromptHashHandler(deps) {
       return;
     const previousHash = sessionMetaEarly?.systemPromptHash ?? "";
     const hasPersistedHash = previousHash !== "" && previousHash !== "0";
-    if (!hasPersistedHash)
-      stickyDateBySession.delete(sessionId);
-    const stickyDate = stickyDateBySession.get(sessionId);
+    const prefixBoundModel = isPrefixBoundThinkingModel(liveModel?.providerID, liveModel?.modelID);
+    let stickyDate = stickyDateBySession.get(sessionId);
+    if (!hasPersistedHash) {
+      const previous = stickyDate ?? recordedStickyDate(sessionId);
+      const live = systemPromptDates(liveSystemContent).live;
+      const fieldCount = (dates) => dates === undefined ? 0 : JSON.parse(dates).length;
+      stickyDate = (!modelKey || prefixBoundModel) && previous !== undefined && live !== undefined && fieldCount(previous) === fieldCount(live) ? previous : undefined;
+      if (stickyDate === undefined)
+        stickyDateBySession.delete(sessionId);
+      else
+        stickyDateBySession.set(sessionId, stickyDate);
+    }
+    if (stickyDate === undefined && hasPersistedHash) {
+      const recorded = recordedStickyDate(sessionId);
+      const live = systemPromptDates(liveSystemContent).live;
+      if (recorded !== undefined && live !== undefined && recorded !== live && systemPromptFingerprint(systemPromptDates(liveSystemContent, recorded).stable, promptSurface.preset) === previousHash) {
+        stickyDate = recorded;
+        stickyDateBySession.set(sessionId, recorded);
+        sessionLog2(sessionId, `system prompt date restored after restart: real=${live}, using=${recorded}`);
+      }
+    }
+    const setStickyDate = (value) => {
+      stickyDateBySession.set(sessionId, value);
+      if (value !== recordedStickyDate(sessionId)) {
+        if (persistSystemPromptStickyDate(deps.db, sessionId, value))
+          recordedStickyDateBySession.set(sessionId, value);
+      }
+    };
     const dates = systemPromptDates(liveSystemContent, stickyDate);
     const currentDate = dates.live;
     const stableCandidate = dates.stable;
@@ -25933,13 +26137,12 @@ function createSystemPromptHashHandler(deps) {
     const contentOrPresetChanged = hasPersistedHash && stableCandidateHash !== previousHash;
     const rewritePermission = systemDateRefreshPermission(deps.historyRefreshSessions, dateRequest);
     const signedThinkingKept = systemDateSignedThinkingKept(deps.historyRefreshSessions, dateRequest);
-    const idleDateMayAdvance = idleCacheExpired && signedThinkingKept !== true;
-    const prefixBoundModel = isPrefixBoundThinkingModel(liveModel?.providerID, liveModel?.modelID);
+    const systemDateMayMove = (rewrite, keptSignedThinking) => (rewrite || idleCacheExpired) && keptSignedThinking !== true;
     let deferredDateRefresh = false;
     if (currentDate && stickyDate && currentDate !== stickyDate && (idleCacheExpired ? prefixBoundModel : isCacheBusting) && !contentOrPresetChanged && !requestMessagesFinal) {
       const liveElements = [...output.system];
       deferredDateRefresh = waitForSystemDateRefresh(deps.historyRefreshSessions, dateRequest, (permitted, keptSignedThinking) => {
-        if (!permitted && !(idleCacheExpired && keptSignedThinking !== true)) {
+        if (!systemDateMayMove(permitted, keptSignedThinking)) {
           deps.systemPromptRefreshSessions.add(sessionId);
           return;
         }
@@ -25952,7 +26155,7 @@ function createSystemPromptHashHandler(deps) {
             cachedM0SystemHash: hash,
             systemPromptTokens: estimateTokens(content)
           });
-          stickyDateBySession.set(sessionId, currentDate);
+          setStickyDate(currentDate);
           output.system.splice(0, output.system.length, ...liveElements);
           publishSystemDateOutput(output.system);
           deps.systemPromptRefreshSessions.delete(sessionId);
@@ -25963,12 +26166,12 @@ function createSystemPromptHashHandler(deps) {
         }
       });
     }
-    const dateMayAdvance = idleDateMayAdvance && !deferredDateRefresh || contentOrPresetChanged || isCacheBusting && !deferredDateRefresh && (dateRequest ? rewritePermission === true : rewritePermission !== false);
+    const dateMayAdvance = contentOrPresetChanged || !deferredDateRefresh && systemDateMayMove(isCacheBusting && (dateRequest ? rewritePermission === true : rewritePermission !== false), signedThinkingKept);
     if (currentDate && !stickyDate) {
-      stickyDateBySession.set(sessionId, currentDate);
+      setStickyDate(currentDate);
     } else if (currentDate && stickyDate && currentDate !== stickyDate) {
       if (dateMayAdvance) {
-        stickyDateBySession.set(sessionId, currentDate);
+        setStickyDate(currentDate);
         sessionLog2(sessionId, `system prompt date updated: ${stickyDate} → ${currentDate} (cache-busting pass)`);
       } else {
         let offset = 0;
@@ -26026,7 +26229,7 @@ function createSystemPromptHashHandler(deps) {
         sessionLog2(sessionId, "system prompt meta persist failed (fail-open):", error);
       }
     }
-    if (isCacheBusting && !deferredDateRefresh && (contentOrPresetChanged || !currentDate || currentDate === stickyDate || !dateRequest || rewritePermission === true)) {
+    if (isCacheBusting && !deferredDateRefresh && (contentOrPresetChanged || !currentDate || currentDate === stickyDate || !dateRequest || rewritePermission === true && signedThinkingKept !== true)) {
       deps.systemPromptRefreshSessions.delete(sessionId);
     }
   };
@@ -26041,6 +26244,7 @@ function createSystemPromptHashHandler(deps) {
     handler,
     clearSession: (sessionId) => {
       diagnosticPrompts.delete(sessionId);
+      recordedStickyDateBySession.delete(sessionId);
       clearSystemDateRefresh(deps.historyRefreshSessions, sessionId);
       guidanceEpochs.clear(sessionId);
       clearSystemPromptHashSession(sessionId, {
@@ -26624,8 +26828,17 @@ function guardSubagentTools(tools, db, isInternalChild) {
 function hideSubagentTools(draft, db) {
   if (!getOrCreateSessionMeta(db, draft.sessionID).isSubagent)
     return;
+  removePrimaryOnlyTools(draft.tools);
+}
+function removePrimaryOnlyTools(tools) {
   for (const id of PRIMARY_ONLY_TOOLS)
-    delete draft.tools[id];
+    delete tools[id];
+}
+function storedSubagentMode(db, sessionId) {
+  const row = db.prepare("SELECT is_subagent FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (!row || typeof row.is_subagent !== "number")
+    return;
+  return row.is_subagent === 1;
 }
 
 // src/tools/ctx-expand/tools.ts
@@ -28633,7 +28846,7 @@ function createCtxReduceTool(deps) {
       args = unwrapImitatedReducedArgs(args, ["drop"], { drop: "string" });
       const sessionId = toolContext.sessionID;
       if (!args.drop) {
-        return "Error: 'drop' must be provided.";
+        return `Error: 'drop' must be provided as a string of tag numbers, for example {"drop": "3-5,8"}.`;
       }
       const rustReduce = deps.rustToolBackends?.reduce;
       if (rustReduce) {
@@ -28921,6 +29134,7 @@ function createCtxSearchTool(deps) {
         explicitSearch: true,
         rerankConnectionFile: deps.rerankConnectionFile,
         searchMessageHistory: (request) => searchMessageHistoryOffThread(deps.db, request),
+        signal: toolContext.abort,
         ...dateRange
       });
       return formatSearchResults2(query, results, toolContext.sessionID, diagnostics);
@@ -29469,4 +29683,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, scheduleClearAndReindex, 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, 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, scheduleClearAndReindex, 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 };