@retaw106/mmc-pi 2.2.1 → 2.4.0

package/dist/cli.js

@@ -4981,6 +4981,15 @@ var HistorianModelEntryObjectSchema = object({
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
 }).strict();
 var HistorianModelEntrySchema = union([string2(), HistorianModelEntryObjectSchema]);
+var MaintenanceModelEntrySchema = HistorianModelEntrySchema.superRefine((entry, ctx) => {
+  const model = typeof entry === "string" ? entry : entry.model;
+  if (typeof model !== "string" || model.trim().length === 0) {
+    ctx.addIssue({
+      code: "custom",
+      message: "maintenance model entries must be non-empty: a bare provider/model string or { model, variant?, thinking_level? }"
+    });
+  }
+});
 var ProfileHistorianSchema = object({
   model: HistorianModelEntrySchema.optional().describe("Primary historian model entry."),
   fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries."),
@@ -5034,8 +5043,8 @@ var MagicContextConfigSchema = object({
     object({ default: number2().min(0) }).catchall(number2().min(0))
   ]).optional().describe('User-only output-token reservation override. Number or per-model object ({ default: 16384, "provider/model": 8192 }); 0 disables reservation. Takes precedence over every derived source: an explicit value here always wins against catalog output limits, provider window-geometry facts, and the 25%-of-context fallback (usable window = context window minus this reserve). When unset, Magic Context reserves the catalog output limit (capped at 25% of context) for shared-window providers and keeps proven separate-quota Google/Gemini windows unchanged.'),
   models: object({
-    window_overlay_path: string2().trim().min(1).optional()
-  }).optional().describe("User-only Fusiform window-overlay settings. The path defaults to <dataDir>/fusiform/window-overlay.json."),
+    window_overlay_path: unknown().optional().describe("Deprecated: ignored. Fusiform no longer publishes window-overlay data, so this setting no longer changes model window geometry. Remove this key.").meta({ deprecated: true })
+  }).optional().describe("Deprecated user-only Fusiform window-overlay settings; ignored."),
   toast_duration_ms: number2().min(0).max(60000).default(5000).describe("TUI toast lifetime in milliseconds for Magic Context notifications. Set to 0 to disable Magic Context toasts entirely (min: 0, max: 60000, default: 5000)"),
   execute_threshold_percentage: union([
     number2().min(20).max(90, EXECUTE_THRESHOLD_CAP_MESSAGE),
@@ -5107,6 +5116,8 @@ var MagicContextConfigSchema = object({
   }).describe("Cross-session memory configuration"),
   maintenance: object({
     enabled: boolean2().default(true).describe("Enable the automatic memory-maintenance task (default: true). USER-LEVEL ONLY — the whole maintenance group is stripped from project-tier config."),
+    model: MaintenanceModelEntrySchema.optional().describe("Primary maintenance model entry: a bare provider/model string or { model, variant? (OpenCode), thinking_level? (Pi) }. USER-LEVEL ONLY. When absent, inherit historian model configuration. If neither has a primary, automatic passes skip and manual runs refuse. The main-session model is never inherited."),
+    fallback_models: array(MaintenanceModelEntrySchema).optional().describe("Ordered fallback maintenance model entries, tried after CALL failures only. When absent and the primary is inherited, inherit historian fallbacks; explicit [] disables fallbacks. Illegal manifests, permission refusals, and exhausted budgets never switch models."),
     budgets: object({
       inputTokens: number2().int().min(1).default(400000).describe("Per-run input-token budget (input + cacheRead + cacheWrite pricing dimensions). Default 400000."),
       outputTokens: number2().int().min(1).default(32000).describe("Per-run output-token budget. Default 32000."),
@@ -5148,7 +5159,7 @@ var MagicContextConfigSchema = object({
       maxRetries: 3
     },
     anomalyThreshold: { absoluteRows: 10, poolFraction: 0.25 }
-  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.")
+  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: project-tier config cannot pick maintenance models or change run controls. An absent model inherits historian model configuration, never the session model.")
 });
 var LIVE_RELOAD_CONFIG_PATHS = [
   "cache_ttl",

package/dist/config-init.js

@@ -4998,6 +4998,15 @@ var HistorianModelEntryObjectSchema = object({
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
 }).strict();
 var HistorianModelEntrySchema = union([string2(), HistorianModelEntryObjectSchema]);
+var MaintenanceModelEntrySchema = HistorianModelEntrySchema.superRefine((entry, ctx) => {
+  const model = typeof entry === "string" ? entry : entry.model;
+  if (typeof model !== "string" || model.trim().length === 0) {
+    ctx.addIssue({
+      code: "custom",
+      message: "maintenance model entries must be non-empty: a bare provider/model string or { model, variant?, thinking_level? }"
+    });
+  }
+});
 var ProfileHistorianSchema = object({
   model: HistorianModelEntrySchema.optional().describe("Primary historian model entry."),
   fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries."),
@@ -5051,8 +5060,8 @@ var MagicContextConfigSchema = object({
     object({ default: number2().min(0) }).catchall(number2().min(0))
   ]).optional().describe('User-only output-token reservation override. Number or per-model object ({ default: 16384, "provider/model": 8192 }); 0 disables reservation. Takes precedence over every derived source: an explicit value here always wins against catalog output limits, provider window-geometry facts, and the 25%-of-context fallback (usable window = context window minus this reserve). When unset, Magic Context reserves the catalog output limit (capped at 25% of context) for shared-window providers and keeps proven separate-quota Google/Gemini windows unchanged.'),
   models: object({
-    window_overlay_path: string2().trim().min(1).optional()
-  }).optional().describe("User-only Fusiform window-overlay settings. The path defaults to <dataDir>/fusiform/window-overlay.json."),
+    window_overlay_path: unknown().optional().describe("Deprecated: ignored. Fusiform no longer publishes window-overlay data, so this setting no longer changes model window geometry. Remove this key.").meta({ deprecated: true })
+  }).optional().describe("Deprecated user-only Fusiform window-overlay settings; ignored."),
   toast_duration_ms: number2().min(0).max(60000).default(5000).describe("TUI toast lifetime in milliseconds for Magic Context notifications. Set to 0 to disable Magic Context toasts entirely (min: 0, max: 60000, default: 5000)"),
   execute_threshold_percentage: union([
     number2().min(20).max(90, EXECUTE_THRESHOLD_CAP_MESSAGE),
@@ -5124,6 +5133,8 @@ var MagicContextConfigSchema = object({
   }).describe("Cross-session memory configuration"),
   maintenance: object({
     enabled: boolean2().default(true).describe("Enable the automatic memory-maintenance task (default: true). USER-LEVEL ONLY — the whole maintenance group is stripped from project-tier config."),
+    model: MaintenanceModelEntrySchema.optional().describe("Primary maintenance model entry: a bare provider/model string or { model, variant? (OpenCode), thinking_level? (Pi) }. USER-LEVEL ONLY. When absent, inherit historian model configuration. If neither has a primary, automatic passes skip and manual runs refuse. The main-session model is never inherited."),
+    fallback_models: array(MaintenanceModelEntrySchema).optional().describe("Ordered fallback maintenance model entries, tried after CALL failures only. When absent and the primary is inherited, inherit historian fallbacks; explicit [] disables fallbacks. Illegal manifests, permission refusals, and exhausted budgets never switch models."),
     budgets: object({
       inputTokens: number2().int().min(1).default(400000).describe("Per-run input-token budget (input + cacheRead + cacheWrite pricing dimensions). Default 400000."),
       outputTokens: number2().int().min(1).default(32000).describe("Per-run output-token budget. Default 32000."),
@@ -5165,7 +5176,7 @@ var MagicContextConfigSchema = object({
       maxRetries: 3
     },
     anomalyThreshold: { absoluteRows: 10, poolFraction: 0.25 }
-  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.")
+  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: project-tier config cannot pick maintenance models or change run controls. An absent model inherits historian model configuration, never the session model.")
 });
 var LIVE_RELOAD_CONFIG_PATHS = [
   "cache_ttl",

package/dist/{index-v6scmxvt.js → index-1p318k54.js}

@@ -1,6 +1,6 @@
 import {
   log
-} from "./index-54cgx9gm.js";
+} from "./index-83p1tc98.js";
 
 // ../plugin/src/shared/safe-notification-target.ts
 var DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;

package/dist/{index-dx9vhsy8.js → index-4ktngyya.js}

@@ -1,6 +1,6 @@
 import {
   log
-} from "./index-54cgx9gm.js";
+} from "./index-83p1tc98.js";
 
 // ../plugin/src/shared/write-transaction-timing.ts
 var SLOW_WRITE_TRANSACTION_THRESHOLD_MS = 1000;

package/dist/{index-54cgx9gm.js → index-83p1tc98.js}

@@ -431,8 +431,12 @@ function flush() {
     let currentSize = getCurrentLogSize(logFile);
     const dataSize = Buffer.byteLength(data);
     if (currentSize > 0 && currentSize + dataSize > MAX_LOG_FILE_BYTES) {
-      rotateLogFile(logFile, currentSize);
-      currentSize = 0;
+      flushesSinceSizeCheck = SIZE_CHECK_INTERVAL_FLUSHES;
+      currentSize = getCurrentLogSize(logFile);
+      if (currentSize > 0 && currentSize + dataSize > MAX_LOG_FILE_BYTES) {
+        rotateLogFile(logFile, currentSize);
+        currentSize = 0;
+      }
     }
     fs.appendFileSync(logFile, data, { encoding: "utf8", mode: 384 });
     buffer = [];

package/dist/{index-ny303arh.js → index-cr4hzd76.js}

@@ -1,16 +1,23 @@
 // ../plugin/src/shared/sqlite.ts
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
+var resourceRoot = new AsyncResource("magic-context:root");
+function inRootAsyncContext(operation) {
+  return resourceRoot.runInAsyncScope(operation);
+}
 var reportSlowPrivilegedWrite;
 function registerSlowWriteReporter(reporter) {
   reportSlowPrivilegedWrite = reporter;
 }
 var sqliteDiagnosticSink;
-function registerSqliteDiagnosticSink(sink) {
+var sqliteDiagnosticHost = () => "unknown";
+function registerSqliteDiagnosticSink(sink, host) {
   sqliteDiagnosticSink = sink;
+  if (host)
+    sqliteDiagnosticHost = host;
 }
 function reportSqliteDiagnostic(message) {
   try {
-    sqliteDiagnosticSink?.(`[magic-context] ${message}`);
+    sqliteDiagnosticSink?.(`[magic-context] ${message} pid=${process.pid} host=${sqliteDiagnosticHost()}`);
   } catch {}
 }
 function detectSqliteRuntime() {
@@ -46,10 +53,31 @@ class SqliteRuntimeUnavailableError extends Error {
     this.specifier = specifier;
   }
 }
+function isNodeSqliteExperimentalWarning(args) {
+  const [warning, options] = args;
+  const message = warning instanceof Error ? warning.message : warning;
+  const type = typeof options === "string" ? options : options && typeof options === "object" ? options.type : undefined;
+  return type === "ExperimentalWarning" && typeof message === "string" && message.startsWith("SQLite is an experimental feature");
+}
+async function importSqliteModuleForRuntime(runtime, specifier, importer) {
+  if (runtime !== "Node.js")
+    return importer(specifier);
+  const originalEmitWarning = process.emitWarning;
+  process.emitWarning = function(...args) {
+    if (isNodeSqliteExperimentalWarning(args))
+      return;
+    Reflect.apply(originalEmitWarning, this, args);
+  };
+  try {
+    return await importer(specifier);
+  } finally {
+    process.emitWarning = originalEmitWarning;
+  }
+}
 async function loadSqliteModule(runtime = detectSqliteRuntime(), importer = importSqliteModule) {
   const specifier = runtime === "Bun" ? bunSpec : nodeSpec;
   try {
-    return await importer(specifier);
+    return await importSqliteModuleForRuntime(runtime, specifier, importer);
   } catch (error) {
     if (isModuleNotFoundError(error, specifier)) {
       throw new SqliteRuntimeUnavailableError(runtime, specifier, error);
@@ -63,6 +91,81 @@ var sqliteModule = await loadSqliteModule(detectedRuntime);
 var DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
 var trackedSqliteConnections = new Map;
 var nextSqliteConnectionSequence = 1;
+var TAG_COLUMNS_OUTSIDE_IDENTITY = new Set([
+  "status",
+  "drop_mode",
+  "byte_size",
+  "input_byte_size",
+  "reasoning_byte_size",
+  "token_count",
+  "input_token_count",
+  "caveman_depth",
+  "entry_fingerprint",
+  "tool_name",
+  "harness"
+]);
+var tagIdentityWriteGeneration = 0;
+function mayChangeTagIdentity(sql) {
+  if (!/\btags\b/i.test(sql) || /^\s*(?:SELECT|EXPLAIN|PRAGMA)\b/i.test(sql))
+    return false;
+  if (/^\s*WITH\b/i.test(sql) && !/\b(?:INSERT|UPDATE|DELETE|REPLACE)\b/i.test(sql))
+    return false;
+  if (/;\s*\S/.test(sql) || /\bREPLACE\b/i.test(sql) || /\bON\s+CONFLICT\b/i.test(sql))
+    return true;
+  const insert = /^\s*INSERT\s+INTO\s+(?:main\.)?["`]?tags["`]?\s*\(([^)]*)\)/i.exec(sql);
+  if (insert) {
+    const columns = (insert[1] ?? "").split(",").map((column) => column.trim().replace(/["`[\]]/g, "").toLowerCase());
+    return columns.includes("id") || columns.includes("rowid");
+  }
+  const update = /^\s*UPDATE\s+(?:main\.)?["`]?tags["`]?\s+SET\s+([\s\S]*?)\bWHERE\b/i.exec(sql);
+  if (update && !/\bSELECT\b/i.test(sql)) {
+    const assignments = topLevelCommaSegments(update[1] ?? "");
+    if (!assignments)
+      return true;
+    return !assignments.every((assignment) => {
+      const column = /^\s*["`]?(\w+)["`]?\s*=(?!=)/.exec(assignment)?.[1];
+      return column !== undefined && TAG_COLUMNS_OUTSIDE_IDENTITY.has(column.toLowerCase());
+    });
+  }
+  return true;
+}
+function topLevelCommaSegments(text) {
+  const segments = [];
+  let depth = 0;
+  let quote = null;
+  let start = 0;
+  for (let index = 0;index < text.length; index += 1) {
+    const char = text[index];
+    if (quote) {
+      if (char === quote) {
+        if (text[index + 1] === quote)
+          index += 1;
+        else
+          quote = null;
+      }
+      continue;
+    }
+    if (char === "'" || char === '"' || char === "`")
+      quote = char;
+    else if (char === "(")
+      depth += 1;
+    else if (char === ")") {
+      depth -= 1;
+      if (depth < 0)
+        return null;
+    } else if (char === "," && depth === 0) {
+      segments.push(text.slice(start, index));
+      start = index + 1;
+    }
+  }
+  if (quote || depth !== 0)
+    return null;
+  segments.push(text.slice(start));
+  return segments;
+}
+function getTagIdentityWriteGeneration() {
+  return tagIdentityWriteGeneration;
+}
 function installTransactionRouting(db, readonly) {
   const nativeExec = db.exec.bind(db);
   Object.defineProperty(db, "exec", {
@@ -73,16 +176,30 @@ function installTransactionRouting(db, readonly) {
         assertTransformWrite();
       if (/^\s*BEGIN\s+(?:IMMEDIATE|EXCLUSIVE)(?:\s+TRANSACTION)?\s*;?\s*$/i.test(sql)) {
         openWriterTransactions.delete(db);
-        if (transformPassScope.getStore()?.active || backgroundWriterScope.getStore())
+        if (transformPassScope.getStore()?.active || backgroundWriterScope.getStore()) {
           acquireShort(db, () => nativeExec(sql), sql.trim());
-        else
+        } else {
           nativeExec(sql);
+          openWriterTransactions.set(db, {
+            site: sql.trim(),
+            lane: "background",
+            acquireMs: 0,
+            attempts: 1,
+            acquiredAt: performance.now()
+          });
+        }
         return db;
       }
       if (WRITER_TRANSACTION_END.test(sql) && openWriterTransactions.has(db))
         return endWriterTransaction(db, () => nativeExec(sql), sql);
-      if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql))
-        return withAutocommitTimeout(db, () => nativeExec(sql));
+      if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)) {
+        try {
+          return withAutocommitTimeout(db, () => nativeExec(sql), false);
+        } finally {
+          if (mayChangeTagIdentity(sql))
+            tagIdentityWriteGeneration += 1;
+        }
+      }
       return nativeExec(sql);
     }
   });
@@ -93,13 +210,23 @@ function installTransactionRouting(db, readonly) {
     value: (sql) => {
       const statement = nativePrepare(sql);
       if (!readonly && !/^\s*(?:SELECT|EXPLAIN|PRAGMA)\b/i.test(sql)) {
+        const changesTagIdentity = mayChangeTagIdentity(sql);
         for (const method of ["run", "get", "all"]) {
           const execute = statement[method].bind(statement);
           Object.defineProperty(statement, method, {
             configurable: true,
-            value: (...args) => withAutocommitTimeout(db, () => execute(...args))
+            value: (...args) => {
+              try {
+                return withAutocommitTimeout(db, () => execute(...args));
+              } finally {
+                if (changesTagIdentity)
+                  tagIdentityWriteGeneration += 1;
+              }
+            }
           });
         }
+        if (changesTagIdentity)
+          wrapRemainingTagWriteForms(statement);
       }
       return statement;
     }
@@ -147,6 +274,35 @@ function installTransactionRouting(db, readonly) {
     }
   });
 }
+function wrapRemainingTagWriteForms(statement) {
+  if (typeof statement.iterate === "function") {
+    const iterate = statement.iterate.bind(statement);
+    Object.defineProperty(statement, "iterate", {
+      configurable: true,
+      value: function* (...args) {
+        tagIdentityWriteGeneration += 1;
+        try {
+          yield* iterate(...args);
+        } finally {
+          tagIdentityWriteGeneration += 1;
+        }
+      }
+    });
+  }
+  if (typeof statement.values === "function") {
+    const values = statement.values.bind(statement);
+    Object.defineProperty(statement, "values", {
+      configurable: true,
+      value: (...args) => {
+        try {
+          return values(...args);
+        } finally {
+          tagIdentityWriteGeneration += 1;
+        }
+      }
+    });
+  }
+}
 function trackSqliteConnection(db, filename, options) {
   const originalClose = db.close.bind(db);
   const sequence = nextSqliteConnectionSequence++;
@@ -180,7 +336,7 @@ function trackSqliteConnection(db, filename, options) {
 }
 var TrackedDatabase = new Proxy(DatabaseImpl, {
   construct(target, args) {
-    const db = Reflect.construct(target, args, target);
+    const db = inRootAsyncContext(() => Reflect.construct(target, args, target));
     return trackSqliteConnection(db, args[0], args[1]);
   }
 });
@@ -207,6 +363,18 @@ function buildNodeSqliteDatabaseClass(DatabaseSync) {
   return NodeSqliteDatabase;
 }
 var Database = TrackedDatabase;
+function getSqliteDatabasePath(db) {
+  for (const connection of trackedSqliteConnections.values()) {
+    if (connection.reference.deref() === db) {
+      return connection.filename === ":memory:" || connection.filename === "<buffer>" ? null : connection.filename;
+    }
+  }
+  const native = db;
+  const path = native.filename ?? native.name;
+  if (typeof path === "string" && path !== ":memory:" && path !== "")
+    return path;
+  return null;
+}
 function pragmaValue(db, name) {
   const row = db.prepare(`PRAGMA ${name}`).get();
   if (!row)
@@ -289,22 +457,29 @@ function withSqliteTransformPass(operation) {
   const existing = transformPassScope.getStore();
   if (existing?.active)
     return operation();
-  const lease = { active: true, remainingWaitMs: FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS };
-  return transformPassScope.run(lease, () => {
-    try {
-      const result = operation();
-      if (result && typeof result.then === "function") {
-        return Promise.resolve(result).finally(() => {
-          lease.active = false;
-        });
+  const reservation = reserveForegroundSqliteTurn();
+  const run = (release) => {
+    const lease = { active: true, remainingWaitMs: FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS };
+    return transformPassScope.run(lease, () => {
+      try {
+        const result = operation();
+        if (result && typeof result.then === "function") {
+          return Promise.resolve(result).finally(() => {
+            lease.active = false;
+            release();
+          });
+        }
+        lease.active = false;
+        release();
+        return result;
+      } catch (error) {
+        lease.active = false;
+        release();
+        throw error;
       }
-      lease.active = false;
-      return result;
-    } catch (error) {
-      lease.active = false;
-      throw error;
-    }
-  });
+    });
+  };
+  return typeof reservation === "function" ? run(reservation) : reservation.then(run);
 }
 function withoutSqliteTransformPass(operation) {
   return transformPassScope.run(undefined, operation);
@@ -335,9 +510,9 @@ class SqliteAcquisitionBusyError extends Error {
   }
 }
 var SHORT_BUSY_TIMEOUT_MS = 25;
-var FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 250;
+var FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 2000;
 var FOREGROUND_ACQUISITION_BUDGET_MS = 16500;
-var SLOW_WRITER_LOG_MS = 250;
+var SLOW_WRITER_LOG_MS = 100;
 var WRITER_TRANSACTION_END = /^\s*(?:COMMIT|END|ROLLBACK)(?:\s+TRANSACTION)?\s*;?\s*$/i;
 var writerAcquisitionScope = new AsyncLocalStorage;
 var openWriterTransactions = new WeakMap;
@@ -345,25 +520,52 @@ function foregroundWaitLease() {
   const lease = transformPassScope.getStore();
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
-function withAutocommitTimeout(db, operation) {
+function withAutocommitTimeout(db, operation, singleStatement = true) {
   assertTransformWrite();
   const lease = foregroundWaitLease();
-  if (isInTransaction(db) || !lease && !backgroundWriterScope.getStore())
+  if (isInTransaction(db))
     return operation();
-  const previous = pragmaNumber(db, "busy_timeout");
-  db.exec(`PRAGMA busy_timeout=${lease ? Math.floor(lease.remainingWaitMs) : SHORT_BUSY_TIMEOUT_MS}`);
+  const scoped = lease || backgroundWriterScope.getStore();
+  const previous = scoped ? pragmaNumber(db, "busy_timeout") : null;
   const started = performance.now();
+  let completed = false;
+  const execute = () => {
+    const result = operation();
+    completed = true;
+    return result;
+  };
   try {
-    return operation();
+    if (!scoped)
+      return execute();
+    if (singleStatement) {
+      db.exec("PRAGMA busy_timeout=0");
+      try {
+        return execute();
+      } catch (error) {
+        if (!isTransientSqliteError(error) || isInTransaction(db))
+          throw error;
+      }
+      assertTransformWrite();
+    }
+    const timeout = Math.floor(Math.min(lease?.remainingWaitMs ?? SHORT_BUSY_TIMEOUT_MS, lease?.guard?.remainingMs() ?? Infinity));
+    db.exec(`PRAGMA busy_timeout=${timeout}`);
+    const waitStarted = performance.now();
+    try {
+      return execute();
+    } finally {
+      if (lease)
+        lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - (performance.now() - waitStarted));
+    }
   } catch (error) {
     if (lease && isTransientSqliteError(error))
       throw new SqliteAcquisitionBusyError(error, "autocommit");
     throw error;
   } finally {
-    if (lease)
-      lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - (performance.now() - started));
+    const elapsed = performance.now() - started;
     if (previous !== null)
       db.exec(`PRAGMA busy_timeout=${previous}`);
+    if (elapsed >= SLOW_WRITER_LOG_MS)
+      reportSqliteDiagnostic(`sqlite writer site=autocommit lane=${lease ? "foreground" : "background"} elapsed_ms=${Math.round(elapsed)} timing=statement_including_acquisition outcome=${completed ? "completed" : "failed"} caller=${writerCaller()}`);
   }
 }
 function acquireShort(db, acquire, site) {
@@ -420,11 +622,15 @@ function endWriterTransaction(db, end, sql) {
       const holdMs = performance.now() - open.acquiredAt;
       if (open.acquireMs >= SLOW_WRITER_LOG_MS || holdMs >= SLOW_WRITER_LOG_MS) {
         const outcome = /^\s*ROLLBACK/i.test(sql) ? "rolled_back" : ended ? "committed" : "failed";
-        reportSqliteDiagnostic(`sqlite writer site=${open.site} lane=${open.lane} acquire_ms=${Math.round(open.acquireMs)} hold_ms=${Math.round(holdMs)} attempts=${open.attempts} outcome=${outcome}`);
+        reportSqliteDiagnostic(`sqlite writer site=${open.site} lane=${open.lane} acquire_ms=${Math.round(open.acquireMs)} hold_ms=${Math.round(holdMs)} attempts=${open.attempts} outcome=${outcome} timing=through_commit_upper_bound caller=${writerCaller()}`);
       }
     }
   }
 }
+function writerCaller() {
+  return new Error().stack?.split(`
+`).find((line) => line.includes(" at ") && !/[/\\]sqlite\.[tj]s[:)]/.test(line) && !/\b(?:writerCaller|endWriterTransaction|withAutocommitTimeout|value)\b/.test(line))?.trim().replace(/\s+/g, "_") ?? "unknown";
+}
 async function withAsyncPrivilegedWriter(db, operation, options = {}) {
   const started = performance.now();
   const budgetMs = Math.max(0, Math.min(FOREGROUND_ACQUISITION_BUDGET_MS, options.budgetMs ?? Infinity));
@@ -533,5 +739,56 @@ function withPrivilegedWriter(db, operation) {
     throw error;
   }
 }
+var indexCoordinationKey = Symbol.for("magic-context.index-foreground-coordination.v1");
+var indexCoordinationHeap = globalThis;
+var indexCoordinationBuffer = indexCoordinationHeap[indexCoordinationKey] ?? new SharedArrayBuffer(3 * Int32Array.BYTES_PER_ELEMENT);
+indexCoordinationHeap[indexCoordinationKey] = indexCoordinationBuffer;
+var indexCoordinationState = new Int32Array(indexCoordinationBuffer);
+function indexCoordinationInput() {
+  return {
+    indexCoordination: indexCoordinationBuffer,
+    indexOwner: Atomics.add(indexCoordinationState, 2, 1) + 1
+  };
+}
+var yieldIndexTurn = () => new Promise((resolve) => setTimeout(resolve, 1));
+function reserveForegroundSqliteTurn() {
+  Atomics.add(indexCoordinationState, 0, 1);
+  const release = () => {
+    Atomics.sub(indexCoordinationState, 0, 1);
+    Atomics.notify(indexCoordinationState, 0);
+  };
+  if (Atomics.load(indexCoordinationState, 1) === 0)
+    return release;
+  return (async () => {
+    while (Atomics.load(indexCoordinationState, 1) !== 0)
+      await yieldIndexTurn();
+    return release;
+  })();
+}
+function releaseIndexOwner(input) {
+  if (!input.indexCoordination || !input.indexOwner)
+    return;
+  const shared = new Int32Array(input.indexCoordination);
+  Atomics.compareExchange(shared, 1, input.indexOwner, 0);
+  Atomics.notify(shared, 1);
+}
+async function withIndexChunk(input, operation) {
+  if (!input.indexCoordination || !input.indexOwner)
+    return operation();
+  const shared = new Int32Array(input.indexCoordination);
+  for (;; ) {
+    if (Atomics.load(shared, 0) === 0 && Atomics.compareExchange(shared, 1, 0, input.indexOwner) === 0) {
+      if (Atomics.load(shared, 0) === 0)
+        break;
+      releaseIndexOwner(input);
+    }
+    await yieldIndexTurn();
+  }
+  try {
+    return await operation();
+  } finally {
+    releaseIndexOwner(input);
+  }
+}
 
-export { registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, Database, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, guardSqliteTransformPass, isTransientSqliteError, withAsyncPrivilegedWriter, withPrivilegedWriter };
+export { inRootAsyncContext, registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, getTagIdentityWriteGeneration, Database, getSqliteDatabasePath, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, guardSqliteTransformPass, isTransientSqliteError, withAsyncPrivilegedWriter, withPrivilegedWriter, indexCoordinationInput, withIndexChunk };