From c52b8361a3aa693047729d3c625c701aba249d5f 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/12] 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
---
 .../e2e/session-local-recovery.spec.ts        |   8 +-
 .../__tests__/message-queue-ui-state.test.ts  |  54 ++++--
 .../controller/session-local-messages.tsx     |  19 +-
 .../renderer/locales/session-local-copy.ts    |  50 ++---
 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 +-
 12 files changed, 282 insertions(+), 101 deletions(-)

diff --git a/apps/desktop/e2e/session-local-recovery.spec.ts b/apps/desktop/e2e/session-local-recovery.spec.ts
index 75b6cdf8e7..fa3787e74a 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.getByText('已本地保存 · 等待发送')).toBeVisible();
+  await expect(page.getByText('等待发送')).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.getByText('已本地保存 · 等待发送')).toBeVisible();
+  await expect(page.getByText('等待发送')).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.getByText('已本地保存 · 等待发送')).toBeVisible();
+  await expect(page.getByText('等待发送')).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.getByText('已本地保存 · 等待发送')).toBeVisible();
+  await expect(page.getByText('等待发送')).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 81bf402eec..72792cccf6 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
@@ -33,17 +33,23 @@ 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;
-  let messages: DesktopLocalMessage[] = ['steering', 'followup', 'root'].map((messageId) => ({
-    sessionId: 'session-1', messageId, createdAt: 1, state: 'unknown', canCancel: false,
-    text: messageId, attachments: [], inlineReferences: [],
-    placement: messageId === 'steering' ? 'current_turn' : 'next_turn',
-  }));
+  const cancelled: string[][] = [];
+  const reconciled: string[][] = [];
+  let messages: DesktopLocalMessage[] = [
+    { sessionId: 'session-1', messageId: 'steering', createdAt: 1, state: 'unknown', canCancel: false,
+      text: 'steering', attachments: [], inlineReferences: [], placement: 'current_turn' },
+    { sessionId: 'session-1', messageId: 'followup', createdAt: 2, state: 'saved', canCancel: true,
+      text: 'followup', attachments: [], inlineReferences: [], placement: 'next_turn' },
+    { sessionId: 'session-1', messageId: 'root', createdAt: 3, state: 'unknown', canCancel: false,
+      text: 'root', attachments: [], inlineReferences: [], placement: 'next_turn' },
+  ];
   await act(async () => root.render(createElement(LocaleProvider, { locale: 'en', children:
     createElement(ConversationServicesProvider, { services: {
       listMessages: async () => messages,
       subscribeChanges: (handler) => { changed = handler; return () => {}; },
-      cancelMessage: async () => {}, reconcileMessage: async () => {},
-      sessions: { readSnapshot: async () => { throw new Error('unexpected snapshot read'); } },
+      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'); } },
       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 }) },
@@ -55,13 +61,39 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       reportError: (message) => { throw new Error(message); },
     }) }),
   })));
-  assert.equal(transient.get('steering')?.deliveryActions?.length, 1, 'unconfirmed sends retain their receipt check');
-  messages = messages.map((message) => ({ ...message, state: 'accepted', ...(message.messageId === 'root' ? { turnId: 'started-turn' } : {}) }));
+  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 followup = transient.get('followup');
+  assert.equal(followup?.deliveryStatus, 'Waiting for earlier messages to be delivered',
+    'a saved row behind an unresolved predecessor explains the wait');
+  assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Cancel sending']);
+  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');
+  await act(async () => { await followup?.deliveryActions?.[0]?.onClick(); });
+  assert.deepEqual(cancelled, [['session-1', 'followup']]);
+  assert.equal(transient.has('followup'), false, 'cancel retires the local row');
+  messages = [
+    { ...messages[0]!, state: 'failed', canCancel: true },
+    { sessionId: 'session-1', messageId: 'settled', createdAt: 4, state: 'accepted', canCancel: false,
+      text: 'settled', attachments: [], inlineReferences: [], placement: 'next_turn' },
+    { ...messages[2]!, state: 'accepted', turnId: 'started-turn' },
+    { sessionId: 'session-1', messageId: 'later', createdAt: 5, state: 'saved', canCancel: true,
+      text: 'later', attachments: [], inlineReferences: [], placement: 'next_turn' },
+  ];
   await act(async () => changed('session-1'));
-  assert.deepEqual([...transient.keys()], ['root']);
+  const failed = transient.get('steering');
+  assert.equal(failed?.deliveryStatus, 'Could not send · message kept');
+  assert.deepEqual(failed?.deliveryActions?.map((action) => action.label), ['Delete unsent message']);
+  assert.equal(transient.get('later')?.deliveryStatus, 'Waiting to send',
+    'failed and accepted predecessors do not hold back a later saved row');
+  assert.deepEqual([...transient.keys()], ['steering', 'root', 'later']);
   assert.equal(transient.get('root')?.transientPlacement, 'current_turn');
   await act(async () => changed('session-1'));
