@frod.io/bridge 0.7.2 → 0.7.3

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// @frod.io/bridge 0.7.2. One file; do not edit: the source is apps/bridge/src in the platform repository.
+// @frod.io/bridge 0.7.3. One file; do not edit: the source is apps/bridge/src in the platform repository.
 import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 var __create = Object.create;
@@ -6481,6 +6481,9 @@ function workdirRequestFor(spec) {
 }
 
 // src/connection.ts
+var RECONCILE_INTERVAL_MS = 6e4;
+var RECONCILE_WAIT_MS = 1500;
+var STOP_BOUND_MS = 1e4;
 var HostConnection = class {
   constructor(o) {
     this.o = o;
@@ -6498,6 +6501,7 @@ var HostConnection = class {
   /** Which runtime started each session — a turn must reach the one holding it. */
   sessionAdapter = /* @__PURE__ */ new Map();
   attempt = 0;
+  reconcileTimer = null;
   connectedAt = null;
   /** Requests this computer sent to the pod (night 2: permissions), by id. */
   nextRequestId = 1;
@@ -6593,6 +6597,7 @@ var HostConnection = class {
         const reason = reasonBuf.toString();
         this.connectedAt = null;
         this.ws = null;
+        this.stopReconciling();
         this.failPending(`the connection closed (${code})`);
         void this.endAllSessions(`connection closed (${code}${reason ? ` ${reason}` : ""})`);
         if (final && (code === 4403 || code === 4404 || final.reason.startsWith("Another computer") || final.reason.startsWith("This computer left") || final.reason.startsWith("This computer was disconnected") || /access was revoked/.test(final.reason))) {
@@ -6634,6 +6639,8 @@ var HostConnection = class {
       const hosted = hostedAgentsWords({ bindings, agentName: this.o.config.agentName });
       log.event("host.welcome", { host: params.hostName ?? this.o.config.name, host_id: params.hostId ?? null, person: params.person?.name ?? null, workspace: params.workspaceId, agents: bindings.map((b) => `${b.agentName}: ${bindingWords(b)}`), ping_ms: params.pingIntervalMs });
       log.info(`Connected \u2014 ${this.o.config.name} hosts ${hosted}`);
+      this.reconcile("welcome");
+      this.startReconciling();
       if (typeof params.hostId === "string") {
         this.o.onWelcome?.({ hostId: params.hostId, hostName: String(params.hostName ?? this.o.config.name), person: params.person ?? null, bindings, bridge: params.bridge });
       }
@@ -6673,7 +6680,13 @@ var HostConnection = class {
         const spec = params;
         if (this.draining || this.stopping) return fail(`${this.o.config.name} is restarting${this.draining ? " to update itself" : ""} \u2014 try again in a moment`);
         if (this.sessions.size >= this.o.config.maxSessions && !this.sessions.has(sid)) {
-          return fail(`${this.o.config.name} is busy (${this.sessions.size} of ${this.o.config.maxSessions} sessions)`);
+          const before = this.sessions.size;
+          this.reconcile("desk full");
+          await sleep(RECONCILE_WAIT_MS);
+          log.event("session.reconciled", { session: sid, before, after: this.sessions.size, max: this.o.config.maxSessions });
+          if (this.sessions.size >= this.o.config.maxSessions) {
+            return fail(`${this.o.config.name} is busy (${this.sessions.size} of ${this.o.config.maxSessions} sessions)`);
+          }
         }
         this.sessions.add(sid);
         this.sessionsChanged();
@@ -6774,7 +6787,10 @@ var HostConnection = class {
         return;
       }
       if (method === "session/stop") {
-        await this.adapterOf(sid).stop(sid);
+        const reason = typeof params.reason === "string" ? params.reason : "stopped";
+        if (reason === "unknown_session") log.event("session.forgotten_by_pod", { session: sid });
+        await this.adapterOf(sid).stop(sid, reason);
+        this.forget(sid);
         return;
       }
       if (method === "session/permission_decided") {
@@ -6869,15 +6885,50 @@ var HostConnection = class {
   }
   async endAllSessions(reason) {
     if (this.sessions.size === 0) return;
-    log.warn(`Stopping ${this.sessions.size} session(s): ${reason}`);
-    for (const sid of [...this.sessions]) {
-      await this.adapterOf(sid).stop(sid, "host_disconnected").catch(() => {
-      });
-      this.sessions.delete(sid);
-      this.checkouts.delete(sid);
+    const sids = [...this.sessions];
+    log.warn(`Stopping ${sids.length} session(s): ${reason}`);
+    for (const sid of sids) this.forget(sid, { keepAdapter: true });
+    await Promise.all(sids.map(async (sid) => {
+      const adapter = this.sessionAdapter.get(sid) ?? this.adapterOf(sid);
       this.sessionAdapter.delete(sid);
+      await Promise.race([
+        adapter.stop(sid, "host_disconnected").catch(() => {
+        }),
+        sleep(STOP_BOUND_MS).then(() => log.warn(`[${sid.slice(0, 8)}] did not stop within ${STOP_BOUND_MS / 1e3} s \u2014 slot freed anyway`))
+      ]);
+    }));
+  }
+  /** Free a session's slot and everything this computer remembered about it. Idempotent. */
+  forget(sid, opts = {}) {
+    const had = this.sessions.delete(sid);
+    this.checkouts.delete(sid);
+    this.doorCheckouts.forget(sid);
+    this.sessionDirs.delete(sid);
+    if (!opts.keepAdapter) this.sessionAdapter.delete(sid);
+    if (had) this.sessionsChanged();
+  }
+  /**
+   * No tails: ask the pod about every lane this computer holds. A known
+   * session gets silence; a forgotten one gets `session/stop` back, which
+   * frees its slot through the ordinary path. Sent only while connected.
+   */
+  reconcile(why) {
+    if (this.sessions.size === 0 || !this.ws || this.ws.readyState !== wrapper_default.OPEN) return;
+    log.event("sessions.reconcile", { why, held: this.sessions.size, max: this.o.config.maxSessions });
+    for (const sid of this.sessions) {
+      this.send({ sid, msg: { jsonrpc: "2.0", method: "session/heartbeat", params: { sessionId: sid } } });
+    }
+  }
+  startReconciling() {
+    this.stopReconciling();
+    this.reconcileTimer = setInterval(() => this.reconcile("interval"), RECONCILE_INTERVAL_MS);
+    this.reconcileTimer.unref?.();
+  }
+  stopReconciling() {
+    if (this.reconcileTimer) {
+      clearInterval(this.reconcileTimer);
+      this.reconcileTimer = null;
     }
-    this.sessionsChanged();
   }
   send(frame) {
     const ws = this.ws;
@@ -7779,7 +7830,7 @@ function samplesInWords(samples) {
 }
 
 // src/cli.ts
-var VERSION = "0.7.2";
+var VERSION = "0.7.3";
 function arg(flag, argv) {
   const i = argv.indexOf(flag);
   return i >= 0 ? argv[i + 1] : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frod.io/bridge",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "type": "module",
   "description": "Your computer is a desk: hosts a Frod.io agent's sessions with your own Claude Code, Codex or Grok Build. Installs and updates itself.",
   "license": "UNLICENSED",