thinkpool-pair 0.7.351 → 0.7.353

package/bridge.mjs

@@ -2259,7 +2259,7 @@ function worktreeSnapshot(cwd) {
 // relay STRUCTURED events. onEvent → broadcast `code-event` + print locally +
 // persist to the host file; tool calls round-trip through the perm card; the
 // rolling log replays to joiners and survives bridge restarts (session-store).
-function openStructured({ id, runtime = 'claude', model, models, effort, resume, log, commands, mode, spawnedBy, spawnDepth, cascadeRole, hop, sideParent, sideTask, pendingSideContexts, pendingWorkerCompletions, workerCompletionsInFlight, rolePrompt, sliceType, flowSessionId, flowTaskKey, flowRole, flowReviewTarget, flowReviewTargets, flowReviewSnapshots, flowReviewRound, dispatchBaseSha, revertTarget, cwd, managedWorktree, reviewSliceRoots, openedAt, defer, provider, carryRecap, lastUsage }) {
+function openStructured({ id, runtime = 'claude', model, models, effort, resume, log, commands, mode, spawnedBy, spawnDepth, cascadeRole, hop, sideParent, sideTask, pendingSideContexts, pendingWorkerCompletions, workerCompletionsInFlight, rolePrompt, sliceType, flowSessionId, flowTaskKey, flowRole, flowReviewTarget, flowReviewTargets, flowReviewSnapshots, flowReviewRound, dispatchBaseSha, revertTarget, cwd, managedWorktree, reviewSliceRoots, openedAt, defer, provider, carryRecap, lastUsage, receivedTurnCids }) {
   if (sessions.has(id)) return
   runtime = structuredRuntimeMetadata(runtime) ? runtime : 'claude'
   mode = structuredModeForSlice(runtime, { mode, sliceType, flowRole })
@@ -2302,7 +2302,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
   const restoredRawLog = Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : []
   const restoredLog = boundStructuredLog(restoredRawLog)
   const restoredOffset = restoredRawLog.length - restoredLog.length
-  const entry = { cmd: runtime, runtime, kind: 'structured', log: restoredLog, pending: new Map(), session: null, recovered: false, commands: commandCatalogForRuntime(runtime, commands), mode, effort, models: runtime === 'codex' ? codexModels : runtime === 'hermes' ? (Array.isArray(models) && models.length ? models : hostHermesModels) : undefined,
+  const entry = { cmd: runtime, runtime, kind: 'structured', log: restoredLog, pending: new Map(), receivedTurnCids: new Set(Array.isArray(receivedTurnCids) ? receivedTurnCids.filter(Boolean).slice(-1000) : []), session: null, recovered: false, commands: commandCatalogForRuntime(runtime, commands), mode, effort, models: runtime === 'codex' ? codexModels : runtime === 'hermes' ? (Array.isArray(models) && models.length ? models : hostHermesModels) : undefined,
     // model: truthful active-model label — now the SAME `laneModel` the SDK is given, so the
     // chip cannot disagree with the wire. When this lane runs on a custom (non-anthropic)
     // registered provider the SDK id is impersonated (see the onEvent guard below), so
@@ -2592,7 +2592,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
   // restart. Without this, sessionData omitted it → on restart the resumed session
   // re-launched on the host default (Opus) regardless of the last switch, and the
   // switch looked like it "never changed the model" (Max 2026-07-02). Restored below.
-  const sessionData = () => ({ sessionId: entry.session?.sessionId || null, runtime: entry.runtime, log: entry.log, commands: entry.commands, mode: entry.mode, effort: entry.effort, model: entry.model || null, models: entry.runtime === 'hermes' ? (entry.models || []) : undefined, provider: entry.provider || null, spawnedBy: entry.spawnedBy, spawnDepth: entry.spawnDepth || 0, cascadeRole: entry.cascadeRole || null, hop: entry.hop || 0, sideParent: entry.sideParent, sideTask: entry.sideTask, pendingSideContexts: entry.pendingSideContexts, pendingWorkerCompletions: entry.pendingWorkerCompletions, workerCompletionsInFlight: entry.workerCompletionsInFlight, sliceType: entry.sliceType, flowSessionId: entry.flowSessionId, flowTaskKey: entry.flowTaskKey, flowRole: entry.flowRole || null, flowReviewTargets: entry.flowReviewTargets || [], flowReviewSnapshots: entry.flowReviewSnapshots || [], flowReviewRound: entry.flowReviewRound || 0, dispatchBaseSha: entry.dispatchBaseSha || null, cwd: entry.cwd, managedWorktree: entry.managedWorktree, rolePrompt: entry.rolePrompt, flowReviewTarget: entry.flowReviewTarget || null, revertTarget: entry.revertTarget || null, reviewSliceRoots: entry.reviewSliceRoots || [], openedAt: entry.openedAt || null, lastUsage: entry.lastUsage || null, carryRecap: entry.pendingRecap || null })
+  const sessionData = () => ({ sessionId: entry.session?.sessionId || null, runtime: entry.runtime, log: entry.log, commands: entry.commands, mode: entry.mode, effort: entry.effort, model: entry.model || null, models: entry.runtime === 'hermes' ? (entry.models || []) : undefined, provider: entry.provider || null, spawnedBy: entry.spawnedBy, spawnDepth: entry.spawnDepth || 0, cascadeRole: entry.cascadeRole || null, hop: entry.hop || 0, sideParent: entry.sideParent, sideTask: entry.sideTask, pendingSideContexts: entry.pendingSideContexts, pendingWorkerCompletions: entry.pendingWorkerCompletions, workerCompletionsInFlight: entry.workerCompletionsInFlight, sliceType: entry.sliceType, flowSessionId: entry.flowSessionId, flowTaskKey: entry.flowTaskKey, flowRole: entry.flowRole || null, flowReviewTargets: entry.flowReviewTargets || [], flowReviewSnapshots: entry.flowReviewSnapshots || [], flowReviewRound: entry.flowReviewRound || 0, dispatchBaseSha: entry.dispatchBaseSha || null, cwd: entry.cwd, managedWorktree: entry.managedWorktree, rolePrompt: entry.rolePrompt, flowReviewTarget: entry.flowReviewTarget || null, revertTarget: entry.revertTarget || null, reviewSliceRoots: entry.reviewSliceRoots || [], openedAt: entry.openedAt || null, lastUsage: entry.lastUsage || null, carryRecap: entry.pendingRecap || null, receivedTurnCids: [...entry.receivedTurnCids].slice(-1000) })
   const persist = () => saveSession(room, id, sessionData())
   // Synchronous flush of this session's record. Used on open (so a brand-new session
   // has a file under its id BEFORE its first event — surviving a restart inside the
@@ -4481,6 +4481,30 @@ channel
     // and close it. Re-check identity after the await in case the lane was closed.
     await waitForAbortBarrier(s)
     if (sessions.get(payload.term) !== s || !s.session) return
+    // Mobile can suspend after showing its optimistic row but before this frame
+    // is consumed. The browser therefore retries by cid until this explicit,
+    // bridge-authored receipt arrives. Collapse every retry before dispatch:
+    // in-memory receipts cover concurrent/live duplicates and the persisted log
+    // covers an ack lost across a bridge reconnect/restart.
+    const turnCid = payload.cid && String(payload.cid)
+    if (turnCid) {
+      if (!s.receivedTurnCids) s.receivedTurnCids = new Set()
+      const alreadyReceived = s.receivedTurnCids.has(turnCid)
+        || s.log?.some((event) => event?.cid === turnCid && (event.kind === 'you' || event.kind === 'control'))
+      if (!alreadyReceived) {
+        s.receivedTurnCids.add(turnCid)
+        if (s.receivedTurnCids.size > 1000) {
+          const oldest = s.receivedTurnCids.values().next().value
+          s.receivedTurnCids.delete(oldest)
+        }
+        // Persist the idempotency key before acknowledging it. If the bridge
+        // restarts after this receipt but before the browser observes the ack,
+        // the browser's retry is still collapsed instead of running twice.
+        s.flush?.()
+      }
+      bcast('code-turn-ack', { term: payload.term, cid: turnCid, duplicate: alreadyReceived })
+      if (alreadyReceived) return
+    }
     markActivity()
     // B2/C: a real human turn is hop 0 with fresh cross-terminal budgets. This is
     // the loop-breaker reset point — an injected (cross-posted) turn does NOT come
@@ -4910,7 +4934,7 @@ channel
             // FL-M6 — restore the flow context (id/role/cwd) so an in-flight flow survives a
             // bridge restart: the conductor keeps its subagent-block + plan interception, and
             // lanes keep their worktree cwd + the ability to mark done.
-            openStructured({ id: rec.id, runtime: rec.runtime || 'claude', model: rec.model || undefined, models: rec.models, effort: rec.effort, provider: rec.runtime === 'claude' ? rec.provider || undefined : undefined, resume: resumable ? rec.sessionId : undefined, log: rec.log, commands: rec.commands, mode: rec.mode, spawnedBy: rec.spawnedBy, spawnDepth: rec.spawnDepth, cascadeRole: rec.cascadeRole, hop: rec.hop, sideParent: rec.sideParent, sideTask: rec.sideTask, pendingSideContexts: rec.pendingSideContexts, pendingWorkerCompletions: rec.pendingWorkerCompletions, workerCompletionsInFlight: rec.workerCompletionsInFlight, sliceType: rec.sliceType, flowSessionId: rec.flowSessionId, flowTaskKey: rec.flowTaskKey, flowRole: rec.flowRole, flowReviewTarget: rec.flowReviewTarget, flowReviewTargets: rec.flowReviewTargets, flowReviewSnapshots: rec.flowReviewSnapshots, flowReviewRound: rec.flowReviewRound, dispatchBaseSha: rec.dispatchBaseSha, revertTarget: rec.revertTarget, cwd: rec.cwd, managedWorktree: rec.managedWorktree, rolePrompt: rec.rolePrompt, reviewSliceRoots: rec.reviewSliceRoots, openedAt: rec.openedAt, lastUsage: rec.lastUsage, carryRecap: wasInterrupted ? recoveryRecap : rec.carryRecap,
+            openStructured({ id: rec.id, runtime: rec.runtime || 'claude', model: rec.model || undefined, models: rec.models, effort: rec.effort, provider: rec.runtime === 'claude' ? rec.provider || undefined : undefined, resume: resumable ? rec.sessionId : undefined, log: rec.log, commands: rec.commands, mode: rec.mode, spawnedBy: rec.spawnedBy, spawnDepth: rec.spawnDepth, cascadeRole: rec.cascadeRole, hop: rec.hop, sideParent: rec.sideParent, sideTask: rec.sideTask, pendingSideContexts: rec.pendingSideContexts, pendingWorkerCompletions: rec.pendingWorkerCompletions, workerCompletionsInFlight: rec.workerCompletionsInFlight, sliceType: rec.sliceType, flowSessionId: rec.flowSessionId, flowTaskKey: rec.flowTaskKey, flowRole: rec.flowRole, flowReviewTarget: rec.flowReviewTarget, flowReviewTargets: rec.flowReviewTargets, flowReviewSnapshots: rec.flowReviewSnapshots, flowReviewRound: rec.flowReviewRound, dispatchBaseSha: rec.dispatchBaseSha, revertTarget: rec.revertTarget, cwd: rec.cwd, managedWorktree: rec.managedWorktree, rolePrompt: rec.rolePrompt, reviewSliceRoots: rec.reviewSliceRoots, openedAt: rec.openedAt, lastUsage: rec.lastUsage, receivedTurnCids: rec.receivedTurnCids, carryRecap: wasInterrupted ? recoveryRecap : rec.carryRecap,
               // Lazy-boot restored terminals that were IDLE + not part of a flow: their transcript
               // shows immediately; the query boots on first turn. Mid-turn + flow terminals boot now
               // (mid-turn needs auto-resume; flow needs its lane live).

package/codex-event-mapper.mjs

@@ -30,9 +30,11 @@
 // path routes command/file approval requests through the shared room cards.
 import fs from 'node:fs'
 import { CODEX_COMMAND_CATALOG } from './codex-commands.mjs'
+import { normalizeEditKind, summarizeTextDiff } from './edit-diff.mjs'
 
 const safeMcpPart = (value) => String(value || 'unknown').replace(/[^a-zA-Z0-9_-]/g, '_')
 const mcpToolName = (item) => `mcp__${safeMcpPart(item?.server)}__${safeMcpPart(item?.tool)}`
+const webSearchQuery = (item) => item?.query || item?.action?.query || item?.action?.url || ''
 const resultText = (value) => {
   if (typeof value === 'string') return value
   if (value == null) return ''
@@ -99,15 +101,16 @@ export class CodexEventMapper {
           this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: 'Bash', input: { command: it.command || '' } }], parentToolUseId: null })
         } else if (it.type === 'file_change') {
           const before = (it.changes || []).map((c) => {
+            const kind = normalizeEditKind(c.kind)
             let content = ''
-            if (c.kind !== 'add' && c.path) {
+            if (kind !== 'add' && c.path) {
               try { content = this._fs.readFileSync(c.path, 'utf8') } catch { /* missing/unreadable → empty */ }
             }
-            return { path: c.path || '', kind: c.kind || 'update', content }
+            return { path: c.path || '', kind, content }
           })
           this._fileBefore.set(it.id, before)
         } else if (it.type === 'web_search') {
-          this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: 'WebSearch', input: { query: it.query || '' } }], parentToolUseId: null })
+          this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: 'WebSearch', input: { query: webSearchQuery(it) } }], parentToolUseId: null })
         } else if (it.type === 'mcp_tool_call') {
           this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name: mcpToolName(it), input: it.arguments || {} }], parentToolUseId: null })
         }
