thinkpool-pair 0.7.334 → 0.7.336

package/account.mjs

@@ -526,6 +526,11 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   // never impersonate a completed restart.
   const BRIDGE_ID = randomUUID()
   let restarting = false   // set by the "restart" broadcast → stop() exits non-zero so a supervisor respawns us
+  // Account-control handlers are registered before the discovery loop is
+  // initialized. Route early requests through a harmless placeholder, then
+  // replace it once `tick` exists; this avoids a temporal-dead-zone crash during
+  // supervisor bootstrap while still letting a live web room request discovery.
+  let requestDiscoveryTick = () => {}
   // Web "attach this session" card → bind an unbound/new room to a local dir (and
   // optionally set it as the account default) so it serves WITHOUT a terminal command.
   // Rides the private, owner-gated control topic; the dir must exist on THIS machine.
@@ -538,7 +543,17 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
     bindDir(code, dir)
     if (payload?.setDefault) { saveDefaultDir(dir); process.stderr.write(`\n  ◆ default project dir set → ${dir}\n`) }
     process.stderr.write(`\n  ◆ ${code} bound → ${dir} (from the web). Serving…\n`)
-    try { tick() } catch { /* the periodic tick will serve it next cycle */ }
+    requestDiscoveryTick()
+  })
+  // A newly-created web room already knows its owner and has an authenticated,
+  // owner-private account-control channel. Nudge discovery immediately instead
+  // of waiting for the supervisor's 15-second reconciliation interval. `tick`
+  // still re-queries owner-owned active rooms, so the browser cannot make this
+  // host serve an arbitrary code.
+  acctControl.on('broadcast', { event: 'serve-room' }, ({ payload }) => {
+    const code = String(payload?.code || '').toUpperCase().trim()
+    if (!/^[A-Z0-9]{4,12}$/.test(code)) return
+    requestDiscoveryTick()
   })
   // Dashboard "Disconnect" → broadcast shutdown → clean exit (presence leaves, bar flips live).
   // If we're the auto-restarting background service (launchd KeepAlive / systemd
@@ -906,6 +921,7 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
     tickingSince = now
     try { await tickBody() } finally { if (tickingSince === now) tickingSince = 0 }
   }
