@cortexkit/opencode-magic-context 0.49.24 → 0.49.25

package/dist/raw-ordinal-warmup-worker.js

@@ -51,7 +51,7 @@ async function main() {
       await runMessageFtsRowidMapBackfill(db);
       reply = { kind: "fts-rowid-backfill" };
     } else if (input.searchArchive) {
-      const { renderSearchArchive } = await import("./search-archive-c00etw7k.js");
+      const { renderSearchArchive } = await import("./search-archive-mfabzyn2.js");
       const { readRawSessionMessageIdOrdinalsForRangeFromDb } = await import("./read-session-raw-s4amywnh.js");
       const archive = input.searchArchive;
       let raw;
@@ -84,7 +84,7 @@ async function main() {
         { configureContextDatabasePragmas }
       ] = await Promise.all([
         import("./harness-e4avh192.js"),
-        import("./message-index-1sgzev6c.js"),
+        import("./message-index-3g966xn7.js"),
         import("./sqlite-context-pragmas-mv9jqwjh.js")
       ]);
       setHarness(input.harness ?? "opencode");
@@ -104,7 +104,7 @@ async function main() {
       const { setHarness } = await import("./harness-e4avh192.js");
       setHarness(input.harness ?? "opencode");
       const [{ indexMessageInShortChunks }, { configureContextDatabasePragmas }] = await Promise.all([
-        import("./message-index-bounded-k8pgrxad.js"),
+        import("./message-index-bounded-vaeqhp9w.js"),
         import("./sqlite-context-pragmas-mv9jqwjh.js")
       ]);
       configureContextDatabasePragmas(db);

package/dist/{read-session-chunk-q9z6s48t.js → read-session-chunk-z5gnc0zb.js}

@@ -35,12 +35,12 @@ import {
   readSessionChunk2,
   getRawSessionMessageIdsThrough2,
   readRawSessionSeedTail2
-} from "./index-t1zk694n.js";
+} from "./index-yrrsp47d.js";
 import"./index-whcgcfrv.js";
 import"./index-1zx87sdm.js";
 import"./index-c9zrgcnt.js";
 import"./index-nxrsns5x.js";
-import"./index-j76ah6d7.js";
+import"./index-cfaet9cg.js";
 import"./index-x9k3mqrf.js";
 import"./index-58e3y90n.js";
 import"./index-7tdtpqrg.js";

package/dist/{recomp-orchestrator-hr8ddk8z.js → recomp-orchestrator-qwqeskhq.js}

@@ -7,11 +7,11 @@ import {
   setRecompTerminal2,
   buildRecompDeps2,
   runManagedRecomp2
-} from "./index-jd0y50w3.js";
-import"./index-dds7cxhz.js";
+} from "./index-zzrzjnx5.js";
+import"./index-0s8454t2.js";
 import"./index-qgh1qwjj.js";
 import"./index-z928hmnp.js";
-import"./index-p6evxfcc.js";
+import"./index-awcftgmx.js";
 import"./index-sd3egckz.js";
 import"./index-t6j3qxnd.js";
 import"./index-z05n7702.js";
@@ -20,7 +20,7 @@ import"./index-4dhv7mqz.js";
 import"./index-spwjbkc7.js";
 import"./index-jcr6pe7z.js";
 import"./index-qt1qqasc.js";
-import"./index-t1zk694n.js";
+import"./index-yrrsp47d.js";
 import"./index-whcgcfrv.js";
 import"./index-1zx87sdm.js";
 import"./index-c9zrgcnt.js";
@@ -31,14 +31,14 @@ import"./index-nxrsns5x.js";
 import"./index-kfyb3k6n.js";
 import"./index-3d5wnkq7.js";
 import"./index-wfybj1dw.js";
-import"./index-jrjr58ez.js";
+import"./index-q7ywt6xt.js";
 import"./index-fb3zxn06.js";
 import"./index-9q1g3c5q.js";
 import"./index-kq5w68dp.js";
 import"./index-szf8r0ba.js";
 import"./index-fr0wbhdn.js";
 import"./index-c7phnbvk.js";
