@cortexkit/aft-bridge 0.57.2 → 0.58.1

package/dist/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGlE,KAAK,YAAY,GAAG,OAAO,YAAY,CAAC;AAIxC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAEzE;AAID,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAiG7B,iBAAS,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAKvD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAgC9D;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CACzB,QAAQ,GAAE,MAAyB,EACnC,IAAI,GAAE,MAAqB,GAC1B,MAAM,CAgBR;AAmBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMtE;AA8GD,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,UAAU,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmC1E"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIlE,KAAK,YAAY,GAAG,OAAO,YAAY,CAAC;AAIxC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAEzE;AAED,KAAK,kBAAkB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,KAAK,wBAAwB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,kBAAkB,GAAG,IAAI,CAAC;AAI3E,uGAAuG;AACvG,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,wBAAwB,GAAG,IAAI,GAAG,IAAI,CAE3F;AAED,KAAK,WAAW,GAAG,OAAO,OAAO,CAAC,GAAG,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAmF7B,4EAA4E;AAC5E,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC,CAIlE;AAuCD;;;;;GAKG;AACH,iBAAS,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAY/D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAgC9D;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CACzB,QAAQ,GAAE,MAAyB,EACnC,IAAI,GAAE,MAAqB,GAC1B,MAAM,CAgBR;AAiED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMtE;AAsGD,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,UAAU,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA0D1E"}

package/dist/resolver.js

@@ -1,69 +1,99 @@
-import { execSync } from "node:child_process";
-import { chmodSync, closeSync, copyFileSync, existsSync, mkdirSync, openSync, readSync, renameSync, unlinkSync, } from "node:fs";
+import { closeSync, existsSync, promises as fsPromises, openSync, readFileSync, readSync, } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { delimiter, dirname, isAbsolute, join } from "node:path";
 import { log, warn } from "./active-logger.js";
+import { isTrustedCachedBinary, recordBinaryIdentity, removeBinaryIdentitySidecar, sha256File, writeBinaryIdentitySidecar, } from "./binary-identity.js";
 import { getAftBinaryCacheDir } from "./cache-paths.js";
 import { ensureBinary, readBinaryVersion } from "./downloader.js";
 import { PLATFORM_ARCH_MAP } from "./platform.js";
+import { readBinaryVersionOffThread } from "./version-probe.js";
 let ensureBinaryForResolver = ensureBinary;
 export function __setEnsureBinaryForTests(impl) {
     ensureBinaryForResolver = impl ?? ensureBinary;
 }
+let npmPlatformPackageReader = null;
+/** Test seam: stand in for the installed `@cortexkit/aft-<platform>` package. Pass null to restore. */
+export function __setNpmPlatformPackageForTests(impl) {
+    npmPlatformPackageReader = impl;
+}
 export { readBinaryVersion };
+/** Copies into the versioned cache that are still running, keyed by destination. */
+const cacheCopiesInFlight = new Map();
 /**
- * Copy an npm platform binary to the versioned cache so we never run from
+ * Copy an npm platform binary into the versioned cache so we never run from
  * node_modules directly. This prevents corruption when npm updates the
  * package while a bridge process is running the binary.
  *
- * @param npmBinaryPath Absolute path to the npm-installed `aft` binary.
- * @param knownVersion Optional pre-resolved version string to skip the extra
- *   `--version` invocation (the caller often has it already).
+ * `version` comes from the platform package's own package.json, so nothing is
+ * executed. An existing cache entry is reused only when its identity sidecar
+ * vouches for it; an entry without one, or whose sidecar no longer matches
+ * (for example a copy another process finished but has not recorded yet), is
+ * replaced from the npm package rather than run to learn its version.
+ *
+ * The copy itself (~85 MB) runs asynchronously so the host thread never waits
+ * on it. Until it lands, callers use the npm package's own binary, whose
+ * identity is already known from its manifest.
  */
