@cortexkit/opencode-magic-context 0.49.31 → 0.49.33

package/dist/v2/{server-zh3esb0z.js → server-ab8017gw.js}

@@ -50,7 +50,7 @@ import {
   countSessionCompartmentEmbedCoverage2,
   countSessionCompartmentEmbedCoveragePolite2,
   countUnembeddedSessionCompartmentsPolite2
-} from "./server-4sn3at8p.js";
+} from "./server-h1byrhwx.js";
 import {
   acquireGitSweepLease,
   renewGitSweepLease,
@@ -74,6 +74,9 @@ import {
   getEmbeddingProviderIdentity,
   LocalEmbeddingProvider
 } from "./server-vr4szghm.js";
+import {
+  isKnownAutocommit
+} from "./server-8ajstryz.js";
 import {
   logSlowWriteTransaction
 } from "./server-gyy4k6mf.js";
@@ -276,6 +279,51 @@ function createChunkEmbeddingWriter(db) {
   };
 }
 
+// src/features/magic-context/chunk-scope-repair-revision.ts
+var revisions = new WeakMap;
+var KEY = "chunk_scope_repair_revision";
+function readChunkScopeRepairRevision(db) {
+  if (!isKnownAutocommit(db))
+    return null;
+  let state = revisions.get(db);
+  if (!state) {
+    if (!db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'schema_migrations_meta'").get())
+      return null;
+    const bump = `INSERT INTO schema_migrations_meta(key, value) VALUES ('${KEY}', lower(hex(randomblob(16))))
+            ON CONFLICT(key) DO UPDATE SET value = excluded.value;`;
+    db.exec(`CREATE TEMP TRIGGER IF NOT EXISTS mc_chunk_scope_binding_bi
+            BEFORE INSERT ON main.session_projects
+            WHEN NOT EXISTS (SELECT 1 FROM session_projects WHERE session_id = NEW.session_id
+                AND harness = NEW.harness AND project_path = NEW.project_path)
+            BEGIN ${bump} END;
+            CREATE TEMP TRIGGER IF NOT EXISTS mc_chunk_scope_binding_au
+            AFTER UPDATE ON main.session_projects
+            WHEN OLD.session_id IS NOT NEW.session_id OR OLD.harness IS NOT NEW.harness
+                OR OLD.project_path IS NOT NEW.project_path
+            BEGIN ${bump} END;
+            CREATE TEMP TRIGGER IF NOT EXISTS mc_chunk_scope_rows_bi
+            BEFORE INSERT ON main.compartment_chunk_embeddings BEGIN ${bump} END;
+            CREATE TEMP TRIGGER IF NOT EXISTS mc_chunk_scope_rows_au
+            AFTER UPDATE OF project_path, session_id, harness ON main.compartment_chunk_embeddings
+            WHEN NOT EXISTS (SELECT 1 FROM session_projects WHERE session_id = NEW.session_id
+                AND harness = NEW.harness AND project_path = NEW.project_path)
+            BEGIN ${bump} END;`);
+    const statement = db.prepare(`SELECT
+            (SELECT value FROM schema_migrations_meta WHERE key = '${KEY}') AS local,
+            (SELECT data_version FROM pragma_data_version) AS external,
+            (SELECT schema_version FROM pragma_schema_version) AS schemaVersion`);
+    state = { statement };
+    revisions.set(db, state);
+  }
+  const row = state.statement.get();
+  if (state.schemaVersion !== undefined && state.schemaVersion !== row.schemaVersion) {
+    revisions.delete(db);
+    return readChunkScopeRepairRevision(db);
+  }
+  state.schemaVersion = row.schemaVersion;
+  return JSON.stringify(row);
+}
+
 // src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
 var saveStatements = new WeakMap;
 var loadProjectStatements = new WeakMap;
@@ -1465,6 +1513,7 @@ function recordScopeActiveIdentity(db, projectIdentity, scope, modelId, now) {
   getUpsertActiveIdentityStatement(db).run(projectIdentity, scope, modelId, now);
 }
 var legacyDiscoveryComplete = new WeakMap;
+var chunkScopeRepairComplete = new WeakMap;
 function recordActiveEmbeddingIdentity(db, projectIdentity, currentProviderIdentity, currentChunkIdentity, features) {
   if (currentProviderIdentity === OFF_PROVIDER_IDENTITY) {
     return false;
@@ -1486,7 +1535,21 @@ function recordActiveEmbeddingIdentity(db, projectIdentity, currentProviderIdent
     model,
     rows: getBackfillActiveIdentityStatement(db, scope).all(projectIdentity, projectIdentity, scope)
   }));
-  const repairIds = findMisScopedCompartmentChunkEmbeddingIdsForProject(db, projectIdentity);
+  const repairKey = JSON.stringify([projectIdentity, currentChunkIdentity]);
+  const repairRevision = readChunkScopeRepairRevision(db);
+  let completed = chunkScopeRepairComplete.get(db);
+  if (!completed) {
+    completed = new Map;
+    chunkScopeRepairComplete.set(db, completed);
+  }
+  if (repairRevision === null)
+    completed.clear();
+  const repairIds = repairRevision !== null && completed.get(repairKey) === repairRevision ? [] : findMisScopedCompartmentChunkEmbeddingIdsForProject(db, projectIdentity);
+  if (repairIds.length === 0 && repairRevision !== null) {
+    if (completed.size >= 256)
+      completed.delete(completed.keys().next().value);
+    completed.set(repairKey, repairRevision);
+  }
   if (legacy.every(({ rows }) => rows.length === 0) && scopes.every(([scope, model]) => active.get(projectIdentity, scope, model)) && repairIds.length === 0) {
     for (const { scope, model } of legacy)
       discovered.add(discoveryKey(scope, model));

package/dist/v2/{server-rdjgz95f.js → server-aqbm9c8d.js}

@@ -42,7 +42,7 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./server-zh3esb0z.js";
+} from "./server-ab8017gw.js";
 import {
   hasMeaningfulUserText2,
   estimateTokens,
@@ -77,7 +77,7 @@ import {
   replaceCompartmentChunkEmbeddings2,
   deleteChunkEmbedBackoffForSession2,
   chunkWindowSourceKey2
-} from "./server-4sn3at8p.js";
+} from "./server-h1byrhwx.js";
 import {
   isPidAlive,
   readProcessStartTime
@@ -264,7 +264,7 @@ import {
   userFacingFailureCode,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./server-ph300d6m.js";
+} from "./server-tkdabx8q.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
@@ -550,6 +550,44 @@ function withLiveDreamerOutputCap(executor, boot, fresh) {
   };
 }
 
+// src/features/magic-context/request-tool-definitions.ts
+import { createHash as createHash2 } from "node:crypto";
+var IDENTITY_SCOPE = "names-descriptions-v1";
+var sha = (value) => createHash2("sha256").update(JSON.stringify(value)).digest("hex");
+function v2ToolDefinitionsHash(tools) {
+  const pairs = Object.entries(tools).map(([name, tool]) => [name, tool.description]).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
+  return JSON.stringify({
+    scope: IDENTITY_SCOPE,
+    hash: sha(pairs),
+    tools: pairs.map(([name, description]) => [name, sha([name, description])])
+  });
+}
+function needsRequestToolIdentityAdoption(previous, current) {
+  return readIdentity(current).scope === IDENTITY_SCOPE && readIdentity(previous).scope !== IDENTITY_SCOPE;
+}
+function readIdentity(value) {
+  try {
+    const parsed = JSON.parse(value);
+    if (typeof parsed.hash === "string" && Array.isArray(parsed.tools) && parsed.tools.every((item) => Array.isArray(item) && item.length === 2 && item.every((part) => typeof part === "string")))
+      return parsed;
+  } catch {}
+  return { hash: value, tools: [] };
+}
+function describeRequestToolDefinitionChange(previous, current) {
+  const before = readIdentity(previous);
+  const after = readIdentity(current);
+  let firstDifferingTool = "unknown";
+  for (let index = 0;index < Math.max(before.tools.length, after.tools.length); index++) {
+    const left = before.tools[index];
+    const right = after.tools[index];
+    if (left?.[0] === right?.[0] && left?.[1] === right?.[1])
+      continue;
+    firstDifferingTool = left?.[0] === right?.[0] ? left?.[0] ?? "unknown" : `${left?.[0] ?? "(absent)"}→${right?.[0] ?? "(absent)"}`;
+    break;
+  }
+  return { previousHash: before.hash, currentHash: after.hash, firstDifferingTool };
+}
+
 // src/features/magic-context/compartment-lease.ts
 var COMPARTMENT_LEASE_TTL_MS = 5 * 60 * 1000;
 var COMPARTMENT_LEASE_RENEWAL_MS = 60 * 1000;
@@ -905,7 +943,7 @@ function isPartialCompartmentEnd(db, sessionId, messageId) {
   return Boolean(db.prepare("SELECT 1 FROM compartments WHERE session_id=? AND end_message_id=? AND end_block_index IS NOT NULL LIMIT 1").get(sessionId, messageId));
 }
 // src/features/magic-context/project-docs-hash.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { lstatSync, readFileSync as readFileSync2, statSync as statSync2 } from "node:fs";
 import path from "node:path";
 var PROJECT_DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
@@ -1004,7 +1042,7 @@ function hashCanonicalPieces(hashPieces) {
   if (hashPieces.length === 0) {
     return "";
   }
-  return createHash2("sha256").update(hashPieces.join(PROJECT_DOCS_DELIMITER), "utf8").digest("hex");
+  return createHash3("sha256").update(hashPieces.join(PROJECT_DOCS_DELIMITER), "utf8").digest("hex");
 }
 function readProjectDocsCanonical(projectDirectory) {
   canonicalReadCountForTests += 1;
@@ -1030,10 +1068,10 @@ function readProjectDocsCanonical(projectDirectory) {
   return { renderedBlock, canonicalHash };
 }
 // src/hooks/magic-context/lkg-slot.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // src/hooks/magic-context/lkg-measured-request.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 
 // src/shared/provider-response-completion.ts
 function providerResponseFailed(input) {
@@ -1051,16 +1089,16 @@ function isSuccessfulProviderCompletion(input) {
 import { Buffer as Buffer2 } from "node:buffer";
 
 // src/hooks/magic-context/lkg-recovery-fence.ts
-import { createHash as createHash4, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID2 } from "node:crypto";
 import { lstatSync as lstatSync2, readdirSync as readdirSync2, readFileSync as readFileSync4, rmdirSync, rmSync as rmSync2 } from "node:fs";
 import { basename, dirname, join as join2 } from "node:path";
 
 // src/shared/storage-file-mutex.ts
 import { execFileSync } from "node:child_process";
-import { createHash as createHash3, randomUUID } from "node:crypto";
+import { createHash as createHash4, randomUUID } from "node:crypto";
 import { readdirSync, readFileSync as readFileSync3, rmSync } from "node:fs";
 import { join } from "node:path";
-var ticketChecksum = (name, ticket) => createHash3("sha256").update(JSON.stringify([name, ticket.choosing, ticket.number, ticket.birth])).digest("hex");
+var ticketChecksum = (name, ticket) => createHash4("sha256").update(JSON.stringify([name, ticket.choosing, ticket.number, ticket.birth])).digest("hex");
 function processBirth(pid) {
   if (process.platform === "linux") {
     try {
@@ -1190,7 +1228,7 @@ function clearLkgFenceProcessState(sessionId) {
     knownFences.clear();
 }
 var durableFencesSupported = () => platform !== "win32";
-var hash = (value) => createHash4("sha256").update(value).digest("hex");
+var hash = (value) => createHash5("sha256").update(value).digest("hex");
 var lkgServedArrayDigest = hash;
 function lkgRecoveryFencePath(sessionId) {
   return join2(getMagicContextStorageDir(), "lkg-recovery-fences", `${hash(sessionId)}.json`);
@@ -1207,7 +1245,7 @@ function metadata(slot) {
   ];
 }
 function representationKey(slot) {
-  return createHash4("sha256").update(slot.jsonPrefix).update(JSON.stringify(metadata(slot))).digest("hex");
+  return createHash5("sha256").update(slot.jsonPrefix).update(JSON.stringify(metadata(slot))).digest("hex");
 }
 function lkgRecoverySlotKey(slot) {
   return hash(JSON.stringify([
@@ -1526,7 +1564,7 @@ function cancelAutoSearchWork(sessionId) {
 }
 
 // src/v2/store-reader.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 import { statSync as statSync3 } from "node:fs";
 import { hostname } from "node:os";
 import { resolve } from "node:path";
@@ -1798,7 +1836,7 @@ class V2StoreReader {
     this.db = this.connection.db;
   }
   hostIdentity() {
-    return createHash5("sha256").update(JSON.stringify([hostname(), resolve(this.path), this.connection.identity])).digest("hex");
+    return createHash6("sha256").update(JSON.stringify([hostname(), resolve(this.path), this.connection.identity])).digest("hex");
   }
   prepare(sql) {
     if (this.closed)
@@ -2842,7 +2880,7 @@ function lkgProviderInputTotal(tokens) {
   return counts.every((count) => Number.isSafeInteger(count) && count >= 0) ? counts.reduce((sum, count) => sum + count, 0) : Number.NaN;
 }
 function identity(slot) {
-  return createHash6("sha256").update(JSON.stringify([
+  return createHash7("sha256").update(JSON.stringify([
     slot.capturedAt,
     slot.captureSequence,
     slot.rowVersion,
@@ -2938,7 +2976,7 @@ function clearCapturedLkgMeasurement(sessionId) {
 }
 
 // src/hooks/magic-context/lkg-persist.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 function parseStringArray(value) {
   if (typeof value !== "string")
     return null;
@@ -3052,7 +3090,7 @@ function rememberFingerprint(db, sessionId, fingerprint) {
   saved.set(sessionId, fingerprint);
 }
 function slotFingerprint(slot) {
-  return createHash7("sha256").update(JSON.stringify([
+  return createHash8("sha256").update(JSON.stringify([
     slot.jsonPrefix,
     slot.inputIdSeq,
     slot.inputContentDigests,
@@ -4225,7 +4263,7 @@ var DIGEST_CHUNK_BYTES = 64 * 1024;
 var digestChunk;
 function lkgContentDigestFromFields(fields) {
   lkgDigestsComputed += 1;
-  const hash = createHash8("sha256");
+  const hash = createHash9("sha256");
   digestChunk ??= Buffer.allocUnsafe(DIGEST_CHUNK_BYTES);
   const chunk = digestChunk;
   let offset = 0;
@@ -4288,7 +4326,7 @@ function legacyLkgDigestFromFields(fields) {
     const value = typeof field === "symbol" ? field.description ?? "" : String(field);
     key += `${typeof field}:${value.length}:${value}\x00`;
   }
-  return createHash8("sha256").update(key).digest("base64url");
+  return createHash9("sha256").update(key).digest("base64url");
 }
 function legacyLkgContentDigest(message) {
   const fields = flattenContentFields(withoutEmptyUserDiffSummary(message));
@@ -6383,14 +6421,14 @@ class HiddenCompletionRefusal extends Error {
 }
 
 // src/features/magic-context/compaction-marker.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 import { existsSync, statSync as statSync4 } from "node:fs";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 var ID_PREFIX_HEX_LENGTH = 12;
 var ID_SUFFIX_LENGTH = 14;
 var ID_PREFIX_MASK = (1n << BigInt(ID_PREFIX_HEX_LENGTH * 4)) - 1n;
 function deterministicBase62(seed, length) {
-  let value = BigInt(`0x${createHash9("sha256").update(seed).digest("hex")}`);
+  let value = BigInt(`0x${createHash10("sha256").update(seed).digest("hex")}`);
   const chars = Array(length);
   for (let index = length - 1;index >= 0; index -= 1) {
     chars[index] = BASE62_CHARS[Number(value % 62n)];
@@ -7240,7 +7278,7 @@ function parseUserMemoryRow(row) {
 }
 // src/features/magic-context/dreamer/provider-output-failure.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 var MAX_NEAR_ZERO_OUTPUT_TOKENS = 32;
 
 class DreamerProviderOutputFailureError extends Error {
@@ -7337,12 +7375,12 @@ function providerOutputFailureFromInvalidManifest(messages, responseText, now =
   const resetAt = quotaResetAt(responseText, now);
   if (resetAt === undefined && completion.outputTokens > MAX_NEAR_ZERO_OUTPUT_TOKENS)
     return null;
-  const fingerprint = createHash10("sha256").update(normalized).digest("hex").slice(0, 16);
+  const fingerprint = createHash11("sha256").update(normalized).digest("hex").slice(0, 16);
   return new DreamerProviderOutputFailureError(fingerprint, completion.outputTokens, completion.reasoningTokens, responseText, resetAt);
 }
 
 // src/v2/hooks/hidden-child.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 
 // src/agents/dreamer.ts
 var DREAMER_AGENT = "dreamer";
@@ -7567,7 +7605,7 @@ function markerCandidates(text) {
 function textDigest(text) {
   return {
     length: text.length,
-    sha256: createHash11("sha256").update(text).digest("hex").slice(0, 16)
+    sha256: createHash12("sha256").update(text).digest("hex").slice(0, 16)
   };
 }
 function firstDifference(a, b) {
@@ -9167,7 +9205,7 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
   }
 }
 // src/shared/prompt-surface-runtime.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash13 } from "node:crypto";
 import { existsSync as existsSync2, readFileSync as readFileSync5, statSync as statSync5 } from "node:fs";
 import { dirname as dirname2, isAbsolute, resolve as resolve2 } from "node:path";
 
@@ -9200,7 +9238,7 @@ function promptSurfaceHashMaterial(systemContent, preset = "full") {
 \x00magic-context-prompt-surface:${preset}`;
 }
 function systemPromptFingerprint(systemContent, preset = "full") {
-  return createHash12("md5").update(promptSurfaceHashMaterial(systemContent, preset)).digest("hex");
+  return createHash13("md5").update(promptSurfaceHashMaterial(systemContent, preset)).digest("hex");
 }
 var PROMPT_SURFACE_TOOL_ID_SET = new Set(ACTIVE_TOOL_IDS);
 function resolveUserConfigDirectory(options) {
@@ -11098,7 +11136,7 @@ function compareMemorySelectionPriority(left, right) {
 }
 
 // src/features/magic-context/mural/render-trigger.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 
 // src/features/magic-context/mural/mural-selection.ts
 var DEFAULT_MURAL_MEMORY_BUDGET = 8000;
@@ -11802,7 +11840,7 @@ function ensureMuralRendered(db, projectIdentity, budgetTokens = DEFAULT_MURAL_M
     return { ...cached.result };
   }
   const plan = planMuralRender(entries);
-  const textHash = createHash13("sha256").update(plan.layout.text).digest("hex");
+  const textHash = createHash14("sha256").update(plan.layout.text).digest("hex");
   if (existing && existing.contentHash === textHash && existing.width === plan.width && existing.height === plan.height) {
     return rememberRender(db, projectIdentity, key, existing.image, {
       hasMural: true,
@@ -11867,6 +11905,7 @@ var MURAL_COMPONENT_PREFIX = "|mural-enabled:";
 var BUDGET_COMPONENT_PREFIX = "|render-budgets:";
 var RENDERED_BUDGETS_COMPONENT_PREFIX = "|rendered-budgets:";
 var M0_MEMORY_IDS_COMPONENT_PREFIX = "|m0-memory-ids:";
+var TOOL_DEFINITIONS_COMPONENT_PREFIX = "|request-tool-definitions:";
 function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH, muralEnabled = null, renderBudgetIdentity = null, memoryRenderEpoch = MEMORY_RENDER_FORMAT_EPOCH, renderedBudgets = null) {
   let encoded = upgradeState ?? "";
   if (compartmentRenderEpoch !== null) {
@@ -11912,7 +11951,8 @@ function decodeCachedM0UpgradeIdentity(value) {
     value.indexOf(MURAL_COMPONENT_PREFIX),
     value.indexOf(BUDGET_COMPONENT_PREFIX),
     value.indexOf(RENDERED_BUDGETS_COMPONENT_PREFIX),
-    value.indexOf(M0_MEMORY_IDS_COMPONENT_PREFIX)
+    value.indexOf(M0_MEMORY_IDS_COMPONENT_PREFIX),
+    value.indexOf(TOOL_DEFINITIONS_COMPONENT_PREFIX)
   ].filter((index) => index >= 0);
   const identityEnd = componentIndexes.length > 0 ? Math.min(...componentIndexes) : value.length;
   const upgradeState = value.slice(0, identityEnd);
@@ -11930,6 +11970,22 @@ function withCachedM0MemoryIds(identity, ids) {
   const withoutIds = (identity ?? "").replace(/\|m0-memory-ids:[^|]*/g, "");
   return `${withoutIds}${M0_MEMORY_IDS_COMPONENT_PREFIX}${JSON.stringify(ids)}`;
 }
+function withCachedM0ToolDefinitionsHash(identity, hash) {
+  const withoutHash = (identity ?? "").replace(/\|request-tool-definitions:[^|]*/g, "");
+  if (hash === null)
+    return withoutHash || null;
+  return `${withoutHash}${TOOL_DEFINITIONS_COMPONENT_PREFIX}${encodeURIComponent(hash)}`;
+}
+function readCachedM0ToolDefinitionsHash(identity) {
+  const encoded = component(identity ?? "", TOOL_DEFINITIONS_COMPONENT_PREFIX);
+  if (!encoded)
+    return null;
+  try {
+    return decodeURIComponent(encoded) || null;
+  } catch {
+    return null;
+  }
+}
 function readCachedM0MemoryIds(identity, legacyVisibleIds, maxMemoryId) {
   const encoded = component(identity ?? "", M0_MEMORY_IDS_COMPONENT_PREFIX);
   if (encoded !== null) {
@@ -13026,6 +13082,7 @@ function readCurrentM0SnapshotMarkersUncached(args) {
       memoryRenderEpoch: MEMORY_RENDER_FORMAT_EPOCH,
       systemHash: hard.systemHash,
       toolSetHash: hard.toolSetHash ?? "",
+      toolDefinitionsHash: hard.toolDefinitionsHash ?? null,
       modelKey: piModelRefToCanonical(hard.modelKey),
       projectIdentity: args.projectPath ?? null,
       muralEnabled: args.memoryEnabled !== false && args.muralEnabled === true,
@@ -13041,6 +13098,7 @@ function refreshVolatileMarkerInputs(markers, args) {
     materializedAt: Date.now(),
     systemHash: hard.systemHash,
     toolSetHash: hard.toolSetHash ?? "",
+    toolDefinitionsHash: hard.toolDefinitionsHash ?? null,
     modelKey: hard.modelKey,
     projectIdentity: args.projectPath ?? null,
     muralEnabled: args.memoryEnabled !== false && args.muralEnabled === true,
@@ -13111,6 +13169,7 @@ function snapshotMarkersFromCachedM0(state) {
     memoryRenderEpoch: cachedUpgradeIdentity.memoryRenderEpoch,
     systemHash: state.cachedM0SystemHash ?? "",
     toolSetHash: state.cachedM0ToolSetHash ?? "",
+    toolDefinitionsHash: readCachedM0ToolDefinitionsHash(state.cachedM0UpgradeState),
     modelKey: state.cachedM0ModelKey ?? "",
     projectIdentity: state.cachedM0ProjectIdentity ?? null,
     muralHash: state.cachedM0MuralHash ?? null,
@@ -13171,6 +13230,23 @@ function mustMaterialize(args) {
       systemHashNew: hard.systemHash
     };
   }
+  const liveDefinitionsHash = hard.toolDefinitionsHash;
+  if (liveDefinitionsHash) {
+    const cachedDefinitionsHash = readCachedM0ToolDefinitionsHash(args.state.cachedM0UpgradeState);
+    if (!cachedDefinitionsHash || needsRequestToolIdentityAdoption(cachedDefinitionsHash, liveDefinitionsHash)) {
+      const previousIdentity = args.state.cachedM0UpgradeState;
+      const adoptedIdentity = withCachedM0ToolDefinitionsHash(previousIdentity, liveDefinitionsHash);
+      const adopted = args.db.prepare("UPDATE session_meta SET cached_m0_upgrade_state = ? WHERE session_id = ? AND cached_m0_upgrade_state IS ?").run(adoptedIdentity, args.sessionId, previousIdentity);
+      if (adopted.changes > 0)
+        args.state.cachedM0UpgradeState = adoptedIdentity;
+    } else if (cachedDefinitionsHash !== liveDefinitionsHash) {
+      return {
+        value: true,
+        reason: "tool_definitions",
+        toolDefinitionsChange: describeRequestToolDefinitionChange(cachedDefinitionsHash, liveDefinitionsHash)
+      };
+    }
+  }
   const liveToolSetHash = hard.toolSetHash ?? "";
   const toolSetHashComparison = liveToolSetHash !== "" ? {
     m0ToolSetHashPrev: args.state.cachedM0ToolSetHash,
@@ -13504,7 +13580,7 @@ function applyMarkersToState(state, m0Bytes, markers, m1Bytes, renderedM0Ids) {
   state.cachedM0ProjectDocsHash = markers.projectDocsHash;
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
-  state.cachedM0UpgradeState = withCachedM0MemoryIds(encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null), renderedM0Ids);
+  state.cachedM0UpgradeState = withCachedM0ToolDefinitionsHash(withCachedM0MemoryIds(encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null), renderedM0Ids), markers.toolDefinitionsHash ?? null);
   state.cachedM0SystemHash = markers.systemHash;
   state.cachedM0ToolSetHash = markers.toolSetHash;
   state.cachedM0ModelKey = markers.modelKey;
@@ -13629,7 +13705,7 @@ function materializeM0(options) {
   const renderedMemoryIds = trimmed.renderOrder.map((m) => m.id);
   options.beforePhase3ForTest?.();
   const steps = new WriteTransactionSteps;
-  const upgradeIdentity = withCachedM0MemoryIds(encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity, snapshotMarkers.memoryRenderEpoch, snapshotMarkers.renderedBudgets ?? null), renderedMemoryIds);
+  const upgradeIdentity = withCachedM0ToolDefinitionsHash(withCachedM0MemoryIds(encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity, snapshotMarkers.memoryRenderEpoch, snapshotMarkers.renderedBudgets ?? null), renderedMemoryIds), snapshotMarkers.toolDefinitionsHash ?? null);
   const baselineEndMessageId = lastCompartmentBoundaryId(compartments);
   steps.mark("pre_metadata");
   const commitFold = options.onFoldPrepare?.();
@@ -13662,6 +13738,7 @@ function materializeM0(options) {
       memoryRenderEpoch: MEMORY_RENDER_FORMAT_EPOCH,
       systemHash: snapshotMarkers.systemHash,
       toolSetHash: snapshotMarkers.toolSetHash,
+      toolDefinitionsHash: snapshotMarkers.toolDefinitionsHash,
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: projectPath ?? null,
       muralEnabled: snapshotMarkers.muralEnabled,
@@ -13919,7 +13996,7 @@ function readCachedM0M1Row(db, sessionId) {
                     cached_m0_session_facts_version,
                      cached_m0_upgrade_state,
                      cached_m0_system_hash,
-                     cached_m0_tool_set_hash,
+                      cached_m0_tool_set_hash,
                      cached_m0_model_key,
                      cached_m0_project_identity,
                      cached_m0_last_baseline_end_message_id,
@@ -13961,6 +14038,7 @@ function markersFromCachedRow(row) {
     memoryRenderEpoch: cachedUpgradeIdentity.memoryRenderEpoch,
     systemHash: row.cached_m0_system_hash ?? "",
     toolSetHash: row.cached_m0_tool_set_hash ?? "",
+    toolDefinitionsHash: readCachedM0ToolDefinitionsHash(row.cached_m0_upgrade_state),
     modelKey: row.cached_m0_model_key ?? "",
     projectIdentity: row.cached_m0_project_identity ?? null,
     muralHash: row.cached_m0_mural_hash ?? null,
@@ -13991,7 +14069,7 @@ function applyCachedRowToState(state, row) {
   state.cachedM0ProjectDocsHash = markers.projectDocsHash;
   state.cachedM0MaterializedAt = markers.materializedAt;
   state.cachedM0SessionFactsVersion = markers.sessionFactsVersion;
-  state.cachedM0UpgradeState = encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null);
+  state.cachedM0UpgradeState = withCachedM0ToolDefinitionsHash(encodeCachedM0UpgradeIdentity(markers.upgradeState, markers.compartmentRenderEpoch, markers.muralEnabled, markers.renderBudgetIdentity, markers.memoryRenderEpoch, markers.renderedBudgets ?? null), markers.toolDefinitionsHash ?? null);
   state.cachedM0SystemHash = markers.systemHash;
   state.cachedM0ToolSetHash = markers.toolSetHash;
   state.cachedM0ModelKey = markers.modelKey;
@@ -20575,4 +20653,4 @@ ${failure}`;
   }
 }
 
-export { historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, LkgRecoveryFenceError, lkgServedArrayDigest, hasCleanLkgRecoveryFence, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, advanceSessionActivity, backfillSessionActivity, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, readPersistedLkgUntaggedInputIds, persistLkgUntaggedInputIds, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, lkgInputIdentity, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, readCoordinateGeneration, rebaseSessionCoordinatesAsync, HiddenCompletionRefusal, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, getCompartmentEvents, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, ModelProducedNoOutputError, noteModelActivityMonitored, noteModelOutputReceived, isPromptTimeoutError, getPromptFailureDetail, raceWithSignal, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, annotateSubagentInvocationError, failedInvocationStatus, emptyTokenTotals, sumTokensFromChildMessages, recordChildInvocation, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, teardownChildSession, runTokenLog, formatRunTokenLog, createChildSessionWithFence, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, shouldWaitForNewHistorianHistory, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure2, isRecompSkip2, extractRecompReason2, setRecompStarting2, setRecompNote2, setRecompTerminal2, buildRecompDeps2, runManagedRecomp2 };
+export { historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, v2ToolDefinitionsHash, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, LkgRecoveryFenceError, lkgServedArrayDigest, hasCleanLkgRecoveryFence, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, prepareLkgCaptureFence, certifyCommittedLkgCapture, markLkgRecoveryDirty, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, advanceSessionActivity, backfillSessionActivity, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, readPersistedLkgUntaggedInputIds, persistLkgUntaggedInputIds, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, lkgInputIdentity, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, readCoordinateGeneration, rebaseSessionCoordinatesAsync, HiddenCompletionRefusal, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, getCompartmentEvents, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, ModelProducedNoOutputError, noteModelActivityMonitored, noteModelOutputReceived, isPromptTimeoutError, getPromptFailureDetail, raceWithSignal, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, annotateSubagentInvocationError, failedInvocationStatus, emptyTokenTotals, sumTokensFromChildMessages, recordChildInvocation, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, teardownChildSession, runTokenLog, formatRunTokenLog, createChildSessionWithFence, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, shouldWaitForNewHistorianHistory, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure2, isRecompSkip2, extractRecompReason2, setRecompStarting2, setRecompNote2, setRecompTerminal2, buildRecompDeps2, runManagedRecomp2 };

package/dist/v2/{server-4sn3at8p.js → server-h1byrhwx.js}

@@ -14,6 +14,9 @@ import {
 import {
   messageFtsOrdinalRangeIsMapped2
 } from "./server-awr8qa4c.js";
+import {
+  isKnownAutocommit
+} from "./server-8ajstryz.js";
 
 // src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash } from "node:crypto";
@@ -346,15 +349,15 @@ function readDatabaseRevision(db) {
   if (!statements) {
     statements = {
       version: db.prepare("PRAGMA data_version"),
-      changes: db.prepare("SELECT total_changes() AS changes")
+      changes: db.prepare("SELECT total_changes() AS changes, (SELECT schema_version FROM pragma_schema_version) AS schemaVersion")
     };
     revisionStatements.set(db, statements);
   }
   const version = statements.version.get();
   const changes = statements.changes.get();
-  if (typeof version?.data_version !== "number" || typeof changes?.changes !== "number")
+  if (typeof version?.data_version !== "number" || typeof changes?.changes !== "number" || typeof changes.schemaVersion !== "number")
     return null;
-  return `${version.data_version}:${changes.changes}`;
+  return `${version.data_version}:${changes.changes}:${changes.schemaVersion}`;
 }
 function sameSearchScope(left, right) {
   return left.rowCount === right.rowCount && left.maxRowId === right.maxRowId && left.rowIdSum === right.rowIdSum && (left.metadata === right.metadata || [...left.metadata].every(([id, value]) => right.metadata.get(id) === value));
@@ -1198,6 +1201,44 @@ function storedWindowsMatchRecordedSource(db, compartmentId, sourceKey, existing
 }
 var COVERAGE_MEMO_LIMIT = 2048;
 var cachedCoverageWindows = new Map;
+var cachedCoverageSources = new WeakMap;
+function coverageSource(db, candidate, modelId, maxInputTokens) {
+  const revision = isKnownAutocommit(db) ? readDatabaseRevision(db) : null;
+  if (revision === null)
+    cachedCoverageSources.delete(db);
+  let cache = cachedCoverageSources.get(db);
+  if (revision !== null && cache?.revision !== revision) {
+    cache = { revision, entries: new Map };
+    cachedCoverageSources.set(db, cache);
+  }
+  const key = JSON.stringify([
+    candidate.id,
+    candidate.sessionId,
+    candidate.startMessage,
+    candidate.endMessage,
+    modelId,
+    maxInputTokens,
+    CHUNKER_VERSION,
+    getTokenEstimatorFingerprint()
+  ]);
+  const cached = cache?.entries.get(key);
+  if (cached)
+    return cached;
+  const mappedText = buildCanonicalChunkTextFromFts2(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
+  if (mappedText === null)
+    return null;
+  const canonicalText = mappedText || buildCompartmentSummaryFallbackText2(db, candidate.id);
+  const source = {
+    canonicalText,
+    sourceKey: chunkWindowSourceKey2(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens)
+  };
+  if (cache && readDatabaseRevision(db) === revision) {
+    if (cache.entries.size >= 8192)
+      cache.entries.delete(cache.entries.keys().next().value);
+    cache.entries.set(key, source);
+  }
+  return source;
+}
 function memoizedCoverageWindows(candidate, canonicalText, sourceKey, modelId, maxInputTokens) {
   const key = JSON.stringify([candidate.id, sourceKey, modelId]);
   const cached = cachedCoverageWindows.get(key);
@@ -1236,14 +1277,13 @@ function renumberOneBasedChunkWindows(db, candidate, projectPath, modelId, windo
   }).immediate();
 }
 function classifyChunkCoverageDefect(db, projectPath, modelId, candidate, maxInputTokens) {
-  const mappedText = buildCanonicalChunkTextFromFts2(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
-  if (mappedText === null)
+  const source = coverageSource(db, candidate, modelId, maxInputTokens);
+  if (source === null)
     return { defect: "deferred", windows: [] };
-  const canonicalText = mappedText || buildCompartmentSummaryFallbackText2(db, candidate.id);
+  const { canonicalText, sourceKey } = source;
   if (!canonicalText || chunkEmbedBackoffActive(db, candidate, projectPath, modelId, canonicalText)) {
     return { defect: "deferred", windows: [] };
   }
-  const sourceKey = chunkWindowSourceKey2(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
   const existing = getExistingChunkHashes(db, candidate.id, modelId, projectPath);
   if (storedWindowsMatchRecordedSource(db, candidate.id, sourceKey, existing)) {
     return { defect: null, windows: [], sourceKey, confirmedByRecord: true };