@cortexkit/magic-context 0.36.1 → 0.38.0

package/dist/index.js

@@ -3067,10 +3067,11 @@ function detectOmpBinary() {
   const candidate = candidates.find((path2) => isExecutableFile(path2));
   return candidate ? { path: candidate, source: "home" } : null;
 }
-function runOmpCommand(ompPath, args, timeout = 30000) {
+function runOmpCommand(ompPath, args, timeout = 30000, overrides = {}) {
+  const deps = { ...DEFAULT_COMMAND_EXECUTION_DEPS, ...overrides };
   try {
-    const invocation = getOmpCommandInvocation(ompPath, args);
-    const result = spawnSync2(invocation.command, invocation.args, {
+    const invocation = deps.getInvocation(ompPath, args);
+    const result = deps.spawnSync(invocation.command, invocation.args, {
       encoding: "utf-8",
       timeout,
       maxBuffer: 10 * 1024 * 1024,
@@ -3161,11 +3162,15 @@ function getOmpSetting(ompPath, key) {
     return null;
   }
 }
-var OMP_PLUGIN_PACKAGE = "@cortexkit/pi-magic-context";
+var OMP_PLUGIN_PACKAGE = "@cortexkit/pi-magic-context", DEFAULT_COMMAND_EXECUTION_DEPS;
 var init_omp_helpers = __esm(() => {
   init_find_on_path();
   init_paths();
   init_pi_helpers();
+  DEFAULT_COMMAND_EXECUTION_DEPS = {
+    getInvocation: getOmpCommandInvocation,
+    spawnSync: spawnSync2
+  };
 });
 
 // src/adapters/omp.ts
@@ -3176,14 +3181,18 @@ class OmpAdapter {
   kind = "omp";
   displayName = "Oh My Pi (OMP)";
   pluginPackageName = OMP_PLUGIN_PACKAGE;
+  deps;
+  constructor(deps = {}) {
+    this.deps = { ...DEFAULT_DEPS, ...deps };
+  }
   isInstalled() {
-    return detectOmpBinary() !== null;
+    return this.deps.detectOmpBinary() !== null;
   }
   hasPluginEntry() {
-    const omp = detectOmpBinary();
+    const omp = this.deps.detectOmpBinary();
     if (!omp)
       return false;
-    return listOmpPlugins(omp.path)?.some((plugin) => plugin.name === OMP_PLUGIN_PACKAGE && plugin.enabled) ?? false;
+    return this.deps.listOmpPlugins(omp.path)?.some((plugin) => plugin.name === OMP_PLUGIN_PACKAGE && plugin.enabled) ?? false;
   }
   getConfigPaths() {
     return {
@@ -3195,10 +3204,10 @@ class OmpAdapter {
   }
   async ensurePluginEntry() {
     const configPath = getOmpPluginsLockPath();
-    const omp = detectOmpBinary();
+    const omp = this.deps.detectOmpBinary();
     if (!omp)
       return this.errorResult(configPath, "OMP binary not found");
-    const plugins = listOmpPlugins(omp.path);
+    const plugins = this.deps.listOmpPlugins(omp.path);
     if (plugins === null) {
       return this.errorResult(configPath, "`omp plugin list --json` failed");
     }
@@ -3213,16 +3222,16 @@ class OmpAdapter {
     }
     const originalRuntimeEnabled = this.readRuntimeEnabled(configPath);
     const args = installed ? ["plugin", "enable", OMP_PLUGIN_PACKAGE] : ["plugin", "install", OMP_PLUGIN_PACKAGE];
-    const result = runOmpCommand(omp.path, args, 120000);
+    const result = this.deps.runOmpCommand(omp.path, args, 120000);
     if (!result.ok) {
       return this.errorResult(configPath, result.stderr || result.stdout || `omp ${args.join(" ")} failed`);
     }
-    const enabledAfter = listOmpPlugins(omp.path)?.some((plugin) => plugin.name === OMP_PLUGIN_PACKAGE && plugin.enabled);
+    const enabledAfter = this.deps.listOmpPlugins(omp.path)?.some((plugin) => plugin.name === OMP_PLUGIN_PACKAGE && plugin.enabled);
     if (!enabledAfter) {
       if (!installed) {
-        runOmpCommand(omp.path, ["plugin", "uninstall", OMP_PLUGIN_PACKAGE], 120000);
+        this.deps.runOmpCommand(omp.path, ["plugin", "uninstall", OMP_PLUGIN_PACKAGE], 120000);
       } else if (originalRuntimeEnabled !== undefined) {
-        runOmpCommand(omp.path, ["plugin", originalRuntimeEnabled ? "enable" : "disable", OMP_PLUGIN_PACKAGE], 120000);
+        this.deps.runOmpCommand(omp.path, ["plugin", originalRuntimeEnabled ? "enable" : "disable", OMP_PLUGIN_PACKAGE], 120000);
       }
       return this.errorResult(configPath, `${OMP_PLUGIN_PACKAGE} is still disabled in the current project after \`omp ${args.join(" ")}\``);
     }
@@ -3235,10 +3244,10 @@ class OmpAdapter {
   }
   async removePluginEntry() {
     const configPath = getOmpPluginsLockPath();
-    const omp = detectOmpBinary();
+    const omp = this.deps.detectOmpBinary();
     if (!omp)
       return this.errorResult(configPath, "OMP binary not found");
-    const plugins = listOmpPlugins(omp.path);
+    const plugins = this.deps.listOmpPlugins(omp.path);
     if (plugins === null) {
       return this.errorResult(configPath, "`omp plugin list --json` failed");
     }
@@ -3251,7 +3260,7 @@ class OmpAdapter {
         configPath
       };
     }
-    const result = runOmpCommand(omp.path, ["plugin", "uninstall", OMP_PLUGIN_PACKAGE], 120000);
+    const result = this.deps.runOmpCommand(omp.path, ["plugin", "uninstall", OMP_PLUGIN_PACKAGE], 120000);
     if (!result.ok) {
       return this.errorResult(configPath, result.stderr || result.stdout || "OMP plugin uninstall failed");
     }
@@ -3273,10 +3282,10 @@ class OmpAdapter {
     return getMagicContextLogPath2("pi");
   }
   getInstalledPluginVersion() {
-    const omp = detectOmpBinary();
+    const omp = this.deps.detectOmpBinary();
     if (!omp)
       return null;
-    return listOmpPlugins(omp.path)?.find((plugin) => plugin.name === OMP_PLUGIN_PACKAGE)?.version ?? null;
+    return this.deps.listOmpPlugins(omp.path)?.find((plugin) => plugin.name === OMP_PLUGIN_PACKAGE)?.version ?? null;
   }
   readRuntimeEnabled(configPath) {
     try {
@@ -3296,9 +3305,15 @@ class OmpAdapter {
     };
   }
 }
+var DEFAULT_DEPS;
 var init_omp = __esm(() => {
   init_omp_helpers();
   init_paths();
+  DEFAULT_DEPS = {
+    detectOmpBinary,
+    listOmpPlugins,
+    runOmpCommand
+  };
 });
 
 // ../../node_modules/.bun/esprima@4.0.1/node_modules/esprima/dist/esprima.js
@@ -11160,14 +11175,16 @@ var init_atomic_write = () => {};
 import { existsSync as existsSync7, realpathSync } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 import { join as join8 } from "node:path";
-function defaultDeps() {
+function defaultDeps(overrides = {}) {
+  const env = overrides.env ?? process.env;
   return {
-    exists: existsSync7,
-    isExecutable: isExecutableFile,
-    home: process.env.HOME?.trim() || homedir6(),
-    platform: process.platform,
-    env: process.env,
-    onPath: findOnPath
+    exists: overrides.exists ?? existsSync7,
+    isExecutable: overrides.isExecutable ?? isExecutableFile,
+    home: overrides.home ?? (env.HOME?.trim() || homedir6()),
+    platform: overrides.platform ?? process.platform,
+    env,
+    onPath: overrides.onPath ?? findOnPath,
+    realpath: overrides.realpath
   };
 }
 function stockCliBinary(d) {
@@ -11246,7 +11263,7 @@ function desktopAppPaths(d) {
   }
 }
 function detectOpenCodeInstallations(deps) {
-  const d = { ...defaultDeps(), ...deps };
+  const d = defaultDeps(deps);
   const installations = [];
   const seenRealpaths = new Set;
   const onPath = d.onPath("opencode");
@@ -12736,31 +12753,28 @@ var init_setup_pi = __esm(() => {
 });
 
 // src/commands/setup-omp.ts
-async function runSetup2(options = {}) {
-  return runSetup({
-    ...options,
-    env: options.env ?? OMP_ENV,
-    host: options.host ?? OMP_HOST
-  });
+function resolveDeps(overrides = {}) {
+  return { ...DEFAULT_DEPS2, ...overrides };
 }
-var OMP_ENV, OMP_HOST;
-var init_setup_omp = __esm(() => {
-  init_harness_provider_map();
-  init_omp();
-  init_omp_helpers();
-  init_paths();
-  init_setup_pi();
-  OMP_ENV = {
-    detectPiBinary: detectOmpBinary,
-    getPiVersion: getOmpVersion,
-    getAvailableModels: getOmpAvailableModels,
+function createOmpEnvironment(deps) {
+  return {
+    detectPiBinary: deps.detectOmpBinary,
+    getPiVersion: deps.getOmpVersion,
+    getAvailableModels: deps.getOmpAvailableModels,
     paths: {
       getPiAgentConfigDir: getOmpAgentDir,
       getPiUserConfigPath: getOmpUserConfigPath,
       getPiUserExtensionsPath: getOmpPluginsLockPath
     }
   };
-  OMP_HOST = {
+}
+function createOmpHost(deps) {
+  const adapterDeps = {
+    detectOmpBinary: deps.detectOmpBinary,
+    listOmpPlugins: deps.listOmpPlugins,
+    runOmpCommand: deps.runOmpCommand
+  };
+  return {
     displayName: "Oh My Pi (OMP)",
     cliName: "omp",
     packageSource: OMP_PLUGIN_PACKAGE,
@@ -12768,13 +12782,13 @@ var init_setup_omp = __esm(() => {
     minimumVersion: "17.1.7",
     versionWarning: (version, minimum) => `OMP ${version} is older than the tested minimum ${minimum}. ` + "Upgrade with `omp update` before enabling Magic Context.",
     modelRefToCanonical: ompModelRefToCanonical,
-    ensurePluginEntry: async () => new OmpAdapter().ensurePluginEntry(),
+    ensurePluginEntry: async () => new OmpAdapter(adapterDeps).ensurePluginEntry(),
     beforeWrite: async ({ binaryPath, cwd, prompts, dryRun, configureHost }) => {
-      if (!configureHost && !new OmpAdapter().hasPluginEntry()) {
+      if (!configureHost && !new OmpAdapter(adapterDeps).hasPluginEntry()) {
         return async () => {};
       }
-      const compaction = getOmpSetting(binaryPath, "compaction.enabled");
-      const memoryBackend = getOmpSetting(binaryPath, "memory.backend");
+      const compaction = deps.getOmpSetting(binaryPath, "compaction.enabled");
+      const memoryBackend = deps.getOmpSetting(binaryPath, "memory.backend");
       if (compaction === null || memoryBackend === null) {
         prompts.log.error("Could not read OMP compaction/memory settings; refusing to install two context managers blindly.");
         return false;
@@ -12813,7 +12827,7 @@ Edit those files directly, then rerun setup.`);
       const applied = [];
       const rollback = async () => {
         for (const change of [...applied].reverse()) {
-          const result = runOmpCommand(binaryPath, ["config", "set", change.key, change.from], 1e4);
+          const result = deps.runOmpCommand(binaryPath, ["config", "set", change.key, change.from], 1e4);
           if (result.ok)
             prompts.log.info(`Restored OMP ${change.key}=${change.from}`);
           else
@@ -12821,7 +12835,7 @@ Edit those files directly, then rerun setup.`);
         }
       };
       for (const change of changes) {
-        const result = runOmpCommand(binaryPath, ["config", "set", change.key, change.to], 1e4);
+        const result = deps.runOmpCommand(binaryPath, ["config", "set", change.key, change.to], 1e4);
         if (!result.ok) {
           prompts.log.error(result.stderr || `Could not set OMP ${change.key}`);
           await rollback();
@@ -12835,27 +12849,55 @@ Edit those files directly, then rerun setup.`);
     rollbackPluginEntry: async (registration) => {
       if (registration.action === "already_present")
         return;
-      const omp = detectOmpBinary();
+      const omp = deps.detectOmpBinary();
       if (!omp)
         return;
       const action = registration.action === "added" ? "uninstall" : "disable";
-      runOmpCommand(omp.path, ["plugin", action, OMP_PLUGIN_PACKAGE], 120000);
+      deps.runOmpCommand(omp.path, ["plugin", action, OMP_PLUGIN_PACKAGE], 120000);
     }
   };
+}
+async function runSetup2(options = {}) {
+  const { deps: overrides, ...setupOptions } = options;
+  const deps = overrides ? resolveDeps(overrides) : DEFAULT_DEPS2;
+  return runSetup({
+    ...setupOptions,
+    env: setupOptions.env ?? (overrides ? createOmpEnvironment(deps) : OMP_ENV),
+    host: setupOptions.host ?? (overrides ? createOmpHost(deps) : OMP_HOST)
+  });
+}
+var DEFAULT_DEPS2, OMP_ENV, OMP_HOST;
+var init_setup_omp = __esm(() => {
+  init_harness_provider_map();
+  init_omp();
+  init_omp_helpers();
+  init_paths();
+  init_setup_pi();
+  DEFAULT_DEPS2 = {
+    detectOmpBinary,
+    getOmpVersion,
+    getOmpAvailableModels,
+    getOmpSetting,
+    listOmpPlugins,
+    runOmpCommand
+  };
+  OMP_ENV = createOmpEnvironment(DEFAULT_DEPS2);
+  OMP_HOST = createOmpHost(DEFAULT_DEPS2);
 });
 
 // ../plugin/src/shared/logger.ts
 import * as fs from "node:fs";
 import * as path2 from "node:path";
-function ensureDir4(filePath) {
-  const dir = path2.dirname(filePath);
-  if (dir === lastEnsuredDir)
-    return;
+function recordSwallowedWrite(error) {
   try {
-    fs.mkdirSync(dir, { recursive: true });
-    lastEnsuredDir = dir;
+    swallowedWriteCount++;
+    lastErrorMessage = error instanceof Error ? error.message : String(error);
+    lastErrorTime = new Date().toISOString();
   } catch {}
 }
+function ensureDir4(filePath) {
+  fs.mkdirSync(path2.dirname(filePath), { recursive: true });
+}
 function flush() {
   if (flushTimer) {
     clearTimeout(flushTimer);
@@ -12869,7 +12911,9 @@ function flush() {
     const logFile = getMagicContextLogPath();
     ensureDir4(logFile);
     fs.appendFileSync(logFile, data);
-  } catch {}
+  } catch (error) {
+    recordSwallowedWrite(error);
+  }
 }
 function scheduleFlush() {
   if (flushTimer)
@@ -12895,7 +12939,7 @@ ${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
     }
   } catch {}
 }
-var isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, lastEnsuredDir = null;
+var isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, swallowedWriteCount = 0, lastErrorMessage = null, lastErrorTime = null;
 var init_logger = __esm(() => {
   init_data_path();
   buffer = [];
@@ -12903,6 +12947,43 @@ var init_logger = __esm(() => {
     process.on("exit", flush);
   }
 });
+// ../plugin/src/shared/window-geometry.ts
+function setWindowOverlayPath(path3) {
+  configuredOverlayPath = path3;
+  loadedOverlayPath = undefined;
+  loadedOverlay = undefined;
+}
+var GRADES, UNITS, BOUNDARIES, UNKNOWN_REASONS, NUMERIC_FACT_KEYS, configuredOverlayPath, loadedOverlayPath, loadedOverlay, geometryClampLogSeen;
+var init_window_geometry = __esm(() => {
+  init_data_path();
+  init_harness_provider_map();
+  init_logger();
+  GRADES = new Set([
+    "provider_asserted_runtime",
+    "measured",
+    "provider_asserted_doc",
+    "catalog",
+    "unknown"
+  ]);
+  UNITS = new Set(["provider", "estimate"]);
+  BOUNDARIES = new Set(["Observed", "Asserted", "Corrected"]);
+  UNKNOWN_REASONS = new Set([
+    "placeholder_output_equals_context",
+    "placeholder_zero",
+    "never_measured",
+    "not_single_valued_at_key",
+    "retracted"
+  ]);
+  NUMERIC_FACT_KEYS = new Set([
+    "window.advertised",
+    "window.enforced",
+    "output.advertised",
+    "output.enforced",
+    "output.default"
+  ]);
+  geometryClampLogSeen = new Set;
+});
+
 // ../plugin/src/shared/models-dev-cache.ts
 function setOutputReserveConfig(config) {
   outputReserveConfig = config;
@@ -12912,6 +12993,7 @@ var init_models_dev_cache = __esm(() => {
   init_data_path();
   init_harness_provider_map();
   init_logger();
+  init_window_geometry();
   SEPARATE_OUTPUT_QUOTA_PROVIDERS = new Set(["google", "google-antigravity"]);
   reserveClampLogSeen = new Set;
 });
@@ -27951,6 +28033,9 @@ function isValidPromptSurfaceModelKey(key) {
     return true;
   return modelID.length > 0 && !modelID.startsWith("/") && !modelID.endsWith("/") && !modelID.includes("//");
 }
+var init_prompt_surface = __esm(() => {
+  init_harness_provider_map();
+});
 
 // ../plugin/src/config/schema/agent-overrides.ts
 var PermissionValueSchema, PermissionSchema, AgentOverrideConfigSchema;
@@ -28005,6 +28090,7 @@ var init_magic_context = __esm(() => {
   init_zod();
   init_language_directive();
   init_cron();
+  init_prompt_surface();
   init_agent_overrides();
   PiThinkingLevelSchema = exports_external.enum(["off", "minimal", "low", "medium", "high", "xhigh", "max"]).optional();
   PiConfigSchema = exports_external.object({
@@ -28200,7 +28286,10 @@ var init_magic_context = __esm(() => {
     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))
-    ]).optional().describe('User-only output-token reservation override. Number or per-model object ({ default: 16384, "provider/model": 8192 }); 0 disables reservation. When unset, Magic Context reserves the catalog output limit (capped at 25% of context) for shared-window providers and keeps proven separate-quota Google/Gemini windows unchanged.'),
+    ]).optional().describe('User-only output-token reservation override. Number or per-model object ({ default: 16384, "provider/model": 8192 }); 0 disables reservation. Takes precedence over every derived source: an explicit value here always wins against catalog output limits, provider window-geometry facts, and the 25%-of-context fallback (usable window = context window minus this reserve). When unset, Magic Context reserves the catalog output limit (capped at 25% of context) for shared-window providers and keeps proven separate-quota Google/Gemini windows unchanged.'),
+    models: exports_external.object({
+      window_overlay_path: exports_external.string().trim().min(1).optional()
+    }).optional().describe("User-only Fusiform window-overlay settings. The path defaults to <dataDir>/fusiform/window-overlay.json."),
     toast_duration_ms: exports_external.number().min(0).max(60000).default(5000).describe("TUI toast lifetime in milliseconds for Magic Context notifications. Set to 0 to disable Magic Context toasts entirely (min: 0, max: 60000, default: 5000)"),
     execute_threshold_percentage: exports_external.union([
       exports_external.number().min(20).max(90, EXECUTE_THRESHOLD_CAP_MESSAGE),
@@ -28252,7 +28341,7 @@ var init_magic_context = __esm(() => {
       overlay: exports_external.boolean().default(true).describe("Pi only: show the persistent todo overlay above the editor while tasks are active.")
     }).default({ enabled: true, overlay: true }).describe("Pi-only todowrite tool and overlay controls. Pi registers tools and widgets at extension boot, so changing this after /cd requires /reload or restart."),
     pi: PiConfigSchema.describe("Pi-only child-process extension controls. This setting is user-level only; project configuration cannot choose which extensions a user's subagent children load."),
-    smart_drops: exports_external.boolean().default(false).describe("Content-aware reclaim of provably-superseded tool output, layered on the existing execute-pass auto-drop. When on: superseded todowrite (keep newest 1), spent ctx_reduce (keep newest 5), and zero-value meta (bash_status, bash_kill, ctx_note read/dismiss) outputs are dropped; older edits to a file are compressed to a filePath-preserving marker while the newest edit per file stays full. Only acts on passes already busting the cache, so it never originates a cache bust. Honors the protected-tag reserve. Experimental: opt-in, default off until cache stability is proven; when off the wire is byte-identical to the positional-only reclaim. Requires a restart."),
+    smart_drops: exports_external.boolean().default(false).describe("Content-aware reclaim of provably-superseded tool output, layered on the existing execute-pass auto-drop. When on: superseded todowrite (keep newest 1), spent ctx_reduce (keep newest 3), and zero-value meta (bash_status, bash_kill, ctx_note read/dismiss) outputs are dropped; older edits to a file are compressed to a filePath-preserving marker while the newest edit per file stays full. Only acts on passes already busting the cache, so it never originates a cache bust. Honors the protected-tag reserve. Experimental: opt-in, default off until cache stability is proven; when off the wire is byte-identical to the positional-only reclaim. Requires a restart."),
     caveman_text_compression: exports_external.object({
       enabled: exports_external.boolean().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Active for primary sessions when enabled; never for subagents. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
       min_chars: exports_external.number().min(100).max(1e4).default(500).describe("Text parts shorter than this (characters) stay untouched. Min 100, max 10000. Default: 500.")
@@ -28407,6 +28496,11 @@ function stripUnsafeProjectConfigFields(projectRaw) {
     delete projectRaw.output_reserve;
     warnings.push("Ignoring output_reserve from project config (security: output-token reservation only honors user-level config).");
   }
+  const models = projectRaw.models;
+  if (isPlainObject2(models) && "window_overlay_path" in models) {
+    delete models.window_overlay_path;
+    warnings.push("Ignoring models.window_overlay_path from project config (security: only user-level config may select model geometry metadata).");
+  }
   if ("language" in projectRaw) {
     delete projectRaw.language;
     warnings.push("Ignoring language from project config (security: output language is a user-level setting).");
@@ -29085,6 +29179,7 @@ function loadPluginConfigDetailed(directory) {
   const recoveredTopLevelKeys = [];
   const config2 = parsePluginConfig(mergedRaw, recoveredTopLevelKeys);
   setOutputReserveConfig(config2.output_reserve);
+  setWindowOverlayPath(config2.models?.window_overlay_path);
   if (config2.configWarnings?.length) {
     allWarnings.push(...config2.configWarnings.map((w) => {
       if (userLoaded && projectLoaded)
@@ -29126,6 +29221,7 @@ function loadPluginConfigDetailed(directory) {
 var init_config = __esm(() => {
   init_jsonc_parser();
   init_models_dev_cache();
+  init_window_geometry();
   init_agent_disable();
   init_migrate_config_location();
   init_migrate_dreamer_v2();
@@ -29176,14 +29272,17 @@ function detectConflicts(directory, options) {
     omoAnthropicRecovery: false
   };
   const reasons = [];
-  const compactionResult = checkCompaction(directory);
+  let compactionResult = options?.resolvedCompaction ?? checkCompaction(directory);
+  if (process.env.OPENCODE_DISABLE_AUTOCOMPACT) {
+    compactionResult = { auto: false, prune: false };
+  }
   if (compactionEnabled && compactionResult.auto) {
     conflicts.compactionAuto = true;
-    reasons.push("OpenCode auto-compaction is enabled (compaction.auto=true)");
+    reasons.push(options?.resolvedCompaction ? "OpenCode auto-compaction is enabled (compaction.auto=true) (resolved config)" : "OpenCode auto-compaction is enabled (compaction.auto=true)");
   }
   if (compactionEnabled && compactionResult.prune) {
     conflicts.compactionPrune = true;
-    reasons.push("OpenCode prune is enabled (compaction.prune=true)");
+    reasons.push(options?.resolvedCompaction ? "OpenCode prune is enabled (compaction.prune=true) (resolved config)" : "OpenCode prune is enabled (compaction.prune=true)");
   }
   const dcpFound = checkDcpPlugin(directory);
   if (dcpFound) {
@@ -29371,6 +29470,7 @@ function readOmoDisabledHooks(directory) {
 var DCP_PACKAGE_NAMES, OMO_PACKAGE_NAMES;
 var init_conflict_detector = __esm(() => {
   init_jsonc_parser();
+  init_logger();
   init_opencode_config_dir();
   DCP_PACKAGE_NAMES = new Set(["@tarquinen/opencode-dcp"]);
   OMO_PACKAGE_NAMES = new Set(["oh-my-opencode", "oh-my-openagent"]);
@@ -29823,10 +29923,11 @@ function runOpenCode(args, binary, timeoutMs) {
 function getOpenCodeVersion(binary) {
   return runOpenCode(["--version"], binary, OPENCODE_VERSION_PROBE_TIMEOUT_MS);
 }
-function describeOpenCodeInstallations(installations) {
+function describeOpenCodeInstallations(installations, deps = {}) {
+  const getVersion = deps.getVersion ?? getOpenCodeVersion;
   return installations.map((installation, index) => ({
     ...installation,
-    version: installation.kind === "cli" ? getOpenCodeVersion(installation.path) ?? "unknown" : "unknown",
+    version: installation.kind === "cli" ? getVersion(installation.path) ?? "unknown" : "unknown",
     active: index === 0
   }));
 }
@@ -30671,6 +30772,7 @@ function prepareMirrorPageStatements(db) {
   return {
     identityByModule: db.prepare("SELECT context_row_id FROM mirror_identity WHERE domain = ? AND module_project = ? AND module_row_id = ?"),
     insertIdentity: db.prepare("INSERT OR IGNORE INTO mirror_identity(domain, module_project, module_row_id, context_row_id) VALUES (?, ?, ?, ?)"),
+    deleteIdentityByContext: db.prepare("DELETE FROM mirror_identity WHERE domain = ? AND context_row_id = ?"),
     deleteLiveMemory: db.prepare("DELETE FROM mirror_live_memory_rows WHERE module_project = ? AND module_row_id = ?"),
     deletePendingReferencesForMemory: db.prepare("DELETE FROM mirror_pending_references WHERE domain = ? AND module_project = ? AND (module_row_id = ? OR target_module_row_id = ?)"),
     deleteIdentity: db.prepare("DELETE FROM mirror_identity WHERE domain = ? AND module_project = ? AND module_row_id = ?"),
@@ -30722,7 +30824,7 @@ function prepareMirrorPageStatements(db) {
              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 = ?,
              policy_version = ?, anchor_block_id = ?, anchor_ordinal = ?, created_at = ?, updated_at = ? WHERE id = ?`),
-    upsertNoteRevision: db.prepare("INSERT INTO mirror_note_revisions(module_project, module_row_id, context_row_id, status_version) VALUES (?, ?, ?, ?) ON CONFLICT(module_project, module_row_id) DO UPDATE SET context_row_id = excluded.context_row_id, status_version = excluded.status_version"),
+    upsertNoteRevision: db.prepare("INSERT OR REPLACE INTO mirror_note_revisions(module_project, module_row_id, context_row_id, status_version) VALUES (?, ?, ?, ?)"),
     translateMemoryReferences: db.prepare(`UPDATE memories
                 SET superseded_by_memory_id = (
                     SELECT target.context_row_id
@@ -30795,6 +30897,9 @@ function rememberIdentity(db, domain2, moduleProject, moduleRowId, contextRowId,
   const existing = mirrorIdentity(db, domain2, moduleProject, moduleRowId, statements);
   if (existing)
     return;
+  if (domain2 === "notes") {
+    (statements?.deleteIdentityByContext ?? db.prepare("DELETE FROM mirror_identity WHERE domain = ? AND context_row_id = ?")).run(domain2, contextRowId);
+  }
   (statements?.insertIdentity ?? db.prepare("INSERT OR IGNORE INTO mirror_identity(domain, module_project, module_row_id, context_row_id) VALUES (?, ?, ?, ?)")).run(domain2, moduleProject, moduleRowId, contextRowId);
 }
 function contextMemoryId(db, domain2, moduleProject, row, moduleRowId, statements) {
@@ -31427,11 +31532,12 @@ function gitRootInAncestorChain(startDirectory) {
 function hasGitDirInAncestorChain(startDirectory) {
   return gitRootInAncestorChain(startDirectory) !== null;
 }
-var GIT_TIMEOUT_MS = 5000, TRANSIENT_FAILURE_COOLDOWN_MS, identityCache, lastKnownGitIdentityCache, directoryFallbackCache, transientFailureCooldown, dubiousOwnershipFallbackDirectories, dubiousOwnershipLoggedDirectories, dubiousOwnershipWarnedDirectories, transientGitIdentityReuseLoggedDirectories, execFileSyncForIdentity, nowMs = () => Date.now(), ProjectIdentityError;
+var GIT_TIMEOUT_MS = 5000, TRANSIENT_FAILURE_COOLDOWN_MS, identityCache, linkedGitWorktreeCache, lastKnownGitIdentityCache, directoryFallbackCache, transientFailureCooldown, dubiousOwnershipFallbackDirectories, dubiousOwnershipLoggedDirectories, dubiousOwnershipWarnedDirectories, transientGitIdentityReuseLoggedDirectories, execFileSyncForIdentity, nowMs = () => Date.now(), ProjectIdentityError;
 var init_project_identity = __esm(() => {
   init_logger();
   TRANSIENT_FAILURE_COOLDOWN_MS = 5 * 60 * 1000;
   identityCache = new Map;
+  linkedGitWorktreeCache = new Map;
   lastKnownGitIdentityCache = new Map;
   directoryFallbackCache = new Map;
   transientFailureCooldown = new Map;
@@ -33731,6 +33837,7 @@ class SubcModuleTransport {
     return error51;
   }
   async beforeDeadline(operation, deadlineMs, detail) {
+    operation.catch(() => {});
     const remainingMs = deadlineMs - Date.now();
     if (remainingMs <= 0)
       throw this.deadlineError(detail);
@@ -34145,12 +34252,14 @@ import { execFileSync as execFileSync4 } from "node:child_process";
 import { readFileSync as readFileSync12 } from "node:fs";
 function isPidAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0)
-    return false;
+    return "dead";
+  if (rpcIdentityPlatform === "win32")
+    return readWindowsProcess(pid).state;
   try {
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    return err.code === "EPERM";
+    rpcIdentityProcessKill(pid, 0);
+    return "alive";
+  } catch (error51) {
+    return error51.code === "ESRCH" ? "dead" : "inconclusive";
   }
 }
 function parseLinuxProcessStartTime(statContent, uptimeContent) {
@@ -34179,7 +34288,8 @@ function readPsProcessStartTime(pid) {
   try {
     const output = rpcIdentityExecFileSync("ps", ["-p", String(pid), "-o", "lstart="], {
       encoding: "utf8",
-      timeout: PS_PROBE_TIMEOUT_MS
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
     });
     const processStartTime = Date.parse(String(output).trim());
     return Number.isFinite(processStartTime) ? processStartTime : null;
@@ -34187,6 +34297,70 @@ function readPsProcessStartTime(pid) {
     return null;
   }
 }
+function parseCsvLine(line) {
+  const fields = [];
+  let field = "";
+  let quoted = false;
+  for (let index = 0;index < line.length; index += 1) {
+    const character = line[index];
+    if (character === '"') {
+      if (quoted && line[index + 1] === '"') {
+        field += '"';
+        index += 1;
+      } else {
+        quoted = !quoted;
+      }
+    } else if (character === "," && !quoted) {
+      fields.push(field);
+      field = "";
+    } else {
+      field += character;
+    }
+  }
+  if (quoted)
+    return null;
+  fields.push(field);
+  return fields;
+}
+function parseTasklistOutput(output) {
+  const entries = [];
+  let sawHeader = false;
+  for (const rawLine of output.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line)
+      continue;
+    if (TASKLIST_NO_TASKS_PATTERN.test(line))
+      return [];
+    const fields = parseCsvLine(line);
+    if (!fields)
+      continue;
+    if (fields[1]?.trim().toLowerCase() === "pid") {
+      sawHeader = true;
+      continue;
+    }
+    const pid = Number(fields[1]);
+    if (!Number.isInteger(pid) || pid <= 0 || !fields[0])
+      continue;
+    entries.push({ pid, command: fields[0] });
+  }
+  return entries.length > 0 || sawHeader ? entries : null;
+}
+function readWindowsProcess(pid) {
+  try {
+    const output = rpcIdentityExecFileSync("tasklist", ["/FO", "CSV", "/FI", `PID eq ${pid}`], {
+      encoding: "utf8",
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const entries = parseTasklistOutput(String(output));
+    if (entries === null)
+      return { state: "inconclusive" };
+    const process3 = entries.find((entry) => entry.pid === pid);
+    return process3 ? { state: "alive", command: process3.command } : { state: "dead" };
+  } catch {
+    return { state: "inconclusive" };
+  }
+}
 function readLinuxProcessCommand(pid) {
   try {
     return String(rpcIdentityReadFileSync(`/proc/${pid}/cmdline`, "utf8"));
@@ -34198,40 +34372,86 @@ function readPsProcessCommand(pid) {
   try {
     const output = rpcIdentityExecFileSync("ps", ["-p", String(pid), "-o", "command="], {
       encoding: "utf8",
-      timeout: PS_PROBE_TIMEOUT_MS
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
     });
     return String(output);
   } catch {
     return null;
   }
 }
+function readProcessCommand(pid) {
+  if (!Number.isInteger(pid) || pid <= 0)
+    return null;
+  return rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(pid) : rpcIdentityPlatform === "win32" ? readWindowsProcess(pid).command ?? null : readPsProcessCommand(pid);
+}
+function executableName(token) {
+  return (token ?? "").replace(/^['"]|['"]$/g, "").split("/").at(-1) ?? "";
+}
+function commandTokens(command) {
+  return command.toLowerCase().replaceAll("\\", "/").replaceAll("\x00", " ").split(/\s+/).map((token) => token.replace(/^['"]|['"]$/g, "")).filter(Boolean);
+}
+function commandHasOpenCodeExecutable(tokens) {
+  return tokens.findIndex((token) => {
+    const executable = executableName(token).replace(/\.(?:exe|cmd)$/, "");
+    return executable === "opencode" || executable.endsWith("/opencode");
+  });
+}
+function commandHasPiExecutable(tokens) {
+  for (let index = 0;index < tokens.length; index += 1) {
+    const executable = executableName(tokens[index]).replace(/\.(?:exe|cmd)$/, "");
+    if (["pi", "omp", "oh-my-pi"].includes(executable))
+      return true;
+    if (["node", "bun", "deno"].includes(executable)) {
+      const script = executableName(tokens[index + 1]).replace(/\.(?:exe|cmd)$/, "");
+      if (["pi", "pi.js", "pi.mjs", "pi.cjs"].includes(script) || tokens[index + 1]?.includes("pi-coding-agent")) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function classifyProcessKind(command) {
+  if (!command)
+    return "process";
+  const tokens = commandTokens(command);
+  const openCodeIndex = commandHasOpenCodeExecutable(tokens);
+  if (openCodeIndex >= 0) {
+    const args = tokens.slice(openCodeIndex + 1);
+    if (args.some((token) => token === "serve" || token === "--serve" || token.startsWith("--serve="))) {
+      return "OpenCode server";
+    }
+    return "OpenCode instance (TUI/CLI)";
+  }
+  return commandHasPiExecutable(tokens) ? "Pi" : "process";
+}
 function commandLooksLikeOpenCode(command) {
   const normalized = command.toLowerCase();
   return OPEN_CODE_COMMAND_MARKERS.some((marker) => normalized.includes(marker));
 }
 function isPidIdentityPlausible(record2) {
   if (!Number.isInteger(record2.pid) || record2.pid <= 0)
-    return false;
+    return "implausible";
   if (Number.isFinite(record2.started_at) && record2.started_at > 0) {
-    const processStartTime = rpcIdentityPlatform === "linux" ? readLinuxProcessStartTime(record2.pid) : readPsProcessStartTime(record2.pid);
+    const processStartTime = rpcIdentityPlatform === "linux" ? readLinuxProcessStartTime(record2.pid) : rpcIdentityPlatform === "win32" ? null : readPsProcessStartTime(record2.pid);
     if (processStartTime === null)
-      return true;
-    return processStartTime <= record2.started_at + RPC_IDENTITY_SKEW_TOLERANCE_MS;
+      return "inconclusive";
+    return processStartTime <= record2.started_at + RPC_IDENTITY_SKEW_TOLERANCE_MS ? "plausible" : "implausible";
   }
-  const command = rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(record2.pid) : readPsProcessCommand(record2.pid);
+  const command = rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(record2.pid) : rpcIdentityPlatform === "win32" ? readWindowsProcess(record2.pid).command ?? null : readPsProcessCommand(record2.pid);
   if (command === null)
-    return true;
-  return commandLooksLikeOpenCode(command);
+    return "inconclusive";
+  return commandLooksLikeOpenCode(command) ? "plausible" : "implausible";
 }
 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$/, "");
+  const executableName2 = (token) => (token ?? "").split("/").at(-1) ?? "";
+  const first = executableName2(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]);
+    const script = executableName2(tokens[1]);
     return ["pi", "pi.js", "pi.mjs", "pi.cjs"].includes(script) || normalized.includes("pi-coding-agent");
   }
   return false;
@@ -34239,20 +34459,39 @@ function commandLooksLikePi(command) {
 function inspectLivePiProcesses() {
   if (false) {}
   try {
-    const output = String(rpcProcessListExecFileSync("ps", ["-axo", "pid=,command="], {
+    const isWindows = rpcIdentityPlatform === "win32";
+    const output = String(rpcProcessListExecFileSync(isWindows ? "tasklist" : "ps", isWindows ? ["/FO", "CSV"] : ["-axo", "pid=,command="], {
       encoding: "utf8",
-      timeout: PS_PROBE_TIMEOUT_MS
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
     }));
     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);
+    if (isWindows) {
+      const entries = parseTasklistOutput(output);
+      if (entries === null) {
+        return {
+          state: "unreadable",
+          processIds: [],
+          error: "tasklist output unavailable"
+        };
+      }
+      for (const entry of entries) {
+        if (entry.pid === process.pid)
+          continue;
+        if (commandLooksLikePi(entry.command))
+          pids.add(entry.pid);
+      }
+    } else {
+      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) {
@@ -34282,6 +34521,8 @@ function parseRpcPortFile(content, fallbackPid = 0) {
         port: port2,
         pid,
         started_at: Number.isFinite(startedAt) ? startedAt : 0,
+        kind: typeof parsed.kind === "string" ? parsed.kind : undefined,
+        harness: typeof parsed.harness === "string" ? parsed.harness : undefined,
         token: typeof parsed.token === "string" ? parsed.token : undefined,
         instance_id: typeof parsed.instance_id === "string" ? parsed.instance_id : undefined
       };
@@ -34297,11 +34538,13 @@ 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, rpcProcessListExecFileSync, 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, TASKLIST_NO_TASKS_PATTERN, rpcIdentityReadFileSync, rpcIdentityExecFileSync, rpcIdentityProcessKill, rpcProcessListExecFileSync, rpcIdentityPlatform, rpcIdentityNowMs = () => Date.now();
 var init_rpc_utils = __esm(() => {
   OPEN_CODE_COMMAND_MARKERS = ["opencode", "node", "bun", "electron"];
+  TASKLIST_NO_TASKS_PATTERN = /^INFO:\s+No tasks are running which match the specified criteria\.?$/im;
   rpcIdentityReadFileSync = readFileSync12;
   rpcIdentityExecFileSync = execFileSync4;
+  rpcIdentityProcessKill = process.kill;
   rpcProcessListExecFileSync = execFileSync4;
   rpcIdentityPlatform = process.platform;
 });
@@ -34528,6 +34771,8 @@ function healAllNullColumns(db) {
     ["stripped_placeholder_ids", ""],
     ["stale_reduce_stripped_ids", ""],
     ["processed_image_stripped_ids", ""],
+    ["merged_reasoning_stripped_ids", ""],
+    ["trailing_blank_decisions", ""],
     ["memory_block_cache", ""],
     ["memory_block_ids", ""],
     ["compaction_marker_state", ""],
@@ -34981,6 +35226,7 @@ var init_migrations = __esm(() => {
                     status TEXT NOT NULL DEFAULT 'active',
                     promoted_at INTEGER NOT NULL,
                     source_candidate_ids TEXT DEFAULT '[]',
+                    source_candidate_provenance TEXT,
                     created_at INTEGER NOT NULL,
                     updated_at INTEGER NOT NULL
                 );
@@ -36007,6 +36253,7 @@ var init_migrations = __esm(() => {
                     last_observed_at INTEGER,
                     answer_refreshed_at INTEGER,
                     source_candidate_ids TEXT NOT NULL DEFAULT '[]',
+                    source_candidate_provenance TEXT,
                     created_at INTEGER NOT NULL,
                     updated_at INTEGER NOT NULL
                 );
@@ -36816,6 +37063,37 @@ var init_migrations = __esm(() => {
         ensureColumn(db, "notes", "compiled_at", "INTEGER");
         ensureColumn(db, "notes", "compile_status", "TEXT CHECK(compile_status IN ('compiled', 'plain', 'refused'))");
       }
+    },
+    {
+      version: 77,
+      description: "persist scoped provenance for promoted user memories and primers",
+      up(db) {
+        if (tableExists(db, "user_memories")) {
+          ensureColumn(db, "user_memories", "source_candidate_provenance", "TEXT");
+        }
+        if (tableExists(db, "primers")) {
+          ensureColumn(db, "primers", "source_candidate_provenance", "TEXT");
+        }
+      }
+    },
+    {
+      version: 78,
+      description: "add migration_pending journal for crash-safe cross-harness session migration",
+      up(db) {
+        db.exec(`
+                CREATE TABLE IF NOT EXISTS migration_pending (
+                    migration_key TEXT PRIMARY KEY,
+                    source_session_id TEXT NOT NULL,
+                    target_harness TEXT NOT NULL,
+                    pi_session_id TEXT NOT NULL,
+                    final_path TEXT NOT NULL,
+                    stage_path TEXT NOT NULL,
+                    content_sha256 TEXT NOT NULL,
+                    phase TEXT NOT NULL CHECK (phase IN ('staged', 'db_committed')),
+                    created_at INTEGER NOT NULL
+                );
+            `);
+      }
     }
   ];
   LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m3) => Math.max(max, m3.version), 0);
@@ -36859,7 +37137,7 @@ import {
   statSync as statSync7,
   unlinkSync as unlinkSync2
 } from "node:fs";
-import { basename as basename3, dirname as dirname10, join as join14 } from "node:path";
+import { basename as basename3, dirname as dirname10, join as join14, resolve as resolve5 } from "node:path";
 function getPersistedSchemaVersion(db) {
   const hasMigrationsTable = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'schema_migrations'").get();
   if (!hasMigrationsTable) {
@@ -36891,6 +37169,28 @@ function invalidDiscoveryReason(raw) {
   }
   return "parse-invalid";
 }
+function classifyDiscoveryRecordKind(record2) {
+  for (const value of [record2.kind, record2.harness]) {
+    const normalized = value?.trim().toLowerCase();
+    if (!normalized)
+      continue;
+    if (normalized === "process")
+      return "process";
+    if (normalized === "opencode server" || normalized === "server") {
+      return "OpenCode server";
+    }
+    if (normalized === "opencode instance" || normalized === "opencode instance (tui/cli)" || normalized === "opencode" || normalized === "tui" || normalized === "cli") {
+      return "OpenCode instance (TUI/CLI)";
+    }
+    if (normalized === "pi" || normalized === "pi harness" || normalized === "omp" || normalized === "oh-my-pi") {
+      return "Pi";
+    }
+  }
+  return null;
+}
+function classifyRpcProcess(record2) {
+  return classifyDiscoveryRecordKind(record2) ?? classifyProcessKind(readProcessCommand(record2.pid));
+}
 function classifyJunkDiscovery(portFile, raw, staleFiles) {
   let mtimeMs;
   try {
@@ -36943,7 +37243,9 @@ function inspectRpcServerDiscovery(storageDir) {
     return { state: "absent", serverPids: [], staleFiles: [] };
   }
   const pids = new Set;
+  const processByPid = new Map;
   const staleFiles = [];
+  const inconclusivePids = new Set;
   for (const portFile of portFiles) {
     let raw;
     try {
@@ -36963,10 +37265,23 @@ function inspectRpcServerDiscovery(storageDir) {
         return junk;
       continue;
     }
-    if (isPidAlive(record2.pid) && isPidIdentityPlausible(record2))
+    const liveness = isPidAlive(record2.pid);
+    const identity = liveness === "dead" ? "implausible" : isPidIdentityPlausible(record2);
+    if (liveness === "alive" && identity === "plausible") {
       pids.add(record2.pid);
-    else
+      const detected = {
+        kind: classifyRpcProcess(record2),
+        pid: record2.pid
+      };
+      const previous = processByPid.get(record2.pid);
+      if (!previous || previous.kind === "process" && detected.kind !== "process") {
+        processByPid.set(record2.pid, detected);
+      }
+    } else if (liveness === "dead" || identity === "implausible") {
       staleFiles.push(portFile);
+    } else {
+      inconclusivePids.add(record2.pid);
+    }
   }
   for (const staleFile of staleFiles) {
     try {
@@ -36977,14 +37292,28 @@ function inspectRpcServerDiscovery(storageDir) {
   }
   const serverPids = [...pids].sort((a3, b2) => a3 - b2);
   if (serverPids.length > 0) {
-    return { state: "live", serverPids, staleFiles };
+    return {
+      state: "live",
+      serverPids,
+      serverProcesses: serverPids.map((pid) => processByPid.get(pid) ?? { kind: "process", pid }),
+      staleFiles
+    };
+  }
+  const uncertainPids = [...inconclusivePids].sort((a3, b2) => a3 - b2);
+  if (uncertainPids.length > 0) {
+    return {
+      state: "inconclusive",
+      serverPids: [],
+      staleFiles,
+      inconclusivePids: uncertainPids
+    };
   }
   return { state: "stale", serverPids: [], staleFiles };
 }
 function getLiveMigrationBlockingProcesses(storageDir) {
   const discovery = inspectRpcServerDiscovery(storageDir);
-  const openCode = discovery.state === "live" ? discovery.serverPids.map((pid) => ({ harness: "OpenCode server", pid })) : [];
-  const pi = discoverLivePiProcessIds().map((pid) => ({ harness: "Pi harness", pid }));
+  const openCode = discovery.state === "live" ? discovery.serverProcesses ?? [] : [];
+  const pi = discoverLivePiProcessIds().map((pid) => ({ kind: "Pi", pid }));
   return [...openCode, ...pi];
 }
 function applySqliteTuningPragmas(db) {
@@ -37163,6 +37492,7 @@ function initializeDatabase(db) {
       last_observed_at INTEGER,
       answer_refreshed_at INTEGER,
       source_candidate_ids TEXT NOT NULL DEFAULT '[]',
+      source_candidate_provenance TEXT,
       created_at INTEGER NOT NULL,
       updated_at INTEGER NOT NULL
     );
@@ -37798,6 +38128,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "primer_candidates", "question_embedding", "BLOB");
   ensureColumn(db, "primer_candidates", "question_embedding_model_id", "TEXT");
   ensureColumn(db, "primers", "question_embedding_model_id", "TEXT");
+  ensureColumn(db, "primers", "source_candidate_provenance", "TEXT");
+  const hasUserMemoriesTable = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'user_memories'").get();
+  if (hasUserMemoriesTable) {
+    ensureColumn(db, "user_memories", "source_candidate_provenance", "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);
@@ -37871,6 +38206,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   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, "session_meta", "merged_reasoning_stripped_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "trailing_blank_decisions", "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");
@@ -38089,7 +38426,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   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 databases, pendingAsyncOpens, persistenceByDatabase, persistenceErrorByDatabase, pathByDatabase, LATEST_SUPPORTED_VERSION = 78, PERMISSIONS_ENFORCEABLE, RPC_DISCOVERY_PARSE_GRACE_MS, defaultRpcDiscoveryFs, rpcDiscoveryFs, sqlitePragmaConfig, CHANNEL2_CLAIM_TTL_MS;
 var init_storage_db = __esm(async () => {
   init_data_path();
   init_logger();
@@ -38119,6 +38456,7 @@ var init_storage_db = __esm(async () => {
     cacheSizeMb: 64,
     mmapSizeMb: 0
   };
+  CHANNEL2_CLAIM_TTL_MS = 10 * 60000;
 });
 
 // src/lib/database-access.ts
@@ -38224,8 +38562,44 @@ var init_database_access = __esm(async () => {
 var exports_doctor_authority = {};
 __export(exports_doctor_authority, {
   runDoctorDrainAuthority: () => runDoctorDrainAuthority,
-  reportAuthorityMarkers: () => reportAuthorityMarkers
+  reportAuthorityMarkers: () => reportAuthorityMarkers,
+  authorityDrainCommand: () => authorityDrainCommand,
+  assertProjectsUseTsAuthority: () => assertProjectsUseTsAuthority
 });
+function authorityDrainCommand(project) {
+  return `magic-context doctor drain-authority ${project.projectRoot ?? `<${project.role} project root>`}`;
+}
+async function assertProjectsUseTsAuthority(args) {
+  const markers = listAuthorityManagedMarkers(args.db);
+  const markerByProject = new Map(markers.map((marker) => [marker.project_path, marker]));
+  for (const project of args.projects) {
+    const marker = markerByProject.get(project.projectPath);
+    if (!marker)
+      continue;
+    const projectRoot = project.projectRoot;
+    if (!projectRoot) {
+      throw new Error(`Migration refused: durable module authority for ${project.role} project ${project.projectPath} cannot be checked because its project directory is unavailable. ` + `Writes remain fenced. Drain it first: ${authorityDrainCommand(project)}`);
+    }
+    let statuses;
+    try {
+      statuses = await Promise.all(AUTHORITY_DOMAINS.map((domain2) => args.module.authorityStatus({
+        context_store_uuid: marker.context_store_uuid,
+        project: project.projectPath,
+        projectRoot,
+        domain: domain2
+      })));
+    } catch (error51) {
+      throw new Error(`Migration refused: module unreachable while checking ${project.role} project ${project.projectPath}; writes remain fenced. ` + `Drain it first: ${authorityDrainCommand(project)}. ` + `Module error: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    }
+    for (const [index, status] of statuses.entries()) {
+      const state = status.authority?.state ?? "TS";
+      if (state === "TS")
+        continue;
+      throw new Error(`Migration refused: ${project.role} project ${project.projectPath} has ${AUTHORITY_DOMAINS[index]} authority in ${state} mode; writes remain fenced. ` + `Drain it first: ${authorityDrainCommand(project)}`);
+    }
+  }
+  return { markers };
+}
 function authorityClient(transport, projectRoot) {
   return {
     authorityStatus: (request) => transport.authorityStatus({ ...request, projectRoot }),
@@ -38258,12 +38632,12 @@ async function reportAuthorityMarkers(args) {
     }
     try {
       const module = authorityClient(transport, process.cwd());
-      const statuses = await Promise.all(DOMAINS.map((domain2) => module.authorityStatus({
+      const statuses = await Promise.all(AUTHORITY_DOMAINS.map((domain2) => module.authorityStatus({
         context_store_uuid: ensureContextStoreUuid(args.db),
         project: marker.project_path,
         domain: domain2
       })));
-      args.info(`  ${marker.project_path}: ${statuses.map((status, index) => `${DOMAINS[index]}=${status.authority?.state ?? "TS"}`).join(", ")}`);
+      args.info(`  ${marker.project_path}: ${statuses.map((status, index) => `${AUTHORITY_DOMAINS[index]}=${status.authority?.state ?? "TS"}`).join(", ")}`);
     } catch {
       args.warn(`  ${marker.project_path}: module unreachable — writes fenced; run with rust mode or restore subc connectivity`);
     }
@@ -38283,7 +38657,7 @@ async function runDoctorDrainAuthority(projectRoot, dbPath) {
     }
     const module = authorityClient(new SubcModuleTransport, projectRoot);
     let drainedAny = false;
-    for (const domain2 of DOMAINS) {
+    for (const domain2 of AUTHORITY_DOMAINS) {
       const status = await module.authorityStatus({
         context_store_uuid: ensureContextStoreUuid(db),
         project: projectPath,
@@ -38327,7 +38701,6 @@ async function runDoctorDrainAuthority(projectRoot, dbPath) {
     db.close();
   }
 }
-var DOMAINS;
 var init_doctor_authority = __esm(async () => {
   init_project_identity();
   init_storage_project_state();
@@ -38336,7 +38709,6 @@ var init_doctor_authority = __esm(async () => {
     init_context_authority(),
     init_database_access()
   ]);
-  DOMAINS = ["memories", "notes"];
 });
 
 // ../plugin/src/features/magic-context/storage-identity-merge.ts
@@ -39005,7 +39377,7 @@ function printHelp() {
 }
 async function runRepairDb(options = {}) {
   const prompts = options.prompts ?? promptIO;
-  const deps = { ...DEFAULT_DEPS, ...options.deps };
+  const deps = { ...DEFAULT_DEPS3, ...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());
@@ -39175,7 +39547,7 @@ async function runRepairDbCli(args, options = {}) {
   }
   return runRepairDb(options);
 }
-var ROW_COUNT_TABLES, DATABASE_SUFFIXES, RECOGNIZABLE_TABLES, REPAIR_DB_EXIT, DEFAULT_DEPS, RECOVER_UNAVAILABLE_PATTERNS;
+var ROW_COUNT_TABLES, DATABASE_SUFFIXES, RECOGNIZABLE_TABLES, REPAIR_DB_EXIT, DEFAULT_DEPS3, RECOVER_UNAVAILABLE_PATTERNS;
 var init_doctor_repair_db = __esm(async () => {
   init_migrations();
   init_data_path();
@@ -39195,7 +39567,7 @@ var init_doctor_repair_db = __esm(async () => {
     unsalvageable: 2,
     refused: 3
   };
-  DEFAULT_DEPS = {
+  DEFAULT_DEPS3 = {
     now: () => new Date,
     sqliteExecutable: defaultSqliteExecutable(),
     inspectHolders: defaultInspectHolders
@@ -39225,17 +39597,20 @@ var init_migration_paths = () => {};
 // src/commands/migrate.ts
 var exports_migrate = {};
 __export(exports_migrate, {
+  sweepPendingMigrations: () => sweepPendingMigrations,
   runMigrateCli: () => runMigrateCli,
   projectPathToPiDirSlug: () => projectPathToPiDirSlug,
   printMigrateHelp: () => printMigrateHelp,
   parseMigrateArgs: () => parseMigrateArgs,
+  migrationKeyFor: () => migrationKeyFor,
   migrateOpenCodeSessionToPi: () => migrateOpenCodeSessionToPi,
   generateUuidV7: () => generateUuidV7,
-  formatPiFilenameTimestamp: () => formatPiFilenameTimestamp
+  formatPiFilenameTimestamp: () => formatPiFilenameTimestamp,
+  formatMigrationSweepLines: () => formatMigrationSweepLines
 });
-import { randomBytes as randomBytes2 } from "node:crypto";
-import { unlinkSync as unlinkSync3 } from "node:fs";
-import { join as join18 } from "node:path";
+import { createHash as createHash3, randomBytes as randomBytes2 } from "node:crypto";
+import { existsSync as existsSync21, mkdirSync as mkdirSync8, renameSync as renameSync4, unlinkSync as unlinkSync3 } from "node:fs";
+import { dirname as dirname12, join as join18 } from "node:path";
 function defaultOpenCodeDbPath() {
   return getOpenCodeDatabasePath();
 }
@@ -39246,7 +39621,7 @@ function defaultPiSessionsRoot() {
   return getPiSessionsRoot();
 }
 function defaultFs() {
-  return { writeFileAtomic, unlinkSync: unlinkSync3 };
+  return { writeFileAtomic, unlinkSync: unlinkSync3, existsSync: existsSync21, renameSync: renameSync4, mkdirSync: mkdirSync8 };
 }
 function stmt(db, sql) {
   return db.prepare(sql);
@@ -39272,6 +39647,74 @@ function generateUuidV7(date5 = new Date) {
 function shortId() {
   return randomBytes2(4).toString("hex");
 }
+function migrationKeyFor(sourceSessionId, targetHarness) {
+  return createHash3("sha256").update(`${sourceSessionId}
+${targetHarness}`).digest("hex");
+}
+function hasMigrationJournal(db) {
+  return Boolean(stmt(db, "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'migration_pending'").get());
+}
+function sweepPendingMigrations(db, fs3 = defaultFs()) {
+  const report = {
+    completed: 0,
+    rolledForward: 0,
+    rolledBack: 0,
+    lost: []
+  };
+  if (!hasMigrationJournal(db))
+    return report;
+  const rows = stmt(db, `SELECT migration_key, source_session_id, target_harness, pi_session_id,
+               final_path, stage_path, content_sha256, phase, created_at
+          FROM migration_pending
+      ORDER BY created_at ASC`).all();
+  for (const row of rows) {
+    if (fs3.existsSync(row.final_path)) {
+      stmt(db, "DELETE FROM migration_pending WHERE migration_key = ?").run(row.migration_key);
+      report.completed += 1;
+      continue;
+    }
+    if (row.phase === "db_committed") {
+      if (fs3.existsSync(row.stage_path)) {
+        fs3.mkdirSync(dirname12(row.final_path), { recursive: true });
+        fs3.renameSync(row.stage_path, row.final_path);
+        stmt(db, "DELETE FROM migration_pending WHERE migration_key = ?").run(row.migration_key);
+        report.rolledForward += 1;
+      } else {
+        report.lost.push(row);
+      }
+      continue;
+    }
+    try {
+      fs3.unlinkSync(row.stage_path);
+    } catch {}
+    stmt(db, "DELETE FROM migration_pending WHERE migration_key = ?").run(row.migration_key);
+    report.rolledBack += 1;
+  }
+  return report;
+}
+function readPendingMigration(db, migrationKey) {
+  return stmt(db, JOURNAL_SELECT_SQL).get(migrationKey);
+}
+function claimJournalIdentity(args) {
+  const existing = readPendingMigration(args.db, args.migrationKey);
+  if (existing) {
+    return { row: existing, resumed: true };
+  }
+  const piSessionId = generateUuidV7(new Date(args.now));
+  stmt(args.db, `INSERT INTO migration_pending (
+             migration_key, source_session_id, target_harness, pi_session_id,
+             final_path, stage_path, content_sha256, phase, created_at
+         ) VALUES (?, ?, ?, ?, ?, ?, '', 'staged', ?)
+         ON CONFLICT(migration_key) DO NOTHING`).run(args.migrationKey, args.sourceSessionId, args.targetHarness, piSessionId, args.finalPathFor(piSessionId), join18(args.stageDir, `${args.migrationKey}.jsonl`), args.now);
+  const row = readPendingMigration(args.db, args.migrationKey);
+  if (!row) {
+    throw new Error("migration journal row disappeared during insert; aborting migration");
+  }
+  return { row, resumed: row.pi_session_id !== piSessionId };
+}
+function commitStagedChecksum(db, migrationKey, contentSha256) {
+  stmt(db, "UPDATE migration_pending SET content_sha256 = ? WHERE migration_key = ?").run(contentSha256, migrationKey);
+}
 function parseJsonObject(text3) {
   const parsed = JSON.parse(text3);
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
@@ -39431,7 +39874,7 @@ function convertPartToEntries(ctx) {
   }
 }
 function buildPiEntries(params) {
-  const sessionUuid = generateUuidV7(params.now);
+  const sessionUuid = params.piSessionId;
   const nowIso = params.now.toISOString();
   const entries = [
     {
@@ -39467,6 +39910,7 @@ The following conversation was migrated from a different harness. Reasoning cont
     list.push(part);
     partsByMessage.set(part.message_id, list);
   }
+  const messageIdToFirstPiEntryId = new Map;
   const messageIdToLastPiEntryId = new Map;
   const orderedSourceMessageIds = [];
   let parentId = boundary.id;
@@ -39477,6 +39921,7 @@ The following conversation was migrated from a different harness. Reasoning cont
     const timestamp2 = isoFromMs(message.time_created, params.now);
     const tokens = tokensFromMessage(message);
     const usage = tokensToPiUsage(tokens);
+    let firstEntryIdForMessage = null;
     let lastEntryIdForMessage = null;
     for (const part of partsByMessage.get(message.id) ?? []) {
       const newEntries = convertPartToEntries({
@@ -39491,10 +39936,13 @@ The following conversation was migrated from a different harness. Reasoning cont
           entry.parentId = parentId;
         entries.push(entry);
         parentId = entry.id;
+        if (firstEntryIdForMessage === null)
+          firstEntryIdForMessage = parentId;
         lastEntryIdForMessage = parentId;
       }
     }
-    if (lastEntryIdForMessage !== null) {
+    if (lastEntryIdForMessage !== null && firstEntryIdForMessage !== null) {
+      messageIdToFirstPiEntryId.set(message.id, firstEntryIdForMessage);
       messageIdToLastPiEntryId.set(message.id, lastEntryIdForMessage);
       orderedSourceMessageIds.push(message.id);
     }
@@ -39502,6 +39950,7 @@ The following conversation was migrated from a different harness. Reasoning cont
   return {
     entries,
     piSessionId: sessionUuid,
+    messageIdToFirstPiEntryId,
     messageIdToLastPiEntryId,
     orderedSourceMessageIds
   };
@@ -39539,8 +39988,9 @@ function fetchRows(db, sessionId, maxMessages) {
     throw error51;
   }
 }
-function remapBoundaryId(openCodeMessageId, messageIdToLastPiEntryId, orderedSourceMessageIds) {
-  const direct = messageIdToLastPiEntryId.get(openCodeMessageId);
+function remapBoundaryId(openCodeMessageId, edge, messageIdToFirstPiEntryId, messageIdToLastPiEntryId, orderedSourceMessageIds) {
+  const directMap = edge === "start" ? messageIdToFirstPiEntryId : messageIdToLastPiEntryId;
+  const direct = directMap.get(openCodeMessageId);
   if (direct !== undefined)
     return { piEntryId: direct, exact: true };
   let nearestAtOrBefore;
@@ -39601,8 +40051,8 @@ function copyMagicContextState(args) {
   let boundariesApproximated = 0;
   const remappedCompartments = [];
   for (const c3 of sourceCompartments) {
-    const startRemap = remapBoundaryId(c3.start_message_id, args.messageIdToLastPiEntryId, args.orderedSourceMessageIds);
-    const endRemap = remapBoundaryId(c3.end_message_id, args.messageIdToLastPiEntryId, args.orderedSourceMessageIds);
+    const startRemap = remapBoundaryId(c3.start_message_id, "start", args.messageIdToFirstPiEntryId, args.messageIdToLastPiEntryId, args.orderedSourceMessageIds);
+    const endRemap = remapBoundaryId(c3.end_message_id, "end", args.messageIdToFirstPiEntryId, args.messageIdToLastPiEntryId, args.orderedSourceMessageIds);
     if (!startRemap || !endRemap)
       continue;
     if (!startRemap.exact || !endRemap.exact)
@@ -39631,9 +40081,9 @@ function copyMagicContextState(args) {
     lastCompartmentEndPiEntryId: remappedCompartments.at(-1)?.end_message_id
   };
   if (args.dryRun) {
-    return { ...result, commit: () => {} };
+    return { ...result, remappedCompartments, commit: () => {} };
   }
-  const commit = () => {
+  const commit = (journalKey) => {
     const insertCompartment = stmt(args.cortexkitDb, `INSERT INTO compartments (
        session_id, sequence, start_message, end_message,
        start_message_id, end_message_id, title, content,
@@ -39645,19 +40095,72 @@ function copyMagicContextState(args) {
      ) VALUES (?, ?, ?, ?, ?, 'pi')`);
     args.cortexkitDb.exec("BEGIN IMMEDIATE");
     try {
+      stmt(args.cortexkitDb, "DELETE FROM compartments WHERE session_id = ? AND harness = 'pi'").run(args.piSessionId);
+      stmt(args.cortexkitDb, "DELETE FROM session_facts WHERE session_id = ? AND harness = 'pi'").run(args.piSessionId);
       for (const c3 of remappedCompartments) {
         insertCompartment.run(args.piSessionId, c3.sequence, c3.start_message, c3.end_message, c3.start_message_id, c3.end_message_id, c3.title, c3.content, c3.p1, c3.p2, c3.p3, c3.p4, typeof c3.importance === "number" ? c3.importance : 50, c3.episode_type, c3.legacy, args.now);
       }
       for (const f2 of sourceFacts) {
         insertFact.run(args.piSessionId, f2.category, f2.content, f2.created_at, f2.updated_at);
       }
+      if (journalKey !== undefined) {
+        stmt(args.cortexkitDb, "UPDATE migration_pending SET phase = 'db_committed' WHERE migration_key = ?").run(journalKey);
+      }
       args.cortexkitDb.exec("COMMIT");
     } catch (error51) {
       args.cortexkitDb.exec("ROLLBACK");
       throw error51;
     }
   };
-  return { ...result, commit };
+  return { ...result, remappedCompartments, commit };
+}
+function derivePiRuntimeOrdinals(entries) {
+  const ordinalByEntryId = new Map;
+  let nextOrdinal = 1;
+  const pendingToolResultIds = [];
+  const foldPendingInto = (ordinal) => {
+    for (const id of pendingToolResultIds)
+      ordinalByEntryId.set(id, ordinal);
+    pendingToolResultIds.length = 0;
+  };
+  for (const entry of entries) {
+    const message = entry.message;
+    if (entry.type !== "message" || typeof entry.id !== "string" || message === null || typeof message !== "object") {
+      continue;
+    }
+    const role = message.role;
+    if (role === "toolResult") {
+      pendingToolResultIds.push(entry.id);
+      continue;
+    }
+    if (role === "assistant" && pendingToolResultIds.length > 0) {
+      foldPendingInto(nextOrdinal);
+      nextOrdinal += 1;
+    }
+    const ordinal = nextOrdinal;
+    nextOrdinal += 1;
+    if (role === "user" && pendingToolResultIds.length > 0) {
+      foldPendingInto(ordinal);
+    }
+    ordinalByEntryId.set(entry.id, ordinal);
+  }
+  if (pendingToolResultIds.length > 0) {
+    foldPendingInto(nextOrdinal);
+  }
+  return ordinalByEntryId;
+}
+function applyRuntimeOrdinals(remappedCompartments, entries) {
+  const ordinals = derivePiRuntimeOrdinals(entries);
+  for (const compartment of remappedCompartments) {
+    const startOrdinal = ordinals.get(compartment.start_message_id);
+    const endOrdinal = ordinals.get(compartment.end_message_id);
+    if (startOrdinal === undefined || endOrdinal === undefined) {
+      const missing = startOrdinal === undefined ? compartment.start_message_id : compartment.end_message_id;
+      throw new Error(`Migration boundary entry ${missing} has no runtime ordinal; migrator invariant violated`);
+    }
+    compartment.start_message = startOrdinal;
+    compartment.end_message = endOrdinal;
+  }
 }
 function ensureValidOptions(opts) {
   if (!opts.from)
@@ -39707,52 +40210,88 @@ function migrateOpenCodeSessionToPi(opts) {
     const modelId = opts.modelId ?? model.modelId;
     const cwd = session.directory ?? session.path ?? process.cwd();
     const outputDir = join18(piSessionsRoot, projectPathToPiDirSlug(cwd));
+    const targetHarness = opts.targetHarness ?? "pi";
+    const journalActive = cortexkitDb !== null && !opts.dryRun;
+    let recovery;
+    let migrationKey;
+    let journalResumed = false;
+    let piSessionId;
+    let finalPath;
+    let stagePath;
+    if (journalActive && cortexkitDb !== null) {
+      if (!hasMigrationJournal(cortexkitDb)) {
+        throw new Error("context.db has no migration_pending journal (shared schema older than v78). Run a harness session once so the plugin can upgrade the schema, then retry doctor migrate.");
+      }
+      recovery = sweepPendingMigrations(cortexkitDb, fs3);
+      migrationKey = migrationKeyFor(session.id, targetHarness);
+      const claimed = claimJournalIdentity({
+        db: cortexkitDb,
+        migrationKey,
+        sourceSessionId: session.id,
+        targetHarness,
+        finalPathFor: (id) => join18(outputDir, `${formatPiFilenameTimestamp(now)}_${id}.jsonl`),
+        stageDir: join18(dirname12(piSessionsRoot), MIGRATION_STAGE_DIRNAME),
+        now: now.getTime()
+      });
+      piSessionId = claimed.row.pi_session_id;
+      finalPath = claimed.row.final_path;
+      stagePath = claimed.row.stage_path;
+      journalResumed = claimed.resumed;
+    } else {
+      piSessionId = generateUuidV7(now);
+      finalPath = join18(outputDir, `${formatPiFilenameTimestamp(now)}_${piSessionId}.jsonl`);
+      stagePath = "";
+    }
     const buildResult = buildPiEntries({
       session,
       messages,
       parts,
       now,
       provider,
-      modelId
+      modelId,
+      piSessionId
     });
     let copyResult = {
       compartmentsCopied: 0,
       factsCopied: 0,
       boundariesApproximated: 0
     };
-    let commitMagicContextState = null;
+    let plan = null;
     if (cortexkitDb !== null) {
-      const plan = copyMagicContextState({
+      plan = copyMagicContextState({
         cortexkitDb,
         sourceSessionId: session.id,
-        piSessionId: buildResult.piSessionId,
+        piSessionId,
+        messageIdToFirstPiEntryId: buildResult.messageIdToFirstPiEntryId,
         messageIdToLastPiEntryId: buildResult.messageIdToLastPiEntryId,
         orderedSourceMessageIds: buildResult.orderedSourceMessageIds,
         now: now.getTime(),
         dryRun: Boolean(opts.dryRun)
       });
       copyResult = plan;
-      commitMagicContextState = plan.commit;
     }
     const compactionMarker = insertCompactionMarker(buildResult.entries, copyResult.lastCompartmentEndPiEntryId);
-    const outputPath = join18(outputDir, `${formatPiFilenameTimestamp(now)}_${buildResult.piSessionId}.jsonl`);
+    if (plan)
+      applyRuntimeOrdinals(plan.remappedCompartments, buildResult.entries);
     const jsonl = `${buildResult.entries.map((entry) => JSON.stringify(entry)).join(`
 `)}
 `;
     if (!opts.dryRun) {
-      fs3.writeFileAtomic(outputPath, jsonl);
-      try {
-        commitMagicContextState?.();
-      } catch (commitError) {
-        try {
-          fs3.unlinkSync(outputPath);
-        } catch {}
-        throw commitError;
+      if (journalActive && cortexkitDb !== null && migrationKey !== undefined && plan) {
+        const contentSha256 = createHash3("sha256").update(jsonl, "utf8").digest("hex");
+        commitStagedChecksum(cortexkitDb, migrationKey, contentSha256);
+        fs3.writeFileAtomic(stagePath, jsonl);
+        plan.commit(migrationKey);
+        fs3.mkdirSync(dirname12(finalPath), { recursive: true });
+        fs3.renameSync(stagePath, finalPath);
+        stmt(cortexkitDb, "DELETE FROM migration_pending WHERE migration_key = ?").run(migrationKey);
+      } else {
+        fs3.writeFileAtomic(finalPath, jsonl);
       }
     }
     return {
-      outputPath,
-      piSessionId: buildResult.piSessionId,
+      outputPath: finalPath,
+      piSessionId,
       messageCount: buildResult.entries.length - 2,
       byteCount: Buffer.byteLength(jsonl, "utf8"),
       sourceMessageCount,
@@ -39762,6 +40301,9 @@ function migrateOpenCodeSessionToPi(opts) {
       compactionMarkerWritten: compactionMarker.written,
       compactionBoundaryEntryId: compactionMarker.boundaryEntryId,
       compactionFirstKeptEntryId: compactionMarker.firstKeptEntryId,
+      ...migrationKey !== undefined ? { migrationKey } : {},
+      ...journalActive ? { journalResumed } : {},
+      ...recovery !== undefined ? { recovery } : {},
       ...cortexkitSchemaVersionBefore !== null && cortexkitDb !== null ? {
         cortexkitSchemaVersionBefore,
         cortexkitSchemaVersionAfter: getPersistedSchemaVersion2(cortexkitDb)
@@ -39828,9 +40370,32 @@ function printMigrateHelp() {
     - compartments + session_facts are copied to the new Pi session_id;
       compartment boundary message IDs are remapped to the corresponding
       Pi entry IDs (nearest-at-or-before for boundaries that don't have
-      a direct message-level Pi entry)
+      a direct message-level Pi entry), and compartment start/end ordinals
+      are recomputed in the ordinal basis the Pi runtime reader produces
+
+  Crash safety:
+    - each migration is tracked in the shared DB's migration_pending journal
+      and staged outside the sessions tree; an interrupted run is reconciled
+      by phase on the next 'doctor migrate' or plain 'doctor' run, reusing the
+      original Pi session id instead of minting a second one
 `);
 }
+function formatMigrationSweepLines(report) {
+  const lines = [];
+  if (report.rolledForward > 0) {
+    lines.push(`Recovered ${report.rolledForward} interrupted session migration(s) by completing the staged file rename.`);
+  }
+  if (report.rolledBack > 0) {
+    lines.push(`Rolled back ${report.rolledBack} incomplete session migration(s) that never committed shared state.`);
+  }
+  if (report.completed > 0) {
+    lines.push(`Cleared ${report.completed} finished session-migration journal row(s).`);
+  }
+  for (const row of report.lost) {
+    lines.push(`LOST session migration content: source ${row.source_session_id} → ${row.target_harness} session ${row.pi_session_id}; expected file ${row.final_path} (sha256 ${row.content_sha256}). Re-run doctor migrate for this session to rebuild it.`);
+  }
+  return lines;
+}
 async function runMigrateCli(args) {
   try {
     const parsed = parseMigrateArgs(args);
@@ -39840,8 +40405,14 @@ async function runMigrateCli(args) {
       sessionId: parsed.session,
       maxMessages: parsed.maxMessages,
       dryRun: parsed.dryRun,
-      piSessionsRoot: parsed.to === "omp" ? getOmpSessionsRoot() : undefined
+      piSessionsRoot: parsed.to === "omp" ? getOmpSessionsRoot() : undefined,
+      targetHarness: parsed.to === "omp" ? "omp" : "pi"
     });
+    if (result.recovery) {
+      for (const line of formatMigrationSweepLines(result.recovery)) {
+        console.log(line);
+      }
+    }
     const action = result.dryRun ? "Would write" : "Wrote";
     console.log(`${action} ${target} session JSONL:`);
     console.log(`  path: ${result.outputPath}`);
@@ -39858,6 +40429,9 @@ async function runMigrateCli(args) {
     if (result.boundariesApproximated > 0) {
       console.log(`  boundaries approximated: ${result.boundariesApproximated} (nearest-at-or-before)`);
     }
+    if (result.migrationKey !== undefined) {
+      console.log(`  journal: ${result.migrationKey.slice(0, 12)}…${result.journalResumed ? " (resumed interrupted attempt)" : ""}`);
+    }
     if (!result.dryRun) {
       console.log(`${target} may need to be restarted to pick up the new session file.`);
       if (result.cortexkitSchemaVersionBefore !== undefined) {
@@ -39875,7 +40449,9 @@ async function runMigrateCli(args) {
     return 1;
   }
 }
-var DEFAULT_PROVIDER = "openai-codex", DEFAULT_MODEL = "gpt-5.5", MIGRATION_COMPACTION_SUMMARY = "Magic Context compacted prior conversation. See <session-history> block for the structured summary.", PART_LOOKUP_CHUNK_SIZE = 900;
+var DEFAULT_PROVIDER = "openai-codex", DEFAULT_MODEL = "gpt-5.5", MIGRATION_COMPACTION_SUMMARY = "Magic Context compacted prior conversation. See <session-history> block for the structured summary.", PART_LOOKUP_CHUNK_SIZE = 900, MIGRATION_STAGE_DIRNAME = ".mc-migrations", JOURNAL_SELECT_SQL = `SELECT migration_key, source_session_id, target_harness, pi_session_id,
+               final_path, stage_path, content_sha256, phase, created_at
+          FROM migration_pending WHERE migration_key = ?`;
 var init_migrate = __esm(async () => {
   init_data_path();
   init_atomic_write();
@@ -39979,15 +40555,72 @@ var exports_migrate_session = {};
 __export(exports_migrate_session, {
   runMigrateSessionCli: () => runMigrateSessionCli,
   planMigrateSession: () => planMigrateSession,
+  assertMigrateSessionIsSafeToRehome: () => assertMigrateSessionIsSafeToRehome,
   applyMigrateSession: () => applyMigrateSession
 });
-import { existsSync as existsSync21, realpathSync as realpathSync4 } from "node:fs";
+import { existsSync as existsSync22, realpathSync as realpathSync4 } from "node:fs";
 import { homedir as homedir13 } from "node:os";
 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"));
 }
+function isModuleCacheStatePresent(status) {
+  if (!status || typeof status !== "object")
+    return false;
+  const rowVersion = status.row_version;
+  return typeof rowVersion === "number";
+}
+function drainCommandsForMarkers(markers, projects) {
+  const byProject = new Map(projects.map((project) => [project.projectPath, project]));
+  return [
+    ...new Set(markers.map((marker) => authorityDrainCommand(byProject.get(marker.project_path) ?? {
+      role: "marked",
+      projectPath: marker.project_path,
+      projectRoot: null
+    })))
+  ].join("; ");
+}
+async function assertMigrateSessionIsSafeToRehome(args) {
+  const projects = [
+    {
+      role: "source",
+      projectPath: args.plan.fromMcIdentity,
+      projectRoot: args.plan.currentDirectory
+    },
+    {
+      role: "target",
+      projectPath: args.plan.toMcIdentity,
+      projectRoot: args.plan.targetDirectory
+    }
+  ];
+  const authority = await assertProjectsUseTsAuthority({
+    db: args.contextDb,
+    projects,
+    module: args.module
+  });
+  let sessionStatus;
+  try {
+    sessionStatus = await args.module.sessionStatus({
+      sessionId: args.plan.sessionId,
+      projectRoot: args.plan.currentDirectory ?? args.plan.targetDirectory
+    });
+  } catch (error51) {
+    const message = error51 instanceof Error ? error51.message : String(error51);
+    if (authority.markers.length === 0) {
+      return {
+        warnings: [
+          `Module session-cache state was not checked because the module is unreachable: ${message}. No durable authority markers exist, so continuing for this pure-TypeScript installation.`
+        ]
+      };
+    }
+    throw new Error("Migration refused: module session-cache state is unreachable while durable authority markers exist; writes remain fenced. " + `Drain marked projects first: ${drainCommandsForMarkers(authority.markers, projects)}. ` + `Module error: ${message}`);
+  }
+  if (isModuleCacheStatePresent(sessionStatus)) {
+    throw new Error(`Migration refused: the module still holds transform cache state for session ${args.plan.sessionId}. ` + "Use TypeScript transform mode for the session's project, or run `ck session delete` after preserving any needed state, then re-run this migration.");
+  }
+  return { warnings: [] };
+}
 function planMigrateSession(sessionId, rawTargetDirectory, deps) {
   const sessionRow = deps.opencodeDb.prepare("SELECT id, directory FROM session WHERE id = ?").get(sessionId);
   if (!sessionRow) {
@@ -40144,7 +40777,7 @@ function realDeps(opencodeDb, contextDb) {
     opencodeDb,
     contextDb,
     resolveIdentity: resolveProjectIdentity,
-    hasGitDir: (dir) => existsSync21(join19(dir, ".git")),
+    hasGitDir: (dir) => existsSync22(join19(dir, ".git")),
     realpath: (p2) => realpathSync4(p2)
   };
 }
@@ -40223,7 +40856,7 @@ async function runMigrateSessionCli(args) {
     return 1;
   }
   const expandedTo = toDir.startsWith("~") ? join19(homedir13(), toDir.slice(1).replace(/^[/\\]/, "")) : toDir;
-  if (!existsSync21(expandedTo)) {
+  if (!existsSync22(expandedTo)) {
     console.error(`Target directory does not exist: ${expandedTo}`);
     return 1;
   }
@@ -40249,6 +40882,27 @@ async function runMigrateSessionCli(args) {
     } catch {}
     const deps = realDeps(opencodeDb, contextDb);
     const plan = planMigrateSession(sessionId, expandedTo, deps);
+    const transport = new SubcModuleTransport;
+    const safety = await assertMigrateSessionIsSafeToRehome({
+      plan,
+      contextDb,
+      module: {
+        authorityStatus: (request) => transport.authorityStatus(request),
+        sessionStatus: ({ sessionId: statusSessionId, projectRoot }) => transport.call({
+          sessionId: statusSessionId,
+          projectRoot,
+          method: "session.status",
+          body: {
+            method: "session.status",
+            v: 1,
+            session_id: statusSessionId
+          }
+        })
+      }
+    });
+    for (const warning of safety.warnings) {
+      promptIO.log.warn(warning);
+    }
     promptIO.note([
       `session:        ${plan.sessionId}`,
       `from:           ${plan.currentDirectory ?? "(unknown)"}`,
@@ -40332,10 +40986,14 @@ var init_migrate_session = __esm(async () => {
   init_project_identity();
   init_relocate_memory();
   init_storage_project_state();
+  init_module_transport();
   init_data_path();
   init_migration_paths();
   init_prompts();
-  await init_database_access();
+  await __promiseAll([
+    init_database_access(),
+    init_doctor_authority()
+  ]);
   VALID_MEMORY_ACTIONS = new Set([
     "move-all",
     "move-originated",
@@ -40346,7 +41004,7 @@ var init_migrate_session = __esm(async () => {
 });
 
 // ../plugin/src/features/magic-context/v22-deferred-backfill.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 import { realpathSync as realpathSync5 } from "node:fs";
 import path5 from "node:path";
 function readMeta(db, key) {
@@ -40395,7 +41053,7 @@ function computeLegacyRustDirIdentity(rawProjectPath) {
   } catch {
     canonical = path5.isAbsolute(rawProjectPath) ? rawProjectPath : path5.join(process.cwd(), rawProjectPath);
   }
-  return `dir:${createHash3("sha256").update(canonical, "utf8").digest("hex")}`;
+  return `dir:${createHash4("sha256").update(canonical, "utf8").digest("hex")}`;
 }
 function upsertRekeyMap(db, oldProjectPath, newProjectPath, rekeyedAt) {
   db.prepare(`INSERT INTO v22_identity_rekey_map (old_project_path, new_project_path, rekeyed_at)
@@ -40580,7 +41238,7 @@ var init_v22_backfill_commands = __esm(async () => {
 });
 
 // ../pi-plugin/src/config/index.ts
-import { existsSync as existsSync22, readFileSync as readFileSync14 } from "node:fs";
+import { existsSync as existsSync23, readFileSync as readFileSync14 } from "node:fs";
 function getProjectConfigPaths(cwd) {
   const basePath = cortexKitProjectConfigBasePath(cwd);
   return [`${basePath}.jsonc`, `${basePath}.json`];
@@ -40590,10 +41248,10 @@ function getUserConfigPaths() {
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path6) => existsSync22(path6));
+  return paths.find((path6) => existsSync23(path6));
 }
 function resolvePiLegacyFallback(sources) {
-  return sources.find((source) => existsSync22(source.path)) ?? null;
+  return sources.find((source) => existsSync23(source.path)) ?? null;
 }
 function loadConfigFile(path6, scope) {
   try {
@@ -40750,7 +41408,7 @@ function loadPiConfig(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync22(source.path));
+  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync23(source.path));
   const userPath = resolveFirstExisting(getUserConfigPaths());
   const userLegacyFallback = userPath ? null : resolvePiLegacyFallback(harnessLegacy.user);
   const userReadPath = userPath ?? userLegacyFallback?.path;
@@ -40759,7 +41417,7 @@ function loadPiConfig(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync22(source.path));
+  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync23(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) {
@@ -40803,6 +41461,7 @@ function loadPiConfig(opts = {}) {
   }
   const parsed = parsePiConfig(rawConfig);
   setOutputReserveConfig(parsed.config.output_reserve);
+  setWindowOverlayPath(parsed.config.models?.window_overlay_path);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
   return {
     config: parsed.config,
@@ -40821,6 +41480,7 @@ var init_config2 = __esm(() => {
   init_variable();
   init_jsonc_parser();
   init_models_dev_cache();
+  init_window_geometry();
   import_comment_json7 = __toESM(require_src3(), 1);
 });
 
@@ -41040,9 +41700,9 @@ var init_redaction2 = __esm(() => {
 
 // src/commands/doctor-omp.ts
 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 { existsSync as existsSync24, mkdirSync as mkdirSync9, 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";
+import { dirname as dirname13, join as join20, resolve as resolve6 } 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;
@@ -41084,7 +41744,7 @@ function selfVersion() {
   return "unknown";
 }
 function readConfig2(path6) {
-  if (!existsSync23(path6))
+  if (!existsSync24(path6))
     return {};
   try {
     const parsed = import_comment_json8.parse(readFileSync15(path6, "utf-8"));
@@ -41168,8 +41828,8 @@ async function runHealthChecks(options) {
     if (!reportedAgentDir.ok) {
       add(results, "warn", "Could not verify OMP active agent directory");
     } else {
-      const reportedPath = resolve5(reportedAgentDir.stdout);
-      const expectedPath = resolve5(getOmpAgentDir());
+      const reportedPath = resolve6(reportedAgentDir.stdout);
+      const expectedPath = resolve6(getOmpAgentDir());
       if (reportedPath === expectedPath) {
         add(results, "pass", `OMP agent directory resolved to ${getOmpAgentDir()}`);
       } else {
@@ -41178,7 +41838,7 @@ async function runHealthChecks(options) {
     }
   }
   const userConfigPath = getOmpUserConfigPath();
-  if (!existsSync23(userConfigPath)) {
+  if (!existsSync24(userConfigPath)) {
     add(results, "warn", `No Magic Context user config at ${userConfigPath}`);
     repairPlan.writeUserConfig = true;
   } else {
@@ -41195,7 +41855,7 @@ async function runHealthChecks(options) {
     for (const warning of loaded.warnings.slice(0, 5))
       add(results, "warn", warning);
   const dbPath = join20(getMagicContextStorageDir(), "context.db");
-  if (!existsSync23(dbPath))
+  if (!existsSync24(dbPath))
     add(results, "info", `Shared context DB will be created at ${dbPath}`);
   else {
     let db = null;
@@ -41224,7 +41884,7 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
     add(results, "info", `OMP non-global config: ${source}`);
   }
   const logPath = getMagicContextLogPath2("pi");
-  add(results, "info", `Pi-compatible runtime log: ${logPath}${existsSync23(logPath) ? "" : " (not created yet)"}`);
+  add(results, "info", `Pi-compatible runtime log: ${logPath}${existsSync24(logPath) ? "" : " (not created yet)"}`);
   if (!options.quiet)
     for (const result of results)
       printResult(options.prompts, result);
@@ -41237,7 +41897,7 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
   };
 }
 function writeDefaultConfig(path6) {
-  mkdirSync8(dirname12(path6), { recursive: true });
+  mkdirSync9(dirname13(path6), { recursive: true });
   const config2 = {
     $schema: "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json",
     ...MagicContextConfigSchema.parse({})
@@ -41247,7 +41907,7 @@ function writeDefaultConfig(path6) {
 }
 async function repair(plan, deps, prompts, cwd) {
   let fixed = 0;
-  if (plan.writeUserConfig && !existsSync23(getOmpUserConfigPath())) {
+  if (plan.writeUserConfig && !existsSync24(getOmpUserConfigPath())) {
     writeDefaultConfig(getOmpUserConfigPath());
     prompts.log.success(`Wrote default Magic Context config to ${getOmpUserConfigPath()}`);
     fixed += 1;
@@ -41341,8 +42001,8 @@ async function runIssueFlow(options) {
 }
 async function runDoctor(options = {}) {
   const deps = {
-    ...DEFAULT_DEPS2,
-    prompts: options.prompts ?? DEFAULT_DEPS2.prompts,
+    ...DEFAULT_DEPS4,
+    prompts: options.prompts ?? DEFAULT_DEPS4.prompts,
     ...options.deps
   };
   const prompts = options.prompts ?? deps.prompts;
@@ -41368,7 +42028,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_DEPS2;
+var import_comment_json8, MIN_OMP_VERSION = "17.1.7", DEFAULT_DEPS4;
 var init_doctor_omp = __esm(async () => {
   init_magic_context();
   init_data_path();
@@ -41382,7 +42042,7 @@ var init_doctor_omp = __esm(async () => {
   init_redaction2();
   await init_database_access();
   import_comment_json8 = __toESM(require_src3(), 1);
-  DEFAULT_DEPS2 = {
+  DEFAULT_DEPS4 = {
     prompts: promptIO,
     detectOmpBinary,
     getOmpVersion,
@@ -41510,14 +42170,14 @@ var DEFAULT_TIMEOUT_MS = 1e4, MAX_PREVIEW_CHARS = 240;
 // ../plugin/src/shared/tui-config.ts
 import {
   chmodSync as chmodSync4,
-  existsSync as existsSync24,
-  mkdirSync as mkdirSync9,
+  existsSync as existsSync25,
+  mkdirSync as mkdirSync10,
   readFileSync as readFileSync16,
-  renameSync as renameSync4,
+  renameSync as renameSync5,
   statSync as statSync9,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { dirname as dirname13, join as join21 } from "node:path";
+import { dirname as dirname14, join as join21 } from "node:path";
 function pluginEntryId(entry) {
   if (typeof entry === "string")
     return entry;
@@ -41554,15 +42214,15 @@ function writeTuiConfigAtomic(configPath, config2) {
       chmodSync4(tmpPath, statSync9(configPath).mode & 511);
     }
   } catch {}
-  renameSync4(tmpPath, configPath);
+  renameSync5(tmpPath, configPath);
 }
 function resolveTuiConfigPath(configDirOverride) {
   const configDir = configDirOverride ?? getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
   const jsoncPath = join21(configDir, "tui.jsonc");
   const jsonPath = join21(configDir, "tui.json");
-  if (existsSync24(jsoncPath))
+  if (existsSync25(jsoncPath))
     return jsoncPath;
-  if (existsSync24(jsonPath))
+  if (existsSync25(jsonPath))
     return jsonPath;
   return jsoncPath;
 }
@@ -41570,7 +42230,7 @@ function ensureTuiPluginEntry(options = {}) {
   try {
     const configPath = resolveTuiConfigPath(options.configDir);
     let config2 = {};
-    if (existsSync24(configPath)) {
+    if (existsSync25(configPath)) {
       const raw = readFileSync16(configPath, "utf-8");
       config2 = import_comment_json9.parse(raw) ?? {};
     }
@@ -41605,7 +42265,7 @@ function ensureTuiPluginEntry(options = {}) {
       }
     }
     config2.plugin = plugins;
-    mkdirSync9(dirname13(configPath), { recursive: true });
+    mkdirSync10(dirname14(configPath), { recursive: true });
     writeTuiConfigAtomic(configPath, config2);
     log3(`[magic-context] updated TUI plugin entry in ${configPath}`);
     return true;
@@ -41623,7 +42283,7 @@ var init_tui_config = __esm(() => {
 });
 
 // src/lib/diagnostics-opencode.ts
-import { existsSync as existsSync25, readdirSync as readdirSync3, readFileSync as readFileSync17, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync26, 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 join22 } from "node:path";
@@ -41644,7 +42304,7 @@ function getPluginCacheInfo() {
   let cached2;
   for (const installedPkgPath of getOpenCodePluginPackageJsonPaths()) {
     try {
-      if (existsSync25(installedPkgPath)) {
+      if (existsSync26(installedPkgPath)) {
         const pkg = JSON.parse(readFileSync17(installedPkgPath, "utf-8"));
         cached2 = typeof pkg.version === "string" ? pkg.version : undefined;
         if (cached2)
@@ -41662,7 +42322,7 @@ function getStorageDir() {
 }
 function fileSize(path6) {
   try {
-    return existsSync25(path6) ? statSync10(path6).size : 0;
+    return existsSync26(path6) ? statSync10(path6).size : 0;
   } catch {
     return 0;
   }
@@ -41674,7 +42334,7 @@ function sanitizeValue(value) {
   return sanitizeConfigValue(value);
 }
 function readConfig3(path6) {
-  if (!existsSync25(path6))
+  if (!existsSync26(path6))
     return { value: null };
   try {
     const raw = readFileSync17(path6, "utf-8");
@@ -41735,7 +42395,7 @@ function parseHistorianDumpMeta(path6) {
   }
 }
 function listDumpsInDir(dir, limit) {
-  if (!existsSync25(dir))
+  if (!existsSync26(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync3(dir).filter((name) => name.endsWith(".xml")).map((name) => {
@@ -41805,7 +42465,7 @@ function collectHistorianDumps(recentSessions) {
 async function collectRecentSessions() {
   const dataHome = process.env.XDG_DATA_HOME || join22(process.env.HOME || homedir15(), ".local", "share");
   const opencodeDbPath = join22(dataHome, "opencode", "opencode.db");
-  if (!existsSync25(opencodeDbPath))
+  if (!existsSync26(opencodeDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -41840,7 +42500,7 @@ async function collectRecentSessions() {
 }
 async function collectHistorianFailures(storageDirPath) {
   const contextDbPath = join22(storageDirPath, "context.db");
-  if (!existsSync25(contextDbPath))
+  if (!existsSync26(contextDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -41874,7 +42534,7 @@ async function collectHistorianFailures(storageDirPath) {
 }
 async function collectHistorianRuns(storageDirPath) {
   const contextDbPath = join22(storageDirPath, "context.db");
-  if (!existsSync25(contextDbPath))
+  if (!existsSync26(contextDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined")
     return [];
@@ -41945,7 +42605,7 @@ async function collectDiagnostics() {
   const storageDirPath = getStorageDir();
   const contextDbPath = join22(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("opencode");
-  const logFileSize = existsSync25(logPath) ? statSync10(logPath).size : 0;
+  const logFileSize = existsSync26(logPath) ? statSync10(logPath).size : 0;
   let compactionEnabled = false;
   try {
     compactionEnabled = isCompactionEnabled(loadPluginConfig(process.cwd()));
@@ -41973,14 +42633,14 @@ async function collectDiagnostics() {
     opencodeConfigHasPlugin: configHasPluginEntry(opencodeConfig.value),
     tuiConfigHasPlugin: configHasPluginEntry(tuiConfig.value),
     magicContextConfig: {
-      exists: existsSync25(configPaths.magicContextConfig),
+      exists: existsSync26(configPaths.magicContextConfig),
       ...magicContextConfig.error ? { parseError: magicContextConfig.error } : {},
       flags: sanitizeValue(magicContextConfig.value ?? {}) ?? {}
     },
     pluginCache: getPluginCacheInfo(),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync25(storageDirPath),
+      exists: existsSync26(storageDirPath),
       contextDbSizeBytes: fileSize(contextDbPath)
     },
     conflicts: {
@@ -41991,7 +42651,7 @@ async function collectDiagnostics() {
     },
     logFile: {
       path: logPath,
-      exists: existsSync25(logPath),
+      exists: existsSync26(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -42144,9 +42804,9 @@ var init_diagnostics_opencode = __esm(() => {
 
 // src/lib/embedding-runtime.ts
 import { spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync26 } from "node:fs";
+import { existsSync as existsSync27 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
-import { dirname as dirname14, join as join23, sep } from "node:path";
+import { dirname as dirname15, 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;
@@ -42259,7 +42919,7 @@ function expectedBinaryRelPath(platform, arch) {
 }
 function checkLocalEmbeddingRuntimeAt(installRoot, platform = process.platform, arch = process.arch) {
   const packageDir = join23(installRoot, "node_modules", "onnxruntime-node");
-  if (!existsSync26(join23(packageDir, "package.json"))) {
+  if (!existsSync27(join23(packageDir, "package.json"))) {
     return { state: "package-missing", packageDir };
   }
   const rel = expectedBinaryRelPath(platform, arch);
@@ -42267,13 +42927,13 @@ function checkLocalEmbeddingRuntimeAt(installRoot, platform = process.platform,
     return probeOnnxRuntimeNodeLoad(packageDir) ?? { state: "ok", binaryPath: packageDir };
   }
   const binaryPath = join23(packageDir, rel);
-  if (!existsSync26(binaryPath)) {
+  if (!existsSync27(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) => existsSync26(root));
+  const existing = installRoots.filter((root) => existsSync27(root));
   if (existing.length === 0) {
     return {
       state: "unknown",
@@ -42293,10 +42953,10 @@ 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) : dirname14(resolvedPath);
+  return idx >= 0 ? resolvedPath.slice(0, idx + marker.length) : dirname15(resolvedPath);
 }
 function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.platform, arch = process.arch) {
-  if (!existsSync26(join23(pluginDir, "package.json"))) {
+  if (!existsSync27(join23(pluginDir, "package.json"))) {
     return { state: "unknown", reason: "plugin package dir not found" };
   }
   let onnxDir = null;
@@ -42332,7 +42992,7 @@ function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.pl
     return probeOnnxRuntimeNodeLoad(onnxDir) ?? { state: "ok", binaryPath: onnxDir };
   }
   const binaryPath = join23(onnxDir, rel);
-  if (!existsSync26(binaryPath)) {
+  if (!existsSync27(binaryPath)) {
     return { state: "binary-missing", packageDir: onnxDir, expectedBinary: binaryPath };
   }
   return probeOnnxRuntimeNodeLoad(onnxDir) ?? { state: "ok", binaryPath };
@@ -42818,25 +43478,391 @@ function migrateExperimentalPinKeyFilesForDoctor(mcConfig) {
   return true;
 }
 
+// ../plugin/src/hooks/auto-update-checker/constants.ts
+import { homedir as homedir16, platform } from "node:os";
+import { join as join25 } from "node:path";
+function getOpenCodeCacheRoot() {
+  if (platform() === "win32") {
+    return join25(process.env.LOCALAPPDATA ?? homedir16(), "opencode");
+  }
+  return join25(homedir16(), ".cache", "opencode");
+}
+function getOpenCodeConfigRoot() {
+  if (platform() === "win32") {
+    return join25(process.env.APPDATA ?? join25(homedir16(), "AppData", "Roaming"), "opencode");
+  }
+  return join25(process.env.XDG_CONFIG_HOME ?? join25(homedir16(), ".config"), "opencode");
+}
+var PACKAGE_NAME = "@cortexkit/opencode-magic-context", CACHE_DIR, USER_OPENCODE_CONFIG, USER_OPENCODE_CONFIG_JSONC;
+var init_constants2 = __esm(() => {
+  CACHE_DIR = join25(getOpenCodeCacheRoot(), "packages");
+  USER_OPENCODE_CONFIG = join25(getOpenCodeConfigRoot(), "opencode.json");
+  USER_OPENCODE_CONFIG_JSONC = join25(getOpenCodeConfigRoot(), "opencode.jsonc");
+});
+// ../plugin/src/hooks/auto-update-checker/types.ts
+var NpmPackageEnvelopeSchema, OpencodePluginTupleSchema, OpencodeConfigSchema, PackageJsonSchema;
+var init_types = __esm(() => {
+  init_zod();
+  NpmPackageEnvelopeSchema = exports_external.object({
+    "dist-tags": exports_external.record(exports_external.string(), exports_external.string()).optional().default({})
+  });
+  OpencodePluginTupleSchema = exports_external.tuple([exports_external.string(), exports_external.record(exports_external.string(), exports_external.unknown())]);
+  OpencodeConfigSchema = exports_external.object({
+    plugin: exports_external.array(exports_external.union([exports_external.string(), OpencodePluginTupleSchema])).optional()
+  });
+  PackageJsonSchema = exports_external.object({
+    name: exports_external.string().optional(),
+    version: exports_external.string().optional(),
+    dependencies: exports_external.record(exports_external.string(), exports_external.string()).optional()
+  }).passthrough();
+});
+
+// ../plugin/src/hooks/auto-update-checker/checker.ts
+import {
+  accessSync as accessSync2,
+  existsSync as existsSync28,
+  constants as fsConstants,
+  readFileSync as readFileSync19,
+  renameSync as renameSync6,
+  statSync as statSync11,
+  writeFileSync as writeFileSync8
+} from "node:fs";
+import { dirname as dirname16, isAbsolute as isAbsolute4, join as join26, resolve as resolve7 } from "node:path";
+function warn(message) {
+  log3(`WARN: ${message}`);
+}
+function isString(value) {
+  return typeof value === "string";
+}
+function pluginSpecifier(entry) {
+  return typeof entry === "string" ? entry : entry[0];
+}
+function getPluginEntries(config2) {
+  const parsed = OpencodeConfigSchema.safeParse(config2);
+  if (!parsed.success)
+    return [];
+  return (parsed.data.plugin ?? []).map(pluginSpecifier).filter(isString);
+}
+function parseJsonConfig(content) {
+  try {
+    return import_comment_json11.parse(content);
+  } catch (err) {
+    warn(`[auto-update-checker] Failed to parse OpenCode config: ${String(err)}`);
+    return null;
+  }
+}
+function getSurfaceConfigPaths(directory, surface) {
+  const name = surface === "server" ? "opencode" : "tui";
+  const globalDir = dirname16(USER_OPENCODE_CONFIG);
+  const dirs = [
+    globalDir,
+    directory,
+    join26(directory, ".opencode"),
+    process.env.OPENCODE_CONFIG_DIR
+  ].filter((value) => Boolean(value));
+  const paths = [];
+  for (const dir of dirs) {
+    for (const extension of ["json", "jsonc"]) {
+      const path6 = join26(dir, `${name}.${extension}`);
+      if (!paths.includes(path6))
+        paths.push(path6);
+    }
+  }
+  return paths;
+}
+function getWinningConfig(directory, surface) {
+  let winner = null;
+  for (const path6 of getSurfaceConfigPaths(directory, surface)) {
+    try {
+      if (!existsSync28(path6))
+        continue;
+      const parsed = parseJsonConfig(readFileSync19(path6, "utf-8"));
+      const entries = getPluginEntries(parsed);
+      if (entries.some((entry) => entry === PACKAGE_NAME || entry.startsWith(`${PACKAGE_NAME}@`))) {
+        if (winner) {
+          log3(`[auto-update-checker] ${surface} config ${winner.path} is shadowed by ${path6}`);
+        }
+        winner = { path: path6, entries };
+      }
+    } catch {}
+  }
+  return winner;
+}
+function findPluginEntry(directory, surface = "server") {
+  const winner = getWinningConfig(directory, surface);
+  if (!winner)
+    return null;
+  const entry = winner.entries.find((value) => value === PACKAGE_NAME || value.startsWith(`${PACKAGE_NAME}@`));
+  if (!entry)
+    return null;
+  const pinnedVersion = entry.startsWith(`${PACKAGE_NAME}@`) ? entry.slice(PACKAGE_NAME.length + 1) : null;
+  return {
+    entry,
+    isPinned: pinnedVersion !== null && pinnedVersion !== "latest",
+    pinnedVersion: pinnedVersion && pinnedVersion !== "latest" ? pinnedVersion : null,
+    configPath: winner.path
+  };
+}
+var import_comment_json11;
+var init_checker = __esm(() => {
+  init_logger();
+  init_constants2();
+  init_types();
+  import_comment_json11 = __toESM(require_src3(), 1);
+});
+
+// src/lib/opencode-plugin-schema-fence.ts
+import { existsSync as existsSync29, readdirSync as readdirSync4, readFileSync as readFileSync20 } from "node:fs";
+import { join as join27 } from "node:path";
+import { gunzipSync } from "node:zlib";
+function readPackageVersion(packageJsonPath) {
+  try {
+    if (!existsSync29(packageJsonPath))
+      return null;
+    const packageJson = JSON.parse(readFileSync20(packageJsonPath, "utf-8"));
+    if (packageJson.name !== OPENCODE_PLUGIN_NAME || typeof packageJson.version !== "string") {
+      return null;
+    }
+    return packageJson.version;
+  } catch {
+    return null;
+  }
+}
+function readFenceValue(text3) {
+  const values = new Set;
+  for (const match of text3.matchAll(FENCE_PATTERN)) {
+    const version2 = Number.parseInt(match[1] ?? "", 10);
+    if (Number.isFinite(version2))
+      values.add(version2);
+  }
+  return values.size === 1 ? [...values][0] ?? null : null;
+}
+function readFenceFromDist(packageDirectory) {
+  const distDirectory = join27(packageDirectory, "dist");
+  if (!existsSync29(distDirectory))
+    return null;
+  const pending = [distDirectory];
+  const fenceValues = new Set;
+  while (pending.length > 0) {
+    const directory = pending.pop();
+    if (!directory)
+      continue;
+    try {
+      for (const entry of readdirSync4(directory, { withFileTypes: true })) {
+        const path6 = join27(directory, entry.name);
+        if (entry.isDirectory()) {
+          pending.push(path6);
+          continue;
+        }
+        if (!entry.isFile() || !/\.(?:[cm]?js|ts)$/.test(entry.name))
+          continue;
+        const fence = readFenceValue(readFileSync20(path6, "utf-8"));
+        if (fence !== null)
+          fenceValues.add(fence);
+      }
+    } catch {
+      return null;
+    }
+  }
+  return fenceValues.size === 1 ? [...fenceValues][0] ?? null : null;
+}
+function findInstalledPluginPackage(cacheDirectory, specifier, requestedVersion) {
+  const directCacheRoot = join27(cacheDirectory, specifier);
+  const candidates = [directCacheRoot];
+  try {
+    for (const entry of readdirSync4(cacheDirectory, { withFileTypes: true })) {
+      if (!entry.isDirectory())
+        continue;
+      const candidate = join27(cacheDirectory, entry.name);
+      if (!candidates.includes(candidate))
+        candidates.push(candidate);
+    }
+  } catch {}
+  for (const cacheRoot of candidates) {
+    const directory = join27(cacheRoot, "node_modules", ...PACKAGE_PATH_SEGMENTS);
+    const version2 = readPackageVersion(join27(directory, "package.json"));
+    if (!version2)
+      continue;
+    if (cacheRoot === directCacheRoot || EXACT_VERSION_PATTERN.test(requestedVersion) && version2 === requestedVersion) {
+      return { directory, version: version2 };
+    }
+  }
+  return null;
+}
+function readTarText(bytes, offset, length) {
+  const end = Math.min(offset + length, bytes.length);
+  let nul = offset;
+  while (nul < end && bytes[nul] !== 0)
+    nul++;
+  return new TextDecoder().decode(bytes.subarray(offset, nul));
+}
+function readTarOctal(bytes, offset, length) {
+  const value = readTarText(bytes, offset, length).trim();
+  if (!/^[0-7]+$/.test(value))
+    return null;
+  const parsed = Number.parseInt(value, 8);
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function readFenceFromNpmTarball(tarball) {
+  let archive;
+  try {
+    archive = gunzipSync(tarball);
+  } catch {
+    return null;
+  }
+  const fenceValues = new Set;
+  for (let offset = 0;offset + 512 <= archive.length; ) {
+    const name = readTarText(archive, offset, 100);
+    if (!name)
+      break;
+    const prefix = readTarText(archive, offset + 345, 155);
+    const path6 = prefix ? `${prefix}/${name}` : name;
+    const size = readTarOctal(archive, offset + 124, 12);
+    if (size === null)
+      return null;
+    const contentStart = offset + 512;
+    const contentEnd = contentStart + size;
+    if (contentEnd > archive.length)
+      return null;
+    if (/^package\/dist\/.+\.(?:[cm]?js|ts)$/.test(path6)) {
+      const fence = readFenceValue(new TextDecoder().decode(archive.subarray(contentStart, contentEnd)));
+      if (fence !== null)
+        fenceValues.add(fence);
+    }
+    offset = contentStart + Math.ceil(size / 512) * 512;
+  }
+  return fenceValues.size === 1 ? [...fenceValues][0] ?? null : null;
+}
+function npmPackageVersionUrl(version2) {
+  const packagePath = encodeURIComponent(OPENCODE_PLUGIN_NAME).replace("%2F", "/");
+  return `https://registry.npmjs.org/${packagePath}/${encodeURIComponent(version2)}`;
+}
+async function resolveFenceFromNpmTarball(requestedVersion, fetchImpl) {
+  const controller = new AbortController;
+  const timeout = setTimeout(() => controller.abort(), NPM_TIMEOUT_MS);
+  try {
+    const metadataResponse = await fetchImpl(npmPackageVersionUrl(requestedVersion), {
+      signal: controller.signal,
+      headers: { Accept: "application/json" }
+    });
+    if (!metadataResponse.ok)
+      return null;
+    const metadata = await metadataResponse.json();
+    if (typeof metadata.version !== "string" || typeof metadata.dist?.tarball !== "string") {
+      return null;
+    }
+    const tarballUrl = new URL(metadata.dist.tarball);
+    if (tarballUrl.protocol !== "https:")
+      return null;
+    const tarballResponse = await fetchImpl(tarballUrl, { signal: controller.signal });
+    if (!tarballResponse.ok)
+      return null;
+    const contentLength = Number(tarballResponse.headers.get("content-length"));
+    if (Number.isFinite(contentLength) && contentLength > MAX_TARBALL_BYTES)
+      return null;
+    const tarball = new Uint8Array(await tarballResponse.arrayBuffer());
+    if (tarball.byteLength > MAX_TARBALL_BYTES)
+      return null;
+    const supportedVersion = readFenceFromNpmTarball(tarball);
+    return supportedVersion === null ? null : { version: metadata.version, supportedVersion, source: "npm-tarball" };
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+async function resolvePluginFence(specifier, requestedVersion, deps) {
+  const installed = findInstalledPluginPackage(deps.getOpenCodePluginCacheDir(), specifier, requestedVersion);
+  if (installed) {
+    const supportedVersion = readFenceFromDist(installed.directory);
+    if (supportedVersion !== null) {
+      return { version: installed.version, supportedVersion, source: "installed" };
+    }
+  }
+  return resolveFenceFromNpmTarball(requestedVersion, deps.fetch);
+}
+async function inspectPinnedOpenCodePluginSchemaFences(options, deps = {}) {
+  const findEntry = deps.findPluginEntry ?? findPluginEntry;
+  const resolutionDeps = {
+    fetch: deps.fetch ?? globalThis.fetch,
+    getOpenCodePluginCacheDir: deps.getOpenCodePluginCacheDir ?? getOpenCodePluginCacheDir
+  };
+  const resolvedBySpecifier = new Map;
+  const findings = [];
+  for (const surface of ["server", "tui"]) {
+    const entry = findEntry(options.directory, surface);
+    if (!entry?.isPinned || !entry.pinnedVersion)
+      continue;
+    let resolved = resolvedBySpecifier.get(entry.entry);
+    if (!resolved) {
+      resolved = resolvePluginFence(entry.entry, entry.pinnedVersion, resolutionDeps);
+      resolvedBySpecifier.set(entry.entry, resolved);
+    }
+    const fence = await resolved;
+    const supportedVersion = fence?.supportedVersion ?? null;
+    findings.push({
+      status: supportedVersion === null ? "unknown" : supportedVersion < options.databaseVersion ? "fail" : "pass",
+      surface,
+      specifier: entry.entry,
+      configPath: entry.configPath,
+      pinnedVersion: fence?.version ?? entry.pinnedVersion,
+      databaseVersion: options.databaseVersion,
+      supportedVersion,
+      source: fence?.source ?? null
+    });
+  }
+  return findings;
+}
+var PACKAGE_PATH_SEGMENTS, MAX_TARBALL_BYTES, NPM_TIMEOUT_MS = 5000, FENCE_PATTERN, EXACT_VERSION_PATTERN;
+var init_opencode_plugin_schema_fence = __esm(() => {
+  init_checker();
+  init_opencode_plugin_cache();
+  init_paths();
+  PACKAGE_PATH_SEGMENTS = OPENCODE_PLUGIN_NAME.split("/");
+  MAX_TARBALL_BYTES = 25 * 1024 * 1024;
+  FENCE_PATTERN = /\bLATEST_SUPPORTED_VERSION\s*=\s*(\d+)\b/g;
+  EXACT_VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
+});
+
 // ../plugin/src/features/magic-context/fail-closed-block.ts
+function normalizeFailClosedProcessKind(process3) {
+  switch (process3.kind) {
+    case "OpenCode server":
+    case "OpenCode instance (TUI/CLI)":
+    case "Pi":
+    case "process":
+      return process3.kind;
+  }
+  switch (process3.harness?.trim().toLowerCase()) {
+    case "opencode server":
+      return "OpenCode server";
+    case "opencode instance (tui/cli)":
+    case "opencode instance":
+      return "OpenCode instance (TUI/CLI)";
+    case "pi":
+    case "pi harness":
+    case "omp":
+      return "Pi";
+    default:
+      return "process";
+  }
+}
 function formatFailClosedBlockingProcesses(processes) {
   const uniqueProcesses = new Map;
   for (const process3 of processes) {
-    if (!process3.harness.trim() || !Number.isInteger(process3.pid) || process3.pid <= 0)
+    if (!Number.isInteger(process3.pid) || process3.pid <= 0)
       continue;
-    uniqueProcesses.set(`${process3.harness}\x00${process3.pid}`, {
-      harness: process3.harness.trim(),
-      pid: process3.pid
-    });
+    const kind = normalizeFailClosedProcessKind(process3);
+    uniqueProcesses.set(`${kind}\x00${process3.pid}`, { kind, pid: process3.pid });
   }
   const entries = [...uniqueProcesses.values()];
   const visible = entries.slice(0, MAX_FORMATTED_BLOCKING_PROCESSES);
-  const rendered = visible.map(({ harness, pid }) => `${harness} (PID ${pid})`);
+  const rendered = visible.map(({ kind, pid }) => `${kind} (PID ${pid})`);
   const omitted = entries.length - visible.length;
   if (omitted > 0)
     rendered.push(`${omitted} more blocking process(es)`);
   if (rendered.length === 0)
-    return "a live harness process";
+    return "a live process";
   if (rendered.length === 1)
     return rendered[0];
   const last = rendered.pop();
@@ -42846,9 +43872,9 @@ function formatFailClosedBlockingMessage(reason) {
   if (reason.kind === "migration_guard") {
     if (reason.unreadableFile) {
       const arm = reason.unreadableArm ?? "io";
-      const recovery = arm === "io" ? `If no OpenCode server is running, it is safe to delete ${reason.unreadableFile} and retry.` : `The file may be a recent incomplete write; retry after the file is older than the ten-minute grace window, or stop OpenCode before deleting it.`;
+      const recovery = arm === "io" ? `If none of these processes are running, it is safe to delete ${reason.unreadableFile} and retry.` : `The file may be a recent incomplete write; retry after the file is older than the ten-minute grace window, or stop the relevant process before deleting it.`;
       return [
-        `Magic Context cannot migrate the shared database because RPC discovery file ${reason.unreadableFile} is uncertain (${arm} arm), so the absence of a live OpenCode server cannot be proven.`,
+        `Magic Context cannot migrate the shared database because RPC discovery file ${reason.unreadableFile} is uncertain (${arm} arm), so the absence of a live process cannot be proven.`,
         recovery,
         `Recovery: ${FAIL_CLOSED_DOCTOR_COMMAND}`
       ].join(" ");
@@ -42927,13 +43953,13 @@ var init_storage_versions = __esm(async () => {
 });
 
 // src/commands/doctor-opencode-cache.ts
-import { existsSync as existsSync27, readFileSync as readFileSync19, rmSync as rmSync3 } from "node:fs";
+import { existsSync as existsSync30, readFileSync as readFileSync21, rmSync as rmSync3 } from "node:fs";
 function readCachedPluginVersion(pluginCacheDir) {
   try {
     const installedPkgPath = getOpenCodePluginPackageJsonPath(pluginCacheDir);
-    if (!existsSync27(installedPkgPath))
+    if (!existsSync30(installedPkgPath))
       return;
-    const pkg = JSON.parse(readFileSync19(installedPkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync21(installedPkgPath, "utf-8"));
     return typeof pkg.version === "string" ? pkg.version : undefined;
   } catch {
     return;
@@ -42942,7 +43968,7 @@ function readCachedPluginVersion(pluginCacheDir) {
 async function clearPluginCache(options = {}, deps = {}) {
   const remove = deps.remove ?? ((path6) => rmSync3(path6, { recursive: true, force: true }));
   const pluginCacheRoots = getOpenCodePluginCacheRoots();
-  const existingRoots = pluginCacheRoots.filter((root) => existsSync27(root));
+  const existingRoots = pluginCacheRoots.filter((root) => existsSync30(root));
   if (existingRoots.length === 0) {
     return { action: "not_found", path: pluginCacheRoots[0] ?? "" };
   }
@@ -43010,10 +44036,10 @@ var init_doctor_opencode_cache = __esm(() => {
 
 // src/commands/doctor-opencode.ts
 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 { existsSync as existsSync31, readFileSync as readFileSync22, statSync as statSync12 } from "node:fs";
 import { createRequire as createRequire5 } from "node:module";
-import { homedir as homedir16 } from "node:os";
-import { join as join25 } from "node:path";
+import { homedir as homedir17 } from "node:os";
+import { join as join28 } from "node:path";
 function resolveCompactionEnabledForDoctor() {
   try {
     const config2 = loadPluginConfig(process.cwd());
@@ -43112,15 +44138,15 @@ function getUserNpmrcPath() {
   if (custom2)
     return custom2;
   const home = process.env.HOME?.trim();
-  return join25(home || homedir16(), ".npmrc");
+  return join28(home || homedir17(), ".npmrc");
 }
 function collectNpmReleaseAgeWarnings() {
   const ageWarnings = [];
   const npmrcPath = getUserNpmrcPath();
-  if (!existsSync28(npmrcPath))
+  if (!existsSync31(npmrcPath))
     return ageWarnings;
   try {
-    const npmrc = readFileSync20(npmrcPath, "utf-8");
+    const npmrc = readFileSync22(npmrcPath, "utf-8");
     for (const line of npmrc.split(`
 `)) {
       const trimmed = line.trim();
@@ -43259,12 +44285,12 @@ function checkLocalEmbeddingRuntimeForDoctor() {
   return { issues: 0 };
 }
 async function checkEmbeddingConfig(magicContextConfigPath) {
-  if (!existsSync28(magicContextConfigPath)) {
+  if (!existsSync31(magicContextConfigPath)) {
     return checkLocalEmbeddingRuntimeForDoctor();
   }
   let rawText;
   try {
-    rawText = readFileSync20(magicContextConfigPath, "utf-8");
+    rawText = readFileSync22(magicContextConfigPath, "utf-8");
   } catch {
     log2.warn("Could not read magic-context.jsonc for embedding check");
     return { issues: 1 };
@@ -43275,7 +44301,7 @@ async function checkEmbeddingConfig(magicContextConfigPath) {
   });
   let parsedConfig;
   try {
-    parsedConfig = import_comment_json11.parse(substituted.text);
+    parsedConfig = import_comment_json12.parse(substituted.text);
   } catch (error51) {
     log2.warn(`Embedding check skipped — could not parse magic-context.jsonc: ${error51 instanceof Error ? error51.message : String(error51)}`);
     return { issues: 1 };
@@ -43387,7 +44413,7 @@ async function runDoctor2(options = {}) {
   const v22Result = await runV22BackfillCommands({
     name: "OpenCode",
     openDatabase: (readonly2 = true) => {
-      const dbPath2 = join25(getMagicContextStorageDir(), "context.db");
+      const dbPath2 = join28(getMagicContextStorageDir(), "context.db");
       v22Db = readonly2 ? openExistingContextDatabase(dbPath2, { readonly: true }) : openExistingContextDatabaseForMutation(dbPath2);
       return v22Db;
     },
@@ -43410,7 +44436,7 @@ async function runDoctor2(options = {}) {
     log2.success(msg);
     passCount++;
   };
-  const warn = (msg) => {
+  const warn2 = (msg) => {
     log2.warn(msg);
     warnCount++;
   };
@@ -43419,17 +44445,17 @@ async function runDoctor2(options = {}) {
     failCount++;
     issues++;
   };
-  const authorityDbPath = join25(getMagicContextStorageDir(), "context.db");
+  const authorityDbPath = join28(getMagicContextStorageDir(), "context.db");
   let authorityDb = null;
   try {
     authorityDb = openExistingContextDatabase(authorityDbPath, { readonly: true });
     if (authorityDb) {
-      await reportAuthorityMarkers({ db: authorityDb, info: log2.info, warn });
+      await reportAuthorityMarkers({ db: authorityDb, info: log2.info, warn: warn2 });
     } else {
       log2.info("Authority: no context database found");
     }
   } catch (error51) {
-    warn(`Authority check unavailable: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    warn2(`Authority check unavailable: ${error51 instanceof Error ? error51.message : String(error51)}`);
   } finally {
     authorityDb?.close();
   }
@@ -43460,7 +44486,7 @@ async function runDoctor2(options = {}) {
   if (!npmLatest) {
     log2.info(`Magic Context CLI v${selfVersion2}; npm latest check unavailable`);
   } else if (compareVersions(selfVersion2, npmLatest) < 0) {
-    warn(`Magic Context CLI v${selfVersion2} is older than npm latest v${npmLatest}`);
+    warn2(`Magic Context CLI v${selfVersion2} is older than npm latest v${npmLatest}`);
   } else {
     pass(`Magic Context CLI v${selfVersion2} is current (npm latest v${npmLatest})`);
   }
@@ -43470,15 +44496,15 @@ async function runDoctor2(options = {}) {
   } else {
     pass(`OpenCode config: ${paths.opencodeConfig}`);
   }
-  if (existsSync28(paths.magicContextConfig)) {
+  if (existsSync31(paths.magicContextConfig)) {
     pass(`Magic Context config: ${paths.magicContextConfig}`);
     try {
-      const raw = readFileSync20(paths.magicContextConfig, "utf-8");
+      const raw = readFileSync22(paths.magicContextConfig, "utf-8");
       const substituted = substituteConfigVariables({
         text: raw,
         configPath: paths.magicContextConfig
       }).text;
-      import_comment_json11.parse(substituted);
+      import_comment_json12.parse(substituted);
       pass("magic-context.jsonc parses as valid JSONC");
     } catch (err) {
       fail(`magic-context.jsonc parse failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -43487,7 +44513,7 @@ async function runDoctor2(options = {}) {
       const result = loadPluginConfig(process.cwd());
       const warnings = result.configWarnings ?? [];
       if (warnings.length > 0) {
-        warn(`Magic Context config has ${warnings.length} warning(s) — see 'magic-context doctor --issue' for details`);
+        warn2(`Magic Context config has ${warnings.length} warning(s) — see 'magic-context doctor --issue' for details`);
       } else {
         pass("Magic Context config loads successfully");
       }
@@ -43495,13 +44521,13 @@ async function runDoctor2(options = {}) {
       fail(`Could not load Magic Context config: ${err instanceof Error ? err.message : String(err)}`);
     }
   } else {
-    warn(`No magic-context.jsonc found — using defaults`);
+    warn2(`No magic-context.jsonc found — using defaults`);
     log2.info("  Run 'setup' to create one with model recommendations");
   }
-  if (existsSync28(paths.magicContextConfig)) {
+  if (existsSync31(paths.magicContextConfig)) {
     try {
-      const mcRaw = readFileSync20(paths.magicContextConfig, "utf-8");
-      const mcConfig = import_comment_json11.parse(mcRaw);
+      const mcRaw = readFileSync22(paths.magicContextConfig, "utf-8");
+      const mcConfig = import_comment_json12.parse(mcRaw);
       let mcChanged = false;
       const experimental = mcConfig.experimental;
       if (experimental && "compaction_markers" in experimental) {
@@ -43609,7 +44635,7 @@ async function runDoctor2(options = {}) {
         fixed++;
       }
       if (mcChanged) {
-        writeFileAtomic(paths.magicContextConfig, `${import_comment_json11.stringify(mcConfig, null, 2)}
+        writeFileAtomic(paths.magicContextConfig, `${import_comment_json12.stringify(mcConfig, null, 2)}
 `);
       }
     } catch {
@@ -43618,12 +44644,12 @@ async function runDoctor2(options = {}) {
   }
   if (paths.opencodeConfigFormat !== "none") {
     try {
-      const raw = readFileSync20(paths.opencodeConfig, "utf-8");
-      const config2 = import_comment_json11.parse(raw);
+      const raw = readFileSync22(paths.opencodeConfig, "utf-8");
+      const config2 = import_comment_json12.parse(raw);
       const rawPlugins = Array.isArray(config2?.plugin) ? config2.plugin : [];
       const existingIdx = rawPlugins.findIndex((entry) => matchesPluginEntry(entry, OPENCODE_PLUGIN_NAME) || isDevPathPluginEntry(entry));
       if (rawPlugins.some((entry) => isLocalPathPluginEntry(entry) && String(entry).includes("magic-context") && !isDevPathPluginEntry(entry))) {
-        warn("An unverifiable local OpenCode plugin path was ignored because its package name is not Magic Context");
+        warn2("An unverifiable local OpenCode plugin path was ignored because its package name is not Magic Context");
       }
       const configName = paths.opencodeConfigFormat === "jsonc" ? "opencode.jsonc" : "opencode.json";
       const entryAsString = (entry) => {
@@ -43643,7 +44669,7 @@ async function runDoctor2(options = {}) {
         } else {
           const isPinned = isPinnedOpenCodePluginSpecifier(oldEntryStr);
           if (isPinned && !options.force) {
-            warn(`Plugin pinned to ${oldEntryStr} in ${configName} — use 'doctor --force' to upgrade`);
+            warn2(`Plugin pinned to ${oldEntryStr} in ${configName} — use 'doctor --force' to upgrade`);
           } else {
             if (Array.isArray(oldEntry) && oldEntry.length >= 1) {
               const replacement = [...oldEntry];
@@ -43653,7 +44679,7 @@ async function runDoctor2(options = {}) {
               rawPlugins[existingIdx] = OPENCODE_PLUGIN_ENTRY_WITH_VERSION;
             }
             config2.plugin = rawPlugins;
-            writeFileAtomic(paths.opencodeConfig, `${import_comment_json11.stringify(config2, null, 2)}
+            writeFileAtomic(paths.opencodeConfig, `${import_comment_json12.stringify(config2, null, 2)}
 `);
             pass(`Upgraded plugin entry in ${configName}: ${oldEntryStr} → ${OPENCODE_PLUGIN_ENTRY_WITH_VERSION}`);
             fixed++;
@@ -43662,18 +44688,19 @@ async function runDoctor2(options = {}) {
       } else {
         rawPlugins.push(OPENCODE_PLUGIN_ENTRY_WITH_VERSION);
         config2.plugin = rawPlugins;
-        writeFileAtomic(paths.opencodeConfig, `${import_comment_json11.stringify(config2, null, 2)}
+        writeFileAtomic(paths.opencodeConfig, `${import_comment_json12.stringify(config2, null, 2)}
 `);
         pass(`Added plugin to ${configName}`);
         fixed++;
       }
     } catch {
-      warn("Could not parse opencode config to verify plugin entry");
+      warn2("Could not parse opencode config to verify plugin entry");
     }
   }
   const cwd = process.cwd();
   const compactionEnabled = resolveCompactionEnabledForDoctor();
   const conflictResult = detectConflicts(cwd, { compactionEnabled });
+  log2.info("Compaction check: file-based; the running server's resolved config may differ — `opencode debug config` is authoritative");
   if (conflictResult.hasConflict) {
     for (const reason of conflictResult.reasons) {
       fail(`Conflict: ${reason}`);
@@ -43684,14 +44711,14 @@ async function runDoctor2(options = {}) {
       fixed++;
     }
     if (actions.length > 0) {
-      warn("Restart OpenCode for conflict fixes to take effect");
+      warn2("Restart OpenCode for conflict fixes to take effect");
     }
   } else {
     if (!compactionEnabled) {
       if (conflictResult.nativeCompaction.auto || conflictResult.nativeCompaction.prune) {
         pass("No conflicts detected (compaction, DCP, OMO hooks) — native compaction active (compaction-off mode)");
       } else {
-        warn("No compaction manager is active: Magic Context compaction is off and OpenCode auto-compaction is disabled");
+        warn2("No compaction manager is active: Magic Context compaction is off and OpenCode auto-compaction is disabled");
       }
     } else {
       pass("No conflicts detected (compaction, DCP, OMO hooks)");
@@ -43700,16 +44727,16 @@ async function runDoctor2(options = {}) {
   const tuiAdded = ensureTuiPluginEntry();
   if (tuiAdded) {
     pass("Added TUI sidebar plugin to tui.json");
-    warn("Restart OpenCode to see the sidebar");
+    warn2("Restart OpenCode to see the sidebar");
     fixed++;
-  } else if (existsSync28(paths.tuiConfig)) {
+  } else if (existsSync31(paths.tuiConfig)) {
     try {
-      const tuiRaw = readFileSync20(paths.tuiConfig, "utf-8");
-      const tuiConfig = import_comment_json11.parse(tuiRaw);
+      const tuiRaw = readFileSync22(paths.tuiConfig, "utf-8");
+      const tuiConfig = import_comment_json12.parse(tuiRaw);
       const tuiRawPlugins = Array.isArray(tuiConfig?.plugin) ? tuiConfig.plugin : [];
       const tuiIdx = tuiRawPlugins.findIndex((entry) => matchesPluginEntry(entry, OPENCODE_PLUGIN_NAME) || isDevPathPluginEntry(entry));
       if (tuiRawPlugins.some((entry) => isLocalPathPluginEntry(entry) && String(entry).includes("magic-context") && !isDevPathPluginEntry(entry))) {
-        warn("An unverifiable local TUI plugin path was ignored because its package name is not Magic Context");
+        warn2("An unverifiable local TUI plugin path was ignored because its package name is not Magic Context");
       }
       const tuiEntryAsString = (entry) => {
         if (typeof entry === "string")
@@ -43726,7 +44753,7 @@ async function runDoctor2(options = {}) {
         } else {
           const tuiPinned = isPinnedOpenCodePluginSpecifier(tuiEntryStr);
           if (tuiPinned && !options.force) {
-            warn(`TUI plugin pinned to ${tuiEntryStr} — use 'doctor --force' to upgrade`);
+            warn2(`TUI plugin pinned to ${tuiEntryStr} — use 'doctor --force' to upgrade`);
           } else if (tuiPinned && options.force) {
             if (Array.isArray(tuiEntry) && tuiEntry.length >= 1) {
               const replacement = [...tuiEntry];
@@ -43736,7 +44763,7 @@ async function runDoctor2(options = {}) {
               tuiRawPlugins[tuiIdx] = OPENCODE_PLUGIN_ENTRY_WITH_VERSION;
             }
             tuiConfig.plugin = tuiRawPlugins;
-            writeFileAtomic(paths.tuiConfig, `${import_comment_json11.stringify(tuiConfig, null, 2)}
+            writeFileAtomic(paths.tuiConfig, `${import_comment_json12.stringify(tuiConfig, null, 2)}
 `);
             pass(`Upgraded TUI plugin: ${tuiEntryStr} → ${OPENCODE_PLUGIN_ENTRY_WITH_VERSION}`);
             fixed++;
@@ -43753,10 +44780,10 @@ async function runDoctor2(options = {}) {
   } else {
     fail("Could not create or verify the TUI sidebar config");
   }
-  if (existsSync28(paths.magicContextConfig)) {
+  if (existsSync31(paths.magicContextConfig)) {
     try {
-      const mcRaw = readFileSync20(paths.magicContextConfig, "utf-8");
-      const mcConfig = import_comment_json11.parse(mcRaw);
+      const mcRaw = readFileSync22(paths.magicContextConfig, "utf-8");
+      const mcConfig = import_comment_json12.parse(mcRaw);
       const warning = checkUserMemoriesDreamerCompatibility(mcConfig);
       if (warning) {
         log2.warn(warning);
@@ -43772,8 +44799,8 @@ async function runDoctor2(options = {}) {
     warnCount++;
   else
     passCount++;
-  const dbPath = join25(getMagicContextStorageDir(), "context.db");
-  if (!existsSync28(dbPath)) {
+  const dbPath = join28(getMagicContextStorageDir(), "context.db");
+  if (!existsSync31(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}`);
@@ -43786,6 +44813,21 @@ async function runDoctor2(options = {}) {
         pass("Opened the shared DB with a supported schema");
         const storageVersions = readStorageVersions(db);
         log2.info(formatStorageVersions(storageVersions));
+        const pinnedPluginFenceFindings = await inspectPinnedOpenCodePluginSchemaFences({
+          directory: process.cwd(),
+          databaseVersion: storageVersions.context_db_schema_version
+        });
+        for (const finding of pinnedPluginFenceFindings) {
+          const location = `${finding.surface} entry ${finding.specifier} in ${sanitizePathString(finding.configPath)}`;
+          if (finding.status === "fail") {
+            fail(`Pinned plugin schema fence mismatch: ${location} pins plugin v${finding.pinnedVersion}, which supports through schema v${finding.supportedVersion}; shared context.db is v${finding.databaseVersion}. Recovery: unpin the entry (use @latest), or upgrade the pin to a version released after this migration that supports v${finding.databaseVersion} or later.`);
+          } else if (finding.status === "unknown") {
+            warn2(`UNKNOWN: Pinned plugin schema fence could not be resolved for ${location}; shared context.db is v${finding.databaseVersion}, so doctor cannot verify the plugin that will run. Install the pinned package and rerun doctor, or unpin/upgrade it to a version released after this migration.`);
+            issues++;
+          } else {
+            pass(`Pinned plugin schema fence: ${location} pins plugin v${finding.pinnedVersion}, which supports shared context.db v${finding.databaseVersion}.`);
+          }
+        }
         const fenceCheck = checkStorageVersionFence(storageVersions, {
           blockingProcesses: getLiveMigrationBlockingProcesses(getMagicContextStorageDir())
         });
@@ -43852,9 +44894,9 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
   } else if (cacheResult.action === "up_to_date") {
     pass(`Plugin cache up to date (v${cacheResult.cached})`);
   } else if (cacheResult.action === "check_unavailable") {
-    warn(`Plugin cache version check unavailable; preserving cached plugin${cacheResult.cached ? ` (cached: ${cacheResult.cached})` : ""}. Use doctor --force to reinstall it.`);
+    warn2(`Plugin cache version check unavailable; preserving cached plugin${cacheResult.cached ? ` (cached: ${cacheResult.cached})` : ""}. Use doctor --force to reinstall it.`);
   } else if (cacheResult.action === "error") {
-    warn(`Could not clear plugin cache: ${cacheResult.error}`);
+    warn2(`Could not clear plugin cache: ${cacheResult.error}`);
     if (cacheResult.clearedPaths && cacheResult.clearedPaths.length > 0) {
       log2.info(`  Cleared roots: ${cacheResult.clearedPaths.join(", ")}`);
     }
@@ -43880,8 +44922,8 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
     }
   }
   const logPath = getMagicContextLogPath2("opencode");
-  if (existsSync28(logPath)) {
-    const logStat = statSync11(logPath);
+  if (existsSync31(logPath)) {
+    const logStat = statSync12(logPath);
     const sizeKb = (logStat.size / 1024).toFixed(0);
     log2.info(`Log file: ${logPath} (${sizeKb} KB)`);
   } else {
@@ -43892,7 +44934,7 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
   if (dumpBuckets.length > 0) {
     const totalCount = dumpBuckets.reduce((sum, b2) => sum + b2.count, 0);
     const sessionCount = dumpBuckets.length;
-    warn(`Historian debug dumps: ${totalCount} file(s) across ${sessionCount} project(s)`);
+    warn2(`Historian debug dumps: ${totalCount} file(s) across ${sessionCount} project(s)`);
     for (const bucket of dumpBuckets) {
       log2.info(`  [${bucket.directory}] ${bucket.count} file(s)`);
       for (const dump of bucket.recent.slice(0, 3)) {
@@ -43926,7 +44968,7 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
   }
   return 0;
 }
-var import_comment_json11, CLI_PACKAGE_NAME = "@cortexkit/magic-context";
+var import_comment_json12, CLI_PACKAGE_NAME = "@cortexkit/magic-context";
 var init_doctor_opencode = __esm(async () => {
   init_config();
   init_agent_disable();
@@ -43945,6 +44987,7 @@ var init_doctor_opencode = __esm(async () => {
   init_opencode_detect();
   init_opencode_helpers();
   init_opencode_plugin_cache();
+  init_opencode_plugin_schema_fence();
   init_paths();
   init_prompts();
   init_redaction2();
@@ -43956,15 +44999,15 @@ var init_doctor_opencode = __esm(async () => {
     init_v22_backfill_commands(),
     init_doctor_authority()
   ]);
-  import_comment_json11 = __toESM(require_src3(), 1);
+  import_comment_json12 = __toESM(require_src3(), 1);
 });
 
 // src/lib/diagnostics-pi.ts
-import { createHash as createHash4 } from "node:crypto";
-import { existsSync as existsSync29, readdirSync as readdirSync4, readFileSync as readFileSync21, statSync as statSync12 } from "node:fs";
+import { createHash as createHash5 } from "node:crypto";
+import { existsSync as existsSync32, readdirSync as readdirSync5, readFileSync as readFileSync23, statSync as statSync13 } from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
-import { homedir as homedir17, userInfo as userInfo2 } from "node:os";
-import { join as join26 } from "node:path";
+import { homedir as homedir18, userInfo as userInfo2 } from "node:os";
+import { join as join29 } from "node:path";
 function getSelfVersion3() {
   const req = createRequire6(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
@@ -43979,7 +45022,7 @@ function getSelfVersion3() {
 }
 function fileSize2(path6) {
   try {
-    return existsSync29(path6) ? statSync12(path6).size : 0;
+    return existsSync32(path6) ? statSync13(path6).size : 0;
   } catch {
     return 0;
   }
@@ -43989,13 +45032,13 @@ function escapeRegex3(value) {
 }
 function currentUserHash() {
   const username = userInfo2().username || "unknown";
-  return createHash4("sha256").update(username).digest("hex").slice(0, 12);
+  return createHash5("sha256").update(username).digest("hex").slice(0, 12);
 }
 function redactSecretString(value) {
   return redactSecretText(value).replace(/Bearer\s+[A-Za-z0-9._~+\-/=]+/g, "Bearer <REDACTED>").replace(/sk-[A-Za-z0-9_-]{12,}/g, "sk-<REDACTED>").replace(/api[_-]?key=([^\s&]+)/gi, "api_key=<REDACTED>").replace(/token=([^\s&]+)/gi, "token=<REDACTED>");
 }
 function sanitizeString2(value) {
-  const home = process.env.HOME || homedir17();
+  const home = process.env.HOME || homedir18();
   const username = userInfo2().username;
   const userHash = `<USER:${currentUserHash()}>`;
   let sanitized = redactSecretString(value);
@@ -44031,11 +45074,11 @@ function sanitizeValue2(value, key = "") {
   return value;
 }
 function readJsonc(path6) {
-  if (!existsSync29(path6))
+  if (!existsSync32(path6))
     return { value: {} };
   try {
     return {
-      value: import_comment_json12.parse(readFileSync21(path6, "utf-8"))
+      value: import_comment_json13.parse(readFileSync23(path6, "utf-8"))
     };
   } catch (error51) {
     return {
@@ -44051,7 +45094,7 @@ function readConfigDiagnostic(path6) {
   const parsed = readJsonc(path6);
   return {
     path: path6,
-    exists: existsSync29(path6),
+    exists: existsSync32(path6),
     ...parsed.parseError ? { parseError: parsed.parseError } : {},
     flags: sanitizeValue2(parsed.value)
   };
@@ -44069,25 +45112,25 @@ function reverseSlugToDirectory(slug) {
 }
 function collectPiRecentSessions() {
   const sessionsRoot = getPiSessionsRoot();
-  if (!existsSync29(sessionsRoot))
+  if (!existsSync32(sessionsRoot))
     return [];
   try {
-    const slugs = readdirSync4(sessionsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+    const slugs = readdirSync5(sessionsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
     const candidates = [];
     for (const slug of slugs) {
       const directory = reverseSlugToDirectory(slug);
       if (!directory)
         continue;
-      const slugDir = join26(sessionsRoot, slug);
+      const slugDir = join29(sessionsRoot, slug);
       let files;
       try {
-        files = readdirSync4(slugDir).filter((name) => name.endsWith(".jsonl"));
+        files = readdirSync5(slugDir).filter((name) => name.endsWith(".jsonl"));
       } catch {
         continue;
       }
       for (const file2 of files) {
         try {
-          const mtime = statSync12(join26(slugDir, file2)).mtimeMs;
+          const mtime = statSync13(join29(slugDir, file2)).mtimeMs;
           const sessionId = file2.replace(/\.jsonl$/, "");
           candidates.push({ sessionId, directory, mtime });
         } catch {}
@@ -44105,7 +45148,7 @@ function collectPiRecentSessions() {
 }
 function parseHistorianDumpMeta2(path6) {
   try {
-    const xml = readFileSync21(path6, "utf-8");
+    const xml = readFileSync23(path6, "utf-8");
     const parsed = parseCompartmentOutput(xml);
     const factCountByCategory = {};
     for (const fact of parsed.facts) {
@@ -44138,11 +45181,11 @@ function parseHistorianDumpMeta2(path6) {
   }
 }
 function listDumpsInDir2(dir, limit) {
-  if (!existsSync29(dir))
+  if (!existsSync32(dir))
     return { count: 0, recent: [] };
   try {
-    const entries = readdirSync4(dir).filter((name) => name.endsWith(".xml")).map((name) => {
-      const stat = statSync12(join26(dir, name));
+    const entries = readdirSync5(dir).filter((name) => name.endsWith(".xml")).map((name) => {
+      const stat = statSync13(join29(dir, name));
       return {
         name,
         mtime: stat.mtimeMs,
@@ -44151,7 +45194,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(join26(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta2(join29(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -44214,9 +45257,9 @@ async function collectDiagnostics2(cwd = process.cwd()) {
   const projectConfigPath = getProjectConfigPath(cwd);
   const loaded = loadPiConfig({ cwd });
   const storageDirPath = getMagicContextStorageDir();
-  const dbPath = join26(storageDirPath, "context.db");
+  const dbPath = join29(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("pi");
-  const logFileSize = existsSync29(logPath) ? statSync12(logPath).size : 0;
+  const logFileSize = existsSync32(logPath) ? statSync13(logPath).size : 0;
   const otherPiExtensions = packages.filter((entry) => !isPiMagicContextPackageEntry(entry)).map(describePiPackageEntry);
   const recentSessions = collectPiRecentSessions();
   const historianDumps = collectPiHistorianDumps(recentSessions);
@@ -44231,7 +45274,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     piVersion: pi ? getPiVersion(pi.path) : null,
     settings: {
       path: settingsPath,
-      exists: existsSync29(settingsPath),
+      exists: existsSync32(settingsPath),
       ...settingsParsed.parseError ? { parseError: settingsParsed.parseError } : {},
       hasMagicContextPackage: hasPiMagicContextPackage(packages),
       packages: sanitizeValue2(packages)
@@ -44247,7 +45290,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     loadWarnings: loaded.warnings.map(sanitizeString2),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync29(storageDirPath),
+      exists: existsSync32(storageDirPath),
       contextDbSizeBytes: fileSize2(dbPath)
     },
     conflicts: {
@@ -44256,7 +45299,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     },
     logFile: {
       path: logPath,
-      exists: existsSync29(logPath),
+      exists: existsSync32(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -44337,7 +45380,7 @@ function renderDiagnosticsMarkdown2(report) {
   ].join(`
 `);
 }
-var import_comment_json12;
+var import_comment_json13;
 var init_diagnostics_pi = __esm(() => {
   init_migrate_config_location();
   init_compartment_parser();
@@ -44346,12 +45389,12 @@ var init_diagnostics_pi = __esm(() => {
   init_paths();
   init_pi_helpers();
   init_redaction2();
-  import_comment_json12 = __toESM(require_src3(), 1);
+  import_comment_json13 = __toESM(require_src3(), 1);
 });
 
 // src/lib/logs-pi.ts
-import { readFileSync as readFileSync22, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join27 } from "node:path";
+import { readFileSync as readFileSync24, writeFileSync as writeFileSync9 } from "node:fs";
+import { join as join30 } from "node:path";
 function sanitizeLogContent2(content) {
   return sanitizeString2(content);
 }
@@ -44380,7 +45423,7 @@ function filterLogLinesBySession2(lines, sessionId) {
 }
 async function bundleIssueReport2(report, description, title, options = {}) {
   const LOG_TAIL_LINES = 400;
-  const allLogLines = report.logFile.exists ? readFileSync22(report.logFile.path, "utf-8").split(/\r?\n/) : [];
+  const allLogLines = report.logFile.exists ? readFileSync24(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();
@@ -44416,8 +45459,8 @@ async function bundleIssueReport2(report, description, title, options = {}) {
 `);
   const bodyMarkdown = capBodyToGithubLimit(rawBodyMarkdown);
   const cwd = options.cwd ?? process.cwd();
-  const path6 = join27(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
-  writeFileSync8(path6, `${bodyMarkdown}
+  const path6 = join30(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
+  writeFileSync9(path6, `${bodyMarkdown}
 `);
   return { path: path6, bodyMarkdown };
 }
@@ -44428,14 +45471,14 @@ var init_logs_pi = __esm(() => {
 
 // src/commands/doctor-pi.ts
 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 { existsSync as existsSync33, mkdirSync as mkdirSync11, readdirSync as readdirSync6, readFileSync as readFileSync25, rmSync as rmSync4, statSync as statSync14 } from "node:fs";
 import { createRequire as createRequire7 } from "node:module";
-import { homedir as homedir18 } from "node:os";
-import { dirname as dirname15, isAbsolute as isAbsolute4, join as join28 } from "node:path";
+import { homedir as homedir19 } from "node:os";
+import { dirname as dirname17, isAbsolute as isAbsolute5, join as join31 } from "node:path";
 function depsFrom(options) {
   return {
-    ...DEFAULT_DEPS3,
-    prompts: options.prompts ?? DEFAULT_DEPS3.prompts,
+    ...DEFAULT_DEPS5,
+    prompts: options.prompts ?? DEFAULT_DEPS5.prompts,
     ...options.deps
   };
 }
@@ -44521,7 +45564,7 @@ function summarize(results) {
 function readJsonc2(path6) {
   try {
     return {
-      value: import_comment_json13.parse(readFileSync23(path6, "utf-8"))
+      value: import_comment_json14.parse(readFileSync25(path6, "utf-8"))
     };
   } catch (error51) {
     return {
@@ -44540,28 +45583,28 @@ function piPluginDirCandidates(packages, cwd) {
     const spec = typeof entry === "string" ? entry.trim() : "";
     if (!spec || spec.startsWith("npm:"))
       continue;
-    const resolved = isAbsolute4(spec) ? spec : join28(agentDir, spec);
+    const resolved = isAbsolute5(spec) ? spec : join31(agentDir, spec);
     dirs.push(resolved);
   }
-  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")));
+  dirs.push(join31(agentDir, "npm", "node_modules", PACKAGE_NAME2));
+  dirs.push(join31(cwd, ".pi", "npm", "node_modules", PACKAGE_NAME2));
+  return dirs.filter((dir) => existsSync33(join31(dir, "package.json")));
 }
 function projectConfigPath(cwd) {
   return resolveCortexKitProjectConfigPath(cwd);
 }
 function readConfigForEmbedding(path6, isProjectConfig) {
-  if (!existsSync30(path6))
+  if (!existsSync33(path6))
     return null;
   try {
-    const rawText = readFileSync23(path6, "utf-8");
+    const rawText = readFileSync25(path6, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
       configPath: path6,
       isProjectConfig
     });
     const rejectedKeyPaths = [];
-    const parsed = sanitizeParsedJson(import_comment_json13.parse(substituted.text), {
+    const parsed = sanitizeParsedJson(import_comment_json14.parse(substituted.text), {
       onRejectedKey: (keyPath) => rejectedKeyPaths.push(keyPath.join("."))
     });
     if (rejectedKeyPaths.length > 0) {
@@ -44632,38 +45675,38 @@ function pinnedVersionFromPackageSpecifier(specifier) {
 }
 function cacheRoots(cwd) {
   const home = process.env.HOME?.trim();
-  const cacheHome = process.env.XDG_CACHE_HOME || join28(home || homedir18(), ".cache");
+  const cacheHome = process.env.XDG_CACHE_HOME || join31(home || homedir19(), ".cache");
   const piCacheRoot = getPiCacheRoot();
   return [
-    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)
+    join31(piCacheRoot, "extensions"),
+    join31(piCacheRoot, "packages"),
+    join31(cacheHome, "pi", "extensions"),
+    join31(cacheHome, "pi", "packages"),
+    join31(getPiAgentConfigDir(), "cache", "extensions"),
+    join31(getPiAgentConfigDir(), "npm", "node_modules", PACKAGE_NAME2),
+    join31(cwd, ".pi", "npm", "node_modules", PACKAGE_NAME2)
   ];
 }
 function findPiMagicContextCacheDirs(cwd, expectedVersion, force = false) {
   const found = new Map;
   const visit = (path6, depth) => {
-    if (depth < 0 || !existsSync30(path6))
+    if (depth < 0 || !existsSync33(path6))
       return;
     let stat;
     try {
-      stat = statSync13(path6);
+      stat = statSync14(path6);
     } catch {
       return;
     }
     if (!stat.isDirectory())
       return;
-    const packageJson = join28(path6, "package.json");
-    if (existsSync30(packageJson)) {
+    const packageJson = join31(path6, "package.json");
+    if (existsSync33(packageJson)) {
       try {
-        const pkg = JSON.parse(readFileSync23(packageJson, "utf-8"));
+        const pkg = JSON.parse(readFileSync25(packageJson, "utf-8"));
         const name = typeof pkg.name === "string" ? pkg.name : "";
         const version2 = typeof pkg.version === "string" ? pkg.version : undefined;
-        if (name === PACKAGE_NAME) {
+        if (name === PACKAGE_NAME2) {
           if (force || !version2 || expectedVersion && version2 !== expectedVersion) {
             found.set(path6, { path: path6, version: version2 });
           }
@@ -44675,12 +45718,12 @@ function findPiMagicContextCacheDirs(cwd, expectedVersion, force = false) {
     }
     let entries = [];
     try {
-      entries = readdirSync5(path6);
+      entries = readdirSync6(path6);
     } catch {
       return;
     }
     for (const entry of entries)
-      visit(join28(path6, entry), depth - 1);
+      visit(join31(path6, entry), depth - 1);
   };
   for (const root of cacheRoots(cwd))
     visit(root, 5);
@@ -44725,7 +45768,7 @@ async function runHealthChecks2(options) {
   }
   const settingsPath = getPiUserExtensionsPath();
   let packages = [];
-  if (!existsSync30(settingsPath)) {
+  if (!existsSync33(settingsPath)) {
     add2(results, "fail", `Pi settings not found at ${settingsPath}`);
     repairPlan.addPackageEntry = true;
   } else {
@@ -44749,7 +45792,7 @@ async function runHealthChecks2(options) {
     ["user", userConfigPath, true],
     ["project", projectPath, false]
   ]) {
-    if (!existsSync30(path6)) {
+    if (!existsSync33(path6)) {
       if (required2) {
         add2(results, "warn", `No ${label} magic-context.jsonc found at ${path6}`);
         if (userConfigMigrationRefused) {
@@ -44786,8 +45829,8 @@ async function runHealthChecks2(options) {
     add2(results, "pass", `historian.model "${historianModel}" has thinking_level "${historianThinkingLevel}" configured`);
   }
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join28(storageDir, "context.db");
-  const existedBeforeOpen = existsSync30(dbPath);
+  const dbPath = join31(storageDir, "context.db");
+  const existedBeforeOpen = existsSync33(dbPath);
   if (existedBeforeOpen)
     add2(results, "pass", `Shared context DB exists at ${dbPath}`);
   else
@@ -44924,10 +45967,10 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
     add2(results, "pass", "Pi extension cache clean (no stale cached package found)");
   }
   const logPath = getMagicContextLogPath2("pi");
-  if (existsSync30(logPath)) {
-    const stat = statSync13(logPath);
+  if (existsSync33(logPath)) {
+    const stat = statSync14(logPath);
     const sizeKb = (stat.size / 1024).toFixed(0);
-    const lines = readFileSync23(logPath, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    const lines = readFileSync25(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>"}`);
@@ -44962,12 +46005,12 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
   return { results, repairPlan, ...summarize(results) };
 }
 function writeDefaultMagicContextConfig(path6) {
-  mkdirSync10(dirname15(path6), { recursive: true });
+  mkdirSync11(dirname17(path6), { recursive: true });
   const config2 = {
     $schema: "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json",
     ...MagicContextConfigSchema.parse({})
   };
-  writeFileAtomic(path6, `${import_comment_json13.stringify(config2, null, 2)}
+  writeFileAtomic(path6, `${import_comment_json14.stringify(config2, null, 2)}
 `);
 }
 function repair2(plan, prompts) {
@@ -44984,7 +46027,7 @@ function repair2(plan, prompts) {
   }
   if (plan.writeUserConfig) {
     const configPath = getPiUserConfigPath();
-    if (!existsSync30(configPath)) {
+    if (!existsSync33(configPath)) {
       try {
         writeDefaultMagicContextConfig(configPath);
         prompts.log.success(`Wrote default Magic Context config to ${configPath}`);
@@ -45104,7 +46147,7 @@ async function runDoctor3(options = {}) {
   const v22Result = await runV22BackfillCommands({
     name: "Pi",
     openDatabase: (readonly2 = true) => {
-      const dbPath = join28(getMagicContextStorageDir(), "context.db");
+      const dbPath = join31(getMagicContextStorageDir(), "context.db");
       v22Db = readonly2 ? openExistingContextDatabase(dbPath, { readonly: true }) : openExistingContextDatabaseForMutation(dbPath);
       return v22Db;
     },
@@ -45169,7 +46212,7 @@ 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_TABLES2, DEFAULT_DEPS3;
+var import_comment_json14, PACKAGE_NAME2 = "@cortexkit/pi-magic-context", MIN_PI_VERSION = "0.74.0", ROW_COUNT_TABLES2, DEFAULT_DEPS5;
 var init_doctor_pi = __esm(async () => {
   init_migrate_config_location();
   init_project_security();
@@ -45194,14 +46237,14 @@ var init_doctor_pi = __esm(async () => {
     init_storage_versions(),
     init_v22_backfill_commands()
   ]);
-  import_comment_json13 = __toESM(require_src3(), 1);
+  import_comment_json14 = __toESM(require_src3(), 1);
   ROW_COUNT_TABLES2 = ["tags", "compartments", "memories", "notes", "dream_runs"];
-  DEFAULT_DEPS3 = {
+  DEFAULT_DEPS5 = {
     prompts: promptIO,
     collectDiagnostics: collectDiagnostics2,
     detectPiBinary,
     getPiVersion,
-    getLatestNpmVersion: () => getLatestNpmVersion(PACKAGE_NAME),
+    getLatestNpmVersion: () => getLatestNpmVersion(PACKAGE_NAME2),
     selfVersion: selfVersion2,
     probeEmbeddingEndpoint,
     openExistingContextDatabase,
@@ -45216,8 +46259,8 @@ var exports_doctor = {};
 __export(exports_doctor, {
   runDoctor: () => runDoctor4
 });
-import { existsSync as existsSync31, rmSync as rmSync5 } from "node:fs";
-import { join as join29 } from "node:path";
+import { existsSync as existsSync34, rmSync as rmSync5 } from "node:fs";
+import { join as join32 } from "node:path";
 async function runDoctor4(options) {
   if (options.clear)
     return runClear();
@@ -45235,7 +46278,7 @@ async function runDoctor4(options) {
     const result = await runV22BackfillCommands({
       name: "Magic Context",
       openDatabase: (readonly2 = true) => {
-        const dbPath = join29(getMagicContextStorageDir(), "context.db");
+        const dbPath = join32(getMagicContextStorageDir(), "context.db");
         v22Db = readonly2 ? openExistingContextDatabase(dbPath, { readonly: true }) : openExistingContextDatabaseForMutation(dbPath);
         return v22Db;
       },
@@ -45248,6 +46291,27 @@ async function runDoctor4(options) {
     if (result.handled)
       return result.exitCode;
   }
+  const { sweepPendingMigrations: sweepPendingMigrations2, formatMigrationSweepLines: formatMigrationSweepLines2 } = await init_migrate().then(() => exports_migrate);
+  const sweepDbPath = join32(getMagicContextStorageDir(), "context.db");
+  let sweepDb = null;
+  try {
+    sweepDb = openExistingContextDatabaseForMutation(sweepDbPath);
+  } catch {}
+  if (sweepDb !== null) {
+    try {
+      const report = sweepPendingMigrations2(sweepDb);
+      for (const line of formatMigrationSweepLines2(report)) {
+        if (line.startsWith("LOST"))
+          log2.error(line);
+        else
+          log2.info(line);
+      }
+    } catch (error51) {
+      log2.warn(`Session-migration recovery sweep failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    } finally {
+      sweepDb.close();
+    }
+  }
   let anyFailure = false;
   for (const adapter of adapters) {
     log2.step(`Running doctor for ${adapter.displayName}…`);
@@ -45324,7 +46388,7 @@ async function runClear() {
     const s = spinner2();
     s.start(`Clearing ${item.path}`);
     try {
-      if (existsSync31(item.path)) {
+      if (existsSync34(item.path)) {
         rmSync5(item.path, { recursive: true, force: true });
       }
       s.stop(`Cleared ${item.path}`);
@@ -45340,9 +46404,9 @@ async function runClear() {
 function formatSize(bytes) {
   if (bytes < 1024)
     return `${bytes} B`;
-  if (bytes < 1024 * 1024)
+  if (bytes < 1048576)
     return `${(bytes / 1024).toFixed(1)} KB`;
-  if (bytes < 1024 * 1024 * 1024)
+  if (bytes < 1073741824)
     return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
   return `${(bytes / 1024 / 1024 / 1024).toFixed(2)} GB`;
 }
@@ -45470,12 +46534,12 @@ 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: join30 }] = await Promise.all([
+        const [{ runDoctorDrainAuthority: runDoctorDrainAuthority2 }, { getMagicContextStorageDir: getMagicContextStorageDir2 }, { join: join33 }] = 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, join30(getMagicContextStorageDir2(), "context.db"));
+        return runDoctorDrainAuthority2(projectRoot, join33(getMagicContextStorageDir2(), "context.db"));
       }
       if (rest[0] === "merge-identity") {
         const { runMergeIdentityCli: runMergeIdentityCli2 } = await init_doctor_merge_identity().then(() => exports_doctor_merge_identity);