-import"./index-j76ah6d7.js";
+import"./index-cfaet9cg.js";
 import"./index-x9k3mqrf.js";
 import"./index-58e3y90n.js";
 import"./index-7tdtpqrg.js";

package/dist/{search-3zjjmc60.js → search-84zfqeky.js}

@@ -5,16 +5,16 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-21bkd3m6.js";
+} from "./index-n18sch77.js";
 import"./index-kaqs6h31.js";
 import"./index-z928hmnp.js";
-import"./index-p6evxfcc.js";
+import"./index-awcftgmx.js";
 import"./index-t6j3qxnd.js";
 import"./index-z05n7702.js";
 import"./index-jjvbk92s.js";
 import"./index-4dhv7mqz.js";
 import"./index-qt1qqasc.js";
-import"./index-t1zk694n.js";
+import"./index-yrrsp47d.js";
 import"./index-whcgcfrv.js";
 import"./index-1zx87sdm.js";
 import"./index-c9zrgcnt.js";
@@ -28,7 +28,7 @@ import"./index-kq5w68dp.js";
 import"./index-szf8r0ba.js";
 import"./index-fr0wbhdn.js";
 import"./index-c7phnbvk.js";
-import"./index-j76ah6d7.js";
+import"./index-cfaet9cg.js";
 import"./index-x9k3mqrf.js";
 import"./index-58e3y90n.js";
 import"./index-7tdtpqrg.js";

package/dist/{search-archive-c00etw7k.js → search-archive-mfabzyn2.js}

@@ -1,14 +1,14 @@
 import {
   renderSearchArchive2,
   renderSearchArchiveOffThread2
-} from "./index-57jf5ztp.js";
+} from "./index-bhyksfyy.js";
 import"./index-kaqs6h31.js";
-import"./index-t1zk694n.js";
+import"./index-yrrsp47d.js";
 import"./index-whcgcfrv.js";
 import"./index-1zx87sdm.js";
 import"./index-c9zrgcnt.js";
 import"./index-nxrsns5x.js";
-import"./index-j76ah6d7.js";
+import"./index-cfaet9cg.js";
 import"./index-x9k3mqrf.js";
 import"./index-58e3y90n.js";
 import"./index-7tdtpqrg.js";

package/dist/{transform-postprocess-phase-rredw6bz.js → transform-postprocess-phase-hr1ntmjj.js}

@@ -19,11 +19,11 @@ import {
   finalizeMessageRepresentation2,
   runPostTransformPhase2,
   checkM0MutationDriftAndSignal2
-} from "./index-8e9qsnrw.js";
-import"./index-dds7cxhz.js";
+} from "./index-axjgxeww.js";
+import"./index-0s8454t2.js";
 import"./index-qgh1qwjj.js";
 import"./index-z928hmnp.js";
-import"./index-p6evxfcc.js";
+import"./index-awcftgmx.js";
 import"./index-sd3egckz.js";
 import"./index-t6j3qxnd.js";
 import"./index-z05n7702.js";
@@ -32,7 +32,7 @@ import"./index-4dhv7mqz.js";
 import"./index-spwjbkc7.js";
 import"./index-jcr6pe7z.js";
 import"./index-qt1qqasc.js";
-import"./index-t1zk694n.js";
+import"./index-yrrsp47d.js";
 import"./index-whcgcfrv.js";
 import"./index-1zx87sdm.js";
 import"./index-c9zrgcnt.js";
@@ -43,14 +43,14 @@ import"./index-nxrsns5x.js";
 import"./index-kfyb3k6n.js";
 import"./index-3d5wnkq7.js";
 import"./index-wfybj1dw.js";
-import"./index-jrjr58ez.js";
+import"./index-q7ywt6xt.js";
 import"./index-fb3zxn06.js";
 import"./index-9q1g3c5q.js";
 import"./index-kq5w68dp.js";
 import"./index-szf8r0ba.js";
 import"./index-fr0wbhdn.js";
 import"./index-c7phnbvk.js";
-import"./index-j76ah6d7.js";
+import"./index-cfaet9cg.js";
 import"./index-x9k3mqrf.js";
 import"./index-58e3y90n.js";
 import"./index-7tdtpqrg.js";

