@cortexkit/aft-pi 0.44.0 → 0.45.0

package/dist/index.js

@@ -8314,6 +8314,8 @@ function resolveBashKillTimeout(modelTimeout, foregroundWaitMs) {
 }
 // ../aft-bridge/dist/bridge.js
 import { spawn } from "node:child_process";
+import { createHash } from "node:crypto";
+import { readFileSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
 import { StringDecoder } from "node:string_decoder";
@@ -8408,6 +8410,22 @@ function bashTaskIdFrom(response) {
     return camelCase;
   return;
 }
+function hashBinaryOnDisk(binaryPath) {
+  try {
+    return createHash("sha256").update(readFileSync(binaryPath)).digest("hex");
+  } catch {
+    return null;
+  }
+}
+var binaryFingerprintReader = hashBinaryOnDisk;
+function readBinaryFingerprint(binaryPath) {
+  try {
+    const fingerprint = binaryFingerprintReader(binaryPath);
+    return typeof fingerprint === "string" && fingerprint.length > 0 ? fingerprint : null;
+  } catch {
+    return null;
+  }
+}
 function tagStderrLine(line) {
   return /^\[aft(-\w+)?\] /.test(line) ? line : `[aft] ${line}`;
 }
@@ -8503,6 +8521,9 @@ class BinaryBridge {
   binaryPath;
   cwd;
   process = null;
+  spawnedBinaryFingerprint = null;
+  lastBinaryFingerprintCheckAt = 0;
+  _retiringDueToBinaryChange = false;
   pending = new Map;
   outstandingBackgroundTaskIds = new Set;
   nextId = 1;
@@ -8622,6 +8643,24 @@ class BinaryBridge {
   hasOutstandingBackgroundTasks() {
     return this.outstandingBackgroundTaskIds.size > 0;
   }
+  maybeScheduleRespawnForUpdatedBinary(checkIntervalMs, now = Date.now()) {
+    if (this._shuttingDown || this._retiringDueToBinaryChange || !this.isAlive())
+      return false;
+    if (this.pending.size > 0 || this.outstandingBackgroundTaskIds.size > 0)
+      return false;
+    if (now - this.lastBinaryFingerprintCheckAt < checkIntervalMs)
+      return false;
+    this.lastBinaryFingerprintCheckAt = now;
+    const spawnedFingerprint = this.spawnedBinaryFingerprint;
+    if (!spawnedFingerprint)
+      return false;
+    const currentFingerprint = readBinaryFingerprint(this.binaryPath);
+    if (!currentFingerprint || currentFingerprint === spawnedFingerprint)
+      return false;
+    this._retiringDueToBinaryChange = true;
+    this.logVia(`Binary contents changed on disk for ${this.binaryPath}; retiring this bridge so the next tool call respawns onto the updated binary.`);
+    return true;
+  }
   getCwd() {
     return this.cwd;
   }
@@ -8654,6 +8693,9 @@ class BinaryBridge {
   }
   async sendWithVersionMismatchRetry(command, params, options, canRetryAfterVersionSwap) {
     try {
+      if (this._retiringDueToBinaryChange) {
+        throw new Error(`${this.errorPrefix} Bridge is retiring after the on-disk binary changed; retry to respawn on the updated binary`);
+      }
       if (this._shuttingDown) {
         throw new Error(`${this.errorPrefix} Bridge is shutting down, cannot send "${command}"`);
       }
@@ -8852,6 +8894,7 @@ class BinaryBridge {
   }
   async shutdown() {
     this._shuttingDown = true;
+    this.spawnedBinaryFingerprint = null;
     this.clearRestartResetTimer();
     this.configureWarningClients.clear();
     this.rejectAllPending(new Error(`${this.errorPrefix} Bridge shutting down`));
@@ -8905,6 +8948,9 @@ class BinaryBridge {
   async replaceCurrentBinary(newBinaryPath) {
     this.binaryPath = newBinaryPath;
     this.configured = false;
+    this.spawnedBinaryFingerprint = null;
+    this.lastBinaryFingerprintCheckAt = 0;
+    this._retiringDueToBinaryChange = false;
     this.clearRestartResetTimer();
     this.rejectAllPending(new Error(`${this.errorPrefix} Bridge restarting with updated binary: ${newBinaryPath}`));
     if (!this.process)
@@ -8930,6 +8976,7 @@ class BinaryBridge {
     this.spawnProcess(triggeringSessionId);
   }
   spawnProcess(triggeringSessionId) {
+    this._retiringDueToBinaryChange = false;
     this.lastStatusBar = undefined;
     if (triggeringSessionId) {
       this.sessionLogVia(triggeringSessionId, `Spawning binary: ${this.binaryPath} (cwd: ${this.cwd})`);
@@ -9020,6 +9067,8 @@ class BinaryBridge {
       this.handleCrash();
     });
     this.process = child;
+    this.spawnedBinaryFingerprint = readBinaryFingerprint(this.binaryPath);
+    this.lastBinaryFingerprintCheckAt = Date.now();
     this.stdoutBuffer = "";
     this.stdoutReadOffset = 0;
     this.stderrBuffer = "";
@@ -9198,6 +9247,7 @@ class BinaryBridge {
   }
   handleTimeout(triggeringSessionId) {
     this.consecutiveRequestTimeouts = 0;
+    this.spawnedBinaryFingerprint = null;
     this.rejectAllPending(new Error(`${this.errorPrefix} bridge killed during sibling timeout — request aborted`));
     this.outstandingBackgroundTaskIds.clear();
     if (this.process) {
@@ -9224,6 +9274,7 @@ class BinaryBridge {
   handleCrash(cause) {
     const proc = this.process;
     this.process = null;
+    this.spawnedBinaryFingerprint = null;
     if (proc && proc.exitCode === null && !proc.killed) {
       proc.kill("SIGKILL");
     }
@@ -9235,6 +9286,10 @@ class BinaryBridge {
       this.errorVia(`Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""}.${tail}`);
     }
     this.rejectAllPending(new Error(`${this.errorPrefix} Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""} (see ${this.getLogFilePathVia()})`));
+    if (this._retiringDueToBinaryChange) {
+      this.logVia("Binary exited while retiring after an on-disk update; skipping auto-restart");
+      return;
+    }
     if (this._restartCount < this.maxRestarts) {
       const delay = 100 * 2 ** this._restartCount;
       this._restartCount++;
@@ -9643,13 +9698,13 @@ function isEmptyParam(value) {
   return false;
 }
 // ../aft-bridge/dist/config-tiers.js
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync as readFileSync2 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
 function readConfigTiers(opts) {
   const tiers = [];
   try {
     if (existsSync(opts.userConfigPath)) {
-      const doc = readFileSync(opts.userConfigPath, "utf-8");
+      const doc = readFileSync2(opts.userConfigPath, "utf-8");
       tiers.push({
         tier: "user",
         source: resolve2(opts.userConfigPath),
@@ -9659,7 +9714,7 @@ function readConfigTiers(opts) {
   } catch {}
   try {
     if (existsSync(opts.projectConfigPath)) {
-      const doc = readFileSync(opts.projectConfigPath, "utf-8");
+      const doc = readFileSync2(opts.projectConfigPath, "utf-8");
       tiers.push({
         tier: "project",
         source: resolve2(opts.projectConfigPath),
@@ -9677,8 +9732,8 @@ function formatDroppedKeyWarnings(dropped) {
 }
 // ../aft-bridge/dist/downloader.js
 import { spawnSync } from "node:child_process";
-import { createHash, randomUUID } from "node:crypto";
-import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync as existsSync2, mkdirSync, openSync, readFileSync as readFileSync2, renameSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
+import { createHash as createHash2, randomUUID } from "node:crypto";
+import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync as existsSync2, mkdirSync, openSync, readFileSync as readFileSync3, renameSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { join as join3 } from "node:path";
 import { Readable } from "node:stream";
@@ -9822,7 +9877,7 @@ async function downloadBinary(version) {
       warn(`Checksum verification failed: checksums.sha256 found but no entry for ${assetName}. ` + "Binary download aborted for security reasons.");
       return null;
     }
-    const hash = createHash("sha256");
+    const hash = createHash2("sha256");
     let bytesWritten = 0;
     const guard = new TransformStream({
       transform(chunk, controller) {
@@ -9906,7 +9961,7 @@ async function acquireDownloadLock(lockPath) {
           closeSync(fd);
         } catch {}
         try {
-          if (readFileSync2(lockPath, "utf-8") === owner) {
+          if (readFileSync3(lockPath, "utf-8") === owner) {
             rmSync(lockPath, { force: true });
           }
         } catch {}
@@ -10031,12 +10086,12 @@ function stripJsoncSymbols(value) {
 }
 // ../aft-bridge/dist/migration.js
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { closeSync as closeSync3, existsSync as existsSync5, mkdirSync as mkdirSync4, openSync as openSync3, readFileSync as readFileSync4, renameSync as renameSync4, rmSync as rmSync2, statSync as statSync2, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { closeSync as closeSync3, existsSync as existsSync5, mkdirSync as mkdirSync4, openSync as openSync3, readFileSync as readFileSync5, renameSync as renameSync4, rmSync as rmSync2, statSync as statSync2, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir7, tmpdir } from "node:os";
 import { basename, dirname as dirname2, join as join6, resolve as resolve4 } from "node:path";
 
 // ../aft-bridge/dist/paths.js
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, renameSync as renameSync2, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { dirname, isAbsolute as isAbsolute2, join as join4, resolve as resolve3 } from "node:path";
 function homeDir() {
@@ -10110,7 +10165,7 @@ function shouldShowAnnouncement(storageRoot, harness, currentVersion) {
   let lastVersion = "";
   try {
     if (existsSync3(versionFile)) {
-      lastVersion = readFileSync3(versionFile, "utf-8").trim();
+      lastVersion = readFileSync4(versionFile, "utf-8").trim();
     }
   } catch {
     return false;
@@ -10507,7 +10562,7 @@ function atomicCopyConfigFile(sourcePath, targetPath) {
   let fd = null;
   try {
     fd = openSync3(tmpPath, "wx", 384);
-    writeFileSync2(fd, readFileSync4(sourcePath));
+    writeFileSync2(fd, readFileSync5(sourcePath));
     closeSync3(fd);
     fd = null;
     renameSync4(tmpPath, targetPath);
@@ -10586,7 +10641,7 @@ function markLegacySourcesMovedAside(sources, targetPath, logger) {
     const desiredMarkerPath = `${source.path}${MOVED_MARKER_SUFFIX}`;
     const markerPath = nonClobberingSidecarPath(desiredMarkerPath);
     try {
-      const original = readFileSync4(source.path, "utf-8");
+      const original = readFileSync5(source.path, "utf-8");
       if (markerPath !== desiredMarkerPath) {
         logger?.warn?.(`Preserving existing legacy AFT marker ${desiredMarkerPath}; writing new marker to ${markerPath}`);
       }
@@ -10655,10 +10710,10 @@ function migrateAftConfigFile(opts) {
   try {
     const sources = existingSources.map((source) => ({
       ...source,
-      content: readFileSync4(source.path, "utf-8")
+      content: readFileSync5(source.path, "utf-8")
     }));
     if (existsSync5(opts.targetPath)) {
-      const targetContent = readFileSync4(opts.targetPath, "utf-8");
+      const targetContent = readFileSync5(opts.targetPath, "utf-8");
       for (const source of sources) {
         if (fileSemanticsMatch(source.content, targetContent))
           continue;
@@ -10889,8 +10944,8 @@ function npmSpawnEnv(resolved, baseEnv = process.env) {
 }
 // ../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 closeSync4, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync6, lstatSync, mkdirSync as mkdirSync5, openSync as openSync4, readdirSync as readdirSync2, readFileSync as readFileSync5, readlinkSync, realpathSync, rmSync as rmSync3, statSync as statSync4, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { createHash as createHash3 } from "node:crypto";
+import { chmodSync as chmodSync3, closeSync as closeSync4, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync6, lstatSync, mkdirSync as mkdirSync5, openSync as openSync4, readdirSync as readdirSync2, readFileSync as readFileSync6, readlinkSync, realpathSync, rmSync as rmSync3, statSync as statSync4, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
 import { basename as basename2, dirname as dirname4, isAbsolute as isAbsolute4, join as join8, relative as relative2, resolve as resolve5, win32 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
@@ -11440,7 +11495,7 @@ function readOnnxInstalledMeta(installDir) {
   try {
     if (!statSync4(path2).isFile())
       return null;
-    const raw = readFileSync5(path2, "utf8");
+    const raw = readFileSync6(path2, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.version !== "string" || parsed.version.length === 0)
       return null;
@@ -11455,8 +11510,8 @@ function readOnnxInstalledMeta(installDir) {
   }
 }
 function sha256File(path2) {
-  const hash = createHash2("sha256");
-  hash.update(readFileSync5(path2));
+  const hash = createHash3("sha256");
+  hash.update(readFileSync6(path2));
   return hash.digest("hex");
 }
 function acquireLock(lockPath) {
@@ -11484,7 +11539,7 @@ ${new Date().toISOString()}
   let owningPid = null;
   let lockMtimeMs = 0;
   try {
-    const raw = readFileSync5(lockPath, "utf8");
+    const raw = readFileSync6(lockPath, "utf8");
     const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
     const parsed = Number.parseInt(firstLine, 10);
     if (Number.isFinite(parsed) && parsed > 0)
@@ -11509,7 +11564,7 @@ function releaseLock(lockPath) {
   try {
     let owningPid = null;
     try {
-      const raw = readFileSync5(lockPath, "utf8");
+      const raw = readFileSync6(lockPath, "utf8");
       const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
       const parsed = Number.parseInt(firstLine, 10);
       if (Number.isFinite(parsed) && parsed > 0)
@@ -11704,6 +11759,11 @@ class BridgePool {
     for (const [dir, entry] of this.bridges) {
       if (entry.bridge.hasPendingRequests() || entry.bridge.hasOutstandingBackgroundTasks())
         continue;
+      if (entry.bridge.maybeScheduleRespawnForUpdatedBinary(CLEANUP_INTERVAL_MS, now)) {
+        this.staleBridges.add(entry.bridge);
+        this.bridges.delete(dir);
+        continue;
+      }
       if (now - entry.lastUsed > this.idleTimeoutMs) {
         entry.bridge.shutdown().catch((err) => this.error("cleanup shutdown failed:", err));
         this.bridges.delete(dir);
@@ -11800,10 +11860,11 @@ class BridgePool {
 function normalizeKey(projectRoot) {
   return canonicalizeProjectRoot(projectRoot);
 }
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/client.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/client.ts
 import { promises as fs2 } from "node:fs";
+import { debuglog } from "node:util";
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/auth.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/auth.ts
 import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
 var NONCE_LEN = 32;
 var MAX_AUTH_MESSAGE_LEN = 4096;
@@ -11867,7 +11928,7 @@ async function authenticateClient(sock, conn, deadlineMs) {
   await writeMessage(sock, { client_auth: Array.from(clientAuth) }, deadlineMs);
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/connection-file.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/connection-file.ts
 import { promises as fs } from "node:fs";
 var SCHEMA_VERSION = 1;
 var MIN_KEY_LEN = 32;
@@ -11936,7 +11997,7 @@ async function readConnectionFile(path2) {
   return info;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/envelope.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/envelope.ts
 var PROTOCOL_VERSION = 1;
 var HEADER_LEN = 17;
 var FROZEN_PREFIX_LEN = 5;
@@ -12043,7 +12104,7 @@ function encodeFrame(frame) {
   return out;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/socket.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/socket.ts
 import net from "node:net";
 
 class SocketClosedError extends Error {
@@ -12074,6 +12135,9 @@ class SubcSocket {
   buffered = 0;
   waiter = null;
   closedErr = null;
+  bufferedBytes() {
+    return this.buffered;
+  }
   constructor(sock) {
     this.sock = sock;
     sock.on("data", (chunk) => {
@@ -12232,9 +12296,14 @@ class SubcSocket {
   }
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/client.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/client.ts
+var debug = debuglog("subc-client");
 var DEFAULT_HANDSHAKE_TIMEOUT_MS = 1e4;
 var DEFAULT_REQUEST_TIMEOUT_MS = 30000;
+var TIMEOUT_ARBITRATION_GRACE_MS = 50;
+var REQUEST_DEADLINE_MARKER = "request_deadline";
+var DEADLINE_NO_DROP_CODE = "deadline_exceeded_no_drop_observed";
+var ROUTE_OPEN_RETRY_DEADLINE_MS = 1e4;
 var BODY_READ_TIMEOUT_MS = 30000;
 var EMPTY_BODY = new Uint8Array(0);
 var DEFAULT_MANAGED_TARGET_KIND = "management_surface";
@@ -12278,6 +12347,7 @@ class SubcClient {
   closeStarted = false;
   reconnecting = null;
   generation = 1;
+  readerActive = false;
   constructor(sock, currentConn, opts) {
     this.sock = sock;
     this.currentConn = currentConn;
@@ -12336,7 +12406,7 @@ class SubcClient {
           }
           continue;
         }
-        if (err.kind === "outcome_unknown") {
+        if (err.kind === "outcome_unknown" && err.code !== DEADLINE_NO_DROP_CODE) {
           this.scheduleReconnectAfterDrop(err);
         }
         throw err;
@@ -12459,7 +12529,7 @@ class SubcClient {
         timer: null
       };
       pending.timer = setTimeout(() => {
-        this.rejectPending(key, pending, new SubcError(this.timeoutMessage(channel, corr, ms)));
+        this.arbitrateTimeout(key, pending, channel, corr, ms);
       }, ms);
       this.pending.set(key, pending);
       this.sock.write(encodeFrame(frame), Date.now() + ms).catch((err) => {
@@ -12469,6 +12539,23 @@ class SubcClient {
       });
     });
   }
+  arbitrateTimeout(key, pending, channel, corr, ms) {
+    const settleAsTimeout = () => {
+      this.rejectPending(key, pending, new SubcError(this.timeoutMessage(channel, corr, ms), REQUEST_DEADLINE_MARKER));
+    };
+    const graceDeadline = Date.now() + this.opts.timeoutArbitrationGraceMs;
+    const arbitrate = () => {
+      if (this.pending.get(key) !== pending)
+        return;
+      const readerDraining = this.readerActive || this.sock.bufferedBytes() > 0;
+      if (readerDraining && Date.now() < graceDeadline) {
+        setImmediate(arbitrate);
+        return;
+      }
+      settleAsTimeout();
+    };
+    setImmediate(arbitrate);
+  }
   async managedRequest(routeChannel, body, opts) {
     const bytes = body instanceof Uint8Array ? body : this.encode(body);
     const priority = opts.priority ?? 1 /* Interactive */;
@@ -12493,6 +12580,9 @@ class SubcClient {
       if (!handedToSocket) {
         return this.notSentCallError("request bytes were not queued to the subc socket", err);
       }
+      if (err instanceof SubcError && err.code === REQUEST_DEADLINE_MARKER) {
+        return new SubcCallError("outcome_unknown", `managed call deadline exceeded after request bytes were queued to the local socket; no terminal response was observed; outcome unknown${causeMessage(err)}`, DEADLINE_NO_DROP_CODE, err);
+      }
       return this.outcomeUnknownCallError("connection dropped before the managed call returned a response", err);
     };
     return new Promise((resolve7, reject) => {
@@ -12506,7 +12596,7 @@ class SubcClient {
         classifyFailure
       };
       pending.timer = setTimeout(() => {
-        this.rejectPending(key, pending, new SubcError(this.timeoutMessage(channel, corr, ms)));
+        this.arbitrateTimeout(key, pending, channel, corr, ms);
       }, ms);
       this.pending.set(key, pending);
       const write = this.sock.writeTracked(encodeFrame(frame), Date.now() + ms);
@@ -12551,6 +12641,9 @@ class SubcClient {
     return cached.opening;
   }
   async openCachedRoute(cached) {
+    const routeRetryDeadline = Date.now() + ROUTE_OPEN_RETRY_DEADLINE_MS;
+    let routeRetryDelay = this.opts.reconnectBackoff.baseMs;
+    let routeRetryAttempt = 0;
     for (;; ) {
       if (cached.closed)
         throw this.routeClosedDuringOpen();
@@ -12584,6 +12677,15 @@ class SubcClient {
           }
           continue;
         }
+        if (!this.closeStarted && err instanceof SubcError && isRetryableRouteOpenCode(err.code)) {
+          routeRetryAttempt += 1;
+          if (routeRetryAttempt < this.opts.reconnectBackoff.maxAttempts && Date.now() < routeRetryDeadline) {
+            await this.opts.sleep(routeRetryDelay);
+            routeRetryDelay = Math.min(routeRetryDelay * 2, this.opts.reconnectBackoff.capMs);
+            continue;
+          }
+          throw this.notSentCallError(`route.open failed for module ${cached.moduleId}: ${err.code} (retry budget exhausted)`, err);
+        }
         throw this.terminalCallError(`route.open failed for module ${cached.moduleId}`, err);
       }
     }
@@ -12677,9 +12779,16 @@ class SubcClient {
     try {
       for (;; ) {
         const headerBytes = await sock.readExact(HEADER_LEN, Number.POSITIVE_INFINITY);
-        const header = decodeHeader(headerBytes);
-        const body = header.len === 0 ? new Uint8Array(0) : await sock.readExact(header.len, Date.now() + BODY_READ_TIMEOUT_MS);
-        this.dispatch({ header, body });
+        this.readerActive = true;
+        try {
+          const header = decodeHeader(headerBytes);
+          const body = header.len === 0 ? new Uint8Array(0) : await sock.readExact(header.len, Date.now() + BODY_READ_TIMEOUT_MS);
+          if (this.sock === sock && this.generation === generation) {
+            this.dispatch({ header, body });
+          }
+        } finally {
+          this.readerActive = false;
+        }
       }
     } catch (err) {
       if (this.sock === sock && this.generation === generation) {
@@ -12711,13 +12820,20 @@ class SubcClient {
       this.failChannel(frame.header.channel, new SubcError("route closed by subc (GOODBYE)"));
       return;
     }
+    if (frame.header.ty === 1 /* Response */ || frame.header.ty === 5 /* Error */ || frame.header.ty === 4 /* StreamEnd */) {
+      debug("dropped terminal frame with no waiter: type=%d channel=%d corr=%s port=%s", frame.header.ty, frame.header.channel, frame.header.corr, this.sock.localPort() ?? "?");
+      return;
+    }
   }
   settle(key, pending, run) {
+    if (this.pending.get(key) !== pending)
+      return false;
     this.pending.delete(key);
     if (pending.timer)
       clearTimeout(pending.timer);
     run();
     pending.onSettle?.();
+    return true;
   }
   rejectPending(key, pending, err) {
     this.settle(key, pending, () => pending.reject(pending.classifyFailure?.(err) ?? err));
@@ -12781,6 +12897,9 @@ function isConsumerReconnectTransient(err) {
   const code = errorCode(err);
   return code === "ECONNREFUSED" || code === "ECONNRESET" || code === "EPIPE" || code === "ETIMEDOUT" || code === "ENOENT";
 }
+function isRetryableRouteOpenCode(code) {
+  return code === "unknown_module" || code === "module_reloading" || code === "target_unavailable" || code === "module_timeout";
+}
 async function connectionFileExists(path2) {
   try {
     await fs2.access(path2);
@@ -12796,7 +12915,8 @@ function normalizeConnectOptions(opts) {
     identity: opts.identity,
     targetKind: opts.targetKind ?? DEFAULT_MANAGED_TARGET_KIND,
     reconnectBackoff: opts.reconnectBackoff ?? DEFAULT_RECONNECT_BACKOFF,
-    sleep: opts.sleep ?? ((ms) => new Promise((resolve7) => setTimeout(resolve7, ms)))
+    sleep: opts.sleep ?? ((ms) => new Promise((resolve7) => setTimeout(resolve7, ms))),
+    timeoutArbitrationGraceMs: opts.timeoutArbitrationGraceMs ?? TIMEOUT_ARBITRATION_GRACE_MS
   };
 }
 function routeCacheKey(target, identity, consumerIdentity) {
@@ -12825,7 +12945,7 @@ function causeMessage(cause) {
     return "";
   return `: ${cause instanceof Error ? cause.message : String(cause)}`;
 }
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.1/node_modules/@cortexkit/subc-client/src/provider.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/provider.ts
 import { Buffer as Buffer2 } from "node:buffer";
 var DEFAULT_HANDSHAKE_TIMEOUT_MS2 = 1e4;
 var BODY_READ_TIMEOUT_MS2 = 30000;
@@ -14658,7 +14778,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/aft-pi",
-  version: "0.44.0",
+  version: "0.45.0",
   type: "module",
   description: "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   main: "dist/index.js",
@@ -14681,19 +14801,19 @@ var package_default = {
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   dependencies: {
-    "@cortexkit/aft-bridge": "0.44.0",
+    "@cortexkit/aft-bridge": "0.45.0",
     "comment-json": "^5.0.0",
     diff: "^8.0.4",
     typebox: "1.1.38",
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.44.0",
-    "@cortexkit/aft-darwin-x64": "0.44.0",
-    "@cortexkit/aft-linux-arm64": "0.44.0",
-    "@cortexkit/aft-linux-x64": "0.44.0",
-    "@cortexkit/aft-win32-arm64": "0.44.0",
-    "@cortexkit/aft-win32-x64": "0.44.0"
+    "@cortexkit/aft-darwin-arm64": "0.45.0",
+    "@cortexkit/aft-darwin-x64": "0.45.0",
+    "@cortexkit/aft-linux-arm64": "0.45.0",
+    "@cortexkit/aft-linux-x64": "0.45.0",
+    "@cortexkit/aft-win32-arm64": "0.45.0",
+    "@cortexkit/aft-win32-x64": "0.45.0"
   },
   devDependencies: {
     "@earendil-works/pi-coding-agent": "^0.80.2",
@@ -15282,7 +15402,7 @@ function registerStatusCommand(pi, ctx) {
 }
 
 // src/config.ts
-import { existsSync as existsSync7, readFileSync as readFileSync6, renameSync as renameSync5, unlinkSync as unlinkSync5, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7, renameSync as renameSync5, unlinkSync as unlinkSync5, writeFileSync as writeFileSync4 } from "node:fs";
 var import_comment_json = __toESM(require_src2(), 1);
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
@@ -29860,7 +29980,7 @@ function migrateAftConfigFile2(configPath, logger = { log: log2, warn: warn2 })
   let tmpPath = null;
   let oldKeys = [];
   try {
-    const content = readFileSync6(configPath, "utf-8");
+    const content = readFileSync7(configPath, "utf-8");
     const rawConfig = import_comment_json.parse(content);
     if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
       return { migrated: false, oldKeys: [] };
@@ -29909,7 +30029,7 @@ function loadConfigFromPath(configPath) {
   try {
     if (!existsSync7(configPath))
       return null;
-    const content = readFileSync6(configPath, "utf-8");
+    const content = readFileSync7(configPath, "utf-8");
     const rawConfig = import_comment_json.parse(content);
     if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
       recordConfigParseFailure(configPath, "root must be an object");
@@ -30192,12 +30312,12 @@ function loadAftConfig(projectDirectory) {
 
 // src/lsp-auto-install.ts
 import { spawn as spawn2 } from "node:child_process";
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 import {
   createReadStream,
   existsSync as existsSync9,
   mkdirSync as mkdirSync7,
-  readFileSync as readFileSync9,
+  readFileSync as readFileSync10,
   renameSync as renameSync6,
   rmSync as rmSync4,
   statSync as statSync6,
@@ -30210,7 +30330,7 @@ import {
   closeSync as closeSync5,
   mkdirSync as mkdirSync6,
   openSync as openSync5,
-  readFileSync as readFileSync7,
+  readFileSync as readFileSync8,
   statSync as statSync5,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync5
@@ -30274,7 +30394,7 @@ function readInstalledMetaIn(installDir) {
   try {
     if (!statSync5(path3).isFile())
       return null;
-    const raw = readFileSync7(path3, "utf8");
+    const raw = readFileSync8(path3, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.version !== "string" || parsed.version.length === 0)
       return null;
@@ -30324,7 +30444,7 @@ ${new Date().toISOString()}
   let owningPid = null;
   let lockMtimeMs = 0;
   try {
-    const raw = readFileSync7(lock, "utf8");
+    const raw = readFileSync8(lock, "utf8");
     const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
     const parsed = Number.parseInt(firstLine, 10);
     if (Number.isFinite(parsed) && parsed > 0)
@@ -30362,7 +30482,7 @@ function releaseInstallLock(lockKey) {
   try {
     let owningPid = null;
     try {
-      const raw = readFileSync7(lock, "utf8");
+      const raw = readFileSync8(lock, "utf8");
       const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? "";
       const parsed = Number.parseInt(firstLine, 10);
       if (Number.isFinite(parsed) && parsed > 0)
@@ -30403,7 +30523,7 @@ var VERSION_CHECK_FILE = ".aft-version-check";
 function readVersionCheck(npmPackage) {
   const file2 = join11(lspPackageDir(npmPackage), VERSION_CHECK_FILE);
   try {
-    const raw = readFileSync7(file2, "utf8");
+    const raw = readFileSync8(file2, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.last_checked === "string") {
       return {
@@ -30580,7 +30700,7 @@ var NPM_LSP_TABLE = [
 ];
 
 // src/lsp-project-relevance.ts
-import { existsSync as existsSync8, readdirSync as readdirSync3, readFileSync as readFileSync8 } from "node:fs";
+import { existsSync as existsSync8, readdirSync as readdirSync3, readFileSync as readFileSync9 } from "node:fs";
 import { join as join12 } from "node:path";
 var MAX_WALK_DIRS = 200;
 var MAX_WALK_DEPTH = 4;
@@ -30622,7 +30742,7 @@ function hasPackageJsonDep(projectRoot, depNames) {
 }
 function readPackageJson(projectRoot) {
   try {
-    const raw = readFileSync8(join12(projectRoot, "package.json"), "utf8");
+    const raw = readFileSync9(join12(projectRoot, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null)
       return null;
@@ -30944,7 +31064,7 @@ function hashInstalledBinary(spec) {
       reject(new Error(`installed binary not found at any of: ${candidates.join(", ")}`));
       return;
     }
-    const hash2 = createHash3("sha256");
+    const hash2 = createHash4("sha256");
     const stream = createReadStream(pathToHash);
     stream.on("error", reject);
     stream.on("data", (chunk) => hash2.update(chunk));
@@ -30967,7 +31087,7 @@ function installedBinaryPath(spec) {
   return null;
 }
 function sha256OfFileSync(path3) {
-  return createHash3("sha256").update(readFileSync9(path3)).digest("hex");
+  return createHash4("sha256").update(readFileSync10(path3)).digest("hex");
 }
 function quarantineCachedNpmInstall(spec, reason) {
   const packageDir = lspPackageDir(spec.npm);
@@ -31051,7 +31171,7 @@ function runAutoInstall(projectRoot, config2, fetchImpl = fetch) {
 
 // src/lsp-github-install.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
-import { createHash as createHash4, randomBytes as randomBytes2 } from "node:crypto";
+import { createHash as createHash5, randomBytes as randomBytes2 } from "node:crypto";
 import {
   copyFileSync as copyFileSync4,
   createReadStream as createReadStream2,
@@ -31060,7 +31180,7 @@ import {
   lstatSync as lstatSync2,
   mkdirSync as mkdirSync8,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync10,
+  readFileSync as readFileSync11,
   readlinkSync as readlinkSync2,
   realpathSync as realpathSync3,
   renameSync as renameSync7,
@@ -31194,7 +31314,7 @@ function readGithubInstalledMetaIn(installDir) {
     const path3 = join14(installDir, INSTALLED_META_FILE2);
     if (!statSync7(path3).isFile())
       return null;
-    const parsed = JSON.parse(readFileSync10(path3, "utf8"));
+    const parsed = JSON.parse(readFileSync11(path3, "utf8"));
     if (typeof parsed.version !== "string" || parsed.version.length === 0)
       return null;
     return {
@@ -31227,7 +31347,7 @@ var MAX_DOWNLOAD_BYTES3 = 256 * 1024 * 1024;
 var MAX_EXTRACT_BYTES2 = 1024 * 1024 * 1024;
 function sha256OfFile(path3) {
   return new Promise((resolve8, reject) => {
-    const hash2 = createHash4("sha256");
+    const hash2 = createHash5("sha256");
     const stream = createReadStream2(path3);
     stream.on("error", reject);
     stream.on("data", (chunk) => hash2.update(chunk));
@@ -31235,7 +31355,7 @@ function sha256OfFile(path3) {
   });
 }
 function sha256OfFileSync2(path3) {
-  return createHash4("sha256").update(readFileSync10(path3)).digest("hex");
+  return createHash5("sha256").update(readFileSync11(path3)).digest("hex");
 }
 async function fetchReleaseByTag(githubRepo, tag, fetchImpl, signal) {
   const candidates = [];
@@ -35581,13 +35701,13 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.44.0";
+var ANNOUNCEMENT_VERSION = "0.45.0";
 var ANNOUNCEMENT_FEATURES = [
-  "Code Health accuracy overhaul: framework entry points (Tauri commands, Next.js/Nuxt/SvelteKit/Remix/Astro routes, NestJS decorators) are no longer flagged dead, barrel re-exports collapse to their real definition, and test-only usage moves out of the headline counts into its own tier.",
-  "New: import cycle detection for TS/JS (aft_inspect sections: cycles), and expected_mirrors config to suppress intentional duplicate pairs like plugin/pi-plugin parity trees.",
-  "Stale diagnostics fixed: files edited outside AFT (scripts, git) no longer show outdated errors in aft_inspect or the status bar.",
-  "bash wait: true blocks until a long command finishes instead of promoting it to background.",
-  "Objective-C support (.m/.mm): outline, zoom, AST search, and semantic indexing."
+  "Code Health verified against 12 real repositories: dead code is only reported for languages we can actually analyze (Java/Kotlin now say 'not analyzed' instead of guessing), and generated code (gen/ trees, *_pb.ts, DO NOT EDIT banners) moves out of the headline counts into its own bucket.",
+  "Config files (playwright/eslint/tsup/vitest *.config.ts), Storybook stories, Mocha hooks, and SvelteKit hooks/$lib imports are no longer flagged as dead code.",
+  "Rust module aliases, inline-module calls, and cross-crate pub use re-exports now resolve; Go interface methods (sort.Interface, Bubble Tea) are no longer flagged dead.",
+  "Fixed npx @cortexkit/aft doctor --fix and setup failing to download the binary on fresh installs.",
+  "Bridges now detect an updated aft binary on disk and respawn onto it automatically."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/DSa65w8wuf";
 var ALL_ONLY_TOOLS = new Set(["aft_callgraph", "aft_delete", "aft_move", "aft_refactor"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-pi",
-  "version": "0.44.0",
+  "version": "0.45.0",
   "type": "module",
   "description": "Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis",
   "main": "dist/index.js",
@@ -23,19 +23,19 @@
     "test:unit": "bun test src/__tests__ --path-ignore-patterns 'src/__tests__/e2e/**'"
   },
   "dependencies": {
-    "@cortexkit/aft-bridge": "0.44.0",
+    "@cortexkit/aft-bridge": "0.45.0",
     "comment-json": "^5.0.0",
     "diff": "^8.0.4",
     "typebox": "1.1.38",
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.44.0",
-    "@cortexkit/aft-darwin-x64": "0.44.0",
-    "@cortexkit/aft-linux-arm64": "0.44.0",
-    "@cortexkit/aft-linux-x64": "0.44.0",
-    "@cortexkit/aft-win32-arm64": "0.44.0",
-    "@cortexkit/aft-win32-x64": "0.44.0"
+    "@cortexkit/aft-darwin-arm64": "0.45.0",
+    "@cortexkit/aft-darwin-x64": "0.45.0",
+    "@cortexkit/aft-linux-arm64": "0.45.0",
+    "@cortexkit/aft-linux-x64": "0.45.0",
+    "@cortexkit/aft-win32-arm64": "0.45.0",
+    "@cortexkit/aft-win32-x64": "0.45.0"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^0.80.2",