@snowyroad/braid 0.84.1 → 0.86.0

package/dist/{chunk-PQGSJM2V.js → chunk-XENNQYCX.js}

@@ -389,7 +389,7 @@ var InviteExpiredError = class extends Error {
   }
 };
 async function redeemInvite(relayHttpUrl, code) {
-  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-SXNTO4ON.js");
+  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-LZV3OAR2.js");
   const r = await boundedJsonFetch2(`${relayHttpUrl.replace(/\/$/, "")}/invites/redeem`, {
     method: "POST",
     headers: { "content-type": "application/json" },
@@ -478,7 +478,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-SXNTO4ON.js");
+  const { boundedJsonFetch: boundedJsonFetch2 } = await import("./http-LZV3OAR2.js");
   const r = await boundedJsonFetch2(`${relayHttpUrl.replace(/\/$/, "")}/agents/token`, {
     method: "POST",
     headers: {
@@ -3120,6 +3120,27 @@ var RelayClient = class {
   // single-shot: onReady has fired (relay accepted the agent)
   reconnectAnnounced = false;
   // per-connection: "reconnected" printed for this connection
+  connEventCb = null;
+  /** Subscribe the connection-status sink (single subscriber, like onReady). When set,
+   *  the seven legacy per-event console lines are suppressed: the sink owns presentation
+   *  (connStatus.ts aggregates episodes + applies verbosity). When absent, behavior is
+   *  byte-identical to before (plain per-event lines). */
+  onConnEvent(cb) {
+    this.connEventCb = cb;
+  }
+  reportConn(e, legacy) {
+    if (this.connEventCb) this.connEventCb(e);
+    else legacy?.();
+  }
+  /** Current token's JWT exp (epoch seconds), for status display. Non-JWT/garbage -> undefined. */
+  tokenExpSeconds() {
+    try {
+      const exp = decodeJwt(this.cfg.token).exp;
+      return typeof exp === "number" ? exp : void 0;
+    } catch {
+      return void 0;
+    }
+  }
   catchUpCbs = [];
   caughtUp = /* @__PURE__ */ new Set();
   // channels caught up this connection
@@ -3298,9 +3319,9 @@ var RelayClient = class {
       sock.terminate();
     } catch {
     }
-    console.log(
+    this.reportConn({ kind: "connectTimeout", timeoutSecs: CONNECT_TIMEOUT_MS / 1e3 }, () => console.log(
       `[braid] connect attempt timed out after ${CONNECT_TIMEOUT_MS / 1e3}s (socket accepted but the relay never completed the handshake); retrying`
-    );
+    ));
     const delay2 = this.backoffDelay();
     this.reconnectAttempts++;
     this.reconnectTimer = setTimeout(() => {
@@ -3337,12 +3358,13 @@ var RelayClient = class {
     if (this.confirmed) {
       if (!this.reconnectAnnounced) {
         this.reconnectAnnounced = true;
-        console.log("[braid] reconnected");
+        this.reportConn({ kind: "reconnected", tokenExp: this.tokenExpSeconds() }, () => console.log("[braid] reconnected"));
         this.connectedCb?.();
       }
       return;
     }
     this.confirmed = true;
+    this.reportConn({ kind: "connected", tokenExp: this.tokenExpSeconds() });
     this.readyCb?.();
     this.connectedCb?.();
   }
@@ -3491,9 +3513,12 @@ var RelayClient = class {
   onClose(code, reason) {
     this.clearTimers();
     if (this.stopped) return;
-    console.log(`[braid] disconnected (close ${code})${reason ? `: ${sanitizeForTty(reason)}` : ""}`);
+    this.reportConn(
+      { kind: "disconnected", code, reason: reason ? sanitizeForTty(reason) : "" },
+      () => console.log(`[braid] disconnected (close ${code})${reason ? `: ${sanitizeForTty(reason)}` : ""}`)
+    );
     if (code === 4001 && this.cfg.mintToken) {
-      console.log("[braid] access token rejected; re-minting from agent key");
+      this.reportConn({ kind: "remintStarted" }, () => console.log("[braid] access token rejected; re-minting from agent key"));
       this.attemptRemint(code);
       return;
     }
@@ -3654,7 +3679,7 @@ var RelayClient = class {
       return;
     }
     this.cfg.token = token;
-    console.log("[braid] token proactively re-minted before expiry");
+    this.reportConn({ kind: "tokenReminted", tokenExp: this.tokenExpSeconds() }, () => console.log("[braid] token proactively re-minted before expiry"));
     this.scheduleTokenRefresh();
   }
   stop() {
@@ -3699,7 +3724,7 @@ var RelayClient = class {
         }
         this.cfg.token = msg.token;
         this.scheduleTokenRefresh();
-        console.log("[braid] token refreshed");
+        this.reportConn({ kind: "tokenRefreshed", tokenExp: this.tokenExpSeconds() }, () => console.log("[braid] token refreshed"));
         break;
       }
       case "removed": {

package/dist/cli.js

@@ -70,7 +70,7 @@ import {
   toolStatusLine,
   validateRelayWsUrl,
   wsToHttp
-} from "./chunk-PQGSJM2V.js";
+} from "./chunk-XENNQYCX.js";
 import {
   externalSourceLabel,
   externalUntrustedPreamble,
@@ -2902,7 +2902,9 @@ Options for join/start (each also has an env twin; flag > env > file > default):
   --allow-read <path>    widen sandbox read access (repeatable)
   --allow-domain <host>  widen sandbox network egress (repeatable)
   --no-socket        do not open the local control socket (on by default)
-  --verbose          print the full posture detail during the guided first-run
+  --verbose          print every connection lifecycle event (token refreshes, each
+                     disconnect) instead of the default per-episode summaries; also
+                     prints the full posture detail during the guided first-run
                      setup (an interactive first start walks provider/permission
                      prompts and offers to keep the agent running in the
                      background; details any time via: braid status <name>)
@@ -5502,6 +5504,225 @@ 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`;
+var RAW_QUIESCE_MS = 2e3;
+function createStickyLine(out, now = Date.now) {
+  const enabled = out.isTTY === true;
+  let last = "";
+  let painted = false;
+  let paused = false;
+  let stopped = false;
+  let lastRawWriteAt = -Infinity;
+  const width = () => typeof out.columns === "number" && out.columns > 0 ? out.columns : 80;
+  const active = () => enabled && !stopped && !paused;
+  return {
+    enabled,
+    render(line) {
+      if (!active()) return;
+      last = line.slice(0, Math.max(0, width() - 1));
+      out.write(`${CLEAR}${last}`);
+      painted = true;
+    },
+    repaint() {
+      if (!active() || last === "") return;
+      out.write(`${CLEAR}${last}`);
+      painted = true;
+    },
+    clearIfPainted() {
+      if (!enabled || stopped || !painted) return;
+      out.write(CLEAR);
+      painted = false;
+    },
+    noteRawWrite() {
+      this.clearIfPainted();
+      lastRawWriteAt = now();
+    },
+    quiesced() {
+      return now() - lastRawWriteAt >= RAW_QUIESCE_MS;
+    },
+    pause() {
+      if (!enabled || stopped || paused) return;
+      this.clearIfPainted();
+      paused = true;
+    },
+    resume() {
+      paused = false;
+    },
+    stop() {
+      if (enabled && !stopped) this.clearIfPainted();
+      stopped = true;
+    }
+  };
+}
+function installConsoleBridge(sticky) {
+  const orig = { log: console.log, warn: console.warn, error: console.error };
+  const wrap = (fn) => (...a) => {
+    sticky.clearIfPainted();
+    fn(...a);
+    sticky.repaint();
+  };
+  console.log = wrap(orig.log.bind(console));
+  console.warn = wrap(orig.warn.bind(console));
+  console.error = wrap(orig.error.bind(console));
+  return () => {
+    console.log = orig.log;
+    console.warn = orig.warn;
+    console.error = orig.error;
+  };
+}
+function stickyWriteThrough(sticky, real) {
+  return {
+    isTTY: real.isTTY,
+    write(s) {
+      sticky.noteRawWrite();
+      real.write(s);
+    }
+  };
+}
+function formatStatusLine(s, agentName, now) {
+  const name = sanitizeForTty(agentName) || "agent";
+  if (s.state === "connected" && s.connectedSince !== null) {
+    const parts = [`\u25CF braid \xB7 ${name}`, "connected", `up ${fmtDur(now - s.startedAt)}`];
+    if (s.reconnects > 0 && s.lastReconnectAt !== null) {
+      parts.push(`${s.reconnects} ${s.reconnects === 1 ? "reconnect" : "reconnects"} (last ${fmtClock(s.lastReconnectAt)})`);
+    }
+    if (s.tokenExp !== null) {
+      const left = s.tokenExp * 1e3 - now;
+      parts.push(left > 0 ? `token expires in ${fmtDur(left)}` : "token renewing");
+    }
+    return parts.join(" \xB7 ");
+  }
+  if (s.state === "offline" && s.offlineSince !== null) {
+    return `\u25CC braid \xB7 ${name} \xB7 reconnecting: offline ${fmtDur(now - s.offlineSince)} (attempt ${s.attempts})`;
+  }
+  return `\u25CC braid \xB7 ${name} \xB7 connecting\u2026`;
+}
+
+// src/cli.ts
 function printList() {
   console.log(formatAgentList(listAgents(configDir(process.env))));
 }
@@ -6039,6 +6260,22 @@ async function main() {
     await initScopeRuntime(cfg, cfg.agent);
     console.log(banner("braid", "SCOPE", resolveScope(cfg, cfg.agent, process.env).describe()));
   }
+  const runVerbose = invocation.argv.includes("--verbose");
+  const sticky = createStickyLine(process.stdout);
+  const connStatus = createConnStatus({
+    verbose: runVerbose,
+    log: (l) => console.log(l),
+    warn: (l) => console.warn(l)
+  });
+  const restoreConsole = sticky.enabled ? installConsoleBridge(sticky) : null;
+  const statusTimer = setInterval(() => {
+    connStatus.tick();
+    if (sticky.enabled && sticky.quiesced()) {
+      sticky.render(formatStatusLine(connStatus.snapshot(), cfg.agentName ?? "", Date.now()));
+    }
+  }, 1e3);
+  statusTimer.unref?.();
+  process.on("exit", () => sticky.stop());
   console.log("[braid] connecting to the relay...");
   const keysLive = attachEligible(process.stdin, process.stdout, process.env);
   const serviceEligible = process.env.BRAID_SERVICE !== "1" && !!cfg.agentName;
@@ -6090,6 +6327,7 @@ async function main() {
     telemetry,
     onRelayCreated: (relay) => {
       relayRef.current = relay;
+      relay.onConnEvent((e) => connStatus.handle(e));
     }
   });
   if (cfg.runtimeVersion) {
@@ -6099,6 +6337,9 @@ async function main() {
   installGracefulShutdown(bridge, {
     agentName: cfg.agentName,
     beforeDrain: () => {
+      clearInterval(statusTimer);
+      restoreConsole?.();
+      sticky.stop();
       attach?.stop();
       void bridge.controlSocketClose?.();
       resetScope();
@@ -6114,7 +6355,7 @@ async function main() {
     listChannels: () => [...bridge.sessions.keys()],
     channelName: (channelId) => bridge.channelNames.get(channelId),
     stdin: process.stdin,
-    stdout: process.stdout,
+    stdout: stickyWriteThrough(sticky, process.stdout),
     onInterrupt: () => {
       try {
         process.kill(process.pid, "SIGINT");
@@ -6125,21 +6366,26 @@ async function main() {
     // Pause the headless driver for this channel, open the real `claude --resume <id>` on the
     // owner's terminal (same conversation), and resume driving when they quit it.
     handoff: async (channelId, out) => {
-      const session = bridge.sessions.get(channelId);
-      if (!session) {
-        out.write("\n[handoff] that session is no longer active\n");
-        return;
-      }
-      if (!handoffGate.tryAcquire(channelId, "terminal")) {
-        const g = handoffGate.snapshot();
-        out.write(g.state === "orphaned" ? `
-[handoff] a previous handoff was orphaned - run: braid handoff ${cfg.agentName ?? ""} --recover`.trimEnd() + "\n" : "\n[handoff] another handoff is already in progress\n");
-        return;
-      }
+      sticky.pause();
       try {
-        await runHandoff({ channelId, provider: cfg.agent, session, cwd: handoffCwdFor(cfg, channelId), out, channelLabel: channelLabel(channelId), scope: cfg.scope });
+        const session = bridge.sessions.get(channelId);
+        if (!session) {
+          out.write("\n[handoff] that session is no longer active\n");
+          return;
+        }
+        if (!handoffGate.tryAcquire(channelId, "terminal")) {
+          const g = handoffGate.snapshot();
+          out.write(g.state === "orphaned" ? `
+[handoff] a previous handoff was orphaned - run: braid handoff ${cfg.agentName ?? ""} --recover`.trimEnd() + "\n" : "\n[handoff] another handoff is already in progress\n");
+          return;
+        }
+        try {
+          await runHandoff({ channelId, provider: cfg.agent, session, cwd: handoffCwdFor(cfg, channelId), out, channelLabel: channelLabel(channelId), scope: cfg.scope });
+        } finally {
+          handoffGate.release();
+        }
       } finally {
-        handoffGate.release();
+        sticky.resume();
       }
     }
   });

package/dist/{http-SXNTO4ON.js → http-LZV3OAR2.js}

@@ -4,7 +4,7 @@ import {
   boundedJsonFetch,
   resetHttpMetricsForTest,
   snapshotHttpMetrics
-} from "./chunk-PQGSJM2V.js";
+} from "./chunk-XENNQYCX.js";
 import "./chunk-BDOF72CL.js";
 export {
   assertHttpEndpoint,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.84.1",
+  "version": "0.86.0",
   "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",
@@ -51,7 +51,7 @@
     "@anthropic-ai/sandbox-runtime": "0.0.63",
     "@anthropic-ai/sdk": "0.104.1",
     "@modelcontextprotocol/sdk": "1.29.0",
-    "@snowyroad/braid-tui": "0.0.22",
+    "@snowyroad/braid-tui": "0.0.25",
     "canonicalize": "^3.0.0",
     "jose": "^6.2.3",
     "ws": "8.21.0",

package/service-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.84.1",
+  "version": "0.86.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@snowyroad/braid",
-      "version": "0.84.1",
+      "version": "0.86.0",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@agentclientprotocol/sdk": "0.25.1",
@@ -14,7 +14,7 @@
         "@anthropic-ai/sandbox-runtime": "0.0.63",
         "@anthropic-ai/sdk": "0.104.1",
         "@modelcontextprotocol/sdk": "1.29.0",
-        "@snowyroad/braid-tui": "0.0.22",
+        "@snowyroad/braid-tui": "0.0.25",
         "canonicalize": "^3.0.0",
         "jose": "^6.2.3",
         "ws": "8.21.0",
@@ -1183,9 +1183,9 @@
       ]
     },
     "node_modules/@snowyroad/braid-tui": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/@snowyroad/braid-tui/-/braid-tui-0.0.22.tgz",
-      "integrity": "sha512-Sgsn8Dl8v6qLwZjRnlPUKJEXM6nOLFu0B/d2bOAJycSu1AI35LyzWjrOoui6TIwDB7KKBYVkbdOKqfwUtHFbyA==",
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/@snowyroad/braid-tui/-/braid-tui-0.0.25.tgz",
+      "integrity": "sha512-HXtqJ0FBPAOTdR5bZ9zFb3Rcew+1ZlDU44AeOz/PxrDW5a1D+TAdrfVSby32mUk9Z5dVUgWZ2wrnGdbyIX725g==",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "ink": "^5.2.0",
@@ -2505,9 +2505,9 @@
       "license": "ISC"
     },
     "node_modules/jose": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz",
-      "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==",
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.4.tgz",
+      "integrity": "sha512-N8acGzVsQy6M/fjFcxtysNc4Q379TcM5dM/qKkNtsHFji88yANnXTr7BLeP75iPnFwBfQzM/jg2BZ9+HZrHCZA==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -2908,9 +2908,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.20",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.20.tgz",
-      "integrity": "sha512-lW616l85ucIQL+FocMmL7pQFPqBmwejrCMg+iPxyImlrANNJG9NHq/RkyCZopDhd8C3LA03PHRJDjkbGu8vvug==",
+      "version": "8.5.22",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.22.tgz",
+      "integrity": "sha512-KBDEIpLrvpv16pp3K0Fw+UCoZfopFjjgeB+0tA/aaThfEE74kKDLrgg603YvOWJyg3+WYtyq3xYsQWsIyZlPqQ==",
       "dev": true,
       "funding": [
         {