@bivy/bivy 0.1.0-staging.3 → 0.1.0-staging.5

package/bin/bivy.mjs

@@ -3265,15 +3265,47 @@ async function cmdStatus(args = []) {
     try { status = await localApi(config, "/api/status"); } catch {}
   }
   if (json) {
-    console.log(JSON.stringify({ reachable, url: url(config), workspace: status?.workspace || config.workspace, service: serviceStatusLine(), remoteConfigured: Boolean(status?.relay?.configured || fs.existsSync(relayConfigPath)), status }, null, 2));
+    const relayCfgJson = loadRelayConfig();
+    console.log(JSON.stringify({
+      reachable,
+      url: url(config),
+      workspace: status?.workspace || config.workspace,
+      service: serviceStatusLine(),
+      remoteConfigured: Boolean(status?.relay?.configured || relayCfgJson),
+      relay: {
+        configured: Boolean(status?.relay?.configured || relayCfgJson),
+        connected: status?.relay?.connected ?? null,
+        app: status?.relay?.controlPlaneUrl || relayCfgJson?.controlPlaneUrl || null,
+        relay: status?.relay?.relayUrl || relayCfgJson?.url || null,
+        lastError: status?.relay?.lastError || null,
+      },
+      status,
+    }, null, 2));
     return;
   }
   console.log(c.bold("\n  Bivy node\n"));
   console.log(`  url:       ${url(config)}  ${reachable ? c.green("● reachable") : c.dim("○ not reachable")}`);
   console.log(`  workspace: ${status?.workspace || config.workspace}`);
   console.log(`  ${serviceStatusLine()}`);
-  console.log(`  remote:    ${status?.relay?.configured || fs.existsSync(relayConfigPath) ? c.green("relay configured") : "local only"}`);
   const relay = loadRelayConfig();
