@cortexkit/aft-opencode 0.52.0 → 0.52.1

package/dist/index.js

@@ -12087,6 +12087,8 @@ var AFT_MODULE_ID = "aft";
 var MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3;
 var RECONNECT_RETRY_FLOOR_MS = 100;
 var RECONNECT_RETRY_CAP_MS = 2000;
+var ROUTE_OPEN_RELOAD_WAIT_CAP_MS = 15000;
+var ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX = " The AFT daemon module did not return within the 15s reload window.";
 var BG_STABLE_MS = 5000;
 function reconnectBackoffMs(attempt) {
   return Math.min(RECONNECT_RETRY_FLOOR_MS * 2 ** Math.min(attempt, 6), RECONNECT_RETRY_CAP_MS);
@@ -12395,6 +12397,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(() => {
@@ -12519,6 +12530,7 @@ class SubcTransportPool {
   connecting = null;
   routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
   routeReopenRetry = null;
+  routeReopenRetryMs = null;
   sessions = new Map;
   rootIndex = new Map;
   dormantRoots = new Map;
@@ -12992,6 +13004,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;
@@ -13028,7 +13057,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) {
@@ -13036,8 +13065,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();
@@ -13063,17 +13092,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;
@@ -13360,6 +13393,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")
@@ -13684,7 +13723,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 ?? (() => {
@@ -13698,8 +13746,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();
@@ -13714,7 +13763,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 {}
@@ -13732,27 +13781,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.",
     "",
@@ -37984,6 +38034,7 @@ var HASHLINE_EDIT_DESCRIPTION = [
   "",
   "Quick reference:",
   "- Header: `[path#TAG]`; TAG is exactly four hexadecimal digits from a current tagged read. Read every addressed row and gap boundary; REM and MV require a whole-file tagged read. Re-read after an edit before chaining: an edit-response tag can retain only changed context.",
+  "- Same canonical path: multiple sections compose in patch order against pre-request coordinates.",
   "- Addresses: `0` (BOF), `N` (one line), `N.=M` (range; `N..=M`/`N..M` also work), `<N`/`>N` (gap before/after), `N*`/`<N*`/`>N*` (block), and `$`/`$-K` (EOF-relative). A plain `N` PUT replaces; use `<N` or `>N` to insert.",
   "- PUT text: `PUT <address>:` followed by one or more `+` body rows (`+` alone is blank). A final patch newline is allowed. PUT without `:` copies `@name` (or the anonymous register) and takes no body; names use `@` plus ASCII letters, digits, `_`, or `-`.",
   "- CUT: `CUT <address> [@name]`. REM: bare `REM` only, removing the whole file. MV: `MV <destination>` (one whitespace-free path, optional matching quotes), once and after any line operations. `*** Begin Patch`/`*** End Patch` is an optional envelope."
@@ -39658,7 +39709,7 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.52.0";
+var ANNOUNCEMENT_VERSION = "0.52.1";
 var ANNOUNCEMENT_FEATURES = [
   "Callgraph stays consistent under load: edits arriving mid-rebuild can no longer be silently lost from navigation results.",
   "aft_zoom handles real-world .jsonc: files with comment banners above the opening brace now resolve, and not-found errors point at the segment that actually failed (thanks @iceteaSA).",

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

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiDjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA+OtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAoIjE;AAkrBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA4BnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiDjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA+OtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAoIjE;AAmrBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA4BnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.52.0",
+  "version": "0.52.1",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.52.0",
+    "@cortexkit/aft-bridge": "0.52.1",
     "@opentui/core": "0.4.3",
     "@opentui/solid": "0.4.3",
     "comment-json": "^4.6.2",
@@ -43,12 +43,12 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.52.0",
-    "@cortexkit/aft-darwin-x64": "0.52.0",
-    "@cortexkit/aft-linux-arm64": "0.52.0",
-    "@cortexkit/aft-linux-x64": "0.52.0",
-    "@cortexkit/aft-win32-arm64": "0.52.0",
-    "@cortexkit/aft-win32-x64": "0.52.0"
+    "@cortexkit/aft-darwin-arm64": "0.52.1",
+    "@cortexkit/aft-darwin-x64": "0.52.1",
+    "@cortexkit/aft-linux-arm64": "0.52.1",
+    "@cortexkit/aft-linux-x64": "0.52.1",
+    "@cortexkit/aft-win32-arm64": "0.52.1",
+    "@cortexkit/aft-win32-x64": "0.52.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",