@cortexkit/aft-pi 0.25.1 → 0.26.0

package/dist/index.d.ts

@@ -31,6 +31,10 @@
  */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { type AftConfig, loadAftConfig } from "./config.js";
+type VersionMismatchPool = {
+    replaceBinary(path: string): Promise<string>;
+};
+declare function createVersionMismatchHandler(getPool: () => VersionMismatchPool | undefined, ensureCompatibleBinary?: (version?: string) => Promise<string | null>): (binaryVersion: string, minVersion: string) => Promise<string | null>;
 declare function shouldPrepareOnnxRuntime(config: Pick<AftConfig, "semantic_search" | "semantic">): boolean;
 declare function handleConfigureWarningsForSession(context: {
     projectRoot: string;
@@ -80,6 +84,7 @@ export declare const __test__: {
     resolveToolSurface: typeof resolveToolSurface;
     handleConfigureWarningsForSession: typeof handleConfigureWarningsForSession;
     shouldPrepareOnnxRuntime: typeof shouldPrepareOnnxRuntime;
+    createVersionMismatchHandler: typeof createVersionMismatchHandler;
 };
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAQpE,OAAO,EACL,KAAK,SAAS,EACd,aAAa,EAGd,MAAM,aAAa,CAAC;AAgGrB,iBAAS,wBAAwB,CAC/B,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,iBAAiB,GAAG,UAAU,CAAC,GACtD,OAAO,CAGT;AASD,iBAAe,iCAAiC,CAAC,OAAO,EAAE;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAQD;;;;;;;;GAQG;AACH,iBAAS,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG;IACrE,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAiEA;AAED;;;;GAIG;AACH,yBAA+B,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA6Z9D;AAED,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAcH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAQpE,OAAO,EACL,KAAK,SAAS,EACd,aAAa,EAGd,MAAM,aAAa,CAAC;AAgDrB,KAAK,mBAAmB,GAAG;IACzB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,iBAAS,4BAA4B,CACnC,OAAO,EAAE,MAAM,mBAAmB,GAAG,SAAS,EAC9C,sBAAsB,GAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAgB,IAOrE,eAAe,MAAM,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkCjF;AAkDD,iBAAS,wBAAwB,CAC/B,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,iBAAiB,GAAG,UAAU,CAAC,GACtD,OAAO,CAGT;AASD,iBAAe,iCAAiC,CAAC,OAAO,EAAE;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAQD;;;;;;;;GAQG;AACH,iBAAS,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG;IACrE,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAiEA;AAED;;;;GAIG;AACH,yBAA+B,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA+Z9D;AAED,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC"}

package/dist/index.js

@@ -30601,6 +30601,15 @@ function clampSemanticTimeout(configOverrides, bridgeTimeoutMs) {
   };
 }
 
+class BridgeReplacedDuringVersionCheck extends Error {
+  newBinaryPath;
+  constructor(newBinaryPath) {
+    super(`Bridge binary replaced during version check: ${newBinaryPath}`);
+    this.newBinaryPath = newBinaryPath;
+    this.name = "BridgeReplacedDuringVersionCheck";
+  }
+}
+
 class BinaryBridge {
   static RESTART_RESET_MS = 5 * 60 * 1000;
   static STDERR_TAIL_MAX = 20;
@@ -30689,97 +30698,108 @@ class BinaryBridge {
     this.cachedStatus = snapshot;
   }
   async send(command, params = {}, options) {
-    if (this._shuttingDown) {
-      throw new Error(`${this.errorPrefix} Bridge is shutting down, cannot send "${command}"`);
-    }
-    if (Object.hasOwn(params, "id")) {
-      throw new Error("params cannot contain reserved key 'id'");
-    }
-    const requestSessionId = typeof params.session_id === "string" && params.session_id.length > 0 ? params.session_id : undefined;
-    this.ensureSpawned(requestSessionId);
-    if (requestSessionId && options?.configureWarningClient !== undefined) {
-      this.configureWarningClients.set(requestSessionId, options.configureWarningClient);
-    }
-    if (!this.configured) {
-      if (command !== "configure" && command !== "version") {
-        if (!this._configurePromise) {
-          const sessionIdForConfigure = typeof params.session_id === "string" ? params.session_id : undefined;
-          this._configurePromise = (async () => {
-            try {
-              const configResult = await this.send("configure", {
-                project_root: this.cwd,
-                ...this.configOverrides,
-                ...sessionIdForConfigure ? { session_id: sessionIdForConfigure } : {}
-              });
-              if (configResult.success === false) {
-                throw new Error(`${this.errorPrefix} Configure failed: ${configResult.message ?? "unknown error"}`);
-              }
-              await this.deliverConfigureWarnings(configResult, params, options);
-              await this.checkVersion();
-              if (!this.isAlive()) {
-                throw new Error(`${this.errorPrefix} Bridge died during version check. Check logs: ${getLogFilePath()}`);
+    return this.sendWithVersionMismatchRetry(command, params, options, true);
+  }
+  async sendWithVersionMismatchRetry(command, params, options, canRetryAfterVersionSwap) {
+    try {
+      if (this._shuttingDown) {
+        throw new Error(`${this.errorPrefix} Bridge is shutting down, cannot send "${command}"`);
+      }
+      if (Object.hasOwn(params, "id")) {
+        throw new Error("params cannot contain reserved key 'id'");
+      }
+      const requestSessionId = typeof params.session_id === "string" && params.session_id.length > 0 ? params.session_id : undefined;
+      this.ensureSpawned(requestSessionId);
+      if (requestSessionId && options?.configureWarningClient !== undefined) {
+        this.configureWarningClients.set(requestSessionId, options.configureWarningClient);
+      }
+      if (!this.configured) {
+        if (command !== "configure" && command !== "version") {
+          if (!this._configurePromise) {
+            const sessionIdForConfigure = typeof params.session_id === "string" ? params.session_id : undefined;
+            this._configurePromise = (async () => {
+              try {
+                const configResult = await this.send("configure", {
+                  project_root: this.cwd,
+                  ...this.configOverrides,
+                  ...sessionIdForConfigure ? { session_id: sessionIdForConfigure } : {}
+                });
+                if (configResult.success === false) {
+                  throw new Error(`${this.errorPrefix} Configure failed: ${configResult.message ?? "unknown error"}`);
+                }
+                await this.deliverConfigureWarnings(configResult, params, options);
+                await this.checkVersion();
+                if (!this.isAlive()) {
+                  throw new Error(`${this.errorPrefix} Bridge died during version check. Check logs: ${getLogFilePath()}`);
+                }
+                this.configured = true;
+              } finally {
+                this._configurePromise = null;
               }
-              this.configured = true;
-            } finally {
-              this._configurePromise = null;
-            }
-          })();
+            })();
+          }
+          await this._configurePromise;
         }
-        await this._configurePromise;
       }
-    }
-    const id = String(this.nextId++);
-    let request;
-    if (Object.hasOwn(params, "command") || Object.hasOwn(params, "method")) {
-      const nested = { ...params };
-      const reserved = {};
-      for (const key of ["session_id", "lsp_hints"]) {
-        if (Object.hasOwn(nested, key)) {
-          reserved[key] = nested[key];
-          delete nested[key];
+      const id = String(this.nextId++);
+      let request;
+      if (Object.hasOwn(params, "command") || Object.hasOwn(params, "method")) {
+        const nested = { ...params };
+        const reserved = {};
+        for (const key of ["session_id", "lsp_hints"]) {
+          if (Object.hasOwn(nested, key)) {
+            reserved[key] = nested[key];
+            delete nested[key];
+          }
         }
+        request = { id, command, ...reserved, params: nested };
+      } else {
+        request = { id, command, ...params };
       }
-      request = { id, command, ...reserved, params: nested };
-    } else {
-      request = { id, command, ...params };
-    }
-    const line = `${JSON.stringify(request)}
+      const line = `${JSON.stringify(request)}
 `;
-    const effectiveTimeoutMs = options?.transportTimeoutMs ?? options?.timeoutMs ?? this.timeoutMs;
-    const keepBridgeOnTimeout = options?.keepBridgeOnTimeout === true;
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        this.pending.delete(id);
-        const restartSuffix = keepBridgeOnTimeout ? "" : " — restarting bridge";
-        const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms${restartSuffix}`;
-        if (requestSessionId) {
-          sessionWarn(requestSessionId, timeoutMsg);
-        } else {
-          warn(timeoutMsg);
-        }
-        reject(new Error(`${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
-        if (!keepBridgeOnTimeout) {
-          this.handleTimeout(requestSessionId);
-        }
-      }, effectiveTimeoutMs);
-      this.pending.set(id, { resolve, reject, timer, onProgress: options?.onProgress });
-      if (!this.process?.stdin?.writable) {
-        this.pending.delete(id);
-        clearTimeout(timer);
-        reject(new Error(`${this.errorPrefix} stdin not writable for command "${command}"`));
-        return;
-      }
-      this.process.stdin.write(line, (err) => {
-        if (err) {
-          const entry = this.pending.get(id);
-          if (entry) {
-            this.pending.delete(id);
-            clearTimeout(entry.timer);
-            entry.reject(new Error(`${this.errorPrefix} Failed to write to stdin: ${err.message}`));
+      const effectiveTimeoutMs = options?.transportTimeoutMs ?? options?.timeoutMs ?? this.timeoutMs;
+      const keepBridgeOnTimeout = options?.keepBridgeOnTimeout === true;
+      return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+          this.pending.delete(id);
+          const restartSuffix = keepBridgeOnTimeout ? "" : " — restarting bridge";
+          const timeoutMsg = `Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms${restartSuffix}`;
+          if (requestSessionId) {
+            sessionWarn(requestSessionId, timeoutMsg);
+          } else {
+            warn(timeoutMsg);
           }
+          reject(new Error(`${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
+          if (!keepBridgeOnTimeout) {
+            this.handleTimeout(requestSessionId);
+          }
+        }, effectiveTimeoutMs);
+        this.pending.set(id, { resolve, reject, timer, onProgress: options?.onProgress });
+        if (!this.process?.stdin?.writable) {
+          this.pending.delete(id);
+          clearTimeout(timer);
+          reject(new Error(`${this.errorPrefix} stdin not writable for command "${command}"`));
+          return;
         }
+        this.process.stdin.write(line, (err) => {
+          if (err) {
+            const entry = this.pending.get(id);
+            if (entry) {
+              this.pending.delete(id);
+              clearTimeout(entry.timer);
+              entry.reject(new Error(`${this.errorPrefix} Failed to write to stdin: ${err.message}`));
+            }
+          }
+        });
       });
-    });
+    } catch (err) {
+      if (err instanceof BridgeReplacedDuringVersionCheck && canRetryAfterVersionSwap && command !== "configure" && command !== "version") {
+        log(`Retrying request "${command}" once after coordinated binary replacement: ${err.newBinaryPath}`);
+        return this.sendWithVersionMismatchRetry(command, params, options, false);
+      }
+      throw err;
+    }
   }
   async deliverConfigureWarnings(configResult, params, options) {
     if (!this.onConfigureWarnings || !Array.isArray(configResult.warnings))
@@ -30878,13 +30898,43 @@ class BinaryBridge {
       log(`Binary version: ${binaryVersion}`);
       if (compareSemver(binaryVersion, this.minVersion) < 0) {
         warn(`Binary version ${binaryVersion} is older than required ${this.minVersion}`);
-        this.onVersionMismatch?.(binaryVersion, this.minVersion);
+        const replacementPath = await this.onVersionMismatch?.(binaryVersion, this.minVersion);
+        if (replacementPath === undefined) {
+          return;
+        }
+        if (replacementPath === null || replacementPath.length === 0) {
+          throw new Error(`Binary version ${binaryVersion} is older than required ${this.minVersion}; no compatible replacement binary was provided`);
+        }
+        await this.replaceCurrentBinary(replacementPath);
+        throw new BridgeReplacedDuringVersionCheck(replacementPath);
       }
     } catch (err) {
       warn(`Version check failed: ${err.message}`);
       throw err;
     }
   }
+  async replaceCurrentBinary(newBinaryPath) {
+    this.binaryPath = newBinaryPath;
+    this.configured = false;
+    this.clearRestartResetTimer();
+    this.rejectAllPending(new Error(`${this.errorPrefix} Bridge restarting with updated binary: ${newBinaryPath}`));
+    if (!this.process)
+      return;
+    const proc = this.process;
+    this.process = null;
+    await new Promise((resolve) => {
+      const forceKillTimer = setTimeout(() => {
+        proc.kill("SIGKILL");
+        resolve();
+      }, 5000);
+      proc.once("exit", () => {
+        clearTimeout(forceKillTimer);
+        log("Process exited during coordinated binary replacement");
+        resolve();
+      });
+      proc.kill("SIGTERM");
+    });
+  }
   ensureSpawned(triggeringSessionId) {
     if (this.isAlive())
       return;
@@ -31189,11 +31239,12 @@ async function downloadBinary(version) {
     error(`Unsupported platform: ${process.platform}-${process.arch}`);
     return null;
   }
-  const tag = version ?? await fetchLatestTag();
-  if (!tag) {
+  const rawTag = version ?? await fetchLatestTag();
+  if (!rawTag) {
     error("Could not determine latest release version.");
     return null;
   }
+  const tag = rawTag.startsWith("v") ? rawTag : `v${rawTag}`;
   const versionedCacheDir = join2(getCacheDir(), tag);
   const binaryName = getBinaryName();
   const binaryPath = join2(versionedCacheDir, binaryName);
@@ -31255,13 +31306,14 @@ async function downloadBinary(version) {
 }
 async function ensureBinary(version) {
   if (version) {
-    const versionCached = getCachedBinaryPath(version);
+    const tag = version.startsWith("v") ? version : `v${version}`;
+    const versionCached = getCachedBinaryPath(tag);
     if (versionCached) {
-      log(`Found cached binary for ${version}: ${versionCached}`);
+      log(`Found cached binary for ${tag}: ${versionCached}`);
       return versionCached;
     }
-    log(`No cached binary for ${version}, downloading...`);
-    return downloadBinary(version);
+    log(`No cached binary for ${tag}, downloading...`);
+    return downloadBinary(tag);
   }
   log("No cached binary found, downloading latest...");
   return downloadBinary();
@@ -31967,6 +32019,7 @@ class BridgePool {
     this.bridges.clear();
     await Promise.allSettled(shutdowns);
     this.log(`Binary path updated to ${newPath}. All bridges cleared — next calls will use the new binary.`);
+    return newPath;
   }
   log(message, meta) {
     const logger = this.logger ?? getActiveLogger();
@@ -32017,7 +32070,9 @@ function readBinaryVersion(binaryPath) {
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 5000
     });
-    const rawVersion = result.stdout?.trim();
+    const stdoutVersion = result.stdout?.trim();
+    const stderrVersion = result.stderr?.trim();
+    const rawVersion = stdoutVersion || stderrVersion;
     if (!rawVersion)
       return null;
     return rawVersion.replace(/^aft\s+/, "");
@@ -32496,6 +32551,7 @@ async function fetchUrlToTempFile(url, storageDir, options = {}) {
     throw new Error(`Only http:// and https:// URLs are supported, got: ${parsed.protocol}`);
   }
   const allowPrivate = options.allowPrivate === true;
+  await assertPublicUrl(parsed, allowPrivate, options.lookup);
   const dir = cacheDir(storageDir);
   mkdirSync4(dir, { recursive: true });
   const hash = hashUrl(url);
@@ -32999,7 +33055,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.25.1",
+  version: "0.26.0",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -33021,18 +33077,18 @@ var package_default = {
     prepublishOnly: "bun run build"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.25.1",
+    "@cortexkit/aft-bridge": "0.26.0",
     typebox: "^1.1.24",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
     zod: "^4.1.8"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.25.1",
-    "@cortexkit/aft-darwin-x64": "0.25.1",
-    "@cortexkit/aft-linux-arm64": "0.25.1",
-    "@cortexkit/aft-linux-x64": "0.25.1",
-    "@cortexkit/aft-win32-x64": "0.25.1"
+    "@cortexkit/aft-darwin-arm64": "0.26.0",
+    "@cortexkit/aft-darwin-x64": "0.26.0",
+    "@cortexkit/aft-linux-arm64": "0.26.0",
+    "@cortexkit/aft-linux-x64": "0.26.0",
+    "@cortexkit/aft-win32-x64": "0.26.0"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "*",
@@ -48048,8 +48104,9 @@ function runInstall(spec, version2, cwd, signal) {
       resolve2(false);
       return;
     }
-    const child = spawn2("bun", ["add", target, "--cwd", cwd, "--ignore-scripts", "--silent"], {
-      stdio: ["ignore", "pipe", "pipe"]
+    const child = spawn2("npm", ["install", "--no-save", "--ignore-scripts", "--silent", target], {
+      stdio: ["ignore", "pipe", "pipe"],
+      cwd
     });
     child.unref();
     let stderrBuf = "";
@@ -50097,12 +50154,10 @@ function registerFsTools(pi, ctx, surface) {
       parameters: DeleteParams,
       async execute(_toolCallId, params, _signal, _onUpdate, extCtx) {
         const bridge = bridgeFor(ctx, extCtx.cwd);
-        const sessionId = resolveSessionId(extCtx);
-        const response = await bridge.send("delete_file", {
+        const response = await callBridge(bridge, "delete_file", {
           files: params.files,
-          recursive: params.recursive === true,
-          ...sessionId ? { session_id: sessionId } : {}
-        });
+          recursive: params.recursive === true
+        }, extCtx);
         const deletedEntries = response.deleted ?? [];
         const skipped = response.skipped_files ?? [];
         const deleted = deletedEntries.map((entry) => entry.file);
@@ -51734,7 +51789,7 @@ function buildWorkflowHints(opts) {
   const hasNavigate = opts.toolSurface === "all" && !opts.absentTools.has("aft_navigate");
   const hasBgBash = opts.bashBackgroundEnabled && !opts.absentTools.has(bashName) && !opts.absentTools.has("bash_status");
   if (hasOutline && hasZoom) {
-    sections.push(`**Web/URL access**: \`aft_outline({ url })\` first for structure, then \`aft_zoom({ url, symbol: "<heading>" })\` for the specific section.`);
+    sections.push(`**Web/URL access**: \`aft_outline({ target: "<url>" })\` first for structure, then \`aft_zoom({ target: "<url>", symbol: "<heading>" })\` for the specific section.`);
   }
   if (hasOutline && hasZoom && (hasGrep || hasSearch)) {
     const locator = hasGrep ? `\`${grepName}\`` : "`aft_search`";
@@ -51751,7 +51806,7 @@ function buildWorkflowHints(opts) {
 `));
   }
   if (hasBgBash) {
-    sections.push(`**Long-running commands** (builds, installs, full test suites): \`${bashName}({ background: true })\` returns immediately with a \`taskId\`. A completion reminder is delivered automatically — do not poll \`bash_status({ taskId })\`. Use \`bash_status\` only after the reminder arrives, or to inspect a task you already know is complete.`);
+    sections.push(`**Long-running commands** (builds, installs, full test suites): \`${bashName}({ background: true })\` returns immediately with a \`task_id\`. A completion reminder is delivered automatically — do not poll \`bash_status({ task_id })\`. Use \`bash_status\` only after the reminder arrives, or to inspect a task you already know is complete.`);
   }
   if (sections.length === 0) {
     return null;
@@ -51800,6 +51855,36 @@ ${hintsBlock}` };
 
 // src/index.ts
 setActiveLogger(bridgeLogger);
+function createVersionMismatchHandler(getPool, ensureCompatibleBinary = ensureBinary) {
+  let versionUpgradeAttempted = null;
+  return async (binaryVersion, minVersion) => {
+    if (versionUpgradeAttempted === binaryVersion) {
+      log2(`Version ${binaryVersion} < ${minVersion} but upgrade already attempted — continuing`);
+      return null;
+    }
+    versionUpgradeAttempted = binaryVersion;
+    warn2(`WARNING: aft binary v${binaryVersion} is older than plugin v${minVersion}. ` + "Some features may not work. Attempting to download a compatible binary...");
+    try {
+      const path2 = await ensureCompatibleBinary(`v${minVersion}`);
+      if (!path2) {
+        warn2(`Could not find or download v${minVersion}. Continuing with v${binaryVersion}.`);
+        return null;
+      }
+      const pool = getPool();
+      if (!pool) {
+        warn2(`Found/downloaded compatible binary at ${path2}, but bridge pool is not ready.`);
+        return null;
+      }
+      log2(`Found/downloaded compatible binary at ${path2}. Replacing running bridges...`);
+      const replaced = await pool.replaceBinary(path2);
+      log2("Binary replaced successfully. New bridges will use the updated binary.");
+      return replaced;
+    } catch (err) {
+      error2(`Auto-download failed: ${err.message}. Install manually: cargo install agent-file-tools@${minVersion}`);
+      return null;
+    }
+  };
+}
 var PLUGIN_VERSION = (() => {
   try {
     const req = createRequire3(import.meta.url);
@@ -52041,9 +52126,11 @@ ${lines}
   } catch (err) {
     warn2(`[lsp] auto-install setup failed: ${err instanceof Error ? err.message : String(err)}`);
   }
+  let pool;
   const poolOptions = {
     errorPrefix: "[aft-pi]",
     minVersion: PLUGIN_VERSION,
+    onVersionMismatch: createVersionMismatchHandler(() => pool),
     onConfigureWarnings: async ({ projectRoot, sessionId, client, warnings }) => {
       const pendingWarnings = sessionId ? drainPendingEagerWarnings(projectRoot) : [];
       await handleConfigureWarningsForSession({
@@ -52072,7 +52159,7 @@ ${lines}
       }, reminder);
     }
   };
-  const pool = new BridgePool(binaryPath, poolOptions, configOverrides);
+  pool = new BridgePool(binaryPath, poolOptions, configOverrides);
   const ctx = { pool, config: config2, storageDir };
   if (onnxRuntimePromise) {
     onnxRuntimePromise.then((ortDylibDir) => {
@@ -52188,7 +52275,8 @@ ${lines}
 var __test__2 = {
   resolveToolSurface,
   handleConfigureWarningsForSession,
-  shouldPrepareOnnxRuntime
+  shouldPrepareOnnxRuntime,
+  createVersionMismatchHandler
 };
 export {
   src_default as default,

package/dist/lsp-auto-install.d.ts

@@ -19,7 +19,7 @@
  *           installed, log a warning and keep the existing version.
  *           Otherwise skip + warn.
  *
- *   3. Spawn `bun add <pkg>@<version> --cwd <cache_dir> --ignore-scripts`
+ *   3. Spawn `npm install --no-save <pkg>@<version> --ignore-scripts`
  *      in the background. Drop a lockfile while running. Log progress.
  *
  *   4. The newly-installed binary will be picked up on the user's NEXT

package/dist/lsp-auto-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-auto-install.d.ts","sourceRoot":"","sources":["../src/lsp-auto-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAwBH,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,oCAAoC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,kGAAkG;IAClG,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B;AAED,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gDAAgD;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;;;OAOG;IACH,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C;;;;;;;;;OASG;IACH,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAkDD,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAM/D;AAwVD;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,iBAAiB,EACzB,SAAS,GAAE,OAAO,KAAa,GAC9B,iBAAiB,CAwEnB"}
+{"version":3,"file":"lsp-auto-install.d.ts","sourceRoot":"","sources":["../src/lsp-auto-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAwBH,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,oCAAoC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,kGAAkG;IAClG,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B;AAED,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gDAAgD;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;;;OAOG;IACH,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C;;;;;;;;;OASG;IACH,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAkDD,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAM/D;AAyVD;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,iBAAiB,EACzB,SAAS,GAAE,OAAO,KAAa,GAC9B,iBAAiB,CAwEnB"}

package/dist/tools/fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../src/tools/fs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,EAEL,KAAK,iBAAiB,EAKvB,MAAM,qBAAqB,CAAC;AAE7B,QAAA,MAAM,YAAY;;;EAWhB,CAAC;AAEH,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wCAAwC;AACxC,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,YAAY,GAAG,UAAU,EACnC,IAAI,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,EAC7D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,yCAkB3B;AAED,wCAAwC;AACxC,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,YAAY,GAAG,UAAU,EACnC,IAAI,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,EAC7D,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAChC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,sFAsC3B;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CA4F9F"}
+{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../src/tools/fs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,EAEL,KAAK,iBAAiB,EAKvB,MAAM,qBAAqB,CAAC;AAE7B,QAAA,MAAM,YAAY;;;EAWhB,CAAC;AAEH,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wCAAwC;AACxC,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,YAAY,GAAG,UAAU,EACnC,IAAI,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,EAC7D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,yCAkB3B;AAED,wCAAwC;AACxC,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,YAAY,GAAG,UAAU,EACnC,IAAI,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,EAC7D,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAChC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,sFAsC3B;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CA+F9F"}

package/dist/tools/imports.d.ts

@@ -7,7 +7,7 @@ import { type Static, Type } from "typebox";
 import type { PluginContext } from "../types.js";
 import { type RenderContextLike } from "./render-helpers.js";
 declare const ImportParams: Type.TObject<{
-    op: Type.TUnsafe<"add" | "remove" | "organize">;
+    op: Type.TUnsafe<"remove" | "add" | "organize">;
     filePath: Type.TString;
     module: Type.TOptional<Type.TString>;
     names: Type.TOptional<Type.TArray<Type.TString>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-pi",
-  "version": "0.25.1",
+  "version": "0.26.0",
   "type": "module",
   "description": "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   "main": "dist/index.js",
@@ -22,18 +22,18 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@cortexkit/aft-bridge": "0.25.1",
+    "@cortexkit/aft-bridge": "0.26.0",
     "typebox": "^1.1.24",
     "comment-json": "^5.0.0",
     "diff": "^8.0.4",
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.25.1",
-    "@cortexkit/aft-darwin-x64": "0.25.1",
-    "@cortexkit/aft-linux-arm64": "0.25.1",
-    "@cortexkit/aft-linux-x64": "0.25.1",
-    "@cortexkit/aft-win32-x64": "0.25.1"
+    "@cortexkit/aft-darwin-arm64": "0.26.0",
+    "@cortexkit/aft-darwin-x64": "0.26.0",
+    "@cortexkit/aft-linux-arm64": "0.26.0",
+    "@cortexkit/aft-linux-x64": "0.26.0",
+    "@cortexkit/aft-win32-x64": "0.26.0"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "*",