thinkpool-pair 0.7.165 → 0.7.167

package/account.mjs

@@ -271,6 +271,12 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   // account without per-room probing. We TRACK this machine (name + served room
   // codes + version) on a per-account channel; the dashboard subscribes read-only.
   const machine = os.hostname().replace(/\.local$/, '')
+
+  // ── supervisor logging (cascade brg-instrument, supervisor-log lane) ─────────
+  const SUP_ID = (randomUUID?.() || '').slice(0, 8)
+  let lastClaimHeld = null // track state changes for claim_tick logging
+  console.log(`◇ supervisor boot sup=${SUP_ID} host=${machine} pid=${process.pid} npx=${VERSION || 'dev'}`)
+
   const acct = sb.channel(`tpacct:${session.user.id}`, { config: { presence: { key: machine }, broadcast: { self: false } } })
   let restarting = false   // set by the "restart" broadcast → stop() exits non-zero so a supervisor respawns us
   // Web "attach this session" card → bind an unbound/new room to a local dir (and
@@ -463,6 +469,13 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
       else if (!held && standbyHost !== host) process.stderr.write(`\n  ◇ another device (${host}) is serving this account — standing by.\n    (this Mac takes over automatically if that device goes offline.)\n`)
       claimHeld = held
       standbyHost = held ? null : host
+
+      // ── supervisor claim_tick logging (cascade brg-instrument) ─────────────────
+      if (lastClaimHeld !== held) {
+        console.log(`claim_tick sup=${SUP_ID} held=${held} holder=${held ? machine : host}`)
+        lastClaimHeld = held
+      }
+
       return held
     } catch {
       // Transient claim error: keep serving if we already hold; never START
@@ -660,7 +673,12 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
       delete env.THINKPOOL_PAIR_AUTOUPDATE
       // Hand the child the owner JWT for authed web writes (code-mockup, L16).
       if (currentAccessToken) env.TP_ACCESS_TOKEN = currentAccessToken
+
+      // ── supervisor child_spawn logging (cascade brg-instrument) ─────────────────
+      const alreadyHad = children.has(room)
       const child = spawn(process.execPath, [BRIDGE, room, '--headless', '--auto=claude'], { cwd: dir, stdio: ['inherit', 'inherit', 'inherit', 'ipc'], env })
+      console.log(`child_spawn sup=${SUP_ID} room=${room} pid=${child.pid} dir=${dir} had_prior=${alreadyHad}`)
+
       children.set(room, child)
       childIdle.set(room, false)   // unknown until it reports → never restart a fresh child
       childBetween.set(room, false)
@@ -738,6 +756,9 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
         }
       })
       const dropRoom = (code) => {
+        // ── 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
         // Owner-reclaim SENTINEL (75): the grantee child stood down because the owner's bridge
         // returned. Park the room on a cooldown so discovery doesn't respawn it into another
@@ -790,6 +811,9 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   const stop = (sig) => {
     if (stopping) return; stopping = true
     const code = restarting ? 1 : 0
+
+    // ── supervisor stand-down logging (cascade brg-instrument) ─────────────────
+    console.log(`supervisor_stop sup=${SUP_ID} reason=${sig || 'unknown'} restarting=${restarting} children=${children.size}`)
     clearInterval(iv)
     for (const t of updateTimers) { try { clearInterval(t) } catch { /* noop */ } }   // clearInterval clears Timeouts too
     keepFresh.cancel()

package/bridge.mjs

@@ -397,7 +397,7 @@ if (_superOwn.includes('--supervise') || _superOwn.includes('--keep-alive')) {
     child.on('error', () => { /* spawn failure → exit handler retries */ })
   }
   for (const sig of ['SIGINT', 'SIGTERM']) process.on(sig, () => { stopping = true; try { child?.kill(sig) } catch { /* noop */ } setTimeout(() => process.exit(0), 400) })
-  process.stderr.write(`\n  ◆ supervisor up — keeping the bridge for room ${room} alive (auto-restart on crash).\n`)
+  process.stderr.write(`\n  [b:${BRIDGE_ID} r:${room}] ◆ supervisor up — keeping the bridge for room ${room} alive (auto-restart on crash).\n`)
   spawnChild()
   await new Promise(() => {})   // block forever; the child IS the bridge
 }
@@ -505,14 +505,15 @@ if (process.stdin.isTTY && !headless && process.env.THINKPOOL_PAIR_AUTOUPDATE !=
     const yes = await askYesNo(`\n  Run as a background service instead? It survives reboot + auto-updates,\n  but runs detached — you'd stop it with 'uninstall-service', not Ctrl-C.\n  Install background service? [y/N] `, false)
     if (yes) {
       svc.installService(room, attachedCmd ? [attachedCmd, ...attachedArgs] : [])
-      process.stderr.write(`\n  ◆ the background service is handling room ${room} now — you can close this terminal.\n  ◆ STOP IT with:  npx thinkpool-pair@latest uninstall-service ${room}\n     (closing the terminal does NOT stop it — it's detached under launchd/systemd.)\n\n`)
+      process.stderr.write(`\n  [b:${BRIDGE_ID} r:${room}] ◆ the background service is handling room ${room} now — you can close this terminal.\n  ◆ STOP IT with:  npx thinkpool-pair@latest uninstall-service ${room}\n     (closing the terminal does NOT stop it — it's detached under launchd/systemd.)\n\n`)
       process.exit(0)   // hand off to the supervised service (no double bridge)
     }
     try { fs.mkdirSync(path.dirname(declineFile), { recursive: true }); fs.writeFileSync(declineFile, new Date().toISOString()) } catch { /* noop */ }
-    process.stderr.write(`  ◆ running in this terminal. (Auto-update service anytime: npx thinkpool-pair@latest install-service ${room})\n`)
+    process.stderr.write(`  [b:${BRIDGE_ID} r:${room}] ◆ running in this terminal. (Auto-update service anytime: npx thinkpool-pair@latest install-service ${room})\n`)
   }
 }
 const name = process.env.TP_NAME || os.userInfo().username || 'host'
