@cortexkit/magic-context 0.19.0 → 0.20.0

package/dist/index.js

@@ -8300,7 +8300,7 @@ function parseModelListOutput(output) {
     if (!line || line.toLowerCase().includes("usage:"))
       continue;
     const token = line.split(/\s+/)[0]?.trim().replace(/,$/, "");
-    if (!token || !token.includes("/"))
+    if (!token?.includes("/"))
       continue;
     if (/^https?:\/\//.test(token))
       continue;
@@ -8506,7 +8506,7 @@ class PiAdapter {
     }
   }
   getInstallHint() {
-    return "Install Pi: https://pi.coding/install (npm: @mariozechner/pi-coding-agent)";
+    return "Install Pi: https://pi.coding/install (npm: @earendil-works/pi-coding-agent)";
   }
   getPluginCacheInfo() {
     return { path: null, exists: false, sizeBytes: 0 };
@@ -11353,11 +11353,11 @@ async function runSetup2(options = {}) {
   }
   const version = env.getPiVersion(pi.path);
   spinner2.stop(version ? `Pi ${version} detected at ${pi.path}` : `Pi detected at ${pi.path}`);
-  const MIN_PI_VERSION = "0.71.0";
+  const MIN_PI_VERSION = "0.74.0";
   if (version && comparePiVersion(version, MIN_PI_VERSION) < 0) {
     prompts.log.warn(`Pi ${version} is older than the required ${MIN_PI_VERSION}.
-Magic Context spawns subagents with \`--extension <path>\` (long form), which Pi 0.71.0 introduced. Older Pi versions hard-fail with "Unknown option" when historian/dreamer/sidekick tries to run.
-Run \`pi update\` (or \`npm install -g @mariozechner/pi-coding-agent@latest\`) before continuing.`);
+Pi 0.74.0 renamed the npm package from \`@mariozechner/pi-coding-agent\` to \`@earendil-works/pi-coding-agent\`. Magic Context's peer dependency targets the new scope, so older Pi installs cannot load this extension.
+Run \`pi update --self\` (or \`npm install -g @earendil-works/pi-coding-agent@latest\`) before continuing.`);
     const proceed = await prompts.confirm("Continue with setup anyway? (subagents will fail at runtime)", false);
     if (!proceed) {
       prompts.outro("Setup cancelled — upgrade Pi and try again.");
@@ -27631,6 +27631,78 @@ var init_config = __esm(() => {
   init_variable();
 });
 
+// ../plugin/src/features/magic-context/key-files/aft-availability.ts
+import { existsSync as existsSync13, readFileSync as readFileSync9 } from "node:fs";
+import { homedir as homedir9 } from "node:os";
+import { join as join11 } from "node:path";
+function parseConfig(path4) {
+  if (!existsSync13(path4))
+    return null;
+  return import_comment_json6.parse(readFileSync9(path4, "utf-8"));
+}
+function entryMatchesAft(entry) {
+  const value = Array.isArray(entry) ? entry[0] : entry;
+  return typeof value === "string" && (value.includes("@cortexkit/aft") || value.includes("aft-opencode") || value.includes("aft-pi"));
+}
+function hasAftInArray(value) {
+  return Array.isArray(value) && value.some(entryMatchesAft);
+}
+function hasAftAtKeys(value, keys) {
+  if (!value || typeof value !== "object")
+    return false;
+  const record2 = value;
+  for (const key of keys) {
+    if (hasAftInArray(record2[key]))
+      return true;
+  }
+  return false;
+}
+function getAftAvailability() {
+  const home = process.env.HOME || homedir9();
+  const opencodePaths = [
+    join11(home, ".config", "opencode", "opencode.jsonc"),
+    join11(home, ".config", "opencode", "opencode.json")
+  ];
+  const piPaths = [join11(home, ".pi", "agent", "settings.json")];
+  const checkedPaths = [...opencodePaths, ...piPaths];
+  let opencode = false;
+  for (const path4 of opencodePaths) {
+    try {
+      const config2 = parseConfig(path4);
+      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"])) {
+        opencode = true;
+        break;
+      }
+    } catch {}
+  }
+  let pi = false;
+  for (const path4 of piPaths) {
+    try {
+      const config2 = parseConfig(path4);
+      if (hasAftAtKeys(config2, ["packages", "extensions"])) {
+        pi = true;
+        break;
+      }
+      const agent = config2?.agent;
+      if (hasAftAtKeys(agent, ["packages", "extensions"])) {
+        pi = true;
+        break;
+      }
+    } catch {}
+  }
+  const detected = opencode || pi;
+  return {
+    available: overrideAvailability ?? detected,
+    opencode,
+    pi,
+    checkedPaths
+  };
+}
+var import_comment_json6, overrideAvailability = null;
+var init_aft_availability = __esm(() => {
+  import_comment_json6 = __toESM(require_src2(), 1);
+});
+
 // ../plugin/src/features/magic-context/memory/embedding-probe.ts
 async function probeEmbeddingEndpoint(options) {
   const endpoint = options.endpoint.trim().replace(/\/+$/, "");
@@ -27736,8 +27808,8 @@ function truncate(text2) {
 var DEFAULT_TIMEOUT_MS = 1e4, MAX_PREVIEW_CHARS = 240;
 
 // ../plugin/src/shared/tui-config.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync6, readFileSync as readFileSync9, writeFileSync as writeFileSync8 } from "node:fs";
-import { dirname as dirname8, join as join11 } from "node:path";
+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";
 function isMagicContextEntry(entry) {
   if (!entry)
     return false;
@@ -27751,11 +27823,11 @@ function isMagicContextEntry(entry) {
 }
 function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
-  const jsoncPath = join11(configDir, "tui.jsonc");
-  const jsonPath = join11(configDir, "tui.json");
-  if (existsSync13(jsoncPath))
+  const jsoncPath = join12(configDir, "tui.jsonc");
+  const jsonPath = join12(configDir, "tui.json");
+  if (existsSync14(jsoncPath))
     return jsoncPath;
-  if (existsSync13(jsonPath))
+  if (existsSync14(jsonPath))
     return jsonPath;
   return jsonPath;
 }
@@ -27763,9 +27835,9 @@ function ensureTuiPluginEntry() {
   try {
     const configPath = resolveTuiConfigPath();
     let config2 = {};
-    if (existsSync13(configPath)) {
-      const raw = readFileSync9(configPath, "utf-8");
-      config2 = import_comment_json6.parse(raw) ?? {};
+    if (existsSync14(configPath)) {
+      const raw = readFileSync10(configPath, "utf-8");
+      config2 = import_comment_json7.parse(raw) ?? {};
     }
     const plugins = Array.isArray(config2.plugin) ? config2.plugin.filter((p2) => typeof p2 === "string") : [];
     const existingIdx = plugins.findIndex(isMagicContextEntry);
@@ -27784,7 +27856,7 @@ function ensureTuiPluginEntry() {
     }
     config2.plugin = plugins;
     mkdirSync6(dirname8(configPath), { recursive: true });
-    writeFileSync8(configPath, `${import_comment_json6.stringify(config2, null, 2)}
+    writeFileSync8(configPath, `${import_comment_json7.stringify(config2, null, 2)}
 `);
     log2(`[magic-context] updated TUI plugin entry in ${configPath}`);
     return true;
@@ -27793,11 +27865,11 @@ function ensureTuiPluginEntry() {
     return false;
   }
 }
-var import_comment_json6, PLUGIN_NAME4 = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY3;
+var import_comment_json7, PLUGIN_NAME4 = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY3;
 var init_tui_config = __esm(() => {
   init_logger();
   init_opencode_config_dir();
-  import_comment_json6 = __toESM(require_src2(), 1);
+  import_comment_json7 = __toESM(require_src2(), 1);
   PLUGIN_ENTRY3 = `${PLUGIN_NAME4}@latest`;
 });
 
@@ -27852,7 +27924,7 @@ var init_compartment_parser = __esm(() => {
 });
 
 // src/lib/redaction.ts
-import { homedir as homedir9, userInfo } from "node:os";
+import { homedir as homedir10, userInfo } from "node:os";
 function escapeRegex2(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -27865,7 +27937,7 @@ function isSecretKey(key) {
   return SECRET_KEY_PATTERN.test(key);
 }
 function sanitizePathString(value) {
-  const home = homedir9();
+  const home = homedir10();
   const username = userInfo().username;
   let sanitized = value;
   if (home) {
@@ -27967,10 +28039,10 @@ var init_redaction = __esm(() => {
 });
 
 // src/lib/diagnostics-opencode.ts
-import { existsSync as existsSync14, readdirSync as readdirSync2, readFileSync as readFileSync10, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync15, readdirSync as readdirSync2, readFileSync as readFileSync11, statSync as statSync2 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
-import { homedir as homedir10 } from "node:os";
-import { join as join12 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { join as join13 } from "node:path";
 function getSelfVersion() {
   const require2 = createRequire3(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
@@ -27984,12 +28056,12 @@ function getSelfVersion() {
   return "unknown";
 }
 function getPluginCacheInfo() {
-  const path4 = join12(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY_WITH_VERSION);
+  const path4 = join13(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY_WITH_VERSION);
   let cached2;
   try {
-    const installedPkgPath = join12(path4, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
-    if (existsSync14(installedPkgPath)) {
-      const pkg = JSON.parse(readFileSync10(installedPkgPath, "utf-8"));
+    const installedPkgPath = join13(path4, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
+    if (existsSync15(installedPkgPath)) {
+      const pkg = JSON.parse(readFileSync11(installedPkgPath, "utf-8"));
       cached2 = typeof pkg.version === "string" ? pkg.version : undefined;
     }
   } catch {
@@ -27998,12 +28070,12 @@ function getPluginCacheInfo() {
   return { path: path4, cached: cached2, latest: getSelfVersion() };
 }
 function getStorageDir() {
-  const dataHome = process.env.XDG_DATA_HOME || join12(homedir10(), ".local", "share");
-  return join12(dataHome, "cortexkit", "magic-context");
+  const dataHome = process.env.XDG_DATA_HOME || join13(homedir11(), ".local", "share");
+  return join13(dataHome, "cortexkit", "magic-context");
 }
 function fileSize(path4) {
   try {
-    return existsSync14(path4) ? statSync2(path4).size : 0;
+    return existsSync15(path4) ? statSync2(path4).size : 0;
   } catch {
     return 0;
   }
@@ -28015,11 +28087,11 @@ function sanitizeValue(value) {
   return sanitizeConfigValue(value);
 }
 function readConfig2(path4) {
-  if (!existsSync14(path4))
+  if (!existsSync15(path4))
     return { value: null };
   try {
-    const raw = readFileSync10(path4, "utf-8");
-    const value = import_comment_json7.parse(raw);
+    const raw = readFileSync11(path4, "utf-8");
+    const value = import_comment_json8.parse(raw);
     return { value };
   } catch (error51) {
     return { value: null, error: error51 instanceof Error ? error51.message : String(error51) };
@@ -28041,7 +28113,7 @@ function configHasPluginEntry(config2) {
 }
 function parseHistorianDumpMeta(path4) {
   try {
-    const xml = readFileSync10(path4, "utf-8");
+    const xml = readFileSync11(path4, "utf-8");
     const parsed = parseCompartmentOutput(xml);
     const factCountByCategory = {};
     for (const fact of parsed.facts) {
@@ -28074,11 +28146,11 @@ function parseHistorianDumpMeta(path4) {
   }
 }
 function listDumpsInDir(dir, limit) {
-  if (!existsSync14(dir))
+  if (!existsSync15(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync2(dir).filter((name) => name.endsWith(".xml")).map((name) => {
-      const stat = statSync2(join12(dir, name));
+      const stat = statSync2(join13(dir, name));
       return {
         name,
         mtime: stat.mtimeMs,
@@ -28087,7 +28159,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(join12(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta(join13(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -28142,8 +28214,8 @@ function collectHistorianDumps(recentSessions) {
   };
 }
 async function collectRecentSessions() {
-  const opencodeDbPath = join12(homedir10(), ".local", "share", "opencode", "opencode.db");
-  if (!existsSync14(opencodeDbPath))
+  const opencodeDbPath = join13(homedir11(), ".local", "share", "opencode", "opencode.db");
+  if (!existsSync15(opencodeDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -28177,8 +28249,8 @@ async function collectRecentSessions() {
   }
 }
 async function collectHistorianFailures(storageDirPath) {
-  const contextDbPath = join12(storageDirPath, "context.db");
-  if (!existsSync14(contextDbPath))
+  const contextDbPath = join13(storageDirPath, "context.db");
+  if (!existsSync15(contextDbPath))
     return [];
   if (typeof globalThis.Bun === "undefined") {
     return [];
@@ -28217,9 +28289,9 @@ async function collectDiagnostics() {
   const tuiConfig = readConfig2(configPaths.tuiConfig);
   const magicContextConfig = readConfig2(configPaths.magicContextConfig);
   const storageDirPath = getStorageDir();
-  const contextDbPath = join12(storageDirPath, "context.db");
+  const contextDbPath = join13(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("opencode");
-  const logFileSize = existsSync14(logPath) ? statSync2(logPath).size : 0;
+  const logFileSize = existsSync15(logPath) ? statSync2(logPath).size : 0;
   const conflictResult = detectConflicts(process.cwd());
   const recentSessions = await collectRecentSessions();
   return {
@@ -28234,14 +28306,15 @@ async function collectDiagnostics() {
     opencodeConfigHasPlugin: configHasPluginEntry(opencodeConfig.value),
     tuiConfigHasPlugin: configHasPluginEntry(tuiConfig.value),
     magicContextConfig: {
-      exists: existsSync14(configPaths.magicContextConfig),
+      exists: existsSync15(configPaths.magicContextConfig),
       ...magicContextConfig.error ? { parseError: magicContextConfig.error } : {},
       flags: sanitizeValue(magicContextConfig.value ?? {}) ?? {}
     },
+    aft: getAftAvailability(),
     pluginCache: getPluginCacheInfo(),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync14(storageDirPath),
+      exists: existsSync15(storageDirPath),
       contextDbSizeBytes: fileSize(contextDbPath)
     },
     conflicts: {
@@ -28250,7 +28323,7 @@ async function collectDiagnostics() {
     },
     logFile: {
       path: logPath,
-      exists: existsSync14(logPath),
+      exists: existsSync15(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -28316,6 +28389,7 @@ function renderDiagnosticsMarkdown(report) {
     `- Plugin registered in opencode config: ${report.opencodeConfigHasPlugin}`,
     `- Plugin registered in tui config: ${report.tuiConfigHasPlugin}`,
     `- magic-context.jsonc parse error: ${report.magicContextConfig.parseError ?? "none"}`,
+    `- AFT available: ${report.aft?.available ?? false} (opencode=${report.aft?.opencode ?? false}, pi=${report.aft?.pi ?? false})`,
     `- Conflicts detected: ${report.conflicts.hasConflict ? report.conflicts.reasons.join("; ") : "none"}`,
     "",
     "### Config paths",
@@ -28364,22 +28438,23 @@ function renderDiagnosticsMarkdown(report) {
   ].join(`
 `);
 }
-var import_comment_json7, PLUGIN_NAME5 = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY_WITH_VERSION;
+var import_comment_json8, PLUGIN_NAME5 = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY_WITH_VERSION;
 var init_diagnostics_opencode = __esm(() => {
+  init_aft_availability();
   init_compartment_parser();
   init_conflict_detector();
   init_data_path();
   init_opencode_helpers();
   init_paths();
   init_redaction();
-  import_comment_json7 = __toESM(require_src2(), 1);
+  import_comment_json8 = __toESM(require_src2(), 1);
   PLUGIN_ENTRY_WITH_VERSION = `${PLUGIN_NAME5}@latest`;
 });
 
 // src/lib/logs-opencode.ts
-import { readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "node:fs";
-import { homedir as homedir11 } from "node:os";
-import { join as join13 } from "node:path";
+import { readFileSync as readFileSync12, writeFileSync as writeFileSync9 } from "node:fs";
+import { homedir as homedir12 } from "node:os";
+import { join as join14 } from "node:path";
 function sanitizeLogContent(content) {
   return sanitizeDiagnosticText(content);
 }
@@ -28421,7 +28496,7 @@ function filterLogLinesBySession(lines, sessionId) {
 }
 async function bundleIssueReport(report, description, _title, sessionFilter = null) {
   const LOG_TAIL_LINES = 400;
-  const allLogLines = report.logFile.exists ? readFileSync11(report.logFile.path, "utf-8").split(/\r?\n/) : [];
+  const allLogLines = report.logFile.exists ? readFileSync12(report.logFile.path, "utf-8").split(/\r?\n/) : [];
   const logLines = filterLogLinesBySession(allLogLines, sessionFilter);
   const recentLog = sanitizeLogContent(logLines.slice(-LOG_TAIL_LINES).join(`
 `)).trim();
@@ -28429,7 +28504,7 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
 `));
   const historianFailureLines = extractHistorianFailureLines(historianScanWindow, 30);
   const configBody = JSON.stringify(sanitizeConfigValue(report.magicContextConfig.flags), null, 2);
-  const sanitizedConfigPath = report.configPaths.magicContextConfig.replace(homedir11(), "~");
+  const sanitizedConfigPath = report.configPaths.magicContextConfig.replace(homedir12(), "~");
   const bodyMarkdown = [
     "## Description",
     description,
@@ -28460,7 +28535,7 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
     "```"
   ].join(`
 `);
-  const path4 = join13(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
+  const path4 = join14(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
   writeFileSync9(path4, `${bodyMarkdown}
 `);
   return { path: path4, bodyMarkdown };
@@ -28482,10 +28557,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 existsSync15, readFileSync as readFileSync12, rmSync, statSync as statSync3, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync16, readFileSync as readFileSync13, rmSync, statSync as statSync3, writeFileSync as writeFileSync10 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
-import { homedir as homedir12 } from "node:os";
-import { join as join14 } from "node:path";
+import { homedir as homedir13 } from "node:os";
+import { join as join15 } from "node:path";
 async function fetchNpmLatest(pkg, timeoutMs = 5000) {
   try {
     const controller = new AbortController;
@@ -28535,15 +28610,15 @@ function compareVersions(a, b2) {
 }
 async function clearPluginCache(force = false) {
   const cacheDir = getOpenCodeCacheDir();
-  const pluginCacheDir = join14(cacheDir, "packages", PLUGIN_ENTRY_WITH_VERSION2);
-  if (!existsSync15(pluginCacheDir)) {
+  const pluginCacheDir = join15(cacheDir, "packages", PLUGIN_ENTRY_WITH_VERSION2);
+  if (!existsSync16(pluginCacheDir)) {
     return { action: "not_found", path: pluginCacheDir };
   }
   let cachedVersion;
   try {
-    const installedPkgPath = join14(pluginCacheDir, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
-    if (existsSync15(installedPkgPath)) {
-      const pkg = JSON.parse(readFileSync12(installedPkgPath, "utf-8"));
+    const installedPkgPath = join15(pluginCacheDir, "node_modules", "@cortexkit", "opencode-magic-context", "package.json");
+    if (existsSync16(installedPkgPath)) {
+      const pkg = JSON.parse(readFileSync13(installedPkgPath, "utf-8"));
       if (typeof pkg?.version === "string") {
         cachedVersion = pkg.version;
       }
@@ -28675,12 +28750,12 @@ async function runIssueFlow() {
   }
 }
 async function checkEmbeddingConfig(magicContextConfigPath) {
-  if (!existsSync15(magicContextConfigPath)) {
+  if (!existsSync16(magicContextConfigPath)) {
     return { issues: 0 };
   }
   let rawText;
   try {
-    rawText = readFileSync12(magicContextConfigPath, "utf-8");
+    rawText = readFileSync13(magicContextConfigPath, "utf-8");
   } catch {
     log.warn("Could not read magic-context.jsonc for embedding check");
     return { issues: 1 };
@@ -28691,7 +28766,7 @@ async function checkEmbeddingConfig(magicContextConfigPath) {
   });
   let parsedConfig;
   try {
-    parsedConfig = import_comment_json8.parse(substituted.text);
+    parsedConfig = import_comment_json9.parse(substituted.text);
   } catch (error51) {
     log.warn(`Embedding check skipped — could not parse magic-context.jsonc: ${error51 instanceof Error ? error51.message : String(error51)}`);
     return { issues: 1 };
@@ -28828,15 +28903,15 @@ async function runDoctor(options = {}) {
   } else {
     pass(`OpenCode config: ${paths.opencodeConfig}`);
   }
-  if (existsSync15(paths.magicContextConfig)) {
+  if (existsSync16(paths.magicContextConfig)) {
     pass(`Magic Context config: ${paths.magicContextConfig}`);
     try {
-      const raw = readFileSync12(paths.magicContextConfig, "utf-8");
+      const raw = readFileSync13(paths.magicContextConfig, "utf-8");
       const substituted = substituteConfigVariables({
         text: raw,
         configPath: paths.magicContextConfig
       }).text;
-      import_comment_json8.parse(substituted);
+      import_comment_json9.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)}`);
@@ -28856,10 +28931,10 @@ async function runDoctor(options = {}) {
     warn(`No magic-context.jsonc found — using defaults`);
     log.info("  Run 'setup' to create one with model recommendations");
   }
-  if (existsSync15(paths.magicContextConfig)) {
+  if (existsSync16(paths.magicContextConfig)) {
     try {
-      const mcRaw = readFileSync12(paths.magicContextConfig, "utf-8");
-      const mcConfig = import_comment_json8.parse(mcRaw);
+      const mcRaw = readFileSync13(paths.magicContextConfig, "utf-8");
+      const mcConfig = import_comment_json9.parse(mcRaw);
       let mcChanged = false;
       const experimental = mcConfig.experimental;
       if (experimental && "compaction_markers" in experimental) {
@@ -28934,7 +29009,7 @@ async function runDoctor(options = {}) {
         fixed++;
       }
       if (mcChanged) {
-        writeFileSync10(paths.magicContextConfig, `${import_comment_json8.stringify(mcConfig, null, 2)}
+        writeFileSync10(paths.magicContextConfig, `${import_comment_json9.stringify(mcConfig, null, 2)}
 `);
       }
     } catch {
@@ -28943,8 +29018,8 @@ async function runDoctor(options = {}) {
   }
   if (paths.opencodeConfigFormat !== "none") {
     try {
-      const raw = readFileSync12(paths.opencodeConfig, "utf-8");
-      const config2 = import_comment_json8.parse(raw);
+      const raw = readFileSync13(paths.opencodeConfig, "utf-8");
+      const config2 = import_comment_json9.parse(raw);
       const rawPlugins = Array.isArray(config2?.plugin) ? config2.plugin : [];
       const existingIdx = rawPlugins.findIndex((entry) => matchesPluginEntry(entry, PLUGIN_NAME6) || isDevPathPluginEntry(entry));
       const configName = paths.opencodeConfigFormat === "jsonc" ? "opencode.jsonc" : "opencode.json";
@@ -28975,7 +29050,7 @@ async function runDoctor(options = {}) {
               rawPlugins[existingIdx] = PLUGIN_ENTRY_WITH_VERSION2;
             }
             config2.plugin = rawPlugins;
-            writeFileSync10(paths.opencodeConfig, `${import_comment_json8.stringify(config2, null, 2)}
+            writeFileSync10(paths.opencodeConfig, `${import_comment_json9.stringify(config2, null, 2)}
 `);
             pass(`Upgraded plugin entry in ${configName}: ${oldEntryStr} → ${PLUGIN_ENTRY_WITH_VERSION2}`);
             fixed++;
@@ -28984,7 +29059,7 @@ async function runDoctor(options = {}) {
       } else {
         rawPlugins.push(PLUGIN_ENTRY_WITH_VERSION2);
         config2.plugin = rawPlugins;
-        writeFileSync10(paths.opencodeConfig, `${import_comment_json8.stringify(config2, null, 2)}
+        writeFileSync10(paths.opencodeConfig, `${import_comment_json9.stringify(config2, null, 2)}
 `);
         pass(`Added plugin to ${configName}`);
         fixed++;
@@ -29015,10 +29090,10 @@ async function runDoctor(options = {}) {
     pass("Added TUI sidebar plugin to tui.json");
     warn("Restart OpenCode to see the sidebar");
     fixed++;
-  } else if (existsSync15(paths.tuiConfig)) {
+  } else if (existsSync16(paths.tuiConfig)) {
     try {
-      const tuiRaw = readFileSync12(paths.tuiConfig, "utf-8");
-      const tuiConfig = import_comment_json8.parse(tuiRaw);
+      const tuiRaw = readFileSync13(paths.tuiConfig, "utf-8");
+      const tuiConfig = import_comment_json9.parse(tuiRaw);
       const tuiRawPlugins = Array.isArray(tuiConfig?.plugin) ? tuiConfig.plugin : [];
       const tuiIdx = tuiRawPlugins.findIndex((entry) => matchesPluginEntry(entry, PLUGIN_NAME6) || isDevPathPluginEntry(entry));
       const tuiEntryAsString = (entry) => {
@@ -29046,7 +29121,7 @@ async function runDoctor(options = {}) {
               tuiRawPlugins[tuiIdx] = PLUGIN_ENTRY_WITH_VERSION2;
             }
             tuiConfig.plugin = tuiRawPlugins;
-            writeFileSync10(paths.tuiConfig, `${import_comment_json8.stringify(tuiConfig, null, 2)}
+            writeFileSync10(paths.tuiConfig, `${import_comment_json9.stringify(tuiConfig, null, 2)}
 `);
             pass(`Upgraded TUI plugin: ${tuiEntryStr} → ${PLUGIN_ENTRY_WITH_VERSION2}`);
             fixed++;
@@ -29063,10 +29138,10 @@ async function runDoctor(options = {}) {
   } else {
     pass("TUI sidebar plugin configured (tui.json created)");
   }
-  if (existsSync15(paths.magicContextConfig)) {
+  if (existsSync16(paths.magicContextConfig)) {
     try {
-      const mcRaw = readFileSync12(paths.magicContextConfig, "utf-8");
-      const mcConfig = import_comment_json8.parse(mcRaw);
+      const mcRaw = readFileSync13(paths.magicContextConfig, "utf-8");
+      const mcConfig = import_comment_json9.parse(mcRaw);
       const dreamerObj = mcConfig?.dreamer;
       const dreamerEnabled = dreamerObj?.enabled === true;
       const userMemObj = dreamerObj?.user_memories;
@@ -29075,6 +29150,15 @@ async function runDoctor(options = {}) {
         log.warn("dreamer.user_memories is enabled (default) but dreamer itself is disabled — user memory candidates will be collected but never promoted to stable memories. Enable `dreamer.enabled: true` or set `dreamer.user_memories.enabled: false` to silence this.");
         issues++;
       }
+      const pinKeyFilesObj = dreamerObj?.pin_key_files;
+      if (pinKeyFilesObj?.enabled === true) {
+        const aft = getAftAvailability();
+        if (aft.available) {
+          pass("AFT detected for dreamer.pin_key_files");
+        } else {
+          fail(`dreamer.pin_key_files is enabled but AFT is not configured. Install/register AFT (checked: ${aft.checkedPaths.join(", ")})`);
+        }
+      }
     } catch {}
   }
   const embeddingCheck = await checkEmbeddingConfig(paths.magicContextConfig);
@@ -29083,8 +29167,8 @@ async function runDoctor(options = {}) {
     failCount += embeddingCheck.issues;
   else
     passCount++;
-  const dbPath = join14(getMagicContextStorageDir(), "context.db");
-  if (!existsSync15(dbPath)) {
+  const dbPath = join15(getMagicContextStorageDir(), "context.db");
+  if (!existsSync16(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}`);
@@ -29145,10 +29229,10 @@ async function runDoctor(options = {}) {
   }
   {
     const ageWarnings = [];
-    const npmrcPath = join14(homedir12(), ".npmrc");
-    if (existsSync15(npmrcPath)) {
+    const npmrcPath = join15(homedir13(), ".npmrc");
+    if (existsSync16(npmrcPath)) {
       try {
-        const npmrc = readFileSync12(npmrcPath, "utf-8");
+        const npmrc = readFileSync13(npmrcPath, "utf-8");
         for (const line of npmrc.split(`
 `)) {
           const trimmed = line.trim();
@@ -29172,7 +29256,7 @@ async function runDoctor(options = {}) {
     }
   }
   const logPath = getMagicContextLogPath2("opencode");
-  if (existsSync15(logPath)) {
+  if (existsSync16(logPath)) {
     const logStat = statSync3(logPath);
     const sizeKb = (logStat.size / 1024).toFixed(0);
     log.info(`Log file: ${logPath} (${sizeKb} KB)`);
@@ -29218,10 +29302,11 @@ async function runDoctor(options = {}) {
   }
   return 0;
 }
-var import_comment_json8, PLUGIN_NAME6 = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY_WITH_VERSION2, CLI_PACKAGE_NAME = "@cortexkit/magic-context";
+var import_comment_json9, PLUGIN_NAME6 = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY_WITH_VERSION2, CLI_PACKAGE_NAME = "@cortexkit/magic-context";
 var init_doctor_opencode = __esm(async () => {
   init_config();
   init_variable();
+  init_aft_availability();
   init_conflict_detector();
   init_conflict_fixer();
   init_data_path();
@@ -29233,7 +29318,7 @@ var init_doctor_opencode = __esm(async () => {
   init_paths();
   init_prompts();
   await init_sqlite();
-  import_comment_json8 = __toESM(require_src2(), 1);
+  import_comment_json9 = __toESM(require_src2(), 1);
   PLUGIN_ENTRY_WITH_VERSION2 = `${PLUGIN_NAME6}@latest`;
 });
 
@@ -161820,6 +161905,34 @@ function getErrorMessage(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
 
+// ../plugin/src/features/magic-context/key-files/project-key-files.ts
+import { existsSync as existsSync17, 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
+               FROM project_key_files
+              GROUP BY project_path
+             HAVING lastGen < ?`).all(cutoff);
+  let deletedProjects = 0;
+  for (const row of rows) {
+    if (existsSync17(row.projectPath))
+      continue;
+    try {
+      db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
+      db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      deletedProjects++;
+    } catch (error51) {
+      log2(`[key-files] orphan GC failed for ${row.projectPath}:`, error51);
+    }
+  }
+  return deletedProjects;
+}
+var ORPHAN_GRACE_MS;
+var init_project_key_files = __esm(() => {
+  init_logger();
+  ORPHAN_GRACE_MS = 7 * 24 * 60 * 60 * 1000;
+});
+
 // ../plugin/src/features/magic-context/migrations.ts
 function ensureMigrationsTable(db) {
   db.exec(`
@@ -162187,6 +162300,46 @@ var init_migrations = __esm(async () => {
           db.exec("ALTER TABLE session_meta ADD COLUMN pending_compaction_marker_state TEXT");
         }
       }
+    },
+    {
+      version: 14,
+      description: "Add project-scoped key files and version counter",
+      up: (db) => {
+        db.exec(`
+                CREATE TABLE IF NOT EXISTS project_key_files (
+                    project_path           TEXT    NOT NULL,
+                    path                   TEXT    NOT NULL,
+                    content                TEXT    NOT NULL,
+                    content_hash           TEXT    NOT NULL,
+                    local_token_estimate   INTEGER NOT NULL,
+                    generated_at           INTEGER NOT NULL,
+                    generated_by_model     TEXT,
+                    generation_config_hash TEXT    NOT NULL,
+                    stale_reason           TEXT,
+                    PRIMARY KEY (project_path, path)
+                );
+
+                CREATE INDEX IF NOT EXISTS idx_project_key_files_project
+                    ON project_key_files(project_path);
+                CREATE INDEX IF NOT EXISTS idx_project_key_files_generated_at
+                    ON project_key_files(project_path, generated_at);
+
+                CREATE TABLE IF NOT EXISTS project_key_files_version (
+                    project_path TEXT    PRIMARY KEY,
+                    version      INTEGER NOT NULL DEFAULT 0
+                );
+            `);
+      }
+    },
+    {
+      version: 15,
+      description: "Add deferred_execute_state column for boundary execution drain",
+      up: (db) => {
+        const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+        if (!cols.some((c2) => c2.name === "deferred_execute_state")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN deferred_execute_state TEXT");
+        }
+      }
     }
   ];
 });
@@ -162224,10 +162377,10 @@ var init_tool_definition_tokens = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/tool-owner-backfill.ts
-import { existsSync as existsSync16 } from "node:fs";
-import { join as join15 } from "node:path";
+import { existsSync as existsSync18 } from "node:fs";
+import { join as join16 } from "node:path";
 function resolveOpencodeDbPath() {
-  return join15(getDataDir(), "opencode", "opencode.db");
+  return join16(getDataDir(), "opencode", "opencode.db");
 }
 function ensureBackfillStateTable(db) {
   db.exec(`
@@ -162262,7 +162415,7 @@ function runToolOwnerBackfill(db) {
     return result;
   }
   const opencodeDbPath = resolveOpencodeDbPath();
-  if (!existsSync16(opencodeDbPath)) {
+  if (!existsSync18(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");
@@ -162472,25 +162625,25 @@ var init_tool_owner_backfill = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/storage-db.ts
-import { copyFileSync, cpSync, existsSync as existsSync17, mkdirSync as mkdirSync7 } from "node:fs";
-import { join as join16 } from "node:path";
+import { copyFileSync, cpSync, existsSync as existsSync19, mkdirSync as mkdirSync7 } from "node:fs";
+import { join as join17 } from "node:path";
 function resolveDatabasePath() {
   const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join16(dbDir, "context.db") };
+  return { dbDir, dbPath: join17(dbDir, "context.db") };
 }
 function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
-  if (existsSync17(targetDbPath))
+  if (existsSync19(targetDbPath))
     return;
   const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join16(legacyDir, "context.db");
-  if (!existsSync17(legacyDbPath))
+  const legacyDbPath = join17(legacyDir, "context.db");
+  if (!existsSync19(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 = join16(targetDbDir, `context.db${suffix}`);
-    if (existsSync17(src)) {
+    const dst = join17(targetDbDir, `context.db${suffix}`);
+    if (existsSync19(src)) {
       try {
         copyFileSync(src, dst);
       } catch (error51) {
@@ -162498,9 +162651,9 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
       }
     }
   }
-  const legacyModelsDir = join16(legacyDir, "models");
-  const targetModelsDir = join16(targetDbDir, "models");
-  if (existsSync17(legacyModelsDir) && !existsSync17(targetModelsDir)) {
+  const legacyModelsDir = join17(legacyDir, "models");
+  const targetModelsDir = join17(targetDbDir, "models");
+  if (existsSync19(legacyModelsDir) && !existsSync19(targetModelsDir)) {
     try {
       cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
     } catch (error51) {
@@ -162648,6 +162801,26 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
     );
     CREATE INDEX IF NOT EXISTS idx_dream_runs_project ON dream_runs(project_path, finished_at DESC);
 
+    CREATE TABLE IF NOT EXISTS project_key_files (
+      project_path           TEXT    NOT NULL,
+      path                   TEXT    NOT NULL,
+      content                TEXT    NOT NULL,
+      content_hash           TEXT    NOT NULL,
+      local_token_estimate   INTEGER NOT NULL,
+      generated_at           INTEGER NOT NULL,
+      generated_by_model     TEXT,
+      generation_config_hash TEXT    NOT NULL,
+      stale_reason           TEXT,
+      PRIMARY KEY (project_path, path)
+    );
+    CREATE INDEX IF NOT EXISTS idx_project_key_files_project ON project_key_files(project_path);
+    CREATE INDEX IF NOT EXISTS idx_project_key_files_generated_at ON project_key_files(project_path, generated_at);
+
+    CREATE TABLE IF NOT EXISTS project_key_files_version (
+      project_path TEXT    PRIMARY KEY,
+      version      INTEGER NOT NULL DEFAULT 0
+    );
+
     -- (smart_notes: see note above; merged into unified notes table by migration v1)
 
     CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
@@ -162725,7 +162898,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- valid JSON blob written via setPendingCompactionMarkerState.
       -- Excluded from healNullTextColumns. Readers filter IS NOT NULL AND
       -- != empty-string defensively. Plan v6 section 3.
-      pending_compaction_marker_state TEXT
+      pending_compaction_marker_state TEXT,
+      -- deferred_execute_state: intentionally NULLABLE without a default.
+      -- Absence is SQL NULL; presence is a JSON blob written via
+      -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
+      deferred_execute_state TEXT
     );
 
     CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
@@ -162814,6 +162991,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "source_contents", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -162890,7 +163068,15 @@ function ensureColumn(db, table, column, definition) {
   if (rows.some((row) => row.name === column)) {
     return;
   }
-  db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
+  try {
+    db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
+  } catch (err) {
+    const recheck = db.prepare(`PRAGMA table_info(${table})`).all();
+    if (recheck.some((row) => row.name === column)) {
+      return;
+    }
+    throw err;
+  }
 }
 function openDatabase() {
   const { dbDir, dbPath } = resolveDatabasePath();
@@ -162907,6 +163093,11 @@ function openDatabase() {
     const db = new Database(dbPath);
     initializeDatabase(db);
     runMigrations(db);
+    try {
+      deleteOrphanProjectKeyFiles(db);
+    } catch (error51) {
+      log2(`[magic-context] key-files orphan GC failed: ${getErrorMessage(error51)}`);
+    }
     try {
       runToolOwnerBackfill(db);
     } catch (error51) {
@@ -162942,6 +163133,7 @@ var databases, persistenceByDatabase, persistenceErrorByDatabase;
 var init_storage_db = __esm(async () => {
   init_data_path();
   init_logger();
+  init_project_key_files();
   init_tool_definition_tokens();
   init_tool_owner_backfill();
   await __promiseAll([
@@ -163045,24 +163237,24 @@ var init_storage = __esm(async () => {
 });
 
 // ../pi-plugin/src/config/index.ts
-import { existsSync as existsSync18, readFileSync as readFileSync13 } from "node:fs";
-import { homedir as homedir13 } from "node:os";
-import { join as join17 } from "node:path";
+import { existsSync as existsSync20, readFileSync as readFileSync15 } from "node:fs";
+import { homedir as homedir14 } from "node:os";
+import { join as join18 } from "node:path";
 function getProjectConfigPaths(cwd) {
-  const basePath = join17(cwd, ".pi", CONFIG_FILE_NAME);
+  const basePath = join18(cwd, ".pi", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
-  const home = process.env.HOME ?? homedir13();
-  const basePath = join17(home, ".pi", "agent", CONFIG_FILE_NAME);
+  const home = process.env.HOME ?? homedir14();
+  const basePath = join18(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path4) => existsSync18(path4));
+  return paths.find((path4) => existsSync20(path4));
 }
 function loadConfigFile2(path4, scope) {
   try {
-    const rawText = readFileSync13(path4, "utf-8");
+    const rawText = readFileSync15(path4, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
       configPath: path4
@@ -163070,7 +163262,7 @@ function loadConfigFile2(path4, scope) {
     return {
       path: path4,
       scope,
-      config: import_comment_json9.parse(substituted.text),
+      config: import_comment_json10.parse(substituted.text),
       warnings: substituted.warnings.map((warning) => `${path4}: ${warning}`)
     };
   } catch (error51) {
@@ -163183,19 +163375,19 @@ function loadPiConfig(opts = {}) {
     loadedFromPaths: loadedFiles.map((loaded) => loaded.path)
   };
 }
-var import_comment_json9, CONFIG_FILE_NAME = "magic-context";
+var import_comment_json10, CONFIG_FILE_NAME = "magic-context";
 var init_config2 = __esm(() => {
   init_magic_context();
   init_variable();
-  import_comment_json9 = __toESM(require_src2(), 1);
+  import_comment_json10 = __toESM(require_src2(), 1);
 });
 
 // src/lib/diagnostics-pi.ts
 import { createHash } from "node:crypto";
-import { existsSync as existsSync19, readdirSync as readdirSync3, readFileSync as readFileSync14, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync21, readdirSync as readdirSync3, readFileSync as readFileSync16, statSync as statSync4 } from "node:fs";
 import { createRequire as createRequire5 } from "node:module";
-import { homedir as homedir14, userInfo as userInfo2 } from "node:os";
-import { join as join18 } from "node:path";
+import { homedir as homedir15, userInfo as userInfo2 } from "node:os";
+import { join as join19 } from "node:path";
 function getSelfVersion3() {
   const req = createRequire5(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
@@ -163210,7 +163402,7 @@ function getSelfVersion3() {
 }
 function fileSize2(path4) {
   try {
-    return existsSync19(path4) ? statSync4(path4).size : 0;
+    return existsSync21(path4) ? statSync4(path4).size : 0;
   } catch {
     return 0;
   }
@@ -163226,7 +163418,7 @@ function redactSecretString(value) {
   return 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 || homedir14();
+  const home = process.env.HOME || homedir15();
   const username = userInfo2().username;
   const userHash = `<USER:${currentUserHash()}>`;
   let sanitized = redactSecretString(value);
@@ -163260,11 +163452,11 @@ function sanitizeValue2(value, key = "") {
   return value;
 }
 function readJsonc3(path4) {
-  if (!existsSync19(path4))
+  if (!existsSync21(path4))
     return { value: {} };
   try {
     return {
-      value: import_comment_json10.parse(readFileSync14(path4, "utf-8"))
+      value: import_comment_json11.parse(readFileSync16(path4, "utf-8"))
     };
   } catch (error51) {
     return {
@@ -163274,13 +163466,13 @@ function readJsonc3(path4) {
   }
 }
 function getProjectConfigPath(cwd) {
-  return join18(cwd, ".pi", "magic-context.jsonc");
+  return join19(cwd, ".pi", "magic-context.jsonc");
 }
 function readConfigDiagnostic(path4) {
   const parsed = readJsonc3(path4);
   return {
     path: path4,
-    exists: existsSync19(path4),
+    exists: existsSync21(path4),
     ...parsed.parseError ? { parseError: parsed.parseError } : {},
     flags: sanitizeValue2(parsed.value)
   };
@@ -163297,8 +163489,8 @@ function reverseSlugToDirectory(slug) {
   return `/${inner.replace(/-/g, "/")}`;
 }
 function collectPiRecentSessions() {
-  const sessionsRoot = join18(homedir14(), ".pi", "agent", "sessions");
-  if (!existsSync19(sessionsRoot))
+  const sessionsRoot = join19(homedir15(), ".pi", "agent", "sessions");
+  if (!existsSync21(sessionsRoot))
     return [];
   try {
     const slugs = readdirSync3(sessionsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
@@ -163307,7 +163499,7 @@ function collectPiRecentSessions() {
       const directory = reverseSlugToDirectory(slug);
       if (!directory)
         continue;
-      const slugDir = join18(sessionsRoot, slug);
+      const slugDir = join19(sessionsRoot, slug);
       let files;
       try {
         files = readdirSync3(slugDir).filter((name2) => name2.endsWith(".jsonl"));
@@ -163316,7 +163508,7 @@ function collectPiRecentSessions() {
       }
       for (const file2 of files) {
         try {
-          const mtime = statSync4(join18(slugDir, file2)).mtimeMs;
+          const mtime = statSync4(join19(slugDir, file2)).mtimeMs;
           const sessionId = file2.replace(/\.jsonl$/, "");
           candidates.push({ sessionId, directory, mtime });
         } catch {}
@@ -163334,7 +163526,7 @@ function collectPiRecentSessions() {
 }
 function parseHistorianDumpMeta2(path4) {
   try {
-    const xml = readFileSync14(path4, "utf-8");
+    const xml = readFileSync16(path4, "utf-8");
     const parsed = parseCompartmentOutput(xml);
     const factCountByCategory = {};
     for (const fact of parsed.facts) {
@@ -163367,11 +163559,11 @@ function parseHistorianDumpMeta2(path4) {
   }
 }
 function listDumpsInDir2(dir, limit) {
-  if (!existsSync19(dir))
+  if (!existsSync21(dir))
     return { count: 0, recent: [] };
   try {
     const entries = readdirSync3(dir).filter((name2) => name2.endsWith(".xml")).map((name2) => {
-      const stat = statSync4(join18(dir, name2));
+      const stat = statSync4(join19(dir, name2));
       return {
         name: name2,
         mtime: stat.mtimeMs,
@@ -163380,7 +163572,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(join18(dir, entry.name));
+      const meta3 = parseHistorianDumpMeta2(join19(dir, entry.name));
       const summary = {
         name: entry.name,
         ageMinutes: Math.round((now - entry.mtime) / 60000),
@@ -163443,9 +163635,9 @@ async function collectDiagnostics2(cwd = process.cwd()) {
   const projectConfigPath = getProjectConfigPath(cwd);
   const loaded = loadPiConfig({ cwd });
   const storageDirPath = getMagicContextStorageDir();
-  const dbPath = join18(storageDirPath, "context.db");
+  const dbPath = join19(storageDirPath, "context.db");
   const logPath = getMagicContextLogPath2("pi");
-  const logFileSize = existsSync19(logPath) ? statSync4(logPath).size : 0;
+  const logFileSize = existsSync21(logPath) ? statSync4(logPath).size : 0;
   const otherPiExtensions = packages.filter((entry) => !isPiMagicContextPackageEntry(entry)).map(describePiPackageEntry);
   const recentSessions = collectPiRecentSessions();
   const historianDumps = collectPiHistorianDumps(recentSessions);
@@ -163460,7 +163652,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     piVersion: pi ? getPiVersion(pi.path) : null,
     settings: {
       path: settingsPath,
-      exists: existsSync19(settingsPath),
+      exists: existsSync21(settingsPath),
       ...settingsParsed.parseError ? { parseError: settingsParsed.parseError } : {},
       hasMagicContextPackage: hasPiMagicContextPackage(packages),
       packages: sanitizeValue2(packages)
@@ -163476,7 +163668,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     loadWarnings: loaded.warnings.map(sanitizeString2),
     storageDir: {
       path: storageDirPath,
-      exists: existsSync19(storageDirPath),
+      exists: existsSync21(storageDirPath),
       contextDbSizeBytes: fileSize2(dbPath)
     },
     conflicts: {
@@ -163485,7 +163677,7 @@ async function collectDiagnostics2(cwd = process.cwd()) {
     },
     logFile: {
       path: logPath,
-      exists: existsSync19(logPath),
+      exists: existsSync21(logPath),
       sizeKb: Math.round(logFileSize / 1024)
     },
     recentSessions,
@@ -163566,7 +163758,7 @@ function renderDiagnosticsMarkdown2(report) {
   ].join(`
 `);
 }
-var import_comment_json10;
+var import_comment_json11;
 var init_diagnostics_pi = __esm(() => {
   init_compartment_parser();
   init_data_path();
@@ -163574,12 +163766,12 @@ var init_diagnostics_pi = __esm(() => {
   init_paths();
   init_pi_helpers();
   init_pi_package_entry();
-  import_comment_json10 = __toESM(require_src2(), 1);
+  import_comment_json11 = __toESM(require_src2(), 1);
 });
 
 // src/lib/logs-pi.ts
-import { readFileSync as readFileSync15, writeFileSync as writeFileSync11 } from "node:fs";
-import { join as join19 } from "node:path";
+import { readFileSync as readFileSync17, writeFileSync as writeFileSync11 } from "node:fs";
+import { join as join20 } from "node:path";
 function sanitizeLogContent2(content) {
   return sanitizeString2(content);
 }
@@ -163608,7 +163800,7 @@ function filterLogLinesBySession2(lines, sessionId) {
 }
 async function bundleIssueReport2(report, description, title, options = {}) {
   const LOG_TAIL_LINES = 400;
-  const allLogLines = report.logFile.exists ? readFileSync15(report.logFile.path, "utf-8").split(/\r?\n/) : [];
+  const allLogLines = report.logFile.exists ? readFileSync17(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();
@@ -163635,7 +163827,7 @@ async function bundleIssueReport2(report, description, title, options = {}) {
   ].join(`
 `);
   const cwd = options.cwd ?? process.cwd();
-  const path4 = join19(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
+  const path4 = join20(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
   writeFileSync11(path4, `${bodyMarkdown}
 `);
   return { path: path4, bodyMarkdown };
@@ -163647,17 +163839,17 @@ var init_logs_pi = __esm(() => {
 // src/commands/doctor-pi.ts
 import { execFileSync as execFileSync4, spawnSync as spawnSync3 } from "node:child_process";
 import {
-  existsSync as existsSync20,
+  existsSync as existsSync22,
   mkdirSync as mkdirSync8,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync16,
+  readFileSync as readFileSync18,
   rmSync as rmSync2,
   statSync as statSync5,
   writeFileSync as writeFileSync12
 } from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
-import { homedir as homedir15 } from "node:os";
-import { dirname as dirname9, join as join20 } from "node:path";
+import { homedir as homedir16 } from "node:os";
+import { dirname as dirname9, join as join21 } from "node:path";
 function depsFrom(options) {
   return {
     ...DEFAULT_DEPS,
@@ -163744,7 +163936,7 @@ function summarize(results) {
 function readJsonc4(path4) {
   try {
     return {
-      value: import_comment_json11.parse(readFileSync16(path4, "utf-8"))
+      value: import_comment_json12.parse(readFileSync18(path4, "utf-8"))
     };
   } catch (error51) {
     return {
@@ -163757,18 +163949,18 @@ function packagesFrom(settings) {
   return Array.isArray(settings.packages) ? settings.packages : [];
 }
 function projectConfigPath(cwd) {
-  return join20(cwd, ".pi", "magic-context.jsonc");
+  return join21(cwd, ".pi", "magic-context.jsonc");
 }
 function readConfigForEmbedding(path4) {
-  if (!existsSync20(path4))
+  if (!existsSync22(path4))
     return null;
   try {
-    const rawText = readFileSync16(path4, "utf-8");
+    const rawText = readFileSync18(path4, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
       configPath: path4
     });
-    return import_comment_json11.parse(substituted.text);
+    return import_comment_json12.parse(substituted.text);
   } catch {
     return null;
   }
@@ -163821,20 +164013,20 @@ function countTable(db, table) {
   }
 }
 function cacheRoots() {
-  const home = homedir15();
-  const cacheHome = process.env.XDG_CACHE_HOME || join20(home, ".cache");
+  const home = homedir16();
+  const cacheHome = process.env.XDG_CACHE_HOME || join21(home, ".cache");
   return [
-    join20(home, ".pi", "cache", "extensions"),
-    join20(home, ".pi", "cache", "packages"),
-    join20(cacheHome, "pi", "extensions"),
-    join20(cacheHome, "pi", "packages"),
-    join20(getPiAgentConfigDir(), "cache", "extensions")
+    join21(home, ".pi", "cache", "extensions"),
+    join21(home, ".pi", "cache", "packages"),
+    join21(cacheHome, "pi", "extensions"),
+    join21(cacheHome, "pi", "packages"),
+    join21(getPiAgentConfigDir(), "cache", "extensions")
   ];
 }
 function findPiMagicContextCacheDirs(self, force = false) {
   const found = new Map;
   const visit = (path4, depth) => {
-    if (depth < 0 || !existsSync20(path4))
+    if (depth < 0 || !existsSync22(path4))
       return;
     let stat;
     try {
@@ -163844,10 +164036,10 @@ function findPiMagicContextCacheDirs(self, force = false) {
     }
     if (!stat.isDirectory())
       return;
-    const packageJson = join20(path4, "package.json");
-    if (existsSync20(packageJson)) {
+    const packageJson = join21(path4, "package.json");
+    if (existsSync22(packageJson)) {
       try {
-        const pkg = JSON.parse(readFileSync16(packageJson, "utf-8"));
+        const pkg = JSON.parse(readFileSync18(packageJson, "utf-8"));
         const name2 = typeof pkg.name === "string" ? pkg.name : "";
         const version2 = typeof pkg.version === "string" ? pkg.version : undefined;
         if (name2 === PACKAGE_NAME || path4.includes("pi-magic-context")) {
@@ -163866,7 +164058,7 @@ function findPiMagicContextCacheDirs(self, force = false) {
       return;
     }
     for (const entry of entries)
-      visit(join20(path4, entry), depth - 1);
+      visit(join21(path4, entry), depth - 1);
   };
   for (const root of cacheRoots())
     visit(root, 5);
@@ -163888,7 +164080,7 @@ async function runHealthChecks(options) {
     add(results, "pass", version2 ? `Pi ${version2} detected at ${pi.path}` : `Pi detected at ${pi.path}`);
     const compare = compareSemver(version2, MIN_PI_VERSION);
     if (compare !== null && compare < 0) {
-      add(results, "fail", `Pi ${version2} is older than required ${MIN_PI_VERSION}. Subagents (historian/dreamer/sidekick) use the long-form \`--extension\` flag introduced in Pi 0.71.0; older versions hard-fail with "Unknown option". Run \`pi update\` (or \`npm install -g @mariozechner/pi-coding-agent@latest\`).`);
+      add(results, "fail", `Pi ${version2} is older than required ${MIN_PI_VERSION}. Subagents (historian/dreamer/sidekick) use the long-form \`--extension\` flag introduced in Pi 0.71.0; older versions hard-fail with "Unknown option". Run \`pi update\` (or \`npm install -g @earendil-works/pi-coding-agent@latest\`).`);
     } else if (version2) {
       add(results, "pass", `Pi version meets minimum ${MIN_PI_VERSION} requirement`);
     }
@@ -163903,7 +164095,7 @@ async function runHealthChecks(options) {
   }
   const settingsPath = getPiUserExtensionsPath();
   let packages = [];
-  if (!existsSync20(settingsPath)) {
+  if (!existsSync22(settingsPath)) {
     add(results, "warn", `Pi settings not found at ${settingsPath}`);
     repairPlan.addPackageEntry = true;
   } else {
@@ -163927,7 +164119,7 @@ async function runHealthChecks(options) {
     ["user", userConfigPath, true],
     ["project", projectPath, false]
   ]) {
-    if (!existsSync20(path4)) {
+    if (!existsSync22(path4)) {
       if (required2) {
         add(results, "warn", `No ${label} magic-context.jsonc found at ${path4}`);
         repairPlan.writeUserConfig = true;
@@ -163960,8 +164152,8 @@ async function runHealthChecks(options) {
     add(results, "pass", `historian.model "${historianModel}" has thinking_level "${historianThinkingLevel}" configured`);
   }
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join20(storageDir, "context.db");
-  const existedBeforeOpen = existsSync20(dbPath);
+  const dbPath = join21(storageDir, "context.db");
+  const existedBeforeOpen = existsSync22(dbPath);
   if (existedBeforeOpen)
     add(results, "pass", `Shared context DB exists at ${dbPath}`);
   else
@@ -164038,10 +164230,10 @@ async function runHealthChecks(options) {
     add(results, "pass", "Pi extension cache clean (no stale cached package found)");
   }
   const logPath = getMagicContextLogPath2("pi");
-  if (existsSync20(logPath)) {
+  if (existsSync22(logPath)) {
     const stat = statSync5(logPath);
     const sizeKb = (stat.size / 1024).toFixed(0);
-    const lines = readFileSync16(logPath, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    const lines = readFileSync18(logPath, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     add(results, "info", `Log file: ${logPath} (${sizeKb} KB)`);
     add(results, "info", `Last plugin log line: ${lines.at(-1) ?? "<empty log>"}`);
   } else {
@@ -164080,7 +164272,7 @@ function writeDefaultMagicContextConfig(path4) {
     $schema: "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json",
     ...MagicContextConfigSchema.parse({})
   };
-  writeFileSync12(path4, `${import_comment_json11.stringify(config2, null, 2)}
+  writeFileSync12(path4, `${import_comment_json12.stringify(config2, null, 2)}
 `);
 }
 function repair(plan, prompts) {
@@ -164097,7 +164289,7 @@ function repair(plan, prompts) {
   }
   if (plan.writeUserConfig) {
     const configPath = getPiUserConfigPath();
-    if (!existsSync20(configPath)) {
+    if (!existsSync22(configPath)) {
       try {
         writeDefaultMagicContextConfig(configPath);
         prompts.log.success(`Wrote default Magic Context config to ${configPath}`);
@@ -164239,7 +164431,7 @@ function parseDoctorArgs(args) {
 function doctor(args = []) {
   return runDoctor2(parseDoctorArgs(args));
 }
-var import_comment_json11, PACKAGE_NAME = "@cortexkit/pi-magic-context", MIN_PI_VERSION = "0.71.0", ROW_COUNT_TABLES, DEFAULT_DEPS;
+var import_comment_json12, PACKAGE_NAME = "@cortexkit/pi-magic-context", MIN_PI_VERSION = "0.74.0", ROW_COUNT_TABLES, DEFAULT_DEPS;
 var init_doctor_pi = __esm(async () => {
   init_magic_context();
   init_variable();
@@ -164253,7 +164445,7 @@ var init_doctor_pi = __esm(async () => {
   init_prompts();
   init_setup_pi();
   await init_storage();
-  import_comment_json11 = __toESM(require_src2(), 1);
+  import_comment_json12 = __toESM(require_src2(), 1);
   ROW_COUNT_TABLES = ["tags", "compartments", "memories", "notes", "dream_runs"];
   DEFAULT_DEPS = {
     prompts: promptIO,
@@ -164276,7 +164468,7 @@ var exports_doctor = {};
 __export(exports_doctor, {
   runDoctor: () => runDoctor3
 });
-import { existsSync as existsSync21, rmSync as rmSync3 } from "node:fs";
+import { existsSync as existsSync23, rmSync as rmSync3 } from "node:fs";
 async function runDoctor3(options) {
   if (options.clear)
     return runClear();
@@ -164360,7 +164552,7 @@ async function runClear() {
     const s = spinner();
     s.start(`Clearing ${item.path}`);
     try {
-      if (existsSync21(item.path)) {
+      if (existsSync23(item.path)) {
         rmSync3(item.path, { recursive: true, force: true });
       }
       s.stop(`Cleared ${item.path}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/magic-context",
-	"version": "0.19.0",
+	"version": "0.20.0",
 	"description": "Unified CLI for Magic Context — setup, doctor, and migration across OpenCode and Pi",
 	"keywords": [
 		"opencode",
@@ -51,6 +51,6 @@
 		"typescript": "^5.8.0"
 	},
 	"engines": {
-		"node": ">=20.12.0"
+		"node": ">=24.0.0"
 	}
 }