thinkpool-pair 0.6.3 → 0.6.5

package/bridge.mjs

@@ -327,7 +327,7 @@ function openStructured({ id, model, resume }) {
     },
     requestPermission: (req) => new Promise((resolve) => {
       entry.pending.set(req.id, resolve)
-      bcast('code-perm-req', { term: id, id: req.id, toolName: req.toolName, input: req.input, risk: req.risk })
+      bcast('code-perm-req', { term: id, id: req.id, toolName: req.toolName, input: req.input, risk: req.risk, plan: req.plan })
     }),
   })
   announce()
@@ -444,22 +444,36 @@ channel
   })
   .on('broadcast', { event: 'code-turn' }, ({ payload }) => {
     const s = payload?.term && sessions.get(payload.term)
-    if (s && payload.text != null) {
-      s.session.sendTurn(payload.text)
-      // Echo the turn so BOTH readers (and late joiners, via the log) show who
-      // said what — UNLESS silent (an @pool synthesis, which renders as its own
-      // 'pool' line). The sender rendered it optimistically; partner gets this.
-      if (!payload.silent) {
-        const evt = { kind: 'you', text: payload.text, cid: payload.cid, by: payload.by }
-        s.log.push(evt); if (s.log.length > STRUCTURED_LOG_MAX) s.log.shift()
-        bcast('code-event', { term: payload.term, evt })
-      }
+    if (!s || payload.text == null) return
+    const text = String(payload.text)
+    // Echo the turn so BOTH readers (and late joiners, via the log) show who
+    // said what — UNLESS silent (an @pool synthesis, which renders its own line).
+    const echoYou = () => {
+      if (payload.silent) return
+      const evt = { kind: 'you', text, cid: payload.cid, by: payload.by }
+      s.log.push(evt); if (s.log.length > STRUCTURED_LOG_MAX) s.log.shift()
+      bcast('code-event', { term: payload.term, evt })
+    }
+    // Most slash commands (/compact, /clear, …) are processed by the SDK when
+    // sent as a turn. Two need special handling:
+    //  • /model <name> is disabled headless → route to the setModel control.
+    //  • /clear also wipes the on-screen transcript (parity with the CLI).
+    const mm = text.match(/^\/model\b\s*(\S+)?/)
+    if (mm) { echoYou(); if (mm[1]) s.session.setModel(mm[1]); else s.session.listModels(); return }
+    if (/^\/clear\s*$/.test(text)) {
+      echoYou(); s.session.sendTurn(text)
+      s.log = []; bcast('code-event', { term: payload.term, evt: { kind: 'clear' } })
+      return
     }
+    s.session.sendTurn(text)
+    echoYou()
   })
   .on('broadcast', { event: 'code-perm' }, ({ payload }) => {
     const s = payload?.term && sessions.get(payload.term)
     const resolve = s && payload.id && s.pending.get(payload.id)
-    if (resolve) { s.pending.delete(payload.id); resolve(payload.decision === 'deny' ? 'deny' : 'allow') }
+    // Pass the raw decision through — normal tools use allow/deny, plan cards
+    // use run/accept/keep (claude-session interprets). Default deny on missing.
+    if (resolve) { s.pending.delete(payload.id); resolve(payload.decision || 'deny') }
   })
   .on('broadcast', { event: 'code-abort' }, ({ payload }) => {
     const s = payload?.term && sessions.get(payload.term)

package/claude-session.mjs

@@ -101,6 +101,24 @@ export function startClaudeSession({ cwd, model, resume, onEvent, requestPermiss
   const preTool = async (hookInput) => {
     const toolName = hookInput.tool_name
     const toolInput = hookInput.tool_input
+    // ── Plan approval — ExitPlanMode is how the agent presents its plan in
+    // plan mode. Render a dedicated plan card (not the generic perm card) with
+    // three outcomes: run (exit → default), accept (exit → acceptEdits), keep
+    // (deny → stay planning). On approval we flip the SDK permission mode so
+    // subsequent tools actually execute.
+    if (toolName === 'ExitPlanMode') {
+      let choice = 'keep'
+      try { choice = await requestPermission?.({ id: randomUUID(), toolName, input: toolInput, risk: 'plan', plan: toolInput?.plan || '' }) ?? 'keep' }
+      catch { choice = 'keep' }
+      if (choice === 'run' || choice === 'accept') {
+        const next = choice === 'accept' ? 'acceptEdits' : 'default'
+        mode = next
+        try { await q?.setPermissionMode?.(next) } catch { /* only valid mid-stream */ }
+        emit({ kind: 'mode', mode: next })
+        return { continue: true, hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'allow', permissionDecisionReason: `Plan approved in the ThinkPool room — proceed (${next} mode).` } }
+      }
+      return { continue: true, hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'deny', permissionDecisionReason: 'The user chose "keep planning" in the ThinkPool room. Do not exit plan mode — keep refining the plan, then call ExitPlanMode again when ready.' } }
+    }
     const risk = classifyRisk(toolName, toolInput)
     const auto =
       risk === 'low' ||
@@ -181,6 +199,19 @@ export function startClaudeSession({ cwd, model, resume, onEvent, requestPermiss
       try { await q?.setPermissionMode?.(m) } catch { /* only valid mid-stream */ }
       emit({ kind: 'mode', mode })
     },
+    // /model is disabled in headless SDK — switch via the setModel control
+    // instead, and echo a note line so both drivers see the change.
+    async setModel(m) {
+      try { await q?.setModel?.(m) } catch { /* may reject unknown model */ }
+      emit({ kind: 'note', text: `model → ${m}` })
+    },
+    async listModels() {
+      try {
+        const ms = await q?.supportedModels?.()
+        const names = (ms || []).map((x) => x.model || x.id || x.name).filter(Boolean)
+        emit({ kind: 'note', text: names.length ? `models: ${names.join(', ')}` : 'no model list available' })
+      } catch { emit({ kind: 'note', text: 'usage: /model <name>' }) }
+    },
     // Graceful interrupt (Esc / Stop) — stops the current turn but keeps the
     // session alive for the next one. ac.abort() is teardown only (end()).
     async abort() { try { await q?.interrupt?.() } catch { /* noop */ } },

package/package.json

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