@@ -137,7 +140,17 @@ export class CodexEventMapper {
             if (c.kind !== 'delete' && c.path) {
               try { next = this._fs.readFileSync(c.path, 'utf8') } catch { /* deleted/unreadable → empty */ }
             }
-            return { file_path: c.path, path: c.path, old_string: c.content, new_string: next, kind: c.kind }
+            const summary = summarizeTextDiff(c.content, next, { context: 2, maxLines: 60 })
+            return {
+              file_path: c.path,
+              path: c.path,
+              kind: c.kind,
+              added: summary.added,
+              removed: summary.removed,
+              diff_preview: summary.preview,
+              old_string: c.content,
+              new_string: next,
+            }
           })
           const first = edits[0] || { file_path: '', path: '', old_string: '', new_string: '', kind: 'update' }
           const name = edits.length > 1 ? 'MultiEdit' : first.kind === 'add' ? 'Write' : 'Edit'
@@ -149,7 +162,8 @@ export class CodexEventMapper {
           this._emit({ kind: 'assistant', blocks: [{ type: 'tool_use', id: it.id, name, input }], parentToolUseId: null })
           this._emit({ kind: 'tool_result', toolUseId: it.id, content: [{ type: 'text', text: `${name === 'Write' ? 'wrote' : 'edited'} ${first.path}` }], isError: false, durationMs, parentToolUseId: null })
         } else if (it.type === 'web_search') {
-          this._emit({ kind: 'tool_result', toolUseId: it.id, content: [{ type: 'text', text: it.query || 'search completed' }], isError: false, durationMs, parentToolUseId: null })
+          const query = webSearchQuery(it)
+          this._emit({ kind: 'tool_result', toolUseId: it.id, toolInput: { query }, content: [{ type: 'text', text: query || 'search completed' }], isError: false, durationMs, parentToolUseId: null })
         } else if (it.type === 'mcp_tool_call') {
           this._emit({ kind: 'tool_result', toolUseId: it.id, content: [{ type: 'text', text: it.error?.message || resultText(it.result) }], isError: it.status === 'failed' || !!it.error, durationMs, parentToolUseId: null })
         }