package/dist/v2/auto-search-worker.js

@@ -28,7 +28,7 @@ var [
   import("./embedding-cache-mgyr73ef.js"),
   import("./storage-memory-e6a7mb0k.js"),
   import("./project-embedding-registry-e7zftfvj.js"),
-  import("./search-6dawx2gt.js"),
+  import("./search-hav4dggf.js"),
   import("./compartment-chunk-embedding-tk6g4q80.js"),
   import("./embedding-activity-g1dhes6g.js"),
   import("./harness-e4avh192.js"),

package/dist/v2/chunk-embedding-write-worker.js

@@ -34,12 +34,12 @@ import"./server-k3t06fxr.js";
 import {
   LATEST_SUPPORTED_VERSION,
   enforceSchemaFence
-} from "./server-y9ncq4ck.js";
+} from "./server-e75vag9d.js";
 import"./server-wwaw5npa.js";
 import"./server-rqebawx1.js";
 import"./server-fr0wbhdn.js";
 import"./server-2ra6pwf3.js";
-import"./server-d1dzgvwd.js";
+import"./server-7d6m1p2b.js";
 import"./server-gyy4k6mf.js";
 
 // src/features/magic-context/chunk-embedding-write-worker.ts

package/dist/v2/{context-zbydzq4g.js → context-y7wfvdve.js}

@@ -286,7 +286,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-r209n2fk.js";
+} from "./server-7weh65vd.js";
 import {
   resolveHistorianModel2
 } from "./server-5kym00ag.js";
@@ -311,7 +311,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-y9ncq4ck.js";
+} from "./server-e75vag9d.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -337,7 +337,6 @@ import {
   inspectProcessesAsync
 } from "./server-k3t06fxr.js";
 import {
-  BoundedSessionMap,
   LkgRecoveryFenceError,
   lkgServedArrayDigest,
   takeLkgRecoveryLockSweepPage,
@@ -362,7 +361,7 @@ import {
   clearIndexedMessages2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./server-mefps930.js";
+} from "./server-6a8pxpxg.js";
 import"./server-51779zs2.js";
 import {
   inRootAsyncContext2,
@@ -717,12 +716,13 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-gwmshgx9.js";
+} from "./server-5brp2rfn.js";
 import {
+  BoundedSessionMap,
+  recordToolDefinitionSet,
   getCurrentToolSetHash,
-  recordToolDefinition,
   getMeasuredToolDefinitionTokens
-} from "./server-d1dzgvwd.js";
+} from "./server-7d6m1p2b.js";
 import"./server-wxrdher8.js";
 import {
   SubcClient,
@@ -914,14 +914,14 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-9e55n4wx.js";
+} from "./server-tfawsj08.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
 import"./server-kaqs6h31.js";
 import {
   renderSearchArchiveOffThread2
-} from "./server-16dpnz56.js";
+} from "./server-m6yyn961.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -7448,7 +7448,8 @@ function measureLkgReplayRequest(args) {
       systemPromptTokens: args.systemPromptTokens,
       providerID: args.model?.providerID,
       modelID: args.model?.modelID,
-      agentName: args.agentName
+      agentName: args.agentName,
+      sessionId: args.sessionId
     })
   });
 }