+const BRIDGE_ID = (randomUUID?.().slice(0,8)) || 'bridgexx'
 // host: this machine's short label — os.hostname() with any DNS/domain suffix
 // stripped and capped ~24 chars. A /code room can be served by different bridges
 // over time (Max's Mac vs Conrad's Linux box); the client uses this to show WHICH
@@ -528,6 +529,48 @@ const repoLabel = path.basename(cwd)
 // thinkpool-pair's own version — surfaced in the room's welcome banner.
 let VERSION = null
 try { VERSION = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version } catch { /* unknown — banner omits it */ }
+
+// Stale npx cache check — warn if the running bridge is older than the newest installed.
+// Uses proper semver comparison (not string compare) to avoid false positives like "0.7.150" < "0.7.99".
+try {
+  const npxCacheRoot = path.join(os.homedir(), '.npm', '_npx')
+  const npxEntries = fs.readdirSync(npxCacheRoot, { withFileTypes: true })
+    .filter(dirent => dirent.isDirectory())
+    .map(dirent => dirent.name)
+    .filter(name => name !== 'cache')
+
+  // Parse semver into [major, minor, patch] with missing segments as 0
+  const parseSemver = (v) => {
+    if (!v) return [0, 0, 0]
+    return v.split('.').map(p => parseInt(p, 10) || 0)
+  }
+
+  // Compare two semver versions: return true if a < b
+  const semverLess = (a, b) => {
+    const pa = parseSemver(a)
+    const pb = parseSemver(b)
+    for (let i = 0; i < 3; i++) {
+      if (pa[i] < pb[i]) return true
+      if (pa[i] > pb[i]) return false
+    }
+    return false // equal
+  }
+
+  let newestVersion = null
+  for (const entry of npxEntries) {
+    const pkgPath = path.join(npxCacheRoot, entry, 'node_modules', 'thinkpool-pair', 'package.json')
+    try {
+      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+      if (pkg.version) {
+        if (!newestVersion || semverLess(newestVersion, pkg.version)) newestVersion = pkg.version
+      }
+    } catch { /* skip unreadable entries */ }
+  }
+
+  if (newestVersion && VERSION && semverLess(VERSION, newestVersion)) {
+    process.stderr.write(`  ⚠ stale-cache: running ${VERSION}, newest ${newestVersion}\n`)
+  }
+} catch { /* skip on any error — this is a lint, not a hard gate */ }
 // Read the CURRENT branch LIVE (not once at boot) so the room's mode row reflects a
 // branch switch instead of showing whatever branch the dir was on when the bridge spawned
 // (the stale-branch bug). Handles a .git dir (normal checkout) AND a .git FILE (linked
