thinkpool-pair 0.7.227 → 0.7.229

package/bridge.mjs

@@ -66,7 +66,7 @@ import { writeLaneArtifact, digestSlice, appendDigest, resumeLane } from './flow
 import { createFlowWorktree, worktreeSpec } from './flow-worktree.mjs'
 import { startPreview, stopAllPreviews, previews } from './flow-preview.mjs'
 import { ViewportManager, createViewportTools, sharedViewportBrowser } from './viewport.mjs'
-import { designPrompt, materializeDesignAsset, resolveDesignSource, resolveManifestDesignSource, restoreDesignSources, syncRealtimeAuth, validateDesignRequest } from './design-edit.mjs'
+import { deleteDesignAssetDraft, designPrompt, materializeDesignAsset, resolveDesignSource, resolveManifestDesignSource, restoreDesignSources, syncRealtimeAuth, validateDesignBatchRequest } from './design-edit.mjs'
 // FL-M9 — per-lane preview servers leak (one per done lane, never stopped until shutdown).
 // Lane previews are keyed `lane:<flowId>:<laneId>`; stop a whole flow's set when it assembles
 // (the assembled preview supersedes them) or when a lane is reverted.
@@ -1288,7 +1288,15 @@ function pumpDesign(term) {
     : next.request.mode === 'move' ? 'move element'
       : next.request.mode === 'image' ? 'replace image'
         : next.request.intent
-  const visible = { kind: 'you', text: `Design edit · ${next.request.target.name || next.request.target.tag}: ${action}`, cid: next.request.cid, by: next.by }
+  const batchCount = next.request.mode === 'batch' ? next.request.edits.length : 0
+  const visible = {
+    kind: 'you',
+    text: batchCount
+      ? `Design batch · ${batchCount} pooled edit${batchCount === 1 ? '' : 's'}`
+      : `Design edit · ${next.request.target.name || next.request.target.tag}: ${action}`,
+    cid: next.request.cid,
+    by: next.by,
+  }
   stampEvent(visible); pushLog(lane, visible); bcast('code-event', { term, evt: visible })
   try { lane.session.sendTurn(designPrompt({ record: next.record, request: next.request, by: next.by, restore: !!next.restoreRecord, priorRecord: next.restoreRecord })) }
   catch { finishDesign(term, 'failed', { message: 'The producing lane could not start the edit.' }) }
@@ -3991,39 +3999,48 @@ designChannel
     designChannel.send({ type: 'broadcast', event: 'design-capability-res', payload: { previewId: String(payload?.previewId || ''), revision: String(payload?.revision || ''), ok } })
   })
   .on('broadcast', { event: 'design-apply' }, async ({ payload }) => {
-    const verdict = validateDesignRequest(payload, designArtifacts, room)
+    const verdict = validateDesignBatchRequest(payload, designArtifacts, room)
     const previewId = String(payload?.previewId || '')
     const requestId = String(payload?.cid || '').slice(0, 80)
     if (!verdict.ok) {
-      designStatus({ previewId, requestId, state: verdict.error === 'stale-preview' ? 'stale' : 'failed', message: verdict.error })
+      const prefix = Number.isSafeInteger(verdict.editIndex) ? `Edit ${verdict.editIndex + 1}: ` : ''
+      designStatus({ previewId, requestId, state: verdict.error === 'stale-preview' ? 'stale' : 'failed', message: `${prefix}${verdict.error}` })
       return
     }
     if (!requestId || seenDesignRequests.has(requestId)) return
     seenDesignRequests.add(requestId)
     if (seenDesignRequests.size > 500) seenDesignRequests.delete(seenDesignRequests.values().next().value)
-    if (verdict.request.mode === 'image') {
+    const term = verdict.record.term
+    const queue = designQueues.get(term) || []
+    designQueues.set(term, queue)
+    if (queue.length >= 8) {
+      designStatus({ previewId, requestId, state: 'failed', message: 'Too many Design batches are queued for this lane.' })
+      return
+    }
+    const edits = verdict.request.mode === 'batch' ? verdict.request.edits : [verdict.request]
+    const materializedDrafts = []
+    for (let index = 0; index < edits.length; index++) {
+      const edit = edits[index]
+      if (edit.mode !== 'image') continue
       const localPath = await materializeDesignAsset({
         webBase: WEB_BASE,
         token: codeAuthToken,
         room,
-        asset: verdict.request.asset,
-        requestId,
+        asset: edit.asset,
+        requestId: `${requestId}-${index + 1}`,
+        cleanup: false,
       })
       if (!localPath) {
-        designStatus({ previewId, requestId, state: 'failed', message: 'The private image draft could not be opened.' })
+        designStatus({ previewId, requestId, state: 'failed', message: `Edit ${index + 1}: The private image draft could not be opened.` })
         return
       }
-      verdict.request.asset.localPath = localPath
-    }
-    const term = verdict.record.term
-    const queue = designQueues.get(term) || []
-    designQueues.set(term, queue)
-    if (queue.length >= 8) {
-      designStatus({ previewId, requestId, state: 'failed', message: 'Too many Design edits are queued for this lane.' })
-      return
+      edit.asset.localPath = localPath
+      materializedDrafts.push(edit.asset.path)
     }
+    await Promise.all(materializedDrafts.map((assetPath) => deleteDesignAssetDraft({ webBase: WEB_BASE, token: codeAuthToken, room, path: assetPath })))
     queue.push({ ...verdict, by: 'A room member' })
-    designStatus({ previewId, requestId, state: 'queued' })
+    const batchCount = verdict.request.mode === 'batch' ? verdict.request.edits.length : 1
+    designStatus({ previewId, requestId, state: 'queued', message: `${batchCount} edit${batchCount === 1 ? '' : 's'} pooled to the producing lane.` })
     pumpDesign(term)
   })
   .on('broadcast', { event: 'design-restore' }, ({ payload }) => {
@@ -4044,7 +4061,7 @@ designChannel
       designStatus({ previewId, requestId, state: 'failed', message: 'Too many Design edits are queued for this lane.' })
       return
     }
-    queue.push({ record, restoreRecord: restore.priorRecord, request: { previewId, revision: record.revision, mode: 'restore', intent: 'restore previous verified revision', target: restore.request.target, cid: requestId }, by: 'A room member' })
+    queue.push({ record, restoreRecord: restore.priorRecord, request: { previewId, revision: record.revision, mode: 'restore', intent: 'restore previous verified revision', target: restore.request.target || { selector: 'html', tag: 'artifact', name: `${restore.request.edits?.length || 1} pooled edits` }, cid: requestId }, by: 'A room member' })
     designStatus({ previewId, requestId, state: 'queued', message: 'Restore queued in the producing lane.' })
     pumpDesign(record.term)
   })

