@cortexkit/aft 0.34.0 → 0.35.0

package/dist/index.js

@@ -46,11 +46,235 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __promiseAll = (args) => Promise.all(args);
 
-// src/lib/fs-util.ts
-import { existsSync, readdirSync, statSync } from "node:fs";
+// src/lib/paths.ts
+import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
+function getAftBinaryCacheDir() {
+  if (process.env.AFT_CACHE_DIR) {
+    return join(process.env.AFT_CACHE_DIR, "bin");
+  }
+  if (process.platform === "win32") {
+    const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
+    const base2 = localAppData || join(homedir(), "AppData", "Local");
+    return join(base2, "aft", "bin");
+  }
+  const base = process.env.XDG_CACHE_HOME || join(homedir(), ".cache");
+  return join(base, "aft", "bin");
+}
+function getAftBinaryName() {
+  return process.platform === "win32" ? "aft.exe" : "aft";
+}
+function getAftLspPackagesDir() {
+  if (process.env.AFT_CACHE_DIR) {
+    return join(process.env.AFT_CACHE_DIR, "lsp-packages");
+  }
+  if (process.platform === "win32") {
+    const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
+    const base2 = localAppData || join(homedir(), "AppData", "Local");
+    return join(base2, "aft", "lsp-packages");
+  }
+  const base = process.env.XDG_CACHE_HOME || join(homedir(), ".cache");
+  return join(base, "aft", "lsp-packages");
+}
+function getAftLspBinariesDir() {
+  if (process.env.AFT_CACHE_DIR) {
+    return join(process.env.AFT_CACHE_DIR, "lsp-binaries");
+  }
+  if (process.platform === "win32") {
+    const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
+    const base2 = localAppData || join(homedir(), "AppData", "Local");
+    return join(base2, "aft", "lsp-binaries");
+  }
+  const base = process.env.XDG_CACHE_HOME || join(homedir(), ".cache");
+  return join(base, "aft", "lsp-binaries");
+}
+function homeDir() {
+  if (process.platform === "win32")
+    return process.env.USERPROFILE || process.env.HOME || homedir();
+  return process.env.HOME || homedir();
+}
+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 || join(homeDir(), "AppData", "Local");
+  }
+  return join(homeDir(), ".local", "share");
+}
+function getCortexKitStorageRoot() {
+  return join(dataHome(), "cortexkit", "aft");
+}
+function getTmpLogPath(filename) {
+  return join(tmpdir(), filename);
+}
+var init_paths = () => {};
+
+// src/lib/binary-probe.ts
+import { execSync, spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
+import { homedir as homedir2 } from "node:os";
+import { join as join2 } from "node:path";
+async function loadPluginVersion() {
+  try {
+    const bridgePackageName = "@cortexkit/aft-bridge";
+    const bridge = await import(bridgePackageName);
+    if (typeof bridge.PLUGIN_VERSION === "string" && bridge.PLUGIN_VERSION.length > 0) {
+      return bridge.PLUGIN_VERSION;
+    }
+  } catch {}
+  const require2 = createRequire(import.meta.url);
+  for (const relPath of [
+    "../../../aft-bridge/package.json",
+    "../../package.json",
+    "../package.json"
+  ]) {
+    try {
+      const pkg = require2(relPath);
+      if (typeof pkg.version === "string" && pkg.version.length > 0)
+        return pkg.version;
+    } catch {}
+  }
+  return "unknown";
+}
+function parseVersionOutput(output) {
+  for (const line of output.split(/\r?\n/)) {
+    const match = line.trim().match(VERSION_LINE);
+    if (match?.[1])
+      return match[1];
+  }
+  return null;
+}
+function majorMinor(version) {
+  if (!version)
+    return null;
+  const match = version.trim().match(/^v?(\d+)\.(\d+)\.\d+(?:[-+][0-9A-Za-z.-]+)?$/);
+  if (!match)
+    return null;
+  return `${match[1]}.${match[2]}`;
+}
+function versionMatchesExpected(candidate, expectedVersion) {
+  const candidateMajorMinor = majorMinor(candidate);
+  const expectedMajorMinor = majorMinor(expectedVersion);
+  return candidateMajorMinor !== null && candidateMajorMinor === expectedMajorMinor;
+}
+function probeBinaryVersion(preferredVersion) {
+  return probeAftBinary(preferredVersion).version;
+}
+function probeAftBinary(preferredVersion) {
+  const expectedVersion = preferredVersion ?? PLUGIN_VERSION;
+  const expectedMajorMinor = majorMinor(expectedVersion);
+  const candidates = [];
+  for (const candidate of aftBinaryCandidates(preferredVersion)) {
+    try {
+      if (!existsSync(candidate))
+        continue;
+      const result = spawnSync(candidate, ["--version"], {
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf-8",
+        timeout: 5000,
+        env: process.env
+      });
+      const output = `${result.stdout ?? ""}
+${result.stderr ?? ""}`.trim();
+      if (result.error || result.status !== 0) {
+        candidates.push({
+          path: candidate,
+          status: "error",
+          version: null,
+          ...output ? { output } : {},
+          error: result.error?.message ?? `exit status ${result.status ?? "unknown"}`
+        });
+        continue;
+      }
+      const version = parseVersionOutput(output);
+      if (!version) {
+        candidates.push({ path: candidate, status: "invalid", version: null, output });
+        continue;
+      }
+      if (!versionMatchesExpected(version, expectedVersion)) {
+        candidates.push({ path: candidate, status: "unmatched", version, output });
+        continue;
+      }
+      candidates.push({ path: candidate, status: "matched", version, output });
+      return { version, path: candidate, expectedVersion, expectedMajorMinor, candidates };
+    } catch (error) {
+      candidates.push({
+        path: candidate,
+        status: "error",
+        version: null,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  return { version: null, path: null, expectedVersion, expectedMajorMinor, candidates };
+}
+function pushCandidate(candidates, candidate) {
+  if (!candidate)
+    return;
+  if (!candidates.includes(candidate))
+    candidates.push(candidate);
+}
+function firstExisting(candidates) {
+  for (const candidate of candidates) {
+    try {
+      if (!existsSync(candidate))
+        continue;
+      return candidate;
+    } catch {}
+  }
+  return null;
+}
+function platformKey(platform = process.platform, arch = process.arch) {
+  const table = {
+    darwin: { arm64: "darwin-arm64", x64: "darwin-x64" },
+    linux: { arm64: "linux-arm64", x64: "linux-x64" },
+    win32: { x64: "win32-x64" }
+  };
+  return table[platform]?.[arch] ?? null;
+}
+function aftBinaryCandidates(preferredVersion) {
+  const candidates = [];
+  if (preferredVersion) {
+    const tag = preferredVersion.startsWith("v") ? preferredVersion : `v${preferredVersion}`;
+    pushCandidate(candidates, join2(getAftBinaryCacheDir(), tag, getAftBinaryName()));
+  }
+  const key = platformKey();
+  if (key) {
+    try {
+      const require2 = createRequire(import.meta.url);
+      pushCandidate(candidates, require2.resolve(`@cortexkit/aft-${key}/bin/${getAftBinaryName()}`));
+    } catch {}
+  }
+  try {
+    const lookup = process.platform === "win32" ? "where aft" : "which aft";
+    const resolved = execSync(lookup, {
+      stdio: "pipe",
+      encoding: "utf-8",
+      env: process.env
+    }).trim();
+    if (resolved) {
+      pushCandidate(candidates, resolved.split(/\r?\n/)[0]);
+    }
+  } catch {}
+  pushCandidate(candidates, join2(homedir2(), ".cargo", "bin", getAftBinaryName()));
+  return candidates;
+}
+function findAftBinary(preferredVersion) {
+  return firstExisting(aftBinaryCandidates(preferredVersion));
+}
+var PLUGIN_VERSION, VERSION_LINE;
+var init_binary_probe = __esm(async () => {
+  init_paths();
+  PLUGIN_VERSION = await loadPluginVersion();
+  VERSION_LINE = /^(?:aft\s+)?v?(\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?)$/i;
+});
+
+// src/lib/fs-util.ts
+import { existsSync as existsSync2, readdirSync, statSync } from "node:fs";
+import { join as join3 } from "node:path";
 function dirSize(path) {
-  if (!existsSync(path)) {
+  if (!existsSync2(path)) {
     return 0;
   }
   const stat = statSync(path);
@@ -62,7 +286,7 @@ function dirSize(path) {
   }
   let total = 0;
   for (const entry of readdirSync(path)) {
-    total += dirSize(join(path, entry));
+    total += dirSize(join3(path, entry));
   }
   return total;
 }
@@ -7685,10 +7909,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join2 = (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 join4 = (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 join2(comment, inside, gap);
+    return join4(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -7710,13 +7934,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join2(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join4(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 += join2(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join4(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) => {
@@ -7737,13 +7961,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join2(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join4(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 += join2(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join4(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) {
@@ -7836,21 +8060,21 @@ var require_src2 = __commonJS((exports, module) => {
 });
 
 // src/lib/jsonc.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 function detectJsoncFile(configDir, baseName) {
   const jsoncPath = `${configDir}/${baseName}.jsonc`;
   const jsonPath = `${configDir}/${baseName}.json`;
-  if (existsSync2(jsoncPath)) {
+  if (existsSync3(jsoncPath)) {
     return { path: jsoncPath, format: "jsonc" };
   }
-  if (existsSync2(jsonPath)) {
+  if (existsSync3(jsonPath)) {
     return { path: jsonPath, format: "json" };
   }
   return { path: jsonPath, format: "none" };
 }
 function readJsoncFile(path) {
-  if (!existsSync2(path)) {
+  if (!existsSync3(path)) {
     return { value: null };
   }
   try {
@@ -7871,7 +8095,7 @@ function writeJsoncFile(path, value, format = "json") {
 `);
 }
 function ensureAftSchemaUrl(path, format) {
-  const existed = existsSync2(path);
+  const existed = existsSync3(path);
   if (!existed) {
     const writeFormat = format === "jsonc" ? "jsonc" : "json";
     writeJsoncFile(path, { $schema: AFT_SCHEMA_URL }, writeFormat);
@@ -7906,73 +8130,10 @@ var init_jsonc = __esm(() => {
   import_comment_json = __toESM(require_src2(), 1);
 });
 
-// src/lib/paths.ts
-import { homedir, tmpdir } from "node:os";
-import { join as join2 } from "node:path";
-function getAftBinaryCacheDir() {
-  if (process.env.AFT_CACHE_DIR) {
-    return join2(process.env.AFT_CACHE_DIR, "bin");
-  }
-  if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join2(homedir(), "AppData", "Local");
-    return join2(base2, "aft", "bin");
-  }
-  const base = process.env.XDG_CACHE_HOME || join2(homedir(), ".cache");
-  return join2(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");
-  }
-  if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join2(homedir(), "AppData", "Local");
-    return join2(base2, "aft", "lsp-packages");
-  }
-  const base = process.env.XDG_CACHE_HOME || join2(homedir(), ".cache");
-  return join2(base, "aft", "lsp-packages");
-}
-function getAftLspBinariesDir() {
-  if (process.env.AFT_CACHE_DIR) {
-    return join2(process.env.AFT_CACHE_DIR, "lsp-binaries");
-  }
-  if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join2(homedir(), "AppData", "Local");
-    return join2(base2, "aft", "lsp-binaries");
-  }
-  const base = process.env.XDG_CACHE_HOME || join2(homedir(), ".cache");
-  return join2(base, "aft", "lsp-binaries");
-}
-function homeDir() {
-  if (process.platform === "win32")
-    return process.env.USERPROFILE || process.env.HOME || homedir();
-  return process.env.HOME || homedir();
-}
-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 join2(homeDir(), ".local", "share");
-}
-function getCortexKitStorageRoot() {
-  return join2(dataHome(), "cortexkit", "aft");
-}
-function getTmpLogPath(filename) {
-  return join2(tmpdir(), filename);
-}
-var init_paths = () => {};
-
 // src/lib/self-version.ts
-import { createRequire } from "node:module";
+import { createRequire as createRequire2 } from "node:module";
 function getSelfVersion() {
-  const require2 = createRequire(import.meta.url);
+  const require2 = createRequire2(import.meta.url);
   for (const relPath of ["../../package.json", "../package.json"]) {
     try {
       const version = require2(relPath).version;
@@ -7986,27 +8147,27 @@ function getSelfVersion() {
 var init_self_version = () => {};
 
 // src/adapters/opencode.ts
-import { execSync } from "node:child_process";
-import { existsSync as existsSync3, readFileSync as readFileSync2, rmSync, statSync as statSync2 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { dirname as dirname2, join as join3, parse, resolve } from "node:path";
+import { execSync as execSync2 } from "node:child_process";
+import { existsSync as existsSync4, readFileSync as readFileSync2, rmSync, statSync as statSync2 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname2, join as join4, 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 || join3(homedir2(), ".config");
-  return join3(xdg, "opencode");
+  const xdg = process.env.XDG_CONFIG_HOME || join4(homedir3(), ".config");
+  return join4(xdg, "opencode");
 }
 function getOpenCodeCacheDir() {
   const xdg = process.env.XDG_CACHE_HOME;
   if (xdg)
-    return join3(xdg, "opencode");
+    return join4(xdg, "opencode");
   if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA ?? join3(homedir2(), "AppData", "Local");
-    return join3(localAppData, "opencode");
+    const localAppData = process.env.LOCALAPPDATA ?? join4(homedir3(), "AppData", "Local");
+    return join4(localAppData, "opencode");
   }
-  return join3(homedir2(), ".cache", "opencode");
+  return join4(homedir3(), ".cache", "opencode");
 }
 function pathFromEntry(entry) {
   if (entry.startsWith("file://")) {
@@ -8025,13 +8186,13 @@ function pathPointsToOurPlugin(entry) {
   if (!fsPath)
     return false;
   try {
-    if (!existsSync3(fsPath))
+    if (!existsSync4(fsPath))
       return false;
     let searchDir = statSync2(fsPath).isDirectory() ? fsPath : dirname2(fsPath);
     let pkgJsonPath = null;
     while (true) {
-      const candidate = join3(searchDir, "package.json");
-      if (existsSync3(candidate)) {
+      const candidate = join4(searchDir, "package.json");
+      if (existsSync4(candidate)) {
         pkgJsonPath = candidate;
         break;
       }
@@ -8063,7 +8224,7 @@ class OpenCodeAdapter {
   pluginEntryWithVersion = PLUGIN_ENTRY;
   isInstalled() {
     try {
-      execSync("opencode --version", { stdio: "ignore" });
+      execSync2("opencode --version", { stdio: "ignore" });
       return true;
     } catch {
       return false;
@@ -8071,7 +8232,7 @@ class OpenCodeAdapter {
   }
   getHostVersion() {
     try {
-      return execSync("opencode --version", { encoding: "utf-8", stdio: "pipe" }).trim();
+      return execSync2("opencode --version", { encoding: "utf-8", stdio: "pipe" }).trim();
     } catch {
       return null;
     }
@@ -8140,11 +8301,11 @@ class OpenCodeAdapter {
     };
   }
   getPluginCacheInfo() {
-    const path = join3(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY);
+    const path = join4(getOpenCodeCacheDir(), "packages", PLUGIN_ENTRY);
     let cached;
     try {
-      const installedPkgPath = join3(path, "node_modules", "@cortexkit", "aft-opencode", "package.json");
-      if (existsSync3(installedPkgPath)) {
+      const installedPkgPath = join4(path, "node_modules", "@cortexkit", "aft-opencode", "package.json");
+      if (existsSync4(installedPkgPath)) {
         const pkg = JSON.parse(readFileSync2(installedPkgPath, "utf-8"));
         cached = typeof pkg.version === "string" ? pkg.version : undefined;
       }
@@ -8155,7 +8316,7 @@ class OpenCodeAdapter {
       path,
       cached,
       latest: getSelfVersion(),
-      exists: existsSync3(path)
+      exists: existsSync4(path)
     };
   }
   getStorageDir() {
@@ -8204,11 +8365,11 @@ class OpenCodeAdapter {
   describeStorageSubtrees() {
     const storage = this.getStorageDir();
     return {
-      index: dirSize(join3(storage, "index")),
-      semantic: dirSize(join3(storage, "semantic")),
-      backups: dirSize(join3(storage, "backups")),
-      url_cache: dirSize(join3(storage, "url_cache")),
-      onnxruntime: dirSize(join3(storage, "onnxruntime"))
+      index: dirSize(join4(storage, "index")),
+      semantic: dirSize(join4(storage, "semantic")),
+      backups: dirSize(join4(storage, "backups")),
+      url_cache: dirSize(join4(storage, "url_cache")),
+      onnxruntime: dirSize(join4(storage, "onnxruntime"))
     };
   }
 }
@@ -8222,18 +8383,18 @@ var init_opencode = __esm(() => {
 });
 
 // src/adapters/pi.ts
-import { execSync as execSync2, spawnSync } from "node:child_process";
-import { existsSync as existsSync4, readFileSync as readFileSync3 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
-import { join as join4 } from "node:path";
-function getPiAgentDir() {
+import { execSync as execSync3, spawnSync as spawnSync2 } from "node:child_process";
+import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
+import { homedir as homedir4 } from "node:os";
+import { join as join5 } from "node:path";
+function getPiAgentDir() {
   const envHome = process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME;
-  const home = envHome && envHome.length > 0 ? envHome : homedir3();
-  return join4(home, ".pi", "agent");
+  const home = envHome && envHome.length > 0 ? envHome : homedir4();
+  return join5(home, ".pi", "agent");
 }
 function readPiExtensionIndex() {
-  const settingsPath = join4(getPiAgentDir(), "settings.json");
-  if (existsSync4(settingsPath)) {
+  const settingsPath = join5(getPiAgentDir(), "settings.json");
+  if (existsSync5(settingsPath)) {
     try {
       const raw = readFileSync3(settingsPath, "utf-8");
       const trimmed = raw.replace(/^\uFEFF/, "");
@@ -8246,13 +8407,13 @@ function readPiExtensionIndex() {
     } catch {}
   }
   const candidates = [
-    join4(getPiAgentDir(), "extensions.json"),
-    join4(getPiAgentDir(), "extensions.jsonc"),
-    join4(getPiAgentDir(), "config.json"),
-    join4(getPiAgentDir(), "config.jsonc")
+    join5(getPiAgentDir(), "extensions.json"),
+    join5(getPiAgentDir(), "extensions.jsonc"),
+    join5(getPiAgentDir(), "config.json"),
+    join5(getPiAgentDir(), "config.jsonc")
   ];
   for (const path of candidates) {
-    if (!existsSync4(path))
+    if (!existsSync5(path))
       continue;
     try {
       const { value } = readJsoncFile(path);
@@ -8285,15 +8446,15 @@ function piEntryMatchesAft(entry) {
   } else if (entry.startsWith("/")) {
     resolved = entry;
   } else if (entry.length > 0) {
-    resolved = join4(getPiAgentDir(), entry);
+    resolved = join5(getPiAgentDir(), entry);
   }
   if (!resolved)
     return false;
   try {
-    if (!existsSync4(resolved))
+    if (!existsSync5(resolved))
       return false;
-    const pkgPath = join4(resolved, "package.json");
-    if (!existsSync4(pkgPath))
+    const pkgPath = join5(resolved, "package.json");
+    if (!existsSync5(pkgPath))
       return false;
     const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
     return pkg.name === PLUGIN_NAME2;
@@ -8313,7 +8474,7 @@ class PiAdapter {
   pluginEntryWithVersion = PLUGIN_ENTRY2;
   isInstalled() {
     try {
-      execSync2("pi --version", { stdio: "ignore" });
+      execSync3("pi --version", { stdio: "ignore" });
       return true;
     } catch {
       return false;
@@ -8321,7 +8482,7 @@ class PiAdapter {
   }
   getHostVersion() {
     try {
-      const result = spawnSync("pi", ["--version"], {
+      const result = spawnSync2("pi", ["--version"], {
         stdio: ["ignore", "pipe", "pipe"],
         encoding: "utf-8"
       });
@@ -8342,7 +8503,7 @@ class PiAdapter {
     const aft = detectJsoncFile(configDir, "aft");
     return {
       configDir,
-      harnessConfig: index.path ?? join4(configDir, "extensions.json"),
+      harnessConfig: index.path ?? join5(configDir, "extensions.json"),
       harnessConfigFormat: index.path ? "json" : "none",
       aftConfig: aft.path,
       aftConfigFormat: aft.format
@@ -8369,7 +8530,7 @@ class PiAdapter {
       };
     }
     try {
-      execSync2(`pi install ${PLUGIN_ENTRY2}`, { stdio: "inherit" });
+      execSync3(`pi install ${PLUGIN_ENTRY2}`, { stdio: "inherit" });
       return {
         ok: true,
         action: "added",
@@ -8387,11 +8548,11 @@ class PiAdapter {
   }
   getPluginCacheInfo() {
     const candidates = [
-      join4(getPiAgentDir(), "node_modules", "@cortexkit", "aft-pi", "package.json"),
-      join4(getPiAgentDir(), "extensions", "node_modules", "@cortexkit", "aft-pi", "package.json")
+      join5(getPiAgentDir(), "node_modules", "@cortexkit", "aft-pi", "package.json"),
+      join5(getPiAgentDir(), "extensions", "node_modules", "@cortexkit", "aft-pi", "package.json")
     ];
     for (const candidate of candidates) {
-      if (!existsSync4(candidate))
+      if (!existsSync5(candidate))
         continue;
       try {
         const pkg = JSON.parse(readFileSync3(candidate, "utf-8"));
@@ -8405,7 +8566,7 @@ class PiAdapter {
       } catch {}
     }
     return {
-      path: join4(getPiAgentDir(), "extensions"),
+      path: join5(getPiAgentDir(), "extensions"),
       exists: false
     };
   }
@@ -8427,11 +8588,11 @@ class PiAdapter {
   describeStorageSubtrees() {
     const storage = this.getStorageDir();
     return {
-      index: dirSize(join4(storage, "index")),
-      semantic: dirSize(join4(storage, "semantic")),
-      backups: dirSize(join4(storage, "backups")),
-      url_cache: dirSize(join4(storage, "url_cache")),
-      onnxruntime: dirSize(join4(storage, "onnxruntime"))
+      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"))
     };
   }
 }
@@ -8444,6 +8605,9 @@ var init_pi = __esm(() => {
 });
 
 // src/adapters/index.ts
+function getAllAdapters() {
+  return ALL;
+}
 function getAdapter(kind) {
   const found = ALL.find((a) => a.kind === kind);
   if (!found)
@@ -9903,11 +10067,59 @@ async function resolveAdaptersForCommand(argv, options) {
   })), installed.map((a) => a.kind));
   return picks.map((kind) => getAdapter(kind));
 }
+function getAllRegistryAdapters() {
+  return getAllAdapters();
+}
 var init_harness_select = __esm(() => {
   init_adapters();
   init_prompts();
 });
 
+// src/commands/version.ts
+var exports_version = {};
+__export(exports_version, {
+  runVersion: () => runVersion
+});
+function runVersion() {
+  const cliVersion = getSelfVersion();
+  const binaryVersion = probeBinaryVersion();
+  const lines = [];
+  lines.push("");
+  lines.push("  AFT versions");
+  lines.push("");
+  lines.push(`  @cortexkit/aft (this CLI)   v${cliVersion}`);
+  lines.push(`  aft binary                  ${binaryVersion ?? "not installed"}`);
+  lines.push("");
+  const adapters = getAllRegistryAdapters();
+  const labelWidth = Math.max(...adapters.map((adapter) => adapter.displayName.length));
+  for (const adapter of adapters) {
+    const label = adapter.displayName.padEnd(labelWidth);
+    if (!adapter.isInstalled()) {
+      lines.push(`  ${label}   host not installed`);
+      continue;
+    }
+    const host = adapter.getHostVersion() ?? "unknown";
+    const registered = adapter.hasPluginEntry();
+    let pluginPart;
+    if (!registered) {
+      pluginPart = "plugin not registered";
+    } else {
+      const cached = adapter.getPluginCacheInfo().cached;
+      pluginPart = cached ? `plugin ${cached}` : "plugin registered (version unknown)";
+    }
+    lines.push(`  ${label}   host ${host} · ${pluginPart}`);
+  }
+  lines.push("");
+  console.log(lines.join(`
+`));
+  return 0;
+}
+var init_version = __esm(async () => {
+  init_harness_select();
+  init_self_version();
+  await init_binary_probe();
+});
+
 // src/commands/setup.ts
 var exports_setup = {};
 __export(exports_setup, {
@@ -10101,167 +10313,6 @@ ${stderrTrimmed}`);
 var MAX_NOISE_LINES_IN_ERROR = 5;
 var init_aft_bridge = () => {};
 
-// src/lib/binary-probe.ts
-import { execSync as execSync3, spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync5 } from "node:fs";
-import { createRequire as createRequire2 } from "node:module";
-import { homedir as homedir4 } from "node:os";
-import { join as join5 } from "node:path";
-async function loadPluginVersion() {
-  try {
-    const bridgePackageName = "@cortexkit/aft-bridge";
-    const bridge = await import(bridgePackageName);
-    if (typeof bridge.PLUGIN_VERSION === "string" && bridge.PLUGIN_VERSION.length > 0) {
-      return bridge.PLUGIN_VERSION;
-    }
-  } catch {}
-  const require2 = createRequire2(import.meta.url);
-  for (const relPath of [
-    "../../../aft-bridge/package.json",
-    "../../package.json",
-    "../package.json"
-  ]) {
-    try {
-      const pkg = require2(relPath);
-      if (typeof pkg.version === "string" && pkg.version.length > 0)
-        return pkg.version;
-    } catch {}
-  }
-  return "unknown";
-}
-function parseVersionOutput(output) {
-  for (const line of output.split(/\r?\n/)) {
-    const match = line.trim().match(VERSION_LINE);
-    if (match?.[1])
-      return match[1];
-  }
-  return null;
-}
-function majorMinor(version) {
-  if (!version)
-    return null;
-  const match = version.trim().match(/^v?(\d+)\.(\d+)\.\d+(?:[-+][0-9A-Za-z.-]+)?$/);
-  if (!match)
-    return null;
-  return `${match[1]}.${match[2]}`;
-}
-function versionMatchesExpected(candidate, expectedVersion) {
-  const candidateMajorMinor = majorMinor(candidate);
-  const expectedMajorMinor = majorMinor(expectedVersion);
-  return candidateMajorMinor !== null && candidateMajorMinor === expectedMajorMinor;
-}
-function probeBinaryVersion(preferredVersion) {
-  return probeAftBinary(preferredVersion).version;
-}
-function probeAftBinary(preferredVersion) {
-  const expectedVersion = preferredVersion ?? PLUGIN_VERSION;
-  const expectedMajorMinor = majorMinor(expectedVersion);
-  const candidates = [];
-  for (const candidate of aftBinaryCandidates(preferredVersion)) {
-    try {
-      if (!existsSync5(candidate))
-        continue;
-      const result = spawnSync2(candidate, ["--version"], {
-        stdio: ["ignore", "pipe", "pipe"],
-        encoding: "utf-8",
-        timeout: 5000,
-        env: process.env
-      });
-      const output = `${result.stdout ?? ""}
-${result.stderr ?? ""}`.trim();
-      if (result.error || result.status !== 0) {
-        candidates.push({
-          path: candidate,
-          status: "error",
-          version: null,
-          ...output ? { output } : {},
-          error: result.error?.message ?? `exit status ${result.status ?? "unknown"}`
-        });
-        continue;
-      }
-      const version = parseVersionOutput(output);
-      if (!version) {
-        candidates.push({ path: candidate, status: "invalid", version: null, output });
-        continue;
-      }
-      if (!versionMatchesExpected(version, expectedVersion)) {
-        candidates.push({ path: candidate, status: "unmatched", version, output });
-        continue;
-      }
-      candidates.push({ path: candidate, status: "matched", version, output });
-      return { version, path: candidate, expectedVersion, expectedMajorMinor, candidates };
-    } catch (error) {
-      candidates.push({
-        path: candidate,
-        status: "error",
-        version: null,
-        error: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
-  return { version: null, path: null, expectedVersion, expectedMajorMinor, candidates };
-}
-function pushCandidate(candidates, candidate) {
-  if (!candidate)
-    return;
-  if (!candidates.includes(candidate))
-    candidates.push(candidate);
-}
-function firstExisting(candidates) {
-  for (const candidate of candidates) {
-    try {
-      if (!existsSync5(candidate))
-        continue;
-      return candidate;
-    } catch {}
-  }
-  return null;
-}
-function platformKey(platform = process.platform, arch = process.arch) {
-  const table = {
-    darwin: { arm64: "darwin-arm64", x64: "darwin-x64" },
-    linux: { arm64: "linux-arm64", x64: "linux-x64" },
-    win32: { x64: "win32-x64" }
-  };
-  return table[platform]?.[arch] ?? null;
-}
-function aftBinaryCandidates(preferredVersion) {
-  const candidates = [];
-  if (preferredVersion) {
-    const tag = preferredVersion.startsWith("v") ? preferredVersion : `v${preferredVersion}`;
-    pushCandidate(candidates, join5(getAftBinaryCacheDir(), tag, getAftBinaryName()));
-  }
-  const key = platformKey();
-  if (key) {
-    try {
-      const require2 = createRequire2(import.meta.url);
-      pushCandidate(candidates, require2.resolve(`@cortexkit/aft-${key}/bin/${getAftBinaryName()}`));
-    } catch {}
-  }
-  try {
-    const lookup = process.platform === "win32" ? "where aft" : "which aft";
-    const resolved = execSync3(lookup, {
-      stdio: "pipe",
-      encoding: "utf-8",
-      env: process.env
-    }).trim();
-    if (resolved) {
-      pushCandidate(candidates, resolved.split(/\r?\n/)[0]);
-    }
-  } catch {}
-  pushCandidate(candidates, join5(homedir4(), ".cargo", "bin", getAftBinaryName()));
-  return candidates;
-}
-function findAftBinary(preferredVersion) {
-  return firstExisting(aftBinaryCandidates(preferredVersion));
-}
-var PLUGIN_VERSION, VERSION_LINE;
-var init_binary_probe = __esm(async () => {
-  init_paths();
-  PLUGIN_VERSION = await loadPluginVersion();
-  VERSION_LINE = /^(?:aft\s+)?v?(\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?)$/i;
-});
-
 // src/commands/lsp.ts
 var exports_lsp = {};
 __export(exports_lsp, {
@@ -11552,6 +11603,12 @@ function createGitHubIssue(repo, title, body) {
 var init_github = () => {};
 
 // src/lib/issue-body.ts
+function filterLogToSession(logText, sessionId) {
+  const bareId = sessionId.replace(/^ses_/, "");
+  const keepTokens = [`[ses_${bareId}]`, `[${bareId}]`];
+  return logText.split(/\r?\n/).filter((line) => !SESSION_TAG_PATTERN.test(line) || keepTokens.some((token) => line.includes(token))).join(`
+`);
+}
 function isErrorLogLine(line) {
   return ERROR_LOG_PATTERNS.some((rx) => rx.test(line));
 }
@@ -11629,8 +11686,9 @@ function truncateToByteBudget(input, maxBytes) {
   }
   return buf.subarray(0, end).toString("utf8");
 }
-var MAX_GITHUB_BODY_BYTES = 60000, ERROR_LOG_PATTERNS;
+var MAX_GITHUB_BODY_BYTES = 60000, SESSION_TAG_PATTERN, ERROR_LOG_PATTERNS;
 var init_issue_body = __esm(() => {
+  SESSION_TAG_PATTERN = /\[ses_[^\]\s]+\]|\[[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\]/;
   ERROR_LOG_PATTERNS = [
     /\bcrashed:/i,
     /\bfailed:/i,
@@ -11726,6 +11784,189 @@ var init_onnx_fix = __esm(() => {
   init_prompts();
 });
 
+// src/lib/sessions.ts
+import { existsSync as existsSync13, readdirSync as readdirSync6, readFileSync as readFileSync4, statSync as statSync8 } from "node:fs";
+import { createRequire as createRequire3 } from "node:module";
+import { homedir as homedir7 } from "node:os";
+import { basename as basename2, join as join11 } from "node:path";
+function listRecentSessions(adapter) {
+  try {
+    if (adapter.kind === "opencode")
+      return listRecentOpenCodeSessions();
+    if (adapter.kind === "pi")
+      return listRecentPiSessions();
+    return [];
+  } catch {
+    return [];
+  }
+}
+function mapOpenCodeSessionRows(rows) {
+  return rows.map((row) => {
+    if (typeof row.id !== "string" || row.id.length === 0)
+      return null;
+    if (typeof row.title !== "string" || row.title.length === 0)
+      return null;
+    const lastActivity = typeof row.time_updated === "number" ? row.time_updated : Number(row.time_updated);
+    if (!Number.isFinite(lastActivity))
+      return null;
+    return {
+      id: row.id,
+      title: row.title,
+      lastActivity
+    };
+  }).filter((session) => session !== null).sort((a, b) => b.lastActivity - a.lastActivity).slice(0, MAX_RECENT_SESSIONS);
+}
+function listRecentOpenCodeSessions() {
+  const dbPath = join11(getXdgDataHome(), "opencode", "opencode.db");
+  if (!existsSync13(dbPath))
+    return [];
+  let db = null;
+  try {
+    const require2 = createRequire3(import.meta.url);
+    const sqlite = require2("node:sqlite");
+    db = new sqlite.DatabaseSync(dbPath, { readOnly: true });
+    const rows = db.prepare("SELECT id, title, time_updated FROM session ORDER BY time_updated DESC LIMIT 5").all();
+    return mapOpenCodeSessionRows(rows);
+  } catch {
+    return [];
+  } finally {
+    try {
+      db?.close();
+    } catch {}
+  }
+}
+function getXdgDataHome() {
+  const xdgDataHome = process.env.XDG_DATA_HOME;
+  return xdgDataHome && xdgDataHome.length > 0 ? xdgDataHome : join11(homedir7(), ".local", "share");
+}
+function listRecentPiSessions() {
+  return listPiSessionsFromDir(join11(getHomeDir(), ".pi", "agent", "sessions"));
+}
+function getHomeDir() {
+  const envHome = process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME;
+  return envHome && envHome.length > 0 ? envHome : homedir7();
+}
+function listPiSessionsFromDir(sessionsDir) {
+  try {
+    if (!existsSync13(sessionsDir))
+      return [];
+    const files = collectJsonlFiles(sessionsDir).map((filePath) => {
+      try {
+        const stats = statSync8(filePath);
+        return { filePath, mtimeMs: stats.mtimeMs };
+      } catch {
+        return null;
+      }
+    }).filter((entry) => entry !== null).sort((a, b) => b.mtimeMs - a.mtimeMs).slice(0, MAX_RECENT_SESSIONS * 4);
+    const sessions = [];
+    for (const file of files) {
+      const parsed = parsePiSessionJsonl(readFileSync4(file.filePath, "utf8"), basename2(file.filePath));
+      if (!parsed)
+        continue;
+      sessions.push({ ...parsed, lastActivity: file.mtimeMs });
+      if (sessions.length >= MAX_RECENT_SESSIONS)
+        break;
+    }
+    return sessions;
+  } catch {
+    return [];
+  }
+}
+function collectJsonlFiles(root) {
+  const files = [];
+  const stack = [root];
+  while (stack.length > 0) {
+    const dir = stack.pop();
+    if (!dir)
+      continue;
+    let entries;
+    try {
+      entries = readdirSync6(dir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      const path = join11(dir, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(path);
+      } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+        files.push(path);
+      }
+    }
+  }
+  return files;
+}
+function parsePiSessionJsonl(jsonl, fallbackFilename = "") {
+  let id = extractUuidFromFilename(fallbackFilename);
+  let title = null;
+  for (const line of jsonl.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (trimmed.length === 0)
+      continue;
+    let value;
+    try {
+      value = JSON.parse(trimmed);
+    } catch {
+      continue;
+    }
+    if (!value || typeof value !== "object")
+      continue;
+    const record = value;
+    if (record.type === "session" && typeof record.id === "string" && record.id.length > 0) {
+      id = record.id;
+    }
+    if (title === null) {
+      const maybeTitle = extractPiUserMessageText(record);
+      if (maybeTitle)
+        title = truncateTitle(maybeTitle);
+    }
+    if (id && title)
+      break;
+  }
+  if (!id)
+    return null;
+  return { id, title: title ?? id };
+}
+function extractPiUserMessageText(record) {
+  if (record.type !== "message")
+    return null;
+  const message = record.message;
+  if (!message || typeof message !== "object")
+    return null;
+  const messageRecord = message;
+  if (messageRecord.role !== "user")
+    return null;
+  return extractTextFromContent(messageRecord.content);
+}
+function extractTextFromContent(content) {
+  if (typeof content === "string")
+    return content.trim() || null;
+  if (!Array.isArray(content))
+    return null;
+  const parts = content.map((part) => {
+    if (typeof part === "string")
+      return part;
+    if (!part || typeof part !== "object")
+      return "";
+    const partRecord = part;
+    return partRecord.type === "text" && typeof partRecord.text === "string" ? partRecord.text : "";
+  }).filter((text2) => text2.trim().length > 0);
+  const joined = parts.join(" ").trim();
+  return joined.length > 0 ? joined : null;
+}
+function extractUuidFromFilename(filename) {
+  const match = filename.match(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/i);
+  return match?.[1] ?? null;
+}
+function truncateTitle(title, maxLength = 60) {
+  const normalized = title.replace(/\s+/g, " ").trim();
+  if (normalized.length <= maxLength)
+    return normalized;
+  return `${normalized.slice(0, Math.max(0, maxLength - 1))}…`;
+}
+var MAX_RECENT_SESSIONS = 5;
+var init_sessions = () => {};
+
 // src/commands/doctor.ts
 var exports_doctor = {};
 __export(exports_doctor, {
@@ -11744,17 +11985,17 @@ __export(exports_doctor, {
 });
 import {
   chmodSync,
-  existsSync as existsSync13,
+  existsSync as existsSync14,
   mkdirSync as mkdirSync2,
   mkdtempSync,
-  readFileSync as readFileSync4,
+  readFileSync as readFileSync5,
   realpathSync as realpathSync3,
   rmSync as rmSync4,
-  statSync as statSync8,
+  statSync as statSync9,
   writeFileSync as writeFileSync2
 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 async function runDoctor(options) {
   if (options.issue) {
     return runIssueFlow(options.argv);
@@ -11767,7 +12008,7 @@ async function runDoctor(options) {
     return runClearFlow(options.argv);
   }
   const adapters = await resolveAdaptersForCommand(options.argv, {
-    allowMulti: true,
+    allowMulti: false,
     verb: "diagnose"
   });
   const report = await collectDiagnostics(adapters);
@@ -11798,6 +12039,10 @@ async function runDoctor(options) {
     O2.info(`  aft config: ${h.aftConfig.exists ? h.configPaths.aftConfig : "(not set)"}`);
     if (h.aftConfig.parseError) {
       O2.error(`  aft config parse error: ${h.aftConfig.parseError}`);
+    } else if (h.aftConfig.exists) {
+      const { value } = readJsoncFile(h.configPaths.aftConfig);
+      const schemaSet = value?.$schema === AFT_SCHEMA_URL;
+      O2.info(`  aft config $schema: ${schemaSet ? "set" : "not set — run `aft doctor --fix` for editor autocomplete"}`);
     }
     O2.info(`  storage: ${formatDoctorStorageStatus(h)}`);
     if (h.onnxRuntime.required) {
@@ -11904,7 +12149,7 @@ function clearOldBinaries() {
     errors: [],
     keptVersion: keepTag
   };
-  if (!existsSync13(info.path)) {
+  if (!existsSync14(info.path)) {
     O2.info(`Binary cache: nothing to clear at ${info.path}`);
     return result;
   }
@@ -11914,10 +12159,10 @@ function clearOldBinaries() {
     return result;
   }
   for (const version of stale) {
-    const dir = join11(info.path, version);
+    const dir = join12(info.path, version);
     let bytes = 0;
     try {
-      bytes = statSync8(dir).isDirectory() ? dirSize(dir) : 0;
+      bytes = statSync9(dir).isDirectory() ? dirSize(dir) : 0;
     } catch {
       bytes = 0;
     }
@@ -11937,6 +12182,42 @@ function clearOldBinaries() {
   }
   return result;
 }
+function findSchemaFixTargets(adapters) {
+  const targets = [];
+  for (const adapter of adapters) {
+    if (!adapter.isInstalled())
+      continue;
+    let aftConfig;
+    let aftConfigFormat;
+    try {
+      ({ aftConfig, aftConfigFormat } = adapter.detectConfigPaths());
+    } catch {
+      continue;
+    }
+    const { value } = readJsoncFile(aftConfig);
+    if (value?.$schema === AFT_SCHEMA_URL)
+      continue;
+    targets.push({ adapter, aftConfig, aftConfigFormat });
+  }
+  return targets;
+}
+function applySchemaFixes(targets) {
+  let changed = 0;
+  let errors = 0;
+  for (const target of targets) {
+    try {
+      const result = ensureAftSchemaUrl(target.aftConfig, target.aftConfigFormat);
+      if (result.action === "added" || result.action === "updated") {
+        changed += 1;
+        O2.success(`${target.adapter.displayName}: ${result.message}`);
+      }
+    } catch (error) {
+      errors += 1;
+      O2.warn(`${target.adapter.displayName}: could not set $schema on ${target.aftConfig}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  return { changed, errors };
+}
 function buildDoctorFixPlan(adapters, report) {
   const items = [];
   const adaptersByKind = new Map(adapters.map((adapter) => [adapter.kind, adapter]));
@@ -11984,6 +12265,12 @@ function buildDoctorFixPlan(adapters, report) {
       });
     }
   }
+  for (const target of findSchemaFixTargets(adapters)) {
+    items.push({
+      kind: "schema",
+      message: `Will add the AFT config $schema URL to ${target.aftConfig} (editor autocomplete + validation)`
+    });
+  }
   return items;
 }
 function shouldSkipDoctorFixConfirmation(argv) {
@@ -12022,7 +12309,7 @@ function logUnmatchedBinaryCandidates(expectedVersion) {
 }
 async function runFixFlow(argv) {
   const adapters = await resolveAdaptersForCommand(argv, {
-    allowMulti: true,
+    allowMulti: false,
     verb: "auto-fix issues for"
   });
   O2.info("Running diagnostics to identify auto-fixable issues…");
@@ -12044,6 +12331,7 @@ async function runFixFlow(argv) {
   }
   await fixPluginEntries(adapters);
   const storageSummary = ensureStorageDirsForRegisteredPlugins(adapters);
+  const schemaSummary = applySchemaFixes(findSchemaFixTargets(adapters));
   let binaryDownloaded = false;
   let binaryDownloadSkipped = false;
   let binaryDownloadError = null;
@@ -12072,7 +12360,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) {
+  if (onnxResult === null && !binaryDownloaded && !binaryDownloadSkipped && !binaryDownloadError && storageSummary.created === 0 && storageSummary.errors === 0 && schemaSummary.changed === 0 && schemaSummary.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);
@@ -12080,7 +12368,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;
+  const hadErrors = (onnxResult?.errors.length ?? 0) > 0 || binaryDownloadError !== null || storageSummary.errors > 0 || schemaSummary.errors > 0;
   const afterReport = await collectDiagnostics(adapters);
   const stillHasProblems = hasDoctorProblems(afterReport);
   gt(hadErrors ? "Done — some fixes failed." : stillHasProblems ? "Done — some issues remain." : "Done.");
@@ -12135,7 +12423,7 @@ function ensureStorageDirsForRegisteredPlugins(adapters) {
       if (!adapter.isInstalled() || !adapter.hasPluginEntry())
         continue;
       const storageDir = adapter.getStorageDir();
-      if (existsSync13(storageDir))
+      if (existsSync14(storageDir))
         continue;
       mkdirSync2(storageDir, { recursive: true });
       summary.created += 1;
@@ -12238,11 +12526,11 @@ function deriveIssueTitleFromBody(body) {
 function writeIssueReviewFile(body) {
   let reviewDir = null;
   try {
-    reviewDir = mkdtempSync(join11(tmpdir2(), "aft-issue-"));
+    reviewDir = mkdtempSync(join12(tmpdir2(), "aft-issue-"));
     if (process.platform !== "win32") {
       chmodSync(reviewDir, 448);
     }
-    const outPath = join11(reviewDir, "issue.md");
+    const outPath = join12(reviewDir, "issue.md");
     writeFileSync2(outPath, `${body}
 `, { encoding: "utf8", mode: 384, flag: "wx" });
     return { path: outPath, realPath: realpathSync3(outPath) };
@@ -12263,12 +12551,33 @@ function readReviewedIssueFile(reviewFile) {
       O2.error(`Review file path changed before filing; refusing to read ${reviewFile.path}.`);
       return null;
     }
-    return readFileSync4(reviewFile.path, "utf8");
+    return readFileSync5(reviewFile.path, "utf8");
   } catch (err) {
     O2.error(`Failed to read reviewed issue report: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   }
 }
+async function promptForIssueSession(adapter) {
+  const sessions = listRecentSessions(adapter);
+  if (sessions.length === 0)
+    return null;
+  const allLogsValue = "__all__";
+  const selected = await selectOne("Is this issue about a specific session?", [
+    { label: "General — not session-specific (include all logs)", value: allLogsValue },
+    ...sessions.map((session) => ({
+      label: truncateTitle(session.title),
+      value: session.id,
+      hint: shortSessionId(session.id)
+    }))
+  ]);
+  if (selected === allLogsValue)
+    return null;
+  return sessions.find((session) => session.id === selected) ?? null;
+}
+function shortSessionId(id) {
+  const bareId = id.replace(/^ses_/, "");
+  return bareId.length <= 12 ? bareId : bareId.slice(0, 12);
+}
 async function runIssueFlow(argv) {
   mt("AFT doctor --issue");
   if (!isInteractiveTerminal()) {
@@ -12277,28 +12586,33 @@ async function runIssueFlow(argv) {
     return 0;
   }
   const adapters = await resolveAdaptersForCommand(argv, {
-    allowMulti: true,
+    allowMulti: false,
     verb: "include in the issue"
   });
   const description = await text("Describe the problem you're running into:", {
     placeholder: "What happened? What did you expect? Steps to reproduce…",
     validate: (value) => value.trim().length === 0 ? "Please enter a short description." : undefined
   });
+  const selectedSession = await promptForIssueSession(adapters[0]);
+  const selectedBareSessionId = selectedSession?.id.replace(/^ses_/, "") ?? null;
   const report = await collectDiagnostics(adapters);
   const logSections = adapters.map((adapter) => {
     const path = adapter.getLogFile();
     const tail = tailLogFile(path, 200);
+    const scopedTail = selectedBareSessionId ? filterLogToSession(tail, selectedBareSessionId) : tail;
     return `#### ${adapter.displayName} log (${path})
 
 \`\`\`
-${tail || "<no log output>"}
+${scopedTail || "<no log output>"}
 \`\`\`
 `;
   }).join(`
 `);
   const errorScanWindow = adapters.map((adapter) => {
     const path = adapter.getLogFile();
-    return sanitizeContent(tailLogFile(path, 4000));
+    const tail = tailLogFile(path, 4000);
+    const scopedTail = selectedBareSessionId ? filterLogToSession(tail, selectedBareSessionId) : tail;
+    return sanitizeContent(scopedTail);
   }).join(`
 `);
   const recentErrorLines = extractRecentErrors(errorScanWindow, 20);
@@ -12314,6 +12628,7 @@ ${tail || "<no log output>"}
     `- AFT binary: ${report.binaryVersion ?? "unknown"}`,
     `- OS: ${report.platform} ${report.arch}`,
     `- Node: ${report.nodeVersion}`,
+    ...selectedSession ? [`- Session: ses_${selectedBareSessionId} (${truncateTitle(selectedSession.title)})`] : [],
     "",
     "## Diagnostics",
     renderDiagnosticsMarkdown(report),
@@ -12378,11 +12693,13 @@ var init_doctor = __esm(async () => {
   init_github();
   init_harness_select();
   init_issue_body();
+  init_jsonc();
   init_lsp_cache();
   init_onnx_fix();
   init_prompts();
   init_sanitize();
   init_self_version();
+  init_sessions();
   await __promiseAll([
     init_binary_probe(),
     init_diagnostics()
@@ -12413,6 +12730,7 @@ function printHelp() {
   console.log("  -------");
   console.log("");
   console.log("  Commands:");
+  console.log("    --version        Show CLI, binary, and per-harness plugin versions");
   console.log("    setup            Interactive setup wizard");
   console.log("    doctor           Check and fix configuration issues");
   console.log("    doctor lsp <file> Inspect LSP setup for one file");
@@ -12434,6 +12752,10 @@ function printHelp() {
   console.log("");
 }
 async function main() {
+  if (command === "--version" || command === "-v" || command === "-V" || command === "version") {
+    const { runVersion: runVersion2 } = await init_version().then(() => exports_version);
+    return runVersion2();
+  }
   if (command === "setup") {
     const { runSetup: runSetup2 } = await Promise.resolve().then(() => (init_setup(), exports_setup));
     return runSetup2(args);