@cortexkit/opencode-magic-context 0.41.2 → 0.41.4

package/dist/{index-1yh8g550.js → index-22jkk6wg.js}

@@ -18,7 +18,7 @@ var __toESM = (mod, isNodeMode, target) => {
       return cached;
   }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
-  const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  const to = isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   if (mod && typeof mod === "object" || typeof mod === "function") {
     for (let key of __getOwnPropNames(mod))
       if (!__hasOwnProp.call(to, key))
@@ -32,19 +32,6 @@ var __toESM = (mod, isNodeMode, target) => {
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {
-      get: all[name],
-      enumerable: true,
-      configurable: true,
-      set: __exportSetter.bind(all, name)
-    });
-};
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-export { __toESM, __commonJS, __export, __require };
+export { __toESM, __commonJS, __require };

package/dist/{index-dmvy29z0.js → index-3wzdwt6p.js}

@@ -1,6 +1,6 @@
 import {
   getMagicContextStorageDir
-} from "./index-37yzyeca.js";
+} from "./index-3fe78beq.js";
 
 // src/shared/announcement.ts
 import * as fs from "node:fs";
@@ -20,14 +20,14 @@ function compareSemverCore(a, b) {
 }
 
 // src/shared/announcement.ts
-var ANNOUNCEMENT_VERSION = "0.31.0";
-var ANNOUNCEMENT_FEATURES = [
+var ANNOUNCEMENT_VERSION2 = "0.31.0";
+var ANNOUNCEMENT_FEATURES2 = [
   "New /ctx-wrapup command: compact older history on demand, keeping the newest N messages raw. Run it before switching to a smaller-context model.",
   "ctx_search now also searches your session notes and smart notes.",
   "Project identity now survives transient git failures (slow disks, dubious ownership) without splitting your project memory.",
   "Removed the ctx_reduce_enabled setting; agent-controlled reduction is always on. Caveman text compression is now independent (caveman_text_compression.enabled)."
 ];
-var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU";
+var ANNOUNCEMENT_FOOTER2 = "Join us on Discord: https://discord.gg/F2uWxjGnU";
 var STATE_FILENAME = "last_announced_version";
 function getStateFilePath() {
   return path.join(getMagicContextStorageDir(), STATE_FILENAME);
@@ -45,11 +45,7 @@ function readAnnouncementState() {
     return { status: "error" };
   }
 }
-function readLastAnnouncedVersion() {
-  const state = readAnnouncementState();
-  return state.status === "valid" ? state.version : "";
-}
-function markAnnouncementSeen(version) {
+function markAnnouncementSeen2(version) {
   if (!version)
     return;
   try {
@@ -58,22 +54,22 @@ function markAnnouncementSeen(version) {
     fs.writeFileSync(getStateFilePath(), version);
   } catch {}
 }
-function shouldShowAnnouncement() {
-  if (!ANNOUNCEMENT_VERSION || ANNOUNCEMENT_FEATURES.length === 0)
+function shouldShowAnnouncement2() {
+  if (!ANNOUNCEMENT_VERSION2 || ANNOUNCEMENT_FEATURES2.length === 0)
     return false;
   const state = readAnnouncementState();
   if (state.status === "missing") {
-    markAnnouncementSeen(ANNOUNCEMENT_VERSION);
+    markAnnouncementSeen2(ANNOUNCEMENT_VERSION2);
     return false;
   }
   if (state.status === "error") {
     return false;
   }
-  const ordering = compareSemverCore(ANNOUNCEMENT_VERSION, state.version);
+  const ordering = compareSemverCore(ANNOUNCEMENT_VERSION2, state.version);
   if (ordering === null) {
-    return state.version !== ANNOUNCEMENT_VERSION;
+    return state.version !== ANNOUNCEMENT_VERSION2;
   }
   return ordering > 0;
 }
 
-export { isValidSemver, compareSemverCore, ANNOUNCEMENT_VERSION, ANNOUNCEMENT_FEATURES, ANNOUNCEMENT_FOOTER, readLastAnnouncedVersion, markAnnouncementSeen, shouldShowAnnouncement };
+export { isValidSemver, compareSemverCore, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2, shouldShowAnnouncement2 };

package/dist/{index-eq9wr75c.js → index-4avmwfp5.js}

@@ -1,15 +1,12 @@
-import {
-  readJsoncFile
-} from "./index-8mtsfhyg.js";
-import {
-  waitForSafeNotificationTarget
-} from "./index-vnz6jvdc.js";
 import {
   log
-} from "./index-4x691bz5.js";
+} from "./index-dkv2dn46.js";
 import {
-  __require
-} from "./index-1yh8g550.js";
+  sendIgnoredMessage2
+} from "./index-q264erdp.js";
+import {
+  readJsoncFile
+} from "./index-sd3egckz.js";
 
 // src/plugin/conflict-warning-hook.ts
 import { existsSync, readFileSync } from "node:fs";
@@ -97,11 +94,20 @@ function detectConflicts(directory, options) {
   };
 }
 async function resolveCompactionForBoot(client, timeoutMs = 2000) {
+  const controller = new AbortController;
+  let timer;
   try {
-    const result = await Promise.race([
-      client.config.get(),
-      new Promise((_, reject) => setTimeout(() => reject(new Error("config.get() timed out")), timeoutMs))
-    ]);
+    const timeout = new Promise((resolve) => {
+      timer = setTimeout(() => {
+        controller.abort(new Error("config.get() timed out"));
+        resolve(null);
+      }, Math.max(0, timeoutMs));
+      timer.unref?.();
+    });
+    const request = Promise.resolve().then(() => client.config.get({ signal: controller.signal }));
+    const result = await Promise.race([request, timeout]);
+    if (result === null)
+      return null;
     const compaction = result?.data?.compaction;
     if (typeof compaction?.auto !== "boolean" || typeof compaction?.prune !== "boolean") {
       log(`[magic-context] conflict-detector: resolved config carried no explicit compaction block (${JSON.stringify(compaction) ?? "absent"}); falling back to file-based detection`);
@@ -110,6 +116,9 @@ async function resolveCompactionForBoot(client, timeoutMs = 2000) {
     return { auto: compaction.auto, prune: compaction.prune };
   } catch {
     return null;
+  } finally {
+    if (timer)
+      clearTimeout(timer);
   }
 }
 function checkCompaction(directory) {
@@ -392,43 +401,21 @@ async function getSessionMessages(client, sessionId) {
   }
   return [];
 }
-async function sendConflictWarning(client, directory, conflictResult) {
+async function sendConflictWarning2(client, directory, conflictResult) {
   const { sessionId } = getDesktopState(directory);
   if (!sessionId) {
     log("[magic-context] conflict-warning: could not find active session for Desktop warning");
     return;
   }
-  if (await waitForSafeNotificationTarget(client, sessionId) === "skip")
-    return;
   const warningText = formatConflictShort(conflictResult);
   log(`[magic-context] sending conflict warning to session ${sessionId}: ${conflictResult.reasons.join(", ")}`);
   try {
-    const c = client;
-    const promptInput = {
-      path: { id: sessionId },
-      body: {
-        noReply: true,
-        parts: [
-          {
-            type: "text",
-            text: warningText,
-            ignored: true
-          }
-        ]
-      }
-    };
-    if (typeof c.session?.prompt === "function") {
-      await Promise.resolve(c.session.prompt(promptInput));
-    } else if (typeof c.session?.promptAsync === "function") {
-      await c.session.promptAsync(promptInput);
-    } else {
-      log("[magic-context] conflict-warning: session prompt API unavailable");
-    }
+    await sendIgnoredMessage2(client, sessionId, warningText, {});
   } catch (error) {
     log(`[magic-context] conflict-warning: failed to send: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
-async function cleanupConflictWarnings(client, directory, serverUrl) {
+async function cleanupConflictWarnings2(client, directory, serverUrl) {
   const { sessionId } = getDesktopState(directory);
   if (!sessionId) {
     log("[magic-context] cleanup: no active Desktop session found");
@@ -467,43 +454,33 @@ async function cleanupConflictWarnings(client, directory, serverUrl) {
       log(`[magic-context] deleted conflict warning message ${messageId}`);
     }
   }
-  if (await waitForSafeNotificationTarget(client, sessionId) === "skip")
-    return;
   const enabledText = `${ENABLED_MARKER}. Enjoy! ✨`;
+  const scheduleEnabledCleanup = () => {
+    setTimeout(async () => {
+      try {
+        const freshMessages = await getSessionMessages(client, sessionId);
+        for (let i = freshMessages.length - 1;i >= 0; i--) {
+          const msg = freshMessages[i];
+          const msgId = msg.info?.id;
+          const msgRole = msg.info?.role;
+          if (!msgId || msgRole !== "user")
+            break;
+          const parts = msg.parts ?? [];
+          const isEnabled = parts.length > 0 && parts.every((p) => p.ignored === true && p.type === "text" && typeof p.text === "string" && p.text.startsWith(ENABLED_MARKER));
+          if (isEnabled) {
+            await deleteMessage(serverUrl, sessionId, msgId);
+          } else {
+            break;
+          }
+        }
+      } catch {}
+    }, 1000);
+  };
   try {
-    const c = client;
-    const promptInput = {
-      path: { id: sessionId },
-      body: {
-        noReply: true,
-        parts: [{ type: "text", text: enabledText, ignored: true }]
-      }
-    };
-    if (typeof c.session?.prompt === "function") {
-      await Promise.resolve(c.session.prompt(promptInput));
-    } else if (typeof c.session?.promptAsync === "function") {
-      await c.session.promptAsync(promptInput);
-    }
+    await sendIgnoredMessage2(client, sessionId, enabledText, {
+      onDelivered: scheduleEnabledCleanup
+    });
   } catch {}
-  setTimeout(async () => {
-    try {
-      const freshMessages = await getSessionMessages(client, sessionId);
-      for (let i = freshMessages.length - 1;i >= 0; i--) {
-        const msg = freshMessages[i];
-        const msgId = msg.info?.id;
-        const msgRole = msg.info?.role;
-        if (!msgId || msgRole !== "user")
-          break;
-        const parts = msg.parts ?? [];
-        const isEnabled = parts.length > 0 && parts.every((p) => p.ignored === true && p.type === "text" && typeof p.text === "string" && p.text.startsWith(ENABLED_MARKER));
-        if (isEnabled) {
-          await deleteMessage(serverUrl, sessionId, msgId);
-        } else {
-          break;
-        }
-      }
-    } catch {}
-  }, 1000);
 }
 async function cleanupEnabledMessages(messages, serverUrl, sessionId) {
   if (!serverUrl)
@@ -523,12 +500,10 @@ async function cleanupEnabledMessages(messages, serverUrl, sessionId) {
     }
   }
 }
-async function sendSchemaFenceWarning(client, directory, detail) {
+async function sendSchemaFenceWarning2(client, directory, detail) {
   const { sessionId } = getDesktopState(directory);
   if (!sessionId)
     return;
-  if (await waitForSafeNotificationTarget(client, sessionId) === "skip")
-    return;
   const text = [
     `${SCHEMA_FENCE_MARKER}`,
     "",
@@ -546,32 +521,21 @@ async function sendSchemaFenceWarning(client, directory, detail) {
   ].join(`
 `);
   try {
-    const c = client;
-    const promptInput = {
-      path: { id: sessionId },
-      body: { noReply: true, parts: [{ type: "text", text, ignored: true }] }
-    };
-    if (typeof c.session?.prompt === "function") {
-      await Promise.resolve(c.session.prompt(promptInput));
-    } else if (typeof c.session?.promptAsync === "function") {
-      await c.session.promptAsync(promptInput);
-    }
+    await sendIgnoredMessage2(client, sessionId, text, {});
   } catch {
     return;
   }
 }
-async function sendStartupAnnouncement(client, directory, version, features, footer, markSeen) {
+async function sendStartupAnnouncement2(client, directory, version, features, footer, markSeen) {
   if (!version || features.length === 0)
     return;
   const { sessionId } = getDesktopState(directory);
   if (!sessionId) {
     return;
   }
-  const { isTuiConnected } = await import("./rpc-notifications-1ffm755w.js");
+  const { isTuiConnected } = await import("./rpc-notifications-4amf6mf4.js");
   if (isTuiConnected(sessionId) || isTuiConnected())
     return;
-  if (await waitForSafeNotificationTarget(client, sessionId) === "skip")
-    return;
   const bullets = features.map((line) => `  • ${line}`).join(`
 `);
   const sections = [`${ANNOUNCEMENT_MARKER} v${version}:`, "", bullets];
@@ -582,27 +546,12 @@ async function sendStartupAnnouncement(client, directory, version, features, foo
 `);
   log(`[magic-context] sending startup announcement for v${version} to session ${sessionId}`);
   try {
-    const c = client;
-    const promptInput = {
-      path: { id: sessionId },
-      body: {
-        noReply: true,
-        parts: [{ type: "text", text, ignored: true }]
-      }
-    };
-    if (typeof c.session?.prompt === "function") {
-      await Promise.resolve(c.session.prompt(promptInput));
-    } else if (typeof c.session?.promptAsync === "function") {
-      await c.session.promptAsync(promptInput);
-    } else {
-      log("[magic-context] announcement: session prompt API unavailable");
-      return;
-    }
+    await sendIgnoredMessage2(client, sessionId, text, {
+      onDelivered: () => markSeen(version)
+    });
   } catch (error) {
     log(`[magic-context] announcement: failed to send: ${error instanceof Error ? error.message : String(error)}`);
-    return;
   }
-  markSeen(version);
 }
 
-export { detectConflicts, resolveCompactionForBoot, sendConflictWarning, cleanupConflictWarnings, sendSchemaFenceWarning, sendStartupAnnouncement };
+export { detectConflicts, resolveCompactionForBoot, sendConflictWarning2, cleanupConflictWarnings2, sendSchemaFenceWarning2, sendStartupAnnouncement2 };

package/dist/{index-d1mxrd3p.js → index-7k55qm8a.js}

@@ -11,10 +11,14 @@ function readString(value) {
 function hasOwn(record, key) {
   return Object.hasOwn(record, key);
 }
+function resolveHarnessBlock(container, harness) {
+  const selected = harness === "omp" ? container?.omp ?? container?.pi : container?.[harness];
+  return asRecord(selected);
+}
 function normalizeModelEntry(entry, harness) {
   if (typeof entry === "string") {
-    const model2 = readString(entry);
-    return model2 ? { model: model2 } : undefined;
+    const model = readString(entry);
+    return model ? { model } : undefined;
   }
   const objectEntry = asRecord(entry);
   if (!objectEntry)
@@ -35,8 +39,8 @@ function sameAttempt(a, b) {
 function resolveFallbackEntries(value, harness) {
   const values = Array.isArray(value) ? value : value === undefined ? [] : [value];
   const resolved = [];
-  for (const value2 of values) {
-    const entry = normalizeModelEntry(value2, harness);
+  for (const value of values) {
+    const entry = normalizeModelEntry(value, harness);
     if (!entry || !isValidModelReference(entry))
       continue;
     if (resolved.some((candidate) => sameAttempt(candidate, entry)))
@@ -52,9 +56,9 @@ function resolvePrimaryEntry(args) {
   const qualifier = entry.qualifier ?? readString(args.defaultQualifier);
   return qualifier ? { ...entry, qualifier } : entry;
 }
-function resolveHistorianModel(config, harness) {
+function resolveHistorianModel2(config, harness) {
   const historian = asRecord(asRecord(config)?.historian);
-  const block = asRecord(historian?.[harness]);
+  const block = resolveHarnessBlock(historian, harness);
   if (!block)
     return { fallbacks: [] };
   return {
@@ -66,9 +70,9 @@ function resolveHistorianModel(config, harness) {
     fallbacks: resolveFallbackEntries(block.fallback_models, harness)
   };
 }
-function resolveDreamerTaskModel(args) {
+function resolveDreamerTaskModel2(args) {
   const dreamer = asRecord(asRecord(args.config)?.dreamer);
-  const harnessBlock = asRecord(dreamer?.[args.harness]);
+  const harnessBlock = resolveHarnessBlock(dreamer, args.harness);
   const taskBlock = asRecord(asRecord(harnessBlock?.tasks)?.[args.task]);
   const schedulingTask = asRecord(asRecord(dreamer?.tasks)?.[args.task]);
   if (!harnessBlock) {
@@ -97,7 +101,7 @@ function resolveDreamerTaskModel(args) {
     promotionThreshold: typeof schedulingTask?.promotion_threshold === "number" ? schedulingTask.promotion_threshold : undefined
   };
 }
-function resolveOpenCodeAgentOverrides(agent) {
+function resolveOpenCodeAgentOverrides2(agent) {
   const source = asRecord(agent);
   if (!source)
     return {};
@@ -108,6 +112,7 @@ function resolveOpenCodeAgentOverrides(agent) {
     thinking_level: _thinking,
     opencode,
     pi,
+    omp,
     tasks,
     ...rest
   } = source;
@@ -122,11 +127,11 @@ function resolveOpenCodeAgentOverrides(agent) {
     ...primary?.qualifier ? { variant: primary.qualifier } : {}
   };
 }
-function resolveHistorianAgentOverrides(agent) {
+function resolveHistorianAgentOverrides2(agent) {
   return {
     maxTokens: 32000,
-    ...resolveOpenCodeAgentOverrides(agent)
+    ...resolveOpenCodeAgentOverrides2(agent)
   };
 }
 
-export { normalizeModelEntry, resolveFallbackEntries, resolveHistorianModel, resolveDreamerTaskModel, resolveOpenCodeAgentOverrides, resolveHistorianAgentOverrides };
+export { resolveHistorianModel2, resolveDreamerTaskModel2, resolveOpenCodeAgentOverrides2, resolveHistorianAgentOverrides2 };

package/dist/{index-2wchnyk6.js → index-avwt563y.js}

@@ -17,6 +17,9 @@ var OMP_TO_CANONICAL_PROVIDER = {
   "google-antigravity": "google",
   "opencode-zen": "opencode"
 };
+var CANONICAL_MODEL_IDENTITY_ALIASES = {
+  "github-copilot/gpt-6-astra": "openai/gpt-6-astra"
+};
 function remapProviderPrefix(ref, map) {
   if (typeof ref !== "string")
     return ref;
@@ -28,6 +31,10 @@ function remapProviderPrefix(ref, map) {
     return ref;
   return `${map[provider]}${ref.slice(slash)}`;
 }
+function canonicalModelIdentity(ref) {
+  const harnessCanonical = piModelRefToCanonical(ompModelRefToCanonical(ref));
+  return CANONICAL_MODEL_IDENTITY_ALIASES[harnessCanonical.toLowerCase()] ?? harnessCanonical;
+}
 function piModelRefToCanonical(ref) {
   return remapProviderPrefix(ref, PI_TO_CANONICAL_PROVIDER);
 }
@@ -52,4 +59,4 @@ function resolveModelRefForOmp(ref) {
   return remapProviderPrefix(ompModelRefToCanonical(ref), CANONICAL_TO_OMP_PROVIDER);
 }
 
-export { piModelRefToCanonical, modelRefLookupOrder };
+export { canonicalModelIdentity, piModelRefToCanonical, modelRefLookupOrder };

package/dist/{index-4x691bz5.js → index-dkv2dn46.js}

@@ -1,6 +1,6 @@
 import {
   getMagicContextLogPath
-} from "./index-37yzyeca.js";
+} from "./index-3fe78beq.js";
 
 // src/shared/logger.ts
 import * as fs from "node:fs";
@@ -362,8 +362,11 @@ function getLoggerDiagnostics() {
     lastErrorTime
   };
 }
+function flushLogger() {
+  flush();
+}
 if (!isTestEnv) {
   process.on("exit", flush);
 }
 
-export { sanitizeDiagnosticText, hasShareabilitySensitiveText, log, sessionLog, getLoggerDiagnostics };
+export { sanitizeDiagnosticText, hasShareabilitySensitiveText, log, sessionLog, getLoggerDiagnostics, flushLogger };

package/dist/{index-rgdqj8nj.js → index-e7vx3byk.js}

@@ -1,7 +1,7 @@
 import {
   __commonJS,
   __require
-} from "./index-1yh8g550.js";
+} from "./index-22jkk6wg.js";
 
 // ../../node_modules/.bun/@jitl+quickjs-ffi-types@0.32.0/node_modules/@jitl/quickjs-ffi-types/dist/index.js
 var require_dist = __commonJS(function(exports, module) {

package/dist/{index-szf8w1p5.js → index-fmsr7v69.js}

@@ -40,7 +40,7 @@ function isComplete(ctx) {
   return Boolean(ctx.agent && ctx.model && ctx.variant);
 }
 var PROMPT_CONTEXT_MESSAGE_LIMIT = 50;
-async function resolvePromptContext(client, sessionId) {
+async function resolvePromptContext2(client, sessionId) {
   if (!client || !sessionId)
     return null;
   const c = client;
@@ -72,4 +72,4 @@ async function resolvePromptContext(client, sessionId) {
   return result;
 }
 
-export { resolvePromptContext };
+export { resolvePromptContext2 };

package/dist/{index-y1yr57fw.js → index-fz104x1j.js}

@@ -1,15 +1,15 @@
 import {
-  piModelRefToCanonical
-} from "./index-2wchnyk6.js";
+  log
+} from "./index-dkv2dn46.js";
 import {
   withReadOnlySessionDb
-} from "./index-b9j85d29.js";
+} from "./index-raatkvw5.js";
 import {
-  log
-} from "./index-4x691bz5.js";
+  piModelRefToCanonical
+} from "./index-avwt563y.js";
 import {
   getHarness
-} from "./index-37yzyeca.js";
+} from "./index-3fe78beq.js";
 
 // src/features/magic-context/storage-meta-session.ts
 import { Buffer as Buffer2 } from "node:buffer";
@@ -429,11 +429,11 @@ function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
     return 0;
   let deletableSessionIds = [...sessionIds];
   if (options.rustModuleCleanupAcknowledged !== true) {
-    const placeholders2 = sessionIds.map(() => "?").join(", ");
+    const placeholders = sessionIds.map(() => "?").join(", ");
     const harnessPredicate = harness === undefined ? "" : " AND harness = ?";
     const protectedRows = db.prepare(`SELECT session_id
                  FROM pending_session_cleanup
-                 WHERE session_id IN (${placeholders2})
+                 WHERE session_id IN (${placeholders})
                    AND harness LIKE '%:rust'${harnessPredicate}`).all(...sessionIds, ...harness === undefined ? [] : [`${harness}:rust`]);
     const protectedSessionIds = new Set(protectedRows.map((row) => row.session_id));
     deletableSessionIds = sessionIds.filter((sessionId) => !protectedSessionIds.has(sessionId));
@@ -511,7 +511,7 @@ function getSessionMetaSelectColumns(db) {
   sessionMetaSelectColumnsCache.set(db, projection);
   return projection;
 }
-function getOrCreateSessionMeta(db, sessionId) {
+function getOrCreateSessionMeta2(db, sessionId) {
   const result = db.prepare(`SELECT ${getSessionMetaSelectColumns(db)} FROM session_meta WHERE session_id = ?`).get(sessionId);
   if (isSessionMetaRow(result)) {
     return toSessionMeta(result);
@@ -527,7 +527,7 @@ function getOrCreateSessionMeta(db, sessionId) {
   }
   return defaults;
 }
-function updateSessionMeta(db, sessionId, updates) {
+function updateSessionMeta2(db, sessionId, updates) {
   const setClauses = [];
   const values = [];
   for (const [key, column] of Object.entries(META_COLUMNS)) {
@@ -556,7 +556,7 @@ function updateSessionMeta(db, sessionId, updates) {
     db.prepare(`UPDATE session_meta SET ${setClauses.join(", ")} WHERE session_id = ?`).run(...values, sessionId);
   })();
 }
-function advanceToolReclaimWatermark(db, sessionId, maxTagNumber) {
+function advanceToolReclaimWatermark2(db, sessionId, maxTagNumber) {
   if (maxTagNumber <= 0)
     return;
   db.transaction(() => {
@@ -567,7 +567,7 @@ function advanceToolReclaimWatermark(db, sessionId, maxTagNumber) {
 function rustCleanupHarness() {
   return `${getHarness()}:rust`;
 }
-function markSessionCleanupPending(db, sessionId, rustModuleCleanupRequired = false) {
+function markSessionCleanupPending2(db, sessionId, rustModuleCleanupRequired = false) {
   const row = db.prepare(`INSERT INTO pending_session_cleanup (session_id, harness, requested_at, last_attempt_at)
              VALUES (?, ?, ?, NULL)
              ON CONFLICT(session_id) DO UPDATE SET
@@ -580,7 +580,7 @@ function markSessionCleanupPending(db, sessionId, rustModuleCleanupRequired = fa
              RETURNING harness`).get(sessionId, rustModuleCleanupRequired ? rustCleanupHarness() : getHarness(), Date.now());
   return row.harness.endsWith(":rust");
 }
-function retryPendingSessionCleanups(db, limit = 200) {
+function retryPendingSessionCleanups2(db, limit = 200) {
   const rows = db.prepare(`SELECT session_id
              FROM pending_session_cleanup
              WHERE harness NOT LIKE '%:rust'
@@ -591,7 +591,7 @@ function retryPendingSessionCleanups(db, limit = 200) {
   for (const row of rows) {
     try {
       db.prepare("UPDATE pending_session_cleanup SET last_attempt_at = ? WHERE session_id = ?").run(Date.now(), row.session_id);
-      clearSession(db, row.session_id);
+      clearSession2(db, row.session_id);
       cleared += 1;
     } catch {
       failedSessionIds.push(row.session_id);
@@ -599,7 +599,7 @@ function retryPendingSessionCleanups(db, limit = 200) {
   }
   return { attempted: rows.length, cleared, failedSessionIds };
 }
-async function retryPendingRustSessionCleanupsForProject(db, projectPath, deleteSession, limit = 200) {
+async function retryPendingRustSessionCleanupsForProject2(db, projectPath, deleteSession, limit = 200) {
   const harness = getHarness();
   const rows = db.prepare(`SELECT pending.session_id
              FROM pending_session_cleanup pending
@@ -616,7 +616,7 @@ async function retryPendingRustSessionCleanupsForProject(db, projectPath, delete
     try {
       db.prepare("UPDATE pending_session_cleanup SET last_attempt_at = ? WHERE session_id = ?").run(Date.now(), row.session_id);
       await deleteSession(row.session_id);
-      clearSession(db, row.session_id, true);
+      clearSession2(db, row.session_id, true);
       cleared += 1;
     } catch {
       failedSessionIds.push(row.session_id);
@@ -624,7 +624,7 @@ async function retryPendingRustSessionCleanupsForProject(db, projectPath, delete
   }
   return { attempted: rows.length, cleared, failedSessionIds };
 }
-function clearSession(db, sessionId, rustModuleCleanupAcknowledged = false) {
+function clearSession2(db, sessionId, rustModuleCleanupAcknowledged = false) {
   const transactionStartedAt = performance.now();
   db.transaction(() => {
     deleteSessionScopedRows(db, [sessionId], undefined, {
@@ -634,4 +634,4 @@ function clearSession(db, sessionId, rustModuleCleanupAcknowledged = false) {
   logSlowWriteTransaction("clear-session", transactionStartedAt);
 }
 
-export { logSlowWriteTransaction, ensureSessionMetaRow, persistCachedM0, clearCachedM0M1, SESSION_SCOPED_TABLES, deleteSessionScopedRows, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession };
+export { logSlowWriteTransaction, ensureSessionMetaRow, persistCachedM0, clearCachedM0M1, SESSION_SCOPED_TABLES, deleteSessionScopedRows, getOrCreateSessionMeta2, updateSessionMeta2, advanceToolReclaimWatermark2, markSessionCleanupPending2, retryPendingSessionCleanups2, retryPendingRustSessionCleanupsForProject2, clearSession2 };