thinkpool-pair 0.4.0 → 0.5.1

package/bridge.mjs

@@ -7,6 +7,14 @@
      npx thinkpool-pair <ROOM> -- <cmd…>   # share a specific CLI (skip the picker)
      npx thinkpool-pair <ROOM> --headless  # pure relay — terminals open from the web
 
+   v0.5 — continue, don't restart: when the picked agent supports
+   resuming (Claude Code: `--continue` = most recent conversation in
+   THIS directory) and a prior session exists here, the bridge offers to
+   continue it instead of starting fresh — quit your running agent, run
+   the bridge in the same directory, and you're back in the same
+   conversation, now shared. `--continue` / `--fresh` skip the question.
+   (True attach to a live process was ruled out: reptyr-style TTY
+   hijacking is Linux-only and SIP-blocked on macOS.)
    v0.4 — room file drops: files dropped/pasted in the web room download
    to a temp dir here (file-put → file-done) so the agent can read them.
    v0.3 — multi-terminal. The bridge is your machine's presence in the
@@ -49,8 +57,12 @@ catch {
 // Order = display order; Claude Code stays first (the original default). The
 // picker only offers the ones actually installed (PATH probe below). Power
 // users can bypass it entirely with `-- <any command>`.
+// `resume` marks agents where continuing the latest session is a SAFE,
+// verified flag (wrong flags kill the spawn → bridge exits — only add
+// agents after checking the real CLI). probe() must be cheap + read-only;
+// a miss just means "continue" isn't offered.
 const KNOWN_AGENTS = [
-  { label: 'Claude Code', cmd: 'claude' },
+  { label: 'Claude Code', cmd: 'claude', resume: { args: ['--continue'], probe: claudeHasSession } },
   { label: 'Codex CLI',   cmd: 'codex' },
   { label: 'Gemini CLI',  cmd: 'gemini' },
   { label: 'Aider',       cmd: 'aider' },
@@ -62,6 +74,16 @@ const KNOWN_AGENTS = [
   { label: 'Qwen Code',   cmd: 'qwen' },
 ]
 
+// Does Claude Code have a resumable conversation for THIS directory?
+// Sessions live under ~/.claude/projects/<cwd with [/\.:] → '-'> (one
+// subdir per session). Read-only probe; any miss = no "continue" offer.
+function claudeHasSession() {
+  try {
+    const slug = path.resolve(process.cwd()).replace(/[/\\.:]/g, '-')
+    return fs.readdirSync(path.join(os.homedir(), '.claude', 'projects', slug)).length > 0
+  } catch { return false }
+}
+
 // Is `c` on PATH? Pure-Node scan (no `which` subprocess), cross-platform.
 const onPath = (c) => {
   const exts = process.platform === 'win32'
@@ -94,11 +116,23 @@ const pickAgent = (installed) => new Promise((resolve) => {
 
 const argv = process.argv.slice(2)
 const room = (argv[0] || '').toUpperCase().trim()
-if (!room || room.startsWith('-')) { console.error('usage: npx thinkpool-pair <ROOM> [--headless] [-- <command…>]'); process.exit(1) }
+if (!room || room.startsWith('-')) { console.error('usage: npx thinkpool-pair <ROOM> [--headless] [--continue|--fresh] [-- <command…>]'); process.exit(1) }
 const headless = argv.includes('--headless')
 const installedAgents = KNOWN_AGENTS.filter(a => onPath(a.cmd))
 const dashIdx = argv.indexOf('--')
-let attachedCmd = null, attachedArgs = []
+// Own flags are only read from BEFORE `--`; after it, every token belongs
+// to the shared command (`-- claude --continue` must not trip these).
+const ownArgs = dashIdx >= 0 ? argv.slice(0, dashIdx) : argv
+const forceContinue = ownArgs.includes('--continue')
+const forceFresh    = ownArgs.includes('--fresh')
+
+// One yes/no on the bridge's stderr (same channel as the agent picker).
+const askYesNo = (q) => new Promise((resolve) => {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
+  rl.question(q, (ans) => { rl.close(); resolve(!/^n/i.test(String(ans).trim())) })
+})
+
+let attachedCmd = null, attachedArgs = [], continuing = false
 if (dashIdx >= 0) {
   ;[attachedCmd, ...attachedArgs] = argv.slice(dashIdx + 1)
 } else if (!headless) {
@@ -107,6 +141,18 @@ if (dashIdx >= 0) {
     process.exit(1)
   }
   attachedCmd = await pickAgent(installedAgents)
+  // Continue the latest session instead of starting fresh — offered only
+  // when the agent supports it AND a prior session exists in this cwd.
+  // --continue forces it (your call even if the probe misses); --fresh
+  // skips the question; non-TTY stays fresh (no surprise in scripts).
+  const agent = KNOWN_AGENTS.find(a => a.cmd === attachedCmd)
+  if (agent?.resume && !forceFresh) {
+    if (forceContinue) continuing = true
+    else if (process.stdin.isTTY && agent.resume.probe()) {
+      continuing = await askYesNo(`\n  Continue your latest ${agent.label} session in this directory? [Y/n] `)
+    }
+    if (continuing) attachedArgs = [...agent.resume.args]
+  }
 }
 const name = process.env.TP_NAME || os.userInfo().username || 'host'
 
@@ -166,7 +212,15 @@ const announce = () =>
     // updir: where room file-drops land (forward-slash normalised — the web
     // client string-joins host paths onto it; Node accepts `/` on Windows).
     updir: UPDIR.split(path.sep).join('/'),
-    agents: installedAgents,
+    // canResume: this agent can continue a prior session in THIS cwd —
+    // re-probed per announce (a fresh run creates a session, so the flag
+    // can flip true while the bridge is up). Functions don't survive
+    // JSON, so the wire shape is explicit.
+    agents: installedAgents.map(a => {
+      let canResume = false
+      if (a.resume) { try { canResume = a.resume.probe() } catch { /* stays false */ } }
+      return { label: a.label, cmd: a.cmd, canResume }
+    }),
     // 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 })),
@@ -278,8 +332,17 @@ channel
     // Multi-bridge rooms: a targeted open is for ONE machine. Untargeted
     // opens (older web) are taken by whoever hears them — the solo case.
     if (payload.host && payload.host !== name) return
-    openTerm({ id: payload.id, cmd: payload.cmd })
-    process.stderr.write(`\n  ◆ web opened a "${payload.cmd}" terminal (headless).\n`)
+    // resume is a FLAG, never argv: the channel must not pass arbitrary
+    // args even though the room is shell-trust by design. The args come
+    // from our own KNOWN_AGENTS table, probe-gated so `--continue` with
+    // no prior session can't insta-kill the fresh terminal.
+    let args = []
+    if (payload.resume) {
+      const agent = KNOWN_AGENTS.find(a => a.cmd === payload.cmd)
+      if (agent?.resume) { try { if (agent.resume.probe()) args = [...agent.resume.args] } catch { /* fresh */ } }
+    }
+    openTerm({ id: payload.id, cmd: payload.cmd, args })
+    process.stderr.write(`\n  ◆ web opened a "${payload.cmd}"${args.length ? ' (continue)' : ''} terminal (headless).\n`)
   })
   .on('broadcast', { event: 'term-close' }, ({ payload }) => {
     const t = payload?.id && terms.get(payload.id)
@@ -326,7 +389,7 @@ channel
       announce()
       process.stderr.write(headless
         ? `\n  ◆ thinkpool — relaying room ${room} (headless). Open terminals from the web UI.\n\n`
-        : `\n  ◆ thinkpool — sharing "${attachedCmd}" into room ${room}.  Open the web UI and you're both in.\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/package.json

@@ -1,9 +1,11 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
-  "bin": { "thinkpool-pair": "bridge.mjs" },
+  "bin": {
+    "thinkpool-pair": "bridge.mjs"
+  },
   "engines": {
     "node": ">=18"
   },