@cortexkit/opencode-magic-context 0.49.31 → 0.49.33

package/dist/v2/{context-cdqw9jex.js → context-3c4z2wj5.js}

@@ -72,6 +72,7 @@ import {
   pluginConfigReader,
   currentPluginConfigReader,
   withLiveDreamerOutputCap,
+  v2ToolDefinitionsHash,
   acquireCompartmentLease,
   releaseCompartmentLeaseBestEffort,
   isCompartmentLeaseHeld,
@@ -304,7 +305,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-rdjgz95f.js";
+} from "./server-aqbm9c8d.js";
 import {
   resolveHistorianModel2
 } from "./server-5kym00ag.js";
@@ -712,13 +713,34 @@ import {
 import {
   cleanSearchText,
   matchedSearchSnippet,
-  getLastIndexedOrdinal,
-  getMessageIndexReconciliationStartOrdinal,
-  isMessageIndexReconciledThrough,
-  clearIndexedMessages,
-  indexMessagesAfterOrdinal
+  getLastIndexedOrdinal
 } from "./server-hwag0khr.js";
 import"./server-awr8qa4c.js";
+import {
+  getMessageIndexEpoch,
+  isMessageIndexSearchable,
+  scheduleReconciliation,
+  scheduleClearAndReindex,
+  getMessageIndexQueueHeapStats,
+  renderSingleStoreMigrationRequiredRefusal,
+  SingleStoreMigrationRequiredError,
+  singleStoreMigrationRequiredFailure,
+  projectNeedsSingleStoreMigration,
+  STORE_AHEAD_OF_BINARY_CODE,
+  storeAheadOfBinaryFailure,
+  TRANSFORM_PAGE_UPLOAD_TIMEOUT_MS,
+  transformColdStartExecuteTimeoutMs,
+  getDefaultSubcConnectionFile,
+  isModuleTransportGenerationChangedResult,
+  SubcModuleTransport,
+  indexCommitsForProject,
+  embedUnembeddedCommits,
+  createUnifiedSearchDiagnostics2,
+  parseIdShapedQuery2,
+  resolveMemoriesByIdsForSearch2,
+  unifiedSearch2,
+  formatSearchResults2
+} from "./server-n14edf07.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -748,7 +770,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-zh3esb0z.js";
+} from "./server-ab8017gw.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -759,7 +781,7 @@ import {
 } from "./server-ab1g0wn9.js";
 import {
   deleteChunkEmbedBackoffForSession2
-} from "./server-4sn3at8p.js";
+} from "./server-h1byrhwx.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -825,7 +847,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-ph300d6m.js";
+} from "./server-tkdabx8q.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -859,7 +881,7 @@ import {
 } from "./server-vr4szghm.js";
 import {
   cosineSimilarity
-} from "./server-p0snacz3.js";
+} from "./server-2aasmpsp.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -897,26 +919,6 @@ import {
   flushIgnoredMessages2,
   sendStatusNotification2
 } from "./server-qc915kw2.js";
