@cortexkit/opencode-magic-context 0.49.15 → 0.49.17

package/dist/{index-42vcjcwe.js → index-aabzay3h.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-mht7bq0z.js";
+} from "./index-hqhm3wke.js";
 import {
   observeTemporalDecisions,
   stableStringify
@@ -160,14 +161,14 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./index-1sarmj9z.js";
+} from "./index-wgypt3cs.js";
 import {
   isRawCompactionSummaryInfo2,
   extractInMemoryMessageViews2,
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./index-mmfa86mt.js";
+} from "./index-s734jcsr.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -175,7 +176,7 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-1d289pq2.js";
+} from "./index-kq82mtg0.js";
 import {
   expandToolPart,
   estimateTrueRawMessageTokens,
@@ -296,10 +297,10 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-944w16m0.js";
+} from "./index-p7m7j0cp.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./index-n6m03s3n.js";
+} from "./index-ke416mdc.js";
 import {
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
@@ -313,7 +314,7 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-yxycg7fs.js";
+} from "./index-fb2qxs2y.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -332,7 +333,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -503,7 +504,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-snp5wbge.js";
+} from "./index-a7c4r5re.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -531,7 +532,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-y1qysm3q.js";
+} from "./index-ze7mvk54.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -539,7 +540,7 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./index-fkx2qnvw.js";
+} from "./index-6x57ar45.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
@@ -551,6 +552,7 @@ import {
   prepareLkgCaptureFence,
   certifyCommittedLkgCapture,
   markLkgRecoveryDirty,
+  gaDatabasePath,
   getMessageIndexSourceIdentity2,
   isMessageIndexSourceCurrent2,
   getLastIndexedOrdinal2,
@@ -559,8 +561,8 @@ import {
   clearIndexedMessages2,
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-thvnpfsv.js";
+  sweepOrphanedOpenCodeMessageIndexesCooperatively2
+} from "./index-cwzfcbtq.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -604,7 +606,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-bxdg2nbt.js";
+} from "./index-v8awdgvd.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -614,7 +616,7 @@ import {
 } from "./index-x8a7jmkh.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./index-e20m7284.js";
+} from "./index-bjcnntmz.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -622,7 +624,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-3kdm78zp.js";
+} from "./index-24fezq97.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -647,7 +649,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-n78avt2p.js";
+} from "./index-n37sebck.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -663,23 +665,22 @@ import {
   SubcModuleTransport,
   indexCommitsForProject,
   embedUnembeddedCommits,
-  withMessageFtsSessionFilter,
   createUnifiedSearchDiagnostics2,
   parseIdShapedQuery2,
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-xn6q9pg6.js";
+} from "./index-vrzjhftj.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-dgs16axy.js";
+} from "./index-s74zqahq.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-1vc7jrkg.js";
+} from "./index-nkpmm9q8.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -721,6 +722,7 @@ import {
   prewarmTagOwners,
   waitForTagOwners,
   stripStructuralNoise,
+  withTransformTimingSummary,
   logTransformTiming,
   hasRecentAssistantCommit,
   tagMessages,
@@ -732,7 +734,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-ts1hjk1h.js";
+} from "./index-4yt7dtf4.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -743,6 +745,9 @@ import {
 import {
   resolvePromptContext2
 } from "./index-fmsr7v69.js";
