@cortexkit/magic-context 0.20.0 → 0.21.1

package/dist/index.js

@@ -7805,6 +7805,45 @@ var require_src2 = __commonJS((exports, module) => {
   };
 });
 
+// src/lib/find-on-path.ts
+import { accessSync, constants, existsSync, statSync } from "node:fs";
+import { delimiter, join } from "node:path";
+function findOnPath(binary) {
+  const PATH = process.env.PATH;
+  if (typeof PATH !== "string" || PATH.length === 0)
+    return null;
+  const isWindows = process.platform === "win32";
+  const dirs = PATH.split(delimiter);
+  const candidates = isWindows ? [`${binary}.exe`, `${binary}.cmd`, `${binary}.bat`, `${binary}.com`] : [binary];
+  for (const dir of dirs) {
+    if (!dir)
+      continue;
+    for (const candidate of candidates) {
+      const fullPath = join(dir, candidate);
+      if (isExecutable(fullPath, isWindows))
+        return fullPath;
+    }
+  }
+  return null;
+}
+function isExecutable(path, isWindows) {
+  try {
+    if (!existsSync(path))
+      return false;
+    const st = statSync(path);
+    if (!st.isFile())
+      return false;
+    if (isWindows) {
+      return true;
+    }
+    accessSync(path, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var init_find_on_path = () => {};
+
 // ../plugin/src/shared/harness.ts
 function getHarness() {
   return currentHarness;
@@ -7850,28 +7889,28 @@ function getOpenCodeCacheDir() {
 var init_data_path = () => {};
 
 // src/lib/paths.ts
-import { existsSync, readdirSync, statSync } from "node:fs";
+import { existsSync as existsSync2, readdirSync, statSync as statSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 function getOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
     return envDir;
   if (process.platform === "win32") {
-    return join2(homedir2(), ".config", "opencode");
+    return join3(homedir2(), ".config", "opencode");
   }
-  const xdgConfig = process.env.XDG_CONFIG_HOME || join2(homedir2(), ".config");
-  return join2(xdgConfig, "opencode");
+  const xdgConfig = process.env.XDG_CONFIG_HOME || join3(homedir2(), ".config");
+  return join3(xdgConfig, "opencode");
 }
 function findOmoConfig(configDir) {
   const locations = [
-    join2(configDir, "oh-my-openagent.jsonc"),
-    join2(configDir, "oh-my-openagent.json"),
-    join2(configDir, "oh-my-opencode.jsonc"),
-    join2(configDir, "oh-my-opencode.json")
+    join3(configDir, "oh-my-openagent.jsonc"),
+    join3(configDir, "oh-my-openagent.json"),
+    join3(configDir, "oh-my-opencode.jsonc"),
+    join3(configDir, "oh-my-opencode.json")
   ];
   for (const loc of locations) {
-    if (existsSync(loc))
+    if (existsSync2(loc))
       return loc;
   }
   return null;
@@ -7882,24 +7921,24 @@ function detectConfigPaths() {
   let opencodeConfigFormat;
   let tuiConfig;
   let tuiConfigFormat;
-  const jsoncPath = join2(configDir, "opencode.jsonc");
-  const jsonPath = join2(configDir, "opencode.json");
-  if (existsSync(jsoncPath)) {
+  const jsoncPath = join3(configDir, "opencode.jsonc");
+  const jsonPath = join3(configDir, "opencode.json");
+  if (existsSync2(jsoncPath)) {
     opencodeConfig = jsoncPath;
     opencodeConfigFormat = "jsonc";
-  } else if (existsSync(jsonPath)) {
+  } else if (existsSync2(jsonPath)) {
     opencodeConfig = jsonPath;
     opencodeConfigFormat = "json";
   } else {
     opencodeConfig = jsonPath;
     opencodeConfigFormat = "none";
   }
-  const tuiJsoncPath = join2(configDir, "tui.jsonc");
-  const tuiJsonPath = join2(configDir, "tui.json");
-  if (existsSync(tuiJsoncPath)) {
+  const tuiJsoncPath = join3(configDir, "tui.jsonc");
+  const tuiJsonPath = join3(configDir, "tui.json");
+  if (existsSync2(tuiJsoncPath)) {
     tuiConfig = tuiJsoncPath;
     tuiConfigFormat = "jsonc";
-  } else if (existsSync(tuiJsonPath)) {
+  } else if (existsSync2(tuiJsonPath)) {
     tuiConfig = tuiJsonPath;
     tuiConfigFormat = "json";
   } else {
@@ -7910,7 +7949,7 @@ function detectConfigPaths() {
     configDir,
     opencodeConfig,
     opencodeConfigFormat,
-    magicContextConfig: join2(configDir, "magic-context.jsonc"),
+    magicContextConfig: join3(configDir, "magic-context.jsonc"),
     omoConfig: findOmoConfig(configDir),
     tuiConfig,
     tuiConfigFormat
@@ -7920,13 +7959,13 @@ function getPiAgentConfigDir() {
   const envDir = process.env.PI_CODING_AGENT_DIR?.trim();
   if (envDir)
     return envDir;
-  return join2(homedir2(), ".pi", "agent");
+  return join3(homedir2(), ".pi", "agent");
 }
 function getPiUserConfigPath() {
-  return join2(getPiAgentConfigDir(), "magic-context.jsonc");
+  return join3(getPiAgentConfigDir(), "magic-context.jsonc");
 }
 function getPiUserExtensionsPath() {
-  return join2(getPiAgentConfigDir(), "settings.json");
+  return join3(getPiAgentConfigDir(), "settings.json");
 }
 function getMagicContextLogPath2(harness) {
   return getMagicContextLogPath(harness);
@@ -7935,12 +7974,12 @@ function getMagicContextHistorianDir2(harness) {
   return getMagicContextHistorianDir(harness);
 }
 function getOpenCodePluginCacheDir() {
-  const xdg = process.env.XDG_CACHE_HOME || join2(homedir2(), ".cache");
-  return join2(xdg, "opencode", "packages");
+  const xdg = process.env.XDG_CACHE_HOME || join3(homedir2(), ".cache");
+  return join3(xdg, "opencode", "packages");
 }
 function isDir(path2) {
   try {
-    return statSync(path2).isDirectory();
+    return statSync2(path2).isDirectory();
   } catch {
     return false;
   }
@@ -7957,12 +7996,12 @@ function dirSizeBytes(path2) {
     try {
       const entries = readdirSync(cur, { withFileTypes: true });
       for (const entry of entries) {
-        const child = join2(cur, entry.name);
+        const child = join3(cur, entry.name);
         if (entry.isDirectory()) {
           stack.push(child);
         } else if (entry.isFile()) {
           try {
-            total += statSync(child).size;
+            total += statSync2(child).size;
           } catch {}
         }
       }
@@ -7975,10 +8014,9 @@ var init_paths = __esm(() => {
 });
 
 // src/adapters/opencode.ts
-import { execFileSync } from "node:child_process";
-import { existsSync as existsSync2, readFileSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync, writeFileSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { dirname, join as join3 } from "node:path";
+import { dirname, join as join4 } from "node:path";
 
 class OpenCodeAdapter {
   kind = "opencode";
@@ -7986,20 +8024,10 @@ class OpenCodeAdapter {
   pluginPackageName = PLUGIN_NAME;
   isInstalled() {
     const isWindows = process.platform === "win32";
-    const stockBin = isWindows ? join3(homedir3(), ".opencode", "bin", "opencode.exe") : join3(homedir3(), ".opencode", "bin", "opencode");
-    if (existsSync2(stockBin))
-      return true;
-    const probe = isWindows ? { cmd: "where", args: ["opencode"] } : { cmd: "command", args: ["-v", "opencode"] };
-    try {
-      if (!isWindows) {
-        execFileSync("which", ["opencode"], { stdio: "ignore" });
-      } else {
-        execFileSync(probe.cmd, probe.args, { stdio: "ignore" });
-      }
+    const stockBin = isWindows ? join4(homedir3(), ".opencode", "bin", "opencode.exe") : join4(homedir3(), ".opencode", "bin", "opencode");
+    if (existsSync3(stockBin))
       return true;
-    } catch {
-      return false;
-    }
+    return findOnPath("opencode") !== null;
   }
   hasPluginEntry() {
     const paths = detectConfigPaths();
@@ -8164,7 +8192,7 @@ class OpenCodeAdapter {
     const path2 = getOpenCodePluginCacheDir();
     return {
       path: path2,
-      exists: existsSync2(path2),
+      exists: existsSync3(path2),
       sizeBytes: dirSizeBytes(path2)
     };
   }
@@ -8178,7 +8206,7 @@ class OpenCodeAdapter {
       `${cacheDir}/${PLUGIN_NAME}/node_modules/${PLUGIN_NAME}/package.json`
     ];
     for (const candidate of candidates) {
-      if (!existsSync2(candidate))
+      if (!existsSync3(candidate))
         continue;
       try {
         const raw = readFileSync(candidate, "utf-8");
@@ -8219,29 +8247,30 @@ function matchesPluginEntry(entry, pkgName) {
 }
 function ensureDir(filePath) {
   const dir = dirname(filePath);
-  if (!existsSync2(dir)) {
+  if (!existsSync3(dir)) {
     const { mkdirSync } = __require("node:fs");
     mkdirSync(dir, { recursive: true });
   }
 }
 var import_comment_json, PLUGIN_NAME = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY;
 var init_opencode = __esm(() => {
+  init_find_on_path();
   init_paths();
   import_comment_json = __toESM(require_src2(), 1);
   PLUGIN_ENTRY = `${PLUGIN_NAME}@latest`;
 });
 
 // src/lib/pi-helpers.ts
-import { execFileSync as execFileSync2, spawnSync } from "node:child_process";
-import { existsSync as existsSync3 } from "node:fs";
+import { execFileSync, spawnSync } from "node:child_process";
+import { existsSync as existsSync4 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 function getStaticModels() {
   return [...STATIC_MODELS];
 }
 function commandExists(command, args) {
   try {
-    const output = execFileSync2(command, args, {
+    const output = execFileSync(command, args, {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
@@ -8257,8 +8286,8 @@ function detectPiBinary() {
     if (first)
       return { path: first, source: "path" };
   }
-  const homeCandidate = process.platform === "win32" ? join4(homedir4(), ".pi", "bin", "pi.cmd") : join4(homedir4(), ".pi", "bin", "pi");
-  if (existsSync3(homeCandidate))
+  const homeCandidate = process.platform === "win32" ? join5(homedir4(), ".pi", "bin", "pi.cmd") : join5(homedir4(), ".pi", "bin", "pi");
+  if (existsSync4(homeCandidate))
     return { path: homeCandidate, source: "home" };
   return null;
 }
@@ -8281,7 +8310,7 @@ function getPiVersion(piPath) {
 }
 function runPi(piPath, args) {
   try {
-    return execFileSync2(piPath, args, {
+    return execFileSync(piPath, args, {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 20000
@@ -8408,8 +8437,8 @@ var init_pi_helpers = __esm(() => {
 });
 
 // src/adapters/pi.ts
-import { execFileSync as execFileSync3 } from "node:child_process";
-import { existsSync as existsSync4, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { execFileSync as execFileSync2 } from "node:child_process";
+import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname as dirname2 } from "node:path";
 
 class PiAdapter {
@@ -8519,7 +8548,7 @@ class PiAdapter {
     if (!piBin)
       return null;
     try {
-      const output = execFileSync3(piBin.path, ["list"], {
+      const output = execFileSync2(piBin.path, ["list"], {
         encoding: "utf-8",
         stdio: ["ignore", "pipe", "ignore"],
         timeout: 5000
@@ -8534,7 +8563,7 @@ class PiAdapter {
 }
 function readPiSettings() {
   const settingsPath = getPiUserExtensionsPath();
-  if (!existsSync4(settingsPath))
+  if (!existsSync5(settingsPath))
     return null;
   try {
     const raw = readFileSync2(settingsPath, "utf-8");
@@ -8568,7 +8597,7 @@ function matchesPiPackage(entry) {
 }
 function ensureDir2(filePath) {
   const dir = dirname2(filePath);
-  if (!existsSync4(dir)) {
+  if (!existsSync5(dir)) {
     const { mkdirSync } = __require("node:fs");
     mkdirSync(dir, { recursive: true });
   }
@@ -10260,7 +10289,7 @@ var init_harness_select = __esm(() => {
 });
 
 // ../plugin/src/shared/jsonc-parser.ts
-import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
 function stripJsonComments(content) {
   let result = "";
   let inString = false;
@@ -10365,10 +10394,10 @@ function readJsoncFile(filePath) {
 function detectConfigFile(basePath) {
   const jsoncPath = `${basePath}.jsonc`;
   const jsonPath = `${basePath}.json`;
-  if (existsSync5(jsoncPath)) {
+  if (existsSync6(jsoncPath)) {
     return { format: "jsonc", path: jsoncPath };
   }
-  if (existsSync5(jsonPath)) {
+  if (existsSync6(jsonPath)) {
     return { format: "json", path: jsonPath };
   }
   return { format: "none", path: jsoncPath };
@@ -10377,16 +10406,16 @@ var init_jsonc_parser = () => {};
 
 // ../plugin/src/shared/opencode-config-dir.ts
 import { homedir as homedir5 } from "node:os";
-import { join as join5, resolve } from "node:path";
+import { join as join6, resolve } from "node:path";
 function getCliConfigDir() {
   const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envConfigDir) {
     return resolve(envConfigDir);
   }
   if (process.platform === "win32") {
-    return join5(homedir5(), ".config", "opencode");
+    return join6(homedir5(), ".config", "opencode");
   }
-  return join5(process.env.XDG_CONFIG_HOME || join5(homedir5(), ".config"), "opencode");
+  return join6(process.env.XDG_CONFIG_HOME || join6(homedir5(), ".config"), "opencode");
 }
 function getOpenCodeConfigDir2(_options) {
   return getCliConfigDir();
@@ -10395,16 +10424,16 @@ function getOpenCodeConfigPaths(options) {
   const configDir = getOpenCodeConfigDir2(options);
   return {
     configDir,
-    configJson: join5(configDir, "opencode.json"),
-    configJsonc: join5(configDir, "opencode.jsonc"),
-    packageJson: join5(configDir, "package.json"),
-    omoConfig: join5(configDir, "magic-context.jsonc")
+    configJson: join6(configDir, "opencode.json"),
+    configJsonc: join6(configDir, "opencode.jsonc"),
+    packageJson: join6(configDir, "package.json"),
+    omoConfig: join6(configDir, "magic-context.jsonc")
   };
 }
 var init_opencode_config_dir = () => {};
 
 // ../plugin/src/shared/conflict-detector.ts
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 function detectConflicts(directory) {
   const conflicts = {
     compactionAuto: false,
@@ -10461,8 +10490,8 @@ function checkCompaction(directory) {
   return { auto: true, prune: false };
 }
 function readProjectCompaction(directory) {
-  const dotOcJsonc = join6(directory, ".opencode", "opencode.jsonc");
-  const dotOcJson = join6(directory, ".opencode", "opencode.json");
+  const dotOcJsonc = join7(directory, ".opencode", "opencode.jsonc");
+  const dotOcJson = join7(directory, ".opencode", "opencode.json");
   const dotOcConfig = readJsoncFile(dotOcJsonc) ?? readJsoncFile(dotOcJson);
   if (dotOcConfig?.compaction) {
     const c2 = dotOcConfig.compaction;
@@ -10470,8 +10499,8 @@ function readProjectCompaction(directory) {
       return { auto: c2.auto === true, prune: c2.prune === true, resolved: true };
     }
   }
-  const rootJsonc = join6(directory, "opencode.jsonc");
-  const rootJson = join6(directory, "opencode.json");
+  const rootJsonc = join7(directory, "opencode.jsonc");
+  const rootJson = join7(directory, "opencode.json");
   const rootConfig = readJsoncFile(rootJsonc) ?? readJsoncFile(rootJson);
   if (rootConfig?.compaction) {
     const c2 = rootConfig.compaction;
@@ -10525,10 +10554,10 @@ function collectPluginEntries(directory) {
     }
   };
   for (const configPath of [
-    join6(directory, ".opencode", "opencode.jsonc"),
-    join6(directory, ".opencode", "opencode.json"),
-    join6(directory, "opencode.jsonc"),
-    join6(directory, "opencode.json")
+    join7(directory, ".opencode", "opencode.jsonc"),
+    join7(directory, ".opencode", "opencode.json"),
+    join7(directory, "opencode.jsonc"),
+    join7(directory, "opencode.json")
   ]) {
     const config = readJsoncFile(configPath);
     pushFrom(config?.plugin);
@@ -10569,7 +10598,7 @@ function readOmoDisabledHooks(directory) {
   try {
     const paths = getOpenCodeConfigPaths({ binary: "opencode" });
     for (const name of configNames) {
-      const configPath = join6(paths.configDir, name);
+      const configPath = join7(paths.configDir, name);
       const config = readJsoncFile(configPath);
       if (config?.disabled_hooks) {
         for (const hook of config.disabled_hooks) {
@@ -10579,7 +10608,7 @@ function readOmoDisabledHooks(directory) {
     }
   } catch {}
   for (const name of configNames) {
-    const config = readJsoncFile(join6(directory, name));
+    const config = readJsoncFile(join7(directory, name));
     if (config?.disabled_hooks) {
       for (const hook of config.disabled_hooks) {
         disabled.add(hook);
@@ -10597,8 +10626,8 @@ var init_conflict_detector = __esm(() => {
 });
 
 // ../plugin/src/shared/conflict-fixer.ts
-import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join7 } from "node:path";
+import { existsSync as existsSync7, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join8 } from "node:path";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -10606,7 +10635,7 @@ function asStringArray(value) {
   return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
 }
 function readConfig(filePath) {
-  if (!existsSync6(filePath)) {
+  if (!existsSync7(filePath)) {
     return null;
   }
   try {
@@ -10622,23 +10651,23 @@ function writeConfig(filePath, config) {
 }
 function resolveUserOpenCodeConfigPath() {
   const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-  if (existsSync6(paths.configJsonc))
+  if (existsSync7(paths.configJsonc))
     return paths.configJsonc;
   return paths.configJson;
 }
 function collectOpenCodeConfigPaths(directory) {
   const paths = new Set;
   const userConfig = resolveUserOpenCodeConfigPath();
-  if (existsSync6(userConfig)) {
+  if (existsSync7(userConfig)) {
     paths.add(userConfig);
   }
   for (const filePath of [
-    join7(directory, ".opencode", "opencode.jsonc"),
-    join7(directory, ".opencode", "opencode.json"),
-    join7(directory, "opencode.jsonc"),
-    join7(directory, "opencode.json")
+    join8(directory, ".opencode", "opencode.jsonc"),
+    join8(directory, ".opencode", "opencode.json"),
+    join8(directory, "opencode.jsonc"),
+    join8(directory, "opencode.json")
   ]) {
-    if (existsSync6(filePath)) {
+    if (existsSync7(filePath)) {
       paths.add(filePath);
     }
   }
@@ -10648,12 +10677,12 @@ function collectOmoConfigPaths(directory) {
   const paths = new Set;
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
   for (const fileName of OMO_CONFIG_NAMES) {
-    const userPath = join7(configDir, fileName);
-    const projectPath = join7(directory, fileName);
-    if (existsSync6(userPath)) {
+    const userPath = join8(configDir, fileName);
+    const projectPath = join8(directory, fileName);
+    if (existsSync7(userPath)) {
       paths.add(userPath);
     }
-    if (existsSync6(projectPath)) {
+    if (existsSync7(projectPath)) {
       paths.add(projectPath);
     }
   }
@@ -10847,10 +10876,10 @@ function buildModelSelection2(allModels, role) {
 var init_opencode_helpers = () => {};
 
 // src/commands/setup-opencode.ts
-import { existsSync as existsSync7, mkdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync8, mkdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "node:fs";
 import { dirname as dirname3 } from "node:path";
 function ensureDir3(dir) {
-  if (!existsSync7(dir)) {
+  if (!existsSync8(dir)) {
     mkdirSync(dir, { recursive: true });
   }
 }
@@ -10949,7 +10978,7 @@ async function resolveDcpConflictBeforeSetup(configPath, format) {
   }
 }
 function writeMagicContextConfig(configPath, options) {
-  const config = (existsSync7(configPath) ? readJsonc(configPath) : null) ?? {};
+  const config = (existsSync8(configPath) ? readJsonc(configPath) : null) ?? {};
   if (!config.$schema) {
     config.$schema = "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json";
   }
@@ -11015,7 +11044,7 @@ async function runSetup() {
     log.warn("You can configure models manually in magic-context.jsonc later");
   }
   const paths = detectConfigPaths();
-  const hadExistingSetup = paths.opencodeConfigFormat !== "none" || existsSync7(paths.magicContextConfig) || paths.tuiConfigFormat !== "none";
+  const hadExistingSetup = paths.opencodeConfigFormat !== "none" || existsSync8(paths.magicContextConfig) || paths.tuiConfigFormat !== "none";
   await resolveDcpConflictBeforeSetup(paths.opencodeConfig, paths.opencodeConfigFormat);
   addPluginToOpenCodeConfig(paths.opencodeConfig, paths.opencodeConfigFormat);
   log.success(`Plugin added to ${paths.opencodeConfig}`);
@@ -11216,10 +11245,10 @@ var init_pi_package_entry = __esm(() => {
 });
 
 // src/commands/setup-pi.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
 import { dirname as dirname4 } from "node:path";
 function ensureDir4(path2) {
-  if (!existsSync8(path2))
+  if (!existsSync9(path2))
     mkdirSync2(path2, { recursive: true });
 }
 async function getDefaultPrompts() {
@@ -11261,7 +11290,7 @@ function comparePiVersion(a, b2) {
 }
 function writePiSettingsPackage(settingsPath, packageSource = PI_PACKAGE_SOURCE) {
   ensureDir4(dirname4(settingsPath));
-  const settings = existsSync8(settingsPath) ? readJsonc2(settingsPath) ?? {} : {};
+  const settings = existsSync9(settingsPath) ? readJsonc2(settingsPath) ?? {} : {};
   const packages = Array.isArray(settings.packages) ? settings.packages : [];
   const hasPackage = hasPiMagicContextPackage(packages);
   if (!hasPackage)
@@ -11273,7 +11302,7 @@ function writePiSettingsPackage(settingsPath, packageSource = PI_PACKAGE_SOURCE)
 }
 function writeMagicContextConfig2(configPath, options) {
   ensureDir4(dirname4(configPath));
-  const config = existsSync8(configPath) ? readJsonc2(configPath) ?? {} : {};
+  const config = existsSync9(configPath) ? readJsonc2(configPath) ?? {} : {};
   if (!config.$schema) {
     config.$schema = "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json";
   }
@@ -11752,7 +11781,7 @@ var exports_native_binding = {};
 __export(exports_native_binding, {
   resolveBetterSqliteNativeBinding: () => resolveBetterSqliteNativeBinding
 });
-import { existsSync as existsSync9, mkdirSync as mkdirSync4, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync4, writeFileSync as writeFileSync6 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import * as path3 from "node:path";
 function logInfo(message) {
@@ -11833,7 +11862,7 @@ async function resolveBetterSqliteNativeBinding() {
       return null;
     }
     const { binaryPath: diskPath, pkgVersion } = resolved;
-    if (existsSync9(diskPath)) {
+    if (existsSync10(diskPath)) {
       const diskProbe = probeAbi(diskPath);
       if (diskProbe.ok) {
         logInfo(`on-disk binary already matches Electron ABI v${expected}; using default bindings() lookup`);
@@ -11844,7 +11873,7 @@ async function resolveBetterSqliteNativeBinding() {
       logWarn(`expected better-sqlite3 binary not found at ${diskPath}; will fetch Electron prebuild anyway`);
     }
     const cachedPath = getCachedBinaryPath(pkgVersion, expected);
-    if (existsSync9(cachedPath)) {
+    if (existsSync10(cachedPath)) {
       const cachedProbe = probeAbi(cachedPath);
       if (cachedProbe.ok) {
         logInfo(`using cached Electron prebuild at ${cachedPath}`);
@@ -11914,20 +11943,20 @@ __export(exports_migrate, {
   formatPiFilenameTimestamp: () => formatPiFilenameTimestamp
 });
 import { randomBytes } from "node:crypto";
-import { existsSync as existsSync10, mkdirSync as mkdirSync5, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync5, writeFileSync as writeFileSync7 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 function defaultOpenCodeDbPath() {
-  return join9(homedir6(), ".local", "share", "opencode", "opencode.db");
+  return join10(homedir6(), ".local", "share", "opencode", "opencode.db");
 }
 function defaultCortexkitDbPath() {
-  return join9(getMagicContextStorageDir(), "context.db");
+  return join10(getMagicContextStorageDir(), "context.db");
 }
 function defaultPiSessionsRoot() {
-  return join9(homedir6(), ".pi", "agent", "sessions");
+  return join10(homedir6(), ".pi", "agent", "sessions");
 }
 function defaultFs() {
-  return { existsSync: existsSync10, mkdirSync: mkdirSync5, writeFileSync: writeFileSync7 };
+  return { existsSync: existsSync11, mkdirSync: mkdirSync5, writeFileSync: writeFileSync7 };
 }
 function stmt(db, sql) {
   return db.prepare(sql);
@@ -12350,7 +12379,7 @@ function migrateOpenCodeSessionToPi(opts) {
     const provider = opts.provider ?? model.provider;
     const modelId = opts.modelId ?? model.modelId;
     const cwd = session.directory ?? session.path ?? process.cwd();
-    const outputDir = join9(piSessionsRoot, projectPathToPiDirSlug(cwd));
+    const outputDir = join10(piSessionsRoot, projectPathToPiDirSlug(cwd));
     const buildResult = buildPiEntries({
       session,
       messages,
@@ -12376,7 +12405,7 @@ function migrateOpenCodeSessionToPi(opts) {
       });
     }
     const compactionMarker = insertCompactionMarker(buildResult.entries, copyResult.lastCompartmentEndPiEntryId);
-    const outputPath = join9(outputDir, `${formatPiFilenameTimestamp(now)}_${buildResult.piSessionId}.jsonl`);
+    const outputPath = join10(outputDir, `${formatPiFilenameTimestamp(now)}_${buildResult.piSessionId}.jsonl`);
     const jsonl = `${buildResult.entries.map((entry) => JSON.stringify(entry)).join(`
 `)}
 `;
@@ -13597,8 +13626,8 @@ var cuid, cuid2, ulid, xid, ksuid, nanoid, duration, extendedDuration, guid, uui
   if (!version)
     return /^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}|00000000-0000-0000-0000-000000000000|ffffffff-ffff-ffff-ffff-ffffffffffff)$/;
   return new RegExp(`^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-${version}[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$`);
-}, uuid4, uuid6, uuid7, email, html5Email, rfc5322Email, unicodeEmail, idnEmail, browserEmail, _emoji = `^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$`, ipv4, ipv6, mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+}, uuid4, uuid6, uuid7, email, html5Email, rfc5322Email, unicodeEmail, idnEmail, browserEmail, _emoji = `^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$`, ipv4, ipv6, mac = (delimiter2) => {
+  const escapedDelim = escapeRegex(delimiter2 ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 }, cidrv4, cidrv6, base64, base64url, hostname, domain, httpProtocol, e164, dateSource = `(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))`, date, string = (params) => {
   const regex = params ? `[\\s\\S]{${params?.minimum ?? 0},${params?.maximum ?? ""}}` : `[\\s\\S]*`;
@@ -27344,7 +27373,7 @@ var init_magic_context = __esm(() => {
 });
 
 // ../plugin/src/config/variable.ts
-import { existsSync as existsSync11, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync12, readFileSync as readFileSync7 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { dirname as dirname7, isAbsolute, resolve as resolve2 } from "node:path";
 function substituteConfigVariables(input) {
@@ -27385,7 +27414,7 @@ function substituteConfigVariables(input) {
     } else if (!isAbsolute(filePath)) {
       filePath = resolve2(configDir, filePath);
     }
-    if (!existsSync11(filePath)) {
+    if (!existsSync12(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
     }
@@ -27409,19 +27438,19 @@ var init_variable = __esm(() => {
 });
 
 // ../plugin/src/config/index.ts
-import { existsSync as existsSync12, readFileSync as readFileSync8 } from "node:fs";
+import { existsSync as existsSync13, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { join as join10 } from "node:path";
+import { join as join11 } from "node:path";
 function getUserConfigBasePath() {
-  const configRoot = process.env.XDG_CONFIG_HOME ?? join10(homedir8(), ".config");
-  return join10(configRoot, "opencode", CONFIG_FILE_BASENAME);
+  const configRoot = process.env.XDG_CONFIG_HOME ?? join11(homedir8(), ".config");
+  return join11(configRoot, "opencode", CONFIG_FILE_BASENAME);
 }
 function getProjectConfigBasePath(directory) {
-  return join10(directory, ".opencode", CONFIG_FILE_BASENAME);
+  return join11(directory, ".opencode", CONFIG_FILE_BASENAME);
 }
 function loadConfigFile(configPath) {
   try {
-    if (!existsSync12(configPath)) {
+    if (!existsSync13(configPath)) {
       return null;
     }
     const rawText = readFileSync8(configPath, "utf-8");
@@ -27529,7 +27558,7 @@ function migrateLegacyExperimental(rawConfig, warnings) {
   patched.dreamer = dreamer;
   return patched;
 }
-function parsePluginConfig(rawConfig) {
+function parsePluginConfig(rawConfig, recoveredTopLevelKeys = []) {
   const preMigrationWarnings = [];
   const migrated = migrateLegacyExperimental(rawConfig, preMigrationWarnings);
   const parsed = MagicContextConfigSchema.safeParse(migrated);
@@ -27554,6 +27583,7 @@ function parsePluginConfig(rawConfig) {
   }
   const patched = { ...rawConfig };
   for (const key of errorPaths) {
+    recoveredTopLevelKeys.push(key);
     const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
     if (isAgentConfig) {
       delete patched[key];
@@ -27584,7 +27614,7 @@ function parsePluginConfig(rawConfig) {
 }
 function loadPluginConfig(directory) {
   const userDetected = detectConfigFile(getUserConfigBasePath());
-  const rootDetected = detectConfigFile(join10(directory, CONFIG_FILE_BASENAME));
+  const rootDetected = detectConfigFile(join11(directory, CONFIG_FILE_BASENAME));
   const dotOpenCodeDetected = detectConfigFile(getProjectConfigBasePath(directory));
   const projectDetected = rootDetected.format !== "none" ? rootDetected : dotOpenCodeDetected;
   const userLoaded = userDetected.format === "none" ? null : loadConfigFile(userDetected.path);
@@ -27632,11 +27662,11 @@ var init_config = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/key-files/aft-availability.ts
-import { existsSync as existsSync13, readFileSync as readFileSync9 } from "node:fs";
+import { existsSync as existsSync14, readFileSync as readFileSync9 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 function parseConfig(path4) {
-  if (!existsSync13(path4))
+  if (!existsSync14(path4))
     return null;
   return import_comment_json6.parse(readFileSync9(path4, "utf-8"));
 }
@@ -27660,10 +27690,10 @@ function hasAftAtKeys(value, keys) {
 function getAftAvailability() {
   const home = process.env.HOME || homedir9();
   const opencodePaths = [
-    join11(home, ".config", "opencode", "opencode.jsonc"),
-    join11(home, ".config", "opencode", "opencode.json")
+    join12(home, ".config", "opencode", "opencode.jsonc"),
+    join12(home, ".config", "opencode", "opencode.json")
   ];
-  const piPaths = [join11(home, ".pi", "agent", "settings.json")];
+  const piPaths = [join12(home, ".pi", "agent", "settings.json")];
   const checkedPaths = [...opencodePaths, ...piPaths];
   let opencode = false;
   for (const path4 of opencodePaths) {
@@ -27808,8 +27838,8 @@ function truncate(text2) {
 var DEFAULT_TIMEOUT_MS = 1e4, MAX_PREVIEW_CHARS = 240;
 
 // ../plugin/src/shared/tui-config.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "node:fs";
-import { dirname as dirname8, join as join12 } from "node:path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "node:fs";
+import { dirname as dirname8, join as join13 } from "node:path";
 function isMagicContextEntry(entry) {
   if (!entry)
     return false;
@@ -27823,11 +27853,11 @@ function isMagicContextEntry(entry) {
 }
 function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
-  const jsoncPath = join12(configDir, "tui.jsonc");
-  const jsonPath = join12(configDir, "tui.json");
-  if (existsSync14(jsoncPath))
+  const jsoncPath = join13(configDir, "tui.jsonc");
+  const jsonPath = join13(configDir, "tui.json");
+  if (existsSync15(jsoncPath))
     return jsoncPath;
-  if (existsSync14(jsonPath))
+  if (existsSync15(jsonPath))
     return jsonPath;
   return jsonPath;
 }
@@ -27835,7 +27865,7 @@ function ensureTuiPluginEntry() {
   try {
     const configPath = resolveTuiConfigPath();
     let config2 = {};
-    if (existsSync14(configPath)) {
+    if (existsSync15(configPath)) {
       const raw = readFileSync10(configPath, "utf-8");
       config2 = import_comment_json7.parse(raw) ?? {};
     }
@@ -28039,10 +28069,10 @@ var init_redaction = __esm(() => {
 });
 
 // src/lib/diagnostics-opencode.ts
-import { existsSync as existsSync15, readdirSync as readdirSync2, readFileSync as readFileSync11, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync16, readdirSync as readdirSync2, readFileSync as readFileSync11, statSync as statSync3 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { homedir as homedir11 } from "node:os";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 function getSelfVersion() {
   const require2 = createRequire3(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
@@ -28056,11 +28086,11 @@ function getSelfVersion() {
   return "unknown";
 }
 function getPluginCacheInfo() {
-  const path4 = join13(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY_WITH_VERSION);
+  const path4 = join14(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY_WITH_VERSION);
   let cached2;
   try {
-    const installedPkgPath = join13(path4, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
-    if (existsSync15(installedPkgPath)) {
+    const installedPkgPath = join14(path4, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
+    if (existsSync16(installedPkgPath)) {
       const pkg = JSON.parse(readFileSync11(installedPkgPath, "utf-8"));
       cached2 = typeof pkg.version === "string" ? pkg.version : undefined;
     }
@@ -28070,12 +28100,12 @@ function getPluginCacheInfo() {
   return { path: path4, cached: cached2, latest: getSelfVersion() };
 }
 function getStorageDir() {
-  const dataHome = process.env.XDG_DATA_HOME || join13(homedir11(), ".local", "share");
-  return join13(dataHome, "cortexkit", "magic-context");
+  const dataHome = process.env.XDG_DATA_HOME || join14(homedir11(), ".local", "share");
+  return join14(dataHome, "cortexkit", "magic-context");
 }
 function fileSize(path4) {
   try {
-    return existsSync15(path4) ? statSync2(path4).size : 0;
+    return existsSync16(path4) ? statSync3(path4).size : 0;
   } catch {
     return 0;
   }
@@ -28087,7 +28117,7 @@ function sanitizeValue(value) {
   return sanitizeConfigValue(value);
 }
 function readConfig2(path4) {
-  if (!existsSync15(path4))
+  if (!existsSync16(path4))
     return { value: null };
   try {
     const raw = readFileSync11(path4, "utf-8");
@@ -28146,11 +28176,11 @@ function parseHistorianDumpMeta(path4) {
   }
 }
 function listDumpsInDir(dir, limit) {
-  if (!existsSync15(dir))
+  if (!existsSync16(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync2(dir).filter((name) => name.endsWith(".xml")).map((name) => {
-      const stat = statSync2(join13(dir, name));
+      const stat = statSync3(join14(dir, name));
       return {
         name,
         mtime: stat.mtimeMs,
@@ -28159,7 +28189,7 @@ function listDumpsInDir(dir, limit) {
     }).sort((a, b2) => b2.mtime - a.mtime);
     const now = Date.now();
     const recent = entries.slice(0, limit).map((entry) => {
-      const meta3 = parseHistorianDumpMeta(join13(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta(join14(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -28214,8 +28244,8 @@ function collectHistorianDumps(recentSessions) {
   };
 }
 async function collectRecentSessions() {
-  const opencodeDbPath = join13(homedir11(), ".local", "share", "opencode", "opencode.db");
-  if (!existsSync15(opencodeDbPath))
+  const opencodeDbPath = join14(homedir11(), ".local", "share", "opencode", "opencode.db");
+  if (!existsSync16(opencodeDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -28249,8 +28279,8 @@ async function collectRecentSessions() {
   }
 }
 async function collectHistorianFailures(storageDirPath) {
-  const contextDbPath = join13(storageDirPath, "context.db");
-  if (!existsSync15(contextDbPath))
+  const contextDbPath = join14(storageDirPath, "context.db");
+  if (!existsSync16(contextDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -28289,9 +28319,9 @@ async function collectDiagnostics() {
   const tuiConfig = readConfig2(configPaths.tuiConfig);
   const magicContextConfig = readConfig2(configPaths.magicContextConfig);
   const storageDirPath = getStorageDir();
-  const contextDbPath = join13(storageDirPath, "context.db");
+  const contextDbPath = join14(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("opencode");
-  const logFileSize = existsSync15(logPath) ? statSync2(logPath).size : 0;
+  const logFileSize = existsSync16(logPath) ? statSync3(logPath).size : 0;
   const conflictResult = detectConflicts(process.cwd());
   const recentSessions = await collectRecentSessions();
   return {
@@ -28306,7 +28336,7 @@ async function collectDiagnostics() {
     opencodeConfigHasPlugin: configHasPluginEntry(opencodeConfig.value),
     tuiConfigHasPlugin: configHasPluginEntry(tuiConfig.value),
     magicContextConfig: {
-      exists: existsSync15(configPaths.magicContextConfig),
+      exists: existsSync16(configPaths.magicContextConfig),
       ...magicContextConfig.error ? { parseError: magicContextConfig.error } : {},
       flags: sanitizeValue(magicContextConfig.value ?? {}) ?? {}
     },
@@ -28314,7 +28344,7 @@ async function collectDiagnostics() {
     pluginCache: getPluginCacheInfo(),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync15(storageDirPath),
+      exists: existsSync16(storageDirPath),
       contextDbSizeBytes: fileSize(contextDbPath)
     },
     conflicts: {
@@ -28323,7 +28353,7 @@ async function collectDiagnostics() {
     },
     logFile: {
       path: logPath,
-      exists: existsSync15(logPath),
+      exists: existsSync16(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -28454,7 +28484,7 @@ var init_diagnostics_opencode = __esm(() => {
 // src/lib/logs-opencode.ts
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir12 } from "node:os";
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 function sanitizeLogContent(content) {
   return sanitizeDiagnosticText(content);
 }
@@ -28535,7 +28565,7 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
     "```"
   ].join(`
 `);
-  const path4 = join14(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
+  const path4 = join15(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
   writeFileSync9(path4, `${bodyMarkdown}
 `);
   return { path: path4, bodyMarkdown };
@@ -28557,10 +28587,10 @@ var init_logs_opencode = __esm(() => {
 
 // src/commands/doctor-opencode.ts
 import { execSync as execSync2, spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync16, readFileSync as readFileSync13, rmSync, statSync as statSync3, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync17, readFileSync as readFileSync13, rmSync, statSync as statSync4, writeFileSync as writeFileSync10 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
 import { homedir as homedir13 } from "node:os";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 async function fetchNpmLatest(pkg, timeoutMs = 5000) {
   try {
     const controller = new AbortController;
@@ -28610,14 +28640,14 @@ function compareVersions(a, b2) {
 }
 async function clearPluginCache(force = false) {
   const cacheDir = getOpenCodeCacheDir();
-  const pluginCacheDir = join15(cacheDir, "packages", PLUGIN_ENTRY_WITH_VERSION2);
-  if (!existsSync16(pluginCacheDir)) {
+  const pluginCacheDir = join16(cacheDir, "packages", PLUGIN_ENTRY_WITH_VERSION2);
+  if (!existsSync17(pluginCacheDir)) {
     return { action: "not_found", path: pluginCacheDir };
   }
   let cachedVersion;
   try {
-    const installedPkgPath = join15(pluginCacheDir, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
-    if (existsSync16(installedPkgPath)) {
+    const installedPkgPath = join16(pluginCacheDir, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
+    if (existsSync17(installedPkgPath)) {
       const pkg = JSON.parse(readFileSync13(installedPkgPath, "utf-8"));
       if (typeof pkg?.version === "string") {
         cachedVersion = pkg.version;
@@ -28750,7 +28780,7 @@ async function runIssueFlow() {
   }
 }
 async function checkEmbeddingConfig(magicContextConfigPath) {
-  if (!existsSync16(magicContextConfigPath)) {
+  if (!existsSync17(magicContextConfigPath)) {
     return { issues: 0 };
   }
   let rawText;
@@ -28884,6 +28914,8 @@ async function runDoctor(options = {}) {
   };
   if (!isOpenCodeInstalled()) {
     fail("OpenCode is not installed or not in PATH");
+    log.info("Doctor checked ~/.opencode/bin/opencode and each entry in $PATH.");
+    log.info("If `which opencode` succeeds outside doctor, your wrapper or shim may not be readable by Node — please share that wrapper in the issue.");
     outro("Doctor failed — install OpenCode first");
     return 1;
   }
@@ -28903,7 +28935,7 @@ async function runDoctor(options = {}) {
   } else {
     pass(`OpenCode config: ${paths.opencodeConfig}`);
   }
-  if (existsSync16(paths.magicContextConfig)) {
+  if (existsSync17(paths.magicContextConfig)) {
     pass(`Magic Context config: ${paths.magicContextConfig}`);
     try {
       const raw = readFileSync13(paths.magicContextConfig, "utf-8");
@@ -28931,7 +28963,7 @@ async function runDoctor(options = {}) {
     warn(`No magic-context.jsonc found — using defaults`);
     log.info("  Run 'setup' to create one with model recommendations");
   }
-  if (existsSync16(paths.magicContextConfig)) {
+  if (existsSync17(paths.magicContextConfig)) {
     try {
       const mcRaw = readFileSync13(paths.magicContextConfig, "utf-8");
       const mcConfig = import_comment_json9.parse(mcRaw);
@@ -29090,7 +29122,7 @@ async function runDoctor(options = {}) {
     pass("Added TUI sidebar plugin to tui.json");
     warn("Restart OpenCode to see the sidebar");
     fixed++;
-  } else if (existsSync16(paths.tuiConfig)) {
+  } else if (existsSync17(paths.tuiConfig)) {
     try {
       const tuiRaw = readFileSync13(paths.tuiConfig, "utf-8");
       const tuiConfig = import_comment_json9.parse(tuiRaw);
@@ -29138,7 +29170,7 @@ async function runDoctor(options = {}) {
   } else {
     pass("TUI sidebar plugin configured (tui.json created)");
   }
-  if (existsSync16(paths.magicContextConfig)) {
+  if (existsSync17(paths.magicContextConfig)) {
     try {
       const mcRaw = readFileSync13(paths.magicContextConfig, "utf-8");
       const mcConfig = import_comment_json9.parse(mcRaw);
@@ -29167,8 +29199,8 @@ async function runDoctor(options = {}) {
     failCount += embeddingCheck.issues;
   else
     passCount++;
-  const dbPath = join15(getMagicContextStorageDir(), "context.db");
-  if (!existsSync16(dbPath)) {
+  const dbPath = join16(getMagicContextStorageDir(), "context.db");
+  if (!existsSync17(dbPath)) {
     log.info(`Shared context DB not yet created at ${dbPath} (will be created on first run)`);
   } else {
     pass(`Shared context DB exists at ${dbPath}`);
@@ -29229,8 +29261,8 @@ async function runDoctor(options = {}) {
   }
   {
     const ageWarnings = [];
-    const npmrcPath = join15(homedir13(), ".npmrc");
-    if (existsSync16(npmrcPath)) {
+    const npmrcPath = join16(homedir13(), ".npmrc");
+    if (existsSync17(npmrcPath)) {
       try {
         const npmrc = readFileSync13(npmrcPath, "utf-8");
         for (const line of npmrc.split(`
@@ -29256,8 +29288,8 @@ async function runDoctor(options = {}) {
     }
   }
   const logPath = getMagicContextLogPath2("opencode");
-  if (existsSync16(logPath)) {
-    const logStat = statSync3(logPath);
+  if (existsSync17(logPath)) {
+    const logStat = statSync4(logPath);
     const sizeKb = (logStat.size / 1024).toFixed(0);
     log.info(`Log file: ${logPath} (${sizeKb} KB)`);
   } else {
@@ -161906,7 +161938,7 @@ function getErrorMessage(error51) {
 }
 
 // ../plugin/src/features/magic-context/key-files/project-key-files.ts
-import { existsSync as existsSync17, readFileSync as readFileSync14, realpathSync } from "node:fs";
+import { existsSync as existsSync18, readFileSync as readFileSync14, realpathSync } from "node:fs";
 function deleteOrphanProjectKeyFiles(db, now = Date.now()) {
   const cutoff = now - ORPHAN_GRACE_MS;
   const rows = db.prepare(`SELECT project_path AS projectPath, MAX(generated_at) AS lastGen
@@ -161915,7 +161947,7 @@ function deleteOrphanProjectKeyFiles(db, now = Date.now()) {
              HAVING lastGen < ?`).all(cutoff);
   let deletedProjects = 0;
   for (const row of rows) {
-    if (existsSync17(row.projectPath))
+    if (existsSync18(row.projectPath))
       continue;
     try {
       db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
@@ -162340,6 +162372,52 @@ var init_migrations = __esm(async () => {
           db.exec("ALTER TABLE session_meta ADD COLUMN deferred_execute_state TEXT");
         }
       }
+    },
+    {
+      version: 16,
+      description: "Add context-limit cache regression sentinels",
+      up: (db) => {
+        const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+        if (!cols.some((c2) => c2.name === "observed_safe_input_tokens")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN observed_safe_input_tokens INTEGER NOT NULL DEFAULT 0");
+        }
+        if (!cols.some((c2) => c2.name === "cache_alert_sent")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN cache_alert_sent INTEGER NOT NULL DEFAULT 0");
+        }
+      }
+    },
+    {
+      version: 17,
+      description: "Multi-anchor JSON storage for note-nudge and auto-search-hint persistence",
+      up: (db) => {
+        const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+        if (!cols.some((c2) => c2.name === "note_nudge_anchors")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN note_nudge_anchors TEXT NOT NULL DEFAULT '[]'");
+        }
+        if (!cols.some((c2) => c2.name === "auto_search_hint_decisions")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN auto_search_hint_decisions TEXT NOT NULL DEFAULT '[]'");
+        }
+        db.exec(`
+                UPDATE session_meta
+                SET note_nudge_anchors = json_array(
+                    json_object(
+                        'messageId', note_nudge_sticky_message_id,
+                        'text', note_nudge_sticky_text
+                    )
+                )
+                WHERE COALESCE(note_nudge_sticky_text, '') != ''
+                  AND COALESCE(note_nudge_sticky_message_id, '') != ''
+                  AND (note_nudge_anchors IS NULL OR note_nudge_anchors = '[]')
+            `);
+        db.exec(`
+                UPDATE session_meta SET note_nudge_anchors = '[]'
+                WHERE note_nudge_anchors IS NULL
+            `);
+        db.exec(`
+                UPDATE session_meta SET auto_search_hint_decisions = '[]'
+                WHERE auto_search_hint_decisions IS NULL
+            `);
+      }
     }
   ];
 });
@@ -162377,10 +162455,10 @@ var init_tool_definition_tokens = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/tool-owner-backfill.ts
-import { existsSync as existsSync18 } from "node:fs";
-import { join as join16 } from "node:path";
+import { existsSync as existsSync19 } from "node:fs";
+import { join as join17 } from "node:path";
 function resolveOpencodeDbPath() {
-  return join16(getDataDir(), "opencode", "opencode.db");
+  return join17(getDataDir(), "opencode", "opencode.db");
 }
 function ensureBackfillStateTable(db) {
   db.exec(`
@@ -162415,7 +162493,7 @@ function runToolOwnerBackfill(db) {
     return result;
   }
   const opencodeDbPath = resolveOpencodeDbPath();
-  if (!existsSync18(opencodeDbPath)) {
+  if (!existsSync19(opencodeDbPath)) {
     log2(`[backfill] OpenCode DB not found at ${opencodeDbPath} — marking all unbackfilled sessions as skipped. Lazy adoption (defense-in-depth) handles legacy rows at runtime.`);
     markAllUnbackfilledSessionsSkipped(db);
     result.sessionsSkippedNoOcDb = countSessionsByStatus(db, "skipped");
@@ -162625,25 +162703,25 @@ var init_tool_owner_backfill = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/storage-db.ts
-import { copyFileSync, cpSync, existsSync as existsSync19, mkdirSync as mkdirSync7 } from "node:fs";
-import { join as join17 } from "node:path";
+import { copyFileSync, cpSync, existsSync as existsSync20, mkdirSync as mkdirSync7 } from "node:fs";
+import { join as join18 } from "node:path";
 function resolveDatabasePath() {
   const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join17(dbDir, "context.db") };
+  return { dbDir, dbPath: join18(dbDir, "context.db") };
 }
 function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
-  if (existsSync19(targetDbPath))
+  if (existsSync20(targetDbPath))
     return;
   const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join17(legacyDir, "context.db");
-  if (!existsSync19(legacyDbPath))
+  const legacyDbPath = join18(legacyDir, "context.db");
+  if (!existsSync20(legacyDbPath))
     return;
   log2(`[magic-context] migrating legacy plugin storage: ${legacyDir} -> ${targetDbDir} (legacy left in place as backup)`);
   mkdirSync7(targetDbDir, { recursive: true });
   for (const suffix of ["", "-wal", "-shm"]) {
     const src = `${legacyDbPath}${suffix}`;
-    const dst = join17(targetDbDir, `context.db${suffix}`);
-    if (existsSync19(src)) {
+    const dst = join18(targetDbDir, `context.db${suffix}`);
+    if (existsSync20(src)) {
       try {
         copyFileSync(src, dst);
       } catch (error51) {
@@ -162651,9 +162729,9 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
       }
     }
   }
-  const legacyModelsDir = join17(legacyDir, "models");
-  const targetModelsDir = join17(targetDbDir, "models");
-  if (existsSync19(legacyModelsDir) && !existsSync19(targetModelsDir)) {
+  const legacyModelsDir = join18(legacyDir, "models");
+  const targetModelsDir = join18(targetDbDir, "models");
+  if (existsSync20(legacyModelsDir) && !existsSync20(targetModelsDir)) {
     try {
       cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
     } catch (error51) {
@@ -162877,6 +162955,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       note_nudge_trigger_message_id TEXT DEFAULT '',
       note_nudge_sticky_text TEXT DEFAULT '',
       note_nudge_sticky_message_id TEXT DEFAULT '',
+      note_nudge_anchors TEXT NOT NULL DEFAULT '[]',
+      auto_search_hint_decisions TEXT NOT NULL DEFAULT '[]',
       last_todo_state TEXT DEFAULT '',
       todo_synthetic_call_id TEXT DEFAULT '',
       todo_synthetic_anchor_message_id TEXT DEFAULT '',
@@ -162884,6 +162964,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       is_subagent INTEGER DEFAULT 0,
       last_context_percentage REAL DEFAULT 0,
       last_input_tokens INTEGER DEFAULT 0,
+      observed_safe_input_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_alert_sent INTEGER NOT NULL DEFAULT 0,
       times_execute_threshold_reached INTEGER DEFAULT 0,
       compartment_in_progress INTEGER DEFAULT 0,
       historian_failure_count INTEGER DEFAULT 0,
@@ -162955,12 +163037,16 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_anchors", "TEXT NOT NULL DEFAULT '[]'");
+  ensureColumn(db, "session_meta", "auto_search_hint_decisions", "TEXT NOT NULL DEFAULT '[]'");
   ensureColumn(db, "session_meta", "last_todo_state", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "todo_synthetic_call_id", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "todo_synthetic_anchor_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "todo_synthetic_state_json", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "note_last_read_at", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "observed_safe_input_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "cache_alert_sent", "INTEGER NOT NULL DEFAULT 0");
   ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "historian_failure_count", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "historian_last_error", "TEXT DEFAULT NULL");
@@ -163052,7 +163138,9 @@ function healNullIntegerColumns(db) {
     ["system_prompt_tokens", 0],
     ["conversation_tokens", 0],
     ["tool_call_tokens", 0],
-    ["note_nudge_trigger_pending", 0]
+    ["note_nudge_trigger_pending", 0],
+    ["observed_safe_input_tokens", 0],
+    ["cache_alert_sent", 0]
   ];
   for (const [column, fallback] of columns) {
     try {
@@ -163061,7 +163149,7 @@ function healNullIntegerColumns(db) {
   }
 }
 function ensureColumn(db, table, column, definition) {
-  if (!/^[a-z_]+$/.test(table) || !/^[a-z_]+$/.test(column) || !/^[A-Z0-9_'(),\s]+$/i.test(definition)) {
+  if (!/^[a-z_]+$/.test(table) || !/^[a-z_]+$/.test(column) || !/^[A-Z0-9_'(),[\]\s]+$/i.test(definition)) {
     throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
   }
   const rows = db.prepare(`PRAGMA table_info(${table})`).all();
@@ -163148,13 +163236,22 @@ var init_storage_db = __esm(async () => {
 // ../plugin/src/features/magic-context/storage-meta-shared.ts
 var BOOLEAN_META_KEYS;
 var init_storage_meta_shared = __esm(() => {
-  BOOLEAN_META_KEYS = new Set(["isSubagent", "compartmentInProgress"]);
+  BOOLEAN_META_KEYS = new Set(["isSubagent", "compartmentInProgress", "cacheAlertSent"]);
 });
 
 // ../plugin/src/features/magic-context/storage-meta-persisted.ts
+var AUTO_SEARCH_NO_HINT_REASONS;
 var init_storage_meta_persisted = __esm(() => {
   init_logger();
   init_storage_meta_shared();
+  AUTO_SEARCH_NO_HINT_REASONS = new Set([
+    "below-threshold",
+    "timeout",
+    "empty",
+    "error",
+    "stacked",
+    "too-short"
+  ]);
 });
 
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
@@ -163237,20 +163334,20 @@ var init_storage = __esm(async () => {
 });
 
 // ../pi-plugin/src/config/index.ts
-import { existsSync as existsSync20, readFileSync as readFileSync15 } from "node:fs";
+import { existsSync as existsSync21, readFileSync as readFileSync15 } from "node:fs";
 import { homedir as homedir14 } from "node:os";
-import { join as join18 } from "node:path";
+import { join as join19 } from "node:path";
 function getProjectConfigPaths(cwd) {
-  const basePath = join18(cwd, ".pi", CONFIG_FILE_NAME);
+  const basePath = join19(cwd, ".pi", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
   const home = process.env.HOME ?? homedir14();
-  const basePath = join18(home, ".pi", "agent", CONFIG_FILE_NAME);
+  const basePath = join19(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path4) => existsSync20(path4));
+  return paths.find((path4) => existsSync21(path4));
 }
 function loadConfigFile2(path4, scope) {
   try {
@@ -163263,7 +163360,8 @@ function loadConfigFile2(path4, scope) {
       path: path4,
       scope,
       config: import_comment_json10.parse(substituted.text),
-      warnings: substituted.warnings.map((warning) => `${path4}: ${warning}`)
+      warnings: substituted.warnings.map((warning) => `${path4}: ${warning}`),
+      loadOutcome: substituted.warnings.length > 0 ? "substitution-failure" : "ok"
     };
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
@@ -163273,7 +163371,8 @@ function loadConfigFile2(path4, scope) {
       config: {},
       warnings: [
         `${path4}: failed to load config: ${message}; using defaults for this file.`
-      ]
+      ],
+      loadOutcome: typeof error51.code === "string" ? "project-file-io-error" : "project-file-parse-error"
     };
   }
 }
@@ -163308,7 +163407,7 @@ function mergeRawConfigs(base, override) {
   }
   return merged;
 }
-function parsePiConfig(rawConfig) {
+function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   const parsed = MagicContextConfigSchema.safeParse(rawConfig);
   if (parsed.success) {
     return { config: parsed.data, warnings: [] };
@@ -163324,6 +163423,7 @@ function parsePiConfig(rawConfig) {
   const patched = { ...rawConfig };
   const warnings = [];
   for (const key of errorPaths) {
+    recoveredTopLevelKeys.push(key);
     const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
     delete patched[key];
     if (isAgentConfig) {
@@ -163384,10 +163484,10 @@ var init_config2 = __esm(() => {
 
 // src/lib/diagnostics-pi.ts
 import { createHash } from "node:crypto";
-import { existsSync as existsSync21, readdirSync as readdirSync3, readFileSync as readFileSync16, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync22, readdirSync as readdirSync3, readFileSync as readFileSync16, statSync as statSync5 } from "node:fs";
 import { createRequire as createRequire5 } from "node:module";
 import { homedir as homedir15, userInfo as userInfo2 } from "node:os";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 function getSelfVersion3() {
   const req = createRequire5(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
@@ -163402,7 +163502,7 @@ function getSelfVersion3() {
 }
 function fileSize2(path4) {
   try {
-    return existsSync21(path4) ? statSync4(path4).size : 0;
+    return existsSync22(path4) ? statSync5(path4).size : 0;
   } catch {
     return 0;
   }
@@ -163452,7 +163552,7 @@ function sanitizeValue2(value, key = "") {
   return value;
 }
 function readJsonc3(path4) {
-  if (!existsSync21(path4))
+  if (!existsSync22(path4))
     return { value: {} };
   try {
     return {
@@ -163466,13 +163566,13 @@ function readJsonc3(path4) {
   }
 }
 function getProjectConfigPath(cwd) {
-  return join19(cwd, ".pi", "magic-context.jsonc");
+  return join20(cwd, ".pi", "magic-context.jsonc");
 }
 function readConfigDiagnostic(path4) {
   const parsed = readJsonc3(path4);
   return {
     path: path4,
-    exists: existsSync21(path4),
+    exists: existsSync22(path4),
     ...parsed.parseError ? { parseError: parsed.parseError } : {},
     flags: sanitizeValue2(parsed.value)
   };
@@ -163489,8 +163589,8 @@ function reverseSlugToDirectory(slug) {
   return `/${inner.replace(/-/g, "/")}`;
 }
 function collectPiRecentSessions() {
-  const sessionsRoot = join19(homedir15(), ".pi", "agent", "sessions");
-  if (!existsSync21(sessionsRoot))
+  const sessionsRoot = join20(homedir15(), ".pi", "agent", "sessions");
+  if (!existsSync22(sessionsRoot))
     return [];
   try {
     const slugs = readdirSync3(sessionsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
@@ -163499,7 +163599,7 @@ function collectPiRecentSessions() {
       const directory = reverseSlugToDirectory(slug);
       if (!directory)
         continue;
-      const slugDir = join19(sessionsRoot, slug);
+      const slugDir = join20(sessionsRoot, slug);
       let files;
       try {
         files = readdirSync3(slugDir).filter((name2) => name2.endsWith(".jsonl"));
@@ -163508,7 +163608,7 @@ function collectPiRecentSessions() {
       }
       for (const file2 of files) {
         try {
-          const mtime = statSync4(join19(slugDir, file2)).mtimeMs;
+          const mtime = statSync5(join20(slugDir, file2)).mtimeMs;
           const sessionId = file2.replace(/\.jsonl$/, "");
           candidates.push({ sessionId, directory, mtime });
         } catch {}
@@ -163559,11 +163659,11 @@ function parseHistorianDumpMeta2(path4) {
   }
 }
 function listDumpsInDir2(dir, limit) {
-  if (!existsSync21(dir))
+  if (!existsSync22(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync3(dir).filter((name2) => name2.endsWith(".xml")).map((name2) => {
-      const stat = statSync4(join19(dir, name2));
+      const stat = statSync5(join20(dir, name2));
       return {
         name: name2,
         mtime: stat.mtimeMs,
@@ -163572,7 +163672,7 @@ function listDumpsInDir2(dir, limit) {
     }).sort((a, b2) => b2.mtime - a.mtime);
     const now = Date.now();
     const recent = entries.slice(0, limit).map((entry) => {
-      const meta3 = parseHistorianDumpMeta2(join19(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta2(join20(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -163635,9 +163735,9 @@ async function collectDiagnostics2(cwd = process.cwd()) {
   const projectConfigPath = getProjectConfigPath(cwd);
   const loaded = loadPiConfig({ cwd });
   const storageDirPath = getMagicContextStorageDir();
-  const dbPath = join19(storageDirPath, "context.db");
+  const dbPath = join20(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("pi");
-  const logFileSize = existsSync21(logPath) ? statSync4(logPath).size : 0;
+  const logFileSize = existsSync22(logPath) ? statSync5(logPath).size : 0;
   const otherPiExtensions = packages.filter((entry) => !isPiMagicContextPackageEntry(entry)).map(describePiPackageEntry);
   const recentSessions = collectPiRecentSessions();
   const historianDumps = collectPiHistorianDumps(recentSessions);
@@ -163652,7 +163752,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     piVersion: pi ? getPiVersion(pi.path) : null,
     settings: {
       path: settingsPath,
-      exists: existsSync21(settingsPath),
+      exists: existsSync22(settingsPath),
       ...settingsParsed.parseError ? { parseError: settingsParsed.parseError } : {},
       hasMagicContextPackage: hasPiMagicContextPackage(packages),
       packages: sanitizeValue2(packages)
@@ -163668,7 +163768,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     loadWarnings: loaded.warnings.map(sanitizeString2),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync21(storageDirPath),
+      exists: existsSync22(storageDirPath),
       contextDbSizeBytes: fileSize2(dbPath)
     },
     conflicts: {
@@ -163677,7 +163777,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     },
     logFile: {
       path: logPath,
-      exists: existsSync21(logPath),
+      exists: existsSync22(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -163771,7 +163871,7 @@ var init_diagnostics_pi = __esm(() => {
 
 // src/lib/logs-pi.ts
 import { readFileSync as readFileSync17, writeFileSync as writeFileSync11 } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join21 } from "node:path";
 function sanitizeLogContent2(content) {
   return sanitizeString2(content);
 }
@@ -163827,7 +163927,7 @@ async function bundleIssueReport2(report, description, title, options = {}) {
   ].join(`
 `);
   const cwd = options.cwd ?? process.cwd();
-  const path4 = join20(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
+  const path4 = join21(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
   writeFileSync11(path4, `${bodyMarkdown}
 `);
   return { path: path4, bodyMarkdown };
@@ -163837,19 +163937,19 @@ var init_logs_pi = __esm(() => {
 });
 
 // src/commands/doctor-pi.ts
-import { execFileSync as execFileSync4, spawnSync as spawnSync3 } from "node:child_process";
+import { execFileSync as execFileSync3, spawnSync as spawnSync3 } from "node:child_process";
 import {
-  existsSync as existsSync22,
+  existsSync as existsSync23,
   mkdirSync as mkdirSync8,
   readdirSync as readdirSync4,
   readFileSync as readFileSync18,
   rmSync as rmSync2,
-  statSync as statSync5,
+  statSync as statSync6,
   writeFileSync as writeFileSync12
 } from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
 import { homedir as homedir16 } from "node:os";
-import { dirname as dirname9, join as join21 } from "node:path";
+import { dirname as dirname9, join as join22 } from "node:path";
 function depsFrom(options) {
   return {
     ...DEFAULT_DEPS,
@@ -163882,7 +163982,7 @@ function selfVersion() {
 }
 function getLatestNpmVersion(packageName) {
   try {
-    return execFileSync4("npm", ["view", packageName, "version"], {
+    return execFileSync3("npm", ["view", packageName, "version"], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 1e4
@@ -163949,10 +164049,10 @@ function packagesFrom(settings) {
   return Array.isArray(settings.packages) ? settings.packages : [];
 }
 function projectConfigPath(cwd) {
-  return join21(cwd, ".pi", "magic-context.jsonc");
+  return join22(cwd, ".pi", "magic-context.jsonc");
 }
 function readConfigForEmbedding(path4) {
-  if (!existsSync22(path4))
+  if (!existsSync23(path4))
     return null;
   try {
     const rawText = readFileSync18(path4, "utf-8");
@@ -164014,30 +164114,30 @@ function countTable(db, table) {
 }
 function cacheRoots() {
   const home = homedir16();
-  const cacheHome = process.env.XDG_CACHE_HOME || join21(home, ".cache");
+  const cacheHome = process.env.XDG_CACHE_HOME || join22(home, ".cache");
   return [
-    join21(home, ".pi", "cache", "extensions"),
-    join21(home, ".pi", "cache", "packages"),
-    join21(cacheHome, "pi", "extensions"),
-    join21(cacheHome, "pi", "packages"),
-    join21(getPiAgentConfigDir(), "cache", "extensions")
+    join22(home, ".pi", "cache", "extensions"),
+    join22(home, ".pi", "cache", "packages"),
+    join22(cacheHome, "pi", "extensions"),
+    join22(cacheHome, "pi", "packages"),
+    join22(getPiAgentConfigDir(), "cache", "extensions")
   ];
 }
 function findPiMagicContextCacheDirs(self, force = false) {
   const found = new Map;
   const visit = (path4, depth) => {
-    if (depth < 0 || !existsSync22(path4))
+    if (depth < 0 || !existsSync23(path4))
       return;
     let stat;
     try {
-      stat = statSync5(path4);
+      stat = statSync6(path4);
     } catch {
       return;
     }
     if (!stat.isDirectory())
       return;
-    const packageJson = join21(path4, "package.json");
-    if (existsSync22(packageJson)) {
+    const packageJson = join22(path4, "package.json");
+    if (existsSync23(packageJson)) {
       try {
         const pkg = JSON.parse(readFileSync18(packageJson, "utf-8"));
         const name2 = typeof pkg.name === "string" ? pkg.name : "";
@@ -164058,7 +164158,7 @@ function findPiMagicContextCacheDirs(self, force = false) {
       return;
     }
     for (const entry of entries)
-      visit(join21(path4, entry), depth - 1);
+      visit(join22(path4, entry), depth - 1);
   };
   for (const root of cacheRoots())
     visit(root, 5);
@@ -164095,7 +164195,7 @@ async function runHealthChecks(options) {
   }
   const settingsPath = getPiUserExtensionsPath();
   let packages = [];
-  if (!existsSync22(settingsPath)) {
+  if (!existsSync23(settingsPath)) {
     add(results, "warn", `Pi settings not found at ${settingsPath}`);
     repairPlan.addPackageEntry = true;
   } else {
@@ -164119,7 +164219,7 @@ async function runHealthChecks(options) {
     ["user", userConfigPath, true],
     ["project", projectPath, false]
   ]) {
-    if (!existsSync22(path4)) {
+    if (!existsSync23(path4)) {
       if (required2) {
         add(results, "warn", `No ${label} magic-context.jsonc found at ${path4}`);
         repairPlan.writeUserConfig = true;
@@ -164152,8 +164252,8 @@ async function runHealthChecks(options) {
     add(results, "pass", `historian.model "${historianModel}" has thinking_level "${historianThinkingLevel}" configured`);
   }
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join21(storageDir, "context.db");
-  const existedBeforeOpen = existsSync22(dbPath);
+  const dbPath = join22(storageDir, "context.db");
+  const existedBeforeOpen = existsSync23(dbPath);
   if (existedBeforeOpen)
     add(results, "pass", `Shared context DB exists at ${dbPath}`);
   else
@@ -164230,8 +164330,8 @@ async function runHealthChecks(options) {
     add(results, "pass", "Pi extension cache clean (no stale cached package found)");
   }
   const logPath = getMagicContextLogPath2("pi");
-  if (existsSync22(logPath)) {
-    const stat = statSync5(logPath);
+  if (existsSync23(logPath)) {
+    const stat = statSync6(logPath);
     const sizeKb = (stat.size / 1024).toFixed(0);
     const lines = readFileSync18(logPath, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     add(results, "info", `Log file: ${logPath} (${sizeKb} KB)`);
@@ -164289,7 +164389,7 @@ function repair(plan, prompts) {
   }
   if (plan.writeUserConfig) {
     const configPath = getPiUserConfigPath();
-    if (!existsSync22(configPath)) {
+    if (!existsSync23(configPath)) {
       try {
         writeDefaultMagicContextConfig(configPath);
         prompts.log.success(`Wrote default Magic Context config to ${configPath}`);
@@ -164458,7 +164558,7 @@ var init_doctor_pi = __esm(async () => {
     isDatabasePersisted,
     closeDatabase,
     now: () => new Date,
-    execFileSync: execFileSync4,
+    execFileSync: execFileSync3,
     spawnSync: spawnSync3
   };
 });
@@ -164468,7 +164568,7 @@ var exports_doctor = {};
 __export(exports_doctor, {
   runDoctor: () => runDoctor3
 });
-import { existsSync as existsSync23, rmSync as rmSync3 } from "node:fs";
+import { existsSync as existsSync24, rmSync as rmSync3 } from "node:fs";
 async function runDoctor3(options) {
   if (options.clear)
     return runClear();
@@ -164552,7 +164652,7 @@ async function runClear() {
     const s = spinner();
     s.start(`Clearing ${item.path}`);
     try {
-      if (existsSync23(item.path)) {
+      if (existsSync24(item.path)) {
         rmSync3(item.path, { recursive: true, force: true });
       }
       s.stop(`Cleared ${item.path}`);