@cortexkit/aft-opencode 0.32.0 → 0.33.0

package/dist/index.js

@@ -11599,6 +11599,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 var DEFAULT_BRIDGE_TIMEOUT_MS = 30000;
+var BRIDGE_HANG_TIMEOUT_THRESHOLD = 2;
 var SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS = 5000;
 var MAX_STDOUT_BUFFER = 64 * 1024 * 1024;
 function tagStderrLine(line) {
@@ -11706,8 +11707,11 @@ class BinaryBridge {
   statusListeners = new Set;
   configureWarningClients = new Map;
   restartResetTimer = null;
+  lastChildActivityAt = 0;
+  consecutiveRequestTimeouts = 0;
   errorPrefix;
   logger;
+  childEnv;
   constructor(binaryPath, cwd, options, configOverrides) {
     this.binaryPath = binaryPath;
     this.cwd = cwd;
@@ -11722,6 +11726,7 @@ class BinaryBridge {
     this.onBashPatternMatch = options?.onBashPatternMatch;
     this.errorPrefix = options?.errorPrefix ?? "[aft-bridge]";
     this.logger = options?.logger;
+    this.childEnv = options?.childEnv;
   }
   logVia(message, meta) {
     const logger = this.logger ?? getActiveLogger();
@@ -11873,20 +11878,41 @@ class BinaryBridge {
       const line = `${JSON.stringify(request)}
 `;
       const keepBridgeOnTimeout = options?.keepBridgeOnTimeout === true;
+      let requestSentAt = Date.now();
       const response = await new Promise((resolve, reject) => {
         const timer = setTimeout(() => {
+          const entry = this.pending.get(id);
+          if (!entry)
+            return;
           this.pending.delete(id);
-          const restartSuffix = keepBridgeOnTimeout ? "" : " — restarting bridge";
+          clearTimeout(entry.timer);
+          if (keepBridgeOnTimeout) {
+            const timeoutMsg2 = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`;
+            if (requestSessionId) {
+              this.sessionWarnVia(requestSessionId, timeoutMsg2);
+            } else {
+              this.warnVia(timeoutMsg2);
+            }
+            entry.reject(new Error(`${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
+            return;
+          }
+          const childActiveSinceRequest = this.lastChildActivityAt > requestSentAt;
+          const consecutiveTimeouts = this.consecutiveRequestTimeouts + 1;
+          this.consecutiveRequestTimeouts = consecutiveTimeouts;
+          const keepWarm = childActiveSinceRequest || consecutiveTimeouts < BRIDGE_HANG_TIMEOUT_THRESHOLD;
+          const restartSuffix = keepWarm ? " — bridge kept warm" : " — restarting bridge";
           const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms${restartSuffix}`;
           if (requestSessionId) {
             this.sessionWarnVia(requestSessionId, timeoutMsg);
           } else {
             this.warnVia(timeoutMsg);
           }
-          reject(new Error(`${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
-          if (!keepBridgeOnTimeout) {
-            this.handleTimeout(requestSessionId);
+          if (keepWarm) {
+            entry.reject(new Error(`${this.errorPrefix} request "${command}" timed out after ${effectiveTimeoutMs}ms (bridge busy/under load); bridge kept warm — retry`));
+            return;
           }
+          entry.reject(new Error(`${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
+          this.handleTimeout(requestSessionId);
         }, effectiveTimeoutMs);
         this.pending.set(id, { resolve, reject, timer, onProgress: options?.onProgress });
         if (!this.process?.stdin?.writable) {
@@ -11895,6 +11921,7 @@ class BinaryBridge {
           reject(new Error(`${this.errorPrefix} stdin not writable for command "${command}"`));
           return;
         }
+        requestSentAt = Date.now();
         this.process.stdin.write(line, (err) => {
           if (err) {
             const entry = this.pending.get(id);
@@ -12089,6 +12116,15 @@ class BinaryBridge {
         this.logVia(`ORT_DYLIB_PATH set from managed ONNX Runtime: ${ortLibraryPath}`);
       }
     }
+    if (this.childEnv) {
+      for (const [key, value] of Object.entries(this.childEnv)) {
+        if (value === undefined) {
+          delete env[key];
+        } else {
+          env[key] = value;
+        }
+      }
+    }
     const child = spawn(this.binaryPath, [], {
       cwd: this.cwd,
       stdio: ["pipe", "pipe", "pipe"],
@@ -12138,6 +12174,8 @@ class BinaryBridge {
     this.process = child;
     this.stdoutBuffer = "";
     this.stderrBuffer = "";
+    this.lastChildActivityAt = 0;
+    this.consecutiveRequestTimeouts = 0;
     this.stderrTail = [];
   }
   pushStderrLine(line) {
@@ -12193,6 +12231,7 @@ class BinaryBridge {
         continue;
       try {
         const response = JSON.parse(line);
+        this.lastChildActivityAt = Date.now();
         if (response.type === "progress") {
           const requestId = response.request_id;
           const entry = requestId ? this.pending.get(requestId) : undefined;
@@ -12245,6 +12284,7 @@ class BinaryBridge {
             continue;
           this.pending.delete(id);
           clearTimeout(entry.timer);
+          this.consecutiveRequestTimeouts = 0;
           this.scheduleRestartCountReset();
           entry.resolve(response);
         } else if (typeof response.type === "string") {
@@ -12256,6 +12296,7 @@ class BinaryBridge {
     }
   }
   handleTimeout(triggeringSessionId) {
+    this.consecutiveRequestTimeouts = 0;
     this.rejectAllPending(new Error(`${this.errorPrefix} bridge killed during sibling timeout — request aborted`));
     if (this.process) {
       this.process.kill("SIGKILL");
@@ -12334,7 +12375,7 @@ class BinaryBridge {
 // ../aft-bridge/dist/downloader.js
 import { spawnSync } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
-import { chmodSync, closeSync, createWriteStream, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
+import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
 import { Readable } from "node:stream";
@@ -12501,10 +12542,18 @@ async function downloadBinary(version) {
       throw new Error(`Checksum mismatch for ${assetName}: expected ${expectedHash}, got ${actualHash}. ` + "The binary may have been tampered with.");
     }
     log(`Checksum verified (SHA-256: ${actualHash.slice(0, 16)}...)`);
-    if (process.platform !== "win32") {
+    if (process.platform === "win32") {
+      copyFileSync(tmpPath, binaryPath);
+    } else {
       chmodSync(tmpPath, 493);
+      renameSync(tmpPath, binaryPath);
+    }
+    try {
+      if (existsSync(tmpPath))
+        unlinkSync(tmpPath);
+    } catch {
+      warn(`Could not clean up temporary download file ${tmpPath} — it can be removed manually.`);
     }
-    renameSync(tmpPath, binaryPath);
     log(`AFT binary ready at ${binaryPath}`);
     return binaryPath;
   } catch (err) {
@@ -12668,7 +12717,7 @@ function markAnnouncementSeen(storageRoot, harness, currentVersion) {
 
 // ../aft-bridge/dist/resolver.js
 import { execSync } from "node:child_process";
-import { chmodSync as chmodSync2, copyFileSync, existsSync as existsSync3, mkdirSync as mkdirSync3, renameSync as renameSync3 } from "node:fs";
+import { chmodSync as chmodSync2, copyFileSync as copyFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync3, renameSync as renameSync3, unlinkSync as unlinkSync2 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { homedir as homedir3 } from "node:os";
 import { join as join4 } from "node:path";
@@ -12691,10 +12740,15 @@ function copyToVersionedCache(npmBinaryPath, knownVersion) {
     }
     mkdirSync3(versionedDir, { recursive: true });
     const tmpPath = `${cachedPath}.${process.pid}.${Date.now()}.tmp`;
-    copyFileSync(npmBinaryPath, tmpPath);
+    copyFileSync2(npmBinaryPath, tmpPath);
     if (process.platform !== "win32") {
       chmodSync2(tmpPath, 493);
     }
+    if (process.platform === "win32" && existsSync3(cachedPath)) {
+      try {
+        unlinkSync2(cachedPath);
+      } catch {}
+    }
     renameSync3(tmpPath, cachedPath);
     log(`Copied npm binary to versioned cache: ${cachedPath}`);
     return cachedPath;
@@ -12946,7 +13000,7 @@ async function ensureStorageMigrated(opts) {
 // ../aft-bridge/dist/onnx-runtime.js
 import { execFileSync } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
-import { chmodSync as chmodSync3, closeSync as closeSync2, copyFileSync as copyFileSync2, createWriteStream as createWriteStream2, existsSync as existsSync5, lstatSync, mkdirSync as mkdirSync5, openSync as openSync2, readdirSync, readFileSync as readFileSync3, readlinkSync, realpathSync, rmSync as rmSync2, statSync as statSync2, symlinkSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { chmodSync as chmodSync3, closeSync as closeSync2, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync5, lstatSync, mkdirSync as mkdirSync5, openSync as openSync2, readdirSync, readFileSync as readFileSync3, readlinkSync, realpathSync, rmSync as rmSync2, statSync as statSync2, symlinkSync, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { basename, dirname as dirname3, isAbsolute, join as join6, relative, resolve, win32 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
@@ -13185,20 +13239,64 @@ function findSystemOnnxRuntime(libName) {
   } else if (process.platform === "linux") {
     searchPaths.push("/usr/lib", "/usr/lib/x86_64-linux-gnu", "/usr/lib/aarch64-linux-gnu", "/usr/local/lib");
   } else if (process.platform === "win32") {
+    const programFiles = process.env.ProgramFiles ?? "C:\\Program Files";
+    const programFilesX86 = process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
+    searchPaths.push(join6(programFiles, "onnxruntime", "lib"), join6(programFiles, "Microsoft ONNX Runtime", "lib"), join6(programFiles, "Microsoft Machine Learning", "lib"), join6(programFilesX86, "onnxruntime", "lib"), ...(() => {
+      const nugetPaths = [];
+      const userProfile = process.env.USERPROFILE ?? "";
+      if (!userProfile)
+        return nugetPaths;
+      const nugetPackageDir = join6(userProfile, ".nuget", "packages", "microsoft.ml.onnxruntime");
+      if (!existsSync5(nugetPackageDir))
+        return nugetPaths;
+      try {
+        for (const entry of readdirSync(nugetPackageDir, { withFileTypes: true })) {
+          if (!entry.isDirectory())
+            continue;
+          if (entry.name === "__globalPackagesFolder" || entry.name.startsWith("."))
+            continue;
+          nugetPaths.push(join6(nugetPackageDir, entry.name, "runtimes", "win-x64", "native"), join6(nugetPackageDir, entry.name, "runtimes", "win-arm64", "native"));
+        }
+      } catch (err) {
+        warn(`Failed to scan NuGet ONNX Runtime cache ${nugetPackageDir}: ${err instanceof Error ? err.message : String(err)}`);
+      }
+      return nugetPaths;
+    })());
     searchPaths.push(...pathEntriesForPlatform());
   }
+  const normalizeCase = process.platform === "win32" || process.platform === "darwin";
   const seen = new Set;
-  for (const dir of searchPaths) {
-    if (seen.has(dir))
-      continue;
-    seen.add(dir);
-    if (!directoryContainsLibrary(dir, libName))
-      continue;
-    const version = detectOnnxVersion(dir, libName);
-    if (version && !isOnnxVersionCompatible(version)) {
-      warn(`Skipping system ONNX Runtime at ${dir} (v${version}); AFT requires ` + `v${REQUIRED_ORT_MAJOR}.${REQUIRED_ORT_MIN_MINOR}+. Falling through to AFT-managed download.`);
+  const uniquePaths = searchPaths.filter((p) => {
+    let key = resolve(p).replace(/[/\\]+$/, "");
+    if (normalizeCase)
+      key = key.toLowerCase();
+    if (seen.has(key))
+      return false;
+    seen.add(key);
+    return true;
+  });
+  for (const dir of uniquePaths) {
+    const libPath = join6(dir, libName);
+    if (process.platform === "win32") {
+      if (!directoryContainsLibrary(dir, libName))
+        continue;
+    } else if (!existsSync5(libPath)) {
       continue;
     }
+    let skipVersionCheck = false;
+    if (process.platform === "win32") {
+      const dirLower = dir.toLowerCase();
+      const isCommonPath = dirLower.includes("program files") || dirLower.includes("onnxruntime");
+      if (!isCommonPath)
+        skipVersionCheck = true;
+    }
+    if (!skipVersionCheck) {
+      const version = detectOnnxVersion(dir, libName);
+      if (version && !isOnnxVersionCompatible(version)) {
+        warn(`Skipping system ONNX Runtime at ${dir} (v${version}); AFT requires ` + `v${REQUIRED_ORT_MAJOR}.${REQUIRED_ORT_MIN_MINOR}+. Falling through to AFT-managed download.`);
+        continue;
+      }
+    }
     return dir;
   }
   return null;
@@ -13236,7 +13334,7 @@ async function downloadFileWithCap(url, destPath) {
     await pipeline2(nodeStream, createWriteStream2(destPath), { signal: controller.signal });
   } catch (err) {
     try {
-      unlinkSync2(destPath);
+      unlinkSync3(destPath);
     } catch {}
     throw err;
   } finally {
@@ -13297,7 +13395,7 @@ async function downloadOnnxRuntime(info, targetDir) {
       await extractZipArchive(archivePath, tmpDir);
     }
     try {
-      unlinkSync2(archivePath);
+      unlinkSync3(archivePath);
     } catch {}
     validateExtractedTree(tmpDir);
     const extractedDir = join6(tmpDir, info.assetName, "lib");
@@ -13346,7 +13444,7 @@ async function downloadOnnxRuntime(info, targetDir) {
     return null;
   }
 }
-function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, copyFile = copyFileSync2) {
+function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, copyFile = copyFileSync3) {
   const requiredLibs = new Set([info.libName]);
   for (const libFile of realFiles) {
     const src = join6(extractedDir, libFile);
@@ -13367,7 +13465,7 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
   for (const link of symlinks) {
     const dst = join6(targetDir, link.name);
     try {
-      unlinkSync2(dst);
+      unlinkSync3(dst);
     } catch {}
     try {
       symlinkSync(link.target, dst);
@@ -13478,7 +13576,7 @@ ${new Date().toISOString()}
   }
   log(`[onnx] reclaiming install lock (owner_pid=${owningPid ?? "unknown"}, alive=${ownerAlive}, age_ms=${age})`);
   try {
-    unlinkSync2(lockPath);
+    unlinkSync3(lockPath);
   } catch {}
   return tryClaim();
 }
@@ -13503,7 +13601,7 @@ function releaseLock(lockPath) {
       return;
     }
     try {
-      unlinkSync2(lockPath);
+      unlinkSync3(lockPath);
     } catch (unlinkErr) {
       const code = unlinkErr.code;
       if (code !== "ENOENT") {
@@ -14738,7 +14836,7 @@ function formatDuration(completion) {
 
 // src/config.ts
 var import_comment_json = __toESM(require_src2(), 1);
-import { existsSync as existsSync6, readFileSync as readFileSync4, renameSync as renameSync4, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync4, renameSync as renameSync4, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { join as join8 } from "node:path";
 
@@ -28326,6 +28424,7 @@ var LspConfigSchema = exports_external.object({
   servers: exports_external.record(exports_external.string().trim().min(1), LspServerEntrySchema).optional(),
   disabled: exports_external.array(exports_external.string().trim().min(1)).optional(),
   python: exports_external.enum(["pyright", "ty", "auto"]).optional(),
+  diagnostics_on_edit: exports_external.boolean().optional(),
   auto_install: exports_external.boolean().optional(),
   grace_days: exports_external.number().int().positive().optional(),
   versions: exports_external.record(exports_external.string().trim().min(1), exports_external.string().trim().min(1)).optional()
@@ -28349,6 +28448,24 @@ var BashFeaturesSchema = exports_external.object({
   long_running_reminder_interval_ms: exports_external.number().int().positive().optional()
 });
 var BashConfigSchema = exports_external.union([exports_external.boolean(), BashFeaturesSchema]);
+var InspectConfigSchema = exports_external.object({
+  enabled: exports_external.boolean().optional(),
+  tier2_idle_minutes: exports_external.number().min(0).optional(),
+  categories: exports_external.record(exports_external.string(), exports_external.boolean()).optional(),
+  tier2_soft_deadline_ms: exports_external.number().int().positive().optional(),
+  max_drill_down_items: exports_external.number().int().positive().max(100).optional(),
+  duplicates: exports_external.object({
+    lower_bound: exports_external.number().int().positive().optional(),
+    discard_cost: exports_external.number().int().min(0).optional(),
+    anonymize: exports_external.object({
+      variables: exports_external.boolean().optional(),
+      fields: exports_external.boolean().optional(),
+      methods: exports_external.boolean().optional(),
+      types: exports_external.boolean().optional(),
+      literals: exports_external.boolean().optional()
+    }).optional()
+  }).optional()
+});
 var AftConfigSchema = exports_external.object({
   $schema: exports_external.string().optional(),
   format_on_edit: exports_external.boolean().optional(),
@@ -28362,6 +28479,7 @@ var AftConfigSchema = exports_external.object({
   restrict_to_project_root: exports_external.boolean().optional(),
   search_index: exports_external.boolean().optional(),
   semantic_search: exports_external.boolean().optional(),
+  inspect: InspectConfigSchema.optional(),
   bash: BashConfigSchema.optional(),
   experimental: ExperimentalConfigSchema.optional(),
   lsp: LspConfigSchema.optional(),
@@ -28438,6 +28556,8 @@ function resolveProjectOverridesForConfigure(config2) {
   Object.assign(overrides, resolveLspConfigForConfigure(config2));
   if (config2.semantic !== undefined)
     overrides.semantic = config2.semantic;
+  if (config2.inspect !== undefined)
+    overrides.inspect = config2.inspect;
   if (config2.max_callgraph_files !== undefined)
     overrides.max_callgraph_files = config2.max_callgraph_files;
   return overrides;
@@ -28653,7 +28773,7 @@ ${serialized}` : serialized;
   } catch (err) {
     if (tmpPath) {
       try {
-        unlinkSync3(tmpPath);
+        unlinkSync4(tmpPath);
       } catch {}
     }
     if (isWritableMigrationError(err)) {
@@ -28746,6 +28866,9 @@ function mergeLspConfig(baseLsp, overrideLsp) {
   const projectLsp = {};
   if (overrideLsp?.python !== undefined)
     projectLsp.python = overrideLsp.python;
+  if (overrideLsp?.diagnostics_on_edit !== undefined) {
+    projectLsp.diagnostics_on_edit = overrideLsp.diagnostics_on_edit;
+  }
   const userDisabled = baseLsp?.disabled ?? [];
   const lsp = {
     ...baseLsp,
@@ -28757,6 +28880,27 @@ function mergeLspConfig(baseLsp, overrideLsp) {
   }
   return Object.fromEntries(Object.entries(lsp).filter(([, value]) => value !== undefined));
 }
+function mergeInspectConfig(baseInspect, overrideInspect) {
+  const inspect = {
+    ...baseInspect,
+    ...overrideInspect,
+    duplicates: baseInspect?.duplicates || overrideInspect?.duplicates ? {
+      ...baseInspect?.duplicates,
+      ...overrideInspect?.duplicates,
+      anonymize: baseInspect?.duplicates?.anonymize || overrideInspect?.duplicates?.anonymize ? {
+        ...baseInspect?.duplicates?.anonymize,
+        ...overrideInspect?.duplicates?.anonymize
+      } : undefined
+    } : undefined
+  };
+  if (inspect.duplicates && inspect.duplicates.anonymize === undefined) {
+    delete inspect.duplicates.anonymize;
+  }
+  if (Object.values(inspect).every((value) => value === undefined)) {
+    return;
+  }
+  return Object.fromEntries(Object.entries(inspect).filter(([, value]) => value !== undefined));
+}
 function mergeBashConfig(baseBash, overrideBash) {
   if (baseBash === undefined && overrideBash === undefined)
     return;
@@ -28816,6 +28960,7 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "validate_on_edit",
   "search_index",
   "semantic_search",
+  "inspect",
   "experimental",
   "bash"
 ]);
@@ -28848,8 +28993,10 @@ function mergeConfigs(base, override) {
   const lsp = mergeLspConfig(base.lsp, override.lsp);
   const experimental = mergeExperimentalConfig(base.experimental, override.experimental);
   const bash = mergeBashConfig(base.bash, override.bash);
+  const inspect = mergeInspectConfig(base.inspect, override.inspect);
   const safeOverride = pickProjectSafeFields(override);
   delete safeOverride.bash;
+  delete safeOverride.inspect;
   return {
     ...base,
     ...safeOverride,
@@ -28857,6 +29004,7 @@ function mergeConfigs(base, override) {
     ...Object.keys(checker).length > 0 ? { checker } : {},
     ...lsp ? { lsp } : {},
     ...bash !== undefined ? { bash } : {},
+    ...inspect !== undefined ? { inspect } : {},
     experimental,
     semantic,
     ...disabledTools.length > 0 ? { disabled_tools: [...new Set(disabledTools)] } : {}
@@ -29603,7 +29751,7 @@ import {
   openSync as openSync4,
   readFileSync as readFileSync8,
   statSync as statSync4,
-  unlinkSync as unlinkSync4,
+  unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync7
 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
@@ -29733,7 +29881,7 @@ ${new Date().toISOString()}
   }
   log2(`[lsp] reclaiming install lock for ${lockKey} (owner_pid=${owningPid ?? "unknown"}, alive=${ownerAlive}, age_ms=${age})`);
   try {
-    unlinkSync4(lock);
+    unlinkSync5(lock);
   } catch {}
   return tryClaim();
 }
@@ -29770,7 +29918,7 @@ function releaseInstallLock(lockKey) {
       return;
     }
     try {
-      unlinkSync4(lock);
+      unlinkSync5(lock);
     } catch (unlinkErr) {
       const code = unlinkErr.code;
       if (code !== "ENOENT") {
@@ -30427,7 +30575,7 @@ function runAutoInstall(projectRoot, config2, fetchImpl = fetch) {
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { createHash as createHash5, randomBytes } from "node:crypto";
 import {
-  copyFileSync as copyFileSync3,
+  copyFileSync as copyFileSync4,
   createReadStream as createReadStream2,
   createWriteStream as createWriteStream3,
   existsSync as existsSync11,
@@ -30440,7 +30588,7 @@ import {
   renameSync as renameSync7,
   rmSync as rmSync6,
   statSync as statSync6,
-  unlinkSync as unlinkSync5,
+  unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync8
 } from "node:fs";
 import { dirname as dirname7, join as join15, relative as relative2, resolve as resolve3 } from "node:path";
@@ -30802,7 +30950,7 @@ async function downloadFile(url2, destPath, fetchImpl, assetSize, signal) {
     await pipeline3(nodeStream, createWriteStream3(destPath), { signal: timeout.signal });
   } catch (err) {
     try {
-      unlinkSync5(destPath);
+      unlinkSync6(destPath);
     } catch {}
     throw err;
   } finally {
@@ -31034,7 +31182,7 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
   } catch (err) {
     error2(`[lsp] hash ${spec.id} failed: ${err}`);
     try {
-      unlinkSync5(archivePath);
+      unlinkSync6(archivePath);
     } catch {}
     return null;
   }
@@ -31045,7 +31193,7 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
     if (previousArchiveSha256 !== archiveSha256) {
       error2(`[lsp] ${spec.id} ${tag}: TOFU sha256 mismatch — refusing install. ` + `Previously installed archive sha256=${previousArchiveSha256}, downloaded sha256=${archiveSha256}. ` + `This means the published release for tag ${tag} changed. Investigate before proceeding. ` + `Run \`aft doctor --clear\` to wipe the cache and force a fresh install if you've verified the change.`);
       try {
-        unlinkSync5(archivePath);
+        unlinkSync6(archivePath);
       } catch {}
       return null;
     }
@@ -31057,7 +31205,7 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
     return null;
   } finally {
     try {
-      unlinkSync5(archivePath);
+      unlinkSync6(archivePath);
     } catch {}
   }
   const innerBinaryPath = join15(extractDir, spec.binaryPathInArchive(platform2, arch, version2));
@@ -31068,7 +31216,7 @@ async function downloadAndInstall(spec, tag, assets, platform2, arch, fetchImpl,
   const targetBinary = ghBinaryPath(spec, platform2);
   mkdirSync9(dirname7(targetBinary), { recursive: true });
   try {
-    copyFileSync3(innerBinaryPath, targetBinary);
+    copyFileSync4(innerBinaryPath, targetBinary);
     if (platform2 !== "win32") {
       const { chmodSync: chmodSync4 } = await import("node:fs");
       chmodSync4(targetBinary, 493);
@@ -31426,13 +31574,21 @@ async function getSessionMessages(client, sessionId) {
 async function sendIgnoredMessage(client, sessionId, text) {
   try {
     const c = client;
-    const agent = await resolveCurrentAgent(c, sessionId);
+    const promptContext = await resolvePromptContext(c, sessionId);
     const body = {
       noReply: true,
       parts: [{ type: "text", text, ignored: true }]
     };
-    if (agent)
-      body.agent = agent;
+    if (promptContext?.agent)
+      body.agent = promptContext.agent;
+    if (promptContext?.model) {
+      body.model = {
+        providerID: promptContext.model.providerID,
+        modelID: promptContext.model.modelID
+      };
+    }
+    if (promptContext?.variant)
+      body.variant = promptContext.variant;
     const promptInput = {
       path: { id: sessionId },
       body
@@ -31450,14 +31606,6 @@ async function sendIgnoredMessage(client, sessionId, text) {
   }
   return false;
 }
-async function resolveCurrentAgent(client, sessionId) {
-  try {
-    const ctx = await resolvePromptContext(client, sessionId);
-    return ctx?.agent;
-  } catch {
-    return;
-  }
-}
 async function deleteMessage(serverUrl, sessionId, messageId) {
   const auth = getServerAuth();
   const url2 = `${serverUrl}/session/${encodeURIComponent(sessionId)}/message/${encodeURIComponent(messageId)}`;
@@ -31534,13 +31682,18 @@ function persistAnnouncedVersion(storageDir, version2) {
   markAnnouncementSeen(storageDir, "opencode", version2);
 }
 async function readWarnedTools(bridge) {
+  let resp;
+  try {
+    resp = await bridge.send("db_get_state", { key: "warned_tools" });
+  } catch {
+    return null;
+  }
+  if (resp.success === false)
+    return null;
+  const value = resp.data?.value;
+  if (typeof value !== "string")
+    return {};
   try {
-    const resp = await bridge.send("db_get_state", { key: "warned_tools" });
-    if (resp.success === false)
-      return {};
-    const value = resp.data?.value;
-    if (typeof value !== "string")
-      return {};
     const parsed = JSON.parse(value);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
       return {};
@@ -31549,12 +31702,16 @@ async function readWarnedTools(bridge) {
     return {};
   }
 }
-async function hasWarnedFor(bridge, key) {
+async function warnedStatus(bridge, key) {
   const warned = await readWarnedTools(bridge);
-  return warned[key] === true || typeof warned[key] === "string";
+  if (warned === null)
+    return "unknown";
+  return warned[key] === true || typeof warned[key] === "string" ? "warned" : "fresh";
 }
 async function recordWarning(bridge, key) {
   const warned = await readWarnedTools(bridge);
+  if (warned === null)
+    return;
   warned[key] = true;
   try {
     await bridge.send("db_set_state", {
@@ -31606,7 +31763,8 @@ async function deliverConfigureWarnings(opts, warnings) {
     return;
   for (const warning of warnings) {
     const key = warningKey(warning, opts.projectRoot);
-    if (await hasWarnedFor(opts.bridge, key))
+    const status = await warnedStatus(opts.bridge, key);
+    if (status !== "fresh")
       continue;
     const delivered = await sendIgnoredMessage(opts.client, opts.sessionId, formatConfigureWarning(warning));
     if (!delivered)
@@ -31755,7 +31913,7 @@ function writeTerminal(terminal, data) {
 
 // src/shared/rpc-server.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { mkdirSync as mkdirSync10, renameSync as renameSync8, unlinkSync as unlinkSync6, writeFileSync as writeFileSync9 } from "node:fs";
+import { mkdirSync as mkdirSync10, renameSync as renameSync8, unlinkSync as unlinkSync7, writeFileSync as writeFileSync9 } from "node:fs";
 import { createServer } from "node:http";
 import { dirname as dirname8, join as join18 } from "node:path";
 
@@ -31829,7 +31987,7 @@ class AftRpcServer {
     }
     this.token = null;
     try {
-      unlinkSync6(this.portFilePath);
+      unlinkSync7(this.portFilePath);
     } catch {}
   }
   dispatch(req, res) {
@@ -32215,24 +32373,28 @@ function getState() {
   }
   return g[GLOBAL_KEY];
 }
-var shuttingDown = false;
+var runningCleanups = false;
 async function runCleanups(reason) {
-  if (shuttingDown)
-    return;
-  shuttingDown = true;
-  const state = getState();
-  if (state.cleanups.size === 0)
+  if (runningCleanups)
     return;
-  log2(`Shutdown triggered by ${reason} — running ${state.cleanups.size} cleanup(s)`);
-  const cleanups = Array.from(state.cleanups);
-  state.cleanups.clear();
-  await Promise.allSettled(cleanups.map(async (fn) => {
-    try {
-      await fn();
-    } catch (err) {
-      log2(`Cleanup error: ${err.message}`);
-    }
-  }));
+  runningCleanups = true;
+  try {
+    const state = getState();
+    if (state.cleanups.size === 0)
+      return;
+    log2(`Shutdown triggered by ${reason} — running ${state.cleanups.size} cleanup(s)`);
+    const cleanups = Array.from(state.cleanups);
+    state.cleanups.clear();
+    await Promise.allSettled(cleanups.map(async (fn) => {
+      try {
+        await fn();
+      } catch (err) {
+        log2(`Cleanup error: ${err.message}`);
+      }
+    }));
+  } finally {
+    runningCleanups = false;
+  }
 }
 function installProcessHandlers() {
   const state = getState();
@@ -33082,7 +33244,14 @@ function applyUpdateChunks(originalContent, filePath, chunks) {
       lineIndex = contextIdx + 1;
     }
     if (chunk.old_lines.length === 0) {
-      const insertionIdx = originalLines.length > 0 && originalLines[originalLines.length - 1] === "" ? originalLines.length - 1 : originalLines.length;
+      let insertionIdx;
+      if (chunk.change_context) {
+        insertionIdx = lineIndex;
+      } else if (originalLines.length > 0 && originalLines[originalLines.length - 1] === "") {
+        insertionIdx = originalLines.length - 1;
+      } else {
+        insertionIdx = originalLines.length;
+      }
       replacements.push([insertionIdx, 0, chunk.new_lines]);
       continue;
     }
@@ -34067,6 +34236,10 @@ function inferBeforeStart(ops, from, beforeLen) {
   return beforeLen;
 }
 var z7 = tool7.schema;
+var DIAGNOSTICS_PARAM_DESCRIPTION = "When true, wait up to 3 seconds for fresh LSP diagnostics on the edited file and include them in the result. Defaults to the configured `lsp.diagnostics_on_edit` value (false unless configured); per-call true/false overrides. Use aft_inspect to check diagnostics across a batch of edits or before tests/commits.";
+function diagnosticsOnEditDefault(ctx) {
+  return ctx.config.lsp?.diagnostics_on_edit ?? false;
+}
 var READ_DESCRIPTION = `Read file contents or list directory entries.
 
 Use either startLine/endLine OR offset/limit to read a section of a file.
@@ -34084,8 +34257,7 @@ Examples:
   Read lines 50-100: { "filePath": "src/app.ts", "startLine": 50, "endLine": 100 }
   Read 30 lines from line 200: { "filePath": "src/app.ts", "offset": 200, "limit": 30 }
   List directory: { "filePath": "src/" }
-
-Returns: Line-numbered file content string. For directories: newline-joined sorted entries. For binary files: size/message string.`;
+`;
 function createReadTool(ctx) {
   return {
     description: READ_DESCRIPTION,
@@ -34210,24 +34382,26 @@ function getWriteDescription(editToolName) {
 
 Automatically creates parent directories. Backs up existing files before overwriting.
 If the project has a formatter configured (biome, prettier, rustfmt, etc.), the file
-is auto-formatted after writing. Returns inline LSP diagnostics when available.
+is auto-formatted after writing. Edits return as soon as the write completes unless
+the configured \`lsp.diagnostics_on_edit\` default or a per-call \`diagnostics: true\`
+asks for legacy sync-wait behavior. Call \`aft_inspect\` afterward to check
+diagnostics across a batch of edits.
 
 **Behavior:**
 - Creates parent directories automatically (no need to mkdir first)
 - Existing files are backed up before overwriting (recoverable via aft_safety undo)
 - Auto-formats using project formatter if configured (biome.json, .prettierrc, etc.)
-- Returns LSP error-level diagnostics inline if type errors are introduced
+- LSP diagnostics follow \`lsp.diagnostics_on_edit\` by default; pass \`diagnostics\` to override per call
 - Use this for creating new files or completely replacing file contents
-- For partial edits (find/replace), use the \`${editToolName}\` tool instead
-
-Returns: Status message string (for example: "Created new file. Auto-formatted.") with optional inline LSP error lines.`;
+- For partial edits (find/replace), use the \`${editToolName}\` tool instead`;
 }
 function createWriteTool(ctx, editToolName = "edit") {
   return {
     description: getWriteDescription(editToolName),
     args: {
       filePath: z7.string().describe("Path to the file to write (absolute or relative to project root)"),
-      content: z7.string().describe("The full content to write to the file")
+      content: z7.string().describe("The full content to write to the file"),
+      diagnostics: z7.boolean().optional().describe(DIAGNOSTICS_PARAM_DESCRIPTION)
     },
     execute: async (args, context) => {
       const file2 = args.filePath;
@@ -34249,8 +34423,8 @@ function createWriteTool(ctx, editToolName = "edit") {
         file: filePath,
         content,
         create_dirs: true,
-        diagnostics: true,
-        include_diff: true
+        diagnostics: args.diagnostics ?? diagnosticsOnEditDefault(ctx),
+        include_diff_content: true
       });
       if (data.success === false) {
         throw new Error(data.message || "write failed");
@@ -34280,7 +34454,7 @@ LSP errors detected, please fix:
       if (pendingServers && pendingServers.length > 0) {
         output += `
 
-Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagnostics may be incomplete; rerun lsp_diagnostics later for a fresh check.`;
+Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagnostics may be incomplete; call aft_inspect for a checkpoint diagnostics snapshot.`;
       }
       if (exitedServers && exitedServers.length > 0) {
         output += `
@@ -34362,11 +34536,8 @@ Note: Modes 6 and 7 are options on mode 5 (find/replace) — they require \`oldS
 - Auto-formats using project formatter if configured
 - Tree-sitter syntax validation on all edits
 - Symbol replace includes decorators, attributes, and doc comments in range
-- LSP error-level diagnostics are returned automatically after edits
-
-Returns: JSON string for the selected edit mode. Edits may append inline LSP error lines.
-
-Common response fields: success (boolean), diff (object with before/after), backup_id (string), syntax_valid (boolean). Exact fields vary by mode.`;
+- Edits return as soon as the write completes unless \`lsp.diagnostics_on_edit\` or a per-call \`diagnostics: true\` requests legacy sync-wait behavior. Call \`aft_inspect\` afterward to check diagnostics across a batch of edits.
+- Response is a JSON string for the selected edit mode; key fields include success, diff, backup_id, syntax_valid, and mode-specific fields.`;
 }
 function createEditTool(ctx, writeToolName = "write") {
   return {
@@ -34381,7 +34552,8 @@ function createEditTool(ctx, writeToolName = "write") {
       content: z7.string().optional().describe("Replacement content for symbol mode or operations[].command='write'. For whole-file writes, use the `write` tool."),
       appendContent: z7.string().optional().describe("Text to append to the end of filePath; creates the file if needed"),
       edits: z7.array(z7.record(z7.string(), z7.unknown())).optional().describe("Batch edits — array of { oldString: string, newString: string } or { startLine: number (1-based), endLine: number (1-based, inclusive), content: string }"),
-      operations: z7.array(z7.record(z7.string(), z7.unknown())).optional().describe("Transaction — array of { file: string, command: 'edit_match' | 'write', match?: string, replacement?: string, content?: string } for multi-file edits with rollback. Note: uses 'file'/'match'/'replacement' (not filePath/oldString/newString)")
+      operations: z7.array(z7.record(z7.string(), z7.unknown())).optional().describe("Transaction — array of { file: string, command: 'edit_match' | 'write', match?: string, replacement?: string, content?: string } for multi-file edits with rollback. Note: uses 'file'/'match'/'replacement' (not filePath/oldString/newString)"),
+      diagnostics: z7.boolean().optional().describe(DIAGNOSTICS_PARAM_DESCRIPTION)
     },
     execute: async (args, context) => {
       const argsRecord = args;
@@ -34477,8 +34649,8 @@ function createEditTool(ctx, writeToolName = "write") {
         const hint = typeof args.content === "string" ? ` To write the whole file, use the '${writeToolName}' tool. To edit existing content, provide 'oldString' (and optionally 'newString'), 'symbol' + 'content', or an 'edits' array.` : " Provide 'oldString' (+ optional 'newString'), 'symbol' + 'content', 'edits' array, or 'operations' array.";
         throw new Error(`edit: no edit mode resolved from arguments.${hint}`);
       }
-      params.diagnostics = true;
-      params.include_diff = true;
+      params.diagnostics = args.diagnostics ?? diagnosticsOnEditDefault(ctx);
+      params.include_diff_content = true;
       const data = await callBridge(ctx, context, command, params);
       if (data.success && data.diff) {
         const diff = data.diff;
@@ -34503,7 +34675,12 @@ function createEditTool(ctx, writeToolName = "write") {
           });
         }
       }
-      let result = JSON.stringify(data);
+      const agentData = { ...data };
+      if (agentData.diff && typeof agentData.diff === "object") {
+        const d = agentData.diff;
+        agentData.diff = { additions: d.additions ?? 0, deletions: d.deletions ?? 0 };
+      }
+      let result = JSON.stringify(agentData);
       const globSkipNote = formatGlobSkipReasonsNote(data.format_skip_reasons);
       if (globSkipNote)
         result += `
@@ -34531,7 +34708,7 @@ ${diagLines}`;
       if (pendingServers && pendingServers.length > 0) {
         result += `
 
-Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagnostics may be incomplete; rerun lsp_diagnostics later for a fresh check.`;
+Note: LSP server(s) did not respond in time: ${pendingServers.join(", ")}. Diagnostics may be incomplete; call aft_inspect for a checkpoint diagnostics snapshot.`;
       }
       if (exitedServers && exitedServers.length > 0) {
         result += `
@@ -34592,15 +34769,17 @@ Example patch:
 - You must include a header with your intended action (Add/Delete/Update)
 - You must prefix new lines with \`+\` even when creating a new file
 
-Returns: Status message string listing created, updated, moved, deleted, or failed file operations. May include inline LSP errors if type errors are introduced by the patch.`;
+Edits return as soon as the write completes unless \`lsp.diagnostics_on_edit\` or a per-call \`diagnostics: true\` requests legacy sync-wait behavior. Call \`aft_inspect\` afterward to check diagnostics across a batch of edits.`;
 function createApplyPatchTool(ctx) {
   return {
     description: APPLY_PATCH_DESCRIPTION,
     args: {
-      patchText: z7.string().describe("The full patch text including Begin/End markers")
+      patchText: z7.string().describe("The full patch text including Begin/End markers"),
+      diagnostics: z7.boolean().optional().describe(DIAGNOSTICS_PARAM_DESCRIPTION)
     },
     execute: async (args, context) => {
       const patchText = args.patchText;
+      const diagnostics = args.diagnostics ?? diagnosticsOnEditDefault(ctx);
       if (!patchText)
         throw new Error("'patchText' is required");
       let hunks;
@@ -34680,8 +34859,8 @@ function createApplyPatchTool(ctx) {
                 file: filePath,
                 content,
                 create_dirs: true,
-                diagnostics: true,
-                include_diff: true,
+                diagnostics,
+                include_diff_content: true,
                 multi_file_write_paths: multiFileWritePaths
               });
               const wrDiff = writeResult.diff;
@@ -34700,7 +34879,7 @@ function createApplyPatchTool(ctx) {
               const filePath2 = path4.resolve(context.directory, hunk.path);
               if (fs6.existsSync(filePath2)) {
                 try {
-                  await callBridge(ctx, context, "delete_file", { file: filePath2 });
+                  fs6.rmSync(filePath2, { force: true });
                 } catch {}
               }
             }
@@ -34733,8 +34912,8 @@ function createApplyPatchTool(ctx) {
                 file: targetPath,
                 content: newContent,
                 create_dirs: true,
-                diagnostics: true,
-                include_diff: true,
+                diagnostics,
+                include_diff_content: true,
                 multi_file_write_paths: multiFileWritePaths
               });
               const diags = writeResult.lsp_diagnostics;
@@ -35007,7 +35186,7 @@ function aftPrefixedTools(ctx) {
             file: filePath,
             content: normalizedArgs.content,
             create_dirs: normalizedArgs.create_dirs !== false,
-            diagnostics: true
+            diagnostics: normalizedArgs.diagnostics ?? diagnosticsOnEditDefault(ctx)
           };
           const response = await callBridge(ctx, context, "write", writeParams);
           if (response.success === false) {
@@ -35096,44 +35275,169 @@ function importTools(ctx) {
   };
 }
 
-// src/tools/lsp.ts
+// src/tools/inspect.ts
 import { tool as tool9 } from "@opencode-ai/plugin";
 var z9 = tool9.schema;
-function lspTools(ctx) {
-  const diagnosticsTool = {
-    description: "On-demand LSP file/scope check. NOT a project-wide type checker — use `tsc --noEmit`, `cargo check`, `pyright` etc. for full coverage.\n" + `
-` + "Honesty: `total: 0` is only clean when `complete: true` AND `lsp_servers_used[].status` includes `pull_ok`. Empty `lsp_servers_used`, or any `binary_not_installed`/`spawn_failed`/`no_root_marker`/`push_only` without diagnostics means the file wasn't actually checked — say so, don't report 'clean'. For per-server breakdown run `npx @cortexkit/aft doctor lsp <filePath>`.",
+function asRecord2(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return;
+  return value;
+}
+function asNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function asString(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function asStringArray(value) {
+  return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+function diagnosticsServerSummary(section) {
+  const pending = asStringArray(section.servers_pending);
+  const notInstalled = asStringArray(section.servers_not_installed);
+  const parts = [];
+  if (pending.length > 0)
+    parts.push(`pending: ${pending.join(", ")}`);
+  if (notInstalled.length > 0)
+    parts.push(`not installed: ${notInstalled.join(", ")}`);
+  return parts.length > 0 ? parts.join("; ") : "none reported";
+}
+function formatDiagnosticsSummary(summary) {
+  const section = asRecord2(summary?.diagnostics);
+  if (!section)
+    return;
+  const errors3 = asNumber(section.errors);
+  const warnings = asNumber(section.warnings);
+  const info = asNumber(section.info);
+  const hints = asNumber(section.hints);
+  const hasCounts = [errors3, warnings, info, hints].some((value) => value !== undefined);
+  const counts = `${errors3 ?? 0} errors, ${warnings ?? 0} warnings, ${info ?? 0} info, ${hints ?? 0} hints`;
+  const status = asString(section.status);
+  if (status === "pending") {
+    return hasCounts ? `diagnostics: ${counts} so far — still pending (servers: ${diagnosticsServerSummary(section)})` : `diagnostics: pending (servers: ${diagnosticsServerSummary(section)})`;
+  }
+  if (status === "incomplete") {
+    return hasCounts ? `diagnostics: ${counts} (incomplete — servers: ${diagnosticsServerSummary(section)})` : `diagnostics: unavailable (status incomplete; servers: ${diagnosticsServerSummary(section)})`;
+  }
+  if (hasCounts) {
+    return `diagnostics: ${counts}`;
+  }
+  return;
+}
+function formatDiagnosticLocation(diagnostic) {
+  const file2 = asString(diagnostic.file) ?? "(unknown file)";
+  const line = asNumber(diagnostic.line);
+  const column = asNumber(diagnostic.column);
+  if (line === undefined)
+    return file2;
+  if (column === undefined)
+    return `${file2}:${line}`;
+  return `${file2}:${line}:${column}`;
+}
+function formatDiagnosticsDetails(details) {
+  const diagnostics = Array.isArray(details?.diagnostics) ? details.diagnostics.map(asRecord2).filter(Boolean) : [];
+  return diagnostics.map((diagnostic) => {
+    const severity = asString(diagnostic.severity) ?? "information";
+    const message = asString(diagnostic.message) ?? "(no message)";
+    const source = asString(diagnostic.source);
+    const suffix = source ? ` [${source}]` : "";
+    return `${formatDiagnosticLocation(diagnostic)} ${severity} ${message}${suffix}`;
+  });
+}
+function renderInspectDiagnostics(response) {
+  const lines = [];
+  const summaryLine = formatDiagnosticsSummary(asRecord2(response.summary));
+  if (summaryLine)
+    lines.push(summaryLine);
+  const detailLines = formatDiagnosticsDetails(asRecord2(response.details));
+  if (detailLines.length > 0) {
+    lines.push("diagnostics details:", ...detailLines.map((line) => `- ${line}`));
+  }
+  return lines.join(`
+`);
+}
+function appendRenderedDiagnostics(text, response) {
+  if (/^diagnostics[: ]/im.test(text))
+    return text;
+  const diagnostics = renderInspectDiagnostics(response);
+  if (!diagnostics)
+    return text;
+  return text ? `${text}
+
+${diagnostics}` : diagnostics;
+}
+function arg(schema) {
+  return schema;
+}
+function normalizeStringOrArray(value) {
+  return isEmptyParam(value) ? undefined : value;
+}
+function inspectToolSurfaceEnabled(config2) {
+  return (config2.tool_surface ?? "recommended") !== "minimal" && config2.inspect?.enabled !== false;
+}
+function createInspectTier2IdleScheduler(options) {
+  const timers = new Map;
+  const setTimer = options.setTimer ?? ((callback, delayMs) => setTimeout(callback, delayMs));
+  const clearTimer = options.clearTimer ?? ((timer) => clearTimeout(timer));
+  const clear = (sessionID) => {
+    const timer = timers.get(sessionID);
+    if (!timer)
+      return;
+    clearTimer(timer);
+    timers.delete(sessionID);
+  };
+  const clearAll = () => {
+    for (const timer of timers.values()) {
+      clearTimer(timer);
+    }
+    timers.clear();
+  };
+  const schedule = (sessionID) => {
+    if (!options.isEnabled())
+      return;
+    clear(sessionID);
+    const idleMinutes = options.idleMinutes() ?? 4;
+    const delayMs = Math.max(0, idleMinutes * 60 * 1000);
+    const timer = setTimer(() => {
+      timers.delete(sessionID);
+      options.run(sessionID).catch((err) => {
+        options.warn?.(`inspect_tier2_run failed: ${err instanceof Error ? err.message : String(err)}`);
+      });
+    }, delayMs);
+    timers.set(sessionID, timer);
+  };
+  return { schedule, clear, clearAll };
+}
+function inspectTools(ctx) {
+  const inspectTool = {
+    description: "Codebase health snapshot. One call returns summary stats for: TODOs, diagnostics, file/symbol metrics, dead code, unused exports, code duplicates. Pass `sections` for per-category drill-down details.\n\n" + "Categories run in tiers — Tier 1 (todos, metrics) return synchronously from cache. Tier 2 (dead_code, unused_exports, duplicates) run as background scans triggered on session idle; calls may return cached `stale_categories: [...]` results or `pending_categories: [...]` while a refresh is in progress (waits up to 1s for fresh data before falling back to cached).\n\n" + `Use when: starting work on unfamiliar code, after multi-edit batches to check diagnostics, before a refactor, before review, or to verify cleanup completeness.
+
+` + "Treat `dead_code` as a hint, not proof: reachability is call-based, so symbols reached only via method dispatch or referenced only in type position may be false positives — verify before deleting.",
     args: {
-      filePath: z9.string().optional().describe("Path to a file to check. Mutually exclusive with 'directory'. Omit both to dump all cached diagnostics."),
-      directory: z9.string().optional().describe("Path to a directory. Returns cached diagnostics + workspace pull; capped at 200 walked files."),
-      severity: z9.enum(["error", "warning", "information", "hint", "all"]).optional().describe("Filter by severity (default: 'all')."),
-      waitMs: optionalInt(1, 1e4).describe("Wait up to N ms (max 10000) for push diagnostics. Push-only servers like bash-language-server and yaml-language-server — use after an edit.")
+      sections: arg(z9.union([z9.string(), z9.array(z9.string())]).optional().describe("Categories to include in detailed drill-down (e.g. 'todos' or ['todos', 'dead_code']). Use 'all' for every active category. Omit for summary-only mode.")),
+      scope: arg(z9.union([z9.string(), z9.array(z9.string())]).optional().describe("Restrict scan/results to paths under this scope (file or directory, absolute or relative to project root). Tier 1 scopes the scan; Tier 2 scans project-wide and applies scope as a result filter.")),
+      topK: arg(z9.number().int().positive().max(100).optional().describe("Max drill-down items per category. Default 20, max 100."))
     },
     execute: async (args, context) => {
-      const filePath = args.filePath || undefined;
-      const directory = args.directory || undefined;
-      if (filePath !== undefined && directory !== undefined) {
-        throw new Error("'filePath' and 'directory' are mutually exclusive — provide one or neither");
-      }
-      const params = {};
-      if (filePath !== undefined)
-        params.file = filePath;
-      if (directory !== undefined)
-        params.directory = directory;
-      if (args.severity !== undefined)
-        params.severity = args.severity;
-      if (args.waitMs !== undefined)
-        params.wait_ms = args.waitMs;
-      const result = await callBridge(ctx, context, "lsp_diagnostics", params);
-      if (result.success === false) {
-        throw new Error(result.message || "lsp_diagnostics failed");
+      const sections = normalizeStringOrArray(args.sections);
+      const scope = normalizeStringOrArray(args.scope);
+      const topK = args.topK === undefined || args.topK === null ? undefined : args.topK;
+      const response = await callBridge(ctx, context, "inspect", { sections, scope, topK });
+      if (response.success === false) {
+        throw new Error(response.message || "inspect failed");
       }
-      return JSON.stringify(result);
+      if (typeof response.text === "string") {
+        return appendRenderedDiagnostics(response.text, response);
+      }
+      const diagnostics = renderInspectDiagnostics(response);
+      const json2 = JSON.stringify(response, null, 2);
+      return diagnostics ? `${json2}
+
+${diagnostics}` : json2;
     }
   };
-  const hoisting = ctx.config.hoist_builtin_tools !== false;
   return {
-    [hoisting ? "lsp_diagnostics" : "aft_lsp_diagnostics"]: diagnosticsTool
+    aft_inspect: inspectTool
   };
 }
 
@@ -35142,18 +35446,18 @@ import { tool as tool10 } from "@opencode-ai/plugin";
 var z10 = tool10.schema;
 function navigationTools(ctx) {
   return {
-    aft_navigate: {
-      description: `Navigate code structure across files using call graph analysis.
+    aft_callgraph: {
+      description: `Answer code-relationship questions from a real call graph — instead of grep + read chains. Reach for this whenever the question is about how symbols connect: who calls X, what X calls, what breaks if X changes, how execution reaches X, or how a value flows.
 
 ` + `Ops:
-` + `- 'call_tree': See what a function calls (forward traversal). Use to understand dependencies before modifying a function.
 ` + `- 'callers': Find all call sites of a symbol. Use before renaming or changing a function's signature.
-` + `- 'trace_to': Trace how execution reaches a function from entry points (routes, exports, main). Use to understand context around deeply-nested code.
-` + `- 'trace_to_symbol': Find the shortest call path from one symbol to another symbol across the codebase. Requires 'toSymbol'. If multiple targets match, the error returns candidate files; retry with 'toFile' to disambiguate.
-` + `- 'impact': Analyze what breaks if a symbol changes. Returns affected callers with signatures and entry point status.
+` + `- 'impact': What breaks if a symbol changes — affected callers with signatures and entry-point status (blast radius). Use before a risky edit.
+` + `- 'call_tree': What a function calls (forward traversal). Use to understand a function's dependencies before modifying it.
+` + `- 'trace_to': How execution reaches a function from entry points (routes, exports, main). Use to understand context around deeply-nested code.
+` + `- 'trace_to_symbol': Shortest call path from one symbol to another. Requires 'toSymbol'. If multiple targets match, the error returns candidate files; retry with 'toFile' to disambiguate.
 ` + `- 'trace_data': Follow a value through variable assignments and function parameters across files. Requires 'symbol' (scope to trace from) and 'expression'.
 
-` + `All ops require both 'filePath' and 'symbol'. The 'expression' parameter is additionally required for trace_data; 'toSymbol' is additionally required for trace_to_symbol.
+` + `All ops require both 'filePath' and 'symbol'. 'expression' is additionally required for trace_data; 'toSymbol' for trace_to_symbol.
 
 `,
       args: {
@@ -35332,9 +35636,25 @@ function readingTools(ctx) {
         contextLines: optionalInt(1, Number.MAX_SAFE_INTEGER).describe("Lines of context before/after the symbol (default: 3)")
       },
       execute: async (args, context) => {
+        const hasTargetsProvided = (t) => {
+          if (isEmptyParam(t))
+            return false;
+          const entryEmpty = (entry) => {
+            if (!entry || typeof entry !== "object")
+              return true;
+            const fp = entry.filePath;
+            const sym = entry.symbol;
+            const fpEmpty = typeof fp !== "string" || fp.length === 0;
+            const symEmpty = typeof sym !== "string" || sym.length === 0;
+            return fpEmpty && symEmpty;
+          };
+          if (Array.isArray(t))
+            return !t.every(entryEmpty);
+          return !entryEmpty(t);
+        };
         const hasFilePath = !isEmptyParam(args.filePath);
         const hasUrl = !isEmptyParam(args.url);
-        const hasTargets = !isEmptyParam(args.targets);
+        const hasTargets = hasTargetsProvided(args.targets);
         const hasSymbols = !isEmptyParam(args.symbols);
         const zoomCallID = getCallID3(context);
         if (zoomCallID) {
@@ -35790,7 +36110,7 @@ function expandTilde(input) {
   }
   return input;
 }
-function arg(schema) {
+function arg2(schema) {
   return schema;
 }
 function formatGrepOutput(response) {
@@ -35888,9 +36208,9 @@ function searchTools(ctx) {
   const grepTool = {
     description: "Search file contents using regular expressions. Returns matching lines with file paths and line numbers (no surrounding context lines — use `read` for that). Always case-sensitive. Capped at 100 matches; if you hit the cap, narrow with `path` or `include` and re-run.",
     args: {
-      pattern: arg(exports_external.string().describe("Regular expression pattern to search for")),
-      include: arg(exports_external.string().optional().describe("File pattern to include (e.g. '*.ts', '*.{ts,tsx}')")),
-      path: arg(exports_external.string().optional().describe("Directory to search (absolute or relative to project root)"))
+      pattern: arg2(exports_external.string().describe("Regular expression pattern to search for")),
+      include: arg2(exports_external.string().optional().describe("File pattern to include (e.g. '*.ts', '*.{ts,tsx}')")),
+      path: arg2(exports_external.string().optional().describe("Directory to search (absolute or relative to project root)"))
     },
     execute: async (args, context) => {
       const pattern = String(args.pattern);
@@ -35927,8 +36247,8 @@ function searchTools(ctx) {
   const globTool = {
     description: "Find files matching a glob pattern. Returns matching file paths sorted by modification time.",
     args: {
-      pattern: arg(exports_external.string().describe("Glob pattern to match (e.g. '**/*.ts', 'src/**/*.test.*')")),
-      path: arg(exports_external.string().optional().describe("Directory to search (absolute or relative to project root)"))
+      pattern: arg2(exports_external.string().describe("Glob pattern to match (e.g. '**/*.ts', 'src/**/*.test.*')")),
+      path: arg2(exports_external.string().optional().describe("Directory to search (absolute or relative to project root)"))
     },
     execute: async (args, context) => {
       let globPattern = expandTilde(String(args.pattern));
@@ -35985,7 +36305,19 @@ function searchTools(ctx) {
 // src/tools/semantic.ts
 import { tool as tool14 } from "@opencode-ai/plugin";
 var z14 = tool14.schema;
-function arg2(schema) {
+function semanticHonestyNote(response) {
+  const notes = [];
+  if (response.more_available === true)
+    notes.push("more results available");
+  if (response.engine_capped === true)
+    notes.push("enumeration capped");
+  if (response.fully_degraded === true)
+    notes.push("fully degraded");
+  if (response.complete === false)
+    notes.push("partial/incomplete");
+  return notes.length > 0 ? `Search status: ${notes.join("; ")}.` : undefined;
+}
+function arg3(schema) {
   return schema;
 }
 function semanticTools(ctx) {
@@ -36003,19 +36335,19 @@ function semanticTools(ctx) {
       "When NOT to use:",
       "- You need exhaustive literal enumeration → use grep directly",
       "- You want the file/module structure → use aft_outline",
-      "- You're following a call chain → use aft_navigate",
+      "- You're following a call chain → use aft_callgraph",
       "",
       "Set hint to 'regex', 'literal', 'semantic', or 'auto' to override or document routing intent."
     ].join(`
 `),
     args: {
-      query: arg2(z14.string().describe("Concept, regex, literal text, filename, or capability to find. Examples: 'fuzzy match with whitespace tolerance', '^export', 'Cargo.lock'.")),
-      topK: arg2(optionalInt(1, 100).describe("Number of results (default: 10, max: 100)")),
-      hint: arg2(z14.enum(["regex", "literal", "semantic", "auto"]).optional().describe("Optional routing hint. Defaults to 'auto'."))
+      query: arg3(z14.string().describe("Concept, regex, literal text, filename, or capability to find. Examples: 'fuzzy match with whitespace tolerance', '^export', 'Cargo.lock'.")),
+      topK: arg3(optionalInt(1, 100).describe("Number of results (default: 10, max: 100)")),
+      hint: arg3(z14.enum(["regex", "literal", "semantic", "auto"]).optional().describe("Optional routing hint. Defaults to 'auto'."))
     },
     execute: async (args, context) => {
-      if (typeof args.query !== "string" || args.query.length === 0) {
-        throw new Error("semantic_search: invalid params: missing field `query`");
+      if (isEmptyParam(args.query) || typeof args.query !== "string" || args.query.trim().length === 0) {
+        throw new Error("semantic_search: invalid params: `query` must be a non-empty string");
       }
       const query = args.query;
       const hint = typeof args.hint === "string" ? args.hint : undefined;
@@ -36032,15 +36364,28 @@ function semanticTools(ctx) {
         bridgeParams.hint = hint;
       const response = await callBridge(ctx, context, "semantic_search", bridgeParams);
       if (response.success === false) {
-        if (response.code === "semantic_search_unavailable" && typeof response.message === "string") {
-          return response.message;
-        }
-        throw new Error(response.message || "semantic_search failed");
-      }
-      if (typeof response.text === "string") {
-        return response.text;
+        const message = typeof response.message === "string" && response.message.length > 0 ? response.message : "semantic_search failed";
+        const code = typeof response.code === "string" && response.code.length > 0 ? response.code : undefined;
+        throw new Error(code ? `semantic_search: ${code} — ${message}` : message);
+      }
+      const honestyNote = semanticHonestyNote(response);
+      if (typeof response.text === "string" && response.status === "disabled" && Array.isArray(response.results) && response.results.length === 0) {
+        return honestyNote ? `${response.text}
+${honestyNote}` : response.text;
+      }
+      const structured = JSON.stringify(response, null, 2);
+      if (typeof response.text === "string" && response.text.length > 0) {
+        const display = honestyNote ? `${response.text}
+${honestyNote}` : response.text;
+        return `${display}
+
+Structured response:
+${structured}`;
       }
-      return JSON.stringify(response);
+      return honestyNote ? `${honestyNote}
+
+Structured response:
+${structured}` : structured;
     }
   };
   return {
@@ -36170,7 +36515,8 @@ function buildWorkflowHints(opts) {
   const hasZoom = !opts.disabledTools.has("aft_zoom");
   const hasGrep = opts.toolSurface !== "minimal" && !opts.disabledTools.has(grepName);
   const hasSearch = opts.toolSurface !== "minimal" && opts.semanticEnabled && !opts.disabledTools.has("aft_search");
-  const hasNavigate = opts.toolSurface === "all" && !opts.disabledTools.has("aft_navigate");
+  const hasNavigate = opts.toolSurface === "all" && !opts.disabledTools.has("aft_callgraph");
+  const hasInspect = opts.toolSurface !== "minimal" && !opts.disabledTools.has("aft_inspect");
   const hasBash = !opts.disabledTools.has(bashName);
   const hasBgBash = hasBash && opts.bashBackgroundEnabled && !opts.disabledTools.has(bashStatusName);
   if (hasOutline && hasZoom) {
@@ -36179,14 +36525,17 @@ function buildWorkflowHints(opts) {
   if (hasOutline && hasZoom && (hasGrep || hasSearch)) {
     if (hasSearch) {
       const grepFallback = hasGrep ? ` Use \`${grepName}\` directly only when you need exhaustive enumeration of literal text (every TODO, every import of X) without ranking.` : "";
-      sections.push(`**Code exploration**: \`aft_search\` is the primary code-search tool. It auto-routes by query shape — exact identifiers, regex, error messages, natural language all use the same call. Pass \`hint: "regex"\` / \`hint: "literal"\` / \`hint: "semantic"\` to override routing if needed. Then \`aft_outline\` for structure → \`aft_zoom\` for symbol(s).${grepFallback}`);
+      sections.push(`**Code exploration**: \`aft_search\` is the primary code-search tool. It auto-routes by query shape — exact identifiers, regex, error messages, natural language all use the same call. Very short queries fall back to literal scans; pass \`hint: "regex"\` / \`hint: "literal"\` / \`hint: "semantic"\` to override routing if needed. Then \`aft_outline\` for structure → \`aft_zoom\` for symbol(s).${grepFallback}`);
     } else {
       sections.push(`**Code exploration**: \`${grepName}\` to locate → \`aft_outline\` for structure → \`aft_zoom\` for symbol(s).`);
     }
   }
+  if (hasInspect) {
+    sections.push("**Codebase health & diagnostics**: AFT does not surface compile/type errors automatically after edits — pull them with `aft_inspect`. Run it after a batch of edits and before you run tests or commit, when starting in unfamiliar code, or before a refactor/review. One call summarizes diagnostics (compile/type errors), TODOs, metrics, dead code, unused exports, and duplicates; pass `sections` for focused drill-down and `scope` to actively pull diagnostics for a specific file or directory. Its diagnostics are a fast checkpoint, not the authority — a clean `tsc` / `cargo check` / `pyright` run is the real gate. Treat `stale_categories` as a genuine stale-cache signal while an async Tier 2 refresh catches up.");
+  }
   if (hasNavigate) {
     sections.push([
-      "Use `aft_navigate` instead of grep + read chains for relationship questions:",
+      "Use `aft_callgraph` for code-relationship questions instead of grep + read chains:",
       "- `callers` — find all call sites before changing a function signature",
       "- `impact` — blast radius (which functions/files will need updates)",
       "- `trace_to` — how execution reaches this code from entry points (routes, exports, main)",
@@ -36303,13 +36652,13 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.32.0";
+var ANNOUNCEMENT_VERSION = "0.33.0";
 var ANNOUNCEMENT_FEATURES = [
-  "`aft_search` is now the primary code-search tool — auto-routes regex / literal / semantic / hybrid by query shape, with a `hint` override.",
-  'Semantic search stays queryable through edits — no more "rebuilding" fallback after every save.',
-  "Workflow hints promote `aft_search` as primary; `grep` is positioned as the specialized fallback.",
-  "Bare `\\n`, `\\t`, `\\r` queries correctly route to regex mode.",
-  'Empty params (`targets: []`, `url: ""`) no longer trigger misleading mutual-exclusion errors.'
+  "New `aft_inspect` — one call for codebase health: diagnostics, metrics, TODOs, dead code, unused exports, and duplicates.",
+  "Diagnostics now flow through `aft_inspect` (run it after a batch of edits) instead of arriving automatically on every edit.",
+  "`aft_navigate` is renamed to `aft_callgraph`; the Rust call graph now resolves cross-file callers.",
+  "Edits no longer echo the whole file back to the agent — much lower token cost per edit.",
+  "Batch of `aft_search` correctness fixes and undo-history/SSRF/Windows hardening."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU";
 var plugin = async (input) => initializePluginForDirectory(input);
@@ -36521,7 +36870,10 @@ ${lines}
     });
   }
   const rpcServer = new AftRpcServer(configOverrides.storage_dir, input.directory);
-  const unregisterShutdown = registerShutdownCleanup(async () => {
+  let clearInspectTier2Idle = () => {};
+  registerShutdownCleanup(async () => {
+    autoUpdateAbort.abort();
+    clearInspectTier2Idle();
     await Promise.allSettled([abortInFlightAutoInstalls(), abortInFlightGithubInstalls()]);
     try {
       rpcServer.stop();
@@ -36621,7 +36973,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
   }
   const surface = aftConfig.tool_surface ?? "recommended";
   const ALL_ONLY_TOOLS = new Set([
-    "aft_navigate",
+    "aft_callgraph",
     "aft_delete",
     "aft_move",
     "aft_transform",
@@ -36636,9 +36988,9 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     ...navigationTools(ctx),
     ...surface !== "minimal" && astTools(ctx),
     ...surface !== "minimal" && aftConfig.semantic_search === true && semanticTools(ctx),
+    ...inspectToolSurfaceEnabled(aftConfig) && inspectTools(ctx),
     ...surface !== "minimal" && aftConfig.search_index === true && searchTools(ctx),
     ...refactoringTools(ctx),
-    ...surface !== "minimal" && lspTools(ctx),
     ...surface !== "minimal" && conflictTools(ctx)
   });
   if (surface !== "all") {
@@ -36669,7 +37021,8 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     "aft_outline",
     "aft_zoom",
     "aft_search",
-    "aft_navigate",
+    "aft_callgraph",
+    "aft_inspect",
     "grep",
     "aft_grep",
     "bash",
@@ -36686,6 +37039,20 @@ Install: ${getManualInstallHint()}`).catch(() => {});
   if (hintsBlock) {
     log2(`Workflow hints injected (${hintsBlock.length} chars)`);
   }
+  const inspectTier2Idle = createInspectTier2IdleScheduler({
+    isEnabled: () => registeredTools.has("aft_inspect"),
+    idleMinutes: () => aftConfig.inspect?.tier2_idle_minutes,
+    warn: warn2,
+    run: async (sessionID) => {
+      const sessionDir = await getSessionDirectory(input.client, sessionID, input.directory) ?? input.directory;
+      const bridge = ctx.pool.getActiveBridgeForRoot(sessionDir) ?? ctx.pool.getBridge(sessionDir);
+      const response = await bridge.send("inspect_tier2_run", { session_id: sessionID });
+      if (response.success === false) {
+        warn2(response.message || "inspect_tier2_run failed");
+      }
+    }
+  });
+  clearInspectTier2Idle = () => inspectTier2Idle.clearAll();
   return {
     tool: allTools,
     "experimental.chat.system.transform": async (_input, output) => {
@@ -36695,11 +37062,17 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     },
     event: async (eventInput) => {
       await autoUpdateEventHook(eventInput);
-      if (eventInput.event.type !== "session.idle")
-        return;
+      const eventType = eventInput.event.type;
       const sessionID = extractSessionID(eventInput.event.properties);
+      if ((eventType === "session.deleted" || eventType === "session.shutdown") && sessionID) {
+        inspectTier2Idle.clear(sessionID);
+        return;
+      }
+      if (eventType !== "session.idle")
+        return;
       if (!sessionID)
         return;
+      inspectTier2Idle.schedule(sessionID);
       const sessionDir = await getSessionDirectory(input.client, sessionID, input.directory) ?? input.directory;
       await handleIdleBgCompletions({
         ctx,
@@ -36713,6 +37086,10 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       const sid = messageInput.sessionID ?? messageInput.sessionId ?? messageInput.id;
       warmSessionDirectory(input.client, sid, input.directory);
     },
+    "tool.execute.before": async (toolInput) => {
+      if (toolInput.sessionID)
+        inspectTier2Idle.clear(toolInput.sessionID);
+    },
     "command.execute.before": async (commandInput, _output) => {
       if (isTuiMode2() || commandInput.command !== STATUS_COMMAND) {
         return;
@@ -36763,12 +37140,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
       };
     },
     dispose: async () => {
-      autoUpdateAbort.abort();
-      unregisterShutdown();
-      await Promise.allSettled([abortInFlightAutoInstalls(), abortInFlightGithubInstalls()]);
-      rpcServer.stop();
-      await disposeAllPtyTerminals();
-      await pool.shutdown();
+      await runCleanups("dispose");
     }
   };
 }