* fix(subagent): 子代理页实时预览改为批量接口,避免 O(N²) history 请求风暴
## 背景
DSH Web UI 中,当主代理同时运行多个子代理时,`dsh-better-sidebar` 的「任务管理/子代理」页面会出现明显卡顿。经调查,卡顿根因不在页面渲染,而在实时预览的请求模式。
## 根因
旧实现中,每个 running 子代理卡片都独立轮询 `subagents.history`:
- N 个 running 子代理 → 每 3 秒产生 N 次 `subagents.history` 请求;
- 每次 `subagents.history` 都会在 host 侧触发一次完整的 `listChildren` 全量子代理目录枚举;
- 子代理数量越多,服务端重复扫描越严重,近似 O(N²) 放大;
- 请求超过 3 秒时,客户端还会 abort 旧请求并重发,进一步形成请求风暴。
## 改动内容
1. **新增 host 批量接口 `POST /sidebar/api/subagents.live`**
- 请求 `{ rootSessionId }`;
- 通过 `ctx.subagents.listDescendants(rootSessionId)` 一次枚举整棵子代理树;
- 仅对 running 且非 Side Chat 的子代理,从 session events 尾部提取最新 `text/tool` 活动;
- 返回 `{ live: Record<childId, { text?, tool? }> }`;
- 缺 `subagents`/`agents` 服务或枚举失败时返回 503;单个子代理日志异常只跳过该子代理。
2. **客户端改为单轮询 + 单飞行请求**
- 删除每个 running 子代理独立的 `subagents.history` 定时器;
- 在 `SubagentView` 中合并为一个 `useSubagentLive` 轮询 hook;
- 使用递归 `setTimeout` 和单在途请求,慢请求不再被 abort/重发;
- 页面隐藏或 root 变化时停止轮询并中止在途请求。
3. **解析器优化**
- `lastActivity` 改为接收原始 `SidebarSessionEvent[]`;
- 从事件尾部向前扫描,找到最新 text 和 tool 后提前停止,避免复制/遍历完整历史。
4. **UI 保持不变**
- 实时预览的展示逻辑、文案、截断规则均未改变。
## 测试
- 新增 `tests/subagent-live-route.spec.ts`:覆盖批量接口成功聚合、只返回 running、跳过 Side Chat、缺服务 503、枚举失败 503、`ctx.get` 回退、bad-request。
- 新增 `tests/subagent-live-polling.spec.tsx`:覆盖每轮只发 1 次 `subagents.live`、不再调用 `subagents.history`、单在途不并发。
- 更新 `tests/subagent-activity.spec.ts` 与 `tests/subagent-jobs-view.spec.tsx`。
- `pnpm typecheck` ✅
- `pnpm build` ✅
- 相关测试 29 个全部通过 ✅
> 本机完整 `pnpm test` 仍有与本改动无关的环境性失败(node-pty 超时、Windows CRLF 断言、pty-deps 路径断言),不影响本 PR 逻辑。
* fix(subagent): live 预览以 catalog activity 为准,删除 agents 第二事实源 (#298)
- host 路由 running 门改回 entry.activity === 'running'(与客户端卡片渲染门一致),
恢复 PR 承诺的 UI 不变:turn 间 idle 的 continuable 子代理仍显示最后活动
- 删除 ctx.agents 依赖与 SidebarAgent.status 新增(agents 缺失时不再静默 200 空 map;
503 契约收窄为只涉及 subagents,与文档/测试一致)
- service 解析统一为 ctx.get('subagents')(兄弟路由惯例;插件未 inject subagents,
直接属性访问有抛错风险)
- buildSubagentLiveApi 签名改收完整 Context,删除 SidebarSubagentLiveContext 窄接口
- api.ts 复用 LastActivity,删除重复类型 SubagentLiveEntry
- 测试:route spec 删除 agents 相关用例;polling spec 新增页面隐藏停止轮询、
root 变化清空 live 并重启轮询两个用例
* fix(subagent): live 预览恢复最近 12 条消息窗口,排除陈旧活动 (#298)
CR 反馈:新批量接口把完整 session event log 喂给 lastActivity,
- 长时间只输出文本、早期调用过工具的 running 子代理会持续显示陈旧 tool
- 无 tool 的长会话每次轮询反向扫描整个事件数组,重新引入与历史长度
相关的 CPU 成本
修复(与旧 subagents.history({ maxMessages: 12 }) 窗口语义一致):
- lastActivity 增加可选 maxMessages 参数:反向扫描按表面消息
(user/message + assistant/message)计数,窗口满后更老事件一律跳过
- 路由传 LIVE_WINDOW_MESSAGES = 12(导出常量)
- 回归测试:窗口外旧 tool 不返回;窗口内 tool 保留;非消息事件不消耗配额
---------
Co-authored-by: Menghuan1918 <menghuan2003@outlook.com>
299 lines
12 KiB
TypeScript
299 lines
12 KiB
TypeScript
/**
|
|
* Subagent page tests for the background-job section: rows render from the
|
|
* `jobsBySession` mirror, clicking a row peeks its output through
|
|
* `jobs.output` with the OWNER session scope, the kill button needs a
|
|
* two-click confirm, settled rows offer no kill, and the output panel never
|
|
* polls while the page is hidden.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement, type ReactNode } from 'react'
|
|
import { createRoot, type Root } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
import { SubagentView } from '../src/client/SubagentView.tsx'
|
|
import type { Context, SidebarSessionList } from '../src/context-types.ts'
|
|
|
|
/** A subscribable sessions-list snapshot (mirror of the runtime list feed). */
|
|
function makeStore(initial: SidebarSessionList) {
|
|
let snapshot = initial
|
|
const listeners = new Set<() => void>()
|
|
return {
|
|
getSnapshot: () => snapshot,
|
|
subscribe: (fn: () => void) => {
|
|
listeners.add(fn)
|
|
return () => { listeners.delete(fn) }
|
|
},
|
|
set(next: SidebarSessionList) {
|
|
snapshot = next
|
|
for (const fn of [...listeners]) fn()
|
|
},
|
|
}
|
|
}
|
|
|
|
type Store = ReturnType<typeof makeStore>
|
|
|
|
/** The client context face SubagentView touches (history stub; everything else inert). */
|
|
function makeCtx(store: Store): Context {
|
|
return {
|
|
sessions: {
|
|
list: store,
|
|
setSubagentCatalogOpen: () => {},
|
|
openSubagent: () => {},
|
|
open: () => {},
|
|
refreshSubagents: async () => {},
|
|
},
|
|
connection: {
|
|
api: {
|
|
subagents: {
|
|
history: async () => ({ result: { ok: true, value: { events: [], hasMore: false } } }),
|
|
},
|
|
},
|
|
},
|
|
} as unknown as Context
|
|
}
|
|
|
|
/** Render `node` into a detached body container under React's act(). */
|
|
function mount(node: ReactNode): { container: HTMLDivElement; unmount: () => void } {
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root: Root = createRoot(container)
|
|
act(() => { root.render(node) })
|
|
const unmount = (): void => {
|
|
act(() => { root.unmount() })
|
|
container.remove()
|
|
}
|
|
return { container, unmount }
|
|
}
|
|
|
|
const outputCalls: Array<{ sessionId: string; id: string }> = []
|
|
const killCalls: Array<{ sessionId: string; id: string }> = []
|
|
|
|
function jsonResponse(value: unknown): Response {
|
|
return { ok: true, status: 200, json: async () => value } as unknown as Response
|
|
}
|
|
|
|
function baseSnapshot(): SidebarSessionList {
|
|
return {
|
|
current: 'root',
|
|
byId: {
|
|
root: { id: 'root', displayTitle: '主会话', running: true },
|
|
child: { id: 'child', displayTitle: '子代理', origin: 'subagent', parentId: 'root', running: true },
|
|
},
|
|
subagentsByParent: {},
|
|
jobsBySession: {
|
|
root: [
|
|
{ id: 'bash-1', kind: 'bash', label: 'sleep 300', status: 'running', startedAt: 1_000 },
|
|
],
|
|
child: [
|
|
{ id: 'bash-2', kind: 'bash', label: 'echo hi', status: 'completed', startedAt: 2_000, finishedAt: 3_000 },
|
|
],
|
|
},
|
|
}
|
|
}
|
|
|
|
beforeEach(() => {
|
|
outputCalls.length = 0
|
|
killCalls.length = 0
|
|
vi.stubGlobal('fetch', async (url: string | URL | Request, init?: RequestInit) => {
|
|
const method = String(url).split('/').pop()
|
|
const body = JSON.parse(String(init?.body)) as { sessionId?: string; id?: string; rootSessionId?: string }
|
|
if (method === 'subagents.live') {
|
|
return jsonResponse({ ok: true, value: { live: {} } })
|
|
}
|
|
if (method === 'jobs.output') {
|
|
outputCalls.push({ sessionId: body.sessionId ?? '', id: body.id ?? '' })
|
|
// bash-9 stands for a job the model never read (read:false).
|
|
return jsonResponse({
|
|
ok: true,
|
|
value: {
|
|
text: body.id === 'bash-9' ? '' : `output-of-${body.id ?? ''}`,
|
|
truncated: false,
|
|
read: body.id !== 'bash-9',
|
|
},
|
|
})
|
|
}
|
|
if (method === 'jobs.kill') {
|
|
killCalls.push({ sessionId: body.sessionId ?? '', id: body.id ?? '' })
|
|
return jsonResponse({ ok: true, value: { ok: true, outcome: 'requested' } })
|
|
}
|
|
throw new Error(`unexpected fetch ${String(url)}`)
|
|
})
|
|
Object.defineProperty(globalThis.navigator, 'language', { value: 'zh-CN', configurable: true })
|
|
})
|
|
|
|
afterEach(() => {
|
|
vi.unstubAllGlobals()
|
|
for (const el of document.querySelectorAll('body > div')) el.remove()
|
|
})
|
|
|
|
describe('SubagentView background jobs', () => {
|
|
it('renders the tree jobs with status, durations, and owner labels', () => {
|
|
const store = makeStore(baseSnapshot())
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
const text = container.textContent ?? ''
|
|
expect(text).toContain('后台任务')
|
|
expect(text).toContain('2 个后台任务 · 1 运行中')
|
|
// Both rows of the whole tree, owner-labeled (the tree spans two sessions).
|
|
expect(text).toContain('sleep 300')
|
|
expect(text).toContain('echo hi')
|
|
expect(text).toContain('主会话')
|
|
expect(text).toContain('子代理')
|
|
// Only the running row offers a kill button.
|
|
expect(container.querySelectorAll('button[aria-label="终止"]')).toHaveLength(1)
|
|
unmount()
|
|
})
|
|
|
|
it('renders nothing job-related when the mirror is empty', () => {
|
|
const store = makeStore({ current: 'root', byId: { root: { id: 'root', displayTitle: '主会话' } }, subagentsByParent: {}, jobsBySession: {} })
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
expect(container.textContent).not.toContain('后台任务')
|
|
unmount()
|
|
})
|
|
|
|
it('survives the mirror emptying while mounted (hook-order regression #300)', async () => {
|
|
const store = makeStore(baseSnapshot())
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
expect(container.textContent).toContain('sleep 300')
|
|
// The mirror empties (all jobs settled and dropped): the section must
|
|
// vanish WITHOUT reordering hooks — a hook below the empty-state return
|
|
// would crash React with "Rendered fewer hooks than expected" (the
|
|
// minified #300 the sidebar boundary surfaces with a retry button).
|
|
await act(async () => { store.set({ ...baseSnapshot(), jobsBySession: {} }) })
|
|
expect(container.textContent).not.toContain('后台任务')
|
|
// And returning jobs must work too, with the same hook order.
|
|
await act(async () => { store.set(baseSnapshot()) })
|
|
expect(container.textContent).toContain('sleep 300')
|
|
unmount()
|
|
})
|
|
|
|
it('shows the selected job output in the bottom dock, closeable', async () => {
|
|
const store = makeStore(baseSnapshot())
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
const row = container.querySelector('button[aria-label*="sleep 300"]') as HTMLButtonElement
|
|
await act(async () => { row.click() })
|
|
// The peek request carries the OWNER session (the fence compares it).
|
|
expect(outputCalls).toEqual([{ sessionId: 'root', id: 'bash-1' }])
|
|
expect(container.textContent).toContain('output-of-bash-1')
|
|
// Exactly one dock region exists (never one per row).
|
|
expect(container.querySelectorAll('[role="region"]')).toHaveLength(1)
|
|
// The selected row is marked, and the close button dismisses the dock.
|
|
expect(row.getAttribute('aria-pressed')).toBe('true')
|
|
const close = container.querySelector('button[aria-label="关闭"]') as HTMLButtonElement
|
|
await act(async () => { close.click() })
|
|
expect(container.textContent).not.toContain('output-of-bash-1')
|
|
expect(container.querySelectorAll('[role="region"]')).toHaveLength(0)
|
|
unmount()
|
|
})
|
|
|
|
it('switches the single dock between selected rows', async () => {
|
|
const store = makeStore(baseSnapshot())
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
const first = container.querySelector('button[aria-label*="sleep 300"]') as HTMLButtonElement
|
|
await act(async () => { first.click() })
|
|
expect(container.textContent).toContain('output-of-bash-1')
|
|
const second = container.querySelector('button[aria-label*="echo hi"]') as HTMLButtonElement
|
|
await act(async () => { second.click() })
|
|
// One dock, now fed by the second job (its owner session scopes the replay).
|
|
expect(outputCalls).toEqual([
|
|
{ sessionId: 'root', id: 'bash-1' },
|
|
{ sessionId: 'child', id: 'bash-2' },
|
|
])
|
|
expect(container.querySelectorAll('[role="region"]')).toHaveLength(1)
|
|
expect(container.textContent).not.toContain('output-of-bash-1')
|
|
expect(container.textContent).toContain('output-of-bash-2')
|
|
unmount()
|
|
})
|
|
|
|
it('explains when the model has not read the job yet', async () => {
|
|
const snapshot = baseSnapshot()
|
|
snapshot.jobsBySession = {
|
|
root: [
|
|
...(snapshot.jobsBySession?.root ?? []),
|
|
{ id: 'bash-9', kind: 'bash', label: 'unread cmd', status: 'running', startedAt: 9_000 },
|
|
],
|
|
}
|
|
const store = makeStore(snapshot)
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
const row = container.querySelector('button[aria-label*="unread cmd"]') as HTMLButtonElement
|
|
await act(async () => { row.click() })
|
|
// read:false → the pane explains the output awaits the model's job_output
|
|
// (never the model's cursor, so there is nothing to steal yet).
|
|
expect(container.textContent).toContain('等待模型读取该任务的输出')
|
|
unmount()
|
|
})
|
|
|
|
it('stays compact and functional with many jobs', async () => {
|
|
const many = Array.from({ length: 60 }, (_, index) => ({
|
|
id: `bash-${index + 10}`,
|
|
kind: 'bash' as const,
|
|
label: `bulk cmd ${index}`,
|
|
status: index % 2 === 0 ? ('running' as const) : ('completed' as const),
|
|
startedAt: 1_000 + index,
|
|
...(index % 2 === 0 ? {} : { finishedAt: 2_000 + index, detail: 'exit code: 1' }),
|
|
}))
|
|
const store = makeStore({
|
|
current: 'root',
|
|
byId: { root: { id: 'root', displayTitle: '主会话' } },
|
|
subagentsByParent: {},
|
|
jobsBySession: { root: many },
|
|
})
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
expect(container.textContent).toContain('60 个后台任务 · 30 运行中')
|
|
expect(container.querySelectorAll('button[aria-label*="bulk cmd"]')).toHaveLength(60)
|
|
// Clicking a row anywhere in the long list still feeds the single dock.
|
|
const row = container.querySelector('button[aria-label*="bulk cmd 59"]') as HTMLButtonElement
|
|
await act(async () => { row.click() })
|
|
expect(outputCalls).toEqual([{ sessionId: 'root', id: 'bash-69' }])
|
|
expect(container.textContent).toContain('output-of-bash-69')
|
|
unmount()
|
|
})
|
|
|
|
it('kills a live job only after the two-click confirm', async () => {
|
|
const store = makeStore(baseSnapshot())
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
|
)
|
|
const kill = container.querySelector('button[aria-label="终止"]') as HTMLButtonElement
|
|
await act(async () => { kill.click() })
|
|
// First click only arms the confirm — no request leaves the page.
|
|
expect(killCalls).toEqual([])
|
|
const confirm = container.querySelector('button[aria-label="再次点击确认终止"]')
|
|
expect(confirm).not.toBeNull()
|
|
await act(async () => { (confirm as HTMLButtonElement).click() })
|
|
expect(killCalls).toEqual([{ sessionId: 'root', id: 'bash-1' }])
|
|
unmount()
|
|
})
|
|
|
|
it('does not poll the output while the page is hidden', async () => {
|
|
vi.useFakeTimers()
|
|
try {
|
|
const store = makeStore(baseSnapshot())
|
|
const { container, unmount } = mount(
|
|
createElement(SubagentView, { sessionId: 'root', active: false, ctx: makeCtx(store) }),
|
|
)
|
|
const row = container.querySelector('button[aria-label*="sleep 300"]') as HTMLButtonElement
|
|
await act(async () => { row.click() })
|
|
await act(async () => { await vi.advanceTimersByTimeAsync(10_000) })
|
|
// One peek for the initial load; the 2s poll never ran while inactive.
|
|
expect(outputCalls).toHaveLength(1)
|
|
unmount()
|
|
} finally {
|
|
vi.useRealTimers()
|
|
}
|
|
})
|
|
})
|