farming-code 2.2.14 → 2.2.17

package/dist/index.html

@@ -15,7 +15,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/farming/farming-2/app-icon-v2-180.png" />
     <link rel="manifest" href="/farming/farming-2/site.webmanifest" />
     <title>Farming 2</title>
-    <script type="module" crossorigin src="/farming/assets/index-BA-iH2Kg.js"></script>
+    <script type="module" crossorigin src="/farming/assets/index-C8ZFKye1.js"></script>
     <link rel="modulepreload" crossorigin href="/farming/assets/chunk-DECur_0Z.js">
     <link rel="modulepreload" crossorigin href="/farming/assets/preload-helper-mJowh_hw.js">
     <link rel="modulepreload" crossorigin href="/farming/assets/jsx-runtime-BthL93pI.js">

package/frontend/session-bridge.js

@@ -2,6 +2,8 @@
   function createClient(options = {}) {
     const getSocket = options.getSocket || (() => null);
     const fetchImpl = options.fetchImpl || global.fetch.bind(global);
+    const composerResults = new Map();
+    let composerRequestSequence = 0;
 
     function send(message) {
       const ws = getSocket();
@@ -31,13 +33,33 @@
         });
       },
 
-      sendComposerMessage(agentId, message, attachments = []) {
-        return send({
+      sendComposerMessage(agentId, message, attachments = [], options = {}) {
+        const requestId = options.onResult
+          ? `composer-${Date.now().toString(36)}-${++composerRequestSequence}`
+          : '';
+        const sent = send({
           type: 'composer-input',
           agentId,
           message,
+          ...(requestId ? { requestId } : {}),
           ...(attachments.length > 0 ? { attachments } : {}),
         });
+        if (sent && requestId) composerResults.set(requestId, options.onResult);
+        return sent;
+      },
+
+      handleServerMessage(message) {
+        if (!message || message.type !== 'composer-input-result') return false;
+        const callback = composerResults.get(message.requestId);
+        if (!callback) return false;
+        composerResults.delete(message.requestId);
+        callback(message);
+        return true;
+      },
+
+      rejectPendingComposerMessages(message = 'Connection unavailable') {
+        composerResults.forEach(callback => callback({ accepted: false, message }));
+        composerResults.clear();
       },
 
       interruptAgent(agentId) {

package/frontend/skins/crt/app.js

@@ -79,6 +79,7 @@ let crtAgentPageResizeFrame = null;
 let dashboardRenderDeferred = false;
 let lastCrtDashboardSignature = '';
 let crtPreviewRenderTimer = null;
+let crtPreviewRenderFrame = null;
 const pendingCrtPreviewRenders = new Map();
 const crtStructuredPreviewCache = new Map();
 const crtStructuredPreviewTimers = new Map();
@@ -1233,7 +1234,6 @@ function updateCrtAgentPreviewCard(agent) {
 }
 
 function flushCrtPreviewCardRenders() {
-  crtPreviewRenderTimer = null;
   const pending = Array.from(pendingCrtPreviewRenders.values());
   pendingCrtPreviewRenders.clear();
   if (pending.length === 0) return;
@@ -1242,9 +1242,12 @@ function flushCrtPreviewCardRenders() {
     return;
   }
 
-  pending.forEach(({ agent, previousSnapshot, previousText, previewChanged }) => {
+  pending.forEach(({ agent, previewChanged }) => {
     const currentAgent = state && state.agents.find((candidate) => candidate.id === agent.id);
     if (!isCrtLiveAgent(currentAgent)) return;
+    // updateCrtAgentPreviewCard prepares a detached preview tree and swaps it
+    // into the existing card atomically. Keeping that card stable avoids the
+    // flash caused by rebuilding or overlaying every sampled frame.
     if (!updateCrtAgentPreviewCard(currentAgent)) {
       if (currentAgent.id !== state.mainAgentId && !isCrtAgentOnCurrentPage(currentAgent.id)) {
         if (previewChanged) pulseCrtBrandForAgent(agent.id);
@@ -1253,44 +1256,30 @@ function flushCrtPreviewCardRenders() {
       renderCrtDashboardIfNeeded(true);
       return;
     }
-    if (previewChanged) {
-      appendCrtPreviewAfterimage(agent.id, previousSnapshot, previousText);
-      pulseCrtBrandForAgent(agent.id);
-    }
   });
 }
 
-function scheduleCrtPreviewCardRender(agent, previousSnapshot, previousText, previewChanged) {
+function flushCrtPreviewCardRendersOnFrame() {
+  crtPreviewRenderTimer = null;
+  if (crtPreviewRenderFrame !== null) return;
+  crtPreviewRenderFrame = requestAnimationFrame(() => {
+    crtPreviewRenderFrame = null;
+    flushCrtPreviewCardRenders();
+  });
+}
+
+function scheduleCrtPreviewCardRender(agent, previewChanged = false) {
   if (!isCrtLiveAgent(agent)) return;
   const existing = pendingCrtPreviewRenders.get(agent.id);
   pendingCrtPreviewRenders.set(agent.id, {
     agent,
-    previousSnapshot: existing ? existing.previousSnapshot : previousSnapshot,
-    previousText: existing ? existing.previousText : previousText,
     previewChanged: Boolean(previewChanged || (existing && existing.previewChanged)),
   });
-  if (!crtPreviewRenderTimer) {
-    crtPreviewRenderTimer = setTimeout(flushCrtPreviewCardRenders, CRT_PREVIEW_RENDER_INTERVAL_MS);
+  if (!crtPreviewRenderTimer && crtPreviewRenderFrame === null) {
+    crtPreviewRenderTimer = setTimeout(flushCrtPreviewCardRendersOnFrame, CRT_PREVIEW_RENDER_INTERVAL_MS);
   }
 }
 
-function appendCrtPreviewAfterimage(agentId, snapshot, fallbackText) {
-  if (typeof document === 'undefined') return;
-  const block = Array.from(document.querySelectorAll('[data-agent-id]'))
-    .find((candidate) => candidate.dataset.agentId === agentId);
-  const output = block && block.querySelector('.agent-output');
-  if (!output || (!snapshot && !fallbackText)) return;
-
-  const afterimage = document.createElement('div');
-  afterimage.className = 'agent-output-afterimage';
-  const tail = document.createElement('div');
-  tail.className = 'agent-output-tail';
-  if (!renderCrtTerminalSnapshot(tail, snapshot)) tail.textContent = fallbackText;
-  afterimage.appendChild(tail);
-  afterimage.addEventListener('animationend', () => afterimage.remove(), { once: true });
-  output.appendChild(afterimage);
-}
-
 function crtCommandProgram(command) {
   const tokens = String(command || '').trim().split(/\s+/).filter(Boolean);
   let index = tokens[0] === 'env' ? 1 : 0;
@@ -1400,8 +1389,8 @@ function isCrtAgentWorking(agent) {
   if (agent.terminalStatus && agent.terminalStatus.busy === true) return true;
   const runtime = agent.runtimeBinding || { kind: 'terminal' };
   if (
-    runtime.kind === 'app-server' &&
-    ['working', 'waiting-for-input', 'interrupting'].includes(runtime.state || '')
+    runtime.kind === 'acp' &&
+    ['working', 'waiting-for-permission', 'waiting-for-input', 'interrupting'].includes(runtime.state || '')
   ) {
     return true;
   }
@@ -2273,10 +2262,25 @@ function installCrtTerminalTestApi() {
         checkpointInFlight: replication.checkpointInFlight,
         checkpointInstallInProgress: replication.installInProgress,
         initialFocusPending: replication.initialFocusPending,
+        queuedTransitionCount: replication.replayState.queuedTransitions.length,
         pendingFitResize: replication.pendingFitResize,
         fitResizeTimerPending: replication.fitResizeTimer !== null
       };
     },
+    getGeometry() {
+      const buffer = terminal?.buffer?.active;
+      const proposed = fitAddon && typeof fitAddon.proposeDimensions === 'function'
+        ? fitAddon.proposeDimensions()
+        : null;
+      return {
+        cols: terminal?.cols || 0,
+        rows: terminal?.rows || 0,
+        proposedCols: proposed?.cols || 0,
+        proposedRows: proposed?.rows || 0,
+        baseY: buffer?.baseY || 0,
+        viewportY: buffer?.viewportY || 0
+      };
+    },
     getRows() {
       const buffer = terminal && terminal.buffer && terminal.buffer.active;
       if (!buffer || typeof buffer.getLine !== 'function') return [];
@@ -2414,7 +2418,7 @@ function finishCrtTerminalReplay(replication = crtTerminalReplication) {
   requestAnimationFrame(() => {
     if (!crtTerminalReplication || crtTerminalReplication !== replication || replication.disposed) return;
     document.getElementById('terminal-output')?.classList.remove('crt-terminal-checkpoint-installing');
-    sendSessionResize(replication.agentId);
+    sendSessionResize(replication.agentId, null, { forceDuringRecovery: true });
     settleInitialCrtTerminalFocus(replication);
   });
 }
@@ -2546,6 +2550,10 @@ function performCrtTerminalCheckpointInstall(replication, sessionView) {
       runtime.markHydrated(sessionView.renderOutput.length);
       syncSessionRuntimeState();
     }
+    // The checkpoint geometry belongs to the previous viewer. Reconcile it with
+    // this CRT container as soon as the checkpoint is committed; a continuous
+    // live stream must not postpone the fit until the replay queue becomes idle.
+    sendSessionResize(replication.agentId, null, { forceDuringRecovery: true });
     if (drainCrtTerminalCheckpointInstall(replication)) return;
     flushCrtTerminalTransitions();
     finishCrtTerminalReplay(replication);
@@ -2600,6 +2608,7 @@ function installCrtTerminalCheckpoint(sessionView) {
     terminal.rows === sessionView.previewRows
   ) {
     TERMINAL_REPLAY.commitCheckpoint(replication.replayState, checkpoint);
+    sendSessionResize(replication.agentId);
     flushCrtTerminalTransitions();
     finishCrtTerminalReplay(replication);
     return true;
@@ -2786,6 +2795,9 @@ async function loadGlobalSettings() {
       ...globalSettings,
       ...(data.settings || {})
     };
+    if (globalSettings.instanceName) {
+      document.title = `${globalSettings.instanceName} · Farming CRT`;
+    }
     applyCRTEffects(globalSettings.crtSkinEffectsEnabled !== false);
     if (state) renderCrtDashboardIfNeeded();
     if (agents.length > 0) renderAgentList();
@@ -2813,6 +2825,9 @@ async function saveGlobalSettings() {
         ...globalSettings,
         ...(data.settings || {})
       };
+      if (globalSettings.instanceName) {
+        document.title = `${globalSettings.instanceName} · Farming CRT`;
+      }
       syncWorkspaceSettings();
     }
   } catch (error) {
@@ -3841,11 +3856,17 @@ function renderCrtBillingSelectedDay({ preferSummary = false } = {}) {
   updateCrtBillingExactMetric('billing-day-cache-read', displayPoint && displayPoint.cacheReadTokens, { date: selectedDate, live: isToday });
   updateCrtBillingExactMetric('billing-day-cache-write', displayPoint && displayPoint.cacheWriteTokens, { date: selectedDate, live: isToday });
   if (providers) {
-    const providerTotals = displayProviders ? Object.entries(displayProviders) : [];
-    providers.textContent = providerTotals
+    const providerTotals = displayProviders
+      ? Object.entries(displayProviders).filter(([, usage]) => (
+          Math.max(0, Number(usage && usage.totalTokens) || 0) > 0
+        ))
+      : [];
+    providers.textContent = providerTotals.length > 0
+      ? `${providerTotals.length} ${providerTotals.length === 1 ? 'SOURCE' : 'SOURCES'}`
+      : '--';
+    providers.title = providerTotals
       .map(([provider, usage]) => `${provider.toUpperCase()} ${formatCrtExactUsageValue(usage && usage.totalTokens)}`)
       .join(' · ') || '--';
-    providers.title = providers.textContent;
   }
   if (stateLabel) {
     const notes = isToday ? ['LIVE 5S', 'PARTIAL DAY', 'INCL CACHE'] : ['COMPLETE DAY', 'INCL CACHE'];
@@ -5297,6 +5318,7 @@ function connect() {
   socket.onmessage = (event) => {
     if (ws !== socket) return;
     const data = JSON.parse(event.data);
+    if (getSessionClient()?.handleServerMessage(data)) return;
     if (data.type === 'protocol-hello') {
       if (data.protocolVersion !== CRT_PROTOCOL_VERSION) {
         socket.close(4002, `Unsupported Farming protocol version ${data.protocolVersion}`);
@@ -5315,6 +5337,18 @@ function connect() {
       terminalPreviewSnapshots.forEach((_snapshot, agentId) => {
         if (!activeAgentIds.has(agentId)) terminalPreviewSnapshots.delete(agentId);
       });
+      if (
+        focusedAgentId
+        && !activeAgentIds.has(focusedAgentId)
+        && !runtimeSwitchPending
+        && !pendingRuntimeSwitchAgentId
+      ) {
+        // Another viewer may kill or archive the Agent while this CRT session
+        // is open. Runtime replacement has its own bounded handoff and may
+        // briefly remove the old id, so do not mistake that legal transition
+        // for a dead session.
+        closeSession();
+      }
       state.agents.forEach((agent) => {
         if (terminalPreviewSnapshots.has(agent.id)) {
           agent.previewSnapshot = terminalPreviewSnapshots.get(agent.id);
@@ -5359,21 +5393,23 @@ function connect() {
     } else if (data.type === 'session-preview') {
       const preview = data.preview;
       if (preview && preview.agentId) {
-        terminalPreviewSnapshots.set(preview.agentId, preview.previewSnapshot || null);
+        if (preview.previewSnapshot && typeof preview.previewSnapshot === 'object') {
+          terminalPreviewSnapshots.set(preview.agentId, preview.previewSnapshot);
+        }
         const agent = state && state.agents.find((candidate) => candidate.id === preview.agentId);
         if (agent) {
-          const previousSnapshot = agent.previewSnapshot;
-          const previousText = getAgentDisplayText(agent);
           const previewChanged = typeof preview.previewText === 'string'
             && preview.previewText !== agent.previewText;
           agent.previewText = preview.previewText || agent.previewText;
           agent.previewCols = preview.cols || agent.previewCols;
           agent.previewRows = preview.rows || agent.previewRows;
-          agent.previewSnapshot = preview.previewSnapshot || null;
+          // A null preview is not a completed new frame. Retain the last
+          // authoritative snapshot until a replacement is ready.
+          agent.previewSnapshot = preview.previewSnapshot || agent.previewSnapshot || null;
           if (preview.terminalStatus) agent.terminalStatus = preview.terminalStatus;
           if (preview.runtimeObservation) agent.runtimeObservation = preview.runtimeObservation;
           if (isCrtSessionOpen()) dashboardRenderDeferred = true;
-          else scheduleCrtPreviewCardRender(agent, previousSnapshot, previousText, previewChanged);
+          else scheduleCrtPreviewCardRender(agent, previewChanged);
         }
       }
     } else if (data.type === 'session-output') {
@@ -5404,7 +5440,8 @@ function connect() {
       const agent = activity && state && state.agents.find((candidate) => candidate.id === activity.agentId);
       if (agent) {
         Object.assign(agent, activity);
-        renderCrtDashboardIfNeeded();
+        if (isCrtSessionOpen()) dashboardRenderDeferred = true;
+        else scheduleCrtPreviewCardRender(agent);
       }
     } else if (data.type === 'system-stats') {
       updateSystemStats(data.stats, data.uptime, data.usageRate);
@@ -5420,6 +5457,7 @@ function connect() {
   socket.onclose = () => {
     if (ws !== socket) return;
     ws = null;
+    getSessionClient()?.rejectPendingComposerMessages();
     console.log('Disconnected from server');
     if (crtTerminalReplication) {
       clearPendingCrtTerminalFitResize(crtTerminalReplication);
@@ -5842,7 +5880,6 @@ function structuredRuntimeKind(agent) {
   const kind = agent && agent.runtimeBinding && agent.runtimeBinding.kind;
   if (kind === 'acp') return 'ACP';
   if (kind === 'json') return 'JSON';
-  if (kind === 'app-server') return 'APP SERVER';
   return '';
 }
 
@@ -5868,6 +5905,19 @@ function canSwitchCrtAgentRuntime(agent) {
   );
 }
 
+function crtRuntimeSwitchUnavailableReason(agent) {
+  if (!agent || !agent.providerCapabilities?.runtimeSwitch || !agent.providerCapabilities?.supportsChat) {
+    return '';
+  }
+  if (agent.providerSessionTemporary === true && agent.terminalInputReceived === true) {
+    return 'MSG unavailable: this temporary Terminal session already has input and cannot be resumed safely.';
+  }
+  if (!String(agent.providerSessionId || '').trim()) {
+    return 'MSG unavailable: this Agent has no resumable provider session yet.';
+  }
+  return '';
+}
+
 function isCrtRuntimeSwitchShortcut(event) {
   return Boolean(
     event
@@ -5931,11 +5981,27 @@ function updateCrtRuntimeSwitchControl(agent) {
   const terminalButton = document.getElementById('crt-runtime-terminal');
   if (!control || !chatButton || !terminalButton) return;
   const supported = canSwitchCrtAgentRuntime(agent);
+  const unavailableReason = crtRuntimeSwitchUnavailableReason(agent);
   const view = crtRuntimeView(agent);
-  control.hidden = !supported;
+  // Keep a disabled control visible for a provider that supports Chat when
+  // this particular session cannot be resumed. Hiding it made a live
+  // Terminal look like a product capability was missing, while silently
+  // enabling it would risk replacing a temporary session and losing input.
+  control.hidden = !supported && !unavailableReason;
   control.setAttribute('aria-busy', runtimeSwitchPending ? 'true' : 'false');
   chatButton.disabled = !supported || runtimeSwitchPending;
   terminalButton.disabled = !supported || runtimeSwitchPending;
+  if (unavailableReason) {
+    control.title = unavailableReason;
+    control.setAttribute('aria-label', unavailableReason);
+    chatButton.title = unavailableReason;
+    terminalButton.title = unavailableReason;
+  } else {
+    control.removeAttribute('title');
+    control.removeAttribute('aria-label');
+    chatButton.title = 'Chat view [Alt+M]';
+    terminalButton.title = 'Terminal view [Alt+M]';
+  }
   chatButton.classList.toggle('active', view === 'chat');
   terminalButton.classList.toggle('active', view === 'terminal');
   chatButton.setAttribute('aria-pressed', view === 'chat' ? 'true' : 'false');
@@ -5973,7 +6039,7 @@ async function switchCrtSessionRuntimeMode(mode) {
   if (runtimeSwitchPending || !focusedAgentId || !state) return;
   const agent = state.agents.find((candidate) => candidate.id === focusedAgentId);
   if (!canSwitchCrtAgentRuntime(agent)) return;
-  const targetMode = mode === 'terminal' ? 'terminal' : 'acp';
+  const targetMode = mode === 'terminal' ? 'terminal' : 'chat';
   if (crtRuntimeView(agent) === (targetMode === 'terminal' ? 'terminal' : 'chat')) return;
 
   const requestSequence = ++runtimeSwitchRequestSequence;
@@ -6006,14 +6072,17 @@ async function switchCrtSessionRuntimeMode(mode) {
 function toggleCrtSessionRuntimeMode() {
   if (!focusedAgentId || !state) return;
   const agent = state.agents.find((candidate) => candidate.id === focusedAgentId);
-  if (!canSwitchCrtAgentRuntime(agent)) return;
-  void switchCrtSessionRuntimeMode(crtRuntimeView(agent) === 'chat' ? 'terminal' : 'acp');
+  if (!canSwitchCrtAgentRuntime(agent)) {
+    const reason = crtRuntimeSwitchUnavailableReason(agent);
+    if (reason) setCrtRuntimeSwitchStatus(reason, true);
+    return;
+  }
+  void switchCrtSessionRuntimeMode(crtRuntimeView(agent) === 'chat' ? 'terminal' : 'chat');
 }
 
 function structuredTranscriptEndpoint(agent) {
   if (agent.runtimeBinding.kind === 'acp') return 'acp-transcript';
-  if (agent.runtimeBinding.kind === 'json') return 'json-cli-transcript';
-  return 'codex-app-server-transcript';
+  return 'json-cli-transcript';
 }
 
 function structuredRuntimeStatus(agent) {
@@ -6033,7 +6102,6 @@ function structuredComposerAction(agent, draft = '') {
   const working = ['working', 'waiting-for-permission'].includes(status);
   if (working) {
     if (agent.runtimeBinding?.kind === 'acp' && String(draft || '').trim()) return 'send';
-    if (agent.runtimeBinding?.kind === 'app-server' && String(draft || '').trim()) return 'steer';
     return 'interrupt';
   }
   if (['starting', 'interrupting'].includes(status)) return 'disabled';
@@ -6042,9 +6110,9 @@ function structuredComposerAction(agent, draft = '') {
     : 'disabled';
 }
 
-function queueStructuredComposerFollowUp(agentId, message) {
+function queueStructuredComposerFollowUp(agentId, message, attachments = []) {
   const queue = structuredComposerPendingFollowUps.get(agentId) || [];
-  queue.push(message);
+  queue.push({ message, attachments });
   structuredComposerPendingFollowUps.set(agentId, queue);
 }
 
@@ -6052,10 +6120,10 @@ function flushStructuredComposerFollowUp(agent) {
   if (!agent || structuredRuntimeStatus(agent) !== 'idle') return;
   const queue = structuredComposerPendingFollowUps.get(agent.id);
   if (!queue || queue.length === 0) return;
-  const message = queue.shift();
+  const next = queue.shift();
   if (queue.length === 0) structuredComposerPendingFollowUps.delete(agent.id);
-  if (!getSessionClient()?.sendComposerMessage(agent.id, message)) {
-    queue.unshift(message);
+  if (!getSessionClient()?.sendComposerMessage(agent.id, next.message, next.attachments)) {
+    queue.unshift(next);
     structuredComposerPendingFollowUps.set(agent.id, queue);
     return;
   }
@@ -6481,9 +6549,7 @@ function updateStructuredComposerState(agent) {
   }
   sendButton.disabled = action === 'disabled';
   sendButton.dataset.action = action;
-  sendButton.textContent = action === 'interrupt'
-    ? 'BREAK [ESC]'
-    : action === 'steer' ? 'STEER [ENTER]' : 'SEND [ENTER]';
+  sendButton.textContent = action === 'interrupt' ? 'BREAK [ESC]' : 'SEND [ENTER]';
   input.placeholder = error
     ? 'Session unavailable'
     : (busy ? 'Agent is changing state...' : 'Type a message...');
@@ -6542,6 +6608,7 @@ function readStructuredTextFile(file) {
 async function prepareStructuredAttachment(file) {
   const attachment = {
     id: structuredAttachmentId(file),
+    kind: String(file.type || '').startsWith('audio/') ? 'audio' : 'image',
     name: file.name || 'attachment',
     status: 'uploading',
     messageBlock: ''
@@ -6549,15 +6616,21 @@ async function prepareStructuredAttachment(file) {
   structuredComposerAttachments.push(attachment);
   renderStructuredComposerAttachments();
   try {
-    if (String(file.type || '').startsWith('image/')) {
-      const response = await fetch(farmingApiPath('/attachments/image'), {
+    if (String(file.type || '').startsWith('image/') || String(file.type || '').startsWith('audio/')) {
+      const image = attachment.kind === 'image';
+      const response = await fetch(farmingApiPath(image ? '/attachments/image' : '/attachments/audio'), {
         method: 'POST',
-        headers: { 'Content-Type': file.type || 'image/png' },
+        headers: { 'Content-Type': file.type || (image ? 'image/png' : 'audio/wav') },
         body: file
       });
       const body = await response.json().catch(() => null);
-      if (!response.ok || !body || !body.path) throw new Error(`Image upload failed (${response.status})`);
-      attachment.messageBlock = `Attached image: ${body.name || attachment.name}\n\nImage path: ${body.path}`;
+      if (!response.ok || !body || !body.path) throw new Error(`${image ? 'Image' : 'Audio'} upload failed (${response.status})`);
+      attachment.path = body.path;
+      attachment.type = body.type || file.type || 'image/png';
+      attachment.size = Number(body.size) || file.size || 0;
+      attachment.messageBlock = image
+        ? `Attached image: ${body.name || attachment.name}\n\nImage path: ${body.path}`
+        : `Attached audio: ${body.name || attachment.name}\n\nAudio path: ${body.path}`;
     } else {
       const content = await readStructuredTextFile(file);
       const limit = 50000;
@@ -6581,11 +6654,25 @@ function addStructuredAttachmentFiles(files) {
 
 function structuredComposerMessage(draft) {
   return structuredComposerAttachments
-    .filter((attachment) => attachment.status === 'ready' && attachment.messageBlock)
+    .filter((attachment) => attachment.status === 'ready' && attachment.messageBlock && !attachment.path)
     .reduce((message, attachment) => structuredAttachmentBlock(message, attachment.messageBlock), String(draft || ''))
     .trim();
 }
 
+function structuredComposerPromptAttachments() {
+  return structuredComposerAttachments.flatMap((attachment) => (
+    attachment.status === 'ready' && attachment.path
+      ? [{
+          kind: attachment.kind,
+          path: attachment.path,
+          name: attachment.name,
+          type: attachment.type,
+          size: attachment.size,
+        }]
+      : []
+  ));
+}
+
 function structuredComposerHistoryFor(agentId) {
   if (!agentId) return [];
   return structuredComposerHistory.get(agentId) || [];
@@ -7013,11 +7100,11 @@ function setupStructuredSessionComposer() {
     updateStructuredComposerState(agent);
   });
   input.addEventListener('paste', (event) => {
-    const imageFiles = Array.from(event.clipboardData && event.clipboardData.files || [])
-      .filter((file) => String(file.type || '').startsWith('image/'));
-    if (!imageFiles.length) return;
+    const mediaFiles = Array.from(event.clipboardData && event.clipboardData.files || [])
+      .filter((file) => /^(image|audio)\//.test(String(file.type || '')));
+    if (!mediaFiles.length) return;
     event.preventDefault();
-    addStructuredAttachmentFiles(imageFiles);
+    addStructuredAttachmentFiles(mediaFiles);
   });
   input.addEventListener('compositionend', () => {
     structuredComposerCompositionEndAt = Date.now();
@@ -7166,11 +7253,25 @@ function setupStructuredSessionComposer() {
     }
     const draft = input.value;
     const message = structuredComposerMessage(draft);
-    if (!message) return;
-    const sent = action === 'send' && structuredRuntimeStatus(agent) !== 'idle'
-      ? (queueStructuredComposerFollowUp(focusedAgentId, message), true)
-      : getSessionClient()?.sendComposerMessage(focusedAgentId, message);
+    const promptAttachments = structuredComposerPromptAttachments();
+    if (!message && promptAttachments.length === 0) return;
     const statusNode = document.getElementById('crt-structured-composer-status');
+    const completeSubmission = () => {
+      addStructuredComposerHistory(focusedAgentId, draft);
+      input.value = '';
+      structuredComposerAttachments = [];
+      renderStructuredComposerAttachments();
+      resizeStructuredComposerInput(input);
+      if (statusNode) {
+        statusNode.textContent = 'SENDING...';
+        statusNode.classList.remove('error');
+      }
+      updateStructuredComposerState(agent);
+      setTimeout(() => void refreshStructuredSession(focusedAgentId, true), 160);
+    };
+    const sent = action === 'send' && structuredRuntimeStatus(agent) !== 'idle'
+      ? (queueStructuredComposerFollowUp(focusedAgentId, message, promptAttachments), true)
+      : getSessionClient()?.sendComposerMessage(focusedAgentId, message, promptAttachments);
     if (!sent) {
       if (statusNode) {
         statusNode.textContent = 'Connection unavailable';
@@ -7178,17 +7279,7 @@ function setupStructuredSessionComposer() {
       }
       return;
     }
-    addStructuredComposerHistory(focusedAgentId, draft);
-    input.value = '';
-    structuredComposerAttachments = [];
-    renderStructuredComposerAttachments();
-    resizeStructuredComposerInput(input);
-    if (statusNode) {
-      statusNode.textContent = action === 'steer' ? 'STEERING...' : 'SENDING...';
-      statusNode.classList.remove('error');
-    }
-    updateStructuredComposerState(agent);
-    setTimeout(() => void refreshStructuredSession(focusedAgentId, true), 160);
+    completeSubmission();
   });
 }
 
@@ -7536,7 +7627,11 @@ function clearPendingCrtTerminalFitResize(replication) {
   replication.pendingFitResize = null;
 }
 
-function commitCrtTerminalResize(agentId, normalizedDimensions) {
+function commitCrtTerminalResize(
+  agentId,
+  normalizedDimensions,
+  { allowDuringRecovery = false } = {}
+) {
   const replication = crtTerminalReplication;
   if (
     !agentId ||
@@ -7544,7 +7639,7 @@ function commitCrtTerminalResize(agentId, normalizedDimensions) {
     !replication ||
     replication.disposed ||
     replication.agentId !== agentId ||
-    replication.replayState.recovering ||
+    (!allowDuringRecovery && replication.replayState.recovering) ||
     (
       normalizedDimensions.cols === replication.lastResizeCols &&
       normalizedDimensions.rows === replication.lastResizeRows
@@ -7586,7 +7681,11 @@ function scheduleCrtTerminalFitResize(replication, agentId, normalizedDimensions
   }, CRT_TERMINAL_RESIZE_SETTLE_MS);
 }
 
-function sendSessionResize(agentId = focusedAgentId, requestedDimensions = null) {
+function sendSessionResize(
+  agentId = focusedAgentId,
+  requestedDimensions = null,
+  { forceDuringRecovery = false } = {}
+) {
   const replication = crtTerminalReplication;
   if (
     !agentId ||
@@ -7594,7 +7693,7 @@ function sendSessionResize(agentId = focusedAgentId, requestedDimensions = null)
     !fitAddon ||
     !replication ||
     replication.agentId !== agentId ||
-    replication.replayState.recovering
+    (!forceDuringRecovery && replication.replayState.recovering)
   ) return;
   const dimensions = requestedDimensions || (
     typeof fitAddon.proposeDimensions === 'function'
@@ -7618,6 +7717,25 @@ function sendSessionResize(agentId = focusedAgentId, requestedDimensions = null)
       normalizedDimensions.rows === replication.lastResizeRows
     ) {
       clearPendingCrtTerminalFitResize(replication);
+      // A checkpoint can temporarily restore the previous viewer's geometry
+      // after this surface's resize was already delivered. Reapply the known
+      // local geometry without sending a duplicate resize to the backend.
+      if (
+        terminal.cols !== normalizedDimensions.cols ||
+        terminal.rows !== normalizedDimensions.rows
+      ) {
+        replication.applyingLocalResize = true;
+        try {
+          terminal.resize(normalizedDimensions.cols, normalizedDimensions.rows);
+        } finally {
+          replication.applyingLocalResize = false;
+        }
+      }
+      return;
+    }
+    if (forceDuringRecovery) {
+      clearPendingCrtTerminalFitResize(replication);
+      commitCrtTerminalResize(agentId, normalizedDimensions, { allowDuringRecovery: true });
       return;
     }
     scheduleCrtTerminalFitResize(replication, agentId, normalizedDimensions);