From 595f447bbd9ac3e33df1f7cdaf6039bfac01b78d Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 15:40:23 +0800
Subject: [PATCH 01/33] fix(ui): make queued message delivery understandable

Explain unconfirmed delivery and the messages waiting behind it without
exposing Host terminology. Use labelled icon actions with tooltips and
one body text size across queue content and status. Keep the existing
Host admission, reconciliation identity and cancellation authority.

Extend the existing controller, composer and recovery checks and reuse
the queue story for unknown and failed delivery states. No new delivery
state or scheduler is introduced.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 .../__tests__/message-queue-ui-state.test.ts  |   6 +-
 .../controller/session-local-messages.tsx     |  18 +-
 .../renderer/locales/session-local-copy.ts    |  38 ++--
 apps/desktop/src/renderer/styles/composer.css |   7 +-
 .../composer-message-queue.stories.tsx        | 178 ++++++++++++++----
 docs/astryx-surface-file-inventory.md         |   2 +-
 .../__tests__/composer-send-toggle.test.tsx   |  28 ++-
 packages/ui/src/chat-turn.tsx                 |   2 +-
 packages/ui/src/chat-view.tsx                 |   2 +-
 packages/ui/src/composer-message-queue.tsx    |  21 ++-
 packages/ui/src/conversation-copy.ts          |  12 +-
 11 files changed, 232 insertions(+), 82 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 05f768b8ef5..02da87f4b05 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -65,19 +65,19 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
     }) }),
   })));
   assert.equal(transient.get('steering')?.deliveryActions?.length, 1, 'unconfirmed sends retain their receipt check');
-  assert.equal(transient.get('root')?.deliveryStatus, 'Host outcome unknown');
+  assert.equal(transient.get('root')?.deliveryStatus, 'Delivery unconfirmed. Do not send again.');
   const placements = () => Object.fromEntries([...transient].map(([id, message]) => [id, message.transientPlacement]));
   assert.deepEqual(placements(), { steering: 'steering', followup: 'follow_up', root: 'transcript' });
   messages = messages.map((message) => ({ ...message, state: 'saved', canCancel: true }));
   await act(async () => changed('session-1'));
-  assert.equal(transient.get('root')?.deliveryStatus, 'Saved locally · waiting to send', 'Main cannot reach the Host');
+  assert.equal(transient.get('root')?.deliveryStatus, 'Waiting for earlier messages to be delivered', 'Main cannot reach the Host');
   messages = messages.map((message) => ({ ...message, delivering: true }));
   await act(async () => changed('session-1'));
   assert.equal(transient.get('root')?.deliveryStatus, undefined, 'a message Main will deliver shows nothing');
   assert.deepEqual(transient.get('root')?.deliveryActions, []);
   messages = messages.map((message) => ({ ...message, error: 'Saved locally. Waiting for the Host to become available.' }));
   await act(async () => changed('session-1'));
-  assert.equal(transient.get('root')?.deliveryStatus, 'Saved locally · waiting to send');
+  assert.equal(transient.get('root')?.deliveryStatus, 'Waiting for earlier messages to be delivered');
   assert.equal(transient.get('root')?.deliveryActions?.length, 1, 'a Host outage keeps the copy removable');
   messages = messages.map((message) => ({ ...message, state: 'failed' }));
   await act(async () => changed('session-1'));
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index fb43e41780f..71fed0d5cc9 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -19,6 +19,7 @@
 
 import { useEffect } from 'react';
 import { useUiLocale, type TransientUserMessageProjection } from '@maka/ui';
+import { ICON_SIZE, Search, Trash2, X } from '@maka/ui/icons';
 import { getSessionLocalCopy } from '../../../locales/session-local-copy.js';
 import { useConversationServices } from '../services.js';
 
@@ -42,6 +43,7 @@ export function SessionLocalMessages(props: {
         .listMessages(sessionId)
         .then((messages) => {
           if (disposed || revision !== admitted) return;
+          let waitingForPrevious = false;
           for (const message of messages) {
             if (message.state === 'accepted' && !message.turnId) {
               // The Host queue owns accepted steering and follow-ups. A local
@@ -49,12 +51,16 @@ export function SessionLocalMessages(props: {
               retire(sessionId, message.messageId);
               continue;
             }
+            const status = message.state === 'accepted' || message.state === 'sending'
+              || (message.state === 'saved' && message.delivering && !message.error)
+              ? undefined
+              : message.state === 'saved' && waitingForPrevious
+                ? copy.waitingForPrevious
+                : copy[message.state];
+            if (message.state !== 'accepted' && message.state !== 'failed') waitingForPrevious = true;
             const action = (operation: () => Promise<void>) => () => {
               void operation().catch(() => reportError(copy.updateError));
             };
-            const status = message.state === 'accepted' || message.state === 'sending'
-              || (message.state === 'saved' && message.delivering && !message.error)
-              ? undefined : copy[message.state];
             publish(sessionId, {
               id: message.messageId,
               text: message.text,
@@ -74,7 +80,10 @@ export function SessionLocalMessages(props: {
                 : message.canCancel
                 ? [
                     {
-                      label: copy.remove,
+                      label: message.state === 'failed' ? copy.remove : copy.cancel,
+                      icon: message.state === 'failed'
+                        ? <Trash2 size={ICON_SIZE.control} aria-hidden="true" />
+                        : <X size={ICON_SIZE.control} aria-hidden="true" />,
                       onClick: action(async () => {
                         await services.cancelMessage(sessionId, message.messageId);
                         retire(sessionId, message.messageId);
@@ -85,6 +94,7 @@ export function SessionLocalMessages(props: {
                   ? [
                       {
                         label: copy.check,
+                        icon: <Search size={ICON_SIZE.control} aria-hidden="true" />,
                         onClick: action(() =>
                           services.reconcileMessage(sessionId, message.messageId),
                         ),
diff --git a/apps/desktop/src/renderer/locales/session-local-copy.ts b/apps/desktop/src/renderer/locales/session-local-copy.ts
index 165bc6c0cd0..af8f95f3c69 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -24,33 +24,41 @@ interface SessionLocalCopy {
   unknown: string;
   failed: string;
   remove: string;
+  cancel: string;
   check: string;
+  waitingForPrevious: string;
   updateError: string;
 }
 
 const catalog = {
   en: {
-    saved: 'Saved locally · waiting to send',
-    unknown: 'Host outcome unknown',
-    failed: 'Not sent · local copy retained',
-    remove: 'Remove local copy',
-    check: 'Check status',
+    saved: 'Waiting to send',
+    unknown: 'Delivery unconfirmed. Do not send again.',
+    failed: 'Could not send · message kept',
+    remove: 'Delete unsent message',
+    cancel: 'Cancel sending',
+    check: 'Check delivery',
+    waitingForPrevious: 'Waiting for earlier messages to be delivered',
     updateError: 'Unable to update the saved message',
   },
   'zh-CN': {
-    saved: '已本地保存 · 等待发送',
-    unknown: 'Host 接受结果未知',
-    failed: '未发送 · 本地副本已保留',
-    remove: '移除本地副本',
-    check: '核对状态',
+    saved: '等待发送',
+    unknown: '暂时无法确认是否送达，请勿重复发送',
+    failed: '未能发送 · 消息已保留',
+    remove: '删除未发送的消息',
+    cancel: '取消发送',
+    check: '检查是否送达',
+    waitingForPrevious: '等待前面的消息送达',
     updateError: '无法更新已保存的消息',
   },
   'zh-TW': {
-    saved: '已儲存於本機 · 等待傳送',
-    unknown: 'Host 接受結果未知',
-    failed: '未傳送 · 本機副本已保留',
-    remove: '移除本機副本',
-    check: '核對狀態',
+    saved: '等待傳送',
+    unknown: '暫時無法確認是否送達，請勿重複傳送',
+    failed: '無法傳送 · 訊息已保留',
+    remove: '刪除未傳送的訊息',
+    cancel: '取消傳送',
+    check: '檢查是否送達',
+    waitingForPrevious: '等待前面的訊息送達',
     updateError: '無法更新已儲存的訊息',
   },
 } satisfies UiCatalog<SessionLocalCopy>;
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index 18f85893009..ef50e15b569 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -706,12 +706,15 @@
   gap: var(--space-2);
   padding: var(--space-1) var(--space-2);
   color: var(--muted-foreground);
-  font-size: 11px;
+  font: var(--maka-text-body);
   white-space: nowrap;
 }
 
 .maka-composer-queue-delivery {
-  font-size: 11px;
+  display: block;
+  white-space: normal;
+  overflow-wrap: anywhere;
+  font: var(--maka-text-body);
   color: var(--muted-foreground);
 }
 
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 363f69fc089..a49196d7310 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -17,20 +17,103 @@
  * under the License.
  */
 
-import { useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import type { ComponentProps } from 'react';
 import type { MessageQueueEntryProjection } from '@maka/core/events';
 import type { SessionSummary } from '@maka/core/session';
 import { Composer } from '@maka/ui';
-import type { ChatModelChoice } from '@maka/ui';
+import type { ChatModelChoice, TransientUserMessageProjection } from '@maka/ui';
+import {
+  ConversationServicesProvider,
+  SessionLocalMessages,
+  type ConversationServices,
+} from '../src/renderer/features/conversation';
+import type { DesktopLocalMessage } from '../src/shared/session-local-contract.js';
 
 const NOW = Date.UTC(2026, 6, 1, 9, 30, 0);
+const SESSION_ID = 's';
+
+type DeliveryState = 'queued' | 'unconfirmed' | 'failed';
+
+function localDeliveryMessages(state: DeliveryState): DesktopLocalMessage[] {
+  const base = {
+    sessionId: SESSION_ID,
+    attachments: [],
+    inlineReferences: [],
+    placement: 'next_turn' as const,
+  };
+  if (state === 'unconfirmed') {
+    return [
+      {
+        ...base,
+        messageId: 'local-unconfirmed',
+        createdAt: NOW - 60_000,
+        state: 'unknown',
+        canCancel: false,
+        text: 'Check whether the queue drained before retrying the compaction audit.',
+        error: 'Connection dropped before the receipt arrived',
+      },
+      {
+        ...base,
+        messageId: 'local-waiting',
+        createdAt: NOW - 30_000,
+        state: 'saved',
+        canCancel: true,
+        text: 'Summarize the retry budget for the pending follow-ups.',
+      },
+    ];
+  }
+  if (state === 'failed') {
+    return [
+      {
+        ...base,
+        messageId: 'local-failed',
+        createdAt: NOW - 60_000,
+        state: 'failed',
+        canCancel: true,
+        text: 'Attach the runtime.sqlite compaction log to the report.',
+        error: 'Message preparation failed. The local copy is retained.',
+      },
+    ];
+  }
+  return [];
+}
+
+function localDeliveryServices(state: DeliveryState): ConversationServices {
+  let messages = localDeliveryMessages(state);
+  return {
+    listMessages: async () => messages,
+    cancelMessage: async (_sessionId, messageId) => {
+      messages = messages.filter((message) => message.messageId !== messageId);
+    },
+    reconcileMessage: async () => undefined,
+    subscribeChanges: () => () => undefined,
+    sessions: {
+      list: async () => [],
+      subscribeChanges: () => () => undefined,
+      readSnapshot: async () => {
+        throw new Error('Session snapshots are not used in this story');
+      },
+    },
+    skills: { listInvocable: async () => [] },
+    workspace: {
+      searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }),
+    },
+    newTasks: {
+      subscribeChanges: () => () => undefined,
+      listInvocableSkills: async () => [],
+      searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }),
+    },
+    mcp: { subscribeChanges: () => () => undefined },
+  };
+}
 
 const meta = {
   title: 'Product/Composer Message Queue',
+  component: QueuedComposer,
   parameters: { layout: 'fullscreen' },
-} satisfies Meta;
+} satisfies Meta<typeof QueuedComposer>;
 
 export default meta;
 
@@ -91,7 +174,7 @@ function followUpEntry(entryId: string, text: string): MessageQueueEntryProjecti
  * (projection in, mutations
  * out) is the real one; only the authority is simulated.
  */
-function QueuedComposer() {
+function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
   const [followup, setFollowup] = useState<MessageQueueEntryProjection[]>([
     {
       entryId: 'entry-steer',
@@ -120,43 +203,72 @@ function QueuedComposer() {
     streaming: true,
   };
 
+  const [published, setPublished] = useState(new Map<string, TransientUserMessageProjection>());
+  const publish = useCallback((_sessionId: string, message: TransientUserMessageProjection) => {
+    setPublished((current) => new Map(current).set(message.id, message));
+  }, []);
+  const retire = useCallback((_sessionId: string, messageId: string) => {
+    setPublished((current) => {
+      const next = new Map(current);
+      next.delete(messageId);
+      return next;
+    });
+  }, []);
+  const services = useMemo(() => localDeliveryServices(deliveryState), [deliveryState]);
+
   return (
-    <Composer
-      {...base}
-      queuedMessages={followup}
-      queuedMessageRevision={1}
-      onPromoteQueuedEntry={(entryId) => {
-        setFollowup((current) => current.filter((candidate) => candidate.entryId !== entryId));
-      }}
-      onUpdateQueuedEntry={(entryId, _expectedQueueRevision, text) => {
-        setFollowup((current) =>
-          current.map((candidate) =>
-            candidate.entryId === entryId
-              ? { ...candidate, content: { ...candidate.content, text, displayText: text } }
-              : candidate,
-          ),
-        );
-      }}
-      onDeleteQueuedEntry={(entryId) => {
-        setFollowup((current) => current.filter((candidate) => candidate.entryId !== entryId));
-      }}
-      onReorderQueuedEntries={(entryIds) => {
-        setFollowup((current) =>
-          entryIds.flatMap((entryId) =>
-            current.filter((candidate) => candidate.entryId === entryId),
-          ),
-        );
-      }}
-    />
+    <ConversationServicesProvider services={services}>
+      <SessionLocalMessages
+        sessionId={SESSION_ID}
+        publish={publish}
+        retire={retire}
+        reportError={noop}
+      />
+      <Composer
+        {...base}
+        queuedMessages={deliveryState === 'queued' ? followup : []}
+        pendingMessages={[...published.values()]}
+        queuedMessageRevision={1}
+        onPromoteQueuedEntry={(entryId) => {
+          setFollowup((current) => current.filter((candidate) => candidate.entryId !== entryId));
+        }}
+        onUpdateQueuedEntry={(entryId, _expectedQueueRevision, text) => {
+          setFollowup((current) =>
+            current.map((candidate) =>
+              candidate.entryId === entryId
+                ? { ...candidate, content: { ...candidate.content, text, displayText: text } }
+                : candidate,
+            ),
+          );
+        }}
+        onDeleteQueuedEntry={(entryId) => {
+          setFollowup((current) => current.filter((candidate) => candidate.entryId !== entryId));
+        }}
+        onReorderQueuedEntries={(entryIds) => {
+          setFollowup((current) =>
+            entryIds.flatMap((entryId) =>
+              current.filter((candidate) => candidate.entryId === entryId),
+            ),
+          );
+        }}
+      />
+    </ConversationServicesProvider>
   );
 }
 
 // Real path: mid-turn sends stay visible above the composer until consumed.
 // Drag follow-ups to reorder; 调整方向 promotes one, 编辑 updates it in place.
 export const PendingPlate: Story = {
-  render: () => (
+  args: { deliveryState: 'queued' },
+  argTypes: {
+    deliveryState: {
+      options: ['queued', 'unconfirmed', 'failed'],
+      control: { type: 'radio' },
+    },
+  },
+  render: (args) => (
     <div style={{ padding: '24px 24px 48px', maxWidth: 840 }}>
-      <QueuedComposer />
+      <QueuedComposer key={args.deliveryState} deliveryState={args.deliveryState} />
     </div>
   ),
 };
diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index 42cb0c9a6d0..e403347c3ee 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -273,7 +273,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `packages/ui/src/client-plugin-runtime.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/client-plugin-slots.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/components.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | Button, IconButton, List, ListItem, Tooltip | raw `<textarea` (API Use-the-System) | polish |
+| `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | IconButton, List, ListItem, Tooltip | raw `<textarea` (API Use-the-System) | polish |
 | `packages/ui/src/composer-model-label.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/composer.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, HoverCard, IconButton, Lightbox, Popover, Token, Tooltip | aligned — uses Astryx (Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem) | aligned |
 | `packages/ui/src/daily-review-panel.tsx` | module-hub | Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem, SegmentedControl, SegmentedControlItem, Skeleton, StackItem, Text, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem) | aligned |
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 2111de79797..002d77482f7 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -34,6 +34,7 @@ import { renderToStaticMarkup } from 'react-dom/server';
 import { parseHTML } from 'linkedom';
 import { Composer } from '../composer.js';
 import { LocaleProvider } from '../locale-context.js';
+import { ICON_SIZE, Search } from '../icons.js';
 
 function renderComposer(streaming: boolean): string {
   return renderToStaticMarkup(
@@ -294,12 +295,13 @@ test('keeps Host order visible until the reordered projection arrives', async ()
         />
       </LocaleProvider>,
     ));
-    const buttons = [...container.querySelectorAll<HTMLButtonElement>('button')];
-    const editButtons = buttons.filter((button) => button.textContent === 'Edit');
+    const editButtons = [
+      ...container.querySelectorAll<HTMLButtonElement>('[aria-label="Edit"]'),
+    ];
     const deleteButtons = [
       ...container.querySelectorAll<HTMLButtonElement>('[aria-label="Delete"]'),
     ];
-    assert.equal(buttons.filter((button) => button.textContent === 'Steer').length, 2);
+    assert.equal(container.querySelectorAll('[aria-label="Steer"]').length, 2);
     assert.equal(editButtons.length, 3);
     assert.equal(deleteButtons.length, 3);
     await act(async () => {
@@ -373,17 +375,27 @@ test('deduplicates pending steering against Host queue entries and keeps the pla
     const document = parseHTML(`<html><body>${markup}</body></html>`).document;
     assert.equal(document.querySelectorAll('.maka-composer-queue-text').length, 1);
     assert.equal(document.querySelector('.maka-composer-queue-text')?.textContent, pending.text);
-    assert.equal(document.querySelector('.maka-composer-queue-status')?.textContent, 'Steering · Applied together');
+    assert.equal(document.querySelector('.maka-composer-queue-status')?.textContent, 'Steering');
   }
 });
 
 
 test('a locally saved follow-up keeps its delivery status and recovery actions in the pending list', () => {
   const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
-    pendingMessages={[{ id: 'local', text: 'offline follow-up', ts: 1, transientPlacement: 'follow_up',
-      deliveryStatus: 'Delivery uncertain', deliveryDetail: 'Connection interrupted',
-      deliveryActions: [{ label: 'Check delivery', onClick() {} }] }]} /></LocaleProvider>);
+    pendingMessages={[
+      { id: 'local', text: 'offline follow-up', ts: 1, transientPlacement: 'follow_up',
+        deliveryStatus: 'Delivery uncertain', deliveryDetail: 'Connection interrupted',
+        deliveryActions: [{ label: 'Check delivery', icon: <Search size={ICON_SIZE.control} aria-hidden="true" />, onClick() {} }] },
+      { id: 'sending', text: 'still sending', ts: 2, transientPlacement: 'follow_up',
+        deliveryStatus: 'Sending…' },
+    ]} /></LocaleProvider>);
   const document = parseHTML(`<html><body>${markup}</body></html>`).document;
   assert.equal(document.querySelector('.maka-composer-queue-delivery')?.textContent, 'Delivery uncertain');
-  assert.ok([...document.querySelectorAll('.maka-composer-queue-actions button')].some((button) => button.textContent === 'Check delivery'));
+  assert.ok(document.querySelector('.maka-composer-queue-actions button[aria-label="Check delivery"]'),
+    'the delivery action stays an accessible labelled icon control');
+  const rows = [...document.querySelectorAll('li')];
+  const sendingRow = rows.find((row) => row.textContent?.includes('still sending'));
+  assert.ok(sendingRow);
+  assert.equal(sendingRow.querySelectorAll('.maka-composer-queue-actions button').length, 0,
+    'a local row without delivery actions offers no Host edit/steer/delete operations');
 });
diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index 746a78857ff..224fc91a6ba 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -211,7 +211,7 @@ const UserMessageBody = memo(function UserMessageBody(props: {
             dataMessageId={props.messageId}
           />
           {props.delivery?.deliveryActions?.map((action) => (
-            <UiButton key={action.label} label={action.label} variant="ghost" size="sm" onClick={action.onClick} />
+            <UiIconButton key={action.label} label={action.label} tooltip={action.label} variant="ghost" size="sm" icon={action.icon} onClick={action.onClick} />
           ))}
           {timeOrDelivery}
         </>
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 9ca927af1f4..120da27356f 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -144,7 +144,7 @@ export interface ChatViewGoalIndicatorProps {
 export interface TransientUserMessageProjection {
   deliveryStatus?: string;
   deliveryDetail?: string;
-  deliveryActions?: readonly { label: string; onClick(): void }[];
+  deliveryActions?: readonly { label: string; icon: ReactNode; onClick(): void | Promise<void> }[];
   id: string;
   text: string;
   ts: number;
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index 715b0099464..868dfa290b8 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -20,10 +20,10 @@
 import { memo, useRef, useState } from 'react';
 import type { TransientUserMessageProjection } from './chat-view.js';
 import type { MessageQueueEntryProjection } from '@maka/core/events';
-import { Button, IconButton, Tooltip } from '@astryxdesign/core';
+import { IconButton, Tooltip } from '@astryxdesign/core';
 import { List, ListItem } from '@astryxdesign/core/List';
 import type { ConversationCopy } from './conversation-copy.js';
-import { Check, GripVertical, HelpCircle, ICON_SIZE, Trash2, X } from './icons.js';
+import { Check, CornerDownLeft, GripVertical, HelpCircle, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
 import { useMountedRef } from './use-mounted-ref.js';
 import { PlatformShortcutText } from './platform-shortcut-text.js';
 
@@ -205,7 +205,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                 </>
               )}
               style={{ minHeight: 28, paddingBlock: 0 }}
-              startContent={(
+              startContent={entry.localMessage ? undefined : (
                 <span
                   className="maka-composer-queue-grip"
                   draggable={reorderable}
@@ -225,8 +225,9 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
               )}
               endContent={(
                 <span className="maka-composer-queue-actions">
-                  {entry.localMessage?.deliveryActions?.length ? entry.localMessage.deliveryActions.map((action) => (
-                    <Button key={action.label} variant="ghost" size="sm" type="button" label={action.label} onClick={action.onClick} />
+                  {entry.localMessage ? entry.localMessage.deliveryActions?.map((action) => (
+                    <IconButton key={action.label} variant="ghost" size="sm" type="button"
+                      label={action.label} tooltip={action.label} icon={action.icon} clickAction={action.onClick} />
                   )) : editing ? (
                     <>
                       <IconButton
@@ -252,7 +253,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                     </>
                   ) : (
                     <>
-                      <Button
+                      <IconButton
                         variant="ghost"
                         size="sm"
                         type="button"
@@ -263,21 +264,25 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                           || !props.onUpdateEntry
                         }
                         label={copy.editQueuedEntry}
+                        tooltip={copy.editQueuedEntry}
                         onClick={() => beginEdit(entry)}
+                        icon={<Pencil size={ICON_SIZE.control} aria-hidden="true" />}
                       />
                       {entry.placement === 'next_turn' ? (
-                        <Button
+                        <IconButton
                           variant="ghost"
                           size="sm"
                           type="button"
-                          isDisabled={pendingEntryId !== null || entry.state !== 'queued'}
+                          isDisabled={pendingEntryId !== null || entry.state !== 'queued' || !props.onPromoteEntry}
                           label={copy.promoteQueuedEntry}
+                          tooltip={copy.promoteQueuedEntry}
                           onClick={() => void runEntryAction(
                             entry.entryId,
                             props.onPromoteEntry
                               ? () => props.onPromoteEntry?.(entry.entryId)
                               : undefined,
                           )}
+                          icon={<CornerDownLeft size={ICON_SIZE.control} aria-hidden="true" />}
                         />
                       ) : null}
                       <IconButton
diff --git a/packages/ui/src/conversation-copy.ts b/packages/ui/src/conversation-copy.ts
index e0b903fac5f..007ee40f7f0 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -449,8 +449,8 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', quoteCommentTitle: '引用注释', quoteCommentSave: '保存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已选择的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你确认权限…',
       sending: '正在发送…', importing: '正在导入…', sendLabel: '发送',
       queuedMessagesAriaLabel: (count) => `${count} 条待发送消息`,
-      steeringPending: '调整方向 · 等待整批生效',
-      followupPending: '下一轮 · 每轮一条',
+      steeringPending: '调整方向',
+      followupPending: '下一轮',
       queueShortcutsLabel: '发送快捷键',
       queueShortcuts: { apple: 'Cmd+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行', other: 'Ctrl+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行' },
       promoteQueuedEntry: '调整方向', editQueuedEntry: '编辑', saveQueuedEntry: '保存', cancelQueuedEntryEdit: '取消编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
@@ -576,8 +576,8 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', quoteCommentTitle: '引用註解', quoteCommentSave: '儲存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已選擇的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你確認權限…',
       sending: '正在傳送…', importing: '正在匯入…', sendLabel: '傳送',
       queuedMessagesAriaLabel: (count) => `${count} 條待發送訊息`,
-      steeringPending: '調整方向 · 等待整批生效',
-      followupPending: '下一輪 · 每輪一條',
+      steeringPending: '調整方向',
+      followupPending: '下一輪',
       queueShortcutsLabel: '傳送快速鍵',
       queueShortcuts: { apple: 'Cmd+Enter：轉向（Steering）\nEnter：下一輪（Follow-up）\nShift+Enter：換行', other: 'Ctrl+Enter：轉向（Steering）\nEnter：下一輪（Follow-up）\nShift+Enter：換行' },
       promoteQueuedEntry: '調整方向', editQueuedEntry: '編輯', saveQueuedEntry: '儲存', cancelQueuedEntryEdit: '取消編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
@@ -703,8 +703,8 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', quoteCommentTitle: 'Quote annotation', quoteCommentSave: 'Save', quoteCommentCancel: 'Cancel', selectedSkillsAriaLabel: 'Selected Skills', removeSkillAriaLabel: (name) => `Remove Skill: ${name}`, awaitingPermission: 'Waiting for your permission decision…',
       sending: 'Sending…', importing: 'Importing…', sendLabel: 'Send',
       queuedMessagesAriaLabel: (count) => `${count} queued message${count === 1 ? '' : 's'}`,
-      steeringPending: 'Steering · Applied together',
-      followupPending: 'Follow-up · One per turn',
+      steeringPending: 'Steering',
+      followupPending: 'Next turn',
       queueShortcutsLabel: 'Send shortcuts',
       queueShortcuts: { apple: 'Cmd+Enter: Steering\nEnter: Follow-up\nShift+Enter: New line', other: 'Ctrl+Enter: Steering\nEnter: Follow-up\nShift+Enter: New line' },
       promoteQueuedEntry: 'Steer', editQueuedEntry: 'Edit', saveQueuedEntry: 'Save', cancelQueuedEntryEdit: 'Cancel editing', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',

From bc595d4d54d37adb1f0e9ffe69f4959b9b46b378 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 15:45:55 +0800
Subject: [PATCH 02/33] fix(ui): keep queued messages on a single line

Delivery explanations should not compete with the queued message body.
Move them into the existing action tooltips and remove the redundant
predecessor-status projection and second-line styling. Keep accessible
recovery actions and the original reconciliation/cancellation boundary.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 apps/desktop/e2e/session-local-recovery.spec.ts     |  8 ++++----
 .../controller/session-local-messages.tsx           |  1 -
 .../src/renderer/locales/session-local-copy.ts      |  4 ----
 apps/desktop/src/renderer/styles/composer.css       |  8 --------
 .../ui/src/__tests__/composer-send-toggle.test.tsx  |  7 +++++--
 packages/ui/src/composer-message-queue.tsx          | 13 ++++++-------
 6 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/apps/desktop/e2e/session-local-recovery.spec.ts b/apps/desktop/e2e/session-local-recovery.spec.ts
index 3bcad1481bb..743de76d37f 100644
--- a/apps/desktop/e2e/session-local-recovery.spec.ts
+++ b/apps/desktop/e2e/session-local-recovery.spec.ts
@@ -56,7 +56,7 @@ test('a locally saved message survives renderer and application restart, then ex
   await awaitSendReady(page);
   await page.locator(COMPOSER_INPUT).press('Enter');
   await expect(page.locator(COMPOSER_INPUT)).toHaveText('');
-  await expect(page.locator('.maka-user-message').filter({ hasText: pending })).toBeVisible();
+  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
   const before = await page.evaluate((id) => window.maka.sessionLocal.listMessages(id), sessionId!);
   const message = before.find((item) => item.text === pending)!;
   expect(message.state).toBe('saved');
@@ -65,7 +65,7 @@ test('a locally saved message survives renderer and application restart, then ex
   await page.reload();
   await ensureSidebarExpanded(page);
   await page.locator(`[data-session-id=${JSON.stringify(sessionId)}]`).click();
-  await expect(page.locator('.maka-user-message').filter({ hasText: pending })).toBeVisible();
+  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
   expect(
     (await page.evaluate((id) => window.maka.sessionLocal.listMessages(id), sessionId!)).find(
       (item) => item.text === pending,
@@ -146,7 +146,7 @@ test('a new task is readable locally before the Host session exists', async ({
   await awaitSendReady(page);
   await page.locator(COMPOSER_INPUT).press('Enter');
   await expect(page.locator(COMPOSER_INPUT)).toHaveText('');
-  await expect(page.locator('.maka-user-message').filter({ hasText: prompt })).toBeVisible();
+  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
   await ensureSidebarExpanded(page);
   const sessionId = await page
     .locator('[data-session-id]:has([aria-current="page"])')
@@ -157,7 +157,7 @@ test('a new task is readable locally before the Host session exists', async ({
   await page.reload();
   await ensureSidebarExpanded(page);
   await page.locator(`[data-session-id=${JSON.stringify(sessionId)}]`).click();
-  await expect(page.locator('.maka-user-message').filter({ hasText: prompt })).toBeVisible();
+  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
   await expect(page.getByText('读取任务失败', { exact: true })).toHaveCount(0);
   page = await sessionLocalWindow.restart();
   await ensureSidebarExpanded(page);
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index 71fed0d5cc9..9e76d545933 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -43,7 +43,6 @@ export function SessionLocalMessages(props: {
         .listMessages(sessionId)
         .then((messages) => {
           if (disposed || revision !== admitted) return;
-          let waitingForPrevious = false;
           for (const message of messages) {
             if (message.state === 'accepted' && !message.turnId) {
               // The Host queue owns accepted steering and follow-ups. A local
diff --git a/apps/desktop/src/renderer/locales/session-local-copy.ts b/apps/desktop/src/renderer/locales/session-local-copy.ts
index af8f95f3c69..5a4e4623e60 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -26,7 +26,6 @@ interface SessionLocalCopy {
   remove: string;
   cancel: string;
   check: string;
-  waitingForPrevious: string;
   updateError: string;
 }
 
@@ -38,7 +37,6 @@ const catalog = {
     remove: 'Delete unsent message',
     cancel: 'Cancel sending',
     check: 'Check delivery',
-    waitingForPrevious: 'Waiting for earlier messages to be delivered',
     updateError: 'Unable to update the saved message',
   },
   'zh-CN': {
@@ -48,7 +46,6 @@ const catalog = {
     remove: '删除未发送的消息',
     cancel: '取消发送',
     check: '检查是否送达',
-    waitingForPrevious: '等待前面的消息送达',
     updateError: '无法更新已保存的消息',
   },
   'zh-TW': {
@@ -58,7 +55,6 @@ const catalog = {
     remove: '刪除未傳送的訊息',
     cancel: '取消傳送',
     check: '檢查是否送達',
-    waitingForPrevious: '等待前面的訊息送達',
     updateError: '無法更新已儲存的訊息',
   },
 } satisfies UiCatalog<SessionLocalCopy>;
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index ef50e15b569..7979d59c952 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -710,14 +710,6 @@
   white-space: nowrap;
 }
 
-.maka-composer-queue-delivery {
-  display: block;
-  white-space: normal;
-  overflow-wrap: anywhere;
-  font: var(--maka-text-body);
-  color: var(--muted-foreground);
-}
-
 /* Share a grid cell so a wrapping suggestion reserves exactly the same height
    as the accepted draft, without measuring layout or mutating the editor. */
 .maka-composer-input-suggestion-wrap { display: grid; min-width: 0; }
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 002d77482f7..7cc37cf79a9 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -380,7 +380,7 @@ test('deduplicates pending steering against Host queue entries and keeps the pla
 });
 
 
-test('a locally saved follow-up keeps its delivery status and recovery actions in the pending list', () => {
+test('local queue rows keep recovery actions without stacking delivery text', () => {
   const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
     pendingMessages={[
       { id: 'local', text: 'offline follow-up', ts: 1, transientPlacement: 'follow_up',
@@ -390,7 +390,10 @@ test('a locally saved follow-up keeps its delivery status and recovery actions i
         deliveryStatus: 'Sending…' },
     ]} /></LocaleProvider>);
   const document = parseHTML(`<html><body>${markup}</body></html>`).document;
-  assert.equal(document.querySelector('.maka-composer-queue-delivery')?.textContent, 'Delivery uncertain');
+  assert.deepEqual(
+    [...document.querySelectorAll('.maka-composer-queue-list li')].map((row) => row.textContent),
+    ['offline follow-up', 'still sending'],
+  );
   assert.ok(document.querySelector('.maka-composer-queue-actions button[aria-label="Check delivery"]'),
     'the delivery action stays an accessible labelled icon control');
   const rows = [...document.querySelectorAll('li')];
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index 868dfa290b8..f7585e2b26b 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -197,12 +197,9 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                   }}
                 />
               ) : (
-                <>
-                  <span className="maka-composer-queue-text" title={entry.content.displayText ?? entry.content.text}>
-                    {entry.content.displayText ?? entry.content.text}
-                  </span>
-                  {entry.localMessage?.deliveryStatus && <span className="maka-composer-queue-delivery" role="status" title={entry.localMessage.deliveryDetail}>{entry.localMessage.deliveryStatus}</span>}
-                </>
+                <span className="maka-composer-queue-text" title={entry.content.displayText ?? entry.content.text}>
+                  {entry.content.displayText ?? entry.content.text}
+                </span>
               )}
               style={{ minHeight: 28, paddingBlock: 0 }}
               startContent={entry.localMessage ? undefined : (
@@ -227,7 +224,9 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                 <span className="maka-composer-queue-actions">
                   {entry.localMessage ? entry.localMessage.deliveryActions?.map((action) => (
                     <IconButton key={action.label} variant="ghost" size="sm" type="button"
-                      label={action.label} tooltip={action.label} icon={action.icon} clickAction={action.onClick} />
+                      label={action.label}
+                      tooltip={entry.localMessage?.deliveryStatus ? `${entry.localMessage.deliveryStatus} · ${action.label}` : action.label}
+                      icon={action.icon} clickAction={action.onClick} />
                   )) : editing ? (
                     <>
                       <IconButton

From a858c4f8e2cba4f41603b2662759ba8c73c8656c Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 20:34:17 +0800
Subject: [PATCH 03/33] fix(ui): render local sends as an outbox, not queue
 entries

A message still waiting for its receipt is not admitted to the Host
queue, so placing it under the "next turn" group told users it would
send when nothing guaranteed that. Split local deliveries into their
own section below the queue: a status icon carries the tone (pending,
unconfirmed, failed) and keeps the explanation in a tooltip, while the
recovery action stays an icon button. Host-admitted rows keep their
group headers, grips and edit/promote/delete actions unchanged.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 .../contracts/transient-message-projection.ts |  1 +
 apps/desktop/src/renderer/styles/composer.css | 20 ++++++
 .../__tests__/composer-send-toggle.test.tsx   | 25 +++++--
 packages/ui/src/chat-view.tsx                 |  2 +
 packages/ui/src/composer-message-queue.tsx    | 69 ++++++++++++++++---
 5 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 29a9c8411cb..4b89d962ed5 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -51,6 +51,7 @@ export function mergeTransientMessageProjection(
     ...update,
     // A Message's send time is written once; an update's `ts` must not move it.
     ts: current.ts,
+    ...(update.pendingSteering === undefined && current.pendingSteering !== undefined ? { pendingSteering: current.pendingSteering } : {}),
     ...(!Object.hasOwn(update, 'deliveryStatus') && current.deliveryStatus !== undefined ? { deliveryStatus: current.deliveryStatus } : {}),
     ...(!Object.hasOwn(update, 'deliveryDetail') && current.deliveryDetail !== undefined ? { deliveryDetail: current.deliveryDetail } : {}),
     ...(!Object.hasOwn(update, 'deliveryActions') && current.deliveryActions !== undefined ? { deliveryActions: current.deliveryActions } : {}),
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index 7979d59c952..d39054bb7ca 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -153,6 +153,26 @@
   cursor: grabbing;
 }
 
+.maka-composer-queue-local:not(:first-child) {
+  border-top: var(--border-width-hairline) solid var(--border);
+}
+
+.maka-composer-queue-delivery {
+  display: grid;
+  place-items: center;
+  width: 16px;
+  color: var(--muted-foreground);
+  outline: none;
+}
+
+.maka-composer-queue-delivery[data-tone='unconfirmed'] {
+  color: var(--warning-text);
+}
+
+.maka-composer-queue-delivery[data-tone='failed'] {
+  color: var(--destructive-text);
+}
+
 @media (max-width: 640px) {
   .maka-composer-queue {
     width: min(var(--maka-reading-measure), calc(100% - (2 * var(--space-3))));
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 7cc37cf79a9..ebb413078f2 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -375,13 +375,21 @@ test('deduplicates pending steering against Host queue entries and keeps the pla
     const document = parseHTML(`<html><body>${markup}</body></html>`).document;
     assert.equal(document.querySelectorAll('.maka-composer-queue-text').length, 1);
     assert.equal(document.querySelector('.maka-composer-queue-text')?.textContent, pending.text);
-    assert.equal(document.querySelector('.maka-composer-queue-status')?.textContent, 'Steering');
+    assert.equal(
+      document.querySelector('.maka-composer-queue-status')?.textContent ?? null,
+      entries.length > 0 ? 'Steering' : null,
+      'only Host-admitted entries carry a queue group; a pending send stays in the outbox',
+    );
   }
 });
 
 
-test('local queue rows keep recovery actions without stacking delivery text', () => {
+test('local sends render as an outbox, not as admitted queue entries', () => {
   const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
+    queuedMessages={[{
+      entryId: 'admitted', messageId: 'message-admitted',
+      content: { text: 'admitted follow-up' }, placement: 'next_turn', state: 'queued',
+    }]}
     pendingMessages={[
       { id: 'local', text: 'offline follow-up', ts: 1, transientPlacement: 'follow_up',
         deliveryStatus: 'Delivery uncertain', deliveryDetail: 'Connection interrupted',
@@ -391,13 +399,20 @@ test('local queue rows keep recovery actions without stacking delivery text', ()
     ]} /></LocaleProvider>);
   const document = parseHTML(`<html><body>${markup}</body></html>`).document;
   assert.deepEqual(
-    [...document.querySelectorAll('.maka-composer-queue-list li')].map((row) => row.textContent),
+    [...document.querySelectorAll('.maka-composer-queue-local li')].map((row) => row.textContent),
     ['offline follow-up', 'still sending'],
   );
+  assert.deepEqual(
+    [...document.querySelectorAll('[data-queue-placement="next_turn"] li')].map((row) => row.textContent),
+    ['admitted follow-up'],
+    'an unconfirmed send never joins the Host-admitted follow-up group',
+  );
+  const delivery = document.querySelector('.maka-composer-queue-delivery[data-tone="unconfirmed"]');
+  assert.equal(delivery?.getAttribute('aria-label'), 'Delivery uncertain');
   assert.ok(document.querySelector('.maka-composer-queue-actions button[aria-label="Check delivery"]'),
     'the delivery action stays an accessible labelled icon control');
-  const rows = [...document.querySelectorAll('li')];
-  const sendingRow = rows.find((row) => row.textContent?.includes('still sending'));
+  const sendingRow = [...document.querySelectorAll('li')]
+    .find((row) => row.textContent?.includes('still sending'));
   assert.ok(sendingRow);
   assert.equal(sendingRow.querySelectorAll('.maka-composer-queue-actions button').length, 0,
     'a local row without delivery actions offers no Host edit/steer/delete operations');
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 120da27356f..7b00249115a 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -142,6 +142,8 @@ export interface ChatViewGoalIndicatorProps {
  * plus `hostTurnId` for the grouping once the Host names one.
  */
 export interface TransientUserMessageProjection {
+  /** Held above the composer until Runtime emits steering_message. */
+  pendingSteering?: boolean;
   deliveryStatus?: string;
   deliveryDetail?: string;
   deliveryActions?: readonly { label: string; icon: ReactNode; onClick(): void | Promise<void> }[];
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index f7585e2b26b..0e06703499e 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -23,7 +23,7 @@ import type { MessageQueueEntryProjection } from '@maka/core/events';
 import { IconButton, Tooltip } from '@astryxdesign/core';
 import { List, ListItem } from '@astryxdesign/core/List';
 import type { ConversationCopy } from './conversation-copy.js';
-import { Check, CornerDownLeft, GripVertical, HelpCircle, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
+import { AlertCircle, AlertTriangle, Check, CornerDownLeft, GripVertical, HelpCircle, Hourglass, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
 import { useMountedRef } from './use-mounted-ref.js';
 import { PlatformShortcutText } from './platform-shortcut-text.js';
 
@@ -74,8 +74,13 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
   const copy = props.copy;
 
   const entries = props.queuedMessages;
+  // The groups hold Host-admitted entries only. A local message still waiting
+  // for its receipt is an outgoing send, not a queued item — mixing it into
+  // "next turn" claims an admission the Host never gave.
+  const localEntries = entries.filter((entry) => entry.localMessage !== undefined);
   const groups = (['current_turn', 'next_turn'] as const).map((placement) => ({
-    placement, entries: entries.filter((entry) => entry.placement === placement),
+    placement,
+    entries: entries.filter((entry) => entry.placement === placement && entry.localMessage === undefined),
   })).filter((group) => group.entries.length > 0);
 
   async function runEntryAction(
@@ -202,7 +207,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                 </span>
               )}
               style={{ minHeight: 28, paddingBlock: 0 }}
-              startContent={entry.localMessage ? undefined : (
+              startContent={(
                 <span
                   className="maka-composer-queue-grip"
                   draggable={reorderable}
@@ -222,12 +227,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
               )}
               endContent={(
                 <span className="maka-composer-queue-actions">
-                  {entry.localMessage ? entry.localMessage.deliveryActions?.map((action) => (
-                    <IconButton key={action.label} variant="ghost" size="sm" type="button"
-                      label={action.label}
-                      tooltip={entry.localMessage?.deliveryStatus ? `${entry.localMessage.deliveryStatus} · ${action.label}` : action.label}
-                      icon={action.icon} clickAction={action.onClick} />
-                  )) : editing ? (
+                  {editing ? (
                     <>
                       <IconButton
                         variant="ghost"
@@ -309,6 +309,57 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
         })}
         </List>
       </section>)}
+      {localEntries.length > 0 && (
+        <section className="maka-composer-queue-local">
+          <List className="maka-composer-queue-list" density="compact">
+            {localEntries.map((entry) => {
+              const local = entry.localMessage;
+              const tone = local?.deliveryState ?? 'pending';
+              const text = entry.content.displayText ?? entry.content.text;
+              return (
+                <ListItem
+                  key={entry.entryId}
+                  style={{ minHeight: 28, paddingBlock: 0 }}
+                  label={(
+                    <span className="maka-composer-queue-text" title={text}>
+                      {text}
+                    </span>
+                  )}
+                  startContent={local?.deliveryStatus ? (
+                    <Tooltip alignment="end" content={local.deliveryStatus} focusTrigger="always" touchTrigger="tap">
+                      <span
+                        className="maka-composer-queue-delivery"
+                        data-tone={tone}
+                        role="img"
+                        tabIndex={0}
+                        aria-label={local.deliveryStatus}
+                      >
+                        {tone === 'failed' ? (
+                          <AlertCircle size={ICON_SIZE.control} aria-hidden="true" />
+                        ) : tone === 'unconfirmed' ? (
+                          <AlertTriangle size={ICON_SIZE.control} aria-hidden="true" />
+                        ) : (
+                          <Hourglass size={ICON_SIZE.control} aria-hidden="true" />
+                        )}
+                      </span>
+                    </Tooltip>
+                  ) : undefined}
+                  endContent={(
+                    <span className="maka-composer-queue-actions">
+                      {local?.deliveryActions?.map((action) => (
+                        <IconButton key={action.label} variant="ghost" size="sm" type="button"
+                          label={action.label}
+                          tooltip={local.deliveryStatus ? `${local.deliveryStatus} · ${action.label}` : action.label}
+                          icon={action.icon} clickAction={action.onClick} />
+                      ))}
+                    </span>
+                  )}
+                />
+              );
+            })}
+          </List>
+        </section>
+      )}
     </div>
   );
 });

From 42c418fdf892915098db29f2a2e5f2536d549f5a Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 20:59:36 +0800
Subject: [PATCH 04/33] fix(ui): flatten the composer staging area into one
 row-per-message list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Queued steering, follow-ups and local in-flight sends are the same
thing to the user — a message that has not landed yet — so the plate
now renders one flat list instead of grouped sections and an outbox
strip. Every row is a single line plus icon buttons: send-now, edit
and delete for admitted entries; edit (cancel and restore the draft)
and delete for unsent ones; a warning-tinted check-delivery for the
unconfirmed state, which is the one case where "send now" would risk
double execution. Group headers and persistent status text are gone;
the send-shortcuts hint lives on a hover-revealed help icon.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 .../__tests__/message-queue-ui-state.test.ts  |  29 ++++-
 apps/desktop/src/renderer/app-shell.tsx       |   9 +-
 .../controller/session-local-messages.tsx     |  49 ++++---
 .../renderer/locales/session-local-copy.ts    |   4 +
 apps/desktop/src/renderer/styles/composer.css |  37 ++----
 .../composer-message-queue.stories.tsx        |  10 +-
 .../__tests__/composer-send-toggle.test.tsx   |  24 ++--
 packages/ui/src/composer-message-queue.tsx    | 123 +++++-------------
 packages/ui/src/conversation-copy.ts          |  14 +-
 9 files changed, 129 insertions(+), 170 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 02da87f4b05..707a0f8914f 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -34,6 +34,9 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   const { root } = installReactRenderer();
   const transient = new Map<string, TransientUserMessageProjection>();
   let changed!: (sessionId: string) => void;
+  const cancelled: string[][] = [];
+  const reconciled: string[][] = [];
+  const restored: string[][] = [];
   let messages: DesktopLocalMessage[] = ['steering', 'followup', 'root'].map((messageId) => ({
     sessionId: 'session-1', messageId, createdAt: 1, state: 'unknown', canCancel: false,
     text: messageId, attachments: [], inlineReferences: [],
@@ -62,26 +65,40 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       },
       retire: (_id, messageId) => { transient.delete(messageId); },
       reportError: (message) => { throw new Error(message); },
+      restoreDraft: (sessionId, text) => { restored.push([sessionId, text]); },
     }) }),
   })));
-  assert.equal(transient.get('steering')?.deliveryActions?.length, 1, 'unconfirmed sends retain their receipt check');
-  assert.equal(transient.get('root')?.deliveryStatus, 'Delivery unconfirmed. Do not send again.');
+  const steering = transient.get('steering');
+  assert.equal(steering?.deliveryStatus, 'Delivery unconfirmed. Do not send again.');
+  assert.deepEqual(steering?.deliveryActions?.map((action) => action.label), ['Check delivery'],
+    'an unconfirmed send offers only its receipt check, never cancellation');
   const placements = () => Object.fromEntries([...transient].map(([id, message]) => [id, message.transientPlacement]));
   assert.deepEqual(placements(), { steering: 'steering', followup: 'follow_up', root: 'transcript' });
+  await act(async () => { await steering?.deliveryActions?.[0]?.onClick(); });
+  assert.deepEqual(reconciled, [['session-1', 'steering']]);
+  assert.equal(transient.has('steering'), true, 'checking delivery does not retire the row');
   messages = messages.map((message) => ({ ...message, state: 'saved', canCancel: true }));
   await act(async () => changed('session-1'));
-  assert.equal(transient.get('root')?.deliveryStatus, 'Waiting for earlier messages to be delivered', 'Main cannot reach the Host');
-  messages = messages.map((message) => ({ ...message, delivering: true }));
+  const followup = transient.get('followup');
+  assert.equal(followup?.deliveryStatus, 'Waiting for earlier messages to be delivered');
+  assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Edit', 'Cancel sending']);
+  await act(async () => { await followup?.deliveryActions?.[0]?.onClick(); });
+  assert.deepEqual(cancelled, [['session-1', 'followup']]);
+  assert.deepEqual(restored, [['session-1', 'followup']],
+    'editing a never-dispatched message returns its text to the composer');
+  assert.equal(transient.has('followup'), false, 'edit retires the local row');
+  messages = messages.filter((message) => message.messageId !== 'followup')
+    .map((message) => ({ ...message, delivering: true }));
   await act(async () => changed('session-1'));
   assert.equal(transient.get('root')?.deliveryStatus, undefined, 'a message Main will deliver shows nothing');
   assert.deepEqual(transient.get('root')?.deliveryActions, []);
   messages = messages.map((message) => ({ ...message, error: 'Saved locally. Waiting for the Host to become available.' }));
   await act(async () => changed('session-1'));
   assert.equal(transient.get('root')?.deliveryStatus, 'Waiting for earlier messages to be delivered');
-  assert.equal(transient.get('root')?.deliveryActions?.length, 1, 'a Host outage keeps the copy removable');
+  assert.equal(transient.get('root')?.deliveryActions?.length, 2, 'a Host outage keeps the copy editable and removable');
   messages = messages.map((message) => ({ ...message, state: 'failed' }));
   await act(async () => changed('session-1'));
-  assert.deepEqual(placements(), { steering: 'steering', followup: 'follow_up', root: 'transcript' }, 'failed delivery moves nothing');
+  assert.deepEqual(placements(), { steering: 'steering', root: 'transcript' }, 'failed delivery moves nothing');
   messages = messages.map((message) => ({ ...message, state: 'accepted', ...(message.messageId === 'root' ? { turnId: 'started-turn' } : {}) }));
   await act(async () => changed('session-1'));
   assert.deepEqual([...transient.keys()], ['root']);
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 6f4778f0b3f..f3518178190 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -613,6 +613,13 @@ function AppShellContent({
   const openComposerModelPicker = useCallback(() => {
     composerRef.current?.openModelPicker();
   }, []);
+  const restoreLocalMessageDraft = useCallback((sessionId: string, text: string) => {
+    const composer = composerRef.current;
+    if (!composer || activeIdRef.current !== sessionId) return;
+    if (composer.getText().trim()) composer.appendText(text);
+    else composer.setText(text);
+    composer.focus();
+  }, [activeIdRef]);
   const retractedWorkspaceReferencesRef = useRef<Record<string, InlineReference[]>>({});
   const [revisionDraft, setRevisionDraft] = useState<TurnRevisionDraft | null>(null);
   const revisionDraftRef = useRef<TurnRevisionDraft | null>(null);
@@ -2071,7 +2078,7 @@ function AppShellContent({
       canOpenDialog={activeBoundarySurface.localInteractionAvailable}
       reportError={showSessionError}
     >
-    <Conversation.SessionLocalMessages sessionId={activeId} publish={addTransientMessage} retire={removeTransientMessage} reportError={toastApi.error} />
+    <Conversation.SessionLocalMessages sessionId={activeId} publish={addTransientMessage} retire={removeTransientMessage} reportError={toastApi.error} restoreDraft={restoreLocalMessageDraft} />
     <CatalogRowWatch
       catalog={sessionCatalogController}
       sessionIds={[revisionDraft?.sourceSessionId, revisionDraft?.draftSessionId]}
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index 9e76d545933..9e3c83419fc 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -19,7 +19,7 @@
 
 import { useEffect } from 'react';
 import { useUiLocale, type TransientUserMessageProjection } from '@maka/ui';
-import { ICON_SIZE, Search, Trash2, X } from '@maka/ui/icons';
+import { ICON_SIZE, Pencil, Search, Trash2 } from '@maka/ui/icons';
 import { getSessionLocalCopy } from '../../../locales/session-local-copy.js';
 import { useConversationServices } from '../services.js';
 
@@ -28,10 +28,12 @@ export function SessionLocalMessages(props: {
   readonly publish: (sessionId: string, message: TransientUserMessageProjection) => void;
   readonly retire: (sessionId: string, messageId: string) => void;
   readonly reportError: (message: string) => void;
+  /** Puts a never-dispatched message's text back into the composer for editing. */
+  readonly restoreDraft?: (sessionId: string, text: string) => void;
 }): null {
   const services = useConversationServices();
   const locale = useUiLocale();
-  const { sessionId, publish, retire, reportError } = props;
+  const { sessionId, publish, retire, reportError, restoreDraft } = props;
   useEffect(() => {
     if (!sessionId) return;
     let disposed = false;
@@ -76,27 +78,38 @@ export function SessionLocalMessages(props: {
               deliveryDetail: message.error,
               deliveryActions: status === undefined
                 ? []
-                : message.canCancel
+                : message.state === 'unknown'
                 ? [
                     {
-                      label: message.state === 'failed' ? copy.remove : copy.cancel,
-                      icon: message.state === 'failed'
-                        ? <Trash2 size={ICON_SIZE.control} aria-hidden="true" />
-                        : <X size={ICON_SIZE.control} aria-hidden="true" />,
-                      onClick: action(async () => {
-                        await services.cancelMessage(sessionId, message.messageId);
-                        retire(sessionId, message.messageId);
-                      }),
+                      label: copy.check,
+                      icon: <Search size={ICON_SIZE.control} style={{ color: 'var(--warning-text)' }} aria-hidden="true" />,
+                      onClick: action(() =>
+                        services.reconcileMessage(sessionId, message.messageId),
+                      ),
                     },
                   ]
-                : message.state === 'unknown'
+                : message.canCancel
                   ? [
+                      ...(restoreDraft
+                        ? [{
+                            label: copy.edit,
+                            icon: <Pencil size={ICON_SIZE.control} aria-hidden="true" />,
+                            onClick: action(async () => {
+                              await services.cancelMessage(sessionId, message.messageId);
+                              retire(sessionId, message.messageId);
+                              restoreDraft(sessionId, message.text);
+                            }),
+                          }]
+                        : []),
                       {
-                        label: copy.check,
-                        icon: <Search size={ICON_SIZE.control} aria-hidden="true" />,
-                        onClick: action(() =>
-                          services.reconcileMessage(sessionId, message.messageId),
-                        ),
+                        label: message.state === 'failed' ? copy.remove : copy.cancel,
+                        icon: message.state === 'failed'
+                          ? <Trash2 size={ICON_SIZE.control} style={{ color: 'var(--destructive-text)' }} aria-hidden="true" />
+                          : <Trash2 size={ICON_SIZE.control} aria-hidden="true" />,
+                        onClick: action(async () => {
+                          await services.cancelMessage(sessionId, message.messageId);
+                          retire(sessionId, message.messageId);
+                        }),
                       },
                     ]
                   : [],
@@ -113,6 +126,6 @@ export function SessionLocalMessages(props: {
       disposed = true;
       unsubscribe();
     };
-  }, [sessionId, services, publish, retire, reportError, locale]);
+  }, [sessionId, services, publish, retire, reportError, restoreDraft, locale]);
   return null;
 }
diff --git a/apps/desktop/src/renderer/locales/session-local-copy.ts b/apps/desktop/src/renderer/locales/session-local-copy.ts
index 5a4e4623e60..a7c53bbc630 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -23,6 +23,7 @@ interface SessionLocalCopy {
   saved: string;
   unknown: string;
   failed: string;
+  edit: string;
   remove: string;
   cancel: string;
   check: string;
@@ -34,6 +35,7 @@ const catalog = {
     saved: 'Waiting to send',
     unknown: 'Delivery unconfirmed. Do not send again.',
     failed: 'Could not send · message kept',
+    edit: 'Edit',
     remove: 'Delete unsent message',
     cancel: 'Cancel sending',
     check: 'Check delivery',
@@ -43,6 +45,7 @@ const catalog = {
     saved: '等待发送',
     unknown: '暂时无法确认是否送达，请勿重复发送',
     failed: '未能发送 · 消息已保留',
+    edit: '编辑',
     remove: '删除未发送的消息',
     cancel: '取消发送',
     check: '检查是否送达',
@@ -52,6 +55,7 @@ const catalog = {
     saved: '等待傳送',
     unknown: '暫時無法確認是否送達，請勿重複傳送',
     failed: '無法傳送 · 訊息已保留',
+    edit: '編輯',
     remove: '刪除未傳送的訊息',
     cancel: '取消傳送',
     check: '檢查是否送達',
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index d39054bb7ca..5f3c1d8f667 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -86,6 +86,7 @@
 }
 
 .maka-composer-queue {
+  position: relative;
   width: min(var(--maka-reading-measure), calc(100% - (2 * var(--space-6))));
   max-width: var(--maka-reading-measure);
   margin: 0 auto var(--space-1);
@@ -153,24 +154,17 @@
   cursor: grabbing;
 }
 
-.maka-composer-queue-local:not(:first-child) {
-  border-top: var(--border-width-hairline) solid var(--border);
-}
-
-.maka-composer-queue-delivery {
-  display: grid;
-  place-items: center;
-  width: 16px;
-  color: var(--muted-foreground);
-  outline: none;
-}
-
-.maka-composer-queue-delivery[data-tone='unconfirmed'] {
-  color: var(--warning-text);
+.maka-composer-queue-help {
+  position: absolute;
+  top: var(--space-1);
+  right: var(--space-1);
+  opacity: 0;
+  transition: opacity 120ms ease;
 }
 
-.maka-composer-queue-delivery[data-tone='failed'] {
-  color: var(--destructive-text);
+.maka-composer-queue:hover .maka-composer-queue-help,
+.maka-composer-queue-help:focus-visible {
+  opacity: 1;
 }
 
 @media (max-width: 640px) {
@@ -719,17 +713,6 @@
   gap: var(--space-3);
 }
 
-.maka-composer-queue-status {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--space-2);
-  padding: var(--space-1) var(--space-2);
-  color: var(--muted-foreground);
-  font: var(--maka-text-body);
-  white-space: nowrap;
-}
-
 /* Share a grid cell so a wrapping suggestion reserves exactly the same height
    as the accepted draft, without measuring layout or mutating the editor. */
 .maka-composer-input-suggestion-wrap { display: grid; min-width: 0; }
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index a49196d7310..cf39af06f22 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import type { ComponentProps } from 'react';
 import type { MessageQueueEntryProjection } from '@maka/core/events';
 import type { SessionSummary } from '@maka/core/session';
 import { Composer } from '@maka/ui';
-import type { ChatModelChoice, TransientUserMessageProjection } from '@maka/ui';
+import type { ChatModelChoice, ComposerHandle, TransientUserMessageProjection } from '@maka/ui';
 import {
   ConversationServicesProvider,
   SessionLocalMessages,
@@ -175,6 +175,7 @@ function followUpEntry(entryId: string, text: string): MessageQueueEntryProjecti
  * out) is the real one; only the authority is simulated.
  */
 function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
+  const composerRef = useRef<ComposerHandle>(null);
   const [followup, setFollowup] = useState<MessageQueueEntryProjection[]>([
     {
       entryId: 'entry-steer',
@@ -223,9 +224,14 @@ function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
         publish={publish}
         retire={retire}
         reportError={noop}
+        restoreDraft={(_id, text) => {
+          composerRef.current?.setText(text);
+          composerRef.current?.focus();
+        }}
       />
       <Composer
         {...base}
+        ref={composerRef}
         queuedMessages={deliveryState === 'queued' ? followup : []}
         pendingMessages={[...published.values()]}
         queuedMessageRevision={1}
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index ebb413078f2..d0faa7ea391 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -301,7 +301,7 @@ test('keeps Host order visible until the reordered projection arrives', async ()
     const deleteButtons = [
       ...container.querySelectorAll<HTMLButtonElement>('[aria-label="Delete"]'),
     ];
-    assert.equal(container.querySelectorAll('[aria-label="Steer"]').length, 2);
+    assert.equal(container.querySelectorAll('[aria-label="Send now"]').length, 2);
     assert.equal(editButtons.length, 3);
     assert.equal(deleteButtons.length, 3);
     await act(async () => {
@@ -375,16 +375,11 @@ test('deduplicates pending steering against Host queue entries and keeps the pla
     const document = parseHTML(`<html><body>${markup}</body></html>`).document;
     assert.equal(document.querySelectorAll('.maka-composer-queue-text').length, 1);
     assert.equal(document.querySelector('.maka-composer-queue-text')?.textContent, pending.text);
-    assert.equal(
-      document.querySelector('.maka-composer-queue-status')?.textContent ?? null,
-      entries.length > 0 ? 'Steering' : null,
-      'only Host-admitted entries carry a queue group; a pending send stays in the outbox',
-    );
   }
 });
 
 
-test('local sends render as an outbox, not as admitted queue entries', () => {
+test('local sends share the flat staging list with icon-only delivery actions', () => {
   const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
     queuedMessages={[{
       entryId: 'admitted', messageId: 'message-admitted',
@@ -399,18 +394,15 @@ test('local sends render as an outbox, not as admitted queue entries', () => {
     ]} /></LocaleProvider>);
   const document = parseHTML(`<html><body>${markup}</body></html>`).document;
   assert.deepEqual(
-    [...document.querySelectorAll('.maka-composer-queue-local li')].map((row) => row.textContent),
-    ['offline follow-up', 'still sending'],
-  );
-  assert.deepEqual(
-    [...document.querySelectorAll('[data-queue-placement="next_turn"] li')].map((row) => row.textContent),
-    ['admitted follow-up'],
-    'an unconfirmed send never joins the Host-admitted follow-up group',
+    [...document.querySelectorAll('.maka-composer-queue-list li')].map((row) => row.textContent),
+    ['admitted follow-up', 'offline follow-up', 'still sending'],
+    'admitted entries and in-flight sends share one flat list',
   );
-  const delivery = document.querySelector('.maka-composer-queue-delivery[data-tone="unconfirmed"]');
-  assert.equal(delivery?.getAttribute('aria-label'), 'Delivery uncertain');
   assert.ok(document.querySelector('.maka-composer-queue-actions button[aria-label="Check delivery"]'),
     'the delivery action stays an accessible labelled icon control');
+  const gripRows = [...document.querySelectorAll('li')]
+    .filter((row) => row.querySelector('.maka-composer-queue-grip') !== null);
+  assert.equal(gripRows.length, 1, 'only the admitted row carries a drag grip');
   const sendingRow = [...document.querySelectorAll('li')]
     .find((row) => row.textContent?.includes('still sending'));
   assert.ok(sendingRow);
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index 0e06703499e..172563469ae 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -23,7 +23,7 @@ import type { MessageQueueEntryProjection } from '@maka/core/events';
 import { IconButton, Tooltip } from '@astryxdesign/core';
 import { List, ListItem } from '@astryxdesign/core/List';
 import type { ConversationCopy } from './conversation-copy.js';
-import { AlertCircle, AlertTriangle, Check, CornerDownLeft, GripVertical, HelpCircle, Hourglass, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
+import { Check, CornerDownLeft, GripVertical, HelpCircle, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
 import { useMountedRef } from './use-mounted-ref.js';
 import { PlatformShortcutText } from './platform-shortcut-text.js';
 
@@ -74,14 +74,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
   const copy = props.copy;
 
   const entries = props.queuedMessages;
-  // The groups hold Host-admitted entries only. A local message still waiting
-  // for its receipt is an outgoing send, not a queued item — mixing it into
-  // "next turn" claims an admission the Host never gave.
-  const localEntries = entries.filter((entry) => entry.localMessage !== undefined);
-  const groups = (['current_turn', 'next_turn'] as const).map((placement) => ({
-    placement,
-    entries: entries.filter((entry) => entry.placement === placement && entry.localMessage === undefined),
-  })).filter((group) => group.entries.length > 0);
 
   async function runEntryAction(
     entryId: string,
@@ -153,25 +145,25 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
       role="region"
       aria-label={copy.queuedMessagesAriaLabel(entries.length)}
     >
-      {groups.map((group, index) => <section key={group.placement} data-queue-placement={group.placement}>
-        <div className="maka-composer-queue-status">
-          <span>{group.placement === 'current_turn' ? copy.steeringPending : copy.followupPending}</span>
-          {index === 0 && <Tooltip alignment="end" content={<span style={{ whiteSpace: 'pre-line' }}><PlatformShortcutText {...copy.queueShortcuts} /></span>}>
-            <IconButton variant="ghost" size="sm" type="button" label={copy.queueShortcutsLabel}
-              icon={<HelpCircle size={ICON_SIZE.control} aria-hidden="true" />} />
-          </Tooltip>}
-        </div>
-        <List className="maka-composer-queue-list" density="compact">
-        {group.entries.map((entry) => {
+      <Tooltip alignment="end" content={<span style={{ whiteSpace: 'pre-line' }}><PlatformShortcutText {...copy.queueShortcuts} /></span>}>
+        <IconButton className="maka-composer-queue-help" variant="ghost" size="sm" type="button"
+          label={copy.queueShortcutsLabel}
+          icon={<HelpCircle size={ICON_SIZE.control} aria-hidden="true" />} />
+      </Tooltip>
+      <List className="maka-composer-queue-list" density="compact">
+        {entries.map((entry) => {
           const editing = editingEntryId === entry.entryId;
+          const local = entry.localMessage;
           const reorderable =
             entry.state === 'queued'
+            && !local
             && !editing
             && Boolean(props.onReorderEntries)
             && pendingEntryId === null;
           return (
             <div
               key={entry.entryId}
+              data-queue-placement={entry.placement}
               data-maka-queue-drop-target={reorderable ? 'true' : undefined}
               onDragOver={(event) => {
                 if (reorderable && dragEntryId.current) event.preventDefault();
@@ -207,7 +199,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                 </span>
               )}
               style={{ minHeight: 28, paddingBlock: 0 }}
-              startContent={(
+              startContent={local ? undefined : (
                 <span
                   className="maka-composer-queue-grip"
                   draggable={reorderable}
@@ -227,7 +219,12 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
               )}
               endContent={(
                 <span className="maka-composer-queue-actions">
-                  {editing ? (
+                  {local ? local.deliveryActions?.map((action) => (
+                    <IconButton key={action.label} variant="ghost" size="sm" type="button"
+                      label={action.label}
+                      tooltip={local.deliveryStatus ? `${local.deliveryStatus} · ${action.label}` : action.label}
+                      icon={action.icon} clickAction={action.onClick} />
+                  )) : editing ? (
                     <>
                       <IconButton
                         variant="ghost"
@@ -252,21 +249,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                     </>
                   ) : (
                     <>
-                      <IconButton
-                        variant="ghost"
-                        size="sm"
-                        type="button"
-                        isDisabled={
-                          pendingEntryId !== null
-                          || entry.state !== 'queued'
-                          || props.queueRevision === undefined
-                          || !props.onUpdateEntry
-                        }
-                        label={copy.editQueuedEntry}
-                        tooltip={copy.editQueuedEntry}
-                        onClick={() => beginEdit(entry)}
-                        icon={<Pencil size={ICON_SIZE.control} aria-hidden="true" />}
-                      />
                       {entry.placement === 'next_turn' ? (
                         <IconButton
                           variant="ghost"
@@ -284,6 +266,21 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                           icon={<CornerDownLeft size={ICON_SIZE.control} aria-hidden="true" />}
                         />
                       ) : null}
+                      <IconButton
+                        variant="ghost"
+                        size="sm"
+                        type="button"
+                        isDisabled={
+                          pendingEntryId !== null
+                          || entry.state !== 'queued'
+                          || props.queueRevision === undefined
+                          || !props.onUpdateEntry
+                        }
+                        label={copy.editQueuedEntry}
+                        tooltip={copy.editQueuedEntry}
+                        onClick={() => beginEdit(entry)}
+                        icon={<Pencil size={ICON_SIZE.control} aria-hidden="true" />}
+                      />
                       <IconButton
                         variant="ghost"
                         size="sm"
@@ -307,59 +304,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
             </div>
           );
         })}
-        </List>
-      </section>)}
-      {localEntries.length > 0 && (
-        <section className="maka-composer-queue-local">
-          <List className="maka-composer-queue-list" density="compact">
-            {localEntries.map((entry) => {
-              const local = entry.localMessage;
-              const tone = local?.deliveryState ?? 'pending';
-              const text = entry.content.displayText ?? entry.content.text;
-              return (
-                <ListItem
-                  key={entry.entryId}
-                  style={{ minHeight: 28, paddingBlock: 0 }}
-                  label={(
-                    <span className="maka-composer-queue-text" title={text}>
-                      {text}
-                    </span>
-                  )}
-                  startContent={local?.deliveryStatus ? (
-                    <Tooltip alignment="end" content={local.deliveryStatus} focusTrigger="always" touchTrigger="tap">
-                      <span
-                        className="maka-composer-queue-delivery"
-                        data-tone={tone}
-                        role="img"
-                        tabIndex={0}
-                        aria-label={local.deliveryStatus}
-                      >
-                        {tone === 'failed' ? (
-                          <AlertCircle size={ICON_SIZE.control} aria-hidden="true" />
-                        ) : tone === 'unconfirmed' ? (
-                          <AlertTriangle size={ICON_SIZE.control} aria-hidden="true" />
-                        ) : (
-                          <Hourglass size={ICON_SIZE.control} aria-hidden="true" />
-                        )}
-                      </span>
-                    </Tooltip>
-                  ) : undefined}
-                  endContent={(
-                    <span className="maka-composer-queue-actions">
-                      {local?.deliveryActions?.map((action) => (
-                        <IconButton key={action.label} variant="ghost" size="sm" type="button"
-                          label={action.label}
-                          tooltip={local.deliveryStatus ? `${local.deliveryStatus} · ${action.label}` : action.label}
-                          icon={action.icon} clickAction={action.onClick} />
-                      ))}
-                    </span>
-                  )}
-                />
-              );
-            })}
-          </List>
-        </section>
-      )}
+      </List>
     </div>
   );
 });
diff --git a/packages/ui/src/conversation-copy.ts b/packages/ui/src/conversation-copy.ts
index 007ee40f7f0..2f57b3ed765 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -91,8 +91,6 @@ export interface ConversationCopy {
     importing: string;
     sendLabel: string;
     queuedMessagesAriaLabel(count: number): string;
-    steeringPending: string;
-    followupPending: string;
     queueShortcutsLabel: string;
     queueShortcuts: { apple: string; other: string };
     promoteQueuedEntry: string;
@@ -449,11 +447,9 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', quoteCommentTitle: '引用注释', quoteCommentSave: '保存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已选择的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你确认权限…',
       sending: '正在发送…', importing: '正在导入…', sendLabel: '发送',
       queuedMessagesAriaLabel: (count) => `${count} 条待发送消息`,
-      steeringPending: '调整方向',
-      followupPending: '下一轮',
       queueShortcutsLabel: '发送快捷键',
       queueShortcuts: { apple: 'Cmd+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行', other: 'Ctrl+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行' },
-      promoteQueuedEntry: '调整方向', editQueuedEntry: '编辑', saveQueuedEntry: '保存', cancelQueuedEntryEdit: '取消编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
+      promoteQueuedEntry: '直接发送', editQueuedEntry: '编辑', saveQueuedEntry: '保存', cancelQueuedEntryEdit: '取消编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '添加上下文', stagedContext: '附加内容',
       selectModel: '选择模型', dropToImport: '松开以导入文件内容', addingAttachment: '正在添加附件', addFileOrDirectory: '添加文件', referenceFolder: '引用文件夹',
@@ -576,11 +572,9 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', quoteCommentTitle: '引用註解', quoteCommentSave: '儲存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已選擇的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你確認權限…',
       sending: '正在傳送…', importing: '正在匯入…', sendLabel: '傳送',
       queuedMessagesAriaLabel: (count) => `${count} 條待發送訊息`,
-      steeringPending: '調整方向',
-      followupPending: '下一輪',
       queueShortcutsLabel: '傳送快速鍵',
       queueShortcuts: { apple: 'Cmd+Enter：轉向（Steering）\nEnter：下一輪（Follow-up）\nShift+Enter：換行', other: 'Ctrl+Enter：轉向（Steering）\nEnter：下一輪（Follow-up）\nShift+Enter：換行' },
-      promoteQueuedEntry: '調整方向', editQueuedEntry: '編輯', saveQueuedEntry: '儲存', cancelQueuedEntryEdit: '取消編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
+      promoteQueuedEntry: '直接傳送', editQueuedEntry: '編輯', saveQueuedEntry: '儲存', cancelQueuedEntryEdit: '取消編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '新增上下文', stagedContext: '附加內容',
       selectModel: '選擇模型', dropToImport: '鬆開以匯入檔案內容', addingAttachment: '正在新增附件', addFileOrDirectory: '新增檔案或目錄', referenceFolder: '引用資料夾',
@@ -703,11 +697,9 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', quoteCommentTitle: 'Quote annotation', quoteCommentSave: 'Save', quoteCommentCancel: 'Cancel', selectedSkillsAriaLabel: 'Selected Skills', removeSkillAriaLabel: (name) => `Remove Skill: ${name}`, awaitingPermission: 'Waiting for your permission decision…',
       sending: 'Sending…', importing: 'Importing…', sendLabel: 'Send',
       queuedMessagesAriaLabel: (count) => `${count} queued message${count === 1 ? '' : 's'}`,
-      steeringPending: 'Steering',
-      followupPending: 'Next turn',
       queueShortcutsLabel: 'Send shortcuts',
       queueShortcuts: { apple: 'Cmd+Enter: Steering\nEnter: Follow-up\nShift+Enter: New line', other: 'Ctrl+Enter: Steering\nEnter: Follow-up\nShift+Enter: New line' },
-      promoteQueuedEntry: 'Steer', editQueuedEntry: 'Edit', saveQueuedEntry: 'Save', cancelQueuedEntryEdit: 'Cancel editing', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',
+      promoteQueuedEntry: 'Send now', editQueuedEntry: 'Edit', saveQueuedEntry: 'Save', cancelQueuedEntryEdit: 'Cancel editing', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',
       stopLabel: 'Stop', stopping: 'Stopping…',
       addContext: 'Add context', stagedContext: 'staged items',
       selectModel: 'Choose model', dropToImport: 'Drop to import file contents', addingAttachment: 'Adding attachment', addFileOrDirectory: 'Add files', referenceFolder: 'Reference folder',

From 4c5067df8721e8d36d2c444a548d8287a2a65dae Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 22:25:33 +0800
Subject: [PATCH 05/33] fix(ui): keep the queue plate's help icon reachable by
 pointer

The floating shortcut hint sat over the first row's actions, so the row
intercepted hover and the tooltip could never open. Reserve the corner
with a uniform right gutter on row actions and raise the icon above the
row background. Also refresh the stale tooltip copy assertion in the
WorkHub e2e.

Generated-by: Devin
---
 apps/desktop/e2e/workhub-layout.spec.ts       | 2 +-
 apps/desktop/src/renderer/styles/composer.css | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/e2e/workhub-layout.spec.ts b/apps/desktop/e2e/workhub-layout.spec.ts
index 6e426cc9ff3..e0535a0b659 100644
--- a/apps/desktop/e2e/workhub-layout.spec.ts
+++ b/apps/desktop/e2e/workhub-layout.spec.ts
@@ -417,7 +417,7 @@ test('WorkHub keeps the submitted prompt visible while its agent is still runnin
   await expect(prompt).toHaveCount(1);
   await expect(workhub.locator('.maka-bubble-streaming')).toContainText('Fake backend waiting');
   await expect(stop).toBeVisible();
-  const followups = workhub.locator('[data-queue-placement="next_turn"] .maka-composer-queue-text');
+  const followups = workhub.locator('.maka-composer-queue .maka-composer-queue-text');
   const queuedTexts = ['下一轮整理测试结果', '再下一轮补充使用说明'] as const;
   await workhub.locator(COMPOSER_INPUT).fill(queuedTexts[0]);
   await workhub.getByRole('button', { name: /^(发送|Send)$/ }).click();
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index 5f3c1d8f667..85d9ec662cb 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -158,10 +158,17 @@
   position: absolute;
   top: var(--space-1);
   right: var(--space-1);
+  z-index: 1;
   opacity: 0;
   transition: opacity 120ms ease;
 }
 
+/* The floating help icon sits over the top-right corner; keep every row's
+   actions clear of it so neither intercepts the other's pointer events. */
+.maka-composer-queue-actions {
+  margin-right: calc(var(--space-6) + var(--space-1));
+}
+
 .maka-composer-queue:hover .maka-composer-queue-help,
 .maka-composer-queue-help:focus-visible {
   opacity: 1;

From 2798532ea4c4fae8788b770b54aaf896eb8c682e Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 22:25:40 +0800
Subject: [PATCH 06/33] fix(ui): render queued steering in the transcript, not
 the plate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The composer staging area is for follow-ups only. Steering the Host has
queued but not yet consumed now appears as a transcript bubble with edit
and delete actions — edit retracts the entry and restores its text to
the draft, delete retracts it outright. Entries that leave the Host
queue without an admission event retire their bubble, and the local
outbox accepting a send no longer removes the queue-owned copy.

Generated-by: Devin
---
 .../__tests__/message-queue-ui-state.test.ts  | 83 +++++++++++++------
 .../__tests__/workhub-send-visibility.test.ts | 12 ++-
 .../src/renderer/app-shell-session-events.ts  | 62 +++++++++++++-
 apps/desktop/src/renderer/app-shell.tsx       | 35 +++++++-
 .../contracts/transient-message-projection.ts | 23 ++++-
 .../tools/side-chat/quote-companion-panel.tsx |  7 ++
 .../tools/side-chat/use-quote-companion.ts    | 50 ++++++++++-
 .../controller/use-workhub-controller.ts      | 77 ++++++++++++++---
 .../features/workhub/ui/workhub-root.tsx      | 10 ++-
 apps/desktop/stories/app-shell.stories.tsx    | 48 +++++++++++
 .../composer-message-queue.stories.tsx        |  3 +
 .../chat-turn-steering-order.test.ts          | 10 ++-
 .../__tests__/composer-send-toggle.test.tsx   | 55 +++++++-----
 packages/ui/src/chat-view.tsx                 |  5 +-
 packages/ui/src/composer-message-queue.tsx    | 57 +++++++------
 packages/ui/src/composer.tsx                  |  2 -
 16 files changed, 434 insertions(+), 105 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 707a0f8914f..9ccdf5b52b2 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -108,9 +108,11 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   assert.deepEqual([...transient.keys()], ['root'], 'a retained local copy cannot resurrect a withdrawn queue entry');
 });
 
-test('queue_update events drive the independent desktop queue projection', () => {
+test('queue_update keeps queued steering as a transcript bubble with retract actions', async () => {
   const controller = createAppShellSessionUiStateController();
-  const transientMessages = new Set(['message-steer', 'message-next']);
+  const transientMessages = new Map<string, TransientUserMessageProjection>();
+  const retracted: string[][] = [];
+  const restored: string[][] = [];
   const handlers = createAppShellSessionEventHandlers({
     uiLocale: 'zh-CN',
     activeIdRef: { current: 'session-1' },
@@ -120,8 +122,19 @@ test('queue_update events drive the independent desktop queue projection', () =>
     setLiveTurnBySession: controller.setLiveTurnBySession,
     setInteractionBySession: controller.setInteractionBySession,
     setMessageQueueBySession: controller.setMessageQueueBySession,
-    removeTransientMessage: (_sessionId, messageId) =>
-      transientMessages.delete(messageId),
+    getMessageQueue: (sessionId) => controller.getState().messageQueueBySession[sessionId],
+    removeTransientMessage: (_sessionId, messageId) => {
+      transientMessages.delete(messageId);
+    },
+    upsertTransientMessage: (_sessionId, message) => {
+      transientMessages.set(message.id, message);
+    },
+    retractQueueEntry: async (sessionId, entryId) => {
+      retracted.push([sessionId, entryId]);
+    },
+    restoreMessageDraft: (sessionId, text) => {
+      restored.push([sessionId, text]);
+    },
     showModelSetupToast() {},
     toastApi: { error() {} },
   });
@@ -136,39 +149,57 @@ test('queue_update events drive the independent desktop queue projection', () =>
     ...steeringEntry,
     state: 'in_flight' as const,
   };
-
-  handlers.handleEvent('session-1', {
-    type: 'queue_update',
+  const followupEntry = {
+    entryId: 'entry-next',
+    messageId: 'message-next',
+    content: { text: 'do this next' },
+    placement: 'next_turn' as const,
+    state: 'queued' as const,
+  };
+  const queueUpdate = (steering: import('@maka/core/events').MessageQueueEntryProjection[]) => ({
+    type: 'queue_update' as const,
     id: 'queue-1',
     turnId: 'turn-1',
     ts: 1,
     queueRevision: 3,
     steering: ['adjust this run'],
     followup: ['do this next'],
-    steeringEntries: [steeringEntry],
-    followupEntries: [{
-      entryId: 'entry-next',
-      messageId: 'message-next',
-      content: { text: 'do this next' },
-      placement: 'next_turn',
-      state: 'queued',
-    }],
+    steeringEntries: steering,
+    followupEntries: [followupEntry],
+  });
+  transientMessages.set('message-next', {
+    id: 'message-next', text: 'do this next', ts: 1, transientPlacement: 'follow_up',
   });
 
+  handlers.handleEvent('session-1', queueUpdate([steeringEntry]));
+
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
     queueRevision: 3,
-    entries: [
-      steeringEntry,
-      {
-        entryId: 'entry-next',
-        messageId: 'message-next',
-        content: { text: 'do this next' },
-        placement: 'next_turn',
-        state: 'queued',
-      },
-    ],
+    entries: [steeringEntry, followupEntry],
   });
-  assert.equal(transientMessages.size, 0, 'Host evidence retires local placeholders');
+  assert.equal(transientMessages.has('message-next'), false,
+    'a queued follow-up retires its placeholder — the plate row owns it');
+  const steering = transientMessages.get('message-steer');
+  assert.equal(steering?.pendingSteering, true);
+  assert.equal(steering?.hostTurnId, 'turn-1');
+  assert.equal(steering?.text, 'adjust this run');
+  assert.deepEqual(steering?.deliveryActions?.map((action) => action.label), ['编辑', '删除'],
+    'queued steering keeps edit and retract controls on its bubble');
+
+  await steering?.deliveryActions?.[0]?.onClick();
+  assert.deepEqual(retracted, [['session-1', 'entry-steer']]);
+  assert.deepEqual(restored, [['session-1', 'adjust this run']],
+    'editing a queued steering retracts it and returns the text to the composer');
+  assert.equal(transientMessages.has('message-steer'), false);
+
+  handlers.handleEvent('session-1', queueUpdate([steeringEntry]));
+  await transientMessages.get('message-steer')?.deliveryActions?.[1]?.onClick();
+  assert.deepEqual(retracted.at(-1), ['session-1', 'entry-steer']);
+  assert.equal(restored.length, 1, 'delete retracts without touching the draft');
+
+  handlers.handleEvent('session-1', queueUpdate([{ ...steeringEntry, state: 'in_flight' }]));
+  assert.equal(transientMessages.has('message-steer'), false,
+    'an in-flight queue entry must not re-add a transcript bubble');
 
   const nextEntry = {
     entryId: 'entry-next',
diff --git a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
index 8225b7bab90..7c67ec9c819 100644
--- a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
+++ b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
@@ -605,7 +605,7 @@ test('steering observed before its admission response renders once and outranks
 });
 
 
-test('WorkHub Host queue owns restored, consumed and retracted rows without transient mirrors', async () => {
+test('WorkHub queued steering keeps a transcript bubble until consumed or retracted', async () => {
   const h = await mountController();
   await act(() => { h.admit('active-turn'); h.emit({ type: 'text_delta', id: 'live', turnId: 'active-turn', messageId: 'answer', ts: 1, text: 'Working' }); });
   const entry = { entryId: 'queued', messageId: 'queued', placement: 'current_turn' as const, state: 'queued' as const, content: { text: 'change direction' } };
@@ -615,13 +615,18 @@ test('WorkHub Host queue owns restored, consumed and retracted rows without tran
   });
   await act(() => project('queued'));
   assert.deepEqual(h.controller.messageQueue.entries, [entry]);
-  assert.deepEqual(h.controller.transientMessages, []);
+  assert.deepEqual(h.controller.transientMessages.map((message) => message.id), ['queued'],
+    'queued steering waits in the transcript, not the follow-up plate');
+  assert.equal(h.controller.transientMessages[0]?.pendingSteering, true);
+  assert.equal(h.controller.transientMessages[0]?.hostTurnId, 'active-turn');
+  await act(() => h.emit({ type: 'steering_message', id: 'consumed', turnId: 'active-turn', ts: 3, messageId: entry.messageId, content: entry.content }));
   await act(() => project('in_flight'));
   assert.deepEqual(h.controller.messageQueue.entries, [{ ...entry, state: 'in_flight' }], 'a pulled message stays pending until the runtime places it');
   await act(() => h.emit({ type: 'steering_message', id: 'consumed', turnId: 'active-turn', ts: 3, messageId: entry.messageId, content: entry.content }));
   assert.deepEqual(h.controller.messageQueue.entries, []);
   assert.deepEqual(h.controller.transientMessages, []);
   await act(() => project('queued'));
+  assert.equal(h.controller.transientMessages.length, 1);
   await act(async () => { await h.controller.deleteQueuedEntry(entry.entryId); });
   await act(() => h.emit({ type: 'queue_update', id: 'removed', turnId: 'active-turn', ts: 4, steering: [], followup: [], steeringEntries: [] }));
   assert.deepEqual(h.controller.messageQueue.entries, []);
@@ -648,7 +653,8 @@ test('WorkHub sends queue edits, withdrawal and both queue orders to the Host an
   await act(() => h.emit({ type: 'queue_update', id: 'updated', turnId: 'active-turn', ts: 3,
     queueRevision: 10, steering: ['edited second'], followup: [], steeringEntries: [{ ...entries[1]!, content: { text: 'edited second' } }] }));
   assert.deepEqual(h.controller.messageQueue.entries.map((entry) => entry.content.text), ['edited second']);
-  assert.deepEqual(h.controller.transientMessages, []);
+  assert.deepEqual(h.controller.transientMessages.map((message) => message.text), ['edited second'],
+    'the queue snapshot retires the edited-out steering bubble and republishes the edited one');
 });
 
 
diff --git a/apps/desktop/src/renderer/app-shell-session-events.ts b/apps/desktop/src/renderer/app-shell-session-events.ts
index f5af41d62e7..4473abb91f9 100644
--- a/apps/desktop/src/renderer/app-shell-session-events.ts
+++ b/apps/desktop/src/renderer/app-shell-session-events.ts
@@ -28,9 +28,10 @@ import {
   TOOL_STREAM_MAX_CHUNKS,
   TOOL_STREAM_MAX_TOTAL_CHARS,
 } from '@maka/ui';
-import type { LiveTurnBuffer, LiveTurnProjection, InteractionQueues } from '@maka/ui';
+import type { LiveTurnBuffer, LiveTurnProjection, InteractionQueues, TransientUserMessageProjection } from '@maka/ui';
 import type { RefreshMessagesOptions } from './app-shell-chat-actions.js';
 import { deriveMessageQueueProjection } from './application/contracts/message-queue-projection.js';
+import { queuedSteeringDeliveryActions } from './application/contracts/transient-message-projection.js';
 import type { MessageQueueUiState } from './app-shell-session-ui-state.js';
 import * as modelConnectionErrors from './model-connection-errors.js';
 import { getDesktopConversationCopy } from './application/contracts/conversation-copy.js';
@@ -53,6 +54,9 @@ type ToastApi = {
 
 export interface AppShellSessionEventHandlers {
   handleEvent(sessionId: string, event: SessionEvent): void;
+  /** Whether the Host queue snapshot currently owns this steering bubble —
+   *  local-record retirement must not remove it. */
+  isQueuedSteering(sessionId: string, messageId: string): boolean;
   reconcilePersistedMessages(sessionId: string, messages: readonly StoredMessage[]): void;
   settleAssistantStreaming(sessionId: string, messageId?: string): Promise<void>;
   flushDisplayEvents(sessionId: string): void;
@@ -80,7 +84,14 @@ export function createAppShellSessionEventHandlers(options: {
   setLiveTurnBySession: StateUpdater<Record<string, LiveTurnBuffer>>;
   setInteractionBySession: StateUpdater<InteractionQueues>;
   setMessageQueueBySession?: StateUpdater<Record<string, MessageQueueUiState>>;
+  /** Reads the last projected Host queue snapshot — the departed-entry diff. */
+  getMessageQueue?: (sessionId: string) => MessageQueueUiState | undefined;
   removeTransientMessage?: (sessionId: string, messageId: string) => void;
+  upsertTransientMessage?: (sessionId: string, message: TransientUserMessageProjection) => void;
+  /** Retract one Host-queued entry; the implementation surfaces the failure. */
+  retractQueueEntry?: (sessionId: string, entryId: string) => Promise<unknown>;
+  /** Put a retracted entry's text back into the composer for editing. */
+  restoreMessageDraft?: (sessionId: string, text: string) => void;
   onInteractionChanged?: (sessionId: string) => void;
   /** A boundary decision settled: the session's execution boundary may have moved. */
   onExecutionBoundaryChanged?: (sessionId: string) => void;
@@ -108,7 +119,11 @@ export function createAppShellSessionEventHandlers(options: {
     setLiveTurnBySession,
     setInteractionBySession,
     setMessageQueueBySession,
+    getMessageQueue,
     removeTransientMessage,
+    upsertTransientMessage,
+    retractQueueEntry,
+    restoreMessageDraft,
     onInteractionChanged,
     onExecutionBoundaryChanged,
     onContextCompactionOutcome,
@@ -118,7 +133,6 @@ export function createAppShellSessionEventHandlers(options: {
   } = options;
   const scheduleFrame = options.scheduleFrame ?? createConversationDisplayFrameScheduler();
   const displayBatch = options.displayBatch ?? createAppShellSessionDisplayBatch();
-
   function applyProjectionEvents(
     projection: LiveTurnBuffer | undefined,
     events: readonly SessionEvent[],
@@ -302,8 +316,46 @@ export function createAppShellSessionEventHandlers(options: {
     switch (event.type) {
       case 'queue_update': {
         const queue = deriveMessageQueueProjection(event);
+        // Queued steering stays on screen as a transcript bubble — the plate
+        // above the composer is for follow-ups only. An entry that leaves the
+        // queue without an admission event still retires its bubble.
+        const queuedSteering = new Map(
+          queue.transientMessages
+            .filter((message) => message.pendingSteering === true)
+            .map((message) => [message.id, message]),
+        );
         for (const entry of [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])]) {
-          removeTransientMessage?.(sessionId, entry.messageId);
+          if (!queuedSteering.has(entry.messageId)) removeTransientMessage?.(sessionId, entry.messageId);
+        }
+        for (const entry of getMessageQueue?.(sessionId)?.entries ?? []) {
+          if (entry.placement === 'current_turn' && !queuedSteering.has(entry.messageId)) {
+            removeTransientMessage?.(sessionId, entry.messageId);
+          }
+        }
+        if (upsertTransientMessage) {
+          for (const entry of event.steeringEntries ?? []) {
+            const transient = queuedSteering.get(entry.messageId);
+            if (!transient) continue;
+            upsertTransientMessage(sessionId, retractQueueEntry
+              ? {
+                  ...transient,
+                  deliveryActions: queuedSteeringDeliveryActions({
+                    locale: uiLocale,
+                    draftText: entry.content.displayText ?? entry.content.text,
+                    retract: async (draftText) => {
+                      try {
+                        await retractQueueEntry(sessionId, entry.entryId);
+                      } catch {
+                        return false;
+                      }
+                      removeTransientMessage?.(sessionId, entry.messageId);
+                      if (draftText !== undefined) restoreMessageDraft?.(sessionId, draftText);
+                      return true;
+                    },
+                  }),
+                }
+              : transient);
+          }
         }
         setMessageQueueBySession?.((current) => {
           if (!event.steering.length && !event.followup.length) {
@@ -416,6 +468,10 @@ export function createAppShellSessionEventHandlers(options: {
 
   return {
     handleEvent,
+    isQueuedSteering: (sessionId, messageId) =>
+      getMessageQueue?.(sessionId)?.entries.some(
+        (entry) => entry.placement === 'current_turn' && entry.messageId === messageId,
+      ) ?? false,
     reconcilePersistedMessages,
     settleAssistantStreaming,
     flushDisplayEvents,
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index f3518178190..b6b1a0891e6 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -1642,6 +1642,24 @@ function AppShellContent({
     if (sessionId && messageId) removeTransientMessage(sessionId, messageId);
   }
 
+  // Event handlers act per observed Session, not the active one — same failure
+  // surface as the plate's queue actions.
+  async function retractQueueEntry(sessionId: string, entryId: string): Promise<void> {
+    try {
+      await window.maka.sessions.retractQueueEntry(sessionId, entryId);
+    } catch (error) {
+      if (activeIdRef.current === sessionId) {
+        const copy = getDesktopConversationCopy(uiLocale).actions;
+        showSessionError(
+          sessionId,
+          copy.operationFailedTitle,
+          localizedShellErrorMessage(error, copy.operationFailedFallback, uiLocale),
+        );
+      }
+      throw error;
+    }
+  }
+
   // Surfaces the failure, then rethrows so the pending plate can settle its
   // in-flight action state without guessing with a timer.
   async function runQueueEntryAction(
@@ -1688,6 +1706,7 @@ function AppShellContent({
   const [sessionDisplayBatch] = useState(createAppShellSessionDisplayBatch);
   const {
     handleEvent,
+    isQueuedSteering,
     reconcilePersistedMessages,
     settleAssistantStreaming,
     flushDisplayEvents,
@@ -1703,7 +1722,11 @@ function AppShellContent({
     setLiveTurnBySession: sessionUiController.setLiveTurnBySession,
     setInteractionBySession: sessionUiController.setInteractionBySession,
     setMessageQueueBySession: sessionUiController.setMessageQueueBySession,
+    getMessageQueue: (sessionId) => sessionUiController.getState().messageQueueBySession[sessionId],
     removeTransientMessage,
+    upsertTransientMessage: addTransientMessage,
+    retractQueueEntry,
+    restoreMessageDraft: restoreLocalMessageDraft,
     displayBatch: sessionDisplayBatch,
     onInteractionChanged: markInteractionChanged,
     onExecutionBoundaryChanged: reloadActiveExecutionBoundary,
@@ -2078,7 +2101,17 @@ function AppShellContent({
       canOpenDialog={activeBoundarySurface.localInteractionAvailable}
       reportError={showSessionError}
     >
-    <Conversation.SessionLocalMessages sessionId={activeId} publish={addTransientMessage} retire={removeTransientMessage} reportError={toastApi.error} restoreDraft={restoreLocalMessageDraft} />
+    <Conversation.SessionLocalMessages
+      sessionId={activeId}
+      publish={addTransientMessage}
+      retire={(sessionId, messageId) => {
+        // A queue-owned steering bubble is the Host's own placeholder; the
+        // local outbox accepting it must not retire the transcript copy.
+        if (!isQueuedSteering(sessionId, messageId)) removeTransientMessage(sessionId, messageId);
+      }}
+      reportError={toastApi.error}
+      restoreDraft={restoreLocalMessageDraft}
+    />
     <CatalogRowWatch
       catalog={sessionCatalogController}
       sessionIds={[revisionDraft?.sourceSessionId, revisionDraft?.draftSessionId]}
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 4b89d962ed5..0be078e97c6 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -17,11 +17,32 @@
  * under the License.
  */
 
+import { createElement } from 'react';
 import type { StoredMessage } from '@maka/core/session';
-import type { TransientUserMessageProjection } from '@maka/ui';
+import type { UiLocale } from '@maka/core/ui-locale';
+import { getConversationCopy, type TransientUserMessageProjection } from '@maka/ui';
+import { ICON_SIZE, Pencil, Trash2 } from '@maka/ui/icons';
 
 type TransientUserMessage = TransientUserMessageProjection;
 
+/**
+ * Edit/delete controls for steering the Host queued but has not consumed.
+ * Both retract the queue entry; edit also hands the text back to the caller's
+ * draft restore. `retract` resolves false when the Host call failed.
+ */
+export function queuedSteeringDeliveryActions(input: {
+  locale: UiLocale;
+  draftText: string;
+  retract: (draftText?: string) => Promise<boolean>;
+}): NonNullable<TransientUserMessage['deliveryActions']> {
+  const copy = getConversationCopy(input.locale).composer;
+  const icon = (glyph: typeof Pencil) => createElement(glyph, { size: ICON_SIZE.control, 'aria-hidden': true });
+  return [
+    { label: copy.editQueuedEntry, icon: icon(Pencil), onClick: async () => { await input.retract(input.draftText); } },
+    { label: copy.deleteQueuedEntry, icon: icon(Trash2), onClick: async () => { await input.retract(); } },
+  ];
+}
+
 /**
  * Replace the queue-backed subset in the exact order supplied by the Host.
  * Other local intents keep their relative position because queue absence is
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
index e6fcfbeb539..a901746f59c 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
@@ -165,6 +165,13 @@ export function QuoteCompanionPanel(props: {
         { sessionId },
       );
     },
+    restoreDraft: (_sessionId, text) => {
+      const input = composerRef.current;
+      if (!input) return;
+      if (input.getText().trim()) input.appendText(text);
+      else input.setText(text);
+      input.focus();
+    },
   });
   useEffect(() => {
     props.onContentStateChange?.(props.panelId, companion.hasContent);
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index dd5682238c3..20eb29065ae 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -77,6 +77,7 @@ import { mergeSettledMessages } from '../../../../settled-message-merge.js';
 import {
   mergeTransientMessageProjection,
   projectQueuedTransientMessages,
+  queuedSteeringDeliveryActions,
   reconcileTransientMessages,
 } from '../../../../application/contracts/transient-message-projection.js';
 import { getDesktopConversationCopy } from '../../../../application/contracts/conversation-copy.js';
@@ -160,6 +161,8 @@ export interface UseQuoteCompanionInput {
     outcome: ContextCompactionOutcome,
   ) => void;
   onContextCompactionError?: (sessionId: string, error: unknown) => void;
+  /** Returns a retracted message's text to the composer draft for editing. */
+  restoreDraft?: (sessionId: string, text: string) => void;
 }
 
 export async function requestPermissionModeWithConfirmation(
@@ -353,6 +356,9 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const pendingUserMessagesRef = useRef<Map<string, TransientUserMessageProjection>>(
     new Map(),
   );
+  const queuedSteeringRef = useRef<Set<string> | undefined>(undefined);
+  const restoreDraftRef = useRef(input.restoreDraft);
+  restoreDraftRef.current = input.restoreDraft;
   const [messageQueue, setMessageQueue] = useState<{
     readonly entries: readonly MessageQueueEntryProjection[];
     readonly queueRevision?: number;
@@ -508,13 +514,48 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   }, [bindPendingMessageTurn, reconcilePendingUserMessages]);
 
   const projectMessageQueue = useCallback(
-    (event: Extract<SessionEvent, { type: 'queue_update' }>) => {
+    (forkId: string, event: Extract<SessionEvent, { type: 'queue_update' }>) => {
       const queue = deriveMessageQueueProjection(event);
       setMessageQueue({ entries: queue.entries, queueRevision: event.queueRevision });
-      projectQueuedTransientMessages(pendingUserMessagesRef.current, queue.transientMessages);
+      const steering = queue.transientMessages.filter((message) => message.pendingSteering === true);
+      // Queued steering waits as a transcript bubble; an entry that leaves the
+      // queue without an admission event still retires its bubble.
+      const steeringIds = new Set(steering.map((message) => message.id));
+      for (const messageId of queuedSteeringRef.current ?? []) {
+        if (!steeringIds.has(messageId)) pendingUserMessagesRef.current.delete(messageId);
+      }
+      queuedSteeringRef.current = steeringIds;
+
+      projectQueuedTransientMessages(
+        pendingUserMessagesRef.current,
+        queue.transientMessages.map((message) => {
+          if (message.pendingSteering !== true) return message;
+          const entry = queue.entries.find((candidate) => candidate.messageId === message.id);
+          if (!entry) return message;
+          return {
+            ...message,
+            deliveryActions: queuedSteeringDeliveryActions({
+              locale: localeRef.current,
+              draftText: entry.content.displayText ?? entry.content.text,
+              retract: async (draftText) => {
+                try {
+                  await sideChat.retractQueueEntry(forkId, entry.entryId);
+                } catch {
+                  if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
+                  return false;
+                }
+                pendingUserMessagesRef.current.delete(message.id);
+                syncPendingUserMessages();
+                if (draftText !== undefined) restoreDraftRef.current?.(forkId, draftText);
+                return true;
+              },
+            }),
+          };
+        }),
+      );
       syncPendingUserMessages();
     },
-    [syncPendingUserMessages],
+    [sideChat, syncPendingUserMessages],
   );
 
   const applyOwnedEvent = useCallback(
@@ -803,7 +844,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
       (event: SessionEvent) => {
         if (!mountedRef.current || disposed || companionIdRef.current !== forkId) return;
         if (event.type === 'queue_update') {
-          projectMessageQueue(event);
+          projectMessageQueue(forkId, event);
           return;
         }
         const admission = pendingAdmissionRef.current;
@@ -969,6 +1010,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
           allMessagesRef.current = [];
           setAllMessages([]);
           pendingUserMessagesRef.current.clear();
+          queuedSteeringRef.current = undefined;
           setPendingUserMessages([]);
           setMessageQueue({ entries: [] });
           onForkVisibilityChangeRef.current?.({
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index 9d9f28c05e2..bdc6dba705c 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -18,6 +18,8 @@
  */
 
 import { activeHostTurn, chatTurnActivity, type SessionExecutionProjection } from '../../../application/contracts/session-execution.js';
+import { deriveMessageQueueProjection } from '../../../application/contracts/message-queue-projection.js';
+import { mergeTransientMessageProjection, queuedSteeringDeliveryActions } from '../../../application/contracts/transient-message-projection.js';
 import { useEffect, useRef, useState } from 'react';
 import {
   applyLiveTurnBufferEvent,
@@ -59,13 +61,18 @@ interface SendAttempt {
 }
 interface MessagePresentation {
   transientMessages: TransientUserMessageProjection[];
-  messageQueue: { entries: MessageQueueEntryProjection[]; revision?: number };
+  messageQueue: { entries: readonly MessageQueueEntryProjection[]; revision?: number };
 }
-export function useWorkHubController(onSubmit?: () => void) {
+export function useWorkHubController(
+  onSubmit?: () => void,
+  restoreDraft?: (sessionId: string, text: string) => void,
+) {
   const services = useWorkHubServices();
   const locale = useUiLocale();
   const localeRef = useRef(locale);
   localeRef.current = locale;
+  const restoreDraftRef = useRef(restoreDraft);
+  restoreDraftRef.current = restoreDraft;
   const [sessionId, setSessionId] = useState<string>();
   const [sessions, setSessions] = useState<Awaited<ReturnType<WorkHubServices['listSessions']>>>(
     [],
@@ -379,15 +386,65 @@ export function useWorkHubController(onSubmit?: () => void) {
         const terminal = event.type === 'complete' || event.type === 'abort' || event.type === 'error';
         setInteractions((current) => terminal ? clearInteractions(current, sessionId) : reduceInteractionQueues(current, sessionId, event));
         if (event.type === 'queue_update') {
-          const entries = [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])];
-          // Host evidence retires local submission placeholders. Queue state
-          // lives only in messageQueue, including after reconnect or withdrawal.
-          const ids = new Set(entries.map((entry) => entry.messageId));
+          const queue = deriveMessageQueueProjection(event);
+          // Host evidence retires local submission placeholders — except queued
+          // steering, which keeps its transcript bubble until the Turn consumes
+          // it. Queue state itself lives only in messageQueue.
+          const ids = new Set(
+            [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])].map((entry) => entry.messageId),
+          );
           if (pendingQueued.current && ids.has(pendingQueued.current.messageId)) pendingQueued.current.observed = true;
-          setMessagePresentation((previous) => ({
-            messageQueue: { entries, revision: event.queueRevision },
-            transientMessages: previous.transientMessages.filter((message) => !ids.has(message.id)),
-          }));
+          setMessagePresentation((previous) => {
+            const steering = queue.transientMessages
+              .filter((message) => message.pendingSteering === true)
+              .map((message) => {
+                const entry = queue.entries.find((candidate) => candidate.messageId === message.id);
+                if (!entry) return message;
+                return {
+                  ...message,
+                  deliveryActions: queuedSteeringDeliveryActions({
+                    locale: localeRef.current,
+                    draftText: entry.content.displayText ?? entry.content.text,
+                    retract: async (draftText) => {
+                      try { await services.retractQueueEntry(sessionId, entry.entryId); }
+                      catch (reason) { report(reason); return false; }
+                      setMessagePresentation((current) => ({
+                        ...current,
+                        transientMessages: current.transientMessages.filter((candidate) => candidate.id !== message.id),
+                      }));
+                      if (draftText !== undefined && currentSessionId.current === sessionId) {
+                        restoreDraftRef.current?.(sessionId, draftText);
+                      }
+                      return true;
+                    },
+                  }),
+                };
+              });
+            const steeringIds = new Set(steering.map((message) => message.id));
+            // A steering entry that left the queue without an admission event
+            // still retires its transcript bubble.
+            const departed = new Set(
+              previous.messageQueue.entries
+                .filter((entry) => entry.placement === 'current_turn')
+                .map((entry) => entry.messageId)
+                .filter((messageId) => !steeringIds.has(messageId)),
+            );
+            const retained = previous.transientMessages
+              .filter(
+                (message) => (!ids.has(message.id) || steeringIds.has(message.id)) && !departed.has(message.id),
+              )
+              .map((message) => {
+                const update = steering.find((candidate) => candidate.id === message.id);
+                return update ? mergeTransientMessageProjection(message, update) : message;
+              });
+            for (const message of steering) {
+              if (!retained.some((candidate) => candidate.id === message.id)) retained.push(message);
+            }
+            return {
+              messageQueue: { entries: queue.entries, revision: event.queueRevision },
+              transientMessages: retained,
+            };
+          });
         }
         if (event.type === 'message_admission') {
           if (event.outcome === 'admitted') {
diff --git a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
index dc5b2a23d8b..ce1a203be04 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
@@ -69,7 +69,14 @@ function revealWordmark(element: HTMLDivElement | null, content: HTMLDivElement
 
 export function WorkHubRoot() {
   const highlight = useWorkHubHighlightState();
-  const controller = useWorkHubController(() => highlight.selectWork(undefined));
+  const composer = useRef<ComposerHandle>(null);
+  const controller = useWorkHubController(() => highlight.selectWork(undefined), (_sessionId, text) => {
+    const input = composer.current;
+    if (!input) return;
+    if (input.getText().trim()) input.appendText(text);
+    else input.setText(text);
+    input.focus();
+  });
   const { services, session, transcript, busy } = controller;
   useEffect(() => {
     services.bindBrowserSession(controller.sessionId ?? null);
@@ -102,7 +109,6 @@ export function WorkHubRoot() {
   const locale = useUiLocale();
   const t = workHubLiveCopy[locale];
   const shortcutLabel = navigator.platform.toLowerCase().includes('mac') ? '⌘⇧K' : 'Ctrl+Shift+K';
-  const composer = useRef<ComposerHandle>(null);
   const composerSurface = useRef<HTMLDivElement>(null);
   const revealMark = useRef<HTMLDivElement>(null);
   const history = useRef<HTMLDivElement>(null);
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index a9798236fa4..545339f91e6 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -39,6 +39,7 @@ import {
 } from '@maka/ui';
 import type { ChatModelChoice, SessionViewMode, TurnViewModel, LiveTurnBuffer } from '@maka/ui';
 import { SessionRail, type SessionRailStoryProps } from '../../../packages/ui/stories/session-rail-harness.js';
+import { ICON_SIZE, Pencil, Trash2 } from '@maka/ui/icons';
 import { AppShellTitlebar } from '../src/renderer/app-shell-chrome-actions';
 import { appShellFrameStyle } from '../src/renderer/shell/frame-style';
 import { SettingsOverlay } from '../src/renderer/app-shell-overlays';
@@ -734,10 +735,57 @@ export const PromptSentBeforeTurnLands: Story = {
   },
 };
 
+// Real path: a steering send the Host queued but has not consumed yet. It lives
+// in the transcript as a pending bubble — edit retracts it back into the draft,
+// delete retracts it outright. The composer plate is for follow-ups only.
+export const QueuedSteeringInTranscript: Story = {
+  render: () => (
+    <ComposedShell
+      session={{ status: 'running', streaming: true }}
+      chat={{
+        activeTurn: { turnId: 'turn-s' },
+        messages: [
+          user('msg-s-1', 'turn-s', 3, '把整套测试跑一遍，看看那三个失败用例是不是同一个原因。'),
+          { type: 'turn_state', id: 'state-s', turnId: 'turn-s', ts: NOW - 30_000, status: 'running' },
+        ],
+        liveTurns: [{
+          turnId: 'turn-s', steps: [{
+            stepId: 'msg-assistant-s',
+            text: { text: '先把失败用例的栈对上。', truncated: false, complete: false },
+            tools: [],
+          }],
+        }],
+        transientMessages: [{
+          id: 'msg-steer-queued',
+          text: '顺便确认一下 coverage 阈值没有变。',
+          ts: NOW - 10_000,
+          transientPlacement: 'transcript',
+          hostTurnId: 'turn-s',
+          pendingSteering: true,
+          deliveryActions: [
+            { label: '编辑', icon: <Pencil size={ICON_SIZE.control} aria-hidden="true" />, onClick: noop },
+            { label: '删除', icon: <Trash2 size={ICON_SIZE.control} aria-hidden="true" />, onClick: noop },
+          ],
+        }],
+      }}
+    />
+  ),
+  play: async ({ canvasElement }) => {
+    const bubble = canvasElement.querySelector('[data-transient-message-id="msg-steer-queued"]');
+    await expect(bubble).not.toBeNull();
+    await expect(bubble?.textContent).toContain('coverage');
+    await expect(bubble?.querySelector('[aria-label="编辑"]')).not.toBeNull();
+    await expect(bubble?.querySelector('[aria-label="删除"]')).not.toBeNull();
+    await expect(canvasElement.querySelector('.maka-composer-queue')).toBeNull();
+  },
+};
+
 // Real path: stop during `npm test` → cancelled terminal result → interrupted tool row.
 // The stdout fixture above comes from the build phase of a real run. ChatView →
 // materializeTurns → ToolTrow derives the interruption from the result; the
 // aborted Session also settles the sidebar and composer.
+// production `.maka-turn` frame. The session is `aborted` too, so the sidebar row
+// and composer agree with the transcript instead of still reading as active.
 export const InterruptedToolAfterTurnAbort: Story = {
   render: () => (
     <ComposedShell
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index cf39af06f22..b39fef6a0e5 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -176,6 +176,9 @@ function followUpEntry(entryId: string, text: string): MessageQueueEntryProjecti
  */
 function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
   const composerRef = useRef<ComposerHandle>(null);
+  // A production queue snapshot also carries queued steering; the plate filters
+  // it out — steering renders in the transcript instead (see the
+  // QueuedSteeringInTranscript story in app-shell).
   const [followup, setFollowup] = useState<MessageQueueEntryProjection[]>([
     {
       entryId: 'entry-steer',
diff --git a/packages/ui/src/__tests__/chat-turn-steering-order.test.ts b/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
index 7ab3d503b7b..db604e1b550 100644
--- a/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
+++ b/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
@@ -96,7 +96,7 @@ test('renders steering where it arrived in the assistant timeline', () => {
   }
 });
 
-test('holds steering above the composer while old output continues, then renders its real reply boundary', async () => {
+test('holds queued steering in the transcript while old output continues, then renders its real reply boundary', async () => {
   const messages: StoredMessage[] = [{ type: 'user', id: 'original', turnId: 'turn-1', ts: 1, text: 'request' }];
   const pending = { id: 'steer', hostTurnId: 'turn-1', ts: 2, text: 'inserted instruction', transientPlacement: 'steering' as const };
   let live: import('../live-turn-projection.js').LiveTurnProjection | undefined = applyLiveTurnEvent(armLiveTurn('turn-1'), {
@@ -113,7 +113,13 @@ test('holds steering above the composer while old output continues, then renders
     }) }),
   )}</body></html>`).document;
   const waiting = await render();
-  assert.equal(waiting.querySelector('.maka-composer-queue-text')?.textContent, pending.text);
+  // Steering waits as a transcript bubble, not a plate row: the composer queue
+  // is the follow-up staging area, and this message is bound for the live Turn.
+  assert.equal(waiting.querySelector('.maka-composer-queue'), null);
+  assert.equal(
+    waiting.querySelector('[data-transient-message-id="steer"]')?.textContent?.includes(pending.text),
+    true,
+  );
   assert.equal(waiting.querySelectorAll('.maka-steering-message').length, 0);
   const timeline = () => createTranscriptProjection().project({ messages, liveTurns: live ? [live] : undefined, locale: 'en' })[0]!.timeline.map((item) => item.kind === 'user' ? item.message.text : item.kind === 'text' ? item.text : item.kind);
   assert.deepEqual(timeline(), ['old answer continues']);
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index d0faa7ea391..e54bd05b32d 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -301,9 +301,15 @@ test('keeps Host order visible until the reordered projection arrives', async ()
     const deleteButtons = [
       ...container.querySelectorAll<HTMLButtonElement>('[aria-label="Delete"]'),
     ];
+    // Queued steering lives in the transcript, not the follow-up plate.
     assert.equal(container.querySelectorAll('[aria-label="Send now"]').length, 2);
-    assert.equal(editButtons.length, 3);
-    assert.equal(deleteButtons.length, 3);
+    assert.equal(editButtons.length, 2);
+    assert.equal(deleteButtons.length, 2);
+    assert.equal(
+      [...container.querySelectorAll('.maka-composer-queue-text')]
+        .every((row) => !row.textContent?.includes('steering')),
+      true,
+    );
     await act(async () => {
       editButtons[0]?.dispatchEvent(new window.Event('click', { bubbles: true }));
       await Promise.resolve();
@@ -313,7 +319,7 @@ test('keeps Host order visible until the reordered projection arrives', async ()
     );
     assert.ok(editInput);
     await act(() => {
-      editInput.value = 'updated steering\nsecond line';
+      editInput.value = 'updated first\nsecond line';
       editInput.dispatchEvent(new window.Event('input', { bubbles: true }));
     });
     await act(async () => {
@@ -329,35 +335,26 @@ test('keeps Host order visible until the reordered projection arrives', async ()
       await Promise.resolve();
     });
     assert.deepEqual(updatedEntries, [{
-      entryId: 'steering',
+      entryId: 'first',
       expectedQueueRevision: 7,
-      text: 'updated steering\nsecond line',
+      text: 'updated first\nsecond line',
     }]);
-    assert.deepEqual(deletedEntryIds, ['steering']);
-    const grips = [...container.querySelectorAll<HTMLElement>('[data-queue-placement="next_turn"] .maka-composer-queue-grip')];
+    assert.deepEqual(deletedEntryIds, ['first']);
+    const grips = [...container.querySelectorAll<HTMLElement>('.maka-composer-queue-grip')];
     assert.equal(grips.length, 2);
     const dragStart = new window.Event('dragstart', { bubbles: true });
     Object.defineProperty(dragStart, 'dataTransfer', {
       value: { effectAllowed: '', setData() {} },
     });
     await act(() => grips[1]?.dispatchEvent(dragStart));
-    const rows = [...container.querySelectorAll('li')];
-    const steeringRow = rows[0]?.parentElement;
-    assert.ok(steeringRow);
-    await act(() => steeringRow.dispatchEvent(new window.Event('drop', { bubbles: true })));
-    assert.equal(requestedOrder, undefined);
-    await act(() => grips[1]?.dispatchEvent(dragStart));
     const firstRow = grips[0]?.closest('li')?.parentElement;
     assert.ok(firstRow);
     await act(() => firstRow.dispatchEvent(new window.Event('drop', { bubbles: true })));
 
     assert.deepEqual(requestedOrder, ['second', 'first']);
     assert.deepEqual(
-      rows.map((row) => {
-        if (row.textContent?.includes('steering')) return 'steering';
-        return row.textContent?.includes('first') ? 'first' : 'second';
-      }),
-      ['steering', 'first', 'second'],
+      [...container.querySelectorAll('.maka-composer-queue-text')].map((row) => row.textContent),
+      ['first', 'second'],
     );
   } finally {
     await act(() => root.unmount());
@@ -366,15 +363,29 @@ test('keeps Host order visible until the reordered projection arrives', async ()
 });
 
 
-test('deduplicates pending steering against Host queue entries and keeps the plate through an empty queue snapshot', () => {
+test('a Host-admitted steering entry leaves the plate while an unadmitted local copy stays', () => {
   const pending = { id: 'steer', text: 'new direction', ts: 1, transientPlacement: 'steering' as const };
   const queued = { entryId: 'host-entry', messageId: pending.id, placement: 'current_turn' as const, state: 'queued' as const, content: { text: pending.text } };
+  const admitted = parseHTML(`<html><body>${renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
+    queuedMessages={[queued]} pendingMessages={[pending]} /></LocaleProvider>)}</body></html>`).document;
+  assert.equal(admitted.querySelector('.maka-composer-queue'), null,
+    'once the Host owns the steering entry its transcript bubble is the row');
+  const unadmitted = parseHTML(`<html><body>${renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
+    queuedMessages={[]} pendingMessages={[pending]} /></LocaleProvider>)}</body></html>`).document;
+  assert.equal(unadmitted.querySelectorAll('.maka-composer-queue-text').length, 1,
+    'a steering send the Host never saw keeps its local row in the staging list');
+});
+
+
+test('queued steering rendered in the transcript never appears in the plate', () => {
+  const pending = { id: 'steer', text: 'new direction', ts: 1, pendingSteering: true, transientPlacement: 'transcript' as const };
+  const queued = { entryId: 'host-entry', messageId: pending.id, placement: 'current_turn' as const, state: 'queued' as const, content: { text: pending.text } };
   for (const entries of [[queued], []]) {
     const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
       queuedMessages={entries} pendingMessages={[pending]} /></LocaleProvider>);
     const document = parseHTML(`<html><body>${markup}</body></html>`).document;
-    assert.equal(document.querySelectorAll('.maka-composer-queue-text').length, 1);
-    assert.equal(document.querySelector('.maka-composer-queue-text')?.textContent, pending.text);
+    assert.equal(document.querySelector('.maka-composer-queue'), null,
+      'a transcript steering bubble is not also a staging row');
   }
 });
 
@@ -391,6 +402,8 @@ test('local sends share the flat staging list with icon-only delivery actions',
         deliveryActions: [{ label: 'Check delivery', icon: <Search size={ICON_SIZE.control} aria-hidden="true" />, onClick() {} }] },
       { id: 'sending', text: 'still sending', ts: 2, transientPlacement: 'follow_up',
         deliveryStatus: 'Sending…' },
+      { id: 'local-steer', text: 'steering in flight', ts: 3, pendingSteering: true,
+        transientPlacement: 'transcript', deliveryStatus: 'Sending…' },
     ]} /></LocaleProvider>);
   const document = parseHTML(`<html><body>${markup}</body></html>`).document;
   assert.deepEqual(
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 7b00249115a..8221c950cd3 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -142,7 +142,7 @@ export interface ChatViewGoalIndicatorProps {
  * plus `hostTurnId` for the grouping once the Host names one.
  */
 export interface TransientUserMessageProjection {
-  /** Held above the composer until Runtime emits steering_message. */
+  /** Renders as a transcript bubble until Runtime emits steering_message. */
   pendingSteering?: boolean;
   deliveryStatus?: string;
   deliveryDetail?: string;
@@ -518,6 +518,9 @@ export function ChatView(props: {
     const turn = message.hostTurnId ? turnsById.get(message.hostTurnId) : undefined;
     if (
       turn === undefined
+      // Queued steering is not the Turn's root prompt; it renders at the tail
+      // until steering_message carries it into the timeline.
+      || message.pendingSteering === true
       || turn.user !== undefined
       || turn.timeline.some((item) => item.kind === 'user' && item.messageId === message.id)
     ) continue;
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index 172563469ae..eac57609d53 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -33,10 +33,11 @@ type ComposerQueueEntry = Omit<MessageQueueEntryProjection, 'state'> & {
 };
 
 /**
- * The pending plate above the composer card. It lists both pending steering
- * and follow-up entries so a submitted message stays editable, reorderable and
- * deletable while it waits for the active Turn to reach a steering boundary.
- * Steering enters the transcript only when Runtime actually consumes it.
+ * The pending plate above the composer card. It lists follow-up entries —
+ * Host-queued and still in flight — so a queued message stays editable,
+ * reorderable and deletable until a Turn consumes it. Steering targets the
+ * active Turn and lives in the transcript instead, where its delivery state
+ * is message metadata rather than a queue row.
  */
 export interface ComposerMessageQueueProps {
   queuedMessages: readonly ComposerQueueEntry[];
@@ -48,15 +49,18 @@ export interface ComposerMessageQueueProps {
   onReorderEntries?(entryIds: readonly string[]): void | Promise<void>;
 }
 
-/** Host entries own queue actions; local sends remain visible before a receipt. */
+/** The plate owns next-turn sends only; steering renders in the transcript. */
 export function projectComposerMessageQueue(
   queued: readonly MessageQueueEntryProjection[],
   transient: readonly TransientUserMessageProjection[],
 ): readonly ComposerQueueEntry[] {
+  const followups = queued.filter((entry) => entry.placement === 'next_turn');
+  // Dedup against the whole queue: a Host-admitted steering entry renders as a
+  // transcript bubble, so its lingering local copy must not stay a plate row.
   const ids = new Set(queued.map((entry) => entry.messageId));
   const pending = transient.filter((message) => message.transientPlacement !== 'transcript' && !ids.has(message.id));
-  if (pending.length === 0) return queued;
-  return [...queued, ...pending.map((message): ComposerQueueEntry => ({
+  if (pending.length === 0) return followups;
+  return [...followups, ...pending.map((message): ComposerQueueEntry => ({
     entryId: message.id, messageId: message.id, content: { text: message.text },
     placement: message.transientPlacement === 'steering' ? 'current_turn' : 'next_turn', state: 'local', localMessage: message,
   }))];
@@ -98,10 +102,8 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
     const fromId = dragEntryId.current;
     dragEntryId.current = null;
     if (!fromId || fromId === targetEntryId || !props.onReorderEntries) return;
-    const target = entries.find((entry) => entry.entryId === targetEntryId);
-    const source = entries.find((entry) => entry.entryId === fromId);
-    if (!target || source?.placement !== target.placement) return;
-    const ids = entries.filter((entry) => entry.placement === target.placement && entry.state === 'queued').map((entry) => entry.entryId);
+    if (!entries.some((entry) => entry.entryId === targetEntryId)) return;
+    const ids = entries.filter((entry) => entry.state === 'queued').map((entry) => entry.entryId);
     const from = ids.indexOf(fromId);
     const to = ids.indexOf(targetEntryId);
     if (from === -1 || to === -1) return;
@@ -163,7 +165,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
           return (
             <div
               key={entry.entryId}
-              data-queue-placement={entry.placement}
               data-maka-queue-drop-target={reorderable ? 'true' : undefined}
               onDragOver={(event) => {
                 if (reorderable && dragEntryId.current) event.preventDefault();
@@ -249,23 +250,21 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                     </>
                   ) : (
                     <>
-                      {entry.placement === 'next_turn' ? (
-                        <IconButton
-                          variant="ghost"
-                          size="sm"
-                          type="button"
-                          isDisabled={pendingEntryId !== null || entry.state !== 'queued' || !props.onPromoteEntry}
-                          label={copy.promoteQueuedEntry}
-                          tooltip={copy.promoteQueuedEntry}
-                          onClick={() => void runEntryAction(
-                            entry.entryId,
-                            props.onPromoteEntry
-                              ? () => props.onPromoteEntry?.(entry.entryId)
-                              : undefined,
-                          )}
-                          icon={<CornerDownLeft size={ICON_SIZE.control} aria-hidden="true" />}
-                        />
-                      ) : null}
+                      <IconButton
+                        variant="ghost"
+                        size="sm"
+                        type="button"
+                        isDisabled={pendingEntryId !== null || entry.state !== 'queued' || !props.onPromoteEntry}
+                        label={copy.promoteQueuedEntry}
+                        tooltip={copy.promoteQueuedEntry}
+                        onClick={() => void runEntryAction(
+                          entry.entryId,
+                          props.onPromoteEntry
+                            ? () => props.onPromoteEntry?.(entry.entryId)
+                            : undefined,
+                        )}
+                        icon={<CornerDownLeft size={ICON_SIZE.control} aria-hidden="true" />}
+                      />
                       <IconButton
                         variant="ghost"
                         size="sm"
diff --git a/packages/ui/src/composer.tsx b/packages/ui/src/composer.tsx
index a13d7a1b7df..6067528aca7 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -1664,8 +1664,6 @@ export const Composer = forwardRef<
   const stopShown =
     props.streaming === true
     && (props.sendBlocked === true || (!text.trim() && !hasStagedContext));
-  // A Host receipt is not model consumption. Keep steering above the composer
-  // until the host surface retires its transient on steering_message.
   const queuedMessages = projectComposerMessageQueue(props.queuedMessages ?? [], props.pendingMessages ?? []);
   const queueCount = queuedMessages.length;
   const modelChipLabel = props.modelLabel?.trim() || copy.selectModel;

From 237b93ecd8452a811c42a2231f6ea73ab69f84ed Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 23:15:50 +0800
Subject: [PATCH 07/33] fix(ui): drop the queue plate's shortcut help icon

The hidden affordance was the only place teaching Shift+Enter, and
discoverability there is not worth a permanent per-row gutter plus a
floating button that had to win pointer hit-testing against row actions.
Enter-follow-up then steer-if-needed stays the safe default path, and the
action is reversible, so the surface no longer advertises it.

Generated-by: Devin
---
 apps/desktop/e2e/workhub-layout.spec.ts       | 11 ----------
 apps/desktop/src/renderer/styles/composer.css | 20 -------------------
 packages/ui/src/composer-message-queue.tsx    | 10 ++--------
 packages/ui/src/conversation-copy.ts          |  8 --------
 4 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/apps/desktop/e2e/workhub-layout.spec.ts b/apps/desktop/e2e/workhub-layout.spec.ts
index e0535a0b659..0e97178f003 100644
--- a/apps/desktop/e2e/workhub-layout.spec.ts
+++ b/apps/desktop/e2e/workhub-layout.spec.ts
@@ -428,17 +428,6 @@ test('WorkHub keeps the submitted prompt visible while its agent is still runnin
   await awaitSendReady(workhub);
   await workhub.locator(COMPOSER_INPUT).press('Enter');
   await expect(followups).toHaveText(queuedTexts);
-  const shortcuts = workhub.getByRole('button', { name: '发送快捷键', exact: true });
-  await expect(shortcuts).toHaveCount(1);
-  await shortcuts.hover();
-  const shortcutHint = workhub.getByRole('tooltip');
-  const steerModifier = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
-  await expect(shortcutHint).toHaveText(`${steerModifier}+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行`);
-  await expect.poll(() => shortcutHint.evaluate((element) => {
-    const bounds = element.getBoundingClientRect();
-    return bounds.left >= 0 && bounds.right <= innerWidth && bounds.top >= 0 && bounds.bottom <= innerHeight;
-  })).toBe(true);
-  await workhub.screenshot({ path: testInfo.outputPath('workhub-queue-shortcuts.png') });
   for (const text of queuedTexts) {
     await expect(workhub.locator('.maka-user-message').filter({ hasText: text })).toHaveCount(0);
   }
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index 85d9ec662cb..be5ff69b8f5 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -154,26 +154,6 @@
   cursor: grabbing;
 }
 
-.maka-composer-queue-help {
-  position: absolute;
-  top: var(--space-1);
-  right: var(--space-1);
-  z-index: 1;
-  opacity: 0;
-  transition: opacity 120ms ease;
-}
-
-/* The floating help icon sits over the top-right corner; keep every row's
-   actions clear of it so neither intercepts the other's pointer events. */
-.maka-composer-queue-actions {
-  margin-right: calc(var(--space-6) + var(--space-1));
-}
-
-.maka-composer-queue:hover .maka-composer-queue-help,
-.maka-composer-queue-help:focus-visible {
-  opacity: 1;
-}
-
 @media (max-width: 640px) {
   .maka-composer-queue {
     width: min(var(--maka-reading-measure), calc(100% - (2 * var(--space-3))));
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index eac57609d53..39d3139a759 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -20,12 +20,11 @@
 import { memo, useRef, useState } from 'react';
 import type { TransientUserMessageProjection } from './chat-view.js';
 import type { MessageQueueEntryProjection } from '@maka/core/events';
-import { IconButton, Tooltip } from '@astryxdesign/core';
+import { IconButton } from '@astryxdesign/core';
 import { List, ListItem } from '@astryxdesign/core/List';
 import type { ConversationCopy } from './conversation-copy.js';
-import { Check, CornerDownLeft, GripVertical, HelpCircle, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
+import { Check, CornerDownLeft, GripVertical, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
 import { useMountedRef } from './use-mounted-ref.js';
-import { PlatformShortcutText } from './platform-shortcut-text.js';
 
 type ComposerQueueEntry = Omit<MessageQueueEntryProjection, 'state'> & {
   state: MessageQueueEntryProjection['state'] | 'local';
@@ -147,11 +146,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
       role="region"
       aria-label={copy.queuedMessagesAriaLabel(entries.length)}
     >
-      <Tooltip alignment="end" content={<span style={{ whiteSpace: 'pre-line' }}><PlatformShortcutText {...copy.queueShortcuts} /></span>}>
-        <IconButton className="maka-composer-queue-help" variant="ghost" size="sm" type="button"
-          label={copy.queueShortcutsLabel}
-          icon={<HelpCircle size={ICON_SIZE.control} aria-hidden="true" />} />
-      </Tooltip>
       <List className="maka-composer-queue-list" density="compact">
         {entries.map((entry) => {
           const editing = editingEntryId === entry.entryId;
diff --git a/packages/ui/src/conversation-copy.ts b/packages/ui/src/conversation-copy.ts
index 2f57b3ed765..438ae582b20 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -91,8 +91,6 @@ export interface ConversationCopy {
     importing: string;
     sendLabel: string;
     queuedMessagesAriaLabel(count: number): string;
-    queueShortcutsLabel: string;
-    queueShortcuts: { apple: string; other: string };
     promoteQueuedEntry: string;
     editQueuedEntry: string;
     saveQueuedEntry: string;
@@ -447,8 +445,6 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', quoteCommentTitle: '引用注释', quoteCommentSave: '保存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已选择的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你确认权限…',
       sending: '正在发送…', importing: '正在导入…', sendLabel: '发送',
       queuedMessagesAriaLabel: (count) => `${count} 条待发送消息`,
-      queueShortcutsLabel: '发送快捷键',
-      queueShortcuts: { apple: 'Cmd+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行', other: 'Ctrl+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行' },
       promoteQueuedEntry: '直接发送', editQueuedEntry: '编辑', saveQueuedEntry: '保存', cancelQueuedEntryEdit: '取消编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '添加上下文', stagedContext: '附加内容',
@@ -572,8 +568,6 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', quoteCommentTitle: '引用註解', quoteCommentSave: '儲存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已選擇的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你確認權限…',
       sending: '正在傳送…', importing: '正在匯入…', sendLabel: '傳送',
       queuedMessagesAriaLabel: (count) => `${count} 條待發送訊息`,
-      queueShortcutsLabel: '傳送快速鍵',
-      queueShortcuts: { apple: 'Cmd+Enter：轉向（Steering）\nEnter：下一輪（Follow-up）\nShift+Enter：換行', other: 'Ctrl+Enter：轉向（Steering）\nEnter：下一輪（Follow-up）\nShift+Enter：換行' },
       promoteQueuedEntry: '直接傳送', editQueuedEntry: '編輯', saveQueuedEntry: '儲存', cancelQueuedEntryEdit: '取消編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '新增上下文', stagedContext: '附加內容',
@@ -697,8 +691,6 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', quoteCommentTitle: 'Quote annotation', quoteCommentSave: 'Save', quoteCommentCancel: 'Cancel', selectedSkillsAriaLabel: 'Selected Skills', removeSkillAriaLabel: (name) => `Remove Skill: ${name}`, awaitingPermission: 'Waiting for your permission decision…',
       sending: 'Sending…', importing: 'Importing…', sendLabel: 'Send',
       queuedMessagesAriaLabel: (count) => `${count} queued message${count === 1 ? '' : 's'}`,
-      queueShortcutsLabel: 'Send shortcuts',
-      queueShortcuts: { apple: 'Cmd+Enter: Steering\nEnter: Follow-up\nShift+Enter: New line', other: 'Ctrl+Enter: Steering\nEnter: Follow-up\nShift+Enter: New line' },
       promoteQueuedEntry: 'Send now', editQueuedEntry: 'Edit', saveQueuedEntry: 'Save', cancelQueuedEntryEdit: 'Cancel editing', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',
       stopLabel: 'Stop', stopping: 'Stopping…',
       addContext: 'Add context', stagedContext: 'staged items',

From ac0dd64307b544e2aced7e5f324ec3eeb31c5a9b Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 23:16:08 +0800
Subject: [PATCH 08/33] fix(desktop): derive queued steering bubbles from the
 Host snapshot

A queue-owned steering bubble used to be stored into the transient map on
queue_update and reconciled back out by three per-surface copies of
departure bookkeeping, plus an isQueuedSteering gate so the local outbox's
accept race could not delete it. The stored copy was only ever a cache of
what the Host snapshot already says.

Now the snapshot is the single source: queue_update stores entries and
retires the listed local intents, and each surface derives steering
bubbles at the render boundary through withQueuedSteeringTransients.
A silent withdrawal, a consume, or a reseed-proven cancellation all retire
the bubble for free; a late local copy with the same id is filtered by the
same derivation instead of needing a guard.

Side Chat's reseed reconciliation reads queue state between React flushes,
so its messageQueue writes go through a ref and the state copy only feeds
rendering. AppShell/WorkHub read the snapshot directly at render.

Generated-by: Devin
---
 .../__tests__/message-queue-ui-state.test.ts  |  45 ++-----
 .../transient-message-projection.test.ts      | 116 ++++++++++--------
 .../src/renderer/app-shell-session-events.ts  |  69 +----------
 apps/desktop/src/renderer/app-shell.tsx       |  40 +++---
 .../contracts/message-queue-projection.ts     |  24 ++--
 .../contracts/transient-message-projection.ts |  64 ++++++++--
 .../conversation/model/session-ui-state.ts    |   3 +
 .../tools/side-chat/use-quote-companion.ts    |  99 ++++++++-------
 .../controller/use-workhub-controller.ts      |  75 +++--------
 apps/desktop/stories/app-shell.stories.tsx    |  29 +++--
 10 files changed, 249 insertions(+), 315 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 9ccdf5b52b2..1ca62badc2b 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -108,11 +108,9 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   assert.deepEqual([...transient.keys()], ['root'], 'a retained local copy cannot resurrect a withdrawn queue entry');
 });
 
-test('queue_update keeps queued steering as a transcript bubble with retract actions', async () => {
+test('queue_update stores the snapshot and retires every listed local placeholder', async () => {
   const controller = createAppShellSessionUiStateController();
   const transientMessages = new Map<string, TransientUserMessageProjection>();
-  const retracted: string[][] = [];
-  const restored: string[][] = [];
   const handlers = createAppShellSessionEventHandlers({
     uiLocale: 'zh-CN',
     activeIdRef: { current: 'session-1' },
@@ -122,19 +120,9 @@ test('queue_update keeps queued steering as a transcript bubble with retract act
     setLiveTurnBySession: controller.setLiveTurnBySession,
     setInteractionBySession: controller.setInteractionBySession,
     setMessageQueueBySession: controller.setMessageQueueBySession,
-    getMessageQueue: (sessionId) => controller.getState().messageQueueBySession[sessionId],
     removeTransientMessage: (_sessionId, messageId) => {
       transientMessages.delete(messageId);
     },
-    upsertTransientMessage: (_sessionId, message) => {
-      transientMessages.set(message.id, message);
-    },
-    retractQueueEntry: async (sessionId, entryId) => {
-      retracted.push([sessionId, entryId]);
-    },
-    restoreMessageDraft: (sessionId, text) => {
-      restored.push([sessionId, text]);
-    },
     showModelSetupToast() {},
     toastApi: { error() {} },
   });
@@ -170,36 +158,21 @@ test('queue_update keeps queued steering as a transcript bubble with retract act
   transientMessages.set('message-next', {
     id: 'message-next', text: 'do this next', ts: 1, transientPlacement: 'follow_up',
   });
+  transientMessages.set('message-steer', {
+    id: 'message-steer', text: 'adjust this run', ts: 1, transientPlacement: 'current_turn',
+    pendingSteering: true,
+  });
 
   handlers.handleEvent('session-1', queueUpdate([steeringEntry]));
 
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
+    turnId: 'turn-1',
+    ts: 1,
     queueRevision: 3,
     entries: [steeringEntry, followupEntry],
   });
-  assert.equal(transientMessages.has('message-next'), false,
-    'a queued follow-up retires its placeholder — the plate row owns it');
-  const steering = transientMessages.get('message-steer');
-  assert.equal(steering?.pendingSteering, true);
-  assert.equal(steering?.hostTurnId, 'turn-1');
-  assert.equal(steering?.text, 'adjust this run');
-  assert.deepEqual(steering?.deliveryActions?.map((action) => action.label), ['编辑', '删除'],
-    'queued steering keeps edit and retract controls on its bubble');
-
-  await steering?.deliveryActions?.[0]?.onClick();
-  assert.deepEqual(retracted, [['session-1', 'entry-steer']]);
-  assert.deepEqual(restored, [['session-1', 'adjust this run']],
-    'editing a queued steering retracts it and returns the text to the composer');
-  assert.equal(transientMessages.has('message-steer'), false);
-
-  handlers.handleEvent('session-1', queueUpdate([steeringEntry]));
-  await transientMessages.get('message-steer')?.deliveryActions?.[1]?.onClick();
-  assert.deepEqual(retracted.at(-1), ['session-1', 'entry-steer']);
-  assert.equal(restored.length, 1, 'delete retracts without touching the draft');
-
-  handlers.handleEvent('session-1', queueUpdate([{ ...steeringEntry, state: 'in_flight' }]));
-  assert.equal(transientMessages.has('message-steer'), false,
-    'an in-flight queue entry must not re-add a transcript bubble');
+  assert.equal(transientMessages.size, 0,
+    'the store keeps no copy of entries the Host snapshot now owns — queued steering derives from it at render');
 
   const nextEntry = {
     entryId: 'entry-next',
diff --git a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
index c310f6641cd..51af5c71326 100644
--- a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
+++ b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
@@ -24,8 +24,8 @@ import type { TransientUserMessageProjection } from '@maka/ui';
 import { deriveMessageQueueProjection } from '../../renderer/application/contracts/message-queue-projection.js';
 import {
   mergeTransientMessageProjection,
-  projectQueuedTransientMessages,
   reconcileTransientMessages,
+  withQueuedSteeringTransients,
 } from '../../renderer/application/contracts/transient-message-projection.js';
 
 /** The durable Message that replaces the transient row above. */
@@ -103,35 +103,13 @@ test('keeps transient messages ordered independently from a sparse durable tail'
   assert.deepEqual(projected.map((message) => message.id), ['message-1']);
 });
 
-test('uses the Host queue snapshot order for already-present transient messages', () => {
-  const localSecond = {
-    ...transient,
-    id: 'message-2',
-    turnId: 'message-2',
-    text: 'second',
-  };
-  const remoteFirst = {
-    ...transient,
-    id: 'message-1',
-    turnId: 'message-1',
-    text: 'first',
-  };
-  const pending = new Map([[localSecond.id, localSecond]]);
-
-  projectQueuedTransientMessages(pending, [remoteFirst, localSecond]);
-
-  assert.deepEqual(
-    reconcileTransientMessages(pending, []).map((message) => message.id),
-    ['message-1', 'message-2'],
-  );
-});
-
 test('derives one queue projection for main and Side Conversation consumers', () => {
   const projection = deriveMessageQueueProjection({
     type: 'queue_update',
     id: 'queue-1',
     turnId: 'turn-1',
     ts: 7,
+    queueRevision: 3,
     steering: ['in flight', 'steer'],
     followup: ['next'],
     steeringEntries: [
@@ -145,7 +123,7 @@ test('derives one queue projection for main and Side Conversation consumers', ()
       {
         entryId: 'steer',
         messageId: 'message-steer',
-        content: { text: 'raw', displayText: 'steer', quotes: [{ text: 'context' }] },
+        content: { text: 'raw', displayText: 'steer' },
         placement: 'current_turn',
         state: 'queued',
       },
@@ -161,30 +139,72 @@ test('derives one queue projection for main and Side Conversation consumers', ()
     ],
   });
 
-  assert.deepEqual(projection.entries.map((entry) => entry.entryId), ['in-flight', 'steer', 'next']);
-  assert.deepEqual(projection.transientMessages, [
-    {
-      id: 'message-in-flight',
-      transientPlacement: 'steering',
-      hostTurnId: 'turn-1',
-      ts: 7,
-      text: 'in flight',
-    },
-    {
-      id: 'message-steer',
-      transientPlacement: 'steering',
-      hostTurnId: 'turn-1',
-      ts: 7,
-      text: 'steer',
-      quotes: [{ text: 'context' }],
-    },
-    {
-      id: 'message-next',
-      transientPlacement: 'follow_up',
-      ts: 7,
-      text: 'next',
+  assert.deepEqual(projection, {
+    turnId: 'turn-1',
+    ts: 7,
+    queueRevision: 3,
+    entries: [
+      {
+        entryId: 'steer',
+        messageId: 'message-steer',
+        content: { text: 'raw', displayText: 'steer' },
+        placement: 'current_turn',
+        state: 'queued',
+      },
+      {
+        entryId: 'next',
+        messageId: 'message-next',
+        content: { text: 'next' },
+        placement: 'next_turn',
+        state: 'queued',
+      },
+    ],
+  });
+});
+
+test('queued steering derives a transcript bubble that lives and dies with the snapshot', async () => {
+  const queueEntry = {
+    entryId: 'steer',
+    messageId: 'message-steer',
+    content: { text: 'raw', displayText: 'steer', quotes: [{ text: 'context' }] },
+    placement: 'current_turn' as const,
+    state: 'queued' as const,
+  };
+  const queue = { turnId: 'turn-1', ts: 7, entries: [queueEntry] };
+  const retracted: (string | undefined)[][] = [];
+  const actions = {
+    locale: 'en' as const,
+    retract: async (_entry: unknown, draftText?: string) => {
+      retracted.push([draftText]);
+      return true;
     },
-  ]);
+  };
+  const localCopy = { ...transient, id: 'message-steer', text: 'local copy' };
+
+  const derived = withQueuedSteeringTransients([transient, localCopy], queue, actions);
+
+  assert.deepEqual(derived.map((message) => message.id), ['message-1', 'message-steer'],
+    'the queue-owned bubble replaces its stored local copy');
+  const bubble = derived.at(-1);
+  assert.equal(bubble?.pendingSteering, true);
+  assert.equal(bubble?.hostTurnId, 'turn-1');
+  assert.equal(bubble?.text, 'steer');
+  assert.deepEqual(bubble?.quotes, [{ text: 'context' }]);
+  assert.deepEqual(bubble?.deliveryActions?.map((action) => action.label), ['Edit', 'Delete']);
+  await bubble?.deliveryActions?.[0]?.onClick();
+  assert.deepEqual(retracted, [['steer']], 'edit hands the text back to the composer');
+  await bubble?.deliveryActions?.[1]?.onClick();
+  assert.deepEqual(retracted.at(-1), [undefined], 'delete retracts without a draft');
+
+  assert.equal(
+    withQueuedSteeringTransients([transient], { ...queue, entries: [] }, actions).length,
+    1,
+    'an entry gone from the snapshot leaves no bubble behind',
+  );
+  assert.equal(
+    withQueuedSteeringTransients([transient], undefined, actions).length,
+    1,
+  );
 });
 
 test('keeps a Host-bound current Turn when a later IPC result has no Turn identity', () => {
diff --git a/apps/desktop/src/renderer/app-shell-session-events.ts b/apps/desktop/src/renderer/app-shell-session-events.ts
index 4473abb91f9..66f88aa1c1c 100644
--- a/apps/desktop/src/renderer/app-shell-session-events.ts
+++ b/apps/desktop/src/renderer/app-shell-session-events.ts
@@ -28,10 +28,9 @@ import {
   TOOL_STREAM_MAX_CHUNKS,
   TOOL_STREAM_MAX_TOTAL_CHARS,
 } from '@maka/ui';
-import type { LiveTurnBuffer, LiveTurnProjection, InteractionQueues, TransientUserMessageProjection } from '@maka/ui';
+import type { LiveTurnBuffer, LiveTurnProjection, InteractionQueues } from '@maka/ui';
 import type { RefreshMessagesOptions } from './app-shell-chat-actions.js';
 import { deriveMessageQueueProjection } from './application/contracts/message-queue-projection.js';
-import { queuedSteeringDeliveryActions } from './application/contracts/transient-message-projection.js';
 import type { MessageQueueUiState } from './app-shell-session-ui-state.js';
 import * as modelConnectionErrors from './model-connection-errors.js';
 import { getDesktopConversationCopy } from './application/contracts/conversation-copy.js';
@@ -54,9 +53,6 @@ type ToastApi = {
 
 export interface AppShellSessionEventHandlers {
   handleEvent(sessionId: string, event: SessionEvent): void;
-  /** Whether the Host queue snapshot currently owns this steering bubble —
-   *  local-record retirement must not remove it. */
-  isQueuedSteering(sessionId: string, messageId: string): boolean;
   reconcilePersistedMessages(sessionId: string, messages: readonly StoredMessage[]): void;
   settleAssistantStreaming(sessionId: string, messageId?: string): Promise<void>;
   flushDisplayEvents(sessionId: string): void;
@@ -84,14 +80,7 @@ export function createAppShellSessionEventHandlers(options: {
   setLiveTurnBySession: StateUpdater<Record<string, LiveTurnBuffer>>;
   setInteractionBySession: StateUpdater<InteractionQueues>;
   setMessageQueueBySession?: StateUpdater<Record<string, MessageQueueUiState>>;
-  /** Reads the last projected Host queue snapshot — the departed-entry diff. */
-  getMessageQueue?: (sessionId: string) => MessageQueueUiState | undefined;
   removeTransientMessage?: (sessionId: string, messageId: string) => void;
-  upsertTransientMessage?: (sessionId: string, message: TransientUserMessageProjection) => void;
-  /** Retract one Host-queued entry; the implementation surfaces the failure. */
-  retractQueueEntry?: (sessionId: string, entryId: string) => Promise<unknown>;
-  /** Put a retracted entry's text back into the composer for editing. */
-  restoreMessageDraft?: (sessionId: string, text: string) => void;
   onInteractionChanged?: (sessionId: string) => void;
   /** A boundary decision settled: the session's execution boundary may have moved. */
   onExecutionBoundaryChanged?: (sessionId: string) => void;
@@ -119,11 +108,7 @@ export function createAppShellSessionEventHandlers(options: {
     setLiveTurnBySession,
     setInteractionBySession,
     setMessageQueueBySession,
-    getMessageQueue,
     removeTransientMessage,
-    upsertTransientMessage,
-    retractQueueEntry,
-    restoreMessageDraft,
     onInteractionChanged,
     onExecutionBoundaryChanged,
     onContextCompactionOutcome,
@@ -316,46 +301,11 @@ export function createAppShellSessionEventHandlers(options: {
     switch (event.type) {
       case 'queue_update': {
         const queue = deriveMessageQueueProjection(event);
-        // Queued steering stays on screen as a transcript bubble — the plate
-        // above the composer is for follow-ups only. An entry that leaves the
-        // queue without an admission event still retires its bubble.
-        const queuedSteering = new Map(
-          queue.transientMessages
-            .filter((message) => message.pendingSteering === true)
-            .map((message) => [message.id, message]),
-        );
+        // Queued steering renders from this snapshot as transcript bubbles —
+        // the store only holds local intents, so every entry the Host lists
+        // retires its local copy here.
         for (const entry of [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])]) {
-          if (!queuedSteering.has(entry.messageId)) removeTransientMessage?.(sessionId, entry.messageId);
-        }
-        for (const entry of getMessageQueue?.(sessionId)?.entries ?? []) {
-          if (entry.placement === 'current_turn' && !queuedSteering.has(entry.messageId)) {
-            removeTransientMessage?.(sessionId, entry.messageId);
-          }
-        }
-        if (upsertTransientMessage) {
-          for (const entry of event.steeringEntries ?? []) {
-            const transient = queuedSteering.get(entry.messageId);
-            if (!transient) continue;
-            upsertTransientMessage(sessionId, retractQueueEntry
-              ? {
-                  ...transient,
-                  deliveryActions: queuedSteeringDeliveryActions({
-                    locale: uiLocale,
-                    draftText: entry.content.displayText ?? entry.content.text,
-                    retract: async (draftText) => {
-                      try {
-                        await retractQueueEntry(sessionId, entry.entryId);
-                      } catch {
-                        return false;
-                      }
-                      removeTransientMessage?.(sessionId, entry.messageId);
-                      if (draftText !== undefined) restoreMessageDraft?.(sessionId, draftText);
-                      return true;
-                    },
-                  }),
-                }
-              : transient);
-          }
+          removeTransientMessage?.(sessionId, entry.messageId);
         }
         setMessageQueueBySession?.((current) => {
           if (!event.steering.length && !event.followup.length) {
@@ -366,10 +316,7 @@ export function createAppShellSessionEventHandlers(options: {
           }
           return {
             ...current,
-            [sessionId]: {
-              queueRevision: event.queueRevision,
-              entries: queue.entries,
-            },
+            [sessionId]: queue,
           };
         });
         break;
@@ -468,10 +415,6 @@ export function createAppShellSessionEventHandlers(options: {
 
   return {
     handleEvent,
-    isQueuedSteering: (sessionId, messageId) =>
-      getMessageQueue?.(sessionId)?.entries.some(
-        (entry) => entry.placement === 'current_turn' && entry.messageId === messageId,
-      ) ?? false,
     reconcilePersistedMessages,
     settleAssistantStreaming,
     flushDisplayEvents,
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index b6b1a0891e6..fb70d0bc8ed 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -67,6 +67,7 @@ import {
 } from '@maka/ui';
 import type { ConnectionEvent } from '@maka/core/connections';
 import { ChatMessageSurface } from './chat-message-surface';
+import { withQueuedSteeringTransients } from './application/contracts/transient-message-projection.js';
 import { useTaskSubmissionReadiness } from './use-task-submission-readiness';
 import { useAppShellSessionUiReads } from './use-app-shell-session-ui-reads';
 import * as Conversation from './features/conversation';
@@ -671,7 +672,27 @@ function AppShellContent({
       }
     : undefined;
   const activeMessageQueue = activeId ? messageQueueBySession[activeId] : undefined;
-  // The shell's reading of the active live turn: streaming/settled flags, the
+  // Queued steering is a thin projection of the Host queue snapshot — the
+  // bubble appears and disappears with it, no bookkeeping of our own.
+  const transcriptTransientMessages = useMemo(
+    () => withQueuedSteeringTransients(transientMessages, activeMessageQueue, {
+      locale: uiLocale,
+      retract: async (entry, draftText) => {
+        const sessionId = activeId;
+        if (!sessionId) return false;
+        try {
+          await retractQueueEntry(sessionId, entry.entryId);
+        } catch {
+          return false;
+        }
+        if (draftText !== undefined) restoreLocalMessageDraft(sessionId, draftText);
+        return true;
+      },
+    }),
+    [transientMessages, activeMessageQueue, uiLocale, activeId],
+  );
+  const activeMessageSubmitting = transientMessages.length > 0;
+  const activeDesktopSession = activeSession;  // The shell's reading of the active live turn: streaming/settled flags, the
   // in-flight tool signal, and the #646 turn-wait cues, all derived from the
   // semantic snapshot rather than the projection (#1985).
   const {
@@ -1635,11 +1656,9 @@ function AppShellContent({
   }
 
   async function deleteQueuedEntry(entryId: string): Promise<void> {
-    const messageId = activeMessageQueue?.entries.find((entry) => entry.entryId === entryId)?.messageId;
-    const sessionId = await runQueueEntryAction((sessionId) =>
+    await runQueueEntryAction((sessionId) =>
       window.maka.sessions.retractQueueEntry(sessionId, entryId).then(() => undefined)
     );
-    if (sessionId && messageId) removeTransientMessage(sessionId, messageId);
   }
 
   // Event handlers act per observed Session, not the active one — same failure
@@ -1706,7 +1725,6 @@ function AppShellContent({
   const [sessionDisplayBatch] = useState(createAppShellSessionDisplayBatch);
   const {
     handleEvent,
-    isQueuedSteering,
     reconcilePersistedMessages,
     settleAssistantStreaming,
     flushDisplayEvents,
@@ -1722,11 +1740,7 @@ function AppShellContent({
     setLiveTurnBySession: sessionUiController.setLiveTurnBySession,
     setInteractionBySession: sessionUiController.setInteractionBySession,
     setMessageQueueBySession: sessionUiController.setMessageQueueBySession,
-    getMessageQueue: (sessionId) => sessionUiController.getState().messageQueueBySession[sessionId],
     removeTransientMessage,
-    upsertTransientMessage: addTransientMessage,
-    retractQueueEntry,
-    restoreMessageDraft: restoreLocalMessageDraft,
     displayBatch: sessionDisplayBatch,
     onInteractionChanged: markInteractionChanged,
     onExecutionBoundaryChanged: reloadActiveExecutionBoundary,
@@ -2104,11 +2118,7 @@ function AppShellContent({
     <Conversation.SessionLocalMessages
       sessionId={activeId}
       publish={addTransientMessage}
-      retire={(sessionId, messageId) => {
-        // A queue-owned steering bubble is the Host's own placeholder; the
-        // local outbox accepting it must not retire the transcript copy.
-        if (!isQueuedSteering(sessionId, messageId)) removeTransientMessage(sessionId, messageId);
-      }}
+      retire={removeTransientMessage}
       reportError={toastApi.error}
       restoreDraft={restoreLocalMessageDraft}
     />
@@ -2500,7 +2510,7 @@ function AppShellContent({
                 onLoadTranscriptTurn={(turn) => transcriptReadingCommands.current?.loadEarlier(turn.sequence)}
                 liveContentSeedRevision={liveContent.liveContentSeedRevision(activeEventSeed, activeId)}
                 messages={messages}
-                transientMessages={transientMessages}
+                transientMessages={transcriptTransientMessages}
                 messageLoading={activeMessageLoading}
                     onStreamingSettled={
                       activeId ? (messageId) => settleAssistantStreaming(activeId, messageId) : undefined
diff --git a/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts b/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
index 7325868a381..7e31ffdfb2d 100644
--- a/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
@@ -21,11 +21,13 @@ import type {
   MessageQueueEntryProjection,
   QueueUpdateEvent,
 } from '@maka/core/events';
-import type { TransientUserMessageProjection } from '@maka/ui';
 
+/** The last Host queue snapshot a surface renders from. */
 export interface MessageQueueProjection {
+  readonly turnId: string;
+  readonly ts: number;
+  readonly queueRevision?: number;
   readonly entries: readonly MessageQueueEntryProjection[];
-  readonly transientMessages: readonly TransientUserMessageProjection[];
 }
 
 /** One presentation contract for Host queue snapshots in every chat surface. */
@@ -37,21 +39,9 @@ export function deriveMessageQueueProjection(
     ...(event.followupEntries ?? []),
   ].map((entry) => structuredClone(entry));
   return {
+    turnId: event.turnId,
+    ts: event.ts,
+    queueRevision: event.queueRevision,
     entries,
-    transientMessages: entries.map((entry) => ({
-        id: entry.messageId,
-        transientPlacement: entry.placement === 'current_turn' ? 'steering' : 'follow_up',
-        ...(entry.placement === 'current_turn' && { hostTurnId: event.turnId }),
-        ts: event.ts,
-        text: entry.content.displayText ?? entry.content.text,
-        ...(entry.content.attachments && { attachments: [...entry.content.attachments] }),
-        ...(entry.content.directoryReferences && {
-          directoryReferences: entry.content.directoryReferences,
-        }),
-        ...(entry.content.quotes && { quotes: [...entry.content.quotes] }),
-        ...(entry.content.inlineReferences && {
-          inlineReferences: [...entry.content.inlineReferences],
-        }),
-      })),
   };
 }
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 0be078e97c6..28a32b2addd 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -18,6 +18,7 @@
  */
 
 import { createElement } from 'react';
+import type { MessageQueueEntryProjection } from '@maka/core/events';
 import type { StoredMessage } from '@maka/core/session';
 import type { UiLocale } from '@maka/core/ui-locale';
 import { getConversationCopy, type TransientUserMessageProjection } from '@maka/ui';
@@ -44,20 +45,57 @@ export function queuedSteeringDeliveryActions(input: {
 }
 
 /**
- * Replace the queue-backed subset in the exact order supplied by the Host.
- * Other local intents keep their relative position because queue absence is
- * not cancellation or delivery proof.
+ * Queued steering is a thin projection of the Host queue snapshot, not a stored
+ * transient: the bubble appears, updates and disappears with `queue` alone.
+ * Appends one transcript bubble per queued current_turn entry — with the
+ * retract-backed edit/delete actions — and drops any stored transient the
+ * queue now owns, so a message never renders twice.
  */
-export function projectQueuedTransientMessages(
-  transient: Map<string, TransientUserMessage>,
-  queued: readonly TransientUserMessage[],
-): void {
-  if (queued.length === 0) return;
-  const queuedIds = new Set(queued.map((message) => message.id));
-  const retained = [...transient.entries()].filter(([id]) => !queuedIds.has(id));
-  transient.clear();
-  for (const [id, message] of retained) transient.set(id, message);
-  for (const message of queued) transient.set(message.id, message);
+export function withQueuedSteeringTransients(
+  transientMessages: readonly TransientUserMessage[],
+  queue:
+    | {
+        readonly entries: readonly MessageQueueEntryProjection[];
+        readonly turnId?: string;
+        readonly ts?: number;
+      }
+    | undefined,
+  actions: {
+    locale: UiLocale;
+    /** Retract the queue entry; resolves false when the Host call failed. */
+    retract(entry: MessageQueueEntryProjection, draftText?: string): Promise<boolean>;
+  },
+): TransientUserMessage[] {
+  const steering = (queue?.entries ?? []).filter(
+    (entry) => entry.placement === 'current_turn' && entry.state === 'queued',
+  );
+  if (steering.length === 0) return [...transientMessages];
+  const bubbles = steering.map((entry): TransientUserMessage => ({
+    id: entry.messageId,
+    transientPlacement: 'current_turn',
+    pendingSteering: true,
+    hostTurnId: queue?.turnId,
+    ts: queue?.ts ?? 0,
+    text: entry.content.displayText ?? entry.content.text,
+    ...(entry.content.attachments && { attachments: [...entry.content.attachments] }),
+    ...(entry.content.directoryReferences && {
+      directoryReferences: entry.content.directoryReferences,
+    }),
+    ...(entry.content.quotes && { quotes: [...entry.content.quotes] }),
+    ...(entry.content.inlineReferences && {
+      inlineReferences: [...entry.content.inlineReferences],
+    }),
+    deliveryActions: queuedSteeringDeliveryActions({
+      locale: actions.locale,
+      draftText: entry.content.displayText ?? entry.content.text,
+      retract: (draftText) => actions.retract(entry, draftText),
+    }),
+  }));
+  const ids = new Set(bubbles.map((message) => message.id));
+  return [
+    ...transientMessages.filter((message) => !ids.has(message.id)),
+    ...bubbles,
+  ];
 }
 
 /**
diff --git a/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts b/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
index 5637d665a19..72a39c40652 100644
--- a/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
+++ b/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
@@ -45,8 +45,11 @@ export interface AppShellSessionUiState {
 
 // The pending plate keeps the Host revision beside its entries so edits can
 // reject stale multi-client projections instead of silently overwriting them.
+// turnId/ts bind the queued-steering bubbles derived from this snapshot.
 export interface MessageQueueUiState {
   readonly queueRevision?: number;
+  readonly turnId: string;
+  readonly ts: number;
   readonly entries: readonly MessageQueueEntryProjection[];
 }
 
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index 20eb29065ae..298d152c5e8 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -76,9 +76,8 @@ import { deriveMessageQueueProjection } from '../../../../application/contracts/
 import { mergeSettledMessages } from '../../../../settled-message-merge.js';
 import {
   mergeTransientMessageProjection,
-  projectQueuedTransientMessages,
-  queuedSteeringDeliveryActions,
   reconcileTransientMessages,
+  withQueuedSteeringTransients,
 } from '../../../../application/contracts/transient-message-projection.js';
 import { getDesktopConversationCopy } from '../../../../application/contracts/conversation-copy.js';
 import {
@@ -356,13 +355,21 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const pendingUserMessagesRef = useRef<Map<string, TransientUserMessageProjection>>(
     new Map(),
   );
-  const queuedSteeringRef = useRef<Set<string> | undefined>(undefined);
   const restoreDraftRef = useRef(input.restoreDraft);
   restoreDraftRef.current = input.restoreDraft;
   const [messageQueue, setMessageQueue] = useState<{
     readonly entries: readonly MessageQueueEntryProjection[];
     readonly queueRevision?: number;
+    readonly turnId?: string;
+    readonly ts?: number;
   }>({ entries: [] });
+  // Reseed reconciliation reads the queue between React flushes, so every
+  // writer goes through the ref; the state copy exists only for rendering.
+  const messageQueueRef = useRef(messageQueue);
+  const applyMessageQueue = useCallback((next: typeof messageQueue) => {
+    messageQueueRef.current = next;
+    setMessageQueue(next);
+  }, []);
   const [execution, setExecution] = useState<SessionExecutionProjection>();
   const [liveTurns, setLiveTurns] = useState<LiveTurnBuffer>();
   const liveTurnsRef = useRef(liveTurns);
@@ -482,11 +489,10 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   }, [syncPendingUserMessages]);
 
   const dropQueuedMessage = useCallback((messageId: string) => {
-    setMessageQueue((current) => {
-      const entries = current.entries.filter((entry) => entry.messageId !== messageId);
-      return entries.length === current.entries.length ? current : { ...current, entries };
-    });
-  }, []);
+    const current = messageQueueRef.current;
+    const entries = current.entries.filter((entry) => entry.messageId !== messageId);
+    if (entries.length !== current.entries.length) applyMessageQueue({ ...current, entries });
+  }, [applyMessageQueue]);
 
   // Bind presentation to canonical ownership before the caller reconciles and
   // publishes the pending Map. Recovery can bind a whole batch in one update.
@@ -516,46 +522,20 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const projectMessageQueue = useCallback(
     (forkId: string, event: Extract<SessionEvent, { type: 'queue_update' }>) => {
       const queue = deriveMessageQueueProjection(event);
-      setMessageQueue({ entries: queue.entries, queueRevision: event.queueRevision });
-      const steering = queue.transientMessages.filter((message) => message.pendingSteering === true);
-      // Queued steering waits as a transcript bubble; an entry that leaves the
-      // queue without an admission event still retires its bubble.
-      const steeringIds = new Set(steering.map((message) => message.id));
-      for (const messageId of queuedSteeringRef.current ?? []) {
-        if (!steeringIds.has(messageId)) pendingUserMessagesRef.current.delete(messageId);
+      applyMessageQueue({
+        entries: queue.entries,
+        queueRevision: event.queueRevision,
+        turnId: event.turnId,
+        ts: event.ts,
+      });
+      // Queued steering renders from this snapshot as transcript bubbles —
+      // every entry the Host lists retires its local transient copy.
+      for (const entry of [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])]) {
+        pendingUserMessagesRef.current.delete(entry.messageId);
       }
-      queuedSteeringRef.current = steeringIds;
-
-      projectQueuedTransientMessages(
-        pendingUserMessagesRef.current,
-        queue.transientMessages.map((message) => {
-          if (message.pendingSteering !== true) return message;
-          const entry = queue.entries.find((candidate) => candidate.messageId === message.id);
-          if (!entry) return message;
-          return {
-            ...message,
-            deliveryActions: queuedSteeringDeliveryActions({
-              locale: localeRef.current,
-              draftText: entry.content.displayText ?? entry.content.text,
-              retract: async (draftText) => {
-                try {
-                  await sideChat.retractQueueEntry(forkId, entry.entryId);
-                } catch {
-                  if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
-                  return false;
-                }
-                pendingUserMessagesRef.current.delete(message.id);
-                syncPendingUserMessages();
-                if (draftText !== undefined) restoreDraftRef.current?.(forkId, draftText);
-                return true;
-              },
-            }),
-          };
-        }),
-      );
       syncPendingUserMessages();
     },
-    [sideChat, syncPendingUserMessages],
+    [applyMessageQueue, syncPendingUserMessages],
   );
 
   const applyOwnedEvent = useCallback(
@@ -724,6 +704,9 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     );
     if (admittedMessage?.turnId) bindAdmittedTurn(forkId, admittedMessage.turnId);
     const messageIds = new Set(pendingUserMessagesRef.current.keys());
+    // Queue-owned ids are already retired from the pending map; reseed still
+    // needs them so a Host-retired entry leaves the plate too.
+    for (const entry of messageQueueRef.current.entries) messageIds.add(entry.messageId);
     if (pendingAdmissionRef.current) messageIds.add(pendingAdmissionRef.current.messageId);
     if (messageIds.size === 0) return;
     try {
@@ -774,15 +757,16 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
       }
       reconcilePendingUserMessages();
       if (retired.size > 0) {
-        setMessageQueue((current) => ({
+        const current = messageQueueRef.current;
+        applyMessageQueue({
           ...current,
           entries: current.entries.filter((entry) => !retired.has(entry.messageId)),
-        }));
+        });
       }
     } catch {
       // A failed proof query leaves presentation intact until canonical proof arrives.
     }
-  }, [bindAdmittedTurn, bindPendingMessageTurn, mergeDurableMessages, mountedRef, reconcilePendingUserMessages, releaseAdmission, sideChat]);
+  }, [applyMessageQueue, bindAdmittedTurn, bindPendingMessageTurn, mergeDurableMessages, mountedRef, reconcilePendingUserMessages, releaseAdmission, sideChat]);
 
   const reconcileStartedFollowUpTurn = useCallback(async (
     forkId: string,
@@ -1010,9 +994,8 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
           allMessagesRef.current = [];
           setAllMessages([]);
           pendingUserMessagesRef.current.clear();
-          queuedSteeringRef.current = undefined;
           setPendingUserMessages([]);
-          setMessageQueue({ entries: [] });
+          applyMessageQueue({ entries: [] });
           onForkVisibilityChangeRef.current?.({
             type: 'cleanup-succeeded',
             sessionId: existing.id,
@@ -1746,7 +1729,21 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const messages = allMessages.filter(
     (message) => message.turnId !== undefined && ownTurnIdsRef.current.has(message.turnId),
   );
-  const transientMessages = pendingUserMessages;
+  const transientMessages = withQueuedSteeringTransients(pendingUserMessages, messageQueue, {
+    locale: localeRef.current,
+    retract: async (entry, draftText) => {
+      const forkId = companionIdRef.current;
+      if (!forkId) return false;
+      try {
+        await sideChat.retractQueueEntry(forkId, entry.entryId);
+      } catch {
+        if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
+        return false;
+      }
+      if (draftText !== undefined) restoreDraftRef.current?.(forkId, draftText);
+      return true;
+    },
+  });
   // Inherited model (read-only): the fork's once created, else the source's.
   const activeModel = companion
     ? { llmConnectionSlug: companion.llmConnectionSlug, model: companion.model }
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index bdc6dba705c..5e5438da688 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -19,7 +19,7 @@
 
 import { activeHostTurn, chatTurnActivity, type SessionExecutionProjection } from '../../../application/contracts/session-execution.js';
 import { deriveMessageQueueProjection } from '../../../application/contracts/message-queue-projection.js';
-import { mergeTransientMessageProjection, queuedSteeringDeliveryActions } from '../../../application/contracts/transient-message-projection.js';
+import { withQueuedSteeringTransients } from '../../../application/contracts/transient-message-projection.js';
 import { useEffect, useRef, useState } from 'react';
 import {
   applyLiveTurnBufferEvent,
@@ -61,7 +61,7 @@ interface SendAttempt {
 }
 interface MessagePresentation {
   transientMessages: TransientUserMessageProjection[];
-  messageQueue: { entries: readonly MessageQueueEntryProjection[]; revision?: number };
+  messageQueue: { entries: readonly MessageQueueEntryProjection[]; revision?: number; turnId?: string; ts?: number };
 }
 export function useWorkHubController(
   onSubmit?: () => void,
@@ -387,64 +387,16 @@ export function useWorkHubController(
         setInteractions((current) => terminal ? clearInteractions(current, sessionId) : reduceInteractionQueues(current, sessionId, event));
         if (event.type === 'queue_update') {
           const queue = deriveMessageQueueProjection(event);
-          // Host evidence retires local submission placeholders — except queued
-          // steering, which keeps its transcript bubble until the Turn consumes
-          // it. Queue state itself lives only in messageQueue.
+          // Host evidence retires local submission placeholders; queued
+          // steering renders from the snapshot itself as transcript bubbles.
           const ids = new Set(
             [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])].map((entry) => entry.messageId),
           );
           if (pendingQueued.current && ids.has(pendingQueued.current.messageId)) pendingQueued.current.observed = true;
-          setMessagePresentation((previous) => {
-            const steering = queue.transientMessages
-              .filter((message) => message.pendingSteering === true)
-              .map((message) => {
-                const entry = queue.entries.find((candidate) => candidate.messageId === message.id);
-                if (!entry) return message;
-                return {
-                  ...message,
-                  deliveryActions: queuedSteeringDeliveryActions({
-                    locale: localeRef.current,
-                    draftText: entry.content.displayText ?? entry.content.text,
-                    retract: async (draftText) => {
-                      try { await services.retractQueueEntry(sessionId, entry.entryId); }
-                      catch (reason) { report(reason); return false; }
-                      setMessagePresentation((current) => ({
-                        ...current,
-                        transientMessages: current.transientMessages.filter((candidate) => candidate.id !== message.id),
-                      }));
-                      if (draftText !== undefined && currentSessionId.current === sessionId) {
-                        restoreDraftRef.current?.(sessionId, draftText);
-                      }
-                      return true;
-                    },
-                  }),
-                };
-              });
-            const steeringIds = new Set(steering.map((message) => message.id));
-            // A steering entry that left the queue without an admission event
-            // still retires its transcript bubble.
-            const departed = new Set(
-              previous.messageQueue.entries
-                .filter((entry) => entry.placement === 'current_turn')
-                .map((entry) => entry.messageId)
-                .filter((messageId) => !steeringIds.has(messageId)),
-            );
-            const retained = previous.transientMessages
-              .filter(
-                (message) => (!ids.has(message.id) || steeringIds.has(message.id)) && !departed.has(message.id),
-              )
-              .map((message) => {
-                const update = steering.find((candidate) => candidate.id === message.id);
-                return update ? mergeTransientMessageProjection(message, update) : message;
-              });
-            for (const message of steering) {
-              if (!retained.some((candidate) => candidate.id === message.id)) retained.push(message);
-            }
-            return {
-              messageQueue: { entries: queue.entries, revision: event.queueRevision },
-              transientMessages: retained,
-            };
-          });
+          setMessagePresentation((previous) => ({
+            messageQueue: { entries: queue.entries, revision: event.queueRevision, turnId: event.turnId, ts: event.ts },
+            transientMessages: previous.transientMessages.filter((message) => !ids.has(message.id)),
+          }));
         }
         if (event.type === 'message_admission') {
           if (event.outcome === 'admitted') {
@@ -748,7 +700,16 @@ export function useWorkHubController(
       if (!sessionId) throw new Error('WorkHub Session is unavailable');
       await services.respondToUserQuestion(sessionId, response);
     },
-    transientMessages,
+    transientMessages: withQueuedSteeringTransients(transientMessages, messageQueue, {
+      locale,
+      retract: async (entry, draftText) => {
+        if (!sessionId) return false;
+        try { await services.retractQueueEntry(sessionId, entry.entryId); }
+        catch (reason) { report(reason); return false; }
+        if (draftText !== undefined) restoreDraftRef.current?.(sessionId, draftText);
+        return true;
+      },
+    }),
     messageQueue,
     updateQueuedEntry: (entryId: string, revision: number, text: string) => mutateQueue((target) => services.updateQueueEntry(target, entryId, revision, text)),
     deleteQueuedEntry: (entryId: string) => mutateQueue((target) => services.retractQueueEntry(target, entryId)),
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 545339f91e6..1401bd7bd41 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -39,7 +39,7 @@ import {
 } from '@maka/ui';
 import type { ChatModelChoice, SessionViewMode, TurnViewModel, LiveTurnBuffer } from '@maka/ui';
 import { SessionRail, type SessionRailStoryProps } from '../../../packages/ui/stories/session-rail-harness.js';
-import { ICON_SIZE, Pencil, Trash2 } from '@maka/ui/icons';
+import { withQueuedSteeringTransients } from '../src/renderer/application/contracts/transient-message-projection';
 import { AppShellTitlebar } from '../src/renderer/app-shell-chrome-actions';
 import { appShellFrameStyle } from '../src/renderer/shell/frame-style';
 import { SettingsOverlay } from '../src/renderer/app-shell-overlays';
@@ -735,9 +735,9 @@ export const PromptSentBeforeTurnLands: Story = {
   },
 };
 
-// Real path: a steering send the Host queued but has not consumed yet. It lives
-// in the transcript as a pending bubble — edit retracts it back into the draft,
-// delete retracts it outright. The composer plate is for follow-ups only.
+// Real path: a steering send the Host queued but has not consumed yet derives
+// from the queue snapshot at the render boundary — the transcript bubble is
+// that entry, with retract-backed edit/delete. The plate shows follow-ups only.
 export const QueuedSteeringInTranscript: Story = {
   render: () => (
     <ComposedShell
@@ -755,18 +755,17 @@ export const QueuedSteeringInTranscript: Story = {
             tools: [],
           }],
         }],
-        transientMessages: [{
-          id: 'msg-steer-queued',
-          text: '顺便确认一下 coverage 阈值没有变。',
+        transientMessages: withQueuedSteeringTransients([], {
+          turnId: 'turn-s',
           ts: NOW - 10_000,
-          transientPlacement: 'transcript',
-          hostTurnId: 'turn-s',
-          pendingSteering: true,
-          deliveryActions: [
-            { label: '编辑', icon: <Pencil size={ICON_SIZE.control} aria-hidden="true" />, onClick: noop },
-            { label: '删除', icon: <Trash2 size={ICON_SIZE.control} aria-hidden="true" />, onClick: noop },
-          ],
-        }],
+          entries: [{
+            entryId: 'entry-steer',
+            messageId: 'msg-steer-queued',
+            content: { text: '顺便确认一下 coverage 阈值没有变。' },
+            placement: 'current_turn',
+            state: 'queued',
+          }],
+        }, { locale: 'zh-CN', retract: async () => true }),
       }}
     />
   ),

From 75b8c207075c656ed86c65c888e1056e59524ca6 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 20 Sep 2026 23:30:34 +0800
Subject: [PATCH 09/33] docs(ui): drop Tooltip from the queue plate's surface
 inventory

---
 docs/astryx-surface-file-inventory.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index e403347c3ee..85aa15841c6 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -273,7 +273,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `packages/ui/src/client-plugin-runtime.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/client-plugin-slots.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/components.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | IconButton, List, ListItem, Tooltip | raw `<textarea` (API Use-the-System) | polish |
+| `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | IconButton, List, ListItem | raw `<textarea` (API Use-the-System) | polish |
 | `packages/ui/src/composer-model-label.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/composer.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, HoverCard, IconButton, Lightbox, Popover, Token, Tooltip | aligned — uses Astryx (Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem) | aligned |
 | `packages/ui/src/daily-review-panel.tsx` | module-hub | Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem, SegmentedControl, SegmentedControlItem, Skeleton, StackItem, Text, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem) | aligned |

From 933249ee70bd4f592921ef148f824e0949bdb2c2 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Mon, 21 Sep 2026 01:43:38 +0800
Subject: [PATCH 10/33] refactor(desktop): move the queue surface into the
 conversation feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The queued-steering projection, its retract/draft-restore path, and the
plate's four entry actions all lived in app-shell.tsx, which the renderer
architecture ratchet measures: the change added a hook call, four
window.maka.sessions bridge paths, and ~300 tokens of new root debt.

useAppShellSessionUiState now owns the whole surface via
useSessionMessageQueue: it selects the active Session's Host queue
snapshot, derives the steering transcript bubbles, and runs the entry
actions through the extended ConversationServices.sessions port. Locale,
toast, and the composer handle come from the feature's own contexts, so
the shell just destructures display.queueSurface — its bridge count,
hook count, and token debt all drop below the base ledger.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 apps/desktop/renderer-architecture.json       |   6 +-
 .../app-shell-first-send-cleanup.test.ts      |  44 ++++++-
 .../main/__tests__/composer-mentions.test.ts  |   4 +
 .../__tests__/message-queue-ui-state.test.ts  |   6 +-
 .../session-reference-composer.test.ts        |  10 ++
 .../session-workspace-action-identity.test.ts |  51 ++++++-
 apps/desktop/src/renderer/app-shell.tsx       | 103 ++-------------
 .../use-app-shell-session-ui-state.ts         |  10 ++
 .../controller/use-session-message-queue.ts   | 124 ++++++++++++++++++
 .../renderer/features/conversation/ports.ts   |   4 +
 .../composer-message-queue.stories.tsx        |   4 +
 .../stories/composer-slash-menu.stories.tsx   |   4 +
 12 files changed, 263 insertions(+), 107 deletions(-)
 create mode 100644 apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index b2972dd25fb..ffa2bf2361d 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -595,7 +595,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 7,
-        "nonTriviaTokens": 2603
+        "nonTriviaTokens": 2677
       },
       "src/renderer/app-shell-session-ui-state.ts": {
         "importDeclarations": 0,
@@ -663,11 +663,7 @@
           "window.maka.sessions.compact": 1,
           "window.maka.sessions.listActiveInteractions": 1,
           "window.maka.sessions.listTurnLandmarks": 1,
-          "window.maka.sessions.promoteQueueEntry": 1,
-          "window.maka.sessions.reorderQueueEntries": 1,
-          "window.maka.sessions.retractQueueEntry": 1,
           "window.maka.sessions.subscribeActiveInteractions": 1,
-          "window.maka.sessions.updateQueueEntry": 1,
           "window.maka.settings.getClient": 1,
           "window.maka.settings.subscribeClientChanged": 1
         },
diff --git a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
index 5f12b8c8973..e38d8dcd5b1 100644
--- a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
+++ b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
@@ -38,10 +38,14 @@ import { describe, it } from 'node:test';
 import { act, createElement } from 'react';
 import type { StoredMessage } from '@maka/core/session';
 import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
-import { useAppShellSessionUiState } from '../../renderer/features/conversation/index.js';
+import {
+  ConversationServicesProvider,
+  useAppShellSessionUiState,
+  type ConversationServices,
+} from '../../renderer/features/conversation/index.js';
 import { createSessionCatalogController } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';
 
-import type { LiveTurnProjection } from '@maka/ui';
+import { LocaleProvider, ToastProvider, type LiveTurnProjection } from '@maka/ui';
 import type { DesktopTranscriptRangeController } from '../../renderer/platform/desktop/desktop-transcript-range-store.js';
 import { createAppShellChatActions } from '../../renderer/app-shell-chat-actions.js';
 import { prepareTranscriptForSend } from '../../renderer/features/conversation/testing.js';
@@ -715,6 +719,31 @@ describe('composer first-send cleanup', () => {
     const { root } = installReactRenderer();
     let publication!: ReturnType<typeof useAppShellSessionUiState>['publication'];
     const catalog = createSessionCatalogController();
+    const services: ConversationServices = {
+      listMessages: async () => [],
+      cancelMessage: async () => undefined,
+      reconcileMessage: async () => undefined,
+      subscribeChanges: () => () => undefined,
+      skills: { listInvocable: async () => [] },
+      sessions: {
+        list: async () => [],
+        readSnapshot: async () => {
+          throw new Error('Session snapshot is not used in this test');
+        },
+        subscribeChanges: () => () => undefined,
+        promoteQueueEntry: async () => undefined,
+        updateQueueEntry: async () => undefined,
+        retractQueueEntry: async () => undefined,
+        reorderQueueEntries: async () => undefined,
+      },
+      workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
+      newTasks: {
+        subscribeChanges: () => () => undefined,
+        listInvocableSkills: async () => [],
+        searchFiles: async () => ({ ok: false, reason: 'no_project' }),
+      },
+      mcp: { subscribeChanges: () => () => undefined },
+    };
     function Probe(): null {
       publication = useAppShellSessionUiState(
         catalog, undefined, deps.activeIdRef,
@@ -723,7 +752,16 @@ describe('composer first-send cleanup', () => {
       return null;
     }
     try {
-      act(() => root.render(createElement(Probe)));
+      act(() => root.render(
+        createElement(LocaleProvider, {
+          locale: 'en',
+          children: createElement(ToastProvider, {
+            children: createElement(ConversationServicesProvider, {
+              services, children: createElement(Probe),
+            }),
+          }),
+        }),
+      ));
       const actions = createAppShellChatActions({
         ...deps, transcriptRangeRef: { current: controller },
         isMessagePublished: publication.isMessagePublished,
diff --git a/apps/desktop/src/main/__tests__/composer-mentions.test.ts b/apps/desktop/src/main/__tests__/composer-mentions.test.ts
index dc652b4159b..bb5da217542 100644
--- a/apps/desktop/src/main/__tests__/composer-mentions.test.ts
+++ b/apps/desktop/src/main/__tests__/composer-mentions.test.ts
@@ -97,6 +97,10 @@ function installCatalogRenderer(t: TestContext) {
       readExecutionBoundary: async () => {
         throw new Error('Execution boundary is not used in catalog tests');
       },
+      promoteQueueEntry: async () => undefined,
+      updateQueueEntry: async () => undefined,
+      retractQueueEntry: async () => undefined,
+      reorderQueueEntries: async () => undefined,
     },
     runtimeHosts: { subscribeChanges: () => () => undefined },
     workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 1ca62badc2b..6cf4db70120 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -47,10 +47,14 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
     createElement(ConversationServicesProvider, { services: {
       listMessages: async () => messages,
       subscribeChanges: (handler) => { changed = handler; return () => {}; },
-      cancelMessage: async () => {}, reconcileMessage: async () => {},
+      cancelMessage: async (sessionId, messageId) => { cancelled.push([sessionId, messageId]); },
+      reconcileMessage: async (sessionId, messageId) => { reconciled.push([sessionId, messageId]); },
       sessions: {
+        list: async () => [], subscribeChanges: () => () => {},
         readSnapshot: async () => { throw new Error('unexpected snapshot read'); },
         readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
+        promoteQueueEntry: async () => undefined, updateQueueEntry: async () => undefined,
+        retractQueueEntry: async () => undefined, reorderQueueEntries: async () => undefined,
       },
       runtimeHosts: { subscribeChanges: () => () => {} },
       skills: { listInvocable: async () => [] },
diff --git a/apps/desktop/src/main/__tests__/session-reference-composer.test.ts b/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
index b72e62942c3..396eedecb18 100644
--- a/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
+++ b/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
@@ -57,6 +57,13 @@ const readExecutionBoundary = async () => {
   throw new Error('Execution boundary is not used in session reference tests');
 };
 
+const queueStubs = {
+  promoteQueueEntry: async () => undefined,
+  updateQueueEntry: async () => undefined,
+  retractQueueEntry: async () => undefined,
+  reorderQueueEntries: async () => undefined,
+};
+
 afterEach(async () => {
   if (root) await act(() => root?.unmount());
   root = undefined;
@@ -108,6 +115,7 @@ test('Session reference picker keeps same-Host sessions and send waits for the s
     sessions: {
       readSnapshot: async () => snapshot,
       readExecutionBoundary,
+      ...queueStubs,
     },
     skills: { listInvocable: async () => [] },
     workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
@@ -247,6 +255,7 @@ test('send resolves the selected Session snapshot at the send boundary', async (
   const services: ConversationServices = {
     ...sessionLocalServices,
     sessions: {
+      ...queueStubs,
       readSnapshot: async () => new Promise<SessionSnapshot>((resolve) => {
         reads += 1;
         queueMicrotask(() => resolve({
@@ -352,6 +361,7 @@ test('ignores a snapshot that resolves after the Composer owner changes', async
   const services: ConversationServices = {
     ...sessionLocalServices,
     sessions: {
+      ...queueStubs,
       readSnapshot: async () => new Promise<SessionSnapshot>((resolve) => {
         release = resolve;
       }),
diff --git a/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts b/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
index f4d3977038d..2ea5e71e340 100644
--- a/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
+++ b/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
@@ -20,7 +20,7 @@
 import { strict as assert } from 'node:assert';
 import { afterEach, describe, it } from 'node:test';
 import { act, createElement } from 'react';
-import { LocaleProvider } from '@maka/ui';
+import { LocaleProvider, ToastProvider } from '@maka/ui';
 import type { StoredMessage } from '@maka/core/session';
 import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
 import {
@@ -28,6 +28,10 @@ import {
   SessionCatalogContext,
 } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';
 import { useAppShellSessionWorkspace } from '../../renderer/use-app-shell-session-workspace.js';
+import {
+  ConversationServicesProvider,
+  type ConversationServices,
+} from '../../renderer/features/conversation/index.js';
 import { createDesktopTranscriptRangeController, DesktopTranscriptRangeStore } from '../../renderer/platform/desktop/desktop-transcript-range-store.js';
 import { encodeDesktopTranscriptSnapshot } from '../desktop-transcript-ipc.js';
 
@@ -54,6 +58,32 @@ function actionKeys(workspace: Workspace): string[] {
   );
 }
 
+function stubConversationServices(): ConversationServices {
+  return {
+    listMessages: async () => [],
+    cancelMessage: async () => undefined,
+    reconcileMessage: async () => undefined,
+    subscribeChanges: () => () => undefined,
+    skills: { listInvocable: async () => [] },
+    sessions: {
+      readSnapshot: async () => {
+        throw new Error('Session snapshot is not used in this test');
+      },
+      promoteQueueEntry: async () => undefined,
+      updateQueueEntry: async () => undefined,
+      retractQueueEntry: async () => undefined,
+      reorderQueueEntries: async () => undefined,
+    },
+    workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
+    newTasks: {
+      subscribeChanges: () => () => undefined,
+      listInvocableSkills: async () => [],
+      searchFiles: async () => ({ ok: false, reason: 'no_project' }),
+    },
+    mcp: { subscribeChanges: () => () => undefined },
+  };
+}
+
 describe('session workspace action identity', () => {
   afterEach(cleanupFakeDom);
 
@@ -65,6 +95,7 @@ describe('session workspace action identity', () => {
     const catalog = createSessionCatalogController();
     let workspace!: Workspace;
     const displays: Array<{ id: string | undefined; messages: StoredMessage[] }> = [];
+    const services = stubConversationServices();
     function Probe(): null {
       workspace = useAppShellSessionWorkspace({ error: () => {} });
       displays.push({ id: workspace.activeId, messages: workspace.messages });
@@ -72,8 +103,13 @@ describe('session workspace action identity', () => {
     }
     act(() => root.render(createElement(LocaleProvider, {
       locale: 'en',
-      children: createElement(SessionCatalogContext.Provider, {
-        value: catalog, children: createElement(Probe),
+      children: createElement(ToastProvider, {
+        children: createElement(ConversationServicesProvider, {
+          services,
+          children: createElement(SessionCatalogContext.Provider, {
+            value: catalog, children: createElement(Probe),
+          }),
+        }),
       }),
     })));
     act(() => workspace.seedSessions([sessionA, sessionB, sessionC].map((id) => ({
@@ -186,8 +222,13 @@ describe('session workspace action identity', () => {
       root.render(
         createElement(LocaleProvider, {
           locale: 'en',
-          children: createElement(SessionCatalogContext.Provider, {
-            value: catalog, children: createElement(Probe),
+          children: createElement(ToastProvider, {
+            children: createElement(ConversationServicesProvider, {
+              services: stubConversationServices(),
+              children: createElement(SessionCatalogContext.Provider, {
+                value: catalog, children: createElement(Probe),
+              }),
+            }),
           }),
         }),
       );
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index fb70d0bc8ed..6279426f9a6 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -67,7 +67,6 @@ import {
 } from '@maka/ui';
 import type { ConnectionEvent } from '@maka/core/connections';
 import { ChatMessageSurface } from './chat-message-surface';
-import { withQueuedSteeringTransients } from './application/contracts/transient-message-projection.js';
 import { useTaskSubmissionReadiness } from './use-task-submission-readiness';
 import { useAppShellSessionUiReads } from './use-app-shell-session-ui-reads';
 import * as Conversation from './features/conversation';
@@ -342,6 +341,7 @@ function AppShellContent({
     sharedSessionActive,
     ownerActiveId,
     switchingSession,
+    queueSurface,
   } = useAppShellSessionWorkspace(toastApi);
   // The shell's own reading of the catalog rides the membership set the list
   // hook already publishes — background row churn belongs to the rail, which
@@ -610,17 +610,9 @@ function AppShellContent({
   // recent workspace history so the home view is populated before the async
   // `app:info` round-trip completes on mount.
   const persistedComposerDefaults = loadComposerDefaults();
-  const composerRef = useRef<ComposerHandle>(null);
   const openComposerModelPicker = useCallback(() => {
     composerRef.current?.openModelPicker();
   }, []);
-  const restoreLocalMessageDraft = useCallback((sessionId: string, text: string) => {
-    const composer = composerRef.current;
-    if (!composer || activeIdRef.current !== sessionId) return;
-    if (composer.getText().trim()) composer.appendText(text);
-    else composer.setText(text);
-    composer.focus();
-  }, [activeIdRef]);
   const retractedWorkspaceReferencesRef = useRef<Record<string, InlineReference[]>>({});
   const [revisionDraft, setRevisionDraft] = useState<TurnRevisionDraft | null>(null);
   const revisionDraftRef = useRef<TurnRevisionDraft | null>(null);
@@ -674,23 +666,15 @@ function AppShellContent({
   const activeMessageQueue = activeId ? messageQueueBySession[activeId] : undefined;
   // Queued steering is a thin projection of the Host queue snapshot — the
   // bubble appears and disappears with it, no bookkeeping of our own.
-  const transcriptTransientMessages = useMemo(
-    () => withQueuedSteeringTransients(transientMessages, activeMessageQueue, {
-      locale: uiLocale,
-      retract: async (entry, draftText) => {
-        const sessionId = activeId;
-        if (!sessionId) return false;
-        try {
-          await retractQueueEntry(sessionId, entry.entryId);
-        } catch {
-          return false;
-        }
-        if (draftText !== undefined) restoreLocalMessageDraft(sessionId, draftText);
-        return true;
-      },
-    }),
-    [transientMessages, activeMessageQueue, uiLocale, activeId],
-  );
+  const {
+    composer: composerRef,
+    transientMessages: transcriptTransientMessages,
+    restoreDraft: restoreLocalMessageDraft,
+    promoteQueuedEntry,
+    updateQueuedEntry,
+    deleteQueuedEntry,
+    reorderQueuedEntries,
+  } = queueSurface;
   const activeMessageSubmitting = transientMessages.length > 0;
   const activeDesktopSession = activeSession;  // The shell's reading of the active live turn: streaming/settled flags, the
   // in-flight tool signal, and the #646 turn-wait cues, all derived from the
@@ -1645,74 +1629,7 @@ function AppShellContent({
     return ok;
   }
 
-  async function updateQueuedEntry(
-    entryId: string,
-    expectedQueueRevision: number,
-    text: string,
-  ): Promise<void> {
-    await runQueueEntryAction((sessionId) =>
-      window.maka.sessions.updateQueueEntry(sessionId, entryId, expectedQueueRevision, text)
-    );
-  }
-
-  async function deleteQueuedEntry(entryId: string): Promise<void> {
-    await runQueueEntryAction((sessionId) =>
-      window.maka.sessions.retractQueueEntry(sessionId, entryId).then(() => undefined)
-    );
-  }
 
-  // Event handlers act per observed Session, not the active one — same failure
-  // surface as the plate's queue actions.
-  async function retractQueueEntry(sessionId: string, entryId: string): Promise<void> {
-    try {
-      await window.maka.sessions.retractQueueEntry(sessionId, entryId);
-    } catch (error) {
-      if (activeIdRef.current === sessionId) {
-        const copy = getDesktopConversationCopy(uiLocale).actions;
-        showSessionError(
-          sessionId,
-          copy.operationFailedTitle,
-          localizedShellErrorMessage(error, copy.operationFailedFallback, uiLocale),
-        );
-      }
-      throw error;
-    }
-  }
-
-  // Surfaces the failure, then rethrows so the pending plate can settle its
-  // in-flight action state without guessing with a timer.
-  async function runQueueEntryAction(
-    action: (sessionId: string) => Promise<void>,
-  ): Promise<string | undefined> {
-    const sessionId = activeIdRef.current;
-    if (!sessionId) return;
-    try {
-      await action(sessionId);
-      return sessionId;
-    } catch (error) {
-      if (activeIdRef.current === sessionId) {
-        const copy = getDesktopConversationCopy(uiLocale).actions;
-        showSessionError(
-          sessionId,
-          copy.operationFailedTitle,
-          localizedShellErrorMessage(error, copy.operationFailedFallback, uiLocale),
-        );
-      }
-      throw error;
-    }
-  }
-
-  async function promoteQueuedEntry(entryId: string): Promise<void> {
-    await runQueueEntryAction((sessionId) =>
-      window.maka.sessions.promoteQueueEntry(sessionId, entryId).then(() => undefined)
-    );
-  }
-
-  async function reorderQueuedEntries(entryIds: readonly string[]): Promise<void> {
-    await runQueueEntryAction((sessionId) =>
-      window.maka.sessions.reorderQueueEntries(sessionId, entryIds).then(() => undefined)
-    );
-  }
 
   const stop = createAppShellStopAction({
     uiLocale,
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-app-shell-session-ui-state.ts b/apps/desktop/src/renderer/features/conversation/controller/use-app-shell-session-ui-state.ts
index ef6eca9a463..36ff5ea8ed5 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-app-shell-session-ui-state.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-app-shell-session-ui-state.ts
@@ -23,6 +23,8 @@ import { valuesEqual, type TransientUserMessageProjection } from '@maka/ui';
 import type { DesktopSessionSummary } from '../../../../shared/desktop-session-projection.js';
 import { currentTranscriptRange } from './transcript-reading-position.js';
 import { createAppShellSessionUiStateController, type AppShellSessionUiStateController } from '../model/session-ui-state.js';
+import { sessionUiSelectors } from '../model/session-ui-selectors.js';
+import { useSessionMessageQueue } from './use-session-message-queue.js';
 import {
   selectSessionById,
   type SessionCatalogController,
@@ -132,6 +134,13 @@ export function useAppShellSessionUiState<
     },
   }));
 
+  const messageQueueBySession = useExternalStoreSelector(controller, sessionUiSelectors.queue);
+  const messageQueueSurface = useSessionMessageQueue({
+    sessionId: view.sessionId,
+    queue: view.sessionId ? messageQueueBySession[view.sessionId] : undefined,
+    transientMessages,
+    activeSessionId: activeIdRef,
+  });
   const activeCatalogSession = useExternalStoreSelector(
     catalog,
     selectSessionById,
@@ -172,6 +181,7 @@ export function useAppShellSessionUiState<
       sharedSessionActive,
       ownerActiveId: sharedSessionActive ? undefined : activeHostSession?.id,
       switchingSession: view.sessionId !== requestedSessionId,
+      queueSurface: messageQueueSurface,
     },
   };
 }
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
new file mode 100644
index 00000000000..7cdd98e7746
--- /dev/null
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { useCallback, useMemo, useRef, type RefObject } from 'react';
+import {
+  useToast,
+  useUiLocale,
+  type ComposerHandle,
+  type TransientUserMessageProjection,
+} from '@maka/ui';
+import { withQueuedSteeringTransients } from '../../../application/contracts/transient-message-projection.js';
+import { getDesktopConversationCopy } from '../../../locales/conversation-copy.js';
+import { localizedShellErrorMessage } from '../../../locales/shell-copy.js';
+import { useConversationServices } from '../services.js';
+import type { MessageQueueUiState } from '../model/session-ui-state.js';
+
+/**
+ * The active Session's message-queue surface: the plate's entry actions, the
+ * transcript's transient layer (locally-sent messages plus one bubble per
+ * queued steering entry derived from the Host queue snapshot), and the "hand
+ * the text back to the composer" gesture both share. `sessionId` is the
+ * Session whose queue is on screen; plate actions instead resolve the Session
+ * at call time so a click always targets the queue the user is looking at.
+ */
+export function useSessionMessageQueue(options: {
+  sessionId: string | undefined;
+  queue: MessageQueueUiState | undefined;
+  transientMessages: readonly TransientUserMessageProjection[];
+  activeSessionId: RefObject<string | undefined>;
+}): {
+  composer: RefObject<ComposerHandle | null>;
+  transientMessages: TransientUserMessageProjection[];
+  restoreDraft: (sessionId: string, text: string) => void;
+  promoteQueuedEntry: (entryId: string) => Promise<void>;
+  updateQueuedEntry: (entryId: string, expectedQueueRevision: number, text: string) => Promise<void>;
+  deleteQueuedEntry: (entryId: string) => Promise<void>;
+  reorderQueuedEntries: (entryIds: readonly string[]) => Promise<void>;
+} {
+  const { sessionId, queue, transientMessages, activeSessionId } = options;
+  const services = useConversationServices();
+  const composer = useRef<ComposerHandle>(null);
+  const locale = useUiLocale();
+  const toast = useToast();
+  const reportError = useCallback(
+    (targetSessionId: string, error: unknown) => {
+      const copy = getDesktopConversationCopy(locale).actions;
+      toast.error(
+        copy.operationFailedTitle,
+        localizedShellErrorMessage(error, copy.operationFailedFallback, locale),
+        undefined,
+        { sessionId: targetSessionId },
+      );
+    },
+    [locale, toast],
+  );
+  const restoreDraft = useCallback(
+    (targetSessionId: string, text: string) => {
+      const handle = composer.current;
+      if (!handle || activeSessionId.current !== targetSessionId) return;
+      if (handle.getText().trim()) handle.appendText(text);
+      else handle.setText(text);
+      handle.focus();
+    },
+    [activeSessionId],
+  );
+  // Surfaces the failure, then rethrows so the pending plate can settle its
+  // in-flight action state without guessing with a timer.
+  const runAction = useCallback(
+    async (action: (targetSessionId: string) => Promise<void>) => {
+      const targetSessionId = activeSessionId.current;
+      if (!targetSessionId) return;
+      try {
+        await action(targetSessionId);
+      } catch (error) {
+        if (activeSessionId.current === targetSessionId) reportError(targetSessionId, error);
+        throw error;
+      }
+    },
+    [activeSessionId, reportError],
+  );
+  const merged = useMemo(
+    () => withQueuedSteeringTransients(transientMessages, queue, {
+      locale,
+      retract: async (entry, draftText) => {
+        if (!sessionId) return false;
+        try {
+          await services.sessions.retractQueueEntry(sessionId, entry.entryId);
+        } catch (error) {
+          if (activeSessionId.current === sessionId) reportError(sessionId, error);
+          return false;
+        }
+        if (draftText !== undefined) restoreDraft(sessionId, draftText);
+        return true;
+      },
+    }),
+    [sessionId, transientMessages, queue, locale, activeSessionId, services, reportError, restoreDraft],
+  );
+  return {
+    composer,
+    transientMessages: merged,
+    restoreDraft,
+    promoteQueuedEntry: (entryId) => runAction((targetSessionId) => services.sessions.promoteQueueEntry(targetSessionId, entryId)),
+    updateQueuedEntry: (entryId, expectedQueueRevision, text) =>
+      runAction((targetSessionId) => services.sessions.updateQueueEntry(targetSessionId, entryId, expectedQueueRevision, text)),
+    deleteQueuedEntry: (entryId) => runAction((targetSessionId) => services.sessions.retractQueueEntry(targetSessionId, entryId)),
+    reorderQueuedEntries: (entryIds) => runAction((targetSessionId) => services.sessions.reorderQueueEntries(targetSessionId, entryIds)),
+  };
+}
diff --git a/apps/desktop/src/renderer/features/conversation/ports.ts b/apps/desktop/src/renderer/features/conversation/ports.ts
index 31759a231f4..820edbc56f4 100644
--- a/apps/desktop/src/renderer/features/conversation/ports.ts
+++ b/apps/desktop/src/renderer/features/conversation/ports.ts
@@ -66,6 +66,10 @@ export interface ConversationServices extends Pick<
     setExecutorModelConfiguration?(sessionId: string, config: import('@maka/core/executor-catalog').ExecutorConfiguration): Promise<import('../../../shared/desktop-session-projection.js').DesktopSessionUpdateResult<DesktopSessionSummary>>;
     readSnapshot(sessionId: string, options?: { readonly maxChars?: number }): Promise<SessionSnapshot>;
     readExecutionBoundary(sessionId: string): Promise<ExecutionBoundaryReadModel>;
+    promoteQueueEntry(sessionId: string, entryId: string): Promise<void>;
+    updateQueueEntry(sessionId: string, entryId: string, expectedQueueRevision: number, text: string): Promise<void>;
+    retractQueueEntry(sessionId: string, entryId: string): Promise<void>;
+    reorderQueueEntries(sessionId: string, entryIds: readonly string[]): Promise<void>;
   };
   readonly runtimeHosts: {
     subscribeChanges(handler: (event: ConversationHostChange) => void): () => void;
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index b39fef6a0e5..7b770874f59 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -95,6 +95,10 @@ function localDeliveryServices(state: DeliveryState): ConversationServices {
       readSnapshot: async () => {
         throw new Error('Session snapshots are not used in this story');
       },
+      promoteQueueEntry: async () => undefined,
+      updateQueueEntry: async () => undefined,
+      retractQueueEntry: async () => undefined,
+      reorderQueueEntries: async () => undefined,
     },
     skills: { listInvocable: async () => [] },
     workspace: {
diff --git a/apps/desktop/stories/composer-slash-menu.stories.tsx b/apps/desktop/stories/composer-slash-menu.stories.tsx
index b8d61eef3e8..dd4b9902533 100644
--- a/apps/desktop/stories/composer-slash-menu.stories.tsx
+++ b/apps/desktop/stories/composer-slash-menu.stories.tsx
@@ -160,6 +160,10 @@ const conversationServices: ConversationServices = {
     readExecutionBoundary: async () => {
       throw new Error('Execution boundaries are not used in slash menu stories');
     },
+    promoteQueueEntry: async () => undefined,
+    updateQueueEntry: async () => undefined,
+    retractQueueEntry: async () => undefined,
+    reorderQueueEntries: async () => undefined,
   },
   runtimeHosts: { subscribeChanges: () => () => undefined },
   skills: { listInvocable: loadProjection },

From 68db1d67b70159cfb6a9205d64189a0d370aceb5 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 02:13:48 +0800
Subject: [PATCH 11/33] test(desktop): adapt queue tests to the rebased service
 port and Astryx 0.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream slimmed ConversationServices.sessions to readSnapshot plus the
queue operations, so stale list/subscribeChanges stubs no longer compile.
The queue-shortcuts copy key went away with the help icon, and Astryx 0.6.2
renders disabled buttons that carry a tooltip as aria-disabled instead of
the native attribute so the tooltip stays reachable — the assertion accepts
either form. Ledger regenerated for the new base.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../app-shell-first-send-cleanup.test.ts         |  2 --
 .../stories/composer-message-queue.stories.tsx   |  2 --
 .../__tests__/composer-message-queue.test.tsx    |  6 +++++-
 .../ui/src/__tests__/composer-shortcuts.test.tsx | 16 ++--------------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
index e38d8dcd5b1..520716409de 100644
--- a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
+++ b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
@@ -726,11 +726,9 @@ describe('composer first-send cleanup', () => {
       subscribeChanges: () => () => undefined,
       skills: { listInvocable: async () => [] },
       sessions: {
-        list: async () => [],
         readSnapshot: async () => {
           throw new Error('Session snapshot is not used in this test');
         },
-        subscribeChanges: () => () => undefined,
         promoteQueueEntry: async () => undefined,
         updateQueueEntry: async () => undefined,
         retractQueueEntry: async () => undefined,
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 7b770874f59..5a9b26c0fef 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -90,8 +90,6 @@ function localDeliveryServices(state: DeliveryState): ConversationServices {
     reconcileMessage: async () => undefined,
     subscribeChanges: () => () => undefined,
     sessions: {
-      list: async () => [],
-      subscribeChanges: () => () => undefined,
       readSnapshot: async () => {
         throw new Error('Session snapshots are not used in this story');
       },
diff --git a/packages/ui/src/__tests__/composer-message-queue.test.tsx b/packages/ui/src/__tests__/composer-message-queue.test.tsx
index f6f4dfd7144..d99f3c1c54e 100644
--- a/packages/ui/src/__tests__/composer-message-queue.test.tsx
+++ b/packages/ui/src/__tests__/composer-message-queue.test.tsx
@@ -171,7 +171,11 @@ test('queue actions stay disabled until the entry is Host-admitted', async () =>
       (button) => (button.getAttribute('aria-label') ?? button.textContent) === copy.editQueuedEntry,
     );
     assert.equal(edits.length, 2);
-    assert.ok(edits.every((button) => button.disabled), 'no row is editable without a queue revision');
+    // Buttons carrying a tooltip render aria-disabled instead of the native
+    // attribute so the tooltip stays reachable — accept either form.
+    const isDisabled = (button: HTMLButtonElement) =>
+      button.disabled || button.getAttribute('aria-disabled') === 'true';
+    assert.ok(edits.every(isDisabled), 'no row is editable without a queue revision');
   } finally {
     await view.close();
   }
diff --git a/packages/ui/src/__tests__/composer-shortcuts.test.tsx b/packages/ui/src/__tests__/composer-shortcuts.test.tsx
index 9008379eb88..711b5f82d17 100644
--- a/packages/ui/src/__tests__/composer-shortcuts.test.tsx
+++ b/packages/ui/src/__tests__/composer-shortcuts.test.tsx
@@ -21,12 +21,11 @@ import assert from 'node:assert/strict';
 import { afterEach, test } from 'node:test';
 import { act, createRef } from 'react';
 import { createRoot } from 'react-dom/client';
-import { renderToStaticMarkup } from 'react-dom/server';
+
 import { parseHTML } from 'linkedom';
 import { Composer, type ComposerHandle, type ComposerSendMetadata } from '../composer.js';
 import { LocaleProvider } from '../locale-context.js';
-import { getConversationCopy } from '../conversation-copy.js';
-import { PlatformShortcutText } from '../platform-shortcut-text.js';
+
 
 const originalNavigator = Object.getOwnPropertyDescriptor(globalThis, 'navigator');
 const originalGlobals = {
@@ -180,14 +179,3 @@ test('steering supports staged context and coalesces repeated keys while admissi
   assert.deepEqual(calls, [{ followUpMode: 'steer' }]);
   await act(async () => finish(true));
 });
-
-for (const locale of ['en', 'zh-CN', 'zh-TW'] as const) {
-  for (const [platform, modifier] of [['MacIntel', 'Cmd'], ['Win32', 'Ctrl']] as const) {
-    test(`${locale}: queue help renders ${modifier}+Enter on ${platform}`, () => {
-      Object.defineProperty(globalThis, 'navigator', { configurable: true, value: { platform } });
-      const markup = renderToStaticMarkup(<PlatformShortcutText {...getConversationCopy(locale).composer.queueShortcuts} />);
-      assert.ok(markup.startsWith(`${modifier}+Enter`));
-      assert.ok(markup.includes('Shift+Enter'));
-    });
-  }
-}

From 70540eaf9aceea433bcb91827296bd337353bef6 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 03:12:48 +0800
Subject: [PATCH 12/33] fix(desktop): restore full queued-message content on
 edit, keyed to its Session
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Editing a queued steering entry retracted the Host copy but handed only
plain text back to the composer — attachments, directory references, and
quotes were silently dropped. The restore was also gated on the owning
Session still being active, so a retract that resolved after the user
navigated away discarded the recovered draft entirely.

The retract callback now carries a RestoredDraftContent (editable text plus
the staged context that rode with the send) and writes through the keyed
draft store, so the draft lands under the owning Session even when another
is on screen; the visible composer only updates and focuses when that
Session is still active. Each surface wires its own staged stores: the
shell restores attachments, directory references, and quotes; Side Chat
re-stages quotes through the workbar panel; WorkHub restores attachments
under its scoped draft keys. WorkHub and Side Chat never stage directories
or quotes respectively, so nothing there is lost.

Pins the transcript/plate split on both seams: a queued follow-up never
becomes a transcript bubble, and projectComposerMessageQueue drops
current_turn entries. Removes a trailing blank line in composer.css.

Generated-by: Devin
---
 .../__tests__/composer-directories.test.ts    | 10 +++
 .../__tests__/message-queue-ui-state.test.ts  | 86 ++++++++++++++++++-
 .../transient-message-projection.test.ts      | 11 ++-
 apps/desktop/src/renderer/app-shell.tsx       | 10 +++
 .../contracts/transient-message-projection.ts | 20 ++++-
 .../controller/session-local-messages.tsx     | 12 ++-
 .../controller/use-session-message-queue.ts   | 53 +++++++++---
 .../renderer/features/conversation/index.ts   |  1 +
 .../controller/use-workbar-controller.ts      | 11 +++
 .../tools/side-chat/quote-companion-panel.tsx | 14 ++-
 .../tools/side-chat/use-quote-companion.ts    | 14 ++-
 .../features/workbar/ui/workbar-host.tsx      |  3 +
 .../features/workbar/ui/workbar-surface.tsx   |  3 +
 .../controller/use-workhub-controller.ts      | 16 +++-
 .../features/workhub/ui/workhub-composer.tsx  | 43 +++++++++-
 .../features/workhub/ui/workhub-root.tsx      | 14 +--
 .../composer-message-queue.stories.tsx        |  4 +-
 .../__tests__/composer-message-queue.test.tsx | 18 ++++
 packages/ui/src/use-composer-attachments.ts   | 20 +++++
 19 files changed, 318 insertions(+), 45 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/composer-directories.test.ts b/apps/desktop/src/main/__tests__/composer-directories.test.ts
index f3b093de2c5..f7272a52109 100644
--- a/apps/desktop/src/main/__tests__/composer-directories.test.ts
+++ b/apps/desktop/src/main/__tests__/composer-directories.test.ts
@@ -143,3 +143,13 @@ test('IPC validates directory references without turning them into attachments o
     }), /Invalid directory references/);
   }
 });
+
+test('restoreDirectories stages references under another draft for a later visit', async () => {
+  const probe = await mount();
+  await act(() => probe.state().restoreDirectories('draft-b', [reference]));
+  assert.deepEqual(probe.state().pendingDirectories, [], 'draft-a stays untouched');
+  await probe.render({ draftKey: 'draft-b' });
+  assert.deepEqual(probe.state().pendingDirectories, [reference]);
+  await act(() => probe.state().restoreDirectories('draft-b', [reference, reference]));
+  assert.deepEqual(probe.state().pendingDirectories, [reference], 'duplicates stay out');
+});
diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 6cf4db70120..80b0e0e3704 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -20,8 +20,14 @@
 import assert from 'node:assert/strict';
 import { afterEach, test } from 'node:test';
 import { act, createElement } from 'react';
-import { LocaleProvider, type TransientUserMessageProjection } from '@maka/ui';
-import { ConversationServicesProvider, SessionLocalMessages } from '../../renderer/features/conversation/index.js';
+import {
+  LocaleProvider,
+  ToastProvider,
+  type ComposerHandle,
+  type TransientUserMessageProjection,
+} from '@maka/ui';
+import { ConversationServicesProvider, SessionLocalMessages, useSessionMessageQueue } from '../../renderer/features/conversation/index.js';
+import type { RestoredDraftContent } from '../../renderer/application/contracts/transient-message-projection.js';
 import type { DesktopLocalMessage } from '../../shared/session-local-contract.js';
 import { mergeTransientMessageProjection } from '../../renderer/application/contracts/transient-message-projection.js';
 import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
@@ -69,7 +75,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       },
       retire: (_id, messageId) => { transient.delete(messageId); },
       reportError: (message) => { throw new Error(message); },
-      restoreDraft: (sessionId, text) => { restored.push([sessionId, text]); },
+      restoreDraft: (sessionId, draft) => { restored.push([sessionId, draft.text]); },
     }) }),
   })));
   const steering = transient.get('steering');
@@ -372,3 +378,77 @@ test('complete events deliver the durable context compaction outcome to Desktop'
     },
   ]);
 });
+
+test('editing a queued steering restores content under the owning Session even after navigation', async () => {
+  const { root } = installReactRenderer();
+  const entry = {
+    entryId: 'entry-1', messageId: 'message-1',
+    placement: 'current_turn' as const, state: 'queued' as const,
+    content: {
+      text: 'steer it',
+      attachments: [{
+        kind: 'other' as const, name: 'a.png', mimeType: 'image/png', bytes: 1,
+        ref: { kind: 'external_file' as const, absolutePath: '/tmp/a.png' },
+      }],
+      quotes: [{ text: 'quoted' }],
+    },
+  };
+  const retracted: string[][] = [];
+  const restoredDrafts: [string, string][] = [];
+  const restoredContext: [string, RestoredDraftContent][] = [];
+  // The user navigated to another Session before the retract resolves.
+  const activeSessionId = { current: 'session-b' as string | undefined };
+  let surface!: ReturnType<typeof useSessionMessageQueue>;
+  function Probe() {
+    surface = useSessionMessageQueue({
+      sessionId: 'session-a',
+      queue: { entries: [entry], turnId: 'turn-1', ts: 1, queueRevision: 2 },
+      transientMessages: [],
+      activeSessionId,
+    });
+    return null;
+  }
+  await act(async () => root.render(createElement(LocaleProvider, { locale: 'en', children:
+    createElement(ToastProvider, { children:
+      createElement(ConversationServicesProvider, { services: {
+        listMessages: async () => [],
+        subscribeChanges: () => () => {},
+        cancelMessage: async () => {},
+        reconcileMessage: async () => {},
+        sessions: {
+          readSnapshot: async () => { throw new Error('unexpected snapshot read'); },
+          promoteQueueEntry: async () => undefined,
+          updateQueueEntry: async () => undefined,
+          retractQueueEntry: async (sessionId: string, entryId: string) => {
+            retracted.push([sessionId, entryId]);
+          },
+          reorderQueueEntries: async () => undefined,
+        },
+        skills: { listInvocable: async () => [] },
+        workspace: { searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
+        newTasks: { subscribeChanges: () => () => {}, listInvocableSkills: async () => [], searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
+        mcp: { subscribeChanges: () => () => {} },
+      }, children: createElement(Probe) }) })})));
+  surface.composer.current = {
+    setText() {}, appendText() {}, getText: () => '', clearDraft() {},
+    setDraft: (key, text) => { restoredDrafts.push([key, text]); },
+    getDraft: () => '',
+    appendDraft: (key, text) => { restoredDrafts.push([key, text]); },
+    focus() {}, openModelPicker() {},
+  } as ComposerHandle;
+  surface.draftContextRestorer.current = (sessionId, draft) => { restoredContext.push([sessionId, draft]); };
+  const bubble = surface.transientMessages.find((message) => message.pendingSteering);
+  assert.ok(bubble, 'a queued steering entry derives a transcript bubble');
+  const edit = bubble.deliveryActions?.find((action) => action.label === 'Edit');
+  assert.ok(edit, 'the bubble offers edit');
+  await act(async () => { await edit.onClick(); });
+  assert.deepEqual(retracted, [['session-a', 'entry-1']]);
+  assert.equal(restoredContext.length, 1);
+  assert.equal(restoredContext[0]![0], 'session-a');
+  assert.equal(restoredContext[0]![1].attachments, entry.content.attachments,
+    'attachments ride back into the draft');
+  assert.equal(restoredContext[0]![1].quotes, entry.content.quotes,
+    'quotes ride back into the draft');
+  assert.deepEqual(restoredDrafts, [['session-a', 'steer it']],
+    'the draft lands under the owning Session even while another is active');
+});
diff --git a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
index 51af5c71326..0af1f19eec7 100644
--- a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
+++ b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
@@ -170,7 +170,14 @@ test('queued steering derives a transcript bubble that lives and dies with the s
     placement: 'current_turn' as const,
     state: 'queued' as const,
   };
-  const queue = { turnId: 'turn-1', ts: 7, entries: [queueEntry] };
+  const followupEntry = {
+    entryId: 'next',
+    messageId: 'message-next',
+    content: { text: 'follow up' },
+    placement: 'next_turn' as const,
+    state: 'queued' as const,
+  };
+  const queue = { turnId: 'turn-1', ts: 7, entries: [queueEntry, followupEntry] };
   const retracted: (string | undefined)[][] = [];
   const actions = {
     locale: 'en' as const,
@@ -184,7 +191,7 @@ test('queued steering derives a transcript bubble that lives and dies with the s
   const derived = withQueuedSteeringTransients([transient, localCopy], queue, actions);
 
   assert.deepEqual(derived.map((message) => message.id), ['message-1', 'message-steer'],
-    'the queue-owned bubble replaces its stored local copy');
+    'the queue-owned bubble replaces its stored local copy, and a queued follow-up stays out of the transcript');
   const bubble = derived.at(-1);
   assert.equal(bubble?.pendingSteering, true);
   assert.equal(bubble?.hostTurnId, 'turn-1');
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 6279426f9a6..b5224ff0234 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -395,6 +395,7 @@ function AppShellContent({
     pickAttachments,
     attachFilePaths,
     restoreAttachments,
+    restoreDirectories,
     removeAttachment,
     clearSubmittedContext,
     imageNoticeLifecycle,
@@ -670,11 +671,20 @@ function AppShellContent({
     composer: composerRef,
     transientMessages: transcriptTransientMessages,
     restoreDraft: restoreLocalMessageDraft,
+    draftContextRestorer,
     promoteQueuedEntry,
     updateQueuedEntry,
     deleteQueuedEntry,
     reorderQueuedEntries,
   } = queueSurface;
+  // A retracted send hands its staged context back through the same keyed
+  // stores a picked file or quote would land in — keyed by Session, so the
+  // restore survives the owning Session navigating away mid-request.
+  draftContextRestorer.current = (targetSessionId, draft) => {
+    if (draft.attachments?.length) restoreAttachments(targetSessionId, draft.attachments);
+    if (draft.directoryReferences?.length) restoreDirectories(targetSessionId, draft.directoryReferences);
+    if (draft.quotes?.length) restoreQuotes(targetSessionId, draft.quotes);
+  };
   const activeMessageSubmitting = transientMessages.length > 0;
   const activeDesktopSession = activeSession;  // The shell's reading of the active live turn: streaming/settled flags, the
   // in-flight tool signal, and the #646 turn-wait cues, all derived from the
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 28a32b2addd..5a52a94db47 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -18,7 +18,12 @@
  */
 
 import { createElement } from 'react';
-import type { MessageQueueEntryProjection } from '@maka/core/events';
+import type {
+  AttachmentRef,
+  DirectoryReference,
+  MessageQueueEntryProjection,
+  QuoteRef,
+} from '@maka/core/events';
 import type { StoredMessage } from '@maka/core/session';
 import type { UiLocale } from '@maka/core/ui-locale';
 import { getConversationCopy, type TransientUserMessageProjection } from '@maka/ui';
@@ -26,6 +31,19 @@ import { ICON_SIZE, Pencil, Trash2 } from '@maka/ui/icons';
 
 type TransientUserMessage = TransientUserMessageProjection;
 
+/**
+ * What a retracted send hands back to the composer: the editable text plus
+ * the staged context (attachments, directory references, quotes) that rode
+ * with it. `text` is the editable serialization — `displayText` when the
+ * content carries a separate model-facing `text`.
+ */
+export interface RestoredDraftContent {
+  text: string;
+  attachments?: readonly AttachmentRef[];
+  directoryReferences?: readonly DirectoryReference[];
+  quotes?: readonly QuoteRef[];
+}
+
 /**
  * Edit/delete controls for steering the Host queued but has not consumed.
  * Both retract the queue entry; edit also hands the text back to the caller's
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index 9e3c83419fc..9bf0b668702 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -21,6 +21,7 @@ import { useEffect } from 'react';
 import { useUiLocale, type TransientUserMessageProjection } from '@maka/ui';
 import { ICON_SIZE, Pencil, Search, Trash2 } from '@maka/ui/icons';
 import { getSessionLocalCopy } from '../../../locales/session-local-copy.js';
+import type { RestoredDraftContent } from '../../../application/contracts/transient-message-projection.js';
 import { useConversationServices } from '../services.js';
 
 export function SessionLocalMessages(props: {
@@ -28,8 +29,8 @@ export function SessionLocalMessages(props: {
   readonly publish: (sessionId: string, message: TransientUserMessageProjection) => void;
   readonly retire: (sessionId: string, messageId: string) => void;
   readonly reportError: (message: string) => void;
-  /** Puts a never-dispatched message's text back into the composer for editing. */
-  readonly restoreDraft?: (sessionId: string, text: string) => void;
+  /** Puts a never-dispatched message's content back into the composer for editing. */
+  readonly restoreDraft?: (sessionId: string, draft: RestoredDraftContent) => void;
 }): null {
   const services = useConversationServices();
   const locale = useUiLocale();
@@ -97,7 +98,12 @@ export function SessionLocalMessages(props: {
                             onClick: action(async () => {
                               await services.cancelMessage(sessionId, message.messageId);
                               retire(sessionId, message.messageId);
-                              restoreDraft(sessionId, message.text);
+                              restoreDraft(sessionId, {
+                                text: message.text,
+                                attachments: message.attachments,
+                                directoryReferences: message.directoryReferences,
+                                quotes: message.quotes,
+                              });
                             }),
                           }]
                         : []),
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index 7cdd98e7746..259bfe830a9 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -19,12 +19,16 @@
 
 import { useCallback, useMemo, useRef, type RefObject } from 'react';
 import {
+  appendPromptContextDraft,
   useToast,
   useUiLocale,
   type ComposerHandle,
   type TransientUserMessageProjection,
 } from '@maka/ui';
-import { withQueuedSteeringTransients } from '../../../application/contracts/transient-message-projection.js';
+import {
+  withQueuedSteeringTransients,
+  type RestoredDraftContent,
+} from '../../../application/contracts/transient-message-projection.js';
 import { getDesktopConversationCopy } from '../../../locales/conversation-copy.js';
 import { localizedShellErrorMessage } from '../../../locales/shell-copy.js';
 import { useConversationServices } from '../services.js';
@@ -46,7 +50,15 @@ export function useSessionMessageQueue(options: {
 }): {
   composer: RefObject<ComposerHandle | null>;
   transientMessages: TransientUserMessageProjection[];
-  restoreDraft: (sessionId: string, text: string) => void;
+  restoreDraft: (sessionId: string, draft: RestoredDraftContent) => void;
+  /**
+   * Staged-context restorer slot: the shell owns the attachments/quotes stores
+   * and fills this once, so a retract can hand the entry's context back even
+   * after the owning Session navigated away.
+   */
+  draftContextRestorer: RefObject<
+    ((sessionId: string, draft: RestoredDraftContent) => void) | undefined
+  >;
   promoteQueuedEntry: (entryId: string) => Promise<void>;
   updateQueuedEntry: (entryId: string, expectedQueueRevision: number, text: string) => Promise<void>;
   deleteQueuedEntry: (entryId: string) => Promise<void>;
@@ -55,6 +67,7 @@ export function useSessionMessageQueue(options: {
   const { sessionId, queue, transientMessages, activeSessionId } = options;
   const services = useConversationServices();
   const composer = useRef<ComposerHandle>(null);
+  const draftContextRestorer = useRef<((sessionId: string, draft: RestoredDraftContent) => void) | undefined>(undefined);
   const locale = useUiLocale();
   const toast = useToast();
   const reportError = useCallback(
@@ -69,16 +82,22 @@ export function useSessionMessageQueue(options: {
     },
     [locale, toast],
   );
-  const restoreDraft = useCallback(
-    (targetSessionId: string, text: string) => {
-      const handle = composer.current;
-      if (!handle || activeSessionId.current !== targetSessionId) return;
-      if (handle.getText().trim()) handle.appendText(text);
-      else handle.setText(text);
-      handle.focus();
-    },
-    [activeSessionId],
-  );
+  // The draft store is keyed, so a restore lands under the retracted Session's
+  // key even after navigation — the composer focuses only when it is still
+  // showing that Session (setDraft/appendDraft guard on the active key).
+  const restoreDraft = useCallback((targetSessionId: string, draft: RestoredDraftContent) => {
+    draftContextRestorer.current?.(targetSessionId, draft);
+    const handle = composer.current;
+    if (!handle || !draft.text.trim()) return;
+    if (handle.appendDraft) {
+      handle.appendDraft(targetSessionId, draft.text);
+    } else {
+      handle.setDraft(
+        targetSessionId,
+        appendPromptContextDraft(handle.getDraft(targetSessionId), draft.text),
+      );
+    }
+  }, []);
   // Surfaces the failure, then rethrows so the pending plate can settle its
   // in-flight action state without guessing with a timer.
   const runAction = useCallback(
@@ -105,7 +124,14 @@ export function useSessionMessageQueue(options: {
           if (activeSessionId.current === sessionId) reportError(sessionId, error);
           return false;
         }
-        if (draftText !== undefined) restoreDraft(sessionId, draftText);
+        if (draftText !== undefined) {
+          restoreDraft(sessionId, {
+            text: draftText,
+            attachments: entry.content.attachments,
+            directoryReferences: entry.content.directoryReferences,
+            quotes: entry.content.quotes,
+          });
+        }
         return true;
       },
     }),
@@ -115,6 +141,7 @@ export function useSessionMessageQueue(options: {
     composer,
     transientMessages: merged,
     restoreDraft,
+    draftContextRestorer,
     promoteQueuedEntry: (entryId) => runAction((targetSessionId) => services.sessions.promoteQueueEntry(targetSessionId, entryId)),
     updateQueuedEntry: (entryId, expectedQueueRevision, text) =>
       runAction((targetSessionId) => services.sessions.updateQueueEntry(targetSessionId, entryId, expectedQueueRevision, text)),
diff --git a/apps/desktop/src/renderer/features/conversation/index.ts b/apps/desktop/src/renderer/features/conversation/index.ts
index 8d9716e54f7..b6736825f85 100644
--- a/apps/desktop/src/renderer/features/conversation/index.ts
+++ b/apps/desktop/src/renderer/features/conversation/index.ts
@@ -63,6 +63,7 @@ export { desktopSlashCommandPresentation } from './model/slash-command-presentat
 export { useComposerQuotes } from './controller/use-composer-quotes.js';
 export { useActiveExecutionBoundary } from './controller/use-active-execution-boundary.js';
 export { useSessionReferenceComposer } from './controller/use-session-reference-composer.js';
+export { useSessionMessageQueue } from './controller/use-session-message-queue.js';
 export {
   ComposerMentionsProvider,
   useComposerMentionsContext,
diff --git a/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts b/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
index baa68082658..9fe1b519c9f 100644
--- a/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
+++ b/apps/desktop/src/renderer/features/workbar/controller/use-workbar-controller.ts
@@ -965,6 +965,17 @@ export function useWorkbarController(
         sideConversations.updatePanel(snapshot.panelId, (panel) =>
           consumeCompanionQuoteSnapshot(panel, snapshot) ?? panel,
         ),
+      onRestoreQuotes: (panelId, quotes) =>
+        sideConversations.updatePanel(panelId, (panel) =>
+          quotes.reduce(
+            (current, quote) => stageCompanionQuote(current, {
+              sourceSessionId: panel.sourceSessionId,
+              quote,
+              newId: () => crypto.randomUUID(),
+            }),
+            panel,
+          ),
+        ),
       onRemoveQuote: (target) =>
         sideConversations.updatePanel(target.panelId, (panel) =>
           removeStagedCompanionQuote(panel, target) ?? panel,
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
index a901746f59c..7dd5314c816 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
@@ -33,6 +33,7 @@ import {
   type ComposerHandle,
 } from '@maka/ui';
 import type { SessionSummary } from '@maka/core/session';
+import type { QuoteRef } from '@maka/core/events';
 import { generalizedErrorMessageForLocale } from '@maka/core/redaction';
 import { useQuoteCompanion } from './use-quote-companion';
 import { useComposerAttachments } from '@maka/ui/use-composer-attachments';
@@ -77,6 +78,8 @@ export function QuoteCompanionPanel(props: {
   modelChoices: readonly ChatModelChoice[];
   confirmBypass: () => Promise<boolean>;
   onQuotesConsumed: (snapshot: CompanionQuoteSnapshot) => void;
+  /** Re-stages quotes a retracted send carried, so an edit restores them. */
+  onRestoreQuotes?: (panelId: string, quotes: readonly QuoteRef[]) => void;
   onRemoveQuote?: (target: CompanionQuoteTarget) => void;
   onForkVisibilityChange?: (event: CompanionForkVisibilityEvent) => void;
   onContentStateChange?: (panelId: string, hasContent: boolean) => void;
@@ -112,6 +115,7 @@ export function QuoteCompanionPanel(props: {
     pendingAttachments,
     pickAttachments,
     attachFilePaths,
+    restoreAttachments,
     removeAttachment,
     clearSubmittedAttachments,
   } = useComposerAttachments({
@@ -165,11 +169,13 @@ export function QuoteCompanionPanel(props: {
         { sessionId },
       );
     },
-    restoreDraft: (_sessionId, text) => {
+    restoreDraft: (_sessionId, draft) => {
+      if (draft.attachments?.length) restoreAttachments(draftKey, draft.attachments);
+      if (draft.quotes?.length) props.onRestoreQuotes?.(props.panelId, draft.quotes);
       const input = composerRef.current;
-      if (!input) return;
-      if (input.getText().trim()) input.appendText(text);
-      else input.setText(text);
+      if (!input || !draft.text.trim()) return;
+      if (input.getText().trim()) input.appendText(draft.text);
+      else input.setText(draft.text);
       input.focus();
     },
   });
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index 298d152c5e8..2b363334b19 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -78,6 +78,7 @@ import {
   mergeTransientMessageProjection,
   reconcileTransientMessages,
   withQueuedSteeringTransients,
+  type RestoredDraftContent,
 } from '../../../../application/contracts/transient-message-projection.js';
 import { getDesktopConversationCopy } from '../../../../application/contracts/conversation-copy.js';
 import {
@@ -160,8 +161,8 @@ export interface UseQuoteCompanionInput {
     outcome: ContextCompactionOutcome,
   ) => void;
   onContextCompactionError?: (sessionId: string, error: unknown) => void;
-  /** Returns a retracted message's text to the composer draft for editing. */
-  restoreDraft?: (sessionId: string, text: string) => void;
+  /** Returns a retracted message's content to the composer draft for editing. */
+  restoreDraft?: (sessionId: string, draft: RestoredDraftContent) => void;
 }
 
 export async function requestPermissionModeWithConfirmation(
@@ -1740,7 +1741,14 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
         if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
         return false;
       }
-      if (draftText !== undefined) restoreDraftRef.current?.(forkId, draftText);
+      if (draftText !== undefined) {
+        restoreDraftRef.current?.(forkId, {
+          text: draftText,
+          attachments: entry.content.attachments,
+          directoryReferences: entry.content.directoryReferences,
+          quotes: entry.content.quotes,
+        });
+      }
       return true;
     },
   });
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
index 40f0d87586e..8f16084328b 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -40,6 +40,7 @@ import type {
   SessionWorkbarTab,
   SessionWorkbarTabKind,
 } from '../model/workbar-tabs';
+import type { QuoteRef } from '@maka/core/events';
 import type {
   CompanionQuoteTarget,
   CompanionQuoteSnapshot,
@@ -112,6 +113,7 @@ export interface WorkbarHostModel {
   bottomResizable: ResizableProps;
   quotes?: readonly QuoteCompanionPanelState[];
   onQuotesConsumed?: (snapshot: CompanionQuoteSnapshot) => void;
+  onRestoreQuotes?: (panelId: string, quotes: readonly QuoteRef[]) => void;
   onRemoveQuote?: (target: CompanionQuoteTarget) => void;
   onForkVisibilityChange?: (event: CompanionForkVisibilityEvent) => void;
   onContentStateChange?: (panelId: string, hasContent: boolean) => void;
@@ -237,6 +239,7 @@ export function WorkbarHostView({ model: props, togglePosition = 'edge' }: { mod
               onRequestOpenTab={props.onRequestOpenTab}
               quotes={props.quotes}
               onQuotesConsumed={props.onQuotesConsumed}
+              onRestoreQuotes={props.onRestoreQuotes}
               onRemoveQuote={props.onRemoveQuote}
               onForkVisibilityChange={props.onForkVisibilityChange}
               onContentStateChange={props.onContentStateChange}
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
index 80782d998b7..b68f3f3703e 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
@@ -66,6 +66,7 @@ import { WorkbarEdgeToggle } from '../../../application/contracts/workbar-edge-t
 import { WorkBoardPanel } from '../../../work-board-panel.js';
 import { getShellCopy } from '../../../locales/shell-copy.js';
 import { getDesktopConversationCopy } from '../../../application/contracts/conversation-copy.js';
+import type { QuoteRef } from '@maka/core/events';
 import type {
   CompanionQuoteTarget,
   CompanionQuoteSnapshot,
@@ -406,6 +407,7 @@ export function WorkbarSurface(props: {
   ) => void;
   quotes?: readonly QuoteCompanionPanelState[];
   onQuotesConsumed?: (snapshot: CompanionQuoteSnapshot) => void;
+  onRestoreQuotes?: (panelId: string, quotes: readonly QuoteRef[]) => void;
   onRemoveQuote?: (target: CompanionQuoteTarget) => void;
   onForkVisibilityChange?: (event: CompanionForkVisibilityEvent) => void;
   onContentStateChange?: (panelId: string, hasContent: boolean) => void;
@@ -613,6 +615,7 @@ export function WorkbarSurface(props: {
                 modelChoices={props.modelChoices ?? []}
                 confirmBypass={props.confirmBypass}
                 onQuotesConsumed={props.onQuotesConsumed ?? (() => {})}
+                onRestoreQuotes={props.onRestoreQuotes}
                 onRemoveQuote={props.onRemoveQuote}
                 onForkVisibilityChange={props.onForkVisibilityChange}
                 onContentStateChange={props.onContentStateChange}
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index 5e5438da688..6b136f3598d 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -19,7 +19,10 @@
 
 import { activeHostTurn, chatTurnActivity, type SessionExecutionProjection } from '../../../application/contracts/session-execution.js';
 import { deriveMessageQueueProjection } from '../../../application/contracts/message-queue-projection.js';
-import { withQueuedSteeringTransients } from '../../../application/contracts/transient-message-projection.js';
+import {
+  withQueuedSteeringTransients,
+  type RestoredDraftContent,
+} from '../../../application/contracts/transient-message-projection.js';
 import { useEffect, useRef, useState } from 'react';
 import {
   applyLiveTurnBufferEvent,
@@ -65,7 +68,7 @@ interface MessagePresentation {
 }
 export function useWorkHubController(
   onSubmit?: () => void,
-  restoreDraft?: (sessionId: string, text: string) => void,
+  restoreDraft?: (sessionId: string, draft: RestoredDraftContent) => void,
 ) {
   const services = useWorkHubServices();
   const locale = useUiLocale();
@@ -706,7 +709,14 @@ export function useWorkHubController(
         if (!sessionId) return false;
         try { await services.retractQueueEntry(sessionId, entry.entryId); }
         catch (reason) { report(reason); return false; }
-        if (draftText !== undefined) restoreDraftRef.current?.(sessionId, draftText);
+        if (draftText !== undefined) {
+          restoreDraftRef.current?.(sessionId, {
+            text: draftText,
+            attachments: entry.content.attachments,
+            directoryReferences: entry.content.directoryReferences,
+            quotes: entry.content.quotes,
+          });
+        }
         return true;
       },
     }),
diff --git a/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx b/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
index 0863fdfed07..7c5dd6df954 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
@@ -17,25 +17,41 @@
  * under the License.
  */
 
-import { forwardRef, useRef, useState } from 'react';
-import { Composer, useToast, useUiLocale, type ComposerHandle, type ComposerProps } from '@maka/ui';
+import { forwardRef, useRef, useState, type MutableRefObject } from 'react';
+import {
+  appendPromptContextDraft,
+  Composer,
+  useToast,
+  useUiLocale,
+  type ComposerHandle,
+  type ComposerProps,
+} from '@maka/ui';
 import { useComposerAttachments } from '@maka/ui/use-composer-attachments';
 import { toComposerIngestItems } from '@maka/ui/composer-attachments';
 import { MAX_ATTACHMENT_BYTES, MAX_ATTACHMENT_COUNT } from '@maka/core/attachments';
 import type { AttachmentRef, FollowUpMode } from '@maka/core/events';
 import { getDesktopConversationCopy } from '../../../application/contracts/conversation-copy.js';
 import { localizedShellErrorMessage } from '../../../locales/shell-copy.js';
+import type { RestoredDraftContent } from '../../../application/contracts/transient-message-projection.js';
 import { useWorkHubServices } from '../services.js';
 import { workHubLiveCopy } from '../locales/workhub-live-copy.js';
 
 export type WorkHubComposerProps = Omit<ComposerProps, 'onSend' | 'draftKey'> & {
   sessionId?: string;
   onSend(text: string, attachments: AttachmentRef[], followUpMode?: FollowUpMode): Promise<boolean>;
+  /**
+   * Filled with a restorer that writes a retracted send's content back under
+   * the owning Session's draft scope — correct even when that Session is not
+   * the one on screen.
+   */
+  draftRestore?: MutableRefObject<
+    ((sessionId: string, draft: RestoredDraftContent) => void) | undefined
+  >;
 };
 
 /** The shared Composer and attachment lifecycle belong to the persistent coordination Session. */
 export const WorkHubComposer = forwardRef<ComposerHandle, WorkHubComposerProps>(function WorkHubComposer(
-  { sessionId, onSend, ...composer }, ref,
+  { sessionId, onSend, draftRestore, ...composer }, ref,
 ) {
   const services = useWorkHubServices();
   const locale = useUiLocale();
@@ -60,8 +76,27 @@ export const WorkHubComposer = forwardRef<ComposerHandle, WorkHubComposerProps>(
     formatError: (error, fallback) => localizedShellErrorMessage(error, fallback, locale),
   });
   const uploaded = useRef(new Map<string, AttachmentRef>());
+  const self = useRef<ComposerHandle | null>(null);
+  if (draftRestore) {
+    draftRestore.current = (targetSessionId, draft) => {
+      // The first-seen Session's draft permanently lives under the 'initial'
+      // scope; later Sessions are keyed by id.
+      const key = targetSessionId === draftOwner.current.first
+        ? 'workhub:initial'
+        : `workhub:${targetSessionId}`;
+      if (draft.attachments?.length) staged.restoreAttachments(key, draft.attachments);
+      const handle = self.current;
+      if (!handle || !draft.text.trim()) return;
+      if (handle.appendDraft) handle.appendDraft(key, draft.text);
+      else handle.setDraft(key, appendPromptContextDraft(handle.getDraft(key), draft.text));
+    };
+  }
   return <Composer {...composer}
-    ref={ref}
+    ref={(handle) => {
+      self.current = handle;
+      if (typeof ref === 'function') ref(handle);
+      else if (ref) ref.current = handle;
+    }}
     draftKey={scope}
     sendBlocked={composer.sendBlocked || submitting || !sessionId}
     allowAttachmentOnlySend
diff --git a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
index ce1a203be04..b28d1921790 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
@@ -25,6 +25,7 @@ import { useLiveContextUsage } from '../../../application/contracts/session-insp
 import { selectLatestRequestUsage } from '../../../application/contracts/session-inspector/latest-request-usage.js';
 import { WorkHubProgressCard } from './workhub-progress-card.js';
 import { WorkHubComposer } from './workhub-composer.js';
+import type { RestoredDraftContent } from '../../../application/contracts/transient-message-projection.js';
 import { WorkHubConversation } from './workhub-conversation.js';
 import { FormInteractionPrompt } from '@maka/ui';
 import { getShellCopy } from '../../../locales/shell-copy.js';
@@ -70,13 +71,11 @@ function revealWordmark(element: HTMLDivElement | null, content: HTMLDivElement
 export function WorkHubRoot() {
   const highlight = useWorkHubHighlightState();
   const composer = useRef<ComposerHandle>(null);
-  const controller = useWorkHubController(() => highlight.selectWork(undefined), (_sessionId, text) => {
-    const input = composer.current;
-    if (!input) return;
-    if (input.getText().trim()) input.appendText(text);
-    else input.setText(text);
-    input.focus();
-  });
+  const draftRestore = useRef<((sessionId: string, draft: RestoredDraftContent) => void) | undefined>(undefined);
+  const controller = useWorkHubController(
+    () => highlight.selectWork(undefined),
+    (sessionId, draft) => draftRestore.current?.(sessionId, draft),
+  );
   const { services, session, transcript, busy } = controller;
   useEffect(() => {
     services.bindBrowserSession(controller.sessionId ?? null);
@@ -315,6 +314,7 @@ export function WorkHubRoot() {
               placeholder={progress ? t.progressInput : t.welcome}
               ref={composer}
               hidden={Boolean(controller.activeQuestion || controller.activeForm)}
+              draftRestore={draftRestore}
               sessionId={controller.sessionId}
               streaming={busy}
               sendBlocked={!controller.sessionId || controller.sending || !session?.model}
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 5a9b26c0fef..3342b3f6ecb 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -229,8 +229,8 @@ function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
         publish={publish}
         retire={retire}
         reportError={noop}
-        restoreDraft={(_id, text) => {
-          composerRef.current?.setText(text);
+        restoreDraft={(_id, draft) => {
+          composerRef.current?.setText(draft.text);
           composerRef.current?.focus();
         }}
       />
diff --git a/packages/ui/src/__tests__/composer-message-queue.test.tsx b/packages/ui/src/__tests__/composer-message-queue.test.tsx
index d99f3c1c54e..ef28c511a0b 100644
--- a/packages/ui/src/__tests__/composer-message-queue.test.tsx
+++ b/packages/ui/src/__tests__/composer-message-queue.test.tsx
@@ -155,6 +155,24 @@ test('a rejected queue edit keeps the row in edit mode instead of reading as reo
   }
 });
 
+test('the plate lists only follow-ups — steering entries belong to the transcript', async () => {
+  const dom = installDom();
+  try {
+    const { projectComposerMessageQueue } = await import('../composer-message-queue.js');
+    const steering: MessageQueueEntryProjection = {
+      ...queued('entry-0', 'steer the current turn'),
+      placement: 'current_turn',
+    };
+    assert.deepEqual(
+      projectComposerMessageQueue([steering, queued('entry-1', 'first follow-up')], [])
+        .map((entry) => entry.entryId),
+      ['entry-1'],
+    );
+  } finally {
+    dom.restore();
+  }
+});
+
 test('queue actions stay disabled until the entry is Host-admitted', async () => {
   const pending: MessageQueueEntryProjection[] = [
     { ...queued('entry-1', 'first follow-up'), state: 'in_flight' },
diff --git a/packages/ui/src/use-composer-attachments.ts b/packages/ui/src/use-composer-attachments.ts
index 39d7516fa53..271fcf2d902 100644
--- a/packages/ui/src/use-composer-attachments.ts
+++ b/packages/ui/src/use-composer-attachments.ts
@@ -480,6 +480,25 @@ export function useComposerAttachments(options: {
     for (const item of staged) lifecycle.stagedKeys.add(item.stagingKey);
   }
 
+  // Retained references carry their Host id, so a restore re-derives the same
+  // `${draftKey}:${hostId}` owner key `pickDirectory` staged them under.
+  function restoreDirectories(draftKey: string, references: readonly DirectoryReference[]): void {
+    if (!lifecycle.mounted || references.length === 0) return;
+    updateDirectories((all) => {
+      let next = all;
+      for (const reference of references) {
+        const ownerKey = `${draftKey}:${reference.hostId}`;
+        const previous = next[ownerKey] ?? [];
+        if (
+          previous.length >= DIRECTORY_REFERENCE_MAX_COUNT
+          || previous.some((entry) => entry.path === reference.path)
+        ) continue;
+        next = { ...next, [ownerKey]: [...previous, reference] };
+      }
+      return next;
+    });
+  }
+
   function removeAttachment(index: number): void {
     const ownerKey = options.draftKey;
     updateAttachments((map) => removePending(map, ownerKey, index));
@@ -545,6 +564,7 @@ export function useComposerAttachments(options: {
     pickAttachments,
     attachFilePaths,
     restoreAttachments,
+    restoreDirectories,
     removeAttachment,
     clearSubmittedContext,
     clearSubmittedAttachments,

From b0f1099118fe8038630d2981f80edc320b30958f Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 16:29:26 +0800
Subject: [PATCH 13/33] fix(desktop): keep queue-admitted message ids for
 reseed Turn binding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Host-snapshot projection deletes a queued entry's transient copy on
admission, leaving its messageId only in the queue snapshot. When the Host
drained the queue while Desktop was disconnected, the reseed had no ids to
resolve — admission and completion events carry no replay — so the
completed Turn never entered ownTurnIds and its durable messages were
filtered out of the Side Chat transcript. The CI side-chat-followups spec
reproduces this deterministically.

Track queue-admitted ids in a separate set: populated at queue_update,
consumed when a durable merge proves the Turn binding itself or when
execution resolutions retire/register the id, cleared on fork switch. This
is a tombstone for ownership resolution, not a second queue authority —
the plate still renders solely from the Host snapshot.

Generated-by: Devin
---
 .../__tests__/quote-companion-retry.test.ts   | 87 +++++++++++++++++++
 .../tools/side-chat/use-quote-companion.ts    | 30 ++++++-
 2 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts b/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
index b42cf3f0f71..d1e828c9710 100644
--- a/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
+++ b/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
@@ -2725,6 +2725,93 @@ test('retires a cancelled queued Side Conversation message after observation res
   assert.ok(queriedMessageIds.some((messageIds) => messageIds.includes(queuedMessageId as string)));
 });
 
+test('binds a drained queued follow-up to its completed Turn when reseeding', async () => {
+  let queuedMessageId: string | undefined;
+  let markSeeded: (() => void) | undefined;
+  let seedCount = 0;
+  let reconnected = false;
+  const { container, emit, send, queue, hostTurn } = await renderOwnershipProbe({
+    subscribeEvents: (_sessionId, _handler, onSeeded) => {
+      markSeeded = onSeeded;
+      if (seedCount === 0) {
+        seedCount += 1;
+        onSeeded?.();
+      }
+      return () => undefined;
+    },
+    send: async () => ({ ok: true as const, turnId: 'old-turn' }),
+    submitFollowUp: async (_sessionId, placement, _text, messageId) => {
+      assert.equal(placement, 'next_turn');
+      queuedMessageId = messageId;
+      return { kind: 'queued' as const };
+    },
+    readSettledMessages: async () => ({
+      messages: reconnected
+        ? [
+            {
+              type: 'user' as const,
+              id: queuedMessageId as string,
+              turnId: 'successor-turn',
+              ts: 3,
+              text: 'drained while disconnected',
+            },
+            {
+              type: 'assistant' as const,
+              id: 'successor-answer',
+              turnId: 'successor-turn',
+              ts: 4,
+              text: 'successor answer',
+              modelId: 'test-model',
+            },
+            {
+              type: 'turn_state' as const,
+              id: 'successor-done',
+              turnId: 'successor-turn',
+              ts: 5,
+              status: 'completed' as const,
+            },
+          ]
+        : [],
+      settled: true,
+    }),
+    queryMessageExecutions: async (_sessionId, messageIds) => ({
+      resolutions: messageIds.map((messageId) => ({ messageId, state: 'pending' as const })),
+    }),
+  });
+
+  await act(async () => {
+    assert.equal(await send('initial prompt'), true);
+    hostTurn('old-turn');
+  });
+  await act(async () => {
+    assert.equal(await queue('drained while disconnected'), true);
+    emit(
+      queueUpdateEvent('queued-follow-up', 'old-turn', 2, [], [
+        {
+          entryId: 'follow-up-entry',
+          messageId: queuedMessageId as string,
+          content: { text: 'drained while disconnected' },
+          placement: 'next_turn',
+          state: 'queued',
+        },
+      ]),
+    );
+    await Promise.resolve();
+  });
+  // The Host drained the queue while the panel was disconnected, so the
+  // post-reconnect snapshot lists nothing and the admission events are gone —
+  // only the reseed can bind the completed Turn.
+  await act(async () => {
+    emit(queueUpdateEvent('drained-queue', 'old-turn', 3));
+    reconnected = true;
+    markSeeded?.();
+    await Promise.resolve();
+  });
+  await waitUntil(() =>
+    (container.firstElementChild?.getAttribute('data-message-texts') ?? '')
+      .includes('drained while disconnected|successor answer'));
+});
+
 for (const resolutionState of ['cancelled', 'owned'] as const) {
   test(`releases an outcome-unknown Side Conversation steer when reseeding proves it ${resolutionState}`, async () => {
     let admissionId: string | undefined;
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index 2b363334b19..c21011f0947 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -371,6 +371,11 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     messageQueueRef.current = next;
     setMessageQueue(next);
   }, []);
+  // Message ids the Host has admitted to its queue. The queue snapshot is the
+  // presentation authority, but it drains when the Host consumes entries — a
+  // reconnect can miss the admission events that would have bound their
+  // Turns, so reseed resolves ownership through this set instead.
+  const queueOwnedMessageIdsRef = useRef(new Set<string>());
   const [execution, setExecution] = useState<SessionExecutionProjection>();
   const [liveTurns, setLiveTurns] = useState<LiveTurnBuffer>();
   const liveTurnsRef = useRef(liveTurns);
@@ -477,6 +482,19 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     const next = mergeSettledMessages(allMessagesRef.current, messages);
     allMessagesRef.current = next;
     setAllMessages(next);
+    // A persisted message carrying a queue-admitted id proves its own Turn —
+    // the admission events that would have bound it may never reach us.
+    let ownershipChanged = false;
+    for (const message of messages) {
+      if (message.turnId === undefined || !queueOwnedMessageIdsRef.current.delete(message.id)) continue;
+      ownTurnIdsRef.current.add(message.turnId);
+      hasContentRef.current = true;
+      ownershipChanged = true;
+    }
+    if (ownershipChanged) {
+      setHasContent(true);
+      setOwnTurnTick((tick) => tick + 1);
+    }
     setLiveTurns((current) => current ? reconcileLiveTurnBuffer(current, next) : current);
     reconcilePendingUserMessages();
   }, [reconcilePendingUserMessages]);
@@ -490,6 +508,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   }, [syncPendingUserMessages]);
 
   const dropQueuedMessage = useCallback((messageId: string) => {
+    queueOwnedMessageIdsRef.current.delete(messageId);
     const current = messageQueueRef.current;
     const entries = current.entries.filter((entry) => entry.messageId !== messageId);
     if (entries.length !== current.entries.length) applyMessageQueue({ ...current, entries });
@@ -533,6 +552,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
       // every entry the Host lists retires its local transient copy.
       for (const entry of [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])]) {
         pendingUserMessagesRef.current.delete(entry.messageId);
+        queueOwnedMessageIdsRef.current.add(entry.messageId);
       }
       syncPendingUserMessages();
     },
@@ -705,9 +725,10 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     );
     if (admittedMessage?.turnId) bindAdmittedTurn(forkId, admittedMessage.turnId);
     const messageIds = new Set(pendingUserMessagesRef.current.keys());
-    // Queue-owned ids are already retired from the pending map; reseed still
-    // needs them so a Host-retired entry leaves the plate too.
-    for (const entry of messageQueueRef.current.entries) messageIds.add(entry.messageId);
+    // Queue-admitted ids are already retired from the pending map, and the
+    // queue itself may have drained while we were away — resolve every id the
+    // Host admitted so its Turn still registers.
+    for (const id of queueOwnedMessageIdsRef.current) messageIds.add(id);
     if (pendingAdmissionRef.current) messageIds.add(pendingAdmissionRef.current.messageId);
     if (messageIds.size === 0) return;
     try {
@@ -724,8 +745,10 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
         // Host cannot say yet, and that keeps its slot.
         if (resolution.state === 'cancelled' || resolution.state === 'not_admitted') {
           retired.add(resolution.messageId);
+          queueOwnedMessageIdsRef.current.delete(resolution.messageId);
           if (pending?.messageId === resolution.messageId) releaseAdmission(pending);
         } else if (resolution.state === 'owned') {
+          queueOwnedMessageIdsRef.current.delete(resolution.messageId);
           bindPendingMessageTurn(resolution.messageId, resolution.turnId);
           if (pending?.messageId === resolution.messageId) {
             bindAdmittedTurn(forkId, resolution.turnId);
@@ -997,6 +1020,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
           pendingUserMessagesRef.current.clear();
           setPendingUserMessages([]);
           applyMessageQueue({ entries: [] });
+          queueOwnedMessageIdsRef.current.clear();
           onForkVisibilityChangeRef.current?.({
             type: 'cleanup-succeeded',
             sessionId: existing.id,

From 332d3009a139c7cb478cdd45fca83a2fc80ec224 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 18:00:00 +0800
Subject: [PATCH 14/33] fix(desktop): resolve queue state lost while a surface
 was not observing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Three gaps found in adversarial review, all sharing one assumption — that a
renderer only needs positive queue evidence:

- seedActive suppressed queue_update on an empty queue, so a session whose
  queue drained while unobserved (navigation away, reconnect) re-seeded
  nothing and the renderer kept phantom entries forever. The seed now
  always carries the authoritative queue snapshot; empty clears.
- WorkHub's unconfirmed queued send resolved only on positive evidence;
  an externally retracted send left a permanent ghost row and blocked
  later sends. On observation ready the pending send now resolves
  through queryMessageExecutions: cancelled/not_admitted drop the
  placeholder, owned keeps it until the durable transcript merge.
- The queue editor CAS-checked the revision captured when editing began,
  so any concurrent queue mutation dead-locked the editor until cancel.
  The commit now CASes the latest known revision; a conflict still
  surfaces once, and a re-save retries fresh state.

Also gates the queued-steering Edit action on an available draft
restorer so it cannot silently degrade to Delete, and pins the new
contract in projection-, observer-, controller- and component-level
tests.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../__tests__/message-queue-ui-state.test.ts  | 52 ++++++++++++++++++-
 .../runtime-host-session-observer.test.ts     | 27 ++++++----
 .../transient-message-projection.test.ts      |  1 +
 .../__tests__/workhub-send-visibility.test.ts | 45 ++++++++++++++++
 .../contracts/transient-message-projection.ts | 12 ++++-
 .../controller/use-session-message-queue.ts   |  1 +
 .../tools/side-chat/use-quote-companion.ts    |  1 +
 .../controller/use-workhub-controller.ts      | 38 +++++++++++++-
 .../src/renderer/features/workhub/ports.ts    |  3 +-
 .../desktop/create-workhub-services.ts        |  2 +
 apps/desktop/stories/app-shell.stories.tsx    |  2 +-
 .../src/__tests__/session-projector.test.ts   | 19 ++++---
 .../src/adapter/session-projector.ts          | 24 ++++++---
 .../__tests__/composer-message-queue.test.tsx | 40 +++++++++++++-
 packages/ui/src/composer-message-queue.tsx    | 11 ++--
 15 files changed, 241 insertions(+), 37 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 80b0e0e3704..c5c9db98b84 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -26,7 +26,8 @@ import {
   type ComposerHandle,
   type TransientUserMessageProjection,
 } from '@maka/ui';
-import { ConversationServicesProvider, SessionLocalMessages, useSessionMessageQueue } from '../../renderer/features/conversation/index.js';
+import { ConversationServicesProvider, SessionLocalMessages } from '../../renderer/features/conversation/index.js';
+import { useSessionMessageQueue } from '../../renderer/features/conversation/testing.js';
 import type { RestoredDraftContent } from '../../renderer/application/contracts/transient-message-projection.js';
 import type { DesktopLocalMessage } from '../../shared/session-local-contract.js';
 import { mergeTransientMessageProjection } from '../../renderer/application/contracts/transient-message-projection.js';
@@ -297,6 +298,55 @@ test('a rootless resubscription seed retires a stale queued card', () => {
   );
 });
 
+test('an empty queue_update clears the last-seen snapshot after an unobserved drain', async () => {
+  const controller = createAppShellSessionUiStateController();
+  const handlers = createAppShellSessionEventHandlers({
+    uiLocale: 'en',
+    activeIdRef: { current: 'session-1' },
+    liveTurnBySessionRef: controller.liveTurnBySessionRef,
+    refreshMessages: async () => true,
+    refreshSessions: async () => [],
+    setLiveTurnBySession: controller.setLiveTurnBySession,
+    setInteractionBySession: controller.setInteractionBySession,
+    setMessageQueueBySession: controller.setMessageQueueBySession,
+    removeTransientMessage: () => {},
+    showModelSetupToast() {},
+    toastApi: { error() {} },
+  });
+
+  handlers.handleEvent('session-1', {
+    type: 'queue_update',
+    id: 'queue-drained-before',
+    turnId: 'turn-1',
+    ts: 1,
+    queueRevision: 2,
+    steering: [],
+    followup: ['do this next'],
+    steeringEntries: [],
+    followupEntries: [{
+      entryId: 'entry-next',
+      messageId: 'message-next',
+      content: { text: 'do this next' },
+      placement: 'next_turn',
+      state: 'queued',
+    }],
+  });
+  assert.equal(controller.getState().messageQueueBySession['session-1']?.entries.length, 1);
+
+  handlers.handleEvent('session-1', {
+    type: 'queue_update',
+    id: 'queue-drained-after',
+    turnId: 'turn-1',
+    ts: 2,
+    queueRevision: 3,
+    steering: [],
+    followup: [],
+    steeringEntries: [],
+    followupEntries: [],
+  });
+  assert.equal(controller.getState().messageQueueBySession['session-1'], undefined);
+});
+
 test('steering delivery clears a promoted follow-up from the desktop queue', () => {
   const controller = createAppShellSessionUiStateController();
   const handlers = createAppShellSessionEventHandlers({
diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts
index 73f9582c4e5..a77a91e3560 100644
--- a/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts
+++ b/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts
@@ -140,7 +140,7 @@ test("joins an active Turn without losing or replaying assistant text", async ()
     },
   ]);
   await Promise.all([watching, observing]);
-  await waitFor(() => target.events.length === 2);
+  await waitFor(() => target.events.length === 3);
 
   assert.deepEqual(
     target.events.map((event) => [
@@ -150,6 +150,7 @@ test("joins an active Turn without losing or replaying assistant text", async ()
     ]),
     [
       ["text_delta", "Hello", 0],
+      ["queue_update", undefined, undefined],
       ["text_delta", " world", 5],
     ],
   );
@@ -240,7 +241,7 @@ test("restores renderer observation after the Host connection is replaced", asyn
   observations.detach(firstObserver);
   await firstObserver.close();
   assert.deepEqual(await observations.attach(secondObserver), ["session-1"]);
-  await waitFor(() => target.events.length === 1);
+  await waitFor(() => target.events.length === 3);
 
   secondEvents.push(deltaFrame(1, 5, " again"));
   secondEvents.push({
@@ -268,7 +269,9 @@ test("restores renderer observation after the Host connection is replaced", asyn
       "text" in event ? event.text : undefined,
     ]),
     [
+      ["queue_update", undefined],
       ["text_delta", "Hello"],
+      ["queue_update", undefined],
       ["text_delta", " again"],
       ["text_complete", "Hello again"],
       ["complete", undefined],
@@ -2234,13 +2237,13 @@ test("reopens an evicted active subscription without a renderer resubscribe", as
   await waitFor(() => openCount === 2);
   assert.equal(target.observations.at(-1)?.type, 'host_observation_pending',
     'observation is invalidated while reopen is still waiting');
-  assert.equal(target.events.length, 1, 'no replacement content is accepted before reopen completes');
+  assert.equal(target.events.length, 2, 'no replacement content is accepted before reopen completes');
   reopen.resolve();
-  await waitFor(() => target.events.length === 2);
+  await waitFor(() => target.events.length === 4);
   assert.equal(target.observations.at(-1)?.type, 'host_observation_seed');
 
   secondEvents.push(deltaFrame(1, 5, " world"));
-  await waitFor(() => target.events.length === 3);
+  await waitFor(() => target.events.length === 5);
   assert.deepEqual(
     target.events.map((event) => [
       event.type,
@@ -2248,8 +2251,10 @@ test("reopens an evicted active subscription without a renderer resubscribe", as
       "startOffset" in event ? event.startOffset : undefined,
     ]),
     [
+      ["queue_update", undefined, undefined],
       ["text_delta", "Hel", 0],
       ["text_delta", "Hello", 0],
+      ["queue_update", undefined, undefined],
       ["text_delta", " world", 5],
     ],
   );
@@ -2538,7 +2543,7 @@ test("seeds a joining observer from the attempt that survives repeated catch-up
     joiningTarget.events.map((event) =>
       event.type === "text_delta" ? event.text : event.type,
     ),
-    ["Hello"],
+    ["queue_update", "Hello", "queue_update"],
   );
   await observer.close();
 });
@@ -2879,10 +2884,10 @@ test("shares one Host subscription and one delivery per renderer target", async
     observer.observe("session-1", "observer-2", target),
   ]);
   events.push(deltaFrame(1, 0, "one"));
-  await waitFor(() => target.events.length === 1);
+  await waitFor(() => target.events.length === 2);
 
   assert.equal(openCount, 1);
-  assert.equal(target.events.length, 1);
+  assert.equal(target.events.length, 2);
   await observer.unobserve("observer-1");
   assert.equal(closeCount, 0);
   await observer.unobserve("observer-2");
@@ -2981,7 +2986,7 @@ test("rehydrates pending interactions and publishes answer acknowledgements", as
 
   assert.deepEqual(
     await observer.readActiveInteractions("session-1"),
-    target.events,
+    target.events.filter((event) => event.type !== "queue_update"),
   );
   observer.publishInteractionAnswer(
     {
@@ -3086,7 +3091,7 @@ test("projects Host queue revisions and places steering from the runtime event",
       },
     }),
   });
-  await waitFor(() => target.events.length === 1);
+  await waitFor(() => target.events.length === 2);
   events.push({
     kind: "subscription.session_projection",
     hostEpoch: "host-1",
@@ -3127,7 +3132,7 @@ test("projects Host queue revisions and places steering from the runtime event",
     ),
     [["queued"], ["in_flight"], [], "steering_message"],
   );
-  assert.deepEqual(target.events[0], {
+  assert.deepEqual(target.events[1], {
     type: "queue_update",
     id: "host-queue:host-1:1",
     turnId: "turn-1",
diff --git a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
index 0af1f19eec7..fa7650f3af8 100644
--- a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
+++ b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
@@ -181,6 +181,7 @@ test('queued steering derives a transcript bubble that lives and dies with the s
   const retracted: (string | undefined)[][] = [];
   const actions = {
     locale: 'en' as const,
+    editable: true,
     retract: async (_entry: unknown, draftText?: string) => {
       retracted.push([draftText]);
       return true;
diff --git a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
index 7c67ec9c819..b185a3dbb60 100644
--- a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
+++ b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
@@ -52,6 +52,8 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
   const queueMutations: unknown[][] = [];
   const steers: Array<Parameters<WorkHubServices['enqueueMessage']>> = [];
   let steerResult: Awaited<ReturnType<WorkHubServices['enqueueMessage']>> = 'admitted';
+  const executionQueries: string[][] = [];
+  let executionResolutions: Awaited<ReturnType<WorkHubServices['queryMessageExecutions']>>['resolutions'] = [];
   let newWorkDefaults: Awaited<ReturnType<WorkHubServices['getNewWorkDefaults']>> = {};
   let onSteer: ((input: Parameters<WorkHubServices['enqueueMessage']>) => void) | undefined;
   const interrupts: Array<{ sessionId: string; turnId: string; runId: string }> = [];
@@ -118,6 +120,10 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
     updateQueueEntry: async (...input: Parameters<WorkHubServices['updateQueueEntry']>) => { queueMutations.push(['update', ...input]); },
     reorderQueueEntries: async (...input: Parameters<WorkHubServices['reorderQueueEntries']>) => { queueMutations.push(['reorder', ...input]); },
     enqueueMessage: async (...input: Parameters<WorkHubServices['enqueueMessage']>) => { steers.push(input); onSteer?.(input); return steerResult; },
+    queryMessageExecutions: async (_id: string, messageIds: readonly string[]) => {
+      executionQueries.push([...messageIds]);
+      return { resolutions: executionResolutions };
+    },
     listActiveInteractions: async () => [],
     subscribeActiveInteractions: () => () => {},
     respondToUserForm: async () => {},
@@ -144,6 +150,7 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
     complete(turnId: string) { rootTurn = { turnId, runId: `run:${turnId}`, status: 'completed' }; projectExecution(); },
     onSteer(handler: typeof onSteer) { onSteer = handler; },
     queueMutations, steers, setSteerResult(value: typeof steerResult) { steerResult = value; },
+    executionQueries, setExecutionResolutions(value: typeof executionResolutions) { executionResolutions = value; },
     setStopRetractions(ids: string[]) { stopRetractions = ids; },
     sessionId, requests, get admission() { return admission; }, interrupts,
     resetAdmission() { admission = deferred<{ turnId: string }>(); },
@@ -593,6 +600,44 @@ test('Host retraction resolves an uncertain WorkHub attempt before the next draf
   assert.notEqual(h.steers[1]![1], messageId);
 });
 
+test('an unobserved retraction resolves an uncertain WorkHub send on reseed', async () => {
+  const h = await mountController();
+  await act(() => { h.admit('active-turn'); h.emit({ type: 'text_delta', id: 'live', turnId: 'active-turn', messageId: 'answer', ts: 1, text: 'Working' }); });
+  h.setSteerResult('unknown');
+  await act(async () => { assert.equal(await h.controller.send('old direction', [], 'steer'), false); });
+  const messageId = h.steers[0]![1];
+  assert.deepEqual(h.controller.transientMessages.map((message) => message.id), [messageId]);
+  // The Host retracted the entry while Desktop was away: no admission event
+  // replays and the reseeded queue arrives already empty — only the
+  // resolution record can still say what happened to the send.
+  h.setExecutionResolutions([{ messageId, state: 'cancelled' }]);
+  await act(async () => h.reconnect());
+  assert.deepEqual(h.executionQueries, [[messageId]]);
+  assert.deepEqual(h.controller.transientMessages, []);
+  h.setSteerResult('admitted');
+  await act(async () => { assert.equal(await h.controller.send('new direction', [], 'steer'), true); });
+  assert.notEqual(h.steers[1]![1], messageId);
+});
+
+test('a queued send consumed while away keeps its row until the durable merge but unblocks retry', async () => {
+  const h = await mountController();
+  await act(() => { h.admit('active-turn'); h.emit({ type: 'text_delta', id: 'live', turnId: 'active-turn', messageId: 'answer', ts: 1, text: 'Working' }); });
+  h.setSteerResult('unknown');
+  await act(async () => { assert.equal(await h.controller.send('do this next', []), false); });
+  const messageId = h.steers[0]![1];
+  assert.deepEqual(h.controller.transientMessages.map((message) => message.id), [messageId]);
+  // The Host drained the entry into a successor Turn during the gap.
+  h.setExecutionResolutions([{ messageId, state: 'owned', turnId: 'followup-turn', runId: 'run-2' }]);
+  await act(async () => h.reconnect());
+  assert.deepEqual(h.executionQueries, [[messageId]]);
+  assert.deepEqual(h.controller.transientMessages.map((message) => message.id), [messageId],
+    'the placeholder stays until its durable row lands — never dropped, never stuck in the plate');
+  await act(() => h.publish([{ type: 'user', id: messageId, turnId: 'followup-turn', ts: 3, text: 'do this next' } as StoredMessage]));
+  assert.deepEqual(h.controller.transientMessages, []);
+  h.setSteerResult('admitted');
+  await act(async () => { assert.equal(await h.controller.send('another message', []), true); });
+});
+
 test('steering observed before its admission response renders once and outranks an uncertain receipt', async () => {
   const h = await mountController();
   await act(() => { h.admit('active-turn'); h.emit({ type: 'text_delta', id: 'live', turnId: 'active-turn', messageId: 'answer', ts: 1, text: 'Working' }); });
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 5a52a94db47..ab2a25d1d2f 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -47,17 +47,22 @@ export interface RestoredDraftContent {
 /**
  * Edit/delete controls for steering the Host queued but has not consumed.
  * Both retract the queue entry; edit also hands the text back to the caller's
- * draft restore. `retract` resolves false when the Host call failed.
+ * draft restore, so it is only offered when the caller can actually restore —
+ * without one, edit would silently behave like delete. `retract` resolves
+ * false when the Host call failed.
  */
 export function queuedSteeringDeliveryActions(input: {
   locale: UiLocale;
   draftText: string;
+  editable: boolean;
   retract: (draftText?: string) => Promise<boolean>;
 }): NonNullable<TransientUserMessage['deliveryActions']> {
   const copy = getConversationCopy(input.locale).composer;
   const icon = (glyph: typeof Pencil) => createElement(glyph, { size: ICON_SIZE.control, 'aria-hidden': true });
   return [
-    { label: copy.editQueuedEntry, icon: icon(Pencil), onClick: async () => { await input.retract(input.draftText); } },
+    ...(input.editable
+      ? [{ label: copy.editQueuedEntry, icon: icon(Pencil), onClick: async () => { await input.retract(input.draftText); } }]
+      : []),
     { label: copy.deleteQueuedEntry, icon: icon(Trash2), onClick: async () => { await input.retract(); } },
   ];
 }
@@ -80,6 +85,8 @@ export function withQueuedSteeringTransients(
     | undefined,
   actions: {
     locale: UiLocale;
+    /** Offer the retract-and-restore edit action. */
+    editable: boolean;
     /** Retract the queue entry; resolves false when the Host call failed. */
     retract(entry: MessageQueueEntryProjection, draftText?: string): Promise<boolean>;
   },
@@ -106,6 +113,7 @@ export function withQueuedSteeringTransients(
     deliveryActions: queuedSteeringDeliveryActions({
       locale: actions.locale,
       draftText: entry.content.displayText ?? entry.content.text,
+      editable: actions.editable,
       retract: (draftText) => actions.retract(entry, draftText),
     }),
   }));
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index 259bfe830a9..a67e98c2e2b 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -116,6 +116,7 @@ export function useSessionMessageQueue(options: {
   const merged = useMemo(
     () => withQueuedSteeringTransients(transientMessages, queue, {
       locale,
+      editable: true,
       retract: async (entry, draftText) => {
         if (!sessionId) return false;
         try {
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index c21011f0947..dde81168e2f 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -1756,6 +1756,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   );
   const transientMessages = withQueuedSteeringTransients(pendingUserMessages, messageQueue, {
     locale: localeRef.current,
+    editable: input.restoreDraft !== undefined,
     retract: async (entry, draftText) => {
       const forkId = companionIdRef.current;
       if (!forkId) return false;
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index 6b136f3598d..e0f95bcbffe 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -222,6 +222,37 @@ export function useWorkHubController(
     }
   }
 
+  // An unobserved queued send has no proof of admission or retraction. On
+  // reseed the Host's resolution record is the only authority left — a queue
+  // it already drained cannot answer, and admission events do not replay.
+  async function resolvePendingQueued(): Promise<void> {
+    const queued = pendingQueued.current;
+    if (!queued || queued.observed || queued.sessionId !== currentSessionId.current) return;
+    try {
+      const { resolutions } = await services.queryMessageExecutions(queued.sessionId, [queued.messageId]);
+      if (pendingQueued.current !== queued || queued.observed) return;
+      const resolution = resolutions.find((entry) => entry.messageId === queued.messageId);
+      // `pending` or an omitted identity means the Host cannot say yet —
+      // keep the placeholder until canonical evidence arrives.
+      if (!resolution || resolution.state === 'pending') return;
+      pendingQueued.current = undefined;
+      // `owned` means the message already runs as a Turn; the durable
+      // transcript merge retires its placeholder. `cancelled`/`not_admitted`
+      // prove it never will, so the placeholder drops here.
+      setMessagePresentation((previous) => ({
+        messageQueue: {
+          ...previous.messageQueue,
+          entries: previous.messageQueue.entries.filter((entry) => entry.messageId !== queued.messageId),
+        },
+        transientMessages: resolution.state === 'owned'
+          ? previous.transientMessages
+          : previous.transientMessages.filter((message) => message.id !== queued.messageId),
+      }));
+    } catch {
+      // A failed proof query says nothing about the send — presentation stays.
+    }
+  }
+
   useEffect(
     () =>
       startWorkHubCoordinationLifecycle({
@@ -455,7 +486,11 @@ export function useWorkHubController(
         if (disposed) return;
         observationPhase = phase;
         handle?.observationChanged(phase);
-        if (phase === 'ready') { refreshInteractions.current(); void recoverSend(); }
+        if (phase === 'ready') {
+          refreshInteractions.current();
+          void recoverSend();
+          void resolvePendingQueued();
+        }
       },
       (projection) => { if (!disposed) setExecution(projection); },
     );
@@ -705,6 +740,7 @@ export function useWorkHubController(
     },
     transientMessages: withQueuedSteeringTransients(transientMessages, messageQueue, {
       locale,
+      editable: restoreDraft !== undefined,
       retract: async (entry, draftText) => {
         if (!sessionId) return false;
         try { await services.retractQueueEntry(sessionId, entry.entryId); }
diff --git a/apps/desktop/src/renderer/features/workhub/ports.ts b/apps/desktop/src/renderer/features/workhub/ports.ts
index 9a497ca229c..6e6c14dc491 100644
--- a/apps/desktop/src/renderer/features/workhub/ports.ts
+++ b/apps/desktop/src/renderer/features/workhub/ports.ts
@@ -23,7 +23,7 @@ import type { UiLocale } from '@maka/core/ui-locale';
 import type { StoredMessage, SessionSummary, WorkHubCreateDefaults } from '@maka/core/session';
 import type { ComposerAttachmentService } from '@maka/ui/use-composer-attachments';
 import type { SessionEvent, AttachmentRef, MessageQueuePlacement } from '@maka/core/events';
-import type { OperationInput, OperationOutput } from '@maka/runtime-host/protocol';
+import type { OperationInput, OperationOutput, TurnMessageExecutionQueryResult } from '@maka/runtime-host/protocol';
 import type { WorkHubAnswerInput, WorkHubAnswerResult } from '../../../shared/workhub-conversation.js';
 import type { WorkHubControlBridge } from '../../../shared/workhub-control.js';
 import type { WorkHubPresentationBridge } from '../../../shared/workhub-presentation.js';
@@ -64,6 +64,7 @@ export interface WorkHubServices extends WorkHubWorkspaceServices {
   respondToUserQuestion(sessionId: string, response: import('@maka/core/user-question').UserQuestionResponse): Promise<void>;
   answer(sessionId: string, input: WorkHubAnswerInput): Promise<WorkHubAnswerResult>;
   enqueueMessage(sessionId: string, messageId: string, text: string, attachments: AttachmentRef[], placement: MessageQueuePlacement): Promise<'admitted' | 'unknown' | 'rejected'>;
+  queryMessageExecutions(sessionId: string, messageIds: readonly string[]): Promise<TurnMessageExecutionQueryResult>;
   retractQueueEntry(sessionId: string, entryId: string): Promise<void>;
   promoteQueueEntry(sessionId: string, entryId: string): Promise<void>;
   updateQueueEntry(sessionId: string, entryId: string, expectedQueueRevision: number, text: string): Promise<void>;
diff --git a/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts b/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts
index 6be0c427398..7c262fb1714 100644
--- a/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts
+++ b/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts
@@ -110,6 +110,8 @@ export function createDesktopWorkHubServices(
       if (result.ok) return result.disposition === (placement === 'current_turn' ? 'steering' : 'followup') ? 'admitted' : 'rejected';
       return result.reason === 'outcome_unknown' ? 'unknown' : 'rejected';
     },
+    queryMessageExecutions: (sessionId, messageIds) =>
+      bridge.sessions.queryMessageExecutions(sessionId, messageIds),
     retractQueueEntry: (sessionId, entryId) => bridge.sessions.retractQueueEntry(sessionId, entryId),
     promoteQueueEntry: (sessionId, entryId) => bridge.sessions.promoteQueueEntry(sessionId, entryId),
     updateQueueEntry: (sessionId, entryId, revision, text) => bridge.sessions.updateQueueEntry(sessionId, entryId, revision, text),
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 1401bd7bd41..32957d0060a 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -765,7 +765,7 @@ export const QueuedSteeringInTranscript: Story = {
             placement: 'current_turn',
             state: 'queued',
           }],
-        }, { locale: 'zh-CN', retract: async () => true }),
+        }, { locale: 'zh-CN', editable: true, retract: async () => true }),
       }}
     />
   ),
diff --git a/packages/runtime-host/src/__tests__/session-projector.test.ts b/packages/runtime-host/src/__tests__/session-projector.test.ts
index c08e9436547..7ba758168a6 100644
--- a/packages/runtime-host/src/__tests__/session-projector.test.ts
+++ b/packages/runtime-host/src/__tests__/session-projector.test.ts
@@ -85,7 +85,7 @@ test('applies authoritative replacement once and does not complete it again at T
 
   assert.deepEqual(
     projector.seedActive(true).map((event) => event.type),
-    ['text_delta'],
+    ['text_delta', 'queue_update'],
   );
   assert.deepEqual(projector.accept(deltaFrame(1, 0, 'final', { reset: true })).events, []);
   const completed = projector.accept(
@@ -96,7 +96,10 @@ test('applies authoritative replacement once and does not complete it again at T
     completed.map((event) => [event.type, 'text' in event ? event.text : '']),
     [['text_complete', 'final']],
   );
-  assert.deepEqual(projector.seedActive(true), []);
+  assert.deepEqual(
+    projector.seedActive(true).map((event) => event.type),
+    ['queue_update'],
+  );
 
   const terminal = projector.accept({
     kind: 'subscription.session_projection',
@@ -511,7 +514,7 @@ test('reseeds the latest provider retry when the active Turn still carries one',
   );
 
   const seeded = projector.seedActive(true);
-  assert.equal(seeded.length, 1);
+  assert.equal(seeded.length, 2);
   assert.equal(seeded[0]?.type, 'provider_retry');
   assert.equal(seeded[0] && 'phase' in seeded[0] ? seeded[0].phase : undefined, 'scheduled');
 });
@@ -651,7 +654,7 @@ test('emits a live provider retry when the snapshot overlay appears, then drops
   });
   assert.deepEqual(
     projector.seedActive(true).map((event) => event.type),
-    ['text_delta'],
+    ['text_delta', 'queue_update'],
   );
 });
 
@@ -674,7 +677,10 @@ test('seeds only streams identified as active by the Host catch-up state', () =>
     projector
       .seedActive(true)
       .map((event) => [event.type, 'messageId' in event && event.messageId]),
-    [['thinking_delta', 'active-step']],
+    [
+      ['thinking_delta', 'active-step'],
+      ['queue_update', false],
+    ],
   );
 });
 
@@ -714,6 +720,7 @@ test('does not replay settled transcript steps when the active step reaches term
     [
       ['thinking_delta', 'active-step', 'active thought'],
       ['text_delta', 'active-step', 'partial answer'],
+      ['queue_update', false, false],
     ],
   );
 
@@ -1086,7 +1093,7 @@ test('seeds a context-compaction-started event for a running compaction Turn', (
     () => 10,
   );
   const seeded = projector.seedActive(true);
-  assert.equal(seeded.length, 1);
+  assert.equal(seeded.length, 2);
   assert.equal(seeded[0]?.type, 'context_compaction_started');
   assert.equal(seeded[0]?.turnId, 'turn-compact');
 });
diff --git a/packages/runtime-host/src/adapter/session-projector.ts b/packages/runtime-host/src/adapter/session-projector.ts
index 36c1d639a69..99ea57dbb22 100644
--- a/packages/runtime-host/src/adapter/session-projector.ts
+++ b/packages/runtime-host/src/adapter/session-projector.ts
@@ -175,10 +175,9 @@ export class RuntimeHostSessionProjector {
       return [projectQueueUpdate(this.#unplacedQueue(queue), '', this.#now())];
     }
     const events: SessionEvent[] = [];
-    const queueEvents =
-      this.#projectMessageAdmissions || queueHasEntries(this.#snapshot.queue)
-        ? [projectQueueUpdate(this.#unplacedQueue(this.#snapshot.queue), root.turnId, this.#now())]
-        : [];
+    // The seed is the only queue evidence a re-observing or reconnecting client
+    // receives — an empty queue must still clear its last-seen entries.
+    const queueEvents = [projectQueueUpdate(this.#unplacedQueue(this.#snapshot.queue), root.turnId, this.#now())];
     if (this.#projectMessageAdmissions) {
       events.push(
         ...projectMessageAdmissionEvents(
@@ -742,8 +741,21 @@ function queueChanged(
   return previous.hostEpoch !== next.hostEpoch || previous.queueRevision !== next.queueRevision;
 }
 
-function queueHasEntries(queue: SessionMessageQueueProjection): boolean {
-  return queue.steering.length > 0 || queue.followup.length > 0;
+function newlyInFlight(
+  previous: SessionMessageQueueProjection,
+  next: SessionMessageQueueProjection,
+): Extract<SteeringMessageSnapshot, { state: 'in_flight' }>[] {
+  const previousIds = new Set(rootQueueInFlight(previous).map((entry) => entry.entryId));
+  return rootQueueInFlight(next).filter((entry) => !previousIds.has(entry.entryId));
+}
+
+function rootQueueInFlight(
+  queue: SessionMessageQueueProjection,
+): Extract<SteeringMessageSnapshot, { state: 'in_flight' }>[] {
+  return queue.steering.filter(
+    (entry): entry is Extract<SteeringMessageSnapshot, { state: 'in_flight' }> =>
+      entry.state === 'in_flight',
+  );
 }
 
 function projectQueueUpdate(
diff --git a/packages/ui/src/__tests__/composer-message-queue.test.tsx b/packages/ui/src/__tests__/composer-message-queue.test.tsx
index ef28c511a0b..2195c5480a1 100644
--- a/packages/ui/src/__tests__/composer-message-queue.test.tsx
+++ b/packages/ui/src/__tests__/composer-message-queue.test.tsx
@@ -89,7 +89,7 @@ async function click(button: HTMLButtonElement): Promise<void> {
   });
 }
 
-test('editing a queued entry reports the captured queue revision and closes on success', async () => {
+test('editing a queued entry CAS-checks the latest known queue revision and closes on success', async () => {
   const updates: Array<{ entryId: string; revision: number; text: string }> = [];
   const view = await mountQueue({
     queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
@@ -115,7 +115,7 @@ test('editing a queued entry reports the captured queue revision and closes on s
       editor.dispatchEvent(new window.Event('input', { bubbles: true }));
     });
     await click(actionButton(view.document, copy.saveQueuedEntry));
-    assert.deepEqual(updates, [{ entryId: 'entry-1', revision: 7, text: 'edited first follow-up' }]);
+    assert.deepEqual(updates, [{ entryId: 'entry-1', revision: 8, text: 'edited first follow-up' }]);
     assert.equal(view.document.querySelector('textarea.maka-composer-queue-edit'), null);
     assert.deepEqual(queueTexts(view.document), ['first follow-up', 'second follow-up']);
   } finally {
@@ -155,6 +155,42 @@ test('a rejected queue edit keeps the row in edit mode instead of reading as reo
   }
 });
 
+test('a rejected queue edit retries against the refreshed revision instead of dead-locking', async () => {
+  const updates: Array<{ entryId: string; revision: number; text: string }> = [];
+  let conflicts = 1;
+  const onUpdateEntry = (entryId: string, expectedQueueRevision: number, text: string) => {
+    updates.push({ entryId, revision: expectedQueueRevision, text });
+    return conflicts-- > 0 ? Promise.reject(new Error('operation_conflict')) : Promise.resolve();
+  };
+  const view = await mountQueue({
+    queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
+    queueRevision: 3,
+    onUpdateEntry,
+  });
+  try {
+    await click(actionButton(view.document, copy.editQueuedEntry, 0));
+    const editor = view.document.querySelector<HTMLTextAreaElement>('textarea.maka-composer-queue-edit')!;
+    await act(async () => {
+      editor.value = 'edited first follow-up';
+      editor.dispatchEvent(new window.Event('input', { bubbles: true }));
+    });
+    await click(actionButton(view.document, copy.saveQueuedEntry));
+    assert.equal(updates.length, 1);
+    assert.ok(view.document.querySelector('textarea.maka-composer-queue-edit'), 'the edit stays open after the conflict');
+    await view.rerender({
+      queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
+      queueRevision: 4,
+      onUpdateEntry,
+    });
+    await click(actionButton(view.document, copy.saveQueuedEntry));
+    assert.deepEqual(updates.at(-1), { entryId: 'entry-1', revision: 4, text: 'edited first follow-up' },
+      'the retry carries the revision the conflicting mutation landed on, not the stale capture');
+    assert.equal(view.document.querySelector('textarea.maka-composer-queue-edit'), null);
+  } finally {
+    await view.close();
+  }
+});
+
 test('the plate lists only follow-ups — steering entries belong to the transcript', async () => {
   const dom = installDom();
   try {
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index 39d3139a759..a3cf2f1c480 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -70,7 +70,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
 ) {
   const [pendingEntryId, setPendingEntryId] = useState<string | null>(null);
   const [editingEntryId, setEditingEntryId] = useState<string | null>(null);
-  const [editingQueueRevision, setEditingQueueRevision] = useState(0);
   const [editingText, setEditingText] = useState('');
   const dragEntryId = useRef<string | null>(null);
   const mountedRef = useMountedRef();
@@ -117,26 +116,26 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
     if (pendingEntryId || !props.onUpdateEntry || props.queueRevision === undefined) return;
     setEditingEntryId(entry.entryId);
     const text = entry.content.displayText ?? entry.content.text;
-    setEditingQueueRevision(props.queueRevision);
     setEditingText(text);
   }
 
   async function commitEdit(entryId: string) {
     const text = editingText.trim();
-    if (!text) return;
+    if (!text || props.queueRevision === undefined) return;
+    // CAS against the latest known revision: a conflict surfaces once via the
+    // caller's toast, and an explicit re-save retries against fresh state
+    // instead of dead-locking on the revision captured when editing began.
     const updated = await runEntryAction(entryId, () =>
-      props.onUpdateEntry?.(entryId, editingQueueRevision, text)
+      props.onUpdateEntry?.(entryId, props.queueRevision ?? 0, text)
     );
     if (updated && mountedRef.current) {
       setEditingEntryId(null);
-      setEditingQueueRevision(0);
       setEditingText('');
     }
   }
 
   function cancelEdit() {
     setEditingEntryId(null);
-    setEditingQueueRevision(0);
     setEditingText('');
   }
 

From 3349d0d935dcc3fac10870df47e3a2806bcda4bf Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 18:00:05 +0800
Subject: [PATCH 15/33] refactor(desktop): cut dead queue-edit surface flagged
 by simplification audit

- Drop projectMessageQueue's unused forkId parameter.
- Move useSessionMessageQueue's test-only export from the feature index to
  testing.ts, the seam the architecture check reserves for test consumers.
- Make ComposerHandle.appendDraft required: every production handle supplies
  it, so the two appendPromptContextDraft fallbacks were unreachable.
- Update docs/desktop-message-queue.md, which still described retract-to-draft
  plate actions and listed in-place editing as unshipped.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../controller/use-session-message-queue.ts          | 10 +---------
 .../src/renderer/features/conversation/index.ts      |  1 -
 .../src/renderer/features/conversation/testing.ts    |  1 +
 .../workbar/tools/side-chat/use-quote-companion.ts   |  4 ++--
 .../features/workhub/ui/workhub-composer.tsx         |  4 +---
 apps/desktop/stories/workhub.stories.tsx             |  1 +
 docs/desktop-message-queue.md                        | 12 +++++++-----
 packages/ui/src/composer.tsx                         |  2 +-
 8 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index a67e98c2e2b..f2b891e02c7 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -19,7 +19,6 @@
 
 import { useCallback, useMemo, useRef, type RefObject } from 'react';
 import {
-  appendPromptContextDraft,
   useToast,
   useUiLocale,
   type ComposerHandle,
@@ -89,14 +88,7 @@ export function useSessionMessageQueue(options: {
     draftContextRestorer.current?.(targetSessionId, draft);
     const handle = composer.current;
     if (!handle || !draft.text.trim()) return;
-    if (handle.appendDraft) {
-      handle.appendDraft(targetSessionId, draft.text);
-    } else {
-      handle.setDraft(
-        targetSessionId,
-        appendPromptContextDraft(handle.getDraft(targetSessionId), draft.text),
-      );
-    }
+    handle.appendDraft(targetSessionId, draft.text);
   }, []);
   // Surfaces the failure, then rethrows so the pending plate can settle its
   // in-flight action state without guessing with a timer.
diff --git a/apps/desktop/src/renderer/features/conversation/index.ts b/apps/desktop/src/renderer/features/conversation/index.ts
index b6736825f85..8d9716e54f7 100644
--- a/apps/desktop/src/renderer/features/conversation/index.ts
+++ b/apps/desktop/src/renderer/features/conversation/index.ts
@@ -63,7 +63,6 @@ export { desktopSlashCommandPresentation } from './model/slash-command-presentat
 export { useComposerQuotes } from './controller/use-composer-quotes.js';
 export { useActiveExecutionBoundary } from './controller/use-active-execution-boundary.js';
 export { useSessionReferenceComposer } from './controller/use-session-reference-composer.js';
-export { useSessionMessageQueue } from './controller/use-session-message-queue.js';
 export {
   ComposerMentionsProvider,
   useComposerMentionsContext,
diff --git a/apps/desktop/src/renderer/features/conversation/testing.ts b/apps/desktop/src/renderer/features/conversation/testing.ts
index 417d94a4c95..22a45cae149 100644
--- a/apps/desktop/src/renderer/features/conversation/testing.ts
+++ b/apps/desktop/src/renderer/features/conversation/testing.ts
@@ -29,3 +29,4 @@ export {
   activeExecutionBoundaryUnreadable,
   startActiveExecutionBoundaryRead,
 } from './controller/use-active-execution-boundary.js';
+export { useSessionMessageQueue } from './controller/use-session-message-queue.js';
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index dde81168e2f..d63fa413316 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -540,7 +540,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   }, [bindPendingMessageTurn, reconcilePendingUserMessages]);
 
   const projectMessageQueue = useCallback(
-    (forkId: string, event: Extract<SessionEvent, { type: 'queue_update' }>) => {
+    (event: Extract<SessionEvent, { type: 'queue_update' }>) => {
       const queue = deriveMessageQueueProjection(event);
       applyMessageQueue({
         entries: queue.entries,
@@ -852,7 +852,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
       (event: SessionEvent) => {
         if (!mountedRef.current || disposed || companionIdRef.current !== forkId) return;
         if (event.type === 'queue_update') {
-          projectMessageQueue(forkId, event);
+          projectMessageQueue(event);
           return;
         }
         const admission = pendingAdmissionRef.current;
diff --git a/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx b/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
index 7c5dd6df954..723e75ebf6c 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
@@ -19,7 +19,6 @@
 
 import { forwardRef, useRef, useState, type MutableRefObject } from 'react';
 import {
-  appendPromptContextDraft,
   Composer,
   useToast,
   useUiLocale,
@@ -87,8 +86,7 @@ export const WorkHubComposer = forwardRef<ComposerHandle, WorkHubComposerProps>(
       if (draft.attachments?.length) staged.restoreAttachments(key, draft.attachments);
       const handle = self.current;
       if (!handle || !draft.text.trim()) return;
-      if (handle.appendDraft) handle.appendDraft(key, draft.text);
-      else handle.setDraft(key, appendPromptContextDraft(handle.getDraft(key), draft.text));
+      handle.appendDraft(key, draft.text);
     };
   }
   return <Composer {...composer}
diff --git a/apps/desktop/stories/workhub.stories.tsx b/apps/desktop/stories/workhub.stories.tsx
index 99a2cade06f..c9a5f2f99da 100644
--- a/apps/desktop/stories/workhub.stories.tsx
+++ b/apps/desktop/stories/workhub.stories.tsx
@@ -104,6 +104,7 @@ function makeServices(failFirst: boolean, withHistory: boolean | 'usage', colore
     retractQueueEntry: async () => {}, promoteQueueEntry: async () => {},
     updateQueueEntry: async () => {}, reorderQueueEntries: async () => {},
     enqueueMessage: async () => 'admitted',
+    queryMessageExecutions: async () => ({ resolutions: [] }),
     surface: 'workhub', initialLocale: 'zh-CN', subscribeAppearance: () => () => {},
     presentation: { ready: async () => {}, progressReady: async () => {}, resizeProgress: async () => {}, expandProgress: async () => {}, getSnapshot: async () => ({ placement: progress ? 'floating' : 'docked', floatingVisible: progress, progressRequest: progress ? 1 : undefined, shortcutRegistered: true, rendererCrashed: false, workbar: { collapsed: true, placement: 'right', togglePosition: 'edge' } }), setHost: async () => {}, setConversationLayout: async () => {}, detach: async () => {}, dock: async () => {}, hide: async () => {}, openUsage: async () => { writes.panel('inspector'); }, toggleWorkbar: async () => { writes.panel('toggle'); }, openSession: async (id) => { writes.open(id); }, openSettings: async () => {}, subscribe: () => () => {}, onViewportInset: () => () => {}, onFocusComposer: () => () => {}, onOpenMain: () => () => {} },
     control: { getSnapshot: async () => ({ revision: 0, phase: 'idle', canUndo: false }), subscribe: () => () => {}, stop: async () => {}, undo: async () => {} },
diff --git a/docs/desktop-message-queue.md b/docs/desktop-message-queue.md
index 025118b3a3f..1aa19a9a00e 100644
--- a/docs/desktop-message-queue.md
+++ b/docs/desktop-message-queue.md
@@ -35,11 +35,13 @@ Runtime Host already owns the durable message semantics:
 - While a turn is active, a composer submit queues a follow-up. There is no mode switch: Send is always Send.
 - `Cmd+Enter` on macOS (`Ctrl+Enter` on Windows/Linux) steers the draft into the active turn once; while idle it sends normally.
 - `Shift+Enter` and `Alt+Enter` always insert a line break, including during an active turn.
-- Queued messages render in a pending plate above the composer card, in send order (first at the top). Per entry the plate offers:
+- Queued follow-ups render in a pending plate above the composer card, in send order (first at the top). Queued steering renders as transcript bubbles instead, where its Edit and Delete actions retract the entry. Per plate entry:
   - drag the hover grip to reorder the follow-up queue,
-  - promote (立即发送) to steer the entry into the active turn,
-  - retract (收回草稿) to restore the entry into the composer draft.
-- Queue contents and mutations are Runtime Host operations (`turn.message.submit`, `queue.entry.promote`, `queue.entry.retract`, `queue.entries.reorder`); the renderer mirrors the authoritative projection.
+  - promote (直接发送 / Send now) to steer the entry into the active turn,
+  - edit to update the entry's text in place (Host CAS on the queue revision),
+  - delete to retract the entry.
+- Retracting an entry — via the plate's Delete or the transcript bubble's Edit — restores its full content (text, attachments, directory references, quotes) into the originating Session's composer draft.
+- Queue contents and mutations are Runtime Host operations (`turn.message.submit`, `queue.entry.promote`, `queue.entry.retract`, `queue.entry.update`, `queue.entries.reorder`); the renderer mirrors the authoritative projection.
 - Identical active toasts reuse one toast instead of stacking duplicates.
 
 ## Race Fix
@@ -48,4 +50,4 @@ Submission routing reads the synchronous live-turn ref and the latest session ca
 
 ## Deliberate Scope
 
-Per-entry queue mutation is limited to reorder, promote-to-steering, and retract-to-draft. Editing a queued entry in place, pausing the queue, and cross-session moves still require separate Runtime Host protocol and durability review.
+Per-entry queue mutation is limited to reorder, promote-to-steering, edit, and retract. Pausing the queue and cross-session moves still require separate Runtime Host protocol and durability review.
diff --git a/packages/ui/src/composer.tsx b/packages/ui/src/composer.tsx
index 6067528aca7..cd480e322f4 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -261,7 +261,7 @@ export interface ComposerHandle {
   /** Read a specific draft without changing the active input. */
   getDraft(draftKey: string): string;
   /** Append to a specific session draft without replacing newer text. */
-  appendDraft?(draftKey: string, text: string): void;
+  appendDraft(draftKey: string, text: string): void;
   /** Move focus to the input without changing its content. */
   focus(): void;
   /** Open the active Session's existing account-and-model picker. */

From 0c3a11af2b3da2bad24885e217982192c47146fe Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 18:47:28 +0800
Subject: [PATCH 16/33] test(cli): adapt session driver tests to unconditional
 queue seed

seedActive now always carries the authoritative queue snapshot, so the
CLI turn streams see a queue_update ahead of live frames even for an
empty queue. Rename the turn-event reader to nextTurnEvent and have it
skip session-level queue_update frames; none of these tests exercise
queue projection.

Two tests needed real fixes beyond framing: the pre-resync backlog test
now skips the seed frame before asserting the first surviving live
event, and the "unconsumed terminal across replacement" pair was relying
on microtask timing - the settlement transcript refresh opens its own
subscription, so recovery actually opens a later subscription than the
fixtures assumed. Give the fixtures enough fake subscriptions for the
recovery to genuinely replace, and wait on the replacement being pumped
instead of an open count.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../runtime-host-session-driver.test.ts       | 124 +++++++++++-------
 1 file changed, 73 insertions(+), 51 deletions(-)

diff --git a/packages/cli/src/__tests__/runtime-host-session-driver.test.ts b/packages/cli/src/__tests__/runtime-host-session-driver.test.ts
index 937e4b66bee..9f9955e398b 100644
--- a/packages/cli/src/__tests__/runtime-host-session-driver.test.ts
+++ b/packages/cli/src/__tests__/runtime-host-session-driver.test.ts
@@ -1123,7 +1123,7 @@ describe('Runtime Host Maka Session driver', () => {
     const switched = await switching;
     assert.deepEqual(switched.messages, [assistantMessage('turn-1', 'Hello')]);
     assert.ok(switched.activeTurn);
-    const event = await nextEvent(switched.activeTurn.events);
+    const event = await nextTurnEvent(switched.activeTurn.events);
     assert.deepEqual(event, {
       type: 'text_delta',
       id: 'host-frame:host-1:subscription-1:1',
@@ -1155,9 +1155,9 @@ describe('Runtime Host Maka Session driver', () => {
 
     assert.deepEqual(
       [
-        await nextEvent(switched.activeTurn.events),
-        await nextEvent(switched.activeTurn.events),
-        await nextEvent(switched.activeTurn.events),
+        await nextTurnEvent(switched.activeTurn.events),
+        await nextTurnEvent(switched.activeTurn.events),
+        await nextTurnEvent(switched.activeTurn.events),
       ].map((event) => ({
         type: event.type,
         messageId: 'messageId' in event ? event.messageId : undefined,
@@ -1238,9 +1238,9 @@ describe('Runtime Host Maka Session driver', () => {
 
     const switched = await switching;
     assert.ok(switched.activeTurn);
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'text_delta');
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'text_complete');
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'text_delta');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'text_complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
   });
 
@@ -1286,7 +1286,7 @@ describe('Runtime Host Maka Session driver', () => {
         rootTurn: completedTurn('turn-1', 'run-1'),
       }),
     });
-    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => refresh.transcriptCalls > 0);
     first.push({
@@ -1308,7 +1308,7 @@ describe('Runtime Host Maka Session driver', () => {
       assistantMessage('turn-2', 'New'),
     ]);
     second.push(deltaFrame(1, 'turn-2', 3, ' text', 'subscription-2', 'run-2'));
-    assert.equal((await nextEvent(attached.events)).type, 'text_delta');
+    assert.equal((await nextTurnEvent(attached.events)).type, 'text_delta');
   });
 
   test('hides the copied parent transcript when a Host starts the side successor turn', async () => {
@@ -1373,7 +1373,7 @@ describe('Runtime Host Maka Session driver', () => {
         rootTurn: completedTurn('turn-1', 'run-1'),
       }),
     });
-    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => refresh.transcriptCalls > 0);
     first.push({
@@ -1439,7 +1439,7 @@ describe('Runtime Host Maka Session driver', () => {
         rootTurn: completedTurn('turn-1', 'run-1'),
       }),
     });
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => refresh.transcriptCalls > 0);
     first.push({
@@ -1458,11 +1458,11 @@ describe('Runtime Host Maka Session driver', () => {
       userMessage('turn-2', 'Fast follow up'),
       assistantMessage('turn-2', 'Done'),
     ]);
-    const text = await nextEvent(attached.events);
+    const text = await nextTurnEvent(attached.events);
     assert.equal(text.type, 'text_complete');
     if (text.type !== 'text_complete') assert.fail('Expected the durable assistant answer');
     assert.equal(text.text, 'Done');
-    assert.equal((await nextEvent(attached.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(attached.events)).type, 'complete');
   });
 
   test('serializes buffered successor reattach so transcript completion cannot reverse turn order', async () => {
@@ -1506,7 +1506,7 @@ describe('Runtime Host Maka Session driver', () => {
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
     first.push(projectionFrame(3, completedTurn('turn-2', 'run-2'), 4));
     first.push(projectionFrame(4, runningTurn('turn-3', 'run-3'), 5));
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
 
     await waitFor(() => connection.openedSubscriptions === 4);
@@ -1582,7 +1582,7 @@ describe('Runtime Host Maka Session driver', () => {
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
     first.push(projectionFrame(3, completedTurn('turn-2', 'run-2'), 4));
     first.push(projectionFrame(4, runningTurn('turn-3', 'run-3'), 5));
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 4 && second.nextCalls > 0);
 
@@ -1642,7 +1642,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     first.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
-    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 3);
 
@@ -1689,7 +1689,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     first.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
-    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(
       () =>
@@ -1755,7 +1755,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     first.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
-    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 3);
 
@@ -1763,7 +1763,7 @@ describe('Runtime Host Maka Session driver', () => {
     assert.ok(switched.activeTurn);
     current.push(projectionFrame(1, completedTurn('turn-3', 'run-3'), 5, 'subscription-current'));
     current.push(projectionFrame(2, runningTurn('turn-4', 'run-4'), 6, 'subscription-current'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 6 && started.includes('turn-4'));
     assert.deepEqual(started, ['turn-4']);
@@ -1999,11 +1999,11 @@ describe('Runtime Host Maka Session driver', () => {
     });
     const switched = await driver.switchSession('session-1');
     assert.ok(switched.activeTurn);
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'user_question_request');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'user_question_request');
 
     await driver.respondToUserQuestion!({ requestId: 'question-1', answers: ['Yes'] });
 
-    assert.deepEqual(await nextEvent(switched.activeTurn.events), {
+    assert.deepEqual(await nextTurnEvent(switched.activeTurn.events), {
       type: 'user_question_answer_ack',
       id: 'host-interaction:question-1:2',
       turnId: 'turn-1',
@@ -2029,7 +2029,7 @@ describe('Runtime Host Maka Session driver', () => {
     });
     const switched = await driver.switchSession('session-1');
     assert.ok(switched.activeTurn);
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'form_request');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'form_request');
 
     await driver.respondToUserForm!({
       requestId: 'form-1',
@@ -2045,7 +2045,7 @@ describe('Runtime Host Maka Session driver', () => {
         answer: { kind: 'form', action: 'accept', values: { version: 'v2' } },
       },
     });
-    assert.deepEqual(await nextEvent(switched.activeTurn.events), {
+    assert.deepEqual(await nextTurnEvent(switched.activeTurn.events), {
       type: 'form_answer_ack',
       id: 'host-interaction:form-1:2',
       turnId: 'turn-1',
@@ -2490,7 +2490,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     const turn = await driver.preparePrompt('Continue');
     second.push(deltaFrame(1, 'turn-2', 0, 'Recovered', 'subscription-2', 'run-2'));
-    assert.equal((await nextEvent(turn.events)).text, 'Recovered');
+    assert.equal((await nextTurnEvent(turn.events)).text, 'Recovered');
   });
 
   test('starts explicit Skills through the Host command and preserves its typed feedback', async () => {
@@ -2742,7 +2742,7 @@ describe('Runtime Host Maka Session driver', () => {
     assert.deepEqual(await transcript.promise, [assistantMessage('turn-1', 'Hello world')]);
     assert.equal(connection.openedSubscriptions, 2);
     replacement.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-2'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
   });
 
   test('recovers the complete terminal answer when a Turn finishes during reconnect', async () => {
@@ -2774,10 +2774,10 @@ describe('Runtime Host Maka Session driver', () => {
     assert.ok(switched.activeTurn);
 
     initial.fail(new RuntimeHostSubscriptionError('connection_closed', 'connection lost'));
-    const text = await nextEvent(switched.activeTurn.events);
+    const text = await nextTurnEvent(switched.activeTurn.events);
     assert.equal(text.type, 'text_complete');
     assert.equal(text.text, 'Hello world');
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
   });
 
@@ -2823,8 +2823,8 @@ describe('Runtime Host Maka Session driver', () => {
     driver.subscribeStartedTurns!((turn) => started.resolve(turn));
 
     initial.fail(new RuntimeHostSubscriptionError('connection_closed', 'connection lost'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'text_complete');
-    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'text_complete');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     assert.equal((await started.promise).turnId, 'turn-2');
   });
@@ -3452,14 +3452,17 @@ function pendingPermission() {
   };
 }
 
-async function nextEvent(events: AsyncIterable<unknown>): Promise<any> {
+async function nextTurnEvent(events: AsyncIterable<unknown>): Promise<any> {
   const iterator = events[Symbol.asyncIterator]();
-  const result = await Promise.race([
-    iterator.next(),
-    delay(WAIT_BUDGET_MS).then(() => assert.fail('Timed out waiting for Session event')),
-  ]);
-  assert.equal(result.done, false);
-  return result.value;
+  for (;;) {
+    const result = await Promise.race([
+      iterator.next(),
+      delay(WAIT_BUDGET_MS).then(() => assert.fail('Timed out waiting for Session event')),
+    ]);
+    assert.equal(result.done, false);
+    const value = result.value as { type?: string };
+    if (value?.type !== 'queue_update') return result.value;
+  }
 }
 
 function sequenceIds(...ids: string[]): () => string {
@@ -3578,7 +3581,7 @@ describe('turn consumer lag recovery (#3180)', () => {
 
     // The stream never rejected, and live events land right away.
     replacement.push(deltaFrame(1, 'turn-1', 5, ' world', 'subscription-2'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).text, ' world');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, ' world');
   });
 
   test('lands terminal events while shedding deltas from a lagging consumer', async () => {
@@ -3658,7 +3661,8 @@ describe('turn consumer lag recovery (#3180)', () => {
     await delay(0);
 
     const iterator = switched.activeTurn.events[Symbol.asyncIterator]();
-    const first = await iterator.next();
+    let first = await iterator.next();
+    while (!first.done && first.value.type === 'queue_update') first = await iterator.next();
     assert.equal(first.done, false);
     assert.equal(first.value.type, 'tool_start');
     if (first.value.type === 'tool_start') assert.equal(first.value.toolUseId, 'tool-9000');
@@ -3761,7 +3765,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     assert.deepEqual(await transcript.promise, [assistantMessage('turn-1', 'Hello world')]);
     assert.equal(connection.openedSubscriptions, 2);
     replacement.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-2'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
   });
 
   test('recovers from a slow-consumer closure the Host held until hydration declared readiness', async () => {
@@ -3797,7 +3801,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     assert.ok(switched.activeTurn);
     await waitForSubscriptions(connection, 2);
     replacement.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-2'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
   });
 
   test('backs off several immediate clean-EOF replacements before recovering', async () => {
@@ -3841,7 +3845,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     // its transcript loads.
     await waitForSubscriptions(connection, 5);
     stable.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-5'));
-    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
   });
 
   for (const [name, replacementRoot] of [
@@ -3853,16 +3857,34 @@ describe('turn consumer lag recovery (#3180)', () => {
         continuitySnapshot(),
         Promise.resolve([assistantMessage('turn-1', 'Hello')]),
       );
-      const replacement = new FakeSubscription(
-        continuitySnapshot({ projectionRevision: 3, rootTurn: replacementRoot }),
-        Promise.resolve([
-          assistantMessage('turn-1', 'Hello'),
-          turnStateMessage('turn-1', 'completed'),
-          ...(replacementRoot.turnId === 'turn-2' ? [userMessage('turn-2', 'Continue')] : []),
-        ]),
+      const transcript = [
+        assistantMessage('turn-1', 'Hello'),
+        turnStateMessage('turn-1', 'completed'),
+        ...(replacementRoot.turnId === 'turn-2' ? [userMessage('turn-2', 'Continue')] : []),
+      ];
+      const snapshot = () =>
+        continuitySnapshot({ projectionRevision: 3, rootTurn: replacementRoot });
+      // A terminal settlement refreshes the transcript through its own
+      // subscription read, so the recovery replacement is not the second open.
+      const transcriptReader = new FakeSubscription(
+        snapshot(),
+        Promise.resolve(transcript),
         'subscription-2',
       );
-      const connection = new FakeConnection([initial, replacement], true);
+      const replacement = new FakeSubscription(
+        snapshot(),
+        Promise.resolve(transcript),
+        'subscription-3',
+      );
+      const settlementReader = new FakeSubscription(
+        snapshot(),
+        Promise.resolve(transcript),
+        'subscription-4',
+      );
+      const connection = new FakeConnection(
+        [initial, transcriptReader, replacement, settlementReader],
+        true,
+      );
       const driver = createRuntimeHostMakaSessionDriver({
         connection: connection.value,
         cwd: '/tmp',
@@ -3877,9 +3899,9 @@ describe('turn consumer lag recovery (#3180)', () => {
       initial.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
       await delay(0);
       initial.fail(new RuntimeHostSubscriptionError('connection_closed', 'connection lost'));
-      await waitForSubscriptions(connection, 2);
+      await waitFor(() => replacement.nextCalls > 0);
 
-      assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
+      assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
       assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     });
   }

From e706021f8c8faeab2f7c8b17c1baad8162e4e3f8 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 23:09:06 +0800
Subject: [PATCH 17/33] refactor(desktop): fold the message queue into the
 composer staging drawer

The pending plate was a second card floating above the composer, duplicating
the frame the drawer staging slab already owns. Queue rows now render as a
section inside the one ChatComposerDrawer, split from staged context by a
hairline, so there is a single collapse affordance and the queued section
collapses into the same count badge. Row actions align to the drawer content
edge instead of the old plate measure.

Stories cover the reachable states: queue-only, queue with staged context,
collapsed strip, overflowing list, inline edit, and the narrow viewport.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../ui/session-turn-request-composer.tsx      |   2 +-
 apps/desktop/src/renderer/styles/composer.css |  31 ++--
 .../src/renderer/styles/shell-layout.css      |   1 +
 .../composer-message-queue.stories.tsx        | 146 +++++++++++++++---
 packages/ui/src/composer-message-queue.tsx    |  10 +-
 packages/ui/src/composer.tsx                  |  33 ++--
 packages/ui/src/conversation-copy.ts          |   6 +
 7 files changed, 168 insertions(+), 61 deletions(-)

diff --git a/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx b/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx
index 6ae79ac6347..f031ff1eca7 100644
--- a/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx
+++ b/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx
@@ -294,7 +294,7 @@ function SessionTurnRequestComposerForSession(props: {
   return (
     <div className="sessionTurnRequestSurface">
       {requests.length > 0 ? (
-        <div className="maka-composer-queue sessionTurnRequestQueue">
+        <div className="sessionTurnRequestQueue">
           <Button
             variant="ghost"
             size="sm"
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index be5ff69b8f5..2cfc22a5572 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -86,22 +86,23 @@
 }
 
 .maka-composer-queue {
-  position: relative;
-  width: min(var(--maka-reading-measure), calc(100% - (2 * var(--space-6))));
-  max-width: var(--maka-reading-measure);
-  margin: 0 auto var(--space-1);
-  padding: var(--space-1);
-  box-sizing: border-box;
-  border-radius: var(--radius-chat);
-  background: var(--background-elevated);
-  box-shadow: inset 0 0 0 var(--border-width-hairline) var(--border);
-  /* Concentric with the plate, mirroring what ChatComposer derives for its
-     own footer buttons: max(--radius-element, radius - padding). The plate
-     sits outside the card, so the row ghost buttons must read it here. */
-  --_button-radius: max(var(--radius-element), calc(var(--radius-chat) - var(--spacing-3)));
+  width: 100%;
+  min-width: 0;
+  padding-bottom: var(--space-1);
+}
+
+.maka-composer-queue-list li {
+  padding-right: 0;
+}
+
+.maka-composer-drawer-divider {
+  width: calc(100% - (2 * var(--space-3)));
+  border-top: var(--border-width-hairline) solid var(--border);
+  margin: var(--space-0-5) var(--space-3);
 }
 
 .maka-composer-queue-list {
+  width: 100%;
   min-width: 0;
   max-height: 132px;
   overflow-y: auto;
@@ -155,10 +156,6 @@
 }
 
 @media (max-width: 640px) {
-  .maka-composer-queue {
-    width: min(var(--maka-reading-measure), calc(100% - (2 * var(--space-3))));
-  }
-
   .maka-composer-queue-actions {
     gap: 0;
   }
diff --git a/apps/desktop/src/renderer/styles/shell-layout.css b/apps/desktop/src/renderer/styles/shell-layout.css
index a4881384f5b..5e88e64708d 100644
--- a/apps/desktop/src/renderer/styles/shell-layout.css
+++ b/apps/desktop/src/renderer/styles/shell-layout.css
@@ -556,6 +556,7 @@ dialog:modal {
 
 .sessionTurnRequestQueue {
   margin-block-start: var(--space-2);
+  padding: var(--space-1);
 }
 
 .sessionTurnRequestQueueToggle {
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 3342b3f6ecb..0cc7f63bdeb 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -19,7 +19,8 @@
 
 import { useCallback, useMemo, useRef, useState } from 'react';
 import type { Meta, StoryObj } from '@storybook/react-vite';
-import type { ComponentProps } from 'react';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import type { ComponentProps, ReactElement, ReactNode } from 'react';
 import type { MessageQueueEntryProjection } from '@maka/core/events';
 import type { SessionSummary } from '@maka/core/session';
 import { Composer } from '@maka/ui';
@@ -176,23 +177,33 @@ function followUpEntry(entryId: string, text: string): MessageQueueEntryProjecti
  * (projection in, mutations
  * out) is the real one; only the authority is simulated.
  */
-function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
+// A production queue snapshot also carries queued steering; the drawer filters
+// it out — steering renders in the transcript instead (see the
+// QueuedSteeringInTranscript story in app-shell).
+const DEFAULT_QUEUE: MessageQueueEntryProjection[] = [
+  {
+    entryId: 'entry-steer',
+    messageId: 'message-steer',
+    content: { text: '先把刚才的判断改成只检查当前工作树。' },
+    placement: 'current_turn',
+    state: 'queued',
+  },
+  followUpEntry('entry-1', '先不要改协议。'),
+  followUpEntry('entry-2', '查一下 PR #3526 相关的 session 及其 compaction 诊断记录。'),
+  followUpEntry('entry-3', '把 runtime.sqlite 里的 compaction 日志也带上。'),
+];
+
+function QueuedComposer({
+  deliveryState,
+  stagedContext = true,
+  entries = DEFAULT_QUEUE,
+}: {
+  deliveryState: DeliveryState;
+  stagedContext?: boolean;
+  entries?: MessageQueueEntryProjection[];
+}) {
   const composerRef = useRef<ComposerHandle>(null);
-  // A production queue snapshot also carries queued steering; the plate filters
-  // it out — steering renders in the transcript instead (see the
-  // QueuedSteeringInTranscript story in app-shell).
-  const [followup, setFollowup] = useState<MessageQueueEntryProjection[]>([
-    {
-      entryId: 'entry-steer',
-      messageId: 'message-steer',
-      content: { text: '先把刚才的判断改成只检查当前工作树。' },
-      placement: 'current_turn',
-      state: 'queued',
-    },
-    followUpEntry('entry-1', '先不要改协议。'),
-    followUpEntry('entry-2', '查一下 PR #3526 相关的 session 及其 compaction 诊断记录。'),
-    followUpEntry('entry-3', '把 runtime.sqlite 里的 compaction 日志也带上。'),
-  ]);
+  const [followup, setFollowup] = useState<MessageQueueEntryProjection[]>(entries);
 
   const base: ComposerProps = {
     draftKey: 'storybook-composer-queue',
@@ -207,6 +218,14 @@ function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
     onPermissionModeChange: noop,
     onPickAttachments: noop,
     streaming: true,
+    // Real mid-turn state can stage context while follow-ups wait: the two
+    // sections stack inside the one staging drawer.
+    pendingQuotes: stagedContext
+      ? [{ text: 'queue.entries 表在 Host 端是唯一权威', label: '设计笔记' }]
+      : undefined,
+    pendingAttachments: stagedContext
+      ? [{ kind: 'other', displayName: 'compaction-audit.md', mimeType: 'text/markdown', size: 12_400 }]
+      : undefined,
   };
 
   const [published, setPublished] = useState(new Map<string, TransientUserMessageProjection>());
@@ -267,8 +286,13 @@ function QueuedComposer({ deliveryState }: { deliveryState: DeliveryState }) {
   );
 }
 
-// Real path: mid-turn sends stay visible above the composer until consumed.
-// Drag follow-ups to reorder; 调整方向 promotes one, 编辑 updates it in place.
+function storyFrame(children: ReactNode): ReactElement {
+  return <div style={{ padding: '24px 24px 48px', maxWidth: 840 }}>{children}</div>;
+}
+
+// Real path: mid-turn sends while a quote and a file are staged — the staging
+// drawer holds the queue section above a hairline and the context chips below.
+// Drag follow-ups to reorder; 直接发送 promotes one, 编辑 updates it in place.
 export const PendingPlate: Story = {
   args: { deliveryState: 'queued' },
   argTypes: {
@@ -277,9 +301,83 @@ export const PendingPlate: Story = {
       control: { type: 'radio' },
     },
   },
-  render: (args) => (
-    <div style={{ padding: '24px 24px 48px', maxWidth: 840 }}>
-      <QueuedComposer key={args.deliveryState} deliveryState={args.deliveryState} />
-    </div>
-  ),
+  render: (args) =>
+    storyFrame(
+      <QueuedComposer key={args.deliveryState} deliveryState={args.deliveryState} />,
+    ),
+};
+
+// Real path: follow-ups sent mid-turn with nothing staged — the drawer holds
+// the queue section alone and collapses to a "N 条待发送消息" strip.
+export const QueueOnly: Story = {
+  args: { deliveryState: 'queued' },
+  render: () => storyFrame(<QueuedComposer deliveryState="queued" stagedContext={false} />),
+};
+
+// Real path: the user folds the staging slab; every staged item collapses into
+// the count strip until it is reopened.
+export const StagingCollapsed: Story = {
+  args: { deliveryState: 'queued' },
+  render: () => storyFrame(<QueuedComposer deliveryState="queued" />),
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getByRole('button', { name: /收起|collapse/i }));
+    await waitFor(() => {
+      expect(canvas.queryByText('先不要改协议。')).toBeNull();
+      expect(canvas.getByRole('button', { name: /附加内容|staged/i })).toBeVisible();
+    });
+  },
+};
+
+// Real path: a long Turn while the user keeps queueing — the list scrolls
+// inside the drawer instead of growing the composer.
+export const OverflowingQueue: Story = {
+  args: { deliveryState: 'queued' },
+  render: () =>
+    storyFrame(
+      <QueuedComposer
+        deliveryState="queued"
+        stagedContext={false}
+        entries={Array.from({ length: 9 }, (_, index) =>
+          followUpEntry(`entry-${index + 1}`, `排队跟进 ${index + 1}：检查 compaction 诊断记录的第 ${index + 1} 段。`),
+        )}
+      />,
+    ),
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const list = canvasElement.querySelector<HTMLElement>('.maka-composer-queue-list');
+    await waitFor(() => {
+      expect(list).not.toBeNull();
+      expect(list!.scrollHeight).toBeGreaterThan(list!.clientHeight);
+    });
+    await expect(canvas.getAllByText(/^排队跟进/).length).toBe(9);
+  },
+};
+
+// Real path: the pencil on a queued row opens an inline editor inside the
+// drawer; Enter commits, Escape cancels.
+export const EditingQueuedEntry: Story = {
+  args: { deliveryState: 'queued' },
+  render: () => storyFrame(<QueuedComposer deliveryState="queued" stagedContext={false} />),
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getAllByRole('button', { name: '编辑' })[1]!);
+    const editor = await canvas.findByRole('textbox', { name: '编辑' });
+    await expect(editor).toHaveValue('查一下 PR #3526 相关的 session 及其 compaction 诊断记录。');
+    await userEvent.clear(editor);
+    await userEvent.type(editor, '改查 PR #3526 的 session 列表。');
+    await userEvent.keyboard('{Enter}');
+    await waitFor(() => {
+      expect(canvas.getByText('改查 PR #3526 的 session 列表。')).toBeVisible();
+      expect(canvas.queryByRole('textbox', { name: '编辑' })).toBeNull();
+    });
+  },
+};
+
+// Real path: a 720px Desktop window — the smoke runner gives ids containing
+// "narrow" the narrow viewport; rows stay one line and actions keep the
+// trailing edge.
+export const NarrowPendingPlate: Story = {
+  args: { deliveryState: 'queued' },
+  render: () => storyFrame(<QueuedComposer deliveryState="queued" />),
 };
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index a3cf2f1c480..f36e19d2f41 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -32,11 +32,11 @@ type ComposerQueueEntry = Omit<MessageQueueEntryProjection, 'state'> & {
 };
 
 /**
- * The pending plate above the composer card. It lists follow-up entries —
- * Host-queued and still in flight — so a queued message stays editable,
- * reorderable and deletable until a Turn consumes it. Steering targets the
- * active Turn and lives in the transcript instead, where its delivery state
- * is message metadata rather than a queue row.
+ * The queued follow-up section of the composer staging drawer. It lists
+ * follow-up entries — Host-queued and still in flight — so a queued message
+ * stays editable, reorderable and deletable until a Turn consumes it.
+ * Steering targets the active Turn and lives in the transcript instead, where
+ * its delivery state is message metadata rather than a queue row.
  */
 export interface ComposerMessageQueueProps {
   queuedMessages: readonly ComposerQueueEntry[];
diff --git a/packages/ui/src/composer.tsx b/packages/ui/src/composer.tsx
index cd480e322f4..7d06ece013b 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -1901,17 +1901,6 @@ export const Composer = forwardRef<
           />
         </div>
       )}
-      {!props.hidden && queueCount > 0 ? (
-          <ComposerMessageQueue
-            queuedMessages={queuedMessages}
-            queueRevision={props.queuedMessageRevision}
-          copy={copy}
-          onPromoteEntry={props.onPromoteQueuedEntry}
-          onUpdateEntry={props.onUpdateQueuedEntry}
-          onDeleteEntry={props.onDeleteQueuedEntry}
-          onReorderEntries={props.onReorderQueuedEntries}
-        />
-      ) : null}
       <form
         ref={formRef}
         className="maka-composer composer"
@@ -1935,11 +1924,11 @@ export const Composer = forwardRef<
           // render our own into the `sendButton` slot.
           onSubmit={() => {}}
           isDisabled={props.disabled}
-          drawer={drawerTokenCount > 0 ? (
+          drawer={queueCount > 0 || drawerTokenCount > 0 ? (
             <ChatComposerDrawer
               className="maka-composer-drawer"
-              count={drawerTokenCount}
-              label={copy.stagedContext}
+              count={queueCount + drawerTokenCount}
+              label={drawerTokenCount > 0 ? copy.stagedContext : copy.queuedMessages}
               defaultIsCollapsed={props.contextDrawerDefaultCollapsed}
               // The collapse band's tooltip (composer.css ::after) follows the
               // pointer instead of sitting at a fixed offset — on a full-width
@@ -1976,6 +1965,21 @@ export const Composer = forwardRef<
                   ?.style.removeProperty('--maka-drawer-tooltip-x');
               }}
             >
+              {!props.hidden && queueCount > 0 ? (
+                <ComposerMessageQueue
+                  queuedMessages={queuedMessages}
+                  queueRevision={props.queuedMessageRevision}
+                  copy={copy}
+                  onPromoteEntry={props.onPromoteQueuedEntry}
+                  onUpdateEntry={props.onUpdateQueuedEntry}
+                  onDeleteEntry={props.onDeleteQueuedEntry}
+                  onReorderEntries={props.onReorderQueuedEntries}
+                />
+              ) : null}
+              {queueCount > 0 && drawerTokenCount > 0 ? (
+                <div className="maka-composer-drawer-divider" aria-hidden="true" />
+              ) : null}
+              {drawerTokenCount > 0 ? (
               <div className="maka-composer-context-drawer" role="group" aria-label={copy.stagedContext}>
                 {props.pendingDirectories?.map((reference, index) => (
                   <DirectoryReferenceChip
@@ -2117,6 +2121,7 @@ export const Composer = forwardRef<
                   );
                 })}
               </div>
+              ) : null}
             </ChatComposerDrawer>
           ) : undefined}
           input={(
diff --git a/packages/ui/src/conversation-copy.ts b/packages/ui/src/conversation-copy.ts
index 438ae582b20..e292972afcb 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -91,6 +91,9 @@ export interface ConversationCopy {
     importing: string;
     sendLabel: string;
     queuedMessagesAriaLabel(count: number): string;
+    /** Noun label for the staging drawer when it holds only queued follow-ups —
+     * the collapsed badge reads "N 待发送". Mixed drawers use `stagedContext`. */
+    queuedMessages: string;
     promoteQueuedEntry: string;
     editQueuedEntry: string;
     saveQueuedEntry: string;
@@ -445,6 +448,7 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', quoteCommentTitle: '引用注释', quoteCommentSave: '保存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已选择的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你确认权限…',
       sending: '正在发送…', importing: '正在导入…', sendLabel: '发送',
       queuedMessagesAriaLabel: (count) => `${count} 条待发送消息`,
+      queuedMessages: '待发送',
       promoteQueuedEntry: '直接发送', editQueuedEntry: '编辑', saveQueuedEntry: '保存', cancelQueuedEntryEdit: '取消编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '添加上下文', stagedContext: '附加内容',
@@ -568,6 +572,7 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', quoteCommentTitle: '引用註解', quoteCommentSave: '儲存', quoteCommentCancel: '取消', selectedSkillsAriaLabel: '已選擇的 Skill', removeSkillAriaLabel: (name) => `移除 Skill：${name}`, awaitingPermission: '等待你確認權限…',
       sending: '正在傳送…', importing: '正在匯入…', sendLabel: '傳送',
       queuedMessagesAriaLabel: (count) => `${count} 條待發送訊息`,
+      queuedMessages: '待發送',
       promoteQueuedEntry: '直接傳送', editQueuedEntry: '編輯', saveQueuedEntry: '儲存', cancelQueuedEntryEdit: '取消編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '新增上下文', stagedContext: '附加內容',
@@ -691,6 +696,7 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', quoteCommentTitle: 'Quote annotation', quoteCommentSave: 'Save', quoteCommentCancel: 'Cancel', selectedSkillsAriaLabel: 'Selected Skills', removeSkillAriaLabel: (name) => `Remove Skill: ${name}`, awaitingPermission: 'Waiting for your permission decision…',
       sending: 'Sending…', importing: 'Importing…', sendLabel: 'Send',
       queuedMessagesAriaLabel: (count) => `${count} queued message${count === 1 ? '' : 's'}`,
+      queuedMessages: 'queued',
       promoteQueuedEntry: 'Send now', editQueuedEntry: 'Edit', saveQueuedEntry: 'Save', cancelQueuedEntryEdit: 'Cancel editing', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',
       stopLabel: 'Stop', stopping: 'Stopping…',
       addContext: 'Add context', stagedContext: 'staged items',

From e2db92d0c395728f85686e53a27b1bc83df1322d Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 22 Sep 2026 23:25:42 +0800
Subject: [PATCH 18/33] refactor(desktop): share the queued-entry
 retract-to-draft path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Three surfaces carried the same retract block — service call, site-specific
error reporting, then rebuilding RestoredDraftContent field by field. The
contract now owns that shape once; each caller keeps only its id guard and
error channel.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../contracts/transient-message-projection.ts | 32 +++++++++++++++++++
 .../controller/use-session-message-queue.ts   | 27 ++++++----------
 .../tools/side-chat/use-quote-companion.ts    | 27 ++++++----------
 .../controller/use-workhub-controller.ts      | 21 +++++-------
 4 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index ab2a25d1d2f..35706d8d4ba 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -44,6 +44,38 @@ export interface RestoredDraftContent {
   quotes?: readonly QuoteRef[];
 }
 
+/**
+ * One retract-and-restore path for every surface's queued-entry edit: the Host
+ * call first, the draft hand-back only when the caller passed the text.
+ * `retractEntry` owns the service call, `reportError` the surface's failure
+ * channel; resolves false when the retract failed.
+ */
+export async function retractQueueEntryToDraft(
+  entry: MessageQueueEntryProjection,
+  draftText: string | undefined,
+  options: {
+    retractEntry(): Promise<unknown>;
+    reportError(error: unknown): void;
+    restoreDraft?(draft: RestoredDraftContent): void;
+  },
+): Promise<boolean> {
+  try {
+    await options.retractEntry();
+  } catch (error) {
+    options.reportError(error);
+    return false;
+  }
+  if (draftText !== undefined) {
+    options.restoreDraft?.({
+      text: draftText,
+      attachments: entry.content.attachments,
+      directoryReferences: entry.content.directoryReferences,
+      quotes: entry.content.quotes,
+    });
+  }
+  return true;
+}
+
 /**
  * Edit/delete controls for steering the Host queued but has not consumed.
  * Both retract the queue entry; edit also hands the text back to the caller's
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index f2b891e02c7..469243f7324 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -25,6 +25,7 @@ import {
   type TransientUserMessageProjection,
 } from '@maka/ui';
 import {
+  retractQueueEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
@@ -109,23 +110,15 @@ export function useSessionMessageQueue(options: {
     () => withQueuedSteeringTransients(transientMessages, queue, {
       locale,
       editable: true,
-      retract: async (entry, draftText) => {
-        if (!sessionId) return false;
-        try {
-          await services.sessions.retractQueueEntry(sessionId, entry.entryId);
-        } catch (error) {
-          if (activeSessionId.current === sessionId) reportError(sessionId, error);
-          return false;
-        }
-        if (draftText !== undefined) {
-          restoreDraft(sessionId, {
-            text: draftText,
-            attachments: entry.content.attachments,
-            directoryReferences: entry.content.directoryReferences,
-            quotes: entry.content.quotes,
-          });
-        }
-        return true;
+      retract: (entry, draftText) => {
+        if (!sessionId) return Promise.resolve(false);
+        return retractQueueEntryToDraft(entry, draftText, {
+          retractEntry: () => services.sessions.retractQueueEntry(sessionId, entry.entryId),
+          reportError: (error) => {
+            if (activeSessionId.current === sessionId) reportError(sessionId, error);
+          },
+          restoreDraft: (draft) => restoreDraft(sessionId, draft),
+        });
       },
     }),
     [sessionId, transientMessages, queue, locale, activeSessionId, services, reportError, restoreDraft],
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index d63fa413316..0a921d712e9 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -77,6 +77,7 @@ import { mergeSettledMessages } from '../../../../settled-message-merge.js';
 import {
   mergeTransientMessageProjection,
   reconcileTransientMessages,
+  retractQueueEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../../application/contracts/transient-message-projection.js';
@@ -1757,24 +1758,16 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const transientMessages = withQueuedSteeringTransients(pendingUserMessages, messageQueue, {
     locale: localeRef.current,
     editable: input.restoreDraft !== undefined,
-    retract: async (entry, draftText) => {
+    retract: (entry, draftText) => {
       const forkId = companionIdRef.current;
-      if (!forkId) return false;
-      try {
-        await sideChat.retractQueueEntry(forkId, entry.entryId);
-      } catch {
-        if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
-        return false;
-      }
-      if (draftText !== undefined) {
-        restoreDraftRef.current?.(forkId, {
-          text: draftText,
-          attachments: entry.content.attachments,
-          directoryReferences: entry.content.directoryReferences,
-          quotes: entry.content.quotes,
-        });
-      }
-      return true;
+      if (!forkId) return Promise.resolve(false);
+      return retractQueueEntryToDraft(entry, draftText, {
+        retractEntry: () => sideChat.retractQueueEntry(forkId, entry.entryId),
+        reportError: () => {
+          if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
+        },
+        restoreDraft: (draft) => restoreDraftRef.current?.(forkId, draft),
+      });
     },
   });
   // Inherited model (read-only): the fork's once created, else the source's.
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index e0f95bcbffe..1635931e43b 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -20,6 +20,7 @@
 import { activeHostTurn, chatTurnActivity, type SessionExecutionProjection } from '../../../application/contracts/session-execution.js';
 import { deriveMessageQueueProjection } from '../../../application/contracts/message-queue-projection.js';
 import {
+  retractQueueEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
@@ -741,19 +742,13 @@ export function useWorkHubController(
     transientMessages: withQueuedSteeringTransients(transientMessages, messageQueue, {
       locale,
       editable: restoreDraft !== undefined,
-      retract: async (entry, draftText) => {
-        if (!sessionId) return false;
-        try { await services.retractQueueEntry(sessionId, entry.entryId); }
-        catch (reason) { report(reason); return false; }
-        if (draftText !== undefined) {
-          restoreDraftRef.current?.(sessionId, {
-            text: draftText,
-            attachments: entry.content.attachments,
-            directoryReferences: entry.content.directoryReferences,
-            quotes: entry.content.quotes,
-          });
-        }
-        return true;
+      retract: (entry, draftText) => {
+        if (!sessionId) return Promise.resolve(false);
+        return retractQueueEntryToDraft(entry, draftText, {
+          retractEntry: () => services.retractQueueEntry(sessionId, entry.entryId),
+          reportError: report,
+          restoreDraft: (draft) => restoreDraftRef.current?.(sessionId, draft),
+        });
       },
     }),
     messageQueue,

From 640cff252e91f34a447f0d0cc92ce0f9ea16ee9a Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 12:57:54 +0800
Subject: [PATCH 19/33] fix(desktop): reconcile queue delivery with the rebased
 Host queue projection

Steering bubbles now cover in-flight entries and use the rebased 'transcript' placement; test and story service fixtures pick up the new readExecutionBoundary/runtimeHosts ports.

Generated-by: Devin
---
 .../__tests__/app-shell-first-send-cleanup.test.ts    |  4 ++++
 .../src/main/__tests__/message-queue-ui-state.test.ts |  7 +++++--
 .../__tests__/runtime-host-session-observer.test.ts   |  8 ++++----
 .../session-workspace-action-identity.test.ts         |  2 ++
 .../__tests__/transient-message-projection.test.ts    |  7 +++++++
 .../contracts/transient-message-projection.ts         |  4 ++--
 .../controller/session-local-messages.tsx             |  1 +
 .../controller/use-session-message-queue.ts           |  2 +-
 .../src/renderer/locales/session-local-copy.ts        |  4 ++++
 .../stories/composer-message-queue.stories.tsx        | 11 +++++++++--
 .../runtime-host/src/adapter/session-projector.ts     |  5 ++++-
 .../ui/src/__tests__/chat-turn-steering-order.test.ts |  2 +-
 .../ui/src/__tests__/composer-send-toggle.test.tsx    |  4 +++-
 13 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
index 520716409de..fa7b64d11aa 100644
--- a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
+++ b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
@@ -729,11 +729,15 @@ describe('composer first-send cleanup', () => {
         readSnapshot: async () => {
           throw new Error('Session snapshot is not used in this test');
         },
+        readExecutionBoundary: async () => {
+          throw new Error('Execution boundary is not used in this test');
+        },
         promoteQueueEntry: async () => undefined,
         updateQueueEntry: async () => undefined,
         retractQueueEntry: async () => undefined,
         reorderQueueEntries: async () => undefined,
       },
+      runtimeHosts: { subscribeChanges: () => () => undefined },
       workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
       newTasks: {
         subscribeChanges: () => () => undefined,
diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index c5c9db98b84..576a4386a0a 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -57,7 +57,6 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       cancelMessage: async (sessionId, messageId) => { cancelled.push([sessionId, messageId]); },
       reconcileMessage: async (sessionId, messageId) => { reconciled.push([sessionId, messageId]); },
       sessions: {
-        list: async () => [], subscribeChanges: () => () => {},
         readSnapshot: async () => { throw new Error('unexpected snapshot read'); },
         readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
         promoteQueueEntry: async () => undefined, updateQueueEntry: async () => undefined,
@@ -170,7 +169,7 @@ test('queue_update stores the snapshot and retires every listed local placeholde
     id: 'message-next', text: 'do this next', ts: 1, transientPlacement: 'follow_up',
   });
   transientMessages.set('message-steer', {
-    id: 'message-steer', text: 'adjust this run', ts: 1, transientPlacement: 'current_turn',
+    id: 'message-steer', text: 'adjust this run', ts: 1, transientPlacement: 'transcript',
     pendingSteering: true,
   });
 
@@ -220,6 +219,8 @@ test('queue_update stores the snapshot and retires every listed local placeholde
   });
   assert.equal(transientMessages.size, 0);
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
+    turnId: 'turn-1',
+    ts: 3,
     queueRevision: 4,
     entries: [nextEntry],
   });
@@ -467,6 +468,7 @@ test('editing a queued steering restores content under the owning Session even a
         reconcileMessage: async () => {},
         sessions: {
           readSnapshot: async () => { throw new Error('unexpected snapshot read'); },
+          readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
           promoteQueueEntry: async () => undefined,
           updateQueueEntry: async () => undefined,
           retractQueueEntry: async (sessionId: string, entryId: string) => {
@@ -474,6 +476,7 @@ test('editing a queued steering restores content under the owning Session even a
           },
           reorderQueueEntries: async () => undefined,
         },
+        runtimeHosts: { subscribeChanges: () => () => {} },
         skills: { listInvocable: async () => [] },
         workspace: { searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
         newTasks: { subscribeChanges: () => () => {}, listInvocableSkills: async () => [], searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts
index a77a91e3560..e82485498f3 100644
--- a/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts
+++ b/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts
@@ -3107,7 +3107,7 @@ test("projects Host queue revisions and places steering from the runtime event",
       },
     }),
   });
-  await waitFor(() => target.events.length === 2);
+  await waitFor(() => target.events.length === 3);
   events.push({
     kind: "subscription.session_event",
     hostEpoch: "host-1",
@@ -3124,13 +3124,13 @@ test("projects Host queue revisions and places steering from the runtime event",
       content: { text: "Change direction" },
     },
   });
-  await waitFor(() => target.events.length === 4);
+  await waitFor(() => target.events.length === 5);
 
   assert.deepEqual(
     target.events.map((event) =>
       event.type === "queue_update" ? event.steeringEntries?.map((entry) => entry.state) : event.type,
     ),
-    [["queued"], ["in_flight"], [], "steering_message"],
+    [[], ["queued"], ["in_flight"], [], "steering_message"],
   );
   assert.deepEqual(target.events[1], {
     type: "queue_update",
@@ -3143,7 +3143,7 @@ test("projects Host queue revisions and places steering from the runtime event",
     steeringEntries: [queued],
     followupEntries: [],
   });
-  assert.deepEqual(target.events[3], {
+  assert.deepEqual(target.events[4], {
     type: "steering_message",
     id: "steering-event-1",
     turnId: "turn-1",
diff --git a/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts b/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
index 2ea5e71e340..b3ce50713cf 100644
--- a/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
+++ b/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
@@ -69,11 +69,13 @@ function stubConversationServices(): ConversationServices {
       readSnapshot: async () => {
         throw new Error('Session snapshot is not used in this test');
       },
+      readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
       promoteQueueEntry: async () => undefined,
       updateQueueEntry: async () => undefined,
       retractQueueEntry: async () => undefined,
       reorderQueueEntries: async () => undefined,
     },
+    runtimeHosts: { subscribeChanges: () => () => undefined },
     workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
     newTasks: {
       subscribeChanges: () => () => undefined,
diff --git a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
index fa7650f3af8..4dbfc811c72 100644
--- a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
+++ b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
@@ -144,6 +144,13 @@ test('derives one queue projection for main and Side Conversation consumers', ()
     ts: 7,
     queueRevision: 3,
     entries: [
+      {
+        entryId: 'in-flight',
+        messageId: 'message-in-flight',
+        content: { text: 'in flight' },
+        placement: 'current_turn',
+        state: 'in_flight',
+      },
       {
         entryId: 'steer',
         messageId: 'message-steer',
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 35706d8d4ba..eab5d448603 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -124,12 +124,12 @@ export function withQueuedSteeringTransients(
   },
 ): TransientUserMessage[] {
   const steering = (queue?.entries ?? []).filter(
-    (entry) => entry.placement === 'current_turn' && entry.state === 'queued',
+    (entry) => entry.placement === 'current_turn',
   );
   if (steering.length === 0) return [...transientMessages];
   const bubbles = steering.map((entry): TransientUserMessage => ({
     id: entry.messageId,
-    transientPlacement: 'current_turn',
+    transientPlacement: 'transcript',
     pendingSteering: true,
     hostTurnId: queue?.turnId,
     ts: queue?.ts ?? 0,
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index 9bf0b668702..df66a233bf7 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -46,6 +46,7 @@ export function SessionLocalMessages(props: {
         .listMessages(sessionId)
         .then((messages) => {
           if (disposed || revision !== admitted) return;
+          let waitingForPrevious = false;
           for (const message of messages) {
             if (message.state === 'accepted' && !message.turnId) {
               // The Host queue owns accepted steering and follow-ups. A local
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index 469243f7324..31eac38f632 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -29,7 +29,7 @@ import {
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
-import { getDesktopConversationCopy } from '../../../locales/conversation-copy.js';
+import { getDesktopConversationCopy } from '../../../application/contracts/conversation-copy.js';
 import { localizedShellErrorMessage } from '../../../locales/shell-copy.js';
 import { useConversationServices } from '../services.js';
 import type { MessageQueueUiState } from '../model/session-ui-state.js';
diff --git a/apps/desktop/src/renderer/locales/session-local-copy.ts b/apps/desktop/src/renderer/locales/session-local-copy.ts
index a7c53bbc630..bfa0df59b0c 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -21,6 +21,7 @@ import type { UiCatalog, UiLocale } from '@maka/core/ui-locale';
 
 interface SessionLocalCopy {
   saved: string;
+  waitingForPrevious: string;
   unknown: string;
   failed: string;
   edit: string;
@@ -33,6 +34,7 @@ interface SessionLocalCopy {
 const catalog = {
   en: {
     saved: 'Waiting to send',
+    waitingForPrevious: 'Waiting for earlier messages to be delivered',
     unknown: 'Delivery unconfirmed. Do not send again.',
     failed: 'Could not send · message kept',
     edit: 'Edit',
@@ -43,6 +45,7 @@ const catalog = {
   },
   'zh-CN': {
     saved: '等待发送',
+    waitingForPrevious: '等待之前的消息送达',
     unknown: '暂时无法确认是否送达，请勿重复发送',
     failed: '未能发送 · 消息已保留',
     edit: '编辑',
@@ -53,6 +56,7 @@ const catalog = {
   },
   'zh-TW': {
     saved: '等待傳送',
+    waitingForPrevious: '等待先前的訊息送達',
     unknown: '暫時無法確認是否送達，請勿重複傳送',
     failed: '無法傳送 · 訊息已保留',
     edit: '編輯',
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 0cc7f63bdeb..9889cafc711 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -94,11 +94,15 @@ function localDeliveryServices(state: DeliveryState): ConversationServices {
       readSnapshot: async () => {
         throw new Error('Session snapshots are not used in this story');
       },
+      readExecutionBoundary: async () => {
+        throw new Error('Execution boundary is not used in this story');
+      },
       promoteQueueEntry: async () => undefined,
       updateQueueEntry: async () => undefined,
       retractQueueEntry: async () => undefined,
       reorderQueueEntries: async () => undefined,
     },
+    runtimeHosts: { subscribeChanges: () => () => undefined },
     skills: { listInvocable: async () => [] },
     workspace: {
       searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }),
@@ -323,8 +327,11 @@ export const StagingCollapsed: Story = {
     const canvas = within(canvasElement);
     await userEvent.click(canvas.getByRole('button', { name: /收起|collapse/i }));
     await waitFor(() => {
-      expect(canvas.queryByText('先不要改协议。')).toBeNull();
-      expect(canvas.getByRole('button', { name: /附加内容|staged/i })).toBeVisible();
+      // Collapsed content stays mounted under the grid-row collapse — assert on
+      // the disclosure state, not DOM removal.
+      const toggle = canvas.getByRole('button', { name: /展开|expand/i });
+      expect(toggle).toHaveAttribute('aria-expanded', 'false');
+      expect(toggle).toHaveTextContent(/5|附加内容|staged/i);
     });
   },
 };
diff --git a/packages/runtime-host/src/adapter/session-projector.ts b/packages/runtime-host/src/adapter/session-projector.ts
index 99ea57dbb22..5c97f44b844 100644
--- a/packages/runtime-host/src/adapter/session-projector.ts
+++ b/packages/runtime-host/src/adapter/session-projector.ts
@@ -30,6 +30,7 @@ import type {
   SessionContinuitySnapshot,
   SessionAssistantStreamIdentity,
   SessionMessageQueueProjection,
+  SteeringMessageSnapshot,
   SessionSteeringEvent,
   SubscriptionFrame,
   LiveTurnSnapshot,
@@ -177,7 +178,9 @@ export class RuntimeHostSessionProjector {
     const events: SessionEvent[] = [];
     // The seed is the only queue evidence a re-observing or reconnecting client
     // receives — an empty queue must still clear its last-seen entries.
-    const queueEvents = [projectQueueUpdate(this.#unplacedQueue(this.#snapshot.queue), root.turnId, this.#now())];
+    const queueEvents = [
+      projectQueueUpdate(this.#unplacedQueue(this.#snapshot.queue), root.turnId, this.#now()),
+    ];
     if (this.#projectMessageAdmissions) {
       events.push(
         ...projectMessageAdmissionEvents(
diff --git a/packages/ui/src/__tests__/chat-turn-steering-order.test.ts b/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
index db604e1b550..45d0cb7a5e1 100644
--- a/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
+++ b/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
@@ -98,7 +98,7 @@ test('renders steering where it arrived in the assistant timeline', () => {
 
 test('holds queued steering in the transcript while old output continues, then renders its real reply boundary', async () => {
   const messages: StoredMessage[] = [{ type: 'user', id: 'original', turnId: 'turn-1', ts: 1, text: 'request' }];
-  const pending = { id: 'steer', hostTurnId: 'turn-1', ts: 2, text: 'inserted instruction', transientPlacement: 'steering' as const };
+  const pending = { id: 'steer', hostTurnId: 'turn-1', ts: 2, text: 'inserted instruction', transientPlacement: 'transcript' as const, pendingSteering: true as const };
   let live: import('../live-turn-projection.js').LiveTurnProjection | undefined = applyLiveTurnEvent(armLiveTurn('turn-1'), {
     type: 'text_delta', id: 'first', turnId: 'turn-1', messageId: 'before', ts: 2, text: 'old answer continues',
   });
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index e54bd05b32d..00f61614bea 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -349,7 +349,9 @@ test('keeps Host order visible until the reordered projection arrives', async ()
     await act(() => grips[1]?.dispatchEvent(dragStart));
     const firstRow = grips[0]?.closest('li')?.parentElement;
     assert.ok(firstRow);
-    await act(() => firstRow.dispatchEvent(new window.Event('drop', { bubbles: true })));
+    const drop = new window.Event('drop', { bubbles: true });
+    Object.defineProperty(drop, 'dataTransfer', { value: { types: [], files: [] } });
+    await act(() => firstRow.dispatchEvent(drop));
 
     assert.deepEqual(requestedOrder, ['second', 'first']);
     assert.deepEqual(

From 67f1903a4b71ab962ad6245688fe8c6431a16f76 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 13:14:41 +0800
Subject: [PATCH 20/33] refactor(desktop): collapse queued-steering bubble
 plumbing onto the Host snapshot

Ablation pass after the rebase:

- Steering bubbles carry no hostTurnId, so ChatView already tails them and
  dedups by message id once steering_message lands; pendingSteering, its
  merge preservation and the turnId copied into every queue state go away.
- retractQueueEntryToDraft and queuedSteeringDeliveryActions fold into
  withQueuedSteeringTransients, which reuses each surface's existing
  report-and-rethrow retract. restoreDraft is required at every production
  caller, so the editable gate is dropped.
- SessionLocalMessages loses the waitingForPrevious status (it did not
  change the user's next action) and the cancel/remove label split.
- Dead newlyInFlight/rootQueueInFlight helpers, stray app-shell locals,
  and a test that only restated the queue concatenation are removed; the
  session-local-recovery E2E returns to main's copy-independent assertion.
- The queue doc no longer claims plate Delete restores the draft.

Generated-by: Devin
---
 .../e2e/session-local-recovery.spec.ts        |   8 +-
 .../__tests__/message-queue-ui-state.test.ts  |  13 +-
 .../__tests__/quote-companion-retry.test.ts   |   2 +
 .../transient-message-projection.test.ts      |  91 ++-----------
 .../__tests__/workhub-send-visibility.test.ts |   4 +-
 .../src/renderer/app-shell-session-events.ts  |   4 +-
 apps/desktop/src/renderer/app-shell.tsx       |   5 +-
 .../contracts/message-queue-projection.ts     |   2 -
 .../contracts/transient-message-projection.ts | 120 +++++-------------
 .../controller/session-local-messages.tsx     |  49 +++----
 .../controller/use-session-message-queue.ts   |  26 ++--
 .../conversation/model/session-ui-state.ts    |   2 -
 .../tools/side-chat/use-quote-companion.ts    |  39 ++----
 .../controller/use-workhub-controller.ts      |  44 +++----
 .../renderer/locales/session-local-copy.ts    |   8 --
 apps/desktop/stories/app-shell.stories.tsx    |   3 +-
 docs/desktop-message-queue.md                 |   2 +-
 .../src/adapter/session-projector.ts          |  18 ---
 .../chat-turn-steering-order.test.ts          |   2 +-
 .../__tests__/composer-send-toggle.test.tsx   |  15 +--
 packages/ui/src/chat-view.tsx                 |   5 -
 21 files changed, 118 insertions(+), 344 deletions(-)

diff --git a/apps/desktop/e2e/session-local-recovery.spec.ts b/apps/desktop/e2e/session-local-recovery.spec.ts
index 743de76d37f..3bcad1481bb 100644
--- a/apps/desktop/e2e/session-local-recovery.spec.ts
+++ b/apps/desktop/e2e/session-local-recovery.spec.ts
@@ -56,7 +56,7 @@ test('a locally saved message survives renderer and application restart, then ex
   await awaitSendReady(page);
   await page.locator(COMPOSER_INPUT).press('Enter');
   await expect(page.locator(COMPOSER_INPUT)).toHaveText('');
-  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
+  await expect(page.locator('.maka-user-message').filter({ hasText: pending })).toBeVisible();
   const before = await page.evaluate((id) => window.maka.sessionLocal.listMessages(id), sessionId!);
   const message = before.find((item) => item.text === pending)!;
   expect(message.state).toBe('saved');
@@ -65,7 +65,7 @@ test('a locally saved message survives renderer and application restart, then ex
   await page.reload();
   await ensureSidebarExpanded(page);
   await page.locator(`[data-session-id=${JSON.stringify(sessionId)}]`).click();
-  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
+  await expect(page.locator('.maka-user-message').filter({ hasText: pending })).toBeVisible();
   expect(
     (await page.evaluate((id) => window.maka.sessionLocal.listMessages(id), sessionId!)).find(
       (item) => item.text === pending,
@@ -146,7 +146,7 @@ test('a new task is readable locally before the Host session exists', async ({
   await awaitSendReady(page);
   await page.locator(COMPOSER_INPUT).press('Enter');
   await expect(page.locator(COMPOSER_INPUT)).toHaveText('');
-  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
+  await expect(page.locator('.maka-user-message').filter({ hasText: prompt })).toBeVisible();
   await ensureSidebarExpanded(page);
   const sessionId = await page
     .locator('[data-session-id]:has([aria-current="page"])')
@@ -157,7 +157,7 @@ test('a new task is readable locally before the Host session exists', async ({
   await page.reload();
   await ensureSidebarExpanded(page);
   await page.locator(`[data-session-id=${JSON.stringify(sessionId)}]`).click();
-  await expect(page.getByRole('button', { name: '取消发送', exact: true })).toBeVisible();
+  await expect(page.locator('.maka-user-message').filter({ hasText: prompt })).toBeVisible();
   await expect(page.getByText('读取任务失败', { exact: true })).toHaveCount(0);
   page = await sessionLocalWindow.restart();
   await ensureSidebarExpanded(page);
diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 576a4386a0a..bda5a11e01b 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -90,8 +90,8 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   messages = messages.map((message) => ({ ...message, state: 'saved', canCancel: true }));
   await act(async () => changed('session-1'));
   const followup = transient.get('followup');
-  assert.equal(followup?.deliveryStatus, 'Waiting for earlier messages to be delivered');
-  assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Edit', 'Cancel sending']);
+  assert.equal(followup?.deliveryStatus, 'Waiting to send');
+  assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Edit', 'Delete unsent message']);
   await act(async () => { await followup?.deliveryActions?.[0]?.onClick(); });
   assert.deepEqual(cancelled, [['session-1', 'followup']]);
   assert.deepEqual(restored, [['session-1', 'followup']],
@@ -104,7 +104,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   assert.deepEqual(transient.get('root')?.deliveryActions, []);
   messages = messages.map((message) => ({ ...message, error: 'Saved locally. Waiting for the Host to become available.' }));
   await act(async () => changed('session-1'));
-  assert.equal(transient.get('root')?.deliveryStatus, 'Waiting for earlier messages to be delivered');
+  assert.equal(transient.get('root')?.deliveryStatus, 'Waiting to send');
   assert.equal(transient.get('root')?.deliveryActions?.length, 2, 'a Host outage keeps the copy editable and removable');
   messages = messages.map((message) => ({ ...message, state: 'failed' }));
   await act(async () => changed('session-1'));
@@ -170,13 +170,11 @@ test('queue_update stores the snapshot and retires every listed local placeholde
   });
   transientMessages.set('message-steer', {
     id: 'message-steer', text: 'adjust this run', ts: 1, transientPlacement: 'transcript',
-    pendingSteering: true,
   });
 
   handlers.handleEvent('session-1', queueUpdate([steeringEntry]));
 
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
-    turnId: 'turn-1',
     ts: 1,
     queueRevision: 3,
     entries: [steeringEntry, followupEntry],
@@ -219,7 +217,6 @@ test('queue_update stores the snapshot and retires every listed local placeholde
   });
   assert.equal(transientMessages.size, 0);
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
-    turnId: 'turn-1',
     ts: 3,
     queueRevision: 4,
     entries: [nextEntry],
@@ -453,7 +450,7 @@ test('editing a queued steering restores content under the owning Session even a
   function Probe() {
     surface = useSessionMessageQueue({
       sessionId: 'session-a',
-      queue: { entries: [entry], turnId: 'turn-1', ts: 1, queueRevision: 2 },
+      queue: { entries: [entry], ts: 1, queueRevision: 2 },
       transientMessages: [],
       activeSessionId,
     });
@@ -490,7 +487,7 @@ test('editing a queued steering restores content under the owning Session even a
     focus() {}, openModelPicker() {},
   } as ComposerHandle;
   surface.draftContextRestorer.current = (sessionId, draft) => { restoredContext.push([sessionId, draft]); };
-  const bubble = surface.transientMessages.find((message) => message.pendingSteering);
+  const bubble = surface.transientMessages.find((message) => message.id === entry.messageId);
   assert.ok(bubble, 'a queued steering entry derives a transcript bubble');
   const edit = bubble.deliveryActions?.find((action) => action.label === 'Edit');
   assert.ok(edit, 'the bubble offers edit');
diff --git a/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts b/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
index d1e828c9710..0e092f2b75a 100644
--- a/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
+++ b/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
@@ -3522,6 +3522,7 @@ function QuoteCompanionProbe(props: {
     locale: 'en',
     onQuotesConsumed: () => undefined,
     confirmBypass: props.confirmBypass ?? (async () => true),
+    restoreDraft: () => undefined,
   });
   props.onSetPermissionMode?.(companion.setPermissionMode);
   return createElement('div', {
@@ -3556,6 +3557,7 @@ function QuoteCompanionOwnershipProbe(props: {
     onQuotesConsumed: props.onQuotesConsumed ?? (() => undefined),
     confirmBypass: async () => true,
     onContextCompactionError: props.onContextCompactionError,
+    restoreDraft: () => undefined,
   });
   props.onSend(companion.send);
   props.onProjection?.(companion);
diff --git a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
index 4dbfc811c72..9379e59b938 100644
--- a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
+++ b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
@@ -21,7 +21,6 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 import type { StoredMessage } from '@maka/core/session';
 import type { TransientUserMessageProjection } from '@maka/ui';
-import { deriveMessageQueueProjection } from '../../renderer/application/contracts/message-queue-projection.js';
 import {
   mergeTransientMessageProjection,
   reconcileTransientMessages,
@@ -103,72 +102,6 @@ test('keeps transient messages ordered independently from a sparse durable tail'
   assert.deepEqual(projected.map((message) => message.id), ['message-1']);
 });
 
-test('derives one queue projection for main and Side Conversation consumers', () => {
-  const projection = deriveMessageQueueProjection({
-    type: 'queue_update',
-    id: 'queue-1',
-    turnId: 'turn-1',
-    ts: 7,
-    queueRevision: 3,
-    steering: ['in flight', 'steer'],
-    followup: ['next'],
-    steeringEntries: [
-      {
-        entryId: 'in-flight',
-        messageId: 'message-in-flight',
-        content: { text: 'in flight' },
-        placement: 'current_turn',
-        state: 'in_flight',
-      },
-      {
-        entryId: 'steer',
-        messageId: 'message-steer',
-        content: { text: 'raw', displayText: 'steer' },
-        placement: 'current_turn',
-        state: 'queued',
-      },
-    ],
-    followupEntries: [
-      {
-        entryId: 'next',
-        messageId: 'message-next',
-        content: { text: 'next' },
-        placement: 'next_turn',
-        state: 'queued',
-      },
-    ],
-  });
-
-  assert.deepEqual(projection, {
-    turnId: 'turn-1',
-    ts: 7,
-    queueRevision: 3,
-    entries: [
-      {
-        entryId: 'in-flight',
-        messageId: 'message-in-flight',
-        content: { text: 'in flight' },
-        placement: 'current_turn',
-        state: 'in_flight',
-      },
-      {
-        entryId: 'steer',
-        messageId: 'message-steer',
-        content: { text: 'raw', displayText: 'steer' },
-        placement: 'current_turn',
-        state: 'queued',
-      },
-      {
-        entryId: 'next',
-        messageId: 'message-next',
-        content: { text: 'next' },
-        placement: 'next_turn',
-        state: 'queued',
-      },
-    ],
-  });
-});
-
 test('queued steering derives a transcript bubble that lives and dies with the snapshot', async () => {
   const queueEntry = {
     entryId: 'steer',
@@ -184,15 +117,17 @@ test('queued steering derives a transcript bubble that lives and dies with the s
     placement: 'next_turn' as const,
     state: 'queued' as const,
   };
-  const queue = { turnId: 'turn-1', ts: 7, entries: [queueEntry, followupEntry] };
-  const retracted: (string | undefined)[][] = [];
+  const queue = { ts: 7, entries: [queueEntry, followupEntry] };
+  const retracted: string[] = [];
+  const restored: string[] = [];
+  let failRetract = false;
   const actions = {
     locale: 'en' as const,
-    editable: true,
-    retract: async (_entry: unknown, draftText?: string) => {
-      retracted.push([draftText]);
-      return true;
+    retract: async (entryId: string) => {
+      if (failRetract) throw new Error('retract failed');
+      retracted.push(entryId);
     },
+    restoreDraft: (draft: { text: string }) => { restored.push(draft.text); },
   };
   const localCopy = { ...transient, id: 'message-steer', text: 'local copy' };
 
@@ -201,15 +136,17 @@ test('queued steering derives a transcript bubble that lives and dies with the s
   assert.deepEqual(derived.map((message) => message.id), ['message-1', 'message-steer'],
     'the queue-owned bubble replaces its stored local copy, and a queued follow-up stays out of the transcript');
   const bubble = derived.at(-1);
-  assert.equal(bubble?.pendingSteering, true);
-  assert.equal(bubble?.hostTurnId, 'turn-1');
   assert.equal(bubble?.text, 'steer');
   assert.deepEqual(bubble?.quotes, [{ text: 'context' }]);
   assert.deepEqual(bubble?.deliveryActions?.map((action) => action.label), ['Edit', 'Delete']);
+  failRetract = true;
+  await bubble?.deliveryActions?.[0]?.onClick();
+  assert.deepEqual(restored, [], 'a failed retract restores nothing');
+  failRetract = false;
   await bubble?.deliveryActions?.[0]?.onClick();
-  assert.deepEqual(retracted, [['steer']], 'edit hands the text back to the composer');
+  assert.deepEqual([retracted, restored], [['steer'], ['steer']], 'edit retracts, then hands the text back');
   await bubble?.deliveryActions?.[1]?.onClick();
-  assert.deepEqual(retracted.at(-1), [undefined], 'delete retracts without a draft');
+  assert.deepEqual([retracted, restored], [['steer', 'steer'], ['steer']], 'delete retracts without a draft');
 
   assert.equal(
     withQueuedSteeringTransients([transient], { ...queue, entries: [] }, actions).length,
diff --git a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
index b185a3dbb60..6e31476d6a1 100644
--- a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
+++ b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
@@ -136,7 +136,7 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
     ...overrides,
   } as unknown as WorkHubServices;
   let submissions = 0;
-  function Probe() { controller = useWorkHubController(() => { submissions++; }); return null; }
+  function Probe() { controller = useWorkHubController(() => { submissions++; }, () => {}); return null; }
   await act(async () => {
     root.render(createElement(LocaleProvider, { locale: 'en', children:
       createElement(WorkHubServicesProvider, { services }, createElement(Probe)),
@@ -662,8 +662,6 @@ test('WorkHub queued steering keeps a transcript bubble until consumed or retrac
   assert.deepEqual(h.controller.messageQueue.entries, [entry]);
   assert.deepEqual(h.controller.transientMessages.map((message) => message.id), ['queued'],
     'queued steering waits in the transcript, not the follow-up plate');
-  assert.equal(h.controller.transientMessages[0]?.pendingSteering, true);
-  assert.equal(h.controller.transientMessages[0]?.hostTurnId, 'active-turn');
   await act(() => h.emit({ type: 'steering_message', id: 'consumed', turnId: 'active-turn', ts: 3, messageId: entry.messageId, content: entry.content }));
   await act(() => project('in_flight'));
   assert.deepEqual(h.controller.messageQueue.entries, [{ ...entry, state: 'in_flight' }], 'a pulled message stays pending until the runtime places it');
diff --git a/apps/desktop/src/renderer/app-shell-session-events.ts b/apps/desktop/src/renderer/app-shell-session-events.ts
index 66f88aa1c1c..d5bf2663c25 100644
--- a/apps/desktop/src/renderer/app-shell-session-events.ts
+++ b/apps/desktop/src/renderer/app-shell-session-events.ts
@@ -118,6 +118,7 @@ export function createAppShellSessionEventHandlers(options: {
   } = options;
   const scheduleFrame = options.scheduleFrame ?? createConversationDisplayFrameScheduler();
   const displayBatch = options.displayBatch ?? createAppShellSessionDisplayBatch();
+
   function applyProjectionEvents(
     projection: LiveTurnBuffer | undefined,
     events: readonly SessionEvent[],
@@ -301,9 +302,6 @@ export function createAppShellSessionEventHandlers(options: {
     switch (event.type) {
       case 'queue_update': {
         const queue = deriveMessageQueueProjection(event);
-        // Queued steering renders from this snapshot as transcript bubbles —
-        // the store only holds local intents, so every entry the Host lists
-        // retires its local copy here.
         for (const entry of [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])]) {
           removeTransientMessage?.(sessionId, entry.messageId);
         }
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index b5224ff0234..2cacf3ddb0a 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -665,8 +665,6 @@ function AppShellContent({
       }
     : undefined;
   const activeMessageQueue = activeId ? messageQueueBySession[activeId] : undefined;
-  // Queued steering is a thin projection of the Host queue snapshot — the
-  // bubble appears and disappears with it, no bookkeeping of our own.
   const {
     composer: composerRef,
     transientMessages: transcriptTransientMessages,
@@ -685,8 +683,7 @@ function AppShellContent({
     if (draft.directoryReferences?.length) restoreDirectories(targetSessionId, draft.directoryReferences);
     if (draft.quotes?.length) restoreQuotes(targetSessionId, draft.quotes);
   };
-  const activeMessageSubmitting = transientMessages.length > 0;
-  const activeDesktopSession = activeSession;  // The shell's reading of the active live turn: streaming/settled flags, the
+  // The shell's reading of the active live turn: streaming/settled flags, the
   // in-flight tool signal, and the #646 turn-wait cues, all derived from the
   // semantic snapshot rather than the projection (#1985).
   const {
diff --git a/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts b/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
index 7e31ffdfb2d..47a6266f18a 100644
--- a/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
@@ -24,7 +24,6 @@ import type {
 
 /** The last Host queue snapshot a surface renders from. */
 export interface MessageQueueProjection {
-  readonly turnId: string;
   readonly ts: number;
   readonly queueRevision?: number;
   readonly entries: readonly MessageQueueEntryProjection[];
@@ -39,7 +38,6 @@ export function deriveMessageQueueProjection(
     ...(event.followupEntries ?? []),
   ].map((entry) => structuredClone(entry));
   return {
-    turnId: event.turnId,
     ts: event.ts,
     queueRevision: event.queueRevision,
     entries,
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index eab5d448603..2d660640961 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -44,110 +44,51 @@ export interface RestoredDraftContent {
   quotes?: readonly QuoteRef[];
 }
 
-/**
- * One retract-and-restore path for every surface's queued-entry edit: the Host
- * call first, the draft hand-back only when the caller passed the text.
- * `retractEntry` owns the service call, `reportError` the surface's failure
- * channel; resolves false when the retract failed.
- */
-export async function retractQueueEntryToDraft(
-  entry: MessageQueueEntryProjection,
-  draftText: string | undefined,
-  options: {
-    retractEntry(): Promise<unknown>;
-    reportError(error: unknown): void;
-    restoreDraft?(draft: RestoredDraftContent): void;
-  },
-): Promise<boolean> {
-  try {
-    await options.retractEntry();
-  } catch (error) {
-    options.reportError(error);
-    return false;
-  }
-  if (draftText !== undefined) {
-    options.restoreDraft?.({
-      text: draftText,
-      attachments: entry.content.attachments,
-      directoryReferences: entry.content.directoryReferences,
-      quotes: entry.content.quotes,
-    });
-  }
-  return true;
-}
-
-/**
- * Edit/delete controls for steering the Host queued but has not consumed.
- * Both retract the queue entry; edit also hands the text back to the caller's
- * draft restore, so it is only offered when the caller can actually restore —
- * without one, edit would silently behave like delete. `retract` resolves
- * false when the Host call failed.
- */
-export function queuedSteeringDeliveryActions(input: {
-  locale: UiLocale;
-  draftText: string;
-  editable: boolean;
-  retract: (draftText?: string) => Promise<boolean>;
-}): NonNullable<TransientUserMessage['deliveryActions']> {
-  const copy = getConversationCopy(input.locale).composer;
-  const icon = (glyph: typeof Pencil) => createElement(glyph, { size: ICON_SIZE.control, 'aria-hidden': true });
-  return [
-    ...(input.editable
-      ? [{ label: copy.editQueuedEntry, icon: icon(Pencil), onClick: async () => { await input.retract(input.draftText); } }]
-      : []),
-    { label: copy.deleteQueuedEntry, icon: icon(Trash2), onClick: async () => { await input.retract(); } },
-  ];
-}
-
 /**
  * Queued steering is a thin projection of the Host queue snapshot, not a stored
- * transient: the bubble appears, updates and disappears with `queue` alone.
- * Appends one transcript bubble per queued current_turn entry — with the
- * retract-backed edit/delete actions — and drops any stored transient the
- * queue now owns, so a message never renders twice.
+ * transient: one tail bubble per current_turn entry, appearing and disappearing
+ * with `queue` alone. Delete retracts the entry; edit retracts it and hands the
+ * content back to the draft. `retract` reports its own failure and rejects, so
+ * a failed edit restores nothing.
  */
 export function withQueuedSteeringTransients(
   transientMessages: readonly TransientUserMessage[],
-  queue:
-    | {
-        readonly entries: readonly MessageQueueEntryProjection[];
-        readonly turnId?: string;
-        readonly ts?: number;
-      }
-    | undefined,
+  queue: { readonly entries: readonly MessageQueueEntryProjection[]; readonly ts?: number } | undefined,
   actions: {
     locale: UiLocale;
-    /** Offer the retract-and-restore edit action. */
-    editable: boolean;
-    /** Retract the queue entry; resolves false when the Host call failed. */
-    retract(entry: MessageQueueEntryProjection, draftText?: string): Promise<boolean>;
+    retract(entryId: string): Promise<void>;
+    restoreDraft(draft: RestoredDraftContent): void;
   },
 ): TransientUserMessage[] {
   const steering = (queue?.entries ?? []).filter(
     (entry) => entry.placement === 'current_turn',
   );
   if (steering.length === 0) return [...transientMessages];
-  const bubbles = steering.map((entry): TransientUserMessage => ({
-    id: entry.messageId,
+  const copy = getConversationCopy(actions.locale).composer;
+  const icon = (glyph: typeof Pencil) => createElement(glyph, { size: ICON_SIZE.control, 'aria-hidden': true });
+  const ignore = () => {};
+  const bubbles = steering.map(({ entryId, messageId, content }): TransientUserMessage => ({
+    id: messageId,
     transientPlacement: 'transcript',
-    pendingSteering: true,
-    hostTurnId: queue?.turnId,
     ts: queue?.ts ?? 0,
-    text: entry.content.displayText ?? entry.content.text,
-    ...(entry.content.attachments && { attachments: [...entry.content.attachments] }),
-    ...(entry.content.directoryReferences && {
-      directoryReferences: entry.content.directoryReferences,
-    }),
-    ...(entry.content.quotes && { quotes: [...entry.content.quotes] }),
-    ...(entry.content.inlineReferences && {
-      inlineReferences: [...entry.content.inlineReferences],
-    }),
-    deliveryActions: queuedSteeringDeliveryActions({
-      locale: actions.locale,
-      draftText: entry.content.displayText ?? entry.content.text,
-      editable: actions.editable,
-      retract: (draftText) => actions.retract(entry, draftText),
-    }),
+    text: content.displayText ?? content.text,
+    ...(content.attachments && { attachments: [...content.attachments] }),
+    ...(content.directoryReferences && { directoryReferences: content.directoryReferences }),
+    ...(content.quotes && { quotes: [...content.quotes] }),
+    ...(content.inlineReferences && { inlineReferences: [...content.inlineReferences] }),
+    deliveryActions: [
+      {
+        label: copy.editQueuedEntry,
+        icon: icon(Pencil),
+        onClick: () => actions.retract(entryId).then(() => actions.restoreDraft({
+          text: content.displayText ?? content.text,
+          attachments: content.attachments,
+          directoryReferences: content.directoryReferences,
+          quotes: content.quotes,
+        }), ignore),
+      },
+      { label: copy.deleteQueuedEntry, icon: icon(Trash2), onClick: () => actions.retract(entryId).catch(ignore) },
+    ],
   }));
   const ids = new Set(bubbles.map((message) => message.id));
   return [
@@ -168,7 +109,6 @@ export function mergeTransientMessageProjection(
     ...update,
     // A Message's send time is written once; an update's `ts` must not move it.
     ts: current.ts,
-    ...(update.pendingSteering === undefined && current.pendingSteering !== undefined ? { pendingSteering: current.pendingSteering } : {}),
     ...(!Object.hasOwn(update, 'deliveryStatus') && current.deliveryStatus !== undefined ? { deliveryStatus: current.deliveryStatus } : {}),
     ...(!Object.hasOwn(update, 'deliveryDetail') && current.deliveryDetail !== undefined ? { deliveryDetail: current.deliveryDetail } : {}),
     ...(!Object.hasOwn(update, 'deliveryActions') && current.deliveryActions !== undefined ? { deliveryActions: current.deliveryActions } : {}),
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index df66a233bf7..926e6b1b8e3 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -30,7 +30,7 @@ export function SessionLocalMessages(props: {
   readonly retire: (sessionId: string, messageId: string) => void;
   readonly reportError: (message: string) => void;
   /** Puts a never-dispatched message's content back into the composer for editing. */
-  readonly restoreDraft?: (sessionId: string, draft: RestoredDraftContent) => void;
+  readonly restoreDraft: (sessionId: string, draft: RestoredDraftContent) => void;
 }): null {
   const services = useConversationServices();
   const locale = useUiLocale();
@@ -46,7 +46,6 @@ export function SessionLocalMessages(props: {
         .listMessages(sessionId)
         .then((messages) => {
           if (disposed || revision !== admitted) return;
-          let waitingForPrevious = false;
           for (const message of messages) {
             if (message.state === 'accepted' && !message.turnId) {
               // The Host queue owns accepted steering and follow-ups. A local
@@ -56,14 +55,14 @@ export function SessionLocalMessages(props: {
             }
             const status = message.state === 'accepted' || message.state === 'sending'
               || (message.state === 'saved' && message.delivering && !message.error)
-              ? undefined
-              : message.state === 'saved' && waitingForPrevious
-                ? copy.waitingForPrevious
-                : copy[message.state];
-            if (message.state !== 'accepted' && message.state !== 'failed') waitingForPrevious = true;
+              ? undefined : copy[message.state];
             const action = (operation: () => Promise<void>) => () => {
               void operation().catch(() => reportError(copy.updateError));
             };
+            const remove = async () => {
+              await services.cancelMessage(sessionId, message.messageId);
+              retire(sessionId, message.messageId);
+            };
             publish(sessionId, {
               id: message.messageId,
               text: message.text,
@@ -92,32 +91,24 @@ export function SessionLocalMessages(props: {
                   ]
                 : message.canCancel
                   ? [
-                      ...(restoreDraft
-                        ? [{
-                            label: copy.edit,
-                            icon: <Pencil size={ICON_SIZE.control} aria-hidden="true" />,
-                            onClick: action(async () => {
-                              await services.cancelMessage(sessionId, message.messageId);
-                              retire(sessionId, message.messageId);
-                              restoreDraft(sessionId, {
-                                text: message.text,
-                                attachments: message.attachments,
-                                directoryReferences: message.directoryReferences,
-                                quotes: message.quotes,
-                              });
-                            }),
-                          }]
-                        : []),
                       {
-                        label: message.state === 'failed' ? copy.remove : copy.cancel,
-                        icon: message.state === 'failed'
-                          ? <Trash2 size={ICON_SIZE.control} style={{ color: 'var(--destructive-text)' }} aria-hidden="true" />
-                          : <Trash2 size={ICON_SIZE.control} aria-hidden="true" />,
+                        label: copy.edit,
+                        icon: <Pencil size={ICON_SIZE.control} aria-hidden="true" />,
                         onClick: action(async () => {
-                          await services.cancelMessage(sessionId, message.messageId);
-                          retire(sessionId, message.messageId);
+                          await remove();
+                          restoreDraft(sessionId, {
+                            text: message.text,
+                            attachments: message.attachments,
+                            directoryReferences: message.directoryReferences,
+                            quotes: message.quotes,
+                          });
                         }),
                       },
+                      {
+                        label: copy.remove,
+                        icon: <Trash2 size={ICON_SIZE.control} aria-hidden="true" />,
+                        onClick: action(remove),
+                      },
                     ]
                   : [],
             });
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index 31eac38f632..c22a35b1be4 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -25,7 +25,6 @@ import {
   type TransientUserMessageProjection,
 } from '@maka/ui';
 import {
-  retractQueueEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
@@ -94,8 +93,7 @@ export function useSessionMessageQueue(options: {
   // Surfaces the failure, then rethrows so the pending plate can settle its
   // in-flight action state without guessing with a timer.
   const runAction = useCallback(
-    async (action: (targetSessionId: string) => Promise<void>) => {
-      const targetSessionId = activeSessionId.current;
+    async (action: (targetSessionId: string) => Promise<void>, targetSessionId = activeSessionId.current) => {
       if (!targetSessionId) return;
       try {
         await action(targetSessionId);
@@ -107,21 +105,15 @@ export function useSessionMessageQueue(options: {
     [activeSessionId, reportError],
   );
   const merged = useMemo(
-    () => withQueuedSteeringTransients(transientMessages, queue, {
-      locale,
-      editable: true,
-      retract: (entry, draftText) => {
-        if (!sessionId) return Promise.resolve(false);
-        return retractQueueEntryToDraft(entry, draftText, {
-          retractEntry: () => services.sessions.retractQueueEntry(sessionId, entry.entryId),
-          reportError: (error) => {
-            if (activeSessionId.current === sessionId) reportError(sessionId, error);
-          },
+    // Bubble actions stay bound to the Session that rendered them.
+    () => sessionId
+      ? withQueuedSteeringTransients(transientMessages, queue, {
+          locale,
+          retract: (entryId) => runAction((target) => services.sessions.retractQueueEntry(target, entryId), sessionId),
           restoreDraft: (draft) => restoreDraft(sessionId, draft),
-        });
-      },
-    }),
-    [sessionId, transientMessages, queue, locale, activeSessionId, services, reportError, restoreDraft],
+        })
+      : [...transientMessages],
+    [sessionId, transientMessages, queue, locale, runAction, services, restoreDraft],
   );
   return {
     composer,
diff --git a/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts b/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
index 72a39c40652..7955c7fb12a 100644
--- a/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
+++ b/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
@@ -45,10 +45,8 @@ export interface AppShellSessionUiState {
 
 // The pending plate keeps the Host revision beside its entries so edits can
 // reject stale multi-client projections instead of silently overwriting them.
-// turnId/ts bind the queued-steering bubbles derived from this snapshot.
 export interface MessageQueueUiState {
   readonly queueRevision?: number;
-  readonly turnId: string;
   readonly ts: number;
   readonly entries: readonly MessageQueueEntryProjection[];
 }
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index 0a921d712e9..86c5bd8b811 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -77,7 +77,6 @@ import { mergeSettledMessages } from '../../../../settled-message-merge.js';
 import {
   mergeTransientMessageProjection,
   reconcileTransientMessages,
-  retractQueueEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../../application/contracts/transient-message-projection.js';
@@ -163,7 +162,7 @@ export interface UseQuoteCompanionInput {
   ) => void;
   onContextCompactionError?: (sessionId: string, error: unknown) => void;
   /** Returns a retracted message's content to the composer draft for editing. */
-  restoreDraft?: (sessionId: string, draft: RestoredDraftContent) => void;
+  restoreDraft: (sessionId: string, draft: RestoredDraftContent) => void;
 }
 
 export async function requestPermissionModeWithConfirmation(
@@ -357,12 +356,9 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const pendingUserMessagesRef = useRef<Map<string, TransientUserMessageProjection>>(
     new Map(),
   );
-  const restoreDraftRef = useRef(input.restoreDraft);
-  restoreDraftRef.current = input.restoreDraft;
   const [messageQueue, setMessageQueue] = useState<{
     readonly entries: readonly MessageQueueEntryProjection[];
     readonly queueRevision?: number;
-    readonly turnId?: string;
     readonly ts?: number;
   }>({ entries: [] });
   // Reseed reconciliation reads the queue between React flushes, so every
@@ -543,15 +539,8 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const projectMessageQueue = useCallback(
     (event: Extract<SessionEvent, { type: 'queue_update' }>) => {
       const queue = deriveMessageQueueProjection(event);
-      applyMessageQueue({
-        entries: queue.entries,
-        queueRevision: event.queueRevision,
-        turnId: event.turnId,
-        ts: event.ts,
-      });
-      // Queued steering renders from this snapshot as transcript bubbles —
-      // every entry the Host lists retires its local transient copy.
-      for (const entry of [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])]) {
+      applyMessageQueue(queue);
+      for (const entry of queue.entries) {
         pendingUserMessagesRef.current.delete(entry.messageId);
         queueOwnedMessageIdsRef.current.add(entry.messageId);
       }
@@ -1755,21 +1744,13 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const messages = allMessages.filter(
     (message) => message.turnId !== undefined && ownTurnIdsRef.current.has(message.turnId),
   );
-  const transientMessages = withQueuedSteeringTransients(pendingUserMessages, messageQueue, {
-    locale: localeRef.current,
-    editable: input.restoreDraft !== undefined,
-    retract: (entry, draftText) => {
-      const forkId = companionIdRef.current;
-      if (!forkId) return Promise.resolve(false);
-      return retractQueueEntryToDraft(entry, draftText, {
-        retractEntry: () => sideChat.retractQueueEntry(forkId, entry.entryId),
-        reportError: () => {
-          if (mountedRef.current) setError(copyRef.current.errors.respondFailed);
-        },
-        restoreDraft: (draft) => restoreDraftRef.current?.(forkId, draft),
-      });
-    },
-  });
+  const transientMessages = companion
+    ? withQueuedSteeringTransients(pendingUserMessages, messageQueue, {
+        locale: localeRef.current,
+        retract: deleteQueuedEntry,
+        restoreDraft: (draft) => input.restoreDraft(companion.id, draft),
+      })
+    : pendingUserMessages;
   // Inherited model (read-only): the fork's once created, else the source's.
   const activeModel = companion
     ? { llmConnectionSlug: companion.llmConnectionSlug, model: companion.model }
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index 1635931e43b..89bdf07b3e4 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -18,9 +18,7 @@
  */
 
 import { activeHostTurn, chatTurnActivity, type SessionExecutionProjection } from '../../../application/contracts/session-execution.js';
-import { deriveMessageQueueProjection } from '../../../application/contracts/message-queue-projection.js';
 import {
-  retractQueueEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
@@ -65,18 +63,16 @@ interface SendAttempt {
 }
 interface MessagePresentation {
   transientMessages: TransientUserMessageProjection[];
-  messageQueue: { entries: readonly MessageQueueEntryProjection[]; revision?: number; turnId?: string; ts?: number };
+  messageQueue: { entries: readonly MessageQueueEntryProjection[]; revision?: number; ts?: number };
 }
 export function useWorkHubController(
-  onSubmit?: () => void,
-  restoreDraft?: (sessionId: string, draft: RestoredDraftContent) => void,
+  onSubmit: (() => void) | undefined,
+  restoreDraft: (sessionId: string, draft: RestoredDraftContent) => void,
 ) {
   const services = useWorkHubServices();
   const locale = useUiLocale();
   const localeRef = useRef(locale);
   localeRef.current = locale;
-  const restoreDraftRef = useRef(restoreDraft);
-  restoreDraftRef.current = restoreDraft;
   const [sessionId, setSessionId] = useState<string>();
   const [sessions, setSessions] = useState<Awaited<ReturnType<WorkHubServices['listSessions']>>>(
     [],
@@ -421,15 +417,13 @@ export function useWorkHubController(
         const terminal = event.type === 'complete' || event.type === 'abort' || event.type === 'error';
         setInteractions((current) => terminal ? clearInteractions(current, sessionId) : reduceInteractionQueues(current, sessionId, event));
         if (event.type === 'queue_update') {
-          const queue = deriveMessageQueueProjection(event);
-          // Host evidence retires local submission placeholders; queued
-          // steering renders from the snapshot itself as transcript bubbles.
-          const ids = new Set(
-            [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])].map((entry) => entry.messageId),
-          );
+          const entries = [...(event.steeringEntries ?? []), ...(event.followupEntries ?? [])];
+          // Host evidence retires local submission placeholders. Queue state
+          // lives only in messageQueue, including after reconnect or withdrawal.
+          const ids = new Set(entries.map((entry) => entry.messageId));
           if (pendingQueued.current && ids.has(pendingQueued.current.messageId)) pendingQueued.current.observed = true;
           setMessagePresentation((previous) => ({
-            messageQueue: { entries: queue.entries, revision: event.queueRevision, turnId: event.turnId, ts: event.ts },
+            messageQueue: { entries, revision: event.queueRevision, ts: event.ts },
             transientMessages: previous.transientMessages.filter((message) => !ids.has(message.id)),
           }));
         }
@@ -720,6 +714,7 @@ export function useWorkHubController(
     try { await action(sessionId); }
     catch (reason) { report(reason); throw reason; }
   }
+  const deleteQueuedEntry = (entryId: string) => mutateQueue((target) => services.retractQueueEntry(target, entryId));
   return {
     services,
     sessionId,
@@ -739,21 +734,16 @@ export function useWorkHubController(
       if (!sessionId) throw new Error('WorkHub Session is unavailable');
       await services.respondToUserQuestion(sessionId, response);
     },
-    transientMessages: withQueuedSteeringTransients(transientMessages, messageQueue, {
-      locale,
-      editable: restoreDraft !== undefined,
-      retract: (entry, draftText) => {
-        if (!sessionId) return Promise.resolve(false);
-        return retractQueueEntryToDraft(entry, draftText, {
-          retractEntry: () => services.retractQueueEntry(sessionId, entry.entryId),
-          reportError: report,
-          restoreDraft: (draft) => restoreDraftRef.current?.(sessionId, draft),
-        });
-      },
-    }),
+    transientMessages: sessionId
+      ? withQueuedSteeringTransients(transientMessages, messageQueue, {
+          locale,
+          retract: deleteQueuedEntry,
+          restoreDraft: (draft) => restoreDraft(sessionId, draft),
+        })
+      : transientMessages,
     messageQueue,
     updateQueuedEntry: (entryId: string, revision: number, text: string) => mutateQueue((target) => services.updateQueueEntry(target, entryId, revision, text)),
-    deleteQueuedEntry: (entryId: string) => mutateQueue((target) => services.retractQueueEntry(target, entryId)),
+    deleteQueuedEntry,
     promoteQueuedEntry: (entryId: string) => mutateQueue((target) => services.promoteQueueEntry(target, entryId)),
     reorderQueuedEntries: (entryIds: readonly string[]) => mutateQueue((target) => services.reorderQueueEntries(target, entryIds)),
     viewportNavigation,
diff --git a/apps/desktop/src/renderer/locales/session-local-copy.ts b/apps/desktop/src/renderer/locales/session-local-copy.ts
index bfa0df59b0c..c6422159307 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -21,12 +21,10 @@ import type { UiCatalog, UiLocale } from '@maka/core/ui-locale';
 
 interface SessionLocalCopy {
   saved: string;
-  waitingForPrevious: string;
   unknown: string;
   failed: string;
   edit: string;
   remove: string;
-  cancel: string;
   check: string;
   updateError: string;
 }
@@ -34,34 +32,28 @@ interface SessionLocalCopy {
 const catalog = {
   en: {
     saved: 'Waiting to send',
-    waitingForPrevious: 'Waiting for earlier messages to be delivered',
     unknown: 'Delivery unconfirmed. Do not send again.',
     failed: 'Could not send · message kept',
     edit: 'Edit',
     remove: 'Delete unsent message',
-    cancel: 'Cancel sending',
     check: 'Check delivery',
     updateError: 'Unable to update the saved message',
   },
   'zh-CN': {
     saved: '等待发送',
-    waitingForPrevious: '等待之前的消息送达',
     unknown: '暂时无法确认是否送达，请勿重复发送',
     failed: '未能发送 · 消息已保留',
     edit: '编辑',
     remove: '删除未发送的消息',
-    cancel: '取消发送',
     check: '检查是否送达',
     updateError: '无法更新已保存的消息',
   },
   'zh-TW': {
     saved: '等待傳送',
-    waitingForPrevious: '等待先前的訊息送達',
     unknown: '暫時無法確認是否送達，請勿重複傳送',
     failed: '無法傳送 · 訊息已保留',
     edit: '編輯',
     remove: '刪除未傳送的訊息',
-    cancel: '取消傳送',
     check: '檢查是否送達',
     updateError: '無法更新已儲存的訊息',
   },
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 32957d0060a..5529d7deb5b 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -756,7 +756,6 @@ export const QueuedSteeringInTranscript: Story = {
           }],
         }],
         transientMessages: withQueuedSteeringTransients([], {
-          turnId: 'turn-s',
           ts: NOW - 10_000,
           entries: [{
             entryId: 'entry-steer',
@@ -765,7 +764,7 @@ export const QueuedSteeringInTranscript: Story = {
             placement: 'current_turn',
             state: 'queued',
           }],
-        }, { locale: 'zh-CN', editable: true, retract: async () => true }),
+        }, { locale: 'zh-CN', retract: async () => {}, restoreDraft: () => {} }),
       }}
     />
   ),
diff --git a/docs/desktop-message-queue.md b/docs/desktop-message-queue.md
index 1aa19a9a00e..db40a2396cf 100644
--- a/docs/desktop-message-queue.md
+++ b/docs/desktop-message-queue.md
@@ -40,7 +40,7 @@ Runtime Host already owns the durable message semantics:
   - promote (直接发送 / Send now) to steer the entry into the active turn,
   - edit to update the entry's text in place (Host CAS on the queue revision),
   - delete to retract the entry.
-- Retracting an entry — via the plate's Delete or the transcript bubble's Edit — restores its full content (text, attachments, directory references, quotes) into the originating Session's composer draft.
+- A transcript bubble's Edit retracts the steering entry and restores its full content (text, attachments, directory references, quotes) into the originating Session's composer draft; Delete only retracts.
 - Queue contents and mutations are Runtime Host operations (`turn.message.submit`, `queue.entry.promote`, `queue.entry.retract`, `queue.entry.update`, `queue.entries.reorder`); the renderer mirrors the authoritative projection.
 - Identical active toasts reuse one toast instead of stacking duplicates.
 
diff --git a/packages/runtime-host/src/adapter/session-projector.ts b/packages/runtime-host/src/adapter/session-projector.ts
index 5c97f44b844..356ebed27ee 100644
--- a/packages/runtime-host/src/adapter/session-projector.ts
+++ b/packages/runtime-host/src/adapter/session-projector.ts
@@ -30,7 +30,6 @@ import type {
   SessionContinuitySnapshot,
   SessionAssistantStreamIdentity,
   SessionMessageQueueProjection,
-  SteeringMessageSnapshot,
   SessionSteeringEvent,
   SubscriptionFrame,
   LiveTurnSnapshot,
@@ -744,23 +743,6 @@ function queueChanged(
   return previous.hostEpoch !== next.hostEpoch || previous.queueRevision !== next.queueRevision;
 }
 
-function newlyInFlight(
-  previous: SessionMessageQueueProjection,
-  next: SessionMessageQueueProjection,
-): Extract<SteeringMessageSnapshot, { state: 'in_flight' }>[] {
-  const previousIds = new Set(rootQueueInFlight(previous).map((entry) => entry.entryId));
-  return rootQueueInFlight(next).filter((entry) => !previousIds.has(entry.entryId));
-}
-
-function rootQueueInFlight(
-  queue: SessionMessageQueueProjection,
-): Extract<SteeringMessageSnapshot, { state: 'in_flight' }>[] {
-  return queue.steering.filter(
-    (entry): entry is Extract<SteeringMessageSnapshot, { state: 'in_flight' }> =>
-      entry.state === 'in_flight',
-  );
-}
-
 function projectQueueUpdate(
   queue: SessionMessageQueueProjection,
   turnId: string,
diff --git a/packages/ui/src/__tests__/chat-turn-steering-order.test.ts b/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
index 45d0cb7a5e1..77bb8abaaff 100644
--- a/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
+++ b/packages/ui/src/__tests__/chat-turn-steering-order.test.ts
@@ -98,7 +98,7 @@ test('renders steering where it arrived in the assistant timeline', () => {
 
 test('holds queued steering in the transcript while old output continues, then renders its real reply boundary', async () => {
   const messages: StoredMessage[] = [{ type: 'user', id: 'original', turnId: 'turn-1', ts: 1, text: 'request' }];
-  const pending = { id: 'steer', hostTurnId: 'turn-1', ts: 2, text: 'inserted instruction', transientPlacement: 'transcript' as const, pendingSteering: true as const };
+  const pending = { id: 'steer', ts: 2, text: 'inserted instruction', transientPlacement: 'transcript' as const };
   let live: import('../live-turn-projection.js').LiveTurnProjection | undefined = applyLiveTurnEvent(armLiveTurn('turn-1'), {
     type: 'text_delta', id: 'first', turnId: 'turn-1', messageId: 'before', ts: 2, text: 'old answer continues',
   });
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 00f61614bea..e839e34212b 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -379,19 +379,6 @@ test('a Host-admitted steering entry leaves the plate while an unadmitted local
 });
 
 
-test('queued steering rendered in the transcript never appears in the plate', () => {
-  const pending = { id: 'steer', text: 'new direction', ts: 1, pendingSteering: true, transientPlacement: 'transcript' as const };
-  const queued = { entryId: 'host-entry', messageId: pending.id, placement: 'current_turn' as const, state: 'queued' as const, content: { text: pending.text } };
-  for (const entries of [[queued], []]) {
-    const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
-      queuedMessages={entries} pendingMessages={[pending]} /></LocaleProvider>);
-    const document = parseHTML(`<html><body>${markup}</body></html>`).document;
-    assert.equal(document.querySelector('.maka-composer-queue'), null,
-      'a transcript steering bubble is not also a staging row');
-  }
-});
-
-
 test('local sends share the flat staging list with icon-only delivery actions', () => {
   const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
     queuedMessages={[{
@@ -404,7 +391,7 @@ test('local sends share the flat staging list with icon-only delivery actions',
         deliveryActions: [{ label: 'Check delivery', icon: <Search size={ICON_SIZE.control} aria-hidden="true" />, onClick() {} }] },
       { id: 'sending', text: 'still sending', ts: 2, transientPlacement: 'follow_up',
         deliveryStatus: 'Sending…' },
-      { id: 'local-steer', text: 'steering in flight', ts: 3, pendingSteering: true,
+      { id: 'local-steer', text: 'steering in flight', ts: 3,
         transientPlacement: 'transcript', deliveryStatus: 'Sending…' },
     ]} /></LocaleProvider>);
   const document = parseHTML(`<html><body>${markup}</body></html>`).document;
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 8221c950cd3..120da27356f 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -142,8 +142,6 @@ export interface ChatViewGoalIndicatorProps {
  * plus `hostTurnId` for the grouping once the Host names one.
  */
 export interface TransientUserMessageProjection {
-  /** Renders as a transcript bubble until Runtime emits steering_message. */
-  pendingSteering?: boolean;
   deliveryStatus?: string;
   deliveryDetail?: string;
   deliveryActions?: readonly { label: string; icon: ReactNode; onClick(): void | Promise<void> }[];
@@ -518,9 +516,6 @@ export function ChatView(props: {
     const turn = message.hostTurnId ? turnsById.get(message.hostTurnId) : undefined;
     if (
       turn === undefined
-      // Queued steering is not the Turn's root prompt; it renders at the tail
-      // until steering_message carries it into the timeline.
-      || message.pendingSteering === true
       || turn.user !== undefined
       || turn.timeline.some((item) => item.kind === 'user' && item.messageId === message.id)
     ) continue;

From 3d69e944893de32133daa668468fa375a958bfcb Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 13:33:49 +0800
Subject: [PATCH 21/33] fix(desktop): keep steering in the transcript from the
 moment it is sent

A steering send used to start as a local row in the staging drawer and jump
into the transcript once the Host queued it. Each message now has one home
for its whole life: steering in the transcript, follow-ups in the staging
drawer. The 'steering' transient placement, the submit path's steering flag,
and Side Chat's moved-to-successor rebinding exist only for that jump and
are removed; the drawer's local rows are follow-ups only.

Generated-by: Devin
---
 apps/desktop/renderer-architecture.json            |  2 +-
 .../app-shell-busy-race-settlement.test.ts         |  6 +++---
 .../__tests__/chat-view-optimistic-render.test.ts  |  8 +++-----
 .../main/__tests__/message-queue-ui-state.test.ts  |  4 ++--
 .../desktop/src/renderer/app-shell-chat-actions.ts |  7 ++-----
 .../controller/session-local-messages.tsx          |  4 ++--
 .../workbar/tools/side-chat/use-quote-companion.ts |  6 ++----
 .../workhub/controller/use-workhub-controller.ts   |  2 +-
 .../ui/src/__tests__/composer-send-toggle.test.tsx | 14 --------------
 packages/ui/src/chat-view.tsx                      |  4 ++--
 packages/ui/src/composer-message-queue.tsx         |  2 +-
 11 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index ffa2bf2361d..6e3adacca65 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -322,7 +322,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 10,
-        "nonTriviaTokens": 3565
+        "nonTriviaTokens": 3546
       },
       "src/renderer/app-shell-chrome-actions.tsx": {
         "importDeclarations": 1,
diff --git a/apps/desktop/src/main/__tests__/app-shell-busy-race-settlement.test.ts b/apps/desktop/src/main/__tests__/app-shell-busy-race-settlement.test.ts
index 1c7ee3d654b..7aad3b2aab4 100644
--- a/apps/desktop/src/main/__tests__/app-shell-busy-race-settlement.test.ts
+++ b/apps/desktop/src/main/__tests__/app-shell-busy-race-settlement.test.ts
@@ -80,11 +80,11 @@ describe('busy-raced send settlement', () => {
     } finally { restoreWindow(); }
   });
 
-  it('keeps steering pending while the Host admits it', async () => {
+  it('shows steering in the transcript while the Host admits it', async () => {
     const transient = new Map<string, TransientUserMessageProjection>();
     const restoreWindow = installWindow({ sessions: {
       submitMessage: async (_sessionId: string, _placement: string, _command: unknown) => {
-        assert.equal([...transient.values()][0]?.transientPlacement, 'steering');
+        assert.equal([...transient.values()][0]?.transientPlacement, 'transcript');
         return { ok: true, disposition: 'steering', attachments: [], inlineReferences: [], skillInvocation: EMPTY_SKILL_INVOCATION };
       },
     } });
@@ -96,7 +96,7 @@ describe('busy-raced send settlement', () => {
         updateTransientMessage: (_sessionId, message) => transient.set(message.id, message),
       });
       assert.equal(await actions.enqueueMessage('session-a', 'steer', 'current_turn'), true);
-      assert.equal([...transient.values()][0]?.transientPlacement, 'steering');
+      assert.equal([...transient.values()][0]?.transientPlacement, 'transcript');
     } finally { restoreWindow(); }
   });
 
diff --git a/apps/desktop/src/main/__tests__/chat-view-optimistic-render.test.ts b/apps/desktop/src/main/__tests__/chat-view-optimistic-render.test.ts
index 9c0ead10660..f843d4aafd8 100644
--- a/apps/desktop/src/main/__tests__/chat-view-optimistic-render.test.ts
+++ b/apps/desktop/src/main/__tests__/chat-view-optimistic-render.test.ts
@@ -134,9 +134,7 @@ test('ordinary sends stay in ChatView while queued prompts stay in the composer'
       'the ordinary prompt remains in the transcript');
   }
 
-  for (const transientPlacement of ['steering', 'follow_up'] as const) {
-    const document = render({ ...OPTIMISTIC_BUBBLE, transientPlacement });
-    assert.ok(document.querySelector('.maka-composer-queue')?.textContent?.includes(OPTIMISTIC_BUBBLE.text));
-    assert.equal(document.querySelector('.maka-user-message'), null, `${transientPlacement} stays out of the transcript`);
-  }
+  const followUp = render({ ...OPTIMISTIC_BUBBLE, transientPlacement: 'follow_up' });
+  assert.ok(followUp.querySelector('.maka-composer-queue')?.textContent?.includes(OPTIMISTIC_BUBBLE.text));
+  assert.equal(followUp.querySelector('.maka-user-message'), null, 'a follow-up stays out of the transcript');
 });
diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index bda5a11e01b..14423bb65d6 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -83,7 +83,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   assert.deepEqual(steering?.deliveryActions?.map((action) => action.label), ['Check delivery'],
     'an unconfirmed send offers only its receipt check, never cancellation');
   const placements = () => Object.fromEntries([...transient].map(([id, message]) => [id, message.transientPlacement]));
-  assert.deepEqual(placements(), { steering: 'steering', followup: 'follow_up', root: 'transcript' });
+  assert.deepEqual(placements(), { steering: 'transcript', followup: 'follow_up', root: 'transcript' });
   await act(async () => { await steering?.deliveryActions?.[0]?.onClick(); });
   assert.deepEqual(reconciled, [['session-1', 'steering']]);
   assert.equal(transient.has('steering'), true, 'checking delivery does not retire the row');
@@ -108,7 +108,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   assert.equal(transient.get('root')?.deliveryActions?.length, 2, 'a Host outage keeps the copy editable and removable');
   messages = messages.map((message) => ({ ...message, state: 'failed' }));
   await act(async () => changed('session-1'));
-  assert.deepEqual(placements(), { steering: 'steering', root: 'transcript' }, 'failed delivery moves nothing');
+  assert.deepEqual(placements(), { steering: 'transcript', root: 'transcript' }, 'failed delivery moves nothing');
   messages = messages.map((message) => ({ ...message, state: 'accepted', ...(message.messageId === 'root' ? { turnId: 'started-turn' } : {}) }));
   await act(async () => changed('session-1'));
   assert.deepEqual([...transient.keys()], ['root']);
diff --git a/apps/desktop/src/renderer/app-shell-chat-actions.ts b/apps/desktop/src/renderer/app-shell-chat-actions.ts
index 985e6cc18cb..50d546db75f 100644
--- a/apps/desktop/src/renderer/app-shell-chat-actions.ts
+++ b/apps/desktop/src/renderer/app-shell-chat-actions.ts
@@ -249,7 +249,6 @@ export function createAppShellChatActions(deps: {
     >;
     displayText?: string;
     quotes?: readonly QuoteRef[];
-    steering?: boolean;
     waitForHostAdmission?: boolean;
     /** Whether this Session's surface is on screen to receive Skill feedback. */
     isSurfaceVisible?: () => boolean;
@@ -282,8 +281,7 @@ export function createAppShellChatActions(deps: {
       id: messageId,
       text: input.displayText ?? skillFeedback.skillInvocationDisplayText(input.command.text, result.skillInvocation),
       attachments: [...result.attachments],
-      transientPlacement: result.disposition === 'turn_started' ? 'transcript'
-        : placement === 'next_turn' ? 'follow_up' : input.steering ? 'steering' : 'transcript',
+      transientPlacement: result.disposition !== 'turn_started' && placement === 'next_turn' ? 'follow_up' : 'transcript',
       ...(result.turnId ? { hostTurnId: result.turnId } : {}),
       ...copiedArray('directoryReferences', directoryReferences),
       ...copiedArray('quotes', input.quotes ?? []),
@@ -497,7 +495,7 @@ export function createAppShellChatActions(deps: {
     publishTransientUserMessage(sessionId, {
       id: messageId, text, attachments: Conversation.retainedAttachmentRefs(pending ?? []),
       ...(steeringTurnId ? { hostTurnId: steeringTurnId } : {}),
-      transientPlacement: placement === 'current_turn' ? 'steering' : 'follow_up',
+      transientPlacement: placement === 'next_turn' ? 'follow_up' : 'transcript',
       ...copiedArray('directoryReferences', directoryReferences),
       ...copiedArray('quotes', quotes),
       inlineReferences: [],
@@ -509,7 +507,6 @@ export function createAppShellChatActions(deps: {
         sessionId,
         messageId,
         placement,
-        steering: placement === 'current_turn',
         command: {
           text,
           ...copiedArray('attachmentItems', attachmentItems),
diff --git a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
index 926e6b1b8e3..b4549959dfe 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
+++ b/apps/desktop/src/renderer/features/conversation/controller/session-local-messages.tsx
@@ -68,8 +68,8 @@ export function SessionLocalMessages(props: {
               text: message.text,
               ts: message.createdAt,
               // Only an ordinary send records `localDisplayPlacement`.
-              transientPlacement: message.turnId || message.localDisplayPlacement === 'current_turn' ? 'transcript'
-                : message.placement === 'current_turn' ? 'steering' : 'follow_up',
+              transientPlacement: message.turnId || message.localDisplayPlacement === 'current_turn'
+                || message.placement === 'current_turn' ? 'transcript' : 'follow_up',
               attachments: message.attachments,
               directoryReferences: message.directoryReferences,
               quotes: message.quotes,
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index 86c5bd8b811..d5adef1b729 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -516,12 +516,10 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const bindPendingMessageTurn = useCallback((messageId: string, turnId: string, startsTurn = false) => {
     const message = pendingUserMessagesRef.current.get(messageId);
     if (!message) return;
-    const movedToSuccessor = message.transientPlacement === 'steering'
-      && message.hostTurnId !== undefined && message.hostTurnId !== turnId;
     pendingUserMessagesRef.current.set(messageId, {
       ...message,
       hostTurnId: turnId,
-      ...((startsTurn || movedToSuccessor || message.transientPlacement === 'follow_up') && {
+      ...((startsTurn || message.transientPlacement === 'follow_up') && {
         transientPlacement: 'transcript',
       }),
     });
@@ -1521,7 +1519,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
       id: admissionId,
       text: trimmed,
       ts: Date.now(),
-      transientPlacement: placement === 'current_turn' ? 'steering' : 'follow_up',
+      transientPlacement: placement === 'next_turn' ? 'follow_up' : 'transcript',
       ...(placement === 'current_turn' && activeTurnIdRef.current
         ? { hostTurnId: activeTurnIdRef.current }
         : {}),
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index 89bdf07b3e4..477083eb0ae 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -564,7 +564,7 @@ export function useWorkHubController(
         pendingQueued.current = attempt;
         if (!attempt.observed) setMessagePresentation((previous) => ({ ...previous, transientMessages: [...previous.transientMessages.filter((message) => message.id !== attempt.messageId), {
           id: attempt.messageId, hostTurnId: queuedTurnId, text, attachments: [...attachments],
-          ts: Date.now(), transientPlacement: attempt.placement === 'current_turn' ? 'steering' : 'follow_up',
+          ts: Date.now(), transientPlacement: attempt.placement === 'next_turn' ? 'follow_up' : 'transcript',
         }] }));
         viewportNavigation.followLatest(target);
         const result = await services.enqueueMessage(target, attempt.messageId, text, attachments, attempt.placement);
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index e839e34212b..177196912b0 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -365,20 +365,6 @@ test('keeps Host order visible until the reordered projection arrives', async ()
 });
 
 
-test('a Host-admitted steering entry leaves the plate while an unadmitted local copy stays', () => {
-  const pending = { id: 'steer', text: 'new direction', ts: 1, transientPlacement: 'steering' as const };
-  const queued = { entryId: 'host-entry', messageId: pending.id, placement: 'current_turn' as const, state: 'queued' as const, content: { text: pending.text } };
-  const admitted = parseHTML(`<html><body>${renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
-    queuedMessages={[queued]} pendingMessages={[pending]} /></LocaleProvider>)}</body></html>`).document;
-  assert.equal(admitted.querySelector('.maka-composer-queue'), null,
-    'once the Host owns the steering entry its transcript bubble is the row');
-  const unadmitted = parseHTML(`<html><body>${renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
-    queuedMessages={[]} pendingMessages={[pending]} /></LocaleProvider>)}</body></html>`).document;
-  assert.equal(unadmitted.querySelectorAll('.maka-composer-queue-text').length, 1,
-    'a steering send the Host never saw keeps its local row in the staging list');
-});
-
-
 test('local sends share the flat staging list with icon-only delivery actions', () => {
   const markup = renderToStaticMarkup(<LocaleProvider locale="en"><Composer onSend={() => undefined} onStop={() => undefined}
     queuedMessages={[{
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 120da27356f..b41986fbeae 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -152,8 +152,8 @@ export interface TransientUserMessageProjection {
   directoryReferences?: readonly import('@maka/core/events').DirectoryReference[];
   quotes?: readonly QuoteRef[];
   inlineReferences?: readonly InlineReference[];
-  /** Steering and follow-ups stay in the composer queue until the Host takes them. */
-  transientPlacement: 'transcript' | 'steering' | 'follow_up';
+  /** Follow-ups stay in the composer queue until the Host takes them. */
+  transientPlacement: 'transcript' | 'follow_up';
   /** The Host Turn this Message is already bound to, once the Host named one. */
   hostTurnId?: string;
 }
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index f36e19d2f41..dc61323de78 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -61,7 +61,7 @@ export function projectComposerMessageQueue(
   if (pending.length === 0) return followups;
   return [...followups, ...pending.map((message): ComposerQueueEntry => ({
     entryId: message.id, messageId: message.id, content: { text: message.text },
-    placement: message.transientPlacement === 'steering' ? 'current_turn' : 'next_turn', state: 'local', localMessage: message,
+    placement: 'next_turn', state: 'local', localMessage: message,
   }))];
 }
 

From 8d29f65eb05b17af11bcbd15974fa7c9eec20307 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 14:18:07 +0800
Subject: [PATCH 22/33] chore(desktop): refresh renderer architecture ledger
 after rebase

Generated-by: Devin
---
 apps/desktop/renderer-architecture.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index 6e3adacca65..8969c81d5ce 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -595,7 +595,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 7,
-        "nonTriviaTokens": 2677
+        "nonTriviaTokens": 2590
       },
       "src/renderer/app-shell-session-ui-state.ts": {
         "importDeclarations": 0,
@@ -689,7 +689,7 @@
           "useNewTaskChoice": 1,
           "useOnboardingSnapshot": 1,
           "usePlanModeState": 1,
-          "useRef": 13,
+          "useRef": 12,
           "useSessionEventHealthPolling": 1,
           "useSessionNavigationReads": 1,
           "useSessionSettingIntent": 1,
@@ -788,7 +788,7 @@
           "react": 1
         },
         "importSpecifiers": 92,
-        "nonTriviaTokens": 12373
+        "nonTriviaTokens": 12139
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,

From 380d7b4a0210463b4ab2fdd13d99ab1b9ebbf903 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 16:40:26 +0800
Subject: [PATCH 23/33] fix(desktop): restore quotes through the composer quote
 store after #5470

Generated-by: Devin

#5470 moved quote staging into useComposerQuotes and dropped restoreQuotes; the queued-steering edit still hands quotes back to the owning Session's draft, so the keyed restore returns to its new home.
---
 apps/desktop/src/renderer/app-shell.tsx                  | 1 +
 .../conversation/controller/use-composer-quotes.ts       | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 2cacf3ddb0a..95a4af66a01 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -404,6 +404,7 @@ function AppShellContent({
     quotesForSend,
     addQuote,
     clearQuotes,
+    restoreQuotes,
     composerQuoteProps,
     chatViewQuoteProps,
   } = useComposerAttachments({
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-composer-quotes.ts b/apps/desktop/src/renderer/features/conversation/controller/use-composer-quotes.ts
index f21209604a1..136621041af 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-composer-quotes.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-composer-quotes.ts
@@ -83,6 +83,14 @@ export function useComposerQuotes(options: { readonly draftKey: string }) {
     publish();
   }, [bucket, publish]);
 
+  const restoreQuotes = useCallback((ownerKey: string, quotes: readonly QuoteRef[]): void => {
+    if (quotes.length === 0) return;
+    const ownerBucket = pendingByKeyRef.current[ownerKey] ??
+      (pendingByKeyRef.current[ownerKey] = []);
+    ownerBucket.push(...quotes.map((quote) => ({ ...quote })));
+    publish();
+  }, [publish]);
+
   // The composer's token asks the transcript to open the note editor over the
   // excerpt; a synchronous false means it falls back to its own popover.
   const chatViewRef = useRef<ChatViewHandle>(null);
@@ -99,6 +107,7 @@ export function useComposerQuotes(options: { readonly draftKey: string }) {
     updateQuoteComment,
     removeQuote,
     clearQuotes,
+    restoreQuotes,
     quotesForSend,
     composerQuoteProps: (canStage: boolean) => ({
       pendingQuotes: bucket,

From af69eec5519dc656b1b3315651d4b39cb34011e6 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 16:42:05 +0800
Subject: [PATCH 24/33] chore(desktop): refresh renderer architecture ledger
 after rebase

Generated-by: Devin
---
 apps/desktop/renderer-architecture.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index 8969c81d5ce..8466e3e3551 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -788,7 +788,7 @@
           "react": 1
         },
         "importSpecifiers": 92,
-        "nonTriviaTokens": 12139
+        "nonTriviaTokens": 12141
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,

From 0d89d5c1f65cce9c4ec09d2a782651570d31a051 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 17:03:35 +0800
Subject: [PATCH 25/33] test(desktop): play the queued-message lifecycle
 through the shell story
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The static QueuedSteeringInTranscript story showed one frozen frame, so
nothing covered a message moving between surfaces. The flow story drives
the real composer and ChatView against a stand-in Host queue read through
deriveMessageQueueProjection: Enter queues a follow-up in the staging
drawer, 直接发送 promotes it into a transcript bubble with edit/delete, and
a steering_message at the step boundary lands it inside the Turn once.
It replaces the static story, whose assertions it runs mid-play.

Generated-by: Devin
---
 apps/desktop/stories/app-shell.stories.tsx    | 238 ++++++++++++++----
 .../composer-message-queue.stories.tsx        |   2 +-
 2 files changed, 197 insertions(+), 43 deletions(-)

diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 5529d7deb5b..36f85b708f7 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -20,11 +20,16 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
 import { ResizeHandle, useResizable } from '@astryxdesign/core/Resizable';
-import { useEffect, useReducer, useState, type CSSProperties, type ReactNode } from 'react';
+import { useEffect, useReducer, useRef, useState, type CSSProperties, type ReactNode } from 'react';
 import type { ComponentProps } from 'react';
 import type { ProjectRecord } from '@maka/core/project';
 import type { SessionSummary, StoredMessage } from '@maka/core/session';
-import type { SessionEvent } from '@maka/core/events';
+import type {
+  MessageQueueEntryProjection,
+  MessageQueuePlacement,
+  QueueUpdateEvent,
+  SessionEvent,
+} from '@maka/core/events';
 import {
   ChatSurfaceLayout,
   ChatView,
@@ -37,8 +42,9 @@ import {
   TitlebarSessionIdentity,
   ToastProvider,
 } from '@maka/ui';
-import type { ChatModelChoice, SessionViewMode, TurnViewModel, LiveTurnBuffer } from '@maka/ui';
+import type { ChatModelChoice, ComposerHandle, SessionViewMode, TurnViewModel, LiveTurnBuffer } from '@maka/ui';
 import { SessionRail, type SessionRailStoryProps } from '../../../packages/ui/stories/session-rail-harness.js';
+import { deriveMessageQueueProjection } from '../src/renderer/application/contracts/message-queue-projection';
 import { withQueuedSteeringTransients } from '../src/renderer/application/contracts/transient-message-projection';
 import { AppShellTitlebar } from '../src/renderer/app-shell-chrome-actions';
 import { appShellFrameStyle } from '../src/renderer/shell/frame-style';
@@ -735,46 +741,194 @@ export const PromptSentBeforeTurnLands: Story = {
   },
 };
 
-// Real path: a steering send the Host queued but has not consumed yet derives
-// from the queue snapshot at the render boundary — the transcript bubble is
-// that entry, with retract-backed edit/delete. The plate shows follow-ups only.
-export const QueuedSteeringInTranscript: Story = {
-  render: () => (
-    <ComposedShell
-      session={{ status: 'running', streaming: true }}
-      chat={{
-        activeTurn: { turnId: 'turn-s' },
-        messages: [
-          user('msg-s-1', 'turn-s', 3, '把整套测试跑一遍，看看那三个失败用例是不是同一个原因。'),
-          { type: 'turn_state', id: 'state-s', turnId: 'turn-s', ts: NOW - 30_000, status: 'running' },
-        ],
-        liveTurns: [{
-          turnId: 'turn-s', steps: [{
-            stepId: 'msg-assistant-s',
-            text: { text: '先把失败用例的栈对上。', truncated: false, complete: false },
-            tools: [],
-          }],
-        }],
-        transientMessages: withQueuedSteeringTransients([], {
-          ts: NOW - 10_000,
-          entries: [{
-            entryId: 'entry-steer',
-            messageId: 'msg-steer-queued',
-            content: { text: '顺便确认一下 coverage 阈值没有变。' },
-            placement: 'current_turn',
-            state: 'queued',
-          }],
-        }, { locale: 'zh-CN', retract: async () => {}, restoreDraft: () => {} }),
-      }}
-    />
-  ),
+const QUEUE_TURN = 'turn-queue';
+
+type QueueHost = {
+  revision: number;
+  steering: MessageQueueEntryProjection[];
+  followup: MessageQueueEntryProjection[];
+  liveTurns: LiveTurnBuffer | undefined;
+};
+type QueueHostAction =
+  | { type: 'enqueue'; text: string; placement: MessageQueuePlacement }
+  | { type: 'promote' | 'retract'; entryId: string }
+  | { type: 'update'; entryId: string; text: string }
+  | { type: 'reorder'; entryIds: readonly string[] }
+  | { type: 'consume' };
+
+// Stands in for the Runtime Host queue: every mutation bumps the revision the
+// shell reads through the same queue_update projection production uses, and
+// consumption echoes the steering_message a step boundary emits.
+function reduceQueueHost(host: QueueHost, action: QueueHostAction): QueueHost {
+  const revision = host.revision + 1;
+  const without = (entries: MessageQueueEntryProjection[], entryId: string) =>
+    entries.filter((entry) => entry.entryId !== entryId);
+  switch (action.type) {
+    case 'enqueue': {
+      const entry: MessageQueueEntryProjection = {
+        entryId: `entry-${revision}`,
+        messageId: `msg-queued-${revision}`,
+        content: { text: action.text },
+        placement: action.placement,
+        state: 'queued',
+      };
+      return action.placement === 'current_turn'
+        ? { ...host, revision, steering: [...host.steering, entry] }
+        : { ...host, revision, followup: [...host.followup, entry] };
+    }
+    case 'promote': {
+      const entry = host.followup.find((candidate) => candidate.entryId === action.entryId);
+      if (!entry) return host;
+      return {
+        ...host,
+        revision,
+        followup: without(host.followup, action.entryId),
+        steering: [...host.steering, { ...entry, placement: 'current_turn' }],
+      };
+    }
+    case 'retract':
+      return { ...host, revision, steering: without(host.steering, action.entryId), followup: without(host.followup, action.entryId) };
+    case 'update': {
+      const edit = (entry: MessageQueueEntryProjection) =>
+        entry.entryId === action.entryId ? { ...entry, content: { ...entry.content, text: action.text } } : entry;
+      return { ...host, revision, steering: host.steering.map(edit), followup: host.followup.map(edit) };
+    }
+    case 'reorder':
+      return {
+        ...host,
+        revision,
+        followup: action.entryIds.flatMap((entryId) => host.followup.filter((entry) => entry.entryId === entryId)),
+      };
+    case 'consume': {
+      const [entry, ...rest] = host.steering;
+      if (!entry) return host;
+      const liveTurns = applyLiveTurnBufferEvent(host.liveTurns, {
+        type: 'steering_message',
+        id: `steering-${entry.messageId}`,
+        turnId: QUEUE_TURN,
+        ts: Date.now(),
+        messageId: entry.messageId,
+        content: entry.content,
+      }, 'zh-CN');
+      return { ...host, revision, steering: rest, liveTurns };
+    }
+  }
+}
+
+function queueUpdate(host: QueueHost, ts: number): QueueUpdateEvent {
+  return {
+    type: 'queue_update',
+    id: `queue-${host.revision}`,
+    turnId: QUEUE_TURN,
+    ts,
+    queueRevision: host.revision,
+    steering: host.steering.map((entry) => entry.content.text),
+    followup: host.followup.map((entry) => entry.content.text),
+    steeringEntries: host.steering,
+    followupEntries: host.followup,
+  };
+}
+
+function QueuedMessageLifecycle() {
+  const [host, dispatch] = useReducer(reduceQueueHost, {
+    revision: 0,
+    steering: [],
+    followup: [],
+    liveTurns: [{
+      turnId: QUEUE_TURN,
+      steps: [{
+        stepId: 'msg-assistant-queue',
+        text: { text: '先把失败用例的栈对上，三个都停在同一个断言附近。', truncated: false, complete: false },
+        tools: [],
+      }],
+    }],
+  });
+  // The running Turn's clock reads wall time, so the scene starts from mount.
+  const [startedAt] = useState(Date.now);
+  const composerRef = useRef<ComposerHandle>(null);
+  const queue = deriveMessageQueueProjection(queueUpdate(host, startedAt));
+  const retract = async (entryId: string) => dispatch({ type: 'retract', entryId });
+  return (
+    <div style={{ height: '100vh', display: 'flex', flexDirection: 'column' }}>
+      <div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: 8, flexShrink: 0 }}>
+        <span>演示控制 · Host 在下一个步骤边界消费已排队的 steering</span>
+        <Button
+          size="sm"
+          label="Host 消费 steering"
+          isDisabled={host.steering.length === 0}
+          onClick={() => dispatch({ type: 'consume' })}
+        />
+      </div>
+      <ComposedShell
+        sidebarCollapsed
+        frameHeight="calc(100vh - 48px)"
+        session={{ status: 'running', streaming: true }}
+        chat={{
+          activeTurn: { turnId: QUEUE_TURN },
+          messages: [
+            { type: 'user', id: 'msg-queue-1', turnId: QUEUE_TURN, ts: startedAt - 20_000, text: '把整套测试跑一遍，看看那三个失败用例是不是同一个原因。' },
+            { type: 'turn_state', id: 'state-queue', turnId: QUEUE_TURN, ts: startedAt - 20_000, status: 'running' },
+          ],
+          liveTurns: host.liveTurns,
+          transientMessages: withQueuedSteeringTransients([], queue, {
+            locale: 'zh-CN',
+            retract,
+            restoreDraft: (draft) => composerRef.current?.setText(draft.text),
+          }),
+        }}
+        composer={{
+          ref: composerRef,
+          queuedMessages: queue.entries,
+          queuedMessageRevision: queue.queueRevision,
+          // Plain Enter mid-turn is an ordinary send the Host queues for the
+          // next Turn; Cmd/Ctrl+Enter asks for the current one.
+          onSend: (text, metadata) => {
+            dispatch({ type: 'enqueue', text, placement: metadata?.followUpMode === 'steer' ? 'current_turn' : 'next_turn' });
+          },
+          onPromoteQueuedEntry: (entryId) => dispatch({ type: 'promote', entryId }),
+          onUpdateQueuedEntry: (entryId, _revision, text) => dispatch({ type: 'update', entryId, text }),
+          onDeleteQueuedEntry: retract,
+          onReorderQueuedEntries: (entryIds) => dispatch({ type: 'reorder', entryIds }),
+        }}
+      />
+    </div>
+  );
+}
+
+// Real path: mid-turn Enter queues a follow-up in the staging drawer → 直接发送
+// promotes it into the running Turn, where it becomes a transcript bubble with
+// edit/delete → the Host consumes it at the next step boundary and the same
+// message lands inside the Turn, shown once. The control bar stands in for the
+// step boundary.
+export const QueuedMessageLifecycleFlow: Story = {
+  name: '排队消息：暂存区 → 直接发送 → 进入对话',
+  render: () => <QueuedMessageLifecycle />,
   play: async ({ canvasElement }) => {
-    const bubble = canvasElement.querySelector('[data-transient-message-id="msg-steer-queued"]');
-    await expect(bubble).not.toBeNull();
-    await expect(bubble?.textContent).toContain('coverage');
-    await expect(bubble?.querySelector('[aria-label="编辑"]')).not.toBeNull();
-    await expect(bubble?.querySelector('[aria-label="删除"]')).not.toBeNull();
-    await expect(canvasElement.querySelector('.maka-composer-queue')).toBeNull();
+    const canvas = within(canvasElement);
+    const text = '顺便确认一下 coverage 阈值没有变。';
+    const input = canvasElement.querySelector<HTMLElement>('.maka-composer-editor [contenteditable="true"]');
+    if (!input) throw new Error('The composer input is missing');
+    await userEvent.type(input, text);
+    await userEvent.keyboard('{Enter}');
+    await waitFor(() => expect(canvasElement.querySelector('.maka-composer-queue-text')).toHaveTextContent(text));
+    await expect(canvasElement.querySelector('[data-transient-message-id]')).toBeNull();
+
+    await userEvent.click(canvas.getByRole('button', { name: '直接发送' }));
+    await waitFor(() => {
+      expect(canvasElement.querySelector('.maka-composer-queue')).toBeNull();
+      const bubble = canvasElement.querySelector('[data-transient-message-id]');
+      expect(bubble).toHaveTextContent(text);
+      expect(bubble?.querySelector('[aria-label="编辑"]')).not.toBeNull();
+      expect(bubble?.querySelector('[aria-label="删除"]')).not.toBeNull();
+    });
+
+    await userEvent.click(canvas.getByRole('button', { name: 'Host 消费 steering' }));
+    await waitFor(() => {
+      expect(canvasElement.querySelector('[data-transient-message-id]')).toBeNull();
+      const rows = canvas.getAllByText(text);
+      expect(rows).toHaveLength(1);
+      expect(rows[0]!.closest(`[data-turn-id="${QUEUE_TURN}"]`)).not.toBeNull();
+    });
   },
 };
 
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 9889cafc711..5c5fe393ed6 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -183,7 +183,7 @@ function followUpEntry(entryId: string, text: string): MessageQueueEntryProjecti
  */
 // A production queue snapshot also carries queued steering; the drawer filters
 // it out — steering renders in the transcript instead (see the
-// QueuedSteeringInTranscript story in app-shell).
+// QueuedMessageLifecycleFlow story in app-shell).
 const DEFAULT_QUEUE: MessageQueueEntryProjection[] = [
   {
     entryId: 'entry-steer',

From 9bb5b3b6bbd3feb53a361d1cb5c6ac60ae529d20 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 17:21:05 +0800
Subject: [PATCH 26/33] fix(runtime-host): seed an empty queue only for
 queue-rendering observers

Always seeding queue_update reached ACP too. ACP ignores the event, but a
restored Turn whose output delivery had already failed rethrew that
failure on the next accepted event and stopped the Host Turn, and a
session/load sibling lost its replayed chunk. main's rule is back: seed
the queue when admissions are projected or it has entries. The Desktop
observer, which renders queues, asks for the empty seed explicitly so a
queue drained while unobserved still clears. The CLI driver tests return
to main's version; the projector test pins which consumer gets the seed.

Generated-by: Devin
---
 .../src/main/runtime-host-session-observer.ts |   4 +-
 .../runtime-host-session-driver.test.ts       | 124 +++++++-----------
 .../src/__tests__/session-projector.test.ts   |  34 +++--
 .../src/adapter/session-projector.ts          |  23 +++-
 4 files changed, 91 insertions(+), 94 deletions(-)

diff --git a/apps/desktop/src/main/runtime-host-session-observer.ts b/apps/desktop/src/main/runtime-host-session-observer.ts
index d9ee8d6d3ae..cf669c11620 100644
--- a/apps/desktop/src/main/runtime-host-session-observer.ts
+++ b/apps/desktop/src/main/runtime-host-session-observer.ts
@@ -764,7 +764,7 @@ export class RuntimeHostSessionObserver {
     state: ObservedSessionState,
     group: ObserverTargetGroup,
     observerId?: string,
-    events = state.projector?.seedActive(true) ?? [],
+    events = state.projector?.seedActive(true, { includeEmptyQueue: true }) ?? [],
   ): void {
     if (!state.snapshot || !state.replica) return;
     const observerIds = observerId ? [observerId] : [...group.observerIds];
@@ -1754,7 +1754,7 @@ function replacementProjection(
   const previousRoot = previous.rootTurn;
   const root = next.rootTurn;
   const terminalEvents: SessionEvent[] = [];
-  const seedEvents = projector.seedActive(true);
+  const seedEvents = projector.seedActive(true, { includeEmptyQueue: true });
   if (previousRoot && !isTerminalTurn(previousRoot)) {
     if (!root || root.runId !== previousRoot.runId) {
       const stored = projector.seedStoredTerminal(
diff --git a/packages/cli/src/__tests__/runtime-host-session-driver.test.ts b/packages/cli/src/__tests__/runtime-host-session-driver.test.ts
index 9f9955e398b..937e4b66bee 100644
--- a/packages/cli/src/__tests__/runtime-host-session-driver.test.ts
+++ b/packages/cli/src/__tests__/runtime-host-session-driver.test.ts
@@ -1123,7 +1123,7 @@ describe('Runtime Host Maka Session driver', () => {
     const switched = await switching;
     assert.deepEqual(switched.messages, [assistantMessage('turn-1', 'Hello')]);
     assert.ok(switched.activeTurn);
-    const event = await nextTurnEvent(switched.activeTurn.events);
+    const event = await nextEvent(switched.activeTurn.events);
     assert.deepEqual(event, {
       type: 'text_delta',
       id: 'host-frame:host-1:subscription-1:1',
@@ -1155,9 +1155,9 @@ describe('Runtime Host Maka Session driver', () => {
 
     assert.deepEqual(
       [
-        await nextTurnEvent(switched.activeTurn.events),
-        await nextTurnEvent(switched.activeTurn.events),
-        await nextTurnEvent(switched.activeTurn.events),
+        await nextEvent(switched.activeTurn.events),
+        await nextEvent(switched.activeTurn.events),
+        await nextEvent(switched.activeTurn.events),
       ].map((event) => ({
         type: event.type,
         messageId: 'messageId' in event ? event.messageId : undefined,
@@ -1238,9 +1238,9 @@ describe('Runtime Host Maka Session driver', () => {
 
     const switched = await switching;
     assert.ok(switched.activeTurn);
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'text_delta');
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'text_complete');
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'text_delta');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'text_complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
   });
 
@@ -1286,7 +1286,7 @@ describe('Runtime Host Maka Session driver', () => {
         rootTurn: completedTurn('turn-1', 'run-1'),
       }),
     });
-    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => refresh.transcriptCalls > 0);
     first.push({
@@ -1308,7 +1308,7 @@ describe('Runtime Host Maka Session driver', () => {
       assistantMessage('turn-2', 'New'),
     ]);
     second.push(deltaFrame(1, 'turn-2', 3, ' text', 'subscription-2', 'run-2'));
-    assert.equal((await nextTurnEvent(attached.events)).type, 'text_delta');
+    assert.equal((await nextEvent(attached.events)).type, 'text_delta');
   });
 
   test('hides the copied parent transcript when a Host starts the side successor turn', async () => {
@@ -1373,7 +1373,7 @@ describe('Runtime Host Maka Session driver', () => {
         rootTurn: completedTurn('turn-1', 'run-1'),
       }),
     });
-    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => refresh.transcriptCalls > 0);
     first.push({
@@ -1439,7 +1439,7 @@ describe('Runtime Host Maka Session driver', () => {
         rootTurn: completedTurn('turn-1', 'run-1'),
       }),
     });
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => refresh.transcriptCalls > 0);
     first.push({
@@ -1458,11 +1458,11 @@ describe('Runtime Host Maka Session driver', () => {
       userMessage('turn-2', 'Fast follow up'),
       assistantMessage('turn-2', 'Done'),
     ]);
-    const text = await nextTurnEvent(attached.events);
+    const text = await nextEvent(attached.events);
     assert.equal(text.type, 'text_complete');
     if (text.type !== 'text_complete') assert.fail('Expected the durable assistant answer');
     assert.equal(text.text, 'Done');
-    assert.equal((await nextTurnEvent(attached.events)).type, 'complete');
+    assert.equal((await nextEvent(attached.events)).type, 'complete');
   });
 
   test('serializes buffered successor reattach so transcript completion cannot reverse turn order', async () => {
@@ -1506,7 +1506,7 @@ describe('Runtime Host Maka Session driver', () => {
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
     first.push(projectionFrame(3, completedTurn('turn-2', 'run-2'), 4));
     first.push(projectionFrame(4, runningTurn('turn-3', 'run-3'), 5));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
 
     await waitFor(() => connection.openedSubscriptions === 4);
@@ -1582,7 +1582,7 @@ describe('Runtime Host Maka Session driver', () => {
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
     first.push(projectionFrame(3, completedTurn('turn-2', 'run-2'), 4));
     first.push(projectionFrame(4, runningTurn('turn-3', 'run-3'), 5));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 4 && second.nextCalls > 0);
 
@@ -1642,7 +1642,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     first.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
-    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 3);
 
@@ -1689,7 +1689,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     first.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
-    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(
       () =>
@@ -1755,7 +1755,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     first.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
     first.push(projectionFrame(2, runningTurn('turn-2', 'run-2'), 3));
-    assert.equal((await nextTurnEvent(initial.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(initial.activeTurn.events)).type, 'complete');
     assert.equal((await initial.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 3);
 
@@ -1763,7 +1763,7 @@ describe('Runtime Host Maka Session driver', () => {
     assert.ok(switched.activeTurn);
     current.push(projectionFrame(1, completedTurn('turn-3', 'run-3'), 5, 'subscription-current'));
     current.push(projectionFrame(2, runningTurn('turn-4', 'run-4'), 6, 'subscription-current'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     await waitFor(() => connection.openedSubscriptions === 6 && started.includes('turn-4'));
     assert.deepEqual(started, ['turn-4']);
@@ -1999,11 +1999,11 @@ describe('Runtime Host Maka Session driver', () => {
     });
     const switched = await driver.switchSession('session-1');
     assert.ok(switched.activeTurn);
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'user_question_request');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'user_question_request');
 
     await driver.respondToUserQuestion!({ requestId: 'question-1', answers: ['Yes'] });
 
-    assert.deepEqual(await nextTurnEvent(switched.activeTurn.events), {
+    assert.deepEqual(await nextEvent(switched.activeTurn.events), {
       type: 'user_question_answer_ack',
       id: 'host-interaction:question-1:2',
       turnId: 'turn-1',
@@ -2029,7 +2029,7 @@ describe('Runtime Host Maka Session driver', () => {
     });
     const switched = await driver.switchSession('session-1');
     assert.ok(switched.activeTurn);
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'form_request');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'form_request');
 
     await driver.respondToUserForm!({
       requestId: 'form-1',
@@ -2045,7 +2045,7 @@ describe('Runtime Host Maka Session driver', () => {
         answer: { kind: 'form', action: 'accept', values: { version: 'v2' } },
       },
     });
-    assert.deepEqual(await nextTurnEvent(switched.activeTurn.events), {
+    assert.deepEqual(await nextEvent(switched.activeTurn.events), {
       type: 'form_answer_ack',
       id: 'host-interaction:form-1:2',
       turnId: 'turn-1',
@@ -2490,7 +2490,7 @@ describe('Runtime Host Maka Session driver', () => {
 
     const turn = await driver.preparePrompt('Continue');
     second.push(deltaFrame(1, 'turn-2', 0, 'Recovered', 'subscription-2', 'run-2'));
-    assert.equal((await nextTurnEvent(turn.events)).text, 'Recovered');
+    assert.equal((await nextEvent(turn.events)).text, 'Recovered');
   });
 
   test('starts explicit Skills through the Host command and preserves its typed feedback', async () => {
@@ -2742,7 +2742,7 @@ describe('Runtime Host Maka Session driver', () => {
     assert.deepEqual(await transcript.promise, [assistantMessage('turn-1', 'Hello world')]);
     assert.equal(connection.openedSubscriptions, 2);
     replacement.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-2'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
   });
 
   test('recovers the complete terminal answer when a Turn finishes during reconnect', async () => {
@@ -2774,10 +2774,10 @@ describe('Runtime Host Maka Session driver', () => {
     assert.ok(switched.activeTurn);
 
     initial.fail(new RuntimeHostSubscriptionError('connection_closed', 'connection lost'));
-    const text = await nextTurnEvent(switched.activeTurn.events);
+    const text = await nextEvent(switched.activeTurn.events);
     assert.equal(text.type, 'text_complete');
     assert.equal(text.text, 'Hello world');
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
   });
 
@@ -2823,8 +2823,8 @@ describe('Runtime Host Maka Session driver', () => {
     driver.subscribeStartedTurns!((turn) => started.resolve(turn));
 
     initial.fail(new RuntimeHostSubscriptionError('connection_closed', 'connection lost'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'text_complete');
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'text_complete');
+    assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
     assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     assert.equal((await started.promise).turnId, 'turn-2');
   });
@@ -3452,17 +3452,14 @@ function pendingPermission() {
   };
 }
 
-async function nextTurnEvent(events: AsyncIterable<unknown>): Promise<any> {
+async function nextEvent(events: AsyncIterable<unknown>): Promise<any> {
   const iterator = events[Symbol.asyncIterator]();
-  for (;;) {
-    const result = await Promise.race([
-      iterator.next(),
-      delay(WAIT_BUDGET_MS).then(() => assert.fail('Timed out waiting for Session event')),
-    ]);
-    assert.equal(result.done, false);
-    const value = result.value as { type?: string };
-    if (value?.type !== 'queue_update') return result.value;
-  }
+  const result = await Promise.race([
+    iterator.next(),
+    delay(WAIT_BUDGET_MS).then(() => assert.fail('Timed out waiting for Session event')),
+  ]);
+  assert.equal(result.done, false);
+  return result.value;
 }
 
 function sequenceIds(...ids: string[]): () => string {
@@ -3581,7 +3578,7 @@ describe('turn consumer lag recovery (#3180)', () => {
 
     // The stream never rejected, and live events land right away.
     replacement.push(deltaFrame(1, 'turn-1', 5, ' world', 'subscription-2'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, ' world');
+    assert.equal((await nextEvent(switched.activeTurn.events)).text, ' world');
   });
 
   test('lands terminal events while shedding deltas from a lagging consumer', async () => {
@@ -3661,8 +3658,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     await delay(0);
 
     const iterator = switched.activeTurn.events[Symbol.asyncIterator]();
-    let first = await iterator.next();
-    while (!first.done && first.value.type === 'queue_update') first = await iterator.next();
+    const first = await iterator.next();
     assert.equal(first.done, false);
     assert.equal(first.value.type, 'tool_start');
     if (first.value.type === 'tool_start') assert.equal(first.value.toolUseId, 'tool-9000');
@@ -3765,7 +3761,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     assert.deepEqual(await transcript.promise, [assistantMessage('turn-1', 'Hello world')]);
     assert.equal(connection.openedSubscriptions, 2);
     replacement.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-2'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
   });
 
   test('recovers from a slow-consumer closure the Host held until hydration declared readiness', async () => {
@@ -3801,7 +3797,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     assert.ok(switched.activeTurn);
     await waitForSubscriptions(connection, 2);
     replacement.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-2'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
   });
 
   test('backs off several immediate clean-EOF replacements before recovering', async () => {
@@ -3845,7 +3841,7 @@ describe('turn consumer lag recovery (#3180)', () => {
     // its transcript loads.
     await waitForSubscriptions(connection, 5);
     stable.push(deltaFrame(1, 'turn-1', 11, '!', 'subscription-5'));
-    assert.equal((await nextTurnEvent(switched.activeTurn.events)).text, '!');
+    assert.equal((await nextEvent(switched.activeTurn.events)).text, '!');
   });
 
   for (const [name, replacementRoot] of [
@@ -3857,34 +3853,16 @@ describe('turn consumer lag recovery (#3180)', () => {
         continuitySnapshot(),
         Promise.resolve([assistantMessage('turn-1', 'Hello')]),
       );
-      const transcript = [
-        assistantMessage('turn-1', 'Hello'),
-        turnStateMessage('turn-1', 'completed'),
-        ...(replacementRoot.turnId === 'turn-2' ? [userMessage('turn-2', 'Continue')] : []),
-      ];
-      const snapshot = () =>
-        continuitySnapshot({ projectionRevision: 3, rootTurn: replacementRoot });
-      // A terminal settlement refreshes the transcript through its own
-      // subscription read, so the recovery replacement is not the second open.
-      const transcriptReader = new FakeSubscription(
-        snapshot(),
-        Promise.resolve(transcript),
-        'subscription-2',
-      );
       const replacement = new FakeSubscription(
-        snapshot(),
-        Promise.resolve(transcript),
-        'subscription-3',
-      );
-      const settlementReader = new FakeSubscription(
-        snapshot(),
-        Promise.resolve(transcript),
-        'subscription-4',
-      );
-      const connection = new FakeConnection(
-        [initial, transcriptReader, replacement, settlementReader],
-        true,
+        continuitySnapshot({ projectionRevision: 3, rootTurn: replacementRoot }),
+        Promise.resolve([
+          assistantMessage('turn-1', 'Hello'),
+          turnStateMessage('turn-1', 'completed'),
+          ...(replacementRoot.turnId === 'turn-2' ? [userMessage('turn-2', 'Continue')] : []),
+        ]),
+        'subscription-2',
       );
+      const connection = new FakeConnection([initial, replacement], true);
       const driver = createRuntimeHostMakaSessionDriver({
         connection: connection.value,
         cwd: '/tmp',
@@ -3899,9 +3877,9 @@ describe('turn consumer lag recovery (#3180)', () => {
       initial.push(projectionFrame(1, completedTurn('turn-1', 'run-1'), 2));
       await delay(0);
       initial.fail(new RuntimeHostSubscriptionError('connection_closed', 'connection lost'));
-      await waitFor(() => replacement.nextCalls > 0);
+      await waitForSubscriptions(connection, 2);
 
-      assert.equal((await nextTurnEvent(switched.activeTurn.events)).type, 'complete');
+      assert.equal((await nextEvent(switched.activeTurn.events)).type, 'complete');
       assert.equal((await switched.activeTurn.events[Symbol.asyncIterator]().next()).done, true);
     });
   }
diff --git a/packages/runtime-host/src/__tests__/session-projector.test.ts b/packages/runtime-host/src/__tests__/session-projector.test.ts
index 7ba758168a6..fcdfef9c070 100644
--- a/packages/runtime-host/src/__tests__/session-projector.test.ts
+++ b/packages/runtime-host/src/__tests__/session-projector.test.ts
@@ -85,7 +85,7 @@ test('applies authoritative replacement once and does not complete it again at T
 
   assert.deepEqual(
     projector.seedActive(true).map((event) => event.type),
-    ['text_delta', 'queue_update'],
+    ['text_delta'],
   );
   assert.deepEqual(projector.accept(deltaFrame(1, 0, 'final', { reset: true })).events, []);
   const completed = projector.accept(
@@ -96,10 +96,7 @@ test('applies authoritative replacement once and does not complete it again at T
     completed.map((event) => [event.type, 'text' in event ? event.text : '']),
     [['text_complete', 'final']],
   );
-  assert.deepEqual(
-    projector.seedActive(true).map((event) => event.type),
-    ['queue_update'],
-  );
+  assert.deepEqual(projector.seedActive(true), []);
 
   const terminal = projector.accept({
     kind: 'subscription.session_projection',
@@ -514,7 +511,7 @@ test('reseeds the latest provider retry when the active Turn still carries one',
   );
 
   const seeded = projector.seedActive(true);
-  assert.equal(seeded.length, 2);
+  assert.equal(seeded.length, 1);
   assert.equal(seeded[0]?.type, 'provider_retry');
   assert.equal(seeded[0] && 'phase' in seeded[0] ? seeded[0].phase : undefined, 'scheduled');
 });
@@ -654,7 +651,7 @@ test('emits a live provider retry when the snapshot overlay appears, then drops
   });
   assert.deepEqual(
     projector.seedActive(true).map((event) => event.type),
-    ['text_delta', 'queue_update'],
+    ['text_delta'],
   );
 });
 
@@ -677,10 +674,7 @@ test('seeds only streams identified as active by the Host catch-up state', () =>
     projector
       .seedActive(true)
       .map((event) => [event.type, 'messageId' in event && event.messageId]),
-    [
-      ['thinking_delta', 'active-step'],
-      ['queue_update', false],
-    ],
+    [['thinking_delta', 'active-step']],
   );
 });
 
@@ -720,7 +714,6 @@ test('does not replay settled transcript steps when the active step reaches term
     [
       ['thinking_delta', 'active-step', 'active thought'],
       ['text_delta', 'active-step', 'partial answer'],
-      ['queue_update', false, false],
     ],
   );
 
@@ -1093,11 +1086,26 @@ test('seeds a context-compaction-started event for a running compaction Turn', (
     () => 10,
   );
   const seeded = projector.seedActive(true);
-  assert.equal(seeded.length, 2);
+  assert.equal(seeded.length, 1);
   assert.equal(seeded[0]?.type, 'context_compaction_started');
   assert.equal(seeded[0]?.turnId, 'turn-compact');
 });
 
+test('seeds an empty queue only for a client that renders the queue', () => {
+  const projector = new RuntimeHostSessionProjector(
+    snapshot({
+      rootTurn: { sessionId: 'session-1', turnId: 'turn-1', runId: 'run-1', status: 'running' },
+    }),
+    createRuntimeHostSessionProjectionSeed([], snapshot()),
+    () => 10,
+  );
+  assert.deepEqual(projector.seedActive(false), []);
+  const [cleared] = projector.seedActive(true, { includeEmptyQueue: true });
+  assert.equal(cleared?.type, 'queue_update');
+  if (cleared?.type !== 'queue_update') return;
+  assert.deepEqual([cleared.steeringEntries, cleared.followupEntries], [[], []]);
+});
+
 test('emits a context-compaction-started event when a compaction Turn starts', () => {
   const projector = new RuntimeHostSessionProjector(
     snapshot(),
diff --git a/packages/runtime-host/src/adapter/session-projector.ts b/packages/runtime-host/src/adapter/session-projector.ts
index 356ebed27ee..f535c7262f1 100644
--- a/packages/runtime-host/src/adapter/session-projector.ts
+++ b/packages/runtime-host/src/adapter/session-projector.ts
@@ -158,7 +158,10 @@ export class RuntimeHostSessionProjector {
     this.#projectMessageAdmissions = true;
   }
 
-  seedActive(includeAssistantText: boolean): SessionEvent[] {
+  seedActive(
+    includeAssistantText: boolean,
+    options: { includeEmptyQueue?: boolean } = {},
+  ): SessionEvent[] {
     const root = this.#snapshot.rootTurn;
     if (!root) {
       // A Session whose root Turn is gone still owns an authoritative queue:
@@ -175,11 +178,15 @@ export class RuntimeHostSessionProjector {
       return [projectQueueUpdate(this.#unplacedQueue(queue), '', this.#now())];
     }
     const events: SessionEvent[] = [];
-    // The seed is the only queue evidence a re-observing or reconnecting client
-    // receives — an empty queue must still clear its last-seen entries.
-    const queueEvents = [
-      projectQueueUpdate(this.#unplacedQueue(this.#snapshot.queue), root.turnId, this.#now()),
-    ];
+    // A queue-rendering client needs the empty seed to clear entries it saw
+    // before re-observing. ACP ignores queue_update, and delivering one after
+    // an output failure would stop the Host Turn it restored.
+    const queueEvents =
+      options.includeEmptyQueue ||
+      this.#projectMessageAdmissions ||
+      queueHasEntries(this.#snapshot.queue)
+        ? [projectQueueUpdate(this.#unplacedQueue(this.#snapshot.queue), root.turnId, this.#now())]
+        : [];
     if (this.#projectMessageAdmissions) {
       events.push(
         ...projectMessageAdmissionEvents(
@@ -743,6 +750,10 @@ function queueChanged(
   return previous.hostEpoch !== next.hostEpoch || previous.queueRevision !== next.queueRevision;
 }
 
+function queueHasEntries(queue: SessionMessageQueueProjection): boolean {
+  return queue.steering.length > 0 || queue.followup.length > 0;
+}
+
 function projectQueueUpdate(
   queue: SessionMessageQueueProjection,
   turnId: string,

From 7eb3eb5260222a3934e7bf284507c6b01d19ad32 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 18:28:07 +0800
Subject: [PATCH 27/33] fix(desktop): carry restored attachments through
 WorkHub and Side Chat sends

Editing queued steering stages its attachments back as retained Host
references. Turning staged attachments into a send command was split
across two helpers, and only main chat called both: WorkHub uploaded
each item through the ingest helper, got nothing for a retained one and
refused the send; Side Chat's contract had no retained field, so the
attachment silently fell off the message.

toSubmittedAttachments is now the one conversion, returning the same
attachmentItems/retainedAttachments pair the Desktop bridge accepts.
Main chat uses it, WorkHub reuses a retained reference instead of
uploading, and Side Chat hands its staged attachments to the hook,
whose send and submitFollowUp contracts carry retained references. The
legacy composer-attachments shim and its feature import are gone.

Generated-by: Devin
---
 apps/desktop/renderer-architecture.json       |  15 +-
 ...pp-shell-attachment-preflight-send.test.ts |   2 +-
 .../__tests__/quote-companion-retry.test.ts   |  70 +++++++--
 .../workhub-composer-restore.test.ts          | 139 ++++++++++++++++++
 .../src/renderer/app-shell-chat-actions.ts    |  25 ++--
 .../src/renderer/composer-attachments.ts      |  20 ---
 .../renderer/features/conversation/index.ts   |   2 +-
 .../src/renderer/features/workbar/ports.ts    |  12 +-
 .../tools/side-chat/quote-companion-core.ts   |   6 +-
 .../tools/side-chat/quote-companion-panel.tsx |  13 +-
 .../tools/side-chat/use-quote-companion.ts    |  24 ++-
 .../src/renderer/features/workhub/testing.ts  |   1 +
 .../features/workhub/ui/workhub-composer.tsx  |   7 +-
 .../desktop/create-workbar-services.ts        |   1 +
 packages/ui/src/composer-attachments.ts       |  52 ++++---
 15 files changed, 268 insertions(+), 121 deletions(-)
 create mode 100644 apps/desktop/src/main/__tests__/workhub-composer-restore.test.ts
 delete mode 100644 apps/desktop/src/renderer/composer-attachments.ts

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index 8466e3e3551..9c333559927 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -32,7 +32,6 @@
     "src/renderer/chat-message-surface.tsx",
     "src/renderer/chat-recovery-notice.tsx",
     "src/renderer/command-palette-commands.ts",
-    "src/renderer/composer-attachments.ts",
     "src/renderer/composer-defaults.ts",
     "src/renderer/composer-mentions.tsx",
     "src/renderer/computer-use-overlay/engine/cursor-candidate-grid.ts",
@@ -219,7 +218,6 @@
     "src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts -> src/renderer/model-connection-errors",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts -> src/renderer/session-copy-attempt",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/attachment-preflight",
-    "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/composer-attachments",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/composer-mentions",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/scroll-motion-policy",
     "src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts -> src/renderer/settled-message-merge",
@@ -322,7 +320,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 10,
-        "nonTriviaTokens": 3546
+        "nonTriviaTokens": 3525
       },
       "src/renderer/app-shell-chrome-actions.tsx": {
         "importDeclarations": 1,
@@ -1057,17 +1055,6 @@
           "@maka/ui/icons": 1
         }
       },
-      "src/renderer/composer-attachments.ts": {
-        "bridgePaths": {},
-        "environmentCapabilities": {},
-        "hookCalls": {},
-        "lifecycleMethods": {},
-        "unresolvedDependencies": 0,
-        "actionFactories": [],
-        "dependencyPaths": {
-          "./features/conversation/index.js": 1
-        }
-      },
       "src/renderer/composer-defaults.ts": {
         "bridgePaths": {},
         "environmentCapabilities": {},
diff --git a/apps/desktop/src/main/__tests__/app-shell-attachment-preflight-send.test.ts b/apps/desktop/src/main/__tests__/app-shell-attachment-preflight-send.test.ts
index f1cf9a8b04e..448cca4efc9 100644
--- a/apps/desktop/src/main/__tests__/app-shell-attachment-preflight-send.test.ts
+++ b/apps/desktop/src/main/__tests__/app-shell-attachment-preflight-send.test.ts
@@ -20,7 +20,7 @@
 import { MAX_ATTACHMENT_COUNT } from '@maka/core/attachments';
 import { strict as assert } from 'node:assert';
 import { test } from 'node:test';
-import type { PendingAttachment } from '../../renderer/composer-attachments.js';
+import type { PendingAttachment } from '@maka/ui/composer-attachments';
 import { createAppShellChatActions } from '../../renderer/app-shell-chat-actions.js';
 import { getShellCopy } from '../../renderer/locales/shell-copy.js';
 import {
diff --git a/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts b/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
index 0e092f2b75a..be14c0b6ef1 100644
--- a/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
+++ b/apps/desktop/src/main/__tests__/quote-companion-retry.test.ts
@@ -27,7 +27,8 @@ import { parseHTML } from 'linkedom';
 import { act, createElement } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
 import { ChatSurfaceLayout, ChatView, LocaleProvider } from '@maka/ui';
-import type { SessionEvent } from '@maka/core/events';
+import type { AttachmentRef, SessionEvent } from '@maka/core/events';
+import type { PendingAttachment } from '@maka/ui/composer-attachments';
 import type { ChatModelChoice } from '@maka/core/chat-model-choice';
 import type { PermissionMode } from '@maka/core/permission';
 import type {
@@ -45,7 +46,6 @@ import {
   WorkbarServicesProvider,
   type CompanionQuoteSnapshot,
   type StagedCompanionQuote,
-  type WorkbarIngestInput,
   type WorkbarServices,
 } from '../../renderer/features/workbar/testing.js';
 import { renderTranscriptMarkup } from './transcript-test-dom.js';
@@ -64,11 +64,27 @@ const originalGlobals = {
 let mountedRoot: Root | undefined;
 const SOURCE_SESSION = session('source-session');
 type SideChatStopTarget = Parameters<WorkbarServices['sideChat']['stop']>[1];
+type SendFn = (text: string, attachments?: readonly PendingAttachment[]) => Promise<boolean>;
 type SteerFn = (
   text: string,
-  attachmentItems?: WorkbarIngestInput[],
+  attachments?: readonly PendingAttachment[],
   onAdmitted?: () => void,
 ) => Promise<boolean>;
+
+function approvalAttachment(approvalId: string, name: string): PendingAttachment {
+  return { stagingKey: approvalId, displayName: name, kind: 'other', size: 1, source: { type: 'approval', approvalId, name } };
+}
+
+function retainedAttachment(attachment: AttachmentRef): PendingAttachment {
+  return {
+    stagingKey: `retained:${attachment.name}`,
+    displayName: attachment.name,
+    mimeType: attachment.mimeType,
+    kind: attachment.kind,
+    size: attachment.bytes,
+    source: { type: 'retained', attachment },
+  };
+}
 type QueueUpdate = Extract<SessionEvent, { type: 'queue_update' }>;
 type QueueEntry = NonNullable<QueueUpdate['steeringEntries']>[number];
 
@@ -133,7 +149,7 @@ async function renderProbe(
     sourceSession?: SessionSummary;
     modelChoices?: readonly ChatModelChoice[];
     ready?: (container: Element) => boolean;
-    onSend?: (send: (text: string) => Promise<boolean>) => void;
+    onSend?: (send: SendFn) => void;
     onProjection?: (companion: ReturnType<typeof useQuoteCompanion>) => void;
     onQueue?: (queue: (text: string) => Promise<boolean>) => void;
     onSteer?: (steer: SteerFn) => void;
@@ -220,7 +236,7 @@ async function renderOwnershipProbe(
     onContextCompactionError?: (sessionId: string, error: unknown) => void;
   } = {},
 ) {
-  let send!: (text: string) => Promise<boolean>;
+  let send!: SendFn;
   let projection!: ReturnType<typeof useQuoteCompanion>;
   let queue!: (text: string) => Promise<boolean>;
   let steer!: SteerFn;
@@ -262,10 +278,10 @@ async function renderOwnershipProbe(
   return {
     ...rendered,
     setActive: rendered.setActive,
-    send: (text: string) => send(text),
+    send: (text: string, attachments?: readonly PendingAttachment[]) => send(text, attachments),
     queue: (text: string) => queue(text),
-    steer: (text: string, attachmentItems?: WorkbarIngestInput[], onAdmitted?: () => void) =>
-      steer(text, attachmentItems, onAdmitted),
+    steer: (text: string, attachments?: readonly PendingAttachment[], onAdmitted?: () => void) =>
+      steer(text, attachments, onAdmitted),
     stop: () => stop(),
     deleteQueuedEntry: (entryId: string) => deleteQueuedEntry(entryId),
     setPermissionMode: (mode: PermissionMode) => setPermissionMode(mode),
@@ -350,7 +366,7 @@ async function rerenderProbeSource(
 function ownershipProbeTree(
   services: WorkbarServices,
   sourceSession: SessionSummary,
-  onSend: (send: (text: string) => Promise<boolean>) => void,
+  onSend: (send: SendFn) => void,
 ) {
   return createElement(WorkbarServicesProvider, {
     services,
@@ -365,7 +381,7 @@ function ownershipProbeTree(
 async function rerenderOwnershipSource(
   rendered: { root: Root; services: WorkbarServices },
   sourceSession: SessionSummary,
-  onSend: (send: (text: string) => Promise<boolean>) => void,
+  onSend: (send: SendFn) => void,
 ) {
   await act(async () => {
     rendered.root.render(ownershipProbeTree(rendered.services, sourceSession, onSend));
@@ -2076,8 +2092,10 @@ test('consumes a steered attachment when the started turn binds the admission',
   const pendingSteer = deferred<{ kind: 'started'; turnId: string }>();
   let admissionId: string | undefined;
   let admitted = 0;
-  let steerPayload: { attachmentItems?: readonly WorkbarIngestInput[] } | undefined;
-  const attachmentItem: WorkbarIngestInput = { approvalId: 'approval-1', name: 'kept.png' };
+  let steerPayload: Parameters<WorkbarServices['sideChat']['submitFollowUp']>[4];
+  // A retracted edit stages its Host attachment as `retained`; it rides the
+  // same steer as a newly picked file.
+  const restored: AttachmentRef = { kind: 'doc', name: 'brief.txt', mimeType: 'text/plain', bytes: 4, ref: { kind: 'workspace_file', relativePath: 'brief.txt' } };
   const { container, emit, send, steer, hostTurn } = await renderOwnershipProbe({
     send: async () => ({ ok: true as const, turnId: 'old-turn' }),
     submitFollowUp: async (_sessionId, placement, _text, requestedAdmissionId, payload) => {
@@ -2095,7 +2113,7 @@ test('consumes a steered attachment when the started turn binds the admission',
   });
   let steerResult!: Promise<boolean>;
   await act(async () => {
-    steerResult = steer('steer with the kept image', [attachmentItem], () => {
+    steerResult = steer('steer with the kept image', [approvalAttachment('approval-1', 'kept.png'), retainedAttachment(restored)], () => {
       admitted += 1;
     });
     await Promise.resolve();
@@ -2109,7 +2127,10 @@ test('consumes a steered attachment when the started turn binds the admission',
   });
 
   // The attachments travel with the steering Message...
-  assert.deepEqual(steerPayload, { attachmentItems: [attachmentItem] });
+  assert.deepEqual(steerPayload, {
+    attachmentItems: [{ approvalId: 'approval-1', name: 'kept.png' }],
+    retainedAttachments: [restored],
+  });
   assert.equal(
     container.firstElementChild?.getAttribute('data-live-turn-id'),
     'steer-started-turn',
@@ -2132,6 +2153,23 @@ test('consumes a steered attachment when the started turn binds the admission',
   assert.equal(admitted, 1, 'the admission echo must not consume a second time');
 });
 
+test('a send carries a restored attachment as a retained Host reference', async () => {
+  const commands: Parameters<WorkbarServices['sideChat']['send']>[1][] = [];
+  const restored: AttachmentRef = { kind: 'doc', name: 'brief.txt', mimeType: 'text/plain', bytes: 4, ref: { kind: 'workspace_file', relativePath: 'brief.txt' } };
+  const { send } = await renderOwnershipProbe({
+    send: async (_sessionId, command) => {
+      commands.push(command);
+      return { ok: true as const, turnId: 'turn-1' };
+    },
+  });
+  await act(async () => {
+    assert.equal(await send('', [retainedAttachment(restored)]), true);
+  });
+  assert.equal(commands.length, 1);
+  assert.deepEqual(commands[0]!.retainedAttachments, [restored]);
+  assert.equal(commands[0]!.attachmentItems, undefined);
+});
+
 test('retracts a queued Side Conversation message without stopping the active turn', async () => {
   let messageId: string | undefined;
   const retracted: string[] = [];
@@ -3757,7 +3795,7 @@ test('a steer with staged attachments consumes them only on confirmed admission'
   const consumed: string[] = [];
   await act(async () => {
     assert.equal(
-      await rendered.steer('', [{ approvalId: 'a-1', name: 'notes.txt' }], () => {
+      await rendered.steer('', [approvalAttachment('a-1', 'notes.txt')], () => {
         consumed.push('admitted');
       }),
       true,
@@ -3803,7 +3841,7 @@ test('an unknown steer outcome that later retracts keeps the staged attachments'
   const consumed: string[] = [];
   await act(async () => {
     assert.equal(
-      await rendered.steer('', [{ approvalId: 'a-1', name: 'notes.txt' }], () => {
+      await rendered.steer('', [approvalAttachment('a-1', 'notes.txt')], () => {
         consumed.push('admitted');
       }),
       true,
diff --git a/apps/desktop/src/main/__tests__/workhub-composer-restore.test.ts b/apps/desktop/src/main/__tests__/workhub-composer-restore.test.ts
new file mode 100644
index 00000000000..14757acd62d
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/workhub-composer-restore.test.ts
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import assert from 'node:assert/strict';
+import { afterEach, test } from 'node:test';
+import { act, createElement, type MutableRefObject } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { parseHTML } from 'linkedom';
+import type { AttachmentRef } from '@maka/core/events';
+import { AstryxLocaleProvider, LocaleProvider, ToastProvider } from '@maka/ui';
+import { WorkHubServicesProvider, type WorkHubServices } from '../../renderer/features/workhub/index.js';
+import { WorkHubComposer } from '../../renderer/features/workhub/testing.js';
+import type { RestoredDraftContent } from '../../renderer/application/contracts/transient-message-projection.js';
+
+const originalGlobals = {
+  document: globalThis.document,
+  window: globalThis.window,
+  HTMLElement: globalThis.HTMLElement,
+  Element: globalThis.Element,
+  Event: globalThis.Event,
+  Node: globalThis.Node,
+  matchMedia: globalThis.matchMedia,
+  requestAnimationFrame: globalThis.requestAnimationFrame,
+  cancelAnimationFrame: globalThis.cancelAnimationFrame,
+  IS_REACT_ACT_ENVIRONMENT: (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean })
+    .IS_REACT_ACT_ENVIRONMENT,
+};
+
+let mountedRoot: Root | undefined;
+
+afterEach(async () => {
+  if (mountedRoot) await act(() => mountedRoot?.unmount());
+  mountedRoot = undefined;
+  Object.assign(globalThis, originalGlobals);
+});
+
+async function mountComposer() {
+  const { document, window } = parseHTML('<div id="root"></div>');
+  const getSelection = () => null;
+  Object.assign(document, { getSelection });
+  Object.assign(window, {
+    getSelection,
+    getComputedStyle: () =>
+      ({ direction: 'ltr', writingMode: 'horizontal-tb', getPropertyValue: () => '' }) as unknown as CSSStyleDeclaration,
+    matchMedia: () =>
+      ({ matches: false, addEventListener() {}, removeEventListener() {} }) as unknown as MediaQueryList,
+  });
+  Object.assign(globalThis, {
+    document,
+    window,
+    HTMLElement: window.HTMLElement,
+    Element: window.Element,
+    Event: window.Event,
+    Node: window.Node,
+    matchMedia: window.matchMedia,
+    requestAnimationFrame: (callback: FrameRequestCallback) => setTimeout(callback, 0),
+    cancelAnimationFrame: (handle: number) => clearTimeout(handle),
+    IS_REACT_ACT_ENVIRONMENT: true,
+  });
+  const root = createRoot(document.querySelector('#root')!);
+  mountedRoot = root;
+  const uploads: unknown[] = [];
+  const sends: Array<{ text: string; attachments: AttachmentRef[] }> = [];
+  const draftRestore: MutableRefObject<
+    ((sessionId: string, draft: RestoredDraftContent) => void) | undefined
+  > = { current: undefined };
+  const services = {
+    attachments: {},
+    prepareAttachments: async (_sessionId: string, items: unknown[]) => {
+      uploads.push(...items);
+      return [];
+    },
+  } as unknown as WorkHubServices;
+  await act(async () => {
+    root.render(createElement(LocaleProvider, {
+      locale: 'en',
+      children: createElement(AstryxLocaleProvider, {
+        children: createElement(ToastProvider, {
+          children: createElement(WorkHubServicesProvider, { services },
+            createElement(WorkHubComposer, {
+              sessionId: 'workhub-session',
+              draftRestore,
+              onStop: () => undefined,
+              onSend: async (text, attachments) => {
+                sends.push({ text, attachments });
+                return true;
+              },
+            })),
+        }),
+      }),
+    }));
+  });
+  return {
+    uploads,
+    sends,
+    async restore(draft: RestoredDraftContent) {
+      await act(async () => draftRestore.current!('workhub-session', draft));
+    },
+    async submit() {
+      await act(async () => {
+        document.querySelector('form')!.dispatchEvent(
+          new window.Event('submit', { bubbles: true, cancelable: true }),
+        );
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      });
+    },
+  };
+}
+
+test('a retracted edit resends its restored attachment as the same Host reference', async () => {
+  const h = await mountComposer();
+  const brief: AttachmentRef = {
+    kind: 'doc',
+    name: 'brief.txt',
+    mimeType: 'text/plain',
+    bytes: 4,
+    ref: { kind: 'workspace_file', relativePath: 'brief.txt' },
+  };
+  await h.restore({ text: 'redo this with the brief', attachments: [brief] });
+  await h.submit();
+  assert.deepEqual(h.sends, [{ text: 'redo this with the brief', attachments: [brief] }]);
+  assert.deepEqual(h.uploads, [], 'a Host attachment is reused, not uploaded again');
+});
diff --git a/apps/desktop/src/renderer/app-shell-chat-actions.ts b/apps/desktop/src/renderer/app-shell-chat-actions.ts
index 50d546db75f..fff2ad5cb55 100644
--- a/apps/desktop/src/renderer/app-shell-chat-actions.ts
+++ b/apps/desktop/src/renderer/app-shell-chat-actions.ts
@@ -47,7 +47,6 @@ import * as skillFeedback from './skill-invocation-feedback.js';
 import type { DesktopTranscriptRangeController } from './platform/desktop/desktop-transcript-range-store.js';
 import type { SessionPendingClaim } from './app-shell-session-ui-state.js';
 import * as Conversation from './features/conversation/index.js';
-import type { PendingAttachment } from './composer-attachments.js';
 
 export interface WorkspaceFileReferencePosition {
   value: string;
@@ -115,7 +114,7 @@ function copiedArray<K extends string, T>(
 export interface AppShellChatActions {
   send(
     text: string,
-    pending?: readonly PendingAttachment[],
+    pending?: readonly Conversation.PendingAttachment[],
     options?: SendOptions,
   ): Promise<boolean>;
   /**
@@ -127,7 +126,7 @@ export interface AppShellChatActions {
     sessionId: string,
     text: string,
     placement: 'current_turn' | 'next_turn',
-    pending?: readonly PendingAttachment[],
+    pending?: readonly Conversation.PendingAttachment[],
     options?: MessageContextOptions,
   ): Promise<boolean>;
   respondToSandboxBoundary(response: SandboxBoundaryResponse): Promise<void>;
@@ -296,7 +295,7 @@ export function createAppShellChatActions(deps: {
 
   async function send(
     text: string,
-    pending?: readonly PendingAttachment[],
+    pending?: readonly Conversation.PendingAttachment[],
     options: SendOptions = {},
   ): Promise<boolean> {
     const { directoryReferences, quotes } = options;
@@ -337,18 +336,13 @@ export function createAppShellChatActions(deps: {
     };
     try {
       async function submitIntoSession(sessionId: string, messageId: string) {
+        const attachments = Conversation.toSubmittedAttachments(pending ?? []);
         const sendCommand = {
           text,
           localDisplayPlacement: 'current_turn' as const,
           ...(options.displayText ? { displayText: options.displayText } : {}),
-          ...copiedArray(
-            'attachmentItems',
-            pending && Conversation.toComposerIngestItems(pending),
-          ),
-          ...copiedArray(
-            'retainedAttachments',
-            pending && Conversation.retainedAttachmentRefs(pending),
-          ),
+          ...copiedArray('attachmentItems', attachments.attachmentItems),
+          ...copiedArray('retainedAttachments', attachments.retainedAttachments),
           ...copiedArray('directoryReferences', directoryReferences),
           ...copiedArray('quotes', quotes),
           ...copiedArray('workspaceFileReferences', options.workspaceFileReferences),
@@ -485,15 +479,16 @@ export function createAppShellChatActions(deps: {
     sessionId: string,
     text: string,
     placement: 'current_turn' | 'next_turn',
-    pending?: readonly PendingAttachment[],
+    pending?: readonly Conversation.PendingAttachment[],
     options: MessageContextOptions = {},
   ): Promise<boolean> {
     const messageId = crypto.randomUUID();
     const steeringTurnId = placement === 'current_turn' ? deps.getRunningTurnId?.(sessionId) : undefined;
     const directoryReferences = options.directoryReferences;
     const quotes = options.quotes ?? [];
+    const { attachmentItems, retainedAttachments = [] } = Conversation.toSubmittedAttachments(pending ?? []);
     publishTransientUserMessage(sessionId, {
-      id: messageId, text, attachments: Conversation.retainedAttachmentRefs(pending ?? []),
+      id: messageId, text, attachments: retainedAttachments,
       ...(steeringTurnId ? { hostTurnId: steeringTurnId } : {}),
       transientPlacement: placement === 'next_turn' ? 'follow_up' : 'transcript',
       ...copiedArray('directoryReferences', directoryReferences),
@@ -501,8 +496,6 @@ export function createAppShellChatActions(deps: {
       inlineReferences: [],
     });
     try {
-      const attachmentItems = pending?.length ? Conversation.toComposerIngestItems(pending) : [];
-      const retainedAttachments = pending?.length ? Conversation.retainedAttachmentRefs(pending) : [];
       const submitted = await submitAndProject({
         sessionId,
         messageId,
diff --git a/apps/desktop/src/renderer/composer-attachments.ts b/apps/desktop/src/renderer/composer-attachments.ts
deleted file mode 100644
index 3d1f4b8dd52..00000000000
--- a/apps/desktop/src/renderer/composer-attachments.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { toComposerIngestItems, type PendingAttachment } from './features/conversation/index.js';
diff --git a/apps/desktop/src/renderer/features/conversation/index.ts b/apps/desktop/src/renderer/features/conversation/index.ts
index 8d9716e54f7..e6852c0f005 100644
--- a/apps/desktop/src/renderer/features/conversation/index.ts
+++ b/apps/desktop/src/renderer/features/conversation/index.ts
@@ -50,7 +50,7 @@ export {
 } from './controller/use-app-shell-session-ui-state.js';
 
 export { useComposerAttachments, type ComposerAttachmentService } from './controller/use-composer-attachments.js';
-export { type PendingAttachment, toComposerIngestItems, retainedAttachmentRefs } from '@maka/ui/composer-attachments';
+export { type PendingAttachment, toSubmittedAttachments } from '@maka/ui/composer-attachments';
 export {
   NEW_TASK_PENDING_KEY,
   selectPending,
diff --git a/apps/desktop/src/renderer/features/workbar/ports.ts b/apps/desktop/src/renderer/features/workbar/ports.ts
index ea10c95733c..e378005b3c9 100644
--- a/apps/desktop/src/renderer/features/workbar/ports.ts
+++ b/apps/desktop/src/renderer/features/workbar/ports.ts
@@ -21,6 +21,7 @@ import type { SessionInspectorService } from '../../application/contracts/sessio
 export type { SessionInspectorService, SessionTracePage, SessionUsageSummary } from '../../application/contracts/session-inspector/service.js';
 
 import type {
+  AttachmentRef,
   MessageQueuePlacement,
   QuoteRef,
   SessionEvent,
@@ -62,6 +63,12 @@ export type WorkbarIngestInput =
   | { approvalId: string; name: string; mimeType?: string }
   | { file: File };
 
+/** A send's attachments: new files to ingest, and Host attachments a restored draft already owns. */
+export interface WorkbarSubmittedAttachments {
+  attachmentItems?: WorkbarIngestInput[];
+  retainedAttachments?: AttachmentRef[];
+}
+
 export interface WorkbarReviewService {
   read(input: {
     sessionId: string;
@@ -226,8 +233,7 @@ export interface SideChatSessionPort {
       turnId: string;
       text: string;
       quotes?: QuoteRef[];
-      attachmentItems?: WorkbarIngestInput[];
-    },
+    } & WorkbarSubmittedAttachments,
   ): Promise<SideChatSendResult>;
   stop(
     sessionId: string,
@@ -238,7 +244,7 @@ export interface SideChatSessionPort {
     placement: MessageQueuePlacement,
     text: string,
     admissionId: string,
-    content?: { quotes?: QuoteRef[]; attachmentItems?: WorkbarIngestInput[] },
+    content?: { quotes?: QuoteRef[] } & WorkbarSubmittedAttachments,
   ): Promise<SideChatFollowUpResult>;
   queryMessageExecutions(
     sessionId: string,
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts
index abd538ff340..0544fee6c8a 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts
@@ -38,7 +38,7 @@ import type { UiLocale } from '@maka/core/ui-locale';
 import type {
   SideChatSessionPort,
   SideChatSendResult,
-  WorkbarIngestInput,
+  WorkbarSubmittedAttachments,
 } from '../../ports.js';
 import {
   acquireSessionCopyAttempt,
@@ -343,7 +343,7 @@ export interface PerformCompanionTurnDeps extends EnsureCompanionForkDeps {
   turnId: string;
   text: string;
   quotes: QuoteRef[] | undefined;
-  attachmentItems?: WorkbarIngestInput[];
+  attachments?: WorkbarSubmittedAttachments;
   /** Fired once a fork is ready, so the caller can commit it. */
   onForkCommitted: (session: SessionSummary) => void;
   /** Fired right before the send — the caller arms the optimistic live turn here. */
@@ -388,7 +388,7 @@ export async function performCompanionTurn(
       turnId: deps.turnId,
       text: deps.text,
       ...(deps.quotes ? { quotes: deps.quotes } : {}),
-      ...(deps.attachmentItems ? { attachmentItems: deps.attachmentItems } : {}),
+      ...deps.attachments,
     });
   } catch {
     if (deps.isDisposed()) return { status: 'disposed' };
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
index 7dd5314c816..d586227c21f 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
@@ -40,7 +40,6 @@ import { useComposerAttachments } from '@maka/ui/use-composer-attachments';
 import { localizedShellErrorMessage } from '../../../../locales/shell-copy.js';
 import { useComposerMentionsContext } from '../../../../composer-mentions.js';
 import { preflightAttachmentItems } from '../../../../attachment-preflight';
-import { toComposerIngestItems } from '../../../../composer-attachments';
 import { getDesktopConversationCopy } from '../../../../application/contracts/conversation-copy.js';
 import { useAppShellTurnPresentation } from '../../../../application/contracts/turn-presentation.js';
 import {
@@ -314,12 +313,10 @@ export function QuoteCompanionPanel(props: {
                     // boundary, not on the hook's optimistic return: an unknown
                     // outcome keeps them staged for retry (#4804).
                     const submitted = pendingAttachments;
-                    const submittedItems =
-                      submitted.length > 0 ? toComposerIngestItems(submitted) : undefined;
                     return companion.steer(
                       text,
-                      submittedItems,
-                      submittedItems
+                      submitted,
+                      submitted.length > 0
                         ? () => clearSubmittedAttachments(submitted)
                         : undefined,
                     );
@@ -336,12 +333,10 @@ export function QuoteCompanionPanel(props: {
                     }
                     // Same admission-boundary retirement as `steer` above.
                     const submitted = pendingAttachments;
-                    const submittedItems =
-                      submitted.length > 0 ? toComposerIngestItems(submitted) : undefined;
                     const accepted = await companion.send(
                       text,
-                      submittedItems,
-                      submittedItems
+                      submitted,
+                      submitted.length > 0
                         ? () => clearSubmittedAttachments(submitted)
                         : undefined,
                     );
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index d5adef1b729..53c9317cb13 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -58,7 +58,7 @@ import type { ContextCompactResult } from '@maka/runtime-host/protocol';
 import { useWorkbarServices } from '../../services-context.js';
 import { getShellCopy } from '../../../../locales/shell-copy.js';
 import { createObservableState } from '../../../../application/contracts/session-catalog/observable-state.js';
-import type { WorkbarIngestInput } from '../../ports.js';
+import { toSubmittedAttachments, type PendingAttachment } from '@maka/ui/composer-attachments';
 import {
   abandonPendingCompanionCopy,
   applyCompanionInteractionEvent,
@@ -213,7 +213,7 @@ export interface UseQuoteCompanionResult {
    *  can retire submitted attachments on the same boundary as the quotes. */
   send: (
     text: string,
-    attachmentItems?: WorkbarIngestInput[],
+    attachments?: readonly PendingAttachment[],
     onAdmitted?: () => void,
   ) => Promise<boolean>;
   /** Insert text — or a structured-only quote/attachment — into the active
@@ -221,7 +221,7 @@ export interface UseQuoteCompanionResult {
    *  confirmed-admission boundary as `send`. */
   steer: (
     text: string,
-    attachmentItems?: WorkbarIngestInput[],
+    attachments?: readonly PendingAttachment[],
     onAdmitted?: () => void,
   ) => Promise<boolean>;
   /** Queue text for the next companion turn while the current turn continues. */
@@ -1192,7 +1192,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const send = useCallback(
     async (
       text: string,
-      attachmentItems?: WorkbarIngestInput[],
+      attachments?: readonly PendingAttachment[],
       onAdmitted?: () => void,
     ): Promise<boolean> => {
       const trimmed = text.trim();
@@ -1203,7 +1203,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
       const quoteSnapshot = snapshotCompanionQuotes(panelId, pendingQuotes);
       if (
         !mountedRef.current ||
-        (!trimmed && quoteSnapshot.quotes.length === 0 && !attachmentItems?.length) ||
+        (!trimmed && quoteSnapshot.quotes.length === 0 && !attachments?.length) ||
         submitLockRef.current ||
         compactionRequestInFlightRef.current ||
         activeTurnIdRef.current ||
@@ -1318,7 +1318,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
         turnId,
         text: trimmed,
         quotes: quoteSnapshot.quotes.length > 0 ? [...quoteSnapshot.quotes] : undefined,
-        ...(attachmentItems?.length ? { attachmentItems } : {}),
+        ...(attachments?.length ? { attachments: toSubmittedAttachments(attachments) } : {}),
         onForkCreated: () => {},
         onForkCleanupSucceeded: (sessionId) =>
           onForkVisibilityChangeRef.current?.({
@@ -1480,7 +1480,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const submitFollowUp = useCallback(async (
     text: string,
     placement: MessageQueuePlacement,
-    structured?: { attachmentItems?: WorkbarIngestInput[]; onAdmitted?: () => void },
+    structured?: { attachments?: readonly PendingAttachment[]; onAdmitted?: () => void },
   ): Promise<boolean> => {
     const id = companionIdRef.current;
     const trimmed = text.trim();
@@ -1490,7 +1490,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     const quoteSnapshot =
       placement === 'current_turn' ? snapshotCompanionQuotes(panelId, pendingQuotes) : null;
     const hasStructuredContent =
-      (quoteSnapshot?.quotes.length ?? 0) > 0 || (structured?.attachmentItems?.length ?? 0) > 0;
+      (quoteSnapshot?.quotes.length ?? 0) > 0 || (structured?.attachments?.length ?? 0) > 0;
     if (
       !mountedRef.current ||
       !id ||
@@ -1531,9 +1531,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
         ...(quoteSnapshot && quoteSnapshot.quotes.length > 0
           ? { quotes: [...quoteSnapshot.quotes] }
           : {}),
-        ...(structured?.attachmentItems?.length
-          ? { attachmentItems: structured.attachmentItems }
-          : {}),
+        ...toSubmittedAttachments(structured?.attachments ?? []),
       });
       if (!mountedRef.current) return false;
       if (placement === 'current_turn' && (await admission.stopPromise) === 'confirmed') {
@@ -1609,9 +1607,9 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const steer = useCallback(
     (
       text: string,
-      attachmentItems?: WorkbarIngestInput[],
+      attachments?: readonly PendingAttachment[],
       onAdmitted?: () => void,
-    ) => submitFollowUp(text, 'current_turn', { attachmentItems, onAdmitted }),
+    ) => submitFollowUp(text, 'current_turn', { attachments, onAdmitted }),
     [submitFollowUp],
   );
   const queue = useCallback(
diff --git a/apps/desktop/src/renderer/features/workhub/testing.ts b/apps/desktop/src/renderer/features/workhub/testing.ts
index c7a1a848060..f9bcb6b5f80 100644
--- a/apps/desktop/src/renderer/features/workhub/testing.ts
+++ b/apps/desktop/src/renderer/features/workhub/testing.ts
@@ -19,6 +19,7 @@
 
 export { useWorkHubController } from './controller/use-workhub-controller.js';
 
+export { WorkHubComposer } from './ui/workhub-composer.js';
 export { WorkHubConversation } from './ui/workhub-conversation.js';
 
 export { WorkHubHighlightContext } from './ui/workhub-work-identity.js';
diff --git a/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx b/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
index 723e75ebf6c..186481a2083 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-composer.tsx
@@ -26,7 +26,7 @@ import {
   type ComposerProps,
 } from '@maka/ui';
 import { useComposerAttachments } from '@maka/ui/use-composer-attachments';
-import { toComposerIngestItems } from '@maka/ui/composer-attachments';
+import { toSubmittedAttachments } from '@maka/ui/composer-attachments';
 import { MAX_ATTACHMENT_BYTES, MAX_ATTACHMENT_COUNT } from '@maka/core/attachments';
 import type { AttachmentRef, FollowUpMode } from '@maka/core/events';
 import { getDesktopConversationCopy } from '../../../application/contracts/conversation-copy.js';
@@ -113,9 +113,10 @@ export const WorkHubComposer = forwardRef<ComposerHandle, WorkHubComposerProps>(
         const attachments: AttachmentRef[] = [];
         for (const item of snapshot) {
           const key = `${scope}:${item.stagingKey}`;
-          let attachment = uploaded.current.get(key);
+          const { attachmentItems = [], retainedAttachments = [] } = toSubmittedAttachments([item]);
+          let attachment = retainedAttachments[0] ?? uploaded.current.get(key);
           if (!attachment) {
-            [attachment] = await services.prepareAttachments(sessionId, toComposerIngestItems([item]));
+            [attachment] = await services.prepareAttachments(sessionId, attachmentItems);
             if (!attachment) throw new Error(t.attachmentUploadFailed);
             uploaded.current.set(key, attachment);
           }
diff --git a/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts b/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts
index 7eb4ef90546..5bd9fe3e034 100644
--- a/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts
+++ b/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts
@@ -92,6 +92,7 @@ export function createDesktopWorkbarServices(
         // with its structured content (#4804).
         ...(content?.quotes ? { quotes: content.quotes } : {}),
         ...(content?.attachmentItems ? { attachmentItems: content.attachmentItems } : {}),
+        ...(content?.retainedAttachments ? { retainedAttachments: content.retainedAttachments } : {}),
       },
       { waitForHostAdmission: true },
     );
diff --git a/packages/ui/src/composer-attachments.ts b/packages/ui/src/composer-attachments.ts
index d978b4ec879..5bf9f8f80ee 100644
--- a/packages/ui/src/composer-attachments.ts
+++ b/packages/ui/src/composer-attachments.ts
@@ -49,29 +49,37 @@ export function pendingAttachmentSourceKey(
   return `retained:${JSON.stringify(attachment.source.attachment)}`;
 }
 
-export function toComposerIngestItems(
-  pending: readonly PendingAttachment[],
-): ComposerIngestInput[] {
-  return pending.flatMap((item) => {
-    if (item.source.type === 'retained') return [];
-    return [
-      item.source.type === 'approval'
-        ? {
-            approvalId: item.source.approvalId,
-            name: item.source.name,
-            ...(item.mimeType ? { mimeType: item.mimeType } : {}),
-          }
-        : { file: item.source.file },
-    ];
-  });
+export interface SubmittedAttachments {
+  /** New files the Host still has to ingest. */
+  attachmentItems?: ComposerIngestInput[];
+  /** Host attachments a restored draft already owns. */
+  retainedAttachments?: AttachmentRef[];
 }
 
-export function retainedAttachmentRefs(
+/**
+ * Every staged attachment, split into the two fields a send command carries.
+ * An empty field is omitted.
+ */
+export function toSubmittedAttachments(
   pending: readonly PendingAttachment[],
-): AttachmentRef[] {
-  return pending.flatMap((item) =>
-    item.source.type === 'retained'
-      ? [structuredClone(item.source.attachment)]
-      : [],
-  );
+): SubmittedAttachments {
+  const attachmentItems: ComposerIngestInput[] = [];
+  const retainedAttachments: AttachmentRef[] = [];
+  for (const { source, mimeType } of pending) {
+    if (source.type === 'retained') {
+      retainedAttachments.push(structuredClone(source.attachment));
+    } else if (source.type === 'approval') {
+      attachmentItems.push({
+        approvalId: source.approvalId,
+        name: source.name,
+        ...(mimeType ? { mimeType } : {}),
+      });
+    } else {
+      attachmentItems.push({ file: source.file });
+    }
+  }
+  return {
+    ...(attachmentItems.length > 0 ? { attachmentItems } : {}),
+    ...(retainedAttachments.length > 0 ? { retainedAttachments } : {}),
+  };
 }

From 1030b1e344438d4cb3385618825886517be14e45 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 18:48:14 +0800
Subject: [PATCH 28/33] refactor(desktop): let shared Sessions write in the one
 chat Composer

Opening a shared Session swapped the chat Composer for a separate Guest
composer. The swap unmounted the Composer, so every owned Session's
unsent text, and any text an edit restored mid-retraction, was lost while
its staged context survived in AppShell. The Guest composer also kept a
second draft authority in module-level maps and a draft-token scheme
that only existed because its input cleared itself on submit.

GuestTurnRequests now wraps the one ChatComposerRegion. For an owned
Session it projects nothing; for a shared one sends become Turn
requests, the Guest's requests are rows in the composer staging drawer
(withdraw or dismiss), and a Guest without request access sees the
notice in place of the composer. Only the Session's model reaches a
Guest's Composer, read-only. Retrying the same text reuses its Turn id,
and a lost response the Host already accepted counts as sent.

Removed: SessionTurnRequestComposer, its module-level draft and attempt
maps, the draft-token restore scheme, AppShell's owner/Guest branch, its
CSS, and three copy keys nothing reads.

Generated-by: Devin
---
 apps/desktop/renderer-architecture.json       |   2 +-
 .../src/main/__tests__/goals-boundary.test.ts |   4 +-
 .../__tests__/guest-turn-requests.test.ts     | 317 ++++++++++++
 .../session-turn-request-composer.test.ts     | 328 -------------
 apps/desktop/src/renderer/app-shell.tsx       |  26 +-
 .../src/renderer/chat-composer-region.tsx     | 110 +++--
 .../features/session-collaboration/README.md  |  10 +
 .../controller/use-guest-turn-requests.ts     | 217 +++++++++
 .../features/session-collaboration/index.ts   |   3 +-
 .../features/session-collaboration/testing.ts |   2 +-
 .../ui/guest-turn-requests.tsx                |  38 ++
 .../ui/session-turn-request-composer.tsx      | 451 ------------------
 .../locales/session-collaboration-copy.ts     |   9 -
 .../src/renderer/styles/shell-layout.css      |  65 ---
 .../stories/shared-session-guest.stories.tsx  |  81 +++-
 docs/astryx-surface-file-inventory.md         |   2 +-
 docs/astryx-surface-file-inventory.paths      |   2 +-
 17 files changed, 756 insertions(+), 911 deletions(-)
 create mode 100644 apps/desktop/src/main/__tests__/guest-turn-requests.test.ts
 delete mode 100644 apps/desktop/src/main/__tests__/session-turn-request-composer.test.ts
 create mode 100644 apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts
 create mode 100644 apps/desktop/src/renderer/features/session-collaboration/ui/guest-turn-requests.tsx
 delete mode 100644 apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index 9c333559927..626d5f9ca57 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -786,7 +786,7 @@
           "react": 1
         },
         "importSpecifiers": 92,
-        "nonTriviaTokens": 12141
+        "nonTriviaTokens": 12159
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,
diff --git a/apps/desktop/src/main/__tests__/goals-boundary.test.ts b/apps/desktop/src/main/__tests__/goals-boundary.test.ts
index e52b4a280c8..7b656c7e18a 100644
--- a/apps/desktop/src/main/__tests__/goals-boundary.test.ts
+++ b/apps/desktop/src/main/__tests__/goals-boundary.test.ts
@@ -160,8 +160,8 @@ describe('Goals feature boundary', () => {
     for (const [source, required] of [
       [composer, 'ComposerGoalProjectionConsumer,'],
       [composer, '<ComposerGoalProjectionConsumer>'],
-      [composer, 'goalActive={goalProjection.goalActive}'],
-      [composer, 'onSetGoal={goalProjection.onSetGoal}'],
+      [composer, 'goalActive: goalProjection.goalActive,'],
+      [composer, 'onSetGoal: goalProjection.onSetGoal,'],
       [messageSurface, 'ChatViewGoalProjectionConsumer,'],
       [messageSurface, '<ChatViewGoalProjectionConsumer>'],
       [messageSurface, 'goalIndicator={goalProjection.goalIndicator}'],
diff --git a/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts b/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts
new file mode 100644
index 00000000000..9fb2029d29c
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts
@@ -0,0 +1,317 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import assert from 'node:assert/strict';
+import { afterEach, test } from 'node:test';
+import { act, createElement, createRef } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { parseHTML } from 'linkedom';
+import { AstryxLocaleProvider, type ComposerHandle, LocaleProvider, ToastProvider } from '@maka/ui';
+import type { SessionTurnAccessRequest } from '@maka/runtime-host/protocol';
+import { ChatComposerRegion } from '../../renderer/chat-composer-region.js';
+import {
+  GuestTurnRequests,
+  SessionCollaborationServicesProvider,
+  createFakeSessionCollaborationServices,
+  type SessionCollaborationServices,
+} from '../../renderer/features/session-collaboration/testing.js';
+
+const originalGlobals = {
+  document: globalThis.document,
+  window: globalThis.window,
+  HTMLElement: globalThis.HTMLElement,
+  HTMLIFrameElement: globalThis.HTMLIFrameElement,
+  HTMLBRElement: globalThis.HTMLBRElement,
+  Element: globalThis.Element,
+  Event: globalThis.Event,
+  Node: globalThis.Node,
+  CSS: globalThis.CSS,
+  getComputedStyle: globalThis.getComputedStyle,
+  sessionStorage: globalThis.sessionStorage,
+  matchMedia: globalThis.matchMedia,
+  requestAnimationFrame: globalThis.requestAnimationFrame,
+  cancelAnimationFrame: globalThis.cancelAnimationFrame,
+  IS_REACT_ACT_ENVIRONMENT: (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean })
+    .IS_REACT_ACT_ENVIRONMENT,
+};
+
+let mountedRoot: Root | undefined;
+
+afterEach(async () => {
+  if (mountedRoot) await act(() => mountedRoot?.unmount());
+  mountedRoot = undefined;
+  Object.assign(globalThis, originalGlobals);
+});
+
+const OWNED = 'owned-session';
+const SHARED = 'shared-session';
+
+function request(turnId: string, text: string): SessionTurnAccessRequest {
+  return {
+    requestId: `request:${turnId}`,
+    principalId: 'guest-1',
+    grantId: 'grant-1',
+    intent: { sessionId: SHARED, turnId, content: { text } },
+    createdAt: '2026-09-03T00:00:00.000Z',
+    state: { kind: 'pending' },
+  };
+}
+
+function guestServices(overrides: Partial<SessionCollaborationServices>): SessionCollaborationServices {
+  return createFakeSessionCollaborationServices({
+    getTurnRequests: async () => ({ canRequestTurns: true, requests: [] }),
+    createOperationId: () => 'turn-1',
+    ...overrides,
+  });
+}
+
+async function mountShell(services: SessionCollaborationServices) {
+  const { document, window } = parseHTML('<div id="root"></div>');
+  const storage = new Map<string, string>();
+  const getSelection = () =>
+    ({
+      rangeCount: 0,
+      isCollapsed: true,
+      anchorNode: null,
+      focusNode: null,
+      removeAllRanges() {},
+      addRange() {},
+      getRangeAt: () => {
+        throw new Error('no range');
+      },
+    }) as unknown as Selection;
+  const getComputedStyle = () =>
+    ({ direction: 'ltr', writingMode: 'horizontal-tb', getPropertyValue: () => '' }) as unknown as CSSStyleDeclaration;
+  const matchMedia = () =>
+    ({ matches: false, addEventListener() {}, removeEventListener() {} }) as unknown as MediaQueryList;
+  const refreshes: Array<() => void> = [];
+  const nativeSetTimeout = globalThis.setTimeout;
+  const nativeClearTimeout = globalThis.clearTimeout;
+  Object.assign(document, { getSelection });
+  Object.assign(window, {
+    getSelection,
+    getComputedStyle,
+    matchMedia,
+    scrollTo() {},
+    // The Guest projection refreshes on a 2s loop; tests advance it by hand.
+    setTimeout(handler: TimerHandler, timeout?: number) {
+      if (timeout === 2_000 && typeof handler === 'function') {
+        refreshes.push(handler as () => void);
+        return 0;
+      }
+      return nativeSetTimeout(handler as () => void, timeout) as unknown as number;
+    },
+    clearTimeout(handle: number) {
+      if (handle !== 0) nativeClearTimeout(handle);
+    },
+  });
+  document.createRange = () =>
+    ({ selectNodeContents() {}, collapse() {}, cloneRange() { return this; } }) as unknown as Range;
+  Object.assign(globalThis, {
+    document,
+    window,
+    HTMLElement: window.HTMLElement,
+    HTMLIFrameElement: window.HTMLIFrameElement ?? class HTMLIFrameElement {},
+    HTMLBRElement: window.HTMLBRElement,
+    Element: window.Element,
+    Event: window.Event,
+    Node: window.Node,
+    CSS: { escape: (value: string) => value },
+    getComputedStyle,
+    sessionStorage: {
+      getItem: (key: string) => storage.get(key) ?? null,
+      setItem: (key: string, value: string) => storage.set(key, value),
+      removeItem: (key: string) => storage.delete(key),
+    },
+    matchMedia,
+    requestAnimationFrame: (callback: FrameRequestCallback) => nativeSetTimeout(callback, 0),
+    cancelAnimationFrame: (handle: number) => nativeClearTimeout(handle),
+    IS_REACT_ACT_ENVIRONMENT: true,
+  });
+  const root = createRoot(document.querySelector('#root')!);
+  mountedRoot = root;
+  const composer = createRef<ComposerHandle>();
+  const flush = () => new Promise((resolve) => nativeSetTimeout(resolve, 0));
+
+  // Mirrors AppShell: the Guest projection wraps the one ChatComposerRegion,
+  // and only its `sessionId` says whether the active Session is shared.
+  async function open(sessionId: string, shared: boolean) {
+    await act(async () => {
+      root.render(createElement(LocaleProvider, {
+        locale: 'en',
+        children: createElement(AstryxLocaleProvider, {
+          children: createElement(ToastProvider, {
+            children: createElement(SessionCollaborationServicesProvider, {
+              services,
+              children: createElement(GuestTurnRequests, {
+                sessionId: shared ? sessionId : undefined,
+                composerRef: composer,
+                children: (guest) => createElement(ChatComposerRegion, {
+                  composerRef: composer,
+                  guest,
+                  onOpenContextUsage: () => undefined,
+                  directoryComposerProps: {},
+                  directoryPickerEnabled: false,
+                  active: true,
+                  onboardingComposerHidden: false,
+                  activeInteraction: undefined,
+                  activeId: sessionId,
+                  contextUsageSessionId: sessionId,
+                  newTaskDraftKey: 'new-task:local',
+                  newTaskSendPending: false,
+                  stopPendingBySession: {},
+                  respondToSandboxBoundary: () => {},
+                  respondToClientCapability: () => {},
+                  respondToUserQuestion: () => {},
+                  respondToUserForm: () => {},
+                  stop: () => {},
+                  onSend: () => {
+                    throw new Error('an owner send must not run for a Guest Session');
+                  },
+                  onStop: () => {},
+                  onPickAttachments: () => {},
+                }),
+              }),
+            }),
+          }),
+        }),
+      }));
+      await flush();
+    });
+  }
+
+  return {
+    composer,
+    document,
+    open,
+    buttons: () => [...document.querySelectorAll('button[aria-label]')].map((button) => button.getAttribute('aria-label')),
+    async send(text: string) {
+      await act(async () => composer.current!.setText(text));
+      await act(async () => {
+        document.querySelector('form')!.dispatchEvent(new window.Event('submit', { bubbles: true, cancelable: true }));
+        await flush();
+        await flush();
+      });
+    },
+    async refresh() {
+      await act(async () => {
+        refreshes.shift()?.();
+        await flush();
+      });
+    },
+  };
+}
+
+test('switching to a shared Session and back keeps the one Composer and its owned draft', async () => {
+  const shell = await mountShell(guestServices({}));
+  await shell.open(OWNED, false);
+  const handle = shell.composer.current;
+  assert.ok(shell.buttons().includes('Add context'));
+  await act(async () => shell.composer.current!.setText('owned draft'));
+
+  await shell.open(SHARED, true);
+  assert.equal(shell.composer.current, handle, 'a shared Session must not replace the Composer');
+  assert.equal(shell.composer.current!.getText(), '');
+  assert.deepEqual(shell.buttons(), ['Send'], 'owner controls and pickers do not reach a Guest');
+
+  await shell.open(OWNED, false);
+  assert.equal(shell.composer.current, handle);
+  assert.equal(shell.composer.current!.getText(), 'owned draft');
+});
+
+test('a Guest send creates one Turn request and lists it in the staging drawer', async () => {
+  const sent: Array<{ turnId: string; text: string }> = [];
+  let requests: SessionTurnAccessRequest[] = [];
+  const shell = await mountShell(guestServices({
+    getTurnRequests: async () => ({ canRequestTurns: true, requests }),
+    requestTurn: async (_sessionId, intent) => {
+      if (intent.kind !== 'start') throw new Error('unexpected intent');
+      sent.push({ turnId: intent.turnId, text: intent.text });
+      requests = [request(intent.turnId, intent.text)];
+      return requests[0]!;
+    },
+  }));
+  await shell.open(SHARED, true);
+  await shell.send('please review the retry plan');
+
+  assert.deepEqual(sent, [{ turnId: 'turn-1', text: 'please review the retry plan' }]);
+  assert.equal(shell.composer.current!.getText(), '');
+  const row = shell.document.querySelector('.maka-composer-queue-text');
+  assert.equal(row?.textContent, 'please review the retry plan');
+  assert.ok(shell.document.querySelector('.maka-composer-queue [aria-label="Withdraw"]'));
+});
+
+test('a lost response the Host already accepted counts as sent instead of being resent', async () => {
+  let dispatched = 0;
+  let requests: SessionTurnAccessRequest[] = [];
+  const shell = await mountShell(guestServices({
+    getTurnRequests: async () => ({ canRequestTurns: true, requests }),
+    requestTurn: async (_sessionId, intent) => {
+      dispatched += 1;
+      if (intent.kind === 'start') requests = [request(intent.turnId, intent.text)];
+      throw new Error('connection lost after dispatch');
+    },
+  }));
+  await shell.open(SHARED, true);
+  await shell.send('one request only');
+
+  assert.equal(dispatched, 1);
+  assert.equal(shell.composer.current!.getText(), '');
+  assert.equal(shell.document.querySelector('.maka-composer-queue-text')?.textContent, 'one request only');
+});
+
+test('an unreachable Host keeps the draft and a retry reuses the same Turn id', async () => {
+  const turnIds: string[] = [];
+  let hostReachable = true;
+  let nextId = 0;
+  const shell = await mountShell(guestServices({
+    createOperationId: () => `turn-${++nextId}`,
+    getTurnRequests: async () => {
+      if (!hostReachable) throw new Error('Runtime Host is reconnecting');
+      return { canRequestTurns: true, requests: [] };
+    },
+    requestTurn: async (_sessionId, intent) => {
+      turnIds.push(intent.turnId);
+      if (!hostReachable) throw new Error('Runtime Host is reconnecting');
+      return request(intent.turnId, intent.kind === 'start' ? intent.text : '');
+    },
+  }));
+  await shell.open(SHARED, true);
+  hostReachable = false;
+  await shell.send('keep this draft');
+  assert.equal(shell.composer.current!.getText(), 'keep this draft');
+
+  hostReachable = true;
+  await shell.refresh();
+  await shell.send('keep this draft');
+  assert.deepEqual(turnIds, ['turn-1', 'turn-1']);
+  assert.equal(shell.composer.current!.getText(), '');
+});
+
+test('a Guest without Turn access sees the notice instead of the composer', async () => {
+  const shell = await mountShell(guestServices({
+    getTurnRequests: async () => ({ canRequestTurns: false, requests: [] }),
+  }));
+  await shell.open(SHARED, true);
+  assert.equal(
+    shell.document.querySelector('.sessionCollaborationReadOnly')?.textContent,
+    'Read the full history and live updates',
+  );
+  assert.equal(shell.document.querySelector('form.maka-composer')?.hasAttribute('hidden'), true);
+});
diff --git a/apps/desktop/src/main/__tests__/session-turn-request-composer.test.ts b/apps/desktop/src/main/__tests__/session-turn-request-composer.test.ts
deleted file mode 100644
index 71c5d232803..00000000000
--- a/apps/desktop/src/main/__tests__/session-turn-request-composer.test.ts
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import assert from 'node:assert/strict';
-import { afterEach, test } from 'node:test';
-import { act, createElement } from 'react';
-import { createRoot, type Root } from 'react-dom/client';
-import { parseHTML } from 'linkedom';
-import { AstryxLocaleProvider, LocaleProvider, ToastProvider } from '@maka/ui';
-import type { SessionTurnAccessRequest } from '@maka/runtime-host/protocol';
-import {
-  SessionCollaborationServicesProvider,
-  createFakeSessionCollaborationServices,
-  SessionTurnRequestComposer,
-  type SessionCollaborationServices,
-} from '../../renderer/features/session-collaboration/testing.js';
-
-const originalGlobals = {
-  document: globalThis.document,
-  window: globalThis.window,
-  HTMLElement: globalThis.HTMLElement,
-  HTMLIFrameElement: globalThis.HTMLIFrameElement,
-  Event: globalThis.Event,
-  Node: globalThis.Node,
-  CSS: globalThis.CSS,
-  getComputedStyle: globalThis.getComputedStyle,
-  matchMedia: globalThis.matchMedia,
-  requestAnimationFrame: globalThis.requestAnimationFrame,
-  cancelAnimationFrame: globalThis.cancelAnimationFrame,
-  IS_REACT_ACT_ENVIRONMENT: (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean })
-    .IS_REACT_ACT_ENVIRONMENT,
-};
-
-let mountedRoot: Root | undefined;
-
-afterEach(async () => {
-  if (mountedRoot) await act(() => mountedRoot?.unmount());
-  mountedRoot = undefined;
-  Object.assign(globalThis, originalGlobals);
-});
-
-test('keeps a newer Guest draft across remount when an old request settles later', async () => {
-  let sessionOneQueryCount = 0;
-  let resolveOldReconciliation: ((requests: {
-    readonly canRequestTurns: boolean;
-    readonly requests: readonly SessionTurnAccessRequest[];
-  }) => void) | undefined;
-  const oldReconciliation = new Promise<{
-    readonly canRequestTurns: boolean;
-    readonly requests: readonly SessionTurnAccessRequest[];
-  }>((resolve) => {
-    resolveOldReconciliation = resolve;
-  });
-  const accepted: SessionTurnAccessRequest = {
-    requestId: 'request-1',
-    principalId: 'guest-1',
-    grantId: 'grant-1',
-    intent: {
-      sessionId: 'session-1',
-      turnId: 'turn-1',
-      content: { text: 'submitted text' },
-    },
-    createdAt: '2026-09-03T00:00:00.000Z',
-    state: { kind: 'pending' },
-  };
-  const services: SessionCollaborationServices = {
-    ...createFakeSessionCollaborationServices(),
-    importInvitation: async () => ({ kind: 'connected', mountId: 'unused' }),
-    cancelImport: async () => 'cancelled',
-    readInvitationClipboard: async () => '',
-    listMounts: async () => [],
-    subscribeMountChanges: () => () => undefined,
-    removeMount: async () => undefined,
-    retryMount: async () => undefined,
-    renameMount: async () => undefined,
-    renamePrincipal: async () => ({ renamed: true }),
-    requestTurn: async () => {
-      throw new Error('connection lost after dispatch');
-    },
-    getTurnRequests: async (sessionId) => {
-      if (sessionId !== 'session-1') {
-        return { canRequestTurns: true, requests: [] };
-      }
-      sessionOneQueryCount += 1;
-      if (sessionOneQueryCount === 2) return oldReconciliation;
-      return { canRequestTurns: true, requests: [] };
-    },
-    acknowledgeTurnRequest: async () => ({ acknowledged: false }),
-    withdrawTurnRequest: async () => ({ withdrawn: false }),
-    getPendingTurnRequests: async () => [],
-    decideTurnRequest: async () => {
-      throw new Error('unused');
-    },
-    createOperationId: () => 'turn-1',
-  };
-  const { document } = installDom(() => undefined);
-  const container = document.querySelector('#root');
-  assert.ok(container);
-  mountedRoot = createRoot(container);
-
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-1'));
-    await Promise.resolve();
-  });
-
-  const textbox = document.querySelector<HTMLElement>('[role="textbox"]');
-  assert.ok(textbox);
-  await edit(textbox, 'submitted text');
-  await pressEnter(textbox);
-  assert.equal(sessionOneQueryCount, 2);
-
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-2'));
-    await Promise.resolve();
-  });
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-1'));
-    await Promise.resolve();
-  });
-  const remountedTextbox = document.querySelector<HTMLElement>('[role="textbox"]');
-  assert.ok(remountedTextbox);
-  await edit(remountedTextbox, 'next draft');
-
-  await act(async () => {
-    resolveOldReconciliation?.({ canRequestTurns: true, requests: [accepted] });
-    await Promise.resolve();
-  });
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-2'));
-    await Promise.resolve();
-  });
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-1'));
-    await Promise.resolve();
-  });
-
-  assert.equal(
-    document.querySelector<HTMLElement>('[role="textbox"]')?.textContent,
-    'next draft',
-  );
-});
-
-test('resumes an in-flight Guest request across remount without submitting it twice', async () => {
-  let sessionQueryCount = 0;
-  let requestCount = 0;
-  let resolveRequest: ((request: SessionTurnAccessRequest) => void) | undefined;
-  const requestResult = new Promise<SessionTurnAccessRequest>((resolve) => {
-    resolveRequest = resolve;
-  });
-  const accepted: SessionTurnAccessRequest = {
-    requestId: 'request-resumed',
-    principalId: 'guest-1',
-    grantId: 'grant-1',
-    intent: {
-      sessionId: 'session-resumed',
-      turnId: 'turn-resumed',
-      content: { text: 'one request only' },
-    },
-    createdAt: '2026-09-03T00:00:00.000Z',
-    state: { kind: 'pending' },
-  };
-  const services: SessionCollaborationServices = {
-    ...createFakeSessionCollaborationServices(),
-    importInvitation: async () => ({ kind: 'connected', mountId: 'unused' }),
-    cancelImport: async () => 'cancelled',
-    readInvitationClipboard: async () => '',
-    listMounts: async () => [],
-    subscribeMountChanges: () => () => undefined,
-    removeMount: async () => undefined,
-    retryMount: async () => undefined,
-    renameMount: async () => undefined,
-    renamePrincipal: async () => ({ renamed: true }),
-    requestTurn: async () => {
-      requestCount += 1;
-      return requestResult;
-    },
-    getTurnRequests: async (sessionId) => {
-      if (sessionId !== 'session-resumed') {
-        return { canRequestTurns: true, requests: [] };
-      }
-      sessionQueryCount += 1;
-      return {
-        canRequestTurns: true,
-        requests: sessionQueryCount === 1 ? [] : [accepted],
-      };
-    },
-    acknowledgeTurnRequest: async () => ({ acknowledged: false }),
-    withdrawTurnRequest: async () => ({ withdrawn: false }),
-    getPendingTurnRequests: async () => [],
-    decideTurnRequest: async () => {
-      throw new Error('unused');
-    },
-    createOperationId: () => 'turn-resumed',
-  };
-  const { document } = installDom(() => undefined);
-  const container = document.querySelector('#root');
-  assert.ok(container);
-  mountedRoot = createRoot(container);
-
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-resumed'));
-    await Promise.resolve();
-  });
-  const textbox = document.querySelector<HTMLElement>('[role="textbox"]');
-  assert.ok(textbox);
-  await edit(textbox, 'one request only');
-  await pressEnter(textbox);
-  assert.equal(requestCount, 1);
-
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-away'));
-    await Promise.resolve();
-  });
-  await act(async () => {
-    mountedRoot?.render(renderComposer(services, 'session-resumed'));
-    await Promise.resolve();
-  });
-
-  assert.equal(
-    document.querySelector<HTMLElement>('[role="textbox"]')?.textContent,
-    '',
-  );
-  assert.equal(requestCount, 1);
-
-  await act(async () => {
-    resolveRequest?.(accepted);
-    await Promise.resolve();
-  });
-});
-
-function renderComposer(services: SessionCollaborationServices, sessionId: string) {
-  return createElement(LocaleProvider, {
-    locale: 'en',
-    children: createElement(AstryxLocaleProvider, {
-      children: createElement(ToastProvider, {
-        children: createElement(SessionCollaborationServicesProvider, {
-          services,
-          children: createElement(SessionTurnRequestComposer, { sessionId }),
-        }),
-      }),
-    }),
-  });
-}
-
-function installDom(captureRefresh: (refresh: () => void) => void): { document: Document } {
-  const parsed = parseHTML('<html><body><div id="root"></div></body></html>');
-  const { document, window } = parsed;
-  const nativeSetTimeout = globalThis.setTimeout;
-  const nativeClearTimeout = globalThis.clearTimeout;
-  const refreshTimer = 2_000_000_001;
-  const matchMedia = (media: string) => ({
-    matches: false,
-    media,
-    onchange: null,
-    addListener() {},
-    removeListener() {},
-    addEventListener() {},
-    removeEventListener() {},
-    dispatchEvent: () => false,
-  });
-  const getComputedStyle = () => ({
-    getPropertyValue: () => '',
-  }) as unknown as CSSStyleDeclaration;
-  Object.assign(window, {
-    matchMedia,
-    getComputedStyle,
-    scrollTo() {},
-    setTimeout(handler: TimerHandler, timeout?: number) {
-      if (timeout === 2_000 && typeof handler === 'function') {
-        captureRefresh(handler as () => void);
-        return refreshTimer;
-      }
-      return nativeSetTimeout(handler as (...args: unknown[]) => void, timeout) as unknown as number;
-    },
-    clearTimeout(handle: number) {
-      if (handle !== refreshTimer) nativeClearTimeout(handle);
-    },
-  });
-  Object.assign(globalThis, {
-    document,
-    window,
-    matchMedia,
-    HTMLElement: window.HTMLElement,
-    HTMLIFrameElement: window.HTMLIFrameElement ?? class HTMLIFrameElement {},
-    Event: window.Event,
-    Node: window.Node,
-    CSS: { escape: (value: string) => value },
-    getComputedStyle,
-    requestAnimationFrame: (callback: FrameRequestCallback) => nativeSetTimeout(callback, 0),
-    cancelAnimationFrame: (handle: number) => clearTimeout(handle),
-    IS_REACT_ACT_ENVIRONMENT: true,
-  });
-  return { document };
-}
-
-async function edit(textbox: HTMLElement, value: string): Promise<void> {
-  await act(async () => {
-    textbox.textContent = value;
-    textbox.dispatchEvent(new Event('input', { bubbles: true }));
-    await Promise.resolve();
-  });
-}
-
-async function pressEnter(textbox: HTMLElement): Promise<void> {
-  await act(async () => {
-    const event = new Event('keydown', { bubbles: true });
-    Object.defineProperty(event, 'key', { value: 'Enter' });
-    textbox.dispatchEvent(event);
-    await Promise.resolve();
-    await Promise.resolve();
-  });
-}
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 95a4af66a01..71c05700f28 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -2294,18 +2294,19 @@ function AppShellContent({
                       />
                     ) : null}
                     {!sharedSessionActive && sessionsSelected ? <PlanExecutionPanel planMode={planMode} /> : null}
-                    {sharedSessionActive && activeId ? (
-                      <SessionCollaboration.SessionTurnRequestComposer
-                        sessionId={activeId}
-                      />
-                    ) : (
-                      <TaskEntry.TaskEntryWorkspacePickerConsumer manageProjects={openProjectSettings}
-                        activeSession={activeSession}
-                      >
-                        {(workspacePicker) => (
+                    <TaskEntry.TaskEntryWorkspacePickerConsumer manageProjects={openProjectSettings}
+                      activeSession={activeSession}
+                    >
+                      {(workspacePicker) => (
+                        <SessionCollaboration.GuestTurnRequests
+                          sessionId={sharedSessionActive ? activeId : undefined}
+                          composerRef={composerRef}
+                        >
+                          {(guest) => (
                           <ChatComposerRegion
                   workspacePicker={workspacePicker}
                   composerRef={composerRef}
+                  guest={guest}
                   active={sessionsSelected}
                   onboardingComposerHidden={
                     onboardingComposerHidden
@@ -2417,9 +2418,10 @@ function AppShellContent({
                       : undefined
                   }
                           />
-                        )}
-                      </TaskEntry.TaskEntryWorkspacePickerConsumer>
-                    )}
+                          )}
+                        </SessionCollaboration.GuestTurnRequests>
+                      )}
+                    </TaskEntry.TaskEntryWorkspacePickerConsumer>
                   </>
                 }
               >
diff --git a/apps/desktop/src/renderer/chat-composer-region.tsx b/apps/desktop/src/renderer/chat-composer-region.tsx
index 4d3f9db8fd6..d2d58cb6b33 100644
--- a/apps/desktop/src/renderer/chat-composer-region.tsx
+++ b/apps/desktop/src/renderer/chat-composer-region.tsx
@@ -32,6 +32,7 @@ import {
 import type { ComposerHandle } from '@maka/ui';
 export { selectLatestRequestUsage } from './application/contracts/session-inspector/latest-request-usage.js';
 import { useComposerMentionsContext } from './composer-mentions.js';
+import type { GuestComposerProjection } from './features/session-collaboration/index.js';
 import {
   readNewTaskReloadDraft,
   readNewTaskReloadIntent,
@@ -104,6 +105,8 @@ interface ChatComposerRegionProps
     | 'onPickDirectory'
   > {
   composerRef: RefObject<ComposerHandle | null>;
+  /** Set while the active Session is a Guest's: the same Composer sends Turn requests. */
+  guest?: GuestComposerProjection;
   active: boolean;
   onboardingComposerHidden: boolean;
   activeInteraction: ComposerInteraction | undefined;
@@ -161,9 +164,10 @@ interface ChatComposerRegionProps
 
 export function ChatComposerRegion({
   composerRef,
+  guest,
   active,
   onboardingComposerHidden,
-  activeInteraction,
+  activeInteraction: ownerInteraction,
   activeId,
   contextUsageSessionId,
   newTaskDraftKey,
@@ -183,6 +187,8 @@ export function ChatComposerRegion({
   ...composerRest
 }: ChatComposerRegionProps) {
   const mentions = useComposerMentionsContext();
+  // Interactions answer the owner's Turn; a Guest never sees their prompts.
+  const activeInteraction = guest ? undefined : ownerInteraction;
   const activeSandboxBoundary =
     activeInteraction?.type === 'sandbox_boundary_request' ? activeInteraction : undefined;
   const activeClientCapability =
@@ -271,37 +277,37 @@ export function ChatComposerRegion({
       {(goalProjection) => (
         <Composer
           ref={composerRef}
-          {...composerRest}
-          contextUsage={contextUsage && liveContextUsage
-            ? {
-                ...contextUsage,
-                usageTokens: liveContextUsage.usageTokens,
-                meteredContextWindow: liveContextUsage.contextWindow,
-              }
-            : contextUsage}
-          // AppShell carries staged attachments into both queued and steering
-          // follow-ups. Other Composer hosts remain gated by default because a
-          // text-only running-turn submission would leave attachments behind.
-          allowAttachmentImportWhileStreaming
-          mentionSkills={mentions?.mentionSkills}
-          mentionSkillsUnavailable={mentions?.mentionSkillsUnavailable}
-          mentionSkillsLoading={mentions?.mentionSkillsLoading}
-          onSearchMentionFiles={mentions?.searchMentionFiles}
-          sessionReferences={mentions?.sessionReferences}
-          onPickSessionReference={mentions?.onPickSessionReference}
-          pendingSessionReferences={mentions?.pendingSessionReferences}
-          onRemovePendingSessionReference={mentions?.onRemovePendingSessionReference}
-          waitForSessionReference={mentions?.waitForSessionReference}
-          {...directoryComposerProps}
-          onPickDirectory={
-            directoryPickerEnabled ? directoryComposerProps.onPickDirectory : undefined
-          }
-          hidden={!active || onboardingComposerHidden || Boolean(activeInteraction)}
+          {...(guest ? guestComposerProps(composerRest, guest) : {
+            ...composerRest,
+            contextUsage: contextUsage && liveContextUsage
+              ? {
+                  ...contextUsage,
+                  usageTokens: liveContextUsage.usageTokens,
+                  meteredContextWindow: liveContextUsage.contextWindow,
+                }
+              : contextUsage,
+            // AppShell carries staged attachments into both queued and steering
+            // follow-ups. Other Composer hosts remain gated by default because a
+            // text-only running-turn submission would leave attachments behind.
+            allowAttachmentImportWhileStreaming: true,
+            mentionSkills: mentions?.mentionSkills,
+            mentionSkillsUnavailable: mentions?.mentionSkillsUnavailable,
+            mentionSkillsLoading: mentions?.mentionSkillsLoading,
+            onSearchMentionFiles: mentions?.searchMentionFiles,
+            sessionReferences: mentions?.sessionReferences,
+            onPickSessionReference: mentions?.onPickSessionReference,
+            pendingSessionReferences: mentions?.pendingSessionReferences,
+            onRemovePendingSessionReference: mentions?.onRemovePendingSessionReference,
+            waitForSessionReference: mentions?.waitForSessionReference,
+            ...directoryComposerProps,
+            onPickDirectory: directoryPickerEnabled ? directoryComposerProps.onPickDirectory : undefined,
+            stopPending: activeId ? stopPendingBySession[activeId] === true : false,
+            goalActive: goalProjection.goalActive,
+            onSetGoal: goalProjection.onSetGoal,
+          })}
+          hidden={!active || onboardingComposerHidden || Boolean(activeInteraction) || Boolean(guest && !guest.composer)}
           draftKey={activeId ?? newTaskDraftKey}
           draftPersistence={newTaskDraftPersistence}
-          stopPending={activeId ? stopPendingBySession[activeId] === true : false}
-          goalActive={goalProjection.goalActive}
-          onSetGoal={goalProjection.onSetGoal}
         />
       )}
     </ComposerGoalProjectionConsumer>
@@ -314,7 +320,10 @@ export function ChatComposerRegion({
             the composer would have been — and never over a turn-scoped
             interaction, which already owns the slot and is the more urgent
             thing to answer. */}
-        {boundaryUnreadableNotice && active && !activeInteraction && (
+        {guest?.notice && active && (
+          <div className="sessionCollaborationReadOnly">{guest.notice}</div>
+        )}
+        {boundaryUnreadableNotice && active && !activeInteraction && !guest && (
           <div className="maka-boundary-unreadable-notice">
             <Banner
               status="warning"
@@ -333,7 +342,7 @@ export function ChatComposerRegion({
               />} />
           </div>
         )}
-        {mentions?.sessionReferenceError && active && !onboardingComposerHidden && !activeInteraction && (
+        {mentions?.sessionReferenceError && active && !onboardingComposerHidden && !activeInteraction && !guest && (
           <Banner
             status="warning"
             role="alert"
@@ -383,3 +392,40 @@ export function ChatComposerRegion({
     </>
   );
 }
+
+type OwnerComposerProps = Pick<
+  ComponentProps<typeof Composer>,
+  | 'activeSession'
+  | 'activeModel'
+  | 'activeModelLabel'
+  | 'activeModelConnectionId'
+  | 'activeModelConnectionSlug'
+  | 'activeProviderType'
+  | 'modelChoices'
+  | 'modelLabel'
+  | 'renderProviderMark'
+>;
+
+/**
+ * A Guest's Composer only sends Turn requests: the Session's model shows
+ * read-only, and no owner control or context picker reaches it.
+ */
+function guestComposerProps(
+  owner: OwnerComposerProps,
+  guest: GuestComposerProjection,
+): ComponentProps<typeof Composer> {
+  return {
+    activeSession: owner.activeSession,
+    activeModel: owner.activeModel,
+    activeModelLabel: owner.activeModelLabel,
+    activeModelConnectionId: owner.activeModelConnectionId,
+    activeModelConnectionSlug: owner.activeModelConnectionSlug,
+    activeProviderType: owner.activeProviderType,
+    modelChoices: owner.modelChoices,
+    modelLabel: owner.modelLabel,
+    renderProviderMark: owner.renderProviderMark,
+    onStop: () => undefined,
+    onSend: async () => false,
+    ...guest.composer,
+  };
+}
diff --git a/apps/desktop/src/renderer/features/session-collaboration/README.md b/apps/desktop/src/renderer/features/session-collaboration/README.md
index 1e861ee4e5b..8436303c587 100644
--- a/apps/desktop/src/renderer/features/session-collaboration/README.md
+++ b/apps/desktop/src/renderer/features/session-collaboration/README.md
@@ -38,6 +38,16 @@ A dialog instance belongs to one target Session. Changing targets remounts it,
 clears the previous invitation and access state, and releases its polling loop.
 Closing or unmounting ignores late projection reads and stops polling.
 
+## Guest composer
+
+A Guest writes in the same `ChatComposerRegion` as an owner, so switching
+between owned and shared Sessions keeps one Composer and its drafts.
+`GuestTurnRequests` wraps that region in AppShell and projects nothing for an
+owned Session. For a shared one, sends become Turn requests, the Guest's
+requests appear as rows in the composer staging drawer, and a Guest without
+request access sees a notice in place of the composer. Retrying the same text
+reuses its Turn id, so a request whose response was lost is not created twice.
+
 The dialog obtains its capabilities from `SessionCollaborationServices`.
 The Desktop adapter owns bridge and clipboard access. Remote access is checked
 before reading local sharing controls and again before creating an invitation;
diff --git a/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts b/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts
new file mode 100644
index 00000000000..7d8cee6ee48
--- /dev/null
+++ b/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createElement, useCallback, useEffect, useMemo, useRef, useState, type RefObject } from 'react';
+import { useToast, useUiLocale, type ComposerHandle, type TransientUserMessageProjection } from '@maka/ui';
+import { ICON_SIZE, Undo2, X } from '@maka/ui/icons';
+import type { SessionTurnAccessRequest } from '@maka/runtime-host/protocol';
+import { getSessionCollaborationCopy } from '../../../locales/session-collaboration-copy.js';
+import { describeTurnRequestIntent, turnRequestStateLabel } from '../model/turn-request-inbox.js';
+import { useSessionCollaborationServices } from '../services-context.js';
+
+/** How the shared composer behaves while the active Session is a Guest's. */
+export interface GuestComposerProjection {
+  /** Stands in for the composer while the Guest cannot request Turns. */
+  readonly notice?: string;
+  /** Present while the Guest can request Turns: sends become Turn requests. */
+  readonly composer?: {
+    readonly placeholder: string;
+    readonly onSend: (text: string) => Promise<boolean>;
+    readonly sendBlocked: boolean;
+    readonly sendBlockedReason?: string;
+    readonly pendingMessages: readonly TransientUserMessageProjection[];
+  };
+}
+
+interface TurnRequestProjection {
+  readonly sessionId: string;
+  readonly canRequestTurns: boolean;
+  readonly authorityAvailable?: boolean;
+  readonly requests: readonly SessionTurnAccessRequest[];
+}
+
+interface TurnRequestAttempt {
+  readonly turnId: string;
+  readonly text: string;
+}
+
+const REFRESH_INTERVAL_MS = 2_000;
+
+export function useGuestTurnRequests(
+  sessionId: string | undefined,
+  composerRef: RefObject<ComposerHandle | null>,
+): GuestComposerProjection | undefined {
+  const services = useSessionCollaborationServices();
+  const copy = getSessionCollaborationCopy(useUiLocale());
+  const toast = useToast();
+  const [projection, setProjection] = useState<TurnRequestProjection>();
+  // Retrying the same text reuses its Turn id, so a request the Host already
+  // created before a lost response is not created twice.
+  const attempts = useRef(new Map<string, TurnRequestAttempt>());
+
+  const apply = useCallback(
+    (target: string, result: { canRequestTurns: boolean; requests: readonly SessionTurnAccessRequest[] }) => {
+      setProjection({ sessionId: target, canRequestTurns: result.canRequestTurns, authorityAvailable: true, requests: result.requests });
+      const attempt = attempts.current.get(target);
+      if (!attempt || !result.requests.some((request) => request.intent.turnId === attempt.turnId)) return undefined;
+      attempts.current.delete(target);
+      return attempt;
+    },
+    [],
+  );
+
+  const markUnavailable = useCallback((target: string) => {
+    setProjection((current) => ({
+      sessionId: target,
+      canRequestTurns: current?.sessionId === target && current.canRequestTurns,
+      authorityAvailable: false,
+      requests: current?.sessionId === target ? current.requests : [],
+    }));
+  }, []);
+
+  useEffect(() => {
+    if (!sessionId) return;
+    let disposed = false;
+    let timer: number | undefined;
+    const refresh = async () => {
+      try {
+        const result = await services.getTurnRequests(sessionId);
+        if (disposed) return;
+        // A request whose response was lost can surface here later; its text
+        // leaves the draft only if the user has not changed it since.
+        const settled = apply(sessionId, result);
+        const composer = composerRef.current;
+        if (settled && composer?.getDraft(sessionId).trim() === settled.text) composer.clearDraft(sessionId);
+      } catch {
+        if (!disposed) markUnavailable(sessionId);
+      } finally {
+        if (!disposed) timer = window.setTimeout(() => void refresh(), REFRESH_INTERVAL_MS);
+      }
+    };
+    void refresh();
+    return () => {
+      disposed = true;
+      if (timer !== undefined) window.clearTimeout(timer);
+    };
+  }, [sessionId, services, apply, markUnavailable, composerRef]);
+
+  const submit = useCallback(async (text: string): Promise<boolean> => {
+    const content = text.trim();
+    if (!sessionId || !content) return false;
+    const previous = attempts.current.get(sessionId);
+    const turnId = previous?.text === content ? previous.turnId : services.createOperationId();
+    attempts.current.set(sessionId, { turnId, text: content });
+    try {
+      const request = await services.requestTurn(sessionId, { kind: 'start', turnId, text: content });
+      attempts.current.delete(sessionId);
+      setProjection((current) =>
+        current?.sessionId === sessionId && !current.requests.some((candidate) => candidate.requestId === request.requestId)
+          ? { ...current, requests: [...current.requests, request] }
+          : current,
+      );
+      toast.success(copy.turnRequestSent);
+      return true;
+    } catch (error) {
+      let current: Awaited<ReturnType<typeof services.getTurnRequests>>;
+      try {
+        current = await services.getTurnRequests(sessionId);
+      } catch {
+        markUnavailable(sessionId);
+        return false;
+      }
+      if (apply(sessionId, current)) {
+        toast.success(copy.turnRequestSent);
+        return true;
+      }
+      toast.error(copy.submitTurnRequest, errorMessage(error));
+      return false;
+    }
+  }, [sessionId, services, apply, markUnavailable, toast, copy]);
+
+  const settleRequest = useCallback(async (requestId: string, withdraw: boolean) => {
+    if (!sessionId) return;
+    try {
+      if (withdraw && !(await services.withdrawTurnRequest(sessionId, requestId)).withdrawn) {
+        apply(sessionId, await services.getTurnRequests(sessionId));
+        return;
+      }
+      if (!withdraw) await services.acknowledgeTurnRequest(sessionId, requestId);
+      setProjection((current) =>
+        current?.sessionId === sessionId
+          ? { ...current, requests: current.requests.filter((request) => request.requestId !== requestId) }
+          : current,
+      );
+      if (withdraw) toast.info(copy.turnRequestWithdrawn);
+    } catch (error) {
+      toast.error(copy.turnRequests, errorMessage(error));
+    }
+  }, [sessionId, services, apply, toast, copy]);
+
+  const current = projection?.sessionId === sessionId ? projection : undefined;
+  const pendingMessages = useMemo(
+    () => (current?.requests ?? []).map((request): TransientUserMessageProjection => {
+      const pending = request.state.kind === 'pending';
+      const action = pending
+        ? { label: copy.withdrawTurnRequest, glyph: Undo2 }
+        : isTurnRequestTerminal(request) ? { label: copy.dismissTurnRequest, glyph: X } : undefined;
+      return {
+        id: request.requestId,
+        text: describeTurnRequestIntent(request.intent, copy.regenerateRequest),
+        ts: Date.parse(request.createdAt) || 0,
+        transientPlacement: 'follow_up',
+        deliveryStatus: turnRequestStateLabel(request, copy),
+        deliveryActions: action
+          ? [{
+              label: action.label,
+              icon: createElement(action.glyph, { size: ICON_SIZE.control, 'aria-hidden': true }),
+              onClick: () => settleRequest(request.requestId, pending),
+            }]
+          : [],
+      };
+    }),
+    [current?.requests, copy, settleRequest],
+  );
+
+  if (!sessionId) return undefined;
+  if (!current?.canRequestTurns) {
+    if (current?.authorityAvailable === undefined) return {};
+    return { notice: current.authorityAvailable ? copy.observeHelp : copy.accessUnavailable };
+  }
+  const connectionPending = current.authorityAvailable !== true;
+  return {
+    composer: {
+      placeholder: copy.turnRequestPlaceholder,
+      onSend: submit,
+      sendBlocked: connectionPending,
+      ...(connectionPending ? { sendBlockedReason: copy.turnRequestReconnecting } : {}),
+      pendingMessages,
+    },
+  };
+}
+
+function isTurnRequestTerminal(request: SessionTurnAccessRequest): boolean {
+  return (
+    request.state.kind === 'rejected' ||
+    (request.state.kind === 'approved' && request.state.admission !== 'pending')
+  );
+}
+
+function errorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
diff --git a/apps/desktop/src/renderer/features/session-collaboration/index.ts b/apps/desktop/src/renderer/features/session-collaboration/index.ts
index 9dd624dc913..c21a8c19198 100644
--- a/apps/desktop/src/renderer/features/session-collaboration/index.ts
+++ b/apps/desktop/src/renderer/features/session-collaboration/index.ts
@@ -22,7 +22,8 @@ export { SessionCollaborationDialogRoot } from './ui/session-collaboration-dialo
 export type { SessionCollaborationDialogProjection } from './model/dialog-projection.js';
 export { SessionCollaborationJoinDialog } from './ui/session-collaboration-join-dialog';
 export { SessionCollaborationNavigation } from './ui/session-collaboration-navigation';
-export { SessionTurnRequestComposer } from './ui/session-turn-request-composer';
+export { GuestTurnRequests } from './ui/guest-turn-requests';
+export type { GuestComposerProjection } from './controller/use-guest-turn-requests';
 export { SessionTurnRequestApprovalForSession } from './ui/session-turn-request-approval';
 export { SessionTurnRequestBadge } from './ui/session-turn-request-badge';
 export { SessionTurnRequestInboxProvider } from './turn-request-inbox-context';
diff --git a/apps/desktop/src/renderer/features/session-collaboration/testing.ts b/apps/desktop/src/renderer/features/session-collaboration/testing.ts
index 4e9b235b13b..d930a3ea607 100644
--- a/apps/desktop/src/renderer/features/session-collaboration/testing.ts
+++ b/apps/desktop/src/renderer/features/session-collaboration/testing.ts
@@ -31,7 +31,7 @@ export type { SessionCollaborationServices } from './ports.js';
 export { SessionCollaborationServicesProvider } from './services-context.js';
 export { SessionCollaborationJoinDialog } from './ui/session-collaboration-join-dialog.js';
 export { SessionCollaborationNavigation } from './ui/session-collaboration-navigation.js';
-export { SessionTurnRequestComposer } from './ui/session-turn-request-composer.js';
+export { GuestTurnRequests } from './ui/guest-turn-requests.js';
 export { sessionCollaborationImportErrorMessage } from './ui/session-collaboration-join-dialog.js';
 export { SessionCollaborationDialogRoot } from './ui/session-collaboration-dialog-root.js';
 export type { SessionCollaborationDialogProjection } from './model/dialog-projection.js';
diff --git a/apps/desktop/src/renderer/features/session-collaboration/ui/guest-turn-requests.tsx b/apps/desktop/src/renderer/features/session-collaboration/ui/guest-turn-requests.tsx
new file mode 100644
index 00000000000..2e6a4883b95
--- /dev/null
+++ b/apps/desktop/src/renderer/features/session-collaboration/ui/guest-turn-requests.tsx
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import type { ReactNode, RefObject } from 'react';
+import type { ComposerHandle } from '@maka/ui';
+import {
+  useGuestTurnRequests,
+  type GuestComposerProjection,
+} from '../controller/use-guest-turn-requests.js';
+
+/**
+ * Projects the shared composer for a Guest Session and nothing for an owned
+ * one. It always renders, so switching between the two keeps one Composer and
+ * its drafts.
+ */
+export function GuestTurnRequests(props: {
+  readonly sessionId: string | undefined;
+  readonly composerRef: RefObject<ComposerHandle | null>;
+  readonly children: (guest: GuestComposerProjection | undefined) => ReactNode;
+}) {
+  return <>{props.children(useGuestTurnRequests(props.sessionId, props.composerRef))}</>;
+}
diff --git a/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx b/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx
deleted file mode 100644
index f031ff1eca7..00000000000
--- a/apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { useEffect, useId, useRef, useState } from 'react';
-import {
-  ChatComposer,
-  ChatComposerInput,
-} from '@astryxdesign/core/Chat';
-import { Tooltip } from '@astryxdesign/core/Tooltip';
-import {
-  Button,
-  readComposerDraft,
-  rememberComposerDraft,
-  Text,
-  useToast,
-  useUiLocale,
-} from '@maka/ui';
-import { ChevronDown, ICON_SIZE, Loader2 } from '@maka/ui/icons';
-import type { SessionTurnAccessRequest } from '@maka/runtime-host/protocol';
-import { getSessionCollaborationCopy } from '../../../locales/session-collaboration-copy.js';
-import {
-  describeTurnRequestIntent,
-  turnRequestStateLabel,
-} from '../model/turn-request-inbox.js';
-import { useSessionCollaborationServices } from '../services-context.js';
-
-const guestTurnRequestDrafts = new Map<string, string>();
-const guestTurnRequestDraftTokens = new Map<string, symbol>();
-const guestTurnRequestAttempts = new Map<string, TurnRequestAttempt>();
-
-interface TurnRequestAttempt {
-  readonly turnId: string;
-  readonly text: string;
-  readonly draftToken: symbol;
-  readonly phase: 'submitting' | 'reconciling' | 'retryable';
-}
-
-export function SessionTurnRequestComposer(props: {
-  readonly sessionId: string;
-}) {
-  return <SessionTurnRequestComposerForSession key={props.sessionId} {...props} />;
-}
-
-function SessionTurnRequestComposerForSession(props: {
-  readonly sessionId: string;
-}) {
-  const copy = getSessionCollaborationCopy(useUiLocale());
-  const toast = useToast();
-  const services = useSessionCollaborationServices();
-  const [text, setText] = useState(() => readComposerDraft(guestTurnRequestDrafts, props.sessionId));
-  const [requests, setRequests] = useState<readonly SessionTurnAccessRequest[]>([]);
-  const [canRequestTurns, setCanRequestTurns] = useState(false);
-  const [authorityAvailable, setAuthorityAvailable] = useState<boolean>();
-  const [reconciling, setReconciling] = useState(false);
-  const [submitting, setSubmitting] = useState(false);
-  const [expanded, setExpanded] = useState(false);
-  const [workingRequestIds, setWorkingRequestIds] = useState<ReadonlySet<string>>(
-    () => new Set(),
-  );
-  const historyId = useId();
-  const attemptRef = useRef<TurnRequestAttempt | undefined>(
-    guestTurnRequestAttempts.get(props.sessionId),
-  );
-  const submissionInFlightRef = useRef(false);
-  const previousActiveCountRef = useRef(0);
-
-  const activeRequestCount = requests.filter((request) => !isTurnRequestTerminal(request)).length;
-  const connectionPending = authorityAvailable !== true || reconciling;
-
-  useEffect(() => {
-    if (activeRequestCount > previousActiveCountRef.current) setExpanded(true);
-    previousActiveCountRef.current = activeRequestCount;
-  }, [activeRequestCount]);
-
-  function setDraft(value: string): void {
-    rememberComposerDraft(guestTurnRequestDrafts, props.sessionId, value);
-    if (value.trim()) guestTurnRequestDraftTokens.set(props.sessionId, Symbol());
-    else guestTurnRequestDraftTokens.delete(props.sessionId);
-    for (const sessionId of guestTurnRequestDraftTokens.keys()) {
-      if (!guestTurnRequestDrafts.has(sessionId)) {
-        guestTurnRequestDraftTokens.delete(sessionId);
-      }
-    }
-    setText(value);
-  }
-
-  function ownsDraft(attempt: TurnRequestAttempt): boolean {
-    return guestTurnRequestDraftTokens.get(props.sessionId) === attempt.draftToken;
-  }
-
-  function restoreDraft(attempt: TurnRequestAttempt): void {
-    if (ownsDraft(attempt)) setText(attempt.text);
-  }
-
-  function rememberAttempt(attempt: TurnRequestAttempt): void {
-    guestTurnRequestAttempts.set(props.sessionId, attempt);
-    attemptRef.current = attempt;
-  }
-
-  function changeAttemptPhase(
-    attempt: TurnRequestAttempt,
-    phase: TurnRequestAttempt['phase'],
-  ): void {
-    const current = guestTurnRequestAttempts.get(props.sessionId);
-    if (current?.turnId !== attempt.turnId) return;
-    rememberAttempt({ ...current, phase });
-  }
-
-  function acceptRequest(request: SessionTurnAccessRequest): void {
-    const attempt = attemptRef.current;
-    const shouldClearDraft = attempt?.turnId === request.intent.turnId && ownsDraft(attempt);
-    setRequests((current) =>
-      current.some((candidate) => candidate.requestId === request.requestId)
-        ? current
-        : [...current, request],
-    );
-    if (guestTurnRequestAttempts.get(props.sessionId)?.turnId === request.intent.turnId) {
-      guestTurnRequestAttempts.delete(props.sessionId);
-    }
-    if (attempt?.turnId === request.intent.turnId) attemptRef.current = undefined;
-    setReconciling(false);
-    if (shouldClearDraft) setDraft('');
-    toast.success(
-      'content' in request.intent ? copy.turnRequestSent : copy.regenerateRequestSent,
-    );
-  }
-
-  function applyProjection(result: {
-    readonly canRequestTurns: boolean;
-    readonly requests: readonly SessionTurnAccessRequest[];
-  }): SessionTurnAccessRequest | undefined {
-    setAuthorityAvailable(true);
-    setCanRequestTurns(result.canRequestTurns);
-    setRequests(result.requests);
-    const sharedAttempt = guestTurnRequestAttempts.get(props.sessionId);
-    if (!sharedAttempt) {
-      if (attemptRef.current) {
-        attemptRef.current = undefined;
-        setText(readComposerDraft(guestTurnRequestDrafts, props.sessionId));
-      }
-      setReconciling(false);
-      return;
-    }
-    attemptRef.current = sharedAttempt;
-    const request = result.requests.find(
-      (candidate) => candidate.intent.turnId === sharedAttempt.turnId,
-    );
-    if (request) acceptRequest(request);
-    else if (sharedAttempt.phase === 'submitting') {
-      setReconciling(true);
-    } else if (sharedAttempt.phase === 'reconciling') {
-      changeAttemptPhase(sharedAttempt, 'retryable');
-      setReconciling(false);
-      restoreDraft(sharedAttempt);
-    } else setReconciling(false);
-    return request;
-  }
-
-  useEffect(() => {
-    let disposed = false;
-    let timer: number | undefined;
-    const refresh = async () => {
-      try {
-        const result = await services.getTurnRequests(props.sessionId);
-        if (!disposed) {
-          applyProjection(result);
-        }
-      } catch {
-        if (!disposed) setAuthorityAvailable(false);
-        // The Host remains authoritative; a later refresh or submit retries the projection.
-      } finally {
-        if (!disposed) timer = window.setTimeout(() => void refresh(), 2_000);
-      }
-    };
-    void refresh();
-    return () => {
-      disposed = true;
-      if (timer !== undefined) window.clearTimeout(timer);
-    };
-  }, [props.sessionId, services]);
-
-  async function submit(value: string): Promise<void> {
-    const content = value.trim();
-    if (!content) return;
-    const draftToken = guestTurnRequestDraftTokens.get(props.sessionId) ?? Symbol();
-    guestTurnRequestDraftTokens.set(props.sessionId, draftToken);
-    const attempt = attemptRef.current?.text === content
-      ? { ...attemptRef.current, draftToken, phase: 'submitting' as const }
-      : {
-          turnId: services.createOperationId(),
-          text: content,
-          draftToken,
-          phase: 'submitting' as const,
-        };
-    rememberAttempt(attempt);
-    submissionInFlightRef.current = true;
-    setSubmitting(true);
-    try {
-      const request = await services.requestTurn(
-        props.sessionId,
-        { kind: 'start', turnId: attempt.turnId, text: attempt.text },
-      );
-      acceptRequest(request);
-    } catch (error) {
-      // Astryx clears its visible input as soon as onSubmit returns. Request
-      // creation is not yet conclusive, so restore the still-owned draft before
-      // reconciliation can wait on a recovering Host.
-      restoreDraft(attempt);
-      changeAttemptPhase(attempt, 'reconciling');
-      try {
-        const current = await services.getTurnRequests(props.sessionId);
-        const request = applyProjection(current);
-        if (
-          request ||
-          guestTurnRequestAttempts.get(props.sessionId)?.turnId !== attempt.turnId
-        ) return;
-      } catch {
-        if (guestTurnRequestAttempts.get(props.sessionId)?.turnId !== attempt.turnId) return;
-        setReconciling(true);
-        setAuthorityAvailable(false);
-        return;
-      }
-      restoreDraft(attempt);
-      toast.error(copy.submitTurnRequest, errorMessage(error));
-    } finally {
-      submissionInFlightRef.current = false;
-      setSubmitting(false);
-    }
-  }
-
-  async function dismiss(requestId: string): Promise<void> {
-    setRequestWorking(requestId, true);
-    try {
-      await services.acknowledgeTurnRequest(
-        props.sessionId,
-        requestId,
-      );
-      setRequests((current) =>
-        current.filter((request) => request.requestId !== requestId),
-      );
-    } catch (error) {
-      toast.error(copy.turnRequests, errorMessage(error));
-    } finally {
-      setRequestWorking(requestId, false);
-    }
-  }
-
-  async function withdraw(requestId: string): Promise<void> {
-    setRequestWorking(requestId, true);
-    try {
-      const result = await services.withdrawTurnRequest(
-        props.sessionId,
-        requestId,
-      );
-      if (result.withdrawn) {
-        setRequests((current) => current.filter((request) => request.requestId !== requestId));
-        toast.info(copy.turnRequestWithdrawn);
-      } else {
-        const current = await services.getTurnRequests(props.sessionId);
-        applyProjection(current);
-      }
-    } catch (error) {
-      toast.error(copy.turnRequests, errorMessage(error));
-    } finally {
-      setRequestWorking(requestId, false);
-    }
-  }
-
-  function setRequestWorking(requestId: string, working: boolean): void {
-    setWorkingRequestIds((current) => {
-      const next = new Set(current);
-      if (working) next.add(requestId);
-      else next.delete(requestId);
-      return next;
-    });
-  }
-
-  return (
-    <div className="sessionTurnRequestSurface">
-      {requests.length > 0 ? (
-        <div className="sessionTurnRequestQueue">
-          <Button
-            variant="ghost"
-            size="sm"
-            className="sessionTurnRequestQueueToggle"
-            label={copy.turnRequestCount(requests.length)}
-            aria-expanded={expanded}
-            aria-controls={historyId}
-            endContent={(
-              <ChevronDown
-                className={expanded ? 'isExpanded' : undefined}
-                size={ICON_SIZE.chrome}
-                aria-hidden="true"
-              />
-            )}
-            onClick={() => setExpanded((current) => !current)}
-          />
-          {expanded ? (
-            <div
-              id={historyId}
-              className="sessionTurnRequestHistory"
-              aria-label={copy.turnRequests}
-            >
-              {requests.slice().reverse().map((request) => {
-                const description = describeTurnRequestIntent(
-                  request.intent,
-                  copy.regenerateRequest,
-                );
-                const requestWorking = workingRequestIds.has(request.requestId);
-                return (
-                  <div className="sessionTurnRequestHistoryRow" key={request.requestId}>
-                    <div className="sessionTurnRequestHistoryBody" title={description}>
-                      <Text
-                        type="body"
-                        className="sessionTurnRequestHistoryText"
-                      >
-                        {description}
-                      </Text>
-                      <Text type="supporting" color="secondary">
-                        {turnRequestStateLabel(request, copy)}
-                      </Text>
-                    </div>
-                    {request.state.kind === 'pending' ? (
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        label={copy.withdrawTurnRequest}
-                        isDisabled={authorityAvailable !== true || requestWorking}
-                        onClick={() => void withdraw(request.requestId)}
-                      />
-                    ) : isTurnRequestTerminal(request) ? (
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        label={copy.dismissTurnRequest}
-                        isDisabled={authorityAvailable !== true || requestWorking}
-                        onClick={() => void dismiss(request.requestId)}
-                      />
-                    ) : null}
-                  </div>
-                );
-              })}
-            </div>
-          ) : null}
-        </div>
-      ) : null}
-      {canRequestTurns ? (
-        <div className="composer sessionTurnRequestComposer">
-          <ChatComposer
-            className="maka-composer-astryx"
-            value={text}
-            placeholder={copy.turnRequestPlaceholder}
-            isDisabled={submitting}
-            input={(
-              <ChatComposerInput
-                label={copy.turnRequestPlaceholder}
-                maxRows={8}
-                hasHistory={false}
-                pasteAsToken={false}
-                onKeyDown={(event) => {
-                  if (connectionPending && event.key === 'Enter' && !event.shiftKey) {
-                    event.preventDefault();
-                  }
-                }}
-              />
-            )}
-            sendButton={connectionPending ? (
-              <Tooltip
-                content={reconciling ? copy.turnRequestReconciling : copy.turnRequestReconnecting}
-              >
-                <span className="sessionTurnRequestReconnectButton">
-                  <Button
-                    variant="primary"
-                    size="md"
-                    label={
-                      reconciling ? copy.turnRequestReconciling : copy.turnRequestReconnecting
-                    }
-                    isDisabled
-                    isIconOnly
-                    icon={(
-                      <Loader2
-                        size={ICON_SIZE.control}
-                        className="maka-spin"
-                        aria-hidden="true"
-                      />
-                    )}
-                  />
-                </span>
-              </Tooltip>
-            ) : undefined}
-            onChange={(value) => {
-              // ChatComposer clears itself immediately after invoking onSubmit.
-              // Reflect that transient state without deleting the remembered
-              // draft until the Host has conclusively accepted the request.
-              if (submissionInFlightRef.current && value === '' && attemptRef.current) {
-                setText('');
-                return;
-              }
-              if (
-                !submissionInFlightRef.current &&
-                value.trim() !== attemptRef.current?.text
-              ) {
-                const attempt = attemptRef.current;
-                if (
-                  attempt?.phase === 'retryable' &&
-                  guestTurnRequestAttempts.get(props.sessionId)?.turnId === attempt.turnId
-                ) {
-                  guestTurnRequestAttempts.delete(props.sessionId);
-                }
-                attemptRef.current = undefined;
-              }
-              setDraft(value);
-            }}
-            onSubmit={(value) => void submit(value)}
-          />
-        </div>
-      ) : authorityAvailable === false ? (
-        <div className="sessionCollaborationReadOnly">{copy.accessUnavailable}</div>
-      ) : authorityAvailable === true ? (
-        <div className="sessionCollaborationReadOnly">{copy.observeHelp}</div>
-      ) : null}
-    </div>
-  );
-}
-
-function isTurnRequestTerminal(request: SessionTurnAccessRequest): boolean {
-  return (
-    request.state.kind === 'rejected' ||
-    (request.state.kind === 'approved' && request.state.admission !== 'pending')
-  );
-}
-
-function errorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
diff --git a/apps/desktop/src/renderer/locales/session-collaboration-copy.ts b/apps/desktop/src/renderer/locales/session-collaboration-copy.ts
index 100240a654c..f0a2c92a48f 100644
--- a/apps/desktop/src/renderer/locales/session-collaboration-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-collaboration-copy.ts
@@ -104,9 +104,7 @@ const ZH_CN = {
     turnRequestPlaceholder: '描述你希望发起的新轮次',
     submitTurnRequest: '请求新轮次',
     turnRequestSent: '请求已提交，等待所有者批准',
-    regenerateRequestSent: '重新生成请求已提交，等待所有者批准',
     turnRequestReconnecting: '正在重连 Runtime Host；草稿会保留，连接恢复后即可发送。',
-    turnRequestReconciling: '正在确认请求是否已被 Host 接收…',
     turnRequestPending: '等待批准',
     turnRequestApproved: '已批准',
     turnRequestRejected: '已拒绝',
@@ -116,7 +114,6 @@ const ZH_CN = {
     dismissTurnRequest: '关闭',
     withdrawTurnRequest: '撤回',
     turnRequestWithdrawn: '请求已撤回',
-    turnRequestCount: (count: number) => `${count} 个轮次请求`,
     regenerateRequest: '重新生成回答',
     sharedTask: '共享任务',
     newTurnRequestTitle: (count: number) => count === 1 ? '新的轮次请求' : `${count} 个新的轮次请求`,
@@ -221,16 +218,13 @@ const ZH_TW = {
     submitTurnRequest: '請求新輪次',
     turnRequestSent: '請求已送出，等待擁有者核准',
   regenerateRequest: '重新生成回答',
-  regenerateRequestSent: '重新生成請求已送出，等待擁有者核准',
   ownerRegenerateRequestTitle: '訪客請求重新生成回答',
-  turnRequestCount: (count: number) => `${count} 個輪次請求`,
   turnRequestReconnecting: '正在重新連線 Runtime Host；草稿會保留，連線恢復後即可傳送。',
   turnRequestWithdrawn: '請求已撤回',
   withdrawTurnRequest: '撤回',
   viewSourceTurn: '檢視原輪次',
   recoveryStarted: '共享任務正在後台連線',
   recoveryStartedBody: '任務已儲存在此裝置；連線恢復後會自動出現在任務清單中。',
-    turnRequestReconciling: '正在確認 Host 是否已收到請求…',
     turnRequestPending: '等待核准',
     turnRequestApproved: '已核准',
     turnRequestRejected: '已拒絕',
@@ -333,9 +327,7 @@ const EN = {
     turnRequestPlaceholder: 'Describe the new Turn you want to start',
     submitTurnRequest: 'Request new Turn',
     turnRequestSent: 'Request sent for Owner approval',
-    regenerateRequestSent: 'Regeneration request sent for Owner approval',
     turnRequestReconnecting: 'Reconnecting to the Runtime Host. Your draft is kept and can be sent when the connection returns.',
-    turnRequestReconciling: 'Checking whether the Host received this request…',
     turnRequestPending: 'Awaiting approval',
     turnRequestApproved: 'Approved',
     turnRequestRejected: 'Rejected',
@@ -345,7 +337,6 @@ const EN = {
     dismissTurnRequest: 'Dismiss',
     withdrawTurnRequest: 'Withdraw',
     turnRequestWithdrawn: 'Request withdrawn',
-    turnRequestCount: (count: number) => `${count} Turn ${count === 1 ? 'request' : 'requests'}`,
     regenerateRequest: 'Regenerate response',
     sharedTask: 'Shared task',
     newTurnRequestTitle: (count: number) => count === 1 ? 'New Turn request' : `${count} new Turn requests`,
diff --git a/apps/desktop/src/renderer/styles/shell-layout.css b/apps/desktop/src/renderer/styles/shell-layout.css
index 5e88e64708d..ffbcc38a414 100644
--- a/apps/desktop/src/renderer/styles/shell-layout.css
+++ b/apps/desktop/src/renderer/styles/shell-layout.css
@@ -487,11 +487,6 @@ dialog:modal {
    its children. A per-button rule (plus a `*` descendant rule for the icons)
    only duplicated that. */
 
-.sessionTurnRequestSurface {
-  border-top: var(--border-width-hairline) solid var(--border);
-  background: var(--background);
-}
-
 .sessionTurnRequestApproval {
   display: grid;
   gap: var(--space-1);
@@ -540,68 +535,8 @@ dialog:modal {
   text-align: end;
 }
 
-.sessionTurnRequestComposer {
-  padding-block-start: var(--space-2);
-}
-
-.sessionTurnRequestReconnectButton {
-  display: inline-flex;
-}
-
 .sessionCollaborationReadOnly {
   padding: var(--space-3);
   color: var(--muted-foreground);
   text-align: center;
 }
-
-.sessionTurnRequestQueue {
-  margin-block-start: var(--space-2);
-  padding: var(--space-1);
-}
-
-.sessionTurnRequestQueueToggle {
-  width: 100%;
-  justify-content: space-between;
-}
-
-.sessionTurnRequestQueueToggle svg {
-  transition: transform var(--duration-fast) var(--ease-standard);
-}
-
-.sessionTurnRequestQueueToggle svg.isExpanded {
-  transform: rotate(180deg);
-}
-
-.sessionTurnRequestHistory {
-  display: grid;
-  max-height: 12rem;
-  overflow-y: auto;
-  margin-block-start: var(--space-1);
-  border-top: var(--border-width-hairline) solid var(--border);
-}
-
-.sessionTurnRequestHistoryRow {
-  display: flex;
-  align-items: center;
-  gap: var(--space-2);
-  min-width: 0;
-  padding: var(--space-2);
-}
-
-.sessionTurnRequestHistoryRow + .sessionTurnRequestHistoryRow {
-  border-top: var(--border-width-hairline) solid var(--border);
-}
-
-.sessionTurnRequestHistoryBody {
-  display: grid;
-  gap: var(--space-0-5);
-  min-width: 0;
-  flex: 1;
-}
-
-.sessionTurnRequestHistoryText {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/apps/desktop/stories/shared-session-guest.stories.tsx b/apps/desktop/stories/shared-session-guest.stories.tsx
index 4ecdc55a2f9..8702b2b39d1 100644
--- a/apps/desktop/stories/shared-session-guest.stories.tsx
+++ b/apps/desktop/stories/shared-session-guest.stories.tsx
@@ -17,17 +17,37 @@
  * under the License.
  */
 
+import { useRef } from 'react';
 import type { Meta, StoryObj } from '@storybook/react-vite';
+import { expect, waitFor } from 'storybook/test';
 import type { SessionTurnAccessRequest } from '@maka/runtime-host/protocol';
-import { ToastProvider } from '@maka/ui';
+import type { SessionSummary } from '@maka/core/session';
+import { ToastProvider, type ComposerHandle } from '@maka/ui';
+import { ChatComposerRegion } from '../src/renderer/chat-composer-region';
 import {
+  GuestTurnRequests,
   SessionCollaborationServicesProvider,
-  SessionTurnRequestComposer,
   type SessionCollaborationServices,
 } from '../src/renderer/features/session-collaboration/index.js';
 import { createFakeSessionCollaborationServices } from '../src/renderer/features/session-collaboration/testing.js';
 
 const SESSION_ID = 'shared-session-story';
+const SHARED_SESSION: SessionSummary = {
+  id: SESSION_ID,
+  name: '连接恢复方案评审',
+  isFlagged: false,
+  isArchived: false,
+  labels: [],
+  hasUnread: false,
+  status: 'active',
+  lastMessageAt: Date.UTC(2026, 8, 3, 1, 0, 0),
+  backend: 'ai-sdk',
+  llmConnectionId: 'connection-anthropic-main',
+  llmConnectionSlug: 'anthropic-main',
+  connectionLocked: false,
+  model: 'claude-sonnet-4-5',
+  permissionMode: 'ask',
+};
 const REQUESTS: readonly SessionTurnAccessRequest[] = [
   {
     requestId: 'pending-request',
@@ -119,9 +139,48 @@ const reconnectServices = services(async () => {
   throw new Error('Runtime Host is reconnecting');
 });
 
+// The same wiring AppShell mounts: the Guest projection wraps the one
+// ChatComposerRegion, which sends Turn requests while the Session is shared.
+function GuestComposer(props: { sessionId: string }) {
+  const composerRef = useRef<ComposerHandle>(null);
+  return (
+    <GuestTurnRequests sessionId={props.sessionId} composerRef={composerRef}>
+      {(guest) => (
+        <ChatComposerRegion
+          composerRef={composerRef}
+          guest={guest}
+          active
+          onboardingComposerHidden={false}
+          activeInteraction={undefined}
+          activeSession={SHARED_SESSION}
+          activeModel={SHARED_SESSION.model}
+          activeModelLabel="Claude Sonnet 4.5"
+          activeModelConnectionId={SHARED_SESSION.llmConnectionId}
+          modelLabel="Claude Sonnet 4.5"
+          activeId={props.sessionId}
+          contextUsageSessionId={props.sessionId}
+          newTaskDraftKey="new-task:story"
+          newTaskSendPending={false}
+          stopPendingBySession={{}}
+          respondToSandboxBoundary={() => undefined}
+          respondToClientCapability={() => undefined}
+          respondToUserQuestion={() => undefined}
+          respondToUserForm={() => undefined}
+          stop={() => undefined}
+          onOpenContextUsage={() => undefined}
+          directoryComposerProps={{}}
+          directoryPickerEnabled={false}
+          onSend={() => false}
+          onStop={() => undefined}
+        />
+      )}
+    </GuestTurnRequests>
+  );
+}
+
 const meta = {
   title: 'Product/Shared Session Guest',
-  component: SessionTurnRequestComposer,
+  component: GuestComposer,
   parameters: { layout: 'fullscreen' },
   decorators: [
     (Story) => (
@@ -139,15 +198,15 @@ const meta = {
       </ToastProvider>
     ),
   ],
-} satisfies Meta<typeof SessionTurnRequestComposer>;
+} satisfies Meta<typeof GuestComposer>;
 
 export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-// Real path: join a shared Session with Turn-request access. The queue is
-// expanded because one active request arrived, and terminal history remains
-// dismissible without pushing the composer away from the normal chat layout.
+// Real path: join a shared Session with Turn-request access. The Guest's
+// requests sit in the composer staging drawer as one-line rows: a pending one
+// can be withdrawn, a settled one dismissed.
 export const RequestQueue: Story = {
   args: { sessionId: SESSION_ID },
   decorators: [
@@ -157,6 +216,14 @@ export const RequestQueue: Story = {
       </SessionCollaborationServicesProvider>
     ),
   ],
+  play: async ({ canvasElement }) => {
+    await waitFor(() => {
+      const rows = [...canvasElement.querySelectorAll('.maka-composer-queue-text')].map((row) => row.textContent);
+      expect(rows).toEqual(['请检查这个连接恢复方案，并给出可以直接执行的修复建议。', '重新生成回答']);
+    });
+    const labels = [...canvasElement.querySelectorAll('.maka-composer-queue button[aria-label]')].map((button) => button.getAttribute('aria-label'));
+    await expect(labels).toEqual(['撤回', '关闭']);
+  },
 };
 
 // Real path: a Guest who already has Turn-request access loses the Runtime
diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index 85aa15841c6..9a9cb0e8b83 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -95,6 +95,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/features/session-bundle/session-bundle-tasks.tsx` | shell-chrome-or-panel | Banner, Button, HStack, SegmentedControl, SegmentedControlItem, VStack | aligned — uses Astryx (Banner, Button, HStack, SegmentedControl, SegmentedControlItem, VStack) | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/services-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/turn-request-inbox-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `apps/desktop/src/renderer/features/session-collaboration/ui/guest-turn-requests.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-alias-action.tsx` | shell-chrome-or-panel | Button, Dialog, DialogHeader, Layout, LayoutContent, LayoutFooter, TextInput | aligned — uses Astryx (Button, Dialog, DialogHeader, Layout, LayoutContent, LayoutFooter, TextInput) | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-dialog-root.tsx` | dialog-overlay | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-dialog.tsx` | dialog-overlay | Banner, Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter, SegmentedControl, SegmentedControlItem, Text, TextArea | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter) | aligned |
@@ -102,7 +103,6 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-navigation.tsx` | shell-chrome-or-panel | SideNavItem | aligned — uses Astryx (SideNavItem) | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-approval.tsx` | shell-chrome-or-panel | Banner, Button, HoverCard | aligned — uses Astryx (Banner, Button, HoverCard) | aligned |
 | `apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-badge.tsx` | shell-chrome-or-panel | Badge | aligned — uses Astryx (Badge) | aligned |
-| `apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerInput, Text, Tooltip | aligned — uses Astryx (Button, ChatComposer, ChatComposerInput, Text, Tooltip) | aligned |
 | `apps/desktop/src/renderer/features/session-navigation/services-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/session-navigation/ui/session-navigation-provider.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/session-settings/services-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
diff --git a/docs/astryx-surface-file-inventory.paths b/docs/astryx-surface-file-inventory.paths
index d096ef35f75..7e80c5bb920 100644
--- a/docs/astryx-surface-file-inventory.paths
+++ b/docs/astryx-surface-file-inventory.paths
@@ -65,6 +65,7 @@ apps/desktop/src/renderer/features/session-bundle/services-context.tsx
 apps/desktop/src/renderer/features/session-bundle/session-bundle-tasks.tsx
 apps/desktop/src/renderer/features/session-collaboration/services-context.tsx
 apps/desktop/src/renderer/features/session-collaboration/turn-request-inbox-context.tsx
+apps/desktop/src/renderer/features/session-collaboration/ui/guest-turn-requests.tsx
 apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-alias-action.tsx
 apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-dialog-root.tsx
 apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-dialog.tsx
@@ -72,7 +73,6 @@ apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboratio
 apps/desktop/src/renderer/features/session-collaboration/ui/session-collaboration-navigation.tsx
 apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-approval.tsx
 apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-badge.tsx
-apps/desktop/src/renderer/features/session-collaboration/ui/session-turn-request-composer.tsx
 apps/desktop/src/renderer/features/session-navigation/services-context.tsx
 apps/desktop/src/renderer/features/session-navigation/ui/session-navigation-provider.tsx
 apps/desktop/src/renderer/features/session-settings/services-context.tsx

From c9b1e31b333f94af6557f1056ec3aba062c86c2b Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 19:16:20 +0800
Subject: [PATCH 29/33] chore(desktop): refresh the Astryx surface inventory
 after the Guest composer move

The inventory still listed the deleted SessionTurnRequestComposer and
missed GuestTurnRequests. The Side Chat tests no longer import
WorkbarIngestInput, so its re-export from the Workbar testing entry is
dead.

Generated-by: Devin
---
 apps/desktop/src/renderer/features/workbar/testing.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/desktop/src/renderer/features/workbar/testing.ts b/apps/desktop/src/renderer/features/workbar/testing.ts
index b440d976ab9..3e180840e69 100644
--- a/apps/desktop/src/renderer/features/workbar/testing.ts
+++ b/apps/desktop/src/renderer/features/workbar/testing.ts
@@ -24,7 +24,6 @@ export type {
   WorkbarServices,
   SessionTracePage,
   SessionUsageSummary,
-  WorkbarIngestInput,
 } from './ports.js';
 
 export * from './model/workbar-tabs.js';

From 39189fb829c9d536ef3878deefcfef7e3837abd1 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 20:15:21 +0800
Subject: [PATCH 30/33] test(desktop): give the session query gate fixture the
 queue service methods

main's session-query-gate test (#4431) builds ConversationServices by hand;
this branch made the Host queue mutations required on that port.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 apps/desktop/src/main/__tests__/session-query-gate.test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/desktop/src/main/__tests__/session-query-gate.test.ts b/apps/desktop/src/main/__tests__/session-query-gate.test.ts
index 69e43183e8b..10d4e879a0e 100644
--- a/apps/desktop/src/main/__tests__/session-query-gate.test.ts
+++ b/apps/desktop/src/main/__tests__/session-query-gate.test.ts
@@ -85,6 +85,10 @@ test('query blocking pauses, resumes, and fences automatic Skills and Plan reads
       readExecutionBoundary: async () => {
         throw new Error('Execution boundary is not used in query gate tests');
       },
+      promoteQueueEntry: async () => undefined,
+      updateQueueEntry: async () => undefined,
+      retractQueueEntry: async () => undefined,
+      reorderQueueEntries: async () => undefined,
     },
     runtimeHosts: { subscribeChanges: () => () => undefined },
     workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },

From f32ac1f94aea2b7672fc2ecdbd938dd8f1d891cf Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 20:43:40 +0800
Subject: [PATCH 31/33] refactor(desktop): make every queued-message edit
 retract back into the draft

Queued follow-up rows edited in place through queue.entry.update, while
steering bubbles and unsent local messages retracted and restored the draft.
In-place editing left the entry live in the Host queue, so a Turn boundary
could consume the old text mid-edit and unmount the row with the typed
edit, and it could only change text.

All three now share retractQueuedEntryToDraft: the entry leaves the queue
first, then its full content (text, attachments, directory references,
quotes) returns to the owning Session's draft. Resending queues it at the
tail; the grip can move it back.

Removed with it: the plate's inline editor and its save/cancel copy and
CSS, the Composer onUpdateQueuedEntry/queuedMessageRevision props, the
updateQueuedEntry wiring in the main chat, WorkHub and Side Chat, the
renderer queueRevision fields that only fed the CAS, and Desktop's
sessions:updateQueueEntry IPC/preload/client path, which had no other
caller. The Host's queue.entry.update operation is unchanged.

Also collapses the ConversationServices stubs this branch copied into
tests into one conversation/testing helper, and drops the QueueOnly,
NarrowPendingPlate and EditingQueuedEntry stories, which carried no
assertion beyond what PendingPlate already renders.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 apps/desktop/renderer-architecture.json       |   2 +-
 .../app-shell-first-send-cleanup.test.ts      |  31 +----
 .../main/__tests__/composer-mentions.test.ts  |  34 +-----
 .../__tests__/message-queue-ui-state.test.ts  |  53 +++-----
 .../runtime-host-client-operations.test.ts    |  21 +---
 ...me-host-session-execution-ipc-main.test.ts |  28 +----
 .../main/__tests__/session-query-gate.test.ts |  34 +-----
 .../session-reference-composer.test.ts        |   1 -
 .../session-workspace-action-identity.test.ts |  34 +-----
 .../workbar-services-adapter.test.ts          |   2 -
 .../__tests__/workhub-send-visibility.test.ts |  11 +-
 apps/desktop/src/main/runtime-host-client.ts  |  10 --
 ...runtime-host-session-execution-ipc-main.ts |  38 ------
 apps/desktop/src/preload/bridge-contract.d.ts |   6 -
 apps/desktop/src/preload/preload.ts           |  14 ---
 apps/desktop/src/renderer/app-shell.tsx       |   5 +-
 .../contracts/message-queue-projection.ts     |   2 -
 .../contracts/transient-message-projection.ts |  56 +++++----
 .../controller/use-session-message-queue.ts   |  10 +-
 .../conversation/model/session-ui-state.ts    |   3 -
 .../renderer/features/conversation/ports.ts   |   1 -
 .../renderer/features/conversation/testing.ts |  39 ++++++
 .../src/renderer/features/workbar/ports.ts    |   6 -
 .../src/renderer/features/workbar/testing.ts  |   1 -
 .../tools/side-chat/quote-companion-panel.tsx |   3 +-
 .../tools/side-chat/use-quote-companion.ts    |  32 ++---
 .../controller/use-workhub-controller.ts      |  20 +--
 .../src/renderer/features/workhub/ports.ts    |   1 -
 .../features/workhub/ui/workhub-root.tsx      |   3 +-
 .../desktop/create-workbar-services.ts        |   2 -
 .../desktop/create-workhub-services.ts        |   1 -
 apps/desktop/src/renderer/styles/composer.css |  13 --
 apps/desktop/stories/app-shell.stories.tsx    |  24 ++--
 .../composer-message-queue.stories.tsx        |  83 ++-----------
 .../stories/composer-slash-menu.stories.tsx   |   1 -
 .../stories/session-workbar.stories.tsx       |   1 -
 apps/desktop/stories/workhub.stories.tsx      |   2 +-
 docs/astryx-surface-file-inventory.md         |   4 +-
 docs/desktop-message-queue.md                 |   8 +-
 .../__tests__/composer-message-queue.test.tsx | 115 ++----------------
 .../__tests__/composer-send-toggle.test.tsx   |  31 +----
 packages/ui/src/composer-message-queue.tsx    | 106 ++--------------
 packages/ui/src/composer.tsx                  |  12 +-
 packages/ui/src/conversation-copy.ts          |   8 +-
 44 files changed, 206 insertions(+), 706 deletions(-)

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index 626d5f9ca57..ffd72e00daa 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -786,7 +786,7 @@
           "react": 1
         },
         "importSpecifiers": 92,
-        "nonTriviaTokens": 12159
+        "nonTriviaTokens": 12152
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,
diff --git a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
index fa7b64d11aa..0b287bcc6ff 100644
--- a/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
+++ b/apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
@@ -41,14 +41,13 @@ import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
 import {
   ConversationServicesProvider,
   useAppShellSessionUiState,
-  type ConversationServices,
 } from '../../renderer/features/conversation/index.js';
 import { createSessionCatalogController } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';
 
 import { LocaleProvider, ToastProvider, type LiveTurnProjection } from '@maka/ui';
 import type { DesktopTranscriptRangeController } from '../../renderer/platform/desktop/desktop-transcript-range-store.js';
 import { createAppShellChatActions } from '../../renderer/app-shell-chat-actions.js';
-import { prepareTranscriptForSend } from '../../renderer/features/conversation/testing.js';
+import { prepareTranscriptForSend, stubConversationServices } from '../../renderer/features/conversation/testing.js';
 
 import {
   createActionsDeps,
@@ -719,33 +718,7 @@ describe('composer first-send cleanup', () => {
     const { root } = installReactRenderer();
     let publication!: ReturnType<typeof useAppShellSessionUiState>['publication'];
     const catalog = createSessionCatalogController();
-    const services: ConversationServices = {
-      listMessages: async () => [],
-      cancelMessage: async () => undefined,
-      reconcileMessage: async () => undefined,
-      subscribeChanges: () => () => undefined,
-      skills: { listInvocable: async () => [] },
-      sessions: {
-        readSnapshot: async () => {
-          throw new Error('Session snapshot is not used in this test');
-        },
-        readExecutionBoundary: async () => {
-          throw new Error('Execution boundary is not used in this test');
-        },
-        promoteQueueEntry: async () => undefined,
-        updateQueueEntry: async () => undefined,
-        retractQueueEntry: async () => undefined,
-        reorderQueueEntries: async () => undefined,
-      },
-      runtimeHosts: { subscribeChanges: () => () => undefined },
-      workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
-      newTasks: {
-        subscribeChanges: () => () => undefined,
-        listInvocableSkills: async () => [],
-        searchFiles: async () => ({ ok: false, reason: 'no_project' }),
-      },
-      mcp: { subscribeChanges: () => () => undefined },
-    };
+    const services = stubConversationServices();
     function Probe(): null {
       publication = useAppShellSessionUiState(
         catalog, undefined, deps.activeIdRef,
diff --git a/apps/desktop/src/main/__tests__/composer-mentions.test.ts b/apps/desktop/src/main/__tests__/composer-mentions.test.ts
index bb5da217542..9904821b557 100644
--- a/apps/desktop/src/main/__tests__/composer-mentions.test.ts
+++ b/apps/desktop/src/main/__tests__/composer-mentions.test.ts
@@ -29,10 +29,8 @@ import {
   useComposerMentionsContext,
   type ComposerMentions,
 } from '../../renderer/composer-mentions.js';
-import {
-  ConversationServicesProvider,
-  type ConversationServices,
-} from '../../renderer/features/conversation/index.js';
+import { ConversationServicesProvider } from '../../renderer/features/conversation/index.js';
+import { stubConversationServices } from '../../renderer/features/conversation/testing.js';
 import {
   createSessionCatalogController,
   SessionCatalogContext,
@@ -80,37 +78,13 @@ function installCatalogRenderer(t: TestContext) {
     sessionId: string;
     resolve(skills: InvocableSkillEntry[]): void;
   }> = [];
-  const services: ConversationServices = {
-    listMessages: async () => [],
-    cancelMessage: async () => undefined,
-    reconcileMessage: async () => undefined,
-    subscribeChanges: () => () => undefined,
+  const services = stubConversationServices({
     skills: {
       listInvocable: (sessionId: string) => new Promise<InvocableSkillEntry[]>((resolve) => {
         pending.push({ sessionId, resolve });
       }),
     },
-    sessions: {
-      readSnapshot: async () => {
-        throw new Error('Session snapshot is not used in catalog tests');
-      },
-      readExecutionBoundary: async () => {
-        throw new Error('Execution boundary is not used in catalog tests');
-      },
-      promoteQueueEntry: async () => undefined,
-      updateQueueEntry: async () => undefined,
-      retractQueueEntry: async () => undefined,
-      reorderQueueEntries: async () => undefined,
-    },
-    runtimeHosts: { subscribeChanges: () => () => undefined },
-    workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
-    newTasks: {
-      subscribeChanges: () => () => undefined,
-      listInvocableSkills: async () => [],
-      searchFiles: async () => ({ ok: false, reason: 'no_project' }),
-    },
-    mcp: { subscribeChanges: () => () => undefined },
-  };
+  });
 
   const sessionCatalog = createSessionCatalogController();
   const observations: CatalogObservation[] = [];
diff --git a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 14423bb65d6..077b8d0fa6a 100644
--- a/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
+++ b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
@@ -27,7 +27,7 @@ import {
   type TransientUserMessageProjection,
 } from '@maka/ui';
 import { ConversationServicesProvider, SessionLocalMessages } from '../../renderer/features/conversation/index.js';
-import { useSessionMessageQueue } from '../../renderer/features/conversation/testing.js';
+import { stubConversationServices, useSessionMessageQueue } from '../../renderer/features/conversation/testing.js';
 import type { RestoredDraftContent } from '../../renderer/application/contracts/transient-message-projection.js';
 import type { DesktopLocalMessage } from '../../shared/session-local-contract.js';
 import { mergeTransientMessageProjection } from '../../renderer/application/contracts/transient-message-projection.js';
@@ -51,23 +51,12 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
     ...(messageId === 'root' ? { localDisplayPlacement: 'current_turn' as const } : {}),
   }));
   await act(async () => root.render(createElement(LocaleProvider, { locale: 'en', children:
-    createElement(ConversationServicesProvider, { services: {
+    createElement(ConversationServicesProvider, { services: stubConversationServices({
       listMessages: async () => messages,
       subscribeChanges: (handler) => { changed = handler; return () => {}; },
       cancelMessage: async (sessionId, messageId) => { cancelled.push([sessionId, messageId]); },
       reconcileMessage: async (sessionId, messageId) => { reconciled.push([sessionId, messageId]); },
-      sessions: {
-        readSnapshot: async () => { throw new Error('unexpected snapshot read'); },
-        readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
-        promoteQueueEntry: async () => undefined, updateQueueEntry: async () => undefined,
-        retractQueueEntry: async () => undefined, reorderQueueEntries: async () => undefined,
-      },
-      runtimeHosts: { subscribeChanges: () => () => {} },
-      skills: { listInvocable: async () => [] },
-      workspace: { searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
-      newTasks: { subscribeChanges: () => () => {}, listInvocableSkills: async () => [], searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
-      mcp: { subscribeChanges: () => () => {} },
-    }, children: createElement(SessionLocalMessages, {
+    }), children: createElement(SessionLocalMessages, {
       sessionId: 'session-1',
       publish: (_id, message) => {
         const current = transient.get(message.id);
@@ -176,7 +165,6 @@ test('queue_update stores the snapshot and retires every listed local placeholde
 
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
     ts: 1,
-    queueRevision: 3,
     entries: [steeringEntry, followupEntry],
   });
   assert.equal(transientMessages.size, 0,
@@ -218,7 +206,6 @@ test('queue_update stores the snapshot and retires every listed local placeholde
   assert.equal(transientMessages.size, 0);
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
     ts: 3,
-    queueRevision: 4,
     entries: [nextEntry],
   });
 
@@ -427,7 +414,7 @@ test('complete events deliver the durable context compaction outcome to Desktop'
   ]);
 });
 
-test('editing a queued steering restores content under the owning Session even after navigation', async () => {
+test('editing a queued message retracts it and restores its content under the owning Session', async () => {
   const { root } = installReactRenderer();
   const entry = {
     entryId: 'entry-1', messageId: 'message-1',
@@ -441,6 +428,11 @@ test('editing a queued steering restores content under the owning Session even a
       quotes: [{ text: 'quoted' }],
     },
   };
+  const followUp = {
+    entryId: 'entry-2', messageId: 'message-2',
+    placement: 'next_turn' as const, state: 'queued' as const,
+    content: { text: 'model text', displayText: 'follow up', directoryReferences: [{ hostId: 'h', path: '/repo' }] },
+  };
   const retracted: string[][] = [];
   const restoredDrafts: [string, string][] = [];
   const restoredContext: [string, RestoredDraftContent][] = [];
@@ -450,7 +442,7 @@ test('editing a queued steering restores content under the owning Session even a
   function Probe() {
     surface = useSessionMessageQueue({
       sessionId: 'session-a',
-      queue: { entries: [entry], ts: 1, queueRevision: 2 },
+      queue: { entries: [entry, followUp], ts: 1 },
       transientMessages: [],
       activeSessionId,
     });
@@ -458,27 +450,13 @@ test('editing a queued steering restores content under the owning Session even a
   }
   await act(async () => root.render(createElement(LocaleProvider, { locale: 'en', children:
     createElement(ToastProvider, { children:
-      createElement(ConversationServicesProvider, { services: {
-        listMessages: async () => [],
-        subscribeChanges: () => () => {},
-        cancelMessage: async () => {},
-        reconcileMessage: async () => {},
+      createElement(ConversationServicesProvider, { services: stubConversationServices({
         sessions: {
-          readSnapshot: async () => { throw new Error('unexpected snapshot read'); },
-          readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
-          promoteQueueEntry: async () => undefined,
-          updateQueueEntry: async () => undefined,
           retractQueueEntry: async (sessionId: string, entryId: string) => {
             retracted.push([sessionId, entryId]);
           },
-          reorderQueueEntries: async () => undefined,
         },
-        runtimeHosts: { subscribeChanges: () => () => {} },
-        skills: { listInvocable: async () => [] },
-        workspace: { searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
-        newTasks: { subscribeChanges: () => () => {}, listInvocableSkills: async () => [], searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }) },
-        mcp: { subscribeChanges: () => () => {} },
-      }, children: createElement(Probe) }) })})));
+      }), children: createElement(Probe) }) })})));
   surface.composer.current = {
     setText() {}, appendText() {}, getText: () => '', clearDraft() {},
     setDraft: (key, text) => { restoredDrafts.push([key, text]); },
@@ -501,4 +479,11 @@ test('editing a queued steering restores content under the owning Session even a
     'quotes ride back into the draft');
   assert.deepEqual(restoredDrafts, [['session-a', 'steer it']],
     'the draft lands under the owning Session even while another is active');
+
+  // A queued follow-up row edits the same way: out of the queue, back into the draft.
+  activeSessionId.current = 'session-a';
+  await act(async () => { await surface.editQueuedEntry(followUp); });
+  assert.deepEqual(retracted.at(-1), ['session-a', 'entry-2']);
+  assert.deepEqual(restoredDrafts.at(-1), ['session-a', 'follow up']);
+  assert.equal(restoredContext.at(-1)![1].directoryReferences, followUp.content.directoryReferences);
 });
diff --git a/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts b/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts
index 4c8c716a18e..821d8b080e3 100644
--- a/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts
+++ b/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts
@@ -449,9 +449,8 @@ test('binds message controls to the current Host Epoch', async () => {
   const { client, requests } = clientWithResponses([
     { disposition: 'steering', queueRevision: 2 },
     { queueRevision: 3 },
-    { queueRevision: 4 },
     {
-      queueRevision: 5,
+      queueRevision: 4,
       retracted: [],
       turn: {
         sessionId: 'session-1',
@@ -475,13 +474,6 @@ test('binds message controls to the current Host Epoch', async () => {
     entryId: 'entry-1',
     retractId: 'retract-1',
   });
-  await client.updateQueueEntry({
-    sessionId: 'session-1',
-    entryId: 'entry-1',
-    updateId: 'update-1',
-    expectedQueueRevision: 3,
-    text: 'Updated steer',
-  });
   await client.interruptTurn({
     sessionId: 'session-1',
     interruptId: 'interrupt-1',
@@ -509,17 +501,6 @@ test('binds message controls to the current Host Epoch', async () => {
         originHostEpoch: 'host-current',
       },
     },
-    {
-      operation: 'queue.entry.update',
-      input: {
-        sessionId: 'session-1',
-        entryId: 'entry-1',
-        updateId: 'update-1',
-        expectedQueueRevision: 3,
-        text: 'Updated steer',
-        originHostEpoch: 'host-current',
-      },
-    },
     {
       operation: 'turn.interrupt',
       input: {
diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts
index 055ead8ca96..bd5ad8eeae3 100644
--- a/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts
+++ b/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts
@@ -1894,13 +1894,9 @@ test("routes per-entry queue mutations to the Runtime Host", async () => {
           calls.push({ operation: "promote", ...input });
           return { queueRevision: 4 };
         },
-        updateQueueEntry: async (input) => {
-          calls.push({ operation: "update", ...input });
-          return { queueRevision: 5 };
-        },
         reorderQueueEntries: async (input) => {
           calls.push({ operation: "reorder", ...input });
-          return { queueRevision: 6 };
+          return { queueRevision: 5 };
         },
       }),
       observer: unusedObserver(),
@@ -1916,13 +1912,6 @@ test("routes per-entry queue mutations to the Runtime Host", async () => {
 
   assert.equal(await ipc.invoke("sessions:retractQueueEntry", "session-1", "entry-1"), undefined);
   await ipc.invoke("sessions:promoteQueueEntry", "session-1", "entry-2");
-  await ipc.invoke(
-    "sessions:updateQueueEntry",
-    "session-1",
-    "entry-2",
-    4,
-    " revised ",
-  );
   await ipc.invoke("sessions:reorderQueueEntries", "session-1", ["entry-3", "entry-2"]);
 
   assert.deepEqual(calls, [
@@ -1938,26 +1927,14 @@ test("routes per-entry queue mutations to the Runtime Host", async () => {
       entryId: "entry-2",
       promoteId: "id-2",
     },
-    {
-      operation: "update",
-      sessionId: "session-1",
-      entryId: "entry-2",
-      updateId: "id-3",
-      expectedQueueRevision: 4,
-      text: "revised",
-    },
     {
       operation: "reorder",
       sessionId: "session-1",
-      reorderId: "id-4",
+      reorderId: "id-3",
       entryIds: ["entry-3", "entry-2"],
     },
   ]);
 
-  await assert.rejects(
-    () => ipc.invoke("sessions:updateQueueEntry", "session-1", "entry-1", 4, " "),
-    /Invalid Queued message text/,
-  );
   await assert.rejects(
     () => ipc.invoke("sessions:promoteQueueEntry", "session-1", 42),
     /Invalid queue entry identity/,
@@ -2318,7 +2295,6 @@ function executionClient(overrides: Partial<ExecutionClient>): ExecutionClient {
     openSession: unavailable,
     retractQueueEntry: unavailable,
     promoteQueueEntry: unavailable,
-    updateQueueEntry: unavailable,
     reorderQueueEntries: unavailable,
     setSessionReadMarker: unavailable,
     startTurnResume: unavailable,
diff --git a/apps/desktop/src/main/__tests__/session-query-gate.test.ts b/apps/desktop/src/main/__tests__/session-query-gate.test.ts
index 10d4e879a0e..3add499fc8d 100644
--- a/apps/desktop/src/main/__tests__/session-query-gate.test.ts
+++ b/apps/desktop/src/main/__tests__/session-query-gate.test.ts
@@ -29,10 +29,8 @@ import {
   ComposerMentionsProvider,
   useComposerMentionsContext,
 } from '../../renderer/composer-mentions.js';
-import {
-  ConversationServicesProvider,
-  type ConversationServices,
-} from '../../renderer/features/conversation/index.js';
+import { ConversationServicesProvider } from '../../renderer/features/conversation/index.js';
+import { stubConversationServices } from '../../renderer/features/conversation/testing.js';
 import {
   usePlanModeState,
   type PlanModeState,
@@ -67,38 +65,14 @@ test('query blocking pauses, resumes, and fences automatic Skills and Plan reads
   let planMode: PlanModeState | undefined;
   let skillsUnavailable = false;
 
-  const services: ConversationServices = {
-    listMessages: async () => [],
-    cancelMessage: async () => undefined,
-    reconcileMessage: async () => undefined,
-    subscribeChanges: () => () => undefined,
+  const services = stubConversationServices({
     skills: {
       listInvocable: async () => {
         skillQueries += 1;
         return skillQueries === 1 ? firstSkillQuery.promise : [];
       },
     },
-    sessions: {
-      readSnapshot: async () => {
-        throw new Error('Session snapshot is not used in query gate tests');
-      },
-      readExecutionBoundary: async () => {
-        throw new Error('Execution boundary is not used in query gate tests');
-      },
-      promoteQueueEntry: async () => undefined,
-      updateQueueEntry: async () => undefined,
-      retractQueueEntry: async () => undefined,
-      reorderQueueEntries: async () => undefined,
-    },
-    runtimeHosts: { subscribeChanges: () => () => undefined },
-    workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
-    newTasks: {
-      subscribeChanges: () => () => undefined,
-      listInvocableSkills: async () => [],
-      searchFiles: async () => ({ ok: false, reason: 'no_project' }),
-    },
-    mcp: { subscribeChanges: () => () => undefined },
-  };
+  });
 
   (globalThis.window as unknown as { maka: unknown }).maka = {
     sessions: {
diff --git a/apps/desktop/src/main/__tests__/session-reference-composer.test.ts b/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
index 396eedecb18..2738fc0e0ae 100644
--- a/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
+++ b/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
@@ -59,7 +59,6 @@ const readExecutionBoundary = async () => {
 
 const queueStubs = {
   promoteQueueEntry: async () => undefined,
-  updateQueueEntry: async () => undefined,
   retractQueueEntry: async () => undefined,
   reorderQueueEntries: async () => undefined,
 };
diff --git a/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts b/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
index b3ce50713cf..02b725dfa6d 100644
--- a/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
+++ b/apps/desktop/src/main/__tests__/session-workspace-action-identity.test.ts
@@ -28,10 +28,8 @@ import {
   SessionCatalogContext,
 } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';
 import { useAppShellSessionWorkspace } from '../../renderer/use-app-shell-session-workspace.js';
-import {
-  ConversationServicesProvider,
-  type ConversationServices,
-} from '../../renderer/features/conversation/index.js';
+import { ConversationServicesProvider } from '../../renderer/features/conversation/index.js';
+import { stubConversationServices } from '../../renderer/features/conversation/testing.js';
 import { createDesktopTranscriptRangeController, DesktopTranscriptRangeStore } from '../../renderer/platform/desktop/desktop-transcript-range-store.js';
 import { encodeDesktopTranscriptSnapshot } from '../desktop-transcript-ipc.js';
 
@@ -58,34 +56,6 @@ function actionKeys(workspace: Workspace): string[] {
   );
 }
 
-function stubConversationServices(): ConversationServices {
-  return {
-    listMessages: async () => [],
-    cancelMessage: async () => undefined,
-    reconcileMessage: async () => undefined,
-    subscribeChanges: () => () => undefined,
-    skills: { listInvocable: async () => [] },
-    sessions: {
-      readSnapshot: async () => {
-        throw new Error('Session snapshot is not used in this test');
-      },
-      readExecutionBoundary: async () => { throw new Error('unexpected boundary read'); },
-      promoteQueueEntry: async () => undefined,
-      updateQueueEntry: async () => undefined,
-      retractQueueEntry: async () => undefined,
-      reorderQueueEntries: async () => undefined,
-    },
-    runtimeHosts: { subscribeChanges: () => () => undefined },
-    workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
-    newTasks: {
-      subscribeChanges: () => () => undefined,
-      listInvocableSkills: async () => [],
-      searchFiles: async () => ({ ok: false, reason: 'no_project' }),
-    },
-    mcp: { subscribeChanges: () => () => undefined },
-  };
-}
-
 describe('session workspace action identity', () => {
   afterEach(cleanupFakeDom);
 
diff --git a/apps/desktop/src/main/__tests__/workbar-services-adapter.test.ts b/apps/desktop/src/main/__tests__/workbar-services-adapter.test.ts
index fd54fa2ec2f..0a670e29d2b 100644
--- a/apps/desktop/src/main/__tests__/workbar-services-adapter.test.ts
+++ b/apps/desktop/src/main/__tests__/workbar-services-adapter.test.ts
@@ -275,7 +275,6 @@ describe('createDesktopWorkbarServices', () => {
     await services.sideChat.queryMessageExecutions('fork', ['message-next']);
     await services.sideChat.retractQueueEntry('fork', 'entry-1');
     await services.sideChat.promoteQueueEntry('fork', 'entry-2');
-    await services.sideChat.updateQueueEntry('fork', 'entry-3', 4, 'updated');
     await services.sideChat.reorderQueueEntries('fork', ['entry-3', 'entry-2']);
     await services.sideChat.setPermissionMode('fork', 'ask');
     await services.sideChat.respondToSandboxBoundary('fork', {} as never);
@@ -332,7 +331,6 @@ describe('createDesktopWorkbarServices', () => {
         'sessions.queryMessageExecutions',
         'sessions.retractQueueEntry',
         'sessions.promoteQueueEntry',
-        'sessions.updateQueueEntry',
         'sessions.reorderQueueEntries',
         'sessions.setPermissionMode',
         'sessions.respondToSandboxBoundary',
diff --git a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
index 6e31476d6a1..ac5d80b03f9 100644
--- a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
+++ b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
@@ -50,6 +50,7 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
   const requests: Array<Parameters<WorkHubServices['answer']>[1]> = [];
   let rootTurn: { turnId: string; runId: string; status: 'running' | 'cancelled' | 'completed' } | undefined;
   const queueMutations: unknown[][] = [];
+  const restoredDrafts: [string, string][] = [];
   const steers: Array<Parameters<WorkHubServices['enqueueMessage']>> = [];
   let steerResult: Awaited<ReturnType<WorkHubServices['enqueueMessage']>> = 'admitted';
   const executionQueries: string[][] = [];
@@ -117,7 +118,6 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
     },
     retractQueueEntry: async (...input: Parameters<WorkHubServices['retractQueueEntry']>) => { queueMutations.push(['retract', ...input]); },
     promoteQueueEntry: async (...input: Parameters<WorkHubServices['promoteQueueEntry']>) => { queueMutations.push(['promote', ...input]); },
-    updateQueueEntry: async (...input: Parameters<WorkHubServices['updateQueueEntry']>) => { queueMutations.push(['update', ...input]); },
     reorderQueueEntries: async (...input: Parameters<WorkHubServices['reorderQueueEntries']>) => { queueMutations.push(['reorder', ...input]); },
     enqueueMessage: async (...input: Parameters<WorkHubServices['enqueueMessage']>) => { steers.push(input); onSteer?.(input); return steerResult; },
     queryMessageExecutions: async (_id: string, messageIds: readonly string[]) => {
@@ -136,7 +136,7 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
     ...overrides,
   } as unknown as WorkHubServices;
   let submissions = 0;
-  function Probe() { controller = useWorkHubController(() => { submissions++; }, () => {}); return null; }
+  function Probe() { controller = useWorkHubController(() => { submissions++; }, (sessionId, draft) => { restoredDrafts.push([sessionId, draft.text]); }); return null; }
   await act(async () => {
     root.render(createElement(LocaleProvider, { locale: 'en', children:
       createElement(WorkHubServicesProvider, { services }, createElement(Probe)),
@@ -149,7 +149,7 @@ async function mountController(failFirstRead = false, overrides: Partial<WorkHub
     reconnect(epoch = hostEpoch) { hostEpoch = epoch; onPhase('pending'); onPhase('ready'); },
     complete(turnId: string) { rootTurn = { turnId, runId: `run:${turnId}`, status: 'completed' }; projectExecution(); },
     onSteer(handler: typeof onSteer) { onSteer = handler; },
-    queueMutations, steers, setSteerResult(value: typeof steerResult) { steerResult = value; },
+    queueMutations, restoredDrafts, steers, setSteerResult(value: typeof steerResult) { steerResult = value; },
     executionQueries, setExecutionResolutions(value: typeof executionResolutions) { executionResolutions = value; },
     setStopRetractions(ids: string[]) { stopRetractions = ids; },
     sessionId, requests, get admission() { return admission; }, interrupts,
@@ -683,15 +683,16 @@ test('WorkHub sends queue edits, withdrawal and both queue orders to the Host an
   await act(() => h.emit({ type: 'queue_update', id: 'queued', turnId: 'active-turn', ts: 2,
     queueRevision: 7, steering: ['first', 'second'], followup: [], steeringEntries: entries }));
   await act(async () => {
-    await h.controller.updateQueuedEntry('second', 7, 'edited second');
+    await h.controller.editQueuedEntry?.(entries[1]!);
     await h.controller.reorderQueuedEntries(['second', 'first']);
     await h.controller.deleteQueuedEntry('first');
   });
   assert.deepEqual(h.queueMutations, [
-    ['update', h.controller.sessionId, 'second', 7, 'edited second'],
+    ['retract', h.controller.sessionId, 'second'],
     ['reorder', h.controller.sessionId, ['second', 'first']],
     ['retract', h.controller.sessionId, 'first'],
   ]);
+  assert.deepEqual(h.restoredDrafts, [[h.controller.sessionId, 'second']], 'edit hands the retracted text back to the draft');
   assert.deepEqual(h.controller.messageQueue.entries.map((entry) => entry.entryId), ['first', 'second']);
   await act(() => h.emit({ type: 'queue_update', id: 'updated', turnId: 'active-turn', ts: 3,
     queueRevision: 10, steering: ['edited second'], followup: [], steeringEntries: [{ ...entries[1]!, content: { text: 'edited second' } }] }));
diff --git a/apps/desktop/src/main/runtime-host-client.ts b/apps/desktop/src/main/runtime-host-client.ts
index 1ece571ba87..f2c6954a287 100644
--- a/apps/desktop/src/main/runtime-host-client.ts
+++ b/apps/desktop/src/main/runtime-host-client.ts
@@ -104,7 +104,6 @@ import {
   type QueueEntriesReorderInput,
   type QueueEntryPromoteInput,
   type QueueEntryRetractInput,
-  type QueueEntryUpdateInput,
   type QueueMutationResult,
   SESSION_TRANSCRIPT_BOOTSTRAP_MAX_BYTES,
   type SessionCatalogChangedFrame,
@@ -1342,15 +1341,6 @@ export class DesktopRuntimeHostClient {
     });
   }
 
-  updateQueueEntry(
-    input: Omit<QueueEntryUpdateInput, "originHostEpoch">,
-  ): Promise<QueueMutationResult> {
-    return this.request("queue.entry.update", {
-      ...input,
-      originHostEpoch: this.connection.hostEpoch,
-    });
-  }
-
   reorderQueueEntries(
     input: Omit<QueueEntriesReorderInput, "originHostEpoch">,
   ): Promise<QueueMutationResult> {
diff --git a/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts b/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts
index 821ecd2e5ee..62fe6dbd302 100644
--- a/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts
+++ b/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts
@@ -124,7 +124,6 @@ type RuntimeHostSessionExecutionClient = Pick<
   | "readExecutionBoundary"
   | "retractQueueEntry"
   | "promoteQueueEntry"
-  | "updateQueueEntry"
   | "reorderQueueEntries"
   | "setSessionReadMarker"
   | "startTurnResume"
@@ -675,25 +674,6 @@ export function registerRuntimeHostSessionExecutionIpc(
       });
     },
   );
-  ipcMain.handle(
-    "sessions:updateQueueEntry",
-    async (
-      _event,
-      sessionId: unknown,
-      entryId: unknown,
-      expectedQueueRevision: unknown,
-      text: unknown,
-    ) => {
-      const normalizedText = requiredText(text, "Queued message").trim();
-      await deps.client.updateQueueEntry({
-        sessionId: requiredId(sessionId, "Session"),
-        entryId: requiredId(entryId, "Queue entry"),
-        updateId: newId(),
-        expectedQueueRevision: requiredSequence(expectedQueueRevision, "Queue"),
-        text: normalizedText,
-      });
-    },
-  );
   ipcMain.handle(
     "sessions:reorderQueueEntries",
     async (_event, sessionId: string, entryIds: unknown) => {
@@ -1083,24 +1063,6 @@ function requiredMessageId(value: unknown): string {
   return value;
 }
 
-function requiredText(value: unknown, label: string): string {
-  if (
-    typeof value !== "string" ||
-    value.trim().length === 0 ||
-    Buffer.byteLength(value, "utf8") > 48 * 1024
-  ) {
-    throw new Error(`Invalid ${label} text`);
-  }
-  return value;
-}
-
-function requiredSequence(value: unknown, label: string): number {
-  if (!Number.isSafeInteger(value) || (value as number) < 0) {
-    throw new Error(`Invalid ${label} sequence`);
-  }
-  return value as number;
-}
-
 function normalizeSnapshotMaxChars(options: unknown): number {
   if (options === undefined) return SESSION_SNAPSHOT_DEFAULT_MAX_CHARS;
   if (!options || typeof options !== 'object' || Array.isArray(options)) {
diff --git a/apps/desktop/src/preload/bridge-contract.d.ts b/apps/desktop/src/preload/bridge-contract.d.ts
index 5aed37c36ab..bb376a5fc6d 100644
--- a/apps/desktop/src/preload/bridge-contract.d.ts
+++ b/apps/desktop/src/preload/bridge-contract.d.ts
@@ -1293,12 +1293,6 @@ export interface MakaBridge {
     ): Promise<import('@maka/runtime-host/protocol').TurnMessageExecutionQueryResult>;
     retractQueueEntry(sessionId: string, entryId: string): Promise<void>;
     promoteQueueEntry(sessionId: string, entryId: string): Promise<void>;
-    updateQueueEntry(
-      sessionId: string,
-      entryId: string,
-      expectedQueueRevision: number,
-      text: string,
-    ): Promise<void>;
     reorderQueueEntries(sessionId: string, entryIds: readonly string[]): Promise<void>;
     readExecutionBoundary(sessionId: string): Promise<ExecutionBoundaryReadModel>;
     listActiveInteractions(sessionId: string): Promise<ActiveInteractionRequestEvent[]>;
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 6476d066c49..a338e69bfa3 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -2347,20 +2347,6 @@ const makaBridge = {
     promoteQueueEntry(sessionId: string, entryId: string): Promise<void> {
       return invokeSessionRuntimeHost('sessions:promoteQueueEntry', sessionId, entryId);
     },
-    updateQueueEntry(
-      sessionId: string,
-      entryId: string,
-      expectedQueueRevision: number,
-      text: string,
-    ): Promise<void> {
-      return invokeSessionRuntimeHost(
-        'sessions:updateQueueEntry',
-        sessionId,
-        entryId,
-        expectedQueueRevision,
-        text,
-      );
-    },
     reorderQueueEntries(sessionId: string, entryIds: readonly string[]): Promise<void> {
       return invokeSessionRuntimeHost('sessions:reorderQueueEntries', sessionId, [...entryIds]);
     },
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 71c05700f28..72d3b5f384b 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -672,7 +672,7 @@ function AppShellContent({
     restoreDraft: restoreLocalMessageDraft,
     draftContextRestorer,
     promoteQueuedEntry,
-    updateQueuedEntry,
+    editQueuedEntry,
     deleteQueuedEntry,
     reorderQueuedEntries,
   } = queueSurface;
@@ -2335,9 +2335,8 @@ function AppShellContent({
                   onStop={stop}
                   pendingMessages={transientMessages}
                   queuedMessages={activeMessageQueue?.entries}
-                  queuedMessageRevision={activeMessageQueue?.queueRevision}
                   onPromoteQueuedEntry={activeId ? promoteQueuedEntry : undefined}
-                  onUpdateQueuedEntry={activeId ? updateQueuedEntry : undefined}
+                  onEditQueuedEntry={activeId ? editQueuedEntry : undefined}
                   onDeleteQueuedEntry={activeId ? deleteQueuedEntry : undefined}
                   onReorderQueuedEntries={activeId ? reorderQueuedEntries : undefined}
                   revisionNotice={
diff --git a/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts b/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
index 47a6266f18a..1b9712d79cd 100644
--- a/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/message-queue-projection.ts
@@ -25,7 +25,6 @@ import type {
 /** The last Host queue snapshot a surface renders from. */
 export interface MessageQueueProjection {
   readonly ts: number;
-  readonly queueRevision?: number;
   readonly entries: readonly MessageQueueEntryProjection[];
 }
 
@@ -39,7 +38,6 @@ export function deriveMessageQueueProjection(
   ].map((entry) => structuredClone(entry));
   return {
     ts: event.ts,
-    queueRevision: event.queueRevision,
     entries,
   };
 }
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 2d660640961..8f6a4a1f1cc 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -44,21 +44,38 @@ export interface RestoredDraftContent {
   quotes?: readonly QuoteRef[];
 }
 
+export interface QueuedEntryDraftActions {
+  retract(entryId: string): Promise<void>;
+  restoreDraft(draft: RestoredDraftContent): void;
+}
+
+/**
+ * Editing any queued message takes it out of the Host queue first, so it cannot
+ * run half-edited, then hands its full content back to the composer. `retract`
+ * reports its own failure and rejects, so a failed edit restores nothing.
+ */
+export async function retractQueuedEntryToDraft(
+  { entryId, content }: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>,
+  actions: QueuedEntryDraftActions,
+): Promise<void> {
+  await actions.retract(entryId);
+  actions.restoreDraft({
+    text: content.displayText ?? content.text,
+    attachments: content.attachments,
+    directoryReferences: content.directoryReferences,
+    quotes: content.quotes,
+  });
+}
+
 /**
  * Queued steering is a thin projection of the Host queue snapshot, not a stored
  * transient: one tail bubble per current_turn entry, appearing and disappearing
- * with `queue` alone. Delete retracts the entry; edit retracts it and hands the
- * content back to the draft. `retract` reports its own failure and rejects, so
- * a failed edit restores nothing.
+ * with `queue` alone.
  */
 export function withQueuedSteeringTransients(
   transientMessages: readonly TransientUserMessage[],
   queue: { readonly entries: readonly MessageQueueEntryProjection[]; readonly ts?: number } | undefined,
-  actions: {
-    locale: UiLocale;
-    retract(entryId: string): Promise<void>;
-    restoreDraft(draft: RestoredDraftContent): void;
-  },
+  actions: QueuedEntryDraftActions & { locale: UiLocale },
 ): TransientUserMessage[] {
   const steering = (queue?.entries ?? []).filter(
     (entry) => entry.placement === 'current_turn',
@@ -67,27 +84,22 @@ export function withQueuedSteeringTransients(
   const copy = getConversationCopy(actions.locale).composer;
   const icon = (glyph: typeof Pencil) => createElement(glyph, { size: ICON_SIZE.control, 'aria-hidden': true });
   const ignore = () => {};
-  const bubbles = steering.map(({ entryId, messageId, content }): TransientUserMessage => ({
-    id: messageId,
+  const bubbles = steering.map((entry): TransientUserMessage => ({
+    id: entry.messageId,
     transientPlacement: 'transcript',
     ts: queue?.ts ?? 0,
-    text: content.displayText ?? content.text,
-    ...(content.attachments && { attachments: [...content.attachments] }),
-    ...(content.directoryReferences && { directoryReferences: content.directoryReferences }),
-    ...(content.quotes && { quotes: [...content.quotes] }),
-    ...(content.inlineReferences && { inlineReferences: [...content.inlineReferences] }),
+    text: entry.content.displayText ?? entry.content.text,
+    ...(entry.content.attachments && { attachments: [...entry.content.attachments] }),
+    ...(entry.content.directoryReferences && { directoryReferences: entry.content.directoryReferences }),
+    ...(entry.content.quotes && { quotes: [...entry.content.quotes] }),
+    ...(entry.content.inlineReferences && { inlineReferences: [...entry.content.inlineReferences] }),
     deliveryActions: [
       {
         label: copy.editQueuedEntry,
         icon: icon(Pencil),
-        onClick: () => actions.retract(entryId).then(() => actions.restoreDraft({
-          text: content.displayText ?? content.text,
-          attachments: content.attachments,
-          directoryReferences: content.directoryReferences,
-          quotes: content.quotes,
-        }), ignore),
+        onClick: () => retractQueuedEntryToDraft(entry, actions).catch(ignore),
       },
-      { label: copy.deleteQueuedEntry, icon: icon(Trash2), onClick: () => actions.retract(entryId).catch(ignore) },
+      { label: copy.deleteQueuedEntry, icon: icon(Trash2), onClick: () => actions.retract(entry.entryId).catch(ignore) },
     ],
   }));
   const ids = new Set(bubbles.map((message) => message.id));
diff --git a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
index c22a35b1be4..0b079b217df 100644
--- a/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
+++ b/apps/desktop/src/renderer/features/conversation/controller/use-session-message-queue.ts
@@ -24,7 +24,9 @@ import {
   type ComposerHandle,
   type TransientUserMessageProjection,
 } from '@maka/ui';
+import type { MessageQueueEntryProjection } from '@maka/core/events';
 import {
+  retractQueuedEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
@@ -59,7 +61,7 @@ export function useSessionMessageQueue(options: {
     ((sessionId: string, draft: RestoredDraftContent) => void) | undefined
   >;
   promoteQueuedEntry: (entryId: string) => Promise<void>;
-  updateQueuedEntry: (entryId: string, expectedQueueRevision: number, text: string) => Promise<void>;
+  editQueuedEntry: (entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>) => Promise<void>;
   deleteQueuedEntry: (entryId: string) => Promise<void>;
   reorderQueuedEntries: (entryIds: readonly string[]) => Promise<void>;
 } {
@@ -121,8 +123,10 @@ export function useSessionMessageQueue(options: {
     restoreDraft,
     draftContextRestorer,
     promoteQueuedEntry: (entryId) => runAction((targetSessionId) => services.sessions.promoteQueueEntry(targetSessionId, entryId)),
-    updateQueuedEntry: (entryId, expectedQueueRevision, text) =>
-      runAction((targetSessionId) => services.sessions.updateQueueEntry(targetSessionId, entryId, expectedQueueRevision, text)),
+    editQueuedEntry: (entry) => runAction((targetSessionId) => retractQueuedEntryToDraft(entry, {
+      retract: (entryId) => services.sessions.retractQueueEntry(targetSessionId, entryId),
+      restoreDraft: (draft) => restoreDraft(targetSessionId, draft),
+    })),
     deleteQueuedEntry: (entryId) => runAction((targetSessionId) => services.sessions.retractQueueEntry(targetSessionId, entryId)),
     reorderQueuedEntries: (entryIds) => runAction((targetSessionId) => services.sessions.reorderQueueEntries(targetSessionId, entryIds)),
   };
diff --git a/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts b/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
index 7955c7fb12a..6abec486add 100644
--- a/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
+++ b/apps/desktop/src/renderer/features/conversation/model/session-ui-state.ts
@@ -43,10 +43,7 @@ export interface AppShellSessionUiState {
   transcriptRestoreUnavailableBySession: Record<string, string>;
 }
 
-// The pending plate keeps the Host revision beside its entries so edits can
-// reject stale multi-client projections instead of silently overwriting them.
 export interface MessageQueueUiState {
-  readonly queueRevision?: number;
   readonly ts: number;
   readonly entries: readonly MessageQueueEntryProjection[];
 }
diff --git a/apps/desktop/src/renderer/features/conversation/ports.ts b/apps/desktop/src/renderer/features/conversation/ports.ts
index 820edbc56f4..0a029b65483 100644
--- a/apps/desktop/src/renderer/features/conversation/ports.ts
+++ b/apps/desktop/src/renderer/features/conversation/ports.ts
@@ -67,7 +67,6 @@ export interface ConversationServices extends Pick<
     readSnapshot(sessionId: string, options?: { readonly maxChars?: number }): Promise<SessionSnapshot>;
     readExecutionBoundary(sessionId: string): Promise<ExecutionBoundaryReadModel>;
     promoteQueueEntry(sessionId: string, entryId: string): Promise<void>;
-    updateQueueEntry(sessionId: string, entryId: string, expectedQueueRevision: number, text: string): Promise<void>;
     retractQueueEntry(sessionId: string, entryId: string): Promise<void>;
     reorderQueueEntries(sessionId: string, entryIds: readonly string[]): Promise<void>;
   };
diff --git a/apps/desktop/src/renderer/features/conversation/testing.ts b/apps/desktop/src/renderer/features/conversation/testing.ts
index 22a45cae149..e209e3a8f4e 100644
--- a/apps/desktop/src/renderer/features/conversation/testing.ts
+++ b/apps/desktop/src/renderer/features/conversation/testing.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import type { ConversationServices } from './ports.js';
+
 export {
   createTranscriptRestoreLifecycle,
   prepareTranscriptForSend,
@@ -30,3 +32,40 @@ export {
   startActiveExecutionBoundaryRead,
 } from './controller/use-active-execution-boundary.js';
 export { useSessionMessageQueue } from './controller/use-session-message-queue.js';
+
+/** Inert conversation services; a test overrides only the calls it observes. */
+export function stubConversationServices(
+  overrides: Partial<Omit<ConversationServices, 'sessions'>> & {
+    readonly sessions?: Partial<ConversationServices['sessions']>;
+  } = {},
+): ConversationServices {
+  const { sessions, ...rest } = overrides;
+  return {
+    listMessages: async () => [],
+    cancelMessage: async () => undefined,
+    reconcileMessage: async () => undefined,
+    subscribeChanges: () => () => undefined,
+    skills: { listInvocable: async () => [] },
+    runtimeHosts: { subscribeChanges: () => () => undefined },
+    workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
+    newTasks: {
+      subscribeChanges: () => () => undefined,
+      listInvocableSkills: async () => [],
+      searchFiles: async () => ({ ok: false, reason: 'no_project' }),
+    },
+    mcp: { subscribeChanges: () => () => undefined },
+    ...rest,
+    sessions: {
+      readSnapshot: async () => {
+        throw new Error('Session snapshot is not stubbed');
+      },
+      readExecutionBoundary: async () => {
+        throw new Error('Execution boundary is not stubbed');
+      },
+      promoteQueueEntry: async () => undefined,
+      retractQueueEntry: async () => undefined,
+      reorderQueueEntries: async () => undefined,
+      ...sessions,
+    },
+  };
+}
diff --git a/apps/desktop/src/renderer/features/workbar/ports.ts b/apps/desktop/src/renderer/features/workbar/ports.ts
index e378005b3c9..d8d79917f5e 100644
--- a/apps/desktop/src/renderer/features/workbar/ports.ts
+++ b/apps/desktop/src/renderer/features/workbar/ports.ts
@@ -252,12 +252,6 @@ export interface SideChatSessionPort {
   ): Promise<TurnMessageExecutionQueryResult>;
   retractQueueEntry(sessionId: string, entryId: string): Promise<void>;
   promoteQueueEntry(sessionId: string, entryId: string): Promise<void>;
-  updateQueueEntry(
-    sessionId: string,
-    entryId: string,
-    expectedQueueRevision: number,
-    text: string,
-  ): Promise<void>;
   reorderQueueEntries(sessionId: string, entryIds: readonly string[]): Promise<void>;
   setPermissionMode(
     sessionId: string,
diff --git a/apps/desktop/src/renderer/features/workbar/testing.ts b/apps/desktop/src/renderer/features/workbar/testing.ts
index 3e180840e69..72ed993bb73 100644
--- a/apps/desktop/src/renderer/features/workbar/testing.ts
+++ b/apps/desktop/src/renderer/features/workbar/testing.ts
@@ -166,7 +166,6 @@ export function createFakeWorkbarServices(
       }),
       retractQueueEntry: async () => undefined,
       promoteQueueEntry: async () => undefined,
-      updateQueueEntry: async () => undefined,
       reorderQueueEntries: async () => undefined,
       setPermissionMode: async () => {
         throw new Error('Fake sideChat.setPermissionMode is not configured');
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
index d586227c21f..dc6a99ac567 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx
@@ -353,9 +353,8 @@ export function QuoteCompanionPanel(props: {
               processing={companion.processing}
               queuedMessages={companion.queuedMessages}
               pendingMessages={companion.transientMessages}
-              queuedMessageRevision={companion.queuedMessageRevision}
               onPromoteQueuedEntry={companion.promoteQueuedEntry}
-              onUpdateQueuedEntry={companion.updateQueuedEntry}
+              onEditQueuedEntry={companion.editQueuedEntry}
               onDeleteQueuedEntry={companion.deleteQueuedEntry}
               onReorderQueuedEntries={companion.reorderQueuedEntries}
               draftKey={draftKey}
diff --git a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
index 53c9317cb13..0803381ee8f 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts
@@ -77,6 +77,7 @@ import { mergeSettledMessages } from '../../../../settled-message-merge.js';
 import {
   mergeTransientMessageProjection,
   reconcileTransientMessages,
+  retractQueuedEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../../application/contracts/transient-message-projection.js';
@@ -188,7 +189,6 @@ export interface UseQuoteCompanionResult {
   transientMessages: readonly TransientUserMessageProjection[];
   /** Host-authoritative pending steering and follow-up messages. */
   queuedMessages: readonly MessageQueueEntryProjection[];
-  queuedMessageRevision: number | undefined;
   liveTurns: LiveTurnBuffer | undefined;
   activeTurn: ReturnType<typeof chatTurnActivity>;
   streaming: boolean;
@@ -227,11 +227,7 @@ export interface UseQuoteCompanionResult {
   /** Queue text for the next companion turn while the current turn continues. */
   queue: (text: string) => Promise<boolean>;
   promoteQueuedEntry: (entryId: string) => Promise<void>;
-  updateQueuedEntry: (
-    entryId: string,
-    expectedQueueRevision: number,
-    text: string,
-  ) => Promise<void>;
+  editQueuedEntry: (entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>) => Promise<void>;
   deleteQueuedEntry: (entryId: string) => Promise<void>;
   reorderQueuedEntries: (entryIds: readonly string[]) => Promise<void>;
   setPermissionMode: (mode: PermissionMode) => Promise<boolean>;
@@ -358,7 +354,6 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   );
   const [messageQueue, setMessageQueue] = useState<{
     readonly entries: readonly MessageQueueEntryProjection[];
-    readonly queueRevision?: number;
     readonly ts?: number;
   }>({ entries: [] });
   // Reseed reconciliation reads the queue between React flushes, so every
@@ -1635,13 +1630,6 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     (entryId: string) => runQueueEntryAction((id) => sideChat.promoteQueueEntry(id, entryId)),
     [runQueueEntryAction, sideChat],
   );
-  const updateQueuedEntry = useCallback(
-    (entryId: string, expectedQueueRevision: number, text: string) =>
-      runQueueEntryAction((id) =>
-        sideChat.updateQueueEntry(id, entryId, expectedQueueRevision, text),
-      ),
-    [runQueueEntryAction, sideChat],
-  );
   const deleteQueuedEntry = useCallback(
     async (entryId: string): Promise<void> => {
       const messageId = messageQueue.entries.find((entry) => entry.entryId === entryId)?.messageId;
@@ -1740,12 +1728,11 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
   const messages = allMessages.filter(
     (message) => message.turnId !== undefined && ownTurnIdsRef.current.has(message.turnId),
   );
-  const transientMessages = companion
-    ? withQueuedSteeringTransients(pendingUserMessages, messageQueue, {
-        locale: localeRef.current,
-        retract: deleteQueuedEntry,
-        restoreDraft: (draft) => input.restoreDraft(companion.id, draft),
-      })
+  const queuedEntryDraft = companion
+    ? { retract: deleteQueuedEntry, restoreDraft: (draft: RestoredDraftContent) => input.restoreDraft(companion.id, draft) }
+    : undefined;
+  const transientMessages = queuedEntryDraft
+    ? withQueuedSteeringTransients(pendingUserMessages, messageQueue, { ...queuedEntryDraft, locale: localeRef.current })
     : pendingUserMessages;
   // Inherited model (read-only): the fork's once created, else the source's.
   const activeModel = companion
@@ -1779,7 +1766,6 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     messages,
     transientMessages,
     queuedMessages: messageQueue.entries,
-    queuedMessageRevision: messageQueue.queueRevision,
     liveTurns,
     activeTurn: chatTurnActivity(execution),
     streaming,
@@ -1797,7 +1783,9 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan
     steer,
     queue,
     promoteQueuedEntry,
-    updateQueuedEntry,
+    editQueuedEntry: async (entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>) => {
+      if (queuedEntryDraft) await retractQueuedEntryToDraft(entry, queuedEntryDraft);
+    },
     deleteQueuedEntry,
     reorderQueuedEntries,
     setPermissionMode,
diff --git a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
index 477083eb0ae..2086c721d9a 100644
--- a/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
+++ b/apps/desktop/src/renderer/features/workhub/controller/use-workhub-controller.ts
@@ -19,6 +19,7 @@
 
 import { activeHostTurn, chatTurnActivity, type SessionExecutionProjection } from '../../../application/contracts/session-execution.js';
 import {
+  retractQueuedEntryToDraft,
   withQueuedSteeringTransients,
   type RestoredDraftContent,
 } from '../../../application/contracts/transient-message-projection.js';
@@ -63,7 +64,7 @@ interface SendAttempt {
 }
 interface MessagePresentation {
   transientMessages: TransientUserMessageProjection[];
-  messageQueue: { entries: readonly MessageQueueEntryProjection[]; revision?: number; ts?: number };
+  messageQueue: { entries: readonly MessageQueueEntryProjection[]; ts?: number };
 }
 export function useWorkHubController(
   onSubmit: (() => void) | undefined,
@@ -423,7 +424,7 @@ export function useWorkHubController(
           const ids = new Set(entries.map((entry) => entry.messageId));
           if (pendingQueued.current && ids.has(pendingQueued.current.messageId)) pendingQueued.current.observed = true;
           setMessagePresentation((previous) => ({
-            messageQueue: { entries, revision: event.queueRevision, ts: event.ts },
+            messageQueue: { entries, ts: event.ts },
             transientMessages: previous.transientMessages.filter((message) => !ids.has(message.id)),
           }));
         }
@@ -715,6 +716,9 @@ export function useWorkHubController(
     catch (reason) { report(reason); throw reason; }
   }
   const deleteQueuedEntry = (entryId: string) => mutateQueue((target) => services.retractQueueEntry(target, entryId));
+  const queuedEntryDraft = sessionId
+    ? { retract: deleteQueuedEntry, restoreDraft: (draft: RestoredDraftContent) => restoreDraft(sessionId, draft) }
+    : undefined;
   return {
     services,
     sessionId,
@@ -734,15 +738,13 @@ export function useWorkHubController(
       if (!sessionId) throw new Error('WorkHub Session is unavailable');
       await services.respondToUserQuestion(sessionId, response);
     },
-    transientMessages: sessionId
-      ? withQueuedSteeringTransients(transientMessages, messageQueue, {
-          locale,
-          retract: deleteQueuedEntry,
-          restoreDraft: (draft) => restoreDraft(sessionId, draft),
-        })
+    transientMessages: queuedEntryDraft
+      ? withQueuedSteeringTransients(transientMessages, messageQueue, { ...queuedEntryDraft, locale })
       : transientMessages,
     messageQueue,
-    updateQueuedEntry: (entryId: string, revision: number, text: string) => mutateQueue((target) => services.updateQueueEntry(target, entryId, revision, text)),
+    editQueuedEntry: queuedEntryDraft
+      ? (entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>) => retractQueuedEntryToDraft(entry, queuedEntryDraft)
+      : undefined,
     deleteQueuedEntry,
     promoteQueuedEntry: (entryId: string) => mutateQueue((target) => services.promoteQueueEntry(target, entryId)),
     reorderQueuedEntries: (entryIds: readonly string[]) => mutateQueue((target) => services.reorderQueueEntries(target, entryIds)),
diff --git a/apps/desktop/src/renderer/features/workhub/ports.ts b/apps/desktop/src/renderer/features/workhub/ports.ts
index 6e6c14dc491..f2f0d8cceed 100644
--- a/apps/desktop/src/renderer/features/workhub/ports.ts
+++ b/apps/desktop/src/renderer/features/workhub/ports.ts
@@ -67,7 +67,6 @@ export interface WorkHubServices extends WorkHubWorkspaceServices {
   queryMessageExecutions(sessionId: string, messageIds: readonly string[]): Promise<TurnMessageExecutionQueryResult>;
   retractQueueEntry(sessionId: string, entryId: string): Promise<void>;
   promoteQueueEntry(sessionId: string, entryId: string): Promise<void>;
-  updateQueueEntry(sessionId: string, entryId: string, expectedQueueRevision: number, text: string): Promise<void>;
   reorderQueueEntries(sessionId: string, entryIds: readonly string[]): Promise<void>;
   configureModel(
     sessionId: string,
diff --git a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
index b28d1921790..348a28237d4 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
@@ -306,8 +306,7 @@ export function WorkHubRoot() {
             <WorkHubComposer
               pendingMessages={controller.transientMessages}
               queuedMessages={controller.messageQueue.entries}
-              queuedMessageRevision={controller.messageQueue.revision}
-              onUpdateQueuedEntry={controller.updateQueuedEntry}
+              onEditQueuedEntry={controller.editQueuedEntry}
               onDeleteQueuedEntry={controller.deleteQueuedEntry}
               onPromoteQueuedEntry={controller.promoteQueuedEntry}
               onReorderQueuedEntries={controller.reorderQueuedEntries}
diff --git a/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts b/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts
index 5bd9fe3e034..c6554dd9453 100644
--- a/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts
+++ b/apps/desktop/src/renderer/platform/desktop/create-workbar-services.ts
@@ -205,8 +205,6 @@ export function createDesktopWorkbarServices(
         bridge.sessions.retractQueueEntry(sessionId, entryId),
       promoteQueueEntry: (sessionId, entryId) =>
         bridge.sessions.promoteQueueEntry(sessionId, entryId),
-      updateQueueEntry: (sessionId, entryId, expectedQueueRevision, text) =>
-        bridge.sessions.updateQueueEntry(sessionId, entryId, expectedQueueRevision, text),
       reorderQueueEntries: (sessionId, entryIds) =>
         bridge.sessions.reorderQueueEntries(sessionId, entryIds),
       setPermissionMode: async (sessionId, mode) =>
diff --git a/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts b/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts
index 7c262fb1714..33c66b8f73a 100644
--- a/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts
+++ b/apps/desktop/src/renderer/platform/desktop/create-workhub-services.ts
@@ -114,7 +114,6 @@ export function createDesktopWorkHubServices(
       bridge.sessions.queryMessageExecutions(sessionId, messageIds),
     retractQueueEntry: (sessionId, entryId) => bridge.sessions.retractQueueEntry(sessionId, entryId),
     promoteQueueEntry: (sessionId, entryId) => bridge.sessions.promoteQueueEntry(sessionId, entryId),
-    updateQueueEntry: (sessionId, entryId, revision, text) => bridge.sessions.updateQueueEntry(sessionId, entryId, revision, text),
     reorderQueueEntries: (sessionId, entryIds) => bridge.sessions.reorderQueueEntries(sessionId, entryIds),
     configureModel: (sessionId, input) => bridge.workHub.configureModel(sessionId, input),
     getNewWorkDefaults: (sessionId) => bridge.workHub.getNewWorkDefaults(sessionId),
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index 2cfc22a5572..6549f9172f4 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -123,19 +123,6 @@
   flex: 0 0 auto;
 }
 
-.maka-composer-queue-edit {
-  width: 100%;
-  min-width: 0;
-  border: 0;
-  border-bottom: var(--border-width-hairline) solid var(--border-strong);
-  outline: 0;
-  background: transparent;
-  color: inherit;
-  font: inherit;
-  line-height: inherit;
-  resize: vertical;
-}
-
 .maka-composer-queue-grip {
   display: grid;
   place-items: center;
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 36f85b708f7..29a7af9c61a 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -45,7 +45,7 @@ import {
 import type { ChatModelChoice, ComposerHandle, SessionViewMode, TurnViewModel, LiveTurnBuffer } from '@maka/ui';
 import { SessionRail, type SessionRailStoryProps } from '../../../packages/ui/stories/session-rail-harness.js';
 import { deriveMessageQueueProjection } from '../src/renderer/application/contracts/message-queue-projection';
-import { withQueuedSteeringTransients } from '../src/renderer/application/contracts/transient-message-projection';
+import { retractQueuedEntryToDraft, withQueuedSteeringTransients } from '../src/renderer/application/contracts/transient-message-projection';
 import { AppShellTitlebar } from '../src/renderer/app-shell-chrome-actions';
 import { appShellFrameStyle } from '../src/renderer/shell/frame-style';
 import { SettingsOverlay } from '../src/renderer/app-shell-overlays';
@@ -752,7 +752,6 @@ type QueueHost = {
 type QueueHostAction =
   | { type: 'enqueue'; text: string; placement: MessageQueuePlacement }
   | { type: 'promote' | 'retract'; entryId: string }
-  | { type: 'update'; entryId: string; text: string }
   | { type: 'reorder'; entryIds: readonly string[] }
   | { type: 'consume' };
 
@@ -788,11 +787,6 @@ function reduceQueueHost(host: QueueHost, action: QueueHostAction): QueueHost {
     }
     case 'retract':
       return { ...host, revision, steering: without(host.steering, action.entryId), followup: without(host.followup, action.entryId) };
-    case 'update': {
-      const edit = (entry: MessageQueueEntryProjection) =>
-        entry.entryId === action.entryId ? { ...entry, content: { ...entry.content, text: action.text } } : entry;
-      return { ...host, revision, steering: host.steering.map(edit), followup: host.followup.map(edit) };
-    }
     case 'reorder':
       return {
         ...host,
@@ -847,7 +841,10 @@ function QueuedMessageLifecycle() {
   const [startedAt] = useState(Date.now);
   const composerRef = useRef<ComposerHandle>(null);
   const queue = deriveMessageQueueProjection(queueUpdate(host, startedAt));
-  const retract = async (entryId: string) => dispatch({ type: 'retract', entryId });
+  const draftActions = {
+    retract: async (entryId: string) => dispatch({ type: 'retract', entryId }),
+    restoreDraft: (draft: { text: string }) => composerRef.current?.setText(draft.text),
+  };
   return (
     <div style={{ height: '100vh', display: 'flex', flexDirection: 'column' }}>
       <div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: 8, flexShrink: 0 }}>
@@ -870,24 +867,19 @@ function QueuedMessageLifecycle() {
             { type: 'turn_state', id: 'state-queue', turnId: QUEUE_TURN, ts: startedAt - 20_000, status: 'running' },
           ],
           liveTurns: host.liveTurns,
-          transientMessages: withQueuedSteeringTransients([], queue, {
-            locale: 'zh-CN',
-            retract,
-            restoreDraft: (draft) => composerRef.current?.setText(draft.text),
-          }),
+          transientMessages: withQueuedSteeringTransients([], queue, { ...draftActions, locale: 'zh-CN' }),
         }}
         composer={{
           ref: composerRef,
           queuedMessages: queue.entries,
-          queuedMessageRevision: queue.queueRevision,
           // Plain Enter mid-turn is an ordinary send the Host queues for the
           // next Turn; Cmd/Ctrl+Enter asks for the current one.
           onSend: (text, metadata) => {
             dispatch({ type: 'enqueue', text, placement: metadata?.followUpMode === 'steer' ? 'current_turn' : 'next_turn' });
           },
           onPromoteQueuedEntry: (entryId) => dispatch({ type: 'promote', entryId }),
-          onUpdateQueuedEntry: (entryId, _revision, text) => dispatch({ type: 'update', entryId, text }),
-          onDeleteQueuedEntry: retract,
+          onEditQueuedEntry: (entry) => retractQueuedEntryToDraft(entry, draftActions),
+          onDeleteQueuedEntry: draftActions.retract,
           onReorderQueuedEntries: (entryIds) => dispatch({ type: 'reorder', entryIds }),
         }}
       />
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 5c5fe393ed6..f673536bb4c 100644
--- a/apps/desktop/stories/composer-message-queue.stories.tsx
+++ b/apps/desktop/stories/composer-message-queue.stories.tsx
@@ -30,6 +30,7 @@ import {
   SessionLocalMessages,
   type ConversationServices,
 } from '../src/renderer/features/conversation';
+import { stubConversationServices } from '../src/renderer/features/conversation/testing';
 import type { DesktopLocalMessage } from '../src/shared/session-local-contract.js';
 
 const NOW = Date.UTC(2026, 6, 1, 9, 30, 0);
@@ -83,37 +84,12 @@ function localDeliveryMessages(state: DeliveryState): DesktopLocalMessage[] {
 
 function localDeliveryServices(state: DeliveryState): ConversationServices {
   let messages = localDeliveryMessages(state);
-  return {
+  return stubConversationServices({
     listMessages: async () => messages,
     cancelMessage: async (_sessionId, messageId) => {
       messages = messages.filter((message) => message.messageId !== messageId);
     },
-    reconcileMessage: async () => undefined,
-    subscribeChanges: () => () => undefined,
-    sessions: {
-      readSnapshot: async () => {
-        throw new Error('Session snapshots are not used in this story');
-      },
-      readExecutionBoundary: async () => {
-        throw new Error('Execution boundary is not used in this story');
-      },
-      promoteQueueEntry: async () => undefined,
-      updateQueueEntry: async () => undefined,
-      retractQueueEntry: async () => undefined,
-      reorderQueueEntries: async () => undefined,
-    },
-    runtimeHosts: { subscribeChanges: () => () => undefined },
-    skills: { listInvocable: async () => [] },
-    workspace: {
-      searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }),
-    },
-    newTasks: {
-      subscribeChanges: () => () => undefined,
-      listInvocableSkills: async () => [],
-      searchFiles: async () => ({ ok: false as const, reason: 'no_project' as const }),
-    },
-    mcp: { subscribeChanges: () => () => undefined },
-  };
+  });
 }
 
 const meta = {
@@ -176,8 +152,8 @@ function followUpEntry(entryId: string, text: string): MessageQueueEntryProjecti
 
 /**
  * Local stand-in for the Runtime Host queue projection: promote hands an
- * entry to the active Turn (it leaves the plate), update edits it in place,
- * retract drops it, and reorder applies the drag order. The component contract
+ * entry to the active Turn (it leaves the plate), edit retracts it back into
+ * the draft, retract drops it, and reorder applies the drag order. The component contract
  * (projection in, mutations
  * out) is the real one; only the authority is simulated.
  */
@@ -262,18 +238,12 @@ function QueuedComposer({
         ref={composerRef}
         queuedMessages={deliveryState === 'queued' ? followup : []}
         pendingMessages={[...published.values()]}
-        queuedMessageRevision={1}
         onPromoteQueuedEntry={(entryId) => {
           setFollowup((current) => current.filter((candidate) => candidate.entryId !== entryId));
         }}
-        onUpdateQueuedEntry={(entryId, _expectedQueueRevision, text) => {
-          setFollowup((current) =>
-            current.map((candidate) =>
-              candidate.entryId === entryId
-                ? { ...candidate, content: { ...candidate.content, text, displayText: text } }
-                : candidate,
-            ),
-          );
+        onEditQueuedEntry={(entry) => {
+          setFollowup((current) => current.filter((candidate) => candidate.entryId !== entry.entryId));
+          composerRef.current?.setText(entry.content.displayText ?? entry.content.text);
         }}
         onDeleteQueuedEntry={(entryId) => {
           setFollowup((current) => current.filter((candidate) => candidate.entryId !== entryId));
@@ -296,7 +266,7 @@ function storyFrame(children: ReactNode): ReactElement {
 
 // Real path: mid-turn sends while a quote and a file are staged — the staging
 // drawer holds the queue section above a hairline and the context chips below.
-// Drag follow-ups to reorder; 直接发送 promotes one, 编辑 updates it in place.
+// Drag follow-ups to reorder; 直接发送 promotes one, 编辑 takes it back into the draft.
 export const PendingPlate: Story = {
   args: { deliveryState: 'queued' },
   argTypes: {
@@ -311,13 +281,6 @@ export const PendingPlate: Story = {
     ),
 };
 
-// Real path: follow-ups sent mid-turn with nothing staged — the drawer holds
-// the queue section alone and collapses to a "N 条待发送消息" strip.
-export const QueueOnly: Story = {
-  args: { deliveryState: 'queued' },
-  render: () => storyFrame(<QueuedComposer deliveryState="queued" stagedContext={false} />),
-};
-
 // Real path: the user folds the staging slab; every staged item collapses into
 // the count strip until it is reopened.
 export const StagingCollapsed: Story = {
@@ -360,31 +323,3 @@ export const OverflowingQueue: Story = {
     await expect(canvas.getAllByText(/^排队跟进/).length).toBe(9);
   },
 };
-
-// Real path: the pencil on a queued row opens an inline editor inside the
-// drawer; Enter commits, Escape cancels.
-export const EditingQueuedEntry: Story = {
-  args: { deliveryState: 'queued' },
-  render: () => storyFrame(<QueuedComposer deliveryState="queued" stagedContext={false} />),
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getAllByRole('button', { name: '编辑' })[1]!);
-    const editor = await canvas.findByRole('textbox', { name: '编辑' });
-    await expect(editor).toHaveValue('查一下 PR #3526 相关的 session 及其 compaction 诊断记录。');
-    await userEvent.clear(editor);
-    await userEvent.type(editor, '改查 PR #3526 的 session 列表。');
-    await userEvent.keyboard('{Enter}');
-    await waitFor(() => {
-      expect(canvas.getByText('改查 PR #3526 的 session 列表。')).toBeVisible();
-      expect(canvas.queryByRole('textbox', { name: '编辑' })).toBeNull();
-    });
-  },
-};
-
-// Real path: a 720px Desktop window — the smoke runner gives ids containing
-// "narrow" the narrow viewport; rows stay one line and actions keep the
-// trailing edge.
-export const NarrowPendingPlate: Story = {
-  args: { deliveryState: 'queued' },
-  render: () => storyFrame(<QueuedComposer deliveryState="queued" />),
-};
diff --git a/apps/desktop/stories/composer-slash-menu.stories.tsx b/apps/desktop/stories/composer-slash-menu.stories.tsx
index dd4b9902533..dd1dc08c270 100644
--- a/apps/desktop/stories/composer-slash-menu.stories.tsx
+++ b/apps/desktop/stories/composer-slash-menu.stories.tsx
@@ -161,7 +161,6 @@ const conversationServices: ConversationServices = {
       throw new Error('Execution boundaries are not used in slash menu stories');
     },
     promoteQueueEntry: async () => undefined,
-    updateQueueEntry: async () => undefined,
     retractQueueEntry: async () => undefined,
     reorderQueueEntries: async () => undefined,
   },
diff --git a/apps/desktop/stories/session-workbar.stories.tsx b/apps/desktop/stories/session-workbar.stories.tsx
index e7720d381ae..3b25540bd17 100644
--- a/apps/desktop/stories/session-workbar.stories.tsx
+++ b/apps/desktop/stories/session-workbar.stories.tsx
@@ -1026,7 +1026,6 @@ function bridge(options: {
       }),
       retractQueueEntry: async () => undefined,
       promoteQueueEntry: async () => undefined,
-      updateQueueEntry: async () => undefined,
       reorderQueueEntries: async () => undefined,
       setPermissionMode: async (_sessionId, mode) => ({
         ...SIDE_CHAT_SESSION,
diff --git a/apps/desktop/stories/workhub.stories.tsx b/apps/desktop/stories/workhub.stories.tsx
index c9a5f2f99da..a30a0280ee9 100644
--- a/apps/desktop/stories/workhub.stories.tsx
+++ b/apps/desktop/stories/workhub.stories.tsx
@@ -102,7 +102,7 @@ function makeServices(failFirst: boolean, withHistory: boolean | 'usage', colore
       subscribeUsageChanges: () => () => {},
     },
     retractQueueEntry: async () => {}, promoteQueueEntry: async () => {},
-    updateQueueEntry: async () => {}, reorderQueueEntries: async () => {},
+    reorderQueueEntries: async () => {},
     enqueueMessage: async () => 'admitted',
     queryMessageExecutions: async () => ({ resolutions: [] }),
     surface: 'workhub', initialLocale: 'zh-CN', subscribeAppearance: () => () => {},
diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index 9a9cb0e8b83..693fae23d15 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -6,7 +6,7 @@ Generated against `@astryxdesign/core@0.6.2` (195 component exports).
 
 Wiki bar: Design Conventions · API Use-the-System · Theming · Container Padding.
 
-**Totals:** 305 files — blocker 0, reimplementation 0, polish 4, aligned 301.
+**Totals:** 305 files — blocker 0, reimplementation 0, polish 3, aligned 302.
 
 ## Exclusions (explicit)
 
@@ -273,7 +273,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `packages/ui/src/client-plugin-runtime.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/client-plugin-slots.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/components.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | IconButton, List, ListItem | raw `<textarea` (API Use-the-System) | polish |
+| `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | IconButton, List, ListItem | aligned — uses Astryx (IconButton, List, ListItem) | aligned |
 | `packages/ui/src/composer-model-label.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/composer.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, HoverCard, IconButton, Lightbox, Popover, Token, Tooltip | aligned — uses Astryx (Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem) | aligned |
 | `packages/ui/src/daily-review-panel.tsx` | module-hub | Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem, SegmentedControl, SegmentedControlItem, Skeleton, StackItem, Text, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem) | aligned |
diff --git a/docs/desktop-message-queue.md b/docs/desktop-message-queue.md
index db40a2396cf..58210dd3261 100644
--- a/docs/desktop-message-queue.md
+++ b/docs/desktop-message-queue.md
@@ -35,13 +35,13 @@ Runtime Host already owns the durable message semantics:
 - While a turn is active, a composer submit queues a follow-up. There is no mode switch: Send is always Send.
 - `Cmd+Enter` on macOS (`Ctrl+Enter` on Windows/Linux) steers the draft into the active turn once; while idle it sends normally.
 - `Shift+Enter` and `Alt+Enter` always insert a line break, including during an active turn.
-- Queued follow-ups render in a pending plate above the composer card, in send order (first at the top). Queued steering renders as transcript bubbles instead, where its Edit and Delete actions retract the entry. Per plate entry:
+- Queued follow-ups render in a pending plate above the composer card, in send order (first at the top). Queued steering renders as transcript bubbles instead. Per plate entry:
   - drag the hover grip to reorder the follow-up queue,
   - promote (直接发送 / Send now) to steer the entry into the active turn,
-  - edit to update the entry's text in place (Host CAS on the queue revision),
+  - edit, which works the same as on a transcript bubble,
   - delete to retract the entry.
-- A transcript bubble's Edit retracts the steering entry and restores its full content (text, attachments, directory references, quotes) into the originating Session's composer draft; Delete only retracts.
-- Queue contents and mutations are Runtime Host operations (`turn.message.submit`, `queue.entry.promote`, `queue.entry.retract`, `queue.entry.update`, `queue.entries.reorder`); the renderer mirrors the authoritative projection.
+- Edit, on a plate entry or a transcript bubble, retracts the entry and restores its full content (text, attachments, directory references, quotes) into the originating Session's composer draft, so a half-edited message can never run; resending queues it at the tail. Delete only retracts.
+- Queue contents and mutations are Runtime Host operations (`turn.message.submit`, `queue.entry.promote`, `queue.entry.retract`, `queue.entries.reorder`); the renderer mirrors the authoritative projection.
 - Identical active toasts reuse one toast instead of stacking duplicates.
 
 ## Race Fix
diff --git a/packages/ui/src/__tests__/composer-message-queue.test.tsx b/packages/ui/src/__tests__/composer-message-queue.test.tsx
index 2195c5480a1..c09679306a1 100644
--- a/packages/ui/src/__tests__/composer-message-queue.test.tsx
+++ b/packages/ui/src/__tests__/composer-message-queue.test.tsx
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-/**
- * The pending plate's own contract. The E2E side-chat failure this replaces
- * hid a queued row behind its own still-open edit box after the Host rejected
- * a stale-revision update, so the row list silently read as reordered.
- */
+/** The pending plate's own contract. */
 
 import assert from 'node:assert/strict';
 import test from 'node:test';
@@ -44,8 +40,7 @@ function queued(entryId: string, text: string): MessageQueueEntryProjection {
 
 async function mountQueue(props: {
   queuedMessages: readonly MessageQueueEntryProjection[];
-  queueRevision?: number;
-  onUpdateEntry?(entryId: string, expectedQueueRevision: number, text: string): void | Promise<void>;
+  onEditEntry?(entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>): void | Promise<void>;
   onDeleteEntry?(entryId: string): void | Promise<void>;
   onPromoteEntry?(entryId: string): void | Promise<void>;
   onReorderEntries?(entryIds: readonly string[]): void | Promise<void>;
@@ -89,108 +84,26 @@ async function click(button: HTMLButtonElement): Promise<void> {
   });
 }
 
-test('editing a queued entry CAS-checks the latest known queue revision and closes on success', async () => {
-  const updates: Array<{ entryId: string; revision: number; text: string }> = [];
+test('edit hands the whole entry to its owner and leaves the row to the Host projection', async () => {
+  const entry = { ...queued('entry-1', 'first follow-up'), content: { text: 'model text', displayText: 'first follow-up' } };
+  const edited: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>[] = [];
   const view = await mountQueue({
-    queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
-    queueRevision: 7,
-    onUpdateEntry: (entryId, expectedQueueRevision, text) => {
-      updates.push({ entryId, revision: expectedQueueRevision, text });
+    queuedMessages: [entry, queued('entry-2', 'second follow-up')],
+    onEditEntry: (target) => {
+      edited.push(target);
+      return Promise.reject(new Error('retract failed'));
     },
   });
   try {
     await click(actionButton(view.document, copy.editQueuedEntry, 0));
-    const editor = view.document.querySelector<HTMLTextAreaElement>('textarea.maka-composer-queue-edit');
-    assert.ok(editor, 'beginEdit swaps the row into its textarea');
-    assert.equal(editor.value, 'first follow-up');
-    await view.rerender({
-      queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
-      queueRevision: 8,
-      onUpdateEntry: (entryId, expectedQueueRevision, text) => {
-        updates.push({ entryId, revision: expectedQueueRevision, text });
-      },
-    });
-    await act(async () => {
-      editor.value = 'edited first follow-up';
-      editor.dispatchEvent(new window.Event('input', { bubbles: true }));
-    });
-    await click(actionButton(view.document, copy.saveQueuedEntry));
-    assert.deepEqual(updates, [{ entryId: 'entry-1', revision: 8, text: 'edited first follow-up' }]);
-    assert.equal(view.document.querySelector('textarea.maka-composer-queue-edit'), null);
+    assert.deepEqual(edited, [entry]);
+    assert.equal(view.document.querySelector('textarea'), null, 'there is no in-place editor');
     assert.deepEqual(queueTexts(view.document), ['first follow-up', 'second follow-up']);
   } finally {
     await view.close();
   }
 });
 
-test('a rejected queue edit keeps the row in edit mode instead of reading as reordered', async () => {
-  const view = await mountQueue({
-    queuedMessages: [
-      queued('entry-1', 'first follow-up'),
-      queued('entry-2', 'second follow-up'),
-      queued('entry-3', 'retract this follow-up'),
-    ],
-    queueRevision: 3,
-    onUpdateEntry: () => Promise.reject(new Error('operation_conflict')),
-  });
-  try {
-    await click(actionButton(view.document, copy.editQueuedEntry, 0));
-    const editor = view.document.querySelector<HTMLTextAreaElement>('textarea.maka-composer-queue-edit')!;
-    await act(async () => {
-      editor.value = 'edited first follow-up';
-      editor.dispatchEvent(new window.Event('input', { bubbles: true }));
-    });
-    await click(actionButton(view.document, copy.saveQueuedEntry));
-    assert.deepEqual(
-      queueTexts(view.document),
-      ['second follow-up', 'retract this follow-up'],
-      'the conflicted row is hidden behind its open editor, not dropped or moved',
-    );
-    assert.equal(
-      view.document.querySelector<HTMLTextAreaElement>('textarea.maka-composer-queue-edit')?.value,
-      'edited first follow-up',
-    );
-  } finally {
-    await view.close();
-  }
-});
-
-test('a rejected queue edit retries against the refreshed revision instead of dead-locking', async () => {
-  const updates: Array<{ entryId: string; revision: number; text: string }> = [];
-  let conflicts = 1;
-  const onUpdateEntry = (entryId: string, expectedQueueRevision: number, text: string) => {
-    updates.push({ entryId, revision: expectedQueueRevision, text });
-    return conflicts-- > 0 ? Promise.reject(new Error('operation_conflict')) : Promise.resolve();
-  };
-  const view = await mountQueue({
-    queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
-    queueRevision: 3,
-    onUpdateEntry,
-  });
-  try {
-    await click(actionButton(view.document, copy.editQueuedEntry, 0));
-    const editor = view.document.querySelector<HTMLTextAreaElement>('textarea.maka-composer-queue-edit')!;
-    await act(async () => {
-      editor.value = 'edited first follow-up';
-      editor.dispatchEvent(new window.Event('input', { bubbles: true }));
-    });
-    await click(actionButton(view.document, copy.saveQueuedEntry));
-    assert.equal(updates.length, 1);
-    assert.ok(view.document.querySelector('textarea.maka-composer-queue-edit'), 'the edit stays open after the conflict');
-    await view.rerender({
-      queuedMessages: [queued('entry-1', 'first follow-up'), queued('entry-2', 'second follow-up')],
-      queueRevision: 4,
-      onUpdateEntry,
-    });
-    await click(actionButton(view.document, copy.saveQueuedEntry));
-    assert.deepEqual(updates.at(-1), { entryId: 'entry-1', revision: 4, text: 'edited first follow-up' },
-      'the retry carries the revision the conflicting mutation landed on, not the stale capture');
-    assert.equal(view.document.querySelector('textarea.maka-composer-queue-edit'), null);
-  } finally {
-    await view.close();
-  }
-});
-
 test('the plate lists only follow-ups — steering entries belong to the transcript', async () => {
   const dom = installDom();
   try {
@@ -216,8 +129,7 @@ test('queue actions stay disabled until the entry is Host-admitted', async () =>
   ];
   const view = await mountQueue({
     queuedMessages: pending,
-    queueRevision: undefined,
-    onUpdateEntry: () => {},
+    onEditEntry: () => {},
     onDeleteEntry: () => {},
   });
   try {
@@ -229,7 +141,7 @@ test('queue actions stay disabled until the entry is Host-admitted', async () =>
     // attribute so the tooltip stays reachable — accept either form.
     const isDisabled = (button: HTMLButtonElement) =>
       button.disabled || button.getAttribute('aria-disabled') === 'true';
-    assert.ok(edits.every(isDisabled), 'no row is editable without a queue revision');
+    assert.deepEqual(edits.map(isDisabled), [true, false], 'only the Host-admitted row is editable');
   } finally {
     await view.close();
   }
@@ -243,7 +155,6 @@ test('dragging reorders the Host-owned id list', async () => {
       queued('entry-2', 'second follow-up'),
       queued('entry-3', 'retract this follow-up'),
     ],
-    queueRevision: 1,
     onReorderEntries: (ids) => { reordered.push([...ids]); },
   });
   try {
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 177196912b0..09693e2434a 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -250,11 +250,7 @@ test('keeps Host order visible until the reordered projection arrives', async ()
   assert.ok(container);
   const root = createRoot(container);
   let requestedOrder: readonly string[] | undefined;
-  const updatedEntries: Array<{
-    entryId: string;
-    expectedQueueRevision: number;
-    text: string;
-  }> = [];
+  const editedEntryIds: string[] = [];
   const deletedEntryIds: string[] = [];
 
   try {
@@ -278,10 +274,9 @@ test('keeps Host order visible until the reordered projection arrives', async ()
               state: 'queued' as const,
             })),
           ]}
-          queuedMessageRevision={7}
           onPromoteQueuedEntry={() => undefined}
-          onUpdateQueuedEntry={(entryId, expectedQueueRevision, text) => {
-            updatedEntries.push({ entryId, expectedQueueRevision, text });
+          onEditQueuedEntry={(entry) => {
+            editedEntryIds.push(entry.entryId);
           }}
           onDeleteQueuedEntry={(entryId) => {
             deletedEntryIds.push(entryId);
@@ -314,31 +309,13 @@ test('keeps Host order visible until the reordered projection arrives', async ()
       editButtons[0]?.dispatchEvent(new window.Event('click', { bubbles: true }));
       await Promise.resolve();
     });
-    const editInput = container.querySelector<HTMLTextAreaElement>(
-      'textarea[aria-label="Edit"]',
-    );
-    assert.ok(editInput);
-    await act(() => {
-      editInput.value = 'updated first\nsecond line';
-      editInput.dispatchEvent(new window.Event('input', { bubbles: true }));
-    });
-    await act(async () => {
-      container
-        .querySelector<HTMLButtonElement>('[aria-label="Save"]')
-        ?.dispatchEvent(new window.Event('click', { bubbles: true }));
-      await Promise.resolve();
-    });
     await act(async () => {
       container
         .querySelector<HTMLButtonElement>('[aria-label="Delete"]')
         ?.dispatchEvent(new window.Event('click', { bubbles: true }));
       await Promise.resolve();
     });
-    assert.deepEqual(updatedEntries, [{
-      entryId: 'first',
-      expectedQueueRevision: 7,
-      text: 'updated first\nsecond line',
-    }]);
+    assert.deepEqual(editedEntryIds, ['first']);
     assert.deepEqual(deletedEntryIds, ['first']);
     const grips = [...container.querySelectorAll<HTMLElement>('.maka-composer-queue-grip')];
     assert.equal(grips.length, 2);
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index dc61323de78..574191c06c2 100644
--- a/packages/ui/src/composer-message-queue.tsx
+++ b/packages/ui/src/composer-message-queue.tsx
@@ -23,7 +23,7 @@ import type { MessageQueueEntryProjection } from '@maka/core/events';
 import { IconButton } from '@astryxdesign/core';
 import { List, ListItem } from '@astryxdesign/core/List';
 import type { ConversationCopy } from './conversation-copy.js';
-import { Check, CornerDownLeft, GripVertical, ICON_SIZE, Pencil, Trash2, X } from './icons.js';
+import { CornerDownLeft, GripVertical, ICON_SIZE, Pencil, Trash2 } from './icons.js';
 import { useMountedRef } from './use-mounted-ref.js';
 
 type ComposerQueueEntry = Omit<MessageQueueEntryProjection, 'state'> & {
@@ -34,16 +34,16 @@ type ComposerQueueEntry = Omit<MessageQueueEntryProjection, 'state'> & {
 /**
  * The queued follow-up section of the composer staging drawer. It lists
  * follow-up entries — Host-queued and still in flight — so a queued message
- * stays editable, reorderable and deletable until a Turn consumes it.
+ * stays promotable, reorderable and deletable until a Turn consumes it; edit
+ * hands it back to the composer.
  * Steering targets the active Turn and lives in the transcript instead, where
  * its delivery state is message metadata rather than a queue row.
  */
 export interface ComposerMessageQueueProps {
   queuedMessages: readonly ComposerQueueEntry[];
-  queueRevision?: number;
   copy: ConversationCopy['composer'];
   onPromoteEntry?(entryId: string): void | Promise<void>;
-  onUpdateEntry?(entryId: string, expectedQueueRevision: number, text: string): void | Promise<void>;
+  onEditEntry?(entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>): void | Promise<void>;
   onDeleteEntry?(entryId: string): void | Promise<void>;
   onReorderEntries?(entryIds: readonly string[]): void | Promise<void>;
 }
@@ -69,8 +69,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
   props: ComposerMessageQueueProps,
 ) {
   const [pendingEntryId, setPendingEntryId] = useState<string | null>(null);
-  const [editingEntryId, setEditingEntryId] = useState<string | null>(null);
-  const [editingText, setEditingText] = useState('');
   const dragEntryId = useRef<string | null>(null);
   const mountedRef = useMountedRef();
   const copy = props.copy;
@@ -80,17 +78,15 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
   async function runEntryAction(
     entryId: string,
     action: (() => void | Promise<void>) | undefined,
-  ): Promise<boolean> {
-    if (!action || pendingEntryId) return false;
+  ): Promise<void> {
+    if (!action || pendingEntryId) return;
     setPendingEntryId(entryId);
     try {
       // The caller (app shell) surfaces failures itself; the projection is
       // unchanged on failure, so there is nothing to settle here.
       await action();
-      return true;
     } catch {
       // surfaced by the caller
-      return false;
     } finally {
       if (mountedRef.current) setPendingEntryId(null);
     }
@@ -112,33 +108,6 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
     void runEntryAction(fromId, () => props.onReorderEntries?.(ids));
   }
 
-  function beginEdit(entry: ComposerQueueEntry) {
-    if (pendingEntryId || !props.onUpdateEntry || props.queueRevision === undefined) return;
-    setEditingEntryId(entry.entryId);
-    const text = entry.content.displayText ?? entry.content.text;
-    setEditingText(text);
-  }
-
-  async function commitEdit(entryId: string) {
-    const text = editingText.trim();
-    if (!text || props.queueRevision === undefined) return;
-    // CAS against the latest known revision: a conflict surfaces once via the
-    // caller's toast, and an explicit re-save retries against fresh state
-    // instead of dead-locking on the revision captured when editing began.
-    const updated = await runEntryAction(entryId, () =>
-      props.onUpdateEntry?.(entryId, props.queueRevision ?? 0, text)
-    );
-    if (updated && mountedRef.current) {
-      setEditingEntryId(null);
-      setEditingText('');
-    }
-  }
-
-  function cancelEdit() {
-    setEditingEntryId(null);
-    setEditingText('');
-  }
-
   return (
     <div
       className="maka-composer-queue"
@@ -147,12 +116,10 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
     >
       <List className="maka-composer-queue-list" density="compact">
         {entries.map((entry) => {
-          const editing = editingEntryId === entry.entryId;
           const local = entry.localMessage;
           const reorderable =
             entry.state === 'queued'
             && !local
-            && !editing
             && Boolean(props.onReorderEntries)
             && pendingEntryId === null;
           return (
@@ -165,29 +132,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
               onDrop={reorderable ? () => dropOn(entry.entryId) : undefined}
             >
               <ListItem
-              label={editing ? (
-                <textarea
-                  autoFocus
-                  className="maka-composer-queue-edit"
-                  aria-label={copy.editQueuedEntry}
-                  rows={1}
-                  value={editingText}
-                  onInput={(event) => setEditingText(event.currentTarget.value)}
-                  onKeyDown={(event) => {
-                    if (
-                      event.key === 'Enter'
-                      && !event.shiftKey
-                      && !event.nativeEvent.isComposing
-                    ) {
-                      event.preventDefault();
-                      void commitEdit(entry.entryId);
-                    } else if (event.key === 'Escape') {
-                      event.preventDefault();
-                      cancelEdit();
-                    }
-                  }}
-                />
-              ) : (
+              label={(
                 <span className="maka-composer-queue-text" title={entry.content.displayText ?? entry.content.text}>
                   {entry.content.displayText ?? entry.content.text}
                 </span>
@@ -218,30 +163,7 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                       label={action.label}
                       tooltip={local.deliveryStatus ? `${local.deliveryStatus} · ${action.label}` : action.label}
                       icon={action.icon} clickAction={action.onClick} />
-                  )) : editing ? (
-                    <>
-                      <IconButton
-                        variant="ghost"
-                        size="sm"
-                        type="button"
-                        isDisabled={pendingEntryId !== null || editingText.trim().length === 0}
-                        label={copy.saveQueuedEntry}
-                        tooltip={copy.saveQueuedEntry}
-                        onClick={() => void commitEdit(entry.entryId)}
-                        icon={<Check size={ICON_SIZE.control} aria-hidden="true" />}
-                      />
-                      <IconButton
-                        variant="ghost"
-                        size="sm"
-                        type="button"
-                        isDisabled={pendingEntryId !== null}
-                        label={copy.cancelQueuedEntryEdit}
-                        tooltip={copy.cancelQueuedEntryEdit}
-                        onClick={cancelEdit}
-                        icon={<X size={ICON_SIZE.control} aria-hidden="true" />}
-                      />
-                    </>
-                  ) : (
+                  )) : (
                     <>
                       <IconButton
                         variant="ghost"
@@ -262,15 +184,13 @@ export const ComposerMessageQueue = memo(function ComposerMessageQueue(
                         variant="ghost"
                         size="sm"
                         type="button"
-                        isDisabled={
-                          pendingEntryId !== null
-                          || entry.state !== 'queued'
-                          || props.queueRevision === undefined
-                          || !props.onUpdateEntry
-                        }
+                        isDisabled={pendingEntryId !== null || entry.state !== 'queued' || !props.onEditEntry}
                         label={copy.editQueuedEntry}
                         tooltip={copy.editQueuedEntry}
-                        onClick={() => beginEdit(entry)}
+                        onClick={() => void runEntryAction(
+                          entry.entryId,
+                          props.onEditEntry ? () => props.onEditEntry?.(entry) : undefined,
+                        )}
                         icon={<Pencil size={ICON_SIZE.control} aria-hidden="true" />}
                       />
                       <IconButton
diff --git a/packages/ui/src/composer.tsx b/packages/ui/src/composer.tsx
index 7d06ece013b..8967dbf695c 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -333,15 +333,10 @@ export const Composer = forwardRef<
     stopPending?: boolean;
     pendingMessages?: readonly import('./chat-view.js').TransientUserMessageProjection[];
     queuedMessages?: readonly MessageQueueEntryProjection[];
-    queuedMessageRevision?: number;
     /** Promote a queued follow-up into the active Turn (调整方向). */
     onPromoteQueuedEntry?(entryId: string): void | Promise<void>;
-    /** Update one queued entry in place without changing its order or placement. */
-    onUpdateQueuedEntry?(
-      entryId: string,
-      expectedQueueRevision: number,
-      text: string,
-    ): void | Promise<void>;
+    /** Take a queued entry out of the queue and hand its content back to the draft. */
+    onEditQueuedEntry?(entry: Pick<MessageQueueEntryProjection, 'entryId' | 'content'>): void | Promise<void>;
     /** Remove one queued entry without restoring it. */
     onDeleteQueuedEntry?(entryId: string): void | Promise<void>;
     /** Reorder the follow-up queue; entryIds is the full intended order. */
@@ -1968,10 +1963,9 @@ export const Composer = forwardRef<
               {!props.hidden && queueCount > 0 ? (
                 <ComposerMessageQueue
                   queuedMessages={queuedMessages}
-                  queueRevision={props.queuedMessageRevision}
                   copy={copy}
                   onPromoteEntry={props.onPromoteQueuedEntry}
-                  onUpdateEntry={props.onUpdateQueuedEntry}
+                  onEditEntry={props.onEditQueuedEntry}
                   onDeleteEntry={props.onDeleteQueuedEntry}
                   onReorderEntries={props.onReorderQueuedEntries}
                 />
diff --git a/packages/ui/src/conversation-copy.ts b/packages/ui/src/conversation-copy.ts
index e292972afcb..5a0ed907a41 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -96,8 +96,6 @@ export interface ConversationCopy {
     queuedMessages: string;
     promoteQueuedEntry: string;
     editQueuedEntry: string;
-    saveQueuedEntry: string;
-    cancelQueuedEntryEdit: string;
     deleteQueuedEntry: string;
     reorderQueuedEntry: string;
     stopLabel: string;
@@ -449,7 +447,7 @@ const CONVERSATION_COPY = {
       sending: '正在发送…', importing: '正在导入…', sendLabel: '发送',
       queuedMessagesAriaLabel: (count) => `${count} 条待发送消息`,
       queuedMessages: '待发送',
-      promoteQueuedEntry: '直接发送', editQueuedEntry: '编辑', saveQueuedEntry: '保存', cancelQueuedEntryEdit: '取消编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
+      promoteQueuedEntry: '直接发送', editQueuedEntry: '编辑', deleteQueuedEntry: '删除', reorderQueuedEntry: '拖动排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '添加上下文', stagedContext: '附加内容',
       selectModel: '选择模型', dropToImport: '松开以导入文件内容', addingAttachment: '正在添加附件', addFileOrDirectory: '添加文件', referenceFolder: '引用文件夹',
@@ -573,7 +571,7 @@ const CONVERSATION_COPY = {
       sending: '正在傳送…', importing: '正在匯入…', sendLabel: '傳送',
       queuedMessagesAriaLabel: (count) => `${count} 條待發送訊息`,
       queuedMessages: '待發送',
-      promoteQueuedEntry: '直接傳送', editQueuedEntry: '編輯', saveQueuedEntry: '儲存', cancelQueuedEntryEdit: '取消編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
+      promoteQueuedEntry: '直接傳送', editQueuedEntry: '編輯', deleteQueuedEntry: '刪除', reorderQueuedEntry: '拖動排序',
       stopLabel: '停止', stopping: '停止中…',
       addContext: '新增上下文', stagedContext: '附加內容',
       selectModel: '選擇模型', dropToImport: '鬆開以匯入檔案內容', addingAttachment: '正在新增附件', addFileOrDirectory: '新增檔案或目錄', referenceFolder: '引用資料夾',
@@ -697,7 +695,7 @@ const CONVERSATION_COPY = {
       sending: 'Sending…', importing: 'Importing…', sendLabel: 'Send',
       queuedMessagesAriaLabel: (count) => `${count} queued message${count === 1 ? '' : 's'}`,
       queuedMessages: 'queued',
-      promoteQueuedEntry: 'Send now', editQueuedEntry: 'Edit', saveQueuedEntry: 'Save', cancelQueuedEntryEdit: 'Cancel editing', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',
+      promoteQueuedEntry: 'Send now', editQueuedEntry: 'Edit', deleteQueuedEntry: 'Delete', reorderQueuedEntry: 'Drag to reorder',
       stopLabel: 'Stop', stopping: 'Stopping…',
       addContext: 'Add context', stagedContext: 'staged items',
       selectModel: 'Choose model', dropToImport: 'Drop to import file contents', addingAttachment: 'Adding attachment', addFileOrDirectory: 'Add files', referenceFolder: 'Reference folder',

From c84abaa37173646e233e8ff3ad33db77fb2c3f34 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 21:45:33 +0800
Subject: [PATCH 32/33] fix(ui): clear a completed send's draft only while it
 still reads as that send
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A send that completed after the user moved to another Session cleared that
Session's stored draft unconditionally, so text typed after the send was
lost; the still-active branch compared first. The Composer's draft is two
representations — the live input for the active key, the store for the
rest — and getDraft read through both while writes did not, so every
caller branched on "is this key active" and re-derived the clear rule, and
one branch missed it. Routing Guest Turn requests through the shared
Composer made the gap easy to hit, because the old Guest composer locked
its input while a request was pending.

The draft hook's writes now cover the live input like its read does, and
the Composer keeps one rule for every completion: clear a draft only while
it still reads as the submitted message. sendCurrent, the handle's
clearDraft(key, submitted) and the Guest controller's lost-response path
share it; the per-caller active-key branches go away.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 .../controller/use-guest-turn-requests.ts     |  3 +-
 .../__tests__/composer-send-toggle.test.tsx   | 39 ++++++++++++-
 packages/ui/src/composer.tsx                  | 58 +++++++++----------
 packages/ui/src/use-composer-draft.ts         | 18 ++----
 4 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts b/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts
index 7d8cee6ee48..9b40302e37e 100644
--- a/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts
+++ b/apps/desktop/src/renderer/features/session-collaboration/controller/use-guest-turn-requests.ts
@@ -96,8 +96,7 @@ export function useGuestTurnRequests(
         // A request whose response was lost can surface here later; its text
         // leaves the draft only if the user has not changed it since.
         const settled = apply(sessionId, result);
-        const composer = composerRef.current;
-        if (settled && composer?.getDraft(sessionId).trim() === settled.text) composer.clearDraft(sessionId);
+        if (settled) composerRef.current?.clearDraft(sessionId, settled.text);
       } catch {
         if (!disposed) markUnavailable(sessionId);
       } finally {
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 09693e2434a..0e3047a4145 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -28,11 +28,11 @@
 
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { act } from 'react';
+import { act, createRef } from 'react';
 import { createRoot } from 'react-dom/client';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { parseHTML } from 'linkedom';
-import { Composer } from '../composer.js';
+import { Composer, type ComposerHandle } from '../composer.js';
 import { LocaleProvider } from '../locale-context.js';
 import { ICON_SIZE, Search } from '../icons.js';
 
@@ -231,6 +231,41 @@ test('the actual submit waits for Session references and keeps the draft on refu
   }
 });
 
+test('a send completing after navigation keeps the newer draft it left behind', async () => {
+  const original = { document: globalThis.document, window: globalThis.window, Node: globalThis.Node, HTMLElement: globalThis.HTMLElement,
+    IS_REACT_ACT_ENVIRONMENT: (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT };
+  const { document, window } = parseHTML('<div id="root"></div>');
+  window.getComputedStyle = () => ({ direction: 'ltr', writingMode: 'horizontal-tb', getPropertyValue: () => '' }) as unknown as CSSStyleDeclaration;
+  Object.assign(window, { getSelection: () => null });
+  Object.assign(document, { getSelection: () => null });
+  Object.assign(globalThis, { document, window, Node: window.Node, HTMLElement: window.HTMLElement, IS_REACT_ACT_ENVIRONMENT: true });
+  const root = createRoot(document.querySelector('#root')!);
+  const handle = createRef<ComposerHandle>();
+  let finish!: (sent: boolean) => void;
+  const render = (draftKey: string) => root.render(
+    <LocaleProvider locale="en">
+      <Composer ref={handle} draftKey={draftKey}
+        onSend={() => new Promise<boolean>((resolve) => { finish = resolve; })}
+        onStop={() => undefined} />
+    </LocaleProvider>,
+  );
+  try {
+    await act(() => render('a'));
+    await act(() => handle.current!.setText('first request'));
+    await act(async () => {
+      document.querySelector('form')!.dispatchEvent(new window.Event('submit', { bubbles: true, cancelable: true }));
+      await Promise.resolve();
+    });
+    await act(() => handle.current!.setText('second unsent draft'));
+    await act(() => render('b'));
+    await act(async () => { finish(true); await Promise.resolve(); });
+    assert.equal(handle.current!.getDraft('a'), 'second unsent draft');
+  } finally {
+    await act(() => root.unmount());
+    Object.assign(globalThis, original);
+  }
+});
+
 test('keeps Host order visible until the reordered projection arrives', async () => {
   const original = {
     document: globalThis.document,
diff --git a/packages/ui/src/composer.tsx b/packages/ui/src/composer.tsx
index 8967dbf695c..f361a5c2eac 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -254,8 +254,11 @@ export interface ComposerHandle {
   appendText(text: string): void;
   /** Read the current input text (inline tokens serialized to their values). */
   getText(): string;
-  /** Clear one persisted draft without affecting another session's. */
-  clearDraft(draftKey: string): void;
+  /**
+   * Clear one session's draft. With `submitted`, clear it only while it still
+   * reads as that sent message, so text typed after the send survives.
+   */
+  clearDraft(draftKey: string, submitted?: string): void;
   /** Write a specific session draft before navigation changes the active key. */
   setDraft(draftKey: string, text: string): void;
   /** Read a specific draft without changing the active input. */
@@ -1364,28 +1367,20 @@ export const Composer = forwardRef<
       getText() {
         return textPort.getValue();
       },
-      clearDraft(draftKey: string) {
-        clearDraft(draftKey);
-        if (activeDraftKey() !== draftKey) return;
-        textPort.setValue('');
-        saveCurrentDraft('');
+      clearDraft(draftKey: string, submitted?: string) {
+        if (submitted === undefined) clearDraft(draftKey);
+        else clearSubmittedDraft(draftKey, submitted);
       },
       setDraft(draftKey: string, nextText: string) {
+        focusIfActive(draftKey);
         setDraft(draftKey, nextText);
-        if (activeDraftKey() !== draftKey) return;
-        resetPromptHistoryNavigation();
-        focusInput();
-        textPort.setValue(nextText);
       },
       getDraft(draftKey: string) {
         return getDraft(draftKey);
       },
       appendDraft(draftKey: string, nextText: string) {
-        const next = appendDraft(draftKey, nextText);
-        if (activeDraftKey() !== draftKey) return;
-        resetPromptHistoryNavigation();
-        focusInput();
-        textPort.setValue(next);
+        focusIfActive(draftKey);
+        appendDraft(draftKey, nextText);
       },
       focus() {
         focusInput();
@@ -1447,22 +1442,21 @@ export const Composer = forwardRef<
     // Save to both local ref and global persistence so the history
     // survives page reloads and is shared across all input surfaces.
     rememberSentEntry(text);
-    // The owner may have changed while onSend awaited (new-session creation,
-    // revision branch, or user navigation). Never erase a foreign draft.
-    if (activeDraftKey() !== submittedDraftKey) {
-      clearDraft(submittedDraftKey);
-      return;
-    }
-    // The user can begin the next message while the send IPC is still
-    // resolving. Clear only the exact draft that was submitted; a newer value
-    // belongs to the next send and must survive this older completion.
-    if (composerWireText(textPort.getValue()) !== text) {
-      saveCurrentDraft(textPort.getValue());
-      return;
-    }
-    clearDraft(submittedDraftKey);
-    textPort.setValue('');
-    saveCurrentDraft('');
+    clearSubmittedDraft(submittedDraftKey, text);
+  }
+
+  // A send completes after its own await: the user may have kept typing or
+  // moved to another Session meanwhile, so only the draft that still reads as
+  // the sent message is cleared, whether or not its Session is on screen.
+  function clearSubmittedDraft(draftKey: string | undefined, submitted: string) {
+    if (composerWireText(getDraft(draftKey)).trim() === submitted.trim()) clearDraft(draftKey);
+  }
+
+  // Focus before the controlled update so the caret lands at the new end.
+  function focusIfActive(draftKey: string) {
+    if (activeDraftKey() !== draftKey) return;
+    resetPromptHistoryNavigation();
+    focusInput();
   }
 
   function submit(event: FormEvent<HTMLFormElement>) {
diff --git a/packages/ui/src/use-composer-draft.ts b/packages/ui/src/use-composer-draft.ts
index c440cca2966..6c34223af59 100644
--- a/packages/ui/src/use-composer-draft.ts
+++ b/packages/ui/src/use-composer-draft.ts
@@ -46,13 +46,9 @@ import {
 export interface ComposerDraftApi {
   /** Persist the current (or given) input value under the active draft key. */
   saveCurrentDraft(value?: string): void;
-  /**
-   * Clear the draft stored under an explicit key. A successful send clears
-   * the key it was submitted from (which may no longer be the active key
-   * after a new-session swap) in addition to the active draft.
-   */
+  /** Clear one session's draft; the active key's draft is the input itself. */
   clearDraft(key: string | undefined): void;
-  /** Persist text under an explicit session key before the host switches it. */
+  /** Replace one session's draft; the active key's draft is the input itself. */
   setDraft(key: string | undefined, value: string): void;
   /** Read one draft without changing which draft is active. */
   getDraft(key: string | undefined): string;
@@ -86,11 +82,11 @@ export function useComposerDraft(input: {
   }
 
   function clearDraft(key: string | undefined) {
-    rememberComposerDraft(draftStoreRef.current, key, '');
-    input.persistence?.write(key, '');
+    setDraft(key, '');
   }
 
   function setDraft(key: string | undefined, value: string) {
+    if (activeDraftKeyRef.current === key) input.text.setValue(value);
     rememberComposerDraft(draftStoreRef.current, key, value);
     input.persistence?.write(key, value);
   }
@@ -105,11 +101,7 @@ export function useComposerDraft(input: {
   }
 
   function appendDraft(key: string | undefined, value: string) {
-    const current =
-      activeDraftKeyRef.current === key
-        ? input.text.getValue()
-        : readComposerDraft(draftStoreRef.current, key);
-    const next = appendPromptContextDraft(current, value);
+    const next = appendPromptContextDraft(getDraft(key), value);
     setDraft(key, next);
     return next;
   }

From b8d638ee4514bbace869dc4619d923fe8038053e Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Sun, 27 Sep 2026 21:45:34 +0800
Subject: [PATCH 33/33] test(desktop): pin AppShell to the one Composer inside
 GuestTurnRequests

app-shell.tsx is outside the node test build, so the Guest tests mirror
its wiring. A source assertion now keeps AppShell to one ChatComposerRegion
inside GuestTurnRequests, with no key and no shared-Session branch beyond
the projection's sessionId; adding a remounting key fails it.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Generated-by: Devin
---
 .../main/__tests__/guest-turn-requests.test.ts   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts b/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts
index 9fb2029d29c..eb3b60805b9 100644
--- a/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts
+++ b/apps/desktop/src/main/__tests__/guest-turn-requests.test.ts
@@ -18,6 +18,7 @@
  */
 
 import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
 import { afterEach, test } from 'node:test';
 import { act, createElement, createRef } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
@@ -218,6 +219,21 @@ async function mountShell(services: SessionCollaborationServices) {
   };
 }
 
+// The harness below mirrors AppShell's wiring; this pins AppShell to it, since
+// app-shell.tsx is not in the node test build.
+test('AppShell mounts the one ChatComposerRegion inside GuestTurnRequests with no owner/Guest remount', () => {
+  const source = readFileSync(new URL('../../../src/renderer/app-shell.tsx', import.meta.url), 'utf8');
+  const regions = [...source.matchAll(/<ChatComposerRegion\b/g)];
+  assert.equal(regions.length, 1);
+  const open = source.indexOf('<SessionCollaboration.GuestTurnRequests');
+  const close = source.indexOf('</SessionCollaboration.GuestTurnRequests>');
+  assert.ok(open !== -1 && open < regions[0]!.index && regions[0]!.index < close);
+  const slot = source.slice(open, close);
+  assert.doesNotMatch(slot, /\bkey=/);
+  assert.deepEqual(slot.match(/sharedSessionActive[^}]*/g), ['sharedSessionActive ? activeId : undefined'],
+    'only the Guest projection\'s sessionId distinguishes a shared Session');
+});
+
 test('switching to a shared Session and back keeps the one Composer and its owned draft', async () => {
   const shell = await mountShell(guestServices({}));
   await shell.open(OWNED, false);