@cortexkit/magic-context 0.36.0 → 0.36.1

package/dist/index.js

@@ -11569,8 +11569,156 @@ var init_opencode = __esm(() => {
   import_comment_json = __toESM(require_src3(), 1);
 });
 
-// src/lib/jsonc-config.ts
+// ../plugin/src/shared/jsonc-parser.ts
 import { existsSync as existsSync9, readFileSync as readFileSync6 } from "node:fs";
+function stripJsonComments(content) {
+  let result = "";
+  let inString = false;
+  let escaped = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let index = 0;index < content.length; index += 1) {
+    const char = content[index];
+    const next = content[index + 1];
+    if (inLineComment) {
+      if (char === `
+`) {
+        inLineComment = false;
+        result += char;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (char === "*" && next === "/") {
+        inBlockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      inLineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      inBlockComment = true;
+      index += 1;
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
+function stripTrailingCommas(content) {
+  let result = "";
+  let inString = false;
+  let escaped = false;
+  for (let index = 0;index < content.length; index += 1) {
+    const char = content[index];
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === ",") {
+      let lookahead = index + 1;
+      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
+        lookahead += 1;
+      }
+      const next = content[lookahead];
+      if (next === "}" || next === "]") {
+        continue;
+      }
+    }
+    result += char;
+  }
+  return result;
+}
+function isPrototypePollutionKey(key) {
+  return PROTOTYPE_POLLUTION_KEYS.has(key);
+}
+function sanitizeParsedJson(value, options = {}, path2 = []) {
+  if (Array.isArray(value)) {
+    return value.map((entry, index) => sanitizeParsedJson(entry, options, [...path2, index]));
+  }
+  if (value === null || typeof value !== "object")
+    return value;
+  const source = value;
+  const sourcePrototype = Object.getPrototypeOf(source);
+  if (sourcePrototype !== null && sourcePrototype !== Object.prototype) {
+    options.onRejectedKey?.([...path2, "__proto__"]);
+  }
+  const sanitized = {};
+  for (const key of Object.keys(source)) {
+    if (isPrototypePollutionKey(key)) {
+      options.onRejectedKey?.([...path2, key]);
+      continue;
+    }
+    Object.defineProperty(sanitized, key, {
+      value: sanitizeParsedJson(source[key], options, [...path2, key]),
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  }
+  return sanitized;
+}
+function parseJsonc2(content, options = {}) {
+  const normalized = stripTrailingCommas(stripJsonComments(content));
+  return sanitizeParsedJson(JSON.parse(normalized), options);
+}
+function readJsoncFile(filePath) {
+  try {
+    return parseJsonc2(readFileSync6(filePath, "utf-8"));
+  } catch (_error) {
+    return null;
+  }
+}
+function detectConfigFile(basePath) {
+  const jsoncPath = `${basePath}.jsonc`;
+  const jsonPath = `${basePath}.json`;
+  if (existsSync9(jsoncPath)) {
+    return { format: "jsonc", path: jsoncPath };
+  }
+  if (existsSync9(jsonPath)) {
+    return { format: "json", path: jsonPath };
+  }
+  return { format: "none", path: jsoncPath };
+}
+var PROTOTYPE_POLLUTION_KEYS;
+var init_jsonc_parser = __esm(() => {
+  PROTOTYPE_POLLUTION_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+});
+
+// src/lib/jsonc-config.ts
+import { existsSync as existsSync10, readFileSync as readFileSync7 } from "node:fs";
 function parseErrorLocation(content, error) {
   const lines = content.split(`
 `);
@@ -11586,11 +11734,17 @@ function parseErrorLocation(content, error) {
   return { line: messageLine ? Number.parseInt(messageLine, 10) : 1, column: 1 };
 }
 function readJsoncConfig(path2) {
-  if (!existsSync9(path2))
+  if (!existsSync10(path2))
     return { kind: "missing" };
-  const content = readFileSync6(path2, "utf-8");
+  const content = readFileSync7(path2, "utf-8");
   try {
-    const parsed = import_comment_json2.parse(content);
+    const rejectedKeyPaths = [];
+    const parsed = sanitizeParsedJson(import_comment_json2.parse(content), {
+      onRejectedKey: (keyPath) => rejectedKeyPaths.push(keyPath.join("."))
+    });
+    if (rejectedKeyPaths.length > 0) {
+      throw new Error(`unsafe prototype-pollution key at ${rejectedKeyPaths.join(", ")}`);
+    }
     if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
       throw new Error("expected a JSON object at the document root");
     }
@@ -11616,6 +11770,7 @@ function assertJsoncConfigsParseable(paths) {
 }
 var import_comment_json2, ConfigParseError;
 var init_jsonc_config = __esm(() => {
+  init_jsonc_parser();
   import_comment_json2 = __toESM(require_src3(), 1);
   ConfigParseError = class ConfigParseError extends Error {
     path;
@@ -11698,7 +11853,7 @@ function describePiPackageEntry(entry) {
 var PI_MAGIC_CONTEXT_PACKAGE_NAME = "@cortexkit/pi-magic-context";
 
 // src/adapters/pi.ts
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 import { dirname as dirname5 } from "node:path";
 
 class PiAdapter {
@@ -11835,7 +11990,7 @@ function writePiSettings(settings2) {
 }
 function ensureDir2(filePath) {
   const dir = dirname5(filePath);
-  if (!existsSync10(dir)) {
+  if (!existsSync11(dir)) {
     const { mkdirSync: mkdirSync4 } = __require("node:fs");
     mkdirSync4(dir, { recursive: true });
   }
@@ -12248,10 +12403,10 @@ var init_dreamer_setup = __esm(() => {
 });
 
 // src/commands/setup-pi.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync4 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync4 } from "node:fs";
 import { dirname as dirname6 } from "node:path";
 function ensureDir3(path2) {
-  if (!existsSync11(path2))
+  if (!existsSync12(path2))
     mkdirSync4(path2, { recursive: true });
 }
 async function getDefaultPrompts() {
@@ -12689,122 +12844,6 @@ Edit those files directly, then rerun setup.`);
   };
 });
 
-// ../plugin/src/shared/jsonc-parser.ts
-import { existsSync as existsSync12, readFileSync as readFileSync7 } from "node:fs";
-function stripJsonComments(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  let inLineComment = false;
-  let inBlockComment = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    const next = content[index + 1];
-    if (inLineComment) {
-      if (char === `
-`) {
-        inLineComment = false;
-        result += char;
-      }
-      continue;
-    }
-    if (inBlockComment) {
-      if (char === "*" && next === "/") {
-        inBlockComment = false;
-        index += 1;
-      }
-      continue;
-    }
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === "/" && next === "/") {
-      inLineComment = true;
-      index += 1;
-      continue;
-    }
-    if (char === "/" && next === "*") {
-      inBlockComment = true;
-      index += 1;
-      continue;
-    }
-    result += char;
-  }
-  return result;
-}
-function stripTrailingCommas(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === ",") {
-      let lookahead = index + 1;
-      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
-        lookahead += 1;
-      }
-      const next = content[lookahead];
-      if (next === "}" || next === "]") {
-        continue;
-      }
-    }
-    result += char;
-  }
-  return result;
-}
-function parseJsonc3(content) {
-  const normalized = stripTrailingCommas(stripJsonComments(content));
-  return JSON.parse(normalized);
-}
-function readJsoncFile(filePath) {
-  try {
-    return parseJsonc3(readFileSync7(filePath, "utf-8"));
-  } catch (_error) {
-    return null;
-  }
-}
-function detectConfigFile(basePath) {
-  const jsoncPath = `${basePath}.jsonc`;
-  const jsonPath = `${basePath}.json`;
-  if (existsSync12(jsoncPath)) {
-    return { format: "jsonc", path: jsoncPath };
-  }
-  if (existsSync12(jsonPath)) {
-    return { format: "json", path: jsonPath };
-  }
-  return { format: "none", path: jsoncPath };
-}
-var init_jsonc_parser = () => {};
-
 // ../plugin/src/shared/logger.ts
 import * as fs from "node:fs";
 import * as path2 from "node:path";
@@ -27899,7 +27938,9 @@ function isValidPromptSurfaceModelKey(key) {
   if (key.length === 0 || key.trim() !== key)
     return false;
   const slash = key.indexOf("/");
-  if (slash <= 0 || slash === key.length - 1)
+  if (slash < 0)
+    return !key.includes("*");
+  if (slash === 0 || slash === key.length - 1)
     return false;
   const provider = key.slice(0, slash);
   const modelID = key.slice(slash + 1);
@@ -27971,14 +28012,14 @@ var init_magic_context = __esm(() => {
   }).optional();
   PromptSurfacePresetSchema = exports_external.enum(["full", "light"]);
   PromptSurfaceModelKeySchema = exports_external.string().refine(isValidPromptSurfaceModelKey, {
-    message: "Use a non-empty provider/model key or the literal provider/* wildcard; model IDs may contain additional slashes and matching is case-sensitive."
+    message: "Use a non-empty bare model key, provider/model key, or the literal provider/* wildcard; model IDs may contain additional slashes and matching is case-sensitive."
   });
   PromptSurfaceToolKeySchema = exports_external.string().refine((value) => value.trim().length > 0, {
     message: "tool description keys must not be empty or whitespace-only"
   });
   PromptSurfaceConfigSchema = exports_external.object({
     default: PromptSurfacePresetSchema.default("full").describe('Fallback prompt-surface preset ("full" or "light").'),
-    models: exports_external.record(PromptSurfaceModelKeySchema, PromptSurfacePresetSchema).optional().describe("Literal per-model routing. Keys are provider/model or provider/*; matching is case-sensitive and preserves additional slashes in model IDs."),
+    models: exports_external.record(PromptSurfaceModelKeySchema, PromptSurfacePresetSchema).optional().describe("Literal per-model routing. Keys are bare model IDs, provider/model, or provider/*; matching is case-sensitive and preserves additional slashes in model IDs."),
     guidance_override_path: exports_external.string().refine((value) => value.trim().length > 0, {
       message: "guidance_override_path must not be empty or whitespace-only"
     }).optional().describe("USER-LEVEL ONLY path to a complete primary guidance section. Relative paths resolve from the user config file."),
@@ -28155,7 +28196,7 @@ var init_magic_context = __esm(() => {
       retina_handoff: exports_external.boolean().default(false).describe("When true, dreamer skips smart notes whose surface conditions compiled to retina provider configs at authoring time. Default false keeps both paths active until the retina consumer is deployed.")
     }).default({ retina_handoff: false }).describe("Smart-note ownership transition controls."),
     cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m").describe('Cache TTL: string (e.g. "5m", "1h", "30s") or per-model object ({ default: "5m", "model-id": "10m" }). Set to "never" for lanes kept warm by an external keepwarm proxy — disables the idle-TTL heuristic so MC never initiates a rebuild based on elapsed time.'),
-    prompt_surface: PromptSurfaceConfigSchema.default({ default: "full" }).describe("Prompt-surface presets: default is full; models use the literal provider/model or provider/* routing grammar. Guidance and tool-description overrides are user-level only. On OpenCode and Pi, per-model routing applies to the guidance block only: tool descriptions are registered once per process, so they follow the default preset (a v1 plugin-surface limitation; per-model tool descriptions are planned for the OpenCode v2 plugin API once the SDK stabilizes)."),
+    prompt_surface: PromptSurfaceConfigSchema.default({ default: "full" }).describe("Prompt-surface presets: default is full; models use bare model IDs, provider/model, or provider/* routing keys. Guidance and tool-description overrides are user-level only. On OpenCode and Pi, per-model routing applies to the guidance block only: tool descriptions are registered once per process, so they follow the default preset (a v1 plugin-surface limitation; per-model tool descriptions are planned for the OpenCode v2 plugin API once the SDK stabilizes)."),
     output_reserve: exports_external.union([
       exports_external.number().min(0),
       exports_external.object({ default: exports_external.number().min(0) }).catchall(exports_external.number().min(0))
@@ -28780,10 +28821,15 @@ function loadConfigFileDetailed(configPath, source) {
       configPath,
       isProjectConfig: source === "project"
     });
+    const rejectedKeyPaths = [];
+    const config2 = parseJsonc2(substituted.text, {
+      onRejectedKey: (path3) => rejectedKeyPaths.push(path3.join("."))
+    });
+    const unsafeKeyWarnings = rejectedKeyPaths.map((path3) => `Ignored unsafe config key "${path3}" (security: prototype-pollution keys are not allowed).`);
     return {
-      config: parseJsonc3(substituted.text),
-      warnings: substituted.warnings.map((w) => `${configPath}: ${w}`),
-      outcome: substituted.warnings.length > 0 ? "substitution-failure" : "ok",
+      config: config2,
+      warnings: [...substituted.warnings, ...unsafeKeyWarnings].map((warning) => `${configPath}: ${warning}`),
+      outcome: rejectedKeyPaths.length > 0 ? "schema-recovery" : substituted.warnings.length > 0 ? "substitution-failure" : "ok",
       source
     };
   } catch (error51) {
@@ -28797,18 +28843,35 @@ function loadConfigFileDetailed(configPath, source) {
     };
   }
 }
+function defineOwnConfigValue(target, key, value) {
+  Object.defineProperty(target, key, {
+    value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+}
 function deepMergeRawConfig(base, override) {
-  const result = { ...base };
+  const result = {};
+  for (const key of Object.keys(base)) {
+    if (isPrototypePollutionKey(key))
+      continue;
+    defineOwnConfigValue(result, key, base[key]);
+  }
   for (const key of Object.keys(override)) {
-    const baseVal = base[key];
+    if (isPrototypePollutionKey(key))
+      continue;
+    const baseVal = Object.hasOwn(base, key) ? base[key] : undefined;
     const overrideVal = override[key];
+    let mergedValue;
     if (baseVal !== null && typeof baseVal === "object" && !Array.isArray(baseVal) && overrideVal !== null && typeof overrideVal === "object" && !Array.isArray(overrideVal)) {
-      result[key] = deepMergeRawConfig(baseVal, overrideVal);
+      mergedValue = deepMergeRawConfig(baseVal, overrideVal);
     } else if (key === "disabled_hooks" && Array.isArray(baseVal) && Array.isArray(overrideVal)) {
-      result[key] = [...new Set([...baseVal, ...overrideVal])];
+      mergedValue = [...new Set([...baseVal, ...overrideVal])];
     } else {
-      result[key] = overrideVal;
+      mergedValue = overrideVal;
     }
+    defineOwnConfigValue(result, key, mergedValue);
   }
   return result;
 }
@@ -29313,30 +29376,242 @@ var init_conflict_detector = __esm(() => {
   OMO_PACKAGE_NAMES = new Set(["oh-my-opencode", "oh-my-openagent"]);
 });
 
-// ../plugin/src/shared/conflict-fixer.ts
-import { existsSync as existsSync15, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "node:fs";
-import { homedir as homedir11 } from "node:os";
-import { join as join12 } from "node:path";
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function asStringArray(value) {
-  return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
-}
+// ../plugin/src/shared/jsonc-edit.ts
+import {
+  applyEdits,
+  createScanner,
+  findNodeAtLocation,
+  getNodeValue,
+  modify,
+  parseTree
+} from "jsonc-parser";
+function parseDocument(text3) {
+  const errors3 = [];
+  const root = parseTree(text3, errors3, { allowTrailingComma: true });
+  if (!root || errors3.length > 0) {
+    throw new Error("Cannot edit invalid JSONC");
+  }
+  return root;
+}
+function findNode(text3, path3) {
+  return findNodeAtLocation(parseDocument(text3), path3);
+}
+function findComma(text3, start, end) {
+  const scanner = createScanner(text3, false);
+  scanner.setPosition(start);
+  for (;; ) {
+    const kind = scanner.scan();
+    const offset = scanner.getTokenOffset();
+    if (kind === TOKEN_EOF || offset >= end)
+      return;
+    if (kind === TOKEN_COMMA) {
+      return {
+        offset,
+        length: scanner.getTokenLength(),
+        line: scanner.getTokenStartLine()
+      };
+    }
+  }
+}
+function lineStart(text3, offset) {
+  const previousNewline = text3.lastIndexOf(`
+`, offset - 1);
+  return previousNewline === -1 ? 0 : previousNewline + 1;
+}
+function lineEnd(text3, offset) {
+  const nextNewline = text3.indexOf(`
+`, offset);
+  if (nextNewline === -1)
+    return text3.length;
+  return text3[nextNewline - 1] === "\r" ? nextNewline - 1 : nextNewline;
+}
+function inlineCommentEnd(text3, start, line, limit) {
+  const scanner = createScanner(text3, false);
+  scanner.setPosition(start);
+  let end;
+  for (;; ) {
+    const kind = scanner.scan();
+    const offset = scanner.getTokenOffset();
+    if (kind === TOKEN_EOF || offset >= limit || scanner.getTokenStartLine() !== line) {
+      return end;
+    }
+    if (kind === TOKEN_LINE_COMMENT || kind === TOKEN_BLOCK_COMMENT) {
+      end = offset + scanner.getTokenLength();
+    }
+  }
+}
+function startAfterPrecedingInlineComments(text3, comma, entryOffset) {
+  const commentEnd = inlineCommentEnd(text3, comma.offset + comma.length, comma.line, entryOffset);
+  if (commentEnd === undefined)
+    return comma.offset + comma.length;
+  const nextNewline = text3.indexOf(`
+`, commentEnd);
+  return nextNewline === -1 ? commentEnd : nextNewline + 1;
+}
+function endAfterFollowingInlineComments(text3, comma, nextEntryOffset) {
+  const commentEnd = inlineCommentEnd(text3, comma.offset + comma.length, comma.line, nextEntryOffset);
+  return commentEnd === undefined ? comma.offset + comma.length : lineEnd(text3, commentEnd);
+}
+function closingWhitespace(text3, entryEnd, closingBracket) {
+  const trailing = text3.slice(entryEnd, closingBracket);
+  const finalNewline = trailing.lastIndexOf(`
+`);
+  if (finalNewline === -1)
+    return "";
+  const newlineStart = trailing[finalNewline - 1] === "\r" ? finalNewline - 1 : finalNewline;
+  return trailing.slice(newlineStart);
+}
+function removeArrayEntry(text3, array2, index) {
+  const entries = array2.children ?? [];
+  const entry = entries[index];
+  if (!entry)
+    return text3;
+  const closingBracket = array2.offset + array2.length - 1;
+  if (entries.length === 1) {
+    const start2 = array2.offset + 1;
+    const replacement = closingWhitespace(text3, entry.offset + entry.length, closingBracket);
+    return text3.slice(0, start2) + replacement + text3.slice(closingBracket);
+  }
+  if (index === entries.length - 1) {
+    const previous = entries[index - 1];
+    if (!previous)
+      return text3;
+    const comma = findComma(text3, previous.offset + previous.length, entry.offset);
+    if (!comma)
+      return text3;
+    const replacement = closingWhitespace(text3, entry.offset + entry.length, closingBracket);
+    return text3.slice(0, comma.offset) + replacement + text3.slice(closingBracket);
+  }
+  const next = entries[index + 1];
+  if (!next)
+    return text3;
+  const followingComma = findComma(text3, entry.offset + entry.length, next.offset);
+  if (!followingComma)
+    return text3;
+  const start = index === 0 ? array2.offset + 1 : (() => {
+    const previous = entries[index - 1];
+    if (!previous)
+      return entry.offset;
+    const precedingComma = findComma(text3, previous.offset + previous.length, entry.offset);
+    return precedingComma ? startAfterPrecedingInlineComments(text3, precedingComma, entry.offset) : entry.offset;
+  })();
+  const end = endAfterFollowingInlineComments(text3, followingComma, next.offset);
+  return text3.slice(0, start) + text3.slice(end);
+}
+function indentationAt(text3, offset) {
+  const prefix = text3.slice(lineStart(text3, offset), offset);
+  return /^[\t ]*$/.test(prefix) ? prefix : "";
+}
+function inferIndent(text3, array2) {
+  const firstEntry = array2.children?.[0];
+  if (firstEntry)
+    return indentationAt(text3, firstEntry.offset);
+  const closingBracket = array2.offset + array2.length - 1;
+  const closingIndent = indentationAt(text3, closingBracket);
+  return `${closingIndent}${closingIndent.includes("\t") ? "\t" : "  "}`;
+}
+function appendArrayValue(text3, array2, value) {
+  const entries = array2.children ?? [];
+  const closingBracket = array2.offset + array2.length - 1;
+  const serialized = JSON.stringify(value);
+  if (entries.length === 0) {
+    if (!text3.slice(array2.offset, closingBracket).includes(`
+`)) {
+      return text3.slice(0, closingBracket) + serialized + text3.slice(closingBracket);
+    }
+    const indent = inferIndent(text3, array2);
+    const closingLineStart2 = lineStart(text3, closingBracket);
+    const eol2 = text3.includes(`\r
+`) ? `\r
+` : `
+`;
+    return text3.slice(0, closingLineStart2) + indent + serialized + eol2 + text3.slice(closingLineStart2);
+  }
+  const lastEntry = entries.at(-1);
+  if (!lastEntry)
+    return text3;
+  const trailingComma = findComma(text3, lastEntry.offset + lastEntry.length, closingBracket);
+  const isMultiline = text3.slice(array2.offset, closingBracket).includes(`
+`);
+  if (!isMultiline) {
+    return text3.slice(0, lastEntry.offset + lastEntry.length) + `,${serialized}` + text3.slice(lastEntry.offset + lastEntry.length);
+  }
+  const closingLineStart = lineStart(text3, closingBracket);
+  const eol = text3.includes(`\r
+`) ? `\r
+` : `
+`;
+  const inserted = `${inferIndent(text3, array2)}${serialized}${trailingComma ? "," : ""}${eol}`;
+  const withValue = text3.slice(0, closingLineStart) + inserted + text3.slice(closingLineStart);
+  if (trailingComma)
+    return withValue;
+  return withValue.slice(0, lastEntry.offset + lastEntry.length) + "," + withValue.slice(lastEntry.offset + lastEntry.length);
+}
+function setJsoncValue(text3, path3, value) {
+  const node = findNode(text3, path3);
+  if (node) {
+    if (Object.is(getNodeValue(node), value))
+      return text3;
+    const serialized = JSON.stringify(value);
+    return text3.slice(0, node.offset) + serialized + text3.slice(node.offset + node.length);
+  }
+  return applyEdits(text3, modify(text3, path3, value, {}));
+}
+function removeJsoncArrayEntries(text3, path3, shouldRemove) {
+  let nextText = text3;
+  let removed = false;
+  for (;; ) {
+    const array2 = findNode(nextText, path3);
+    if (array2?.type !== "array")
+      return { text: nextText, removed };
+    const index = (array2.children ?? []).findIndex((entry) => shouldRemove(getNodeValue(entry)));
+    if (index === -1)
+      return { text: nextText, removed };
+    const updated = removeArrayEntry(nextText, array2, index);
+    if (updated === nextText)
+      return { text: nextText, removed };
+    nextText = updated;
+    removed = true;
+  }
+}
+function appendJsoncArrayValues(text3, path3, values) {
+  let nextText = text3;
+  for (const value of values) {
+    const array2 = findNode(nextText, path3);
+    if (array2?.type !== "array") {
+      return setJsoncValue(nextText, path3, values);
+    }
+    nextText = appendArrayValue(nextText, array2, value);
+  }
+  return nextText;
+}
+var TOKEN_COMMA = 5, TOKEN_LINE_COMMENT = 12, TOKEN_BLOCK_COMMENT = 13, TOKEN_EOF = 17;
+var init_jsonc_edit = () => {};
+
+// ../plugin/src/shared/conflict-fixer.ts
+import { existsSync as existsSync15, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "node:fs";
+import { homedir as homedir11 } from "node:os";
+import { join as join12 } from "node:path";
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function asStringArray(value) {
+  return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
 function readConfig(filePath) {
   if (!existsSync15(filePath)) {
     return null;
   }
   try {
-    const parsed = import_comment_json5.parse(readFileSync10(filePath, "utf-8"));
-    return isRecord(parsed) ? parsed : null;
+    const text3 = readFileSync10(filePath, "utf-8");
+    const parsed = import_comment_json5.parse(text3);
+    return isRecord(parsed) ? { config: parsed, text: text3 } : null;
   } catch {
     return null;
   }
 }
-function writeConfig(filePath, config2) {
-  writeFileSync4(filePath, `${import_comment_json5.stringify(config2, null, 2)}
-`);
+function writeConfig(filePath, text3) {
+  writeFileSync4(filePath, text3);
 }
 function resolveUserOpenCodeConfigPath() {
   const paths = getOpenCodeConfigPaths({ binary: "opencode" });
@@ -29395,21 +29670,24 @@ function isUnifiedOmoPath(configPath) {
   const basename2 = configPath.split("/").pop() ?? "";
   return basename2 === "omo.jsonc" || basename2 === "omo.json";
 }
-function getOrCreateOmoV2Block(config2) {
-  const block2 = config2["[opencode]"];
-  if (isRecord(block2)) {
-    return block2;
+function disableCompactionFlags(text3, config2) {
+  if (!isRecord(config2.compaction)) {
+    return {
+      text: setJsoncValue(text3, ["compaction"], { auto: false, prune: false }),
+      changed: true
+    };
   }
-  const newBlock = {};
-  config2["[opencode]"] = newBlock;
-  return newBlock;
-}
-function filterDcpPluginEntries(entries) {
-  const plugins = entries.filter((entry) => {
-    const name = extractPluginName(entry);
-    return name ? !matchesPackageName(name, DCP_PACKAGE_NAMES) : true;
-  });
-  return { plugins, removed: plugins.length !== entries.length };
+  let updated = text3;
+  let changed = false;
+  if (config2.compaction.auto !== false) {
+    updated = setJsoncValue(updated, ["compaction", "auto"], false);
+    changed = true;
+  }
+  if (config2.compaction.prune !== false) {
+    updated = setJsoncValue(updated, ["compaction", "prune"], false);
+    changed = true;
+  }
+  return { text: updated, changed };
 }
 function fixConflicts(directory, conflicts, options) {
   const compactionEnabled = options?.compactionEnabled ?? true;
@@ -29420,36 +29698,33 @@ function fixConflicts(directory, conflicts, options) {
   const repairCompaction = compactionEnabled && (conflicts.compactionAuto || conflicts.compactionPrune);
   if (repairCompaction || conflicts.dcpPlugin) {
     for (const configPath of collectOpenCodeConfigPaths(directory)) {
-      const config2 = readConfig(configPath);
-      if (!config2) {
+      const document = readConfig(configPath);
+      if (!document) {
         continue;
       }
+      let text3 = document.text;
       let changed = false;
       if (repairCompaction) {
-        const compaction = isRecord(config2.compaction) ? config2.compaction : {};
-        if (compaction.auto !== false) {
-          compaction.auto = false;
-          changed = true;
-          updatedCompaction = true;
-        }
-        if (compaction.prune !== false) {
-          compaction.prune = false;
+        const result = disableCompactionFlags(text3, document.config);
+        if (result.changed) {
+          text3 = result.text;
           changed = true;
           updatedCompaction = true;
         }
-        config2.compaction = compaction;
       }
       if (conflicts.dcpPlugin) {
-        const plugins = Array.isArray(config2.plugin) ? config2.plugin : [];
-        const filtered = filterDcpPluginEntries(plugins);
-        if (filtered.removed) {
-          config2.plugin = filtered.plugins;
+        const result = removeJsoncArrayEntries(text3, ["plugin"], (entry) => {
+          const name = extractPluginName(entry);
+          return name ? matchesPackageName(name, DCP_PACKAGE_NAMES) : false;
+        });
+        if (result.removed) {
+          text3 = result.text;
           changed = true;
           removedDcpPlugin = true;
         }
       }
       if (changed) {
-        writeConfig(configPath, config2);
+        writeConfig(configPath, text3);
       }
     }
   }
@@ -29465,26 +29740,19 @@ function fixConflicts(directory, conflicts, options) {
       hooksToDisable.add("anthropic-context-window-limit-recovery");
     }
     for (const configPath of collectOmoConfigPaths(directory)) {
-      const config2 = readConfig(configPath);
-      if (!config2) {
+      const document = readConfig(configPath);
+      if (!document) {
         continue;
       }
-      const target = isUnifiedOmoPath(configPath) ? getOrCreateOmoV2Block(config2) : config2;
+      const unifiedPath = isUnifiedOmoPath(configPath);
+      const target = unifiedPath && isRecord(document.config["[opencode]"]) ? document.config["[opencode]"] : unifiedPath ? {} : document.config;
       const disabledHooks = new Set(asStringArray(target.disabled_hooks));
-      let changed = false;
-      for (const hook of hooksToDisable) {
-        if (!disabledHooks.has(hook)) {
-          disabledHooks.add(hook);
-          changed = true;
-          disabledOmoHooks = true;
-        }
-      }
-      if (changed) {
-        target.disabled_hooks = [
-          ...CONFLICTING_OMO_HOOKS.filter((hook) => disabledHooks.has(hook)),
-          ...[...disabledHooks].filter((hook) => !CONFLICTING_OMO_HOOKS.includes(hook))
-        ];
-        writeConfig(configPath, config2);
+      const hooksToAdd = CONFLICTING_OMO_HOOKS.filter((hook) => hooksToDisable.has(hook) && !disabledHooks.has(hook));
+      if (hooksToAdd.length > 0) {
+        const path3 = unifiedPath ? ["[opencode]", "disabled_hooks"] : ["disabled_hooks"];
+        const text3 = Array.isArray(target.disabled_hooks) ? appendJsoncArrayValues(document.text, path3, hooksToAdd) : setJsoncValue(document.text, path3, hooksToAdd);
+        writeConfig(configPath, text3);
+        disabledOmoHooks = true;
       }
     }
   }
@@ -29502,6 +29770,7 @@ function fixConflicts(directory, conflicts, options) {
 var import_comment_json5, CONFLICTING_OMO_HOOKS, OMO_CONFIG_NAMES, OMO_UNIFIED_NAMES;
 var init_conflict_fixer = __esm(() => {
   init_conflict_detector();
+  init_jsonc_edit();
   init_opencode_config_dir();
   import_comment_json5 = __toESM(require_src3(), 1);
   CONFLICTING_OMO_HOOKS = [
@@ -29572,7 +29841,7 @@ var OPENCODE_BINARY_ENV = "MAGIC_CONTEXT_OPENCODE_BINARY", OPENCODE_VERSION_PROB
 var init_opencode_helpers = () => {};
 
 // src/commands/setup-opencode.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync6 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync6, readFileSync as readFileSync11 } from "node:fs";
 import { basename as basename2, dirname as dirname9 } from "node:path";
 function resolveCompactionEnabledForWriter() {
   try {
@@ -29591,47 +29860,81 @@ function ensureDir5(dir) {
 function addPluginToOpenCodeConfig(configPath, _format, removeDcp = false, compactionEnabled = true) {
   const existsAtCommit = existsSync16(configPath);
   const existing = existsAtCommit ? readJsoncConfigForUpdate(configPath) : {};
-  if (!existsAtCommit)
+  if (!existsAtCommit) {
     ensureDir5(dirname9(configPath));
-  let rawPlugins = Array.isArray(existing.plugin) ? existing.plugin : [];
-  if (removeDcp) {
-    rawPlugins = rawPlugins.filter((plugin) => !matchesPluginEntry(plugin, DCP_PLUGIN_NAME));
+    const created = { plugin: [OPENCODE_PLUGIN_ENTRY_WITH_VERSION] };
+    if (compactionEnabled) {
+      created.compaction = { auto: false, prune: false };
+    }
+    writeFileAtomic(configPath, `${import_comment_json6.stringify(created, null, 2)}
+`);
+    return;
   }
-  const hasNpmEntry = rawPlugins.some((p2) => matchesPluginEntry(p2, OPENCODE_PLUGIN_NAME));
-  const hasDevEntry = rawPlugins.some((p2) => isDevPathPluginEntry(p2));
-  if (rawPlugins.some((p2) => isLocalPathPluginEntry(p2) && String(p2).includes("magic-context") && !isDevPathPluginEntry(p2))) {
+  let text3 = readFileSync11(configPath, "utf-8");
+  let changed = false;
+  const rawPlugins = Array.isArray(existing.plugin) ? existing.plugin : [];
+  const retainedPlugins = removeDcp ? rawPlugins.filter((plugin) => !matchesPluginEntry(plugin, DCP_PLUGIN_NAME)) : rawPlugins;
+  if (retainedPlugins.some((plugin) => isLocalPathPluginEntry(plugin) && String(plugin).includes("magic-context") && !isDevPathPluginEntry(plugin))) {
     log2.warn("An unverifiable local OpenCode plugin path was ignored; its package name is not Magic Context.");
   }
-  if (!hasNpmEntry && !hasDevEntry) {
-    rawPlugins.push(OPENCODE_PLUGIN_ENTRY_WITH_VERSION);
+  if (Array.isArray(existing.plugin)) {
+    if (removeDcp) {
+      const result = removeJsoncArrayEntries(text3, ["plugin"], (plugin) => matchesPluginEntry(plugin, DCP_PLUGIN_NAME));
+      if (result.removed) {
+        text3 = result.text;
+        changed = true;
+      }
+    }
+    const hasNpmEntry = retainedPlugins.some((plugin) => matchesPluginEntry(plugin, OPENCODE_PLUGIN_NAME));
+    const hasDevEntry = retainedPlugins.some((plugin) => isDevPathPluginEntry(plugin));
+    if (!hasNpmEntry && !hasDevEntry) {
+      text3 = appendJsoncArrayValues(text3, ["plugin"], [OPENCODE_PLUGIN_ENTRY_WITH_VERSION]);
+      changed = true;
+    }
+  } else {
+    text3 = setJsoncValue(text3, ["plugin"], [OPENCODE_PLUGIN_ENTRY_WITH_VERSION]);
+    changed = true;
   }
-  existing.plugin = rawPlugins;
   if (compactionEnabled) {
-    const compaction = existing.compaction ?? {};
-    compaction.auto = false;
-    compaction.prune = false;
-    existing.compaction = compaction;
+    const compaction = existing.compaction;
+    const hasCompactionObject = typeof compaction === "object" && compaction !== null && !Array.isArray(compaction);
+    if (!hasCompactionObject) {
+      text3 = setJsoncValue(text3, ["compaction"], { auto: false, prune: false });
+      changed = true;
+    } else {
+      const fields = compaction;
+      if (fields.auto !== false) {
+        text3 = setJsoncValue(text3, ["compaction", "auto"], false);
+        changed = true;
+      }
+      if (fields.prune !== false) {
+        text3 = setJsoncValue(text3, ["compaction", "prune"], false);
+        changed = true;
+      }
+    }
   }
-  writeFileAtomic(configPath, `${import_comment_json6.stringify(existing, null, 2)}
-`);
+  if (changed)
+    writeFileAtomic(configPath, text3);
 }
 function addPluginToTuiConfig(configPath, _format) {
   const existsAtCommit = existsSync16(configPath);
   const existing = existsAtCommit ? readJsoncConfigForUpdate(configPath) : {};
-  if (!existsAtCommit)
+  if (!existsAtCommit) {
     ensureDir5(dirname9(configPath));
+    writeFileAtomic(configPath, `${import_comment_json6.stringify({ plugin: [OPENCODE_PLUGIN_ENTRY_WITH_VERSION] }, null, 2)}
+`);
+    return;
+  }
   const rawPlugins = Array.isArray(existing.plugin) ? existing.plugin : [];
-  const hasNpmEntry = rawPlugins.some((p2) => matchesPluginEntry(p2, OPENCODE_PLUGIN_NAME));
-  const hasDevEntry = rawPlugins.some((p2) => isDevPathPluginEntry(p2));
-  if (rawPlugins.some((p2) => isLocalPathPluginEntry(p2) && String(p2).includes("magic-context") && !isDevPathPluginEntry(p2))) {
+  if (rawPlugins.some((plugin) => isLocalPathPluginEntry(plugin) && String(plugin).includes("magic-context") && !isDevPathPluginEntry(plugin))) {
     log2.warn("An unverifiable local TUI plugin path was ignored; its package name is not Magic Context.");
   }
-  if (!hasNpmEntry && !hasDevEntry) {
-    rawPlugins.push(OPENCODE_PLUGIN_ENTRY_WITH_VERSION);
-  }
-  existing.plugin = rawPlugins;
-  writeFileAtomic(configPath, `${import_comment_json6.stringify(existing, null, 2)}
-`);
+  const hasNpmEntry = rawPlugins.some((plugin) => matchesPluginEntry(plugin, OPENCODE_PLUGIN_NAME));
+  const hasDevEntry = rawPlugins.some((plugin) => isDevPathPluginEntry(plugin));
+  if (hasNpmEntry || hasDevEntry)
+    return;
+  const text3 = Array.isArray(existing.plugin) ? appendJsoncArrayValues(readFileSync11(configPath, "utf-8"), ["plugin"], [OPENCODE_PLUGIN_ENTRY_WITH_VERSION]) : setJsoncValue(readFileSync11(configPath, "utf-8"), ["plugin"], [OPENCODE_PLUGIN_ENTRY_WITH_VERSION]);
+  writeFileAtomic(configPath, text3);
 }
 function findDcpPluginIndexes(plugins) {
   return plugins.map((plugin, index) => matchesPluginEntry(plugin, DCP_PLUGIN_NAME) ? index : -1).filter((index) => index >= 0);
@@ -29920,6 +30223,7 @@ var init_setup_opencode = __esm(() => {
   init_agent_disable();
   init_conflict_detector();
   init_conflict_fixer();
+  init_jsonc_edit();
   init_opencode();
   init_atomic_write();
   init_config_location_migration();
@@ -30412,7 +30716,8 @@ function prepareMirrorPageStatements(db) {
     deleteNote: db.prepare("DELETE FROM notes WHERE id = ?"),
     deleteNoteRevisions: db.prepare("DELETE FROM mirror_note_revisions WHERE module_project = ? AND module_row_id = ?"),
     updateNote: db.prepare(`UPDATE notes SET type = ?, status = ?, project_path = ?, session_id = ?, content = ?,
-             surface_condition = ?, ready_at = ?, ready_reason = ?, manifest_json = ?, compiled_check = ?,
+             surface_condition = ?, compiled_provider = ?, compiled_config = ?, compiled_at = ?, compile_status = ?,
+             ready_at = ?, ready_reason = ?, manifest_json = ?, compiled_check = ?,
              check_hash = ?, check_cron = ?, check_failure_count = ?, check_network_failure_count = ?,
              check_quarantined_until = ?, check_next_due_at = ?, check_compiled_at = ?, check_false_since_at = ?,
              check_last_liveness_at = ?, last_checked_at = ?, check_status = ?, check_version = ?,
@@ -30668,7 +30973,7 @@ function applyNoteRow(db, feed, statements) {
   }
   const moduleStatus = rowString(effectiveRow, "status", "active");
   const contextStatus = moduleStatus === "surfaced" || moduleStatus === "surfacing" ? "ready" : moduleStatus;
-  statements.updateNote.run(rowString(effectiveRow, "type", "smart"), contextStatus, moduleProject, rowNullableString(effectiveRow, "session_id"), rowString(effectiveRow, "content"), rowNullableString(effectiveRow, "surface_condition"), typeof effectiveRow.ready_at === "number" ? effectiveRow.ready_at : null, rowNullableString(effectiveRow, "ready_reason"), rowNullableString(effectiveRow, "manifest_json"), rowNullableString(effectiveRow, "compiled_check"), rowNullableString(effectiveRow, "check_hash"), rowNullableString(effectiveRow, "check_cron"), rowNumber(effectiveRow, "check_failure_count"), rowNumber(effectiveRow, "check_network_failure_count"), typeof effectiveRow.check_quarantined_until === "number" ? effectiveRow.check_quarantined_until : null, typeof effectiveRow.check_next_due_at === "number" ? effectiveRow.check_next_due_at : null, typeof effectiveRow.check_compiled_at === "number" ? effectiveRow.check_compiled_at : null, typeof effectiveRow.check_false_since_at === "number" ? effectiveRow.check_false_since_at : null, typeof effectiveRow.check_last_liveness_at === "number" ? effectiveRow.check_last_liveness_at : null, typeof effectiveRow.last_checked_at === "number" ? effectiveRow.last_checked_at : null, rowString(effectiveRow, "check_status", "uncompiled"), rowNumber(effectiveRow, "check_version"), rowNumber(effectiveRow, "policy_version", 1), rowNullableString(effectiveRow, "anchor_block_id"), typeof effectiveRow.anchor_ordinal === "number" ? effectiveRow.anchor_ordinal : null, rowNumber(effectiveRow, "created_at_ms"), rowNumber(effectiveRow, "updated_at_ms"), contextId);
+  statements.updateNote.run(rowString(effectiveRow, "type", "smart"), contextStatus, moduleProject, rowNullableString(effectiveRow, "session_id"), rowString(effectiveRow, "content"), rowNullableString(effectiveRow, "surface_condition"), rowNullableString(effectiveRow, "compiled_provider"), rowNullableString(effectiveRow, "compiled_config"), typeof effectiveRow.compiled_at === "number" ? effectiveRow.compiled_at : null, rowNullableString(effectiveRow, "compile_status"), typeof effectiveRow.ready_at === "number" ? effectiveRow.ready_at : null, rowNullableString(effectiveRow, "ready_reason"), rowNullableString(effectiveRow, "manifest_json"), rowNullableString(effectiveRow, "compiled_check"), rowNullableString(effectiveRow, "check_hash"), rowNullableString(effectiveRow, "check_cron"), rowNumber(effectiveRow, "check_failure_count"), rowNumber(effectiveRow, "check_network_failure_count"), typeof effectiveRow.check_quarantined_until === "number" ? effectiveRow.check_quarantined_until : null, typeof effectiveRow.check_next_due_at === "number" ? effectiveRow.check_next_due_at : null, typeof effectiveRow.check_compiled_at === "number" ? effectiveRow.check_compiled_at : null, typeof effectiveRow.check_false_since_at === "number" ? effectiveRow.check_false_since_at : null, typeof effectiveRow.check_last_liveness_at === "number" ? effectiveRow.check_last_liveness_at : null, typeof effectiveRow.last_checked_at === "number" ? effectiveRow.last_checked_at : null, rowString(effectiveRow, "check_status", "uncompiled"), rowNumber(effectiveRow, "check_version"), rowNumber(effectiveRow, "policy_version", 1), rowNullableString(effectiveRow, "anchor_block_id"), typeof effectiveRow.anchor_ordinal === "number" ? effectiveRow.anchor_ordinal : null, rowNumber(effectiveRow, "created_at_ms"), rowNumber(effectiveRow, "updated_at_ms"), contextId);
   statements.upsertNoteRevision.run(moduleProject, feed.module_row_id, contextId, rowNumber(effectiveRow, "status_version"));
 }
 function applyMirrorPage(args) {
@@ -33368,10 +33673,13 @@ class SubcModuleTransport {
   routeSessionPrefix;
   client = null;
   routes = new Map;
+  routeOpenings = new Map;
   canonicalRootCache = new Map;
-  activeSession = null;
+  sessionLanes = new Map;
+  queuedLaneWaiters = 0;
+  wrapupSessions = new Map;
   nextProbeMs = 0;
-  laneReleaseCallbacks = [];
+  connectionPromise = null;
   authorityProjectRoot = "";
   authorityBindRoot = "";
   backoffMs = CONNECT_BACKOFF_INITIAL_MS;
@@ -33417,6 +33725,11 @@ class SubcModuleTransport {
   laneTimeoutError() {
     return this.deadlineError("while queued");
   }
+  connectionChangedError(detail) {
+    const error51 = new Error(detail);
+    error51.code = "ECONNRESET";
+    return error51;
+  }
   async beforeDeadline(operation, deadlineMs, detail) {
     const remainingMs = deadlineMs - Date.now();
     if (remainingMs <= 0)
@@ -33434,22 +33747,30 @@ class SubcModuleTransport {
         clearTimeout(timer);
     }
   }
-  laneRelease() {
+  cleanupLane(sessionId, lane) {
+    if (!lane.active && lane.waiters.length === 0 && this.sessionLanes.get(sessionId) === lane) {
+      this.sessionLanes.delete(sessionId);
+    }
+  }
+  laneRelease(sessionId, lane) {
     let released = false;
     return () => {
       if (released)
         return;
       released = true;
-      this.activeSession = null;
-      this.dispatchNextLaneWaiter();
+      lane.active = false;
+      this.dispatchNextLaneWaiter(sessionId, lane);
     };
   }
-  dispatchNextLaneWaiter() {
-    if (this.activeSession !== null)
+  dispatchNextLaneWaiter(sessionId, lane) {
+    if (lane.active)
       return;
-    while (this.laneReleaseCallbacks.length > 0) {
-      const waiter = this.laneReleaseCallbacks.shift();
-      if (!waiter || waiter.settled)
+    while (lane.waiters.length > 0) {
+      const waiter = lane.waiters.shift();
+      if (!waiter)
+        continue;
+      this.queuedLaneWaiters = Math.max(0, this.queuedLaneWaiters - 1);
+      if (waiter.settled)
         continue;
       waiter.settled = true;
       clearTimeout(waiter.timer);
@@ -33462,10 +33783,16 @@ class SubcModuleTransport {
         waiter.reject(this.laneTimeoutError());
         continue;
       }
-      this.activeSession = waiter.sessionId;
-      waiter.resolve(this.laneRelease());
+      lane.active = true;
+      waiter.resolve(this.laneRelease(sessionId, lane));
       return;
     }
+    this.cleanupLane(sessionId, lane);
+  }
+  queueFullError() {
+    const error51 = new Error("module transport queue is full");
+    error51.code = "EBUSY";
+    return error51;
   }
   acquireCorrectnessLane(sessionId, signal, deadlineMs) {
     if (signal?.aborted) {
@@ -33474,14 +33801,14 @@ class SubcModuleTransport {
     if (deadlineMs - Date.now() < SERIAL_LANE_MIN_REMAINING_MS) {
       return Promise.reject(this.laneTimeoutError());
     }
-    if (this.activeSession === null && this.laneReleaseCallbacks.length === 0) {
-      this.activeSession = sessionId;
-      return Promise.resolve(this.laneRelease());
+    const lane = this.sessionLanes.get(sessionId) ?? { active: false, waiters: [] };
+    this.sessionLanes.set(sessionId, lane);
+    if (!lane.active && lane.waiters.length === 0) {
+      lane.active = true;
+      return Promise.resolve(this.laneRelease(sessionId, lane));
     }
-    if (this.laneReleaseCallbacks.length >= SERIAL_LANE_MAX_WAITERS) {
-      const error51 = new Error("module transport queue is full");
-      error51.code = "EBUSY";
-      return Promise.reject(error51);
+    if (this.queuedLaneWaiters >= SERIAL_LANE_MAX_WAITERS || lane.waiters.length >= SERIAL_LANE_MAX_WAITERS_PER_SESSION) {
+      return Promise.reject(this.queueFullError());
     }
     return new Promise((resolve5, reject) => {
       const waiter = {};
@@ -33491,14 +33818,14 @@ class SubcModuleTransport {
         waiter.settled = true;
         clearTimeout(waiter.timer);
         signal?.removeEventListener("abort", waiter.onAbort);
-        const index = this.laneReleaseCallbacks.indexOf(waiter);
-        if (index >= 0)
-          this.laneReleaseCallbacks.splice(index, 1);
+        const index = lane.waiters.indexOf(waiter);
+        if (index >= 0) {
+          lane.waiters.splice(index, 1);
+          this.queuedLaneWaiters = Math.max(0, this.queuedLaneWaiters - 1);
+        }
         reject(error51);
-        if (this.activeSession === null)
-          this.dispatchNextLaneWaiter();
+        this.cleanupLane(sessionId, lane);
       };
-      waiter.sessionId = sessionId;
       waiter.signal = signal;
       waiter.deadlineMs = deadlineMs;
       waiter.resolve = resolve5;
@@ -33507,17 +33834,40 @@ class SubcModuleTransport {
       waiter.onAbort = () => removeAndReject(signal?.reason ?? new Error("module transport call aborted"));
       waiter.timer = setTimeout(() => removeAndReject(this.laneTimeoutError()), Math.max(0, deadlineMs - Date.now()));
       signal?.addEventListener("abort", waiter.onAbort, { once: true });
-      this.laneReleaseCallbacks.push(waiter);
+      lane.waiters.push(waiter);
+      this.queuedLaneWaiters += 1;
     });
   }
   async call(args) {
-    const attemptTimeoutMs = args.timeoutMs ?? (args.method === "transform" ? Math.min(this.requestTimeoutMs, TRANSFORM_SEND_TIMEOUT_MS) : this.requestTimeoutMs);
+    const wrapupInFlight = (this.wrapupSessions.get(args.sessionId) ?? 0) > 0;
+    const attemptTimeoutMs = args.timeoutMs ?? (args.method === "session.wrapup" || args.method === "session.status" && wrapupInFlight ? MAX_WRAPUP_REQUEST_BUDGET_MS : args.method === "transform" ? Math.min(this.requestTimeoutMs, TRANSFORM_SEND_TIMEOUT_MS) : this.requestTimeoutMs);
+    const tracksWrapup = args.method === "session.wrapup";
+    if (tracksWrapup) {
+      this.wrapupSessions.set(args.sessionId, (this.wrapupSessions.get(args.sessionId) ?? 0) + 1);
+    }
+    const finishWrapupTracking = () => {
+      if (!tracksWrapup)
+        return;
+      const remaining = (this.wrapupSessions.get(args.sessionId) ?? 1) - 1;
+      if (remaining > 0)
+        this.wrapupSessions.set(args.sessionId, remaining);
+      else
+        this.wrapupSessions.delete(args.sessionId);
+    };
     const laneDeadlineMs = Date.now() + attemptTimeoutMs;
-    const releaseLane = await this.acquireCorrectnessLane(args.sessionId, args.signal, laneDeadlineMs);
-    const onAbort = () => this.invalidateConnection();
+    let releaseLane;
+    try {
+      releaseLane = await this.acquireCorrectnessLane(args.sessionId, args.signal, laneDeadlineMs);
+    } catch (error51) {
+      finishWrapupTracking();
+      throw error51;
+    }
+    let activeAttemptClient = null;
+    const onAbort = () => this.invalidateConnection(activeAttemptClient ?? this.client);
     args.signal?.addEventListener("abort", onAbort, { once: true });
     try {
       for (let attempt = 0;attempt < 2; attempt += 1) {
+        activeAttemptClient = null;
         let ensuredRoute = null;
         try {
           if (args.signal?.aborted) {
@@ -33525,22 +33875,35 @@ class SubcModuleTransport {
           }
           const attemptDeadlineMs = Date.now() + attemptTimeoutMs;
           ensuredRoute = await this.ensureRoute(args.sessionId, args.projectRoot, attemptDeadlineMs);
+          activeAttemptClient = ensuredRoute.client;
           if (args.signal?.aborted) {
             throw args.signal.reason ?? new Error("module transport call aborted");
           }
-          return await this.beforeDeadline(ensuredRoute.client.request(ensuredRoute.route, args.body, {
+          const response = await this.beforeDeadline(ensuredRoute.client.request(ensuredRoute.route, args.body, {
             priority: Priority.Background,
             admissionClass: AdmissionClass.Normal,
             timeoutMs: Math.max(1, attemptDeadlineMs - Date.now())
           }), attemptDeadlineMs, "waiting for the module response");
+          if (this.client !== ensuredRoute.client || this.connectionGeneration !== ensuredRoute.generation) {
+            throw this.connectionChangedError("subc connection changed while awaiting the module response");
+          }
+          return response;
         } catch (error51) {
           if (isConnectionFailure(error51)) {
+            const previousGeneration = ensuredRoute?.generation ?? this.connectionGeneration;
             if (ensuredRoute) {
               this.dropRoute(ensuredRoute.routeKey, ensuredRoute.route);
               this.invalidateConnection(ensuredRoute.client);
             } else {
               this.invalidateConnection();
             }
+            if (args.generationSensitive && !args.signal?.aborted) {
+              return {
+                transport_status: "connection_generation_changed",
+                previous_generation: previousGeneration,
+                current_generation: this.connectionGeneration
+              };
+            }
             if (attempt === 0 && !args.signal?.aborted)
               continue;
           }
@@ -33550,6 +33913,7 @@ class SubcModuleTransport {
       throw new Error("module transport route retry exhausted");
     } finally {
       args.signal?.removeEventListener("abort", onAbort);
+      finishWrapupTracking();
       releaseLane();
     }
   }
@@ -33640,7 +34004,7 @@ class SubcModuleTransport {
         });
       }
     }
-    if (routes.length === 0 && this.activeSession === sessionId) {
+    if (routes.length === 0 && this.sessionLanes.get(sessionId)?.active) {
       this.invalidateConnection(client);
     }
   }
@@ -33655,23 +34019,36 @@ class SubcModuleTransport {
     }
     if (existing)
       this.routes.delete(routeKey2);
-    const target = { kind: "tool_provider", module_id: this.moduleId };
-    const identity = {
-      project_root: projectRoot,
-      harness: getHarness(),
-      session: `${this.routeSessionPrefix}${sessionId}`
-    };
-    const route = await this.beforeDeadline(client.routeOpen(target, identity), deadlineMs, "opening the module route");
-    if (this.client !== client || generation !== this.connectionGeneration) {
-      await client.closeRoute(route).catch(() => {
-        return;
-      });
-      const error51 = new Error("subc connection changed while opening module route");
-      error51.code = "ECONNRESET";
-      throw error51;
+    const opening = this.routeOpenings.get(routeKey2);
+    if (opening?.client === client && opening.generation === generation) {
+      return await opening.promise;
+    }
+    const promise2 = (async () => {
+      const target = { kind: "tool_provider", module_id: this.moduleId };
+      const identity = {
+        project_root: projectRoot,
+        harness: getHarness(),
+        session: `${this.routeSessionPrefix}${sessionId}`
+      };
+      const route = await this.beforeDeadline(client.routeOpen(target, identity), deadlineMs, "opening the module route");
+      if (this.client !== client || generation !== this.connectionGeneration) {
+        await client.closeRoute(route).catch(() => {
+          return;
+        });
+        throw this.connectionChangedError("subc connection changed while opening module route");
+      }
+      this.routes.set(routeKey2, { route, generation });
+      return { client, route, routeKey: routeKey2, generation };
+    })();
+    const routeOpening = { client, generation, promise: promise2 };
+    this.routeOpenings.set(routeKey2, routeOpening);
+    try {
+      return await promise2;
+    } finally {
+      if (this.routeOpenings.get(routeKey2) === routeOpening) {
+        this.routeOpenings.delete(routeKey2);
+      }
     }
-    this.routes.set(routeKey2, { route, generation });
-    return { client, route, routeKey: routeKey2, generation };
   }
   dropRoute(routeKey2, route) {
     const existing = this.routes.get(routeKey2);
@@ -33699,9 +34076,17 @@ class SubcModuleTransport {
     }
     return resolved;
   }
+  connectClient() {
+    return SubcClient.connect({
+      connectionFile: this.connectionFile,
+      handshakeTimeoutMs: HANDSHAKE_TIMEOUT_MS
+    });
+  }
   async ensureConnected() {
     if (this.client)
       return this.client;
+    if (this.connectionPromise)
+      return await this.connectionPromise;
     const now = Date.now();
     if (now < this.nextProbeMs) {
       const error51 = new Error(`subc connection backoff active until ${this.nextProbeMs}`);
@@ -33709,49 +34094,55 @@ class SubcModuleTransport {
       throw error51;
     }
     const generation = this.connectionGeneration;
-    let candidate = null;
-    try {
-      candidate = await SubcClient.connect({
-        connectionFile: this.connectionFile,
-        handshakeTimeoutMs: HANDSHAKE_TIMEOUT_MS
-      });
-      if (generation !== this.connectionGeneration) {
-        candidate.close();
-        const error51 = new Error("subc connection attempt was superseded");
-        error51.code = "ECONNRESET";
+    const connecting = (async () => {
+      let candidate = null;
+      try {
+        candidate = await this.connectClient();
+        if (generation !== this.connectionGeneration) {
+          candidate.close();
+          throw this.connectionChangedError("subc connection attempt was superseded");
+        }
+        this.client = candidate;
+        this.routes.clear();
+        this.backoffMs = CONNECT_BACKOFF_INITIAL_MS;
+        this.nextProbeMs = 0;
+        return candidate;
+      } catch (error51) {
+        candidate?.close();
+        if (generation === this.connectionGeneration)
+          this.invalidateConnection();
+        this.nextProbeMs = Date.now() + this.backoffMs;
+        this.backoffMs = Math.min(this.backoffMs * 2, CONNECT_BACKOFF_MAX_MS);
         throw error51;
       }
-      this.client = candidate;
-      this.routes.clear();
-      this.backoffMs = CONNECT_BACKOFF_INITIAL_MS;
-      this.nextProbeMs = 0;
-      return candidate;
-    } catch (error51) {
-      candidate?.close();
-      this.invalidateConnection();
-      this.nextProbeMs = Date.now() + this.backoffMs;
-      this.backoffMs = Math.min(this.backoffMs * 2, CONNECT_BACKOFF_MAX_MS);
-      throw error51;
+    })();
+    this.connectionPromise = connecting;
+    try {
+      return await connecting;
+    } finally {
+      if (this.connectionPromise === connecting)
+        this.connectionPromise = null;
     }
   }
   invalidateConnection(client = this.client) {
-    if (client && this.client && client !== this.client)
+    if (client && this.client !== client)
       return;
     this.connectionGeneration += 1;
     this.invalidateStateSyncCapabilities();
     this.client = null;
     this.routes.clear();
+    this.routeOpenings.clear();
     client?.close();
   }
 }
-var DEFAULT_MODULE_ID = "magic-context", CONNECT_BACKOFF_INITIAL_MS = 1000, CONNECT_BACKOFF_MAX_MS = 30000, HANDSHAKE_TIMEOUT_MS = 2000, MODULE_SEND_TIMEOUT_MS = 15000, TRANSFORM_SEND_TIMEOUT_MS = 5000, SERIAL_LANE_MAX_WAITERS = 16, SERIAL_LANE_MIN_REMAINING_MS = 25, CANONICAL_ROOT_CACHE_MAX_ENTRIES = 256;
+var DEFAULT_MODULE_ID = "magic-context", CONNECT_BACKOFF_INITIAL_MS = 1000, CONNECT_BACKOFF_MAX_MS = 30000, HANDSHAKE_TIMEOUT_MS = 2000, MODULE_SEND_TIMEOUT_MS = 15000, TRANSFORM_SEND_TIMEOUT_MS = 5000, MAX_WRAPUP_REQUEST_BUDGET_MS = 3800000, SERIAL_LANE_MAX_WAITERS = 16, SERIAL_LANE_MAX_WAITERS_PER_SESSION = 8, SERIAL_LANE_MIN_REMAINING_MS = 25, CANONICAL_ROOT_CACHE_MAX_ENTRIES = 256;
 var init_module_transport = __esm(() => {
   init_dist5();
   init_data_path();
 });
 // ../plugin/src/shared/rpc-utils.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { readFileSync as readFileSync11 } from "node:fs";
+import { readFileSync as readFileSync12 } from "node:fs";
 function isPidAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0)
     return false;
@@ -33832,6 +34223,49 @@ function isPidIdentityPlausible(record2) {
     return true;
   return commandLooksLikeOpenCode(command);
 }
+function commandLooksLikePi(command) {
+  const normalized = command.trim().toLowerCase().replaceAll("\\", "/");
+  const tokens = normalized.split(/\s+/).filter(Boolean);
+  const executableName = (token) => (token ?? "").split("/").at(-1) ?? "";
+  const first = executableName(tokens[0]).replace(/\.exe$/, "");
+  if (["pi", "pi.cmd", "omp", "oh-my-pi"].includes(first))
+    return true;
+  if (["node", "bun", "deno"].includes(first)) {
+    const script = executableName(tokens[1]);
+    return ["pi", "pi.js", "pi.mjs", "pi.cjs"].includes(script) || normalized.includes("pi-coding-agent");
+  }
+  return false;
+}
+function inspectLivePiProcesses() {
+  if (false) {}
+  try {
+    const output = String(rpcProcessListExecFileSync("ps", ["-axo", "pid=,command="], {
+      encoding: "utf8",
+      timeout: PS_PROBE_TIMEOUT_MS
+    }));
+    const pids = new Set;
+    for (const line of output.split(/\r?\n/)) {
+      const match = /^\s*(\d+)\s+(.+)$/.exec(line);
+      if (!match)
+        continue;
+      const pid = Number(match[1]);
+      if (!Number.isInteger(pid) || pid <= 0 || pid === process.pid)
+        continue;
+      if (commandLooksLikePi(match[2]))
+        pids.add(pid);
+    }
+    return { state: "known", processIds: [...pids].sort((left, right) => left - right) };
+  } catch (error51) {
+    return {
+      state: "unreadable",
+      processIds: [],
+      error: error51 instanceof Error ? error51.message : String(error51)
+    };
+  }
+}
+function discoverLivePiProcessIds() {
+  return inspectLivePiProcesses().processIds;
+}
 function parseRpcPortFile(content, fallbackPid = 0) {
   const trimmed = content.trim();
   if (!trimmed)
@@ -33863,11 +34297,12 @@ function parseRpcPortFile(content, fallbackPid = 0) {
 function isValidPort(port) {
   return Number.isInteger(port) && port > 0 && port <= 65535;
 }
-var RPC_IDENTITY_SKEW_TOLERANCE_MS = 120000, LINUX_CLOCK_TICKS_PER_SECOND = 100, PS_PROBE_TIMEOUT_MS = 1000, OPEN_CODE_COMMAND_MARKERS, rpcIdentityReadFileSync, rpcIdentityExecFileSync, rpcIdentityPlatform, rpcIdentityNowMs = () => Date.now();
+var RPC_IDENTITY_SKEW_TOLERANCE_MS = 120000, LINUX_CLOCK_TICKS_PER_SECOND = 100, PS_PROBE_TIMEOUT_MS = 1000, OPEN_CODE_COMMAND_MARKERS, rpcIdentityReadFileSync, rpcIdentityExecFileSync, rpcProcessListExecFileSync, rpcIdentityPlatform, rpcIdentityNowMs = () => Date.now();
 var init_rpc_utils = __esm(() => {
   OPEN_CODE_COMMAND_MARKERS = ["opencode", "node", "bun", "electron"];
-  rpcIdentityReadFileSync = readFileSync11;
+  rpcIdentityReadFileSync = readFileSync12;
   rpcIdentityExecFileSync = execFileSync4;
+  rpcProcessListExecFileSync = execFileSync4;
   rpcIdentityPlatform = process.platform;
 });
 // ../plugin/src/hooks/magic-context/compartment-parser.ts
@@ -34227,6 +34662,14 @@ var init_workspaces = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/migrations.ts
+function isSqliteLockError(error51) {
+  if (!error51 || typeof error51 !== "object")
+    return false;
+  const candidate = error51;
+  if (candidate.code === "SQLITE_BUSY" || candidate.code === "SQLITE_LOCKED")
+    return true;
+  return typeof candidate.message === "string" && /database is locked|sqlite_(busy|locked)/i.test(candidate.message);
+}
 function tableExists(db, name) {
   return Boolean(db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = ?").get(name));
 }
@@ -34330,11 +34773,106 @@ function installLatestAuthorityTriggers(db) {
         `);
   }
 }
-var FORK_MIGRATION_VERSION_FLOOR = 1e4, MIGRATIONS, LATEST_MIGRATION_VERSION;
+function ensureMigrationsTable(db) {
+  db.exec(`
+		CREATE TABLE IF NOT EXISTS schema_migrations (
+			version INTEGER PRIMARY KEY,
+			description TEXT NOT NULL,
+			applied_at INTEGER NOT NULL
+		)
+	`);
+}
+function getCurrentVersion(db) {
+  const row = db.prepare("SELECT COALESCE(MAX(version), 0) AS version FROM schema_migrations WHERE version < ?").get(FORK_MIGRATION_VERSION_FLOOR);
+  return row?.version ?? 0;
+}
+function isMigrationApplied(db, version2) {
+  return db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version2) != null;
+}
+function isSiblingMigrationConflict(db, error51, version2) {
+  if (!(error51 instanceof Error))
+    return false;
+  const msg = error51.message;
+  if (!msg.includes("schema_migrations"))
+    return false;
+  if (!msg.toLowerCase().includes("version"))
+    return false;
+  const confirmed = db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version2);
+  return confirmed != null;
+}
+function runMigrations(db) {
+  try {
+    ensureMigrationsTable(db);
+  } catch (error51) {
+    if (isSqliteLockError(error51)) {
+      throw new MigrationLockBusyError(`failed to prepare migration lock: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    }
+    throw error51;
+  }
+  let loggedPlan = false;
+  let touchedLegacyAuthorityBatch = false;
+  while (true) {
+    let migration;
+    let currentVersion = 0;
+    try {
+      const applied = db.transaction(() => {
+        currentVersion = getCurrentVersion(db);
+        migration = MIGRATIONS.find((candidate) => candidate.version > currentVersion && !isMigrationApplied(db, candidate.version));
+        if (!migration)
+          return false;
+        if (!loggedPlan) {
+          const pendingCount = MIGRATIONS.filter((candidate) => candidate.version > currentVersion && !isMigrationApplied(db, candidate.version)).length;
+          log3(`[migrations] current upstream migration lane: ${currentVersion}, applying ${pendingCount} migration(s)`);
+          loggedPlan = true;
+        }
+        migration.up(db);
+        db.prepare("INSERT INTO schema_migrations (version, description, applied_at) VALUES (?, ?, ?)").run(migration.version, migration.description, Date.now());
+        return true;
+      }).immediate();
+      if (!applied || !migration)
+        break;
+      if (migration.version <= 61)
+        touchedLegacyAuthorityBatch = true;
+      log3(`[migrations] applied v${migration.version}: ${migration.description}`);
+    } catch (error51) {
+      if (!migration && isSqliteLockError(error51)) {
+        throw new MigrationLockBusyError(`failed to acquire migration write lock: ${error51 instanceof Error ? error51.message : String(error51)}`);
+      }
+      if (migration && isSiblingMigrationConflict(db, error51, migration.version)) {
+        log3(`[migrations] v${migration.version} already applied by sibling instance — resuming with re-read version`);
+        const reReadVersion = getCurrentVersion(db);
+        if (reReadVersion > currentVersion)
+          continue;
+        throw new Error(`Migration v${migration.version} failed: sibling conflict reported but version did not advance. Database may need manual repair.`);
+      }
+      const version2 = migration?.version ?? currentVersion + 1;
+      const description = migration?.description ?? "acquire migration write lock";
+      log3(`[migrations] FAILED v${version2}: ${description} — ${error51 instanceof Error ? error51.message : String(error51)}`);
+      throw new Error(`Migration v${version2} failed: ${error51 instanceof Error ? error51.message : String(error51)}. Database may need manual repair.`);
+    }
+  }
+  if (touchedLegacyAuthorityBatch) {
+    try {
+      db.transaction(() => installLatestAuthorityTriggers(db)).immediate();
+    } catch (error51) {
+      throw new Error(`Migration authority-trigger postcondition failed: ${error51 instanceof Error ? error51.message : String(error51)}. Database may need manual repair.`);
+    }
+  }
+  if (loggedPlan) {
+    log3(`[migrations] upstream migration lane now: ${MIGRATIONS[MIGRATIONS.length - 1].version}`);
+  }
+}
+var FORK_MIGRATION_VERSION_FLOOR = 1e4, MigrationLockBusyError, MIGRATIONS, LATEST_MIGRATION_VERSION;
 var init_migrations = __esm(() => {
   init_compartment_parser();
   init_logger();
   init_workspaces();
+  MigrationLockBusyError = class MigrationLockBusyError extends Error {
+    constructor(message) {
+      super(message);
+      this.name = "MigrationLockBusyError";
+    }
+  };
   MIGRATIONS = [
     {
       version: 1,
@@ -36289,11 +36827,8 @@ var init_commit_detection = __esm(() => {
   COMMIT_HASH_TEST_PATTERN = new RegExp(`\\b${HASH_HEX}\\b`, "i");
 });
 // ../plugin/src/hooks/magic-context/read-session-formatting.ts
-import { createRequire as createRequire2 } from "node:module";
-var requireFromThisModule;
 var init_read_session_formatting = __esm(() => {
   init_commit_detection();
-  requireFromThisModule = createRequire2(import.meta.url);
 });
 // ../plugin/src/features/magic-context/tool-definition-tokens.ts
 var measurements, fingerprints;
@@ -36320,7 +36855,7 @@ import {
   existsSync as existsSync18,
   mkdirSync as mkdirSync7,
   readdirSync as readdirSync2,
-  readFileSync as readFileSync12,
+  readFileSync as readFileSync13,
   statSync as statSync7,
   unlinkSync as unlinkSync2
 } from "node:fs";
@@ -36448,11 +36983,1113 @@ function inspectRpcServerDiscovery(storageDir) {
 }
 function getLiveMigrationBlockingProcesses(storageDir) {
   const discovery = inspectRpcServerDiscovery(storageDir);
-  if (discovery.state !== "live")
-    return [];
-  return discovery.serverPids.map((pid) => ({ harness: "OpenCode server", pid }));
+  const openCode = discovery.state === "live" ? discovery.serverPids.map((pid) => ({ harness: "OpenCode server", pid })) : [];
+  const pi = discoverLivePiProcessIds().map((pid) => ({ harness: "Pi harness", pid }));
+  return [...openCode, ...pi];
 }
-var databases, pendingAsyncOpens, persistenceByDatabase, persistenceErrorByDatabase, pathByDatabase, LATEST_SUPPORTED_VERSION = 76, PERMISSIONS_ENFORCEABLE, RPC_DISCOVERY_PARSE_GRACE_MS, defaultRpcDiscoveryFs, rpcDiscoveryFs;
+function applySqliteTuningPragmas(db) {
+  db.exec(`PRAGMA cache_size=-${Math.round(sqlitePragmaConfig.cacheSizeMb * 1024)}`);
+  db.exec(`PRAGMA mmap_size=${Math.round(sqlitePragmaConfig.mmapSizeMb * 1024 * 1024)}`);
+  db.exec("PRAGMA analysis_limit=400");
+}
+function initializeDatabase(db) {
+  db.exec("PRAGMA busy_timeout=5000");
+  db.exec("PRAGMA foreign_keys=ON");
+  db.exec("PRAGMA journal_mode=WAL");
+  applySqliteTuningPragmas(db);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS tags (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT,
+      message_id TEXT,
+      type TEXT,
+      status TEXT DEFAULT 'active',
+      byte_size INTEGER,
+      tag_number INTEGER,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      entry_fingerprint TEXT,
+      token_count INTEGER,
+      input_token_count INTEGER,
+      reasoning_token_count INTEGER,
+      UNIQUE(session_id, tag_number)
+    );
+
+    CREATE TABLE IF NOT EXISTS pending_ops (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT,
+      tag_id INTEGER,
+      operation TEXT,
+      queued_at INTEGER,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    CREATE TABLE IF NOT EXISTS source_contents (
+      tag_id INTEGER,
+      session_id TEXT,
+      content TEXT,
+      created_at INTEGER,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      PRIMARY KEY(session_id, tag_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS compartments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      sequence INTEGER NOT NULL,
+      start_message INTEGER NOT NULL,
+      end_message INTEGER NOT NULL,
+      start_message_id TEXT DEFAULT '',
+      end_message_id TEXT DEFAULT '',
+      title TEXT NOT NULL,
+      content TEXT NOT NULL,
+      p1 TEXT,
+      p2 TEXT,
+      p3 TEXT,
+      p4 TEXT,
+      importance INTEGER NOT NULL DEFAULT 50,
+      episode_type TEXT,
+      p1_embedding BLOB,
+      p1_embedding_model_id TEXT,
+      legacy INTEGER NOT NULL DEFAULT 0,
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      UNIQUE(session_id, sequence)
+    );
+    CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
+
+    CREATE TABLE IF NOT EXISTS compartment_chunk_embeddings (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      compartment_id INTEGER NOT NULL REFERENCES compartments(id) ON DELETE CASCADE,
+      session_id TEXT NOT NULL,
+      project_path TEXT NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      window_index INTEGER NOT NULL DEFAULT 0,
+      start_ordinal INTEGER NOT NULL,
+      end_ordinal INTEGER NOT NULL,
+      chunk_hash TEXT NOT NULL,
+      model_id TEXT NOT NULL,
+      dims INTEGER NOT NULL,
+      vector BLOB NOT NULL,
+      created_at INTEGER NOT NULL,
+      UNIQUE(compartment_id, model_id, window_index)
+    );
+    CREATE INDEX IF NOT EXISTS idx_cce_session ON compartment_chunk_embeddings(session_id);
+    CREATE INDEX IF NOT EXISTS idx_cce_project_model ON compartment_chunk_embeddings(project_path, model_id);
+
+    CREATE TABLE IF NOT EXISTS session_projects (
+      session_id TEXT NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      project_path TEXT NOT NULL,
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY(session_id, harness)
+    );
+    CREATE INDEX IF NOT EXISTS idx_session_projects_project
+      ON session_projects(project_path);
+
+    CREATE TABLE IF NOT EXISTS compartment_events (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      compartment_id INTEGER,
+      kind TEXT NOT NULL,
+      at_compartment INTEGER,
+      fields_json TEXT NOT NULL DEFAULT '{}',
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+    CREATE INDEX IF NOT EXISTS idx_compartment_events_session
+      ON compartment_events(session_id);
+
+    CREATE TABLE IF NOT EXISTS compartment_state_lease (
+      session_id TEXT PRIMARY KEY NOT NULL,
+      holder_id TEXT NOT NULL,
+      acquired_at INTEGER NOT NULL,
+      expires_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_compartment_state_lease_expires
+      ON compartment_state_lease(expires_at);
+
+    CREATE TABLE IF NOT EXISTS compression_depth (
+      session_id TEXT NOT NULL,
+      message_ordinal INTEGER NOT NULL,
+      depth INTEGER NOT NULL DEFAULT 0,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      PRIMARY KEY(session_id, message_ordinal)
+    );
+    CREATE INDEX IF NOT EXISTS idx_compression_depth_session ON compression_depth(session_id);
+
+    CREATE TABLE IF NOT EXISTS session_facts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    CREATE TABLE IF NOT EXISTS primer_candidates (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      session_id TEXT NOT NULL,
+      question TEXT NOT NULL,
+      normalized_question TEXT NOT NULL,
+      source_compartment_start INTEGER,
+      source_compartment_end INTEGER,
+      source_start_message_id TEXT NOT NULL DEFAULT '',
+      source_end_message_id TEXT NOT NULL DEFAULT '',
+      source_message_time INTEGER NOT NULL,
+      question_embedding BLOB,
+      question_embedding_model_id TEXT,
+      created_at INTEGER NOT NULL,
+      UNIQUE(project_path, harness, session_id, source_start_message_id, source_end_message_id)
+    );
+    CREATE INDEX IF NOT EXISTS idx_primer_candidates_project_time
+      ON primer_candidates(project_path, source_message_time);
+    CREATE INDEX IF NOT EXISTS idx_primer_candidates_session
+      ON primer_candidates(session_id, harness);
+    CREATE INDEX IF NOT EXISTS idx_primer_candidates_embedding_model
+      ON primer_candidates(project_path, question_embedding_model_id);
+
+    CREATE TABLE IF NOT EXISTS primers (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      question TEXT NOT NULL,
+      question_embedding BLOB,
+      question_embedding_model_id TEXT,
+      answer TEXT NOT NULL DEFAULT '',
+      status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'archived')),
+      total_support INTEGER NOT NULL DEFAULT 0,
+      last_observed_at INTEGER,
+      answer_refreshed_at INTEGER,
+      source_candidate_ids TEXT NOT NULL DEFAULT '[]',
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_primers_project_status_observed
+      ON primers(project_path, status, last_observed_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_primers_embedding_model
+      ON primers(project_path, question_embedding_model_id);
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS primers_fts USING fts5(
+      question,
+      answer,
+      project_path UNINDEXED,
+      content='primers',
+      content_rowid='id',
+      tokenize='porter unicode61'
+    );
+
+    CREATE TRIGGER IF NOT EXISTS primers_ai AFTER INSERT ON primers BEGIN
+      INSERT INTO primers_fts(rowid, question, answer, project_path)
+      VALUES (new.id, new.question, new.answer, new.project_path);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS primers_ad AFTER DELETE ON primers BEGIN
+      INSERT INTO primers_fts(primers_fts, rowid, question, answer, project_path)
+      VALUES ('delete', old.id, old.question, old.answer, old.project_path);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS primers_au AFTER UPDATE ON primers BEGIN
+      INSERT INTO primers_fts(primers_fts, rowid, question, answer, project_path)
+      VALUES ('delete', old.id, old.question, old.answer, old.project_path);
+      INSERT INTO primers_fts(rowid, question, answer, project_path)
+      VALUES (new.id, new.question, new.answer, new.project_path);
+    END;
+
+    -- session_notes and smart_notes were merged into the unified notes table
+    -- by migration v1 (see features/magic-context/migrations.ts). The old tables
+    -- are never recreated; fresh DBs create only notes, upgraded DBs have
+    -- their old tables migrated and dropped by the migration runner.
+
+    CREATE TABLE IF NOT EXISTS memories (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      normalized_hash TEXT NOT NULL,
+      importance INTEGER,
+      scope TEXT NOT NULL DEFAULT 'project',
+      shareable INTEGER NOT NULL DEFAULT 0,
+      source_session_id TEXT,
+      source_type TEXT DEFAULT 'historian',
+      seen_count INTEGER DEFAULT 1,
+      retrieval_count INTEGER DEFAULT 0,
+      first_seen_at INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      last_seen_at INTEGER NOT NULL,
+      last_retrieved_at INTEGER,
+      status TEXT DEFAULT 'active',
+      expires_at INTEGER,
+      verification_status TEXT DEFAULT 'unverified',
+      verified_at INTEGER,
+      classified_at INTEGER,
+      superseded_by_memory_id INTEGER,
+      merged_from TEXT,
+      metadata_json TEXT,
+      mural_cue TEXT,
+      mural_cue_hash TEXT,
+      mural_cue_at INTEGER,
+      mural_cue_rejection_count INTEGER NOT NULL DEFAULT 0,
+      UNIQUE(project_path, category, normalized_hash)
+    );
+
+    CREATE TABLE IF NOT EXISTS memory_embeddings (
+      -- FK-cascade audit (v12): memory_embeddings.memory_id -> memories.id
+      -- uses ON DELETE CASCADE, so SQLite PRAGMA foreign_keys must be ON on
+      -- every connection and v12 cleans historical orphan rows.
+      memory_id INTEGER NOT NULL REFERENCES memories(id) ON DELETE CASCADE,
+      embedding BLOB NOT NULL,
+      model_id TEXT NOT NULL,
+      PRIMARY KEY(memory_id, model_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS embedding_identity_active (
+      project_path TEXT NOT NULL,
+      scope TEXT NOT NULL CHECK(scope IN ('memory', 'commit', 'chunk')),
+      model_id TEXT NOT NULL,
+      last_active_at INTEGER NOT NULL,
+      PRIMARY KEY(project_path, scope, model_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS embedding_registrations (
+      project_path TEXT PRIMARY KEY,
+      provider_identity TEXT NOT NULL DEFAULT '',
+      model_id TEXT NOT NULL DEFAULT '',
+      chunk_model_id TEXT NOT NULL DEFAULT '',
+      fingerprint TEXT NOT NULL DEFAULT '',
+      table_epoch INTEGER NOT NULL DEFAULT 0,
+      dims INTEGER NOT NULL DEFAULT 0,
+      provenance_json TEXT NOT NULL DEFAULT '{}',
+      generation INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL DEFAULT 0
+    );
+
+    CREATE TABLE IF NOT EXISTS synapse_batch_ledger (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      project_path TEXT NOT NULL DEFAULT '',
+      scope TEXT NOT NULL DEFAULT '',
+      manifest_json TEXT NOT NULL DEFAULT '{}',
+      request_key TEXT NOT NULL DEFAULT '',
+      job_id TEXT,
+      cursor TEXT,
+      status TEXT NOT NULL DEFAULT 'pending',
+      created_at INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL DEFAULT 0,
+      UNIQUE(session_id, request_key)
+    );
+    CREATE INDEX IF NOT EXISTS idx_synapse_batch_ledger_session
+      ON synapse_batch_ledger(session_id, updated_at);
+
+    CREATE TABLE IF NOT EXISTS shadow_embedding_registrations (
+      project_path TEXT NOT NULL,
+      scope TEXT NOT NULL CHECK(scope IN ('memory', 'commit', 'chunk')),
+      model_id TEXT NOT NULL,
+      generation INTEGER NOT NULL DEFAULT 0,
+      fingerprint TEXT NOT NULL DEFAULT '',
+      table_epoch INTEGER NOT NULL DEFAULT 0,
+      dims INTEGER NOT NULL DEFAULT 0,
+      provenance_json TEXT NOT NULL DEFAULT '{}',
+      updated_at INTEGER NOT NULL DEFAULT 0,
+      PRIMARY KEY(project_path, scope, model_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS embedding_measurement_corpus (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      project_path TEXT NOT NULL DEFAULT '',
+      dedup_key TEXT NOT NULL DEFAULT '',
+      cohort_key TEXT NOT NULL DEFAULT '',
+      query_text_hash TEXT NOT NULL DEFAULT '',
+      primary_result_ids_json TEXT NOT NULL DEFAULT '[]',
+      shadow_result_ids_json TEXT NOT NULL DEFAULT '[]',
+      primary_latency_ms INTEGER,
+      shadow_latency_ms INTEGER,
+      primary_failed INTEGER NOT NULL DEFAULT 0,
+      shadow_failed INTEGER NOT NULL DEFAULT 0,
+      primary_model_id TEXT NOT NULL DEFAULT '',
+      shadow_model_id TEXT NOT NULL DEFAULT '',
+      primary_fingerprint TEXT NOT NULL DEFAULT '',
+      shadow_fingerprint TEXT NOT NULL DEFAULT '',
+      primary_epoch INTEGER NOT NULL DEFAULT 0,
+      shadow_epoch INTEGER NOT NULL DEFAULT 0,
+      corpus_hash TEXT NOT NULL DEFAULT '',
+      coverage_json TEXT NOT NULL DEFAULT '{}',
+      created_at INTEGER NOT NULL DEFAULT 0,
+      UNIQUE(dedup_key, cohort_key)
+    );
+    CREATE INDEX IF NOT EXISTS idx_embedding_measurement_session
+      ON embedding_measurement_corpus(session_id, created_at);
+
+    CREATE TABLE IF NOT EXISTS memory_verifications (
+      memory_id    INTEGER NOT NULL REFERENCES memories(id) ON DELETE CASCADE,
+      file_path    TEXT NOT NULL,
+      -- verified_at=0 means "mapped (files known) but not yet content-verified".
+      -- map-memories sets mapped_at + verified_at=0; verify sets verified_at=now.
+      verified_at  INTEGER NOT NULL,
+      mapped_at    INTEGER NOT NULL DEFAULT 0,
+      PRIMARY KEY (memory_id, file_path)
+    );
+    CREATE INDEX IF NOT EXISTS idx_memory_verifications_memory ON memory_verifications(memory_id);
+
+    CREATE TABLE IF NOT EXISTS memory_mutation_log (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      mutation_type TEXT NOT NULL CHECK (mutation_type IN ('archive', 'delete', 'update', 'superseded')),
+      target_memory_id INTEGER NOT NULL,
+      superseded_by_id INTEGER,
+      category TEXT,
+      new_content TEXT,
+      queued_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_memory_mutation_log_project
+      ON memory_mutation_log(project_path, id);
+    CREATE INDEX IF NOT EXISTS idx_memory_mutation_log_visibility
+      ON memory_mutation_log(project_path, category, id, target_memory_id);
+    CREATE INDEX IF NOT EXISTS idx_memory_mutation_log_target
+      ON memory_mutation_log(project_path, target_memory_id, id);
+
+    CREATE TABLE IF NOT EXISTS dream_state (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS dream_queue (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      reason TEXT NOT NULL,
+      enqueued_at INTEGER NOT NULL,
+      started_at INTEGER,
+      retry_count INTEGER DEFAULT 0
+    );
+    CREATE INDEX IF NOT EXISTS idx_dream_queue_project ON dream_queue(project_path);
+CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, enqueued_at);
+
+    CREATE TABLE IF NOT EXISTS dream_runs (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      started_at INTEGER NOT NULL,
+      finished_at INTEGER NOT NULL,
+      holder_id TEXT NOT NULL,
+      tasks_json TEXT NOT NULL,
+      tasks_succeeded INTEGER NOT NULL DEFAULT 0,
+      tasks_failed INTEGER NOT NULL DEFAULT 0,
+      smart_notes_surfaced INTEGER NOT NULL DEFAULT 0,
+      smart_notes_pending INTEGER NOT NULL DEFAULT 0,
+      memory_changes_json TEXT,
+      parent_session_id TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_dream_runs_project ON dream_runs(project_path, finished_at DESC);
+
+    CREATE TABLE IF NOT EXISTS task_schedule_state (
+      project_path  TEXT    NOT NULL,
+      task          TEXT    NOT NULL,
+      last_run_at   INTEGER,
+      next_due_at   INTEGER,
+      schedule      TEXT,
+      last_status   TEXT,
+      last_error    TEXT,
+      last_checked_commit TEXT,
+      last_broad_run_at INTEGER,
+      retrospective_watermark_ms INTEGER,
+      retry_count   INTEGER NOT NULL DEFAULT 0,
+      PRIMARY KEY (project_path, task)
+    );
+    CREATE INDEX IF NOT EXISTS idx_task_schedule_due ON task_schedule_state(next_due_at);
+
+    CREATE TABLE IF NOT EXISTS retrospective_processed_windows (
+      project_path TEXT NOT NULL,
+      window_key   TEXT NOT NULL,
+      processed_at INTEGER NOT NULL,
+      PRIMARY KEY (project_path, window_key)
+    );
+
+    CREATE TABLE IF NOT EXISTS project_key_files (
+      project_path           TEXT    NOT NULL,
+      path                   TEXT    NOT NULL,
+      content                TEXT    NOT NULL,
+      content_hash           TEXT    NOT NULL,
+      local_token_estimate   INTEGER NOT NULL,
+      generated_at           INTEGER NOT NULL,
+      generated_by_model     TEXT,
+      generation_config_hash TEXT    NOT NULL,
+      stale_reason           TEXT,
+      PRIMARY KEY (project_path, path)
+    );
+    CREATE INDEX IF NOT EXISTS idx_project_key_files_project ON project_key_files(project_path);
+    CREATE INDEX IF NOT EXISTS idx_project_key_files_generated_at ON project_key_files(project_path, generated_at);
+
+    CREATE TABLE IF NOT EXISTS project_key_files_version (
+      project_path TEXT    PRIMARY KEY,
+      version      INTEGER NOT NULL DEFAULT 0
+    );
+
+    CREATE TABLE IF NOT EXISTS schema_migrations_meta (
+      key   TEXT PRIMARY KEY,
+      value TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS project_state (
+      project_path TEXT PRIMARY KEY,
+      project_memory_epoch INTEGER NOT NULL DEFAULT 0,
+      project_user_profile_version INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL DEFAULT 0
+    );
+
+    CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+      project_path TEXT PRIMARY KEY,
+      lease_holder TEXT,
+      lease_expires_at INTEGER,
+      last_swept_at INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+      ON git_sweep_coordinator(lease_expires_at);
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+      ON git_sweep_coordinator(last_swept_at);
+
+    CREATE TABLE IF NOT EXISTS m0_mutation_log (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      mutation_type TEXT NOT NULL CHECK (mutation_type IN (
+        'compartment_delete', 'compartment_merge', 'recomp_boundary_change', 'compartment_upgrade'
+      )),
+      target_id INTEGER,
+      queued_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_m0_mutation_log_session ON m0_mutation_log(session_id);
+
+    CREATE TABLE IF NOT EXISTS v22_identity_rekey_map (
+      old_project_path TEXT PRIMARY KEY,
+      new_project_path TEXT NOT NULL,
+      rekeyed_at INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS workspaces (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      name TEXT NOT NULL UNIQUE,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      share_categories TEXT NOT NULL DEFAULT '["CONSTRAINTS"]'
+    );
+
+    CREATE TABLE IF NOT EXISTS workspace_members (
+      workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+      project_path TEXT NOT NULL,
+      display_name TEXT NOT NULL,
+      display_path TEXT NOT NULL,
+      added_at INTEGER NOT NULL,
+      PRIMARY KEY (workspace_id, project_path)
+    );
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_workspace_member_unique ON workspace_members(project_path);
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_workspace_member_name ON workspace_members(workspace_id, display_name);
+
+    CREATE TABLE IF NOT EXISTS v22_backfill_failures (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      table_name TEXT NOT NULL,
+      row_id INTEGER NOT NULL,
+      raw_project_path TEXT NOT NULL,
+      error_class TEXT NOT NULL CHECK (error_class IN ('not_git_repo', 'git_missing', 'git_timeout', 'permission_denied', 'unknown')),
+      error_message TEXT,
+      failed_at INTEGER NOT NULL,
+      UNIQUE(table_name, row_id)
+    );
+
+    -- (smart_notes: see note above; merged into unified notes table by migration v1)
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
+      content,
+      category,
+      content='memories',
+      content_rowid='id',
+      tokenize='porter unicode61'
+    );
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS message_history_fts USING fts5(
+      session_id UNINDEXED,
+      message_ordinal UNINDEXED,
+      message_id UNINDEXED,
+      role,
+      content,
+      tokenize='porter unicode61'
+    );
+
+    CREATE TABLE IF NOT EXISTS message_history_index (
+      session_id TEXT PRIMARY KEY,
+      last_indexed_ordinal INTEGER NOT NULL DEFAULT 0,
+      dirty_floor_ordinal INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+    CREATE INDEX IF NOT EXISTS idx_message_history_index_orphan_sweep
+      ON message_history_index(harness, session_id, updated_at);
+
+    CREATE TABLE IF NOT EXISTS message_history_source (
+      session_id TEXT NOT NULL,
+      message_id TEXT NOT NULL,
+      message_ordinal INTEGER NOT NULL,
+      source_version TEXT NOT NULL,
+      normalized_content_hash TEXT NOT NULL,
+      role TEXT NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY(session_id, message_id)
+    );
+    CREATE INDEX IF NOT EXISTS idx_message_history_source_session_ordinal
+      ON message_history_source(session_id, message_ordinal);
+
+    CREATE TABLE IF NOT EXISTS pending_session_cleanup (
+      session_id TEXT PRIMARY KEY,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      requested_at INTEGER NOT NULL,
+      last_attempt_at INTEGER
+    );
+
+    CREATE TABLE IF NOT EXISTS message_history_orphan_sweep (
+      harness TEXT PRIMARY KEY,
+      cursor_session_id TEXT NOT NULL DEFAULT '',
+      last_swept_at INTEGER
+    );
+
+    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
+      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
+      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
+    END;
+
+    CREATE TABLE IF NOT EXISTS session_meta (
+      session_id TEXT PRIMARY KEY,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      last_response_time INTEGER,
+      cache_ttl TEXT,
+      counter INTEGER DEFAULT 0,
+      last_nudge_tokens INTEGER DEFAULT 0,
+      last_nudge_band TEXT DEFAULT '',
+      last_nudge_undropped INTEGER DEFAULT 0,
+      last_nudge_level TEXT DEFAULT '',
+      channel2_nudge_state TEXT DEFAULT '',
+      channel2_nudge_claimed_at INTEGER DEFAULT 0,
+      channel2_nudge_claim_token TEXT DEFAULT '',
+      last_emergency_input_sample INTEGER DEFAULT 0,
+      last_transform_error TEXT DEFAULT '',
+      nudge_anchor_message_id TEXT DEFAULT '',
+      nudge_anchor_text TEXT DEFAULT '',
+      sticky_turn_reminder_text TEXT DEFAULT '',
+      sticky_turn_reminder_message_id TEXT DEFAULT '',
+      note_nudge_trigger_pending INTEGER DEFAULT 0,
+      note_nudge_trigger_message_id TEXT DEFAULT '',
+      note_nudge_sticky_text TEXT DEFAULT '',
+      note_nudge_sticky_message_id TEXT DEFAULT '',
+      note_nudge_anchors TEXT NOT NULL DEFAULT '[]',
+      auto_search_hint_decisions TEXT NOT NULL DEFAULT '[]',
+      last_todo_state TEXT DEFAULT '',
+      todo_permission_denied INTEGER NOT NULL DEFAULT 2,
+      todo_synthetic_call_id TEXT DEFAULT '',
+      todo_synthetic_anchor_message_id TEXT DEFAULT '',
+      todo_synthetic_state_json TEXT DEFAULT '',
+      is_subagent INTEGER DEFAULT 0,
+      last_context_percentage REAL DEFAULT 0,
+      last_input_tokens INTEGER DEFAULT 0,
+      detected_context_limit_provenance TEXT NOT NULL DEFAULT 'unknown',
+      observed_safe_input_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_alert_sent INTEGER NOT NULL DEFAULT 0,
+      times_execute_threshold_reached INTEGER DEFAULT 0,
+      compartment_in_progress INTEGER DEFAULT 0,
+      historian_failure_count INTEGER DEFAULT 0,
+      historian_last_error TEXT DEFAULT NULL,
+      historian_last_failure_at INTEGER DEFAULT NULL,
+      system_prompt_hash TEXT DEFAULT '',
+      memory_block_cache TEXT DEFAULT '',
+      memory_block_count INTEGER DEFAULT 0,
+      memory_block_ids TEXT DEFAULT '',
+      -- pending_compaction_marker_state: intentionally NULLABLE without a
+      -- default. Absence of a deferred marker is SQL NULL; presence is a
+      -- valid JSON blob written via setPendingCompactionMarkerState.
+      -- Excluded from the healAllNullColumns fallback list. Readers filter
+      -- IS NOT NULL AND != empty-string defensively. Plan v6 section 3.
+      pending_compaction_marker_state TEXT,
+      -- Target OpenCode message id used to inject the current compaction marker.
+      -- Nullable for legacy persisted markers; repaired on the next marker move.
+      compaction_marker_target_end_message_id TEXT,
+      -- pending_pi_compaction_marker_state: intentionally NULLABLE without a
+      -- default. Absence of a deferred Pi-native marker is SQL NULL; presence
+      -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
+      -- Excluded from the healAllNullColumns fallback list.
+      pending_pi_compaction_marker_state TEXT,
+      new_work_tokens INTEGER NOT NULL DEFAULT 0,
+      total_input_tokens INTEGER NOT NULL DEFAULT 0,
+      -- deferred_execute_state: intentionally NULLABLE without a default.
+      -- Absence is SQL NULL; presence is a JSON blob written via
+      -- setDeferredExecutePendingIfAbsent. Excluded from the
+      -- healAllNullColumns fallback list.
+      deferred_execute_state TEXT,
+      cached_m0_bytes BLOB,
+      cached_m0_project_memory_epoch INTEGER,
+      cached_m0_workspace_fingerprint TEXT,
+      cached_m0_project_user_profile_version INTEGER,
+      cached_m0_max_compartment_seq INTEGER,
+      cached_m0_max_memory_id INTEGER,
+      cached_m0_max_mutation_id INTEGER,
+      cached_m0_max_memory_mutation_id INTEGER,
+      cached_m0_project_docs_hash TEXT,
+      cached_m1_bytes BLOB,
+      last_observed_model_key TEXT,
+      last_usage_context_limit INTEGER NOT NULL DEFAULT 0,
+      prior_boundary_ordinal INTEGER NOT NULL DEFAULT 1,
+      protected_tail_policy_version INTEGER NOT NULL DEFAULT 0,
+      protected_tail_drain_window_started_at INTEGER NOT NULL DEFAULT 0,
+      protected_tail_drain_tokens INTEGER NOT NULL DEFAULT 0,
+      recovery_no_eligible_head_count INTEGER NOT NULL DEFAULT 0,
+      force_emergency_bypass_window_start INTEGER NOT NULL DEFAULT 0,
+      force_emergency_bypass_used INTEGER NOT NULL DEFAULT 0,
+      emergency_drain_active INTEGER NOT NULL DEFAULT 0,
+      historian_drain_failure_at INTEGER NOT NULL DEFAULT 0,
+      wrapup_in_progress_state TEXT,
+      compaction_mode_record TEXT,
+      cached_m0_materialized_at INTEGER,
+      cached_m0_session_facts_version INTEGER,
+      cached_m0_upgrade_state TEXT,
+      cached_m0_system_hash TEXT,
+      cached_m0_tool_set_hash TEXT,
+      cached_m0_model_key TEXT,
+      cached_m0_project_identity TEXT,
+      cached_m0_last_baseline_end_message_id TEXT,
+       upgrade_reminded_at INTEGER,
+       pi_stable_id_scheme INTEGER
+    );
+
+    CREATE TABLE IF NOT EXISTS tool_owner_backfill_state (
+      session_id TEXT PRIMARY KEY,
+      status TEXT NOT NULL CHECK (status IN ('pending', 'running', 'completed', 'skipped')),
+      started_at INTEGER,
+      lease_expires_at INTEGER,
+      completed_at INTEGER,
+      last_error TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_tool_owner_backfill_state_status
+      ON tool_owner_backfill_state(status);
+
+    CREATE TABLE IF NOT EXISTS subagent_invocations (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      harness TEXT NOT NULL,
+      subagent TEXT NOT NULL,
+      task TEXT,
+      provider_id TEXT,
+      model_id TEXT,
+      started_at INTEGER NOT NULL,
+      ended_at INTEGER,
+      status TEXT NOT NULL,
+      input_tokens INTEGER NOT NULL DEFAULT 0,
+      output_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+      error TEXT,
+      parent_invocation_id INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_sai_session_started
+      ON subagent_invocations(session_id, started_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_sai_subagent
+      ON subagent_invocations(subagent, started_at DESC);
+
+    CREATE TABLE IF NOT EXISTS historian_runs (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      subagent_invocation_id INTEGER,
+      run_kind TEXT NOT NULL,
+      status TEXT NOT NULL,
+      failure_reason TEXT,
+      chunk_start_ordinal INTEGER,
+      chunk_end_ordinal INTEGER,
+      unprocessed_from INTEGER,
+      compartments_produced INTEGER NOT NULL DEFAULT 0,
+      compartment_id_min INTEGER,
+      compartment_id_max INTEGER,
+      facts_emitted INTEGER NOT NULL DEFAULT 0,
+      facts_by_category_json TEXT,
+      events_emitted INTEGER NOT NULL DEFAULT 0,
+      importance_min INTEGER,
+      importance_max INTEGER,
+      importance_avg REAL,
+      discarded_last INTEGER NOT NULL DEFAULT 0,
+      legacy INTEGER NOT NULL DEFAULT 0,
+      created_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_historian_runs_session
+      ON historian_runs(session_id, created_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_historian_runs_status
+      ON historian_runs(status, created_at DESC);
+
+    CREATE TABLE IF NOT EXISTS transform_decisions (
+      session_id         TEXT    NOT NULL,
+      harness            TEXT    NOT NULL DEFAULT 'opencode',
+      message_id         TEXT    NOT NULL,
+      ts_ms              INTEGER NOT NULL,
+      decision           TEXT    NOT NULL,
+      materialized       INTEGER NOT NULL DEFAULT 0,
+      materialize_reason TEXT,
+      emergency          INTEGER NOT NULL DEFAULT 0,
+      dropped_tokens     INTEGER NOT NULL DEFAULT 0,
+      dropped_count      INTEGER NOT NULL DEFAULT 0,
+      input_tokens       INTEGER NOT NULL DEFAULT 0,
+      PRIMARY KEY (session_id, harness, message_id)
+    );
+    CREATE INDEX IF NOT EXISTS idx_transform_decisions_session_harness
+      ON transform_decisions(session_id, harness);
+
+    CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
+    CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
+    CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
+    CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
+    CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
+    
+    CREATE TABLE IF NOT EXISTS recomp_compartments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      sequence INTEGER NOT NULL,
+      start_message INTEGER NOT NULL,
+      end_message INTEGER NOT NULL,
+      start_message_id TEXT DEFAULT '',
+      end_message_id TEXT DEFAULT '',
+      title TEXT NOT NULL,
+      content TEXT NOT NULL,
+      p1 TEXT,
+      p2 TEXT,
+      p3 TEXT,
+      p4 TEXT,
+      importance INTEGER NOT NULL DEFAULT 50,
+      episode_type TEXT,
+      pass_number INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      UNIQUE(session_id, sequence)
+    );
+
+    CREATE TABLE IF NOT EXISTS recomp_facts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      pass_number INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_session_facts_session ON session_facts(session_id);
+    CREATE INDEX IF NOT EXISTS idx_recomp_compartments_session ON recomp_compartments(session_id);
+    CREATE INDEX IF NOT EXISTS idx_recomp_facts_session ON recomp_facts(session_id);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_status_category ON memories(project_path, status, category);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_status_expires ON memories(project_path, status, expires_at);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_category_hash ON memories(project_path, category, normalized_hash);
+    CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
+  `);
+  ensureColumn(db, "primer_candidates", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "primer_candidates", "source_start_message_id", "TEXT NOT NULL DEFAULT ''");
+  ensureColumn(db, "primer_candidates", "source_end_message_id", "TEXT NOT NULL DEFAULT ''");
+  ensureColumn(db, "primer_candidates", "question_embedding", "BLOB");
+  ensureColumn(db, "primer_candidates", "question_embedding_model_id", "TEXT");
+  ensureColumn(db, "primers", "question_embedding_model_id", "TEXT");
+  db.exec(`
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_primer_candidates_occurrence
+        ON primer_candidates(project_path, harness, session_id, source_start_message_id, source_end_message_id);
+      CREATE INDEX IF NOT EXISTS idx_primer_candidates_project_time
+        ON primer_candidates(project_path, source_message_time);
+      CREATE INDEX IF NOT EXISTS idx_primer_candidates_session
+        ON primer_candidates(session_id, harness);
+      CREATE INDEX IF NOT EXISTS idx_primer_candidates_embedding_model
+        ON primer_candidates(project_path, question_embedding_model_id);
+      CREATE INDEX IF NOT EXISTS idx_primers_project_status_observed
+        ON primers(project_path, status, last_observed_at DESC);
+      CREATE INDEX IF NOT EXISTS idx_primers_embedding_model
+        ON primers(project_path, question_embedding_model_id);
+      CREATE VIRTUAL TABLE IF NOT EXISTS primers_fts USING fts5(
+        question,
+        answer,
+        project_path UNINDEXED,
+        content='primers',
+        content_rowid='id',
+        tokenize='porter unicode61'
+      );
+      CREATE TRIGGER IF NOT EXISTS primers_ai AFTER INSERT ON primers BEGIN
+        INSERT INTO primers_fts(rowid, question, answer, project_path)
+        VALUES (new.id, new.question, new.answer, new.project_path);
+      END;
+      CREATE TRIGGER IF NOT EXISTS primers_ad AFTER DELETE ON primers BEGIN
+        INSERT INTO primers_fts(primers_fts, rowid, question, answer, project_path)
+        VALUES ('delete', old.id, old.question, old.answer, old.project_path);
+      END;
+      CREATE TRIGGER IF NOT EXISTS primers_au AFTER UPDATE ON primers BEGIN
+        INSERT INTO primers_fts(primers_fts, rowid, question, answer, project_path)
+        VALUES ('delete', old.id, old.question, old.answer, old.project_path);
+        INSERT INTO primers_fts(rowid, question, answer, project_path)
+        VALUES (new.id, new.question, new.answer, new.project_path);
+      END;
+    `);
+  ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_nudge_undropped", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "last_nudge_level", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "channel2_nudge_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "channel2_nudge_claimed_at", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "channel2_nudge_claim_token", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_emergency_input_sample", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "sticky_turn_reminder_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "sticky_turn_reminder_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_trigger_pending", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_anchors", "TEXT NOT NULL DEFAULT '[]'");
+  ensureColumn(db, "session_meta", "auto_search_hint_decisions", "TEXT NOT NULL DEFAULT '[]'");
+  ensureColumn(db, "session_meta", "last_todo_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "todo_permission_denied", "INTEGER NOT NULL DEFAULT 2");
+  ensureColumn(db, "session_meta", "todo_synthetic_call_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "todo_synthetic_anchor_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "todo_synthetic_state_json", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_last_read_at", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "observed_safe_input_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "cache_alert_sent", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "historian_failure_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "historian_last_error", "TEXT DEFAULT NULL");
+  ensureColumn(db, "session_meta", "historian_last_failure_at", "INTEGER DEFAULT NULL");
+  ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "tool_reclaim_watermark", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "stale_reduce_stripped_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "processed_image_stripped_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
+  ensureColumn(db, "session_meta", "memory_block_cache", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "memory_block_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "pi_stable_id_scheme", "INTEGER");
+  ensureColumn(db, "session_meta", "memory_block_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "dream_queue", "retry_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "reasoning_byte_size", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "drop_mode", "TEXT DEFAULT 'full'");
+  ensureColumn(db, "tags", "tool_name", "TEXT");
+  ensureColumn(db, "tags", "input_byte_size", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "caveman_depth", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "tool_owner_message_id", "TEXT DEFAULT NULL");
+  ensureColumn(db, "tags", "entry_fingerprint", "TEXT");
+  db.exec(`CREATE INDEX IF NOT EXISTS idx_tags_pi_adopt
+            ON tags(session_id, entry_fingerprint)
+            WHERE type='message' AND entry_fingerprint IS NOT NULL`);
+  db.exec(`CREATE INDEX IF NOT EXISTS idx_tags_pi_fallback_tool_owner
+            ON tags(session_id, tool_owner_message_id)
+            WHERE type='tool'`);
+  ensureColumn(db, "tags", "token_count", "INTEGER");
+  ensureColumn(db, "tags", "input_token_count", "INTEGER");
+  ensureColumn(db, "tags", "reasoning_token_count", "INTEGER");
+  ensureColumn(db, "task_schedule_state", "schedule", "TEXT");
+  ensureColumn(db, "task_schedule_state", "last_checked_commit", "TEXT");
+  ensureColumn(db, "task_schedule_state", "last_broad_run_at", "INTEGER");
+  ensureColumn(db, "task_schedule_state", "retrospective_watermark_ms", "INTEGER");
+  ensureColumn(db, "dream_runs", "parent_session_id", "TEXT");
+  ensureColumn(db, "session_meta", "system_prompt_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "compaction_marker_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "compaction_marker_target_end_message_id", "TEXT");
+  ensureColumn(db, "session_meta", "key_files", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "conversation_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "tool_call_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "recomp_partial_range_start", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "recomp_partial_range_end", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "detected_context_limit_model_key", "TEXT");
+  ensureColumn(db, "session_meta", "detected_context_limit_provenance", "TEXT NOT NULL DEFAULT 'unknown'");
+  ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "emergency_recovery_origin", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "pending_pi_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "new_work_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "total_input_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
+  ensureColumn(db, "compartments", "p1", "TEXT");
+  ensureColumn(db, "compartments", "p2", "TEXT");
+  ensureColumn(db, "compartments", "p3", "TEXT");
+  ensureColumn(db, "compartments", "p4", "TEXT");
+  ensureColumn(db, "compartments", "importance", "INTEGER NOT NULL DEFAULT 50");
+  ensureColumn(db, "compartments", "episode_type", "TEXT");
+  ensureColumn(db, "compartments", "p1_embedding", "BLOB");
+  ensureColumn(db, "compartments", "p1_embedding_model_id", "TEXT");
+  ensureColumn(db, "compartments", "legacy", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "recomp_compartments", "p1", "TEXT");
+  ensureColumn(db, "recomp_compartments", "p2", "TEXT");
+  ensureColumn(db, "recomp_compartments", "p3", "TEXT");
+  ensureColumn(db, "recomp_compartments", "p4", "TEXT");
+  ensureColumn(db, "recomp_compartments", "importance", "INTEGER NOT NULL DEFAULT 50");
+  ensureColumn(db, "recomp_compartments", "episode_type", "TEXT");
+  ensureColumn(db, "memories", "importance", "INTEGER");
+  ensureColumn(db, "memories", "classified_at", "INTEGER");
+  ensureColumn(db, "memories", "mural_cue", "TEXT");
+  ensureColumn(db, "memories", "mural_cue_hash", "TEXT");
+  ensureColumn(db, "memories", "mural_cue_at", "INTEGER");
+  ensureColumn(db, "memory_verifications", "mapped_at", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "cached_m0_bytes", "BLOB");
+  ensureColumn(db, "session_meta", "cached_m0_project_memory_epoch", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_workspace_fingerprint", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_project_user_profile_version", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_max_compartment_seq", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_max_memory_id", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_max_mutation_id", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_max_memory_mutation_id", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_project_docs_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m1_bytes", "BLOB");
+  ensureColumn(db, "session_meta", "last_observed_model_key", "TEXT");
+  ensureColumn(db, "session_meta", "last_usage_context_limit", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "prior_boundary_ordinal", "INTEGER NOT NULL DEFAULT 1");
+  ensureColumn(db, "session_meta", "protected_tail_policy_version", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "protected_tail_drain_window_started_at", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "protected_tail_drain_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "recovery_no_eligible_head_count", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "force_emergency_bypass_window_start", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "force_emergency_bypass_used", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "emergency_drain_active", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "historian_drain_failure_at", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "wrapup_in_progress_state", "TEXT");
+  ensureColumn(db, "session_meta", "compaction_mode_record", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_materialized_at", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_session_facts_version", "INTEGER");
+  ensureColumn(db, "session_meta", "cached_m0_upgrade_state", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_project_identity", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_last_baseline_end_message_id", "TEXT");
+  ensureColumn(db, "session_meta", "upgrade_reminded_at", "INTEGER");
+  ensureColumn(db, "session_meta", "upgrade_reminder_last_sent_at", "INTEGER");
+  ensureColumn(db, "session_meta", "upgrade_reminder_count", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "cached_m0_mural_data_url", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_mural_hash", "TEXT");
+  db.exec(`
+      CREATE TABLE IF NOT EXISTS project_state (
+        project_path TEXT PRIMARY KEY,
+        project_memory_epoch INTEGER NOT NULL DEFAULT 0,
+        project_user_profile_version INTEGER NOT NULL DEFAULT 0,
+        updated_at INTEGER NOT NULL DEFAULT 0
+      );
+      CREATE TABLE IF NOT EXISTS session_projects (
+        session_id TEXT NOT NULL,
+        harness TEXT NOT NULL DEFAULT 'opencode',
+        project_path TEXT NOT NULL,
+        updated_at INTEGER NOT NULL,
+        PRIMARY KEY(session_id, harness)
+      );
+      CREATE INDEX IF NOT EXISTS idx_session_projects_project
+        ON session_projects(project_path);
+      CREATE TABLE IF NOT EXISTS m0_mutation_log (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        session_id TEXT NOT NULL,
+        mutation_type TEXT NOT NULL CHECK (mutation_type IN (
+          'compartment_delete', 'compartment_merge', 'recomp_boundary_change', 'compartment_upgrade'
+        )),
+        target_id INTEGER,
+        queued_at INTEGER NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_m0_mutation_log_session ON m0_mutation_log(session_id);
+      CREATE TABLE IF NOT EXISTS memory_mutation_log (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        project_path TEXT NOT NULL,
+        mutation_type TEXT NOT NULL CHECK (mutation_type IN ('archive', 'delete', 'update', 'superseded')),
+        target_memory_id INTEGER NOT NULL,
+        superseded_by_id INTEGER,
+        category TEXT,
+        new_content TEXT,
+        queued_at INTEGER NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_memory_mutation_log_project
+        ON memory_mutation_log(project_path, id);
+       CREATE TABLE IF NOT EXISTS v22_identity_rekey_map (
+         old_project_path TEXT PRIMARY KEY,
+         new_project_path TEXT NOT NULL,
+         rekeyed_at INTEGER NOT NULL
+       );
+       CREATE TABLE IF NOT EXISTS identity_merge_log (
+         id INTEGER PRIMARY KEY AUTOINCREMENT,
+         from_identity TEXT NOT NULL,
+         to_identity TEXT NOT NULL,
+         table_name TEXT NOT NULL,
+         row_id TEXT NOT NULL,
+         action TEXT NOT NULL,
+         target_row_id TEXT,
+         merged_at INTEGER NOT NULL
+       );
+       CREATE INDEX IF NOT EXISTS idx_identity_merge_log_identities
+         ON identity_merge_log(from_identity, to_identity, merged_at);
+       CREATE INDEX IF NOT EXISTS idx_identity_merge_log_table_row
+         ON identity_merge_log(table_name, row_id);
+      CREATE TABLE IF NOT EXISTS workspaces (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        name TEXT NOT NULL UNIQUE,
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL,
+        share_categories TEXT NOT NULL DEFAULT '["CONSTRAINTS"]'
+      );
+      CREATE TABLE IF NOT EXISTS workspace_members (
+        workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+        project_path TEXT NOT NULL,
+        display_name TEXT NOT NULL,
+        display_path TEXT NOT NULL,
+        added_at INTEGER NOT NULL,
+        PRIMARY KEY (workspace_id, project_path)
+      );
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_workspace_member_unique ON workspace_members(project_path);
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_workspace_member_name ON workspace_members(workspace_id, display_name);
+      CREATE TABLE IF NOT EXISTS v22_backfill_failures (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        table_name TEXT NOT NULL,
+        row_id INTEGER NOT NULL,
+        raw_project_path TEXT NOT NULL,
+        error_class TEXT NOT NULL CHECK (error_class IN ('not_git_repo', 'git_missing', 'git_timeout', 'permission_denied', 'unknown')),
+        error_message TEXT,
+        failed_at INTEGER NOT NULL,
+        UNIQUE(table_name, row_id)
+      );
+      CREATE TABLE IF NOT EXISTS transform_decisions (
+        session_id         TEXT    NOT NULL,
+        harness            TEXT    NOT NULL DEFAULT 'opencode',
+        message_id         TEXT    NOT NULL,
+        ts_ms              INTEGER NOT NULL,
+        decision           TEXT    NOT NULL,
+        materialized       INTEGER NOT NULL DEFAULT 0,
+        materialize_reason TEXT,
+        emergency          INTEGER NOT NULL DEFAULT 0,
+        dropped_tokens     INTEGER NOT NULL DEFAULT 0,
+        dropped_count      INTEGER NOT NULL DEFAULT 0,
+        input_tokens       INTEGER NOT NULL DEFAULT 0,
+        PRIMARY KEY (session_id, harness, message_id)
+      );
+      CREATE INDEX IF NOT EXISTS idx_transform_decisions_session_harness
+        ON transform_decisions(session_id, harness);
+    `);
+  ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "message_history_index", "dirty_floor_ordinal", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "source_contents", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "compression_depth", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "session_facts", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "session_meta", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "recomp_compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "recomp_facts", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "message_history_index", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "workspaces", "share_categories", `TEXT NOT NULL DEFAULT '["CONSTRAINTS"]'`);
+}
+var databases, pendingAsyncOpens, persistenceByDatabase, persistenceErrorByDatabase, pathByDatabase, LATEST_SUPPORTED_VERSION = 76, PERMISSIONS_ENFORCEABLE, RPC_DISCOVERY_PARSE_GRACE_MS, defaultRpcDiscoveryFs, rpcDiscoveryFs, sqlitePragmaConfig;
 var init_storage_db = __esm(async () => {
   init_data_path();
   init_logger();
@@ -36473,11 +38110,15 @@ var init_storage_db = __esm(async () => {
   RPC_DISCOVERY_PARSE_GRACE_MS = 10 * 60 * 1000;
   defaultRpcDiscoveryFs = {
     readdirSync: (path4, options) => options?.withFileTypes ? readdirSync2(path4, { withFileTypes: true }) : readdirSync2(path4),
-    readFileSync: (path4, encoding) => String(readFileSync12(path4, encoding)),
+    readFileSync: (path4, encoding) => String(readFileSync13(path4, encoding)),
     statSync: (path4) => ({ mtimeMs: statSync7(path4).mtimeMs }),
     unlinkSync: (path4) => unlinkSync2(path4)
   };
   rpcDiscoveryFs = defaultRpcDiscoveryFs;
+  sqlitePragmaConfig = {
+    cacheSizeMb: 64,
+    mmapSizeMb: 0
+  };
 });
 
 // src/lib/database-access.ts
@@ -36784,13 +38425,39 @@ function mergeMemoryRow(db, row, fromIdentity, toIdentity, mergedAt) {
   const sourceId = row.id;
   if (typeof sourceId !== "number")
     return false;
-  const collision = db.prepare(`SELECT id, seen_count
+  const collision = db.prepare(`SELECT *
                FROM memories
               WHERE project_path = ? AND category = ? AND normalized_hash = ? AND id <> ?
               LIMIT 1`).get(toIdentity, row.category, row.normalized_hash, sourceId);
   if (collision && typeof collision.id === "number") {
+    const targetId = collision.id;
     const mergedSeen = Math.max(Number(collision.seen_count ?? 1), Number(row.seen_count ?? 1));
-    db.prepare("UPDATE memories SET seen_count = ?, status = COALESCE(status, 'active') WHERE id = ?").run(mergedSeen, collision.id);
+    const sourceClassifiedAt = Number(row.classified_at ?? 0);
+    const targetClassifiedAt = Number(collision.classified_at ?? 0);
+    if (sourceClassifiedAt > targetClassifiedAt) {
+      db.prepare(`UPDATE memories
+                    SET importance = ?, scope = ?, shareable = ?, classified_at = ?
+                  WHERE id = ?`).run(row.importance, row.scope, row.shareable, row.classified_at, targetId);
+    }
+    const sourceHasCue = typeof row.mural_cue === "string" && row.mural_cue.length > 0;
+    const targetHasCue = typeof collision.mural_cue === "string" && collision.mural_cue.length > 0;
+    const sourceCueAt = Number(row.mural_cue_at ?? 0);
+    const targetCueAt = Number(collision.mural_cue_at ?? 0);
+    if (sourceHasCue && (!targetHasCue || sourceCueAt > targetCueAt)) {
+      db.prepare(`UPDATE memories
+                    SET mural_cue = ?, mural_cue_hash = ?, mural_cue_at = ?,
+                        mural_cue_rejection_count = ?
+                  WHERE id = ?`).run(row.mural_cue, row.mural_cue_hash, row.mural_cue_at, row.mural_cue_rejection_count, targetId);
+    }
+    db.prepare(`INSERT INTO memory_verifications (memory_id, file_path, verified_at, mapped_at)
+             SELECT ?, file_path, verified_at, mapped_at
+               FROM memory_verifications
+              WHERE memory_id = ?
+             ON CONFLICT(memory_id, file_path) DO UPDATE SET
+                verified_at = MAX(memory_verifications.verified_at, excluded.verified_at),
+                mapped_at = MAX(memory_verifications.mapped_at, excluded.mapped_at)`).run(targetId, sourceId);
+    db.prepare("DELETE FROM memory_verifications WHERE memory_id = ?").run(sourceId);
+    db.prepare("UPDATE memories SET seen_count = ?, status = COALESCE(status, 'active') WHERE id = ?").run(mergedSeen, targetId);
     db.prepare(`UPDATE memories
                 SET status = 'archived',
                     superseded_by_memory_id = ?,
@@ -36799,11 +38466,11 @@ function mergeMemoryRow(db, row, fromIdentity, toIdentity, mergedAt) {
                         ELSE merged_from || ',' || ?
                     END,
                     updated_at = ?
-              WHERE id = ? AND project_path = ?`).run(collision.id, String(sourceId), "identity-merge", mergedAt, sourceId, fromIdentity);
+              WHERE id = ? AND project_path = ?`).run(targetId, String(sourceId), "identity-merge", mergedAt, sourceId, fromIdentity);
     db.prepare(`INSERT INTO memory_mutation_log
                 (project_path, mutation_type, target_memory_id, superseded_by_id, category, queued_at)
-             VALUES (?, 'superseded', ?, ?, ?, ?)`).run(fromIdentity, sourceId, collision.id, row.category, mergedAt);
-    logRow(db, fromIdentity, toIdentity, "memories", String(sourceId), "superseded", String(collision.id), mergedAt);
+             VALUES (?, 'superseded', ?, ?, ?, ?)`).run(fromIdentity, sourceId, targetId, row.category, mergedAt);
+    logRow(db, fromIdentity, toIdentity, "memories", String(sourceId), "superseded", String(targetId), mergedAt);
     return true;
   }
   const result = db.prepare("UPDATE memories SET project_path = ? WHERE id = ? AND project_path = ?").run(toIdentity, sourceId, fromIdentity);
@@ -36812,10 +38479,30 @@ function mergeMemoryRow(db, row, fromIdentity, toIdentity, mergedAt) {
   logRow(db, fromIdentity, toIdentity, "memories", String(sourceId), "rekeyed", null, mergedAt);
   return true;
 }
+function nullableMaximum(left, right) {
+  const values = [left, right].filter((value) => typeof value === "number");
+  return values.length > 0 ? Math.max(...values) : null;
+}
+function oldestOpenCycleStart(left, right) {
+  const values = [left, right].filter((value) => typeof value === "number" && value > 0);
+  return values.length > 0 ? Math.min(...values) : null;
+}
+function reconcileTaskScheduleCollision(db, source, target) {
+  const sourceIsNewer = typeof source.last_run_at === "number" && (typeof target.last_run_at !== "number" || source.last_run_at > target.last_run_at);
+  const latest = sourceIsNewer ? source : target;
+  db.prepare(`UPDATE task_schedule_state
+            SET last_run_at = ?, next_due_at = ?, schedule = ?, last_status = ?,
+                last_error = ?, retry_count = ?, last_checked_commit = ?,
+                last_broad_run_at = ?, retrospective_watermark_ms = ?
+          WHERE project_path = ? AND task = ?`).run(nullableMaximum(source.last_run_at, target.last_run_at), latest.next_due_at, latest.schedule, latest.last_status, latest.last_error, latest.retry_count, latest.last_checked_commit, oldestOpenCycleStart(source.last_broad_run_at, target.last_broad_run_at), nullableMaximum(source.retrospective_watermark_ms, target.retrospective_watermark_ms), target.project_path, target.task);
+}
 function rekeyGenericRow(db, table, row, fromIdentity, toIdentity, mergedAt) {
   const rowId = rowKey(db, table.name, row);
   const collision = findUniqueCollision(db, table, row, fromIdentity, toIdentity);
   if (collision) {
+    if (table.name === "task_schedule_state") {
+      reconcileTaskScheduleCollision(db, row, collision);
+    }
     const sourcePredicate = rowPredicate(db, table.name, row);
     const result2 = db.prepare(`DELETE FROM ${quoteIdentifier(table.name)} WHERE ${sourcePredicate.sql}`).run(...sourcePredicate.values);
     if ((result2.changes ?? 0) === 0)
@@ -37010,12 +38697,522 @@ var init_doctor_merge_identity = __esm(async () => {
   await init_database_access();
 });
 
+// src/commands/doctor-repair-db.ts
+var exports_doctor_repair_db = {};
+__export(exports_doctor_repair_db, {
+  runRepairDbCli: () => runRepairDbCli,
+  runRepairDb: () => runRepairDb,
+  defaultSqliteExecutable: () => defaultSqliteExecutable,
+  REPAIR_DB_EXIT: () => REPAIR_DB_EXIT
+});
+import { spawnSync as spawnSync3 } from "node:child_process";
+import {
+  chmodSync as chmodSync3,
+  closeSync as closeSync2,
+  constants as constants2,
+  copyFileSync as copyFileSync2,
+  existsSync as existsSync20,
+  openSync as openSync2,
+  renameSync as renameSync3,
+  rmSync as rmSync2,
+  statSync as statSync8
+} from "node:fs";
+import { dirname as dirname11, join as join16 } from "node:path";
+function defaultInspectHolders(storageDir) {
+  const rpc = inspectRpcServerDiscovery(storageDir);
+  if (rpc.state === "unreadable") {
+    const arm = rpc.unreadableArm === "parse" ? "could not be parsed" : "could not be read";
+    return {
+      safe: false,
+      blockers: [],
+      uncertainty: `RPC discovery ${rpc.unreadableFile ?? join16(storageDir, "rpc")} ${arm}`
+    };
+  }
+  const blockers = rpc.state === "live" ? rpc.serverPids.map((pid) => `OpenCode server (PID ${pid})`) : [];
+  const pi = inspectLivePiProcesses();
+  if (pi.state === "unreadable") {
+    return {
+      safe: false,
+      blockers,
+      uncertainty: `Pi/OMP process liveness could not be determined: ${pi.error ?? "process list unavailable"}`
+    };
+  }
+  blockers.push(...pi.processIds.map((pid) => `Pi/OMP harness (PID ${pid})`));
+  return { safe: blockers.length === 0, blockers };
+}
+function defaultSqliteExecutable() {
+  return process.env.MAGIC_CONTEXT_SQLITE3 ?? "sqlite3";
+}
+function timestamp(date5) {
+  return date5.toISOString().replaceAll("-", "").replaceAll(":", "").replace(".", "");
+}
+function uniqueBase(preferred) {
+  if (!DATABASE_SUFFIXES.some((suffix) => existsSync20(`${preferred}${suffix}`)))
+    return preferred;
+  for (let attempt = 1;attempt < 1e4; attempt++) {
+    const candidate = `${preferred}-${attempt}`;
+    if (!DATABASE_SUFFIXES.some((suffix) => existsSync20(`${candidate}${suffix}`)))
+      return candidate;
+  }
+  throw new Error(`Could not allocate a unique recovery path beside ${preferred}`);
+}
+function copyBackupBundle(dbPath, stamp) {
+  const basePath = uniqueBase(`${dbPath}.corrupt-backup-${stamp}`);
+  const copiedPaths = copyDatabaseBundle(dbPath, basePath);
+  return { basePath, copiedPaths };
+}
+function copyDatabaseBundle(sourceBase, destinationBase) {
+  const copiedPaths = [];
+  for (const suffix of DATABASE_SUFFIXES) {
+    const source = `${sourceBase}${suffix}`;
+    if (!existsSync20(source))
+      continue;
+    const destination = `${destinationBase}${suffix}`;
+    copyFileSync2(source, destination, constants2.COPYFILE_EXCL);
+    copiedPaths.push(destination);
+  }
+  return copiedPaths;
+}
+function readRowCounts(path4) {
+  const counts = Object.fromEntries(ROW_COUNT_TABLES.map((table) => [table, null]));
+  let db = null;
+  try {
+    db = new Database(path4, { readonly: true });
+    for (const table of ROW_COUNT_TABLES) {
+      try {
+        const row = db.prepare(`SELECT COUNT(*) AS count FROM ${table}`).get();
+        counts[table] = typeof row?.count === "number" ? row.count : null;
+      } catch {
+        counts[table] = null;
+      }
+    }
+  } catch {} finally {
+    db?.close();
+  }
+  return counts;
+}
+function reportCounts(prompts, label, counts) {
+  prompts.log.info(`Row counts ${label} recovery:`);
+  for (const table of ROW_COUNT_TABLES) {
+    prompts.log.info(`  ${table}=${counts[table] ?? "n/a"}`);
+  }
+}
+function reportSchemaTransition(prompts, result) {
+  prompts.log.info(`Schema migration: v${result.schemaVersionBefore ?? "unknown"} → v${result.schemaVersionAfter ?? "unknown"}`);
+}
+function reportSalvageRates(prompts, before, after) {
+  prompts.log.info("Salvage rates (readable rows before → rows after):");
+  for (const table of ROW_COUNT_TABLES) {
+    const beforeCount = before[table];
+    const afterCount = after[table];
+    if (beforeCount === null || afterCount === null) {
+      prompts.log.info(`  ${table}: n/a`);
+      continue;
+    }
+    const rate = beforeCount === 0 ? afterCount === 0 ? 100 : 0 : afterCount / beforeCount * 100;
+    const lost = Math.max(0, beforeCount - afterCount);
+    prompts.log.info(`  ${table}: ${beforeCount} → ${afterCount} (${rate.toFixed(1)}%, lost ${lost})`);
+  }
+}
+function integrityErrors(db) {
+  const rows = db.prepare("PRAGMA integrity_check").all();
+  return rows.map((row) => String(row.integrity_check ?? "unknown")).filter((result) => result !== "ok");
+}
+function sqliteError(result) {
+  if (result.error)
+    return result.error.message;
+  const stderr = String(result.stderr ?? "").trim();
+  if (stderr)
+    return stderr;
+  return `sqlite3 exited with status ${String(result.status)}`;
+}
+function isRecoverCapabilityMissing(errorDetail) {
+  return RECOVER_UNAVAILABLE_PATTERNS.some((pattern) => pattern.test(errorDetail));
+}
+function runRecoverShell(sqliteExecutable, sourcePath, recoveredPath, dumpPath) {
+  let dumpWriteFd = null;
+  try {
+    dumpWriteFd = openSync2(dumpPath, "wx", 384);
+    const recovered = spawnSync3(sqliteExecutable, [sourcePath, ".recover"], {
+      stdio: ["ignore", dumpWriteFd, "pipe"],
+      encoding: "utf8",
+      windowsHide: true
+    });
+    closeSync2(dumpWriteFd);
+    dumpWriteFd = null;
+    if (recovered.error || recovered.status !== 0) {
+      const errorDetail = sqliteError(recovered);
+      const attempted = recovered.error === undefined;
+      return {
+        ok: false,
+        detail: `.recover failed: ${errorDetail}`,
+        attempted,
+        unavailable: attempted && isRecoverCapabilityMissing(errorDetail)
+      };
+    }
+    const dumpReadFd = openSync2(dumpPath, "r");
+    try {
+      const replayed = spawnSync3(sqliteExecutable, [recoveredPath], {
+        stdio: [dumpReadFd, "ignore", "pipe"],
+        encoding: "utf8",
+        windowsHide: true
+      });
+      if (replayed.error || replayed.status !== 0) {
+        return {
+          ok: false,
+          detail: `replaying .recover output failed: ${sqliteError(replayed)}`,
+          attempted: true,
+          unavailable: false
+        };
+      }
+    } finally {
+      closeSync2(dumpReadFd);
+    }
+    return { ok: true };
+  } catch (error51) {
+    return {
+      ok: false,
+      detail: error51 instanceof Error ? error51.message : String(error51),
+      attempted: false,
+      unavailable: false
+    };
+  } finally {
+    if (dumpWriteFd !== null)
+      closeSync2(dumpWriteFd);
+    rmSync2(dumpPath, { force: true });
+  }
+}
+function migrateAndCheckRecoveredDatabase(path4) {
+  let db = null;
+  try {
+    db = new Database(path4);
+    const recognized = db.prepare(`SELECT name FROM sqlite_master WHERE type='table' AND name IN (${RECOGNIZABLE_TABLES.map(() => "?").join(",")})`).all(...RECOGNIZABLE_TABLES);
+    if (recognized.length === 0) {
+      return {
+        ok: false,
+        detail: ".recover found no recognizable Magic Context schema or user tables"
+      };
+    }
+    const schemaVersionBefore = getPersistedSchemaVersion(db);
+    initializeDatabase(db);
+    runMigrations(db);
+    ensureContextStoreUuid(db);
+    const schemaVersionAfter = getPersistedSchemaVersion(db);
+    const errors3 = integrityErrors(db);
+    if (errors3.length > 0) {
+      return {
+        ok: false,
+        detail: `recovered database integrity_check failed: ${errors3.slice(0, 3).join("; ")}`
+      };
+    }
+    const afterCounts = readCountsFromOpenDatabase(db);
+    db.exec("PRAGMA wal_checkpoint(TRUNCATE)");
+    db.exec("PRAGMA journal_mode=DELETE");
+    return { ok: true, afterCounts, schemaVersionBefore, schemaVersionAfter };
+  } catch (error51) {
+    return {
+      ok: false,
+      detail: error51 instanceof Error ? error51.message : String(error51)
+    };
+  } finally {
+    db?.close();
+  }
+}
+function readCountsFromOpenDatabase(db) {
+  const counts = Object.fromEntries(ROW_COUNT_TABLES.map((table) => [table, null]));
+  for (const table of ROW_COUNT_TABLES) {
+    try {
+      const row = db.prepare(`SELECT COUNT(*) AS count FROM ${table}`).get();
+      counts[table] = typeof row?.count === "number" ? row.count : null;
+    } catch {
+      counts[table] = null;
+    }
+  }
+  return counts;
+}
+function prepareFreshDatabase(path4) {
+  let db = null;
+  try {
+    db = new Database(path4);
+    const schemaVersionBefore = getPersistedSchemaVersion(db);
+    initializeDatabase(db);
+    runMigrations(db);
+    ensureContextStoreUuid(db);
+    const schemaVersionAfter = getPersistedSchemaVersion(db);
+    const errors3 = integrityErrors(db);
+    if (errors3.length > 0) {
+      return {
+        ok: false,
+        detail: `fresh database integrity_check failed: ${errors3.join("; ")}`
+      };
+    }
+    const afterCounts = readCountsFromOpenDatabase(db);
+    db.exec("PRAGMA wal_checkpoint(TRUNCATE)");
+    db.exec("PRAGMA journal_mode=DELETE");
+    return { ok: true, afterCounts, schemaVersionBefore, schemaVersionAfter };
+  } catch (error51) {
+    return { ok: false, detail: error51 instanceof Error ? error51.message : String(error51) };
+  } finally {
+    db?.close();
+  }
+}
+function removeRecoveryBundle(basePath) {
+  for (const suffix of DATABASE_SUFFIXES)
+    rmSync2(`${basePath}${suffix}`, { force: true });
+}
+function activateReplacement(dbPath, replacementPath, originalAsidePath) {
+  const movedOriginals = [];
+  try {
+    for (const suffix of DATABASE_SUFFIXES) {
+      const from = `${dbPath}${suffix}`;
+      if (!existsSync20(from))
+        continue;
+      const to = `${originalAsidePath}${suffix}`;
+      renameSync3(from, to);
+      movedOriginals.push({ from, to });
+    }
+    renameSync3(replacementPath, dbPath);
+    return movedOriginals.map(({ to }) => to);
+  } catch (error51) {
+    for (const moved of movedOriginals.reverse()) {
+      if (existsSync20(moved.to) && !existsSync20(moved.from))
+        renameSync3(moved.to, moved.from);
+    }
+    throw error51;
+  }
+}
+function reportSafetyRefusal(prompts, dbPath, inspection, backupBase) {
+  prompts.log.error(`Refusing to repair the live database: ${dbPath}`);
+  if (inspection.blockers.length > 0) {
+    prompts.log.error(`Active database holder(s): ${inspection.blockers.join(", ")}`);
+  }
+  if (inspection.uncertainty)
+    prompts.log.error(inspection.uncertainty);
+  prompts.log.info("Close every OpenCode, Pi, and OMP process, then run the command again.");
+  if (backupBase)
+    prompts.log.info(`Backup base: ${backupBase}`);
+  else
+    prompts.log.info("Backup: not created (repair refused before database access)");
+  prompts.outro("Database repair refused; the original database files were not modified");
+  return REPAIR_DB_EXIT.refused;
+}
+function printHelp() {
+  console.log("Usage: magic-context doctor repair-db");
+  console.log("");
+  console.log("Back up and salvage the shared context.db using SQLite .recover.");
+  console.log("If salvage is impossible, an empty reset is offered with a separate confirmation.");
+  console.log("Salvage needs a sqlite3 shell built with SQLITE_ENABLE_DBPAGE_VTAB; without one, the command backs up and stops without modifying the database.");
+}
+async function runRepairDb(options = {}) {
+  const prompts = options.prompts ?? promptIO;
+  const deps = { ...DEFAULT_DEPS, ...options.deps };
+  const storageDir = options.storageDir ?? dirname11(options.dbPath ?? join16(getMagicContextStorageDir(), "context.db"));
+  const dbPath = options.dbPath ?? join16(storageDir, "context.db");
+  const stamp = timestamp(deps.now());
+  prompts.intro("Magic Context — Repair shared database");
+  prompts.log.info(`Database: ${dbPath}`);
+  if (!existsSync20(dbPath)) {
+    prompts.log.error(`Database not found: ${dbPath}`);
+    prompts.log.info("Backup: not created (database does not exist)");
+    prompts.outro("Database repair failed");
+    return REPAIR_DB_EXIT.failed;
+  }
+  const initialInspection = deps.inspectHolders(storageDir);
+  if (!initialInspection.safe)
+    return reportSafetyRefusal(prompts, dbPath, initialInspection);
+  let backup;
+  try {
+    backup = copyBackupBundle(dbPath, stamp);
+  } catch (error51) {
+    prompts.log.error(`Could not complete the required backup: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    prompts.log.info(`Backup base: ${dbPath}.corrupt-backup-${stamp}`);
+    prompts.outro("Database repair stopped before salvage");
+    return REPAIR_DB_EXIT.failed;
+  }
+  for (const path4 of backup.copiedPaths)
+    prompts.log.info(`Backup: ${path4}`);
+  const workingBase = uniqueBase(`${dbPath}.recovering-${stamp}-${process.pid}`);
+  const countSourcePath = `${workingBase}.count-source`;
+  const recoverSourcePath = `${workingBase}.recover-source`;
+  try {
+    copyDatabaseBundle(backup.basePath, countSourcePath);
+  } catch (error51) {
+    removeRecoveryBundle(countSourcePath);
+    prompts.log.error(`Could not prepare the isolated row-count snapshot: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    prompts.log.info(`Database remains unchanged: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database repair stopped before salvage");
+    return REPAIR_DB_EXIT.failed;
+  }
+  const beforeCounts = readRowCounts(countSourcePath);
+  removeRecoveryBundle(countSourcePath);
+  reportCounts(prompts, "BEFORE", beforeCounts);
+  try {
+    copyDatabaseBundle(backup.basePath, recoverSourcePath);
+  } catch (error51) {
+    removeRecoveryBundle(recoverSourcePath);
+    prompts.log.error(`Could not prepare the isolated salvage snapshot: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    prompts.log.info(`Database remains unchanged: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database repair stopped before salvage");
+    return REPAIR_DB_EXIT.failed;
+  }
+  const recoveredPath = `${workingBase}.db`;
+  const dumpPath = `${workingBase}.sql`;
+  prompts.log.info(`Attempting SQLite .recover into fresh database: ${recoveredPath}`);
+  const salvage = runRecoverShell(deps.sqliteExecutable, recoverSourcePath, recoveredPath, dumpPath);
+  removeRecoveryBundle(recoverSourcePath);
+  if (!salvage.ok && !salvage.attempted) {
+    removeRecoveryBundle(recoveredPath);
+    const unavailableAfter2 = Object.fromEntries(ROW_COUNT_TABLES.map((table) => [table, null]));
+    reportCounts(prompts, "AFTER", unavailableAfter2);
+    reportSalvageRates(prompts, beforeCounts, unavailableAfter2);
+    prompts.log.error(`SQLite .recover could not be started: ${salvage.detail}`);
+    prompts.log.info("Install the SQLite command-line shell (sqlite3), then rerun this command. Reset was not offered because salvage did not run.");
+    prompts.log.info(`Database remains unchanged: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database repair stopped before salvage could run");
+    return REPAIR_DB_EXIT.failed;
+  }
+  if (!salvage.ok && salvage.unavailable) {
+    removeRecoveryBundle(recoveredPath);
+    const unavailableAfter2 = Object.fromEntries(ROW_COUNT_TABLES.map((table) => [table, null]));
+    reportCounts(prompts, "AFTER", unavailableAfter2);
+    reportSalvageRates(prompts, beforeCounts, unavailableAfter2);
+    prompts.log.error(`SQLite .recover is unavailable on this machine: ${salvage.detail}`);
+    prompts.log.info("This sqlite3 was built without SQLITE_ENABLE_DBPAGE_VTAB, the compile-time option .recover needs. That is a limitation of the tool, not a verdict about your data: the database may be perfectly salvageable with a full sqlite3 build. Install the official SQLite command-line binary (sqlite.org/download.html) or a distro package built with SQLITE_ENABLE_DBPAGE_VTAB, then rerun this command. Reset was not offered because salvage did not run.");
+    prompts.log.info(`Database remains unchanged: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database repair stopped: this sqlite3 cannot run .recover");
+    return REPAIR_DB_EXIT.failed;
+  }
+  let salvageResult;
+  if (salvage.ok) {
+    salvageResult = migrateAndCheckRecoveredDatabase(recoveredPath);
+  } else {
+    salvageResult = salvage;
+  }
+  if (salvageResult.ok && salvageResult.afterCounts) {
+    const finalInspection = deps.inspectHolders(storageDir);
+    if (!finalInspection.safe) {
+      removeRecoveryBundle(recoveredPath);
+      return reportSafetyRefusal(prompts, dbPath, finalInspection, backup.basePath);
+    }
+    try {
+      const originalMode = statSync8(dbPath).mode & 511;
+      chmodSync3(recoveredPath, originalMode);
+      const originalAsidePath = uniqueBase(`${dbPath}.corrupt-original-${stamp}`);
+      const moved = activateReplacement(dbPath, recoveredPath, originalAsidePath);
+      reportSchemaTransition(prompts, salvageResult);
+      reportCounts(prompts, "AFTER", salvageResult.afterCounts);
+      reportSalvageRates(prompts, beforeCounts, salvageResult.afterCounts);
+      for (const path4 of moved)
+        prompts.log.info(`Corrupt original preserved: ${path4}`);
+      prompts.log.success(`Salvaged database installed: ${dbPath}`);
+      prompts.log.info(`Backup base: ${backup.basePath}`);
+      prompts.outro("Database salvage complete; restart your harness");
+      return REPAIR_DB_EXIT.salvaged;
+    } catch (error51) {
+      salvageResult = {
+        ok: false,
+        detail: `could not install recovered database: ${error51 instanceof Error ? error51.message : String(error51)}`
+      };
+    }
+  }
+  removeRecoveryBundle(recoveredPath);
+  const unavailableAfter = Object.fromEntries(ROW_COUNT_TABLES.map((table) => [table, null]));
+  reportCounts(prompts, "AFTER", unavailableAfter);
+  reportSalvageRates(prompts, beforeCounts, unavailableAfter);
+  prompts.log.error(`SQLite salvage was unsuccessful: ${salvageResult.detail ?? "unknown error"}`);
+  prompts.log.info(`Database remains unchanged: ${dbPath}`);
+  prompts.log.info(`Backup base: ${backup.basePath}`);
+  const confirmed = await prompts.confirm("Salvage failed. Move the corrupt database aside and create a fresh empty database? This discards all unrecovered data from the active database.", false);
+  if (!confirmed) {
+    prompts.log.info("Reset declined. The corrupt database remains in place.");
+    prompts.outro("Database is unsalvageable by this command; backup retained");
+    return REPAIR_DB_EXIT.unsalvageable;
+  }
+  const resetInspection = deps.inspectHolders(storageDir);
+  if (!resetInspection.safe) {
+    return reportSafetyRefusal(prompts, dbPath, resetInspection, backup.basePath);
+  }
+  const freshPath = `${workingBase}.fresh.db`;
+  const fresh = prepareFreshDatabase(freshPath);
+  if (!fresh.ok || !fresh.afterCounts) {
+    removeRecoveryBundle(freshPath);
+    prompts.log.error(`Could not create a fresh database: ${fresh.detail ?? "unknown error"}`);
+    prompts.log.info(`Database remains unchanged: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database reset failed");
+    return REPAIR_DB_EXIT.failed;
+  }
+  try {
+    const originalMode = statSync8(dbPath).mode & 511;
+    chmodSync3(freshPath, originalMode);
+    const originalAsidePath = uniqueBase(`${dbPath}.corrupt-original-${stamp}`);
+    const moved = activateReplacement(dbPath, freshPath, originalAsidePath);
+    reportSchemaTransition(prompts, fresh);
+    reportCounts(prompts, "AFTER", fresh.afterCounts);
+    reportSalvageRates(prompts, beforeCounts, fresh.afterCounts);
+    for (const path4 of moved)
+      prompts.log.info(`Corrupt original preserved: ${path4}`);
+    prompts.log.success(`Fresh database installed after explicit reset confirmation: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database reset complete; restart your harness");
+    return REPAIR_DB_EXIT.salvaged;
+  } catch (error51) {
+    prompts.log.error(`Could not install the fresh database: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    prompts.log.info(`Database remains unchanged: ${dbPath}`);
+    prompts.log.info(`Backup base: ${backup.basePath}`);
+    prompts.outro("Database reset failed");
+    return REPAIR_DB_EXIT.failed;
+  }
+}
+async function runRepairDbCli(args, options = {}) {
+  if (args.includes("--help") || args.includes("-h")) {
+    printHelp();
+    return REPAIR_DB_EXIT.salvaged;
+  }
+  return runRepairDb(options);
+}
+var ROW_COUNT_TABLES, DATABASE_SUFFIXES, RECOGNIZABLE_TABLES, REPAIR_DB_EXIT, DEFAULT_DEPS, RECOVER_UNAVAILABLE_PATTERNS;
+var init_doctor_repair_db = __esm(async () => {
+  init_migrations();
+  init_data_path();
+  init_rpc_utils();
+  init_prompts();
+  await __promiseAll([
+    init_context_authority(),
+    init_storage_db(),
+    init_sqlite()
+  ]);
+  ROW_COUNT_TABLES = ["tags", "compartments", "memories", "notes", "dream_runs"];
+  DATABASE_SUFFIXES = ["", "-wal", "-shm"];
+  RECOGNIZABLE_TABLES = [...ROW_COUNT_TABLES, "schema_migrations"];
+  REPAIR_DB_EXIT = {
+    salvaged: 0,
+    failed: 1,
+    unsalvageable: 2,
+    refused: 3
+  };
+  DEFAULT_DEPS = {
+    now: () => new Date,
+    sqliteExecutable: defaultSqliteExecutable(),
+    inspectHolders: defaultInspectHolders
+  };
+  RECOVER_UNAVAILABLE_PATTERNS = [
+    /no such table: sqlite_dbpage/i,
+    /no such module: sqlite_dbpage/i,
+    /unknown command[^\n]*\.recover/i
+  ];
+});
+
 // src/lib/migration-paths.ts
 import { homedir as homedir12 } from "node:os";
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 function getOpenCodeDatabasePath() {
   const dataHome = process.env.XDG_DATA_HOME?.trim();
-  return join16(dataHome || join16(homedir12(), ".local", "share"), "opencode", "opencode.db");
+  return join17(dataHome || join17(homedir12(), ".local", "share"), "opencode", "opencode.db");
 }
 function projectPathToPiSessionSlug(projectPath, platform = process.platform) {
   const separators = platform === "win32" ? /[:\\/]+/g : /\/+/g;
@@ -37038,12 +39235,12 @@ __export(exports_migrate, {
 });
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { unlinkSync as unlinkSync3 } from "node:fs";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 function defaultOpenCodeDbPath() {
   return getOpenCodeDatabasePath();
 }
 function defaultCortexkitDbPath() {
-  return join17(getMagicContextStorageDir(), "context.db");
+  return join18(getMagicContextStorageDir(), "context.db");
 }
 function defaultPiSessionsRoot() {
   return getPiSessionsRoot();
@@ -37138,11 +39335,11 @@ function tokensToPiUsage(tokens) {
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
   };
 }
-function makeMessageEntry(role, text3, timestamp, parentId, usage) {
+function makeMessageEntry(role, text3, timestamp2, parentId, usage) {
   const message = {
     role,
     content: [{ type: "text", text: text3 }],
-    timestamp: Date.parse(timestamp)
+    timestamp: Date.parse(timestamp2)
   };
   if (role === "assistant") {
     message.usage = usage;
@@ -37151,30 +39348,30 @@ function makeMessageEntry(role, text3, timestamp, parentId, usage) {
     type: "message",
     id: shortId(),
     parentId,
-    timestamp,
+    timestamp: timestamp2,
     message
   };
 }
-function makeThinkingEntry(text3, timestamp, parentId, usage) {
+function makeThinkingEntry(text3, timestamp2, parentId, usage) {
   return {
     type: "message",
     id: shortId(),
     parentId,
-    timestamp,
+    timestamp: timestamp2,
     message: {
       role: "assistant",
       content: [{ type: "thinking", thinking: text3, thinkingSignature: null }],
-      timestamp: Date.parse(timestamp),
+      timestamp: Date.parse(timestamp2),
       usage
     }
   };
 }
-function makeToolCallEntry(tool, timestamp, parentId, usage) {
+function makeToolCallEntry(tool, timestamp2, parentId, usage) {
   return {
     type: "message",
     id: shortId(),
     parentId,
-    timestamp,
+    timestamp: timestamp2,
     message: {
       role: "assistant",
       content: [
@@ -37185,24 +39382,24 @@ function makeToolCallEntry(tool, timestamp, parentId, usage) {
           arguments: tool.input ?? {}
         }
       ],
-      timestamp: Date.parse(timestamp),
+      timestamp: Date.parse(timestamp2),
       usage
     }
   };
 }
-function makeToolResultEntry(tool, timestamp, parentId) {
+function makeToolResultEntry(tool, timestamp2, parentId) {
   return {
     type: "message",
     id: shortId(),
     parentId,
-    timestamp,
+    timestamp: timestamp2,
     message: {
       role: "toolResult",
       toolCallId: tool.callId,
       toolName: tool.name,
       content: [{ type: "text", text: textFromUnknown(tool.output) }],
       isError: false,
-      timestamp: Date.parse(timestamp)
+      timestamp: Date.parse(timestamp2)
     }
   };
 }
@@ -37277,7 +39474,7 @@ The following conversation was migrated from a different harness. Reasoning cont
     const role = roleFromMessage(message);
     if (!role)
       continue;
-    const timestamp = isoFromMs(message.time_created, params.now);
+    const timestamp2 = isoFromMs(message.time_created, params.now);
     const tokens = tokensFromMessage(message);
     const usage = tokensToPiUsage(tokens);
     let lastEntryIdForMessage = null;
@@ -37285,7 +39482,7 @@ The following conversation was migrated from a different harness. Reasoning cont
       const newEntries = convertPartToEntries({
         role,
         row: part,
-        timestamp,
+        timestamp: timestamp2,
         parentId,
         usage
       });
@@ -37509,7 +39706,7 @@ function migrateOpenCodeSessionToPi(opts) {
     const provider = opts.provider ?? model.provider;
     const modelId = opts.modelId ?? model.modelId;
     const cwd = session.directory ?? session.path ?? process.cwd();
-    const outputDir = join17(piSessionsRoot, projectPathToPiDirSlug(cwd));
+    const outputDir = join18(piSessionsRoot, projectPathToPiDirSlug(cwd));
     const buildResult = buildPiEntries({
       session,
       messages,
@@ -37538,7 +39735,7 @@ function migrateOpenCodeSessionToPi(opts) {
       commitMagicContextState = plan.commit;
     }
     const compactionMarker = insertCompactionMarker(buildResult.entries, copyResult.lastCompartmentEndPiEntryId);
-    const outputPath = join17(outputDir, `${formatPiFilenameTimestamp(now)}_${buildResult.piSessionId}.jsonl`);
+    const outputPath = join18(outputDir, `${formatPiFilenameTimestamp(now)}_${buildResult.piSessionId}.jsonl`);
     const jsonl = `${buildResult.entries.map((entry) => JSON.stringify(entry)).join(`
 `)}
 `;
@@ -37784,9 +39981,9 @@ __export(exports_migrate_session, {
   planMigrateSession: () => planMigrateSession,
   applyMigrateSession: () => applyMigrateSession
 });
-import { existsSync as existsSync20, realpathSync as realpathSync4 } from "node:fs";
+import { existsSync as existsSync21, realpathSync as realpathSync4 } from "node:fs";
 import { homedir as homedir13 } from "node:os";
-import path4, { join as join18 } from "node:path";
+import path4, { join as join19 } from "node:path";
 function existingSessionColumns(db) {
   const rows = db.prepare("PRAGMA table_info(session)").all();
   return new Set(rows.map((r2) => r2.name).filter((n2) => typeof n2 === "string"));
@@ -37940,14 +40137,14 @@ function defaultOpenCodeDbPath2() {
   return getOpenCodeDatabasePath();
 }
 function defaultContextDbPath() {
-  return join18(getMagicContextStorageDir(), "context.db");
+  return join19(getMagicContextStorageDir(), "context.db");
 }
 function realDeps(opencodeDb, contextDb) {
   return {
     opencodeDb,
     contextDb,
     resolveIdentity: resolveProjectIdentity,
-    hasGitDir: (dir) => existsSync20(join18(dir, ".git")),
+    hasGitDir: (dir) => existsSync21(join19(dir, ".git")),
     realpath: (p2) => realpathSync4(p2)
   };
 }
@@ -38025,8 +40222,8 @@ async function runMigrateSessionCli(args) {
     printMigrateSessionHelp();
     return 1;
   }
-  const expandedTo = toDir.startsWith("~") ? join18(homedir13(), toDir.slice(1).replace(/^[/\\]/, "")) : toDir;
-  if (!existsSync20(expandedTo)) {
+  const expandedTo = toDir.startsWith("~") ? join19(homedir13(), toDir.slice(1).replace(/^[/\\]/, "")) : toDir;
+  if (!existsSync21(expandedTo)) {
     console.error(`Target directory does not exist: ${expandedTo}`);
     return 1;
   }
@@ -38383,7 +40580,7 @@ var init_v22_backfill_commands = __esm(async () => {
 });
 
 // ../pi-plugin/src/config/index.ts
-import { existsSync as existsSync21, readFileSync as readFileSync13 } from "node:fs";
+import { existsSync as existsSync22, readFileSync as readFileSync14 } from "node:fs";
 function getProjectConfigPaths(cwd) {
   const basePath = cortexKitProjectConfigBasePath(cwd);
   return [`${basePath}.jsonc`, `${basePath}.json`];
@@ -38393,25 +40590,28 @@ function getUserConfigPaths() {
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path6) => existsSync21(path6));
+  return paths.find((path6) => existsSync22(path6));
 }
 function resolvePiLegacyFallback(sources) {
-  return sources.find((source) => existsSync21(source.path)) ?? null;
+  return sources.find((source) => existsSync22(source.path)) ?? null;
 }
 function loadConfigFile(path6, scope) {
   try {
-    const rawText = readFileSync13(path6, "utf-8");
+    const rawText = readFileSync14(path6, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
       configPath: path6,
       isProjectConfig: scope === "project"
     });
+    const rejectedKeyPaths = [];
+    const config2 = sanitizeParsedJson(import_comment_json7.parse(substituted.text), { onRejectedKey: (keyPath) => rejectedKeyPaths.push(keyPath.join(".")) });
+    const unsafeKeyWarnings = rejectedKeyPaths.map((keyPath) => `Ignored unsafe config key "${keyPath}" (security: prototype-pollution keys are not allowed).`);
     return {
       path: path6,
       scope,
-      config: import_comment_json7.parse(substituted.text),
-      warnings: substituted.warnings.map((warning) => `${path6}: ${warning}`),
-      loadOutcome: substituted.warnings.length > 0 ? "substitution-failure" : "ok"
+      config: config2,
+      warnings: [...substituted.warnings, ...unsafeKeyWarnings].map((warning) => `${path6}: ${warning}`),
+      loadOutcome: rejectedKeyPaths.length > 0 ? "schema-recovery" : substituted.warnings.length > 0 ? "substitution-failure" : "ok"
     };
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
@@ -38449,11 +40649,28 @@ function redactConfigValue2(value) {
 function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function defineOwnConfigValue2(target, key, value) {
+  Object.defineProperty(target, key, {
+    value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+}
 function mergeRawConfigs(base, override) {
-  const merged = { ...base };
-  for (const [key, overrideValue] of Object.entries(override)) {
-    const baseValue = merged[key];
-    merged[key] = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+  const merged = {};
+  for (const key of Object.keys(base)) {
+    if (isPrototypePollutionKey(key))
+      continue;
+    defineOwnConfigValue2(merged, key, base[key]);
+  }
+  for (const key of Object.keys(override)) {
+    if (isPrototypePollutionKey(key))
+      continue;
+    const overrideValue = override[key];
+    const baseValue = Object.hasOwn(base, key) ? base[key] : undefined;
+    const mergedValue = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+    defineOwnConfigValue2(merged, key, mergedValue);
   }
   return merged;
 }
@@ -38533,7 +40750,7 @@ function loadPiConfig(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync21(source.path));
+  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync22(source.path));
   const userPath = resolveFirstExisting(getUserConfigPaths());
   const userLegacyFallback = userPath ? null : resolvePiLegacyFallback(harnessLegacy.user);
   const userReadPath = userPath ?? userLegacyFallback?.path;
@@ -38542,7 +40759,7 @@ function loadPiConfig(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync21(source.path));
+  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync22(source.path));
   if (userLegacyFallback) {
     warnings.push(`[user config] reading legacy config from ${userLegacyFallback.path} until migration completes; run \`npx @cortexkit/magic-context doctor\` to consolidate into the shared CortexKit location.`);
   } else if (legacyUserUnmigrated) {
@@ -38602,10 +40819,17 @@ var init_config2 = __esm(() => {
   init_project_security();
   init_magic_context();
   init_variable();
+  init_jsonc_parser();
   init_models_dev_cache();
   import_comment_json7 = __toESM(require_src3(), 1);
 });
 
+// src/lib/database-repair-guidance.ts
+function formatDatabaseRepairGuidance(dbPath) {
+  return `Database: ${dbPath}. Recovery: run \`${DATABASE_REPAIR_COMMAND}\` (salvage needs a sqlite3 shell built with SQLITE_ENABLE_DBPAGE_VTAB; without one, the command backs up and stops without modifying the database).`;
+}
+var DATABASE_REPAIR_COMMAND = "bunx @cortexkit/magic-context@latest doctor repair-db";
+
 // ../plugin/src/shared/redaction.ts
 import { homedir as homedir14, userInfo } from "node:os";
 function escapeRegex2(value) {
@@ -38815,10 +41039,10 @@ var init_redaction2 = __esm(() => {
 });
 
 // src/commands/doctor-omp.ts
-import { execFileSync as execFileSync5, spawnSync as spawnSync3 } from "node:child_process";
-import { existsSync as existsSync22, mkdirSync as mkdirSync8, readFileSync as readFileSync14 } from "node:fs";
-import { createRequire as createRequire3 } from "node:module";
-import { dirname as dirname11, join as join19, resolve as resolve5 } from "node:path";
+import { execFileSync as execFileSync5, spawnSync as spawnSync4 } from "node:child_process";
+import { existsSync as existsSync23, mkdirSync as mkdirSync8, readFileSync as readFileSync15 } from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+import { dirname as dirname12, join as join20, resolve as resolve5 } from "node:path";
 function parseSemver(value) {
   const match = value?.match(/(\d+)\.(\d+)\.(\d+)/);
   return match ? [Number(match[1]), Number(match[2]), Number(match[3])] : null;
@@ -38849,7 +41073,7 @@ function printResult(prompts, result) {
     prompts.log.error(line);
 }
 function selfVersion() {
-  const req = createRequire3(import.meta.url);
+  const req = createRequire2(import.meta.url);
   for (const path6 of ["../../package.json", "../package.json"]) {
     try {
       const value = req(path6);
@@ -38860,10 +41084,10 @@ function selfVersion() {
   return "unknown";
 }
 function readConfig2(path6) {
-  if (!existsSync22(path6))
+  if (!existsSync23(path6))
     return {};
   try {
-    const parsed = import_comment_json8.parse(readFileSync14(path6, "utf-8"));
+    const parsed = import_comment_json8.parse(readFileSync15(path6, "utf-8"));
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? {} : { error: "top level is not an object" };
   } catch (error51) {
     return { error: error51 instanceof Error ? error51.message : String(error51) };
@@ -38873,7 +41097,7 @@ function pluginDeclaresOmp(path6) {
   if (!path6)
     return null;
   try {
-    const pkg = JSON.parse(readFileSync14(join19(path6, "package.json"), "utf-8"));
+    const pkg = JSON.parse(readFileSync15(join20(path6, "package.json"), "utf-8"));
     return Array.isArray(pkg.omp?.extensions) || Array.isArray(pkg.pi?.extensions);
   } catch {
     return null;
@@ -38954,7 +41178,7 @@ async function runHealthChecks(options) {
     }
   }
   const userConfigPath = getOmpUserConfigPath();
-  if (!existsSync22(userConfigPath)) {
+  if (!existsSync23(userConfigPath)) {
     add(results, "warn", `No Magic Context user config at ${userConfigPath}`);
     repairPlan.writeUserConfig = true;
   } else {
@@ -38970,8 +41194,8 @@ async function runHealthChecks(options) {
   else
     for (const warning of loaded.warnings.slice(0, 5))
       add(results, "warn", warning);
-  const dbPath = join19(getMagicContextStorageDir(), "context.db");
-  if (!existsSync22(dbPath))
+  const dbPath = join20(getMagicContextStorageDir(), "context.db");
+  if (!existsSync23(dbPath))
     add(results, "info", `Shared context DB will be created at ${dbPath}`);
   else {
     let db = null;
@@ -38981,9 +41205,11 @@ async function runHealthChecks(options) {
       if (integrity?.integrity_check === "ok")
         add(results, "pass", "SQLite integrity_check: ok");
       else
-        add(results, "fail", `SQLite integrity_check: ${String(integrity?.integrity_check)}`);
+        add(results, "fail", `SQLite integrity_check: ${String(integrity?.integrity_check)}
+${formatDatabaseRepairGuidance(dbPath)}`);
     } catch (error51) {
-      add(results, "fail", `Could not inspect shared DB: ${String(error51)}`);
+      add(results, "fail", `Could not inspect shared DB: ${String(error51)}
+${formatDatabaseRepairGuidance(dbPath)}`);
     } finally {
       db?.close();
     }
@@ -38998,7 +41224,7 @@ async function runHealthChecks(options) {
     add(results, "info", `OMP non-global config: ${source}`);
   }
   const logPath = getMagicContextLogPath2("pi");
-  add(results, "info", `Pi-compatible runtime log: ${logPath}${existsSync22(logPath) ? "" : " (not created yet)"}`);
+  add(results, "info", `Pi-compatible runtime log: ${logPath}${existsSync23(logPath) ? "" : " (not created yet)"}`);
   if (!options.quiet)
     for (const result of results)
       printResult(options.prompts, result);
@@ -39011,7 +41237,7 @@ async function runHealthChecks(options) {
   };
 }
 function writeDefaultConfig(path6) {
-  mkdirSync8(dirname11(path6), { recursive: true });
+  mkdirSync8(dirname12(path6), { recursive: true });
   const config2 = {
     $schema: "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json",
     ...MagicContextConfigSchema.parse({})
@@ -39021,7 +41247,7 @@ function writeDefaultConfig(path6) {
 }
 async function repair(plan, deps, prompts, cwd) {
   let fixed = 0;
-  if (plan.writeUserConfig && !existsSync22(getOmpUserConfigPath())) {
+  if (plan.writeUserConfig && !existsSync23(getOmpUserConfigPath())) {
     writeDefaultConfig(getOmpUserConfigPath());
     prompts.log.success(`Wrote default Magic Context config to ${getOmpUserConfigPath()}`);
     fixed += 1;
@@ -39057,7 +41283,7 @@ async function repair(plan, deps, prompts, cwd) {
   }
   return fixed;
 }
-function timestamp(date5) {
+function timestamp2(date5) {
   return date5.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
 }
 async function runIssueFlow(options) {
@@ -39079,7 +41305,7 @@ async function runIssueFlow(options) {
     ...report.results.map((result) => `- ${result.status.toUpperCase()}: ${sanitizeDiagnosticText(result.message)}`)
   ].join(`
 `);
-  const path6 = join19(options.cwd, `magic-context-omp-issue-${timestamp(options.deps.now())}.md`);
+  const path6 = join20(options.cwd, `magic-context-omp-issue-${timestamp2(options.deps.now())}.md`);
   writeFileAtomic(path6, `${body}
 `);
   options.prompts.log.success(`Sanitized report written to ${path6}`);
@@ -39115,8 +41341,8 @@ async function runIssueFlow(options) {
 }
 async function runDoctor(options = {}) {
   const deps = {
-    ...DEFAULT_DEPS,
-    prompts: options.prompts ?? DEFAULT_DEPS.prompts,
+    ...DEFAULT_DEPS2,
+    prompts: options.prompts ?? DEFAULT_DEPS2.prompts,
     ...options.deps
   };
   const prompts = options.prompts ?? deps.prompts;
@@ -39142,7 +41368,7 @@ async function runDoctor(options = {}) {
   prompts.log.message(`Summary: PASS ${second.pass} / WARN ${second.warn} / FAIL ${second.fail}`);
   return second.fail === 0 ? 0 : 1;
 }
-var import_comment_json8, MIN_OMP_VERSION = "17.1.7", DEFAULT_DEPS;
+var import_comment_json8, MIN_OMP_VERSION = "17.1.7", DEFAULT_DEPS2;
 var init_doctor_omp = __esm(async () => {
   init_magic_context();
   init_data_path();
@@ -39156,7 +41382,7 @@ var init_doctor_omp = __esm(async () => {
   init_redaction2();
   await init_database_access();
   import_comment_json8 = __toESM(require_src3(), 1);
-  DEFAULT_DEPS = {
+  DEFAULT_DEPS2 = {
     prompts: promptIO,
     detectOmpBinary,
     getOmpVersion,
@@ -39166,7 +41392,7 @@ var init_doctor_omp = __esm(async () => {
     openExistingContextDatabase,
     now: () => new Date,
     execFileSync: execFileSync5,
-    spawnSync: spawnSync3
+    spawnSync: spawnSync4
   };
 });
 
@@ -39283,15 +41509,15 @@ var DEFAULT_TIMEOUT_MS = 1e4, MAX_PREVIEW_CHARS = 240;
 
 // ../plugin/src/shared/tui-config.ts
 import {
-  chmodSync as chmodSync3,
-  existsSync as existsSync23,
+  chmodSync as chmodSync4,
+  existsSync as existsSync24,
   mkdirSync as mkdirSync9,
-  readFileSync as readFileSync15,
-  renameSync as renameSync3,
-  statSync as statSync8,
+  readFileSync as readFileSync16,
+  renameSync as renameSync4,
+  statSync as statSync9,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { dirname as dirname12, join as join20 } from "node:path";
+import { dirname as dirname13, join as join21 } from "node:path";
 function pluginEntryId(entry) {
   if (typeof entry === "string")
     return entry;
@@ -39324,19 +41550,19 @@ function writeTuiConfigAtomic(configPath, config2) {
   const tmpPath = `${configPath}.tmp`;
   writeFileSync6(tmpPath, body);
   try {
-    if (statSync8(configPath, { throwIfNoEntry: false })?.isFile()) {
-      chmodSync3(tmpPath, statSync8(configPath).mode & 511);
+    if (statSync9(configPath, { throwIfNoEntry: false })?.isFile()) {
+      chmodSync4(tmpPath, statSync9(configPath).mode & 511);
     }
   } catch {}
-  renameSync3(tmpPath, configPath);
+  renameSync4(tmpPath, configPath);
 }
 function resolveTuiConfigPath(configDirOverride) {
   const configDir = configDirOverride ?? getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
-  const jsoncPath = join20(configDir, "tui.jsonc");
-  const jsonPath = join20(configDir, "tui.json");
-  if (existsSync23(jsoncPath))
+  const jsoncPath = join21(configDir, "tui.jsonc");
+  const jsonPath = join21(configDir, "tui.json");
+  if (existsSync24(jsoncPath))
     return jsoncPath;
-  if (existsSync23(jsonPath))
+  if (existsSync24(jsonPath))
     return jsonPath;
   return jsoncPath;
 }
@@ -39344,8 +41570,8 @@ function ensureTuiPluginEntry(options = {}) {
   try {
     const configPath = resolveTuiConfigPath(options.configDir);
     let config2 = {};
-    if (existsSync23(configPath)) {
-      const raw = readFileSync15(configPath, "utf-8");
+    if (existsSync24(configPath)) {
+      const raw = readFileSync16(configPath, "utf-8");
       config2 = import_comment_json9.parse(raw) ?? {};
     }
     const plugins = Array.isArray(config2.plugin) ? [...config2.plugin] : [];
@@ -39379,7 +41605,7 @@ function ensureTuiPluginEntry(options = {}) {
       }
     }
     config2.plugin = plugins;
-    mkdirSync9(dirname12(configPath), { recursive: true });
+    mkdirSync9(dirname13(configPath), { recursive: true });
     writeTuiConfigAtomic(configPath, config2);
     log3(`[magic-context] updated TUI plugin entry in ${configPath}`);
     return true;
@@ -39397,12 +41623,12 @@ var init_tui_config = __esm(() => {
 });
 
 // src/lib/diagnostics-opencode.ts
-import { existsSync as existsSync24, readdirSync as readdirSync3, readFileSync as readFileSync16, statSync as statSync9 } from "node:fs";
-import { createRequire as createRequire4 } from "node:module";
+import { existsSync as existsSync25, readdirSync as readdirSync3, readFileSync as readFileSync17, statSync as statSync10 } from "node:fs";
+import { createRequire as createRequire3 } from "node:module";
 import { homedir as homedir15 } from "node:os";
-import { join as join21 } from "node:path";
+import { join as join22 } from "node:path";
 function getSelfVersion() {
-  const require2 = createRequire4(import.meta.url);
+  const require2 = createRequire3(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
     try {
       const pkg = require2(relPath);
@@ -39418,8 +41644,8 @@ function getPluginCacheInfo() {
   let cached2;
   for (const installedPkgPath of getOpenCodePluginPackageJsonPaths()) {
     try {
-      if (existsSync24(installedPkgPath)) {
-        const pkg = JSON.parse(readFileSync16(installedPkgPath, "utf-8"));
+      if (existsSync25(installedPkgPath)) {
+        const pkg = JSON.parse(readFileSync17(installedPkgPath, "utf-8"));
         cached2 = typeof pkg.version === "string" ? pkg.version : undefined;
         if (cached2)
           break;
@@ -39431,12 +41657,12 @@ function getPluginCacheInfo() {
   return { path: path6, cached: cached2, latest: getSelfVersion() };
 }
 function getStorageDir() {
-  const dataHome = process.env.XDG_DATA_HOME || join21(homedir15(), ".local", "share");
-  return join21(dataHome, "cortexkit", "magic-context");
+  const dataHome = process.env.XDG_DATA_HOME || join22(homedir15(), ".local", "share");
+  return join22(dataHome, "cortexkit", "magic-context");
 }
 function fileSize(path6) {
   try {
-    return existsSync24(path6) ? statSync9(path6).size : 0;
+    return existsSync25(path6) ? statSync10(path6).size : 0;
   } catch {
     return 0;
   }
@@ -39448,10 +41674,10 @@ function sanitizeValue(value) {
   return sanitizeConfigValue(value);
 }
 function readConfig3(path6) {
-  if (!existsSync24(path6))
+  if (!existsSync25(path6))
     return { value: null };
   try {
-    const raw = readFileSync16(path6, "utf-8");
+    const raw = readFileSync17(path6, "utf-8");
     const value = import_comment_json10.parse(raw);
     return { value };
   } catch (error51) {
@@ -39476,7 +41702,7 @@ function configHasPluginEntry(config2) {
 }
 function parseHistorianDumpMeta(path6) {
   try {
-    const xml = readFileSync16(path6, "utf-8");
+    const xml = readFileSync17(path6, "utf-8");
     const parsed = parseCompartmentOutput(xml);
     const factCountByCategory = {};
     for (const fact of parsed.facts) {
@@ -39509,11 +41735,11 @@ function parseHistorianDumpMeta(path6) {
   }
 }
 function listDumpsInDir(dir, limit) {
-  if (!existsSync24(dir))
+  if (!existsSync25(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync3(dir).filter((name) => name.endsWith(".xml")).map((name) => {
-      const stat = statSync9(join21(dir, name));
+      const stat = statSync10(join22(dir, name));
       return {
         name,
         mtime: stat.mtimeMs,
@@ -39522,7 +41748,7 @@ function listDumpsInDir(dir, limit) {
     }).sort((a3, b2) => b2.mtime - a3.mtime);
     const now = Date.now();
     const recent = entries.slice(0, limit).map((entry) => {
-      const meta3 = parseHistorianDumpMeta(join21(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta(join22(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -39577,9 +41803,9 @@ function collectHistorianDumps(recentSessions) {
   };
 }
 async function collectRecentSessions() {
-  const dataHome = process.env.XDG_DATA_HOME || join21(process.env.HOME || homedir15(), ".local", "share");
-  const opencodeDbPath = join21(dataHome, "opencode", "opencode.db");
-  if (!existsSync24(opencodeDbPath))
+  const dataHome = process.env.XDG_DATA_HOME || join22(process.env.HOME || homedir15(), ".local", "share");
+  const opencodeDbPath = join22(dataHome, "opencode", "opencode.db");
+  if (!existsSync25(opencodeDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -39613,8 +41839,8 @@ async function collectRecentSessions() {
   }
 }
 async function collectHistorianFailures(storageDirPath) {
-  const contextDbPath = join21(storageDirPath, "context.db");
-  if (!existsSync24(contextDbPath))
+  const contextDbPath = join22(storageDirPath, "context.db");
+  if (!existsSync25(contextDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -39647,8 +41873,8 @@ async function collectHistorianFailures(storageDirPath) {
   }
 }
 async function collectHistorianRuns(storageDirPath) {
-  const contextDbPath = join21(storageDirPath, "context.db");
-  if (!existsSync24(contextDbPath))
+  const contextDbPath = join22(storageDirPath, "context.db");
+  if (!existsSync25(contextDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined")
     return [];
@@ -39717,9 +41943,9 @@ async function collectDiagnostics() {
   const tuiConfig = readConfig3(configPaths.tuiConfig);
   const magicContextConfig = readConfig3(configPaths.magicContextConfig);
   const storageDirPath = getStorageDir();
-  const contextDbPath = join21(storageDirPath, "context.db");
+  const contextDbPath = join22(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("opencode");
-  const logFileSize = existsSync24(logPath) ? statSync9(logPath).size : 0;
+  const logFileSize = existsSync25(logPath) ? statSync10(logPath).size : 0;
   let compactionEnabled = false;
   try {
     compactionEnabled = isCompactionEnabled(loadPluginConfig(process.cwd()));
@@ -39747,14 +41973,14 @@ async function collectDiagnostics() {
     opencodeConfigHasPlugin: configHasPluginEntry(opencodeConfig.value),
     tuiConfigHasPlugin: configHasPluginEntry(tuiConfig.value),
     magicContextConfig: {
-      exists: existsSync24(configPaths.magicContextConfig),
+      exists: existsSync25(configPaths.magicContextConfig),
       ...magicContextConfig.error ? { parseError: magicContextConfig.error } : {},
       flags: sanitizeValue(magicContextConfig.value ?? {}) ?? {}
     },
     pluginCache: getPluginCacheInfo(),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync24(storageDirPath),
+      exists: existsSync25(storageDirPath),
       contextDbSizeBytes: fileSize(contextDbPath)
     },
     conflicts: {
@@ -39765,7 +41991,7 @@ async function collectDiagnostics() {
     },
     logFile: {
       path: logPath,
-      exists: existsSync24(logPath),
+      exists: existsSync25(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -39917,17 +42143,17 @@ var init_diagnostics_opencode = __esm(() => {
 });
 
 // src/lib/embedding-runtime.ts
-import { spawnSync as spawnSync4 } from "node:child_process";
-import { existsSync as existsSync25 } from "node:fs";
-import { createRequire as createRequire5 } from "node:module";
-import { dirname as dirname13, join as join22, sep } from "node:path";
+import { spawnSync as spawnSync5 } from "node:child_process";
+import { existsSync as existsSync26 } from "node:fs";
+import { createRequire as createRequire4 } from "node:module";
+import { dirname as dirname14, join as join23, sep } from "node:path";
 function describeError(error51) {
   const message = error51 instanceof Error ? error51.message : String(error51 ?? "unknown error");
   const code = error51?.code;
   return typeof code === "string" && code.length > 0 ? `${code}: ${message}` : message;
 }
 function runOnnxRuntimeNodeLoadProbeChild(packageDir) {
-  return spawnSync4(process.execPath, ["-e", ONNX_RUNTIME_NODE_LOAD_PROBE_SCRIPT], {
+  return spawnSync5(process.execPath, ["-e", ONNX_RUNTIME_NODE_LOAD_PROBE_SCRIPT], {
     encoding: "utf8",
     env: { ...process.env, [ONNX_LOAD_PROBE_PACKAGE_DIR_ENV]: packageDir },
     stdio: ["ignore", "pipe", "pipe"],
@@ -40029,25 +42255,25 @@ function expectedBinaryRelPath(platform, arch) {
   const supportedArch = arch === "x64" || arch === "arm64";
   if (!supportedPlatform || !supportedArch)
     return null;
-  return join22("bin", "napi-v6", platform, arch, "onnxruntime_binding.node");
+  return join23("bin", "napi-v6", platform, arch, "onnxruntime_binding.node");
 }
 function checkLocalEmbeddingRuntimeAt(installRoot, platform = process.platform, arch = process.arch) {
-  const packageDir = join22(installRoot, "node_modules", "onnxruntime-node");
-  if (!existsSync25(join22(packageDir, "package.json"))) {
+  const packageDir = join23(installRoot, "node_modules", "onnxruntime-node");
+  if (!existsSync26(join23(packageDir, "package.json"))) {
     return { state: "package-missing", packageDir };
   }
   const rel = expectedBinaryRelPath(platform, arch);
   if (rel === null) {
     return probeOnnxRuntimeNodeLoad(packageDir) ?? { state: "ok", binaryPath: packageDir };
   }
-  const binaryPath = join22(packageDir, rel);
-  if (!existsSync25(binaryPath)) {
+  const binaryPath = join23(packageDir, rel);
+  if (!existsSync26(binaryPath)) {
     return { state: "binary-missing", packageDir, expectedBinary: binaryPath };
   }
   return probeOnnxRuntimeNodeLoad(packageDir) ?? { state: "ok", binaryPath };
 }
 function checkLocalEmbeddingRuntime(installRoots, platform = process.platform, arch = process.arch) {
-  const existing = installRoots.filter((root) => existsSync25(root));
+  const existing = installRoots.filter((root) => existsSync26(root));
   if (existing.length === 0) {
     return {
       state: "unknown",
@@ -40067,22 +42293,22 @@ function checkLocalEmbeddingRuntime(installRoots, platform = process.platform, a
 function packageDirFromResolved(resolvedPath, packageName) {
   const marker = `node_modules${sep}${packageName.split("/").join(sep)}`;
   const idx = resolvedPath.indexOf(marker);
-  return idx >= 0 ? resolvedPath.slice(0, idx + marker.length) : dirname13(resolvedPath);
+  return idx >= 0 ? resolvedPath.slice(0, idx + marker.length) : dirname14(resolvedPath);
 }
 function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.platform, arch = process.arch) {
-  if (!existsSync25(join22(pluginDir, "package.json"))) {
+  if (!existsSync26(join23(pluginDir, "package.json"))) {
     return { state: "unknown", reason: "plugin package dir not found" };
   }
   let onnxDir = null;
   let resolveError;
   try {
-    const reqPlugin = createRequire5(join22(pluginDir, "package.json"));
+    const reqPlugin = createRequire4(join23(pluginDir, "package.json"));
     try {
       onnxDir = packageDirFromResolved(reqPlugin.resolve("onnxruntime-node"), "onnxruntime-node");
     } catch {
       const tfResolved = reqPlugin.resolve("@huggingface/transformers");
       const tfDir = packageDirFromResolved(tfResolved, "@huggingface/transformers");
-      const reqTf = createRequire5(join22(tfDir, "package.json"));
+      const reqTf = createRequire4(join23(tfDir, "package.json"));
       onnxDir = packageDirFromResolved(reqTf.resolve("onnxruntime-node"), "onnxruntime-node");
     }
   } catch (error51) {
@@ -40090,7 +42316,7 @@ function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.pl
     if (resolveError === "ERR_MODULE_NOT_FOUND" || resolveError === "MODULE_NOT_FOUND") {
       return {
         state: "package-missing",
-        packageDir: join22(pluginDir, "node_modules", "onnxruntime-node")
+        packageDir: join23(pluginDir, "node_modules", "onnxruntime-node")
       };
     }
     return {
@@ -40105,8 +42331,8 @@ function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.pl
   if (rel === null) {
     return probeOnnxRuntimeNodeLoad(onnxDir) ?? { state: "ok", binaryPath: onnxDir };
   }
-  const binaryPath = join22(onnxDir, rel);
-  if (!existsSync25(binaryPath)) {
+  const binaryPath = join23(onnxDir, rel);
+  if (!existsSync26(binaryPath)) {
     return { state: "binary-missing", packageDir: onnxDir, expectedBinary: binaryPath };
   }
   return probeOnnxRuntimeNodeLoad(onnxDir) ?? { state: "ok", binaryPath };
@@ -40235,8 +42461,8 @@ var init_issue_body = __esm(() => {
 });
 
 // src/lib/logs-opencode.ts
-import { readFileSync as readFileSync17, writeFileSync as writeFileSync7 } from "node:fs";
-import { join as join23 } from "node:path";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync7 } from "node:fs";
+import { join as join24 } from "node:path";
 function sanitizeLogContent(content) {
   return sanitizeDiagnosticText(content);
 }
@@ -40278,7 +42504,7 @@ function filterLogLinesBySession(lines, sessionId) {
 }
 async function bundleIssueReport(report, description, title, sessionFilter = null) {
   const LOG_TAIL_LINES = 400;
-  const allLogLines = report.logFile.exists ? readFileSync17(report.logFile.path, "utf-8").split(/\r?\n/) : [];
+  const allLogLines = report.logFile.exists ? readFileSync18(report.logFile.path, "utf-8").split(/\r?\n/) : [];
   const logLines = filterLogLinesBySession(allLogLines, sessionFilter);
   const recentLog = sanitizeLogContent(logLines.slice(-LOG_TAIL_LINES).join(`
 `)).trim();
@@ -40329,7 +42555,7 @@ async function bundleIssueReport(report, description, title, sessionFilter = nul
   ].join(`
 `);
   const bodyMarkdown = capBodyToGithubLimit(rawBodyMarkdown);
-  const path6 = join23(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
+  const path6 = join24(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
   writeFileSync7(path6, `${bodyMarkdown}
 `);
   return { path: path6, bodyMarkdown };
@@ -40701,22 +42927,22 @@ var init_storage_versions = __esm(async () => {
 });
 
 // src/commands/doctor-opencode-cache.ts
-import { existsSync as existsSync26, readFileSync as readFileSync18, rmSync as rmSync2 } from "node:fs";
+import { existsSync as existsSync27, readFileSync as readFileSync19, rmSync as rmSync3 } from "node:fs";
 function readCachedPluginVersion(pluginCacheDir) {
   try {
     const installedPkgPath = getOpenCodePluginPackageJsonPath(pluginCacheDir);
-    if (!existsSync26(installedPkgPath))
+    if (!existsSync27(installedPkgPath))
       return;
-    const pkg = JSON.parse(readFileSync18(installedPkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync19(installedPkgPath, "utf-8"));
     return typeof pkg.version === "string" ? pkg.version : undefined;
   } catch {
     return;
   }
 }
 async function clearPluginCache(options = {}, deps = {}) {
-  const remove = deps.remove ?? ((path6) => rmSync2(path6, { recursive: true, force: true }));
+  const remove = deps.remove ?? ((path6) => rmSync3(path6, { recursive: true, force: true }));
   const pluginCacheRoots = getOpenCodePluginCacheRoots();
-  const existingRoots = pluginCacheRoots.filter((root) => existsSync26(root));
+  const existingRoots = pluginCacheRoots.filter((root) => existsSync27(root));
   if (existingRoots.length === 0) {
     return { action: "not_found", path: pluginCacheRoots[0] ?? "" };
   }
@@ -40783,11 +43009,11 @@ var init_doctor_opencode_cache = __esm(() => {
 });
 
 // src/commands/doctor-opencode.ts
-import { execSync as execSync2, spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync27, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
-import { createRequire as createRequire6 } from "node:module";
+import { execSync as execSync2, spawnSync as spawnSync6 } from "node:child_process";
+import { existsSync as existsSync28, readFileSync as readFileSync20, statSync as statSync11 } from "node:fs";
+import { createRequire as createRequire5 } from "node:module";
 import { homedir as homedir16 } from "node:os";
-import { join as join24 } from "node:path";
+import { join as join25 } from "node:path";
 function resolveCompactionEnabledForDoctor() {
   try {
     const config2 = loadPluginConfig(process.cwd());
@@ -40866,7 +43092,7 @@ async function fetchNpmLatest(pkg, timeoutMs = 5000) {
   }
 }
 function getSelfVersion2() {
-  const req = createRequire6(import.meta.url);
+  const req = createRequire5(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
     try {
       const pkg = req(relPath);
@@ -40886,15 +43112,15 @@ function getUserNpmrcPath() {
   if (custom2)
     return custom2;
   const home = process.env.HOME?.trim();
-  return join24(home || homedir16(), ".npmrc");
+  return join25(home || homedir16(), ".npmrc");
 }
 function collectNpmReleaseAgeWarnings() {
   const ageWarnings = [];
   const npmrcPath = getUserNpmrcPath();
-  if (!existsSync27(npmrcPath))
+  if (!existsSync28(npmrcPath))
     return ageWarnings;
   try {
-    const npmrc = readFileSync19(npmrcPath, "utf-8");
+    const npmrc = readFileSync20(npmrcPath, "utf-8");
     for (const line of npmrc.split(`
 `)) {
       const trimmed = line.trim();
@@ -40935,15 +43161,15 @@ function isGhInstalled() {
 function openBrowser(url2) {
   try {
     if (process.platform === "darwin") {
-      const child = spawnSync5("open", [url2], { stdio: "ignore" });
+      const child = spawnSync6("open", [url2], { stdio: "ignore" });
       if (child.status === 0)
         return;
     } else if (process.platform === "linux") {
-      const child = spawnSync5("xdg-open", [url2], { stdio: "ignore" });
+      const child = spawnSync6("xdg-open", [url2], { stdio: "ignore" });
       if (child.status === 0)
         return;
     } else if (process.platform === "win32") {
-      const child = spawnSync5("cmd", ["/c", "start", "", url2], { stdio: "ignore" });
+      const child = spawnSync6("cmd", ["/c", "start", "", url2], { stdio: "ignore" });
       if (child.status === 0)
         return;
     }
@@ -40987,7 +43213,7 @@ async function runIssueFlow2() {
     s.stop(`Report written to ${bundled.path}`);
     const shouldSubmit = await confirm2("Submit this issue on GitHub now?", true);
     if (shouldSubmit && isGhInstalled()) {
-      const result = spawnSync5("gh", [
+      const result = spawnSync6("gh", [
         "issue",
         "create",
         "-R",
@@ -41033,12 +43259,12 @@ function checkLocalEmbeddingRuntimeForDoctor() {
   return { issues: 0 };
 }
 async function checkEmbeddingConfig(magicContextConfigPath) {
-  if (!existsSync27(magicContextConfigPath)) {
+  if (!existsSync28(magicContextConfigPath)) {
     return checkLocalEmbeddingRuntimeForDoctor();
   }
   let rawText;
   try {
-    rawText = readFileSync19(magicContextConfigPath, "utf-8");
+    rawText = readFileSync20(magicContextConfigPath, "utf-8");
   } catch {
     log2.warn("Could not read magic-context.jsonc for embedding check");
     return { issues: 1 };
@@ -41161,7 +43387,7 @@ async function runDoctor2(options = {}) {
   const v22Result = await runV22BackfillCommands({
     name: "OpenCode",
     openDatabase: (readonly2 = true) => {
-      const dbPath2 = join24(getMagicContextStorageDir(), "context.db");
+      const dbPath2 = join25(getMagicContextStorageDir(), "context.db");
       v22Db = readonly2 ? openExistingContextDatabase(dbPath2, { readonly: true }) : openExistingContextDatabaseForMutation(dbPath2);
       return v22Db;
     },
@@ -41193,7 +43419,7 @@ async function runDoctor2(options = {}) {
     failCount++;
     issues++;
   };
-  const authorityDbPath = join24(getMagicContextStorageDir(), "context.db");
+  const authorityDbPath = join25(getMagicContextStorageDir(), "context.db");
   let authorityDb = null;
   try {
     authorityDb = openExistingContextDatabase(authorityDbPath, { readonly: true });
@@ -41244,10 +43470,10 @@ async function runDoctor2(options = {}) {
   } else {
     pass(`OpenCode config: ${paths.opencodeConfig}`);
   }
-  if (existsSync27(paths.magicContextConfig)) {
+  if (existsSync28(paths.magicContextConfig)) {
     pass(`Magic Context config: ${paths.magicContextConfig}`);
     try {
-      const raw = readFileSync19(paths.magicContextConfig, "utf-8");
+      const raw = readFileSync20(paths.magicContextConfig, "utf-8");
       const substituted = substituteConfigVariables({
         text: raw,
         configPath: paths.magicContextConfig
@@ -41272,9 +43498,9 @@ async function runDoctor2(options = {}) {
     warn(`No magic-context.jsonc found — using defaults`);
     log2.info("  Run 'setup' to create one with model recommendations");
   }
-  if (existsSync27(paths.magicContextConfig)) {
+  if (existsSync28(paths.magicContextConfig)) {
     try {
-      const mcRaw = readFileSync19(paths.magicContextConfig, "utf-8");
+      const mcRaw = readFileSync20(paths.magicContextConfig, "utf-8");
       const mcConfig = import_comment_json11.parse(mcRaw);
       let mcChanged = false;
       const experimental = mcConfig.experimental;
@@ -41392,7 +43618,7 @@ async function runDoctor2(options = {}) {
   }
   if (paths.opencodeConfigFormat !== "none") {
     try {
-      const raw = readFileSync19(paths.opencodeConfig, "utf-8");
+      const raw = readFileSync20(paths.opencodeConfig, "utf-8");
       const config2 = import_comment_json11.parse(raw);
       const rawPlugins = Array.isArray(config2?.plugin) ? config2.plugin : [];
       const existingIdx = rawPlugins.findIndex((entry) => matchesPluginEntry(entry, OPENCODE_PLUGIN_NAME) || isDevPathPluginEntry(entry));
@@ -41476,9 +43702,9 @@ async function runDoctor2(options = {}) {
     pass("Added TUI sidebar plugin to tui.json");
     warn("Restart OpenCode to see the sidebar");
     fixed++;
-  } else if (existsSync27(paths.tuiConfig)) {
+  } else if (existsSync28(paths.tuiConfig)) {
     try {
-      const tuiRaw = readFileSync19(paths.tuiConfig, "utf-8");
+      const tuiRaw = readFileSync20(paths.tuiConfig, "utf-8");
       const tuiConfig = import_comment_json11.parse(tuiRaw);
       const tuiRawPlugins = Array.isArray(tuiConfig?.plugin) ? tuiConfig.plugin : [];
       const tuiIdx = tuiRawPlugins.findIndex((entry) => matchesPluginEntry(entry, OPENCODE_PLUGIN_NAME) || isDevPathPluginEntry(entry));
@@ -41527,9 +43753,9 @@ async function runDoctor2(options = {}) {
   } else {
     fail("Could not create or verify the TUI sidebar config");
   }
-  if (existsSync27(paths.magicContextConfig)) {
+  if (existsSync28(paths.magicContextConfig)) {
     try {
-      const mcRaw = readFileSync19(paths.magicContextConfig, "utf-8");
+      const mcRaw = readFileSync20(paths.magicContextConfig, "utf-8");
       const mcConfig = import_comment_json11.parse(mcRaw);
       const warning = checkUserMemoriesDreamerCompatibility(mcConfig);
       if (warning) {
@@ -41546,8 +43772,8 @@ async function runDoctor2(options = {}) {
     warnCount++;
   else
     passCount++;
-  const dbPath = join24(getMagicContextStorageDir(), "context.db");
-  if (!existsSync27(dbPath)) {
+  const dbPath = join25(getMagicContextStorageDir(), "context.db");
+  if (!existsSync28(dbPath)) {
     log2.info(`Shared context DB not yet created at ${dbPath} (will be created on first run)`);
   } else {
     log2.info(`Shared context DB exists at ${dbPath}`);
@@ -41573,9 +43799,11 @@ async function runDoctor2(options = {}) {
           if (result === "ok")
             pass("SQLite integrity_check: ok");
           else
-            fail(`SQLite integrity_check reported: ${result}`);
+            fail(`SQLite integrity_check reported: ${result}
+${formatDatabaseRepairGuidance(dbPath)}`);
         } catch (err) {
-          fail(`SQLite integrity_check failed: ${err instanceof Error ? err.message : String(err)}`);
+          fail(`SQLite integrity_check failed: ${err instanceof Error ? err.message : String(err)}
+${formatDatabaseRepairGuidance(dbPath)}`);
         }
         try {
           const counts = {};
@@ -41606,7 +43834,8 @@ async function runDoctor2(options = {}) {
           plugin_supported_version: err.supportedVersion
         }).message);
       } else {
-        fail(`Could not open shared DB: ${err instanceof Error ? err.message : String(err)}`);
+        fail(`Could not open shared DB: ${err instanceof Error ? err.message : String(err)}
+${formatDatabaseRepairGuidance(dbPath)}`);
       }
     }
   }
@@ -41651,8 +43880,8 @@ async function runDoctor2(options = {}) {
     }
   }
   const logPath = getMagicContextLogPath2("opencode");
-  if (existsSync27(logPath)) {
-    const logStat = statSync10(logPath);
+  if (existsSync28(logPath)) {
+    const logStat = statSync11(logPath);
     const sizeKb = (logStat.size / 1024).toFixed(0);
     log2.info(`Log file: ${logPath} (${sizeKb} KB)`);
   } else {
@@ -41732,12 +43961,12 @@ var init_doctor_opencode = __esm(async () => {
 
 // src/lib/diagnostics-pi.ts
 import { createHash as createHash4 } from "node:crypto";
-import { existsSync as existsSync28, readdirSync as readdirSync4, readFileSync as readFileSync20, statSync as statSync11 } from "node:fs";
-import { createRequire as createRequire7 } from "node:module";
+import { existsSync as existsSync29, readdirSync as readdirSync4, readFileSync as readFileSync21, statSync as statSync12 } from "node:fs";
+import { createRequire as createRequire6 } from "node:module";
 import { homedir as homedir17, userInfo as userInfo2 } from "node:os";
-import { join as join25 } from "node:path";
+import { join as join26 } from "node:path";
 function getSelfVersion3() {
-  const req = createRequire7(import.meta.url);
+  const req = createRequire6(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
     try {
       const pkg = req(relPath);
@@ -41750,7 +43979,7 @@ function getSelfVersion3() {
 }
 function fileSize2(path6) {
   try {
-    return existsSync28(path6) ? statSync11(path6).size : 0;
+    return existsSync29(path6) ? statSync12(path6).size : 0;
   } catch {
     return 0;
   }
@@ -41802,11 +44031,11 @@ function sanitizeValue2(value, key = "") {
   return value;
 }
 function readJsonc(path6) {
-  if (!existsSync28(path6))
+  if (!existsSync29(path6))
     return { value: {} };
   try {
     return {
-      value: import_comment_json12.parse(readFileSync20(path6, "utf-8"))
+      value: import_comment_json12.parse(readFileSync21(path6, "utf-8"))
     };
   } catch (error51) {
     return {
@@ -41822,7 +44051,7 @@ function readConfigDiagnostic(path6) {
   const parsed = readJsonc(path6);
   return {
     path: path6,
-    exists: existsSync28(path6),
+    exists: existsSync29(path6),
     ...parsed.parseError ? { parseError: parsed.parseError } : {},
     flags: sanitizeValue2(parsed.value)
   };
@@ -41840,7 +44069,7 @@ function reverseSlugToDirectory(slug) {
 }
 function collectPiRecentSessions() {
   const sessionsRoot = getPiSessionsRoot();
-  if (!existsSync28(sessionsRoot))
+  if (!existsSync29(sessionsRoot))
     return [];
   try {
     const slugs = readdirSync4(sessionsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
@@ -41849,7 +44078,7 @@ function collectPiRecentSessions() {
       const directory = reverseSlugToDirectory(slug);
       if (!directory)
         continue;
-      const slugDir = join25(sessionsRoot, slug);
+      const slugDir = join26(sessionsRoot, slug);
       let files;
       try {
         files = readdirSync4(slugDir).filter((name) => name.endsWith(".jsonl"));
@@ -41858,7 +44087,7 @@ function collectPiRecentSessions() {
       }
       for (const file2 of files) {
         try {
-          const mtime = statSync11(join25(slugDir, file2)).mtimeMs;
+          const mtime = statSync12(join26(slugDir, file2)).mtimeMs;
           const sessionId = file2.replace(/\.jsonl$/, "");
           candidates.push({ sessionId, directory, mtime });
         } catch {}
@@ -41876,7 +44105,7 @@ function collectPiRecentSessions() {
 }
 function parseHistorianDumpMeta2(path6) {
   try {
-    const xml = readFileSync20(path6, "utf-8");
+    const xml = readFileSync21(path6, "utf-8");
     const parsed = parseCompartmentOutput(xml);
     const factCountByCategory = {};
     for (const fact of parsed.facts) {
@@ -41909,11 +44138,11 @@ function parseHistorianDumpMeta2(path6) {
   }
 }
 function listDumpsInDir2(dir, limit) {
-  if (!existsSync28(dir))
+  if (!existsSync29(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync4(dir).filter((name) => name.endsWith(".xml")).map((name) => {
-      const stat = statSync11(join25(dir, name));
+      const stat = statSync12(join26(dir, name));
       return {
         name,
         mtime: stat.mtimeMs,
@@ -41922,7 +44151,7 @@ function listDumpsInDir2(dir, limit) {
     }).sort((a3, b2) => b2.mtime - a3.mtime);
     const now = Date.now();
     const recent = entries.slice(0, limit).map((entry) => {
-      const meta3 = parseHistorianDumpMeta2(join25(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta2(join26(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -41985,9 +44214,9 @@ async function collectDiagnostics2(cwd = process.cwd()) {
   const projectConfigPath = getProjectConfigPath(cwd);
   const loaded = loadPiConfig({ cwd });
   const storageDirPath = getMagicContextStorageDir();
-  const dbPath = join25(storageDirPath, "context.db");
+  const dbPath = join26(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("pi");
-  const logFileSize = existsSync28(logPath) ? statSync11(logPath).size : 0;
+  const logFileSize = existsSync29(logPath) ? statSync12(logPath).size : 0;
   const otherPiExtensions = packages.filter((entry) => !isPiMagicContextPackageEntry(entry)).map(describePiPackageEntry);
   const recentSessions = collectPiRecentSessions();
   const historianDumps = collectPiHistorianDumps(recentSessions);
@@ -42002,7 +44231,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     piVersion: pi ? getPiVersion(pi.path) : null,
     settings: {
       path: settingsPath,
-      exists: existsSync28(settingsPath),
+      exists: existsSync29(settingsPath),
       ...settingsParsed.parseError ? { parseError: settingsParsed.parseError } : {},
       hasMagicContextPackage: hasPiMagicContextPackage(packages),
       packages: sanitizeValue2(packages)
@@ -42018,7 +44247,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     loadWarnings: loaded.warnings.map(sanitizeString2),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync28(storageDirPath),
+      exists: existsSync29(storageDirPath),
       contextDbSizeBytes: fileSize2(dbPath)
     },
     conflicts: {
@@ -42027,7 +44256,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     },
     logFile: {
       path: logPath,
-      exists: existsSync28(logPath),
+      exists: existsSync29(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -42121,8 +44350,8 @@ var init_diagnostics_pi = __esm(() => {
 });
 
 // src/lib/logs-pi.ts
-import { readFileSync as readFileSync21, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join26 } from "node:path";
+import { readFileSync as readFileSync22, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join27 } from "node:path";
 function sanitizeLogContent2(content) {
   return sanitizeString2(content);
 }
@@ -42151,7 +44380,7 @@ function filterLogLinesBySession2(lines, sessionId) {
 }
 async function bundleIssueReport2(report, description, title, options = {}) {
   const LOG_TAIL_LINES = 400;
-  const allLogLines = report.logFile.exists ? readFileSync21(report.logFile.path, "utf-8").split(/\r?\n/) : [];
+  const allLogLines = report.logFile.exists ? readFileSync22(report.logFile.path, "utf-8").split(/\r?\n/) : [];
   const logLines = filterLogLinesBySession2(allLogLines, options.sessionFilter ?? null);
   const recentLog = sanitizeLogContent2(logLines.slice(-LOG_TAIL_LINES).join(`
 `)).trim();
@@ -42187,7 +44416,7 @@ async function bundleIssueReport2(report, description, title, options = {}) {
 `);
   const bodyMarkdown = capBodyToGithubLimit(rawBodyMarkdown);
   const cwd = options.cwd ?? process.cwd();
-  const path6 = join26(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
+  const path6 = join27(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
   writeFileSync8(path6, `${bodyMarkdown}
 `);
   return { path: path6, bodyMarkdown };
@@ -42198,15 +44427,15 @@ var init_logs_pi = __esm(() => {
 });
 
 // src/commands/doctor-pi.ts
-import { execFileSync as execFileSync6, spawnSync as spawnSync6 } from "node:child_process";
-import { existsSync as existsSync29, mkdirSync as mkdirSync10, readdirSync as readdirSync5, readFileSync as readFileSync22, rmSync as rmSync3, statSync as statSync12 } from "node:fs";
-import { createRequire as createRequire8 } from "node:module";
+import { execFileSync as execFileSync6, spawnSync as spawnSync7 } from "node:child_process";
+import { existsSync as existsSync30, mkdirSync as mkdirSync10, readdirSync as readdirSync5, readFileSync as readFileSync23, rmSync as rmSync4, statSync as statSync13 } from "node:fs";
+import { createRequire as createRequire7 } from "node:module";
 import { homedir as homedir18 } from "node:os";
-import { dirname as dirname14, isAbsolute as isAbsolute4, join as join27 } from "node:path";
+import { dirname as dirname15, isAbsolute as isAbsolute4, join as join28 } from "node:path";
 function depsFrom(options) {
   return {
-    ...DEFAULT_DEPS2,
-    prompts: options.prompts ?? DEFAULT_DEPS2.prompts,
+    ...DEFAULT_DEPS3,
+    prompts: options.prompts ?? DEFAULT_DEPS3.prompts,
     ...options.deps
   };
 }
@@ -42226,7 +44455,7 @@ function printDoctorHelp() {
   console.log("");
 }
 function selfVersion2() {
-  const req = createRequire8(import.meta.url);
+  const req = createRequire7(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
     try {
       const pkg = req(relPath);
@@ -42292,7 +44521,7 @@ function summarize(results) {
 function readJsonc2(path6) {
   try {
     return {
-      value: import_comment_json13.parse(readFileSync22(path6, "utf-8"))
+      value: import_comment_json13.parse(readFileSync23(path6, "utf-8"))
     };
   } catch (error51) {
     return {
@@ -42311,27 +44540,34 @@ function piPluginDirCandidates(packages, cwd) {
     const spec = typeof entry === "string" ? entry.trim() : "";
     if (!spec || spec.startsWith("npm:"))
       continue;
-    const resolved = isAbsolute4(spec) ? spec : join27(agentDir, spec);
+    const resolved = isAbsolute4(spec) ? spec : join28(agentDir, spec);
     dirs.push(resolved);
   }
-  dirs.push(join27(agentDir, "npm", "node_modules", PACKAGE_NAME));
-  dirs.push(join27(cwd, ".pi", "npm", "node_modules", PACKAGE_NAME));
-  return dirs.filter((dir) => existsSync29(join27(dir, "package.json")));
+  dirs.push(join28(agentDir, "npm", "node_modules", PACKAGE_NAME));
+  dirs.push(join28(cwd, ".pi", "npm", "node_modules", PACKAGE_NAME));
+  return dirs.filter((dir) => existsSync30(join28(dir, "package.json")));
 }
 function projectConfigPath(cwd) {
   return resolveCortexKitProjectConfigPath(cwd);
 }
 function readConfigForEmbedding(path6, isProjectConfig) {
-  if (!existsSync29(path6))
+  if (!existsSync30(path6))
     return null;
   try {
-    const rawText = readFileSync22(path6, "utf-8");
+    const rawText = readFileSync23(path6, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
       configPath: path6,
       isProjectConfig
     });
-    return import_comment_json13.parse(substituted.text);
+    const rejectedKeyPaths = [];
+    const parsed = sanitizeParsedJson(import_comment_json13.parse(substituted.text), {
+      onRejectedKey: (keyPath) => rejectedKeyPaths.push(keyPath.join("."))
+    });
+    if (rejectedKeyPaths.length > 0) {
+      throw new Error("unsafe prototype-pollution key in config");
+    }
+    return parsed;
   } catch {
     return null;
   }
@@ -42396,35 +44632,35 @@ function pinnedVersionFromPackageSpecifier(specifier) {
 }
 function cacheRoots(cwd) {
   const home = process.env.HOME?.trim();
-  const cacheHome = process.env.XDG_CACHE_HOME || join27(home || homedir18(), ".cache");
+  const cacheHome = process.env.XDG_CACHE_HOME || join28(home || homedir18(), ".cache");
   const piCacheRoot = getPiCacheRoot();
   return [
-    join27(piCacheRoot, "extensions"),
-    join27(piCacheRoot, "packages"),
-    join27(cacheHome, "pi", "extensions"),
-    join27(cacheHome, "pi", "packages"),
-    join27(getPiAgentConfigDir(), "cache", "extensions"),
-    join27(getPiAgentConfigDir(), "npm", "node_modules", PACKAGE_NAME),
-    join27(cwd, ".pi", "npm", "node_modules", PACKAGE_NAME)
+    join28(piCacheRoot, "extensions"),
+    join28(piCacheRoot, "packages"),
+    join28(cacheHome, "pi", "extensions"),
+    join28(cacheHome, "pi", "packages"),
+    join28(getPiAgentConfigDir(), "cache", "extensions"),
+    join28(getPiAgentConfigDir(), "npm", "node_modules", PACKAGE_NAME),
+    join28(cwd, ".pi", "npm", "node_modules", PACKAGE_NAME)
   ];
 }
 function findPiMagicContextCacheDirs(cwd, expectedVersion, force = false) {
   const found = new Map;
   const visit = (path6, depth) => {
-    if (depth < 0 || !existsSync29(path6))
+    if (depth < 0 || !existsSync30(path6))
       return;
     let stat;
     try {
-      stat = statSync12(path6);
+      stat = statSync13(path6);
     } catch {
       return;
     }
     if (!stat.isDirectory())
       return;
-    const packageJson = join27(path6, "package.json");
-    if (existsSync29(packageJson)) {
+    const packageJson = join28(path6, "package.json");
+    if (existsSync30(packageJson)) {
       try {
-        const pkg = JSON.parse(readFileSync22(packageJson, "utf-8"));
+        const pkg = JSON.parse(readFileSync23(packageJson, "utf-8"));
         const name = typeof pkg.name === "string" ? pkg.name : "";
         const version2 = typeof pkg.version === "string" ? pkg.version : undefined;
         if (name === PACKAGE_NAME) {
@@ -42444,7 +44680,7 @@ function findPiMagicContextCacheDirs(cwd, expectedVersion, force = false) {
       return;
     }
     for (const entry of entries)
-      visit(join27(path6, entry), depth - 1);
+      visit(join28(path6, entry), depth - 1);
   };
   for (const root of cacheRoots(cwd))
     visit(root, 5);
@@ -42489,7 +44725,7 @@ async function runHealthChecks2(options) {
   }
   const settingsPath = getPiUserExtensionsPath();
   let packages = [];
-  if (!existsSync29(settingsPath)) {
+  if (!existsSync30(settingsPath)) {
     add2(results, "fail", `Pi settings not found at ${settingsPath}`);
     repairPlan.addPackageEntry = true;
   } else {
@@ -42513,7 +44749,7 @@ async function runHealthChecks2(options) {
     ["user", userConfigPath, true],
     ["project", projectPath, false]
   ]) {
-    if (!existsSync29(path6)) {
+    if (!existsSync30(path6)) {
       if (required2) {
         add2(results, "warn", `No ${label} magic-context.jsonc found at ${path6}`);
         if (userConfigMigrationRefused) {
@@ -42550,8 +44786,8 @@ async function runHealthChecks2(options) {
     add2(results, "pass", `historian.model "${historianModel}" has thinking_level "${historianThinkingLevel}" configured`);
   }
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join27(storageDir, "context.db");
-  const existedBeforeOpen = existsSync29(dbPath);
+  const dbPath = join28(storageDir, "context.db");
+  const existedBeforeOpen = existsSync30(dbPath);
   if (existedBeforeOpen)
     add2(results, "pass", `Shared context DB exists at ${dbPath}`);
   else
@@ -42574,8 +44810,9 @@ async function runHealthChecks2(options) {
         if (integrity?.integrity_check === "ok")
           add2(results, "pass", "SQLite integrity_check: ok");
         else
-          add2(results, "fail", `SQLite integrity_check: ${String(integrity?.integrity_check ?? "unknown")}`);
-        const counts = ROW_COUNT_TABLES.map((table) => `${table}=${countTable(db, table) ?? "n/a"}`).join(", ");
+          add2(results, "fail", `SQLite integrity_check: ${String(integrity?.integrity_check ?? "unknown")}
+${formatDatabaseRepairGuidance(dbPath)}`);
+        const counts = ROW_COUNT_TABLES2.map((table) => `${table}=${countTable(db, table) ?? "n/a"}`).join(", ");
         add2(results, "info", `Shared DB row counts: ${counts}`);
       }
     } catch (error51) {
@@ -42585,7 +44822,8 @@ async function runHealthChecks2(options) {
           plugin_supported_version: error51.supportedVersion
         }).message);
       } else {
-        add2(results, "fail", `Could not open shared context DB: ${error51 instanceof Error ? error51.message : String(error51)}`);
+        add2(results, "fail", `Could not open shared context DB: ${error51 instanceof Error ? error51.message : String(error51)}
+${formatDatabaseRepairGuidance(dbPath)}`);
       }
     } finally {
       db?.close();
@@ -42600,7 +44838,16 @@ async function runHealthChecks2(options) {
   for (const config2 of [userRaw, projectRaw]) {
     const embedding = config2?.embedding;
     if (embedding && typeof embedding === "object" && !Array.isArray(embedding)) {
-      Object.assign(mergedEmbedding, embedding);
+      for (const key of Object.keys(embedding)) {
+        if (isPrototypePollutionKey(key))
+          continue;
+        Object.defineProperty(mergedEmbedding, key, {
+          value: embedding[key],
+          enumerable: true,
+          configurable: true,
+          writable: true
+        });
+      }
     }
   }
   if (projectRaw) {
@@ -42677,10 +44924,10 @@ async function runHealthChecks2(options) {
     add2(results, "pass", "Pi extension cache clean (no stale cached package found)");
   }
   const logPath = getMagicContextLogPath2("pi");
-  if (existsSync29(logPath)) {
-    const stat = statSync12(logPath);
+  if (existsSync30(logPath)) {
+    const stat = statSync13(logPath);
     const sizeKb = (stat.size / 1024).toFixed(0);
-    const lines = readFileSync22(logPath, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    const lines = readFileSync23(logPath, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     add2(results, "info", `Log file: ${logPath} (${sizeKb} KB)`);
     const lastLine = lines.at(-1);
     add2(results, "info", `Last plugin log line: ${lastLine ? sanitizeDiagnosticText(lastLine) : "<empty log>"}`);
@@ -42715,7 +44962,7 @@ async function runHealthChecks2(options) {
   return { results, repairPlan, ...summarize(results) };
 }
 function writeDefaultMagicContextConfig(path6) {
-  mkdirSync10(dirname14(path6), { recursive: true });
+  mkdirSync10(dirname15(path6), { recursive: true });
   const config2 = {
     $schema: "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json",
     ...MagicContextConfigSchema.parse({})
@@ -42737,7 +44984,7 @@ function repair2(plan, prompts) {
   }
   if (plan.writeUserConfig) {
     const configPath = getPiUserConfigPath();
-    if (!existsSync29(configPath)) {
+    if (!existsSync30(configPath)) {
       try {
         writeDefaultMagicContextConfig(configPath);
         prompts.log.success(`Wrote default Magic Context config to ${configPath}`);
@@ -42749,7 +44996,7 @@ function repair2(plan, prompts) {
   }
   for (const path6 of plan.clearCachePaths) {
     try {
-      rmSync3(path6, { recursive: true, force: true });
+      rmSync4(path6, { recursive: true, force: true });
       prompts.log.success(`Cleared stale Pi extension cache: ${path6}`);
       fixed += 1;
     } catch (error51) {
@@ -42857,7 +45104,7 @@ async function runDoctor3(options = {}) {
   const v22Result = await runV22BackfillCommands({
     name: "Pi",
     openDatabase: (readonly2 = true) => {
-      const dbPath = join27(getMagicContextStorageDir(), "context.db");
+      const dbPath = join28(getMagicContextStorageDir(), "context.db");
       v22Db = readonly2 ? openExistingContextDatabase(dbPath, { readonly: true }) : openExistingContextDatabaseForMutation(dbPath);
       return v22Db;
     },
@@ -42922,13 +45169,14 @@ function parseDoctorArgs(args) {
 function doctor(args = []) {
   return runDoctor3(parseDoctorArgs(args));
 }
-var import_comment_json13, PACKAGE_NAME = "@cortexkit/pi-magic-context", MIN_PI_VERSION = "0.74.0", ROW_COUNT_TABLES, DEFAULT_DEPS2;
+var import_comment_json13, PACKAGE_NAME = "@cortexkit/pi-magic-context", MIN_PI_VERSION = "0.74.0", ROW_COUNT_TABLES2, DEFAULT_DEPS3;
 var init_doctor_pi = __esm(async () => {
   init_migrate_config_location();
   init_project_security();
   init_magic_context();
   init_variable();
   init_data_path();
+  init_jsonc_parser();
   init_config2();
   init_atomic_write();
   init_config_location_migration();
@@ -42947,8 +45195,8 @@ var init_doctor_pi = __esm(async () => {
     init_v22_backfill_commands()
   ]);
   import_comment_json13 = __toESM(require_src3(), 1);
-  ROW_COUNT_TABLES = ["tags", "compartments", "memories", "notes", "dream_runs"];
-  DEFAULT_DEPS2 = {
+  ROW_COUNT_TABLES2 = ["tags", "compartments", "memories", "notes", "dream_runs"];
+  DEFAULT_DEPS3 = {
     prompts: promptIO,
     collectDiagnostics: collectDiagnostics2,
     detectPiBinary,
@@ -42959,7 +45207,7 @@ var init_doctor_pi = __esm(async () => {
     openExistingContextDatabase,
     now: () => new Date,
     execFileSync: execFileSync6,
-    spawnSync: spawnSync6
+    spawnSync: spawnSync7
   };
 });
 
@@ -42968,8 +45216,8 @@ var exports_doctor = {};
 __export(exports_doctor, {
   runDoctor: () => runDoctor4
 });
-import { existsSync as existsSync30, rmSync as rmSync4 } from "node:fs";
-import { join as join28 } from "node:path";
+import { existsSync as existsSync31, rmSync as rmSync5 } from "node:fs";
+import { join as join29 } from "node:path";
 async function runDoctor4(options) {
   if (options.clear)
     return runClear();
@@ -42987,7 +45235,7 @@ async function runDoctor4(options) {
     const result = await runV22BackfillCommands({
       name: "Magic Context",
       openDatabase: (readonly2 = true) => {
-        const dbPath = join28(getMagicContextStorageDir(), "context.db");
+        const dbPath = join29(getMagicContextStorageDir(), "context.db");
         v22Db = readonly2 ? openExistingContextDatabase(dbPath, { readonly: true }) : openExistingContextDatabaseForMutation(dbPath);
         return v22Db;
       },
@@ -43076,8 +45324,8 @@ async function runClear() {
     const s = spinner2();
     s.start(`Clearing ${item.path}`);
     try {
-      if (existsSync30(item.path)) {
-        rmSync4(item.path, { recursive: true, force: true });
+      if (existsSync31(item.path)) {
+        rmSync5(item.path, { recursive: true, force: true });
       }
       s.stop(`Cleared ${item.path}`);
     } catch (err) {
@@ -43114,7 +45362,7 @@ var init_doctor = __esm(async () => {
 
 // src/index.ts
 init_prompts();
-import { createRequire as createRequire9 } from "node:module";
+import { createRequire as createRequire8 } from "node:module";
 
 // src/lib/sqlite-preflight.ts
 async function probeSqliteBackend() {
@@ -43142,7 +45390,7 @@ async function runSqlitePreflight(probe = probeSqliteBackend, report = (message)
 
 // src/index.ts
 function getVersion() {
-  const req = createRequire9(import.meta.url);
+  const req = createRequire8(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
     try {
       const pkg = req(relPath);
@@ -43180,6 +45428,7 @@ function printUsage() {
   console.log("    doctor migrate   Migrate OpenCode session to Pi or OMP JSONL");
   console.log("    doctor migrate-session   Re-home an OpenCode session to another directory");
   console.log("    doctor merge-identity   Merge project rows (--from ID --to ID [--dry-run] [--yes])");
+  console.log("    doctor repair-db   Back up and salvage a corrupted shared database");
   console.log("");
   console.log("  Harness selection:");
   console.log("    --harness opencode    Target OpenCode only");
@@ -43221,17 +45470,21 @@ async function main(argv = process.argv.slice(2)) {
           console.error("Usage: magic-context doctor drain-authority <project>");
           return 1;
         }
-        const [{ runDoctorDrainAuthority: runDoctorDrainAuthority2 }, { getMagicContextStorageDir: getMagicContextStorageDir2 }, { join: join29 }] = await Promise.all([
+        const [{ runDoctorDrainAuthority: runDoctorDrainAuthority2 }, { getMagicContextStorageDir: getMagicContextStorageDir2 }, { join: join30 }] = await Promise.all([
           init_doctor_authority().then(() => exports_doctor_authority),
           Promise.resolve().then(() => (init_data_path(), exports_data_path)),
           import("node:path")
         ]);
-        return runDoctorDrainAuthority2(projectRoot, join29(getMagicContextStorageDir2(), "context.db"));
+        return runDoctorDrainAuthority2(projectRoot, join30(getMagicContextStorageDir2(), "context.db"));
       }
       if (rest[0] === "merge-identity") {
         const { runMergeIdentityCli: runMergeIdentityCli2 } = await init_doctor_merge_identity().then(() => exports_doctor_merge_identity);
         return runMergeIdentityCli2(rest.slice(1));
       }
+      if (rest[0] === "repair-db") {
+        const { runRepairDbCli: runRepairDbCli2 } = await init_doctor_repair_db().then(() => exports_doctor_repair_db);
+        return runRepairDbCli2(rest.slice(1));
+      }
       if (rest[0] === "migrate") {
         const { runMigrateCli: runMigrateCli2 } = await init_migrate().then(() => exports_migrate);
         return runMigrateCli2(rest.slice(1));