thinkpool-pair 0.7.293 → 0.7.295

package/account.mjs

@@ -416,6 +416,7 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   const childIdle = new Map()    // room -> bool (last idle report: in the quiet window)
   const childBetween = new Map() // room -> bool (between turns now — safe to restart per Contract #1)
   const childPeer = new Map()  // room -> bool (a web client is watching this room)
+  const readyRooms = new Set() // child subscribed + restored + announced usable room state
   // Thinkpool Ensemble cross-ROOM router (Tier 1): the supervisor is the only process
   // that knows every room on this machine, so it routes a child's read_session into the
   // target room's child and relays the reply back. roomNames feeds list_sessions; pairPending
@@ -562,7 +563,7 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   // to spawn against — re-read each announce so an add/remove reflects immediately.
   // Both are additive; older clients ignore them (feature: multi-provider BYOK, slice 1).
   const PROVIDER_PUBKEY = publicKeyB64()
-  const pushPresence = () => trackPresence({ name: machine, bridgeId: BRIDGE_ID, version: VERSION, rooms: [...children.keys()], refused: [...refused].map(([code, reason]) => ({ code, reason })), service: runsAsService(), providerPubKey: PROVIDER_PUBKEY, providers: announceProviders(), agents: installedAgentCommands().map((cmd) => ({ cmd })), ts: Date.now() })
+  const pushPresence = () => trackPresence({ name: machine, bridgeId: BRIDGE_ID, version: VERSION, rooms: [...children.keys()], readyRooms: [...readyRooms], refused: [...refused].map(([code, reason]) => ({ code, reason })), service: runsAsService(), providerPubKey: PROVIDER_PUBKEY, providers: announceProviders(), agents: installedAgentCommands().map((cmd) => ({ cmd })), ts: Date.now() })
 
   // ── Provider registry — the multi-BYOK wire contract (slice 1). ─────────────
   // AUTH: the account channel `tpacct:<uid>` is created WITHOUT config.private:true,
@@ -895,12 +896,18 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
       console.log(`child_spawn sup=${SUP_ID} room=${room} pid=${child.pid} dir=${dir} had_prior=${alreadyHad}`)
 
       children.set(room, child)
+      readyRooms.delete(room)
       childIdle.set(room, false)   // unknown until it reports → never restart a fresh child
       childBetween.set(room, false)
       childPeer.set(room, false)
       child.on('message', (m) => {
         if (!m) return
-        if (m.t === 'idle') { childIdle.set(room, !!m.idle); childBetween.set(room, m.between != null ? !!m.between : !!m.idle); childPeer.set(room, !!m.webPeer) }
+        if (m.t === 'room-ready') {
+          readyRooms.add(room)
+          console.log(`child_ready sup=${SUP_ID} room=${room} pid=${child.pid}`)
+          pushPresence()
+        }
+        else if (m.t === 'idle') { childIdle.set(room, !!m.idle); childBetween.set(room, m.between != null ? !!m.between : !!m.idle); childPeer.set(room, !!m.webPeer) }
         else if (m.t === 'apply-update') { applyRequested = true; applyIfIdle() }   // user clicked the chip
         // ── Thinkpool Ensemble cross-ROOM routing ──────────────────────────────
         // `room` here is the room that sent the message (this closure is per-child).
@@ -993,7 +1000,7 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
         // ── supervisor child_exit logging (cascade brg-instrument) ─────────────────
         console.log(`child_exit sup=${SUP_ID} room=${room} pid=${child?.pid || '?'} code=${code || '?'}`)
 
-        children.delete(room); childIdle.delete(room); childBetween.delete(room); childPeer.delete(room); roomNames.delete(room); roomPartner.delete(room)   // re-served on the next tick
+        children.delete(room); readyRooms.delete(room); childIdle.delete(room); childBetween.delete(room); childPeer.delete(room); roomNames.delete(room); roomPartner.delete(room)   // re-served on the next tick
         // Fail any in-flight cross-room peeks/posts this dead room had ASKED (bus-origin
         // entries have askerRoom null and just time out on their own).
         for (const [reqId, w] of pairPending) { if (w?.askerRoom === room) pairPending.delete(reqId) }

package/bridge.mjs

@@ -348,9 +348,9 @@ if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
       child.on('exit', (code) => process.exit(code == null ? 0 : code))
     }),
     serveAccountForeground: async () => { const { runAccount } = await import('./account.mjs'); await runAccount(SUPABASE_URL, SUPABASE_ANON) },
