@cortexkit/opencode-magic-context 0.49.24 → 0.49.25

package/dist/v2/{recomp-orchestrator-nmt9y25j.js → recomp-orchestrator-e8a4jpvr.js}

@@ -7,10 +7,10 @@ import {
   setRecompTerminal2,
   buildRecompDeps2,
   runManagedRecomp2
-} from "./server-r209n2fk.js";
+} from "./server-7weh65vd.js";
 import"./server-806rzhs6.js";
 import"./server-9xbbaekh.js";
-import"./server-mefps930.js";
+import"./server-6a8pxpxg.js";
 import"./server-8j2e7t31.js";
 import"./server-jjvbk92s.js";
 import"./server-q5z0gag0.js";
@@ -18,7 +18,7 @@ import"./server-4dhv7mqz.js";
 import"./server-53eh1r8r.js";
 import"./server-6v3cdzsx.js";
 import"./server-qt1qqasc.js";
-import"./server-gwmshgx9.js";
+import"./server-5brp2rfn.js";
 import"./server-fa7vtp40.js";
 import"./server-1zx87sdm.js";
 import"./server-3vhxy2k5.js";
@@ -31,14 +31,14 @@ import"./server-24g8r2d0.js";
 import"./server-bsgd4dk1.js";
 import"./server-pw21ypwb.js";
 import"./server-ab1g0wn9.js";
-import"./server-y9ncq4ck.js";
+import"./server-e75vag9d.js";
 import"./server-fb3zxn06.js";
 import"./server-wwaw5npa.js";
 import"./server-fr0wbhdn.js";
 import"./server-qjvk4a9t.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/{search-archive-dhqj1w31.js → search-archive-vrwgxv6z.js}

@@ -1,14 +1,14 @@
 import {
   renderSearchArchive2,
   renderSearchArchiveOffThread2
-} from "./server-16dpnz56.js";
+} from "./server-m6yyn961.js";
 import"./server-kaqs6h31.js";
-import"./server-gwmshgx9.js";
+import"./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";

package/dist/v2/{search-6dawx2gt.js → search-hav4dggf.js}

@@ -5,16 +5,16 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-9e55n4wx.js";
+} from "./server-tfawsj08.js";
 import"./server-kaqs6h31.js";
 import"./server-9xbbaekh.js";
-import"./server-mefps930.js";
+import"./server-6a8pxpxg.js";
 import"./server-8j2e7t31.js";
 import"./server-jjvbk92s.js";
 import"./server-q5z0gag0.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
-import"./server-gwmshgx9.js";
+import"./server-5brp2rfn.js";
 import"./server-fa7vtp40.js";
 import"./server-1zx87sdm.js";
 import"./server-3vhxy2k5.js";
@@ -28,7 +28,7 @@ import"./server-fr0wbhdn.js";
 import"./server-qjvk4a9t.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/{server-gwmshgx9.js → server-5brp2rfn.js}

@@ -79,9 +79,9 @@ import {
 } from "./server-3vhxy2k5.js";
 import {
   getToolDefinitionMeasurementSignature,
-  getLargestMeasuredToolDefinitionTokens,
-  getMeasuredToolDefinitionTokens
-} from "./server-d1dzgvwd.js";
+  getMeasuredToolDefinitionTokens,
+  getSessionToolDefinitionTokens
+} from "./server-7d6m1p2b.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical
@@ -5721,7 +5721,7 @@ function createFinalWireUsageTracker() {
   const envelopeFor = (input) => {
     if (!input.providerID || !input.modelID || !input.systemPromptHash)
       return;
-    const tools = getToolDefinitionMeasurementSignature(input.providerID, input.modelID, input.agentName);
+    const tools = getToolDefinitionMeasurementSignature(input.providerID, input.modelID, input.agentName, input.sessionId);
     if (!tools)
       return;
     return JSON.stringify([
@@ -5734,7 +5734,8 @@ function createFinalWireUsageTracker() {
     ]);
   };
   return {
-    estimate(sessionId, input, limit) {
+    estimate(sessionId, request, limit) {
+      const input = { ...request, sessionId: request.sessionId ?? sessionId };
       let measuredPrefix;
       try {
         const previous = served.get(sessionId);
@@ -5765,7 +5766,8 @@ function createFinalWireUsageTracker() {
       }
       return estimateOutgoingWireForRefusal({ ...input, measuredPrefix }, limit);
     },
-    capture(sessionId, input) {
+    capture(sessionId, request) {
+      const input = { ...request, sessionId: request.sessionId ?? sessionId };
       const previous = served.get(sessionId);
       served.delete(sessionId);
       try {
@@ -5836,7 +5838,7 @@ function estimateOutgoingWireForRefusal(input, limit) {
     if (bytes) {
       const lower = baseline + Math.ceil(bytes.bytes / 4);
       const calibration = resolveDecisionCalibration(input.providerID, input.modelID);
-      const tools = input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName) : undefined;
+      const tools = input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName, input.sessionId) : undefined;
       const envelope = measured ? baseline : tools !== undefined && Number.isFinite(input.systemPromptTokens) && input.systemPromptTokens > 0 ? providerMass({ system: input.systemPromptTokens, tools }, calibration, true) : undefined;
       const upper = envelope === undefined ? undefined : envelope + Math.ceil(bytes.bytes * Math.max(UNKNOWN_FIT_RATIO, calibration.toolsRatio, calibration.proseRatio));
       if (bytes.aborted || lower > limit || upper !== undefined && upper <= limit) {
@@ -5864,17 +5866,17 @@ function estimateFinalWireInputTokens(input) {
     total.toolCall += next.toolCall;
     return total;
   }, { conversation: 0, toolCall: 0 });
-  const measuredToolDefinitions = input.toolDefinitionTokens ?? (input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName) : undefined);
+  const measuredToolDefinitions = input.toolDefinitionTokens ?? (input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName, input.sessionId) : undefined);
   const calibration = resolveDecisionCalibration(input.providerID, input.modelID);
-  const largestToolDefinitions = measuredToolDefinitions === undefined ? getLargestMeasuredToolDefinitionTokens() : undefined;
-  const toolDefinitions = measuredToolDefinitions ?? (largestToolDefinitions === undefined ? undefined : Math.ceil(largestToolDefinitions * UNKNOWN_FIT_RATIO / (calibration.seeded ? calibration.toolsRatio : UNKNOWN_FIT_RATIO)));
+  const borrowedToolDefinitions = measuredToolDefinitions === undefined ? getSessionToolDefinitionTokens(input.sessionId) : undefined;
+  const toolDefinitions = measuredToolDefinitions ?? (borrowedToolDefinitions === undefined ? undefined : Math.ceil(borrowedToolDefinitions * UNKNOWN_FIT_RATIO / (calibration.seeded ? calibration.toolsRatio : UNKNOWN_FIT_RATIO)));
   const rawComponents = {
     system: input.systemPromptTokens,
     tools: (toolDefinitions ?? 0) + messageTokens.toolCall,
     prose: messageTokens.conversation
   };
   const tokens = providerMass(rawComponents, calibration, true);
-  const pressureToolDefinitions = measuredToolDefinitions ?? largestToolDefinitions ?? 0;
+  const pressureToolDefinitions = measuredToolDefinitions ?? borrowedToolDefinitions ?? 0;
   const pressureTokens = providerMass({
     system: rawComponents.system,
     tools: pressureToolDefinitions + messageTokens.toolCall,

package/dist/v2/{server-mefps930.js → server-6a8pxpxg.js}

@@ -35,7 +35,10 @@ import {
 } from "./server-rqebawx1.js";
 import {
   cleanUserText2
-} from "./server-gwmshgx9.js";
+} from "./server-5brp2rfn.js";
+import {
+  BoundedSessionMap
+} from "./server-7d6m1p2b.js";
 import {
   recordMessageFtsRowid2,
   recordIndexedMessageTime2,
@@ -63,51 +66,6 @@ import {
   writeStorageFileDurableAtomicSync
 } from "./server-fvnzcnww.js";
 
-// src/shared/bounded-session-map.ts
-class BoundedSessionMap {
-  maxEntries;
-  store = new Map;
-  constructor(maxEntries) {
-    if (!Number.isFinite(maxEntries) || maxEntries < 1) {
-      throw new Error(`BoundedSessionMap: maxEntries must be >= 1, got ${maxEntries}`);
-    }
-    this.maxEntries = maxEntries;
-  }
-  get(sessionId) {
-    const value = this.store.get(sessionId);
-    if (value === undefined)
-      return;
-    this.store.delete(sessionId);
-    this.store.set(sessionId, value);
-    return value;
-  }
-  peek(sessionId) {
-    return this.store.get(sessionId);
-  }
-  has(sessionId) {
-    return this.store.has(sessionId);
-  }
-  set(sessionId, value) {
-    if (this.store.has(sessionId)) {
-      this.store.delete(sessionId);
-    } else if (this.store.size >= this.maxEntries) {
-      const oldest = this.store.keys().next().value;
-      if (oldest !== undefined)
-        this.store.delete(oldest);
-    }
-    this.store.set(sessionId, value);
-  }
-  delete(sessionId) {
-    return this.store.delete(sessionId);
-  }
-  clear() {
-    this.store.clear();
-  }
-  get size() {
-    return this.store.size;
-  }
-}
-
 // src/hooks/magic-context/lkg-recovery-fence.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import {
@@ -2259,4 +2217,4 @@ async function sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource,
   }));
 }
 
-export { BoundedSessionMap, LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, takeLkgRecoveryLockSweepPage, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, cleanSearchText, keywordRelevance, matchedSearchSnippet, clearCompressionDepth, clearCompressionDepthRange, advanceSessionActivity, backfillSessionActivity, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };
+export { LkgRecoveryFenceError, clearLkgFenceProcessState, lkgServedArrayDigest, takeLkgRecoveryLockSweepPage, hasCleanLkgRecoveryFence, lkgFenceRequiresRebuild, lkgRecoveryFenceUnclean, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, commitLkgWithRecoveryFence, clearLkgRecoveryFence, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, cleanSearchText, keywordRelevance, matchedSearchSnippet, clearCompressionDepth, clearCompressionDepthRange, advanceSessionActivity, backfillSessionActivity, deleteSessionScopedRows, MESSAGE_INDEX_MAX_FTS_BYTES2, messageIndexSkipKey2, toMessageIndexSource2, getMessageIndexSourceIdentity2, isMessageIndexSourceCurrent2, getLastIndexedOrdinal2, getIndexedMessageCorpusSize2, markMessageIndexDirty2, getMessageIndexReconciliationStartOrdinal2, isMessageIndexReconciledThrough2, deleteIndexedMessage2, clearIndexedMessagesInTransaction2, clearIndexedMessages2, getIndexableContent2, indexSingleMessage2, indexMessagesAfterOrdinal2, indexSourcesAfterOrdinal2, sweepOrphanedOpenCodeMessageIndexesCooperatively2 };

package/dist/v2/server-7d6m1p2b.js

@@ -0,0 +1,361 @@
+import {
+  estimateTokens
+} from "./server-3mz2qh5a.js";
+import {
+  stableStringify
+} from "./server-rqebawx1.js";
+
+// src/features/magic-context/tool-definition-tokens.ts
+import { createHash } from "node:crypto";
+
+// src/shared/bounded-session-map.ts
+class BoundedSessionMap {
+  maxEntries;
+  store = new Map;
+  constructor(maxEntries) {
+    if (!Number.isFinite(maxEntries) || maxEntries < 1) {
+      throw new Error(`BoundedSessionMap: maxEntries must be >= 1, got ${maxEntries}`);
+    }
+    this.maxEntries = maxEntries;
+  }
+  get(sessionId) {
+    const value = this.store.get(sessionId);
+    if (value === undefined)
+      return;
+    this.store.delete(sessionId);
+    this.store.set(sessionId, value);
+    return value;
+  }
+  peek(sessionId) {
+    return this.store.get(sessionId);
+  }
+  has(sessionId) {
+    return this.store.has(sessionId);
+  }
+  set(sessionId, value) {
+    if (this.store.has(sessionId)) {
+      this.store.delete(sessionId);
+    } else if (this.store.size >= this.maxEntries) {
+      const oldest = this.store.keys().next().value;
+      if (oldest !== undefined)
+        this.store.delete(oldest);
+    }
+    this.store.set(sessionId, value);
+  }
+  delete(sessionId) {
+    return this.store.delete(sessionId);
+  }
+  clear() {
+    this.store.clear();
+  }
+  get size() {
+    return this.store.size;
+  }
+}
+
+// src/features/magic-context/tool-definition-tokens.ts
+var ACTIVITY_WINDOW_MS = 10 * 60000;
+var MAX_ACTIVITY_GAP_MS = 60000;
+var RETIRED_CACHE_LIMIT = 64;
+var WRITE_RETRY_MS = 5000;
+var WINDOWED_SINCE_KEY = "tool_definition_measurements:windowed_since";
+var routes = new Map;
+var sessionFlights = new BoundedSessionMap(1000);
+var persistenceDb = null;
+var windowedSince;
+var boundAt = 0;
+var cachedInsertStmt = null;
+var cachedDeleteStmt = null;
+function agentKey(agentName) {
+  return agentName && agentName.length > 0 ? agentName : "default";
+}
+function keyFor(providerID, modelID, agentName) {
+  return `${providerID}/${modelID}/${agentKey(agentName)}`;
+}
+function fingerprintFor(description, parameters) {
+  return createHash("sha256").update(description).update("\x00").update(stableStringify(parameters)).digest("hex");
+}
+function measure(description, parameters) {
+  let paramsText = "";
+  try {
+    paramsText = parameters === undefined ? "" : JSON.stringify(parameters);
+  } catch {
+    paramsText = "";
+  }
+  return estimateTokens(description) + estimateTokens(paramsText);
+}
+function routeFor(providerID, modelID, agentName) {
+  const key = keyFor(providerID, modelID, agentName);
+  let route = routes.get(key);
+  if (!route) {
+    route = {
+      providerID,
+      modelID,
+      agentName: agentKey(agentName),
+      tools: new Map,
+      live: false,
+      clock: 0,
+      lastWallAt: Date.now(),
+      oldestFireAt: Number.POSITIVE_INFINITY,
+      retired: new Map,
+      legacyRows: new Set
+    };
+    routes.set(key, route);
+  }
+  return { key, route };
+}
+function advanceClock(route) {
+  const now = Date.now();
+  const gap = Math.min(Math.max(now - route.lastWallAt, 0), MAX_ACTIVITY_GAP_MS);
+  route.clock += gap;
+  route.lastWallAt = Math.max(route.lastWallAt, now);
+  return route.clock;
+}
+function counts(route, slot) {
+  if (!route.live)
+    return true;
+  if (slot.legacy)
+    return false;
+  return slot.lastFireAt >= route.clock - ACTIVITY_WINDOW_MS;
+}
+function currentTools(route) {
+  return [...route.tools.entries()].filter(([, slot]) => counts(route, slot));
+}
+function summarize(entries, live) {
+  let total = 0;
+  for (const [, slot] of entries)
+    total += slot.tokens;
+  const ids = entries.map(([id]) => id).sort();
+  const fingerprints = new Map(entries.map(([id, slot]) => [
+    id,
+    slot.fingerprint ?? (live ? `stored:${slot.tokens}` : undefined)
+  ]));
+  const complete = ids.every((id) => fingerprints.get(id) !== undefined);
+  return {
+    total,
+    signature: complete ? createHash("sha256").update(JSON.stringify(ids.map((id) => [id, fingerprints.get(id)]))).digest("hex") : undefined,
+    hash: ids.length === 0 ? "" : createHash("sha256").update(ids.join("\x00")).digest("hex")
+  };
+}
+function resolve(providerID, modelID, agentName, sessionId) {
+  if (!providerID || !modelID)
+    return;
+  const key = keyFor(providerID, modelID, agentName);
+  if (sessionId) {
+    const flight = sessionFlights.peek(sessionId);
+    if (flight?.key === key && flight.exact)
+      return flight.exact;
+  }
+  const route = routes.get(key);
+  if (!route)
+    return;
+  const entries = currentTools(route);
+  if (!route.live && entries.length === 0)
+    return;
+  return summarize(entries, route.live);
+}
+function readWindowedSince(db) {
+  try {
+    const row = db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(WINDOWED_SINCE_KEY);
+    if (!row)
+      return;
+    const value = Number(row.value);
+    return Number.isFinite(value) ? value : undefined;
+  } catch {
+    return;
+  }
+}
+function markWindowed() {
+  if (windowedSince !== undefined || !persistenceDb)
+    return;
+  try {
+    persistenceDb.prepare("INSERT OR IGNORE INTO schema_migrations_meta (key, value) VALUES (?, ?)").run(WINDOWED_SINCE_KEY, String(boundAt));
+    windowedSince = readWindowedSince(persistenceDb);
+  } catch {}
+}
+function persistInsert(route, toolID, tokens) {
+  if (!persistenceDb)
+    return false;
+  try {
+    cachedInsertStmt ??= persistenceDb.prepare(`INSERT OR REPLACE INTO tool_definition_measurements
+             (provider_id, model_id, agent_name, tool_id, token_count, recorded_at)
+             VALUES (?, ?, ?, ?, ?, ?)`);
+    cachedInsertStmt.run(route.providerID, route.modelID, route.agentName, toolID, tokens, Date.now());
+  } catch {
+    cachedInsertStmt = null;
+    return false;
+  }
+  if (route.legacyRows.delete(toolID) && route.legacyRows.size === 0)
+    markWindowed();
+  return true;
+}
+function persistDelete(route, toolIDs) {
+  if (!persistenceDb)
+    return false;
+  try {
+    cachedDeleteStmt ??= persistenceDb.prepare(`DELETE FROM tool_definition_measurements
+             WHERE provider_id = ? AND model_id = ? AND agent_name = ?
+               AND tool_id IN (SELECT value FROM json_each(?))`);
+    cachedDeleteStmt.run(route.providerID, route.modelID, route.agentName, JSON.stringify(toolIDs));
+  } catch {
+    cachedDeleteStmt = null;
+    return false;
+  }
+  for (const id of toolIDs)
+    route.legacyRows.delete(id);
+  markWindowed();
+  return true;
+}
+function writeSlot(route, toolID, slot) {
+  if (slot.persisted || !persistenceDb)
+    return;
+  const now = Date.now();
+  if (slot.writeFailedAt !== undefined && now - slot.writeFailedAt < WRITE_RETRY_MS)
+    return;
+  if (persistInsert(route, toolID, slot.tokens)) {
+    slot.persisted = true;
+    slot.writeFailedAt = undefined;
+  } else {
+    slot.writeFailedAt = now;
+  }
+}
+function retire(route, toolID, slot, rowDeleted) {
+  if (slot.fingerprint === undefined)
+    return;
+  route.retired.delete(toolID);
+  route.retired.set(toolID, {
+    fingerprint: slot.fingerprint,
+    tokens: slot.tokens,
+    rowKept: slot.persisted && !rowDeleted
+  });
+  if (route.retired.size > RETIRED_CACHE_LIMIT) {
+    const oldest = route.retired.keys().next().value;
+    if (oldest !== undefined)
+      route.retired.delete(oldest);
+  }
+}
+function freshSlot(route, toolID, description, parameters, fingerprint, now) {
+  const retired = route.retired.get(toolID);
+  if (retired)
+    route.retired.delete(toolID);
+  const reuse = retired?.fingerprint === fingerprint ? retired : undefined;
+  return {
+    tokens: reuse ? reuse.tokens : measure(description, parameters),
+    fingerprint,
+    lastFireAt: now,
+    legacy: false,
+    persisted: reuse?.rowKept === true
+  };
+}
+function setDatabase(db) {
+  const rebound = persistenceDb !== null && persistenceDb !== db;
+  persistenceDb = db;
+  boundAt = Date.now();
+  cachedInsertStmt = null;
+  cachedDeleteStmt = null;
+  if (rebound) {
+    for (const route of routes.values()) {
+      for (const slot of route.tools.values()) {
+        slot.persisted = false;
+        slot.writeFailedAt = undefined;
+      }
+      for (const retired of route.retired.values())
+        retired.rowKept = false;
+      route.legacyRows.clear();
+    }
+  }
+  windowedSince = readWindowedSince(db);
+  if (windowedSince !== undefined)
+    return;
+  try {
+    if (!db.prepare("SELECT 1 FROM tool_definition_measurements LIMIT 1").get())
+      markWindowed();
+  } catch {}
+}
+function loadToolDefinitionMeasurements(db) {
+  let rows = [];
+  try {
+    rows = db.prepare("SELECT provider_id, model_id, agent_name, tool_id, token_count, recorded_at FROM tool_definition_measurements").all();
+  } catch {
+    return;
+  }
+  const since = readWindowedSince(db);
+  const loadedAt = new Map;
+  for (const row of rows) {
+    const { route } = routeFor(row.provider_id, row.model_id, row.agent_name);
+    if (route.live)
+      continue;
+    let now = loadedAt.get(route);
+    if (now === undefined) {
+      now = advanceClock(route);
+      loadedAt.set(route, now);
+    }
+    const legacy = since === undefined || !(Number(row.recorded_at) >= since);
+    route.tools.set(row.tool_id, {
+      tokens: row.token_count,
+      fingerprint: undefined,
+      lastFireAt: now,
+      legacy,
+      persisted: !legacy
+    });
+    route.oldestFireAt = Math.min(route.oldestFireAt, now);
+    if (legacy)
+      route.legacyRows.add(row.tool_id);
+    else
+      route.legacyRows.delete(row.tool_id);
+  }
+}
+function recordToolDefinitionSet(providerID, modelID, agentName, tools, sessionId) {
+  if (!providerID || !modelID)
+    return;
+  const { key, route } = routeFor(providerID, modelID, agentName);
+  const now = advanceClock(route);
+  route.live = true;
+  const next = new Map;
+  for (const tool of tools) {
+    if (!tool.id)
+      continue;
+    const fingerprint = fingerprintFor(tool.description ?? "", tool.parameters);
+    const previous = route.tools.get(tool.id);
+    if (previous && previous.fingerprint === fingerprint) {
+      previous.lastFireAt = now;
+      next.set(tool.id, previous);
+      continue;
+    }
+    next.set(tool.id, freshSlot(route, tool.id, tool.description ?? "", tool.parameters, fingerprint, now));
+  }
+  const removed = [...route.tools].filter(([id]) => !next.has(id));
+  route.tools = next;
+  route.oldestFireAt = now;
+  if (removed.length > 0) {
+    const deleted = persistDelete(route, removed.map(([id]) => id));
+    for (const [id, slot] of removed)
+      retire(route, id, slot, deleted);
+  }
+  for (const [toolID, slot] of next)
+    writeSlot(route, toolID, slot);
+  if (sessionId)
+    sessionFlights.set(sessionId, { key, exact: summarize([...next.entries()], true) });
+}
+function getCurrentToolSetHash(providerID, modelID, agentName, sessionId) {
+  return resolve(providerID, modelID, agentName, sessionId)?.hash ?? "";
+}
+function getToolDefinitionMeasurementSignature(providerID, modelID, agentName, sessionId) {
+  return resolve(providerID, modelID, agentName, sessionId)?.signature;
+}
+function getMeasuredToolDefinitionTokens(providerID, modelID, agentName, sessionId) {
+  return resolve(providerID, modelID, agentName, sessionId)?.total;
+}
+function getSessionToolDefinitionTokens(sessionId) {
+  if (!sessionId)
+    return;
+  const flight = sessionFlights.peek(sessionId);
+  if (!flight)
+    return;
+  if (flight.exact)
+    return flight.exact.total;
+  const route = routes.get(flight.key);
+  return route ? summarize(currentTools(route), route.live).total : undefined;
+}
+
+export { BoundedSessionMap, setDatabase, loadToolDefinitionMeasurements, recordToolDefinitionSet, getCurrentToolSetHash, getToolDefinitionMeasurementSignature, getMeasuredToolDefinitionTokens, getSessionToolDefinitionTokens };

package/dist/v2/{server-r209n2fk.js → server-7weh65vd.js}

@@ -75,7 +75,6 @@ import {
   isPidAlive
 } from "./server-k3t06fxr.js";
 import {
-  BoundedSessionMap,
   clearLkgFenceProcessState,
   lkgFenceRequiresRebuild,
   lkgRecoveryFenceUnclean,
@@ -90,7 +89,7 @@ import {
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./server-mefps930.js";
+} from "./server-6a8pxpxg.js";
 import {
   retreatPastHostUnservedRows,
   snapTerminalCompartmentToServedRow,
@@ -188,7 +187,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-gwmshgx9.js";
+} from "./server-5brp2rfn.js";
 import {
   getTableColumnNames
 } from "./server-rqebawx1.js";
@@ -198,7 +197,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-y9ncq4ck.js";
+} from "./server-e75vag9d.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -229,8 +228,9 @@ import {
   getMessageTimesFromOpenCodeDb
 } from "./server-3vhxy2k5.js";
 import {
+  BoundedSessionMap,
   getMeasuredToolDefinitionTokens
-} from "./server-d1dzgvwd.js";
+} from "./server-7d6m1p2b.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY,
@@ -1489,13 +1489,13 @@ function identity(slot) {
     slot.inputContentDigests
   ])).update(slot.jsonPrefix).digest("hex");
 }
-function envelope(modelKey, systemPromptTokens, agentName) {
+function envelope(modelKey, systemPromptTokens, agentName, sessionId) {
   const slash = modelKey.indexOf("/");
   return JSON.stringify([
     modelKey,
     systemPromptTokens,
     agentName,
-    getMeasuredToolDefinitionTokens(modelKey.slice(0, slash), modelKey.slice(slash + 1), agentName)
+    getMeasuredToolDefinitionTokens(modelKey.slice(0, slash), modelKey.slice(slash + 1), agentName, sessionId)
   ]);
 }
 function beginV2LkgRequest(sessionId, modelKey, previousResponseId, responseAfterSequence) {
@@ -1527,7 +1527,7 @@ function noteCapturedLkgRequest(args) {
     request,
     slot: identity(args.slot),
     prefixCount: JSON.parse(args.slot.jsonPrefix).length,
-    envelope: envelope(request.modelKey, args.systemPromptTokens, args.agentName)
+    envelope: envelope(request.modelKey, args.systemPromptTokens, args.agentName, args.sessionId)
   });
 }
 function noteLkgProviderResponse(args) {
@@ -1558,7 +1558,7 @@ function noteLkgProviderResponse(args) {
 }
 function measuredLkgPrefix(args) {
   const capture = captures.get(args.sessionId);
-  if (!capture?.usage || !args.slot || capture.slot !== identity(args.slot) || capture.request.modelKey !== args.modelKey || capture.envelope !== envelope(args.modelKey, args.systemPromptTokens, args.agentName))
+  if (!capture?.usage || !args.slot || capture.slot !== identity(args.slot) || capture.request.modelKey !== args.modelKey || capture.envelope !== envelope(args.modelKey, args.systemPromptTokens, args.agentName, args.sessionId))
     return;
   const appendedMessages = args.messages.slice(capture.prefixCount);
   if (appendedMessages[0]?.info.id !== capture.usage.responseId || appendedMessages[0]?.info.role !== "assistant" || JSON.stringify(args.messages.slice(0, capture.prefixCount)) !== args.slot.jsonPrefix)

package/dist/v2/{server-y9ncq4ck.js → server-e75vag9d.js}

@@ -65,7 +65,7 @@ import {
 import {
   setDatabase,
   loadToolDefinitionMeasurements
-} from "./server-d1dzgvwd.js";
+} from "./server-7d6m1p2b.js";
 import {
   getErrorMessage
 } from "./server-y8v6yerm.js";
@@ -1221,7 +1221,7 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       state.running = startMessageFtsRowidMapBackfill2(db, signal).then(async () => {
         if (signal.aborted || !readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-qqvda7zv.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-knvkq1hf.js"));
         const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-zvthw6xb.js"));
         if (signal.aborted)
           return;