fix(web): address steering review feedback

packages/client/ui-conversation/tests/chat-view.spec.tsx

@@ -288,7 +288,7 @@ describe('ChatView', () => {
 
     act(() => {
       h.set({
-        queue: [queued, pending],
+        queue: [queued],
         nodes: [
           assistant(1, 'working'),
           {
@@ -306,9 +306,30 @@ describe('ChatView', () => {
     expect(branchButtons).toHaveLength(2)
     fireEvent.click(branchButtons[1]!)
     expect(h.forkAt).toHaveBeenCalledWith(2)
+  })
 
-    act(() => { h.set({ queue: [queued] }) })
-    expect(view.getAllByText('interrupt now')).toHaveLength(1)
+  it('keeps a later pending occurrence visible when it reuses a durable MessageId', () => {
+    const pending = {
+      id: 'steer-occurrence-later' as never,
+      messageId: 'shared-steer-message' as never,
+      placement: 'steering' as const,
+      content: [{ type: 'text' as const, text: 'same steering' }],
+      preview: 'same steering',
+      text: 'same steering',
+    }
+    const h = makeHarness({
+      queue: [pending],
+      nodes: [{
+        kind: 'steering', messageId: pending.messageId,
+        seq: 2, time: 2_000, turn: 1,
+        content: pending.content, source: null,
+      }],
+      running: true,
+    })
+    const view = render(<h.ChatView {...h.props} />)
+
+    expect(view.getAllByText('same steering')).toHaveLength(2)
+    expect(view.container.querySelectorAll('[data-pending-steering]')).toHaveLength(1)
   })
 
   it('animates only the latest unresolved model retry', () => {

packages/client/ui-conversation/tests/input-bar.spec.tsx

@@ -108,8 +108,8 @@ function bench(over?: BenchOptions) {
     useInput: bindSnapshotSelector(shell.state),
     inputActions: shell.actions,
     keyboard: shell,
-    resolveSubmitMode: (running, gesture) => {
-      if (!running) return 'queue'
+    resolveSubmitMode: (running, gesture, steeringAvailable) => {
+      if (!running || !steeringAvailable) return 'queue'
       const preferred = over?.busyEnter ?? 'queue'
       return gesture === 'enter' ? preferred : preferred === 'queue' ? 'steer' : 'queue'
     },
@@ -271,6 +271,24 @@ describe('running and lock semantics (queue cut 1)', () => {
     expect(empty.button.disabled).toBe(true)
   })
 
+  it('keeps both running subagent Enter gestures on Queue transport', () => {
+    const subagent = {
+      address: {
+        parentSessionId: 'parent' as SessionId,
+        childSessionId: SID,
+        mode: 'continuable' as const,
+      },
+      parentAvailable: true,
+    }
+    const plain = bench({ running: true, busyEnter: 'steer', draft: 'plain', subagent })
+    fireEvent.keyDown(plain.textarea, { key: 'Enter' })
+    expect(plain.sink).toHaveBeenCalledWith('plain', 'queue')
+
+    const accelerated = bench({ running: true, draft: 'accelerated', subagent })
+    fireEvent.keyDown(accelerated.textarea, { key: 'Enter', metaKey: true })
+    expect(accelerated.sink).toHaveBeenCalledWith('accelerated', 'queue')
+  })
+
   it('disabled (session removed) locks the textarea and chrome', () => {
     const { textarea, view } = bench({ disabled: true })
     expect(textarea.disabled).toBe(true)

packages/client/ui-conversation/tests/queue-dock.spec.tsx

@@ -305,11 +305,34 @@ describe('QueueDock', () => {
     expect(rendered.getByLabelText('插话发送').getAttribute('title')).toBe('仅运行中可插话发送')
   })
 
-  it('keeps the row and reports a strict steer race', async () => {
+  it('renders a session-backed subagent Queue without unsupported actions', () => {
+    const snap = {
+      ...snapshotWith([row('i-subagent', 'pending child follow-up')]),
+      subagent: {
+        address: {
+          parentSessionId: 'parent' as SessionId,
+          childSessionId: SID,
+          mode: 'continuable' as const,
+        },
+        parentAvailable: true,
+      },
+    }
+    const source = liveSession(snap)
+    const view = render(
+      <QueueDock {...kitFor(snap)} useSession={source.useSession} />,
+    )
+
+    expect(view.getByText('pending child follow-up')).toBeTruthy()
+    expect(view.queryByLabelText('编辑排队消息')).toBeNull()
+    expect(view.queryByLabelText('删除排队消息')).toBeNull()
+    expect(view.queryByLabelText('插话发送')).toBeNull()
+  })
+
+  it('keeps the row and reports a genuine steer failure', async () => {
     const snap = snapshotWith([row('i-steer-race', 'pending steer')])
     const source = liveSession(snap)
     const notify = vi.fn()
-    const updateQueue = vi.fn(() => Promise.reject(new Error('steer unavailable')))
+    const updateQueue = vi.fn(() => Promise.reject(new Error('transport failed')))
     const { getByLabelText, getByText } = render(
       <QueueDock {...kitFor(snap, { updateQueue, notify })} useSession={source.useSession} />,
     )
@@ -318,7 +341,7 @@ describe('QueueDock', () => {
     await waitFor(() => {
       expect(notify).toHaveBeenCalledWith(
         'error',
-        '插话失败：当前回复已结束，或这条消息已经开始发送。',
+        '插话发送失败，请重试。',
       )
     })
     expect(getByText('pending steer')).toBeTruthy()

packages/client/ui-conversation/tests/service-orchestration.spec.ts

@@ -50,6 +50,29 @@ describe('ConversationService', () => {
     await expect(b.scoped.send('x')).rejects.toThrow('conversation.send failed: agent-busy: busy')
     b.cancel.mockResolvedValueOnce({ ok: false, error: { code: 'internal', message: 'nope', details: {} } } as never)
     await expect(b.scoped.cancel()).rejects.toThrow('conversation.cancel failed: internal: nope')
+    b.updateQueue.mockResolvedValueOnce({
+      ok: false, error: { code: 'internal', message: 'broken', details: {} },
+    } as never)
+    await expect(b.scoped.updateQueue('item-1' as never, { kind: 'steer' }))
+      .rejects.toThrow('conversation.updateQueue failed: internal: broken')
+    await b.runtime.dispose()
+  })
+
+  it('treats strict-steer races as converged Queue delivery', async () => {
+    const b = await bench()
+    b.updateQueue.mockResolvedValueOnce({
+      ok: false, error: { code: 'steer-unavailable', message: 'closed', details: {} },
+    } as never)
+    await expect(b.scoped.updateQueue('item-1' as never, { kind: 'steer' })).resolves.toBeUndefined()
+    b.updateQueue.mockResolvedValueOnce({
+      ok: false, error: { code: 'queue-item-not-found', message: 'claimed', details: {} },
+    } as never)
+    await expect(b.scoped.updateQueue('item-2' as never, { kind: 'steer' })).resolves.toBeUndefined()
+    b.updateQueue.mockResolvedValueOnce({
+      ok: false, error: { code: 'queue-item-not-found', message: 'claimed', details: {} },
+    } as never)
+    await expect(b.scoped.updateQueue('item-3' as never, { kind: 'remove' }))
+      .rejects.toThrow('conversation.updateQueue failed: queue-item-not-found: claimed')
     await b.runtime.dispose()
   })
 

packages/client/ui-conversation/tests/submission-policy.spec.ts

@@ -13,19 +13,21 @@ describe('ComposerSubmissionPolicy', () => {
   it('defaults to Queue and only applies the preference while running', () => {
     const policy = new ComposerSubmissionPolicy()
     expect(policy.busyEnter.getSnapshot()).toBe(DEFAULT_BUSY_ENTER_BEHAVIOR)
-    expect(policy.resolve(false, 'enter')).toBe('queue')
-    expect(policy.resolve(false, 'accelerated')).toBe('queue')
-    expect(policy.resolve(true, 'enter')).toBe('queue')
-    expect(policy.resolve(true, 'accelerated')).toBe('steer')
+    expect(policy.resolve(false, 'enter', true)).toBe('queue')
+    expect(policy.resolve(false, 'accelerated', true)).toBe('queue')
+    expect(policy.resolve(true, 'enter', true)).toBe('queue')
+    expect(policy.resolve(true, 'accelerated', true)).toBe('steer')
+    expect(policy.resolve(true, 'enter', false)).toBe('queue')
+    expect(policy.resolve(true, 'accelerated', false)).toBe('queue')
 
     const changed = vi.fn()
     policy.busyEnter.subscribe(changed)
     policy.setBusyEnter('steer')
     expect(changed).toHaveBeenCalledTimes(1)
-    expect(policy.resolve(true, 'enter')).toBe('steer')
-    expect(policy.resolve(true, 'accelerated')).toBe('queue')
-    expect(policy.resolve(false, 'enter')).toBe('queue')
-    expect(policy.resolve(false, 'accelerated')).toBe('queue')
+    expect(policy.resolve(true, 'enter', true)).toBe('steer')
+    expect(policy.resolve(true, 'accelerated', true)).toBe('queue')
+    expect(policy.resolve(false, 'enter', true)).toBe('queue')
+    expect(policy.resolve(false, 'accelerated', true)).toBe('queue')
     expect(localStorage.getItem(BUSY_ENTER_STORAGE_KEY)).toBe('steer')
   })