@cortexkit/aft 0.35.1 → 0.35.3

package/dist/commands/doctor.d.ts

@@ -61,7 +61,7 @@ export interface BinaryCacheClearResult {
 }
 export declare function clearOldBinaries(): BinaryCacheClearResult;
 export interface DoctorFixPlanItem {
-    kind: "plugin" | "binary" | "onnx" | "storage" | "schema";
+    kind: "plugin" | "plugin-update" | "binary" | "onnx" | "storage" | "schema";
     message: string;
 }
 export declare function buildDoctorFixPlan(adapters: HarnessAdapter[], report: DiagnosticReport): DoctorFixPlanItem[];

package/dist/commands/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -523,7 +523,6 @@ var init_bridge = __esm(() => {
       if (!snapshot || typeof snapshot !== "object" || Array.isArray(snapshot))
         return;
       this.cachedStatus = snapshot;
-      this.logVia("Received status_changed push frame; cached AFT status snapshot");
       for (const listener of this.statusListeners) {
         this.deliverStatusSnapshot(listener, this.cachedStatus);
       }
@@ -975,6 +974,122 @@ var init_migration = __esm(() => {
   DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
 });
 
+// ../aft-bridge/dist/npm-resolver.js
+import { readdirSync, statSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { delimiter, dirname, isAbsolute, join as join2 } from "node:path";
+function defaultDeps() {
+  return {
+    platform: process.platform,
+    env: process.env,
+    home: homedir2(),
+    execPath: process.execPath
+  };
+}
+function npmBinaryName(platform) {
+  return platform === "win32" ? "npm.cmd" : "npm";
+}
+function isFile(p) {
+  try {
+    return statSync(p).isFile();
+  } catch {
+    return false;
+  }
+}
+function npmFromPath(deps) {
+  const name = npmBinaryName(deps.platform);
+  const raw = deps.env.PATH ?? deps.env.Path ?? "";
+  for (const entry of raw.split(delimiter)) {
+    const dir = entry.trim().replace(/^"|"$/g, "");
+    if (!dir || !isAbsolute(dir))
+      continue;
+    if (isFile(join2(dir, name)))
+      return dir;
+  }
+  return null;
+}
+function npmAdjacentToNode(deps) {
+  const dir = dirname(deps.execPath);
+  return isFile(join2(dir, npmBinaryName(deps.platform))) ? dir : null;
+}
+function highestVersionedNodeBin(installsDir, name) {
+  let entries;
+  try {
+    entries = readdirSync(installsDir);
+  } catch {
+    return null;
+  }
+  const candidates = entries.filter((v) => isFile(join2(installsDir, v, "bin", name))).sort((a, b) => compareVersionsDesc(a, b));
+  return candidates.length > 0 ? join2(installsDir, candidates[0], "bin") : null;
+}
+function compareVersionsDesc(a, b) {
+  const pa = a.replace(/^v/, "").split(".").map((n) => Number.parseInt(n, 10));
+  const pb = b.replace(/^v/, "").split(".").map((n) => Number.parseInt(n, 10));
+  for (let i = 0;i < Math.max(pa.length, pb.length); i++) {
+    const na = Number.isFinite(pa[i]) ? pa[i] : -1;
+    const nb = Number.isFinite(pb[i]) ? pb[i] : -1;
+    if (na !== nb)
+      return nb - na;
+  }
+  return b.localeCompare(a);
+}
+function wellKnownNpmDirs(deps) {
+  const { platform, env, home } = deps;
+  const name = npmBinaryName(platform);
+  const dirs = [];
+  const push = (dir) => {
+    if (dir && !dirs.includes(dir))
+      dirs.push(dir);
+  };
+  if (platform === "win32") {
+    const programFiles = env.ProgramFiles || "C:\\Program Files";
+    const appData = env.APPDATA;
+    const localAppData = env.LOCALAPPDATA;
+    push(join2(programFiles, "nodejs"));
+    if (appData)
+      push(join2(appData, "npm"));
+    if (localAppData)
+      push(join2(localAppData, "Volta", "bin"));
+    if (env.NVM_SYMLINK)
+      push(env.NVM_SYMLINK);
+  } else {
+    if (env.NVM_BIN)
+      push(env.NVM_BIN);
+    push(highestVersionedNodeBin(join2(home, ".nvm", "versions", "node"), name));
+    push(highestVersionedNodeBin(join2(home, ".local", "share", "mise", "installs", "node"), name));
+    push(highestVersionedNodeBin(join2(home, ".asdf", "installs", "nodejs"), name));
+    push(join2(home, ".volta", "bin"));
+    push(join2(home, ".asdf", "shims"));
+    const systemDirs = deps.systemNpmDirs ?? (platform === "darwin" ? ["/opt/homebrew/bin", "/usr/local/bin"] : ["/usr/local/bin", "/usr/bin", join2(home, ".local", "bin")]);
+    for (const dir of systemDirs)
+      push(dir);
+  }
+  return dirs;
+}
+function resolveNpm(deps = defaultDeps()) {
+  const name = npmBinaryName(deps.platform);
+  const onPath = npmFromPath(deps);
+  if (onPath)
+    return { command: join2(onPath, name), binDir: onPath };
+  const adjacent = npmAdjacentToNode(deps);
+  if (adjacent)
+    return { command: join2(adjacent, name), binDir: adjacent };
+  for (const dir of wellKnownNpmDirs(deps)) {
+    const candidate = join2(dir, name);
+    if (isFile(candidate))
+      return { command: candidate, binDir: dir };
+  }
+  return null;
+}
+function npmSpawnEnv(resolved, baseEnv = process.env) {
+  if (!resolved.binDir)
+    return { ...baseEnv };
+  const existing = baseEnv.PATH ?? baseEnv.Path ?? "";
+  const next = existing ? `${resolved.binDir}${delimiter}${existing}` : resolved.binDir;
+  return { ...baseEnv, PATH: next };
+}
+var init_npm_resolver = () => {};
+
 // ../aft-bridge/dist/onnx-runtime.js
 var ORT_VERSION = "1.24.4", MAX_DOWNLOAD_BYTES2, MAX_EXTRACT_BYTES, STALE_LOCK_MS, ORT_PLATFORM_MAP;
 var init_onnx_runtime = __esm(() => {
@@ -1206,6 +1321,7 @@ var init_dist = __esm(() => {
   init_bridge();
   init_downloader();
   init_migration();
+  init_npm_resolver();
   init_onnx_runtime();
   init_paths();
   init_platform();
@@ -1214,65 +1330,65 @@ var init_dist = __esm(() => {
 });
 
 // src/lib/paths.ts
-import { homedir as homedir2, tmpdir } from "node:os";
-import { join as join2 } from "node:path";
+import { homedir as homedir3, tmpdir } from "node:os";
+import { join as join3 } from "node:path";
 function getAftBinaryCacheDir() {
   if (process.env.AFT_CACHE_DIR) {
-    return join2(process.env.AFT_CACHE_DIR, "bin");
+    return join3(process.env.AFT_CACHE_DIR, "bin");
   }
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join2(homedir2(), "AppData", "Local");
-    return join2(base2, "aft", "bin");
+    const base2 = localAppData || join3(homedir3(), "AppData", "Local");
+    return join3(base2, "aft", "bin");
   }
-  const base = process.env.XDG_CACHE_HOME || join2(homedir2(), ".cache");
-  return join2(base, "aft", "bin");
+  const base = process.env.XDG_CACHE_HOME || join3(homedir3(), ".cache");
+  return join3(base, "aft", "bin");
 }
 function getAftBinaryName() {
   return process.platform === "win32" ? "aft.exe" : "aft";
 }
 function getAftLspPackagesDir() {
   if (process.env.AFT_CACHE_DIR) {
-    return join2(process.env.AFT_CACHE_DIR, "lsp-packages");
+    return join3(process.env.AFT_CACHE_DIR, "lsp-packages");
   }
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join2(homedir2(), "AppData", "Local");
-    return join2(base2, "aft", "lsp-packages");
+    const base2 = localAppData || join3(homedir3(), "AppData", "Local");
+    return join3(base2, "aft", "lsp-packages");
   }
-  const base = process.env.XDG_CACHE_HOME || join2(homedir2(), ".cache");
-  return join2(base, "aft", "lsp-packages");
+  const base = process.env.XDG_CACHE_HOME || join3(homedir3(), ".cache");
+  return join3(base, "aft", "lsp-packages");
 }
 function getAftLspBinariesDir() {
   if (process.env.AFT_CACHE_DIR) {
-    return join2(process.env.AFT_CACHE_DIR, "lsp-binaries");
+    return join3(process.env.AFT_CACHE_DIR, "lsp-binaries");
   }
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join2(homedir2(), "AppData", "Local");
-    return join2(base2, "aft", "lsp-binaries");
+    const base2 = localAppData || join3(homedir3(), "AppData", "Local");
+    return join3(base2, "aft", "lsp-binaries");
   }
-  const base = process.env.XDG_CACHE_HOME || join2(homedir2(), ".cache");
-  return join2(base, "aft", "lsp-binaries");
+  const base = process.env.XDG_CACHE_HOME || join3(homedir3(), ".cache");
+  return join3(base, "aft", "lsp-binaries");
 }
 function homeDir() {
   if (process.platform === "win32")
-    return process.env.USERPROFILE || process.env.HOME || homedir2();
-  return process.env.HOME || homedir2();
+    return process.env.USERPROFILE || process.env.HOME || homedir3();
+  return process.env.HOME || homedir3();
 }
 function dataHome() {
   if (process.env.XDG_DATA_HOME)
     return process.env.XDG_DATA_HOME;
   if (process.platform === "win32") {
-    return process.env.LOCALAPPDATA || process.env.APPDATA || join2(homeDir(), "AppData", "Local");
+    return process.env.LOCALAPPDATA || process.env.APPDATA || join3(homeDir(), "AppData", "Local");
   }
-  return join2(homeDir(), ".local", "share");
+  return join3(homeDir(), ".local", "share");
 }
 function getCortexKitStorageRoot() {
-  return join2(dataHome(), "cortexkit", "aft");
+  return join3(dataHome(), "cortexkit", "aft");
 }
 function getTmpLogPath(filename) {
-  return join2(tmpdir(), filename);
+  return join3(tmpdir(), filename);
 }
 var init_paths2 = () => {};
 
@@ -1280,8 +1396,8 @@ var init_paths2 = () => {};
 import { execSync, spawnSync } from "node:child_process";
 import { existsSync as existsSync2 } from "node:fs";
 import { createRequire } from "node:module";
-import { homedir as homedir3 } from "node:os";
-import { join as join3 } from "node:path";
+import { homedir as homedir4 } from "node:os";
+import { join as join4 } from "node:path";
 async function loadPluginVersion() {
   try {
     const bridgePackageName = "@cortexkit/aft-bridge";
@@ -1404,7 +1520,7 @@ function aftBinaryCandidates(preferredVersion) {
   const candidates = [];
   if (preferredVersion) {
     const tag = preferredVersion.startsWith("v") ? preferredVersion : `v${preferredVersion}`;
-    pushCandidate(candidates, join3(getAftBinaryCacheDir(), tag, getAftBinaryName()));
+    pushCandidate(candidates, join4(getAftBinaryCacheDir(), tag, getAftBinaryName()));
   }
   const key = platformKey2();
   if (key) {
@@ -1427,7 +1543,7 @@ function aftBinaryCandidates(preferredVersion) {
       }
     }
   } catch {}
-  pushCandidate(candidates, join3(homedir3(), ".cargo", "bin", getAftBinaryName()));
+  pushCandidate(candidates, join4(homedir4(), ".cargo", "bin", getAftBinaryName()));
   return candidates;
 }
 function findAftBinary(preferredVersion) {
@@ -1442,13 +1558,13 @@ var init_binary_probe = __esm(async () => {
 });
 
 // src/lib/fs-util.ts
-import { existsSync as existsSync3, readdirSync, statSync } from "node:fs";
-import { join as join4 } from "node:path";
+import { existsSync as existsSync3, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
+import { join as join5 } from "node:path";
 function dirSize(path) {
   if (!existsSync3(path)) {
     return 0;
   }
-  const stat = statSync(path);
+  const stat = statSync2(path);
   if (stat.isFile()) {
     return stat.size;
   }
@@ -1456,8 +1572,8 @@ function dirSize(path) {
     return 0;
   }
   let total = 0;
-  for (const entry of readdirSync(path)) {
-    total += dirSize(join4(path, entry));
+  for (const entry of readdirSync2(path)) {
+    total += dirSize(join5(path, entry));
   }
   return total;
 }
@@ -9065,9 +9181,9 @@ var require_stringify = __commonJS((exports, module) => {
       if (line_breaks_before === null) {
         line_breaks_before = inline ? 0 : 1;
       }
-      const delimiter = line_breaks_before > 0 ? repeat_line_breaks(line_breaks_before, deeper_gap) : inline ? SPACE : i === 0 ? EMPTY : LF + deeper_gap;
+      const delimiter2 = line_breaks_before > 0 ? repeat_line_breaks(line_breaks_before, deeper_gap) : inline ? SPACE : i === 0 ? EMPTY : LF + deeper_gap;
       const is_line_comment = type === "LineComment";
-      str += delimiter + comment_stringify(value, is_line_comment);
+      str += delimiter2 + comment_stringify(value, is_line_comment);
       last_comment = comment;
     });
     const default_line_breaks_after = display_block || last_comment.type === "LineComment" ? 1 : 0;
@@ -9080,10 +9196,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join5 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join6 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join5(comment, inside, gap);
+    return join6(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -9105,13 +9221,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join5(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join6(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join5(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join6(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -9132,13 +9248,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join5(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join6(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join5(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join6(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -9232,7 +9348,7 @@ var require_src2 = __commonJS((exports, module) => {
 
 // src/lib/jsonc.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { dirname as dirname2 } from "node:path";
 function detectJsoncFile(configDir, baseName) {
   const jsoncPath = `${configDir}/${baseName}.jsonc`;
   const jsonPath = `${configDir}/${baseName}.json`;
@@ -9260,7 +9376,7 @@ function readJsoncFile(path) {
   }
 }
 function writeJsoncFile(path, value, format = "json") {
-  mkdirSync2(dirname(path), { recursive: true });
+  mkdirSync2(dirname2(path), { recursive: true });
   const serialized = format === "jsonc" ? import_comment_json.stringify(value, null, 2) : JSON.stringify(value, null, 2);
   writeFileSync(path, `${serialized}
 `);
@@ -9319,26 +9435,26 @@ var init_self_version = () => {};
 
 // src/adapters/opencode.ts
 import { execSync as execSync2 } from "node:child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync2, rmSync, statSync as statSync2 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { dirname as dirname2, join as join5, parse, resolve } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync2, rmSync, statSync as statSync3 } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { dirname as dirname3, join as join6, parse, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 function getOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
     return resolve(envDir);
-  const xdg = process.env.XDG_CONFIG_HOME || join5(homedir4(), ".config");
-  return join5(xdg, "opencode");
+  const xdg = process.env.XDG_CONFIG_HOME || join6(homedir5(), ".config");
+  return join6(xdg, "opencode");
 }
 function getOpenCodeCacheDir() {
   const xdg = process.env.XDG_CACHE_HOME;
   if (xdg)
-    return join5(xdg, "opencode");
+    return join6(xdg, "opencode");
   if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA ?? join5(homedir4(), "AppData", "Local");
-    return join5(localAppData, "opencode");
+    const localAppData = process.env.LOCALAPPDATA ?? join6(homedir5(), "AppData", "Local");
+    return join6(localAppData, "opencode");
   }
-  return join5(homedir4(), ".cache", "opencode");
+  return join6(homedir5(), ".cache", "opencode");
 }
 function hasOpenCodeCli() {
   try {
@@ -9351,12 +9467,12 @@ function hasOpenCodeCli() {
 function openCodeDesktopAppExists() {
   const candidates = [];
   if (process.platform === "darwin") {
-    candidates.push("/Applications/OpenCode.app", "/Applications/OpenCode Beta.app", join5(homedir4(), "Applications", "OpenCode.app"), join5(homedir4(), "Applications", "OpenCode Beta.app"));
+    candidates.push("/Applications/OpenCode.app", "/Applications/OpenCode Beta.app", join6(homedir5(), "Applications", "OpenCode.app"), join6(homedir5(), "Applications", "OpenCode Beta.app"));
   } else if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA ?? join5(homedir4(), "AppData", "Local");
-    candidates.push(join5(localAppData, "Programs", "opencode"), join5(localAppData, "opencode"));
+    const localAppData = process.env.LOCALAPPDATA ?? join6(homedir5(), "AppData", "Local");
+    candidates.push(join6(localAppData, "Programs", "opencode"), join6(localAppData, "opencode"));
   } else {
-    candidates.push("/opt/OpenCode", "/usr/lib/opencode", join5(homedir4(), ".local", "share", "applications", "opencode.desktop"));
+    candidates.push("/opt/OpenCode", "/usr/lib/opencode", join6(homedir5(), ".local", "share", "applications", "opencode.desktop"));
   }
   return candidates.some((p) => {
     try {
@@ -9385,15 +9501,15 @@ function pathPointsToOurPlugin(entry) {
   try {
     if (!existsSync5(fsPath))
       return false;
-    let searchDir = statSync2(fsPath).isDirectory() ? fsPath : dirname2(fsPath);
+    let searchDir = statSync3(fsPath).isDirectory() ? fsPath : dirname3(fsPath);
     let pkgJsonPath = null;
     while (true) {
-      const candidate = join5(searchDir, "package.json");
+      const candidate = join6(searchDir, "package.json");
       if (existsSync5(candidate)) {
         pkgJsonPath = candidate;
         break;
       }
-      const parent = dirname2(searchDir);
+      const parent = dirname3(searchDir);
       if (parent === searchDir || searchDir === parse(searchDir).root)
         break;
       searchDir = parent;
@@ -9501,10 +9617,10 @@ class OpenCodeAdapter {
     };
   }
   getPluginCacheInfo() {
-    const path = join5(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY);
+    const path = join6(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY);
     let cached;
     try {
-      const installedPkgPath = join5(path, "node_modules", "@cortexkit", "aft-opencode", "package.json");
+      const installedPkgPath = join6(path, "node_modules", "@cortexkit", "aft-opencode", "package.json");
       if (existsSync5(installedPkgPath)) {
         const pkg = JSON.parse(readFileSync2(installedPkgPath, "utf-8"));
         cached = typeof pkg.version === "string" ? pkg.version : undefined;
@@ -9565,11 +9681,11 @@ class OpenCodeAdapter {
   describeStorageSubtrees() {
     const storage = this.getStorageDir();
     return {
-      index: dirSize(join5(storage, "index")),
-      semantic: dirSize(join5(storage, "semantic")),
-      backups: dirSize(join5(storage, "backups")),
-      url_cache: dirSize(join5(storage, "url_cache")),
-      onnxruntime: dirSize(join5(storage, "onnxruntime"))
+      index: dirSize(join6(storage, "index")),
+      semantic: dirSize(join6(storage, "semantic")),
+      backups: dirSize(join6(storage, "backups")),
+      url_cache: dirSize(join6(storage, "url_cache")),
+      onnxruntime: dirSize(join6(storage, "onnxruntime"))
     };
   }
 }
@@ -9585,15 +9701,15 @@ var init_opencode = __esm(() => {
 // src/adapters/pi.ts
 import { execSync as execSync3, spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join6 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { join as join7 } from "node:path";
 function getPiAgentDir() {
   const envHome = process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME;
-  const home = envHome && envHome.length > 0 ? envHome : homedir5();
-  return join6(home, ".pi", "agent");
+  const home = envHome && envHome.length > 0 ? envHome : homedir6();
+  return join7(home, ".pi", "agent");
 }
 function readPiExtensionIndex() {
-  const settingsPath = join6(getPiAgentDir(), "settings.json");
+  const settingsPath = join7(getPiAgentDir(), "settings.json");
   if (existsSync6(settingsPath)) {
     try {
       const raw = readFileSync3(settingsPath, "utf-8");
@@ -9607,10 +9723,10 @@ function readPiExtensionIndex() {
     } catch {}
   }
   const candidates = [
-    join6(getPiAgentDir(), "extensions.json"),
-    join6(getPiAgentDir(), "extensions.jsonc"),
-    join6(getPiAgentDir(), "config.json"),
-    join6(getPiAgentDir(), "config.jsonc")
+    join7(getPiAgentDir(), "extensions.json"),
+    join7(getPiAgentDir(), "extensions.jsonc"),
+    join7(getPiAgentDir(), "config.json"),
+    join7(getPiAgentDir(), "config.jsonc")
   ];
   for (const path of candidates) {
     if (!existsSync6(path))
@@ -9646,14 +9762,14 @@ function piEntryMatchesAft(entry) {
   } else if (entry.startsWith("/")) {
     resolved = entry;
   } else if (entry.length > 0) {
-    resolved = join6(getPiAgentDir(), entry);
+    resolved = join7(getPiAgentDir(), entry);
   }
   if (!resolved)
     return false;
   try {
     if (!existsSync6(resolved))
       return false;
-    const pkgPath = join6(resolved, "package.json");
+    const pkgPath = join7(resolved, "package.json");
     if (!existsSync6(pkgPath))
       return false;
     const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
@@ -9704,7 +9820,7 @@ class PiAdapter {
     const aft = detectJsoncFile(configDir, "aft");
     return {
       configDir,
-      harnessConfig: index.path ?? join6(configDir, "extensions.json"),
+      harnessConfig: index.path ?? join7(configDir, "extensions.json"),
       harnessConfigFormat: index.path ? "json" : "none",
       aftConfig: aft.path,
       aftConfigFormat: aft.format
@@ -9749,8 +9865,8 @@ class PiAdapter {
   }
   getPluginCacheInfo() {
     const candidates = [
-      join6(getPiAgentDir(), "node_modules", "@cortexkit", "aft-pi", "package.json"),
-      join6(getPiAgentDir(), "extensions", "node_modules", "@cortexkit", "aft-pi", "package.json")
+      join7(getPiAgentDir(), "node_modules", "@cortexkit", "aft-pi", "package.json"),
+      join7(getPiAgentDir(), "extensions", "node_modules", "@cortexkit", "aft-pi", "package.json")
     ];
     for (const candidate of candidates) {
       if (!existsSync6(candidate))
@@ -9767,7 +9883,7 @@ class PiAdapter {
       } catch {}
     }
     return {
-      path: join6(getPiAgentDir(), "extensions"),
+      path: join7(getPiAgentDir(), "extensions"),
       exists: false
     };
   }
@@ -9789,11 +9905,11 @@ class PiAdapter {
   describeStorageSubtrees() {
     const storage = this.getStorageDir();
     return {
-      index: dirSize(join6(storage, "index")),
-      semantic: dirSize(join6(storage, "semantic")),
-      backups: dirSize(join6(storage, "backups")),
-      url_cache: dirSize(join6(storage, "url_cache")),
-      onnxruntime: dirSize(join6(storage, "onnxruntime"))
+      index: dirSize(join7(storage, "index")),
+      semantic: dirSize(join7(storage, "semantic")),
+      backups: dirSize(join7(storage, "backups")),
+      url_cache: dirSize(join7(storage, "url_cache")),
+      onnxruntime: dirSize(join7(storage, "onnxruntime"))
     };
   }
 }
@@ -11522,23 +11638,23 @@ __export(exports_lsp, {
   printLspDoctorHelp: () => printLspDoctorHelp,
   findProjectRootForFile: () => findProjectRootForFile
 });
-import { existsSync as existsSync7, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
-import { dirname as dirname3, join as join7, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync7, readdirSync as readdirSync3, statSync as statSync4 } from "node:fs";
+import { dirname as dirname4, join as join8, resolve as resolve2 } from "node:path";
 function findProjectRootForFile(filePath, fallbackCwd = process.cwd()) {
   const resolvedFile = resolve2(fallbackCwd, filePath);
-  let dir = dirname3(resolvedFile);
+  let dir = dirname4(resolvedFile);
   try {
-    if (existsSync7(resolvedFile) && statSync3(resolvedFile).isDirectory()) {
+    if (existsSync7(resolvedFile) && statSync4(resolvedFile).isDirectory()) {
       dir = resolvedFile;
     }
   } catch {
-    dir = dirname3(resolvedFile);
+    dir = dirname4(resolvedFile);
   }
   while (true) {
-    if (PROJECT_ROOT_MARKERS.some((marker) => existsSync7(join7(dir, marker)))) {
+    if (PROJECT_ROOT_MARKERS.some((marker) => existsSync7(join8(dir, marker)))) {
       return dir;
     }
-    const parent = dirname3(dir);
+    const parent = dirname4(dir);
     if (parent === dir)
       return resolve2(fallbackCwd);
     dir = parent;
@@ -11673,8 +11789,8 @@ function buildConfigureParams(adapter, projectRoot) {
 }
 function readProjectConfig(kind, projectRoot) {
   const dir = kind === "pi" ? ".pi" : ".opencode";
-  const jsonc = join7(projectRoot, dir, "aft.jsonc");
-  const json = join7(projectRoot, dir, "aft.json");
+  const jsonc = join8(projectRoot, dir, "aft.jsonc");
+  const json = join8(projectRoot, dir, "aft.json");
   if (existsSync7(jsonc))
     return readJsoncFile(jsonc).value ?? {};
   if (existsSync7(json))
@@ -11740,10 +11856,10 @@ function resolveCustomServers(servers) {
 function inferLspPathsExtra(_lsp) {
   const paths = new Set;
   for (const entry of childDirs(getAftLspPackagesDir())) {
-    paths.add(join7(entry, "node_modules", ".bin"));
+    paths.add(join8(entry, "node_modules", ".bin"));
   }
   for (const entry of childDirs(getAftLspBinariesDir())) {
-    paths.add(join7(entry, "bin"));
+    paths.add(join8(entry, "bin"));
   }
   return [...paths];
 }
@@ -11751,9 +11867,9 @@ function childDirs(path) {
   if (!existsSync7(path))
     return [];
   try {
-    return readdirSync2(path).map((entry) => join7(path, entry)).filter((entry) => {
+    return readdirSync3(path).map((entry) => join8(path, entry)).filter((entry) => {
       try {
-        return statSync3(entry).isDirectory();
+        return statSync4(entry).isDirectory();
       } catch {
         return false;
       }
@@ -11832,7 +11948,7 @@ __export(exports_doctor_filters, {
   printDoctorFiltersHelp: () => printDoctorFiltersHelp
 });
 import { existsSync as existsSync8 } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { relative, resolve as resolve3 } from "node:path";
 function printDoctorFiltersHelp() {
   console.log("Usage: aft doctor filters [--show <name>] [trust|untrust]");
@@ -12050,7 +12166,7 @@ function truncate(value) {
   return value.length <= 80 ? value : `${value.slice(0, 77)}…`;
 }
 function formatHome(path) {
-  const home = homedir6();
+  const home = homedir7();
   return path.startsWith(home) ? `~${path.slice(home.length)}` : path;
 }
 function formatProjectPath(path, projectRoot) {
@@ -12073,8 +12189,8 @@ var init_doctor_filters = __esm(async () => {
 });
 
 // src/lib/binary-cache.ts
-import { existsSync as existsSync9, readdirSync as readdirSync3, statSync as statSync4 } from "node:fs";
-import { join as join8 } from "node:path";
+import { existsSync as existsSync9, readdirSync as readdirSync4, statSync as statSync5 } from "node:fs";
+import { join as join9 } from "node:path";
 function getBinaryCacheInfo(activeVersion) {
   const path = getAftBinaryCacheDir();
   if (!existsSync9(path)) {
@@ -12085,9 +12201,9 @@ function getBinaryCacheInfo(activeVersion) {
       path
     };
   }
-  const versions = readdirSync3(path).filter((entry) => {
+  const versions = readdirSync4(path).filter((entry) => {
     try {
-      return statSync4(join8(path, entry)).isDirectory();
+      return statSync5(join9(path, entry)).isDirectory();
     } catch {
       return false;
     }
@@ -12107,8 +12223,8 @@ var init_binary_cache = __esm(() => {
 });
 
 // src/lib/lsp-cache.ts
-import { existsSync as existsSync10, readdirSync as readdirSync4, rmSync as rmSync2, statSync as statSync5 } from "node:fs";
-import { join as join9 } from "node:path";
+import { existsSync as existsSync10, readdirSync as readdirSync5, rmSync as rmSync2, statSync as statSync6 } from "node:fs";
+import { join as join10 } from "node:path";
 function inspectDir(path) {
   if (!existsSync10(path)) {
     return { entries: [], totalSize: 0 };
@@ -12117,14 +12233,14 @@ function inspectDir(path) {
   let totalSize = 0;
   let names;
   try {
-    names = readdirSync4(path);
+    names = readdirSync5(path);
   } catch {
     return { entries: [], totalSize: 0 };
   }
   for (const name of names) {
-    const full = join9(path, name);
+    const full = join10(path, name);
     try {
-      if (!statSync5(full).isDirectory())
+      if (!statSync6(full).isDirectory())
         continue;
       const size = dirSize(full);
       entries.push({
@@ -12180,8 +12296,8 @@ var init_lsp_cache = __esm(() => {
 });
 
 // src/lib/onnx.ts
-import { existsSync as existsSync11, readdirSync as readdirSync5, readlinkSync, realpathSync as realpathSync2, statSync as statSync6 } from "node:fs";
-import { basename, isAbsolute, join as join10, resolve as resolve4, win32 } from "node:path";
+import { existsSync as existsSync11, readdirSync as readdirSync6, readlinkSync, realpathSync as realpathSync2, statSync as statSync7 } from "node:fs";
+import { basename, isAbsolute as isAbsolute2, join as join11, resolve as resolve4, win32 } from "node:path";
 function getOnnxLibraryName() {
   if (process.platform === "darwin")
     return "libonnxruntime.dylib";
@@ -12214,16 +12330,16 @@ function pathEnvValue() {
   return process.env.PATH ?? process.env.Path ?? process.env.path ?? "";
 }
 function pathEntriesForPlatform() {
-  const delimiter = process.platform === "win32" ? ";" : ":";
-  return pathEnvValue().split(delimiter).map((entry) => entry.trim().replace(/^"|"$/g, "")).filter((entry) => {
+  const delimiter2 = process.platform === "win32" ? ";" : ":";
+  return pathEnvValue().split(delimiter2).map((entry) => entry.trim().replace(/^"|"$/g, "")).filter((entry) => {
     if (!entry || entry === "." || entry.includes("\x00"))
       return false;
-    return isAbsolute(entry) || win32.isAbsolute(entry);
+    return isAbsolute2(entry) || win32.isAbsolute(entry);
   });
 }
 function directoryContainsLibrary(dir, libName) {
   try {
-    const entries = readdirSync5(dir);
+    const entries = readdirSync6(dir);
     if (process.platform === "win32") {
       const expected = libName.toLowerCase();
       return entries.some((entry) => entry.toLowerCase() === expected);
@@ -12244,21 +12360,21 @@ function findSystemOnnxRuntime() {
     searchPaths.push(...pathEntriesForPlatform());
     const programFiles = process.env.ProgramFiles ?? "C:\\Program Files";
     const programFilesX86 = process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
-    searchPaths.push(join10(programFiles, "onnxruntime", "lib"), join10(programFiles, "Microsoft ONNX Runtime", "lib"), join10(programFiles, "Microsoft Machine Learning", "lib"), join10(programFilesX86, "onnxruntime", "lib"), ...(() => {
+    searchPaths.push(join11(programFiles, "onnxruntime", "lib"), join11(programFiles, "Microsoft ONNX Runtime", "lib"), join11(programFiles, "Microsoft Machine Learning", "lib"), join11(programFilesX86, "onnxruntime", "lib"), ...(() => {
       const nugetPaths = [];
       const userProfile = process.env.USERPROFILE ?? "";
       if (!userProfile)
         return nugetPaths;
-      const nugetPackageDir = join10(userProfile, ".nuget", "packages", "microsoft.ml.onnxruntime");
+      const nugetPackageDir = join11(userProfile, ".nuget", "packages", "microsoft.ml.onnxruntime");
       if (!existsSync11(nugetPackageDir))
         return nugetPaths;
       try {
-        for (const entry of readdirSync5(nugetPackageDir, { withFileTypes: true })) {
+        for (const entry of readdirSync6(nugetPackageDir, { withFileTypes: true })) {
           if (!entry.isDirectory())
             continue;
           if (entry.name === "__globalPackagesFolder" || entry.name.startsWith("."))
             continue;
-          nugetPaths.push(join10(nugetPackageDir, entry.name, "runtimes", "win-x64", "native"), join10(nugetPackageDir, entry.name, "runtimes", "win-arm64", "native"));
+          nugetPaths.push(join11(nugetPackageDir, entry.name, "runtimes", "win-x64", "native"), join11(nugetPackageDir, entry.name, "runtimes", "win-arm64", "native"));
         }
       } catch {}
       return nugetPaths;
@@ -12288,12 +12404,12 @@ function findSystemOnnxRuntime() {
   return unknownVersionPaths[0] ?? null;
 }
 function findCachedOnnxRuntime(storageDir) {
-  const ortDir = join10(storageDir, "onnxruntime", ONNX_RUNTIME_VERSION);
+  const ortDir = join11(storageDir, "onnxruntime", ONNX_RUNTIME_VERSION);
   const libName = getOnnxLibraryName();
-  if (existsSync11(join10(ortDir, libName)))
+  if (existsSync11(join11(ortDir, libName)))
     return ortDir;
-  const libSubdir = join10(ortDir, "lib");
-  if (existsSync11(join10(libSubdir, libName)))
+  const libSubdir = join11(ortDir, "lib");
+  if (existsSync11(join11(libSubdir, libName)))
     return libSubdir;
   return null;
 }
@@ -12318,7 +12434,7 @@ function detectOrtVersion(libDir) {
     return null;
   const libName = getOnnxLibraryName();
   try {
-    const entries = readdirSync5(libDir);
+    const entries = readdirSync6(libDir);
     const barePrefix = libName.replace(/\.(so|dylib|dll)$/, "");
     const expectedPrefix = process.platform === "win32" ? barePrefix.toLowerCase() : barePrefix;
     for (const entry of entries) {
@@ -12329,7 +12445,7 @@ function detectOrtVersion(libDir) {
       if (version)
         return version;
     }
-    const base = join10(libDir, libName);
+    const base = join11(libDir, libName);
     if (existsSync11(base)) {
       try {
         const real = realpathSync2(base);
@@ -12362,7 +12478,7 @@ var init_onnx = () => {};
 
 // src/lib/sanitize.ts
 import { realpathSync as realpathSync3 } from "node:fs";
-import { homedir as homedir7, userInfo } from "node:os";
+import { homedir as homedir8, userInfo } from "node:os";
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -12393,7 +12509,7 @@ function redactSecrets(content) {
 }
 function sanitizeContent(content) {
   const username = userInfo().username;
-  const home = homedir7();
+  const home = homedir8();
   let sanitized = redactSecrets(content);
   const cwd = process.cwd();
   for (const candidate of new Set([cwd, safeRealpath(cwd)])) {
@@ -12445,7 +12561,7 @@ import {
   existsSync as existsSync12,
   openSync as openSync2,
   readSync as readSync2,
-  statSync as statSync7
+  statSync as statSync8
 } from "node:fs";
 async function collectDiagnostics(adapters) {
   const cliVersion = getSelfVersion();
@@ -12523,7 +12639,7 @@ async function diagnoseHarness(adapter) {
     logFile: {
       path: logPath,
       exists: existsSync12(logPath),
-      sizeKb: existsSync12(logPath) ? Math.round(statSync7(logPath).size / 1024) : 0
+      sizeKb: existsSync12(logPath) ? Math.round(statSync8(logPath).size / 1024) : 0
     }
   };
 }
@@ -12724,7 +12840,7 @@ function tailLogFile(path, lines) {
   const chunkSize = 64 * 1024;
   let fd = null;
   try {
-    const size = statSync7(path).size;
+    const size = statSync8(path).size;
     fd = openSync2(path, "r");
     const chunks = [];
     let position = size;
@@ -12904,7 +13020,7 @@ var init_issue_body = __esm(() => {
 
 // src/lib/onnx-fix.ts
 import { existsSync as existsSync13, rmSync as rmSync3 } from "node:fs";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 function findOnnxFixCandidates(report) {
   const candidates = [];
   for (const harness of report.harnesses) {
@@ -12912,7 +13028,7 @@ function findOnnxFixCandidates(report) {
       continue;
     if (!harness.storageDir.exists)
       continue;
-    const storageOnnxDir = join11(harness.storageDir.path, "onnxruntime");
+    const storageOnnxDir = join12(harness.storageDir.path, "onnxruntime");
     const systemTooOld = harness.onnxRuntime.systemPath !== null && harness.onnxRuntime.systemCompatible === false;
     const cachedTooOld = harness.onnxRuntime.cachedPath !== null && harness.onnxRuntime.cachedCompatible === false;
     const hasCompatibleCached = harness.onnxRuntime.cachedCompatible === true;
@@ -12986,10 +13102,10 @@ var init_onnx_fix = __esm(() => {
 });
 
 // src/lib/sessions.ts
-import { existsSync as existsSync14, readdirSync as readdirSync6, readFileSync as readFileSync4, statSync as statSync8 } from "node:fs";
+import { existsSync as existsSync14, readdirSync as readdirSync7, readFileSync as readFileSync4, statSync as statSync9 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
-import { homedir as homedir8 } from "node:os";
-import { basename as basename2, join as join12 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { basename as basename2, join as join13 } from "node:path";
 function listRecentSessions(adapter) {
   try {
     if (adapter.kind === "opencode")
@@ -13018,7 +13134,7 @@ function mapOpenCodeSessionRows(rows) {
   }).filter((session) => session !== null).sort((a, b) => b.lastActivity - a.lastActivity).slice(0, MAX_RECENT_SESSIONS);
 }
 function listRecentOpenCodeSessions() {
-  const dbPath = join12(getXdgDataHome(), "opencode", "opencode.db");
+  const dbPath = join13(getXdgDataHome(), "opencode", "opencode.db");
   if (!existsSync14(dbPath))
     return [];
   let db = null;
@@ -13038,14 +13154,14 @@ function listRecentOpenCodeSessions() {
 }
 function getXdgDataHome() {
   const xdgDataHome = process.env.XDG_DATA_HOME;
-  return xdgDataHome && xdgDataHome.length > 0 ? xdgDataHome : join12(homedir8(), ".local", "share");
+  return xdgDataHome && xdgDataHome.length > 0 ? xdgDataHome : join13(homedir9(), ".local", "share");
 }
 function listRecentPiSessions() {
-  return listPiSessionsFromDir(join12(getHomeDir(), ".pi", "agent", "sessions"));
+  return listPiSessionsFromDir(join13(getHomeDir(), ".pi", "agent", "sessions"));
 }
 function getHomeDir() {
   const envHome = process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME;
-  return envHome && envHome.length > 0 ? envHome : homedir8();
+  return envHome && envHome.length > 0 ? envHome : homedir9();
 }
 function listPiSessionsFromDir(sessionsDir) {
   try {
@@ -13053,7 +13169,7 @@ function listPiSessionsFromDir(sessionsDir) {
       return [];
     const files = collectJsonlFiles(sessionsDir).map((filePath) => {
       try {
-        const stats = statSync8(filePath);
+        const stats = statSync9(filePath);
         return { filePath, mtimeMs: stats.mtimeMs };
       } catch {
         return null;
@@ -13082,12 +13198,12 @@ function collectJsonlFiles(root) {
       continue;
     let entries;
     try {
-      entries = readdirSync6(dir, { withFileTypes: true });
+      entries = readdirSync7(dir, { withFileTypes: true });
     } catch {
       continue;
     }
     for (const entry of entries) {
-      const path = join12(dir, entry.name);
+      const path = join13(dir, entry.name);
       if (entry.isDirectory()) {
         stack.push(path);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
@@ -13184,6 +13300,7 @@ __export(exports_doctor, {
   DOCTOR_FORCE_CLEAR_TARGETS: () => DOCTOR_FORCE_CLEAR_TARGETS,
   DOCTOR_CLEAR_TARGET_OPTIONS: () => DOCTOR_CLEAR_TARGET_OPTIONS
 });
+import { execFileSync } from "node:child_process";
 import {
   chmodSync as chmodSync2,
   existsSync as existsSync15,
@@ -13192,11 +13309,11 @@ import {
   readFileSync as readFileSync5,
   realpathSync as realpathSync4,
   rmSync as rmSync4,
-  statSync as statSync9,
+  statSync as statSync10,
   writeFileSync as writeFileSync2
 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 async function runDoctor(options) {
   if (options.issue) {
     return runIssueFlow(options.argv);
@@ -13360,10 +13477,10 @@ function clearOldBinaries() {
     return result;
   }
   for (const version of stale) {
-    const dir = join13(info.path, version);
+    const dir = join14(info.path, version);
     let bytes = 0;
     try {
-      bytes = statSync9(dir).isDirectory() ? dirSize(dir) : 0;
+      bytes = statSync10(dir).isDirectory() ? dirSize(dir) : 0;
     } catch {
       bytes = 0;
     }
@@ -13383,6 +13500,31 @@ function clearOldBinaries() {
   }
   return result;
 }
+function findPluginUpdateTargets(adapters, report) {
+  const adaptersByKind = new Map(adapters.map((a) => [a.kind, a]));
+  const targets = [];
+  for (const harness of report.harnesses) {
+    if (harness.kind !== "opencode")
+      continue;
+    if (!harness.hostInstalled || !harness.pluginRegistered)
+      continue;
+    const cache = harness.pluginCache;
+    if (!cache?.exists || !cache.cached || !cache.latest)
+      continue;
+    if (cache.cached === cache.latest)
+      continue;
+    const adapter = adaptersByKind.get(harness.kind);
+    if (!adapter)
+      continue;
+    targets.push({
+      adapter,
+      installDir: cache.path,
+      cached: cache.cached,
+      latest: cache.latest
+    });
+  }
+  return targets;
+}
 function findSchemaFixTargets(adapters) {
   const targets = [];
   for (const adapter of adapters) {
@@ -13402,6 +13544,35 @@ function findSchemaFixTargets(adapters) {
   }
   return targets;
 }
+async function applyPluginUpdates(targets) {
+  let updated = 0;
+  let errors = 0;
+  if (targets.length === 0)
+    return { updated, errors };
+  const npm = resolveNpm();
+  if (!npm) {
+    errors += targets.length;
+    O2.error("Could not find npm on PATH or in known version-manager locations, so the plugin cannot be updated automatically. Install Node/npm, or launch your editor from a shell where npm is available.");
+    return { updated, errors };
+  }
+  for (const target of targets) {
+    try {
+      execFileSync(npm.command, ["install", "--no-audit", "--no-fund", "--no-progress", "--ignore-scripts"], {
+        cwd: target.installDir,
+        env: npmSpawnEnv(npm),
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 120000
+      });
+      updated += 1;
+      O2.success(`${target.adapter.displayName}: plugin updated ${target.cached} → ${target.latest} (restart ${target.adapter.displayName} to apply)`);
+    } catch (err) {
+      errors += 1;
+      const message = err instanceof Error ? err.message : String(err);
+      O2.error(`${target.adapter.displayName}: plugin update failed: ${message}`);
+    }
+  }
+  return { updated, errors };
+}
 function applySchemaFixes(targets) {
   let changed = 0;
   let errors = 0;
@@ -13438,6 +13609,12 @@ function buildDoctorFixPlan(adapters, report) {
       });
     }
   }
+  for (const target of findPluginUpdateTargets(adapters, report)) {
+    items.push({
+      kind: "plugin-update",
+      message: `Will update ${target.adapter.displayName} plugin ${target.cached} → ${target.latest} via npm (the plugin's own auto-update could not run, often no npm on PATH)`
+    });
+  }
   if (!report.binaryVersion) {
     const skews = findPluginCliVersionSkews(report);
     items.push({
@@ -13531,6 +13708,7 @@ async function runFixFlow(argv) {
     }
   }
   await fixPluginEntries(adapters);
+  const pluginUpdateSummary = await applyPluginUpdates(findPluginUpdateTargets(adapters, report));
   const storageSummary = ensureStorageDirsForRegisteredPlugins(adapters);
   const schemaSummary = applySchemaFixes(findSchemaFixTargets(adapters));
   let binaryDownloaded = false;
@@ -13561,7 +13739,7 @@ async function runFixFlow(argv) {
     }
   }
   const onnxResult = await runOnnxFix(adapters, report, { yes: true });
-  if (onnxResult === null && !binaryDownloaded && !binaryDownloadSkipped && !binaryDownloadError && storageSummary.created === 0 && storageSummary.errors === 0 && schemaSummary.changed === 0 && schemaSummary.errors === 0) {
+  if (onnxResult === null && !binaryDownloaded && !binaryDownloadSkipped && !binaryDownloadError && storageSummary.created === 0 && storageSummary.errors === 0 && schemaSummary.changed === 0 && schemaSummary.errors === 0 && pluginUpdateSummary.updated === 0 && pluginUpdateSummary.errors === 0) {
     O2.info("No auto-fixable issues detected.");
     wt("If you're still seeing 'Semantic Index: failed' in the TUI sidebar, run `aft doctor` (without --fix) for a full diagnostic dump.", "Tip");
     const afterReport2 = await collectDiagnostics(adapters);
@@ -13569,7 +13747,7 @@ async function runFixFlow(argv) {
     gt(stillHasProblems2 ? "Done — some issues remain." : "Done.");
     return stillHasProblems2 ? 1 : 0;
   }
-  const hadErrors = (onnxResult?.errors.length ?? 0) > 0 || binaryDownloadError !== null || storageSummary.errors > 0 || schemaSummary.errors > 0;
+  const hadErrors = (onnxResult?.errors.length ?? 0) > 0 || binaryDownloadError !== null || storageSummary.errors > 0 || schemaSummary.errors > 0 || pluginUpdateSummary.errors > 0;
   const afterReport = await collectDiagnostics(adapters);
   const stillHasProblems = hasDoctorProblems(afterReport);
   gt(hadErrors ? "Done — some fixes failed." : stillHasProblems ? "Done — some issues remain." : "Done.");
@@ -13727,11 +13905,11 @@ function deriveIssueTitleFromBody(body) {
 function writeIssueReviewFile(body) {
   let reviewDir = null;
   try {
-    reviewDir = mkdtempSync(join13(tmpdir2(), "aft-issue-"));
+    reviewDir = mkdtempSync(join14(tmpdir2(), "aft-issue-"));
     if (process.platform !== "win32") {
       chmodSync2(reviewDir, 448);
     }
-    const outPath = join13(reviewDir, "issue.md");
+    const outPath = join14(reviewDir, "issue.md");
     writeFileSync2(outPath, `${body}
 `, { encoding: "utf8", mode: 384, flag: "wx" });
     return { path: outPath, realPath: realpathSync4(outPath) };
@@ -13889,6 +14067,7 @@ https://github.com/cortexkit/aft/issues/new and paste the contents of ${outPath}
 }
 var DOCTOR_CLEAR_TARGET_OPTIONS, DOCTOR_FORCE_CLEAR_TARGETS;
 var init_doctor = __esm(async () => {
+  init_dist();
   init_binary_cache();
   init_fs_util();
   init_github();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft",
-  "version": "0.35.1",
+  "version": "0.35.3",
   "type": "module",
   "description": "Unified CLI for Agent File Tools (AFT) — setup, doctor, and diagnostics across supported agent harnesses (OpenCode, Pi)",
   "license": "MIT",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.35.1",
+    "@cortexkit/aft-bridge": "0.35.3",
     "comment-json": "^4.6.2"
   },
   "devDependencies": {