feat(tasks): 空闲成员 ≥3 时自动收进聚合,聚合并如实报出状态配比

用户要求优化显示:「比如空闲时也折叠」。

在此之前,一个跑完一轮的 teammate(活体通道不报 running)映射成 idle,
而 idle 不在「已完成/出错」的可折叠集合里 —— 于是 8 人团队永远摆 8 张卡,
而同样「不在执行」的普通子代理却是 done、会折叠。同一事实两种显示,才是
这个痛点的根。

- 可折叠集合放宽到「不在执行」(done | idle | error);运行中/部署中永不折叠。
- 空闲**不无条件收**:按用户确认的阈值,一个父节点下空闲成员 ≥3 才随页面级
  折叠规则一起收(FOLD_IDLE_MIN)。1–2 个待命成员就是这个团队的工作集,
  而且它们的卡上会挂任务行,留着看;3 个以上才是「在扫名册」。
- 聚合行如实报账:聚合节点新增 doneCount/idleCount/errorCount/hasIdle,
  小条写 `✓ N 已完成 · N 待命 · 出错 N`(为零的项省略,全已完成时与原先一样短),
  徽标在**没有已完成项**时改说 `N 待命` —— 否则「✓ N 已完成」会把待命和出错
  一起算成已完成,是撒谎。图卡片与树行共用 foldTally/foldBadgeCount。
- 手动折叠(卡片 chevron)不设阈值:那是读者点名要收的节点。
- i18n:新增 tasksFoldIdle ×20 词典。

测试:新增 6 例(阈值命中收 3 个空闲成员、2 个保持可见、运行中成员即使达标也不收、
混合聚合按状态计数、页面聚合行报「3 待命」且徽标不说已完成);pnpm test
1284 passed / 9 skipped,typecheck / lint 通过。

(cherry picked from commit 39d66ffb2e93eeb4095ec1cb2ac15933cce62742)
This commit is contained in:
Menghuan1918 committed 2026-09-27 22:19:05 +08:00
1 parent a7338bee1a
commit c0ff3d1afd
27 files changed
+242 -34

No files matched your search

