@cortexkit/aft-opencode 0.43.1 → 0.45.0

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

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/tools/ast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiDjD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0H3E"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/tools/ast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAkDjD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0H3E"}

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

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAuCjD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,GACpB,MAAM,CAaR;AA6ED,wBAAgB,cAAc,CAC5B,GAAG,EAAE,aAAa,EAClB,2BAA2B,CAAC,EAAE,OAAO,GACpC,cAAc,CAwMhB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA2BvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwBrE"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAuCjD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,GACpB,MAAM,CAaR;AA6ED,wBAAgB,cAAc,CAC5B,GAAG,EAAE,aAAa,EAClB,2BAA2B,CAAC,EAAE,OAAO,GACpC,cAAc,CA2NhB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA2BvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwBrE"}

package/dist/tui/badge-contrast.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Pick the text color for a sidebar badge label drawn on a theme accent.
+ * Keep this logic in sync with Magic Context so both sidebars make the same
+ * contrast decision for shared themes.
+ */
+type Color = {
+    r: number;
+    g: number;
+    b: number;
+    a?: number;
+};
+export declare function readableTextColorOn(bg: Color): string;
+export declare function badgeTextColor<T extends Color>(accent: T, background: T): T | string;
+export {};
+//# sourceMappingURL=badge-contrast.d.ts.map

package/dist/tui/badge-contrast.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"badge-contrast.d.ts","sourceRoot":"","sources":["../../src/tui/badge-contrast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,KAAK,KAAK,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA0B7D,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,KAAK,GAAG,MAAM,CAErD;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAMpF"}

package/dist/tui.js

@@ -7790,10 +7790,10 @@ var require_src2 = __commonJS((exports, module) => {
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var version = "0.43.1";
+var version = "0.45.0";
 
 // src/shared/rpc-client.ts
-import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync as readFileSync2, unlinkSync } from "node:fs";
 import { join as join3 } from "node:path";
 
 // src/shared/rpc-utils.ts
@@ -7856,6 +7856,8 @@ function error(message, meta) {
 }
 // ../aft-bridge/dist/bridge.js
 import { spawn } from "node:child_process";
+import { createHash } from "node:crypto";
+import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { StringDecoder } from "node:string_decoder";
@@ -7912,6 +7914,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}`;
 }
@@ -8003,6 +8021,9 @@ class BinaryBridge {
   binaryPath;
   cwd;
   process = null;
+  spawnedBinaryFingerprint = null;
+  lastBinaryFingerprintCheckAt = 0;
+  _retiringDueToBinaryChange = false;
   pending = new Map;
   outstandingBackgroundTaskIds = new Set;
   nextId = 1;
@@ -8122,6 +8143,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;
   }
@@ -8154,6 +8193,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}"`);
       }
@@ -8352,6 +8394,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`));
@@ -8405,6 +8448,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)
@@ -8430,6 +8476,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})`);
@@ -8520,6 +8567,8 @@ class BinaryBridge {
       this.handleCrash();
     });
     this.process = child;
+    this.spawnedBinaryFingerprint = readBinaryFingerprint(this.binaryPath);
+    this.lastBinaryFingerprintCheckAt = Date.now();
     this.stdoutBuffer = "";
     this.stdoutReadOffset = 0;
     this.stderrBuffer = "";
@@ -8698,6 +8747,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) {
@@ -8724,6 +8774,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");
     }
