@snowyroad/braid 0.96.3 → 0.96.5

package/dist/{chunk-DKPDCAG6.js → chunk-DIUVFB7Z.js}

@@ -205,9 +205,9 @@ function newBeyondFile(list) {
     flag: list.flag.filter((x) => !file.has(x))
   };
 }
-function seg(n, singular, plural) {
+function seg(n, singular, plural2) {
   if (n === 0) return null;
-  return `+${n} ${n === 1 ? singular : plural}`;
+  return `+${n} ${n === 1 ? singular : plural2}`;
 }
 function computePostureWarnings(flags, env, stored) {
   if (stored === void 0) return [];
@@ -400,7 +400,7 @@ var InviteExpiredError = class extends Error {
   }
 };
 async function redeemInvite(relayHttpUrl, code) {
-  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-6SGKZVYJ.js");
+  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-DZ3ZHOHX.js");
   const r = await boundedJsonFetch2(`${relayHttpUrl.replace(/\/$/, "")}/invites/redeem`, {
     method: "POST",
     headers: { "content-type": "application/json" },
@@ -492,7 +492,7 @@ function validateReplacementToken(newToken, currentToken, nowMs = Date.now()) {
   return { ok: true };
 }
 async function mintAccessToken(relayHttpUrl, agentKey, fetchFn = fetch, dpopProof) {
-  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-6SGKZVYJ.js");
+  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-DZ3ZHOHX.js");
   const r = await boundedJsonFetch2(`${relayHttpUrl.replace(/\/$/, "")}/agents/token`, {
     method: "POST",
     headers: {
@@ -1770,6 +1770,44 @@ function dropVendorNotifications(input) {
   });
 }
 
+// src/acp/stderrNoise.ts
+var TEARDOWN_HEAD = /cancellation failed during teardown/;
+var CONTINUATION = /^(\s+at\s|\s*[{}]\s*$|\s+(telemetryMessage|errorClass|exitCode)\s*:)/;
+function createTeardownNoiseFilter(isStopping) {
+  let pending = "";
+  let dropping = false;
+  function line(l) {
+    if (dropping) {
+      if (CONTINUATION.test(l)) return "";
+      dropping = false;
+    }
+    if (isStopping() && TEARDOWN_HEAD.test(l)) {
+      dropping = true;
+      return "";
+    }
+    return l + "\n";
+  }
+  return {
+    push(chunk) {
+      pending += chunk;
+      let out = "";
+      let nl;
+      while ((nl = pending.indexOf("\n")) !== -1) {
+        out += line(pending.slice(0, nl));
+        pending = pending.slice(nl + 1);
+      }
+      return out;
+    },
+    flush() {
+      const rest = pending;
+      pending = "";
+      if (!rest) return "";
+      if (dropping && CONTINUATION.test(rest)) return "";
+      return rest;
+    }
+  };
+}
+
 // src/acp/client.ts
 import { randomUUID } from "crypto";
 
@@ -2106,7 +2144,17 @@ var AcpClient = class {
       detached: true
     });
     this.child = child;
-    pipeSanitizedToTty(child.stderr);
+    const noise = createTeardownNoiseFilter(() => this.stopping);
+    pipeSanitizedToTty(child.stderr, {
+      write: (s) => {
+        const kept = noise.push(s);
+        if (kept) process.stderr.write(kept);
+      }
+    });
+    child.on("close", () => {
+      const rest = noise.flush();
+      if (rest) process.stderr.write(rest);
+    });
     child.on("error", (err) => {
       this.failPending(new Error(`ACP agent subprocess error: ${err.message}`));
     });
@@ -2691,6 +2739,9 @@ function modelLaunchFor(agent, model) {
   }
 }
 
+// src/adapter.ts
+import { execFileSync as execFileSync2 } from "child_process";
+
 // src/scope/sandbox.ts
 import { SandboxManager, SandboxRuntimeConfigSchema, installWindowsSandbox, getSrtWinPath } from "@anthropic-ai/sandbox-runtime";
 import path4 from "path";
@@ -3434,6 +3485,137 @@ function classifyCatchUp(messages, agentName, nowMs, opts) {
   return { context: inWindow, mentions: capped };
 }
 
+// src/connStatus.ts
+var ESCALATE_FIRST_MS = 6e4;
+var ESCALATE_REPEAT_MS = 3e5;
+var CLOSE_TRY_AGAIN_LATER = 1013;
+function fmtDur(ms) {
+  const s = Math.max(0, Math.floor(ms / 1e3));
+  if (s < 60) return `${s}s`;
+  const m = Math.floor(s / 60);
+  if (m < 60) return `${m}m${String(s % 60).padStart(2, "0")}s`;
+  return `${Math.floor(m / 60)}h${String(m % 60).padStart(2, "0")}m`;
+}
+function fmtClock(epochMs) {
+  const d = new Date(epochMs);
+  return `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
+}
+function plural(n, one, many) {
+  return `${n} ${n === 1 ? one : many}`;
+}
+function createConnStatus(opts) {
+  const now = opts.now ?? Date.now;
+  const startedAt = now();
+  let state = "starting";
+  let connectedSince = null;
+  let offlineSince = null;
+  let attempts = 0;
+  let reconnects = 0;
+  let lastReconnectAt = null;
+  let tokenExp = null;
+  let lastCloseCode = null;
+  let nextEscalateAt = null;
+  let tryAgainLaterSaid = false;
+  function noteDrop() {
+    if (state !== "offline") {
+      offlineSince = now();
+      attempts = 0;
+      nextEscalateAt = offlineSince + ESCALATE_FIRST_MS;
+    }
+    state = "offline";
+    connectedSince = null;
+    attempts++;
+  }
+  function closeEpisode(t) {
+    if (offlineSince === null || attempts === 0) return null;
+    const down = fmtDur(t - offlineSince);
+    const suffix = attempts > 1 ? `${down}, ${plural(attempts, "attempt", "attempts")}` : down;
+    offlineSince = null;
+    nextEscalateAt = null;
+    tryAgainLaterSaid = false;
+    return suffix;
+  }
+  function adoptExp(exp) {
+    if (exp !== void 0) tokenExp = exp;
+  }
+  function handle(e) {
+    switch (e.kind) {
+      case "connected": {
+        const t = now();
+        const hadRetries = offlineSince !== null && attempts > 0;
+        const n = attempts;
+        const since = offlineSince;
+        const ep = closeEpisode(t);
+        state = "connected";
+        connectedSince = t;
+        adoptExp(e.tokenExp);
+        if (hadRetries && ep !== null && since !== null) {
+          opts.log(`[braid] connected (after ${plural(n, "attempt", "attempts")}, ${fmtDur(t - since)})`);
+        }
+        break;
+      }
+      case "reconnected": {
+        const t = now();
+        const ep = closeEpisode(t);
+        state = "connected";
+        connectedSince = t;
+        reconnects++;
+        lastReconnectAt = t;
+        adoptExp(e.tokenExp);
+        opts.log(`[braid] reconnected${ep !== null ? ` (offline ${ep})` : ""}`);
+        break;
+      }
+      case "disconnected":
+        lastCloseCode = e.code;
+        noteDrop();
+        if (e.code === CLOSE_TRY_AGAIN_LATER) {
+          if (!tryAgainLaterSaid) {
+            tryAgainLaterSaid = true;
+            opts.warn(
+              `[braid] relay asked us to try again later${e.reason ? ` (${e.reason})` : ""}; reconnecting automatically`
+            );
+          }
+        } else if (opts.verbose) {
+          opts.log(`[braid] disconnected (close ${e.code})${e.reason ? `: ${e.reason}` : ""}`);
+        }
+        break;
+      case "connectTimeout":
+        noteDrop();
+        if (opts.verbose) {
+          opts.log(
+            `[braid] connect attempt timed out after ${e.timeoutSecs}s (socket accepted but the relay never completed the handshake); retrying`
+          );
+        }
+        break;
+      case "remintStarted":
+        if (opts.verbose) opts.log("[braid] access token rejected; re-minting from agent key");
+        break;
+      case "tokenRefreshed":
+        adoptExp(e.tokenExp);
+        if (opts.verbose) opts.log("[braid] token refreshed");
+        break;
+      case "tokenReminted":
+        adoptExp(e.tokenExp);
+        if (opts.verbose) opts.log("[braid] token proactively re-minted before expiry");
+        break;
+    }
+  }
+  function tick() {
+    if (state !== "offline" || offlineSince === null || nextEscalateAt === null) return;
+    const t = now();
+    if (t >= nextEscalateAt) {
+      opts.warn(
+        `[braid] still reconnecting: offline ${fmtDur(t - offlineSince)} (${plural(attempts, "attempt", "attempts")})`
+      );
+      nextEscalateAt = t + ESCALATE_REPEAT_MS;
+    }
+  }
+  function snapshot() {
+    return { state, startedAt, connectedSince, offlineSince, attempts, reconnects, lastReconnectAt, tokenExp, lastCloseCode };
+  }
+  return { handle, tick, snapshot };
+}
+
 // src/cardIdentity.ts
 import { createRemoteJWKSet, jwtVerify } from "jose";
 
@@ -4157,7 +4339,7 @@ var RelayClient = class {
       this.fatalCb?.(code, reason);
       return;
     }
-    if (!this.helloReceived) {
+    if (!this.helloReceived && code !== CLOSE_TRY_AGAIN_LATER) {
       this.preHelloFailures++;
       if (this.preHelloFailures >= PRE_HELLO_HINT_AFTER && !this.handshakeHintShown) {
         this.handshakeHintShown = true;
@@ -6101,8 +6283,11 @@ function resolvePathBinary(binary, hint) {
 function launchSpecFor(agent) {
   const cwd = process.cwd();
   switch (agent) {
-    case "claude-code":
-      return { ...npxSpec(pinned("@agentclientprotocol/claude-agent-acp")), cwd };
+    case "claude-code": {
+      const bin = resolveClaudeBinary();
+      const env = bin.source === "bundled" ? {} : { env: { CLAUDE_CODE_EXECUTABLE: bin.path } };
+      return { ...npxSpec(pinned("@agentclientprotocol/claude-agent-acp")), cwd, ...env };
+    }
     // codex: canonical adapter (BL-120, 2026-06-28). 1.x prefers CODEX_API_KEY,
     // falling back to OPENAI_API_KEY; both pass through buildAcpEnv unchanged.
     case "codex":
@@ -6200,6 +6385,35 @@ function resolveHandoffBinary(name, install) {
   handoffBinaryAbs.set(name, found);
   return found;
 }
+var claudeBinaryCached;
+function claudeVersion(bin) {
+  try {
+    const out = execFileSync2(bin, ["--version"], { encoding: "utf8", timeout: 8e3, stdio: ["ignore", "pipe", "ignore"] });
+    return out.trim().split("\n")[0] || null;
+  } catch {
+    return null;
+  }
+}
+function resolveClaudeBinary(env = process.env, home = homedir5(), platform = process.platform) {
+  if (claudeBinaryCached) return claudeBinaryCached;
+  const explicit = env.CLAUDE_CODE_EXECUTABLE?.trim();
+  let out;
+  if (explicit) {
+    out = { path: explicit, version: claudeVersion(explicit), source: "env" };
+  } else {
+    const found = findHandoffBinary("claude", env.PATH ?? "", home, platform);
+    out = found ? { path: found, version: claudeVersion(found), source: "path" } : { path: "", version: null, source: "bundled" };
+  }
+  claudeBinaryCached = out;
+  return out;
+}
+function describeClaudeBinary(b) {
+  if (b.source === "bundled") {
+    return "adapter-bundled copy (no `claude` on PATH or ~/.local/bin; install Claude Code so `claude update` keeps this current)";
+  }
+  const ver = b.version ? ` (${b.version})` : "";
+  return b.source === "env" ? `${b.path}${ver} [CLAUDE_CODE_EXECUTABLE]` : `${b.path}${ver}, the one \`claude update\` maintains`;
+}
 var HANDOFF_RESUME_SPECS = {
   "claude-code": (sessionId, cwd) => ({ command: resolveHandoffBinary("claude", "Claude Code"), args: ["--resume", sessionId], cwd }),
   codex: (sessionId, cwd) => ({ command: resolveHandoffBinary("codex", "the Codex CLI"), args: ["resume", sessionId], cwd }),
@@ -7396,7 +7610,7 @@ function buildVersion() {
     return "";
   }
 }
-function startingLines(cfg) {
+function startingLines(cfg, extras = {}) {
   const row = (label, value) => `${label.padEnd(8)} : ${value}`;
   const anthropicCredential = cfg.agentMode !== "acp" || cfg.agent === "claude-code";
   const catchUpHours = cfg.catchUpTtlMs % 36e5 === 0 ? `${cfg.catchUpTtlMs / 36e5}h` : `${Math.round(cfg.catchUpTtlMs / 6e4)}min`;
@@ -7408,6 +7622,9 @@ function startingLines(cfg) {
     row("agent", sanitizeForTty(cfg.agentName)),
     row("relay", sanitizeForTty(cfg.relayWsUrl)),
     row("provider", cfg.agentMode === "acp" ? cfg.agent : "bundled SDK (generic mode)"),
+    // Which Claude Code binary claude-code turns run (2026-09-21): the user's own, so
+    // `claude update` is the fix for a client-version refusal, never a braid release.
+    ...extras.claudeBinary ? [row("claude", sanitizeForTty(extras.claudeBinary))] : [],
     row("model", sanitizeForTty(redactConfig(cfg).model)),
     row("fallback", cfg.fallbackModel ? sanitizeForTty(cfg.fallbackModel) : "(none \u2014 a rate limit is surfaced, not switched)"),
     row("tools", cfg.toolMode),
@@ -7677,6 +7894,9 @@ export {
   isAddressed,
   isAddressedByReply,
   classifyCatchUp,
+  fmtDur,
+  fmtClock,
+  createConnStatus,
   WS_MAX_PAYLOAD_BYTES,
   RelayClient,
   SourceBroker,
@@ -7685,6 +7905,8 @@ export {
   scopedLaunch,
   resetScope,
   sandboxInstaller,
+  resolveClaudeBinary,
+  describeClaudeBinary,
   interactiveHandoffSupported,
   interactiveResumeSpecFor,
   createAdapter,

package/dist/cli.js

@@ -29,11 +29,15 @@ import {
   classifyFatal,
   configDir,
   createAdapter,
+  createConnStatus,
   createEphemeralLisaAdapter,
   createWorkspaceNoticeGate,
   decodeInvite,
+  describeClaudeBinary,
   distinctWorkspaceNames,
   effectiveAnthropicCredential,
+  fmtClock,
+  fmtDur,
   handoffCwdFor,
   hasSubscriptionLogin,
   initScopeRuntime,
@@ -59,6 +63,7 @@ import {
   relayHostSegment,
   resetScope,
   resolveAgentSelection,
+  resolveClaudeBinary,
   resolveConfig,
   resolveIpcProfile,
   resolveKnobs,
@@ -76,7 +81,7 @@ import {
   updateAgentWorkspace,
   validateRelayWsUrl,
   wsToHttp
-} from "./chunk-DKPDCAG6.js";
+} from "./chunk-DIUVFB7Z.js";
 import {
   clampUntrusted,
   externalSourceLabel,
@@ -5712,127 +5717,6 @@ function installTee(outWriter, errWriter) {
 // src/cli.ts
 import { homedir as homedir6 } from "os";
 
-// src/connStatus.ts
-var ESCALATE_FIRST_MS = 6e4;
-var ESCALATE_REPEAT_MS = 3e5;
-function fmtDur(ms) {
-  const s = Math.max(0, Math.floor(ms / 1e3));
-  if (s < 60) return `${s}s`;
-  const m = Math.floor(s / 60);
-  if (m < 60) return `${m}m${String(s % 60).padStart(2, "0")}s`;
-  return `${Math.floor(m / 60)}h${String(m % 60).padStart(2, "0")}m`;
-}
-function fmtClock(epochMs) {
-  const d = new Date(epochMs);
-  return `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
-}
-function plural(n, one, many) {
-  return `${n} ${n === 1 ? one : many}`;
-}
-function createConnStatus(opts) {
-  const now = opts.now ?? Date.now;
-  const startedAt = now();
-  let state = "starting";
-  let connectedSince = null;
-  let offlineSince = null;
-  let attempts = 0;
-  let reconnects = 0;
-  let lastReconnectAt = null;
-  let tokenExp = null;
-  let lastCloseCode = null;
-  let nextEscalateAt = null;
-  function noteDrop() {
-    if (state !== "offline") {
-      offlineSince = now();
-      attempts = 0;
-      nextEscalateAt = offlineSince + ESCALATE_FIRST_MS;
-    }
-    state = "offline";
-    connectedSince = null;
-    attempts++;
-  }
-  function closeEpisode(t) {
-    if (offlineSince === null || attempts === 0) return null;
-    const down = fmtDur(t - offlineSince);
-    const suffix = attempts > 1 ? `${down}, ${plural(attempts, "attempt", "attempts")}` : down;
-    offlineSince = null;
-    nextEscalateAt = null;
-    return suffix;
-  }
-  function adoptExp(exp) {
-    if (exp !== void 0) tokenExp = exp;
-  }
-  function handle(e) {
-    switch (e.kind) {
-      case "connected": {
-        const t = now();
-        const hadRetries = offlineSince !== null && attempts > 0;
-        const n = attempts;
-        const since = offlineSince;
-        const ep = closeEpisode(t);
-        state = "connected";
-        connectedSince = t;
-        adoptExp(e.tokenExp);
-        if (hadRetries && ep !== null && since !== null) {
-          opts.log(`[braid] connected (after ${plural(n, "attempt", "attempts")}, ${fmtDur(t - since)})`);
-        }
-        break;
-      }
-      case "reconnected": {
-        const t = now();
-        const ep = closeEpisode(t);
-        state = "connected";
-        connectedSince = t;
-        reconnects++;
-        lastReconnectAt = t;
-        adoptExp(e.tokenExp);
-        opts.log(`[braid] reconnected${ep !== null ? ` (offline ${ep})` : ""}`);
-        break;
-      }
-      case "disconnected":
-        lastCloseCode = e.code;
-        noteDrop();
-        if (opts.verbose) {
-          opts.log(`[braid] disconnected (close ${e.code})${e.reason ? `: ${e.reason}` : ""}`);
-        }
-        break;
-      case "connectTimeout":
-        noteDrop();
-        if (opts.verbose) {
-          opts.log(
-            `[braid] connect attempt timed out after ${e.timeoutSecs}s (socket accepted but the relay never completed the handshake); retrying`
-          );
-        }
-        break;
-      case "remintStarted":
-        if (opts.verbose) opts.log("[braid] access token rejected; re-minting from agent key");
-        break;
-      case "tokenRefreshed":
-        adoptExp(e.tokenExp);
-        if (opts.verbose) opts.log("[braid] token refreshed");
-        break;
-      case "tokenReminted":
-        adoptExp(e.tokenExp);
-        if (opts.verbose) opts.log("[braid] token proactively re-minted before expiry");
-        break;
-    }
-  }
-  function tick() {
-    if (state !== "offline" || offlineSince === null || nextEscalateAt === null) return;
-    const t = now();
-    if (t >= nextEscalateAt) {
-      opts.warn(
-        `[braid] still reconnecting: offline ${fmtDur(t - offlineSince)} (${plural(attempts, "attempt", "attempts")})`
-      );
-      nextEscalateAt = t + ESCALATE_REPEAT_MS;
-    }
-  }
-  function snapshot() {
-    return { state, startedAt, connectedSince, offlineSince, attempts, reconnects, lastReconnectAt, tokenExp, lastCloseCode };
-  }
-  return { handle, tick, snapshot };
-}
-
 // src/statusLine.ts
 var ESC = String.fromCharCode(27);
 var CLEAR = `\r${ESC}[2K`;
@@ -6329,7 +6213,9 @@ async function main() {
     }
     assertKeystorePerms(dir, file);
   }
-  console.log(banner("braid", "STARTING", startingLines(cfg)));
+  console.log(banner("braid", "STARTING", startingLines(cfg, {
+    ...cfg.agentMode === "acp" && cfg.agent === "claude-code" ? { claudeBinary: describeClaudeBinary(resolveClaudeBinary()) } : {}
+  })));
   if (cfg.toolMode === "full") {
     console.error(
       "[braid] WARNING full tool access: remote channel content can drive local tool use on this machine"

package/dist/{http-6SGKZVYJ.js → http-DZ3ZHOHX.js}

@@ -4,7 +4,7 @@ import {
   boundedJsonFetch,
   resetHttpMetricsForTest,
   snapshotHttpMetrics
-} from "./chunk-DKPDCAG6.js";
+} from "./chunk-DIUVFB7Z.js";
 import "./chunk-HQNAAXUM.js";
 export {
   assertHttpEndpoint,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.96.3",
+  "version": "0.96.5",
   "description": "Braid: connect your own coding agent (Claude Code, Codex, Gemini, Grok) to a Braid channel and collaborate with other agents and humans.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "SnowyRoad",

package/service-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.96.3",
+  "version": "0.96.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@snowyroad/braid",
-      "version": "0.96.3",
+      "version": "0.96.5",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@agentclientprotocol/sdk": "0.25.1",