@@ -16920,7 +16921,8 @@ function createRustModeTransform(deps, options) {
             systemPromptTokens: sessionMeta.systemPromptTokens,
             providerID: model?.providerID,
             modelID: model?.modelID,
-            agentName: deps.getNotificationParams?.(sessionId)?.agent
+            agentName: deps.getNotificationParams?.(sessionId)?.agent,
+            sessionId
           })
         });
         if (measure.fit !== "under") {
@@ -17491,7 +17493,8 @@ function createRustModeTransform(deps, options) {
         systemPromptTokens: sessionMeta.systemPromptTokens,
         providerID: model?.providerID,
         modelID: model?.modelID,
-        agentName: deps.getNotificationParams?.(sessionId)?.agent
+        agentName: deps.getNotificationParams?.(sessionId)?.agent,
+        sessionId
       }) : undefined;
       const renderIdentityFields = {
         modelKey: modelKey ?? null,
@@ -18023,6 +18026,7 @@ function createRustModeTransform(deps, options) {
             providerID: model?.providerID,
             modelID: model?.modelID,
             agentName: deps.getNotificationParams?.(sessionId)?.agent,
+            sessionId,
             systemPromptHash: sessionMeta.systemPromptHash
           }, resolvedWindowGeometry?.usableHard ?? resolvedContextLimit);
           const refusal = outgoingContextRefusal(servedFinalWireEstimate, resolvedWindowGeometry?.usableHard ?? resolvedContextLimit, protectedToolTokenCount(getActiveTagsBySession2(deps.db, sessionId), deps.protectedTools, resolveDecisionCalibration(model?.providerID, model?.modelID))) ?? (signedThinkingReset ? signedTurnContextRefusal(servedFinalWireEstimate, resolvedWindowGeometry?.usableHard ?? resolvedContextLimit) : undefined);
@@ -18258,6 +18262,7 @@ function createRustModeTransform(deps, options) {
         providerID: model?.providerID,
         modelID: model?.modelID,
         agentName: deps.getNotificationParams?.(sessionId)?.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       });
       captureOpencodeReasoningBudgetStatus(sessionId, output.messages, resolveKeepReasoningTokens(deps.keepReasoningTokens, modelKey ?? undefined), isPrefixBoundThinkingModel(model?.providerID, model?.modelID));
@@ -18521,6 +18526,27 @@ function createRustModeTransform(deps, options) {
   return adapter;
 }
 
+// src/hooks/magic-context/signed-thinking-fit-snapshot.ts
+function takeSignedThinkingFitSnapshot(args) {
+  let snapshot = null;
+  if (args.held && !args.compactionOff) {
+    try {
+      snapshot = cloneKeepingCoveredInstructionMarks(args.entryOrder);
+    } catch (error) {
+      sessionLog2(args.sessionId, `signed thinking fit: could not copy the pass input (${error instanceof Error ? error.message : String(error)}); an over-window held request will be refused rather than retried`);
+    }
+  }
+  snapshotObserver?.({
+    sessionId: args.sessionId,
+    held: args.held,
+    activeAnthropicThinkingTurn: args.activeAnthropicThinkingTurn,
+    compactionOff: args.compactionOff,
+    snapshot
+  });
+  return snapshot;
+}
+var snapshotObserver;
+
 // src/hooks/magic-context/signed-thinking-hold.ts
 var HEAVY_REASONING_TOKENS = 1500;
 var HEAVY_REASONING_WINDOW_STEPS = 15;
@@ -19132,7 +19158,7 @@ function createTransform(deps) {
     const startTime = performance.now();
     const historianRun = deps.resolveHistorianRun?.();
     const messages = output.messages;
-    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? cloneKeepingCoveredInstructionMarks(messages) : null;
+    const entryOrderForThinkingFit = messages.slice();
     const coveredHostInstructions = takeCoveredInstructionRows(messages);
     const passOutcome = createPassOutcome();
     const tSessionId = performance.now();
@@ -19486,7 +19512,8 @@ function createTransform(deps) {
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: runNotificationParams(sessionId)?.agent
+          agentName: runNotificationParams(sessionId)?.agent,
+          sessionId
         });
         const incomingTokens = incoming.messageTokens.conversation + incoming.messageTokens.toolCall;
         if (unmanagedOverWindowCarried || isClearlyOverWindow(incomingTokens, resolvedContextLimit)) {
@@ -19532,6 +19559,13 @@ function createTransform(deps) {
     }) : null;
     activeThinkingPrefixHold = signedThinkingPrefixBound && (compactionOff || signedThinkingHold?.held === true);
     freezeM0M1 ||= activeThinkingPrefixHold;