+8 -4
View File
@@ -41,7 +41,7 @@ import {
type GraphBox, type GraphBox,
} from './tasks-graph-layout.ts' } from './tasks-graph-layout.ts'
import { import {
agentIdentity, agentMeta, foldPreviews, TaskLine, WorkflowGlyph, workflowMeta, agentIdentity, agentMeta, foldBadgeCount, foldPreviews, foldTally, TaskLine, WorkflowGlyph, workflowMeta,
} from './tasks-shared.tsx' } from './tasks-shared.tsx'
import { CardBar, CardTop, phaseClass, type CardKind } from './tasks-card.tsx' import { CardBar, CardTop, phaseClass, type CardKind } from './tasks-card.tsx'
import { doneActivityTitle, liveActivityLabel } from './process-labels.ts' import { doneActivityTitle, liveActivityLabel } from './process-labels.ts'
@@ -657,7 +657,7 @@ function renderFoldNode(
data-depth={node.depth} data-depth={node.depth}
role="button" role="button"
tabIndex={-1} tabIndex={-1}
aria-label={`${t('tasksFoldCompleted', { count: node.count })} · ${t('tasksFoldExpand')}`} aria-label={`${foldTally(node)} · ${t('tasksFoldExpand')}`}
className={clsx(css.node, css.nodeFold)} className={clsx(css.node, css.nodeFold)}
style={style} style={style}
onClick={() => { onClick={() => {
@@ -667,13 +667,17 @@ function renderFoldNode(
> >
<CardTop <CardTop
kind="fold" kind="fold"
count={node.count} count={foldBadgeCount(node)}
badgeIdle={node.doneCount === 0}
depth={node.depth} depth={node.depth}
name={foldPreviews(node.previews)} name={foldPreviews(node.previews)}
extraClass={css.cardNamePlain} extraClass={css.cardNamePlain}
/> />
<CardBar state="done" stateWord={false}> <CardBar state="done" stateWord={false}>
<span className={css.barActivity}>{t('tasksFoldExpand')}</span> {/* The tally SAYS what was folded (✓N 已完成 · N 待命 · 出错 N): the
badge alone would read as "all done" once idle members ride along,
and the bar is too narrow for a tally AND an action word. */}
<span className={css.barActivity} title={foldTally(node)}>{foldTally(node)}</span>
<span className={css.barFold} aria-hidden="true"> <span className={css.barFold} aria-hidden="true">
<IconChevronDownOutlineRegular size={12} /> <IconChevronDownOutlineRegular size={12} />
</span> </span>
+4 -4
View File
@@ -20,8 +20,8 @@ import clsx from 'clsx'
import { IconLoadingOutlineRegular, StateDot } from '@deepseek-ai/dsh-client-ui-primitives' import { IconLoadingOutlineRegular, StateDot } from '@deepseek-ai/dsh-client-ui-primitives'
import type { TasksAgentNode, TasksNode, TasksWorkflowNode } from './tasks-model.ts' import type { TasksAgentNode, TasksNode, TasksWorkflowNode } from './tasks-model.ts'
import { import {
AgentGlyph, agentMeta, FoldGlyph, foldPreviews, LiveLine, nodeDotState, TaskLine, AgentGlyph, agentMeta, FoldGlyph, foldPreviews, foldTally, LiveLine, nodeDotState,
WorkflowGlyph, workflowMeta, TaskLine, WorkflowGlyph, workflowMeta,
} from './tasks-shared.tsx' } from './tasks-shared.tsx'
import { FoldToggleButton, ViewModeToggle } from './TasksGraph.tsx' import { FoldToggleButton, ViewModeToggle } from './TasksGraph.tsx'
import { t } from './locales.ts' import { t } from './locales.ts'
@@ -104,7 +104,7 @@ export function TasksTree(props: TasksTreeProps): ReactNode {
role="treeitem" role="treeitem"
tabIndex={0} tabIndex={0}
aria-level={depth + 1} aria-level={depth + 1}
aria-label={`${t('tasksFoldCompleted', { count: node.count })} · ${t('tasksFoldExpand')}`} aria-label={`${foldTally(node)} · ${t('tasksFoldExpand')}`}
className={clsx(css.treeRow, css.treeFoldRow)} className={clsx(css.treeRow, css.treeFoldRow)}
onClick={onToggleFold} onClick={onToggleFold}
onKeyDown={(event) => { activateOnKey(event, onToggleFold) }} onKeyDown={(event) => { activateOnKey(event, onToggleFold) }}
@@ -112,7 +112,7 @@ export function TasksTree(props: TasksTreeProps): ReactNode {
<span className={css.treeGlyph} aria-hidden="true"><FoldGlyph /></span> <span className={css.treeGlyph} aria-hidden="true"><FoldGlyph /></span>
<span className={css.treeContent}> <span className={css.treeContent}>
<span className={css.treeTitle}> <span className={css.treeTitle}>
{t('tasksFoldCompleted', { count: node.count })} {foldTally(node)}
<span className={css.treeMeta}> <span className={css.treeMeta}>
{t(folded ? 'tasksFoldExpand' : 'tasksFoldCollapse')} {t(folded ? 'tasksFoldExpand' : 'tasksFoldCollapse')}
</span> </span>
+1
View File
@@ -371,6 +371,7 @@ export const ar: Record<string, string> = {
settingsViewModeGraphDesc: 'مخطط عُقد متدرج مع تكبير وتحريك', settingsViewModeGraphDesc: 'مخطط عُقد متدرج مع تكبير وتحريك',
settingsViewModeTree: 'شجرة', settingsViewModeTree: 'شجرة',
settingsViewModeTreeDesc: 'شجرة كلاسيكية بمسافات بادئة، قابلة للتنقل بلوحة المفاتيح', settingsViewModeTreeDesc: 'شجرة كلاسيكية بمسافات بادئة، قابلة للتنقل بلوحة المفاتيح',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} مكتمل', tasksFoldCompleted: '✓ {count} مكتمل',
tasksFoldOne: 'الطي مع المكتملة', tasksFoldOne: 'الطي مع المكتملة',
tasksFoldExpand: 'توسيع العُقد المكتملة', tasksFoldExpand: 'توسيع العُقد المكتملة',
+1
View File
@@ -356,6 +356,7 @@ export const de: Record<string, string> = {
settingsViewModeGraphDesc: 'Geschichtetes Knotendiagramm mit Zoom und Schwenken', settingsViewModeGraphDesc: 'Geschichtetes Knotendiagramm mit Zoom und Schwenken',
settingsViewModeTree: 'Baum', settingsViewModeTree: 'Baum',
settingsViewModeTreeDesc: 'Klassischer Einrückungsbaum, per Tastatur navigierbar', settingsViewModeTreeDesc: 'Klassischer Einrückungsbaum, per Tastatur navigierbar',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} abgeschlossen', tasksFoldCompleted: '✓ {count} abgeschlossen',
tasksFoldOne: 'Zu Erledigten falten', tasksFoldOne: 'Zu Erledigten falten',
tasksFoldExpand: 'Abgeschlossene Knoten ausklappen', tasksFoldExpand: 'Abgeschlossene Knoten ausklappen',
+1
View File
@@ -363,6 +363,7 @@ export const fr: Record<string, string> = {
settingsViewModeGraphDesc: 'Graphe de nœuds en couches, avec zoom et panoramique', settingsViewModeGraphDesc: 'Graphe de nœuds en couches, avec zoom et panoramique',
settingsViewModeTree: 'Arbre', settingsViewModeTree: 'Arbre',
settingsViewModeTreeDesc: 'Arbre à indentation classique, navigable au clavier', settingsViewModeTreeDesc: 'Arbre à indentation classique, navigable au clavier',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} terminés', tasksFoldCompleted: '✓ {count} terminés',
tasksFoldOne: 'Replier avec les terminés', tasksFoldOne: 'Replier avec les terminés',
tasksFoldExpand: 'Déplier les nœuds terminés', tasksFoldExpand: 'Déplier les nœuds terminés',
+1
View File
@@ -370,6 +370,7 @@ export const hi: Record<string, string> = {
settingsViewModeGraphDesc: 'स्तरित नोड ग्राफ़, ज़ूम और पैन के साथ', settingsViewModeGraphDesc: 'स्तरित नोड ग्राफ़, ज़ूम और पैन के साथ',
settingsViewModeTree: 'ट्री', settingsViewModeTree: 'ट्री',
settingsViewModeTreeDesc: 'क्लासिक इंडेंटेड ट्री, कीबोर्ड से नेविगेट करने योग्य', settingsViewModeTreeDesc: 'क्लासिक इंडेंटेड ट्री, कीबोर्ड से नेविगेट करने योग्य',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} पूर्ण', tasksFoldCompleted: '✓ {count} पूर्ण',
tasksFoldOne: 'पूर्ण में समेटें', tasksFoldOne: 'पूर्ण में समेटें',
tasksFoldExpand: 'पूर्ण नोड्स विस्तारित करें', tasksFoldExpand: 'पूर्ण नोड्स विस्तारित करें',
+1
View File
@@ -368,6 +368,7 @@ export const id: Record<string, string> = {
settingsViewModeGraphDesc: 'Graf node berlapis dengan zoom dan pan', settingsViewModeGraphDesc: 'Graf node berlapis dengan zoom dan pan',
settingsViewModeTree: 'Pohon', settingsViewModeTree: 'Pohon',
settingsViewModeTreeDesc: 'Pohon indentasi klasik, dapat dinavigasi dengan keyboard', settingsViewModeTreeDesc: 'Pohon indentasi klasik, dapat dinavigasi dengan keyboard',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} selesai', tasksFoldCompleted: '✓ {count} selesai',
tasksFoldOne: 'Lipat ke selesai', tasksFoldOne: 'Lipat ke selesai',
tasksFoldExpand: 'Perluas node yang selesai', tasksFoldExpand: 'Perluas node yang selesai',
+1
View File
@@ -361,6 +361,7 @@ export const it: Record<string, string> = {
settingsViewModeGraphDesc: 'Grafo di nodi a livelli, con zoom e pan', settingsViewModeGraphDesc: 'Grafo di nodi a livelli, con zoom e pan',
settingsViewModeTree: 'Albero', settingsViewModeTree: 'Albero',
settingsViewModeTreeDesc: 'Albero a rientri classico, navigabile da tastiera', settingsViewModeTreeDesc: 'Albero a rientri classico, navigabile da tastiera',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} completati', tasksFoldCompleted: '✓ {count} completati',
tasksFoldOne: 'Raggruppa nei completati', tasksFoldOne: 'Raggruppa nei completati',
tasksFoldExpand: 'Espandi i nodi completati', tasksFoldExpand: 'Espandi i nodi completati',
+1
View File
@@ -370,6 +370,7 @@ export const ja: Record<string, string> = {
settingsViewModeGraphDesc: '階層ノードグラフ(ズーム・パン対応)', settingsViewModeGraphDesc: '階層ノードグラフ(ズーム・パン対応)',
settingsViewModeTree: 'ツリー', settingsViewModeTree: 'ツリー',
settingsViewModeTreeDesc: '従来のインデントツリー(キーボード操作可)', settingsViewModeTreeDesc: '従来のインデントツリー(キーボード操作可)',
tasksFoldIdle: '待機 {count}',
tasksFoldCompleted: '✓ {count} 件完了', tasksFoldCompleted: '✓ {count} 件完了',
tasksFoldOne: '完了済みにまとめる', tasksFoldOne: '完了済みにまとめる',
tasksFoldExpand: '完了ノードを展開', tasksFoldExpand: '完了ノードを展開',
+1
View File
@@ -362,6 +362,7 @@ export const ko: Record<string, string> = {
settingsViewModeGraphDesc: '계층형 노드 그래프, 확대/이동 가능', settingsViewModeGraphDesc: '계층형 노드 그래프, 확대/이동 가능',
settingsViewModeTree: '트리', settingsViewModeTree: '트리',
settingsViewModeTreeDesc: '클래식 들여쓰기 트리, 키보드 탐색 지원', settingsViewModeTreeDesc: '클래식 들여쓰기 트리, 키보드 탐색 지원',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} 완료됨', tasksFoldCompleted: '✓ {count} 완료됨',
tasksFoldOne: '완료 항목으로 접기', tasksFoldOne: '완료 항목으로 접기',
tasksFoldExpand: '완료된 노드 펼치기', tasksFoldExpand: '완료된 노드 펼치기',
+1
View File
@@ -368,6 +368,7 @@ export const nl: Record<string, string> = {
settingsViewModeGraphDesc: 'Gelaagde knoppengrafiek met in- en uitzoomen en pannen', settingsViewModeGraphDesc: 'Gelaagde knoppengrafiek met in- en uitzoomen en pannen',
settingsViewModeTree: 'Boom', settingsViewModeTree: 'Boom',
settingsViewModeTreeDesc: 'Klassieke inspringboom, navigeerbaar met het toetsenbord', settingsViewModeTreeDesc: 'Klassieke inspringboom, navigeerbaar met het toetsenbord',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} voltooid', tasksFoldCompleted: '✓ {count} voltooid',
tasksFoldOne: 'Vouwen bij afgerond', tasksFoldOne: 'Vouwen bij afgerond',
tasksFoldExpand: 'Voltooide knopen uitklappen', tasksFoldExpand: 'Voltooide knopen uitklappen',
+1
View File
@@ -372,6 +372,7 @@ export const pl: Record<string, string> = {
settingsViewModeGraphDesc: 'Warstwowy graf węzłów ze zoomowaniem i przesuwaniem', settingsViewModeGraphDesc: 'Warstwowy graf węzłów ze zoomowaniem i przesuwaniem',
settingsViewModeTree: 'Drzewo', settingsViewModeTree: 'Drzewo',
settingsViewModeTreeDesc: 'Klasyczne drzewo wcięć, nawigowalne z klawiatury', settingsViewModeTreeDesc: 'Klasyczne drzewo wcięć, nawigowalne z klawiatury',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} ukończonych', tasksFoldCompleted: '✓ {count} ukończonych',
tasksFoldOne: 'Zwiń do ukończonych', tasksFoldOne: 'Zwiń do ukończonych',
tasksFoldExpand: 'Rozwiń ukończone węzły', tasksFoldExpand: 'Rozwiń ukończone węzły',
+1
View File
@@ -353,6 +353,7 @@ export const pt: Record<string, string> = {
settingsViewModeGraphDesc: 'Grafo de nós em camadas, com zoom e deslocamento', settingsViewModeGraphDesc: 'Grafo de nós em camadas, com zoom e deslocamento',
settingsViewModeTree: 'Árvore', settingsViewModeTree: 'Árvore',
settingsViewModeTreeDesc: 'Árvore com indentação clássica, navegável pelo teclado', settingsViewModeTreeDesc: 'Árvore com indentação clássica, navegável pelo teclado',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} concluídos', tasksFoldCompleted: '✓ {count} concluídos',
tasksFoldOne: 'Dobrar nos concluídos', tasksFoldOne: 'Dobrar nos concluídos',
tasksFoldExpand: 'Expandir os nós concluídos', tasksFoldExpand: 'Expandir os nós concluídos',
+1
View File
@@ -368,6 +368,7 @@ export const ru: Record<string, string> = {
settingsViewModeGraphDesc: 'Многоуровневый граф узлов с масштабированием и панорамированием', settingsViewModeGraphDesc: 'Многоуровневый граф узлов с масштабированием и панорамированием',
settingsViewModeTree: 'Дерево', settingsViewModeTree: 'Дерево',
settingsViewModeTreeDesc: 'Классическое дерево с отступами, навигация с клавиатуры', settingsViewModeTreeDesc: 'Классическое дерево с отступами, навигация с клавиатуры',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} завершено', tasksFoldCompleted: '✓ {count} завершено',
tasksFoldOne: 'Свернуть в завершённые', tasksFoldOne: 'Свернуть в завершённые',
tasksFoldExpand: 'Развернуть завершённые узлы', tasksFoldExpand: 'Развернуть завершённые узлы',
+1
View File
@@ -353,6 +353,7 @@ export const sv: Record<string, string> = {
settingsViewModeGraphDesc: 'Lagerindelad nodgraf med zoom och panorering', settingsViewModeGraphDesc: 'Lagerindelad nodgraf med zoom och panorering',
settingsViewModeTree: 'Träd', settingsViewModeTree: 'Träd',
settingsViewModeTreeDesc: 'Klassiskt indragsträd, navigerbart med tangentbord', settingsViewModeTreeDesc: 'Klassiskt indragsträd, navigerbart med tangentbord',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} klara', tasksFoldCompleted: '✓ {count} klara',
tasksFoldOne: 'Vik ihop med klara', tasksFoldOne: 'Vik ihop med klara',
tasksFoldExpand: 'Visa färdiga noder', tasksFoldExpand: 'Visa färdiga noder',
+1
View File
@@ -370,6 +370,7 @@ export const th: Record<string, string> = {
settingsViewModeGraphDesc: 'กราฟโหนดแบบชั้น ซูมและเลื่อนได้', settingsViewModeGraphDesc: 'กราฟโหนดแบบชั้น ซูมและเลื่อนได้',
settingsViewModeTree: 'มุมมองต้นไม้', settingsViewModeTree: 'มุมมองต้นไม้',
settingsViewModeTreeDesc: 'ต้นไม้แบบเยื้องคลาสสิก นำทางด้วยคีย์บอร์ดได้', settingsViewModeTreeDesc: 'ต้นไม้แบบเยื้องคลาสสิก นำทางด้วยคีย์บอร์ดได้',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ เสร็จแล้ว {count}', tasksFoldCompleted: '✓ เสร็จแล้ว {count}',
tasksFoldOne: 'พับรวมกับที่เสร็จแล้ว', tasksFoldOne: 'พับรวมกับที่เสร็จแล้ว',
tasksFoldExpand: 'ขยายโหนดที่เสร็จแล้ว', tasksFoldExpand: 'ขยายโหนดที่เสร็จแล้ว',
+1
View File
@@ -370,6 +370,7 @@ export const tr: Record<string, string> = {
settingsViewModeGraphDesc: 'Yakınlaştırma ve kaydırma ile katmanlı düğüm grafiği', settingsViewModeGraphDesc: 'Yakınlaştırma ve kaydırma ile katmanlı düğüm grafiği',
settingsViewModeTree: 'Ağaç', settingsViewModeTree: 'Ağaç',
settingsViewModeTreeDesc: 'Klasik girintili ağaç, klavye ile gezilebilir', settingsViewModeTreeDesc: 'Klasik girintili ağaç, klavye ile gezilebilir',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} tamamlandı', tasksFoldCompleted: '✓ {count} tamamlandı',
tasksFoldOne: 'Tamamlananlara katla', tasksFoldOne: 'Tamamlananlara katla',
tasksFoldExpand: 'Tamamlanan düğümleri genişlet', tasksFoldExpand: 'Tamamlanan düğümleri genişlet',
+1
View File
@@ -370,6 +370,7 @@ export const vi: Record<string, string> = {
settingsViewModeGraphDesc: 'Đồ thị nút phân tầng với thu phóng và di chuyển', settingsViewModeGraphDesc: 'Đồ thị nút phân tầng với thu phóng và di chuyển',
settingsViewModeTree: 'Cây', settingsViewModeTree: 'Cây',
settingsViewModeTreeDesc: 'Cây thụt lề cổ điển, điều hướng được bằng bàn phím', settingsViewModeTreeDesc: 'Cây thụt lề cổ điển, điều hướng được bằng bàn phím',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} hoàn thành', tasksFoldCompleted: '✓ {count} hoàn thành',
tasksFoldOne: 'Gộp vào đã xong', tasksFoldOne: 'Gộp vào đã xong',
tasksFoldExpand: 'Mở rộng các nút đã hoàn thành', tasksFoldExpand: 'Mở rộng các nút đã hoàn thành',
+1
View File
@@ -385,6 +385,7 @@ export const zhHK: Record<string, string> = {
settingsViewModeGraphDesc: '分層節點圖,可縮放平移', settingsViewModeGraphDesc: '分層節點圖,可縮放平移',
settingsViewModeTree: '樹狀圖', settingsViewModeTree: '樹狀圖',
settingsViewModeTreeDesc: '經典縮排樹,可用鍵盤導航', settingsViewModeTreeDesc: '經典縮排樹,可用鍵盤導航',
tasksFoldIdle: '{count} 待命',
tasksFoldCompleted: '✓ {count} 已完成', tasksFoldCompleted: '✓ {count} 已完成',
tasksFoldOne: '收進已完成聚合', tasksFoldOne: '收進已完成聚合',
tasksFoldExpand: '展開已完成的節點', tasksFoldExpand: '展開已完成的節點',
+1
View File
@@ -385,6 +385,7 @@ export const zhMO: Record<string, string> = {
settingsViewModeGraphDesc: '分層節點圖,可縮放平移', settingsViewModeGraphDesc: '分層節點圖,可縮放平移',
settingsViewModeTree: '樹狀圖', settingsViewModeTree: '樹狀圖',
settingsViewModeTreeDesc: '經典縮排樹,可用鍵盤導航', settingsViewModeTreeDesc: '經典縮排樹,可用鍵盤導航',
tasksFoldIdle: '{count} 待命',
tasksFoldCompleted: '✓ {count} 已完成', tasksFoldCompleted: '✓ {count} 已完成',
tasksFoldOne: '收進已完成聚合', tasksFoldOne: '收進已完成聚合',
tasksFoldExpand: '展開已完成的節點', tasksFoldExpand: '展開已完成的節點',
+1
View File
@@ -385,6 +385,7 @@ export const zhTW: Record<string, string> = {
settingsViewModeGraphDesc: '分層節點圖,可縮放平移', settingsViewModeGraphDesc: '分層節點圖,可縮放平移',
settingsViewModeTree: '樹狀圖', settingsViewModeTree: '樹狀圖',
settingsViewModeTreeDesc: '經典縮排樹,可用鍵盤導航', settingsViewModeTreeDesc: '經典縮排樹,可用鍵盤導航',
tasksFoldIdle: '{count} 待命',
tasksFoldCompleted: '✓ {count} 已完成', tasksFoldCompleted: '✓ {count} 已完成',
tasksFoldOne: '收進已完成聚合', tasksFoldOne: '收進已完成聚合',
tasksFoldExpand: '展開已完成的節點', tasksFoldExpand: '展開已完成的節點',
+2
View File
@@ -382,6 +382,7 @@ export const zh = {
settingsViewModeGraphDesc: '分层节点图,可缩放平移', settingsViewModeGraphDesc: '分层节点图,可缩放平移',
settingsViewModeTree: '树状图', settingsViewModeTree: '树状图',
settingsViewModeTreeDesc: '经典缩进树,键盘可导航', settingsViewModeTreeDesc: '经典缩进树,键盘可导航',
tasksFoldIdle: '{count} 待命',
tasksFoldCompleted: '✓ {count} 已完成', tasksFoldCompleted: '✓ {count} 已完成',
tasksFoldOne: '收进已完成聚合', tasksFoldOne: '收进已完成聚合',
tasksFoldExpand: '展开已完成的节点', tasksFoldExpand: '展开已完成的节点',
@@ -865,6 +866,7 @@ export const en: Record<keyof typeof zh, string> = {
settingsViewModeGraphDesc: 'Layered node graph with zoom and pan', settingsViewModeGraphDesc: 'Layered node graph with zoom and pan',
settingsViewModeTree: 'Tree', settingsViewModeTree: 'Tree',
settingsViewModeTreeDesc: 'Classic indentation tree, keyboard navigable', settingsViewModeTreeDesc: 'Classic indentation tree, keyboard navigable',
tasksFoldIdle: 'Idle {count}',
tasksFoldCompleted: '✓ {count} completed', tasksFoldCompleted: '✓ {count} completed',
tasksFoldOne: 'Fold into completed', tasksFoldOne: 'Fold into completed',
tasksFoldExpand: 'Expand the completed nodes', tasksFoldExpand: 'Expand the completed nodes',
+14 -4
View File
@@ -31,16 +31,24 @@ export type CardKind = 'main' | 'subagent' | 'teammate' | 'workflow' | 'fold'
/** /**
* The kind badge's word: the SAME vocabulary the rest of the page uses (the * The kind badge's word: the SAME vocabulary the rest of the page uses (the
* header already calls the root "主代理"), so no sixth word is invented for it. * header already calls the root "主代理"), so no sixth word is invented for it.
*
* The aggregate's badge says 已完成 only when something WAS completed: an
* aggregate that sweeps idle teammates (or only failed rows) and still claimed
* "✓ N 已完成" would be lying about what is inside it, so `foldBadgeIdle`
* switches it to the idle word for exactly that case.
* @param kind - card kind. * @param kind - card kind.
* @param count - folded member count (the fold aggregate's badge only). * @param count - folded member count (the fold aggregate's badge only).
* @param foldBadgeIdle - the aggregate holds no completed row (see above).
*/ */
export function cardKindLabel(kind: CardKind, count = 0): string { export function cardKindLabel(kind: CardKind, count = 0, foldBadgeIdle = false): string {
switch (kind) { switch (kind) {
case 'main': return t('subagentMainAgent') case 'main': return t('subagentMainAgent')
case 'subagent': return t('tasksKindSubagent') case 'subagent': return t('tasksKindSubagent')
case 'teammate': return t('tasksKindTeammate') case 'teammate': return t('tasksKindTeammate')
case 'workflow': return t('tasksKindWorkflow') case 'workflow': return t('tasksKindWorkflow')
case 'fold': return t('tasksFoldCompleted', { count }) case 'fold': return foldBadgeIdle
? t('tasksFoldIdle', { count })
: t('tasksFoldCompleted', { count })
} }
} }
@@ -69,6 +77,8 @@ export function CardTop(props: {
kind: CardKind kind: CardKind
/** Folded member count, for the aggregate's badge. */ /** Folded member count, for the aggregate's badge. */
count?: number count?: number
/** Whether the aggregate holds no completed row (its badge switches word). */
badgeIdle?: boolean
/** Tree depth → the group colour of the badge and the card's left edge. */ /** Tree depth → the group colour of the badge and the card's left edge. */
depth: number depth: number
/** Workflow phase (a member's badge). */ /** Workflow phase (a member's badge). */
@@ -82,12 +92,12 @@ export function CardTop(props: {
/** Extra rows the caller appends (the team task line). */ /** Extra rows the caller appends (the team task line). */
children?: ReactNode children?: ReactNode
}): ReactNode { }): ReactNode {
const { kind, count, depth, phase } = props const { kind, count, badgeIdle, depth, phase } = props
return ( return (
<span className={clsx(css.cardTop, depthClass(depth))}> <span className={clsx(css.cardTop, depthClass(depth))}>
<span className={css.cardBadges}> <span className={css.cardBadges}>
<span className={css.kindBadge} data-card-kind={kind}> <span className={css.kindBadge} data-card-kind={kind}>
{cardKindLabel(kind, count ?? 0)} {cardKindLabel(kind, count ?? 0, badgeIdle === true)}
</span> </span>
{phase !== undefined && ( {phase !== undefined && (
<span <span
+78 -20
View File
@@ -107,6 +107,14 @@ export interface TasksFoldNode {
/** Tree depth (see {@link TasksAgentNode.depth}). */ /** Tree depth (see {@link TasksAgentNode.depth}). */
depth: number depth: number
count: number count: number
/** How many of {@link count} are done (the badge keeps saying 已完成). */
doneCount: number
/** How many are waiting for a turn (待命 idle members, never executing). */
idleCount: number
/** How many ended in a failure (出错). */
errorCount: number
/** Whether this row also sweeps IDLE team members (see {@link FOLD_IDLE_MIN}). */
hasIdle: boolean
/** The folded session ids, in original order (expansion restores them). */ /** The folded session ids, in original order (expansion restores them). */
memberIds: string[] memberIds: string[]
/** Up to two label previews for the collapsed subtitle. */ /** Up to two label previews for the collapsed subtitle. */
@@ -149,32 +157,68 @@ function childLabel(
} }
/** /**
* Whether the page-level fold rule may sweep this node into its parent's * Whether the aggregate may hide this node as part of a page-level fold. The
* aggregate. Everything the AUTO rule excludes, it excludes for a reason: * caller supplies `foldIdleMembers`: an idle teammate is only swept when its
* parent has enough of them ({@link FOLD_IDLE_MIN}).
* *
* - a branching node or one with a run of its own — folding it hides a whole * - a branching node or one with a run of its own — folding it hides a whole
* branch, not a finished leaf; * branch, not a finished leaf;
* - the session on screen — the "you are here" marker must stay reachable; * - the session on screen — the "you are here" marker must stay reachable;
* - a TEAMMATE — a roster row is a real, resumable worker the reader is * - a RUNNING or PROVISIONING node — work in flight is never hidden;
* watching, not a settled subagent to sweep away; * - a teammate — a roster row is a real, resumable worker, not a settled
* - anything not settled — 运行中 must never be hidden. * subagent to sweep away, so it needs the idle head count (a `failed` one
* is ordinary settled work and folds with the rest).
* *
* The manual trigger ({@link TasksModelInput.foldedIds}) shares only the last * The manual trigger ({@link TasksModelInput.foldedIds}) asks for ONE node by
* two guards; see `nodeBlocksFold`. * name, so it answers only to the running/current guards — a trigger that
* cannot fire is a dead control.
*/ */
function isAutoFoldable(node: TasksAgentNode, runsByOrigin: Map<string, WorkflowRunView[]>): boolean { function nodeFoldable(node: TasksAgentNode, currentSessionId: string): boolean {
const isLeaf = node.hasChildren !== true && !runsByOrigin.has(node.id) return !node.current && node.id !== currentSessionId
return isLeaf && node.team === undefined && node.state !== 'running'
}
/** The extra guard the PAGE-LEVEL rule adds to {@link nodeFoldable}. */
function isAutoFoldable(
node: TasksAgentNode,
runsByOrigin: Map<string, WorkflowRunView[]>,
foldIdleMembers: boolean,
): boolean {
if (!foldIdleMembers && node.team !== undefined) return false
return node.hasChildren !== true && !runsByOrigin.has(node.id)
} }
/** /**
* The guards BOTH fold triggers answer to: only a SETTLED node (done/error) * How many IDLE team members one parent needs before the page-level rule
* that is not the session on screen may be hidden — 运行中 and 待命 nodes stay * sweeps them into the aggregate too.
* visible under either trigger. *
* A teammate that has finished its turn is `idle`: it is not executing, has
* nothing in flight, and can be resumed later — the same fact a plain
* subagent reports as `done`. It used to stay out of the aggregate entirely,
* so a wide team kept a card per member forever. The count is kept at three
* on purpose: one or two idle members are the team's working set (and their
* cards are where a task line shows up), while three or more is a roster the
* reader is scanning rather than watching. Nothing is lost either way — the
* aggregate row names the counts and expands on one click.
*/ */
function nodeFoldable(node: TasksAgentNode, currentSessionId: string): boolean { export const FOLD_IDLE_MIN = 3
const settled = node.state === 'done' || node.state === 'error'
return settled && !node.current && node.id !== currentSessionId /** The state tally of one parent's folded children. */
interface FoldTally {
done: number
idle: number
error: number
}
/** Count the folded children by display state. */
function tally(folded: readonly TasksAgentNode[]): FoldTally {
const counts: FoldTally = { done: 0, idle: 0, error: 0 }
for (const node of folded) {
if (node.state === 'done') counts.done += 1
else if (node.state === 'idle') counts.idle += 1
else counts.error += 1
}
return counts
} }
/** /**
@@ -354,15 +398,19 @@ export function buildTasksModel(input: TasksModelInput): TasksNode[] {
} }
const visibleAgentChildren = agentChildren.filter(child => child.parentId === parentId) const visibleAgentChildren = agentChildren.filter(child => child.parentId === parentId)
// Fold: settled agent leaves of THIS parent collapse into one aggregate. // Fold: this parent's non-executing children collapse into one aggregate.
// Two triggers, two guard sets: the page-level `folded` rule also spares // Two triggers, two guard sets: the page-level `folded` rule also spares
// team members and branching nodes; a manual `foldedIds` fold is the // branching nodes and (below the idle head count) teammates; a manual
// reader asking for THAT node, so it only spares live/current work. // `foldedIds` fold is the reader asking for THAT node, so it only spares
// running/current work.
const idleMembers = visibleAgentChildren
.filter(child => child.state === 'idle' && child.team !== undefined).length
const foldIdleMembers = idleMembers >= FOLD_IDLE_MIN
const kept: TasksAgentNode[] = [] const kept: TasksAgentNode[] = []
const foldCandidates: TasksAgentNode[] = [] const foldCandidates: TasksAgentNode[] = []
for (const child of visibleAgentChildren) { for (const child of visibleAgentChildren) {
const foldable = nodeFoldable(child, currentSessionId) const foldable = nodeFoldable(child, currentSessionId)
const auto = folded && foldable && isAutoFoldable(child, runsByOrigin) const auto = folded && foldable && isAutoFoldable(child, runsByOrigin, foldIdleMembers)
const manual = foldedIds?.has(child.id) === true && foldable const manual = foldedIds?.has(child.id) === true && foldable
if (auto || manual) foldCandidates.push(child) if (auto || manual) foldCandidates.push(child)
else kept.push(child) else kept.push(child)
@@ -373,12 +421,17 @@ export function buildTasksModel(input: TasksModelInput): TasksNode[] {
appendChildren(child.id, child.depth) appendChildren(child.id, child.depth)
} }
if (foldCandidates.length > 0) { if (foldCandidates.length > 0) {
const counts = tally(foldCandidates)
out.push({ out.push({
kind: 'fold', kind: 'fold',
id: `fold:${parentId}`, id: `fold:${parentId}`,
parentId, parentId,
depth: depth + 1, depth: depth + 1,
count: foldCandidates.length, count: foldCandidates.length,
doneCount: counts.done,
idleCount: counts.idle,
errorCount: counts.error,
hasIdle: counts.idle > 0,
memberIds: foldCandidates.map(child => child.id), memberIds: foldCandidates.map(child => child.id),
previews: foldCandidates.slice(0, 2).map(child => child.label), previews: foldCandidates.slice(0, 2).map(child => child.label),
}) })
@@ -402,12 +455,17 @@ export function buildTasksModel(input: TasksModelInput): TasksNode[] {
} }
out.push(...keptMembers) out.push(...keptMembers)
if (foldedMembers.length > 0) { if (foldedMembers.length > 0) {
const counts = tally(foldedMembers)
out.push({ out.push({
kind: 'fold', kind: 'fold',
id: `fold:${runNode.id}`, id: `fold:${runNode.id}`,
parentId: runNode.id, parentId: runNode.id,
depth: runNode.depth + 1, depth: runNode.depth + 1,
count: foldedMembers.length, count: foldedMembers.length,
doneCount: counts.done,
idleCount: counts.idle,
errorCount: counts.error,
hasIdle: counts.idle > 0,
memberIds: foldedMembers.map(member => member.id), memberIds: foldedMembers.map(member => member.id),
previews: foldedMembers.slice(0, 2).map(member => member.label), previews: foldedMembers.slice(0, 2).map(member => member.label),
}) })
+25 -2
View File
@@ -18,7 +18,9 @@ import {
} from '@deepseek-ai/dsh-client-ui-primitives' } from '@deepseek-ai/dsh-client-ui-primitives'
import type { SidebarChildLiveView } from '../context-types.ts' import type { SidebarChildLiveView } from '../context-types.ts'
import { liveActivityLabel } from './process-labels.ts' import { liveActivityLabel } from './process-labels.ts'
import type { TasksAgentNode, TasksNodeState, TasksNodeTask, TasksWorkflowNode } from './tasks-model.ts' import type {
TasksAgentNode, TasksFoldNode, TasksNodeState, TasksNodeTask, TasksWorkflowNode,
} from './tasks-model.ts'
import { toolGlyph } from './tool-icons.tsx' import { toolGlyph } from './tool-icons.tsx'
import { t, type CopyKey } from './locales.ts' import { t, type CopyKey } from './locales.ts'
import css from './tasks-graph.module.css' import css from './tasks-graph.module.css'
@@ -280,7 +282,28 @@ export function LiveLine(props: { live: SidebarChildLiveView | undefined }): Rea
) )
} }
/** The fold aggregate's subtitle: up to two label previews joined by ·. */ /** The fold aggregate's subtitle: up to two label previews joined by `/`. */
export function foldPreviews(previews: readonly string[]): string { export function foldPreviews(previews: readonly string[]): string {
return previews.join(' / ') return previews.join(' / ')
} }
/**
* The fold aggregate's state tally — `✓ 2 已完成 · 3 待命 · 1 出错`.
*
* The aggregate has to SAY what it swallowed: the badge's "✓ N 已完成" is
* true only for the settled part, and an aggregate that also sweeps idle
* members (or errors) would otherwise read as a lie. Parts that are zero are
* omitted, so an all-done aggregate stays exactly as short as it was.
*/
export function foldTally(node: TasksFoldNode): string {
const parts: string[] = []
if (node.doneCount > 0) parts.push(t('tasksFoldCompleted', { count: node.doneCount }))
if (node.idleCount > 0) parts.push(t('tasksFoldIdle', { count: node.idleCount }))
if (node.errorCount > 0) parts.push(`${t('tasksStateError')} ${node.errorCount}`)
return parts.join(' · ')
}
/** The aggregate's cross-state badge word: 已完成 unless nothing is done. */
export function foldBadgeCount(node: TasksFoldNode): number {
return node.doneCount > 0 ? node.doneCount : node.count
}
+72
View File
@@ -226,6 +226,78 @@ describe('buildTasksModel', () => {
expect(fold).toMatchObject({ parentId: 'root', count: 2, memberIds: ['done-1', 'done-2'] }) expect(fold).toMatchObject({ parentId: 'root', count: 2, memberIds: ['done-1', 'done-2'] })
}) })
it('sweeps idle team members once a parent has FOLD_IDLE_MIN of them', () => {
// Three idle teammates = a roster the reader scans, not a working set:
// they fold, and the aggregate keeps saying who is only waiting.
const mates = ['m1', 'm2', 'm3']
const model = buildTasksModel(input({
catalogs: {
root: catalog(mates.map(id => child(id))),
...Object.fromEntries(mates.map(id => [id, catalog([])])),
},
byId: Object.fromEntries([['root', summary('root')], ...mates.map(id => [id, summary(id)])]),
teamMembers: mates.map(id => member({ id, name: id, status: 'idle' })),
}))
expect(model.map(node => node.id)).toEqual(['root', 'fold:root'])
expect(model.find(node => node.kind === 'fold')).toMatchObject({
count: 3, doneCount: 0, idleCount: 3, errorCount: 0, hasIdle: true,
memberIds: ['m1', 'm2', 'm3'],
})
})
it('keeps two idle team members visible (below the threshold)', () => {
const mates = ['m1', 'm2']
const model = buildTasksModel(input({
catalogs: {
root: catalog(mates.map(id => child(id))),
...Object.fromEntries(mates.map(id => [id, catalog([])])),
},
byId: Object.fromEntries([['root', summary('root')], ...mates.map(id => [id, summary(id)])]),
teamMembers: mates.map(id => member({ id, name: id, status: 'idle' })),
}))
expect(model.map(node => node.id)).toEqual(['root', 'm1', 'm2'])
})
it('never sweeps a RUNNING member even when the idle head count is met', () => {
const model = buildTasksModel(input({
catalogs: {
root: catalog(['m1', 'm2', 'm3', 'busy'].map(id => child(id))),
...Object.fromEntries(['m1', 'm2', 'm3', 'busy'].map(id => [id, catalog([])])),
},
byId: Object.fromEntries(
[['root', summary('root')], ...['m1', 'm2', 'm3', 'busy'].map(id => [id, summary(id)])],
),
live: running('busy'),
teamMembers: [
...['m1', 'm2', 'm3'].map(id => member({ id, name: id, status: 'idle' })),
member({ id: 'busy', name: 'busy', status: 'running' }),
],
}))
expect(model.map(node => node.id)).toEqual(['root', 'busy', 'fold:root'])
expect(model.find(node => node.kind === 'fold')).toMatchObject({ idleCount: 3, doneCount: 0 })
})
it('counts a mixed aggregate per state so the tally cannot over-claim', () => {
const model = buildTasksModel(input({
catalogs: {
root: catalog([child('m1'), child('m2'), child('m3'), child('done-1'), child('failed-1')]),
...Object.fromEntries(
['m1', 'm2', 'm3', 'done-1', 'failed-1'].map(id => [id, catalog([])]),
),
},
byId: Object.fromEntries(
[['root', summary('root')], ...['m1', 'm2', 'm3', 'done-1', 'failed-1'].map(id => [id, summary(id)])],
),
teamMembers: [
...['m1', 'm2', 'm3'].map(id => member({ id, name: id, status: 'idle' })),
member({ id: 'failed-1', name: 'failed-1', phase: 'failed', status: 'failed' }),
],
}))
expect(model.find(node => node.kind === 'fold')).toMatchObject({
count: 5, doneCount: 1, idleCount: 3, errorCount: 1,
})
})
it('keeps a child whose own catalog is unknown (never folds on missing data)', () => { it('keeps a child whose own catalog is unknown (never folds on missing data)', () => {
const model = buildTasksModel(input({ const model = buildTasksModel(input({
catalogs: { root: catalog([child('opaque')]) }, catalogs: { root: catalog([child('opaque')]) },
+20
View File
@@ -827,6 +827,26 @@ describe('Tasks page: the shared task window', () => {
unmount() unmount()
}) })
it('reports the idle part of the aggregate instead of claiming everything is done', async () => {
// Three idle teammates meet the idle head count, so the team folds — and
// the aggregate row has to say that they are WAITING, not finished.
const mate = (index: number): SidebarTeamMemberProjection => ({
id: `child-${index}`, name: `mate-${index}`, role: 'teammate', phase: 'active',
})
withTeam({ members: [{ id: 'root', name: 'lead', role: 'lead', phase: 'active' }, ...[0, 1, 2].map(mate)] })
const store = makeStore(snapshotWithChildren(3))
const { container, unmount } = renderRoot(
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
)
await flushJobs()
const aggregate = container.querySelector('[data-graph-node="fold:root"]') as HTMLElement
expect(aggregate).not.toBeNull()
expect(aggregate.textContent).toContain('3 待命')
// Nothing was completed, so the badge must not claim a completed count.
expect(aggregate.textContent).not.toContain('已完成')
unmount()
})
it('draws COLLAPSE and EXPAND with different glyphs (cluster, card, aggregate)', async () => { it('draws COLLAPSE and EXPAND with different glyphs (cluster, card, aggregate)', async () => {
const store = makeStore(snapshotWithChildren(2)) const store = makeStore(snapshotWithChildren(2))
const { container, unmount } = renderRoot( const { container, unmount } = renderRoot(