-function copyToVersionedCache(npmBinaryPath, knownVersion) {
+function copyToVersionedCache(npmBinaryPath, version) {
+    const tag = version.startsWith("v") ? version : `v${version}`;
+    const ext = process.platform === "win32" ? ".exe" : "";
+    const versionedDir = join(getAftBinaryCacheDir(), tag);
+    const cachedPath = join(versionedDir, `aft${ext}`);
+    if (existsSync(cachedPath) && isTrustedCachedBinary(cachedPath, version))
+        return { cachedPath };
+    const existing = cacheCopiesInFlight.get(cachedPath);
+    if (existing)
+        return { pendingCopy: existing };
+    const task = copyIntoCache(npmBinaryPath, version, versionedDir, cachedPath).finally(() => {
+        cacheCopiesInFlight.delete(cachedPath);
+    });
+    cacheCopiesInFlight.set(cachedPath, task);
+    return { pendingCopy: task };
+}
+async function copyIntoCache(npmBinaryPath, version, versionedDir, cachedPath) {
+    const tmpPath = `${cachedPath}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`;
     try {
-        const version = knownVersion ?? readBinaryVersion(npmBinaryPath);
-        if (!version)
-            return null;
-        const tag = version.startsWith("v") ? version : `v${version}`;
-        const cacheDir = getAftBinaryCacheDir();
-        const versionedDir = join(cacheDir, tag);
-        const ext = process.platform === "win32" ? ".exe" : "";
-        const cachedPath = join(versionedDir, `aft${ext}`);
-        // Already cached. Probe before trusting the directory label; stale or
-        // corrupted cache entries must not shadow PATH/cargo fallback forever.
-        if (existsSync(cachedPath)) {
-            const cachedVersion = readBinaryVersion(cachedPath);
-            if (cachedVersion === version)
-                return cachedPath;
-            warn(`Cached binary at ${cachedPath} reports ${cachedVersion ?? "no version"}, expected ${version}; refreshing from npm package`);
-        }
-        // Copy to versioned cache
-        mkdirSync(versionedDir, { recursive: true });
-        const tmpPath = `${cachedPath}.${process.pid}.${Date.now()}.tmp`;
-        copyFileSync(npmBinaryPath, tmpPath);
+        await fsPromises.mkdir(versionedDir, { recursive: true });
+        await fsPromises.copyFile(npmBinaryPath, tmpPath);
         if (process.platform !== "win32") {
-            chmodSync(tmpPath, 0o755);
+            await fsPromises.chmod(tmpPath, 0o755);
         }
-        // Best-effort replace — unlink first on Windows where renameSync fails if target exists
-        if (process.platform === "win32" && existsSync(cachedPath)) {
-            try {
-                unlinkSync(cachedPath);
-            }
-            catch {
-                // best-effort; renameSync will surface the error if unlink fails
-            }
+        // Hash the private temp copy, which nothing else can touch, before it is
+        // renamed into place. Hashing the final path afterwards raced a second
+        // copy replacing it (another resolve, or another process, sees the entry
+        // without a sidecar and copies again), so on first start the identity was
+        // discarded as "changed while it was being hashed" and never recorded.
+        const sha256 = await sha256File(tmpPath);
+        removeBinaryIdentitySidecar(cachedPath);
+        // Best-effort replace — unlink first on Windows where rename fails if target exists
+        if (process.platform === "win32") {
+            await fsPromises.unlink(cachedPath).catch(() => { });
         }
-        renameSync(tmpPath, cachedPath);
+        await fsPromises.rename(tmpPath, cachedPath);
         log(`Copied npm binary to versioned cache: ${cachedPath}`);
+        // A rename keeps the file's size, mtime and inode, so the stamp taken now
+        // describes the bytes that were just hashed.
+        try {
+            writeBinaryIdentitySidecar(cachedPath, version, sha256);
+        }
+        catch (err) {
+            warn(`Could not record identity for ${cachedPath}: ${err instanceof Error ? err.message : String(err)}`);
+        }
         return cachedPath;
     }
     catch (err) {
+        await fsPromises.unlink(tmpPath).catch(() => { });
         warn(`Failed to copy binary to cache: ${err instanceof Error ? err.message : String(err)}`);
         return null;
     }
 }
+/** Test helper: wait for every background copy into the versioned cache. */
+export async function __waitForCacheCopiesForTests() {
+    while (cacheCopiesInFlight.size > 0) {
+        await Promise.all([...cacheCopiesInFlight.values()]);
+    }
+}
 function normalizeBareVersion(version) {
     return version.startsWith("v") ? version.slice(1) : version;
 }
@@ -74,16 +104,13 @@ function cachedBinaryPathFromEnv(version, env, ext) {
     const binaryPath = join(getAftBinaryCacheDir(env), version, `aft${ext}`);
     return existsSync(binaryPath) ? binaryPath : null;
 }
-function isExpectedCachedBinary(binaryPath, expectedVersion) {
-    const expected = normalizeBareVersion(expectedVersion);
-    const actual = readBinaryVersion(binaryPath);
-    if (actual === expected)
-        return true;
-    warn(`Cached binary at ${binaryPath} reports ${actual ?? "no version"}, expected ${expected}; skipping cache candidate`);
-    return false;
-}
-function probeBinaryCandidate(binaryPath, source, expectedVersion) {
-    const actual = readBinaryVersion(binaryPath);
+/**
+ * Ask `binaryPath` for its version on a worker thread and accept it when it
+ * reports `expectedVersion` (any version when none is expected). The host's
+ * event loop keeps running while the binary is loaded.
+ */
+async function probeBinaryCandidateOffThread(binaryPath, source, expectedVersion) {
+    const actual = await readBinaryVersionOffThread(binaryPath);
     if (actual === null) {
         warn(`${source} binary at ${binaryPath} did not report a version; skipping`);
         return null;
@@ -94,22 +121,38 @@ function probeBinaryCandidate(binaryPath, source, expectedVersion) {
     }
     return binaryPath;
 }
-function parsePathLookupOutput(output) {
-    return output
-        .split(/\r?\n/)
-        .map((candidate) => candidate.trim())
-        .filter(Boolean);
+/**
+ * Every `aft` executable on PATH, in PATH order, found by checking each
+ * directory in-process instead of forking `which aft` / `where aft`.
+ * Relative PATH entries are ignored so a project directory can never plant a
+ * binary that the resolver would pick up.
+ */
+function pathCandidates(env, ext) {
+    const rawPath = env.PATH ?? (process.platform === "win32" ? env.Path : undefined) ?? "";
+    const seen = new Set();
+    const candidates = [];
+    for (const dir of rawPath.split(delimiter)) {
+        if (!dir || !isAbsolute(dir))
+            continue;
+        const candidate = join(dir, `aft${ext}`);
+        if (seen.has(candidate))
+            continue;
+        seen.add(candidate);
+        if (existsSync(candidate))
+            candidates.push(candidate);
+    }
+    return candidates;
 }
 /**
  * True when `binaryPath` begins with a recognized native-executable magic
  * number (Mach-O, ELF, or PE/`MZ`). False for script shims that start with a
  * shebang (`#!`) or anything else.
  *
- * This is the guard against a `which aft` / `where aft` PATH lookup resolving to
+ * This is the guard against a PATH lookup for `aft` resolving to
  * the `@cortexkit/aft` CLI's OWN node-script shim. The CLI publishes a `bin`
  * named `aft` (same name as the native binary), and npx prepends its
- * `node_modules/.bin` to PATH, so `which aft` can resolve to that shim. Probing
- * it with `--version` re-enters the CLI, which probes `which aft` again, which
+ * `node_modules/.bin` to PATH, so the lookup can resolve to that shim. Probing
+ * it with `--version` re-enters the CLI, which looks `aft` up again, which
  * forks `opencode --version` / `pi --version` for its harness report — an
  * exponential fork bomb (issue: self-resolution recursion). Native binaries
  * never start with `#!`, so a magic-number check rejects the shim regardless of
@@ -182,152 +225,204 @@ export function platformKey(platform = process.platform, arch = process.arch) {
 function logBinaryResolution(resolution) {
     log(`Resolved binary from ${resolution.source}: ${resolution.path}`);
 }
+function explicitBinaryOverride(env) {
+    const explicitBinary = env.AFT_BINARY_PATH?.trim();
+    if (!explicitBinary)
+        return null;
+    // Hermetic host probes provide the just-built binary explicitly. Treat a bad
+    // override as an error instead of falling through to an operator cache or PATH.
+    if (!existsSync(explicitBinary) || !isNativeExecutable(explicitBinary)) {
+        throw new Error(`AFT_BINARY_PATH does not name a native executable: ${explicitBinary}`);
+    }
+    return explicitBinary;
+}
+/** The version this package ships with, used when the caller names none. */
+function ownPackageVersion() {
+    try {
+        const req = createRequire(import.meta.url);
+        return req("../package.json").version;
+    }
+    catch {
+        return null;
+    }
+}
 /**
- * Locate the `aft` binary synchronously by checking (in order):
- * 1. Cached binary from previous auto-download (~/.cache/aft/bin/)
- * 2. npm platform package via `require.resolve(@cortexkit/aft-<platform>/bin/aft)`
- * 3. PATH lookup via `which aft` (or `where aft` on Windows)
- * 4. ~/.cargo/bin/aft (Rust cargo install location)
+ * Read the npm platform package's binary path and version. The version comes
+ * from the package's package.json, which npm installs together with the
+ * binary, so no exec is needed to learn it.
+ */
+function npmPlatformPackage(ext) {
+    if (npmPlatformPackageReader)
+        return npmPlatformPackageReader(ext);
+    try {
+        const req = createRequire(import.meta.url);
+        const manifestPath = req.resolve(`@cortexkit/aft-${platformKey()}/package.json`);
+        const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+        const binaryPath = join(dirname(manifestPath), "bin", `aft${ext}`);
+        if (typeof manifest.version !== "string" || !existsSync(binaryPath))
+            return null;
+        return { binaryPath, version: normalizeBareVersion(manifest.version) };
+    }
+    catch {
+        // npm package not installed or resolution failed
+        return null;
+    }
+}
+/**
+ * Locate the `aft` binary synchronously WITHOUT executing anything, so it is
+ * safe on a plugin host's only JavaScript thread. Checks, in order:
+ * 0. `AFT_BINARY_PATH` (must be a native executable; its version is checked
+ *    by {@link findBinary} and by the bridge handshake, not here)
+ * 1. The versioned cache (`~/.cache/aft/bin/v<version>/aft`), accepted only
+ *    when its identity sidecar still matches the file (stat only)
+ * 2. The npm platform package `@cortexkit/aft-<platform>`, whose version is
+ *    read from its package.json. It is copied into the versioned cache in the
+ *    background; until that copy is in place (and recorded), the package's
+ *    own binary is returned for this boot.
+ *
+ * PATH and `~/.cargo/bin` binaries are not considered here: their version is
+ * unknown until they run. {@link findBinary} probes them on a worker thread.
  *
- * @param expectedVersion Optional version (without `v` prefix) — when set, the
- *   versioned cache for that version is checked first. Hosts that ship in
- *   lock-step with the binary should pass their own package version so a
- *   freshly downloaded binary is picked up before fallback resolution.
- * @returns Absolute path to the first binary found, or null if none found.
+ * @param expectedVersion Optional version (without `v` prefix). Defaults to
+ *   this package's own version.
+ * @returns Absolute path to a binary whose identity is established, or null.
  */
 export function findBinarySync(expectedVersion) {
-    const resolution = findBinarySyncInner(expectedVersion);
+    const resolution = findTrustedBinarySync(expectedVersion, { ...process.env });
     // Keep one durable, source-labeled line after every successful binary-resolution
     // path. Operators need to distinguish a stale cache hit from npm, PATH, cargo, or a download.
     if (resolution)
         logBinaryResolution(resolution);
     return resolution?.path ?? null;
 }
-function findBinarySyncInner(expectedVersion) {
+function findTrustedBinarySync(expectedVersion, env) {
     const ext = process.platform === "win32" ? ".exe" : "";
-    const env = { ...process.env };
-    // Hermetic host probes provide the just-built binary explicitly. Treat a bad
-    // override as an error instead of falling through to an operator cache or PATH.
-    const explicitBinary = env.AFT_BINARY_PATH?.trim();
-    if (explicitBinary) {
-        if (!existsSync(explicitBinary) || !isNativeExecutable(explicitBinary)) {
-            throw new Error(`AFT_BINARY_PATH does not name a native executable: ${explicitBinary}`);
-        }
-        const usable = probeBinaryCandidate(explicitBinary, "AFT_BINARY_PATH", expectedVersion);
-        if (!usable) {
-            throw new Error(`AFT_BINARY_PATH is incompatible with the requested AFT version: ${explicitBinary}`);
-        }
-        return { path: usable, source: "AFT_BINARY_PATH" };
-    }
-    // 1. Check versioned cache for the requested version (or this package's own
-    // version as a fallback so direct callers without a host still benefit from
-    // the cache).
-    const pluginVersion = expectedVersion ??
-        (() => {
-            try {
-                const req = createRequire(import.meta.url);
-                return req("../package.json").version;
-            }
-            catch {
-                return null;
-            }
-        })();
+    const explicitBinary = explicitBinaryOverride(env);
+    if (explicitBinary)
+        return { path: explicitBinary, source: "AFT_BINARY_PATH" };
+    const pluginVersion = expectedVersion ?? ownPackageVersion();
+    // 1. Versioned cache, vouched for by its identity sidecar.
     if (pluginVersion) {
         const tag = pluginVersion.startsWith("v") ? pluginVersion : `v${pluginVersion}`;
-        const versionCached = cachedBinaryPathFromEnv(tag, env, ext);
-        if (versionCached && isExpectedCachedBinary(versionCached, pluginVersion)) {
-            return { path: versionCached, source: "versioned cache" };
+        const cached = cachedBinaryPathFromEnv(tag, env, ext);
+        if (cached && isTrustedCachedBinary(cached, pluginVersion)) {
+            return { path: cached, source: "versioned cache" };
         }
     }
-    // 2. Check npm platform package — copy to versioned cache to avoid
-    // corruption when npm updates the package while a bridge is running.
+    // 2. npm platform package — copy to versioned cache to avoid corruption
+    // when npm updates the package while a bridge is running.
     //
-    // IMPORTANT: when `pluginVersion` is known, REJECT npm binaries whose
+    // IMPORTANT: when `pluginVersion` is known, REJECT npm packages whose
     // version does not match. A workspace with bun-cached older versions of
     // `@cortexkit/aft-<platform>` (e.g. v0.19.5 left over after upgrading the
     // plugin to v0.22.x) can otherwise hijack resolution and produce stale
-    // task-id slugs / outdated protocol behavior. Skip to step 3 (PATH) so a
-    // freshly built local binary can take over.
-    try {
-        const key = platformKey();
-        const packageBin = `@cortexkit/aft-${key}/bin/aft${ext}`;
-        const req = createRequire(import.meta.url);
-        const resolved = req.resolve(packageBin);
-        if (existsSync(resolved)) {
-            const npmVersion = readBinaryVersion(resolved);
-            if (npmVersion === null) {
-                warn(`npm platform package binary at ${resolved} did not report a version; skipping (continuing to PATH lookup)`);
-            }
-            else if (pluginVersion && npmVersion !== normalizeBareVersion(pluginVersion)) {
-                warn(`npm platform package binary v${npmVersion} does not match plugin v${pluginVersion}; skipping (continuing to PATH lookup)`);
-            }
-            else {
-                const copied = copyToVersionedCache(resolved, npmVersion);
-                return { path: copied ?? resolved, source: "npm platform package" };
-            }
+    // task-id slugs / outdated protocol behavior.
+    const npm = npmPlatformPackage(ext);
+    if (npm) {
+        if (pluginVersion && npm.version !== normalizeBareVersion(pluginVersion)) {
+            warn(`npm platform package binary v${npm.version} does not match plugin v${pluginVersion}; skipping`);
+        }
+        else {
+            const copy = copyToVersionedCache(npm.binaryPath, npm.version);
+            if ("cachedPath" in copy)
+                return { path: copy.cachedPath, source: "npm platform package" };
+            return {
+                path: npm.binaryPath,
+                source: "npm platform package",
+                pendingCopy: copy.pendingCopy,
+            };
         }
     }
-    catch {
-        // npm package not installed or resolution failed
-    }
-    // 3. Check PATH
-    try {
-        const whichCmd = process.platform === "win32" ? "where aft" : "which aft";
-        const result = execSync(whichCmd, {
-            encoding: "utf-8",
-            env,
-            stdio: ["pipe", "pipe", "pipe"],
-        }).trim();
-        for (const candidate of parsePathLookupOutput(result)) {
-            // Guard against self-resolution: a `which aft` hit can be the
-            // @cortexkit/aft CLI's own node-script shim (npx prepends its
-            // node_modules/.bin to PATH). Probing it with --version re-enters the CLI
-            // and fork-bombs. Only accept native executables here.
-            if (!isNativeExecutable(candidate)) {
-                warn(`PATH binary at ${candidate} is not a native executable (script shim?); skipping`);
-                continue;
+    return null;
+}
+/**
+ * Candidates whose version can only be learned by running them, probed on a
+ * worker thread in resolution order: a versioned-cache entry without a
+ * matching identity sidecar (for example one written before sidecars
+ * existed), every `aft` on PATH, then `~/.cargo/bin/aft`.
+ */
+async function findProbedBinary(expectedVersion, env) {
+    const ext = process.platform === "win32" ? ".exe" : "";
+    const pluginVersion = expectedVersion ?? ownPackageVersion();
+    // 1. An unvouched versioned-cache entry. Verified by running it off the
+    // host thread; once confirmed, a sidecar is recorded in the background so
+    // the next lookup is stat-only.
+    if (pluginVersion) {
+        const tag = pluginVersion.startsWith("v") ? pluginVersion : `v${pluginVersion}`;
+        const cached = cachedBinaryPathFromEnv(tag, env, ext);
+        if (cached) {
+            const usable = await probeBinaryCandidateOffThread(cached, "Cached", pluginVersion);
+            if (usable) {
+                void recordBinaryIdentity(usable, pluginVersion);
+                return { path: usable, source: "versioned cache" };
             }
-            const usable = probeBinaryCandidate(candidate, "PATH", expectedVersion);
-            if (usable)
-                return { path: usable, source: "PATH" };
         }
     }
-    catch {
-        // not in PATH
+    // 2. PATH
+    for (const candidate of pathCandidates(env, ext)) {
+        // Guard against self-resolution: a PATH hit can be the @cortexkit/aft
+        // CLI's own node-script shim (npx prepends its node_modules/.bin to
+        // PATH). Probing it with --version re-enters the CLI and fork-bombs.
+        // Only accept native executables here.
+        if (!isNativeExecutable(candidate)) {
+            warn(`PATH binary at ${candidate} is not a native executable (script shim?); skipping`);
+            continue;
+        }
+        const usable = await probeBinaryCandidateOffThread(candidate, "PATH", expectedVersion);
+        if (usable)
+            return { path: usable, source: "PATH" };
     }
-    // 4. Check ~/.cargo/bin/aft
+    // 3. ~/.cargo/bin/aft
     const cargoPath = join(homeDirFromEnv(env), ".cargo", "bin", `aft${ext}`);
     if (existsSync(cargoPath)) {
-        const usable = probeBinaryCandidate(cargoPath, "cargo", expectedVersion);
+        const usable = await probeBinaryCandidateOffThread(cargoPath, "cargo", expectedVersion);
         if (usable)
             return { path: usable, source: "cargo" };
     }
     return null;
 }
 export const __test__ = {
-    parsePathLookupOutput,
+    pathCandidates,
 };
 /**
- * Locate the `aft` binary, with auto-download as a last resort.
+ * Locate the `aft` binary, with auto-download as a last resort. Never
+ * executes a binary on the calling thread: identities come from sidecars and
+ * package manifests, and anything that has to be run to learn its version is
+ * run on a worker thread while the caller awaits.
  *
  * Resolution order:
- *   0. Explicit AFT_BINARY_PATH (hermetic host probes)
- *   1. Cached binary (~/.cache/aft/bin/)
+ *   0. Explicit AFT_BINARY_PATH (hermetic host probes; version verified)
+ *   1. Versioned cache (~/.cache/aft/bin/) with a matching identity sidecar
  *   2. npm platform package (@cortexkit/aft-<platform>)
- *   3. PATH lookup (which aft)
- *   4. ~/.cargo/bin/aft
- *   5. Auto-download from GitHub releases
+ *   3. Versioned cache entry without a sidecar, verified by running it
+ *   4. PATH lookup
+ *   5. ~/.cargo/bin/aft
+ *   6. Auto-download from GitHub releases
  *
  * Returns the absolute path to the binary.
  * Throws a descriptive error with install instructions if all sources fail.
  */
 export async function findBinary(expectedVersion) {
-    // Try synchronous resolution first (fast path)
-    const syncResult = findBinarySync(expectedVersion);
-    if (syncResult) {
-        return syncResult;
+    const env = { ...process.env };
+    const explicitBinary = explicitBinaryOverride(env);
+    if (explicitBinary) {
+        const usable = await probeBinaryCandidateOffThread(explicitBinary, "AFT_BINARY_PATH", expectedVersion);
+        if (!usable) {
+            throw new Error(`AFT_BINARY_PATH is incompatible with the requested AFT version: ${explicitBinary}`);
+        }
+        logBinaryResolution({ path: usable, source: "AFT_BINARY_PATH" });
+        return usable;
+    }
+    const resolution = findTrustedBinarySync(expectedVersion, env) ?? (await findProbedBinary(expectedVersion, env));
+    if (resolution) {
+        // An async caller can wait for the npm copy without blocking the host
+        // thread, and then avoids running from node_modules at all.
+        const copied = resolution.pendingCopy ? await resolution.pendingCopy : null;
+        const path = copied ?? resolution.path;
+        logBinaryResolution({ path, source: resolution.source });
+        return path;
     }
-    // 5. Auto-download from GitHub releases
+    // 6. Auto-download from GitHub releases
     log("Binary not found locally, attempting auto-download...");
     const downloaded = await ensureBinaryForResolver(expectedVersion);
     if (downloaded) {
@@ -341,7 +436,7 @@ export async function findBinary(expectedVersion) {
         "Attempted sources:",
         "  - Cache directory (~/.cache/aft/bin/)",
         "  - npm platform package (@cortexkit/aft-<platform>)",
-        "  - PATH lookup (which aft)",
+        "  - PATH lookup",
         "  - ~/.cargo/bin/aft",
         "  - Auto-download from GitHub releases (failed)",
         "",

package/dist/resolver.js.map

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

package/dist/revivable-transport.d.ts.map

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

package/dist/revivable-transport.js

@@ -70,6 +70,18 @@ export class RevivableTransportPool {
         this.activePool.setConfigureOverride(key, value);
     }
     async reconfigure(projectRoot, overrides) {
+        if (this.activePool.isShutdown() && !this.revival) {
+            // Reconfigure only updates live bridges, and a shut-down pool has none.
+            // Reviving here would leave a live pool behind after the host's shutdown
+            // hook finished: background work that settles during shutdown (an LSP
+            // install aborted by that hook, for example) then keeps an unowned pool
+            // around and a headless host never exits. Record the overrides instead;
+            // a later revival applies them to the replacement pool.
+            for (const [key, value] of Object.entries(overrides)) {
+                this.setConfigureOverride(key, value);
+            }
+            return;
+        }
         const pool = await this.ensureActivePool();
         const runtimeOverrides = {};
         for (const [key, value] of Object.entries(overrides)) {