feat(tasks): 适配 DSH 0.1.7 的 Agent Teams(读 projection + 写路由对接真实服务)

团队功能在 0.1.7 上整条失效:team-routes.ts 当初镜像的是 0.1.6 的 Remote 词汇
(remoteView / remoteCreateTask / remoteUpdateTask),而 0.1.7 把这三个方法删掉了,
读路径改到 Lead Session 的 `agentTeam` Session projection。真机 3080 复现:
teams.view 对带团队的会话返回 400 "membership.svc.remoteView is not a function",
于是 TeamBoard 从不渲染、节点富化与任务窗连带失效。

- 读:删掉 teams.view 与 5s 轮询,改读 SessionListState.projectionsBySession[root]
  .values.agentTeam(与 subagentCatalog 同源,推送式);新增 client/team-projection.ts
  做纯适配器,成员运行状态由 subagents.live 的 running 叠加、Lead 回退 session list
  (官方 README 的 "overlays activity from Session status")。projection 缺席 =
  这里没有团队,与旧的 {available:false}/{team:null} 合并成同一静默降级。
- 写:taskCreate/taskUpdate 改调 0.1.7 的 createTask/updateTask(返回已提交的 view,
  拒绝改为抛 TeamError),TEAM_TASK_STALE_REVISION → 409 team-conflict,其余 → 400
  team-error(wire 新增 team-conflict)。api.ts 的 writeTask 把失败信封还原成
  {ok:false,code,message} —— 原先窗口永远走不到该分支(readEnvelope 是抛)。
- 任务窗:外壳换成上一轮的 FloatingWindow(可拖拽/可拉伸/只在关闭或 Esc 时消失),
  动作行下沉到 shell 的 footer,长描述不再把动作推出视野。
- 真机抓到的两个单测抓不到的问题:
  1. 队列中任务的「完成」被宿主状态机拒绝(pending → claim → in_progress →
     complete → completed → reopen)→ 动作行跟随状态,pending 出「认领」;
  2. 认领后 Tag 变「阻塞」—— ready 的语义只是「pending 且无未完成 blocker」,
     对所有非 pending 任务都是 false → 抽出唯一规则 taskBlocked/taskStatusLabel/
     taskTone/taskDotState,四处展示点全部改走它。
- i18n:新增 teamTaskClaim / taskWindowCreate / taskWindowDetail /
  tasksStateProvisioning 词条 ×20 词典。

验证:typecheck / lint 通过;pnpm test 1276 passed / 9 skipped;
pnpm test:mount 7/7(真实 DSH 0.1.7-rc.2 挂载 + tab 全扫无崩溃)。
真机 3080(0.1.7-rc.1 + Agent Teams 实验层):看板从 projection 渲染、
队列任务「认领」→「完成」全链路写通(负责人 lead / 进行中 / 已完成)、
外部点击不关窗、Escape 关窗,截图见 docs/plans/2026-09-27-agent-teams-dsh-0.1.7-adaptation.md。

(cherry picked from commit dbc524e0b350c5d3564843f4776cd15d797506d8)
This commit is contained in:
Menghuan1918 committed 2026-09-27 22:19:05 +08:00
1 parent 421fd3fde7
commit d8bc6566df
40 files changed
+1352 -576

No files matched your search

+48 -7
View File
@@ -14,8 +14,9 @@ import {
import type {
SidebarSessionSummary,
SidebarSubagentCatalogEntry,
SidebarTeamMemberView,
} from '../src/context-types.ts'
import type { TeamMemberRow } from '../src/client/team-projection.ts'
import { taskBlocked, taskDotState, taskStatusLabel, taskTone } from '../src/client/tasks-shared.tsx'
import type { SubagentCatalogView } from '../src/client/subagent-catalog.ts'
import type { SidebarChildLiveView } from '../src/context-types.ts'
import type { WorkflowRunView } from '../src/workflow-runs.ts'
@@ -49,9 +50,9 @@ function run(over: Partial<WorkflowRunView> = {}): WorkflowRunView {
}
}
/** A team member view. */
function member(over: Partial<SidebarTeamMemberView> = {}): SidebarTeamMemberView {
return { id: 'x', name: 'n', role: 'teammate', status: 'running', diagnostics: [], ...over }
/** A derived roster row (the shape ./team-projection.ts hands the model). */
function member(over: Partial<TeamMemberRow> = {}): TeamMemberRow {
return { id: 'x', name: 'n', role: 'teammate', phase: 'active', status: 'running', diagnostics: [], ...over }
}
/** A base input; override per test. */
@@ -131,18 +132,27 @@ describe('buildTasksModel', () => {
expect(existing?.parentId).toBe('run:run-1')
})
it('enriches teammates and the lead from the team view', () => {
it('enriches teammates and the lead from the roster projection', () => {
const model = buildTasksModel(input({
catalogs: { root: catalog([child('w', { label: 'writer' })]) },
byId: { root: summary('root'), w: summary('w') },
teamMembers: [
member({ id: 'root', name: 'lead', role: 'lead' }),
member({ id: 'w', name: 'writer', model: 'glm-5.3', status: 'idle' }),
member({ id: 'w', name: 'writer', phase: 'active', status: 'idle' }),
],
}))
expect(agents(model).find(node => node.id === 'root')?.team?.role).toBe('lead')
const w = agents(model).find(node => node.id === 'w')
expect(w?.team).toMatchObject({ role: 'teammate', name: 'writer', model: 'glm-5.3' })
expect(w?.team).toMatchObject({ role: 'teammate', name: 'writer', phase: 'active', status: 'idle' })
})
it('gives a provisioning teammate the running node state', () => {
const model = buildTasksModel(input({
catalogs: { root: catalog([child('w')]) },
byId: { root: summary('root'), w: summary('w') },
teamMembers: [member({ id: 'w', phase: 'provisioning', status: 'provisioning' })],
}))
expect(agents(model).find(node => node.id === 'w')?.state).toBe('running')
})
it('folds settled leaves per parent and keeps running/teammate/current rows', () => {
@@ -255,3 +265,34 @@ describe('buildTasksModel: duplicate workflow members', () => {
expect(ghost).toMatchObject({ parentId: 'run:run-1', synthesized: true })
})
})
describe('shared task status rule (taskBlocked / taskStatusLabel / taskTone)', () => {
const facts = (status: 'pending' | 'in_progress' | 'completed', ready: boolean) => ({ status, ready })
it('calls a queued task with an open blocker blocked', () => {
expect(taskBlocked(facts('pending', false))).toBe(true)
expect(taskStatusLabel(facts('pending', false))).toBe('Blocked')
expect(taskTone(facts('pending', false))).toBe('warning')
})
it('never calls a CLAIMED task blocked, even though the service reports ready:false', () => {
// The board's `ready` flag means "a pending task clear to claim": it is
// false for every non-pending task, which is exactly how a task being
// actively worked on got labelled 阻塞 on the real board.
expect(taskBlocked(facts('in_progress', false))).toBe(false)
expect(taskStatusLabel(facts('in_progress', false))).toBe('In progress')
expect(taskTone(facts('in_progress', false))).toBe('info')
})
it('never calls a finished task blocked', () => {
expect(taskBlocked(facts('completed', false))).toBe(false)
expect(taskStatusLabel(facts('completed', false))).toBe('Completed')
expect(taskTone(facts('completed', false))).toBe('success')
})
it('reads a claimable queued task as pending, not blocked', () => {
expect(taskStatusLabel(facts('pending', true))).toBe('Pending')
expect(taskTone(facts('pending', true))).toBe('info')
expect(taskDotState(facts('pending', true))).toBe('ongoing')
})
})