Merge commit '1c4bcff2b182c6a38d0128a25c6be217dd33f843' into codex/work-folders-base-refresh

* commit '1c4bcff2b182c6a38d0128a25c6be217dd33f843':
  fix(test): await issue lock before retry race assertions (#13273)
  fix: resume saved user messages after execution recovery (#13270)

ui/src/components/task-chat/TaskChatQueuedMessages.test.tsx

@@ -78,6 +78,15 @@ describe("TaskChatQueuedMessages", () => {
     return props;
   }
 
+  it("shows the saved message's wait reason and removes it when admission succeeds", () => {
+    const message = "Waiting for the previous environment to stop. Your message will start automatically.";
+    render({ queue: { ...queue, executionWait: { reason: "remote_cleanup", message } } });
+    expect(container.querySelector('[role="status"]')?.textContent).toContain(message);
+    expect(container.textContent).toContain("First queued message");
+    render();
+    expect(container.textContent).not.toContain(message);
+  });
+
   it("renders each queued message once as a compact one-line row", () => {
     render();
     const pane = container.querySelector(

ui/src/components/task-chat/TaskChatQueuedMessages.tsx

@@ -365,6 +365,11 @@ export function TaskChatQueuedMessages({
       data-testid="task-chat-queued-messages"
       aria-label="Queued messages"
     >
+      {queue.executionWait && (
+        <div role="status" aria-live="polite" className="px-3 py-1.5 text-xs text-muted-foreground">
+          {queue.executionWait.message}
+        </div>
+      )}
       <DndContext
         sensors={sensors}
         collisionDetection={closestCenter}