-  assert.deepEqual([...transient.keys()], ['root'], 'a retained local copy cannot resurrect a withdrawn queue entry');
+  assert.deepEqual([...transient.keys()], ['steering', 'root', 'later'],
+    'a retained local copy cannot resurrect a withdrawn queue entry');
 });
 
 test('queue_update events drive the independent desktop queue projection', () => {
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 0e08e4679b..c968cd7388 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,9 +51,12 @@ export function SessionLocalMessages(props: {
               retire(sessionId, message.messageId);
               continue;
             }
-            const action = (operation: () => Promise<void>) => () => {
-              void operation().catch(() => reportError(copy.updateError));
-            };
+            const deliveryStatus = message.state === 'saved' && waitingForPrevious
+              ? copy.waitingForPrevious
+              : copy[message.state];
+            if (message.state !== 'accepted' && message.state !== 'failed') waitingForPrevious = true;
+            const action = (operation: () => Promise<void>) => () =>
+              operation().catch(() => reportError(copy.updateError));
             publish(sessionId, {
               id: message.messageId,
               text: message.text,
@@ -62,12 +67,15 @@ export function SessionLocalMessages(props: {
               quotes: message.quotes,
               inlineReferences: message.inlineReferences,
               hostTurnId: message.turnId,
-              deliveryStatus: copy[message.state],
+              deliveryStatus,
               deliveryDetail: message.error,
               deliveryActions: 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);
@@ -78,6 +86,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 c96e9ff98b..83b9293cca 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -26,39 +26,47 @@ 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',
-    sending: 'Delivering to Host',
-    accepted: 'Host accepted',
-    unknown: 'Host outcome unknown',
-    failed: 'Not sent · local copy retained',
-    remove: 'Remove local copy',
-    check: 'Check status',
+    saved: 'Waiting to send',
+    sending: 'Sending…',
+    accepted: 'Delivered',
+    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: '已本地保存 · 等待发送',
-    sending: '正在投递到 Host',
-    accepted: 'Host 已接受',
-    unknown: 'Host 接受结果未知',
-    failed: '未发送 · 本地副本已保留',
-    remove: '移除本地副本',
-    check: '核对状态',
+    saved: '等待发送',
+    sending: '正在发送…',
+    accepted: '已送达',
+    unknown: '暂时无法确认是否送达，请勿重复发送',
+    failed: '未能发送 · 消息已保留',
+    remove: '删除未发送的消息',
+    cancel: '取消发送',
+    check: '检查是否送达',
+    waitingForPrevious: '等待前面的消息送达',
     updateError: '无法更新已保存的消息',
   },
   'zh-TW': {
-    saved: '已儲存於本機 · 等待傳送',
-    sending: '正在投遞至 Host',
-    accepted: 'Host 已接受',
-    unknown: 'Host 接受結果未知',
-    failed: '未傳送 · 本機副本已保留',
-    remove: '移除本機副本',
-    check: '核對狀態',
+    saved: '等待傳送',
+    sending: '正在傳送…',
+    accepted: '已送達',
+    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 70dc4523b5..ef7b2d50e8 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -651,11 +651,14 @@
   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 363f69fc08..a49196d731 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 a96f7b3bc8..693916df9c 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -266,7 +266,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.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, IconButton, Lightbox, 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 |
 | `packages/ui/src/directory-reference-chip.tsx` | ui-composition | Token, Tooltip | aligned — uses Astryx (Token, Tooltip) | aligned |
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index c9f61dea52..6982f4380d 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: 'next_turn',
-      deliveryStatus: 'Delivery uncertain', deliveryDetail: 'Connection interrupted',
-      deliveryActions: [{ label: 'Check delivery', onClick() {} }] }]} /></LocaleProvider>);
+    pendingMessages={[
+      { id: 'local', text: 'offline follow-up', ts: 1, transientPlacement: 'next_turn',
+        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: 'next_turn',
+        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 d1819a4bea..a14d05edd3 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -188,7 +188,7 @@ const UserMessageBody = memo(function UserMessageBody(props: {
             {timeOrDelivery}
           </span> : timeOrDelivery}
           {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} clickAction={action.onClick} />
           ))}
           <CopyButton
             copyKey="message"
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 7c617f2378..76220b42f7 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -146,7 +146,7 @@ export interface TransientUserMessageProjection {
   pendingSteering?: boolean;
   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 123017f537..60240a731d 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 1aceae7a0c..d9762880b8 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -448,8 +448,8 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', pastedQuoteLabel: '粘贴的文本', 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: '拖动排序',
@@ -574,8 +574,8 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', pastedQuoteLabel: '貼上的文本', 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: '拖動排序',
@@ -700,8 +700,8 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', pastedQuoteLabel: 'Pasted text', 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 0cc76a07510c38ea6177986fdd32ed1fbd641e92 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/12] 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 ++++----
 .../main/__tests__/message-queue-ui-state.test.ts   |  5 +----
 .../controller/session-local-messages.tsx           |  7 +------
 .../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 ++++++-------
 7 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/apps/desktop/e2e/session-local-recovery.spec.ts b/apps/desktop/e2e/session-local-recovery.spec.ts
index fa3787e74a..743de76d37 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.getByText('等待发送')).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.getByText('等待发送')).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.getByText('等待发送')).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.getByText('等待发送')).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/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index 72792cccf6..549e1f64c5 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
@@ -66,8 +66,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 followup = transient.get('followup');
-  assert.equal(followup?.deliveryStatus, 'Waiting for earlier messages to be delivered',
-    'a saved row behind an unresolved predecessor explains the wait');
+  assert.equal(followup?.deliveryStatus, 'Waiting to send');
   assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Cancel sending']);
   await act(async () => { await steering?.deliveryActions?.[0]?.onClick(); });
   assert.deepEqual(reconciled, [['session-1', 'steering']]);
@@ -87,8 +86,6 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   const failed = transient.get('steering');
   assert.equal(failed?.deliveryStatus, 'Could not send · message kept');
   assert.deepEqual(failed?.deliveryActions?.map((action) => action.label), ['Delete unsent message']);
-  assert.equal(transient.get('later')?.deliveryStatus, 'Waiting to send',
-    'failed and accepted predecessors do not hold back a later saved row');
   assert.deepEqual([...transient.keys()], ['steering', 'root', 'later']);
   assert.equal(transient.get('root')?.transientPlacement, 'current_turn');
   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 c968cd7388..1b187bf9d2 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
@@ -51,10 +50,6 @@ export function SessionLocalMessages(props: {
               retire(sessionId, message.messageId);
               continue;
             }
-            const deliveryStatus = message.state === 'saved' && waitingForPrevious
-              ? copy.waitingForPrevious
-              : copy[message.state];
-            if (message.state !== 'accepted' && message.state !== 'failed') waitingForPrevious = true;
             const action = (operation: () => Promise<void>) => () =>
               operation().catch(() => reportError(copy.updateError));
             publish(sessionId, {
@@ -67,7 +62,7 @@ export function SessionLocalMessages(props: {
               quotes: message.quotes,
               inlineReferences: message.inlineReferences,
               hostTurnId: message.turnId,
-              deliveryStatus,
+              deliveryStatus: copy[message.state],
               deliveryDetail: message.error,
               deliveryActions: message.canCancel
                 ? [
diff --git a/apps/desktop/src/renderer/locales/session-local-copy.ts b/apps/desktop/src/renderer/locales/session-local-copy.ts
index 83b9293cca..d29b4080ad 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -28,7 +28,6 @@ interface SessionLocalCopy {
   remove: string;
   cancel: string;
   check: string;
-  waitingForPrevious: string;
   updateError: string;
 }
 
@@ -42,7 +41,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': {
@@ -54,7 +52,6 @@ const catalog = {
     remove: '删除未发送的消息',
     cancel: '取消发送',
     check: '检查是否送达',
-    waitingForPrevious: '等待前面的消息送达',
     updateError: '无法更新已保存的消息',
   },
   'zh-TW': {
@@ -66,7 +63,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 ef7b2d50e8..f2fbea5e77 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -654,11 +654,3 @@
   font: var(--maka-text-body);
   white-space: nowrap;
 }
-
-.maka-composer-queue-delivery {
-  display: block;
-  white-space: normal;
-  overflow-wrap: anywhere;
-  font: var(--maka-text-body);
-  color: var(--muted-foreground);
-}
diff --git a/packages/ui/src/__tests__/composer-send-toggle.test.tsx b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
index 6982f4380d..696a3db7f3 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: 'next_turn',
@@ -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 60240a731d..ad165b115c 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 c1d303e622c83008c7d74da12e8c7ba94239ad52 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/12] 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
---
 .../__tests__/message-queue-ui-state.test.ts  |  3 +
 .../contracts/transient-message-projection.ts |  1 +
 .../controller/session-local-messages.tsx     |  5 ++
 apps/desktop/src/renderer/styles/composer.css | 20 ++++++
 .../__tests__/composer-send-toggle.test.tsx   | 29 ++++++--
 packages/ui/src/chat-view.tsx                 |  2 +
 packages/ui/src/composer-message-queue.tsx    | 69 ++++++++++++++++---
 7 files changed, 113 insertions(+), 16 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 549e1f64c5..4382590b59 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
@@ -62,10 +62,12 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
     }) }),
   })));
   const steering = transient.get('steering');