package/codex-event-mapper.mjs

@@ -37,6 +37,14 @@ const resultText = (value) => {
   if (value == null) return ''
   try { return JSON.stringify(value) } catch { return String(value) }
 }
+// Codex uses both `message: string` and `message: { message: string }` across
+// its exec/app-server error paths. Room events must keep `message` scalar: an
+// object persists successfully but crashes React when that transcript replays.
+const errorText = (value, fallback) => {
+  if (typeof value === 'string' && value.trim()) return value
+  if (value && typeof value === 'object' && typeof value.message === 'string' && value.message.trim()) return value.message
+  return resultText(value) || fallback
+}
 
 export class CodexEventMapper {
   /**
@@ -187,13 +195,13 @@ export class CodexEventMapper {
       }
 
       case 'turn.failed': {
-        this._emit({ kind: 'error', message: ev.message || ev.error || 'codex turn failed', recoverable: true })
+        this._emit({ kind: 'error', message: errorText(ev.message ?? ev.error, 'codex turn failed'), recoverable: true })
         this._emit({ kind: 'result', subtype: 'error_during_execution', sessionId: this._sessionId, model: this._model, costUsd: null, usage: null, numTurns: 1, durationMs: undefined, denials: 0, resultText: null })
         return
       }
 
       case 'error':
-        this._emit({ kind: 'error', message: ev.message || ev.error || 'codex error', recoverable: true })
+        this._emit({ kind: 'error', message: errorText(ev.message ?? ev.error, 'codex error'), recoverable: true })
         return
 
       default:

package/design-edit.mjs

@@ -6,6 +6,7 @@ import path from 'node:path'
 const MAX_SOURCE_BYTES = 2 * 1024 * 1024
 const MAX_INTENT = 2_000
 const MAX_TEXT = 4_000
+const MAX_BATCH_EDITS = 8
 
 const clean = (value, max) => String(value ?? '').replace(/\0/g, '').trim().slice(0, max)
 
@@ -160,7 +161,38 @@ export function validateDesignRequest(payload, registry, room = '') {
   return { ok: true, record, request: { previewId, revision: record.revision, mode, intent, target, movement, asset, cid: clean(payload.cid, 80) } }
 }
 
-export async function materializeDesignAsset({ webBase, token, room, asset, requestId, fetcher = fetch }) {
+export function validateDesignBatchRequest(payload, registry, room = '') {
+  if (!payload || typeof payload !== 'object' || !Array.isArray(payload.edits)) return validateDesignRequest(payload, registry, room)
+  if (payload.edits.length < 1 || payload.edits.length > MAX_BATCH_EDITS) return { ok: false, error: 'invalid-batch' }
+  const previewId = clean(payload.previewId, 64)
+  const revision = clean(payload.revision, 64)
+  const cid = clean(payload.cid, 80)
+  const edits = []
+  const targets = new Set()
+  let record = null
+  for (let index = 0; index < payload.edits.length; index++) {
+    const verdict = validateDesignRequest({ ...payload.edits[index], previewId, revision, cid }, registry, room)
+    if (!verdict.ok) return { ...verdict, editIndex: index }
+    const targetKey = verdict.request.target.nodeKey || verdict.request.target.selector || verdict.request.target.xpath
+    if (targets.has(targetKey)) return { ok: false, error: 'duplicate-target', editIndex: index }
+    targets.add(targetKey)
+    record = verdict.record
+    edits.push(verdict.request)
+  }
+  return { ok: true, record, request: { previewId, revision: record.revision, mode: 'batch', edits, cid } }
+}
+
+export async function deleteDesignAssetDraft({ webBase, token, room, path: assetPath, fetcher = fetch }) {
+  if (!webBase || !token || !room || !assetPath) return false
+  const response = await fetcher(`${String(webBase).replace(/\/$/, '')}/api/code-design-draft`, {
+    method: 'DELETE',
+    headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+    body: JSON.stringify({ code: room, path: assetPath }),
+  }).catch(() => null)
+  return !!response?.ok
+}
+
+export async function materializeDesignAsset({ webBase, token, room, asset, requestId, cleanup = true, fetcher = fetch }) {
   if (!webBase || !token || !room || !asset?.path || !requestId) return null
   const headers = { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }
   const signed = await fetcher(`${String(webBase).replace(/\/$/, '')}/api/code-attachment-url`, {
@@ -180,24 +212,23 @@ export async function materializeDesignAsset({ webBase, token, room, asset, requ
   const file = path.join(dir, `${clean(requestId, 80)}${ext}`)
   fs.mkdirSync(dir, { recursive: true })
   fs.writeFileSync(file, data)
-  await fetcher(`${String(webBase).replace(/\/$/, '')}/api/code-design-draft`, {
-    method: 'DELETE',
-    headers,
-    body: JSON.stringify({ code: room, path: asset.path }),
-  }).catch(() => {})
+  if (cleanup) await deleteDesignAssetDraft({ webBase, token, room, path: asset.path, fetcher })
   return file
 }
 
+function designAction(request) {
+  if (request.mode === 'text') return `Replace only this element's visible text with:\n${request.intent}`
+  if (request.mode === 'move') return `Move only this selected element within its current direct parent, from sibling position ${request.movement.fromIndex + 1} to ${request.movement.toIndex + 1}. Preserve the parent, responsive behavior, semantics, and every other sibling.`
+  if (request.mode === 'image') return `Replace only this selected image's content with the uploaded image at this bridge-local temporary path:\n${request.asset.localPath}\nCopy it into an appropriate durable project asset location. Preserve the existing image frame, dimensions, border radius, object-fit behavior, responsive rules, and surrounding layout.`
+  return `Apply this visual change to only the selected element unless the instruction explicitly requires its immediate context:\n${request.intent}`
+}
+
 export function designPrompt({ record, request, by, restore = false, priorRecord = null }) {
-  const target = JSON.stringify(request.target, null, 2)
-  const action = restore
+  const batch = request.mode === 'batch' ? request.edits : null
+  const work = restore
     ? `Restore only the immediately previous Design Mode change by comparing the current artifact with this bridge-created verified backup: ${priorRecord?.backupPath || '(backup unavailable)'}. Do not overwrite unrelated changes.`
-    : request.mode === 'text'
-    ? `Replace only this element's visible text with:\n${request.intent}`
-    : request.mode === 'move'
-    ? `Move only this selected element within its current direct parent, from sibling position ${request.movement.fromIndex + 1} to ${request.movement.toIndex + 1}. Preserve the parent, responsive behavior, semantics, and every other sibling.`
-    : request.mode === 'image'
-    ? `Replace only this selected image's content with the uploaded image at this bridge-local temporary path:\n${request.asset.localPath}\nCopy it into an appropriate durable project asset location. Preserve the existing image frame, dimensions, border radius, object-fit behavior, responsive rules, and surrounding layout.`
-    : `Apply this visual change to only the selected element unless the instruction explicitly requires its immediate context:\n${request.intent}`
-  return `A room member used ThinkPool Design Mode on the artifact below. This is an authorized source edit in your current workspace.\n\nArtifact source: ${record.sourcePath}\nWorkspace: ${record.workspaceRoot}\nExpected source revision: ${record.revision}\nRequested by: ${clean(by || 'A room member', 120)}\nOperation: ${restore ? 'restore the immediately previous verified Design Mode revision' : request.mode}\n\nSelected element:\n${target}\n\n${action}\n\nRules:\n- Re-read the exact artifact source and confirm its revision/content still matches the selected element before editing.\n- Edit the canonical source above; do not search for or edit a different plausible file.\n- Preserve unrelated content and styling.\n- Use the existing mockup render workflow to produce both desktop and mobile captures after the edit. Run it with TP_DESIGN_REQUEST_ID=${request.cid} and TP_DESIGN_PARENT_REVISION=${record.revision} in the command environment so the proof correlates to this request.\n- Do not claim this is live until both captures succeed and the room receives the manifest.\n- If the target is stale or ambiguous, stop without editing and explain that the person must reselect it.`
+    : batch
+      ? batch.map((edit, index) => `Edit ${index + 1} of ${batch.length} · ${edit.mode}\nSelected element:\n${JSON.stringify(edit.target, null, 2)}\n\n${designAction(edit)}`).join('\n\n---\n\n')
+      : `Selected element:\n${JSON.stringify(request.target, null, 2)}\n\n${designAction(request)}`
+  return `A room member used ThinkPool Design Mode on the artifact below. This is an authorized source edit in your current workspace.\n\nArtifact source: ${record.sourcePath}\nWorkspace: ${record.workspaceRoot}\nExpected source revision: ${record.revision}\nRequested by: ${clean(by || 'A room member', 120)}\nOperation: ${restore ? 'restore the immediately previous verified Design Mode revision' : batch ? `${batch.length} queued edits in one batch` : request.mode}\n\n${work}\n\nRules:\n- Re-read the exact artifact source and confirm its revision/content still matches every selected element before editing.\n${batch ? '- Apply the queued edits in order in one source pass, then render once after the full batch.' : '- Apply only the requested change, then render the result once.'}\n- Edit the canonical source above; do not search for or edit a different plausible file.\n- Preserve the represented product page faithfully: keep its real copy, structure, fonts, assets, spacing, and responsive behavior except for the selected edits. Never replace it with generic mockup content.\n- Preserve unrelated content and styling.\n- Use the existing mockup render workflow to produce both desktop and mobile captures after the edit. Run it with TP_DESIGN_REQUEST_ID=${request.cid} and TP_DESIGN_PARENT_REVISION=${record.revision} in the command environment so the proof correlates to this request.\n- Do not claim this is live until both captures succeed and the room receives the manifest.\n- If any target is stale or ambiguous, stop without editing and explain that the person must reselect it.`
 }

package/package.json

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

package/thinkpool-room-prompt.mjs

@@ -3,7 +3,7 @@
 // the first human turn in each fresh native thread. Keep the runtime-specific
 // orchestration rules in their own drivers — these are the cross-runtime truths
 // about where the people are and how finished work must reach them.
-export const THINKPOOL_DESIGN_DELIVERY_RULE = 'THINKPOOL DESIGN (mandatory for HTML): save the editable HTML source in the workspace, then use the $TP_MOCKUP_OUTBOX render helper so the room receives a Thinkpool Design card with both desktop (1440×900) and mobile (390×844) previews. Never paste raw HTML into chat, send an .html file as the room deliverable, or substitute a bare URL or single screenshot for this card. A shareable browser URL may accompany the card, but never replaces it.'
+export const THINKPOOL_DESIGN_DELIVERY_RULE = 'THINKPOOL DESIGN (mandatory for HTML): save the editable HTML source in the workspace, then use the $TP_MOCKUP_OUTBOX render helper so the room receives a Thinkpool Design card with both desktop (1440×900) and mobile (390×844) previews. When the requested Design surface is an existing product page or route, first build and capture the actual route at both viewports, then read its current source, styles, copy, fonts, and assets. Derive the editable Design artifact from that evidence and compare both artifact captures against the real route before delivery. Preserve the real page faithfully except for explicitly proposed edits—never hand-recreate it from memory, simplify it, replace it with generic mockup content, or label an approximation as the product. If a faithful editable artifact cannot be produced, surface the actual route captures and say that Design editing is unavailable for that surface. Never paste raw HTML into chat, send an .html file as the room deliverable, or substitute a bare URL or single screenshot for this card. A shareable browser URL may accompany the card, but never replaces it.'
 
 export const THINKPOOL_REMOTE_DELIVERY_RULES = Object.freeze([
   'REMOTE USER (authoritative default for ThinkPool Code rooms): unless a person explicitly says they are at the host machine, assume everyone driving this room is remote — possibly on a phone — with no terminal and no access to the host filesystem. Never ask them to run a local command, open a local file, or "go check" something on the machine. Anything host-side, you run yourself and show the result in the room. Only suggest actions they can actually do from the room UI or a browser.',