@cortexkit/opencode-magic-context 0.49.32 → 0.49.34

package/dist/v2/{server-4n176b5m.js → server-z2wft9zv.js}

@@ -88,7 +88,7 @@ import {
   toMessageIndexSource,
   clearIndexedMessagesInTransaction,
   indexSourcesAfterOrdinal
-} from "./server-hwag0khr.js";
+} from "./server-m1pfg2d4.js";
 import {
   retreatPastHostUnservedRows,
   snapTerminalCompartmentToServedRow,
@@ -154,7 +154,9 @@ import {
   getOverflowState,
   clearEmergencyRecovery,
   getPersistedCompactionMarkerState,
-  setPersistedCompactionMarkerState,
+  getCompactionMarkerPublicationState,
+  compareAndSetCompactionMarkerPublicationState,
+  getDeferredClearedCompactionMarkerState,
   parseStrippedPlaceholderState,
   serializeStrippedPlaceholderState,
   THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
@@ -187,7 +189,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-rb8m4vry.js";
+} from "./server-qvy4qavp.js";
 import {
   getTableColumnNames,
   tagTombstoneOwnerRange,
@@ -202,7 +204,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-d01pe8q5.js";
+} from "./server-jw5qe9y8.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -550,6 +552,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 +945,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 +1044,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 +1070,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 +1091,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 +1230,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 +1247,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 +1566,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 +1838,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 +2882,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 +2978,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 +3092,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 +4265,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 +4328,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 +6423,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)];
@@ -6611,6 +6651,80 @@ function getOpenCodeMessageById(sessionId, messageId) {
   const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
   return row ?? null;
 }
+function planCompactionMarker(args, boundary) {
+  const identity = `${args.sessionId}\x00${args.endMessageId}`;
+  return {
+    boundaryMessageId: boundary.id,
+    summaryMessageId: generateMessageId(boundary.timeCreated + 1, 1n, `${identity}\x00summary-message`),
+    compactionPartId: generatePartId(boundary.timeCreated, 1n, `${identity}\x00compaction-part`),
+    summaryPartId: generatePartId(boundary.timeCreated + 1, 2n, `${identity}\x00summary-part`)
+  };
+}
+function isCompactionMarkerIntentAbsent(marker, targetEndMessageId) {
+  if (!targetEndMessageId)
+    return false;
+  const db = getWritableOpenCodeDb();
+  return !db.prepare(`SELECT 1 FROM message WHERE id IN (?, ?)
+        UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(targetEndMessageId, marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId);
+}
+function withCompactionMarkerPublicationLock(operation) {
+  return runMarkerWriteTransaction(getWritableOpenCodeDb(), "compaction-marker-replace", operation);
+}
+function inspectCompactionMarkerPublication(sessionId, recognized, summaryText) {
+  const db = getWritableOpenCodeDb();
+  const basis = readMarkerCandidateBasis2(db, sessionId);
+  if (!basis)
+    return { kind: "deferred" };
+  const pairs = [];
+  for (const id of basis.ids) {
+    const rows = db.prepare(`SELECT m.id AS summaryId, p.message_id AS boundaryId, p.id AS partId
+             FROM message m JOIN part p ON p.message_id = json_extract(m.data, '$.parentID')
+               AND +p.session_id = m.session_id
+             WHERE m.id = ? AND m.session_id = ? AND json_extract(m.data, '$.summary') = 1
+               AND COALESCE(json_extract(m.data, '$.finish'), '') <> ''
+               AND json_extract(p.data, '$.type') = 'compaction'`).all(id, sessionId);
+    pairs.push(...rows);
+  }
+  if (pairs.length > 1)
+    return { kind: "ambiguous" };
+  if (pairs.length === 0) {
+    for (const marker of recognized) {
+      if (db.prepare(`SELECT 1 FROM message WHERE id = ?
+                UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId))
+        return { kind: "ambiguous" };
+    }
+    return { kind: "verified", marker: null };
+  }
+  const pair = pairs[0];
+  const marker = recognized.find((item) => item.summaryMessageId === pair.summaryId && item.boundaryMessageId === pair.boundaryId && item.compactionPartId === pair.partId);
+  if (!marker)
+    return { kind: "ambiguous" };
+  for (const other of recognized) {
+    if (other.summaryMessageId === marker.summaryMessageId && other.compactionPartId === marker.compactionPartId && other.summaryPartId === marker.summaryPartId)
+      continue;
+    if (db.prepare(`SELECT 1 FROM message WHERE id = ?
+            UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(other.summaryMessageId, other.compactionPartId, other.summaryPartId))
+      return { kind: "ambiguous" };
+  }
+  const row = db.prepare(`SELECT c.data AS compactionData FROM message m
+         JOIN message b ON b.id = ? AND b.session_id = m.session_id
+         JOIN part c ON c.id = ? AND c.message_id = b.id AND c.session_id = m.session_id
+         JOIN part t ON t.id = ? AND t.message_id = m.id AND t.session_id = m.session_id
+         WHERE m.id = ? AND m.session_id = ?
+           AND json_extract(b.data, '$.role') = 'user'
+           AND json_extract(m.data, '$.role') = 'assistant'
+           AND json_extract(m.data, '$.parentID') = b.id
+           AND json_extract(m.data, '$.summary') = 1
+           AND json_extract(m.data, '$.finish') = 'stop'
+           AND json_extract(m.data, '$.error') IS NULL
+           AND json_extract(m.data, '$.providerID') = 'magic-context'
+           AND json_extract(m.data, '$.modelID') = 'magic-context'
+           AND json_extract(t.data, '$.type') = 'text' AND json_extract(t.data, '$.text') = ?
+           AND (SELECT COUNT(*) FROM part p WHERE p.message_id = m.id AND +p.session_id = m.session_id) = 1`).get(marker.boundaryMessageId, marker.compactionPartId, marker.summaryPartId, marker.summaryMessageId, sessionId, summaryText);
+  if (!row || !isMcCanonicalCompactionPartData(JSON.parse(row.compactionData)) || findBoundaryUserMessage(sessionId, marker.boundaryMessageId)?.id !== marker.boundaryMessageId)
+    return { kind: "ambiguous" };
+  return { kind: "verified", marker };
+}
 var LEGACY_MARKER_LINEAGE_SQL = `SELECT m.id
     FROM message m
     WHERE +m.session_id = ? AND m.id IN (SELECT value FROM json_each(?)) AND m.id <> ?
@@ -6660,10 +6774,11 @@ function injectCompactionMarkerFromBasis(args, validatedBasis) {
     return null;
   }
   const boundaryTime = boundary.timeCreated;
-  const markerIdentity = `${args.sessionId}\x00${args.endMessageId}`;
-  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n, `${markerIdentity}\x00summary-message`);
-  const compactionPartId = generatePartId(boundaryTime, 1n, `${markerIdentity}\x00compaction-part`);
-  const summaryPartId = generatePartId(boundaryTime + 1, 2n, `${markerIdentity}\x00summary-part`);
+  const {
+    summaryMessageId: summaryMsgId,
+    compactionPartId,
+    summaryPartId
+  } = planCompactionMarker(args, boundary);
   const summaryMsgData = JSON.stringify({
     role: "assistant",
     parentID: boundary.id,
@@ -6823,10 +6938,12 @@ function listSessionCompactionMarkers(sessionId) {
   markers.sort((left, right) => left.timeCreated - right.timeCreated || left.compactionPartId.localeCompare(right.compactionPartId));
   return markers.map(({ timeCreated: _, ...marker }) => marker);
 }
-function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId) {
+function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId, shouldRemove) {
   try {
     const db = getWritableOpenCodeDb("removal");
     runMarkerRemovalTransaction(db, () => {
+      if (shouldRemove && !shouldRemove())
+        return;
       const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
       const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
       for (const summaryMessageId of marker.summaryMessageIds) {
@@ -7240,7 +7357,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 +7454,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 +7684,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 +9284,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 +9317,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) {
@@ -9312,24 +9429,118 @@ function createPromptSurfaceGuidanceEpochCache(runtime) {
   guidanceEpochCacheByRuntime.set(runtime, cache);
   return cache;
 }
-// src/hooks/magic-context/compaction-marker-manager.ts
-var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
-function dropMarkerSummaryTag(db, sessionId, summaryMessageId) {
-  const tagNumber = getTagNumberByMessageId2(db, sessionId, `${summaryMessageId}:p0`);
-  if (tagNumber !== null)
-    updateTagStatus2(db, sessionId, tagNumber, "dropped");
-}
-function persistMarkerStateAndDropReplacedTag(db, sessionId, state, replacedSummaryMessageId) {
-  let transactionStartedAt = 0;
-  db.transaction(() => {
-    transactionStartedAt = performance.now();
-    setPersistedCompactionMarkerState(db, sessionId, state);
-    if (replacedSummaryMessageId !== null) {
-      dropMarkerSummaryTag(db, sessionId, replacedSummaryMessageId);
+// src/hooks/magic-context/compaction-marker-publication.ts
+function samePair(left, right) {
+  return left.boundaryMessageId === right.boundaryMessageId && left.summaryMessageId === right.summaryMessageId && left.compactionPartId === right.compactionPartId && left.summaryPartId === right.summaryPartId;
+}
+function publishRecoverableCompactionMarker(db, args, targetIsCurrent) {
+  const { sessionId } = args;
+  let raw = "";
+  let previous = null;
+  let oldSummary = null;
+  let intended;
+  let reason = "publication-failed";
+  let recovered;
+  let cut = "uncertain";
+  let writingState = false;
+  const persist = (state) => {
+    writingState = true;
+    db.transaction(() => {
+      raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, state, null);
+      if (previous && previous.summaryMessageId !== state.summaryMessageId) {
+        const tag = getTagNumberByMessageId2(db, sessionId, `${previous.summaryMessageId}:p0`);
+        if (tag !== null)
+          updateTagStatus2(db, sessionId, tag, "dropped");
+      }
+    }).immediate();
+    writingState = false;
+    previous = state;
+  };
+  try {
+    cut = getCompactionMarkerPublicationState(db, sessionId).pending ? "uncertain" : "definitely-no-cut";
+    const result = withCompactionMarkerPublicationLock(() => {
+      const snapshot = getCompactionMarkerPublicationState(db, sessionId);
+      if (snapshot.pending)
+        cut = "uncertain";
+      raw = snapshot.raw;
+      previous = getPersistedCompactionMarkerState(db, sessionId) ?? getDeferredClearedCompactionMarkerState(db, sessionId);
+      oldSummary = previous?.summaryMessageId ?? null;
+      if (snapshot.pending && (snapshot.pending.boundaryOrdinal > args.endOrdinal || snapshot.pending.boundaryOrdinal === args.endOrdinal && snapshot.pending.targetEndMessageId !== args.endMessageId) && !isCompactionMarkerIntentAbsent(snapshot.pending, snapshot.pending.targetEndMessageId))
+        throw new Error("a newer marker publication intent is pending");
+      const boundary = findBoundaryUserMessage(sessionId, args.endMessageId);
+      if (!targetIsCurrent() || !boundary || boundary.id !== args.resolvedBoundary?.id || boundary.timeCreated !== args.resolvedBoundary.timeCreated)
+        throw new Error("marker publication frontier changed before publication");
+      intended = {
+        ...planCompactionMarker(args, boundary),
+        boundaryOrdinal: args.endOrdinal,
+        targetEndMessageId: args.endMessageId
+      };
+      let pending = snapshot.pending;
+      if (pending) {
+        const pendingTarget = pending.targetEndMessageId;
+        const pendingBoundary = pendingTarget ? findBoundaryUserMessage(sessionId, pendingTarget) : null;
+        const compartments = pendingTarget ? getCompartmentsByEndMessageId(db, sessionId, pendingTarget) : [];
+        const validTarget = pending.targetEndMessageId === args.endMessageId && pending.boundaryOrdinal === args.endOrdinal || compartments.length === 1 && compartments[0].endMessage === pending.boundaryOrdinal;
+        if (!validTarget || !pendingBoundary || !pendingTarget || !samePair(pending, planCompactionMarker({ ...args, endMessageId: pendingTarget }, pendingBoundary)))
+          pending = null;
+      }
+      const inspection = inspectCompactionMarkerPublication(sessionId, [intended, ...previous ? [previous] : [], ...pending ? [pending] : []], args.summaryText);
+      if (inspection.kind === "deferred") {
+        reason = "candidate-preparation";
+        return {
+          kind: cut === "uncertain" ? "uncertain" : "deferred",
+          error: new Error("marker candidate preparation pending")
+        };
+      }
+      if (inspection.kind === "ambiguous") {
+        reason = "ambiguous-left-alone";
+        return {
+          kind: cut,
+          error: new Error("unverified or ambiguous host marker pairs; left alone")
+        };
+      }
+      cut = "definitely-no-cut";
+      const host = inspection.marker;
+      if (host && (pending && samePair(host, pending) || samePair(host, intended))) {
+        const adopted = pending && samePair(host, pending) ? pending : intended;
+        recovered = adopted === pending ? "pending-intent-recovered" : "adopted-existing-pair";
+        cut = "uncertain";
+        if (samePair(host, intended))
+          return { kind: "committed", marker: host };
+        persist(adopted);
+      }
+      writingState = true;
+      raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, previous, intended);
+      writingState = false;
+      cut = "uncertain";
+      const replacement = replaceCompactionMarker(host, {
+        ...args,
+        resolvedBoundary: boundary
+      });
+      if (recovered && replacement.kind !== "committed")
+        return { kind: "uncertain", error: replacement.error };
+      if (replacement.kind !== "committed")
+        cut = replacement.kind === "uncertain" ? "uncertain" : "definitely-no-cut";
+      return replacement;
+    });
+    if (result.kind === "committed") {
+      if (!intended)
+        throw new Error("committed marker has no publication intent");
+      persist(intended);
+      reason = recovered ?? "published";
     }
-  }).immediate();
-  logSlowWriteTransaction("marker-drain", transactionStartedAt);
+    return result;
+  } catch (error) {
+    if (writingState)
+      reason = "state-write-failed";
+    return { kind: cut, error: error instanceof Error ? error : new Error(String(error)) };
+  } finally {
+    sessionLog2(sessionId, `compaction-marker publication reason=${reason} oldSummary=${oldSummary ?? "none"} newSummary=${intended?.summaryMessageId ?? "none"} target=${args.endMessageId} at=${Date.now()}`);
+  }
 }
+
+// src/hooks/magic-context/compaction-marker-manager.ts
+var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
 function markerUpdateDefinitelyDidNotCut(outcome) {
   return outcome.kind === "already-current" || outcome.kind === "deferred" || outcome.kind === "stale-skip" || outcome.kind === "retryable-failure" && outcome.cut === "definitely-no-cut";
 }
@@ -9398,7 +9609,7 @@ function boundaryWouldDiscardUncoveredMessage(db, sessionId, ordinal, boundaryMe
   return false;
 }
 function applyDeferredCompactionMarker(db, sessionId, pending, directory, trustedBoundary) {
-  let cut = "definitely-no-cut";
+  let cut = "uncertain";
   let stepStartedAt = performance.now();
   const stepMs = [];
   const endStep = (name) => {
@@ -9407,41 +9618,61 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
     stepStartedAt = now;
   };
   try {
+    cut = getCompactionMarkerPublicationState(db, sessionId).pending ? "uncertain" : "definitely-no-cut";
+    const unresolvedIntentFailure = () => {
+      const alreadyUncertain = cut === "uncertain";
+      cut = "uncertain";
+      if (getCompactionMarkerPublicationState(db, sessionId).pending || alreadyUncertain) {
+        return {
+          kind: "retryable-failure",
+          cut,
+          error: new Error("unresolved marker publication intent; retaining retry state")
+        };
+      }
+      cut = "definitely-no-cut";
+      return null;
+    };
     const responseFencesTarget = trustedBoundary !== undefined && Number.isSafeInteger(trustedBoundary.rowVersion) && trustedBoundary.rowVersion > 0 && trustedBoundary.ordinal === pending.ordinal && trustedBoundary.endMessageId === pending.endMessageId;
     const validation = responseFencesTarget ? "ok" : validatePendingTarget(db, sessionId, pending);
     endStep("validate");
     if (validation !== "ok") {
+      const unresolved = unresolvedIntentFailure();
+      if (unresolved)
+        return unresolved;
       sessionLog2(sessionId, `compaction-marker drain: stale-skip (${validation}) for ordinal ${pending.ordinal} endMessageId=${pending.endMessageId}`);
       return { kind: "stale-skip", reason: validation };
     }
     const existing = getPersistedCompactionMarkerState(db, sessionId);
     if (existing && existingMarkerAlreadyCoversTarget(sessionId, existing, pending.ordinal, pending.endMessageId)) {
-      return { kind: "already-current" };
+      if (!unresolvedIntentFailure())
+        return { kind: "already-current" };
     }
     const boundary = findBoundaryUserMessage(sessionId, pending.endMessageId);
     endStep("boundary");
     if (!boundary) {
-      return {
+      return unresolvedIntentFailure() ?? {
         kind: "retryable-failure",
         cut: "definitely-no-cut",
         error: new Error(`no user boundary found at or before endMessageId ${pending.endMessageId} (ordinal ${pending.ordinal}); preserving existing marker`)
       };
     }
     if (boundaryWouldDiscardUncoveredMessage(db, sessionId, pending.ordinal, boundary.id)) {
+      const unresolved = unresolvedIntentFailure();
+      if (unresolved)
+        return unresolved;
       sessionLog2(sessionId, `compaction-marker drain: stale-skip (partial-message-boundary) for ordinal ${pending.ordinal} endMessageId=${pending.endMessageId}`);
       return { kind: "stale-skip", reason: "partial-message-boundary" };
     }
     endStep("discardCheck");
-    const removedSummaryMessageId = existing?.summaryMessageId ?? null;
     cut = "uncertain";
-    const replacement = replaceCompactionMarker(existing, {
+    const replacement = publishRecoverableCompactionMarker(db, {
       sessionId,
       endOrdinal: pending.ordinal,
       endMessageId: pending.endMessageId,
       summaryText: MARKER_SUMMARY_TEXT,
       directory: directory ?? process.cwd(),
       resolvedBoundary: boundary
-    });
+    }, () => JSON.stringify(getPersistedCompactionMarkerState(db, sessionId)) === JSON.stringify(existing) && (responseFencesTarget || validatePendingTarget(db, sessionId, pending) === "ok"));
     endStep("replace");
     if (replacement.kind === "deferred")
       return { kind: "deferred", reason: "candidate-preparation" };
@@ -9452,14 +9683,8 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
         error: replacement.error
       };
     }
-    const result = replacement.marker;
-    persistMarkerStateAndDropReplacedTag(db, sessionId, {
-      ...result,
-      boundaryOrdinal: pending.ordinal,
-      targetEndMessageId: pending.endMessageId
-    }, removedSummaryMessageId);
     endStep("persist");
-    sessionLog2(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${result.boundaryMessageId} ${stepMs.join(" ")}`);
+    sessionLog2(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${replacement.marker.boundaryMessageId} ${stepMs.join(" ")}`);
     return {
       kind: "applied",
       markerOrdinal: pending.ordinal
@@ -9480,8 +9705,7 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     return false;
   }
   const existing = getPersistedCompactionMarkerState(db, sessionId);
-  const removedSummaryMessageId = existing?.summaryMessageId ?? null;
-  if (existing) {
+  if (existing && !getCompactionMarkerPublicationState(db, sessionId).pending) {
     if (existingMarkerAlreadyCoversTarget(sessionId, existing, lastCompartmentEnd, targetEndMessageId)) {
       return true;
     }
@@ -9494,33 +9718,26 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
   if (boundaryWouldDiscardUncoveredMessage(db, sessionId, lastCompartmentEnd, boundary.id)) {
     return false;
   }
-  const replacement = replaceCompactionMarker(existing, {
+  const replacement = publishRecoverableCompactionMarker(db, {
     sessionId,
     endOrdinal: lastCompartmentEnd,
     endMessageId: targetEndMessageId,
     summaryText: MARKER_SUMMARY_TEXT,
     directory: directory ?? process.cwd(),
     resolvedBoundary: boundary
-  });
+  }, () => JSON.stringify(getPersistedCompactionMarkerState(db, sessionId)) === JSON.stringify(existing) && getCompartmentEndMessageIdForOrdinal(db, sessionId, lastCompartmentEnd) === targetEndMessageId);
   if (replacement.kind === "committed") {
-    const result = replacement.marker;
-    persistMarkerStateAndDropReplacedTag(db, sessionId, {
-      ...result,
-      boundaryOrdinal: lastCompartmentEnd,
-      targetEndMessageId
-    }, removedSummaryMessageId);
-    sessionLog2(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
     return true;
   }
   return false;
 }
-function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
-  if (getHarness2() !== "opencode") {
+function reconcileForkOrphanedCompactionMarkers(db, sessionId, isCacheBusting) {
+  if (!isCacheBusting || getHarness2() !== "opencode") {
     return { removed: 0, failed: false };
   }
   try {
     const owned = getPersistedCompactionMarkerState(db, sessionId);
-    if (!owned) {
+    if (!owned || getCompactionMarkerPublicationState(db, sessionId).pending) {
       return { removed: 0, failed: false };
     }
     const markers = listSessionCompactionMarkers(sessionId);
@@ -9541,7 +9758,15 @@ function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
       if (!currentOwned || marker.compactionPartId === currentOwned.compactionPartId) {
         continue;
       }
-      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId);
+      let protectedByState = false;
+      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId, () => db.transaction(() => {
+        const publication = getCompactionMarkerPublicationState(db, sessionId);
+        const latestOwned = getPersistedCompactionMarkerState(db, sessionId);
+        protectedByState = Boolean(publication.pending || !latestOwned || marker.compactionPartId === latestOwned.compactionPartId || marker.summaryMessageIds.includes(latestOwned.summaryMessageId) || compareOpenCodeMessagesByCanonicalOrder(sessionId, marker.boundaryMessageId, latestOwned.boundaryMessageId) !== 1);
+        return !protectedByState;
+      }).deferred());
+      if (protectedByState)
+        continue;
       if (ok) {
         removed += 1;
         sessionLog2(sessionId, `compaction-marker hygiene: removed fork-orphaned marker part=${marker.compactionPartId} boundary=${marker.boundaryMessageId} (outranked owned boundary ${currentOwned.boundaryMessageId})`);
@@ -11098,7 +11323,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 +12027,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 +12092,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 +12138,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 +12157,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) {
@@ -12623,8 +12866,8 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, co
     resultEndMessageId = trimEndMessageId;
   } else {
     const degradedCount = noteDegradedRebuild(sessionId);
-    if (degradedCount === 1) {
-      reconcileForkOrphanedCompactionMarkers(db, sessionId);
+    if (isCacheBusting) {
+      reconcileForkOrphanedCompactionMarkers(db, sessionId, isCacheBusting);
     }
     let reAnchored = false;
     if (degradedCount >= REANCHOR_MIN_DEGRADED_PASSES && isCacheBusting) {
@@ -13026,6 +13269,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 +13285,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 +13356,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 +13417,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 +13767,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 +13892,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 +13925,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 +14183,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 +14225,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 +14256,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 +20840,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 };