-    // install / uninstall / restart are NOT terminal — they do their work, print their
-    // notes, and RETURN so the launcher loop drops you back at the menu (the service
-    // runs in its own launchd/systemd process; this launcher isn't itself a bridge).
+    // install / uninstall are NOT terminal — they do their work, print their notes,
+    // and return to the menu. A confirmed update closes the launcher instead: its
+    // in-memory package version is stale while the new service runs independently.
     installService: ({ room = null, agentCmd } = {}) => { svc.installService(room, agentCmd ? [agentCmd] : []) },
     uninstallService: ({ room = null } = {}) => { svc.uninstallService(room) },
     restartService: ({ room = null } = {}) => { svc.restartService(room) },
@@ -1117,7 +1117,7 @@ const announce = () => {
   // on a custom provider without the owner's account-channel registry.
   const provNames = providerNameMap()
   const rev = ++announceRev
-  return bcast('bridge', {
+  return bcastAwait('bridge', {
     v: 2, name, bridge_id: BRIDGE_ID, started_at: BRIDGE_STARTED_AT, rev, repo: repoLabel, branch: readBranch(),
     // sdkWarn: the auto-pulled agent SDK failed its boot compatibility smoke test —
     // surfaced so the room can show a banner (turns may misbehave; pin a good SDK).
@@ -4459,7 +4459,14 @@ channel
           openTerm({ id: ptyId, cmd: startCmd, args: attachedArgs, attached: !autoAgent })
         }
       }
-      announce()
+      await announce()
+      // Account presence must distinguish a spawned child from a usable room.
+      // Signal only after realtime subscribed, durable sessions restored, and the
+      // first authoritative roster was announced. The dashboard keeps the bridge
+      // in "Restarting" until every pre-restart room reaches this boundary.
+      if (process.send && process.env.THINKPOOL_PAIR_ACCOUNT_CHILD === '1') {
+        try { process.send({ t: 'room-ready', room, bridgeId: BRIDGE_ID }) } catch { /* supervisor exited */ }
+      }
       process.stderr.write(headless
         ? `\n  ◆ thinkpool — relaying room ${room} (headless). Open terminals from the web UI.\n\n`
         : `\n  ◆ thinkpool — sharing "${attachedCmd}"${continuing ? ' (continuing your latest session)' : ''} into room ${room}.  Open the web UI and you're both in.\n\n`)

package/launcher.mjs

@@ -278,7 +278,16 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
     if (pick.key === 'quit') return
     if (pick.key === 'serve') { if (await ensureLoggedIn()) await actions.serveAccountForeground() }
     else if (pick.key === 'service') { if (await ensureLoggedIn()) { await actions.installService({ room: null }); resync() } }
-    else if (pick.key === 'restart') { await actions.restartUpdateService({ room: null }); resync() }
+    else if (pick.key === 'restart') {
+      const updated = await actions.restartUpdateService({ room: null })
+      // The launcher process cannot update its own in-memory VERSION. Returning to
+      // the menu after a successful service update therefore showed the old launcher
+      // version beside the new managed-service version and ended on a misleading
+      // "press Enter" pause. The service is already independently running, so close
+      // this stale installer process once the OS-level update is confirmed.
+      if (updated === true) return
+      resync()
+    }
     else if (pick.key === 'uninstall') { await actions.uninstallService({ room: null }); resync() }
     else if (pick.key === 'settings') await settingsMenu()
     await io.ask('\n  ' + C.dim('press Enter to return to the menu…'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.293",
+  "version": "0.7.295",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {