@cortexkit/opencode-magic-context 0.49.16 → 0.49.18

package/dist/{index-ek1yxvvz.js → index-936py2wm.js}

@@ -55,8 +55,9 @@ import {
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
+  pruneMissingProjectIdentities,
   shouldSkipHomeProjectMemory,
   ProjectIdentityError,
   takeDubiousOwnershipProjectIdentityWarning,
@@ -70,7 +71,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-a8bvhwqs.js";
+} from "./index-2vxtcb95.js";
 import {
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity,
@@ -80,7 +81,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-saews2s3.js";
+} from "./index-rr2bb45z.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -106,7 +107,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-hqkczed7.js";
+} from "./index-c5pytzne.js";
 import {
   protectedToolTokenCount,
   peelLeadingMcTagNotation,
@@ -143,7 +144,7 @@ import {
   getDroppedTagsByNumbers2,
   getMaxDroppedTagNumber2,
   getTagById2
-} from "./index-nd7m2a5a.js";
+} from "./index-cf74k5ak.js";
 import {
   observeTemporalDecisions,
   stableStringify
@@ -167,7 +168,7 @@ import {
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./index-7pa32z07.js";
+} from "./index-s734jcsr.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -175,9 +176,11 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-mtw9e71a.js";
+} from "./index-kq82mtg0.js";
 import {
   expandToolPart,
+  takeCoveredInstructionRows,
+  cloneKeepingCoveredInstructionMarks,
   estimateTrueRawMessageTokens,
   isTextPart,
   toolPartHasUserAnswer,
@@ -267,6 +270,7 @@ import {
   snapshotTrailingBlankSourceDecisions,
   projectOpencodeReasoningBudgetCutoff,
   resolveKeepReasoningTokens,
+  reasoningStepCost,
   reasoningBudgetCutoff,
   describeFinalWireTail,
   estimateMessageTokens,
@@ -296,10 +300,10 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-j6zw70pf.js";
+} from "./index-rmwykbbb.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./index-n6m03s3n.js";
+} from "./index-ke416mdc.js";
 import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
@@ -313,7 +317,7 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-cj9g0j7a.js";
+} from "./index-fgncb0ng.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -332,7 +336,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -366,6 +370,7 @@ import {
   retryPendingSessionCleanups,
   retryPendingRustSessionCleanupsForProject,
   requestPendingMaterialization,
+  hasPendingMaterializationOrigin,
   clearPendingMaterialization,
   recordSystemPromptForRequest,
   recordHeldHeadForRequest,
@@ -492,6 +497,7 @@ import {
   onNoteTrigger,
   clearNoteNudgeTriggerAndCooldown,
   resetNoteNudgeCooldownOnly,
+  omitIncompleteFileTokenTotals,
   RECOVERY_NO_HEAD_LIMIT,
   deriveProtectedTailTokenTarget,
   selectPerRunCap,
@@ -503,7 +509,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-ayym1x7f.js";
+} from "./index-s1ex9y6p.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -531,7 +537,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-qrahzcqv.js";
+} from "./index-ze7mvk54.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -539,7 +545,7 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./index-fkx2qnvw.js";
+} from "./index-6x57ar45.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
@@ -551,6 +557,7 @@ import {
   prepareLkgCaptureFence,
   certifyCommittedLkgCapture,
   markLkgRecoveryDirty,
+  gaDatabasePath,
   getMessageIndexSourceIdentity2,
   isMessageIndexSourceCurrent2,
   getLastIndexedOrdinal2,
@@ -559,8 +566,8 @@ import {
   clearIndexedMessages2,
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-p4vde22c.js";
+  sweepOrphanedOpenCodeMessageIndexesCooperatively2
+} from "./index-x4njr8df.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -604,7 +611,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-wv9n2zcq.js";
+} from "./index-v8awdgvd.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -614,7 +621,7 @@ import {
 } from "./index-x8a7jmkh.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./index-7b2cfmaz.js";
+} from "./index-bjcnntmz.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -622,7 +629,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-9nkg2dzk.js";
+} from "./index-24fezq97.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -647,7 +654,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-n78avt2p.js";
+} from "./index-n37sebck.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -668,17 +675,17 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-4qfy7v57.js";
+} from "./index-s7j8tvhv.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-b17m64g9.js";
+} from "./index-s74zqahq.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-v63beg1z.js";
+} from "./index-r4nkrs05.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -697,6 +704,7 @@ import {
   resolveTodowriteAvailability,
   canConsumeDeferredOnThisPass,
   hasReclaimRide,
+  reclaimRidePermitted,
   reclaimRideLabel,
   captureOpencodeReasoningBudgetStatus,
   reasoningBudgetStatusLine,
@@ -720,6 +728,7 @@ import {
   prewarmTagOwners,
   waitForTagOwners,
   stripStructuralNoise,
+  withTransformTimingSummary,
   logTransformTiming,
   hasRecentAssistantCommit,
   tagMessages,
@@ -731,7 +740,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-kn4t1haw.js";
+} from "./index-e4xv8890.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -744,7 +753,7 @@ import {
 } from "./index-fmsr7v69.js";
 import {
   renderSearchArchiveOffThread2
-} from "./index-6a6dq53h.js";
+} from "./index-6s5941tm.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -11611,9 +11620,14 @@ async function indexSingleMessageOffThread(db, sessionId, message) {
   return result.inserted;
 }
 async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  if (getHarness2() === "opencode2")
