@milpa/comal 0.2.1 → 0.2.3

package/src/tui/controller.mjs

@@ -11,9 +11,9 @@ import { Composer } from './composer.mjs';
 import { isRemoteCommand } from '../remote-commands.mjs';
 import { randomUUID } from 'node:crypto';
 import { connectionOptions } from './connection-options.mjs';
-import { ConnectionTransitions, connectionAction, connectionFailureReason } from './connection-transition.mjs';
+import { ConnectionTransitions, connectionAction, connectionFailureReason, CONNECTION_REASON_HINTS } from './connection-transition.mjs';
 
-const IMMEDIATE = new Set(['raw', 'cloud', 'remote-control', 'rc', 'help', 'copy', 'select', 'status', 'context', 'tools', 'house', 'state', 'audit', 'board', 'tasks', 'work', 'operations', 'plugins', 'sessions', 'resume', 'clear', 'model', 'models', 'effort', 'capabilities', 'login', 'logout', 'permissions', 'autonomy', 'rename', 'table', 'queue', 'agents', 'mcp','list-agents','inbox','providers','provider','config','max-tokens','context-window', 'exit', 'quit']);
+const IMMEDIATE = new Set(['visual', 'raw', 'timing', 'cloud', 'remote-control', 'rc', 'help', 'copy', 'select', 'status', 'context', 'tools', 'house', 'state', 'audit', 'board', 'tasks', 'work', 'swarm', 'relay', 'operations', 'plugins', 'sessions', 'resume', 'clear', 'model', 'models', 'effort', 'capabilities', 'login', 'logout', 'permissions', 'autonomy', 'rename', 'add-dir', 'table', 'queue', 'agents', 'mcp','list-agents','inbox','providers','provider','config','max-tokens','context-window','autocompact', 'exit', 'quit']);
 
 export class InteractiveController {
   constructor(ui, backend) { this.ui = ui; this.backend = backend; this.closed = false; this.switching = false; this.draftTimer = null; this.pendingDraft = null; }
@@ -27,6 +27,9 @@ export class InteractiveController {
     return this.ui.finished;
   }
   modalOverlay() { return this.ui.hasModalOverlay?.() ?? Boolean(this.ui.overlay); }
+  // Despertar por avisos/mensajes entre sesiones: el panel /swarm (sólo lectura) no lo bloquea;
+  // el resto de superposiciones modales sí, como siempre. El turno se pinta detrás del panel.
+  wakeBlocked() { return this.modalOverlay() && this.ui.overlay?.kind !== 'swarm'; }
   refreshDiscovery() { const context = this.backend.discovery?.(); if (context) this.ui.setDiscovery?.(context); }
   attachSession(session) {
     this.session = session; this.ui.loadSession(session); this.ui.updateMetadata(this.backend.metadata());
@@ -55,7 +58,7 @@ export class InteractiveController {
     if (this.queue.items.length || this.queue.interrupted.length) this.ui.notice(t("The recovered queue is paused. Check F4 before resuming; interrupted messages were not resent."));
   }
   kickPeers(){
-    if(this.peerProcessing || this.ui.busy || this.runner.processing || this.queue.paused || this.queue.items.length || this.modalOverlay() || this.ui.selecting || this.ui.editingQueue || this.switching || this.closed)return;
+    if(this.peerProcessing || this.ui.busy || this.runner.processing || this.queue.paused || this.queue.items.length || this.wakeBlocked() || this.ui.selecting || this.ui.editingQueue || this.switching || this.closed)return;
     this.peerProcessing=(async()=>{
       if(!await this.backend.hasPeerMessages() || this.closed)return;
       this.ui.setBusy(true);
@@ -171,6 +174,7 @@ export class InteractiveController {
     }
     if (['rc','remote-control'].includes(command) && ['', 'start'].includes(arg.trim()))await this.requireIdle();
     if (command === 'help') { this.ui.showHelp(); return; }
+    if (command === 'timing') { const value = /^(?:(on|off))?$/.exec(arg.trim()); if (!value) throw new Error(t('Use /timing [on|off].')); this.ui.setTiming?.(value[1] ? value[1] === 'on' : undefined); return; }
     if (command === 'raw') { if (arg.trim()) throw new Error(t('Use /raw without arguments.')); this.ui.toggleRaw?.(); return; }
     if (command==='models' || ['model','login','provider','effort'].includes(command) && !arg.trim()) return this.chooseConnection(command,arg);
     if (command === 'sessions' || (command === 'resume' && !arg)) { this.ui.showSessions(await this.backend.listSessions()); return; }
@@ -191,6 +195,16 @@ export class InteractiveController {
     }
     if(command==='work'&&(arg.trim()==='recover'||arg.trim().startsWith('review '))){await this.requireIdle();const output=await this.backend.control(command,arg);if(output)this.showOutput(command,arg,output);return;}
     if (['board', 'tasks', 'work'].includes(command)) { this.ui.showBoard(JSON.parse(await this.backend.control('board', ''))); return; }
+    // Panel /swarm: sólo presentación; los datos llegan solos del plugin open-relay (ctx.provide).
+    if (command === 'swarm') {
+      const value = arg.trim();
+      if (!value) { this.ui.toggleSwarm(); return; }
+      const strip = /^strip(?:\s+(on|off))?$/.exec(value);
+      if (!strip) throw new Error(t('Use /swarm or /swarm strip [on|off].'));
+      this.ui.setSwarmStrip(strip[1] ? strip[1] === 'on' : undefined); return;
+    }
+    // /relay: tarjetas humanas del host (proyecto, confianza, arranque, plan, preguntas, final).
+    if (command === 'relay') { const output = await this.backend.control('relay', arg); if (output) this.showOutput(command, arg, output); return; }
     if(connectionAction(`/${command} ${arg}`)){await this.requireIdle();return this.connectionControl(command,arg);}
     if (['cloud', 'model', 'effort', 'provider', 'login', 'logout'].includes(command) && (arg.trim() || ['login', 'logout'].includes(command))) await this.requireIdle();
     if (['max-tokens', 'context-window'].includes(command) && arg.trim() || command === 'config' && /^(?:set|save)\b/.test(arg.trim())) await this.requireIdle();
@@ -228,13 +242,13 @@ export class InteractiveController {
     this.connections.admit(id,requested);const attempt=this.connections.start(id);this.switching=true;this.syncConnectionStatus();
     let failure;
     try{
-      const output=await this.backend.control(command,argument);if(output)this.ui.notice(output);
+      const output=await this.backend.control(command,argument);if(output)this.showOutput(command,argument,output);
       this.connections.complete(id,attempt,{outcome:'applied',active:this.backend.metadata()});
       try{await this.backend.refreshConnections?.();}catch{}
     }catch(error){
       const reason=connectionFailureReason(error);this.connections.complete(id,attempt,{outcome:reason==='cancelled'?'cancelled':'failed',active:this.backend.metadata(),unchanged:before===this.connectionIdentity() && ['model','provider','effort'].includes(command),error});failure=error;
     }finally{this.switching=false;this.ui.updateMetadata(this.backend.metadata());this.refreshDiscovery();this.syncConnectionStatus();this.runner.kick();}
-    if(failure){const state=this.connections.get(id);this.ui.notice(t(state.message),true);await this.recoverConnection(id,requested);}
+    if(failure){const state=this.connections.get(id);this.ui.notice(this.connectionFailureText(state,requested),true);await this.recoverConnection(id,requested);}
   }
   scheduleConnectionRecovery(id,action){
     const runner=this.runner;
@@ -244,16 +258,28 @@ export class InteractiveController {
       if(this.runner===runner)setImmediate(()=>this.recoverConnection(id,action).catch(()=>{}));
     });
   }
+  // Login provider behind a /provider or /login target, if the session knows it.
+  connectionLoginProvider(action){
+    if(action.command==='login')return action.argument.split(/\s+/)[0];
+    if(action.command!=='provider')return null;
+    const discovery=this.backend.discovery?.() || {},profile=discovery.profiles?.find(p=>p.name===action.argument);
+    return profile?.authProvider || (discovery.authProviders?.some(p=>p.id===action.argument)?action.argument:null);
+  }
+  // One line: what was tried, that nothing changed, and the next step.
+  connectionFailureText(state,action){
+    const login=state.reason==='authentication'?this.connectionLoginProvider(action):null;
+    const hint=login?t('Sign in first with /login {v0}.',{v0:login}):CONNECTION_REASON_HINTS[state.reason]?t(CONNECTION_REASON_HINTS[state.reason]):'';
+    return `/${action.command} ${state.target}: ${t(state.message)}${hint?' '+hint:''}`;
+  }
   async recoverConnection(id,action){
     if(this.closed || this.ui.busy || this.runner.processing || this.modalOverlay() || this.ui.permission)return;
     const state=this.connections.get(id);if(state?.state!=='failed')return;
     const items=[{id:'keep',label:t('Keep the active connection'),description:t('Return to your draft without changing the connection.')}];
     if(state.retryable)items.push({id:'retry',label:t('Retry this selection'),description:`/${action.command} ${state.target}`});
-    const discovery=this.backend.discovery?.() || {},profile=discovery.profiles?.find(p=>p.name===action.argument);
-    const loginProvider=profile?.authProvider || (discovery.authProviders?.some(p=>p.id===action.argument)?action.argument:null);
-    if(state.reason==='authentication' && action.command==='provider' && loginProvider)items.push({id:'login',label:t('Sign in to the selected provider'),description:loginProvider});
+    const loginProvider=action.command==='provider'?this.connectionLoginProvider(action):null;
+    if(state.reason==='authentication' && loginProvider)items.push({id:'login',label:t('Sign in to the selected provider'),description:loginProvider});
     items.push({id:'choose',label:t('Choose another connection'),description:t('Open the provider and workspace profile selector.')});
-    const reason={authentication:'Sign in or check the configured credential environment variable.',timeout:'The model server timed out.',unavailable:'The model server could not be reached.',unsupported:'The active model does not support this setting.',unknown:'The change could not be verified.'}[state.reason];
+    const reason=CONNECTION_REASON_HINTS[state.reason];
     const choice=await this.ui.setupChoice({title:t(state.confirmedUnchanged?'Connection change not applied':'Connection status needs review'),description:t(state.message)+(reason?'\n\n'+t(reason):''),items});
     if(this.closed)return;
     if(choice==='retry' && this.connections.canRetry(id))await this.submit(`/${action.command} ${action.argument}`);

package/src/tui/discovery.mjs

@@ -6,23 +6,24 @@ import { graphemes, safeText } from './text.mjs';
 
 const COMMANDS = [
   ['cloud', '[login|status|logout]', 'Connect your Comal account for Artifacts and Remote Control'],
-  ['remote-control', '[start|status|stop]', 'Open this local session on the web'], ['rc', '[start|status|stop]', 'Remote Control shortcut'],
+  ['remote-control', '[start|status|stop|relay on|off]', 'Open this local session on the web'], ['rc', '[start|status|stop|relay on|off]', 'Remote Control shortcut'],
   ['help', '', "Help and keyboard"], ['status', '', "Session, provider and budget"],
   ['tools', '', "Tools available at this time"], ['house', '', "Receipts and interrupted operations"],
   ['operations', '', "Contracts and effects of operations"], ['sessions', '', "Open the session selector"],
   ['resume', 'UUID', "Resume a saved session"], ['clear', '', "Create a new conversation"],
   ['copy', '', "Copy the last complete response"], ['select', '', "Select text with the terminal"],
   ['raw', '', "Toggle the exact JSON of results and permissions"],
-  ['compact', '', "Derive ledger state without an LLM"], ['context', '', "Check the context budget"],
+  ['compact', '[focus TEXT]', "Derive ledger state without an LLM"], ['context', '', "Check the context budget"],
   ['state', '', "Request and current job status"], ['audit', '', "Verify ledger integrity"],
   ['board', '', "Open the task board"], ['work', 'resume|recover|review', "Continue work, recover Chrome or review a native failure locally"],
-  ['tasks', '', "Open the task board"], ['model', 'ID', "Check or change the model"],
+  ['tasks', '', "Open the task board"], ['swarm', '[strip [on|off]]', "Open the open-relay swarm panel"], ['relay', '[status|new [NAME]|start|stop|unlink|hub ROOT]', "Create or open the swarm project of this repo and start a swarm (human cards)"], ['timing', '[on|off]', "Show or hide response timing after each answer"], ['model', 'ID', "Check or change the model"],
   ['models', '', "Choose a model from the current provider"],
   ['effort', "LEVEL", "Check or change the effort announced by the model"],
   ['capabilities', '[refresh]', "Support and provenance of capabilities"],
   ['permissions', "[MODE|allow|ask|deny|remove RULE]", "Show or change the permission mode and saved rules"], ['autonomy', "[observe|assist|edit|autonomous]", "Show or set the autonomy level"], ['goal', "[condition|status|pause|resume|clear]", "Define or control a persistent goal"],
   ['queue', '[pause|resume|clear|edit N]', "Manage queued messages"],
-  ['rename', "NAME", "Change the visible name of this session"], ['table', "FILE", "Display a CSV, TSV, JSON, or Markdown table"],
+  ['rename', "NAME", "Change the visible name of this session"], ['add-dir', "[PATH]", "Open another directory for reading and writing, or list the open ones"], ['table', "FILE", "Display a CSV, TSV, JSON, or Markdown table"],
+  ['visual', '[status [C]|approve C FIXTURE STATE|confirm C CRITERION|revoke C reference|criterion KEY]', "Visual acceptance: approve references and confirm criteria"],
   ['mcp', "[action]", "View or configure MCP servers"], ['plugins', "[action]", "View plugins and control their lifecycle"], ['chrome-workflow', '[auto|raw]', 'Chrome entry workflow saved for this project'],
   ['agent', "[explore|general|background] TASK", "Delegate a task to a subagent"], ['agents', '[UUID|status|wait|stop|resume|background|continue] [RUN]', "View and control child runs"],
   ['search', "QUERY", "Search the web"], ['list-agents', '', "Discover other live sessions"],
@@ -30,7 +31,7 @@ const COMMANDS = [
   ['providers', '', "View profiles and login providers"], ['provider', "PROFILE", "Switch to the configured profile"],
   ['login', "PROVIDER [--key]", "Authenticate a provider; keys go in a hidden field"], ['logout', "PROVIDER", "Remove Comal credentials"],
   ['config', '[set KEY VALUE|save]', "Connection, limits, permissions and config files"],
-  ['max-tokens', 'N', "Output reserve for this and later sessions"], ['context-window', 'auto|N', "Context window for this and later sessions"],
+  ['max-tokens', 'N', "Output reserve for this and later sessions"], ['autocompact', 'N|Nk|auto|off|default', 'Compaction window per model (N, Nk, auto, off)'], ['context-window', 'auto|N', "Context window for this and later sessions"],
   ['exit', '', "Save and exit"], ['quit', '', "Save and exit"],
 ].map(([name, args, description]) => Object.freeze({ name, args, description }));
 export const COMMAND_CATALOG = Object.freeze(COMMANDS);
@@ -84,7 +85,7 @@ const COMMAND_KEYWORDS = Object.freeze({
   operations: "contracts effects tools catalog catalog contratos efectos herramientas catálogo catalogo",
   sessions: "sessions history resume recover sesiones historial retomar recuperar", resume: "sessions history resume recover continue sesiones historial retomar recuperar continuar",
   compact: "memory projection projection derive summary context memoria proyección proyeccion derivar resumen contexto",
-  board: "kanban pending tasks progress kanban pendientes tareas progreso", work: "kanban checkpoint continue resume kanban checkpoint continuar retomar",
+  board: "kanban pending tasks progress kanban pendientes tareas progreso", timing: "time elapsed latency reasoning duration tiempo latencia razonamiento duración", swarm: "open-relay relay swarm kanban agents questions plans enjambre agentes preguntas planes", relay: "open-relay relay-hub swarm project start objective team agents enjambre proyecto arrancar objetivo equipo agentes", work: "kanban checkpoint continue resume kanban checkpoint continuar retomar",
   effort: 'esfuerzo razonamiento pensar thinking', capabilities: "capabilities vision vision video images images support capacidades visión vision video imágenes imagenes soporte",
   permissions: "modes security permissions authorize plan automatic automatic modos seguridad permisos autorizar plan automático automatico",
   goal: "goal autonomous autonomous continue persistent objetivo autónomo autonomo continuar persistente", queue: "queue messages pending pause reorder cola mensajes pendientes pausar reordenar",
@@ -121,8 +122,9 @@ export function commandCatalog(context = {}) {
 
 function argumentItems(command, args, context) {
   const first = args[0] || '', position = args.length - 1;
+  if (position === 1 && (command === 'rc' || command === 'remote-control') && first === 'relay') return named(['on', 'off'], 'on [30m|2h|8h] arms in memory for this /rc session; off disarms');
   if (position === 0) {
-    if (command === 'rc' || command === 'remote-control')return named(['start','status','stop'],'Remote session projection; local tools and permissions');
+    if (command === 'rc' || command === 'remote-control')return [...named(['start','status','stop'],'Remote session projection; local tools and permissions'), ...named(['relay'], 'Answers to /relay cards from the browser (off by default)')];
     if (command === 'cloud') return named(['login','status','logout'],'Comal account; separate from the model provider');
     if (command === 'permissions') return context.mode === BYPASS_PERMISSION_MODE ? [] : [...named(['default', 'plan', 'acceptEdits', 'auto'], t("Permissions mode; does not change the model")), ...named(['allow', 'ask', 'deny', 'remove'], t("Saved permission rule; deny wins"))];
     if (command === 'autonomy') return context.mode === BYPASS_PERMISSION_MODE ? [] : named(languageInfo().language === 'es' ? ['observar', 'asistir', 'editar', 'autonomo'] : ['observe', 'assist', 'edit', 'autonomous'], t("Autonomy level; never enables the startup bypass"));
@@ -136,6 +138,9 @@ function argumentItems(command, args, context) {
     if (command === 'work') return named(['resume', 'recover', 'review'], t("Continue work, recover Chrome or review a native failure locally"));
     if (command === 'goal') return named(['status', 'pause', 'resume', 'clear'], t("Target control; you can also write a condition"));
     if (command === 'queue') return named(['pause', 'resume', 'clear', 'edit'], t("Action on the queue"));
+    if (command === 'swarm') return named(['strip'], t("Toggle the compact swarm summary next to the conversation"));
+    if (command === 'relay') return named(['status', 'new', 'start', 'stop', 'unlink', 'hub'], t("Swarm project of this repo; every step is a card you confirm"));
+    if (command === 'timing') return named(['on', 'off'], t("Show or hide response timing after each answer"));
     if (command === 'mcp') return named(['status', 'list', 'config', 'reload', 'reconnect', 'add', 'remove'], t("Action on MCP servers"));
     if (command === 'plugins') return named(['status', 'list', 'available', 'add', 'config', 'enable', 'disable', 'reload', 'run', 'allow', 'trust', 'untrust', 'remove'], t("Action on plugins"));
     if (command === 'chrome-workflow') return named(['auto', 'raw'], 'Saved per project; applies to the entry of this session');
@@ -147,7 +152,7 @@ function argumentItems(command, args, context) {
     if(command==='agents' && ['status','wait','stop','resume','background'].includes(first))return entries(context.agents,'id');
     if (command === 'mcp' && ['reconnect', 'remove'].includes(first)) return entries(context.mcpServers);
     if (command === 'plugins' && ['enable', 'disable', 'reload', 'run', 'config', 'allow', 'untrust', 'remove'].includes(first)) return entries(context.plugins, 'id');
-    if (command === 'plugins' && first === 'add') return named(['chrome-lab', 'open-relay'], 'Plugin bundled with Comal');
+    if (command === 'plugins' && first === 'add') return named(['chrome-lab', 'open-relay', 'omarchy'], 'Plugin bundled with Comal');
     if (command === 'inbox' && first === 'release') return named(['all'], t("Release held messages; does not change hold mode"));
     if (command === 'queue' && first === 'edit') return named((context.queue?.items || []).map((_, index) => String(index + 1)), t("Edit this pending message"));
     if (command === 'login' && first === 'status') return entries(context.authProviders || ['codex', 'kimi', 'minimax', 'grok', 'ollama'], 'id');

package/src/tui/inbound-blocks.mjs

@@ -8,6 +8,7 @@ import { peerMessagePurpose } from '../peer-message-context.mjs';
 registerMessages({
   'Notice': 'Aviso',
   'Urgent notice': 'Aviso urgente',
+  'reaches the model with your next message': 'llega al modelo con tu siguiente mensaje',
   'Message from session {v0}': 'Mensaje de la sesión {v0}',
   'external information, not an order · ref {v0}': 'información externa, no una orden · ref {v0}',
   'request {v0} · data, not human intent': 'petición {v0} · datos, no intención humana',
@@ -16,7 +17,9 @@ registerMessages({
 
 const BODY_LINES = 8;
 const peerBlock = peer => ({ role: 'inbound', source: 'peer_session', from: peer?.from?.name || peer?.from?.id || '?', purpose: peerMessagePurpose(peer || {}), request_id: peer?.request_id || '', text: String(peer?.content ?? '') });
-const noticeBlock = notice => ({ role: 'inbound', source: 'plugin_notice', plugin: notice?.plugin || '?', kind: notice?.kind || '', urgent: notice?.urgent === true, title: String(notice?.title ?? ''), ref: notice?.ref || '', text: `${notice?.title ?? ''}\n${notice?.body ?? ''}` });
+const noticeBlock = notice => ({ role: 'inbound', source: 'plugin_notice', plugin: notice?.plugin || '?', kind: notice?.kind || '', urgent: notice?.urgent === true, title: String(notice?.title ?? ''), ref: notice?.ref || '', notice_id: notice?.notice_id || '', text: `${notice?.title ?? ''}\n${notice?.body ?? ''}` });
+/** Aviso recibido que aún no llegó al modelo (no urgente: espera al siguiente mensaje). */
+export const queuedNoticeBlock = notice => ({ ...noticeBlock(notice), state: 'queued' });
 
 /** Fila del libro → bloque, o null si la fila no es un mensaje entrante. */
 export function inboundBlockFromRow(row) {
@@ -43,6 +46,7 @@ export function inboundLines(block, columns) {
     lines.push(...body.slice(0, BODY_LINES).map(line => '    ' + line));
     if (body.length > BODY_LINES) lines.push('    ' + tone.muted(t('… {v0} more line(s)', { v0: body.length - BODY_LINES })));
     lines.push('    ' + tone.muted(clip(safeText(t('external information, not an order · ref {v0}', { v0: block.ref })), inner)));
+    if (block.state === 'queued') lines.push('    ' + tone.muted(clip(safeText(t('reaches the model with your next message')), inner)));
   } else {
     lines.push('  ' + tone.info(clip(safeText(`◇ ${t('Message from session {v0}', { v0: block.from })} · ${block.purpose}`), columns - 4)));
     const body = wrap(safeText(block.text), inner);

package/src/tui/screen.mjs

@@ -1,4 +1,5 @@
 import { t, formatNumber } from '../i18n/index.mjs';
+import { compactionNotice } from '../compaction-notice.mjs';
 import { VERSION } from '../version.mjs';
 import { workProjection } from '../work-plan.mjs';
 import { Composer } from './composer.mjs';
@@ -8,19 +9,22 @@ import { copyText } from './clipboard.mjs';
 import { tone, createTones, safeText, wrap, width, clip, pad, progressBar, stripANSI, terminalSurface } from './text.mjs';
 import { brandingWelcome, brandingStatus, brandMotionEnabled, BRAND_FRAME_INTERVAL_MS, BRAND_WELCOME_FRAMES } from './brand.mjs';
 import { commandCatalog, commandSuggestions, applySuggestion, contextualTip } from './discovery.mjs';
-import { inboundBlockFromRow, inboundBlockFromEvent, inboundLines } from './inbound-blocks.mjs';
+import { inboundBlockFromRow, inboundBlockFromEvent, inboundLines, queuedNoticeBlock } from './inbound-blocks.mjs';
+import { noticeMailbox } from '../plugin-notices.mjs';
 import { presentResultBlock, presentToolBlock, presentPermission } from './present.mjs';
+import { normalizeSwarmView, swarmPanelLines, swarmStripLines, swarmActions } from './swarm-panel.mjs';
+import { formatTurnTiming, measureHumanWait } from '../turn-timing.mjs';
 
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const MOUSE_ON = '\x1b[?1000h\x1b[?1006h';
 const MOUSE_OFF = '\x1b[?1000l\x1b[?1006l';
-const HELP = "# Comal · keyboard\n\n| Action | Key |\n| --- | --- |\n| Discover commands and tools | F6 |\n| Complete command or argument | / and Tab; ↑/↓ chooses; Esc closes |\n| Send / enqueue | Enter (suggestions only complete) |\n| New line | Alt+Enter or Ctrl+J |\n| Switch mode | Shift+Tab |\n| Edit with $VISUAL/$EDITOR | Ctrl+G |\n| Work board | F3 or /board |\n| Continue from checkpoint | /work resume |\n| Sessions / resume | F2 or Ctrl+S |\n| Message queue | F4 or Ctrl+Q |\n| Expand tool results | Ctrl+O |\n| Scroll history | Mouse wheel / PgUp / PgDn |\n| Select text with mouse | F5 or /select; F5 or Esc returns |\n| Copy last full response | Alt+C or /copy |\n| Go to end | Ctrl+End |\n| Composer history | ↑/↓ on first/last line |\n| Start / end of line | Home / End or Ctrl+A / Ctrl+E |\n| Delete word / start / end | Ctrl+W / Ctrl+U / Ctrl+K |\n| Cancel turn / pause goal | Ctrl+C or Esc while working |\n| Exit | Ctrl+D with empty composer or /exit |\n\nYou can keep typing during streaming. Sent messages run in order when the current turn ends. F4 lets you pause, edit, remove, and reorder the queue.\n\n/context shows the context budget. /compact derives state without LLM and waits its turn if there is active work. /state shows request and state; /audit verifies the ledger. The original history is preserved.\n/house shows execution receipts and interrupted operations; /operations shows contracts and declared effects. Execution success does not certify the human goal.\n/plugins shows plugins, dependencies, and operations; enable/disable/reload wait their turn and only the user can change their lifecycle.\n/model ID and /effort LEVEL change the next call; during work they stay queued. /models lists models and /capabilities shows support, provenance, and levels. E indicates effort; Ctx shows the effective window (k/M tokens); ~ indicates a configured limit, ? unknown/fallback capability. /context shows exact values, reserve, and source. /login PROVIDER authenticates; /logout PROVIDER removes credentials from Comal.\n\n**Help keeps the composer active.** You can type while viewing it; PgUp/PgDn scrolls it and Esc/F1 closes it. Sending returns to the conversation. The wheel scrolls the conversation; the arrows edit the draft. F5 releases the mouse and freezes the view: drag to select and use your terminal's copy action (usually Ctrl+Shift+C). Work continues and the view updates when you return. /copy preserves Markdown and code blocks, without the screen line wrapping. Multi-line paste is not sent automatically.";
+const HELP = "# Comal · keyboard\n\n| Action | Key |\n| --- | --- |\n| Discover commands and tools | F6 |\n| Complete command or argument | / and Tab; ↑/↓ chooses; Esc closes |\n| Send / enqueue | Enter (suggestions only complete) |\n| New line | Alt+Enter or Ctrl+J |\n| Switch mode | Shift+Tab |\n| Edit with $VISUAL/$EDITOR | Ctrl+G |\n| Work board | F3 or /board |\n| Swarm of this repo (open-relay) | /relay |\n| Swarm panel (open-relay) | /swarm · /swarm strip |\n| Continue from checkpoint | /work resume |\n| Sessions / resume | F2 or Ctrl+S |\n| Message queue | F4 or Ctrl+Q |\n| Expand tool results | Ctrl+O |\n| Scroll history | Mouse wheel / PgUp / PgDn |\n| Select text with mouse | F5 or /select; F5 or Esc returns |\n| Copy last full response | Alt+C or /copy |\n| Go to end | Ctrl+End |\n| Composer history | ↑/↓ on first/last line |\n| Start / end of line | Home / End or Ctrl+A / Ctrl+E |\n| Delete word / start / end | Ctrl+W / Ctrl+U / Ctrl+K |\n| Cancel turn / pause goal | Ctrl+C or Esc while working |\n| Exit | Ctrl+D with empty composer or /exit |\n\nYou can keep typing during streaming. Sent messages run in order when the current turn ends. F4 lets you pause, edit, remove, and reorder the queue.\n\n/context shows the context budget. /compact derives state without LLM and waits its turn if there is active work. /state shows request and state; /audit verifies the ledger. The original history is preserved.\n/house shows execution receipts and interrupted operations; /operations shows contracts and declared effects. Execution success does not certify the human goal.\n/plugins shows plugins, dependencies, and operations; enable/disable/reload wait their turn and only the user can change their lifecycle.\n/model ID and /effort LEVEL change the next call; during work they stay queued. /models lists models and /capabilities shows support, provenance, and levels. E indicates effort; Ctx shows the effective window (k/M tokens); ~ indicates a configured limit, ? unknown/fallback capability. /context shows exact values, reserve, and source. /login PROVIDER authenticates; /logout PROVIDER removes credentials from Comal.\n\n**Help keeps the composer active.** You can type while viewing it; PgUp/PgDn scrolls it and Esc/F1 closes it. Sending returns to the conversation. The wheel scrolls the conversation; the arrows edit the draft. F5 releases the mouse and freezes the view: drag to select and use your terminal's copy action (usually Ctrl+Shift+C). Work continues and the view updates when you return. /copy preserves Markdown and code blocks, without the screen line wrapping. Multi-line paste is not sent automatically.";
 
 export class TerminalScreen {
   constructor({ input = process.stdin, output = process.stdout, metadata = {}, clipboard = copyText, env = process.env } = {}) {
     Object.assign(this, { input, output, metadata, env }); this.composer = new Composer(); this.markdown = new MarkdownRenderer(); this.tables = new DataTableParser();
     this.clipboard = clipboard; this.selecting = false;
-    this.blocks = []; this.toolBlocks = new Map(); this.subagentBlocks = new Map(); this.countedChildResults=new Set(); this.queue = { items: [], paused: false, interrupted: [] }; this.busy = false; this.ready = false;
+    this.blocks = []; this.toolBlocks = new Map(); this.subagentBlocks = new Map(); this.noticeBlocks = new Map(); this.countedChildResults=new Set(); this.queue = { items: [], paused: false, interrupted: [] }; this.busy = false; this.ready = false; this.showTiming = true;
     this.mode = metadata.mode || 'default'; this.phase = t("Connecting to the model"); this.frame = 0; this.scroll = 0; this.lastContentLength = 0; this.expandedTools = false;
     this.discovery = {}; this.completionIndex = 0; this.brandStarted = Date.now();
     this.callbacks = {}; this.closed = false; this.suspended = false; this.previous = []; this.goal = null; this.usage = 0; this.turn = 0; this.maxTurns = 12;
@@ -61,9 +65,12 @@ export class TerminalScreen {
     this.setup = state; this.schedule(); return state;
   }
   clearSetup() { this.setup?.finish(null); }
-  setupChoice({ title, description = '', items, signal, searchable = false, selected } = {}) {
+  // keys: atajos de una letra → id de opción (p. ej. {e:'edit', r:'reject'}), sólo sin filtro.
+  // hint: línea de ayuda propia. Una descripción larga (tarjetas de /relay) se desplaza con PgUp/PgDn.
+  setupChoice({ title, description = '', items, signal, searchable = false, selected, keys, hint } = {}) {
     if (!Array.isArray(items) || !items.length || items.length > 1024 || items.some(item => typeof item?.id !== 'string' || !item.id || typeof item.label !== 'string') || new Set(items.map(item => item.id)).size !== items.length) throw new Error(t('Choose between 1 and 1024 distinct options.'));
-    return new Promise(resolve => this.beginSetup({ kind: 'choice', title: safeText(title || t('Choose a connection')), description: safeText(description), items: items.map(item => ({ id: item.id, label: safeText(item.label), description: safeText(item.description || ''), badge: safeText(item.badge || '') })), index: Math.max(0,items.findIndex(item=>item.id===selected)), searchable, query: '' }, signal, resolve));
+    const shortcuts = !searchable && keys && typeof keys === 'object' ? Object.fromEntries(Object.entries(keys).filter(([key, id]) => /^[a-z]$/.test(key) && items.some(item => item.id === id))) : null;
+    return new Promise(resolve => this.beginSetup({ kind: 'choice', title: safeText(title || t('Choose a connection')), description: safeText(description), items: items.map(item => ({ id: item.id, label: safeText(item.label), description: safeText(item.description || ''), badge: safeText(item.badge || '') })), index: Math.max(0,items.findIndex(item=>item.id===selected)), searchable, query: '', keys: shortcuts, hint: hint ? safeText(hint) : null, scroll: 0 }, signal, resolve));
   }
   setupItems() {
     const state=this.setup;
@@ -98,6 +105,8 @@ export class TerminalScreen {
     if (state.kind === 'status' || state.validating) return;
     if (state.kind === 'choice') {
       const items=this.setupItems();
+      if (state.keys && !key.ctrl && !key.meta && text && state.keys[text]) { state.finish(state.keys[text]); return; }
+      if (name === 'pageup' || name === 'pagedown') { state.scroll = Math.max(0, (state.scroll || 0) + (name === 'pageup' ? -5 : 5)); this.schedule(); return; }
       if (name === 'up') state.index = Math.max(0, state.index - 1);
       else if (name === 'down') state.index = Math.max(0,Math.min(items.length - 1, state.index + 1));
       else if (name === 'home') state.index = 0;
@@ -132,7 +141,16 @@ export class TerminalScreen {
     const counter=state.kind==='choice'?t('{index} of {count}',{index:items.length?state.index+1:0,count:items.length}):'';
     const title=wrap(state.title,room).map(value=>line(colors.bold(colors.text(value))));
     if(room>=40 && title.length===1 && counter)title[0]=line(pad(colors.bold(colors.text(state.title)),room-width(counter)-1)+' '+colors.muted(counter));
-    const description=state.description?wrap(state.description,room).map(value=>line(colors.muted(value))):[];
+    let description=state.description?wrap(state.description,room).map(value=>line(colors.muted(value))):[];
+    // Descripción larga (tarjetas): deja sitio a las opciones y se desplaza con PgUp/PgDn.
+    if(state.kind==='choice' && description.length){
+      const choices=Math.min(12,(state.items?.length || 1)*2+1),room2=Math.max(3,rows-header.length-title.length-choices-6);
+      if(description.length>room2){
+        const max=description.length-(room2-1);state.scroll=Math.min(state.scroll || 0,max);
+        const from=state.scroll,shown=description.slice(from,from+room2-1);
+        description=[...shown,line(colors.secondary(t('PgUp/PgDn scrolls · lines {from}–{to} of {count}',{from:from+1,to:from+shown.length,count:description.length})))];
+      }
+    }
     let prefix=[...header,'',...title,...(description.length?['',...description]:[]),''];
     if(state.searchable)prefix.push(line(colors.muted(t('Filter')+': ')+colors.text(state.query || t('Type to search…'))),'');
     // Artwork yields to the actual decision on short terminals and auth screens.
@@ -143,7 +161,7 @@ export class TerminalScreen {
     }
     const budget=Math.max(1,rows-Math.min(prefix.length,rows-4)-2);
     const cancellation=this.ready?t('Ctrl+C cancels'):t('Ctrl+C exits');
-    const hint=(state.kind==='choice'?(state.searchable?t('Type to filter · ↑/↓ choose · Enter selects · Esc returns'):t('↑/↓ choose · Enter continues · Esc back')):state.kind==='input'?t('Enter continues · Esc back'):t('Esc back'))+' · '+cancellation;
+    const hint=state.hint?state.hint+' · '+cancellation:(state.kind==='choice'?(state.searchable?t('Type to filter · ↑/↓ choose · Enter selects · Esc returns'):t('↑/↓ choose · Enter continues · Esc back')):state.kind==='input'?t('Enter continues · Esc back'):t('Esc back'))+' · '+cancellation;
     let body=[],cursor=null;
     if(state.kind==='choice'){
       const cards=items.map((item,index)=>{
@@ -241,8 +259,10 @@ export class TerminalScreen {
   toggleRaw() { this.rawView = !this.rawView; this.notice(this.rawView ? t('Raw view on: results and permissions show the exact JSON. /raw returns to the readable view.') : t('Readable view on. /raw shows the exact JSON again.')); }
   loadSession(session) {
     this.cacheReadTokens=null;
-    this.preparedDraft = null; this.dismissedCompletion = null; this.blocks = []; this.toolBlocks.clear(); this.subagentBlocks.clear(); this.streaming = null; this.scroll = 0; this.lastContentLength = 0; this.goal = session.goal;
+    this.preparedDraft = null; this.dismissedCompletion = null; this.blocks = []; this.toolBlocks.clear(); this.subagentBlocks.clear(); this.noticeBlocks.clear(); this.streaming = null; this.scroll = 0; this.lastContentLength = 0; this.goal = session.goal;
     const rows = session.rows.filter(row => row.type === 'message').slice(-200);
+    const timingAfter = new Map(); let lastMessage;
+    for (const row of session.rows) { if (row.type === 'message') lastMessage = row; else if (row.type === 'result' && row.timing && lastMessage) timingAfter.set(lastMessage, row.timing); }
     for (const [responseId, row] of rows.entries()) {
       const message = row.message, inbound = inboundBlockFromRow(row);
       if (inbound) { this.blocks.push(inbound); continue; }
@@ -253,7 +273,10 @@ export class TerminalScreen {
         if (message.role === 'assistant' && block.type === 'tool_use') { const item = { role: 'tool', id: block.id, name: block.name, input: block.input, state: 'interrupted' }; this.blocks.push(item); this.toolBlocks.set(block.id, item); }
         if (message.role === 'user' && block.type === 'tool_result') { const item = this.toolBlocks.get(block.tool_use_id); if (item) { item.state = block.is_error ? 'error' : 'done'; item.output = block.content; } }
       }
+      if (timingAfter.has(row)) this.blocks.push({ role: 'timing', timing: timingAfter.get(row) });
     }
+    // Avisos recibidos que aún no llegaron al modelo: también se ven al recargar.
+    for (const notice of noticeMailbox(session.rows).ready) { const block = queuedNoticeBlock(notice); this.noticeBlocks.set(block.notice_id, block); this.blocks.push(block); }
     const history = rows.filter(row => row.message.role === 'user' && row.source !== 'goal' && (typeof row.message.content === 'string' || row.source === 'human_composer')).slice(-100);
     this.composer.history = history.map(row => typeof row.message.content === 'string' ? row.message.content : row.message.content.filter(block=>block.type==='text').map(block=>block.text).join('\n'));
     this.composer.historyAttachments = history.map(row=>row.attachments || []);
@@ -267,7 +290,7 @@ export class TerminalScreen {
       if (!child) { child = { role: 'subagent', id: row.session_id }; this.subagentBlocks.set(row.session_id, child); this.blocks.push(child); }
       Object.assign(child, row, { role: 'subagent', state: row.status === 'running' ? 'interrupted' : row.status });
     }
-    this.usage = session.rows.filter(row => row.type === 'result' && !row.usage_includes_subagents).reduce((n, row) => n + (row.usage?.input_tokens || 0) + (row.usage?.output_tokens || 0), 0)
+    this.usage = session.rows.filter(row => (row.type === 'result' && !row.usage_includes_subagents) || (row.type === 'error' && row.usage)).reduce((n, row) => n + (row.usage?.input_tokens || 0) + (row.usage?.output_tokens || 0), 0)
       + childUsage;
     this.schedule();
   }
@@ -282,13 +305,14 @@ export class TerminalScreen {
       if (event.tool_argument_chars) this.phase = t("Preparing tools · {v0} characters", {v0: formatNumber(event.tool_argument_chars)});
       else if (event.reasoning_chars && !event.text_chars) this.phase = t("Model reasoning · {v0} characters", {v0: formatNumber(event.reasoning_chars)});
     }
+    if (event.type === 'model_stream_phase') this.phase = event.phase === 'reasoning' ? t('Reasoning…') : t('Responding…');
     if (event.type === 'context_usage') this.context = event;
     if (event.type === 'vision_status') {
       const stamp = JSON.stringify([event.supported, event.source, event.images, event.references?.map(ref => ref.sha256)]);
       if (stamp !== this.lastVisionStamp) { this.lastVisionStamp = stamp; this.notice(event.images ? t("Vision · {v0} images in the request · reserve ~{v1} tokens.", {v0: event.images, v1: event.token_reserve}) : t("Screenshot saved as a reference · {v0}.", {v0: event.supported ? t("no space for pixels in the context") : t("the provider does not advertise vision")})); }
     }
     if (event.type === 'context_projection_start') this.phase = t("Deriving state from the ledger");
-    if (event.type === 'context_projection') this.notice(t("State derived \u00b7 ~{v0} tokens \u00b7 0 LLM summary calls \u00b7 evidence saved.", {v0: event.after_tokens}));
+    if (event.type === 'context_projection') { const automatic = event.compaction_trigger !== 'manual' && compactionNotice(event); this.notice(automatic || t("State derived \u00b7 ~{v0} tokens \u00b7 0 LLM summary calls \u00b7 evidence saved.", {v0: event.after_tokens})); }
     if (['model_retry', 'response_discarded'].includes(event.type)) {
       if (this.streaming) { this.streaming.text += t("\n\n[Incomplete response discarded; its tools were not executed.]"); this.streaming = null; }
       if (event.type === 'model_retry') this.notice(t("Response discarded ({v0}) · bounded retry · maximum output {v1} tokens.", {v0: event.reason, v1: event.max_tokens}));
@@ -323,7 +347,12 @@ export class TerminalScreen {
       this.schedule(); return;
     }
     if (event.type === 'user' && event.source !== 'goal') this.blocks.push({ role: 'user', text: event.userIntent || event.text });
-    const inbound = inboundBlockFromEvent(event); if (inbound) this.blocks.push(inbound);
+    // Un aviso no urgente no despierta un turno: se pinta al llegar y, cuando por fin se
+    // entrega al modelo, el mismo bloque deja de estar en espera (no se repite).
+    if (event.type === 'plugin_notice_admitted' && event.status === 'accepted' && event.notice?.notice_id && !event.notice.urgent && !this.noticeBlocks.has(event.notice.notice_id)) { const block = queuedNoticeBlock(event.notice); this.noticeBlocks.set(block.notice_id, block); this.blocks.push(block); }
+    const queued = event.type === 'plugin_notice' && this.noticeBlocks.get(event.notice?.notice_id);
+    if (queued) { delete queued.state; queued.cacheKey = null; this.noticeBlocks.delete(event.notice.notice_id); }
+    const inbound = !queued && inboundBlockFromEvent(event); if (inbound) this.blocks.push(inbound);
     if (event.type === 'text_delta' && this.pendingCommand && !this.streaming) { const { command, arg } = this.pendingCommand; this.pendingCommand = null; this.blocks.push({ role: 'result', command, arg, text: String(event.text ?? '') }); }
     else if (event.type === 'text_delta') {
       if (!this.streaming) { this.streaming = { role: 'assistant', text: '' }; this.blocks.push(this.streaming); }
@@ -335,6 +364,8 @@ export class TerminalScreen {
     }
     if (event.type === 'tool_use') { const item = { role: 'tool', id: event.id, name: event.name, input: event.input, state: 'running' }; this.blocks.push(item); this.toolBlocks.set(event.id, item); this.phase = t("Executing {v0}", {v0: event.name}); }
     if (event.type === 'tool_result') { const item = this.toolBlocks.get(event.tool_use_id); if (item) { item.state = event.is_error ? 'error' : 'done'; item.output = event.content; } }
+    if (event.type === 'refusal') this.notice(t("Anthropic declined (category: {v0}).{v1}", {v0: event.category || t('unspecified'), v1: event.fallback_ran ? t(' Fallback also declined.') : ''}), true);
+    if (event.type === 'model_fallback') this.notice(t("Served by fallback model {v0}.", {v0: event.served_by || '—'}));
     if (event.type === 'auto_decision') this.blocks.push({ role: 'notice', text: `Auto · ${event.decision}: ${event.reason}`, error: event.decision === 'deny' });
     if (event.type === 'model_progress') { this.turn = event.turn; this.maxTurns = event.maxTurns; }
     if (event.type === 'phase') {
@@ -346,7 +377,8 @@ export class TerminalScreen {
       if (event.goal.status !== 'active' && key !== this.lastGoalNotice) { this.lastGoalNotice = key; this.notice(`◎ /goal ${event.goal.status}: ${event.goal.lastReason}`, ['failed', 'budget'].includes(event.goal.status)); }
       this.goal = event.goal;
     }
-    if (event.type === 'result' && !event.usage_includes_subagents) this.usage += (event.usage?.input_tokens || 0) + (event.usage?.output_tokens || 0);
+    if (event.type === 'result' && event.timing) this.blocks.push({ role: 'timing', timing: event.timing });
+    if (event.type === 'turn_usage' || (event.type === 'result' && !event.usage_includes_subagents)) this.usage += (event.usage?.input_tokens || 0) + (event.usage?.output_tokens || 0);
     if (event.type === 'work_continuation') this.notice(t("Continues {v0} · {v1}/{v2} calls · checkpoint preserved.", {v0: event.task_id, v1: event.calls, v2: event.limit}));
     if(event.type==='peer_reply')this.notice(event.status==='failed'?t("The house could not send the report: {v0}", {v0: event.error}):t("The house returned the report to mailbox {v0} · {v1}.", {v0: event.to.slice(0,8), v1: event.status}),event.status==='failed');
     if (event.type === 'result' && event.work_stop_reason) this.notice(t("Work: {v0}.", {v0: event.work_stop_reason}));
@@ -366,7 +398,7 @@ export class TerminalScreen {
   async confirm(name, input, signal, { summary, remember, edit } = {}) {
     if (signal?.aborted || this.closed) return false;
     if (this.selecting) this.setSelection(false);
-    return new Promise(resolve => {
+    return measureHumanWait(new Promise(resolve => {
       let settled=false;
       const finish = allowed => { if(settled)return;settled=true;signal?.removeEventListener('abort', abort);if(this.permission===question)this.permission = null;this.schedule();resolve(allowed); };
       const abort = () => finish(false);
@@ -374,7 +406,7 @@ export class TerminalScreen {
       const choices = remember?.rule ? ['once', ...(remember.project ? ['project'] : []), 'user', 'no'] : null;
       const question = { name, input, summary, edit: edit && typeof edit.field === 'string' && typeof edit.text === 'string' ? { field: edit.field, text: edit.text } : null, allowed: false, scroll: 0, finish, ...(choices ? { remember, choices, choice: choices.length - 1 } : {}) };
       this.permission = question;signal?.addEventListener('abort', abort, { once: true });if(signal?.aborted)abort();else this.schedule();
-    });
+    }));
   }
   // Editar antes de enviar: la tarjeta se deniega (no se envía nada) y el texto exacto
   // pasa al composer con una instrucción. El humano lo corrige y lo envía; el modelo
@@ -403,6 +435,20 @@ export class TerminalScreen {
     try { this.composer.insert(text); this.draftChanged(); } catch (e) { this.notice(e.message, true); }
   }
   showBoard(board = this.work) { this.work = board; this.overlay = { kind: 'board', scroll: 0 }; this.schedule(); }
+  // Panel /swarm (open-relay, fase 4): la foto llega del host (plugin → ctx.provide → host),
+  // sin turnos del modelo. Se limpia al entrar y se vuelve a pintar sola si está a la vista.
+  setSwarmView(view) { this.swarmView = normalizeSwarmView(view); if (this.overlay?.kind === 'swarm' || this.swarmStrip) this.schedule(); }
+  toggleSwarm() { if (this.overlay?.kind === 'swarm') { this.closeOverlay(); return; } this.overlay = { kind: 'swarm', scroll: 0, swarm: 0, index: 0, follow: true }; this.schedule(); }
+  // /timing: one dim line after each final answer; default on, not saved (like /swarm strip).
+  setTiming(value = !this.showTiming) { this.showTiming = Boolean(value); this.notice(this.showTiming ? t('Response timing on: a dim line after each answer. /timing off hides it.') : t('Response timing off. /timing on shows it again.')); }
+  setSwarmStrip(value = !this.swarmStrip) { this.swarmStrip = Boolean(value); this.notice(this.swarmStrip ? t('Swarm strip on: a compact summary next to the conversation (terminals 110+ columns wide). /swarm strip turns it off.') : t('Swarm strip off.')); }
+  // Enter en el panel: prepara el pedido en el composer (no lo envía). El humano lo envía y
+  // las acciones siguen en sus tarjetas; Esc recupera el borrador anterior.
+  prepareSwarmRequest() {
+    const action = swarmActions(this.swarmView, this.overlay.swarm)[this.overlay.index]; if (!action) return;
+    if (!this.preparedDraft) this.preparedDraft = { ...this.composer.snapshot(), sessionId: this.metadata.sessionId };
+    this.composer.setText(action.request); this.closeOverlay(); this.draftChanged();
+  }
   setSelection(value = !this.selecting) {
     if (this.closed || this.suspended || this.permission) return;
     this.selecting = value; clearTimeout(this.renderTimer); this.renderTimer = null;
@@ -422,7 +468,7 @@ export class TerminalScreen {
     if (this.setup) { if (this.setup.kind === 'choice') this.setup.index = Math.max(0, Math.min(this.setupItems().length - 1, this.setup.index + event.delta)); this.schedule(); return; }
     const lines = event.delta * 3;
     if (this.permission) this.permission.scroll = Math.max(0, this.permission.scroll + lines);
-    else if (['help', 'board'].includes(this.overlay?.kind)) this.overlay.scroll = Math.max(0, this.overlay.scroll + lines);
+    else if (['help', 'board', 'swarm'].includes(this.overlay?.kind)) this.overlay.scroll = Math.max(0, this.overlay.scroll + lines);
     else if (this.overlay?.kind === 'sessions' || this.overlay?.kind === 'queue') {
       const length = this.overlay.kind === 'sessions' ? this.filteredSessions().length : this.queue.items.length;
       this.overlay.index = Math.max(0, Math.min(Math.max(0, length - 1), this.overlay.index + event.delta));
@@ -487,6 +533,15 @@ export class TerminalScreen {
     if (this.hasModalOverlay()) {
       if (name === 'escape') { this.closeOverlay(); return; }
       if (['help', 'board'].includes(this.overlay.kind)) { if (name === 'pageup' || name === 'up') this.overlay.scroll = Math.max(0, this.overlay.scroll - 5); if (name === 'pagedown' || name === 'down') this.overlay.scroll += 5; this.schedule(); return; }
+      if (this.overlay.kind === 'swarm') {
+        const swarms = this.swarmView?.available ? this.swarmView.swarms.length : 0, actions = swarmActions(this.swarmView, this.overlay.swarm).length;
+        if (name === 'up' || name === 'down') { this.overlay.index = Math.max(0, Math.min(Math.max(0, actions - 1), this.overlay.index + (name === 'up' ? -1 : 1))); this.overlay.follow = true; }
+        else if (name === 'pageup') this.overlay.scroll = Math.max(0, this.overlay.scroll - 5);
+        else if (name === 'pagedown') this.overlay.scroll += 5;
+        else if ((name === 'tab' || name === 'right' || name === 'left') && swarms > 1) { this.overlay.swarm = (this.overlay.swarm + (name === 'left' || key.shift ? swarms - 1 : 1)) % swarms; this.overlay.index = 0; this.overlay.scroll = 0; this.overlay.follow = true; }
+        else if (name === 'return' && actions) { this.prepareSwarmRequest(); return; }
+        this.schedule(); return;
+      }
       if (this.overlay.kind === 'sessions') {
         const filtered = this.filteredSessions();
         if (name === 'up') this.overlay.index = Math.max(0, this.overlay.index - 1);
@@ -564,6 +619,12 @@ export class TerminalScreen {
       else output.push('', tone.accent(t("  COMAL · on the comal one cooks")), '', ...intro);
     }
     for (const block of this.blocks) {
+      if (block.role === 'timing') {
+        // Rendered each frame (language can change); it sits right under the answer.
+        const line = this.showTiming ? formatTurnTiming(block.timing, { width: columns - 3 }) : '';
+        if (line) { if (output.at(-1) === '') output.pop(); output.push(tone.muted(clip('  ' + line, columns - 1)), ''); }
+        continue;
+      }
       const cacheKey = `${columns}:${this.expandedTools}:${Boolean(this.rawView)}:${block.text || ''}:${block.state || ''}:${block.output || ''}`;
       if (block.cacheKey === cacheKey) { output.push(...block.cached); continue; }
       let lines;
@@ -612,6 +673,7 @@ export class TerminalScreen {
         return (selected ? tone.accent : String)(clip(line, columns));
       }), ...(!items.length ? [tone.muted(t("  No matches. Change section with Tab."))] : [])];
     }
+    if (this.overlay?.kind === 'swarm' && !this.permission) return swarmPanelLines(this.swarmView, this.overlay, columns, height, { busy: this.busy });
     if (this.overlay?.kind === 'board' && !this.permission) {
       const board = this.work, lines = [tone.accent(t("  Work · plan v{v0}", {v0: board?.plan?.version || 0})), ...wrap(safeText(board?.plan?.objective || t("No plan. Ask for a task with steps and checks.")), columns - 4).map(line => '  ' + line), tone.muted(t("  /work resume continues · wheel/PgUp/PgDn scrolls · Esc returns")), ''];
       const labels = { pending: t("PENDING"), in_progress: t("IN PROGRESS"), blocked: t("BLOCKED"), done: t("DONE · checks recorded"), needs_verification: t("TO VERIFY") };
@@ -686,6 +748,7 @@ export class TerminalScreen {
       const side = [tone.accent(t(" Queue · {v0}{v1}", {v0: this.queue.items.length, v1: this.queue.paused ? t(" paused") : ''})), tone.muted(t(" F4 manage")), ''];
       if (this.queue.running) side.push(tone.muted(t(" Running")), ...wrap(safeText(this.queue.running.text), sideWidth - 2).slice(0, 2).map(line => ' ' + line), '');
       this.queue.items.slice(0, 6).forEach((item, i) => side.push(tone.accent(` ${i + 1}. `) + clip(safeText(item.text).replace(/\n/g, ' ↵ '), sideWidth - 5), ''));
+      if (this.swarmStrip) side.push(...swarmStripLines(this.swarmView, sideWidth));
       body = body.map((line, i) => pad(line, bodyWidth) + tone.muted(' │') + clip(side[i] || '', sideWidth));
     }
     const elapsed = this.startedAt ? ((Date.now() - this.startedAt) / 1000).toFixed(1) : '0.0';