+  assert.equal(steering?.deliveryState, 'unconfirmed');
   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 followup = transient.get('followup');
+  assert.equal(followup?.deliveryState, 'pending');
   assert.equal(followup?.deliveryStatus, 'Waiting to send');
   assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Cancel sending']);
   await act(async () => { await steering?.deliveryActions?.[0]?.onClick(); });
@@ -84,6 +86,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   ];
   await act(async () => changed('session-1'));
   const failed = transient.get('steering');
+  assert.equal(failed?.deliveryState, 'failed');
   assert.equal(failed?.deliveryStatus, 'Could not send · message kept');
   assert.deepEqual(failed?.deliveryActions?.map((action) => action.label), ['Delete unsent message']);
   assert.deepEqual([...transient.keys()], ['steering', 'root', 'later']);
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 4b89d962ed..7e8f98b61b 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -52,6 +52,7 @@ export function mergeTransientMessageProjection(
     // 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, 'deliveryState') && current.deliveryState !== undefined ? { deliveryState: current.deliveryState } : {}),
     ...(!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 1b187bf9d2..4d293dfaed 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
@@ -62,6 +62,11 @@ export function SessionLocalMessages(props: {
               quotes: message.quotes,
               inlineReferences: message.inlineReferences,
               hostTurnId: message.turnId,
+              deliveryState: message.state === 'unknown'
+                ? 'unconfirmed'
+                : message.state === 'failed'
+                  ? 'failed'
+                  : 'pending',
               deliveryStatus: copy[message.state],
               deliveryDetail: message.error,
               deliveryActions: message.canCancel
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index f2fbea5e77..48fba5d6d1 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -129,6 +129,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 696a3db7f3..4e96ab9cc1 100644
--- a/packages/ui/src/__tests__/composer-send-toggle.test.tsx
+++ b/packages/ui/src/__tests__/composer-send-toggle.test.tsx
@@ -375,29 +375,44 @@ 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: 'next_turn',
-        deliveryStatus: 'Delivery uncertain', deliveryDetail: 'Connection interrupted',
+        deliveryState: 'unconfirmed', 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: 'next_turn',
-        deliveryStatus: 'Sending…' },
+        deliveryState: 'pending', deliveryStatus: 'Sending…' },
     ]} /></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 76220b42f7..c464dcd5f5 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -144,6 +144,8 @@ export interface ChatViewGoalIndicatorProps {
 export interface TransientUserMessageProjection {
   /** Held above the composer until Runtime emits steering_message. */
   pendingSteering?: boolean;
+  /** Outbox tone for the composer row: pending sends differ from ones needing attention. */
+  deliveryState?: 'pending' | 'unconfirmed' | 'failed';
   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 ad165b115c..9f39bda980 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 fb648cfd8587d5a1a5641e44e177cb70b763d98b 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/12] 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  |  13 +-
 apps/desktop/src/renderer/app-shell.tsx       |   9 +-
 .../contracts/transient-message-projection.ts |   1 -
 .../controller/session-local-messages.tsx     |  54 ++++----
 .../renderer/locales/session-local-copy.ts    |   4 +
 apps/desktop/src/renderer/styles/composer.css |  36 ++---
 .../composer-message-queue.stories.tsx        |  10 +-
 .../__tests__/composer-send-toggle.test.tsx   |  28 ++--
 packages/ui/src/chat-view.tsx                 |   2 -
 packages/ui/src/composer-message-queue.tsx    | 123 +++++-------------
 packages/ui/src/conversation-copy.ts          |  14 +-
 11 files changed, 115 insertions(+), 179 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 4382590b59..842a375c11 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
@@ -35,6 +35,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   let changed!: (sessionId: string) => void;
   const cancelled: string[][] = [];
   const reconciled: string[][] = [];
+  const restored: string[][] = [];
   let messages: DesktopLocalMessage[] = [
     { sessionId: 'session-1', messageId: 'steering', createdAt: 1, state: 'unknown', canCancel: false,
       text: 'steering', attachments: [], inlineReferences: [], placement: 'current_turn' },
@@ -59,23 +60,24 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       publish: (_id, message) => { transient.set(message.id, message); },
       retire: (_id, messageId) => { transient.delete(messageId); },
       reportError: (message) => { throw new Error(message); },
+      restoreDraft: (sessionId, text) => { restored.push([sessionId, text]); },
     }) }),
   })));
   const steering = transient.get('steering');
-  assert.equal(steering?.deliveryState, 'unconfirmed');
   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 followup = transient.get('followup');
-  assert.equal(followup?.deliveryState, 'pending');
   assert.equal(followup?.deliveryStatus, 'Waiting to send');
-  assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Cancel sending']);
+  assert.deepEqual(followup?.deliveryActions?.map((action) => action.label), ['Edit', 'Cancel sending']);
   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');
   await act(async () => { await followup?.deliveryActions?.[0]?.onClick(); });
   assert.deepEqual(cancelled, [['session-1', 'followup']]);
-  assert.equal(transient.has('followup'), false, 'cancel retires the local row');
+  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[0]!, state: 'failed', canCancel: true },
     { sessionId: 'session-1', messageId: 'settled', createdAt: 4, state: 'accepted', canCancel: false,
@@ -86,9 +88,8 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
   ];
   await act(async () => changed('session-1'));
   const failed = transient.get('steering');