package/edit-diff.mjs

@@ -0,0 +1,136 @@
+// Bridge-local diff primitives. Keep this module self-contained: the npm
+// package cannot import the web app's ../src tree.
+export const normalizeEditKind = (value) => {
+  const kind = typeof value === 'object' ? value?.type : value
+  if (kind === 'add' || kind === 'delete' || kind === 'rename') return kind
+  return 'update'
+}
+
+const splitLines = (value) => {
+  if (!value) return []
+  const lines = String(value).replace(/\r\n?/g, '\n').split('\n')
+  if (lines.at(-1) === '') lines.pop()
+  return lines
+}
+
+const fallbackDiff = (before, after) => {
+  let start = 0
+  while (start < before.length && start < after.length && before[start] === after[start]) start++
+  let oldEnd = before.length
+  let newEnd = after.length
+  while (oldEnd > start && newEnd > start && before[oldEnd - 1] === after[newEnd - 1]) {
+    oldEnd--
+    newEnd--
+  }
+  return [
+    ...before.slice(0, start).map((text) => ({ type: 'context', text })),
+    ...before.slice(start, oldEnd).map((text) => ({ type: 'remove', text })),
+    ...after.slice(start, newEnd).map((text) => ({ type: 'add', text })),
+    ...before.slice(oldEnd).map((text) => ({ type: 'context', text })),
+  ]
+}
+
+function lineDiff(before, after, maxDistance = 600) {
+  if (!before.length) return after.map((text) => ({ type: 'add', text }))
+  if (!after.length) return before.map((text) => ({ type: 'remove', text }))
+  const max = Math.min(before.length + after.length, maxDistance)
+  const frontier = new Map([[1, 0]])
+  const trace = []
+  for (let distance = 0; distance <= max; distance++) {
+    trace.push(new Map(frontier))
+    for (let diagonal = -distance; diagonal <= distance; diagonal += 2) {
+      const down = frontier.get(diagonal + 1) ?? -1
+      const right = frontier.get(diagonal - 1) ?? -1
+      let oldIndex = diagonal === -distance || (diagonal !== distance && right < down)
+        ? Math.max(0, down)
+        : Math.max(0, right + 1)
+      let newIndex = oldIndex - diagonal
+      while (oldIndex < before.length && newIndex < after.length && before[oldIndex] === after[newIndex]) {
+        oldIndex++
+        newIndex++
+      }
+      frontier.set(diagonal, oldIndex)
+      if (oldIndex < before.length || newIndex < after.length) continue
+
+      const operations = []
+      let x = before.length
+      let y = after.length
+      for (let d = distance; d >= 0; d--) {
+        const snapshot = trace[d]
+        const k = x - y
+        const snapshotDown = snapshot.get(k + 1) ?? -1
+        const snapshotRight = snapshot.get(k - 1) ?? -1
+        const previousK = k === -d || (k !== d && snapshotRight < snapshotDown) ? k + 1 : k - 1
+        const previousX = Math.max(0, snapshot.get(previousK) ?? 0)
+        const previousY = previousX - previousK
+        while (x > previousX && y > previousY) {
+          operations.push({ type: 'context', text: before[x - 1] })
+          x--
+          y--
+        }
+        if (d === 0) break
+        if (x === previousX) {
+          operations.push({ type: 'add', text: after[y - 1] })
+          y--
+        } else {
+          operations.push({ type: 'remove', text: before[x - 1] })
+          x--
+        }
+      }
+      return operations.reverse()
+    }
+  }
+  return fallbackDiff(before, after)
+}
+
+const previewLine = (type, text = '') => {
+  if (type === 'add') return `+${text}`
+  if (type === 'remove') return `-${text}`
+  if (type === 'context') return ` ${text}`
+  return `…${text}`
+}
+
+function compactOperations(operations, context = 2, maxLines = 80) {
+  const changed = []
+  operations.forEach((operation, index) => {
+    if (operation.type !== 'context') changed.push(index)
+  })
+  if (!changed.length) return []
+
+  const ranges = []
+  for (const index of changed) {
+    const start = Math.max(0, index - context)
+    const end = Math.min(operations.length, index + context + 1)
+    const previous = ranges.at(-1)
+    if (previous && start <= previous.end) previous.end = Math.max(previous.end, end)
+    else ranges.push({ start, end })
+  }
+
+  const compacted = []
+  ranges.forEach((range, index) => {
+    if (index > 0) compacted.push({ type: 'omit', text: `${range.start - ranges[index - 1].end} unchanged lines` })
+    compacted.push(...operations.slice(range.start, range.end))
+  })
+  if (compacted.length <= maxLines) return compacted
+
+  const head = Math.floor((maxLines - 1) / 2)
+  const tail = maxLines - head - 1
+  return [
+    ...compacted.slice(0, head),
+    { type: 'omit', text: `${compacted.length - head - tail} preview lines hidden` },
+    ...compacted.slice(-tail),
+  ]
+}
+
+export function summarizeTextDiff(oldText, newText, options = {}) {
+  const operations = lineDiff(splitLines(oldText), splitLines(newText), options.maxDistance)
+  const added = operations.reduce((total, operation) => total + (operation.type === 'add' ? 1 : 0), 0)
+  const removed = operations.reduce((total, operation) => total + (operation.type === 'remove' ? 1 : 0), 0)
+  const lines = compactOperations(operations, options.context ?? 2, options.maxLines ?? 80)
+  return {
+    added,
+    removed,
+    lines,
+    preview: lines.map((line) => previewLine(line.type, line.text)).join('\n'),
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.351",
+  "version": "0.7.353",
   "description": "Connect Claude Code, Codex, or Hermes on your computer to a Thinkpool Code room.",
   "type": "module",
   "bin": {
@@ -34,6 +34,7 @@
     "codex-mcp-http.mjs",
     "lane-worktree.mjs",
     "codex-event-mapper.mjs",
+    "edit-diff.mjs",
     "cumulative-event-relay.mjs",
     "codex-commands.mjs",
     "acp-client.mjs",

package/terminal-name.mjs

@@ -224,7 +224,7 @@ export function cleanTerminalName(value) {
   const words = name.split(/\s+/).filter(Boolean)
   const compactCjk = words.length === 1
     && /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]/u.test(name)
-  if ((words.length < 2 && !compactCjk) || words.length > 4) return null
+  if ((words.length < 2 && !compactCjk) || words.length > 3) return null
   return name || null
 }
 
@@ -268,7 +268,7 @@ const taskTitle = (value) => {
   if (!body) return null
   const grammar = analyzeGrammar(body)
   if (grammar.negativePreference) {
-    const subject = contentWords(negativePreferenceSubject(grammar)).slice(0, 3)
+    const subject = contentWords(negativePreferenceSubject(grammar)).slice(0, 2)
     return subject.length ? cleanTerminalName(['Avoid', ...subject.map(titleWord)].join(' ')) : null
   }
   const informationRequest = grammar.informationRequest
@@ -286,11 +286,11 @@ const taskTitle = (value) => {
   if (!verb && /\bopen(?:s|ed|ing)?\b/i.test(body)) verb = 'Open'
 
   if (/\bautomatic(?:ally)?\b[\s\S]{0,24}\bnam(?:e|ing)\b/i.test(signalText) && /\bterminals?\b/i.test(signalText)) {
-    if (/\bcontext\b[\s\S]{0,24}\broom\b|\broom\b[\s\S]{0,24}\bcontext\b/i.test(signalText)) return 'Auto-Name Terminals From Context'
+    if (/\bcontext\b[\s\S]{0,24}\broom\b|\broom\b[\s\S]{0,24}\bcontext\b/i.test(signalText)) return 'Contextual Terminal Names'
     verb = 'Auto-Name'
   }
-  if (verb === 'Snap' && /\bterminal row\b/i.test(signalText) && /\bview\b/i.test(signalText)) return 'Snap Terminal Row View'
-  if (verb === 'Snap' && /\bclicked terminal\b/i.test(signalText) && /\bview\b/i.test(signalText)) return 'Snap Clicked Terminal View'
+  if (verb === 'Snap' && /\bterminal row\b/i.test(signalText) && /\bview\b/i.test(signalText)) return 'Snap Terminal Row'
+  if (verb === 'Snap' && /\bclicked terminal\b/i.test(signalText) && /\bview\b/i.test(signalText)) return 'Snap Clicked Terminal'
 
   let domain = []
   let objectText = body
@@ -311,7 +311,7 @@ const taskTitle = (value) => {
   }
   const picked = [...domain, ...object]
     .filter((word, index, all) => all.findIndex((other) => other.toLowerCase() === word.toLowerCase()) === index)
-    .slice(0, verb ? 3 : 4)
+    .slice(0, verb ? 2 : 3)
   if (!picked.length) return null
   return cleanTerminalName([verb, ...picked.map(titleWord)].filter(Boolean).join(' '))
 }