merge: resolve conflict with main's prompt queue

Keep icon cancel button, always-"Send" label, and queue status span
from main. Drop unused `active` local after label simplification.
Update test expectation to match.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

web/src/structured.ts

@@ -117,6 +117,7 @@ export function createStructuredConnection(
             <svg class="structured-cancel-spinner" viewBox="0 0 24 24" aria-hidden="true"><circle cx="12" cy="12" r="10" fill="none" stroke="currentColor" stroke-width="2" stroke-dasharray="50 14" stroke-linecap="round"/></svg>
             <svg class="structured-cancel-stop" viewBox="0 0 24 24" aria-hidden="true"><rect x="6" y="6" width="12" height="12" rx="2" fill="currentColor"/></svg>
           </button>
+          <span class="structured-queue" role="status" aria-live="polite" hidden></span>
         </form>
       </div>
     </div>
@@ -136,11 +137,14 @@ export function createStructuredConnection(
   const commandMenu = el.querySelector(".structured-command-menu") as HTMLDivElement;
   const input = el.querySelector(".structured-input") as HTMLTextAreaElement;
   const sendBtn = el.querySelector(".structured-send") as HTMLButtonElement;
+  const sendLabel = sendBtn.querySelector("span") as HTMLSpanElement;
   const cancelBtn = el.querySelector(".structured-cancel") as HTMLButtonElement;
+  const queueEl = el.querySelector(".structured-queue") as HTMLSpanElement;
   const attachBtn = el.querySelector(".structured-attach") as HTMLButtonElement;
   const fileInput = el.querySelector(".structured-file-input") as HTMLInputElement;
   const attachmentEl = el.querySelector(".structured-attachments") as HTMLDivElement;
   type Attachment = { file: File; path?: string };
+  type QueuedPrompt = { text: string; attachments: Attachment[] };
   let attachments: Attachment[] = [];
   let uploading = false;
   let pasteCount = 0;
@@ -158,7 +162,7 @@ export function createStructuredConnection(
       remove.type = "button";
       remove.textContent = "×";
       remove.setAttribute("aria-label", `Remove ${attachment.file.name}`);
-      remove.disabled = input.disabled;
+      remove.disabled = uploading;
       remove.addEventListener("click", () => {
         attachments = attachments.filter((item) => item !== attachment);
         renderAttachments();
@@ -169,7 +173,7 @@ export function createStructuredConnection(
   }
 
   function addFiles(files: File[]): void {
-    if (input.disabled || disposed) return;
+    if (uploading || disposed) return;
     for (const file of files) {
       if (file.size > 20 * 1024 * 1024) {
         showError(`${file.name} exceeds 20 MiB. Choose a smaller file.`);
@@ -196,7 +200,7 @@ export function createStructuredConnection(
   });
   input.addEventListener("paste", (event) => {
     const clipboard = event.clipboardData;
-    if (!clipboard || input.disabled) return;
+    if (!clipboard || uploading) return;
     if (clipboard.files.length) {
       event.preventDefault();
       addFiles(Array.from(clipboard.files));
@@ -247,6 +251,8 @@ export function createStructuredConnection(
   let disposed = false;
   let optimisticTurnStartedAt: number | null = null;
   let activityTimer: number | null = null;
+  const promptQueue: QueuedPrompt[] = [];
+  let promptRequestPending = false;
 
   // Within 64px, wheel and touch imprecision should still count as following.
   const FOLLOW_BOTTOM_THRESHOLD_PX = 64;
@@ -647,16 +653,19 @@ export function createStructuredConnection(
   }
 
   function renderComposerState(): void {
-    const active = uploading || state.turn.responding || state.turn.thinking || awaitingBeginGeneration !== null;
     const projectedActive = state.turn.responding || state.turn.thinking;
-    input.disabled = active;
-    attachBtn.disabled = active;
-    fileInput.disabled = active;
+    input.disabled = false;
+    attachBtn.disabled = uploading;
+    fileInput.disabled = uploading;
     renderAttachments();
-    sendBtn.disabled = active;
-    sendBtn.hidden = projectedActive;
+    sendBtn.disabled = false;
+    sendBtn.hidden = false;
+    sendLabel.textContent = "Send";
     cancelBtn.hidden = !projectedActive;
-    if (active) closeCommandMenu();
+    queueEl.hidden = promptQueue.length === 0;
+    queueEl.textContent = promptQueue.length === 1
+      ? "1 message queued"
+      : `${promptQueue.length} messages queued`;
     renderActivity();
   }
 
@@ -718,6 +727,7 @@ export function createStructuredConnection(
     }
     renderConfig();
     renderComposerState();
+    dispatchQueuedPrompt();
   }
 
   function closeConfigMenu(): void {
@@ -917,17 +927,14 @@ export function createStructuredConnection(
       if (!commandMenu.contains(document.activeElement)) closeCommandMenu();
     }, 0);
   });
-  composerForm.addEventListener("submit", (e) => {
-    e.preventDefault();
-    const text = input.value;
-    if ((!text.trim() && attachments.length === 0) || input.disabled) return;
-    const submittedAttachments = attachments;
+  function dispatchPrompt(text: string, submittedAttachments: Attachment[] = []): void {
     uploading = submittedAttachments.length > 0;
     const generation = ++submissionGeneration;
     const submissionSocketGeneration = socketGeneration;
     awaitingBeginGeneration = generation;
     optimisticTurnStartedAt = Date.now();
     acceptedSubmission = null;
+    promptRequestPending = true;
     input.value = "";
     autoResize();
     clearError();
@@ -944,6 +951,7 @@ export function createStructuredConnection(
     };
     void send().then(
       () => {
+        promptRequestPending = false;
         if (disposed || generation !== submissionGeneration) return;
         uploading = false;
         if (attachments === submittedAttachments) {
@@ -957,11 +965,17 @@ export function createStructuredConnection(
         // A replacement socket may have captured idle before the POST claimed
         // the prompt. Reconnect again so its snapshot cannot predate the 204.
         if (acceptanceSocketGeneration > submissionSocketGeneration) reconnectForReconciliation();
+        renderComposerState();
+        dispatchQueuedPrompt();
       },
       (e: unknown) => {
+        promptRequestPending = false;
         uploading = false;
         if (disposed || generation !== submissionGeneration) return;
         if (awaitingBeginGeneration === generation) awaitingBeginGeneration = null;
+        if (attachments.length === 0 && submittedAttachments.length > 0) {
+          attachments = submittedAttachments;
+        }
         if (input.value === "") {
           input.value = text;
           autoResize();
@@ -970,6 +984,32 @@ export function createStructuredConnection(
         renderComposerState();
       },
     );
+  }
+
+  function dispatchQueuedPrompt(): void {
+    const active = state.turn.responding || state.turn.thinking || awaitingBeginGeneration !== null;
+    if (disposed || active || promptRequestPending || promptQueue.length === 0) return;
+    const next = promptQueue.shift()!;
+    dispatchPrompt(next.text, next.attachments);
+  }
+
+  composerForm.addEventListener("submit", (e) => {
+    e.preventDefault();
+    const text = input.value;
+    if ((!text.trim() && attachments.length === 0) || uploading) return;
+    const submittedAttachments = attachments;
+    const active = state.turn.responding || state.turn.thinking || awaitingBeginGeneration !== null;
+    if (active || promptQueue.length > 0) {
+      promptQueue.push({ text, attachments: submittedAttachments });
+      attachments = [];
+      input.value = "";
+      autoResize();
+      clearError();
+      renderComposerState();
+      dispatchQueuedPrompt();
+      return;
+    }
+    dispatchPrompt(text, submittedAttachments);
   });
   cancelBtn.addEventListener("click", () => {
     clearError();