-import {
-  renderSingleStoreMigrationRequiredRefusal,
-  SingleStoreMigrationRequiredError,
-  singleStoreMigrationRequiredFailure,
-  projectNeedsSingleStoreMigration,
-  STORE_AHEAD_OF_BINARY_CODE,
-  storeAheadOfBinaryFailure,
-  TRANSFORM_PAGE_UPLOAD_TIMEOUT_MS,
-  transformColdStartExecuteTimeoutMs,
-  getDefaultSubcConnectionFile,
-  isModuleTransportGenerationChangedResult,
-  SubcModuleTransport,
-  indexCommitsForProject,
-  embedUnembeddedCommits,
-  createUnifiedSearchDiagnostics2,
-  parseIdShapedQuery2,
-  resolveMemoriesByIdsForSearch2,
-  unifiedSearch2,
-  formatSearchResults2
-} from "./server-42nebt63.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
@@ -1739,234 +1741,6 @@ function summarizeManualDream(summary) {
 `);
 }
 
-// src/features/magic-context/message-index-async.ts
-var indexCancellations = new Map;
-var sessionEpochs = new Map;
-var workerMeasurements = new WeakMap;
-function isDatabaseLockedError(error) {
-  if (!error || typeof error !== "object")
-    return false;
-  const e = error;
-  if (typeof e.code === "string") {
-    if (e.code === "SQLITE_BUSY" || e.code === "SQLITE_LOCKED")
-      return true;
-  }
-  if (typeof e.message === "string") {
-    if (/database is locked/i.test(e.message))
-      return true;
-    if (/sqlite_(busy|locked)/i.test(e.message))
-      return true;
-  }
-  return false;
-}
-var RECONCILIATION_BATCH_SIZE = 100;
-
-class MagicContextMessageIndexHeapHolder {
-  reconciledSessions = new Set;
-  reconciledSnapshots = new Map;
-  stalledSessions = new Set;
-  reconciliationScheduledSessions = new Set;
-  clearAndReindexScheduledSessions = new Map;
-  sessionLocks = new Map;
-  incrementalTimers = new Map;
-  pendingIncrementalKeys = new Set;
-  completedIncrementalKeys = new Set;
-  activeReconcilerBuffers = new Map;
-}
-var heapHolder = new MagicContextMessageIndexHeapHolder;
-function clearCompletedIncrementalKeys(sessionId) {
-  const prefix = `${sessionId}\x00`;
-  for (const key of heapHolder.completedIncrementalKeys) {
-    if (key.startsWith(prefix))
-      heapHolder.completedIncrementalKeys.delete(key);
-  }
-}
-var PREPARE_RETRY_MS = 60000;
-async function sourceReady(source, sessionId) {
-  const prepare = source?.prepare;
-  return typeof prepare === "function" ? prepare(sessionId) : true;
-}
-function defer(fn) {
-  const immediate = globalThis.setImmediate;
-  if (typeof immediate === "function") {
-    inRootAsyncContext2(() => immediate(fn));
-    return;
-  }
-  inRootAsyncContext2(() => setTimeout(fn, 0));
-}
-function yieldToEventLoop() {
-  return new Promise((resolve) => defer(resolve));
-}
-function runWithSessionLock(sessionId, operation) {
-  const previous = heapHolder.sessionLocks.get(sessionId) ?? Promise.resolve();
-  const run = previous.catch(() => {
-    return;
-  }).then(async () => {
-    await operation();
-  });
-  heapHolder.sessionLocks.set(sessionId, run);
-  run.finally(() => {
-    if (heapHolder.sessionLocks.get(sessionId) === run) {
-      heapHolder.sessionLocks.delete(sessionId);
-    }
-  }).catch(() => {
-    return;
-  });
-  return run;
-}
-function logIndexingError(sessionId, action, error) {
-  if (isDatabaseLockedError(error)) {
-    sessionLog2(sessionId, `message FTS async ${action} skipped (database busy; will retry on next reconciliation)`);
-    return;
-  }
-  sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
-  log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
-}
-function serializedMessageBytes(messages) {
-  try {
-    return Buffer.byteLength(JSON.stringify(messages));
-  } catch {
-    return 0;
-  }
-}
-function logReconciliationStall(sessionId, reason) {
-  if (heapHolder.stalledSessions.has(sessionId))
-    return;
-  heapHolder.stalledSessions.add(sessionId);
-  sessionLog2(sessionId, `message FTS reconciliation stalled: ${reason}; will retry`);
-}
-async function reconcileSessionIndex(db, sessionId, readMessages) {
-  if (!await sourceReady(readMessages, sessionId)) {
-    logReconciliationStall(sessionId, "raw message reader is not ready");
-    return false;
-  }
-  await runWithSessionLock(sessionId, async () => {
-    if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId))
-      return;
-    let fallbackSnapshot = null;
-    try {
-      const fullReader = typeof readMessages === "function" ? readMessages : null;
-      const revision = readMessages.getRevision?.(sessionId);
-      const previous = heapHolder.reconciledSnapshots.get(sessionId);
-      const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
-      let cursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
-      let after = cursor === previous?.count ? previous.after : undefined;
-      while (cursor < finalWatermark) {
-        const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
-        const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
-        const retainedMessages = fallbackSnapshot ?? messages;
-        heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
-        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal(db, sessionId, messages, cursor, pageEnd));
-        const nextCursor = getMessageIndexReconciliationStartOrdinal(db, sessionId);
-        if (nextCursor <= cursor)
-          break;
-        cursor = nextCursor;
-        const last = messages.at(-1);
-        after = last?.ordinal === cursor && typeof last.createdAt === "number" ? { timeCreated: last.createdAt, id: last.id } : undefined;
-        if (cursor < finalWatermark) {
-          await yieldToEventLoop();
-        }
-      }
-      if (isMessageIndexReconciledThrough(db, sessionId, finalWatermark)) {
-        heapHolder.reconciledSessions.add(sessionId);
-        if (revision !== undefined) {
-          if (!after && finalWatermark > 0 && readMessages.readPage) {
-            const last = readMessages.readPage(sessionId, finalWatermark - 1, 1, finalWatermark).at(-1);
-            if (last?.ordinal === finalWatermark && typeof last.createdAt === "number")
-              after = { timeCreated: last.createdAt, id: last.id };
-          }
-          heapHolder.reconciledSnapshots.set(sessionId, {
-            revision,
-            count: finalWatermark,
-            after
-          });
-        }
-      } else {
-        logReconciliationStall(sessionId, `gap after ordinal ${cursor} (store count ${finalWatermark})`);
-      }
-    } finally {
-      heapHolder.activeReconcilerBuffers.delete(sessionId);
-    }
-  });
-  return true;
-}
-function scheduleReconciliation(db, sessionId, readMessages) {
-  if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
-    return;
-  }
-  heapHolder.reconciliationScheduledSessions.add(sessionId);
-  scheduleAfterBootQuiet(() => {
-    defer(() => {
-      let appendedDuringReconciliation = false;
-      const previousSnapshot = heapHolder.reconciledSnapshots.get(sessionId);
-      reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
-        if (ran) {
-          const snapshot = heapHolder.reconciledSnapshots.get(sessionId);
-          appendedDuringReconciliation = snapshot !== undefined && snapshot !== previousSnapshot && readMessages.getRevision !== undefined && readMessages.getRevision(sessionId) !== snapshot.revision;
-          return;
-        }
-        inRootAsyncContext2(() => setTimeout(() => {
-          heapHolder.reconciliationScheduledSessions.delete(sessionId);
-          scheduleReconciliation(db, sessionId, readMessages);
-        }, PREPARE_RETRY_MS)).unref?.();
-      }).catch((error) => {
-        logReconciliationStall(sessionId, error instanceof Error ? error.message : String(error));
-        if (isDatabaseLockedError(error))
-          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
-      }).finally(() => {
-        heapHolder.reconciliationScheduledSessions.delete(sessionId);
-        if (appendedDuringReconciliation)
-          scheduleReconciliation(db, sessionId, readMessages);
-      });
-    });
-  });
-}
-function scheduleClearAndReindex(db, sessionId, readMessages) {
-  heapHolder.reconciledSessions.delete(sessionId);
-  heapHolder.reconciledSnapshots.delete(sessionId);
-  heapHolder.reconciliationScheduledSessions.delete(sessionId);
-  clearCompletedIncrementalKeys(sessionId);
-  const existing = heapHolder.clearAndReindexScheduledSessions.get(sessionId);
-  if (existing) {
-    existing.source = readMessages;
-    return;
-  }
-  const pending = { source: readMessages };
-  heapHolder.clearAndReindexScheduledSessions.set(sessionId, pending);
-  scheduleAfterBootQuiet(() => {
-    defer(() => {
-      let cleared = false;
-      runWithSessionLock(sessionId, () => {
-        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) !== pending)
-          return;
-        heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
-        heapHolder.reconciledSessions.delete(sessionId);
-        heapHolder.reconciledSnapshots.delete(sessionId);
-        clearCompletedIncrementalKeys(sessionId);
-        clearIndexedMessages(db, sessionId);
-        cleared = true;
-      }).then(() => cleared ? reconcileSessionIndex(db, sessionId, pending.source) : undefined).catch((error) => {
-        heapHolder.reconciledSessions.delete(sessionId);
-        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) === pending)
-          heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
-        logIndexingError(sessionId, "clear and reindex", error);
-      });
-    });
-  });
-}
-function getMessageIndexQueueHeapStats() {
-  return {
-    queueLength: heapHolder.reconciliationScheduledSessions.size + heapHolder.incrementalTimers.size + heapHolder.pendingIncrementalKeys.size,
-    reconciliationScheduled: heapHolder.reconciliationScheduledSessions.size,
-    incrementalTimers: heapHolder.incrementalTimers.size,
-    pendingIncremental: heapHolder.pendingIncrementalKeys.size,
-    activeSessionLocks: heapHolder.sessionLocks.size,
-    completedIncrementalKeys: heapHolder.completedIncrementalKeys.size,
-    activeBufferMessages: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + messages.length, 0),
-    activeBufferBytes: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + serializedMessageBytes(messages), 0)
-  };
-}
-
 // src/shared/model-cache-ttl.ts
 var MODEL_CACHE_LIFETIMES = [
   {
@@ -4328,6 +4102,8 @@ class AutoSearchBusyError extends Error {
   }
 }
 async function searchAutoHint(db, sessionId, projectPath, query, options, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url)) {
+  const messageIndexEpoch = getMessageIndexEpoch(sessionId);
+  const messageIndexWasSearchable = isMessageIndexSearchable(sessionId);
   const {
     rerankConfig: _rerankConfig,
     rerankClient: _rerankClient,
@@ -4336,7 +4112,8 @@ async function searchAutoHint(db, sessionId, projectPath, query, options, entry
     captureRerankLanes: _captureRerankLanes,
     ...hintOptions
   } = options;
-  return executeAutoSearchWorker(db, sessionId, projectPath, query, { ...hintOptions, explicitSearch: false, rerank: false }, entry, "search");
+  const results = await executeAutoSearchWorker(db, sessionId, projectPath, query, { ...hintOptions, explicitSearch: false, rerank: false }, entry, "search");
+  return messageIndexWasSearchable && isMessageIndexSearchable(sessionId) && getMessageIndexEpoch(sessionId) === messageIndexEpoch ? results : results.filter((result) => result.source !== "message");
 }
 var pendingBackfills = new WeakMap;
 var searchWorkers = new WeakMap;
@@ -5812,16 +5589,47 @@ function getDreamTaskBacklog(db, projectPath, task, options = {}) {
   }
 }
 var backlogCaches = new WeakMap;
+var displayBacklogCaches = new WeakMap;
+var DISPLAY_BACKLOG_MAX_AGE_MS = 60000;
 function getDreamTaskBacklogs(db, projectPath, tasks = CANONICAL_DREAM_TASKS, options = {}) {
   if (tasks.length === 0)
     return {};
   if (!isKnownAutocommit(db)) {
     backlogCaches.delete(db);
+    displayBacklogCaches.delete(db);
     const result = {};
     for (const task of tasks)
       result[task] = getDreamTaskBacklog(db, projectPath, task, options);
     return result;
   }
+  if (options.display) {
+    let entries = displayBacklogCaches.get(db);
+    if (!entries) {
+      entries = new Map;
+      displayBacklogCaches.set(db, entries);
+    }
+    const optionKey = (value) => value === undefined ? "omitted" : value === null ? "null" : `number:${value}`;
+    const key = JSON.stringify([
+      projectPath,
+      tasks,
+      optionKey(options.lastRunAt),
+      optionKey(options.retrospectiveWatermarkMs)
+    ]);
+    const now = Date.now();
+    const cached = entries.get(key);
+    if (cached && now < cached.expiresAt && now >= cached.expiresAt - DISPLAY_BACKLOG_MAX_AGE_MS)
+      return structuredClone(cached.value);
+    const value = {};
+    for (const task of tasks)
+      value[task] = getDreamTaskBacklog(db, projectPath, task, options);
+    if (entries.size >= 256)
+      entries.delete(entries.keys().next().value);
+    entries.set(key, {
+      expiresAt: now + DISPLAY_BACKLOG_MAX_AGE_MS,
+      value: structuredClone(value)
+    });
+    return value;
+  }
   let cache = backlogCaches.get(db);
   if (!cache) {
     cache = {
@@ -7607,6 +7415,7 @@ function hasSmallToolInput(target) {
 var CACHE_LOSING_FOLD_REASONS = new Set([
   "model_change",
   "system_hash",
+  "tool_definitions",
   "ttl_idle",
   "host_compaction"
 ]);
@@ -10709,6 +10518,10 @@ async function runPostTransformPhase(args) {
       sessionLog2(args.sessionId, "transform: m[0] HARD fold pre-execution failed:", getErrorMessage(error));
     }
     sessionLog2(args.sessionId, `m[0] HARD fold decision: reason=${m0MaterializeReason ?? foldDueDecision.reason ?? (foldExecutedThisPass ? "drift" : "soft_refresh")} executed=${foldExecutedThisPass} bustsServedPrefix=${foldBustsServedPrefixThisPass}`);
+    const toolChange = m0ComparisonDecision?.toolDefinitionsChange;
+    if (foldExecutedThisPass && toolChange) {
+      sessionLog2(args.sessionId, "m[0] request tool definitions changed:", JSON.stringify(toolChange));
+    }
   }
   logTransformTiming(args.sessionId, "pp.prefixPreflight", tPostprocessSetup, `foldExecuted=${foldExecutedThisPass} m1Refreshed=${publishedM1RefreshedThisPass}`);
   const tPassDecisions = performance.now();
@@ -13433,7 +13246,7 @@ var MODULE_PAGE_MAX_BYTES = SUBC_MAX_FRAME_BODY_BYTES - MODULE_PAGE_ENVELOPE_HEA
 var MODULE_ITEM_CONTINUATION_CHUNK_BYTES = 64 * 1024;
 var MODULE_ITEM_CONTINUATION_KEY = "__shadow_item_continuation";
 var MODULE_ORDINAL_PAGE_SIZE = 500;
-function yieldToEventLoop2() {
+function yieldToEventLoop() {
   return new Promise((resolve) => setTimeout(resolve, 0));
 }
 function canonicalJson(value) {
@@ -13523,7 +13336,7 @@ async function resolveOrdinalsForModule(args) {
         pageEnds.push({ anchor: pageAnchor, entryCount: entries.length });
         if (page.length < MODULE_ORDINAL_PAGE_SIZE)
           break;
-        await yieldToEventLoop2();
+        await yieldToEventLoop();
       }
       return { entries, end: pageAnchor, pageEnds };
     };
@@ -20178,6 +19991,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const m0HardSignals = {
       systemHash: hardSystemHash,
       toolSetHash: hardToolSetHash,
+      toolDefinitionsHash: deps.getToolDefinitionsHash?.(sessionId),
       modelKey: hardModelKey,
       cacheExpired: hardCacheExpired,
       lastResponseTime: sessionMeta.lastResponseTime,
@@ -23270,7 +23084,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
     const dreamerProgress = projectIdentity ? liveSessionState?.dreamerProgressByProject?.get(projectIdentity) ?? null : null;
     if (projectIdentity) {
       try {
-        dreamerBacklog = getDreamTaskBacklogs(db, projectIdentity, CANONICAL_DREAM_TASKS.filter((task) => smartNotesEnabled || task !== "evaluate-smart-notes"));
+        dreamerBacklog = getDreamTaskBacklogs(db, projectIdentity, CANONICAL_DREAM_TASKS.filter((task) => smartNotesEnabled || task !== "evaluate-smart-notes"), { display: true });
       } catch {}
     }
     if (projectIdentity) {
@@ -24022,7 +23836,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-kdxr4tx8.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-qfqdvbta.js"));
     const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-x5nzy34v.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
@@ -24107,7 +23921,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-prfvyqbb.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-ga5vfmwr.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -53504,6 +53318,7 @@ async function registerContext(context) {
   const hiddenSessionErrors = new Map;
   const hiddenModelActivity = new HiddenModelActivity;
   const liveModels = new Map;
+  const toolDefinitionsHashes = new BoundedSessionMap(1000);
   const promptSurfaceRuntime = createPromptSurfaceRuntime({
     harness: "opencode2",
     directory,
@@ -54085,6 +53900,7 @@ async function registerContext(context) {
       hardSignals: {
         systemHash: state.systemPromptHash ?? "",
         toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent, draft.sessionID),
+        toolDefinitionsHash: toolDefinitionsHashes.get(draft.sessionID),
         modelKey: `${draft.model.providerID}/${draft.model.id}`,
         cacheExpired: false,
         lastResponseTime: state.lastResponseTime
@@ -54215,6 +54031,7 @@ async function registerContext(context) {
         return "";
       return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
     },
+    getToolDefinitionsHash: (sessionId) => toolDefinitionsHashes.get(sessionId),
     channel1StateBySession: channel1,
     historyRefreshSessions,
     pendingMaterializationSessions,
@@ -54440,6 +54257,7 @@ async function registerContext(context) {
       if (admissionDb)
         hideSubagentTools(draft, admissionDb);
       recordV2ToolDefinitions(draft);
+      toolDefinitionsHashes.set(draft.sessionID, v2ToolDefinitionsHash(draft.tools));
       if (await recordUsage(draft, true) && !compactionOff) {
         const storageReason = storage.current() ? null : storage.reason();
         if (storageReason) {

package/dist/v2/{embedding-backfill-35k6czrr.js → embedding-backfill-f43hd8y6.js}

@@ -1,13 +1,13 @@
 import {
   ensureMemoryEmbeddings2
-} from "./server-p0snacz3.js";
-import"./server-zh3esb0z.js";
+} from "./server-2aasmpsp.js";
+import"./server-ab8017gw.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-vr4szghm.js";
 import"./server-24g8r2d0.js";
 import"./server-bsgd4dk1.js";
-import"./server-4sn3at8p.js";
+import"./server-h1byrhwx.js";
 import"./server-ab1g0wn9.js";
 import"./server-qjvk4a9t.js";
 import"./server-awr8qa4c.js";

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

@@ -64,7 +64,7 @@ export declare function removeDreamerOnlyTools(draft: SessionContext): void;
 /** Rewrite Magic Context ctx_* tool descriptions for this draft's model. */
 export declare function applyV2PromptSurfaceTools(draft: SessionContext, runtime: PromptSurfaceRuntime, config: PromptSurfaceConfig | undefined, smartNotesEnabled?: boolean): void;
 /**
- * Measure the tool definitions this request is actually going to send.
+ * Measure the tool definitions visible to this session's context hook.
  *
  * OpenCode 1 measures the same thing through its `tool.definition` hook; OpenCode 2 has no such
  * hook, but the request draft carries the whole tool set, so the draft is the measurement seam.
@@ -76,8 +76,8 @@ export declare function applyV2PromptSurfaceTools(draft: SessionContext, runtime
  * 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.
+ * Measuring changes no served byte. The names-only measurement hash remains attribution;
+ * the separate request-definition hash is captured by the managed context hook.
  */
 export declare function recordV2ToolDefinitions(draft: SessionContext): void;
 /**

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/{project-embedding-registry-p1p10ks7.js → project-embedding-registry-1x5qe2fy.js}

@@ -35,13 +35,13 @@ import {
   sweepAllRegisteredProjects2,
   _setTestProviderFactoryForProject2,
   _resetProjectEmbeddingRegistryForTests2
-} from "./server-zh3esb0z.js";
+} from "./server-ab8017gw.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-vr4szghm.js";
 import"./server-24g8r2d0.js";
 import"./server-bsgd4dk1.js";
-import"./server-4sn3at8p.js";
+import"./server-h1byrhwx.js";
 import"./server-ab1g0wn9.js";
 import"./server-qjvk4a9t.js";
 import"./server-awr8qa4c.js";

package/dist/v2/{recomp-orchestrator-kdxr4tx8.js → recomp-orchestrator-qfqdvbta.js}

@@ -7,13 +7,13 @@ import {
   setRecompTerminal2,
   buildRecompDeps2,
   runManagedRecomp2
-} from "./server-rdjgz95f.js";
+} from "./server-aqbm9c8d.js";
 import"./server-806rzhs6.js";
-import"./server-ph300d6m.js";
+import"./server-tkdabx8q.js";
 import"./server-hwag0khr.js";
-import"./server-p0snacz3.js";
+import"./server-2aasmpsp.js";
 import"./server-jjvbk92s.js";
-import"./server-zh3esb0z.js";
+import"./server-ab8017gw.js";
 import"./server-4dhv7mqz.js";
 import"./server-53eh1r8r.js";
 import"./server-qc915kw2.js";
@@ -29,7 +29,7 @@ import"./server-x8a7jmkh.js";
 import"./server-vr4szghm.js";
 import"./server-24g8r2d0.js";
 import"./server-bsgd4dk1.js";
-import"./server-4sn3at8p.js";
+import"./server-h1byrhwx.js";
 import"./server-ab1g0wn9.js";
 import"./server-d01pe8q5.js";
 import"./server-fb3zxn06.js";

package/dist/v2/{search-q3jjw6zp.js → search-q3wkpe8t.js}

@@ -5,13 +5,13 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-42nebt63.js";
+} from "./server-n14edf07.js";
 import"./server-kaqs6h31.js";
-import"./server-ph300d6m.js";
+import"./server-tkdabx8q.js";
 import"./server-hwag0khr.js";
-import"./server-p0snacz3.js";
+import"./server-2aasmpsp.js";
 import"./server-jjvbk92s.js";
-import"./server-zh3esb0z.js";
+import"./server-ab8017gw.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-rb8m4vry.js";
@@ -21,7 +21,7 @@ import"./server-a7x00tw8.js";
 import"./server-vr4szghm.js";
 import"./server-24g8r2d0.js";
 import"./server-bsgd4dk1.js";
-import"./server-4sn3at8p.js";
+import"./server-h1byrhwx.js";
 import"./server-ab1g0wn9.js";
 import"./server-6g98c227.js";
 import"./server-fr0wbhdn.js";

package/dist/v2/{server-p0snacz3.js → server-2aasmpsp.js}

@@ -15,7 +15,7 @@ import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./server-zh3esb0z.js";
+} from "./server-ab8017gw.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";