thinkpool-pair 0.7.21 → 0.7.23

package/bridge.mjs

@@ -36,7 +36,7 @@ import { spawn } from 'node:child_process'
 import { randomUUID } from 'node:crypto'
 import { createClient } from '@supabase/supabase-js'
 import { startClaudeSession } from './claude-session.mjs'
-import { saveSession, flushSession, deleteSession, loadAll, canResume, loadPtyId, savePtyId } from './session-store.mjs'
+import { saveSession, flushSession, deleteSession, loadAll, canResume, loadPtyId, savePtyId, loadNames, saveNames } from './session-store.mjs'
 
 // Public client creds (the same anon values the web app ships — safe to embed).
 // Override with TP_SUPABASE_URL / TP_SUPABASE_ANON if you ever need to.
@@ -331,6 +331,11 @@ const bcast = (event, payload) => {
   } catch { /* noop */ }
 }
 
+// Per-room terminal display names (id -> label), set by the web's `term-rename`.
+// Persisted on the host so a rename is cross-device + survives a bridge restart;
+// every announce carries them so a late-joining or second device sees them too.
+const termNames = loadNames(room)
+
 const announce = () =>
   bcast('bridge', {
     v: 2, name, repo: repoLabel, branch,
@@ -352,10 +357,12 @@ const announce = () =>
     // cols/rows: the PTY's one true size — web viewers render this grid and
     // scale it to their own page instead of voting to reflow it.
     terms: [
-      ...[...terms.entries()].map(([id, t]) => ({ id, cmd: t.cmd, alive: true, cols: t.term.cols, rows: t.term.rows })),
+      ...[...terms.entries()].map(([id, t]) => ({ id, cmd: t.cmd, alive: true, cols: t.term.cols, rows: t.term.rows, name: termNames[id] || undefined })),
       // Structured sessions advertise kind:'structured' so the web renders the
-      // reader (not xterm) and drives them with code-turn / code-perm.
-      ...[...sessions.entries()].map(([id, s]) => ({ id, cmd: s.cmd, kind: 'structured', alive: true, commands: s.commands })),
+      // reader (not xterm) and drives them with code-turn / code-perm. `mode` +
+      // `name` ride along so a second device shows the live permission mode and
+      // the chosen label instead of defaulting to Normal / unnamed.
+      ...[...sessions.entries()].map(([id, s]) => ({ id, cmd: s.cmd, kind: 'structured', alive: true, commands: s.commands, mode: s.mode || undefined, name: termNames[id] || undefined })),
     ],
   })
 
@@ -820,6 +827,16 @@ channel
   .on('broadcast', { event: 'code-close' }, ({ payload }) => {
     endStructured(payload?.id)
   })
+  // Persist + re-announce terminal renames. The web also echoes term-rename to
+  // online peers directly; storing it here is what reaches a device that joins
+  // LATER (or a second machine) — those only ever see the announce.
+  .on('broadcast', { event: 'term-rename' }, ({ payload }) => {
+    if (!payload?.id) return
+    if (payload.name) termNames[payload.id] = String(payload.name).slice(0, 80)
+    else delete termNames[payload.id]
+    saveNames(room, termNames)
+    announce()
+  })
   .on('broadcast', { event: 'who' }, announce)
   .subscribe(status => {
     if (status === 'SUBSCRIBED') {
@@ -837,7 +854,13 @@ channel
         if (wantStructured(startCmd)) {
           const all = loadAll(room).filter((r) => r.log?.length || r.sessionId)
           if (all.length) for (const rec of all) openStructured({ id: rec.id, resume: canResume(rec) ? rec.sessionId : undefined, log: rec.log, commands: rec.commands, mode: rec.mode })
-          else openStructured({ id: randomUUID() })
+          // Fresh open: ONLY for an explicit `-- <claude>` share. In account mode
+          // (autoAgent set, no attachedCmd) the web's `?new=1` flow opens the first
+          // terminal; opening one here too raced it into TWO terminals — each a
+          // fresh random id, so openStructured's id-dedup couldn't catch it. The
+          // saved-session restore above still runs unconditionally, so a bridge
+          // restart resumes backgrounded sessions regardless of this guard.
+          else if (attachedCmd) openStructured({ id: randomUUID() })
         }
         else {
           // Reuse the prior auto-opened PTY id across restarts so a reconnecting

package/package.json

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

package/session-store.mjs

@@ -83,3 +83,17 @@ export function loadPtyId(room) {
 export function savePtyId(room, id) {
   try { ensureDir(room); fs.writeFileSync(ptyFile(room), String(id)) } catch { /* noop */ }
 }
+
+// Per-room terminal display names (terminal id -> label), set via the web's
+// `term-rename` broadcast. This is what makes a rename CROSS-DEVICE + survive a
+// bridge restart: names were previously web-localStorage only + a live broadcast,
+// so a device that joined later (or a second machine) saw none of them. The bridge
+// stores them here and includes them in every announce. Stored as a single dotfile
+// (NOT *.json) so it never lands in listRecs/loadAll.
+const namesFile = (room) => path.join(dir(room), '.names')
+export function loadNames(room) {
+  try { return JSON.parse(fs.readFileSync(namesFile(room), 'utf8')) || {} } catch { return {} }
+}
+export function saveNames(room, names) {
+  try { ensureDir(room); fs.writeFileSync(namesFile(room), JSON.stringify(names || {})) } catch { /* noop */ }
+}