@cortexkit/aft 0.45.1 → 0.46.0

package/dist/index.js

@@ -4188,7 +4188,7 @@ var init_pool = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/auth.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/auth.js
 import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
 function computeProof(key, domain, clientNonce, serverNonce, daemonId) {
   const mac = createHmac("sha256", Buffer.from(key));
@@ -4249,7 +4249,7 @@ var init_auth = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/connection-file.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/connection-file.js
 import { promises as fs } from "node:fs";
 function toBytes(value, field) {
   if (!Array.isArray(value) || value.some((n) => typeof n !== "number")) {
@@ -4317,9 +4317,9 @@ var init_connection_file = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/envelope.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/envelope.js
 function isPureHeader(ty) {
-  return ty === 6 /* Cancel */ || ty === 7 /* Ping */ || ty === 8 /* Pong */ || ty === 11 /* Goodbye */;
+  return ty === FrameType.Cancel || ty === FrameType.Ping || ty === FrameType.Pong || ty === FrameType.Goodbye;
 }
 function buildFlags(binary, priority, last) {
   let b = 0;
@@ -4395,10 +4395,10 @@ function encodeFrame(frame) {
   out.set(frame.body, header.length);
   return out;
 }
-var PROTOCOL_VERSION = 1, HEADER_LEN = 17, FROZEN_PREFIX_LEN = 5, MAX_FRAME_BODY_LEN, FrameType, FRAME_TYPE_MAX = 11 /* Goodbye */, FLAG_BINARY = 1, FLAG_PRIORITY_MASK = 6, FLAG_PRIORITY_SHIFT = 1, FLAG_LAST = 8, FLAG_RESERVED_MASK = 240, DecodeError;
+var PROTOCOL_VERSION = 1, HEADER_LEN = 17, FROZEN_PREFIX_LEN = 5, MAX_FRAME_BODY_LEN, FrameType, FRAME_TYPE_MAX, Priority, FLAG_BINARY = 1, FLAG_PRIORITY_MASK = 6, FLAG_PRIORITY_SHIFT = 1, FLAG_LAST = 8, FLAG_RESERVED_MASK = 240, DecodeError;
 var init_envelope = __esm(() => {
   MAX_FRAME_BODY_LEN = 64 * 1024 * 1024;
-  ((FrameType2) => {
+  (function(FrameType2) {
     FrameType2[FrameType2["Request"] = 0] = "Request";
     FrameType2[FrameType2["Response"] = 1] = "Response";
     FrameType2[FrameType2["Push"] = 2] = "Push";
@@ -4411,12 +4411,18 @@ var init_envelope = __esm(() => {
     FrameType2[FrameType2["Hello"] = 9] = "Hello";
     FrameType2[FrameType2["HelloAck"] = 10] = "HelloAck";
     FrameType2[FrameType2["Goodbye"] = 11] = "Goodbye";
-  })(FrameType ||= {});
+  })(FrameType || (FrameType = {}));
+  FRAME_TYPE_MAX = FrameType.Goodbye;
+  (function(Priority2) {
+    Priority2[Priority2["Passive"] = 0] = "Passive";
+    Priority2[Priority2["Interactive"] = 1] = "Interactive";
+    Priority2[Priority2["Background"] = 2] = "Background";
+  })(Priority || (Priority = {}));
   DecodeError = class DecodeError extends Error {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/socket.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/socket.js
 import net from "node:net";
 
 class SubcSocket {
@@ -4607,7 +4613,7 @@ var init_socket = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/client.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/client.js
 import { promises as fs2 } from "node:fs";
 import { debuglog } from "node:util";
 
@@ -4660,12 +4666,13 @@ class SubcClient {
   }
   async request(routeChannel, body, opts = {}) {
     const bytes = body instanceof Uint8Array ? body : this.encode(body);
-    const priority = opts.priority ?? 1 /* Interactive */;
+    const priority = opts.priority ?? Priority.Interactive;
     const reply = await this.send(routeChannel, bytes, priority, opts.timeoutMs, opts.onProgress);
     return this.parseJson(reply);
   }
   async call(moduleId, method, params, opts = {}) {
     const body = params === undefined ? { method } : { method, params };
+    let retriedUnknownChannel = false;
     for (;; ) {
       const routeChannel = await this.cachedRouteChannel(moduleId, opts);
       try {
@@ -4673,6 +4680,11 @@ class SubcClient {
       } catch (err) {
         if (!(err instanceof SubcCallError))
           throw this.terminalCallError("managed call failed", err);
+        if (err.code === "unknown_channel" && !retriedUnknownChannel && !this.closeStarted) {
+          retriedUnknownChannel = true;
+          this.evictRouteChannel(routeChannel);
+          continue;
+        }
         if (err.kind === "not_sent") {
           try {
             await this.reconnectAfterDrop(err);
@@ -4690,7 +4702,7 @@ class SubcClient {
   }
   subscribe(routeChannel, body, onEvent, opts = {}) {
     const bytes = body instanceof Uint8Array ? body : this.encode(body);
-    const priority = opts.priority ?? 1 /* Interactive */;
+    const priority = opts.priority ?? Priority.Interactive;
     const corr = this.nextCorr++;
     const key = `${routeChannel}:${corr}`;
     const closed = new Promise((resolve7, reject) => {
@@ -4706,7 +4718,7 @@ class SubcClient {
         timer: null,
         subscription: true
       });
-      const frame = buildFrame(0 /* Request */, buildFlags(false, priority, false), routeChannel, corr, bytes);
+      const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false), routeChannel, corr, bytes);
       this.sock.write(encodeFrame(frame), Date.now() + DEFAULT_REQUEST_TIMEOUT_MS).catch((err) => {
         const p = this.pending.get(key);
         if (p)
@@ -4718,7 +4730,7 @@ class SubcClient {
       if (cancelled)
         return;
       cancelled = true;
-      const cancel = buildFrame(6 /* Cancel */, buildFlags(false, priority, false), routeChannel, corr, EMPTY_BODY);
+      const cancel = buildFrame(FrameType.Cancel, buildFlags(false, priority, false), routeChannel, corr, EMPTY_BODY);
       this.sock.write(encodeFrame(cancel), Date.now() + DEFAULT_REQUEST_TIMEOUT_MS).catch(() => {});
     };
     return { unsubscribe, closed };
@@ -4769,7 +4781,7 @@ class SubcClient {
   sendRouteGoodbye(channel) {
     if (this.closedErr)
       return;
-    const goodbye = buildFrame(11 /* Goodbye */, buildFlags(false, 1 /* Interactive */, false), channel, 0n, EMPTY_BODY);
+    const goodbye = buildFrame(FrameType.Goodbye, buildFlags(false, Priority.Interactive, false), channel, 0n, EMPTY_BODY);
     this.sock.write(encodeFrame(goodbye), Date.now() + DEFAULT_REQUEST_TIMEOUT_MS).catch(() => {});
   }
   static async openConnection(opts) {
@@ -4786,14 +4798,14 @@ class SubcClient {
     return { sock, conn };
   }
   async controlRpc(body) {
-    return this.send(0, body, 1 /* Interactive */, undefined, undefined);
+    return this.send(0, body, Priority.Interactive, undefined, undefined);
   }
   send(channel, body, priority, timeoutMs, onProgress) {
     if (this.closedErr)
       return Promise.reject(this.closedErr);
     const corr = this.nextCorr++;
     const key = `${channel}:${corr}`;
-    const frame = buildFrame(0 /* Request */, buildFlags(false, priority, false), channel, corr, body);
+    const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false), channel, corr, body);
     return new Promise((resolve7, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
@@ -4833,7 +4845,7 @@ class SubcClient {
   }
   async managedRequest(routeChannel, body, opts) {
     const bytes = body instanceof Uint8Array ? body : this.encode(body);
-    const priority = opts.priority ?? 1 /* Interactive */;
+    const priority = opts.priority ?? Priority.Interactive;
     try {
       const reply = await this.sendManaged(routeChannel, bytes, priority, opts.timeoutMs, opts.onProgress);
       return this.parseJson(reply);
@@ -4849,7 +4861,7 @@ class SubcClient {
     }
     const corr = this.nextCorr++;
     const key = `${channel}:${corr}`;
-    const frame = buildFrame(0 /* Request */, buildFlags(false, priority, false), channel, corr, body);
+    const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false), channel, corr, body);
     let handedToSocket = false;
     const classifyFailure = (err) => {
       if (!handedToSocket) {
@@ -5008,6 +5020,9 @@ class SubcClient {
         return;
       } catch (err) {
         if (!isConsumerReconnectTransient(err) || attempt >= this.opts.reconnectBackoff.maxAttempts) {
+          if (err instanceof AuthError && attempt > 1) {
+            throw new AuthError(`reconnect gave up after ${attempt} attempts: ${err.message} — the connection file and the daemon's key disagree persistently ` + `(daemon restarting in a loop, split connection-file paths, or a genuinely foreign daemon on this port); ` + `check the daemon, then restart this host app`);
+          }
           throw err;
         }
         await this.opts.sleep(delay);
@@ -5076,26 +5091,27 @@ class SubcClient {
     const pending = this.pending.get(key);
     if (pending) {
       switch (frame.header.ty) {
-        case 2 /* Push */:
-        case 3 /* StreamData */:
+        case FrameType.Push:
+        case FrameType.StreamData:
           pending.onProgress?.(frame.body);
           return;
-        case 1 /* Response */:
-        case 4 /* StreamEnd */:
+        case FrameType.Response:
+        case FrameType.StreamEnd:
           this.settle(key, pending, () => pending.resolve(frame));
           return;
-        case 5 /* Error */:
+        case FrameType.Error:
           this.settle(key, pending, () => pending.reject(this.errorFromFrame(frame)));
           return;
         default:
           return;
       }
     }
-    if (frame.header.ty === 11 /* Goodbye */) {
+    if (frame.header.ty === FrameType.Goodbye) {
       this.failChannel(frame.header.channel, new SubcError("route closed by subc (GOODBYE)"));
+      this.evictRouteChannel(frame.header.channel);
       return;
     }
-    if (frame.header.ty === 1 /* Response */ || frame.header.ty === 5 /* Error */ || frame.header.ty === 4 /* StreamEnd */) {
+    if (frame.header.ty === FrameType.Response || frame.header.ty === FrameType.Error || frame.header.ty === FrameType.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;
     }
@@ -5121,6 +5137,13 @@ class SubcClient {
       return new SubcError(Buffer.from(frame.body).toString("utf8") || "subc error");
     }
   }
+  evictRouteChannel(channel) {
+    for (const cached of this.routes.values()) {
+      if (cached.channel === channel && cached.generation === this.generation) {
+        cached.channel = null;
+      }
+    }
+  }
   failChannel(channel, err) {
     for (const [key, pending] of this.pending) {
       if (pending.channel === channel) {
@@ -5167,7 +5190,9 @@ function isConsumerReconnectTransient(err) {
     return true;
   if (err instanceof SubcCallError)
     return err.kind === "not_sent" || err.kind === "outcome_unknown";
-  if (err instanceof SubcError || err instanceof ConnectionFileError || err instanceof AuthError)
+  if (err instanceof AuthError)
+    return true;
+  if (err instanceof SubcError || err instanceof ConnectionFileError)
     return false;
   const code = errorCode(err);
   return code === "ECONNREFUSED" || code === "ECONNRESET" || code === "EPIPE" || code === "ETIMEDOUT" || code === "ENOENT";
@@ -5220,7 +5245,7 @@ function causeMessage(cause) {
     return "";
   return `: ${cause instanceof Error ? cause.message : String(cause)}`;
 }
-var debug, DEFAULT_HANDSHAKE_TIMEOUT_MS = 1e4, DEFAULT_REQUEST_TIMEOUT_MS = 30000, TIMEOUT_ARBITRATION_GRACE_MS = 50, REQUEST_DEADLINE_MARKER = "request_deadline", DEADLINE_NO_DROP_CODE = "deadline_exceeded_no_drop_observed", ROUTE_OPEN_RETRY_DEADLINE_MS = 1e4, BODY_READ_TIMEOUT_MS = 30000, EMPTY_BODY, DEFAULT_MANAGED_TARGET_KIND = "management_surface", SUBC_MODULE_ID_ENV = "SUBC_MODULE_ID", SUBC_LAUNCH_NONCE_ENV = "SUBC_LAUNCH_NONCE", DEFAULT_RECONNECT_BACKOFF, SubcCallError, SubcError;
+var debug, DEFAULT_HANDSHAKE_TIMEOUT_MS = 1e4, DEFAULT_REQUEST_TIMEOUT_MS = 30000, TIMEOUT_ARBITRATION_GRACE_MS = 50, REQUEST_DEADLINE_MARKER = "request_deadline", DEADLINE_NO_DROP_CODE = "deadline_exceeded_no_drop_observed", ROUTE_OPEN_RETRY_DEADLINE_MS = 30000, BODY_READ_TIMEOUT_MS = 30000, EMPTY_BODY, DEFAULT_MANAGED_TARGET_KIND = "management_surface", SUBC_MODULE_ID_ENV = "SUBC_MODULE_ID", SUBC_LAUNCH_NONCE_ENV = "SUBC_LAUNCH_NONCE", DEFAULT_RECONNECT_BACKOFF, SubcCallError, SubcError;
 var init_client = __esm(() => {
   init_auth();
   init_connection_file();
@@ -5254,9 +5279,44 @@ var init_client = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/provider.ts
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/provider.js
 import { Buffer as Buffer2 } from "node:buffer";
 
+class AsyncPermitPool {
+  available;
+  waiters = [];
+  constructor(capacity) {
+    if (!Number.isInteger(capacity) || capacity <= 0) {
+      throw new SubcProviderError("provider handler capacity must be a positive integer", "invalid_handler_capacity");
+    }
+    this.available = capacity;
+  }
+  async acquire() {
+    if (this.available > 0) {
+      this.available -= 1;
+      return this.releaseOnce();
+    }
+    await new Promise((resolve7) => {
+      this.waiters.push(resolve7);
+    });
+    return this.releaseOnce();
+  }
+  releaseOnce() {
+    let released = false;
+    return () => {
+      if (released)
+        return;
+      released = true;
+      const next = this.waiters.shift();
+      if (next) {
+        next();
+      } else {
+        this.available += 1;
+      }
+    };
+  }
+}
+
 class SubcProvider {
   sock;
   currentConn;
@@ -5268,6 +5328,7 @@ class SubcProvider {
   closeStarted = false;
   closedErr = null;
   inflight = new Map;
+  requestGate = new AsyncPermitPool(DEFAULT_PROVIDER_HANDLER_CAPACITY);
   reconnecting = null;
   generation = 1;
   connectionEpoch = 1;
@@ -5306,7 +5367,7 @@ class SubcProvider {
       this.cancelRestoredDebounce();
       const sock = this.sock;
       try {
-        await sendFrame(sock, buildFrame(11 /* Goodbye */, controlFlags(), 0, 0n, new Uint8Array(0)));
+        await sendFrame(sock, buildFrame(FrameType.Goodbye, controlFlags(), 0, 0n, new Uint8Array(0)));
       } catch {} finally {
         sock.close();
         this.finishClosed();
@@ -5357,21 +5418,21 @@ class SubcProvider {
   }
   async dispatch(frame, sock, generation) {
     switch (frame.header.ty) {
-      case 7 /* Ping */:
+      case FrameType.Ping:
         if (frame.header.channel === 0) {
-          await this.sendOn(sock, generation, buildFrameWithVersion(frame.header.ver, 8 /* Pong */, frame.header.flags, 0, frame.header.corr, new Uint8Array(0)));
+          await this.sendOn(sock, generation, buildFrameWithVersion(frame.header.ver, FrameType.Pong, frame.header.flags, 0, frame.header.corr, new Uint8Array(0)));
         }
         return true;
-      case 11 /* Goodbye */:
+      case FrameType.Goodbye:
         if (frame.header.channel === 0)
           return false;
         this.abortChannel(generation, frame.header.channel);
         await this.opts.onRouteGone?.(frame.header.channel);
         return true;
-      case 6 /* Cancel */:
+      case FrameType.Cancel:
         this.inflight.get(routeKey(generation, frame.header.channel, frame.header.corr))?.abort();
         return true;
-      case 0 /* Request */:
+      case FrameType.Request:
         if (frame.header.channel === 0) {
           await this.handleControlRequest(frame, sock, generation);
         } else {
@@ -5406,6 +5467,14 @@ class SubcProvider {
   }
   async handleControlRequest(frame, sock, generation) {
     const request = parseJson(frame.body);
+    if (request.op === HEALTH_CHECK_OP) {
+      this.handleHealthRequest(frame, sock, generation).catch((err) => {
+        if (!this.closeStarted && this.sock === sock && this.generation === generation) {
+          console.warn("SubcProvider health handler failed after its request was dispatched", err);
+        }
+      });
+      return;
+    }
     if (request.op !== "route.bind") {
       throw new SubcProviderError(`unsupported module control request ${request.op ?? "<missing op>"}`);
     }
@@ -5421,41 +5490,67 @@ class SubcProvider {
       await this.sendError(frame, rejection.code, rejection.message, controlFlags(), sock, generation);
       return;
     }
-    await this.sendOn(sock, generation, buildFrameWithVersion(frame.header.ver, 1 /* Response */, controlFlags(), 0, frame.header.corr, encodeJson({ op: "route.bind" })));
+    await this.sendOn(sock, generation, buildFrameWithVersion(frame.header.ver, FrameType.Response, controlFlags(), 0, frame.header.corr, encodeJson({ op: "route.bind" })));
   }
   async handleDataRequest(frame, sock, generation) {
     const { channel, corr, ver } = frame.header;
     const key = routeKey(generation, channel, corr);
     const controller = new AbortController;
     this.inflight.set(key, controller);
-    const dataFlags = buildFlags(false, 1 /* Interactive */, false);
+    const dataFlags = buildFlags(false, Priority.Interactive, false);
     const ctx = {
       signal: controller.signal,
       currentEpoch: () => this.connectionEpoch,
       emit: async (eventBody) => {
         if (controller.signal.aborted)
           return;
-        await this.sendOn(sock, generation, buildFrameWithVersion(ver, 3 /* StreamData */, dataFlags, channel, corr, eventBody));
+        await this.sendOn(sock, generation, buildFrameWithVersion(ver, FrameType.StreamData, dataFlags, channel, corr, eventBody));
       }
     };
+    const releasePermit = await (this.requestGate ?? new AsyncPermitPool(DEFAULT_PROVIDER_HANDLER_CAPACITY)).acquire();
     try {
       const body = await this.opts.handler(channel, frame.body, ctx);
       if (body === undefined) {
-        await this.sendOn(sock, generation, buildFrameWithVersion(ver, 4 /* StreamEnd */, dataFlags, channel, corr, new Uint8Array(0)));
+        await this.sendOn(sock, generation, buildFrameWithVersion(ver, FrameType.StreamEnd, dataFlags, channel, corr, new Uint8Array(0)));
       } else if (body instanceof Uint8Array) {
-        await this.sendOn(sock, generation, buildFrameWithVersion(ver, 1 /* Response */, dataFlags, channel, corr, body));
+        await this.sendOn(sock, generation, buildFrameWithVersion(ver, FrameType.Response, dataFlags, channel, corr, body));
       } else {
         throw new SubcProviderError("provider handler must return a Uint8Array or void", "invalid_handler_response");
       }
     } catch (err) {
       await this.sendError(frame, err instanceof SubcProviderError && err.code ? err.code : "handler_error", err instanceof Error ? err.message : String(err), dataFlags, sock, generation);
     } finally {
+      releasePermit();
+      if (this.inflight.get(key) === controller)
+        this.inflight.delete(key);
+    }
+  }
+  async handleHealthRequest(frame, sock, generation) {
+    const { channel, corr, ver } = frame.header;
+    const key = routeKey(generation, channel, corr);
+    const controller = new AbortController;
+    this.inflight.set(key, controller);
+    const releasePermit = await (this.requestGate ?? new AsyncPermitPool(DEFAULT_PROVIDER_HANDLER_CAPACITY)).acquire();
+    try {
+      if (controller.signal.aborted)
+        return;
+      const report = await this.opts.health();
+      await this.sendOn(sock, generation, buildFrameWithVersion(ver, FrameType.Response, controlFlags(), channel, corr, encodeJson({
+        op: HEALTH_CHECK_OP,
+        status: report.status,
+        ...report.detail === undefined ? {} : { detail: report.detail },
+        ...report.metrics === undefined ? {} : { metrics: report.metrics }
+      })));
+    } catch (err) {
+      await this.sendError(frame, err instanceof SubcProviderError && err.code ? err.code : "health_error", err instanceof Error ? err.message : String(err), controlFlags(), sock, generation);
+    } finally {
+      releasePermit();
       if (this.inflight.get(key) === controller)
         this.inflight.delete(key);
     }
   }
   async sendError(frame, code, message, flags, sock, generation) {
-    await this.sendOn(sock, generation, buildFrameWithVersion(frame.header.ver, 5 /* Error */, flags, frame.header.channel, frame.header.corr, encodeJson({ code, message })));
+    await this.sendOn(sock, generation, buildFrameWithVersion(frame.header.ver, FrameType.Error, flags, frame.header.channel, frame.header.corr, encodeJson({ code, message })));
   }
   async sendOn(sock, generation, frame) {
     if (this.sock !== sock || this.generation !== generation || this.closeStarted || this.closedErr)
@@ -5594,6 +5689,7 @@ function normalizeProviderConnectOptions(opts) {
     connectionFile: opts.connectionFile,
     manifest: opts.manifest,
     handler: opts.handler,
+    health: opts.health ?? (() => ({ status: "ok" })),
     handshakeTimeoutMs: opts.handshakeTimeoutMs,
     controlOps: opts.controlOps,
     onBind: opts.onBind,
@@ -5605,12 +5701,19 @@ function normalizeProviderConnectOptions(opts) {
     launchNonce: opts.launchNonce
   };
 }
+function normalizedControlOps(controlOps) {
+  if (controlOps === null)
+    return null;
+  const merged = new Set(controlOps ?? []);
+  merged.add(HEALTH_CHECK_OP);
+  return [...merged];
+}
 function buildHelloFrame(opts) {
   const nonce = launchNonce(opts);
-  return buildFrame(9 /* Hello */, controlFlags(), 0, HELLO_CORR, encodeJson({
+  return buildFrame(FrameType.Hello, controlFlags(), 0, HELLO_CORR, encodeJson({
     manifest: normalizeManifest(opts.manifest),
     protocol_ver: PROTOCOL_VERSION,
-    control_ops: opts.controlOps === undefined ? null : opts.controlOps,
+    control_ops: normalizedControlOps(opts.controlOps),
     ...nonce ? { launch_nonce: nonce } : {}
   }));
 }
@@ -5621,7 +5724,9 @@ function isProviderReconnectTransient(err) {
     return true;
   if (err instanceof SocketWriteNotQueuedError || err instanceof SocketWriteQueuedError)
     return true;
-  if (err instanceof ConnectionFileError || err instanceof AuthError)
+  if (err instanceof AuthError)
+    return true;
+  if (err instanceof ConnectionFileError)
     return false;
   const code = errorCode2(err);
   return code === "ECONNREFUSED" || code === "ECONNRESET" || code === "EPIPE" || code === "ETIMEDOUT" || code === "ENOENT";
@@ -5638,7 +5743,7 @@ async function pauseBeforeStateRetry() {
   await new Promise((resolve7) => setTimeout(resolve7, 0));
 }
 function controlFlags() {
-  return buildFlags(false, 0 /* Passive */, false);
+  return buildFlags(false, Priority.Passive, false);
 }
 async function sendFrame(sock, frame) {
   await sock.write(encodeFrame(frame), Date.now() + WRITE_TIMEOUT_MS);
@@ -5648,9 +5753,9 @@ async function expectHelloAck(sock, deadline) {
   const body = header.len === 0 ? new Uint8Array(0) : await sock.readExact(header.len, deadline);
   const frame = { header, body };
   switch (header.ty) {
-    case 10 /* HelloAck */:
+    case FrameType.HelloAck:
       return parseJson(body);
-    case 5 /* Error */: {
+    case FrameType.Error: {
       const error2 = parseJson(body);
       throw new SubcProviderError(`subc rejected HELLO: ${error2.code ?? "unknown"} — ${error2.message ?? "subc error"}`, error2.code);
     }
@@ -5716,6 +5821,7 @@ function normalizeProviderRole(role) {
         role: "tool_provider",
         tools: role.tools.map((tool) => ({
           name: tool.name,
+          ...tool.description === undefined ? {} : { description: tool.description },
           execution_mode: tool.execution_mode,
           schema: tool.schema
         })),
@@ -5791,7 +5897,7 @@ function normalizeScheduledTask(task) {
     }
   };
 }
-var DEFAULT_HANDSHAKE_TIMEOUT_MS2 = 1e4, BODY_READ_TIMEOUT_MS2 = 30000, WRITE_TIMEOUT_MS = 30000, DEFAULT_RESTORED_DEBOUNCE_MS = 250, HELLO_CORR = 1n, SubcProviderError, SUBC_LAUNCH_NONCE_ENV2 = "SUBC_LAUNCH_NONCE";
+var DEFAULT_HANDSHAKE_TIMEOUT_MS2 = 1e4, BODY_READ_TIMEOUT_MS2 = 30000, WRITE_TIMEOUT_MS = 30000, DEFAULT_RESTORED_DEBOUNCE_MS = 250, DEFAULT_PROVIDER_HANDLER_CAPACITY = 64, HEALTH_CHECK_OP = "health.check", HELLO_CORR = 1n, SubcProviderError, SUBC_LAUNCH_NONCE_ENV2 = "SUBC_LAUNCH_NONCE";
 var init_provider = __esm(() => {
   init_auth();
   init_client();
@@ -5807,8 +5913,8 @@ var init_provider = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.3.0/node_modules/@cortexkit/subc-client/src/index.ts
-var init_src = __esm(() => {
+// ../../node_modules/.bun/@cortexkit+subc-client@0.3.4/node_modules/@cortexkit/subc-client/dist/index.js
+var init_dist = __esm(() => {
   init_client();
   init_connection_file();
   init_envelope();
@@ -5911,6 +6017,9 @@ class BgSubscription {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isUnknownChannelError(err) {
+  return err instanceof SubcError && err.code === "unknown_channel";
+}
 function safeCloseRoute(client, channel) {
   try {
     client.closeRouteChannel(channel).catch(() => {
@@ -5987,7 +6096,7 @@ class SubcTransport {
     if (!options)
       return {};
     const preview = options.preview;
-    const timeoutMs = options.timeoutMs;
+    const timeoutMs = options.transportTimeoutMs ?? options.timeoutMs;
     const onProgress = options.onProgress;
     return { preview, timeoutMs, onProgress };
   }
@@ -6057,45 +6166,66 @@ class SubcTransportPool {
     record.inflight += 1;
     try {
       const client = await this.ensureClient();
-      if (!this.isCurrentSession(key, record)) {
-        throw new RouteTornDownError("subc session closed");
-      }
-      let channel;
-      let entry;
-      try {
-        ({ channel, entry } = await this.routeChannel(client, identity, record));
+      const openRoute = async () => {
         if (!this.isCurrentSession(key, record)) {
           throw new RouteTornDownError("subc session closed");
         }
-      } catch (err) {
-        if (err instanceof RouteTornDownError)
+        try {
+          const opened = await this.routeChannel(client, identity, record);
+          if (!this.isCurrentSession(key, record)) {
+            throw new RouteTornDownError("subc session closed");
+          }
+          return opened;
+        } catch (err) {
+          if (err instanceof RouteTornDownError)
+            throw err;
+          if (isConsumerReconnectTransient(err) && this.isCurrentSession(key, record) && this.client === client) {
+            this.dropClient(client);
+          }
           throw err;
-        if (isConsumerReconnectTransient(err) && this.isCurrentSession(key, record) && this.client === client) {
-          this.dropClient(client);
-        }
-        throw err;
-      }
-      try {
-        const reply = await client.request(channel, body, { timeoutMs, onProgress });
-        if (this.isCurrentSession(key, record) && this.client === client) {
-          this.transportFailures = 0;
         }
-        this.ensureBgSubscription(identity, record);
-        return reply;
-      } catch (err) {
-        if (record.routeEntry === entry) {
-          entry.closed = true;
+      };
+      const clearRouteEntry = (entry2) => {
+        if (record.routeEntry === entry2) {
+          entry2.closed = true;
           record.routeEntry = null;
         }
+      };
+      const handleRequestFailure = (err, entry2) => {
+        clearRouteEntry(entry2);
         if (this.isCurrentSession(key, record) && this.client === client) {
           if (isConsumerReconnectTransient(err)) {
             this.transportFailures = 0;
             this.dropClient(client);
-          } else if (++this.transportFailures >= MAX_CONSECUTIVE_TRANSPORT_FAILURES) {
+          } else if (!isUnknownChannelError(err) && ++this.transportFailures >= MAX_CONSECUTIVE_TRANSPORT_FAILURES) {
             this.transportFailures = 0;
             this.dropClient(client);
           }
         }
+      };
+      const requestOnRoute = async (channel2) => {
+        const reply = await client.request(channel2, body, { timeoutMs, onProgress });
+        if (this.isCurrentSession(key, record) && this.client === client) {
+          this.transportFailures = 0;
+        }
+        this.ensureBgSubscription(identity, record);
+        return reply;
+      };
+      let { channel, entry } = await openRoute();
+      try {
+        return await requestOnRoute(channel);
+      } catch (err) {
+        if (isUnknownChannelError(err) && this.isCurrentSession(key, record) && this.client === client) {
+          clearRouteEntry(entry);
+          ({ channel, entry } = await openRoute());
+          try {
+            return await requestOnRoute(channel);
+          } catch (retryErr) {
+            handleRequestFailure(retryErr, entry);
+            throw retryErr;
+          }
+        }
+        handleRequestFailure(err, entry);
         throw err;
       }
     } finally {
@@ -6261,7 +6391,7 @@ class SubcTransportPool {
 }
 var AFT_MODULE_ID = "aft", MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3, BG_STABLE_MS = 5000, DEFAULT_SESSION_ID = "__default__", LOCALLY_SATISFIED_COMMANDS, RouteTornDownError;
 var init_subc_transport = __esm(() => {
-  init_src();
+  init_dist();
   init_project_identity();
   LOCALLY_SATISFIED_COMMANDS = new Set(["configure"]);
   RouteTornDownError = class RouteTornDownError extends Error {
@@ -6581,7 +6711,7 @@ __export(exports_dist, {
   BridgePool: () => BridgePool,
   BinaryBridge: () => BinaryBridge
 });
-var init_dist = __esm(() => {
+var init_dist2 = __esm(() => {
   init_active_logger();
   init_bash_hints();
   init_bridge();
@@ -6672,7 +6802,7 @@ import { homedir as homedir12 } from "node:os";
 import { join as join11 } from "node:path";
 async function loadPluginVersion() {
   try {
-    const bridge = await Promise.resolve().then(() => (init_dist(), exports_dist));
+    const bridge = await Promise.resolve().then(() => (init_dist2(), exports_dist));
     if (typeof bridge.PLUGIN_VERSION === "string" && bridge.PLUGIN_VERSION.length > 0) {
       return bridge.PLUGIN_VERSION;
     }
@@ -6822,7 +6952,7 @@ function findAftBinary(preferredVersion) {
 }
 var PLUGIN_VERSION, VERSION_LINE;
 var init_binary_probe = __esm(async () => {
-  init_dist();
+  init_dist2();
   init_paths2();
   PLUGIN_VERSION = await loadPluginVersion();
   VERSION_LINE = /^(?:aft\s+)?v?(\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?)$/i;
@@ -15020,7 +15150,7 @@ class OpenCodeAdapter {
 }
 var PLUGIN_NAME = "@cortexkit/aft-opencode", PLUGIN_ENTRY;
 var init_opencode = __esm(() => {
-  init_dist();
+  init_dist2();
   init_fs_util();
   init_jsonc();
   init_paths2();
@@ -15246,7 +15376,7 @@ class PiAdapter {
 }
 var PLUGIN_NAME2 = "@cortexkit/aft-pi", PLUGIN_ENTRY2;
 var init_pi = __esm(() => {
-  init_dist();
+  init_dist2();
   init_fs_util();
   init_jsonc();
   init_paths2();
@@ -15382,7 +15512,7 @@ var ANSI_RE, CONTROL_RE, CJKT_WIDE_RE, TAB_RE, EMOJI_RE, LATIN_RE, MODIFIER_RE,
     ellipsed: truncationEnabled && LIMIT >= ELLIPSIS_WIDTH
   };
 }, dist_default;
-var init_dist2 = __esm(() => {
+var init_dist3 = __esm(() => {
   init_utils();
   ANSI_RE = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]|\u001b\]8;[^;]*;.*?(?:\u0007|\u001b\u005c)/y;
   CONTROL_RE = /[\x00-\x08\x0A-\x1F\x7F-\x9F]{1,1000}/y;
@@ -15399,8 +15529,8 @@ var init_dist2 = __esm(() => {
 var NO_TRUNCATION2, fastStringWidth = (input, options = {}) => {
   return dist_default(input, NO_TRUNCATION2, options).width;
 }, dist_default2;
-var init_dist3 = __esm(() => {
-  init_dist2();
+var init_dist4 = __esm(() => {
+  init_dist3();
   NO_TRUNCATION2 = {
     limit: Infinity,
     ellipsis: "",
@@ -15606,7 +15736,7 @@ var ESC = "\x1B", CSI = "›", END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI
   return returnValue;
 }, CRLF_OR_LF;
 var init_main = __esm(() => {
-  init_dist3();
+  init_dist4();
   ANSI_ESCAPE_LINK = `${ANSI_OSC}8;;`;
   GROUP_REGEX = new RegExp(`(?:\\${ANSI_CSI}(?<code>\\d+)m|\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`, "y");
   CRLF_OR_LF = /\r?\n/;
@@ -15961,7 +16091,7 @@ function T2(r2, t2, i, s) {
   };
 }
 var import_sisteransi, a$2, t, settings, R, CANCEL_SYMBOL, getColumns = (e) => ("columns" in e) && typeof e.columns == "number" ? e.columns : 80, getRows = (e) => ("rows" in e) && typeof e.rows == "number" ? e.rows : 20, T$1, r, _, U, u$1, o$1, h, a$1, a2, n;
-var init_dist4 = __esm(() => {
+var init_dist5 = __esm(() => {
   init_main();
   import_sisteransi = __toESM(require_src3(), 1);
   a$2 = ["up", "down", "left", "right", "space", "enter", "cancel"];
@@ -16813,11 +16943,11 @@ ${r2}
     }
   }
 }).prompt();
-var init_dist5 = __esm(() => {
-  init_dist4();
-  init_dist4();
+var init_dist6 = __esm(() => {
+  init_dist5();
+  init_dist5();
   init_main();
-  init_dist3();
+  init_dist4();
   import_sisteransi2 = __toESM(require_src3(), 1);
   unicode = isUnicodeSupported();
   S_STEP_ACTIVE = unicodeOr("◆", "*");
@@ -16954,7 +17084,7 @@ async function text2(message, options = {}) {
   return result;
 }
 var init_prompts = __esm(() => {
-  init_dist5();
+  init_dist6();
 });
 
 // src/lib/harness-select.ts
@@ -17475,7 +17605,7 @@ function installHint(binaryName) {
 }
 var PROJECT_ROOT_MARKERS;
 var init_lsp = __esm(async () => {
-  init_dist();
+  init_dist2();
   init_aft_bridge();
   init_harness_select();
   init_paths2();
@@ -18585,7 +18715,7 @@ function tailLogFile(path2, lines) {
   }
 }
 var init_diagnostics = __esm(async () => {
-  init_dist();
+  init_dist2();
   init_binary_cache();
   init_jsonc();
   init_lsp_cache();
@@ -19468,7 +19598,7 @@ async function runFixFlow(argv) {
     } else {
       log2.info("AFT binary not found. Downloading…");
       try {
-        const { ensureBinary: ensureBinary2 } = await Promise.resolve().then(() => (init_dist(), exports_dist));
+        const { ensureBinary: ensureBinary2 } = await Promise.resolve().then(() => (init_dist2(), exports_dist));
         const path2 = await ensureBinary2(`v${report.cliVersion}`);
         if (path2) {
           log2.success(`AFT binary installed at ${path2}`);
@@ -19826,7 +19956,7 @@ https://github.com/cortexkit/aft/issues/new and paste the contents of ${outPath}
 }
 var DOCTOR_CLEAR_TARGET_OPTIONS, DOCTOR_FORCE_CLEAR_TARGETS;
 var init_doctor = __esm(async () => {
-  init_dist();
+  init_dist2();
   init_binary_cache();
   init_bridge_tool_failures();
   init_fs_util();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft",
-  "version": "0.45.1",
+  "version": "0.46.0",
   "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.45.1",
+    "@cortexkit/aft-bridge": "0.46.0",
     "comment-json": "^4.6.2"
   },
   "devDependencies": {