@cortexkit/aft 0.52.0 → 0.52.1

package/dist/index.js

@@ -4956,6 +4956,15 @@ function isAbsentRootRouteError(err) {
 function absentRootError(root) {
   return new SubcError(`invalid route project root: project root does not exist: ${root}`, "config_divergence");
 }
+function reloadWindowExhaustedError(error2) {
+  if (error2 instanceof Error) {
+    try {
+      error2.message += ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX;
+      return error2;
+    } catch {}
+  }
+  return new Error(`${String(error2)}${ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX}`);
+}
 function safeCloseRoute(client, route) {
   try {
     client.closeRouteChannel(route).catch(() => {
@@ -5077,6 +5086,7 @@ class SubcTransportPool {
   connecting = null;
   routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
   routeReopenRetry = null;
+  routeReopenRetryMs = null;
   sessions = new Map;
   rootIndex = new Map;
   dormantRoots = new Map;
@@ -5550,6 +5560,23 @@ class SubcTransportPool {
           throw error2;
         }
       };
+      const openRouteAfterReloadWindow = async () => {
+        let reloadWaitedMs = 0;
+        while (true) {
+          try {
+            return await openRoute();
+          } catch (error2) {
+            if (!isRouteOpenReloadWindowError(error2))
+              throw error2;
+            const { delayMs, wait } = this.waitForRouteReopenBackoff();
+            if (reloadWaitedMs + delayMs > ROUTE_OPEN_RELOAD_WAIT_CAP_MS) {
+              throw reloadWindowExhaustedError(error2);
+            }
+            reloadWaitedMs += delayMs;
+            await wait;
+          }
+        }
+      };
       const clearRouteEntry = (entry) => {
         if (record.routeEntry !== entry)
           return;
@@ -5586,7 +5613,7 @@ class SubcTransportPool {
         this.ensureBgSubscription(identity, record);
         return reply;
       };
-      let routeAndEntry = await openRoute();
+      let routeAndEntry = await openRouteAfterReloadWindow();
       try {
         return await requestOnRoute(routeAndEntry.route);
       } catch (error2) {
@@ -5594,8 +5621,8 @@ class SubcTransportPool {
           throw this.annotateReapError(error2, record);
         if (isRouteProvenAbsentError(error2) && this.isCurrentSession(key, record) && this.client === client) {
           clearRouteEntry(routeAndEntry.entry);
-          await this.waitForRouteReopenBackoff();
-          routeAndEntry = await openRoute();
+          await this.waitForRouteReopenBackoff().wait;
+          routeAndEntry = await openRouteAfterReloadWindow();
           try {
             const reply = await requestOnRoute(routeAndEntry.route);
             this.resetRouteReopenBackoff();
@@ -5621,17 +5648,21 @@ class SubcTransportPool {
   }
   waitForRouteReopenBackoff() {
     const pending = this.routeReopenRetry;
-    if (pending)
-      return pending;
-    const delay = this.routeReopenRetryDelayMs;
-    this.routeReopenRetryDelayMs = Math.min(delay * 2, RECONNECT_RETRY_CAP_MS);
+    const pendingDelay = this.routeReopenRetryMs;
+    if (pending && pendingDelay !== null)
+      return { delayMs: pendingDelay, wait: pending };
+    const delayMs = this.routeReopenRetryDelayMs;
+    this.routeReopenRetryDelayMs = Math.min(delayMs * 2, RECONNECT_RETRY_CAP_MS);
     let retry;
-    retry = Promise.resolve().then(() => this.routeRetrySleep(delay)).finally(() => {
-      if (this.routeReopenRetry === retry)
+    retry = Promise.resolve().then(() => this.routeRetrySleep(delayMs)).finally(() => {
+      if (this.routeReopenRetry === retry) {
         this.routeReopenRetry = null;
+        this.routeReopenRetryMs = null;
+      }
     });
     this.routeReopenRetry = retry;
-    return retry;
+    this.routeReopenRetryMs = delayMs;
+    return { delayMs, wait: retry };
   }
   resetRouteReopenBackoff() {
     this.routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
@@ -5889,10 +5920,11 @@ function resolveBridgeForNudge(pool, ref) {
     currentConcretePoolId: candidate.getConcretePoolId?.()
   });
 }
-var SubcTransportShuttingDownError, AFT_MODULE_ID = "aft", MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3, RECONNECT_RETRY_FLOOR_MS = 100, RECONNECT_RETRY_CAP_MS = 2000, BG_STABLE_MS = 5000, BG_LIFECYCLE_LOG_INTERVAL_MS = 60000, BG_DISPATCH_PROBE_INTERVAL_MS = 60000, DEFAULT_SESSION_ID = "__default__", LOCALLY_SATISFIED_COMMANDS, SubcRootReapedError, SubcRootGenerationExpiredError, SubcRootDemandRequiredError, RouteTornDownError;
+var SubcTransportShuttingDownError, AFT_MODULE_ID = "aft", MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3, RECONNECT_RETRY_FLOOR_MS = 100, RECONNECT_RETRY_CAP_MS = 2000, ROUTE_OPEN_RELOAD_WAIT_CAP_MS = 15000, ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX = " The AFT daemon module did not return within the 15s reload window.", BG_STABLE_MS = 5000, BG_LIFECYCLE_LOG_INTERVAL_MS = 60000, BG_DISPATCH_PROBE_INTERVAL_MS = 60000, DEFAULT_SESSION_ID = "__default__", LOCALLY_SATISFIED_COMMANDS, SubcRootReapedError, SubcRootGenerationExpiredError, SubcRootDemandRequiredError, RouteTornDownError;
 var init_subc_transport = __esm(() => {
   init_dist();
   init_active_logger();
+  init_error_contract();
   init_lifecycle_registry();
   init_project_identity();
   SubcTransportShuttingDownError = class SubcTransportShuttingDownError extends SubcCallError {
@@ -5963,6 +5995,12 @@ function isRouteGoodbyeError(error2) {
   }
   return error2.code === "route_closed" && error2.message.includes("route closed by subc");
 }
+function isRouteOpenReloadWindowError(error2) {
+  if (error2 === null || typeof error2 !== "object")
+    return false;
+  const code = error2.code;
+  return code === "module_reloading" || code === "module_warming" || code === "target_unavailable";
+}
 function hasEngineResponse(error2) {
   const response = error2.response;
   if (response !== null && typeof response === "object")
@@ -6321,7 +6359,16 @@ function platformKey(platform = process.platform, arch = process.arch) {
   }
   return key;
 }
+function logBinaryResolution(resolution) {
+  log(`Resolved binary from ${resolution.source}: ${resolution.path}`);
+}
 function findBinarySync(expectedVersion) {
+  const resolution = findBinarySyncInner(expectedVersion);
+  if (resolution)
+    logBinaryResolution(resolution);
+  return resolution?.path ?? null;
+}
+function findBinarySyncInner(expectedVersion) {
   const ext = process.platform === "win32" ? ".exe" : "";
   const env = { ...process.env };
   const pluginVersion = expectedVersion ?? (() => {
@@ -6335,8 +6382,9 @@ function findBinarySync(expectedVersion) {
   if (pluginVersion) {
     const tag = pluginVersion.startsWith("v") ? pluginVersion : `v${pluginVersion}`;
     const versionCached = cachedBinaryPathFromEnv(tag, env, ext);
-    if (versionCached && isExpectedCachedBinary2(versionCached, pluginVersion))
-      return versionCached;
+    if (versionCached && isExpectedCachedBinary2(versionCached, pluginVersion)) {
+      return { path: versionCached, source: "versioned cache" };
+    }
   }
   try {
     const key = platformKey();
@@ -6351,7 +6399,7 @@ function findBinarySync(expectedVersion) {
         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 copied ?? resolved;
+        return { path: copied ?? resolved, source: "npm platform package" };
       }
     }
   } catch {}
@@ -6369,27 +6417,28 @@ function findBinarySync(expectedVersion) {
       }
       const usable = probeBinaryCandidate(candidate, "PATH", expectedVersion);
       if (usable)
-        return usable;
+        return { path: usable, source: "PATH" };
     }
   } catch {}
   const cargoPath = join7(homeDirFromEnv(env), ".cargo", "bin", `aft${ext}`);
   if (existsSync5(cargoPath)) {
     const usable = probeBinaryCandidate(cargoPath, "cargo", expectedVersion);
     if (usable)
-      return usable;
+      return { path: usable, source: "cargo" };
   }
   return null;
 }
 async function findBinary(expectedVersion) {
   const syncResult = findBinarySync(expectedVersion);
   if (syncResult) {
-    log(`Resolved binary: ${syncResult}`);
     return syncResult;
   }
   log("Binary not found locally, attempting auto-download...");
   const downloaded = await ensureBinaryForResolver(expectedVersion);
-  if (downloaded)
+  if (downloaded) {
+    logBinaryResolution({ path: downloaded, source: "auto-download" });
     return downloaded;
+  }
   throw new Error([
     "Could not find the `aft` binary.",
     "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft",
-  "version": "0.52.0",
+  "version": "0.52.1",
   "type": "module",
   "description": "Unified CLI for Agent File Tools (AFT) — setup, doctor, and diagnostics across supported agent harnesses (OpenCode, Pi)",
   "license": "MIT",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.52.0",
+    "@cortexkit/aft-bridge": "0.52.1",
     "comment-json": "^4.6.2"
   },
   "devDependencies": {