-  assert.equal(failed?.deliveryState, 'failed');
   assert.equal(failed?.deliveryStatus, 'Could not send · message kept');
-  assert.deepEqual(failed?.deliveryActions?.map((action) => action.label), ['Delete unsent message']);
+  assert.deepEqual(failed?.deliveryActions?.map((action) => action.label), ['Edit', 'Delete unsent message']);
   assert.deepEqual([...transient.keys()], ['steering', 'root', 'later']);
   assert.equal(transient.get('root')?.transientPlacement, 'current_turn');
   await act(async () => changed('session-1'));
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index eaafc7b180..2c6ac1d9ab 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -603,6 +603,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);
@@ -2117,7 +2124,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/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 7e8f98b61b..4b89d962ed 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -52,7 +52,6 @@ export function mergeTransientMessageProjection(
     // 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, 'deliveryState') && current.deliveryState !== undefined ? { deliveryState: current.deliveryState } : {}),
     ...(!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 4d293dfaed..22ee720b47 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;
@@ -62,34 +64,40 @@ export function SessionLocalMessages(props: {
               quotes: message.quotes,
               inlineReferences: message.inlineReferences,
               hostTurnId: message.turnId,
-              deliveryState: message.state === 'unknown'
-                ? 'unconfirmed'
-                : message.state === 'failed'
-                  ? 'failed'
-                  : 'pending',
               deliveryStatus: copy[message.state],
               deliveryDetail: message.error,
-              deliveryActions: message.canCancel
+              deliveryActions: 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);
+                        }),
                       },
                     ]
                   : [],
@@ -106,6 +114,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 d29b4080ad..1311b83de1 100644
--- a/apps/desktop/src/renderer/locales/session-local-copy.ts
+++ b/apps/desktop/src/renderer/locales/session-local-copy.ts
@@ -25,6 +25,7 @@ interface SessionLocalCopy {
   accepted: string;
   unknown: string;
   failed: string;
+  edit: string;
   remove: string;
   cancel: string;
   check: string;
@@ -38,6 +39,7 @@ const catalog = {
     accepted: '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',
@@ -49,6 +51,7 @@ const catalog = {
     accepted: '已送达',
     unknown: '暂时无法确认是否送达，请勿重复发送',
     failed: '未能发送 · 消息已保留',
+    edit: '编辑',
     remove: '删除未发送的消息',
     cancel: '取消发送',
     check: '检查是否送达',
@@ -60,6 +63,7 @@ const catalog = {
     accepted: '已送達',
     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 48fba5d6d1..49e681c6b2 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -62,6 +62,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);
@@ -129,24 +130,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) {
@@ -664,13 +658,3 @@
   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;
-}
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index a49196d731..cf39af06f2 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 4e96ab9cc1..12ebbc927a 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',
@@ -392,25 +387,22 @@ test('local sends render as an outbox, not as admitted queue entries', () => {
     }]}
     pendingMessages={[
       { id: 'local', text: 'offline follow-up', ts: 1, transientPlacement: 'next_turn',
-        deliveryState: 'unconfirmed', deliveryStatus: 'Delivery uncertain', deliveryDetail: 'Connection interrupted',
+        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: 'next_turn',
-        deliveryState: 'pending', deliveryStatus: 'Sending…' },
+        deliveryStatus: 'Sending…' },
     ]} /></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/chat-view.tsx b/packages/ui/src/chat-view.tsx
index c464dcd5f5..76220b42f7 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -144,8 +144,6 @@ export interface ChatViewGoalIndicatorProps {
 export interface TransientUserMessageProjection {
   /** Held above the composer until Runtime emits steering_message. */
   pendingSteering?: boolean;
-  /** Outbox tone for the composer row: pending sends differ from ones needing attention. */
-  deliveryState?: 'pending' | 'unconfirmed' | 'failed';
   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 9f39bda980..55240152b7 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 d9762880b8..56a2de62a8 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -95,8 +95,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;
@@ -448,11 +446,9 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', pastedQuoteLabel: '粘贴的文本', 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: '引用文件夹',
@@ -574,11 +570,9 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', pastedQuoteLabel: '貼上的文本', 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: '引用資料夾',
@@ -700,11 +694,9 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', pastedQuoteLabel: 'Pasted text', 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 67a3b379c165dce6324582e8d4b5ce44d1a06930 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/12] 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 ddfc2ed55a..fd3caf7bdf 100644
--- a/apps/desktop/e2e/workhub-layout.spec.ts
+++ b/apps/desktop/e2e/workhub-layout.spec.ts
@@ -446,7 +446,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 49e681c6b2..d5fcaabdef 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -134,10 +134,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 58bf238dc686b3f4e91a87d94c9e5c81f0d253e9 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/12] 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  | 128 ++++++++----------
 .../__tests__/workhub-send-visibility.test.ts |  11 +-
 .../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    |  46 +++++++
 .../composer-message-queue.stories.tsx        |   3 +
 .../chat-turn-steering-order.test.ts          |  10 +-
 .../__tests__/composer-send-toggle.test.tsx   |  41 +++---
 packages/ui/src/chat-view.tsx                 |  12 +-
 packages/ui/src/composer-message-queue.tsx    |  59 ++++----
 packages/ui/src/composer.tsx                  |   2 -
 16 files changed, 418 insertions(+), 158 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 842a375c11..60fbdf0a5a 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
@@ -97,9 +97,11 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
     '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' },
@@ -109,8 +111,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() {} },
   });
@@ -121,90 +134,57 @@ test('queue_update events drive the independent desktop queue projection', () =>
     placement: 'current_turn' as const,
     state: 'queued' as const,
   };
-  const inFlightEntry = {
-    ...steeringEntry,
-    state: 'in_flight' as const,
+  const followupEntry = {
+    entryId: 'entry-next',
+    messageId: 'message-next',
+    content: { text: 'do this next' },
+    placement: 'next_turn' as const,
+    state: 'queued' as const,
   };
-
-  handlers.handleEvent('session-1', {
-    type: 'queue_update',
+  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],
   });
-
-  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',
-      },
-    ],
+  transientMessages.set('message-next', {
+    id: 'message-next', text: 'do this next', ts: 1, transientPlacement: 'next_turn',
   });
-  assert.equal(transientMessages.size, 0, 'Host evidence retires local placeholders');
 