+  requestDiscoveryTick = () => { void tick().catch(() => {}) }
   // Expose for the watchdog to force-unwedge the guard after a reconnect.
   const clearTickGuard = () => { tickingSince = 0 }
   const tickBody = async () => {

package/bridge.mjs

@@ -130,6 +130,7 @@ import { fetchPairControlDeliveryAuthority } from './pair-control-authority.mjs'
 import { SIDE_HANDOFF_PROMPT, SIDE_ROLE_PROMPT, appendSideContext, assistantTextSince, dispatchSideContexts, sideContextBlock, sideSnapshot } from './side-lane.mjs'
 import { planMeterLine } from './plan-meters.mjs'
 import { priceForModel } from './model-prices.mjs'
+import { loadHermesModelCache, saveHermesModelCache } from './hermes-model-cache.mjs'
 import { makeThrottledTrack, recoveryBackoffMs } from './presence.mjs'
 import { MockupDeliveryQueue, completeMockupManifest, isMockupDeliveryBoundary } from './mockup-delivery.mjs'
 import { resolveAnonKey, DEFAULT_SUPABASE_URL } from './supabase-key.mjs'
@@ -140,6 +141,10 @@ import { buildTerminalRolePrompt, HERMES_VISIBLE_WORKER_FALLBACK_RULE, THINKPOOL
 const SUPABASE_URL  = process.env.TP_SUPABASE_URL  || DEFAULT_SUPABASE_URL
 const WEB_BASE      = process.env.TP_WEB_BASE      || 'https://thinkpool.io'
 const IMAGE_QUEUE_CONFIG = imageQueueConfig()
+// Shared by every Hermes lane in this room child and persisted across room
+// children. Without this, each new room must boot ACP (up to 30s) merely to
+// discover the same public model list before its first real turn.
+let hostHermesModels = loadHermesModelCache()
 
 // The anon key is RESOLVED, not baked. It used to be a string literal here, and
 // that literal now sits in 224 published tarballs on 224 users' laptops: disable
@@ -2139,7 +2144,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
     ? spawnDepth
     : (sideParent || (spawnedBy && !String(spawnedBy).startsWith('flow:')) ? 1 : 0)
   const initialHop = Number.isInteger(hop) && hop >= 0 ? hop : structuralDepth
-  const entry = { cmd: runtime, runtime, kind: 'structured', log: Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : [], pending: new Map(), session: null, recovered: false, commands: commandCatalogForRuntime(runtime, commands), mode, effort, models: runtime === 'codex' ? codexModels : runtime === 'hermes' && Array.isArray(models) ? models : undefined,
+  const entry = { cmd: runtime, runtime, kind: 'structured', log: Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : [], 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,
     // 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
@@ -3311,7 +3316,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
         // A custom Anthropic-compatible endpoint may expose its own catalog through the
         // same SDK method. Never publish that as the ROOM's Claude catalog: its models
         // already render in the provider group and otherwise leak under ANTHROPIC.
-        if (entry.runtime === 'hermes' && evt.kind === 'models' && Array.isArray(evt.models) && evt.models.length) { entry.models = evt.models; announce() }
+        if (entry.runtime === 'hermes' && evt.kind === 'models' && Array.isArray(evt.models) && evt.models.length) { entry.models = saveHermesModelCache(evt.models); hostHermesModels = entry.models; announce() }
         else if (onBuiltin && evt.kind === 'models' && Array.isArray(evt.models) && evt.models.length) { roomModels = evt.models; announce() } }
       // Hermes model changes are asynchronous ACP requests. Keep the previous model
       // authoritative until Hermes acknowledges session/set_model; then settle the

package/hermes-model-cache.mjs

@@ -0,0 +1,54 @@
+// Hermes exposes its model catalog only after `session/new`, which may take up
+// to 30 seconds while the ACP process boots. The catalog is public metadata and
+// identical for every room served by this Hermes profile, so keep the last
+// validated copy at the host level. A live Hermes session always replaces it.
+
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+
+const MAX_MODELS = 1000
+const MAX_BYTES = 512 * 1024
+const MAX_FIELD = 512
+
+const cachePath = () => process.env.TP_HERMES_MODEL_CACHE
+  || path.join(process.env.TP_PAIR_ROOT || path.join(os.homedir(), '.thinkpool-pair'), 'hermes-models.json')
+
+export function normalizeHermesModelCache(models) {
+  if (!Array.isArray(models)) return []
+  const seen = new Set()
+  const normalized = []
+  for (const raw of models.slice(0, MAX_MODELS)) {
+    const value = String(raw?.value || '').trim().slice(0, MAX_FIELD)
+    if (!value || seen.has(value)) continue
+    seen.add(value)
+    normalized.push({
+      value,
+      displayName: String(raw?.displayName || value).trim().slice(0, MAX_FIELD) || value,
+      description: String(raw?.description || '').trim().slice(0, MAX_FIELD),
+    })
+  }
+  return normalized
+}
+
+export function loadHermesModelCache() {
+  try {
+    const file = cachePath()
+    if ((Number(fs.statSync(file).size) || 0) > MAX_BYTES) return []
+    const parsed = JSON.parse(fs.readFileSync(file, 'utf8'))
+    return normalizeHermesModelCache(parsed?.models)
+  } catch { return [] }
+}
+
+export function saveHermesModelCache(models) {
+  const normalized = normalizeHermesModelCache(models)
+  if (!normalized.length) return []
+  try {
+    const file = cachePath()
+    fs.mkdirSync(path.dirname(file), { recursive: true })
+    const temp = `${file}.${process.pid}.${Date.now()}.tmp`
+    fs.writeFileSync(temp, JSON.stringify({ savedAt: Date.now(), models: normalized }), { mode: 0o600 })
+    fs.renameSync(temp, file)
+  } catch { /* cache is opportunistic; live discovery remains the fallback */ }
+  return normalized
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.334",
+  "version": "0.7.336",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -36,6 +36,7 @@
     "codex-commands.mjs",
     "acp-client.mjs",
     "hermes-session.mjs",
+    "hermes-model-cache.mjs",
     "hermes-policy.mjs",
     "hermes-acp-bootstrap.py",
     "hermes-event-mapper.mjs",
@@ -113,6 +114,7 @@
     "@anthropic-ai/claude-agent-sdk": "^0.3.198",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@supabase/supabase-js": "^2.45.0",
+    "compromise": "14.16.0",
     "yaml": "2.9.0",
     "zod": "^4.4.3"
   },

package/terminal-name.mjs

@@ -1,4 +1,5 @@
 import { nativeClaudeProviderAccessFailed } from './cross-terminal.mjs'
+import nlp from 'compromise/two'
 
 const SKIP = new Set([
   'a', 'an', 'and', 'are', 'at', 'be', 'can', 'could', 'for', 'from', 'how', 'i',
@@ -18,12 +19,66 @@ const NOISE = /^(?:context|background|for reference|here(?:'s| is)|note|current(
 const EXPLANATION = /^(?:because|cause|since|so that|this is because)\b/i
 const CONSTRAINT = /^(?:users? can still|keep|must|never|should|without)\b/i
 const DEPENDENT_FRAGMENT = /^(?:after|before|by|during|for|from|in|instead(?: of)?|on|through|until|with|without)\b/i
-const INFORMATION_REQUEST = /^(?:which|what|who|where|when|why|how)\b/i
-const NEGATIVE_PREFERENCE = /^(?:(?:i|we)\s+)?(?:do not|don't|dont|would not|wouldn't|won't|wont)\s+(?:(?:want|wanna|need)(?:\s+to)?|use|include|choose)\b|^(?:(?:i|we)\s+)?(?:want|wanna|need)(?:\s+to)?\s+avoid\b/i
 const ISSUE = /\b(?:broken|buggy|crash(?:es|ed|ing)?|duplicate|error|fail(?:s|ed|ing|ure)?|flash(?:es|ed|ing)?|missing|no animation|not working|out of (?:scrollable )?view|stuck|wrong)\b/i
 const REQUEST = /^(?:please\s+)?(?:can|could|would|will)\s+(?:we|you)\b|^(?:please\s+)?(?:how about|let's|let us|we need to|i want you to)\b/i
 const SECRET = /(?<![\p{L}\p{N}])(?:sk-(?:proj-)?[a-z0-9_-]{8,}|gsk_[a-z0-9_-]{8,}|xox[baprs]-[a-z0-9_-]{8,}|gh[pousr]_[a-z0-9_-]{8,}|glpat-[a-z0-9_-]{8,}|npm_[a-z0-9]{24,}|(?:sk|rk)_(?:live|test)_[a-z0-9]{8,}|whsec_[a-z0-9]{8,}|AIza[a-z0-9_-]{8,}|AKIA[A-Z0-9]{12,}|bearer\s+[a-z0-9._-]{8,}|eyJ[a-z0-9_-]{8,}\.[a-z0-9_-]{8,}\.[a-z0-9_-]{8,})(?![\p{L}\p{N}])/giu
 const HANDOFF_MARKER = /^---\s*(?:the person's next message|current person request(?:\s*\([^\n]*\))?|side task)\s*---\s*$/gim
+const QUESTION_WORDS = new Set(['how', 'what', 'when', 'where', 'which', 'who', 'whom', 'whose', 'why'])
+const PREFERENCE_WORDS = new Set(['avoid', 'choose', 'include', 'need', 'use', 'want'])
+const PREFERENCE_OBJECT_WORDS = new Set(['avoid', 'choose', 'include', 'use'])
+
+const conceptsForTerm = (term) => new Set(
+  [term?.text, term?.normal, term?.machine, term?.implicit]
+    .map((value) => String(value || '').trim().toLowerCase())
+    .filter(Boolean),
+)
+
+const analyzeGrammar = (value, suppliedTerms = null) => {
+  const text = String(value || '').trim()
+  const terms = suppliedTerms || nlp(text).json({ terms: true }).flatMap((sentence) => sentence.terms || [])
+  const visible = terms
+    .filter((term) => String(term?.text || '').trim())
+    .map((term) => ({ text: term.text, concepts: conceptsForTerm(term), tags: new Set(term.tags || []) }))
+  const hasQuestionWord = visible.some((term) => [...term.concepts].some((word) => QUESTION_WORDS.has(word)))
+  const taggedQuestionWord = visible.some((term) => term.tags.has('QuestionWord'))
+  const negative = terms.some((term) => Array.isArray(term?.tags) && term.tags.includes('Negative'))
+  const preference = terms.some((term) => [...conceptsForTerm(term)].some((word) => PREFERENCE_WORDS.has(word)))
+  return {
+    text,
+    visible,
+    informationRequest: hasQuestionWord && (taggedQuestionWord || /\?\s*$/.test(text)),
+    negativePreference: negative && preference,
+  }
+}
+
+const parsedClauses = (value) => String(value || '')
+  .replace(/,\s*(?:but|however)\s+/gi, '\n')
+  .split(/\n+|;\s*/)
+  .flatMap((part) => {
+    const text = part.trim()
+    if (!text) return []
+    const sentences = nlp(text).json({ terms: true })
+    return sentences.length
+      ? sentences.map((sentence) => analyzeGrammar(sentence.text, sentence.terms || []))
+      : [analyzeGrammar(text)]
+  })
+  .filter((clause) => clause.text)
+
+const questionSubject = (analysis) => {
+  const index = analysis.visible.findIndex((term) => [...term.concepts].some((word) => QUESTION_WORDS.has(word)))
+  return index >= 0 ? analysis.visible.slice(index + 1).map((term) => term.text).join(' ') : analysis.text
+}
+
+const negativePreferenceSubject = (analysis) => {
+  let index = -1
+  for (let i = 0; i < analysis.visible.length; i++) {
+    if ([...analysis.visible[i].concepts].some((word) => PREFERENCE_OBJECT_WORDS.has(word))) index = i
+  }
+  if (index < 0) {
+    index = analysis.visible.findIndex((term) => [...term.concepts].some((word) => word === 'need' || word === 'want'))
+  }
+  return index >= 0 ? analysis.visible.slice(index + 1).map((term) => term.text).join(' ') : analysis.text
+}
 
 const ACTIONS = Object.freeze([
   { title: 'Fix', score: 100, re: /\b(?:fix|fixes|fixed|fixing|repair|repairs|repaired|repairing)\b/i },
@@ -117,35 +172,31 @@ const explicitIntent = (text) => {
 }
 
 const bestIntentClause = (text) => {
-  const clauses = text
-    .replace(/,\s*(?:but|however)\s+/gi, '\n')
-    .split(/\n+|(?<=[.!?;])\s+/)
-    .map((part) => part.trim())
-    .filter(Boolean)
+  const clauses = parsedClauses(text)
   let best = null
-  for (let i = 0; i < clauses.length; i++) {
-    const clause = clauses[i].replace(/^[-*#>\d.)\s]+/, '').trim()
+  for (const parsed of clauses) {
+    const clause = parsed.text.replace(/^[-*#>\d.)\s]+/, '').trim()
     if (!clause || /^(?:https?:\/\/|\/|[A-Za-z]:\\)/.test(clause)) continue
-    const words = clause.match(/[\p{L}\p{N}][\p{L}\p{N}+#.'-]*/gu) || []
+    const grammar = clause === parsed.text ? parsed : analyzeGrammar(clause)
     const action = bestAction(clause)
     let score = action?.score || 0
     if (REQUEST.test(clause)) score += 18
-    if (INFORMATION_REQUEST.test(clause)) score += 36
+    if (grammar.informationRequest) score += 36
     if (ISSUE.test(clause)) score += /\b(?:crash|fail|flash|stuck|wrong)\w*\b/i.test(clause) ? 36 : 26
-    if (words.length >= 3 && words.length <= 24) score += 10
-    else if (words.length > 40) score -= 14
+    if (grammar.visible.length >= 3 && grammar.visible.length <= 24) score += 10
+    else if (grammar.visible.length > 40) score -= 14
     if (NOISE.test(clause)) score -= 30
     if (EXPLANATION.test(clause)) score -= 34
     if (CONSTRAINT.test(clause)) score -= 45
-    if (NEGATIVE_PREFERENCE.test(clause)) score -= 70
+    if (grammar.negativePreference) score -= 70
     // A short dependent tail such as "From ground up" or "On mobile" adds
     // scope to the preceding request; it is not a standalone task. Recency is
     // deliberately not a signal here: the title should represent the main
     // theme, not whichever sentence happened to come last.
-    if (!action && !REQUEST.test(clause) && !INFORMATION_REQUEST.test(clause) && DEPENDENT_FRAGMENT.test(clause)) score -= 24
+    if (!action && !REQUEST.test(clause) && !grammar.informationRequest && DEPENDENT_FRAGMENT.test(clause)) score -= 24
     if (!best || score > best.score) best = { clause, score }
   }
-  return best?.clause || clauses[0] || null
+  return best?.clause || clauses[0]?.text || null
 }
 
 export function extractTerminalTask(value) {
@@ -210,9 +261,13 @@ const taskTitle = (value) => {
     .replace(/^\s*(?:how about|i (?:do not|don't) know|i guess|i want you to|we need to|your task is to|let(?:'s| us))\s+/i, '')
     .trim()
   if (!body) return null
-  if (NEGATIVE_PREFERENCE.test(body)) return null
-  const informationRequest = INFORMATION_REQUEST.test(body)
-  if (informationRequest) body = body.replace(/^\s*(?:which|what)\s+/i, '').trim()
+  const grammar = analyzeGrammar(body)
+  if (grammar.negativePreference) {
+    const subject = contentWords(negativePreferenceSubject(grammar)).slice(0, 4)
+    return subject.length ? cleanTerminalName(['Avoid', ...subject.map(titleWord)].join(' ')) : null
+  }
+  const informationRequest = grammar.informationRequest
+  if (informationRequest) body = questionSubject(grammar).trim()
   const signalText = body
   body = body
     .replace(/\s*,?\s+(?:so (?:that|you|we|it)\b|because\b|cause\b|if you know what i mean\b)[\s\S]*$/i, '')