fix(ui): render queued steering in the transcript and fold follow-ups into the staging drawer

apps/desktop/e2e/workhub-layout.spec.ts

@@ -417,7 +417,7 @@ test('WorkHub keeps the submitted prompt visible while its agent is still runnin
   await expect(prompt).toHaveCount(1);
   await expect(workhub.locator('.maka-bubble-streaming')).toContainText('Fake backend waiting');
   await expect(stop).toBeVisible();
-  const followups = workhub.locator('[data-queue-placement="next_turn"] .maka-composer-queue-text');
+  const followups = workhub.locator('.maka-composer-queue .maka-composer-queue-text');
   const queuedTexts = ['下一轮整理测试结果', '再下一轮补充使用说明'] as const;
   await workhub.locator(COMPOSER_INPUT).fill(queuedTexts[0]);
   await workhub.getByRole('button', { name: /^(发送|Send)$/ }).click();
@@ -428,17 +428,6 @@ test('WorkHub keeps the submitted prompt visible while its agent is still runnin
   await awaitSendReady(workhub);
   await workhub.locator(COMPOSER_INPUT).press('Enter');
   await expect(followups).toHaveText(queuedTexts);
-  const shortcuts = workhub.getByRole('button', { name: '发送快捷键', exact: true });
-  await expect(shortcuts).toHaveCount(1);
-  await shortcuts.hover();
-  const shortcutHint = workhub.getByRole('tooltip');
-  const steerModifier = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
-  await expect(shortcutHint).toHaveText(`${steerModifier}+Enter：转向（Steering）\nEnter：下一轮（Follow-up）\nShift+Enter：换行`);
-  await expect.poll(() => shortcutHint.evaluate((element) => {
-    const bounds = element.getBoundingClientRect();
-    return bounds.left >= 0 && bounds.right <= innerWidth && bounds.top >= 0 && bounds.bottom <= innerHeight;
-  })).toBe(true);
-  await workhub.screenshot({ path: testInfo.outputPath('workhub-queue-shortcuts.png') });
   for (const text of queuedTexts) {
     await expect(workhub.locator('.maka-user-message').filter({ hasText: text })).toHaveCount(0);
   }

apps/desktop/renderer-architecture.json

@@ -32,7 +32,6 @@
     "src/renderer/chat-message-surface.tsx",
     "src/renderer/chat-recovery-notice.tsx",
     "src/renderer/command-palette-commands.ts",
-    "src/renderer/composer-attachments.ts",
     "src/renderer/composer-defaults.ts",
     "src/renderer/composer-mentions.tsx",
     "src/renderer/computer-use-overlay/engine/cursor-candidate-grid.ts",
@@ -219,7 +218,6 @@
     "src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts -> src/renderer/model-connection-errors",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-core.ts -> src/renderer/session-copy-attempt",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/attachment-preflight",
-    "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/composer-attachments",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/composer-mentions",
     "src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx -> src/renderer/scroll-motion-policy",
     "src/renderer/features/workbar/tools/side-chat/use-quote-companion.ts -> src/renderer/settled-message-merge",
@@ -322,7 +320,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 10,
-        "nonTriviaTokens": 3565
+        "nonTriviaTokens": 3525
       },
       "src/renderer/app-shell-chrome-actions.tsx": {
         "importDeclarations": 1,
@@ -595,7 +593,7 @@
           "@maka/ui": 1
         },
         "importSpecifiers": 7,
-        "nonTriviaTokens": 2603
+        "nonTriviaTokens": 2590
       },
       "src/renderer/app-shell-session-ui-state.ts": {
         "importDeclarations": 0,
@@ -663,11 +661,7 @@
           "window.maka.sessions.compact": 1,
           "window.maka.sessions.listActiveInteractions": 1,
           "window.maka.sessions.listTurnLandmarks": 1,
-          "window.maka.sessions.promoteQueueEntry": 1,
-          "window.maka.sessions.reorderQueueEntries": 1,
-          "window.maka.sessions.retractQueueEntry": 1,
           "window.maka.sessions.subscribeActiveInteractions": 1,
-          "window.maka.sessions.updateQueueEntry": 1,
           "window.maka.settings.getClient": 1,
           "window.maka.settings.subscribeClientChanged": 1
         },