+  const relaySt = status?.relay;
+  const relayConfigured = Boolean(relaySt?.configured || relay);
+  if (!relayConfigured) {
+    console.log(`  remote:    ${c.dim("local only")}  ${c.dim("('bivy relay:setup' to enable remote access)")}`);
+  } else {
+    // The live link state is only knowable when the node is running; if it's
+    // down we can say it's configured but not whether it's currently connected.
+    let state;
+    if (!reachable) state = c.yellow("configured (node not running)");
+    else if (relaySt?.connected) state = c.green("● connected");
+    else state = c.yellow("○ configured, not connected");
+    const relErr = relaySt?.lastError ? c.dim(`  (${relaySt.lastError})`) : "";
+    console.log(`  remote:    ${state}${relErr}`);
+    const cpUrl = relaySt?.controlPlaneUrl || relay?.controlPlaneUrl;
+    const rlUrl = relaySt?.relayUrl || relay?.url;
+    if (cpUrl) console.log(`  app:       ${cpUrl}`);
+    if (rlUrl) console.log(`  relay:     ${rlUrl}`);
+  }
   if (relay?.controlPlaneUrl && relay?.enrollmentToken) {
     try {
       const acct = await controlPlaneNodeApi(relay, "/node/account");
@@ -3331,7 +3363,15 @@ async function cmdDoctor(args = []) {
   console.log(`  ${mark(agentAvailable, true)} agent ${runtimeInfo?.displayName || defaultAgent}${agentAvailable ? "" : c.dim(" not available — install it or run 'bivy setup'")}`);
   console.log(`  ${mark(hasModelConfig(config), authOwner !== "bivy")} model ${hasModelConfig(config) ? "configured" : authOwner === "bivy" ? c.dim("not configured — run 'bivy login'") : c.dim("agent-native auth — use the agent's CLI login if needed")}`);
   const relayConfigured = Boolean(status?.relay?.configured || fs.existsSync(relayConfigPath));
-  console.log(`  ${relayConfigured ? ok : c.dim("○")} remote ${relayConfigured ? (status?.relay?.connected ? c.green("relay connected") : "relay configured") : c.dim("local only — 'bivy relay:setup' to enable")}`);
+  const relayConnected = Boolean(status?.relay?.connected);
+  const relayApp = status?.relay?.controlPlaneUrl;
+  const relayErr = status?.relay?.lastError;
+  const relayLine = !relayConfigured
+    ? c.dim("local only — 'bivy relay:setup' to enable")
+    : relayConnected
+      ? c.green("relay connected") + (relayApp ? c.dim(`  ${relayApp}`) : "")
+      : c.yellow("configured, not connected") + (relayErr ? c.dim(`  (${relayErr})`) : "");
+  console.log(`  ${relayConfigured ? (relayConnected ? ok : warn) : c.dim("○")} remote ${relayLine}`);
   // Derived from BUILTIN_TERMINAL_AGENTS (the same list 'bivy agents'/'bivy run'
   // use) rather than a hand-maintained list, so it can't drift out of sync (#113).
   const agentCommands = [...BUILTIN_TERMINAL_AGENTS.values()].filter((a) => a.type === "command").map((a) => a.command);

package/dist/relay-client.js

@@ -51,6 +51,14 @@ export class RelayConnector {
     heartbeatTimer;
     stableTimer;
     lastPongAt = 0;
+    // True only between the relay's `ready` message (auth + entitlement passed)
+    // and the socket closing. This — not "a connector object exists" — is what
+    // "connected" means to the control plane, so it's what `bivy status` reports.
+    ready = false;
+    // Most recent relay-side failure (ticket mint, socket error, or an `error`
+    // frame), surfaced by `bivy status`/`doctor` so a node that never connects
+    // explains why instead of silently showing "configured".
+    lastErrorMessage;
     replay = new ReplayGuard();
     reassembler = new FrameReassembler();
     pairing;
@@ -71,12 +79,26 @@ export class RelayConnector {
             return;
         this.ws.send(JSON.stringify({ t: "pair", p: JSON.stringify({ k: "key.rotate", deliveries }) }));
     }
+    /**
+     * True only while the relay link is live AND the relay has sent `ready`
+     * (auth/entitlement checks passed) — i.e. the node is actually reachable from
+     * the control plane. A socket that opened but was rejected, or one still
+     * reconnecting, reads false.
+     */
+    get connected() {
+        return this.ready && this.ws?.readyState === WebSocket.OPEN;
+    }
+    /** Most recent relay-side failure, if any — for status/diagnostics. */
+    get lastError() {
+        return this.lastErrorMessage;
+    }
     start() {
         this.closed = false;
         void this.connect();
     }
     stop() {
         this.closed = true;
+        this.ready = false;
         this.stopHeartbeat();
         this.clearBackoffReset();
         this.ws?.close();
@@ -250,6 +272,7 @@ export class RelayConnector {
             ({ ticket, relayUrl } = await this.mintTicket());
         }
         catch (error) {
+            this.lastErrorMessage = `ticket mint failed: ${error.message}`;
             console.warn("[relay] could not mint relay ticket:", error.message);
             this.scheduleReconnect();
             return;
@@ -276,6 +299,8 @@ export class RelayConnector {
                 return;
             }
             if (env.t === "ready") {
+                this.ready = true;
+                this.lastErrorMessage = undefined;
                 this.startHeartbeat(ws);
                 this.scheduleBackoffReset(ws);
                 console.log("[relay] connected");
@@ -311,6 +336,7 @@ export class RelayConnector {
             }
             if (env.t === "error") {
                 const message = env.error || "Relay error";
+                this.lastErrorMessage = message;
                 console.warn("[relay] error:", message);
                 if (isFatalRelayError(message)) {
                     console.warn("[relay] disabling connector; fix relay setup/plan and restart the node dev server");
@@ -323,11 +349,13 @@ export class RelayConnector {
             this.lastPongAt = Date.now();
         });
         ws.on("close", () => {
+            this.ready = false;
             this.stopHeartbeat();
             this.clearBackoffReset();
             this.scheduleReconnect();
         });
         ws.on("error", (error) => {
+            this.lastErrorMessage = error.message;
             console.warn("[relay] socket error:", error.message);
         });
     }

package/dist/server.js

@@ -7577,7 +7577,14 @@ app.get("/api/status", (_req, res) => {
             workspaceBoundary: true,
             strictApprovalOptIn: true,
         },
-        relay: { configured: Boolean(relayConfig), connected: Boolean(relay) },
+        relay: {
+            configured: Boolean(relayConfig),
+            // Real link state (relay sent `ready`), not merely "a connector exists".
+            connected: Boolean(relay?.connected),
+            controlPlaneUrl: relayConfig?.controlPlaneUrl,
+            relayUrl: relayConfig?.url,
+            ...(relay?.lastError ? { lastError: relay.lastError } : {}),
+        },
         sessions: {
             open: new Set(openSessions.values()).size,
             indexed: metadata.listSessions().length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.1.0-staging.3",
+  "version": "0.1.0-staging.5",
   "type": "module",
   "license": "FSL-1.1-ALv2",
   "description": "Run coding agents on machines you own. Source-available, self-hostable agent workspace.",