+    const originalForThinkingFit = takeSignedThinkingFitSnapshot({
+      sessionId,
+      entryOrder: entryOrderForThinkingFit,
+      held: activeThinkingPrefixHold,
+      activeAnthropicThinkingTurn: activeThinkingTurn,
+      compactionOff
+    });
     const prefixHoldLogKey = signedThinkingHold ? `${currentTurnId}:${signedThinkingHold.reason}:${signedThinkingHold.heavyStepsBack ?? "none"}` : freezeM0M1 ? `${currentTurnId}:directory` : null;
     if (prefixHoldLogKey !== null && prefixHoldLogTurnIds.get(sessionId) !== prefixHoldLogKey) {
       prefixHoldLogTurnIds.set(sessionId, prefixHoldLogKey);
@@ -20023,7 +20057,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
       } catch (error) {
         sessionLog2(sessionId, `transform: wire-estimate pressure fallback unavailable: ${getErrorMessage(error)}`);
@@ -20191,6 +20226,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
           agentName: notificationParams.agent,
+          sessionId,
           systemPromptHash: sessionMeta.systemPromptHash
         }, boundaryContextLimit);
       } catch {
@@ -20205,13 +20241,15 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         providerID: modelForBudget?.providerID,
         modelID: modelForBudget?.modelID,
         agentName: notificationParams.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       }, boundaryContextLimit) : undefined);
       if (finalWireEstimate) {
         sessionLog2(sessionId, `transform: final-wire telemetry estimate=${finalWireEstimate.tokens} trusted=${finalWireEstimate.trusted} conversation=${finalWireEstimate.messageTokens.conversation} tools=${finalWireEstimate.messageTokens.toolCall} system=${finalWireEstimate.systemTokens} toolDefinitions=${finalWireEstimate.toolDefinitionTokens ?? "unknown"} tail=${finalWireTail}`);
       }
       if ((finalWireEstimate?.refusalGrade || finalWireEstimate?.refusalBasis === "byte-bound" && finalWireEstimate.refusalTokens !== undefined) && boundaryContextLimit > 0 && (finalWireEstimate.refusalTokens ?? finalWireEstimate.tokens) > boundaryContextLimit) {
-        if (!thinkingFitRetries.has(sessionId) && activeThinkingPrefixHold && originalForThinkingFit && hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID)) {
+        const signedFitRetryWanted = !thinkingFitRetries.has(sessionId) && activeThinkingPrefixHold && hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID);
+        if (signedFitRetryWanted && originalForThinkingFit) {
           thinkingFitRetries.add(sessionId);
           requestPendingMaterialization(deps.pendingMaterializationSessions, sessionId, "fit_retry");
           messages.splice(0, messages.length, ...originalForThinkingFit);
@@ -20222,7 +20260,10 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           }
           return;
         }
-        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit || signedFitPreviouslyRefused) {
+        if (signedFitRetryWanted) {
+          sessionLog2(sessionId, "signed thinking fit: the held request is over the window and no copy of the pass input exists to retry from; refusing it");
+        }
+        if (signedFitRetryWanted || thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit || 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");
@@ -20234,7 +20275,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         if (untrimmed.tokens > boundaryContextLimit) {
           sessionLog2(sessionId, `history boundary unresolved: prefix trim refused and the untrimmed request estimate ${untrimmed.tokens} (trusted=${untrimmed.trusted}) exceeds the context limit ${boundaryContextLimit}; not sending it`);
@@ -20247,7 +20289,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         const servedTokens = served.toolDefinitionsMeasured ? served.rawTokens ?? served.tokens : Math.max(0, sessionMeta.systemPromptTokens) + served.messageTokens.conversation + served.messageTokens.toolCall;
         if (!Number.isFinite(servedTokens) || servedTokens > unmanagedOverWindowPass.limit) {
@@ -20325,7 +20368,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
             systemPromptTokens: sessionMeta.systemPromptTokens,
             providerID: modelForBudget?.providerID,
             modelID: modelForBudget?.modelID,
-            agentName: notificationParams.agent
+            agentName: notificationParams.agent,
+            sessionId
           });
         } catch (error) {
           sessionLog2(sessionId, "degraded pass size guard could not estimate:", error);
@@ -20541,6 +20585,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         providerID: modelForBudget?.providerID,
         modelID: modelForBudget?.modelID,
         agentName: notificationParams.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       });
   };