+    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
+      readonly: true,
+      fileMustExist: true
+    });
   const path = getSqliteDatabasePath2(db);
-  if (!path || getHarness2() !== "opencode")
-    return sweepOrphanedOpenCodeMessageIndexes2(db, openSource, options);
+  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource, options);
   let source = null;
   let sourcePath = null;
   try {
@@ -11625,7 +11639,7 @@ async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, opti
       source?.close();
   }
   if (!sourcePath)
-    return sweepOrphanedOpenCodeMessageIndexes2(db, () => source, options);
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, () => source, options);
   const reply = await runSessionWarmupWorker({
     path,
     sessionId: "",
@@ -11824,7 +11838,7 @@ function runTick(origin) {
   if (tickInFlight)
     return;
   tickInFlight = true;
-  log2(`[dreamer] timer tick (${origin}) — projects=${registeredProjects.size}`);
+  log2(`[magic-context] maintenance tick (${origin}) — projects=${registeredProjects.size}`);
   (async () => {
     try {
       const db = openTimerDatabaseOrNull("maintenance tick");
@@ -11874,6 +11888,9 @@ function persistTickOutcome(db, failure) {
   }
 }
 async function runMessageHistoryMaintenance(db) {
+  const prunedIdentities = await pruneMissingProjectIdentities();
+  if (prunedIdentities > 0)
+    log2(`[magic-context] pruned ${prunedIdentities} missing project identities`);
   try {
     await drainStaleLkgSlots(db);
   } catch (error) {
@@ -12107,10 +12124,20 @@ async function sweepGitCommits(args) {
   const holderId = crypto.randomUUID();
   const lease = acquireGitSweepLease(db, projectIdentity, holderId);
   if (!lease.acquired) {
-    const reason = lease.reason === "cooldown_active" ? `cooldown active until ${lease.nextAllowedAt}` : `lease held by ${lease.leaseHolder ?? "another holder"} until ${lease.leaseExpiresAt ?? "unknown"}`;
+    if (lease.reason === "cooldown_active")
+      return;
+    const reason = `lease held by ${lease.leaseHolder ?? "another holder"} until ${lease.leaseExpiresAt ?? "unknown"}`;
     log2(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
     return;
   }
+  if (projectIdentity.startsWith("dir:")) {
+    if (parkGitSweepNonIndexable(db, projectIdentity, holderId)) {
+      log2(`[git-commits] sweep parked for ${projectIdentity}: directory identity has no commits`);
+    } else {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+    }
+    return;
+  }
   const startedAt = Date.now();
   const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
   log2(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
@@ -14055,8 +14082,9 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
+  const ridePermitted = reclaimRide !== undefined && (reclaimRide.permission ? reclaimRidePermitted(reclaimRide, reclaimRide.permission) : hasReclaimRide(reclaimRide));
   const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
-  const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
+  const dropsCanLand = ridePermitted;
   const forceMaterializationPercentage = escalationBands(executeThresholdPercentage).forceMaterializationPercentage;
   if (usage.percentage >= forceMaterializationPercentage) {
     if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
@@ -16272,8 +16300,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-tjcaj5x7.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-2x9edkrp.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-ghpk2dtq.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-6ve0e8p4.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -16357,7 +16385,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-vj2tbp22.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-s9zc5b00.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -17283,7 +17311,9 @@ var PASS_DEGRADATION_EFFECTS = {
   "trailing-blank-decision-exception": "changes-request",
   "proactive-thinking-strip-persistence-failure": "changes-request",
   "reasoning-removal-read-failure": "changes-request",
-  "reasoning-removal-persistence-failure": "changes-request"
+  "reasoning-removal-persistence-failure": "changes-request",
+  "host-instruction-retention-read-failure": "changes-request",
+  "host-instruction-retention-persistence-failure": "changes-request"
 };
 function degradationChangesRequest(site) {
   return PASS_DEGRADATION_EFFECTS[site] === "changes-request";
@@ -17850,6 +17880,7 @@ class HistorianHostRunner {
         throw new Error("hidden completion carrier returned no session id");
       const run = await promptSyncWithValidatedOutputRetry(undefined, {
         path: { id: handle.id },
+        cacheTail: "skip",
         query: { directory: sessionDirectory },
         body: {
           agent: "historian",
@@ -20153,6 +20184,24 @@ function contextUsagePassSnapshot(sessionMeta) {
     } : null
   };
 }
+function savedProviderReadingForPass(input) {
+  const persisted = input.persisted;
+  if (!persisted)
+    return null;
+  const { percentage, inputTokens } = persisted.usage;
+  if (!Number.isFinite(percentage) || percentage <= 0 || !Number.isFinite(inputTokens) || inputTokens <= 0) {
+    return null;
+  }
+  if (!(input.lastResponseTime > 0) || input.cacheExpired)
+    return null;
+  if (persisted.lastObservedModelKey === null || input.currentModelKey === undefined || input.currentModelKey.length === 0 || piModelRefToCanonical(persisted.lastObservedModelKey) !== piModelRefToCanonical(input.currentModelKey)) {
+    return null;
+  }
+  if (typeof input.contextLimit !== "number" || !(input.contextLimit > 0) || persisted.lastUsageContextLimit !== input.contextLimit) {
+    return null;
+  }
+  return { percentage, inputTokens };
+}
 function resolveUnknownUsageFromWireEstimate(input) {
   if (input.usage.inputTokens > 0 || !input.pricedPass)
     return input.usage;
@@ -23505,6 +23554,101 @@ function createRustModeTransform(deps, options) {
   return adapter;
 }
 
+// src/hooks/magic-context/signed-thinking-hold.ts
+var HEAVY_REASONING_TOKENS = 1500;
+var HEAVY_REASONING_WINDOW_STEPS = 15;
+var HOLD_CAP_POINTS = 10;
+var REASONING_TYPES = new Set(["reasoning", "thinking"]);
+function role(message) {
+  if (!isRecord(message))
+    return;
+  return isRecord(message.info) ? message.info.role : message.role;
+}
+function parts(message) {
+  if (!isRecord(message))
+    return [];
+  if (Array.isArray(message.parts))
+    return message.parts;
+  return Array.isArray(message.content) ? message.content : [];
+}
+function recordedReasoningTokens(message) {
+  if (!isRecord(message))
+    return;
+  const info = isRecord(message.info) ? message.info : undefined;
+  const candidates = [];
+  if (info && isRecord(info.tokens))
+    candidates.push(info.tokens.reasoning);
+  if (isRecord(message.usage)) {
+    candidates.push(message.usage.reasoning, message.usage.reasoningTokens);
+  }
+  for (const value of candidates) {
+    if (typeof value === "number" && Number.isFinite(value) && value > 0)
+      return value;
+  }
+  return;
+}
+function stepReasoningTokens(message, estimateTextTokens) {
+  let text = "";
+  let opaque = false;
+  for (const part of parts(message)) {
+    if (!isRecord(part))
+      continue;
+    const type = String(part.type ?? part.kind);
+    if (type === "redacted_thinking" || part.redacted === true) {
+      opaque = true;
+      continue;
+    }
+    if (!REASONING_TYPES.has(type))
+      continue;
+    const body = typeof part.thinking === "string" ? part.thinking : typeof part.text === "string" ? part.text : "";
+    if (body.length > 0)
+      text += body;
+    else
+      opaque = true;
+  }
+  if (!text && !opaque)
+    return 0;
+  return reasoningStepCost(recordedReasoningTokens(message), text ? estimateTextTokens(text) : 0, opaque);
+}
+function decideSignedThinkingHold(args) {
+  const capPercentage = args.executeThresholdPercentage + HOLD_CAP_POINTS;
+  let heavyStepsBack = null;
+  let heavyStepTokens = 0;
+  const start = latestAssistantTurnStart(args.messages);
+  let stepsBack = 0;
+  for (let index = args.messages.length - 1;index >= start; index--) {
+    const message = args.messages[index];
+    if (role(message) !== "assistant" || parts(message).length === 0)
+      continue;
+    stepsBack++;
+    if (stepsBack > HEAVY_REASONING_WINDOW_STEPS)
+      break;
+    const tokens = stepReasoningTokens(message, args.estimateTextTokens);
+    if (tokens > HEAVY_REASONING_TOKENS) {
+      heavyStepsBack = stepsBack;
+      heavyStepTokens = tokens;
+      break;
+    }
+  }
+  if (heavyStepsBack === null)
+    return {
+      held: false,
+      reason: "no_recent_heavy_reasoning",
+      heavyStepsBack,
+      heavyStepTokens,
+      capPercentage
+    };
+  if (!(args.usagePercentage < capPercentage))
+    return { held: false, reason: "above_cap", heavyStepsBack, heavyStepTokens, capPercentage };
+  return {
+    held: true,
+    reason: "heavy_reasoning",
+    heavyStepsBack,
+    heavyStepTokens,
+    capPercentage
+  };
+}
+
 // src/hooks/magic-context/temporal-served-projection.ts
 function readLkgTemporalDecisions(db, sessionId, runtime) {
   const slot = getInMemorySlot(sessionId) ?? loadPersistedLkgSlot(db, sessionId);
@@ -23728,7 +23872,7 @@ async function runCompartmentPhaseImpl(args) {
     justAwaitedPublication = activeRun.published;
     published = published || activeRun.published;
     const historyReprepareShouldBust = activeRun.published && args.deferredHistoryRefreshSessions.has(args.sessionId);
-    pendingCompartmentInjection = prepareCompartmentInjection(args.db, args.resolvedSessionId, args.messages, historyReprepareShouldBust, args.projectPath, args.injectionBudgetTokens, args.experimentalTemporalAwareness);
+    pendingCompartmentInjection = prepareCompartmentInjection(args.db, args.resolvedSessionId, args.messages, historyReprepareShouldBust, args.coveredInstructions, args.projectPath, args.injectionBudgetTokens, args.experimentalTemporalAwareness);
     if (historyReprepareShouldBust) {
       rebuiltHistoryThisPass = true;
     }
@@ -24028,7 +24172,8 @@ function createTransform(deps) {
     const startTime = performance.now();
     const historianRun = deps.resolveHistorianRun?.();
     const messages = output.messages;
-    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? structuredClone(messages) : null;
+    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? cloneKeepingCoveredInstructionMarks(messages) : null;
+    const coveredHostInstructions = takeCoveredInstructionRows(messages);
     const passOutcome = createPassOutcome();
     const tSessionId = performance.now();
     const sessionId = findSessionId(messages);
@@ -24226,8 +24371,8 @@ function createTransform(deps) {
         return true;
       }
     })();
-    let activeThinkingPrefixHold = activeThinkingTurn && isPrefixBoundThinkingModel(activeThinkingModel?.providerID, activeThinkingModel?.modelID);
-    let freezeM0M1 = unresolvedDirectoryHold || activeThinkingPrefixHold;
+    let activeThinkingPrefixHold = false;
+    let freezeM0M1 = unresolvedDirectoryHold;
     const compartmentDirectory = sessionDirectory;
     const historianRunnable = deps.historianRunnable !== false;
     const canRunCompartments = fullFeatureMode && !compactionOff && historianRunnable && (deps.client !== undefined || deps.hiddenCompletionExecutor !== undefined) && compartmentDirectory.length > 0;
@@ -24355,13 +24500,7 @@ function createTransform(deps) {
     }
     const resolvedProviderID = modelForBudget?.providerID;
     activeThinkingTurn ||= hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID);
-    activeThinkingPrefixHold ||= activeThinkingTurn && isPrefixBoundThinkingModel(resolvedProviderID, modelForBudget?.modelID);
-    freezeM0M1 ||= activeThinkingPrefixHold;
-    if (freezeM0M1 && prefixHoldLogTurnIds.get(sessionId) !== currentTurnId) {
-      prefixHoldLogTurnIds.set(sessionId, currentTurnId);
-      const reason = activeThinkingPrefixHold ? "active thinking turn (prefix-bound model)" : "session directory unresolved";
-      sessionLog2(sessionId, `m[0]/m[1] frozen: ${reason}; replaying the frozen prefix and deferring any rebuild`);
-    }
+    const signedThinkingPrefixBound = activeThinkingTurn && (isPrefixBoundThinkingModel(activeThinkingModel?.providerID, activeThinkingModel?.modelID) || isPrefixBoundThinkingModel(resolvedProviderID, modelForBudget?.modelID));
     const canUseEmptySentinels = modelAcceptsEmptyContent(resolvedProviderID);
     const protectedThinkingMessages = activeThinkingTurn || isAnthropicFamilyRoute(resolvedProviderID, modelForBudget?.modelID) ? latestAssistantTurnMessages(messages) : new Set;
     const resolvedContextLimit = modelForBudget ? resolveTrustedContextLimit(modelForBudget.providerID, modelForBudget.modelID, {
@@ -24415,6 +24554,29 @@ function createTransform(deps) {
     const effectiveExecuteThresholdPercentage = executeThresholdDetail.percentage;
     sessionLog2(sessionId, `transform threshold: model=${currentModelKeyForBoundary ?? "unknown"} matchedModel=${executeThresholdDetail.matchedKey ?? "scalar"} mode=${executeThresholdDetail.mode} threshold=${effectiveExecuteThresholdPercentage}% proactiveFloor=${getProactiveCompartmentTriggerPercentage(effectiveExecuteThresholdPercentage)}%`);
     const { forceMaterializationPercentage } = escalationBands(effectiveExecuteThresholdPercentage);
+    let holdProseRatio;
+    const signedThinkingHold = signedThinkingPrefixBound ? decideSignedThinkingHold({
+      messages,
+      usagePercentage: contextUsageEarly.percentage,
+      executeThresholdPercentage: effectiveExecuteThresholdPercentage,
+      estimateTextTokens: (text) => {
+        holdProseRatio ??= sessionDecisionCalibration(db, sessionId).proseRatio;
+        return estimateTokens(text) * holdProseRatio;
+      }
+    }) : null;
+    activeThinkingPrefixHold = signedThinkingPrefixBound && (compactionOff || signedThinkingHold?.held === true);
+    freezeM0M1 ||= activeThinkingPrefixHold;
+    const prefixHoldLogKey = signedThinkingHold ? `${currentTurnId}:${signedThinkingHold.reason}:${signedThinkingHold.heavyStepsBack ?? "none"}` : freezeM0M1 ? `${currentTurnId}:directory` : null;
+    if (prefixHoldLogKey !== null && prefixHoldLogTurnIds.get(sessionId) !== prefixHoldLogKey) {
+      prefixHoldLogTurnIds.set(sessionId, prefixHoldLogKey);
+      if (signedThinkingHold) {
+        sessionLog2(sessionId, `signed thinking hold: held=${signedThinkingHold.held} reason=${signedThinkingHold.reason} heavyStepsBack=${signedThinkingHold.heavyStepsBack ?? "none"} heavyStepTokens=${signedThinkingHold.heavyStepTokens} usage=${contextUsageEarly.percentage.toFixed(1)}% cap=${signedThinkingHold.capPercentage}%`);
+      }
+      if (freezeM0M1) {
+        const reason = activeThinkingPrefixHold ? compactionOff ? "active thinking turn in compaction-off mode (prefix-bound model)" : "recent heavy reasoning in the active thinking turn (prefix-bound model)" : "session directory unresolved";
+        sessionLog2(sessionId, `m[0]/m[1] frozen: ${reason}; replaying the frozen prefix and deferring any rebuild`);
+      }
+    }
     const persistedUsageFreshForBoundary = persistedUsageBeforeResets && Date.now() - persistedUsageBeforeResets.updatedAt <= 10 * 60 * 1000 && (persistedUsageBeforeResets.lastObservedModelKey === null || currentModelKeyForBoundary === undefined || piModelRefToCanonical(persistedUsageBeforeResets.lastObservedModelKey) === piModelRefToCanonical(currentModelKeyForBoundary)) && (resolvedContextLimit === undefined || persistedUsageBeforeResets.lastUsageContextLimit === 0 || persistedUsageBeforeResets.lastUsageContextLimit === resolvedContextLimit) ? persistedUsageBeforeResets.usage : null;
     const boundaryUsageForProtectedTail = persistedUsageFreshForBoundary ?? contextUsageEarly;
     const boundaryUsageSource = persistedUsageFreshForBoundary ? "persisted" : "live";
@@ -24601,8 +24763,14 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         }, {
           hardFold: false,
           force: contextUsageEarly.percentage >= forceMaterializationPercentage && (contextUsageEarly.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
-          explicitFlush: deps.pendingMaterializationSessions.has(sessionId),
-          publishedHistory: isCacheBusting
+          explicitFlush: hasPendingMaterializationOrigin(deps.pendingMaterializationSessions, sessionId, "user_flush"),
+          publishedHistory: isCacheBusting,
+          permission: {
+            signedThinkingHold: activeThinkingPrefixHold,
+            firstRender: false,
+            idleExpiry: false,
+            emergency: contextUsageEarly.percentage >= forceMaterializationPercentage
+          }
         }, pendingDropEligibility.read(sessionId, dropProjectionKey()));
         if (triggerResult.shouldFire) {
           sessionLog2(sessionId, `compartment trigger: firing (reason=${triggerResult.reason})`);
@@ -24622,7 +24790,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const messagesBeforeInitialPrepare = isCacheBusting && deferredHistoryWasPendingAtPassStart ? [...messages] : null;
     if (fullFeatureMode && !compactionOff) {
       const tInj = performance.now();
-      pendingCompartmentInjection = prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectIdentity, deps.memoryConfig?.injectionBudgetTokens, deps.experimentalTemporalAwareness);
+      pendingCompartmentInjection = prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, coveredHostInstructions, projectIdentity, deps.memoryConfig?.injectionBudgetTokens, deps.experimentalTemporalAwareness);
       if (messagesBeforeInitialPrepare) {
         const skippedVisibleMessages = pendingCompartmentInjection?.skippedVisibleMessages ?? 0;
         trimmedMessagesAtCompactionBoundary = messagesBeforeInitialPrepare.slice(0, skippedVisibleMessages);
@@ -24661,7 +24829,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       const tagged = tagMessages(sessionId, tail, deps.tagger, db, {
         skipPrefixInjection: !ctxReduceCallable,
         servedMessages: messages,
-        normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText
+        normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
+        refreshSourceContents: deps.refreshSourceContents?.(sessionId)
       });
       for (const [number, target] of tagged.targets)
         targets.set(number, target);
@@ -24686,7 +24855,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           skipPrefixInjection,
           scopedToolSweep,
           servedMessages: messages,
-          normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText
+          normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
+          refreshSourceContents: deps.refreshSourceContents?.(sessionId)
         });
         targets = result.targets;
         if (thinkingRecovery.restore)
@@ -24794,6 +24964,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       fallbackModels: historianRun?.fallbackModels ?? deps.fallbackModels,
       compartmentDirectory,
       messages,
+      coveredInstructions: coveredHostInstructions,
       pendingCompartmentInjection,
       fallbackModelId,
       projectPath: projectIdentity,
@@ -24865,30 +25036,53 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       bustReason: calibrationBustReason,
       onAdopt: (message) => sessionLog2(sessionId, message)
     });
+    let contextUsageFromEstimate = false;
     if (contextUsage.inputTokens <= 0 && protectionCacheBustingPass) {
+      const overflowRecoveryPass = usagePercentageSynthetic || emergencyRecoveryArmed;
+      const savedProviderReading = overflowRecoveryPass ? null : savedProviderReadingForPass({
+        persisted: persistedUsageBeforeResets,
+        currentModelKey: currentModelKeyForBoundary ?? (hardModelKey || undefined),
+        contextLimit: resolvedContextLimit,
+        lastResponseTime: sessionMeta.lastResponseTime,
+        cacheExpired: hardCacheExpired
+      });
+      let pressureEstimate;
       try {
-        const pressureEstimate = estimateFinalWireInputTokens({
+        pressureEstimate = estimateFinalWireInputTokens({
           messages,
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
           agentName: notificationParams.agent
         });
+      } catch (error) {
+        sessionLog2(sessionId, `transform: wire-estimate pressure fallback unavailable: ${getErrorMessage(error)}`);
+      }
+      const usableHard = windowGeometry?.usableHard;
+      const countPercentage = pressureEstimate?.pressureTokens !== undefined && Number.isFinite(pressureEstimate.pressureTokens) && typeof usableHard === "number" && usableHard > 0 ? pressureEstimate.pressureTokens / usableHard * 100 : 0;
+      const grewPastSavedReading = savedProviderReading !== null && countPercentage >= 95 && countPercentage > savedProviderReading.percentage;
+      if (savedProviderReading && !grewPastSavedReading) {
+        contextUsage = {
+          inputTokens: savedProviderReading.inputTokens,
+          percentage: Math.max(contextUsage.percentage, savedProviderReading.percentage)
+        };
+        sessionLog2(sessionId, `transform: unknown provider usage; using saved provider reading for priced pass inputTokens=${contextUsage.inputTokens} percentage=${contextUsage.percentage.toFixed(1)} countPercentage=${countPercentage.toFixed(1)}`);
+      } else if (pressureEstimate) {
+        const percentageBeforeEstimate = contextUsage.percentage;
         contextUsage = resolveUnknownUsageFromWireEstimate({
           usage: contextUsage,
           pricedPass: true,
-          wireEstimateTokens: pressureEstimate.tokens,
+          wireEstimateTokens: overflowRecoveryPass ? pressureEstimate.tokens : pressureEstimate.pressureTokens,
           wireEstimateTrusted: pressureEstimate.trusted,
           providerProvenInputTokens: providerProvenInputForRecovery,
           providerProvenLimitTokens: providerProvenLimitForRecovery,
-          usableHardLimit: windowGeometry?.usableHard
+          usableHardLimit: usableHard
         });
         if (contextUsage.inputTokens > 0) {
           const usedProviderInput = !pressureEstimate.trusted && providerProvenLimitForRecovery !== undefined && providerProvenInputForRecovery !== undefined && contextUsage.inputTokens >= providerProvenInputForRecovery;
-          sessionLog2(sessionId, `transform: unknown provider usage; using ${usedProviderInput ? "provider-proven input" : "wire estimate"} for priced pass inputTokens=${contextUsage.inputTokens} percentage=${contextUsage.percentage.toFixed(1)} trusted=${pressureEstimate.trusted} wireTokens=${pressureEstimate.tokens}`);
+          contextUsageFromEstimate = !overflowRecoveryPass && !usedProviderInput && !usagePercentageSynthetic && contextUsage.percentage > percentageBeforeEstimate;
+          sessionLog2(sessionId, `transform: unknown provider usage; using ${usedProviderInput ? "provider-proven input" : "wire estimate"} for priced pass inputTokens=${contextUsage.inputTokens} percentage=${contextUsage.percentage.toFixed(1)} trusted=${pressureEstimate.trusted} wireTokens=${pressureEstimate.tokens} pressureTokens=${pressureEstimate.pressureTokens}${grewPastSavedReading ? ` grewPastSavedReading=${savedProviderReading?.percentage.toFixed(1)}` : ""}`);
         }
-      } catch (error) {
-        sessionLog2(sessionId, `transform: wire-estimate pressure fallback unavailable: ${getErrorMessage(error)}`);
       }
     }
     const protectionUsableSoft = windowGeometry?.usableSoft ?? boundaryContextLimit;
@@ -24929,6 +25123,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       activeAgent,
       batch,
       contextUsage,
+      contextUsageFromEstimate,
       usableWindow: resolvedContextLimit ?? 0,
       schedulerDecision,
       schedulerDeferReason,
@@ -24974,6 +25169,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       emergencyCeilingTokens,
       pendingCompartmentInjection,
       prefixTrimSourceOrder,
+      coveredHostInstructions,
       hiddenMessagesAtCompactionSeam,
       trimmedMessagesAtCompactionBoundary,
       didMutateFromFlushedStatuses,
@@ -25174,7 +25370,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     if (!finalWireEstimate) {
       sessionLog2(sessionId, `transform: final-wire telemetry estimate=unavailable trusted=false conversation=unknown tools=unknown system=unknown toolDefinitions=unknown tail=${finalWireTail}`);
     }
-    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold || postTransformResult.thinkingReleasedForFit === true);
+    finishSystemDateRefresh(deps.historyRefreshSessions, dateRequest, postTransformResult.bustedThisPass && !activeThinkingPrefixHold && postTransformResult.openTurnSignedThinkingKept !== true || postTransformResult.thinkingReleasedForFit === true);
     if (activeThinkingPrefixHold && !postTransformResult.thinkingReleasedForFit && sessionMeta.cachedM0Bytes != null && sessionMeta.cachedM1Bytes != null) {
       recordHeldHeadForRequest(sessionId, currentLkgRequestIdentity(sessionId), (ownsHistory) => deferDeliveredSystemRefresh(deps, sessionId, ownsHistory));
     }
@@ -25275,7 +25471,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     });
     if (uncachedMessageIds.length > 0) {
       try {
-        storedByMessage = getActiveTagTokenTotalsByMessage2(db, sessionId, uncachedMessageIds);
+        storedByMessage = omitIncompleteFileTokenTotals(db, sessionId, messages.flatMap((message) => message.info.id ? [{ id: message.info.id, parts: message.parts }] : []), getActiveTagTokenTotalsByMessage2(db, sessionId, uncachedMessageIds));
       } catch {
         storedByMessage = new Map;
       }
@@ -25370,7 +25566,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         systemPromptHash: sessionMeta.systemPromptHash
       });
   };
-  return Object.assign(transform, {
+  const timedTransform = (input, output) => withTransformTimingSummary(() => transform(input, output));
+  return Object.assign(timedTransform, {
     clearSessionLogState,
     invalidateRustWireState(sessionId) {
       rustModeTransform?.invalidateWireState(sessionId);
@@ -25591,6 +25788,26 @@ function systemPromptDates(prompt, sticky) {
   return { live: values.length ? JSON.stringify(values) : undefined, stable };
 }
 
+// src/hooks/magic-context/system-prompt-diagnostics.ts
+import { createHash as createHash13 } 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 elements = [];
+  for (let index = 0;index < Math.max(previous?.elements.length ?? 0, current.elements.length); index++) {
+    const before = previous?.elements[index];
+    const after = current.elements[index];
+    let offset = 0;
+    while (before && after && offset < Math.min(before.length, after.length) && before[offset] === after[offset])
+      offset++;
+    const status = !previous ? "unknown" : !before ? "added" : !after ? "removed" : before.equals(after) ? "unchanged" : "changed";
+    elements.push(`${index}:${status}(${metadata(before)} -> ${metadata(after)},firstDiffByte=${!previous ? "unknown" : status === "unchanged" ? "none" : offset})`);
+  }
+  return `presetChanged=${previous ? previous.preset !== current.preset : "unknown"} elements=[${elements.join("; ")}]`;
+}
+
 // src/hooks/magic-context/system-prompt-hash.ts
 var MAGIC_CONTEXT_MARKER = "## Magic Context";
 var SYSTEM_PROMPT_GUIDANCE_SEPARATOR = `
@@ -25613,6 +25830,7 @@ function createSystemPromptHashHandler(deps) {
   });
   const guidanceEpochs = createPromptSurfaceGuidanceEpochCache(promptSurfaceRuntime);
   const stickyDateBySession = new Map;
+  const diagnosticPrompts = new Map;
   const processSystemPrompt = async (input, output) => {
     const sessionId = input.sessionID;
     if (!sessionId)
@@ -25745,8 +25963,11 @@ function createSystemPromptHashHandler(deps) {
       return;
     }
     const sessionMeta = sessionMetaEarly;
+    const previousPrompt = diagnosticPrompts.get(sessionId);
+    const currentPrompt = previousPrompt && previousHash === currentHash ? previousPrompt : snapshotSystemPrompt(output.system, promptSurface.preset);
+    diagnosticPrompts.set(sessionId, currentPrompt);
     if (previousHash !== "" && previousHash !== "0" && previousHash !== currentHash) {
-      sessionLog2(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${systemContent.length}), ${idleCacheExpired ? "adopting on idle-expired request" : requestMessagesFinal ? "adopting on the request whose messages are already final" : "triggering flush"}`);
+      sessionLog2(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${systemContent.length}), ${idleCacheExpired ? "adopting on idle-expired request" : requestMessagesFinal ? "adopting on the request whose messages are already final" : "triggering flush"}; ${describeSystemPromptChange(previousPrompt, currentPrompt)}`);
       noteSystemPromptHashChange(sessionId);
       if (!adoptSystemChange) {
         deps.historyRefreshSessions.add(sessionId);
@@ -25790,6 +26011,7 @@ function createSystemPromptHashHandler(deps) {
   return {
     handler,
     clearSession: (sessionId) => {
+      diagnosticPrompts.delete(sessionId);
       clearSystemDateRefresh(deps.historyRefreshSessions, sessionId);
       guidanceEpochs.clear(sessionId);
       clearSystemPromptHashSession(sessionId, {
@@ -26518,7 +26740,7 @@ function resolveCtxExpandMode(args, domain) {
 }
 
 // src/tools/ctx-expand/render.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 function isRecord4(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -26742,7 +26964,7 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
   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" && createHash13("sha256").update(part.text).digest("hex") === derived[3]) : [];
+  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.`;
 }
@@ -28298,7 +28520,7 @@ function formatCtxReduceReply(stampedCount, selfStampCount = 0) {
   return parts.join(" ");
 }
 // src/tools/ctx-reduce/tools.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 import { tool as tool4 } from "@opencode-ai/plugin";
 
 // src/features/magic-context/range-parser.ts
@@ -28362,11 +28584,11 @@ function createCtxReduceTool(deps) {
       const stableId = `oc-${sessionId}-${callId}`;
       if (Buffer.byteLength(stableId) <= 128)
         return stableId;
-      return `oc-${createHash14("sha256").update(stableId).digest("hex")}`;
+      return `oc-${createHash15("sha256").update(stableId).digest("hex")}`;
     }
     fallbackCommandSequence += 1;
     const monotonicId = `oc-${sessionId}-${fallbackCommandSequence}`;
-    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash14("sha256").update(monotonicId).digest("hex")}`;
+    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash15("sha256").update(monotonicId).digest("hex")}`;
   };
   return tool4({
     description: CTX_REDUCE_DESCRIPTION,
@@ -28773,7 +28995,58 @@ function applyJsonSchemaParameterDescriptions(toolId, input, preset, smartNotesE
 
 // src/shared/rpc-server.ts
 import { randomBytes, timingSafeEqual } from "node:crypto";
-import { readdirSync as readdirSync2, readFileSync as readFileSync6, unlinkSync } from "node:fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync6, rmdirSync, unlinkSync } from "node:fs";
+
+// src/shared/rpc-discovery-cleanup.ts
+import { promises as fs } from "node:fs";
+import { join as join7 } from "node:path";
+async function reapDeadRpcDiscovery(storageDir) {
+  const root = join7(storageDir, "rpc");
+  let directories;
+  try {
+    directories = await fs.readdir(root, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  const records = [];
+  const projectDirs = [];
+  for (const entry of directories) {
+    if (!entry.isDirectory() || !/^[0-9a-f]{16}$/.test(entry.name))
+      continue;
+    const directory = join7(root, entry.name);
+    projectDirs.push(directory);
+    try {
+      for (const name of await fs.readdir(directory)) {
+        const match = /^port-(\d+)(?:-[0-9a-f]+)?\.json$/.exec(name);
+        if (!match)
+          continue;
+        const path = join7(directory, name);
+        try {
+          const content = await fs.readFile(path, "utf8");
+          const record = parseRpcPortFile(content, Number(match[1]));
+          if (record && record.pid === Number(match[1]))
+            records.push({ path, content, pid: record.pid });
+        } catch {}
+      }
+    } catch {}
+  }
+  const processes = records.length ? await inspectProcessesAsync(true) : undefined;
+  for (const record of records) {
+    if (processes?.liveness(record.pid) !== "dead")
+      continue;
+    try {
+      if (await fs.readFile(record.path, "utf8") === record.content)
+        await fs.unlink(record.path);
+    } catch {}
+  }
+  for (const directory of projectDirs) {
+    try {
+      await fs.rmdir(directory);
+    } catch {}
+  }
+}
+
+// src/shared/rpc-server.ts
 var MAX_BODY_BYTES = 1048576;
 var WS_AUTH_TIMEOUT_MS = 5000;
 var WS_CLOSE_UNAUTHORIZED = 4401;
@@ -28796,17 +29069,20 @@ function websocketToken(req) {
 }
 
 class MagicContextRpcServer {
+  storageDir;
   server = null;
   port = 0;
   handlers = new Map;
   portFilePath;
   portDir;
   startedAt = Date.now();
+  stopped = false;
   instanceId = randomBytes(8).toString("hex");
   unregisterOwnInstance = null;
   sockets = new Set;
   token = randomBytes(32).toString("hex");
   constructor(storageDir, directory) {
+    this.storageDir = storageDir;
     this.portFilePath = rpcPortFilePath(storageDir, directory, process.pid, this.instanceId);
     this.portDir = rpcPortDir(storageDir, directory);
   }
@@ -28824,6 +29100,10 @@ class MagicContextRpcServer {
       log2("rpc server skipped: Bun runtime not available (no TUI consumer)");
       return 0;
     }
+    this.stopped = false;
+    await reapDeadRpcDiscovery(this.storageDir);
+    if (this.stopped)
+      return 0;
     this.startedAt = Date.now();
     const self = this;
     const server = inRootAsyncContext2(() => Bun.serve({
@@ -28855,7 +29135,7 @@ class MagicContextRpcServer {
     try {
       this.warnIfOtherLiveInstance();
       this.unregisterOwnInstance ??= registerOwnRpcServerInstance(this.instanceId);
-      writeStorageFileAtomicSync(this.portFilePath, JSON.stringify({
+      const publish = () => writeStorageFileAtomicSync(this.portFilePath, JSON.stringify({
         port: this.port,
         pid: process.pid,
         started_at: this.startedAt,
@@ -28863,6 +29143,13 @@ class MagicContextRpcServer {
         token: this.token,
         instance_id: this.instanceId
       }));
+      try {
+        publish();
+      } catch (error) {
+        if (error.code !== "ENOENT")
+          throw error;
+        publish();
+      }
       log2(`[rpc] server listening on 127.0.0.1:${this.port}`);
     } catch (err) {
       log2(`[rpc] failed to write port file: ${err}`);
@@ -28870,6 +29157,7 @@ class MagicContextRpcServer {
     return this.port;
   }
   stop() {
+    this.stopped = true;
     for (const ws of this.sockets) {
       try {
         if (ws.data.authTimer)
@@ -28886,6 +29174,9 @@ class MagicContextRpcServer {
     try {
       unlinkSync(this.portFilePath);
     } catch {}
+    try {
+      rmdirSync(this.portDir);
+    } catch {}
     this.unregisterOwnInstance?.();
     this.unregisterOwnInstance = null;
   }
@@ -29033,7 +29324,7 @@ function json(body, status = 200) {
 // src/shared/models-dev-temperature.ts
 import { readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 var CATALOG_PROVIDER_ALIASES = {
   "google-antigravity": "google",
   "opencode-zen": "opencode"
@@ -29043,7 +29334,7 @@ var cached;
 function modelsDevCatalogPath(env = process.env) {
   if (env.OPENCODE_MODELS_PATH)
     return env.OPENCODE_MODELS_PATH;
-  return join7(env.XDG_CACHE_HOME || join7(homedir2(), ".cache"), "opencode", "models.json");
+  return join8(env.XDG_CACHE_HOME || join8(homedir2(), ".cache"), "opencode", "models.json");
 }
 function buildIndex(raw) {
   const index = new Map;