thinkpool-pair 0.7.158 → 0.7.159

package/account.mjs

@@ -16,6 +16,7 @@ import os from 'node:os'
 import { saveAuth, loadAuth, loadDirs, bindDir, loadServed, rememberServed, loadDefaultDir, saveDefaultDir, claudeRecentProjectDir } from './auth-store.mjs'
 import { isSafeToRestart } from './update-gate.mjs'
 import { makeThrottledTrack } from './presence.mjs'
+import { supervisorServes } from './serve-consent.mjs'
 import { resolveServeDir } from './serve-dir.mjs'
 import { pairKeyFor, pairTopic, CROSSROOM_BUS } from './cross-terminal.mjs'
 
@@ -529,26 +530,32 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
       return
     }
     let rooms = []
+    const me = session.user.id
     try {
-      // Owner-only discovery (Contract C-CODE-2): a host bridges ONLY the sessions
-      // it CREATED. RLS on code_sessions returns owned OR participant rooms, so
-      // without this owner filter the supervisor auto-serves rooms you merely JOINED
-      // as a guest — spawning your machine into another owner's session that already
-      // runs its own bridge. The web watches tpacct:<session-owner>, so a
-      // participant's bridge is duplication the UI never even looks at.
-      const { data } = await sb.from('code_sessions').select('code,name,last_active_at,owner_id,participants').eq('owner_id', session.user.id).order('last_active_at', { ascending: false }).limit(20)
+      // Discovery (Contract C-CODE-2, evolved owner-only → owner-OR-granted): a host
+      // bridges the sessions it OWNS *plus* any it has been explicitly granted to serve
+      // (code_sessions.serve_grant_uid = me — the owner-consent grant, #206/#208). RLS
+      // returns owned OR participant rooms, and a grantee is ALWAYS a participant
+      // (set_serve_grant requires it), so a granted row is visible to this login. Without
+      // a filter the supervisor would auto-serve rooms you merely JOINED as a guest —
+      // spawning your machine into another owner's session that already runs its own
+      // bridge; the .or keeps un-granted joins out while letting a consented grant IN.
+      // The web watches tpacct:<session-owner>; a granted bridge serves on the owner's
+      // behalf (the grant IS the consent), so it is wanted duplication, not stray.
+      const { data } = await sb.from('code_sessions').select('code,name,last_active_at,owner_id,serve_grant_uid,participants').or(`owner_id.eq.${me},serve_grant_uid.eq.${me}`).order('last_active_at', { ascending: false }).limit(20)
       rooms = data || []
-      // Prune refused entries for rooms we no longer own (only on a SUCCESSFUL fetch,
-      // so a transient query error never wipes the set).
-      const ownedCodes = new Set(rooms.map((r) => r.code))
-      for (const c of [...refused.keys()]) if (!ownedCodes.has(c)) refused.delete(c)
+      // Prune refused entries for rooms we can no longer serve — owned OR granted (only
+      // on a SUCCESSFUL fetch, so a transient query error never wipes the set).
+      const servableCodes = new Set(rooms.map((r) => r.code))
+      for (const c of [...refused.keys()]) if (!servableCodes.has(c)) refused.delete(c)
     } catch { /* transient — keep existing children, retry next tick */ }
     const dirs = loadDirs()
     const served = loadServed()
     for (const r of rooms) {
       const room = r.code
       if (!room || children.has(room)) { if (room) refused.delete(room); continue }   // served → not refused
-      if (r.owner_id && r.owner_id !== session.user.id) continue   // never serve a room we don't own (defense-in-depth behind the .eq above)
+      // Defense-in-depth behind the .or above: serve iff we OWN the room or hold its grant.
+      if (!supervisorServes({ ownerId: r.owner_id, grantUid: r.serve_grant_uid, myUid: me })) continue
       // Resolve the serve dir: explicit bind > last-served memory > launch dir. REFUSE
       // to auto-serve an unbound room from $HOME — that strips the agent's resume context
       // (cwd-keyed SDK sessions) and shows your home folder as the repo (FVIHV1DE).

package/package.json

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

package/serve-consent.mjs

@@ -35,6 +35,18 @@ export function serveDecision ({ ownerId, grantUid, myUid }) {
   return { serve: false, reason: 'not-granted' }
 }
 
+// supervisorServes — the account supervisor's per-row discovery decision: may this
+// login auto-serve THIS discovered room? True iff the login OWNS the room or HOLDS its
+// serve grant. This is the defense-in-depth per-row check behind the supervisor's
+// `.or(owner_id.eq.me,serve_grant_uid.eq.me)` query — a broad RLS row (owned OR merely
+// participant) must still resolve to owned-or-granted before a child is spawned. Mirrors
+// serveDecision's owner|grant serve set, evaluated against a discovery row rather than a
+// gate fetch (Contract C-CODE-2, evolved owner-only → owner-or-granted).
+export function supervisorServes ({ ownerId, grantUid, myUid }) {
+  if (!myUid) return false
+  return ownerId === myUid || grantUid === myUid
+}
+
 // amGrantee — this bridge serves by grant (not as owner). Grantees are the only
 // bridges that ever stand down; the owner's bridge never yields.
 export function amGrantee ({ ownerId, grantUid, myUid }) {