@cortexkit/aft 0.39.4 → 0.40.1

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

@@ -1 +1 @@
-{"version":3,"file":"lsp.d.ts","sourceRoot":"","sources":["../../src/commands/lsp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAMrE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,cAAc,CAAC;IACpC,YAAY,CAAC,EAAE,OAAO,eAAe,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,aAAa,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,yBAAyB,CAAC;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACzC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,aAAa,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,sBAAsB,GAAG,WAAW,GAAG,MAAM,CAAC;IAC1F,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAkBD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,WAAW,GAAE,MAAsB,GAClC,MAAM,CAoBR;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAIzC;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2D7E;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAmD3F"}
+{"version":3,"file":"lsp.d.ts","sourceRoot":"","sources":["../../src/commands/lsp.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAKrE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,cAAc,CAAC;IACpC,YAAY,CAAC,EAAE,OAAO,eAAe,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,aAAa,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,yBAAyB,CAAC;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACzC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,aAAa,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,sBAAsB,GAAG,WAAW,GAAG,MAAM,CAAC;IAC1F,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAkBD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,WAAW,GAAE,MAAsB,GAClC,MAAM,CAoBR;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAIzC;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2D7E;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAmD3F"}

package/dist/index.js

@@ -110,18 +110,8 @@ var init_bash_hints = () => {};
 function isPassiveCommand(command) {
   return PASSIVE_COMMANDS.has(command);
 }
-var LONG_RUNNING_COMMAND_TIMEOUT_MS, PASSIVE_COMMANDS, PASSIVE_COMMAND_TIMEOUT_MS = 5000;
+var PASSIVE_COMMANDS, PASSIVE_COMMAND_TIMEOUT_MS = 5000;
 var init_command_timeouts = __esm(() => {
-  LONG_RUNNING_COMMAND_TIMEOUT_MS = {
-    callers: 60000,
-    trace_to: 60000,
-    trace_to_symbol: 60000,
-    trace_data: 60000,
-    impact: 60000,
-    grep: 60000,
-    glob: 60000,
-    semantic_search: 60000
-  };
   PASSIVE_COMMANDS = new Set(["status"]);
 });
 
@@ -211,30 +201,21 @@ function compareSemver(a, b) {
   }
   return 0;
 }
-function clampSemanticTimeout(configOverrides, bridgeTimeoutMs) {
-  const semantic = configOverrides.semantic;
-  if (!semantic || typeof semantic !== "object" || Array.isArray(semantic)) {
-    return configOverrides;
-  }
-  const timeoutMs = semantic.timeout_ms;
-  if (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs)) {
-    return configOverrides;
-  }
-  const semanticTransportBudgetMs = Math.max(bridgeTimeoutMs, LONG_RUNNING_COMMAND_TIMEOUT_MS.semantic_search ?? 0);
-  const maxSemanticTimeoutMs = semanticTransportBudgetMs > SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS ? semanticTransportBudgetMs - SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS : Math.max(1, semanticTransportBudgetMs - 1);
-  if (timeoutMs <= maxSemanticTimeoutMs) {
-    return configOverrides;
-  }
-  warn(`semantic.timeout_ms=${timeoutMs} exceeds the semantic transport budget; clamping to ${maxSemanticTimeoutMs}ms (budget: ${semanticTransportBudgetMs}ms)`);
-  return {
-    ...configOverrides,
-    semantic: {
-      ...semantic,
-      timeout_ms: maxSemanticTimeoutMs
+function coerceConfigureDroppedKeys(value) {
+  if (!Array.isArray(value))
+    return [];
+  const dropped = [];
+  for (const item of value) {
+    if (!item || typeof item !== "object" || Array.isArray(item))
+      continue;
+    const record = item;
+    if (typeof record.key === "string" && typeof record.tier === "string" && typeof record.reason === "string") {
+      dropped.push({ key: record.key, tier: record.tier, reason: record.reason });
     }
-  };
+  }
+  return dropped;
 }
-var DEFAULT_BRIDGE_TIMEOUT_MS = 30000, BRIDGE_HANG_TIMEOUT_THRESHOLD = 2, SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS = 5000, MAX_STDOUT_BUFFER, STDOUT_BUFFER_COMPACT_THRESHOLD, TERMINAL_BASH_STATUSES, BENIGN_CPUINFO_PROC_CPUINFO_PARSE_FAILURE = "failed to parse processor information from /proc/cpuinfo", BridgeReplacedDuringVersionCheck, BridgeTransportTimeoutError, BinaryBridge;
+var DEFAULT_BRIDGE_TIMEOUT_MS = 30000, BRIDGE_HANG_TIMEOUT_THRESHOLD = 2, MAX_STDOUT_BUFFER, STDOUT_BUFFER_COMPACT_THRESHOLD, TERMINAL_BASH_STATUSES, BENIGN_CPUINFO_PROC_CPUINFO_PARSE_FAILURE = "failed to parse processor information from /proc/cpuinfo", BridgeReplacedDuringVersionCheck, BridgeTransportTimeoutError, BinaryBridge;
 var init_bridge = __esm(() => {
   init_active_logger();
   init_command_timeouts();
@@ -310,7 +291,7 @@ var init_bridge = __esm(() => {
       this.timeoutMs = options?.timeoutMs ?? DEFAULT_BRIDGE_TIMEOUT_MS;
       this.hangThreshold = options?.hangThreshold ?? BRIDGE_HANG_TIMEOUT_THRESHOLD;
       this.maxRestarts = options?.maxRestarts ?? 3;
-      this.configOverrides = clampSemanticTimeout(configOverrides ?? {}, this.timeoutMs);
+      this.configOverrides = configOverrides ?? {};
       this.minVersion = options?.minVersion;
       this.onVersionMismatch = options?.onVersionMismatch;
       this.onConfigureWarnings = options?.onConfigureWarnings;
@@ -547,18 +528,24 @@ var init_bridge = __esm(() => {
       }
     }
     async deliverConfigureWarnings(configResult, params, options) {
-      if (!this.onConfigureWarnings || !Array.isArray(configResult.warnings))
+      if (!this.onConfigureWarnings)
         return;
-      if (configResult.warnings.length === 0)
+      const warnings = Array.isArray(configResult.warnings) ? configResult.warnings : [];
+      const configDroppedKeys = coerceConfigureDroppedKeys(configResult.config_dropped_keys);
+      if (warnings.length === 0 && configDroppedKeys.length === 0)
         return;
       const sessionId = typeof params.session_id === "string" ? params.session_id : undefined;
+      const context = {
+        projectRoot: this.cwd,
+        sessionId,
+        client: options?.configureWarningClient ?? (sessionId ? this.configureWarningClients.get(sessionId) : undefined),
+        warnings
+      };
+      if (configDroppedKeys.length > 0) {
+        context.configDroppedKeys = configDroppedKeys;
+      }
       try {
-        await this.onConfigureWarnings({
-          projectRoot: this.cwd,
-          sessionId,
-          client: options?.configureWarningClient ?? (sessionId ? this.configureWarningClients.get(sessionId) : undefined),
-          warnings: configResult.warnings
-        });
+        await this.onConfigureWarnings(context);
       } catch (err) {
         this.warnVia(`configure warning delivery failed: ${err instanceof Error ? err.message : String(err)}`);
       } finally {
@@ -1034,6 +1021,35 @@ var init_bridge = __esm(() => {
 
 // ../aft-bridge/dist/callgraph-format.js
 var init_callgraph_format = () => {};
+// ../aft-bridge/dist/config-tiers.js
+import { existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+function readConfigTiers(opts) {
+  const tiers = [];
+  try {
+    if (existsSync(opts.userConfigPath)) {
+      const doc = readFileSync(opts.userConfigPath, "utf-8");
+      tiers.push({
+        tier: "user",
+        source: resolve(opts.userConfigPath),
+        doc
+      });
+    }
+  } catch {}
+  try {
+    if (existsSync(opts.projectConfigPath)) {
+      const doc = readFileSync(opts.projectConfigPath, "utf-8");
+      tiers.push({
+        tier: "project",
+        source: resolve(opts.projectConfigPath),
+        doc
+      });
+    }
+  } catch {}
+  return tiers;
+}
+var init_config_tiers = () => {};
+
 // ../aft-bridge/dist/platform.js
 var init_platform = () => {};
 
@@ -1049,7 +1065,7 @@ var init_downloader = __esm(() => {
 var init_paths = () => {};
 
 // ../aft-bridge/dist/resolver.js
-import { chmodSync, closeSync, copyFileSync, existsSync, mkdirSync, openSync, readSync, renameSync, unlinkSync } from "node:fs";
+import { chmodSync, closeSync, copyFileSync, existsSync as existsSync2, mkdirSync, openSync, readSync, renameSync, unlinkSync } from "node:fs";
 function isNativeExecutable(binaryPath) {
   let fd = null;
   try {
@@ -1254,63 +1270,39 @@ var init_onnx_runtime = __esm(() => {
   };
 });
 
-// ../aft-bridge/dist/pipe-strip.js
-var NOISE_FILTERS, GREP_GUARD_FLAGS, XCODEBUILD_VALUE_FLAGS, XCODEBUILD_BUILD_ACTIONS, READS_FILE_OPERAND;
-var init_pipe_strip = __esm(() => {
-  NOISE_FILTERS = new Set([
-    "grep",
-    "rg",
-    "head",
-    "tail",
-    "cat",
-    "less",
-    "more",
-    "sed",
-    "awk",
-    "cut",
-    "sort",
-    "uniq",
-    "tr",
-    "column",
-    "fold"
-  ]);
-  GREP_GUARD_FLAGS = new Set([
-    "c",
-    "count",
-    "q",
-    "quiet",
-    "o",
-    "only-matching",
-    "l",
-    "files-with-matches"
-  ]);
-  XCODEBUILD_VALUE_FLAGS = new Set([
-    "-scheme",
-    "-target",
-    "-project",
-    "-workspace",
-    "-configuration",
-    "-sdk",
-    "-destination",
-    "-arch",
-    "-derivedDataPath",
-    "-resultBundlePath",
-    "-xcconfig",
-    "-toolchain"
-  ]);
-  XCODEBUILD_BUILD_ACTIONS = new Set([
-    "build",
-    "test",
-    "build-for-testing",
-    "test-without-building",
-    "analyze"
-  ]);
-  READS_FILE_OPERAND = new Set(["cat", "tac", "nl", "less", "more"]);
-});
-
-// ../aft-bridge/dist/pool.js
+// ../aft-bridge/dist/project-identity.js
 import { realpathSync } from "node:fs";
+import { resolve as resolve2 } from "node:path";
+function canonicalizeProjectRoot(dir) {
+  const trimmed = dir.replace(/[/\\]+$/, "");
+  let canonical;
+  try {
+    canonical = realpathSync(trimmed);
+  } catch {
+    canonical = resolve2(trimmed);
+  }
+  return normalizeWindowsRoot(canonical);
+}
+function normalizeWindowsRoot(p) {
+  if (process.platform !== "win32")
+    return p;
+  let s = p;
+  if (s.startsWith("\\\\?\\UNC\\")) {
+    s = `\\\\${s.slice("\\\\?\\UNC\\".length)}`;
+  } else if (s.startsWith("\\\\?\\")) {
+    s = s.slice("\\\\?\\".length);
+  }
+  if (s.length >= 2 && s[1] === ":") {
+    const drive = s.charCodeAt(0);
+    if (drive >= 97 && drive <= 122) {
+      s = s[0].toUpperCase() + s.slice(1);
+    }
+  }
+  return s;
+}
+var init_project_identity = () => {};
 
+// ../aft-bridge/dist/pool.js
 class BridgePool {
   bridges = new Map;
   staleBridges = new Set;
@@ -1478,17 +1470,13 @@ class BridgePool {
   }
 }
 function normalizeKey(projectRoot) {
-  const stripped = projectRoot.replace(/[/\\]+$/, "");
-  try {
-    return realpathSync(stripped);
-  } catch {
-    return stripped;
-  }
+  return canonicalizeProjectRoot(projectRoot);
 }
 var DEFAULT_IDLE_TIMEOUT_MS, DEFAULT_MAX_POOL_SIZE = 8, CLEANUP_INTERVAL_MS;
 var init_pool = __esm(() => {
   init_active_logger();
   init_bridge();
+  init_project_identity();
   DEFAULT_IDLE_TIMEOUT_MS = 30 * 60 * 1000;
   CLEANUP_INTERVAL_MS = 60 * 1000;
 });
@@ -1499,14 +1487,15 @@ var init_dist = __esm(() => {
   init_bridge();
   init_callgraph_format();
   init_command_timeouts();
+  init_config_tiers();
   init_downloader();
   init_migration();
   init_npm_resolver();
   init_onnx_runtime();
   init_paths();
-  init_pipe_strip();
   init_platform();
   init_pool();
+  init_project_identity();
   init_resolver();
 });
 
@@ -1575,7 +1564,7 @@ var init_paths2 = () => {};
 
 // src/lib/binary-probe.ts
 import { execSync, spawnSync } from "node:child_process";
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync as existsSync3 } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir as homedir4 } from "node:os";
 import { join as join4 } from "node:path";
@@ -1631,7 +1620,7 @@ function probeAftBinary(preferredVersion) {
   const candidates = [];
   for (const candidate of aftBinaryCandidates(preferredVersion)) {
     try {
-      if (!existsSync2(candidate))
+      if (!existsSync3(candidate))
         continue;
       const result = spawnSync(candidate, ["--version"], {
         stdio: ["ignore", "pipe", "pipe"],
@@ -1682,7 +1671,7 @@ function pushCandidate(candidates, candidate) {
 function firstExisting(candidates) {
   for (const candidate of candidates) {
     try {
-      if (!existsSync2(candidate))
+      if (!existsSync3(candidate))
         continue;
       return candidate;
     } catch {}
@@ -1739,10 +1728,10 @@ var init_binary_probe = __esm(async () => {
 });
 
 // src/lib/fs-util.ts
-import { existsSync as existsSync3, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync4, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
 import { join as join5 } from "node:path";
 function dirSize(path) {
-  if (!existsSync3(path)) {
+  if (!existsSync4(path)) {
     return 0;
   }
   const stat = statSync2(path);
@@ -9528,25 +9517,25 @@ var require_src2 = __commonJS((exports, module) => {
 });
 
 // src/lib/jsonc.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 import { dirname as dirname2 } from "node:path";
 function detectJsoncFile(configDir, baseName) {
   const jsoncPath = `${configDir}/${baseName}.jsonc`;
   const jsonPath = `${configDir}/${baseName}.json`;
-  if (existsSync4(jsoncPath)) {
+  if (existsSync5(jsoncPath)) {
     return { path: jsoncPath, format: "jsonc" };
   }
-  if (existsSync4(jsonPath)) {
+  if (existsSync5(jsonPath)) {
     return { path: jsonPath, format: "json" };
   }
   return { path: jsonPath, format: "none" };
 }
 function readJsoncFile(path) {
-  if (!existsSync4(path)) {
+  if (!existsSync5(path)) {
     return { value: null };
   }
   try {
-    const raw = readFileSync(path, "utf-8");
+    const raw = readFileSync2(path, "utf-8");
     const value = import_comment_json.parse(raw);
     return { value };
   } catch (error2) {
@@ -9563,7 +9552,7 @@ function writeJsoncFile(path, value, format = "json") {
 `);
 }
 function ensureAftSchemaUrl(path, format) {
-  const existed = existsSync4(path);
+  const existed = existsSync5(path);
   if (!existed) {
     const writeFormat = format === "jsonc" ? "jsonc" : "json";
     writeJsoncFile(path, { $schema: AFT_SCHEMA_URL }, writeFormat);
@@ -9616,14 +9605,14 @@ 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 statSync3 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync3, 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 { dirname as dirname3, join as join6, parse, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
 function getOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
-    return resolve(envDir);
+    return resolve3(envDir);
   const xdg = process.env.XDG_CONFIG_HOME || join6(homedir5(), ".config");
   return join6(xdg, "opencode");
 }
@@ -9657,7 +9646,7 @@ function openCodeDesktopAppExists() {
   }
   return candidates.some((p) => {
     try {
-      return existsSync5(p);
+      return existsSync6(p);
     } catch {
       return false;
     }
@@ -9680,13 +9669,13 @@ function pathPointsToOurPlugin(entry) {
   if (!fsPath)
     return false;
   try {
-    if (!existsSync5(fsPath))
+    if (!existsSync6(fsPath))
       return false;
     let searchDir = statSync3(fsPath).isDirectory() ? fsPath : dirname3(fsPath);
     let pkgJsonPath = null;
     while (true) {
       const candidate = join6(searchDir, "package.json");
-      if (existsSync5(candidate)) {
+      if (existsSync6(candidate)) {
         pkgJsonPath = candidate;
         break;
       }
@@ -9697,7 +9686,7 @@ function pathPointsToOurPlugin(entry) {
     }
     if (!pkgJsonPath)
       return false;
-    const parsed = JSON.parse(readFileSync2(pkgJsonPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync3(pkgJsonPath, "utf-8"));
     return parsed.name === PLUGIN_NAME;
   } catch {
     return false;
@@ -9717,7 +9706,7 @@ class OpenCodeAdapter {
   pluginPackageName = PLUGIN_NAME;
   pluginEntryWithVersion = PLUGIN_ENTRY;
   isInstalled() {
-    if (existsSync5(getOpenCodeConfigDir()))
+    if (existsSync6(getOpenCodeConfigDir()))
       return true;
     if (openCodeDesktopAppExists())
       return true;
@@ -9802,8 +9791,8 @@ class OpenCodeAdapter {
     let cached;
     try {
       const installedPkgPath = join6(path, "node_modules", "@cortexkit", "aft-opencode", "package.json");
-      if (existsSync5(installedPkgPath)) {
-        const pkg = JSON.parse(readFileSync2(installedPkgPath, "utf-8"));
+      if (existsSync6(installedPkgPath)) {
+        const pkg = JSON.parse(readFileSync3(installedPkgPath, "utf-8"));
         cached = typeof pkg.version === "string" ? pkg.version : undefined;
       }
     } catch {
@@ -9813,7 +9802,7 @@ class OpenCodeAdapter {
       path,
       cached,
       latest: getSelfVersion(),
-      exists: existsSync5(path)
+      exists: existsSync6(path)
     };
   }
   getStorageDir() {
@@ -9881,7 +9870,7 @@ 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 { existsSync as existsSync7, readFileSync as readFileSync4 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 import { join as join7 } from "node:path";
 function getPiAgentDir() {
@@ -9891,9 +9880,9 @@ function getPiAgentDir() {
 }
 function readPiExtensionIndex() {
   const settingsPath = join7(getPiAgentDir(), "settings.json");
-  if (existsSync6(settingsPath)) {
+  if (existsSync7(settingsPath)) {
     try {
-      const raw = readFileSync3(settingsPath, "utf-8");
+      const raw = readFileSync4(settingsPath, "utf-8");
       const trimmed = raw.replace(/^\uFEFF/, "");
       const value = JSON.parse(trimmed);
       const packages = value.packages;
@@ -9910,7 +9899,7 @@ function readPiExtensionIndex() {
     join7(getPiAgentDir(), "config.jsonc")
   ];
   for (const path of candidates) {
-    if (!existsSync6(path))
+    if (!existsSync7(path))
       continue;
     try {
       const { value } = readJsoncFile(path);
@@ -9948,12 +9937,12 @@ function piEntryMatchesAft(entry) {
   if (!resolved)
     return false;
   try {
-    if (!existsSync6(resolved))
+    if (!existsSync7(resolved))
       return false;
     const pkgPath = join7(resolved, "package.json");
-    if (!existsSync6(pkgPath))
+    if (!existsSync7(pkgPath))
       return false;
-    const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
     return pkg.name === PLUGIN_NAME2;
   } catch {
     return false;
@@ -10050,10 +10039,10 @@ class PiAdapter {
       join7(getPiAgentDir(), "extensions", "node_modules", "@cortexkit", "aft-pi", "package.json")
     ];
     for (const candidate of candidates) {
-      if (!existsSync6(candidate))
+      if (!existsSync7(candidate))
         continue;
       try {
-        const pkg = JSON.parse(readFileSync3(candidate, "utf-8"));
+        const pkg = JSON.parse(readFileSync4(candidate, "utf-8"));
         const cached = typeof pkg.version === "string" ? pkg.version : undefined;
         return {
           path: candidate,
@@ -11707,7 +11696,7 @@ function isResponseForRequest(parsed, expectedIds) {
   return expectedIds.has(id);
 }
 async function sendAftRequests(binaryPath, requests) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     const child = spawn2(binaryPath, [], {
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -11744,7 +11733,7 @@ async function sendAftRequests(binaryPath, requests) {
       const response = parsed;
       responses.push(response);
       if (responses.length === requests.length) {
-        finish(() => resolve2(responses));
+        finish(() => resolve4(responses));
       }
     };
     child.stdout.setEncoding("utf-8");
@@ -11819,25 +11808,25 @@ __export(exports_lsp, {
   printLspDoctorHelp: () => printLspDoctorHelp,
   findProjectRootForFile: () => findProjectRootForFile
 });
-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";
+import { existsSync as existsSync8, readdirSync as readdirSync3, statSync as statSync4 } from "node:fs";
+import { dirname as dirname4, join as join8, resolve as resolve4 } from "node:path";
 function findProjectRootForFile(filePath, fallbackCwd = process.cwd()) {
-  const resolvedFile = resolve2(fallbackCwd, filePath);
+  const resolvedFile = resolve4(fallbackCwd, filePath);
   let dir = dirname4(resolvedFile);
   try {
-    if (existsSync7(resolvedFile) && statSync4(resolvedFile).isDirectory()) {
+    if (existsSync8(resolvedFile) && statSync4(resolvedFile).isDirectory()) {
       dir = resolvedFile;
     }
   } catch {
     dir = dirname4(resolvedFile);
   }
   while (true) {
-    if (PROJECT_ROOT_MARKERS.some((marker) => existsSync7(join8(dir, marker)))) {
+    if (PROJECT_ROOT_MARKERS.some((marker) => existsSync8(join8(dir, marker)))) {
       return dir;
     }
     const parent = dirname4(dir);
     if (parent === dir)
-      return resolve2(fallbackCwd);
+      return resolve4(fallbackCwd);
     dir = parent;
   }
 }
@@ -11868,7 +11857,7 @@ async function runLspDoctor(options) {
     O2.error("Could not find the aft binary in the cache, platform package, PATH, or ~/.cargo/bin.");
     return 1;
   }
-  const resolvedFile = resolve2(file);
+  const resolvedFile = resolve4(file);
   const projectRoot = findProjectRootForFile(resolvedFile);
   const config = buildConfigureParams(adapter, projectRoot);
   const inspectRequest = {
@@ -11953,87 +11942,20 @@ function parseFileArg(argv) {
   return null;
 }
 function buildConfigureParams(adapter, projectRoot) {
-  const paths = adapter.detectConfigPaths();
-  const userConfig = readJsoncFile(paths.aftConfig).value ?? {};
-  const projectConfig = readProjectConfig(adapter.kind, projectRoot);
-  const merged = mergeConfig(userConfig, projectConfig);
-  const lsp = isRecord(merged.lsp) ? merged.lsp : {};
-  const lspConfig = resolveLspConfig(merged);
+  const userConfigPath = adapter.detectConfigPaths().aftConfig;
+  const dir = adapter.kind === "pi" ? ".pi" : ".opencode";
+  const projectJsonc = join8(projectRoot, dir, "aft.jsonc");
+  const projectJson = join8(projectRoot, dir, "aft.json");
+  const projectConfigPath = existsSync8(projectJsonc) ? projectJsonc : projectJson;
   return {
     id: "doctor-lsp-configure",
     command: "configure",
     project_root: projectRoot,
     harness: adapter.kind,
-    ...lspConfig,
-    lsp_paths_extra: inferLspPathsExtra(lsp)
+    config: readConfigTiers({ userConfigPath, projectConfigPath }),
+    lsp_paths_extra: inferLspPathsExtra({})
   };
 }
-function readProjectConfig(kind, projectRoot) {
-  const dir = kind === "pi" ? ".pi" : ".opencode";
-  const jsonc = join8(projectRoot, dir, "aft.jsonc");
-  const json = join8(projectRoot, dir, "aft.json");
-  if (existsSync7(jsonc))
-    return readJsoncFile(jsonc).value ?? {};
-  if (existsSync7(json))
-    return readJsoncFile(json).value ?? {};
-  return {};
-}
-function mergeConfig(userConfig, projectConfig) {
-  const userLsp = isRecord(userConfig.lsp) ? userConfig.lsp : {};
-  const projectLsp = isRecord(projectConfig.lsp) ? projectConfig.lsp : {};
-  return {
-    ...userConfig,
-    ...projectConfig,
-    lsp: {
-      ...userLsp,
-      ...projectLsp,
-      ...isRecord(userLsp.servers) ? { servers: userLsp.servers } : {},
-      ...Array.isArray(userLsp.disabled) ? { disabled: userLsp.disabled } : {}
-    }
-  };
-}
-function resolveLspConfig(config) {
-  const lsp = isRecord(config.lsp) ? config.lsp : {};
-  const disabled = new Set;
-  for (const entry of Array.isArray(lsp.disabled) ? lsp.disabled : []) {
-    if (typeof entry === "string")
-      disabled.add(entry.toLowerCase());
-  }
-  let experimentalTy = typeof config.experimental_lsp_ty === "boolean" ? config.experimental_lsp_ty : undefined;
-  if (lsp.python === "ty") {
-    experimentalTy = true;
-    disabled.add("python");
-  } else if (lsp.python === "pyright") {
-    experimentalTy = false;
-    disabled.add("ty");
-  }
-  const result = {};
-  if (experimentalTy !== undefined)
-    result.experimental_lsp_ty = experimentalTy;
-  if (disabled.size > 0)
-    result.disabled_lsp = [...disabled];
-  const servers = resolveCustomServers(lsp.servers);
-  if (servers.length > 0)
-    result.lsp_servers = servers;
-  return result;
-}
-function resolveCustomServers(servers) {
-  if (!isRecord(servers))
-    return [];
-  return Object.entries(servers).filter(([, server]) => isRecord(server)).map(([id, server]) => {
-    const entry = server;
-    return {
-      id,
-      extensions: Array.isArray(entry.extensions) ? entry.extensions : [],
-      binary: typeof entry.binary === "string" ? entry.binary : "",
-      args: Array.isArray(entry.args) ? entry.args : [],
-      root_markers: Array.isArray(entry.root_markers) ? entry.root_markers : [".git"],
-      disabled: entry.disabled === true,
-      ...isRecord(entry.env) ? { env: entry.env } : {},
-      ...entry.initialization_options !== undefined ? { initialization_options: entry.initialization_options } : {}
-    };
-  }).filter((server) => typeof server.binary === "string" && server.binary.length > 0);
-}
 function inferLspPathsExtra(_lsp) {
   const paths = new Set;
   for (const entry of childDirs(getAftLspPackagesDir())) {
@@ -12045,7 +11967,7 @@ function inferLspPathsExtra(_lsp) {
   return [...paths];
 }
 function childDirs(path) {
-  if (!existsSync7(path))
+  if (!existsSync8(path))
     return [];
   try {
     return readdirSync3(path).map((entry) => join8(path, entry)).filter((entry) => {
@@ -12090,14 +12012,11 @@ function installHint(binaryName) {
     return "Install with `npm install -g pyright`.";
   return `Install ${binaryName} and ensure it is on PATH or in lsp_paths_extra.`;
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 var PROJECT_ROOT_MARKERS;
 var init_lsp = __esm(async () => {
+  init_dist();
   init_aft_bridge();
   init_harness_select();
-  init_jsonc();
   init_paths2();
   init_prompts();
   init_self_version();
@@ -12128,9 +12047,9 @@ __export(exports_doctor_filters, {
   renderFilterList: () => renderFilterList,
   printDoctorFiltersHelp: () => printDoctorFiltersHelp
 });
-import { existsSync as existsSync8 } from "node:fs";
+import { existsSync as existsSync9 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { relative, resolve as resolve3 } from "node:path";
+import { relative, resolve as resolve5 } from "node:path";
 function printDoctorFiltersHelp() {
   console.log("Usage: aft doctor filters [--show <name>] [trust|untrust]");
   console.log("");
@@ -12165,13 +12084,13 @@ async function runDoctorFilters(options) {
     O2.error("Could not find the aft binary in the cache, platform package, PATH, or ~/.cargo/bin.");
     return 1;
   }
-  const projectRoot = resolve3(process.cwd());
+  const projectRoot = resolve5(process.cwd());
   const list = await listFilters(binary, adapter, projectRoot, options.sendRequests ?? sendAftRequests);
   if (!list.success) {
     O2.error(list.message ?? list.code ?? "list_filters failed");
     return 1;
   }
-  list.project_dir_exists = list.project_dir ? existsSync8(list.project_dir) : false;
+  list.project_dir_exists = list.project_dir ? existsSync9(list.project_dir) : false;
   if (mode.kind === "list") {
     console.log(renderFilterList(list, projectRoot));
     return 0;
@@ -12370,11 +12289,11 @@ var init_doctor_filters = __esm(async () => {
 });
 
 // src/lib/binary-cache.ts
-import { existsSync as existsSync9, readdirSync as readdirSync4, statSync as statSync5 } from "node:fs";
+import { existsSync as existsSync10, 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)) {
+  if (!existsSync10(path)) {
     return {
       versions: [],
       activeVersion: null,
@@ -12482,7 +12401,7 @@ var init_sanitize = __esm(() => {
 });
 
 // src/lib/bridge-tool-failures.ts
-import { closeSync as closeSync2, existsSync as existsSync10, openSync as openSync2, readSync as readSync2, statSync as statSync6 } from "node:fs";
+import { closeSync as closeSync2, existsSync as existsSync11, openSync as openSync2, readSync as readSync2, statSync as statSync6 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join10 } from "node:path";
 function resolveBridgePluginLogPath() {
@@ -12490,7 +12409,7 @@ function resolveBridgePluginLogPath() {
   return join10(tmpdir2(), isTestEnv ? "aft-plugin-test.log" : "aft-plugin.log");
 }
 function tailLogFileBytes(path, maxBytes) {
-  if (!existsSync10(path) || maxBytes <= 0)
+  if (!existsSync11(path) || maxBytes <= 0)
     return "";
   let fd = null;
   try {
@@ -12625,10 +12544,10 @@ var init_bridge_tool_failures = __esm(() => {
 });
 
 // src/lib/lsp-cache.ts
-import { existsSync as existsSync11, readdirSync as readdirSync5, rmSync as rmSync2, statSync as statSync7 } from "node:fs";
+import { existsSync as existsSync12, readdirSync as readdirSync5, rmSync as rmSync2, statSync as statSync7 } from "node:fs";
 import { join as join11 } from "node:path";
 function inspectDir(path) {
-  if (!existsSync11(path)) {
+  if (!existsSync12(path)) {
     return { entries: [], totalSize: 0 };
   }
   const entries = [];
@@ -12698,8 +12617,8 @@ var init_lsp_cache = __esm(() => {
 });
 
 // src/lib/onnx.ts
-import { existsSync as existsSync12, readdirSync as readdirSync6, readlinkSync, realpathSync as realpathSync3, statSync as statSync8 } from "node:fs";
-import { basename, isAbsolute as isAbsolute2, join as join12, resolve as resolve4, win32 } from "node:path";
+import { existsSync as existsSync13, readdirSync as readdirSync6, readlinkSync, realpathSync as realpathSync3, statSync as statSync8 } from "node:fs";
+import { basename, isAbsolute as isAbsolute2, join as join12, resolve as resolve6, win32 } from "node:path";
 function getOnnxLibraryName() {
   if (process.platform === "darwin")
     return "libonnxruntime.dylib";
@@ -12768,7 +12687,7 @@ function findSystemOnnxRuntime() {
       if (!userProfile)
         return nugetPaths;
       const nugetPackageDir = join12(userProfile, ".nuget", "packages", "microsoft.ml.onnxruntime");
-      if (!existsSync12(nugetPackageDir))
+      if (!existsSync13(nugetPackageDir))
         return nugetPaths;
       try {
         for (const entry of readdirSync6(nugetPackageDir, { withFileTypes: true })) {
@@ -12786,7 +12705,7 @@ function findSystemOnnxRuntime() {
   const seen = new Set;
   const unknownVersionPaths = [];
   for (const dir of searchPaths) {
-    let key = resolve4(dir).replace(/[/\\]+$/, "");
+    let key = resolve6(dir).replace(/[/\\]+$/, "");
     if (normalizeCase)
       key = key.toLowerCase();
     if (seen.has(key))
@@ -12808,10 +12727,10 @@ function findSystemOnnxRuntime() {
 function findCachedOnnxRuntime(storageDir) {
   const ortDir = join12(storageDir, "onnxruntime", ONNX_RUNTIME_VERSION);
   const libName = getOnnxLibraryName();
-  if (existsSync12(join12(ortDir, libName)))
+  if (existsSync13(join12(ortDir, libName)))
     return ortDir;
   const libSubdir = join12(ortDir, "lib");
-  if (existsSync12(join12(libSubdir, libName)))
+  if (existsSync13(join12(libSubdir, libName)))
     return libSubdir;
   return null;
 }
@@ -12832,7 +12751,7 @@ function parseOrtVersionFromDirectoryPath(value) {
   return null;
 }
 function detectOrtVersion(libDir) {
-  if (!existsSync12(libDir))
+  if (!existsSync13(libDir))
     return null;
   const libName = getOnnxLibraryName();
   try {
@@ -12848,7 +12767,7 @@ function detectOrtVersion(libDir) {
         return version;
     }
     const base = join12(libDir, libName);
-    if (existsSync12(base)) {
+    if (existsSync13(base)) {
       try {
         const real = realpathSync3(base);
         const version = parseOrtVersionFromPath(real) ?? parseOrtVersionFromDirectoryPath(real);
@@ -12883,7 +12802,7 @@ import {
   accessSync,
   closeSync as closeSync3,
   constants,
-  existsSync as existsSync13,
+  existsSync as existsSync14,
   openSync as openSync3,
   readSync as readSync3,
   statSync as statSync9
@@ -12915,7 +12834,7 @@ async function diagnoseHarness(adapter) {
   const logPath = adapter.getLogFile();
   const pluginCache = adapter.getPluginCacheInfo();
   const storageAccessible = (() => {
-    if (!existsSync13(storage))
+    if (!existsSync14(storage))
       return false;
     try {
       accessSync(storage, constants.R_OK | constants.W_OK);
@@ -12938,14 +12857,14 @@ async function diagnoseHarness(adapter) {
     pluginRegistered: adapter.hasPluginEntry(),
     configPaths,
     aftConfig: {
-      exists: existsSync13(configPaths.aftConfig),
+      exists: existsSync14(configPaths.aftConfig),
       ...aftConfigRead.error ? { parseError: aftConfigRead.error } : {},
       flags: aftFlags
     },
     pluginCache,
     storageDir: {
       path: storage,
-      exists: existsSync13(storage),
+      exists: existsSync14(storage),
       accessible: storageAccessible,
       sizesByKey: describeStorage
     },
@@ -12963,8 +12882,8 @@ async function diagnoseHarness(adapter) {
     },
     logFile: {
       path: logPath,
-      exists: existsSync13(logPath),
-      sizeKb: existsSync13(logPath) ? Math.round(statSync9(logPath).size / 1024) : 0
+      exists: existsSync14(logPath),
+      sizeKb: existsSync14(logPath) ? Math.round(statSync9(logPath).size / 1024) : 0
     }
   };
 }
@@ -13158,7 +13077,7 @@ function formatDiagnosticIssuesSection(report) {
   return lines;
 }
 function tailLogFile(path, lines) {
-  if (!existsSync13(path))
+  if (!existsSync14(path))
     return "";
   if (lines <= 0)
     return "";
@@ -13344,7 +13263,7 @@ var init_issue_body = __esm(() => {
 });
 
 // src/lib/onnx-fix.ts
-import { existsSync as existsSync14, rmSync as rmSync3 } from "node:fs";
+import { existsSync as existsSync15, rmSync as rmSync3 } from "node:fs";
 import { join as join13 } from "node:path";
 function findOnnxFixCandidates(report) {
   const candidates = [];
@@ -13362,7 +13281,7 @@ function findOnnxFixCandidates(report) {
         harness,
         reason: `cached ONNX Runtime at ${harness.onnxRuntime.cachedPath} is v${harness.onnxRuntime.cachedVersion}, but AFT requires ${harness.onnxRuntime.requirement}. Clearing forces a fresh download on next start.`,
         storageOnnxDir,
-        storageOnnxBytes: existsSync14(storageOnnxDir) ? dirSize(storageOnnxDir) : 0
+        storageOnnxBytes: existsSync15(storageOnnxDir) ? dirSize(storageOnnxDir) : 0
       });
       continue;
     }
@@ -13371,7 +13290,7 @@ function findOnnxFixCandidates(report) {
         harness,
         reason: `system ONNX Runtime at ${harness.onnxRuntime.systemPath} is v${harness.onnxRuntime.systemVersion}, but AFT requires ${harness.onnxRuntime.requirement}, and no AFT-managed install is present. AFT v0.19.5+ skips incompatible system installs and auto-downloads v1.24 on next start; clearing any stale state here ensures a clean slate.`,
         storageOnnxDir,
-        storageOnnxBytes: existsSync14(storageOnnxDir) ? dirSize(storageOnnxDir) : 0
+        storageOnnxBytes: existsSync15(storageOnnxDir) ? dirSize(storageOnnxDir) : 0
       });
     }
   }
@@ -13401,7 +13320,7 @@ async function runOnnxFix(adapters, report, options = {}) {
   const result = { cleared: 0, bytesReclaimed: 0, errors: [] };
   const rmFn = options.rmFn ?? rmSync3;
   for (const c2 of candidates) {
-    if (!existsSync14(c2.storageOnnxDir)) {
+    if (!existsSync15(c2.storageOnnxDir)) {
       O2.success(`${c2.harness.displayName}: no cached state to clear; restart your harness to trigger a fresh ONNX download`);
       continue;
     }
@@ -13427,7 +13346,7 @@ var init_onnx_fix = __esm(() => {
 });
 
 // src/lib/sessions.ts
-import { existsSync as existsSync15, readdirSync as readdirSync7, readFileSync as readFileSync4, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync16, readdirSync as readdirSync7, readFileSync as readFileSync5, statSync as statSync10 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { homedir as homedir9 } from "node:os";
 import { basename as basename2, join as join14 } from "node:path";
@@ -13460,7 +13379,7 @@ function mapOpenCodeSessionRows(rows) {
 }
 function listRecentOpenCodeSessions() {
   const dbPath = join14(getXdgDataHome(), "opencode", "opencode.db");
-  if (!existsSync15(dbPath))
+  if (!existsSync16(dbPath))
     return [];
   let db = null;
   try {
@@ -13490,7 +13409,7 @@ function getHomeDir() {
 }
 function listPiSessionsFromDir(sessionsDir) {
   try {
-    if (!existsSync15(sessionsDir))
+    if (!existsSync16(sessionsDir))
       return [];
     const files = collectJsonlFiles(sessionsDir).map((filePath) => {
       try {
@@ -13502,7 +13421,7 @@ function listPiSessionsFromDir(sessionsDir) {
     }).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));
+      const parsed = parsePiSessionJsonl(readFileSync5(file.filePath, "utf8"), basename2(file.filePath));
       if (!parsed)
         continue;
       sessions.push({ ...parsed, lastActivity: file.mtimeMs });
@@ -13628,10 +13547,10 @@ __export(exports_doctor, {
 import { execFileSync } from "node:child_process";
 import {
   chmodSync as chmodSync2,
-  existsSync as existsSync16,
+  existsSync as existsSync17,
   mkdirSync as mkdirSync3,
   mkdtempSync,
-  readFileSync as readFileSync5,
+  readFileSync as readFileSync6,
   realpathSync as realpathSync4,
   rmSync as rmSync4,
   statSync as statSync11,
@@ -13792,7 +13711,7 @@ function clearOldBinaries() {
     errors: [],
     keptVersion: keepTag
   };
-  if (!existsSync16(info.path)) {
+  if (!existsSync17(info.path)) {
     O2.info(`Binary cache: nothing to clear at ${info.path}`);
     return result;
   }
@@ -14127,7 +14046,7 @@ function ensureStorageDirsForRegisteredPlugins(adapters) {
       if (!adapter.isInstalled() || !adapter.hasPluginEntry())
         continue;
       const storageDir = adapter.getStorageDir();
-      if (existsSync16(storageDir))
+      if (existsSync17(storageDir))
         continue;
       mkdirSync3(storageDir, { recursive: true });
       summary.created += 1;
@@ -14255,7 +14174,7 @@ function readReviewedIssueFile(reviewFile) {
       O2.error(`Review file path changed before filing; refusing to read ${reviewFile.path}.`);
       return null;
     }
-    return readFileSync5(reviewFile.path, "utf8");
+    return readFileSync6(reviewFile.path, "utf8");
   } catch (err) {
     O2.error(`Failed to read reviewed issue report: ${err instanceof Error ? err.message : String(err)}`);
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft",
-  "version": "0.39.4",
+  "version": "0.40.1",
   "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.39.4",
+    "@cortexkit/aft-bridge": "0.40.1",
     "comment-json": "^4.6.2"
   },
   "devDependencies": {