-  handlers.handleEvent('session-1', {
-    type: 'steering_message',
-    id: 'steering-message-steer',
-    turnId: 'turn-1',
-    messageId: 'message-steer',
-    ts: 2,
-    content: { text: 'adjust this run' },
-  });
-  assert.equal(transientMessages.size, 0);
+  handlers.handleEvent('session-1', queueUpdate([steeringEntry]));
+
   assert.deepEqual(controller.getState().messageQueueBySession['session-1'], {
     queueRevision: 3,
-    entries: [{
-      entryId: 'entry-next',
-      messageId: 'message-next',
-      content: { text: 'do this next' },
-      placement: 'next_turn',
-      state: 'queued',
-    }],
+    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');
 
-  handlers.handleEvent('session-1', {
-    type: 'queue_update',
-    id: 'queue-2',
-    turnId: 'turn-1',
-    ts: 3,
-    queueRevision: 4,
-    steering: ['adjust this run'],
-    followup: ['do this next'],
-    steeringEntries: [inFlightEntry],
-    followupEntries: [{
-      entryId: 'entry-next',
-      messageId: 'message-next',
-      content: { text: 'do this next' },
-      placement: 'next_turn',
-      state: 'queued',
-    }],
-  });
-  assert.deepEqual(controller.getState().messageQueueBySession['session-1']?.entries, [{
-    entryId: 'entry-next',
-    messageId: 'message-next',
-    content: { text: 'do this next' },
-    placement: 'next_turn',
-    state: 'queued',
-  }]);
-  assert.equal(transientMessages.size, 0);
-  assert.equal(transientMessages.size, 0, 'in-flight queue projection must not re-add a local row');
+  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');
 
   handlers.handleEvent('session-1', {
     type: 'message_admission',
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 be8eba88b5..cfd9b5e0f7 100644
--- a/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
+++ b/apps/desktop/src/main/__tests__/workhub-send-visibility.test.ts
@@ -608,7 +608,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' } };
@@ -618,12 +618,16 @@ 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, []);
   assert.deepEqual(h.controller.transientMessages, [], 'an in-flight snapshot cannot resurrect consumed steering');
   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, []);
@@ -650,7 +654,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 efd4cc0d9b..e0acf552f4 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 './locales/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) {
@@ -419,6 +471,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 2c6ac1d9ab..af577cd62b 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -1713,6 +1713,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(
@@ -1759,6 +1777,7 @@ function AppShellContent({
   const [sessionDisplayBatch] = useState(createAppShellSessionDisplayBatch);
   const {
     handleEvent,
+    isQueuedSteering,
     reconcilePersistedMessages,
     settleAssistantStreaming,
     flushDisplayEvents,
@@ -1774,7 +1793,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,
@@ -2124,7 +2147,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 4b89d962ed..0be078e97c 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 c3655022f2..d4a2a02b2a 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
@@ -166,6 +166,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 a18f45abec..b0922b4719 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
@@ -75,6 +75,7 @@ import { mergeSettledMessages } from '../../../../settled-message-merge.js';
 import {
   mergeTransientMessageProjection,
   projectQueuedTransientMessages,
+  queuedSteeringDeliveryActions,
   reconcileTransientMessages,
 } from '../../../../application/contracts/transient-message-projection.js';
 import { getDesktopConversationCopy } from '../../../../locales/conversation-copy.js';
@@ -158,6 +159,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(
@@ -346,6 +349,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;
@@ -501,13 +507,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(
@@ -796,7 +837,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;
@@ -962,6 +1003,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 a00765525a..565367b4be 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,
@@ -58,13 +60,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']>>>(
     [],
@@ -362,15 +369,65 @@ export function useWorkHubController(onSubmit?: () => void) {
         setInteractions((current) => terminal ? clearInteractions(current, sessionId) : reduceInteractionQueues(current, sessionId, event));
         if (terminal) setTurnStates((current) => Object.fromEntries([...Object.entries(current), [event.turnId, event.type === 'complete' ? 'completed' : event.type === 'abort' ? 'aborted' : 'failed']].slice(-64)));
         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: entries.filter((entry) => entry.state === 'queued'), 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 3480d4b193..ab1ed971e9 100644
--- a/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
+++ b/apps/desktop/src/renderer/features/workhub/ui/workhub-root.tsx
@@ -72,7 +72,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);
@@ -87,7 +94,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 8a31e20511..43779fa49a 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 { AppShellTopbarActions } from '../src/renderer/app-shell-chrome-actions';
 import { appShellFrameStyle } from '../src/renderer/shell/frame-style';
 import { SettingsOverlay } from '../src/renderer/app-shell-overlays';
@@ -710,6 +711,51 @@ 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: 'current_turn',
+          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();
+  },
+};
+
 // 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 = {
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index cf39af06f2..b39fef6a0e 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 756032d42a..7c92918dd9 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', pendingSteering: true, transientPlacement: 'current_turn' 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 12ebbc927a..7ab2b996ea 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,15 @@ 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('steering stays out of the follow-up staging list entirely', () => {
   const pending = { id: 'steer', text: 'new direction', ts: 1, pendingSteering: true, transientPlacement: 'current_turn' 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 steering send — queued or in flight — renders in the transcript, not the plate');
   }
 });
 
@@ -391,6 +388,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: 'next_turn',
         deliveryStatus: 'Sending…' },
+      { id: 'local-steer', text: 'steering in flight', ts: 3, pendingSteering: true,
+        transientPlacement: 'current_turn', 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 76220b42f7..1cd64723de 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;
@@ -156,8 +156,9 @@ export interface TransientUserMessageProjection {
   inlineReferences?: readonly InlineReference[];
   /**
    * Presentation-only placement until canonical transcript grouping arrives.
-   * Pending steering and next-turn messages stay in the composer queue; an
-   * unresolved current-turn root prompt can render beside its live Turn.
+   * Next-turn messages stay in the composer queue; current-turn messages
+   * (steering in flight or queued, an unresolved root prompt) render in the
+   * transcript.
    */
   transientPlacement: 'current_turn' | 'next_turn';
   /** The Host Turn this Message is already bound to, once the Host named one. */
@@ -374,7 +375,7 @@ export function ChatView(props: {
     ),
     [visibleMessages],
   );
-  const transientMessages = (props.transientMessages ?? []).filter((message) => !message.pendingSteering && message.transientPlacement !== 'next_turn');
+  const transientMessages = (props.transientMessages ?? []).filter((message) => message.transientPlacement !== 'next_turn');
   // The projection owns the derived turns, so a turn nothing said anything
   // about keeps its object identity and its memoized TurnView skips — across
   // deltas AND across the message refreshes that fire at every step/tool
@@ -540,6 +541,9 @@ export function ChatView(props: {
     const turn = message.hostTurnId ? turnsById.get(message.hostTurnId) : undefined;
     if (
       message.transientPlacement !== 'current_turn'
+      // 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 === undefined
       || turn.user !== undefined
       || turn.timeline.some((item) => item.kind === 'user' && item.messageId === message.id)
diff --git a/packages/ui/src/composer-message-queue.tsx b/packages/ui/src/composer-message-queue.tsx
index 55240152b7..68f56ff9dc 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,16 @@ 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 ids = new Set(queued.map((entry) => entry.messageId));
-  const pending = transient.filter((message) => (message.pendingSteering || message.transientPlacement === 'next_turn') && !ids.has(message.id));
-  if (pending.length === 0) return queued;
-  return [...queued, ...pending.map((message): ComposerQueueEntry => ({
+  const followups = queued.filter((entry) => entry.placement === 'next_turn');
+  const ids = new Set(followups.map((entry) => entry.messageId));
+  const pending = transient.filter((message) => message.transientPlacement === 'next_turn' && !ids.has(message.id));
+  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, state: 'local', localMessage: message,
   }))];
@@ -98,10 +100,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 +163,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 +248,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 3d29bb47a3..98f5faf4b0 100644
--- a/packages/ui/src/composer.tsx
+++ b/packages/ui/src/composer.tsx
@@ -1613,8 +1613,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 0d9dbd11b3c94c04e0f60a4fb5dbff8c4cb0cead 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/12] 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 fd3caf7bdf..89da64f58b 100644
--- a/apps/desktop/e2e/workhub-layout.spec.ts
+++ b/apps/desktop/e2e/workhub-layout.spec.ts
@@ -457,17 +457,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 d5fcaabdef..449f23e3c7 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -130,26 +130,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 68f56ff9dc..30c1ba99e4 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';
@@ -145,11 +144,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 56a2de62a8..c731454297 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -95,8 +95,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;
@@ -446,8 +444,6 @@ const CONVERSATION_COPY = {
       placeholder: '描述任务，@ 引用文件或会话，/ 选择技能…', textareaAriaLabel: '消息输入框', pastedQuoteLabel: '粘贴的文本', 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: '附加内容',
@@ -570,8 +566,6 @@ const CONVERSATION_COPY = {
       placeholder: '描述任務，@ 引用檔案，/ 選擇技能…', textareaAriaLabel: '訊息輸入框', pastedQuoteLabel: '貼上的文本', 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: '附加內容',
@@ -694,8 +688,6 @@ const CONVERSATION_COPY = {
       placeholder: 'Describe a task, @ to reference files or sessions, / for skills…', textareaAriaLabel: 'Message input', pastedQuoteLabel: 'Pasted text', 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 5195253267caa2fa72eacc98214c5bf651156eb1 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/12] 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      | 110 +++++++++++-------
 .../src/renderer/app-shell-session-events.ts  |  69 +----------
 apps/desktop/src/renderer/app-shell.tsx       |  37 +++---
 .../contracts/message-queue-projection.ts     |  27 ++---
 .../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, 247 insertions(+), 311 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 60fbdf0a5a..64ffeda138 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
@@ -97,11 +97,9 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
     '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' },
@@ -111,19 +109,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() {} },
   });
@@ -155,36 +143,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: 'next_turn',
   });
+  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');
 
   handlers.handleEvent('session-1', {
     type: 'message_admission',
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 d64678990a..f8a19e2ebb 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,24 +139,72 @@ test('derives one queue projection for main and Side Conversation consumers', ()
     ],
   });
 
-  assert.deepEqual(projection.entries.map((entry) => entry.entryId), ['steer', 'next']);
-  assert.deepEqual(projection.transientMessages, [
-    {
-      id: 'message-steer',
-      pendingSteering: true,
-      transientPlacement: 'current_turn',
-      hostTurnId: 'turn-1',
-      ts: 7,
-      text: 'steer',
-      quotes: [{ text: 'context' }],
-    },
-    {
-      id: 'message-next',
-      transientPlacement: 'next_turn',
-      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 e0acf552f4..68474c2a88 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 './locales/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;
@@ -471,10 +418,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 af577cd62b..458503aee5 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';
@@ -678,6 +679,25 @@ 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 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
@@ -1706,11 +1726,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
@@ -1777,7 +1795,6 @@ function AppShellContent({
   const [sessionDisplayBatch] = useState(createAppShellSessionDisplayBatch);
   const {
     handleEvent,
-    isQueuedSteering,
     reconcilePersistedMessages,
     settleAssistantStreaming,
     flushDisplayEvents,
@@ -1793,11 +1810,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,
@@ -2150,11 +2163,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}
     />
@@ -2555,7 +2564,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 b3f484380d..35b80fb723 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. */
@@ -39,24 +41,9 @@ export function deriveMessageQueueProjection(
     .filter((entry) => entry.state === 'queued')
     .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,
-        ...(entry.placement === 'current_turn' && {
-          hostTurnId: event.turnId,
-          pendingSteering: true,
-        }),
-        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 0be078e97c..28a32b2add 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 5637d665a1..72a39c4065 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 b0922b4719..7fe7fa1fff 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
@@ -74,9 +74,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 '../../../../locales/conversation-copy.js';
 import {
@@ -349,13 +348,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);
@@ -475,11 +482,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.
@@ -509,46 +515,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(
@@ -717,6 +697,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 {
@@ -767,15 +750,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,
@@ -1003,9 +987,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,
@@ -1729,7 +1712,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 565367b4be..2f2af70a5a 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,
@@ -60,7 +60,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,
@@ -370,64 +370,16 @@ export function useWorkHubController(
         if (terminal) setTurnStates((current) => Object.fromEntries([...Object.entries(current), [event.turnId, event.type === 'complete' ? 'completed' : event.type === 'abort' ? 'aborted' : 'failed']].slice(-64)));
         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') {
@@ -717,7 +669,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 43779fa49a..9462164dcb 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 { AppShellTopbarActions } from '../src/renderer/app-shell-chrome-actions';
 import { appShellFrameStyle } from '../src/renderer/shell/frame-style';
 import { SettingsOverlay } from '../src/renderer/app-shell-overlays';
@@ -711,9 +711,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
@@ -731,18 +731,17 @@ export const QueuedSteeringInTranscript: Story = {
             tools: [],
           }],
         }],
-        transientMessages: [{
-          id: 'msg-steer-queued',
-          text: '顺便确认一下 coverage 阈值没有变。',
+        transientMessages: withQueuedSteeringTransients([], {
+          turnId: 'turn-s',
           ts: NOW - 10_000,
-          transientPlacement: 'current_turn',
-          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 77fd9fa6ded6ddddd63ba89b0258491bf5128fb9 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/12] 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 693916df9c..b749378433 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -266,7 +266,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.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, IconButton, Lightbox, 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 |
 | `packages/ui/src/directory-reference-chip.tsx` | ui-composition | Token, Tooltip | aligned — uses Astryx (Token, Tooltip) | aligned |

From 076c36c9ce681caa797dbb63bc8b6dba3dce3eea 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/12] 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  |   2 +-
 .../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, 259 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 1ad28e4726..3520380057 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -601,7 +601,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 7,
-        "nonTriviaTokens": 2687
+        "nonTriviaTokens": 2677
       },
       "src/renderer/app-shell-session-ui-state.ts": {
         "importDeclarations": 0,
@@ -694,11 +694,7 @@
           "window.maka.sessions.getPlanState": 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 214361cf4b..5eefbe0630 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 6bc4a2a504..f2c5184028 100644
--- a/apps/desktop/src/main/__tests__/composer-mentions.test.ts
+++ b/apps/desktop/src/main/__tests__/composer-mentions.test.ts
@@ -94,6 +94,10 @@ function installCatalogRenderer(t: TestContext) {
       readSnapshot: async () => {
         throw new Error('Session snapshot is not used in catalog tests');
       },
+      promoteQueueEntry: async () => undefined,
+      updateQueueEntry: async () => undefined,
+      retractQueueEntry: async () => undefined,
+      reorderQueueEntries: async () => undefined,
     },
     workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
     newTasks: {
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 64ffeda138..af1da08ba4 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
@@ -50,7 +50,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       subscribeChanges: (handler) => { changed = handler; return () => {}; },
       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'); } },
+      sessions: { list: async () => [], subscribeChanges: () => () => {}, readSnapshot: async () => { throw new Error('unexpected snapshot read'); }, promoteQueueEntry: async () => undefined, updateQueueEntry: async () => undefined, retractQueueEntry: async () => undefined, 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 }) },
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 2c8d23d90a..3cad851bb0 100644
--- a/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
+++ b/apps/desktop/src/main/__tests__/session-reference-composer.test.ts
@@ -52,6 +52,13 @@ const sessionLocalServices: Pick<
   subscribeChanges: () => () => undefined,
 };
 
+const queueStubs = {
+  promoteQueueEntry: async () => undefined,
+  updateQueueEntry: async () => undefined,
+  retractQueueEntry: async () => undefined,
+  reorderQueueEntries: async () => undefined,
+};
+
 afterEach(async () => {
   if (root) await act(() => root?.unmount());
   root = undefined;
@@ -102,6 +109,7 @@ test('Session reference picker keeps same-Host sessions and send waits for the s
     ...sessionLocalServices,
     sessions: {
       readSnapshot: async () => snapshot,
+      ...queueStubs,
     },
     skills: { listInvocable: async () => [] },
     workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
@@ -241,6 +249,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({
@@ -345,6 +354,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 f4d3977038..2ea5e71e34 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 458503aee5..755d5470ef 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';
@@ -332,6 +331,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
@@ -600,17 +600,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);
@@ -681,23 +673,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
@@ -1715,74 +1699,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 ef6eca9a46..36ff5ea8ed 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 0000000000..7cdd98e774
--- /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 03df268905..0969dbd1f2 100644
--- a/apps/desktop/src/renderer/features/conversation/ports.ts
+++ b/apps/desktop/src/renderer/features/conversation/ports.ts
@@ -51,6 +51,10 @@ export interface ConversationServices extends Pick<
 > {
   readonly sessions: {
     readSnapshot(sessionId: string, options?: { readonly maxChars?: number }): Promise<SessionSnapshot>;
+    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 skills: {
     listInvocable(sessionId?: string): Promise<InvocableSkillEntry[]>;
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index b39fef6a0e..7b770874f5 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 4aad6a5131..5e92f59c13 100644
--- a/apps/desktop/stories/composer-slash-menu.stories.tsx
+++ b/apps/desktop/stories/composer-slash-menu.stories.tsx
@@ -157,6 +157,10 @@ const conversationServices: ConversationServices = {
     readSnapshot: async () => {
       throw new Error('Session snapshots are not used in slash menu stories');
     },
+    promoteQueueEntry: async () => undefined,
+    updateQueueEntry: async () => undefined,
+    retractQueueEntry: async () => undefined,
+    reorderQueueEntries: async () => undefined,
   },
   skills: { listInvocable: loadProjection },
   workspace: { searchFiles: async () => ({ ok: true, files: [] }) },

From bc05a063990ef2a89effcd86c91eb869c8cab6f8 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/12] 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>
---
 apps/desktop/renderer-architecture.json          |  4 ++--
 .../app-shell-first-send-cleanup.test.ts         |  2 --
 .../__tests__/message-queue-ui-state.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 ++--------------
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index 3520380057..d7f4c01a6b 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -721,7 +721,7 @@
           "useNewTaskChoice": 1,
           "useOnboardingSnapshot": 1,
           "usePlanModeState": 1,
-          "useRef": 14,
+          "useRef": 13,
           "useSessionCollaborationDialog": 1,
           "useSessionEventHealthPolling": 1,
           "useSessionNavigationReads": 1,
@@ -827,7 +827,7 @@
           "react": 1
         },
         "importSpecifiers": 98,
-        "nonTriviaTokens": 12730
+        "nonTriviaTokens": 12427
       },
       "src/renderer/use-app-shell-composer-quotes.ts": {
         "importDeclarations": 0,
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 5eefbe0630..d2bb88058c 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/src/main/__tests__/message-queue-ui-state.test.ts b/apps/desktop/src/main/__tests__/message-queue-ui-state.test.ts
index af1da08ba4..f49d896886 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
@@ -50,7 +50,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       subscribeChanges: (handler) => { changed = handler; return () => {}; },
       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'); }, promoteQueueEntry: async () => undefined, updateQueueEntry: async () => undefined, retractQueueEntry: async () => undefined, reorderQueueEntries: async () => undefined },
+      sessions: { readSnapshot: async () => { throw new Error('unexpected snapshot read'); }, promoteQueueEntry: async () => undefined, updateQueueEntry: async () => undefined, retractQueueEntry: async () => undefined, 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 }) },
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 7b770874f5..5a9b26c0fe 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 f6f4dfd714..d99f3c1c54 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 9008379eb8..711b5f82d1 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 9d9f2da121eccd2dcc99d3db77806bc379a63c7a 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/12] 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
---
 apps/desktop/renderer-architecture.json       |  2 +-
 .../__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 +--
 apps/desktop/src/renderer/styles/composer.css |  1 -
 .../composer-message-queue.stories.tsx        |  4 +-
 .../__tests__/composer-message-queue.test.tsx | 18 ++++
 packages/ui/src/use-composer-attachments.ts   | 20 +++++
 21 files changed, 319 insertions(+), 47 deletions(-)

diff --git a/apps/desktop/renderer-architecture.json b/apps/desktop/renderer-architecture.json
index d7f4c01a6b..10d00e9a0c 100644
--- a/apps/desktop/renderer-architecture.json
+++ b/apps/desktop/renderer-architecture.json
@@ -827,7 +827,7 @@
           "react": 1
         },
         "importSpecifiers": 98,
-        "nonTriviaTokens": 12427
+        "nonTriviaTokens": 12498
       },
       "src/renderer/use-app-shell-composer-quotes.ts": {
         "importDeclarations": 0,
diff --git a/apps/desktop/src/main/__tests__/composer-directories.test.ts b/apps/desktop/src/main/__tests__/composer-directories.test.ts
index f3b093de2c..f7272a5210 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 f49d896886..4690f6740b 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 { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
 import { createAppShellSessionEventHandlers } from '../../renderer/app-shell-session-events.js';
@@ -60,7 +66,7 @@ test('local delivery recovery cannot republish accepted Host queue rows', async
       publish: (_id, message) => { transient.set(message.id, message); },
       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');
@@ -251,3 +257,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 f8a19e2ebb..4d8ce4cd10 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 755d5470ef..fc57215127 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -385,6 +385,7 @@ function AppShellContent({
     pickAttachments,
     attachFilePaths,
     restoreAttachments,
+    restoreDirectories,
     removeAttachment,
     clearSubmittedContext,
     imageNoticeLifecycle,
@@ -677,11 +678,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
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 28a32b2add..5a52a94db4 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 22ee720b47..65f1f253f5 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();
@@ -85,7 +86,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 7cdd98e774..259bfe830a 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 072aa4fe04..449f552496 100644
--- a/apps/desktop/src/renderer/features/conversation/index.ts
+++ b/apps/desktop/src/renderer/features/conversation/index.ts
@@ -62,6 +62,7 @@ export {
 export { desktopSlashCommandPresentation } from './model/slash-command-presentation.js';
 export { useComposerQuotes } from './controller/use-composer-quotes.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 3b212be3a6..b9eb24f3a6 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 d4a2a02b2a..6ae4e805a1 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
@@ -34,6 +34,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';
@@ -78,6 +79,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;
@@ -113,6 +116,7 @@ export function QuoteCompanionPanel(props: {
     pendingAttachments,
     pickAttachments,
     attachFilePaths,
+    restoreAttachments,
     removeAttachment,
     clearSubmittedAttachments,
   } = useComposerAttachments({
@@ -166,11 +170,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 7fe7fa1fff..9d86b4530e 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,6 +76,7 @@ import {
   mergeTransientMessageProjection,
   reconcileTransientMessages,
   withQueuedSteeringTransients,
+  type RestoredDraftContent,
 } from '../../../../application/contracts/transient-message-projection.js';
 import { getDesktopConversationCopy } from '../../../../locales/conversation-copy.js';
 import {
@@ -158,8 +159,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(
@@ -1723,7 +1724,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 ebb8b4d3da..62d39a6188 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -32,6 +32,7 @@ import type {
   SessionWorkbarTab,
   SessionWorkbarTabKind,
 } from '../model/workbar-tabs';
+import type { QuoteRef } from '@maka/core/events';
 import type {
   CompanionQuoteTarget,
   CompanionQuoteSnapshot,
@@ -103,6 +104,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;
@@ -184,6 +186,7 @@ export function WorkbarHost({ model: props }: { model: WorkbarHostModel }) {
               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 cc7436c42d..ed56ca5ec1 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx
@@ -64,6 +64,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 '../../../locales/conversation-copy.js';
+import type { QuoteRef } from '@maka/core/events';
 import type {
   CompanionQuoteTarget,
   CompanionQuoteSnapshot,
@@ -398,6 +399,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;
@@ -598,6 +600,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 2f2af70a5a..27aef461c1 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,
@@ -64,7 +67,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();
@@ -675,7 +678,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 f1234e8d9e..184c3ae33b 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 '../../../locales/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 ab1ed971e9..d90f7f04eb 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';
@@ -73,13 +74,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);
@@ -334,6 +333,7 @@ export function WorkHubRoot() {
               onReorderQueuedEntries={controller.reorderQueuedEntries}
               placeholder={progress ? t.progressInput : t.welcome}
               ref={composer}
+              draftRestore={draftRestore}
               sessionId={controller.sessionId}
               streaming={busy}
               sendBlocked={!controller.sessionId || controller.sending || !session?.model}
diff --git a/apps/desktop/src/renderer/styles/composer.css b/apps/desktop/src/renderer/styles/composer.css
index 449f23e3c7..1e94f90ab0 100644
--- a/apps/desktop/src/renderer/styles/composer.css
+++ b/apps/desktop/src/renderer/styles/composer.css
@@ -644,4 +644,3 @@
   justify-content: space-between;
   gap: var(--space-3);
 }
-
diff --git a/apps/desktop/stories/composer-message-queue.stories.tsx b/apps/desktop/stories/composer-message-queue.stories.tsx
index 5a9b26c0fe..3342b3f6ec 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 d99f3c1c54..ef28c511a0 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 087401d73c..5fd04315c4 100644
--- a/packages/ui/src/use-composer-attachments.ts
+++ b/packages/ui/src/use-composer-attachments.ts
@@ -428,6 +428,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));
@@ -493,6 +512,7 @@ export function useComposerAttachments(options: {
     pickAttachments,
     attachFilePaths,
     restoreAttachments,
+    restoreDirectories,
     removeAttachment,
     clearSubmittedContext,
     clearSubmittedAttachments,