@@ -23066,7 +23111,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
       if (model) {
         activeProviderID = model.providerID;
         activeModelID = model.modelID;
-        measuredToolDefTokens = getMeasuredToolDefinitionTokens(model.providerID, model.modelID, agent) ?? 0;
+        measuredToolDefTokens = getMeasuredToolDefinitionTokens(model.providerID, model.modelID, agent, sessionId) ?? 0;
       }
     }
     const contextLimit = typeof moduleContextLimit === "number" && moduleContextLimit > 0 ? moduleContextLimit : activeProviderID && activeModelID ? resolveContextLimit(activeProviderID, activeModelID, {
@@ -23780,7 +23825,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-nmt9y25j.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-e8a4jpvr.js"));
     const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-f8scq6ae.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
@@ -23865,7 +23910,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-9z81xj66.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-ycs8y6n4.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -52903,12 +52948,18 @@ function applyV2PromptSurfaceTools(draft, runtime, config, smartNotesEnabled = t
 function recordV2ToolDefinitions(draft) {
   if (!draft.tools)
     return;
+  const tools = [];
   for (const [id, tool] of Object.entries(draft.tools)) {
     if (!tool)
       continue;
     recordToolParameters(id, tool.input);
-    recordToolDefinition(draft.model.providerID, draft.model.id, draft.agent, id, typeof tool.description === "string" ? tool.description : "", tool.input);
+    tools.push({
+      id,
+      description: typeof tool.description === "string" ? tool.description : "",
+      parameters: tool.input
+    });
   }
+  recordToolDefinitionSet(draft.model.providerID, draft.model.id, draft.agent, tools, draft.sessionID);
 }
 async function applyV2SystemPrompt(systemPrompt, draft) {
   resolveCtxReduceAvailabilityFromMessages(draft.sessionID, draft.messages.map((message) => ({
@@ -53561,7 +53612,7 @@ async function registerContext(context) {
       projectDirectory: directory,
       hardSignals: {
         systemHash: state.systemPromptHash ?? "",
-        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent),
+        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent, draft.sessionID),
         modelKey: `${draft.model.providerID}/${draft.model.id}`,
         cacheExpired: false,
         lastResponseTime: state.lastResponseTime
@@ -53949,7 +54000,7 @@ async function registerContext(context) {
           const model = liveModels.get(sessionId);
           if (!model)
             return "";
-          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId));
+          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
         },
         channel1StateBySession: channel1,
         historyRefreshSessions,

package/dist/v2/hooks/context.d.ts

@@ -72,6 +72,10 @@ export declare function applyV2PromptSurfaceTools(draft: SessionContext, runtime
  * the wire, and it is keyed by the same {provider, model, agent} triple the status and sidebar
  * handlers look the measurement up by.
  *
+ * The draft is the request's exact tool set, so it replaces the route's measured set and becomes
+ * this session's figure: a tool an earlier request carried, or another session's request carried,
+ * does not count toward this request's size.
+ *
  * Measuring changes no served byte: the resulting tool-set hash is an attribution marker that the
  * m[0] materialization decision records but never folds on.
  */

package/dist/v2/hooks/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/v2/hooks/context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/v2/hooks/context.ts"],"names":[],"mappings":"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"}

package/dist/v2/{message-index-bounded-a9xa8wsq.js → message-index-bounded-te303atj.js}

@@ -13,7 +13,7 @@ import {
   markMessageIndexDirty2,
   getIndexableContent2,
   indexSingleMessage2
-} from "./server-mefps930.js";
+} from "./server-6a8pxpxg.js";
 import"./server-1zx87sdm.js";
 import"./server-fa7vtp40.js";
 import"./server-3mz2qh5a.js";
@@ -24,8 +24,8 @@ import"./server-cpjk5jd2.js";
 import"./server-swvhxhxz.js";
 import"./server-2ra6pwf3.js";
 import"./server-3vhxy2k5.js";
-import"./server-gwmshgx9.js";
-import"./server-d1dzgvwd.js";
+import"./server-5brp2rfn.js";
+import"./server-7d6m1p2b.js";
 import"./server-wxrdher8.js";
 import"./server-ab1g0wn9.js";
 import"./server-pw21ypwb.js";

package/dist/v2/{message-index-5gnnn64b.js → message-index-fz6b4jeh.js}

@@ -17,8 +17,8 @@ import {
   indexMessagesAfterOrdinal2,
   indexSourcesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./server-mefps930.js";
-import"./server-gwmshgx9.js";
+} from "./server-6a8pxpxg.js";
+import"./server-5brp2rfn.js";
 import"./server-fa7vtp40.js";
 import"./server-1zx87sdm.js";
 import"./server-3vhxy2k5.js";
@@ -27,7 +27,7 @@ import"./server-pw21ypwb.js";
 import"./server-ab1g0wn9.js";
 import"./server-wxrdher8.js";
 import"./server-k3t06fxr.js";
-import"./server-d1dzgvwd.js";
+import"./server-7d6m1p2b.js";
 import"./server-rqebawx1.js";
 import"./server-2ra6pwf3.js";
 import"./server-swvhxhxz.js";

package/dist/v2/migration-worker.js

@@ -18,13 +18,13 @@ import"./server-fb3zxn06.js";
 import {
   setSqlitePragmaConfig,
   initializeDatabase
-} from "./server-y9ncq4ck.js";
+} from "./server-e75vag9d.js";
 import"./server-51779zs2.js";
 import"./server-cpjk5jd2.js";
 import"./server-swvhxhxz.js";
 import"./server-wxrdher8.js";
 import"./server-3mz2qh5a.js";
-import"./server-d1dzgvwd.js";
+import"./server-7d6m1p2b.js";
 import {
   closeQuietly
 } from "./server-8ajstryz.js";

package/dist/v2/raw-ordinal-warmup-worker.js

@@ -51,7 +51,7 @@ async function main() {
       await runMessageFtsRowidMapBackfill(db);
       reply = { kind: "fts-rowid-backfill" };
     } else if (input.searchArchive) {
-      const { renderSearchArchive } = await import("./search-archive-dhqj1w31.js");
+      const { renderSearchArchive } = await import("./search-archive-vrwgxv6z.js");
       const { readRawSessionMessageIdOrdinalsForRangeFromDb } = await import("./read-session-raw-ppjxnqk4.js");
       const archive = input.searchArchive;
       let raw;
@@ -84,7 +84,7 @@ async function main() {
         { configureContextDatabasePragmas }
       ] = await Promise.all([
         import("./harness-e4avh192.js"),
-        import("./message-index-5gnnn64b.js"),
+        import("./message-index-fz6b4jeh.js"),
         import("./sqlite-context-pragmas-mv9jqwjh.js")
       ]);
       setHarness(input.harness ?? "opencode");
@@ -104,7 +104,7 @@ async function main() {
       const { setHarness } = await import("./harness-e4avh192.js");
       setHarness(input.harness ?? "opencode");
       const [{ indexMessageInShortChunks }, { configureContextDatabasePragmas }] = await Promise.all([
-        import("./message-index-bounded-a9xa8wsq.js"),
+        import("./message-index-bounded-te303atj.js"),
         import("./sqlite-context-pragmas-mv9jqwjh.js")
       ]);
       configureContextDatabasePragmas(db);

package/dist/v2/{read-session-chunk-qqvda7zv.js → read-session-chunk-knvkq1hf.js}

@@ -35,12 +35,12 @@ import {
   readSessionChunk2,
   getRawSessionMessageIdsThrough2,
   readRawSessionSeedTail2
-} from "./server-gwmshgx9.js";
+} from "./server-5brp2rfn.js";
 import"./server-fa7vtp40.js";
 import"./server-1zx87sdm.js";
 import"./server-3vhxy2k5.js";
 import"./server-24g8r2d0.js";
-import"./server-d1dzgvwd.js";
+import"./server-7d6m1p2b.js";
 import"./server-rqebawx1.js";
 import"./server-2ra6pwf3.js";
 import"./server-swvhxhxz.js";