@@ -693,7 +687,7 @@
           "useNewTaskChoice": 1,
           "useOnboardingSnapshot": 1,
           "usePlanModeState": 1,
-          "useRef": 13,
+          "useRef": 12,
           "useSessionEventHealthPolling": 1,
           "useSessionNavigationReads": 1,
           "useSessionSettingIntent": 1,
@@ -792,7 +786,7 @@
           "react": 1
         },
         "importSpecifiers": 92,
-        "nonTriviaTokens": 12373
+        "nonTriviaTokens": 12152
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,
@@ -1061,17 +1055,6 @@
           "@maka/ui/icons": 1
         }
       },
-      "src/renderer/composer-attachments.ts": {
-        "bridgePaths": {},
-        "environmentCapabilities": {},
-        "hookCalls": {},
-        "lifecycleMethods": {},
-        "unresolvedDependencies": 0,
-        "actionFactories": [],
-        "dependencyPaths": {
-          "./features/conversation/index.js": 1
-        }
-      },
       "src/renderer/composer-defaults.ts": {
         "bridgePaths": {},
         "environmentCapabilities": {},

apps/desktop/src/main/__tests__/app-shell-attachment-preflight-send.test.ts

@@ -20,7 +20,7 @@
 import { MAX_ATTACHMENT_COUNT } from '@maka/core/attachments';
 import { strict as assert } from 'node:assert';
 import { test } from 'node:test';
-import type { PendingAttachment } from '../../renderer/composer-attachments.js';
+import type { PendingAttachment } from '@maka/ui/composer-attachments';
 import { createAppShellChatActions } from '../../renderer/app-shell-chat-actions.js';
 import { getShellCopy } from '../../renderer/locales/shell-copy.js';
 import {

apps/desktop/src/main/__tests__/app-shell-busy-race-settlement.test.ts

@@ -80,11 +80,11 @@ describe('busy-raced send settlement', () => {
     } finally { restoreWindow(); }
   });
 
-  it('keeps steering pending while the Host admits it', async () => {
+  it('shows steering in the transcript while the Host admits it', async () => {
     const transient = new Map<string, TransientUserMessageProjection>();
     const restoreWindow = installWindow({ sessions: {
       submitMessage: async (_sessionId: string, _placement: string, _command: unknown) => {
-        assert.equal([...transient.values()][0]?.transientPlacement, 'steering');
+        assert.equal([...transient.values()][0]?.transientPlacement, 'transcript');
         return { ok: true, disposition: 'steering', attachments: [], inlineReferences: [], skillInvocation: EMPTY_SKILL_INVOCATION };
       },
     } });
@@ -96,7 +96,7 @@ describe('busy-raced send settlement', () => {
         updateTransientMessage: (_sessionId, message) => transient.set(message.id, message),
       });
       assert.equal(await actions.enqueueMessage('session-a', 'steer', 'current_turn'), true);
-      assert.equal([...transient.values()][0]?.transientPlacement, 'steering');
+      assert.equal([...transient.values()][0]?.transientPlacement, 'transcript');
     } finally { restoreWindow(); }
   });
 

apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

@@ -38,13 +38,16 @@ 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,
+} 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';
+import { prepareTranscriptForSend, stubConversationServices } from '../../renderer/features/conversation/testing.js';
 
 import {
   createActionsDeps,
@@ -715,6 +718,7 @@ describe('composer first-send cleanup', () => {
     const { root } = installReactRenderer();
     let publication!: ReturnType<typeof useAppShellSessionUiState>['publication'];
     const catalog = createSessionCatalogController();
+    const services = stubConversationServices();
     function Probe(): null {
       publication = useAppShellSessionUiState(
         catalog, undefined, deps.activeIdRef,
@@ -723,7 +727,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,

apps/desktop/src/main/__tests__/chat-view-optimistic-render.test.ts

@@ -134,9 +134,7 @@ test('ordinary sends stay in ChatView while queued prompts stay in the composer'
       'the ordinary prompt remains in the transcript');
   }
 
-  for (const transientPlacement of ['steering', 'follow_up'] as const) {
-    const document = render({ ...OPTIMISTIC_BUBBLE, transientPlacement });
-    assert.ok(document.querySelector('.maka-composer-queue')?.textContent?.includes(OPTIMISTIC_BUBBLE.text));
-    assert.equal(document.querySelector('.maka-user-message'), null, `${transientPlacement} stays out of the transcript`);
-  }
+  const followUp = render({ ...OPTIMISTIC_BUBBLE, transientPlacement: 'follow_up' });
+  assert.ok(followUp.querySelector('.maka-composer-queue')?.textContent?.includes(OPTIMISTIC_BUBBLE.text));
+  assert.equal(followUp.querySelector('.maka-user-message'), null, 'a follow-up stays out of the transcript');
 });

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');
+});

apps/desktop/src/main/__tests__/composer-mentions.test.ts

@@ -29,10 +29,8 @@ import {
   useComposerMentionsContext,
   type ComposerMentions,
 } from '../../renderer/composer-mentions.js';
-import {
-  ConversationServicesProvider,
-  type ConversationServices,
-} from '../../renderer/features/conversation/index.js';
+import { ConversationServicesProvider } from '../../renderer/features/conversation/index.js';
+import { stubConversationServices } from '../../renderer/features/conversation/testing.js';
 import {
   createSessionCatalogController,
   SessionCatalogContext,
@@ -80,33 +78,13 @@ function installCatalogRenderer(t: TestContext) {
     sessionId: string;
     resolve(skills: InvocableSkillEntry[]): void;
   }> = [];
-  const services: ConversationServices = {
-    listMessages: async () => [],
-    cancelMessage: async () => undefined,
-    reconcileMessage: async () => undefined,
-    subscribeChanges: () => () => undefined,
+  const services = stubConversationServices({
     skills: {
       listInvocable: (sessionId: string) => new Promise<InvocableSkillEntry[]>((resolve) => {
         pending.push({ sessionId, resolve });
       }),
     },
-    sessions: {
-      readSnapshot: async () => {
-        throw new Error('Session snapshot is not used in catalog tests');
-      },
-      readExecutionBoundary: async () => {
-        throw new Error('Execution boundary is not used in catalog tests');
-      },
-    },
-    runtimeHosts: { subscribeChanges: () => () => undefined },
-    workspace: { searchFiles: async () => ({ ok: false, reason: 'no_project' }) },
-    newTasks: {
-      subscribeChanges: () => () => undefined,
-      listInvocableSkills: async () => [],
-      searchFiles: async () => ({ ok: false, reason: 'no_project' }),
-    },
-    mcp: { subscribeChanges: () => () => undefined },
-  };
+  });
 
   const sessionCatalog = createSessionCatalogController();
   const observations: CatalogObservation[] = [];

apps/desktop/src/main/__tests__/goals-boundary.test.ts

@@ -160,8 +160,8 @@ describe('Goals feature boundary', () => {
     for (const [source, required] of [
       [composer, 'ComposerGoalProjectionConsumer,'],
       [composer, '<ComposerGoalProjectionConsumer>'],
-      [composer, 'goalActive={goalProjection.goalActive}'],
-      [composer, 'onSetGoal={goalProjection.onSetGoal}'],
+      [composer, 'goalActive: goalProjection.goalActive,'],
+      [composer, 'onSetGoal: goalProjection.onSetGoal,'],
       [messageSurface, 'ChatViewGoalProjectionConsumer,'],
       [messageSurface, '<ChatViewGoalProjectionConsumer>'],
       [messageSurface, 'goalIndicator={goalProjection.goalIndicator}'],