From 1edd872c554f666ba43353da7e6f0605ecec311b Mon Sep 17 00:00:00 2001
From: weichen <weichen@home.local>
Date: Mon, 12 Oct 2026 07:45:08 +0000
Subject: [PATCH] Prefer progress cards over duplicate CurrentTaskCard

Why: When a slow-lane progress card is active, hide the plan/todos
CurrentTaskCard so the work column has one authoritative task object.
Evidence: npx vitest run (workbench-progress + full suite)
Impact: Workbench work tab; tidyCards skips done+danger failures.
Refs: fast-slow-channel-display-u1-plan W4

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/components/Workbench.tsx    |  8 +++++++-
 src/store.ts                    |  3 ++-
 test/workbench-progress.test.ts | 26 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 test/workbench-progress.test.ts

diff --git a/src/components/Workbench.tsx b/src/components/Workbench.tsx
index 0d72972..f6ba34f 100644
--- a/src/components/Workbench.tsx
+++ b/src/components/Workbench.tsx
@@ -91,6 +91,11 @@ function FilesTab() {
   return <div className="tab-body"><ArtifactsPanel /></div>
 }
 
+/** U1：同会话存在后台 progress 卡（进行中/待确认）时，progress 为权威对象，隐藏 CurrentTaskCard 避免双标题。 */
+export function hasActiveProgressCard(cards: ActivityCard[]): boolean {
+  return cards.some(c => c.kind === 'progress' && (c.status === 'active' || c.status === 'action_required'))
+}
+
 function WorkTab({ plan, todos, filter, inboxScope, projectCards, cards }: {
   plan: Parameters<typeof CurrentTaskCard>[0]['plan']
   todos: Parameters<typeof CurrentTaskCard>[0]['todos']
@@ -99,10 +104,11 @@ function WorkTab({ plan, todos, filter, inboxScope, projectCards, cards }: {
   projectCards: ActivityCard[]
   cards: ActivityCard[]
 }) {
+  const showCurrentTask = !hasActiveProgressCard(cards)
   return (
     <>
       <div className="tab-body" data-scroll-sync="inbox">
-        <CurrentTaskCard plan={plan} todos={todos} />
+        {showCurrentTask ? <CurrentTaskCard plan={plan} todos={todos} /> : null}
         <div className="inbox-scope" role="tablist" aria-label="收件箱范围与筛选">
           <button className={inboxScope === 'conv' ? 'active' : ''} onClick={() => store.setInboxScope('conv')}>本会话</button>
           <button className={inboxScope === 'project' ? 'active' : ''} onClick={() => store.setInboxScope('project')}>
diff --git a/src/store.ts b/src/store.ts
index d78fbbb..079fef8 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -893,7 +893,8 @@ export const store = {
   },
 
   async tidyCards() {
-    const done = state.cards.filter(c => c.status === 'done')
+    // U1：不收纳失败语义卡（failed，或旧 done+danger），避免把失败当完成清掉。
+    const done = state.cards.filter(c => c.status === 'done' && c.tone !== 'danger')
     for (const c of done) {
       try { const out = await api.cardDismiss(c.id); store.upsertCard(out.card) } catch { /* 单卡失败不阻断 */ }
     }
diff --git a/test/workbench-progress.test.ts b/test/workbench-progress.test.ts
new file mode 100644
index 0000000..294b87a
--- /dev/null
+++ b/test/workbench-progress.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, it } from 'vitest'
+import { hasActiveProgressCard } from '../src/components/Workbench'
+import type { ActivityCard } from '@ui'
+
+function card(over: Partial<ActivityCard>): ActivityCard {
+  return {
+    id: 'card_1', projectId: 'prj_1', conversationId: 'cnv_1',
+    kind: 'progress', title: '材料整理', status: 'active', tone: 'info',
+    createdAt: '2026-10-12T10:00:00Z', updatedAt: '2026-10-12T10:00:00Z',
+    ...over,
+  }
+}
+
+describe('hasActiveProgressCard', () => {
+  it('active/action_required progress 卡视为占用当前任务位', () => {
+    expect(hasActiveProgressCard([card({ status: 'active' })])).toBe(true)
+    expect(hasActiveProgressCard([card({ status: 'action_required' })])).toBe(true)
+  })
+
+  it('完成/失败 progress 或非 progress 不隐藏 CurrentTaskCard', () => {
+    expect(hasActiveProgressCard([card({ status: 'done', tone: 'ok' })])).toBe(false)
+    expect(hasActiveProgressCard([card({ status: 'failed', tone: 'danger' })])).toBe(false)
+    expect(hasActiveProgressCard([card({ kind: 'confirm', status: 'action_required' })])).toBe(false)
+    expect(hasActiveProgressCard([])).toBe(false)
+  })
+})