@@ -8735,6 +8786,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++;
@@ -8819,7 +8874,7 @@ var ORT_PLATFORM_MAP = {
   }
 };
 // ../aft-bridge/dist/project-identity.js
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 import { realpathSync } from "node:fs";
 import { resolve } from "node:path";
 function canonicalizeProjectRoot(dir) {
@@ -8850,7 +8905,7 @@ function normalizeWindowsRoot(p) {
   return s;
 }
 function projectRootKeyHash(dir) {
-  return createHash("sha256").update(canonicalizeProjectRoot(dir)).digest("hex").slice(0, 16);
+  return createHash2("sha256").update(canonicalizeProjectRoot(dir)).digest("hex").slice(0, 16);
 }
 
 // ../aft-bridge/dist/pool.js
@@ -8934,6 +8989,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);
@@ -9030,10 +9090,11 @@ class BridgePool {
 function normalizeKey(projectRoot) {
   return canonicalizeProjectRoot(projectRoot);
 }
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.0/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.0/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;
@@ -9097,7 +9158,7 @@ async function authenticateClient(sock, conn, deadlineMs) {
   await writeMessage(sock, { client_auth: Array.from(clientAuth) }, deadlineMs);
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.0/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;
@@ -9166,7 +9227,7 @@ async function readConnectionFile(path) {
   return info;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.0/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;
@@ -9273,7 +9334,7 @@ function encodeFrame(frame) {
   return out;
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.0/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 {
@@ -9304,6 +9365,9 @@ class SubcSocket {
   buffered = 0;
   waiter = null;
   closedErr = null;
+  bufferedBytes() {
+    return this.buffered;
+  }
   constructor(sock) {
     this.sock = sock;
     sock.on("data", (chunk) => {
@@ -9320,6 +9384,9 @@ class SubcSocket {
     sock.on("end", () => fail(new SocketClosedError("subc closed the connection")));
     sock.on("close", () => fail(new SocketClosedError("subc connection closed")));
   }
+  localPort() {
+    return this.sock.localPort ?? null;
+  }
   static connect(host, port, deadlineMs) {
     return new Promise((resolve2, reject) => {
       const sock = net.connect({ host, port });
@@ -9459,9 +9526,14 @@ class SubcSocket {
   }
 }
 
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.0/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";
@@ -9505,6 +9577,7 @@ class SubcClient {
   closeStarted = false;
   reconnecting = null;
   generation = 1;
+  readerActive = false;
   constructor(sock, currentConn, opts) {
     this.sock = sock;
     this.currentConn = currentConn;
@@ -9563,7 +9636,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;
@@ -9686,7 +9759,7 @@ class SubcClient {
         timer: null
       };
       pending.timer = setTimeout(() => {
-        this.rejectPending(key, pending, new SubcError(`request on channel ${channel} timed out after ${ms}ms`));
+        this.arbitrateTimeout(key, pending, channel, corr, ms);
       }, ms);
       this.pending.set(key, pending);
       this.sock.write(encodeFrame(frame), Date.now() + ms).catch((err) => {
@@ -9696,6 +9769,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 */;
@@ -9720,6 +9810,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((resolve2, reject) => {
@@ -9733,7 +9826,7 @@ class SubcClient {
         classifyFailure
       };
       pending.timer = setTimeout(() => {
-        this.rejectPending(key, pending, new SubcError(`request on channel ${channel} timed out after ${ms}ms`));
+        this.arbitrateTimeout(key, pending, channel, corr, ms);
       }, ms);
       this.pending.set(key, pending);
       const write = this.sock.writeTracked(encodeFrame(frame), Date.now() + ms);
@@ -9778,6 +9871,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();
@@ -9811,6 +9907,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);
       }
     }
@@ -9881,7 +9986,9 @@ class SubcClient {
     for (const cached of this.routes.values()) {
       if (cached.closed)
         continue;
-      const channel = await this.routeOpen(cached.target, cached.identity);
+      const channel = await this.routeOpen(cached.target, cached.identity, {
+        consumerIdentity: cached.consumerIdentity ?? null
+      });
       if (cached.closed) {
         this.sendRouteGoodbye(channel);
         continue;
@@ -9890,6 +9997,11 @@ class SubcClient {
       cached.generation = this.generation;
     }
   }
+  timeoutMessage(channel, corr, ms) {
+    const port = this.sock.localPort();
+    const where = port === null ? "channel" : `local_port=${port} channel`;
+    return `request on ${where} ${channel} corr ${corr} timed out after ${ms}ms`;
+  }
   routeClosedDuringOpen() {
     return new SubcCallError("not_sent", "route was closed before route.open completed", "route_closed");
   }
@@ -9897,9 +10009,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) {
@@ -9931,13 +10050,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));
@@ -10001,6 +10127,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(path) {
   try {
     await fs2.access(path);
@@ -10016,7 +10145,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((resolve2) => setTimeout(resolve2, ms)))
+    sleep: opts.sleep ?? ((ms) => new Promise((resolve2) => setTimeout(resolve2, ms))),
+    timeoutArbitrationGraceMs: opts.timeoutArbitrationGraceMs ?? TIMEOUT_ARBITRATION_GRACE_MS
   };
 }
 function routeCacheKey(target, identity, consumerIdentity) {
@@ -10045,7 +10175,7 @@ function causeMessage(cause) {
     return "";
   return `: ${cause instanceof Error ? cause.message : String(cause)}`;
 }
-// ../../node_modules/.bun/@cortexkit+subc-client@0.2.0/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;
@@ -11263,7 +11393,7 @@ class AftRpcClient {
   }
   parsePortFile(filePath) {
     try {
-      const content = readFileSync(filePath, "utf-8");
+      const content = readFileSync2(filePath, "utf-8");
       return parseRpcPortRecord(content);
     } catch {
       return null;
@@ -11799,6 +11929,30 @@ async function handleSocketMessage(ws, raw, messageGeneration) {
 // src/tui/sidebar.tsx
 import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js";
 
+// src/tui/badge-contrast.ts
+var MIN_OPAQUE_ALPHA = 0.5;
+var MIN_CHANNEL_DISTANCE = 0.06;
+var LIGHT_ACCENT_LUMINANCE = 0.5;
+function srgbChannelToLinear(c) {
+  return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+}
+function relativeLuminance(bg) {
+  return 0.2126 * srgbChannelToLinear(bg.r) + 0.7152 * srgbChannelToLinear(bg.g) + 0.0722 * srgbChannelToLinear(bg.b);
+}
+function nearlyEqual(a, b) {
+  return Math.abs(a.r - b.r) < MIN_CHANNEL_DISTANCE && Math.abs(a.g - b.g) < MIN_CHANNEL_DISTANCE && Math.abs(a.b - b.b) < MIN_CHANNEL_DISTANCE;
+}
+function readableTextColorOn(bg) {
+  return relativeLuminance(bg) < LIGHT_ACCENT_LUMINANCE ? "#ffffff" : "#000000";
+}
+function badgeTextColor(accent, background) {
+  const alpha = background.a ?? 1;
+  if (alpha >= MIN_OPAQUE_ALPHA && !nearlyEqual(accent, background)) {
+    return background;
+  }
+  return readableTextColorOn(accent);
+}
+
 // src/tui/preferences.ts
 var import_comment_json = __toESM(require_src2(), 1);
 import { watch } from "node:fs";
@@ -12369,7 +12523,7 @@ var SidebarContent = (props) => {
                 paddingRight: 1,
                 backgroundColor: props.theme.accent,
                 children: /* @__PURE__ */ jsxDEV("text", {
-                  fg: props.theme.background,
+                  fg: badgeTextColor(props.theme.accent, props.theme.background),
                   children: /* @__PURE__ */ jsxDEV("b", {
                     children: [
                       notInitialized() ? "" : collapsed() ? "▶ " : "▼ ",
@@ -12384,7 +12538,7 @@ var SidebarContent = (props) => {
                 marginLeft: 1,
                 backgroundColor: props.theme.warning,
                 children: /* @__PURE__ */ jsxDEV("text", {
-                  fg: props.theme.background,
+                  fg: badgeTextColor(props.theme.warning, props.theme.background),
                   children: /* @__PURE__ */ jsxDEV("b", {
                     children: "DEGRADED"
                   }, undefined, false, undefined, this)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.43.1",
+  "version": "0.45.0",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.43.1",
+    "@cortexkit/aft-bridge": "0.45.0",
     "@opentui/core": "^0.4.2",
     "@opentui/solid": "^0.4.2",
     "comment-json": "^4.6.2",
@@ -40,12 +40,12 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.43.1",
-    "@cortexkit/aft-darwin-x64": "0.43.1",
-    "@cortexkit/aft-linux-arm64": "0.43.1",
-    "@cortexkit/aft-linux-x64": "0.43.1",
-    "@cortexkit/aft-win32-arm64": "0.43.1",
-    "@cortexkit/aft-win32-x64": "0.43.1"
+    "@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": {
     "@opencode-ai/plugin": "^1.17.11",

package/src/tui/badge-contrast.ts

@@ -0,0 +1,43 @@
+/**
+ * Pick the text color for a sidebar badge label drawn on a theme accent.
+ * Keep this logic in sync with Magic Context so both sidebars make the same
+ * contrast decision for shared themes.
+ */
+
+type Color = { r: number; g: number; b: number; a?: number };
+
+const MIN_OPAQUE_ALPHA = 0.5;
+const MIN_CHANNEL_DISTANCE = 0.06;
+const LIGHT_ACCENT_LUMINANCE = 0.5;
+
+function srgbChannelToLinear(c: number): number {
+  return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+}
+
+function relativeLuminance(bg: Color): number {
+  return (
+    0.2126 * srgbChannelToLinear(bg.r) +
+    0.7152 * srgbChannelToLinear(bg.g) +
+    0.0722 * srgbChannelToLinear(bg.b)
+  );
+}
+
+function nearlyEqual(a: Color, b: Color): boolean {
+  return (
+    Math.abs(a.r - b.r) < MIN_CHANNEL_DISTANCE &&
+    Math.abs(a.g - b.g) < MIN_CHANNEL_DISTANCE &&
+    Math.abs(a.b - b.b) < MIN_CHANNEL_DISTANCE
+  );
+}
+
+export function readableTextColorOn(bg: Color): string {
+  return relativeLuminance(bg) < LIGHT_ACCENT_LUMINANCE ? "#ffffff" : "#000000";
+}
+
+export function badgeTextColor<T extends Color>(accent: T, background: T): T | string {
+  const alpha = background.a ?? 1;
+  if (alpha >= MIN_OPAQUE_ALPHA && !nearlyEqual(accent, background)) {
+    return background;
+  }
+  return readableTextColorOn(accent);
+}

package/src/tui/sidebar.tsx

@@ -19,6 +19,7 @@ import {
   type StatusCompression,
 } from "../shared/status";
 import { resolveCortexKitStorageRoot } from "../shared/storage-paths";
+import { badgeTextColor } from "./badge-contrast";
 import {
   createDebouncedStatusRefresh,
   refreshAftTuiSocketScope,
@@ -592,7 +593,7 @@ const SidebarContent = (props: {
           {/* Triangle lives inside the accent badge so the toggle reads as one
               unit: "▶ AFT" / "▼ AFT". Hidden pre-init (nothing to collapse). */}
           <box paddingLeft={1} paddingRight={1} backgroundColor={props.theme.accent}>
-            <text fg={props.theme.background}>
+            <text fg={badgeTextColor(props.theme.accent, props.theme.background)}>
               <b>
                 {notInitialized() ? "" : collapsed() ? "▶ " : "▼ "}
                 {prefs().header.label}
@@ -606,7 +607,7 @@ const SidebarContent = (props: {
               marginLeft={1}
               backgroundColor={props.theme.warning}
             >
-              <text fg={props.theme.background}>
+              <text fg={badgeTextColor(props.theme.warning, props.theme.background)}>
                 <b>DEGRADED</b>
               </text>
             </box>