@@ -612,8 +655,14 @@ const isRoomParticipant = async (jwt) => {
     const { data } = await supabase.auth.getUser(jwt)
     if (!data?.user) return false
     const uid = data.user.id
-    const r = await fetch(`${SUPABASE_URL}/rest/v1/code_sessions?code=eq.${encodeURIComponent(room)}&participants=cs.${uid}`, { headers: { apikey: SUPABASE_ANON, Authorization: `Bearer ${codeAuthToken}` } })
-    return r.ok
+    // Query with the CALLER's jwt (not the bridge host's codeAuthToken) so RLS scopes
+    // the read to what THIS user may see, and require an actual matching row — `r.ok`
+    // alone is true for an empty [] result, which let ANY authenticated user pass.
+    // participants is a uuid[]; PostgREST array-contains is cs.{uid} (braces required).
+    const r = await fetch(`${SUPABASE_URL}/rest/v1/code_sessions?code=eq.${encodeURIComponent(room)}&participants=cs.%7B${encodeURIComponent(uid)}%7D&select=code`, { headers: { apikey: SUPABASE_ANON, Authorization: `Bearer ${jwt}` } })
+    if (!r.ok) return false
+    const rows = await r.json().catch(() => [])
+    return Array.isArray(rows) && rows.length > 0
   } catch { return false }
 }
 // ── Room-serve owner consent (Contract C-CODE-3) ──────────────────────────────
@@ -679,7 +728,7 @@ let yielding = false         // set once when standing down, so reclaim + revoke
       process.exit(0)
     }
     iServeAsGrantee = amGrantee({ ownerId, grantUid, myUid: myServeUid })
-    if (iServeAsGrantee) process.stderr.write(`\n  ◆ serving room ${room} by the owner's grant — will yield if the owner's bridge returns or the grant is revoked.\n`)
+    if (iServeAsGrantee) process.stderr.write(`\n  [b:${BRIDGE_ID} r:${room}] ◆ serving room ${room} by the owner's grant — will yield if the owner's bridge returns or the grant is revoked.\n`)
   } catch (e) {
     // A THROWN fetchServeRow error is either a definitively-bad auth (401/403) or an
     // availability failure (5xx / transport reject). Only the latter fails OPEN — a stale
@@ -1000,7 +1049,7 @@ function onPeerBridgeAnnounce (payload) {
   if (yielding) return
   if (!standDownOnPeerAnnounce({ myUid: myServeUid, ownerId: roomOwnerId, peerUid: payload?.uid })) return
   yielding = true
-  process.stderr.write(`\n  ◆ owner's bridge reconnected — yielding room ${room}.\n`)
+  process.stderr.write(`\n  [b:${BRIDGE_ID} r:${room}] ◆ owner's bridge reconnected — yielding room ${room}.\n`)
   // Exit with the grant-reclaim SENTINEL (not a clean 0). A supervisor that spawned this
   // grantee child reads the code and puts the room on a cooldown, so it does NOT respawn a
   // child that will only yield again — the owner-serves/grantee-stands-by coexistence state
@@ -2776,7 +2825,7 @@ channel
   .subscribe(status => {
     if (status === 'SUBSCRIBED') {
       realtimeHealthy = true; brokenSince = 0
-      trackPresence({ name, role: 'bridge' })
+      trackPresence({ name, role: 'bridge', bridge_id: BRIDGE_ID })
       const startCmd = attachedCmd || autoAgent   // autoAgent: account-mode auto-open (headless)
       if (startCmd && !terms.size && !sessions.size) {
         // Claude + structured mode → Agent SDK session; everything else → PTY.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.165",
-  "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
+  "version": "0.7.167",
+  "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, \u2026) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
     "thinkpool-pair": "bridge.mjs"