+import {
+  renderSearchArchiveOffThread2
+} from "./index-kmdj7dsq.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -11609,9 +11614,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 {
@@ -11623,7 +11633,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: "",
@@ -11822,7 +11832,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");
@@ -11872,6 +11882,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) {
@@ -12105,10 +12118,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})`);
@@ -16270,8 +16293,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-nwzcfhx4.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-24r4esbh.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-z3ecszx6.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-6ve0e8p4.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -16355,7 +16378,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-28xzsj5q.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-j7d7ry5b.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -17848,6 +17871,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",
@@ -17878,6 +17902,7 @@ class HistorianHostRunner {
         timeoutMs: attemptMs,
         signal,
         fallbackModels: rest.map(withVariant),
+        allowModelSuggestions: false,
         callContext: `historian-host:${claim.runId}`,
         fetchOutput: () => withinAttempt(executor.collect(handle, 50), attemptStartedAt + attemptMs - Date.now(), attemptMs, signal).catch((error) => {
           recordAttempt(undefined, error);
@@ -23984,6 +24009,7 @@ function resolveTransformHostSeams(deps) {
     hostRefuse: deps.hostRefuse ?? abortSessionFailClosed2
   };
 }
+var SIGNED_FIT_REFUSED_MARKER = "signed_fit:refused:v1";
 function createTransform(deps) {
   registerSystemDateRefresh(deps.historyRefreshSessions);
   const finalWireUsage = createFinalWireUsageTracker();
@@ -24657,7 +24683,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);
@@ -24682,7 +24709,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)
@@ -24905,7 +24933,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const protectedTagIds = protectedTagNumbers;
     const protectedCutoff = protectionWindow.cutoff;
     const tPostProcess = performance.now();
-    dropProjectionEmergency = thinkingFitRetries.has(sessionId) || contextUsage.percentage >= 95;
+    dropProjectionEmergency = contextUsage.percentage >= 95;
     const postTransformResult = await runPostTransformPhase2({
       opencode2: deps.storeGeneration === "v2",
       normalizeRecoveryTail,
@@ -24924,7 +24952,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       client: deps.client,
       activeAgent,
       batch,
-      contextUsage: thinkingFitRetries.has(sessionId) ? { ...contextUsage, percentage: Math.max(95, contextUsage.percentage) } : contextUsage,
+      contextUsage,
       usableWindow: resolvedContextLimit ?? 0,
       schedulerDecision,
       schedulerDeferReason,
@@ -25009,6 +25037,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       postTransformResult.bustedThisPass = true;
     passOutcome.markFinalized();
     const finalWireTail = describeFinalWireTail(messages);
+    const signedFitPreviouslyRefused = !compactionOff && getMergedReasoningStrippedIds(db, sessionId).has(SIGNED_FIT_REFUSED_MARKER);
     let finalWireEstimate;
     if (postTransformResult.bustedThisPass) {
       try {
@@ -25026,7 +25055,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     }
     if (!compactionOff) {
       const emergencyUsagePercentage = usagePercentageSynthetic ? Math.max(95, contextUsage.percentage) : windowGeometry?.usableHard && contextUsage.inputTokens > 0 ? contextUsage.inputTokens / windowGeometry.usableHard * 100 : contextUsage.percentage;
-      finalWireEstimate = finalWireEstimate ?? (emergencyUsagePercentage >= 95 || schedulerDecision === "execute" ? finalWireUsage.estimate(sessionId, {
+      finalWireEstimate = finalWireEstimate ?? (emergencyUsagePercentage >= 95 || schedulerDecision === "execute" || signedFitPreviouslyRefused ? finalWireUsage.estimate(sessionId, {
         messages,
         systemPromptTokens: sessionMeta.systemPromptTokens,
         providerID: modelForBudget?.providerID,
@@ -25049,8 +25078,11 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           }
           return;
         }
-        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit)
+        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit || signedFitPreviouslyRefused) {
+          if (!signedFitPreviouslyRefused && !addMergedReasoningStrippedIds(db, sessionId, [SIGNED_FIT_REFUSED_MARKER]))
+            throw contextRefusalError("Cannot persist the signed-fit refusal");
           throw contextRefusalError("The request remains over the model window after stripping signed thinking and reclaiming context");
+        }
       }
       if (postTransformResult.prefixTrimStatus === "refused") {
         const untrimmed = finalWireEstimate ?? estimateFinalWireInputTokens({
@@ -25362,7 +25394,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);
@@ -25583,6 +25616,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 = `
@@ -25605,6 +25658,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)
@@ -25737,8 +25791,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);
@@ -25782,6 +25839,7 @@ function createSystemPromptHashHandler(deps) {
   return {
     handler,
     clearSession: (sessionId) => {
+      diagnosticPrompts.delete(sessionId);
       clearSystemDateRefresh(deps.historyRefreshSessions, sessionId);
       guidanceEpochs.clear(sessionId);
       clearSystemPromptHashSession(sessionId, {
@@ -26510,7 +26568,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);
 }
@@ -26734,61 +26792,11 @@ 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.`;
 }
 
-// src/tools/ctx-expand/search-archive.ts
-function renderSearchArchive(db, sessionId, start, end, tokenBudget, archiveOnly = false) {
-  return withMessageFtsSessionFilter(db, sessionId, (sessionFirst) => {
-    let rawIds;
-    const rows = db.prepare(sessionFirst ? `SELECT f.message_ordinal AS ordinal, f.message_id AS id, f.role, f.content
-                   FROM message_fts_rowid_map AS m
-                   JOIN message_history_fts AS f ON f.rowid = m.fts_rowid
-                   WHERE m.session_id = ?1 AND m.message_ordinal BETWEEN ?2 AND ?3
-                     AND f.session_id = ?1 AND f.message_ordinal BETWEEN ?2 AND ?3
-                   ORDER BY m.message_ordinal` : `SELECT message_ordinal AS ordinal, message_id AS id, role, content
-                   FROM message_history_fts
-                   WHERE session_id = ?1 AND message_ordinal BETWEEN ?2 AND ?3
-                   ORDER BY CAST(message_ordinal AS INTEGER)`);
-    const blocks = [];
-    let tokens = 0;
-    let lastOrdinal = start - 1;
-    let truncated = false;
-    for (const row of rows.iterate(sessionId, start, end)) {
-      if (!row.content)
-        continue;
-      if (!archiveOnly) {
-        rawIds ??= readRawSessionMessageIdOrdinalsForRange2(sessionId, start, end);
-        if (rawIds.get(row.id) === row.ordinal)
-          continue;
-      }
-      const block = `[${row.ordinal}] ${row.role === "user" ? "U" : "A"}: ${row.content}`;
-      const cost = estimateTokens(block);
-      if (blocks.length > 0 && tokens + cost > tokenBudget) {
-        truncated = true;
-        break;
-      }
-      blocks.push(block);
-      tokens += cost;
-      lastOrdinal = row.ordinal;
-    }
-    if (blocks.length === 0)
-      return null;
-    const text = [
-      "From the search archive: indexed text only; no surrounding messages or tool output.",
-      "",
-      ...blocks
-    ];
-    if (truncated) {
-      text.push("", `Truncated at message ${lastOrdinal} (budget: ~${tokenBudget} tokens). Call ctx_expand(start=${lastOrdinal + 1}, end=${end}) for more archived text.`);
-    }
-    return text.join(`
-`);
-  });
-}
-
 // src/tools/ctx-expand/tools.ts
 var ctxExpandArgsShape = {
   tag: tool.schema.union([tool.schema.number(), tool.schema.string()]).optional().describe("Tag number from a §N§ tag or a [dropped §N§] placeholder, not a message ordinal. Returns that one item in full. Use alone."),
@@ -26822,7 +26830,7 @@ function createCtxExpandTool(deps) {
         return renderItemByTag(deps.db, sessionId, mode.tag);
       }
       if (mode.kind === "message") {
-        return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
+        return await renderSearchArchiveOffThread2(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
       }
       const { start, end, verbose } = mode;
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -26830,7 +26838,7 @@ function createCtxExpandTool(deps) {
         return `Range ${start}-${end} is entirely within the live tail (after the last compacted message ${lastCompartmentEnd}); those messages are already visible in context.`;
       }
       const effectiveEnd = lastCompartmentEnd >= 0 ? Math.min(end, lastCompartmentEnd) : end;
-      const archived = renderSearchArchive(deps.db, sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
+      const archived = await renderSearchArchiveOffThread2(deps.db, sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
       if (archived)
         return archived;
       if (verbose) {
@@ -28340,7 +28348,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
@@ -28404,11 +28412,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,
@@ -28815,7 +28823,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;
@@ -28838,17 +28897,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);
   }
@@ -28866,6 +28928,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({
@@ -28897,7 +28963,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,
@@ -28905,6 +28971,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}`);
@@ -28912,6 +28985,7 @@ class MagicContextRpcServer {
     return this.port;
   }
   stop() {
+    this.stopped = true;
     for (const ws of this.sockets) {
       try {
         if (ws.data.authTimer)
@@ -28928,6 +29002,9 @@ class MagicContextRpcServer {
     try {
       unlinkSync(this.portFilePath);
     } catch {}
+    try {
+      rmdirSync(this.portDir);
+    } catch {}
     this.unregisterOwnInstance?.();
     this.unregisterOwnInstance = null;
   }
@@ -29075,7 +29152,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"
@@ -29085,7 +29162,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;