- 新增 src/client/jobs-client.ts:结构探测 ctx.jobs(watchRows / observe / state / kill),引用计数的按会话 roster 订阅、只观测展开的那一行、 跨树去重(无主任务归到承载它的被观测会话,树外 owner 丢弃)。 - 抽屉与输出浮窗改读该服务:行来自推送 roster(状态 / 时长 / owner / 进度), 输出面换 TerminalBlock 显示宿主为观察者流的保留输出(gapBefore → 截断提示、 error → 失败提示),kill 走 jobs.kill(owner, jobId),两击确认不变。 - 自动激活(use-host-feeds)改骑同一条推送 roster;detectNewJob 增加 「观测起点时钟」参数,避免「页面打开时已在跑的任务」被当成新工作。 - 删除 src/jobs-routes.ts(+ tests/jobs-routes.spec.ts)、index.ts 的三条路由、 api.jobsList/jobOutput/jobKill 与 JobOutputResult、context-types 的 SidebarJobsService(换成 SidebarClientJobsService/SidebarJobsSnapshot/ SidebarObservedJob 镜像,SidebarJobView 补 owner/progress)、 页面里的 jobs.list 轮询与 collectTreeJobs。 - 三个 spec 改用假 ctx.jobs 服务(jobs-view 14 例 / 自动激活 12 例 / 页面 20 例):观测只在展开行、切换与关闭释放观测、watch 隐藏时不建立、 卸载时全部释放、无服务时不渲染任务面。 验证:typecheck / lint 通过;pnpm test 1240 passed / 9 skipped;pnpm build + pack 通过。 (cherry picked from commit 7d9b82e73190218f05910433ed520cb90e4d4ab2)
505 lines
16 KiB
TypeScript
505 lines
16 KiB
TypeScript
/**
|
|
* Auto-activation regressions for issue #162: background activity (a new
|
|
* subagent, a new background job) activates the Tasks page in DSH's NATIVE
|
|
* right Sidebar — the column the two auto-open switches and the README promise
|
|
* ("wide viewports also expand the sidebar, while narrow full-screen drawers
|
|
* are not forced open"). The plugin's own bottom workbench is NOT that
|
|
* surface: it serves only its own flows (its + menu, the first-expansion
|
|
* auto-terminal), so a background activation must leave it exactly as it was.
|
|
*
|
|
* The narrow half of that promise is a PARK: the host draws the native column
|
|
* fullscreen below 768px and expands it on every open, so the activation places
|
|
* the tab and puts the column back to collapsed (src/client/sidebar/
|
|
* use-host-feeds.ts `activateTasksPage`). The topology jump-back is an explicit
|
|
* user gesture and always takes the host's expansion.
|
|
*
|
|
* "The current conversation" is the native surface's MOUNTED seat
|
|
* (`ctx.sidebarRight.mounted`): the session-list snapshot never carried a
|
|
* current-session field, so the park gate used to read a phantom one and was
|
|
* permanently false. Background jobs are likewise no longer mirrored into that
|
|
* snapshot — they arrive as whole-set rosters PUSHED by the host's client jobs
|
|
* service, so a job is delivered by publishing a frame.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement, useEffect, useRef, type ReactNode } from 'react'
|
|
import { createRoot, type Root } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
|
|
import { setupReactAct } from './test-utils.ts'
|
|
setupReactAct()
|
|
|
|
import { Sidebar } from '../src/client/Sidebar.tsx'
|
|
import { allLeaves, createSidebarStore, type SidebarStore } from '../src/client/state.ts'
|
|
import {
|
|
createBetterSidebarService,
|
|
type BetterSidebarService,
|
|
type SidebarSurface,
|
|
type TabComponentProps,
|
|
} from '../src/client/service.ts'
|
|
import type {
|
|
Context,
|
|
SidebarClientJobsService,
|
|
SidebarJobsSnapshot,
|
|
SidebarJobView,
|
|
SidebarSessionList,
|
|
} from '../src/context-types.ts'
|
|
|
|
class FakeWebSocket {
|
|
onmessage: ((event: { data: unknown }) => void) | null = null
|
|
onclose: (() => void) | null = null
|
|
onerror: (() => void) | null = null
|
|
close = (): void => {}
|
|
constructor(_url: string) {}
|
|
}
|
|
|
|
function makeSessionFeed(initial: SidebarSessionList) {
|
|
let snapshot = initial
|
|
const listeners = new Set<() => void>()
|
|
return {
|
|
getSnapshot: () => snapshot,
|
|
subscribe: (listener: () => void) => {
|
|
listeners.add(listener)
|
|
return () => { listeners.delete(listener) }
|
|
},
|
|
set(next: SidebarSessionList): void {
|
|
snapshot = next
|
|
for (const listener of [...listeners]) listener()
|
|
},
|
|
}
|
|
}
|
|
|
|
type SessionFeed = ReturnType<typeof makeSessionFeed>
|
|
|
|
/** One recorded native-surface open. */
|
|
interface NativeOpen {
|
|
sessionId: string
|
|
kind: string
|
|
params: unknown
|
|
revealIfOpened: boolean
|
|
}
|
|
|
|
/** The native right Sidebar, replaced by a recording stand-in: the shell's
|
|
* opens must reach THIS surface, not the plugin's own layout. */
|
|
interface NativeSurfaceSpy {
|
|
surface: SidebarSurface
|
|
opens: NativeOpen[]
|
|
}
|
|
|
|
function makeNativeSurfaceSpy(): NativeSurfaceSpy {
|
|
const opens: NativeOpen[] = []
|
|
return {
|
|
opens,
|
|
surface: {
|
|
openTab: input => { opens.push({ ...input }) },
|
|
openResource: () => {},
|
|
fileAddress: (sessionId, cwd, path) => `addr://${sessionId}${cwd ?? ''}${path}`,
|
|
close: () => undefined,
|
|
update: () => false,
|
|
activate: () => false,
|
|
has: () => false,
|
|
},
|
|
}
|
|
}
|
|
|
|
/** A subscribable seat observable (mirror of `ISidebarRight.mounted`). */
|
|
function makeMountedStore(initial: string | undefined) {
|
|
let snapshot = initial
|
|
const listeners = new Set<() => void>()
|
|
return {
|
|
getSnapshot: () => snapshot,
|
|
subscribe: (listener: () => void) => {
|
|
listeners.add(listener)
|
|
return () => { listeners.delete(listener) }
|
|
},
|
|
set(next: string | undefined): void {
|
|
if (next === snapshot) return
|
|
snapshot = next
|
|
for (const listener of [...listeners]) listener()
|
|
},
|
|
}
|
|
}
|
|
|
|
type MountedStore = ReturnType<typeof makeMountedStore>
|
|
|
|
/** `ctx.sidebarRight`, replaced by a stand-in column: `isExpanded` reports the
|
|
* current state, `toggleExpanded` flips it and counts the calls, and `mounted`
|
|
* is the seat observation the shell binds its per-session state to. */
|
|
interface NativeColumnSpy {
|
|
face: { isExpanded: () => boolean; toggleExpanded: () => void; mounted: MountedStore }
|
|
toggles: number
|
|
mounted: MountedStore
|
|
}
|
|
|
|
function makeNativeColumnSpy(expanded: boolean, mounted: string | undefined): NativeColumnSpy {
|
|
const spy = {
|
|
toggles: 0,
|
|
expanded,
|
|
mounted: makeMountedStore(mounted),
|
|
face: {} as { isExpanded: () => boolean; toggleExpanded: () => void; mounted: MountedStore },
|
|
}
|
|
spy.face = {
|
|
isExpanded: () => spy.expanded,
|
|
toggleExpanded: () => {
|
|
spy.toggles += 1
|
|
spy.expanded = !spy.expanded
|
|
},
|
|
mounted: spy.mounted,
|
|
}
|
|
return spy
|
|
}
|
|
|
|
/** Stands in for the Tasks page: its node click is the jump gesture that arms
|
|
* the shell's jump-back (fired once, like a real click). */
|
|
function JumpHarness({ onSubagentJump }: TabComponentProps): ReactNode {
|
|
const fired = useRef(false)
|
|
useEffect(() => {
|
|
if (fired.current) return
|
|
fired.current = true
|
|
onSubagentJump?.('child')
|
|
}, [onSubagentJump])
|
|
return null
|
|
}
|
|
|
|
interface MountedSidebar {
|
|
store: SidebarStore
|
|
service: BetterSidebarService
|
|
feed: SessionFeed
|
|
surface: NativeSurfaceSpy
|
|
column: NativeColumnSpy
|
|
sessionId: string
|
|
/** The client jobs feed the auto-open trigger watches (push rosters). */
|
|
jobs: JobsFeed
|
|
unmount: () => void
|
|
}
|
|
|
|
/**
|
|
* The host client jobs service double: `watchRows` opens a reference-counted
|
|
* roster stream and `publish` pushes a whole-set frame through the same
|
|
* subscribe/getSnapshot pair the trigger reads.
|
|
*/
|
|
interface JobsFeed {
|
|
service: SidebarClientJobsService
|
|
watched: string[]
|
|
released: string[]
|
|
publish(sessionId: string, jobs: readonly SidebarJobView[]): void
|
|
}
|
|
|
|
function makeJobsFeed(): JobsFeed {
|
|
let snapshot: SidebarJobsSnapshot = { rows: {}, observed: {} }
|
|
const listeners = new Set<() => void>()
|
|
const feed: JobsFeed = {
|
|
watched: [],
|
|
released: [],
|
|
service: {
|
|
state: {
|
|
getSnapshot: () => snapshot,
|
|
subscribe: (listener: () => void) => {
|
|
listeners.add(listener)
|
|
return () => { listeners.delete(listener) }
|
|
},
|
|
},
|
|
watchRows(sessionId: string) {
|
|
feed.watched.push(sessionId)
|
|
return () => { feed.released.push(sessionId) }
|
|
},
|
|
observe: () => () => {},
|
|
kill: async () => {},
|
|
},
|
|
publish(sessionId, jobs) {
|
|
snapshot = { rows: { ...snapshot.rows, ...(jobs.length === 0 ? {} : { [sessionId]: [...jobs] }) }, observed: {} }
|
|
if (jobs.length === 0) {
|
|
const { [sessionId]: _dropped, ...rest } = snapshot.rows
|
|
snapshot = { rows: rest, observed: {} }
|
|
}
|
|
for (const listener of [...listeners]) listener()
|
|
},
|
|
}
|
|
return feed
|
|
}
|
|
|
|
let sessionSeq = 0
|
|
const mounted: MountedSidebar[] = []
|
|
|
|
function setViewport(width: number): void {
|
|
Object.defineProperty(window, 'innerWidth', { configurable: true, value: width })
|
|
}
|
|
|
|
function mountSidebar(
|
|
width: number,
|
|
bottomOpen = false,
|
|
options: { columnExpanded?: boolean } = {},
|
|
): MountedSidebar {
|
|
setViewport(width)
|
|
vi.stubGlobal('WebSocket', FakeWebSocket)
|
|
const sessionId = `auto-activation-${++sessionSeq}`
|
|
const initial: SidebarSessionList = {
|
|
byId: {
|
|
[sessionId]: { id: sessionId, cwd: '/tmp', displayTitle: 'Root' },
|
|
},
|
|
}
|
|
const feed = makeSessionFeed(initial)
|
|
// Background jobs arrive through the host's own client jobs service
|
|
// (`ctx.jobs`): the feed below is what a test pushes rosters into.
|
|
const jobs = makeJobsFeed()
|
|
const store = createSidebarStore()
|
|
store.setPrefs({ ...store.getPrefs(), autoOpenSubagent: true, autoOpenJobs: true })
|
|
store.setSession(sessionId)
|
|
store.reduce(state => ({ ...state, bottomOpen }))
|
|
const service = createBetterSidebarService(store)
|
|
const surface = makeNativeSurfaceSpy()
|
|
service.setSurface(surface.surface)
|
|
service.registerTab({ id: 'subagent', title: 'Subagent', component: JumpHarness })
|
|
const column = makeNativeColumnSpy(options.columnExpanded ?? false, sessionId)
|
|
const localeSnapshot = { active: 'en' }
|
|
const ctx = {
|
|
locale: { subscribe: () => () => {}, getSnapshot: () => localeSnapshot },
|
|
sessions: { list: feed },
|
|
betterSidebar: service,
|
|
get: (name: string) => name === 'betterSidebar'
|
|
? service
|
|
: name === 'sidebarRight' ? column.face : name === 'jobs' ? jobs.service : undefined,
|
|
} as unknown as Context
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root: Root = createRoot(container)
|
|
act(() => { root.render(createElement(Sidebar, { ctx, store })) })
|
|
const result = {
|
|
store,
|
|
service,
|
|
feed,
|
|
surface,
|
|
column,
|
|
sessionId,
|
|
jobs,
|
|
unmount: () => {
|
|
act(() => { root.unmount() })
|
|
container.remove()
|
|
},
|
|
}
|
|
mounted.push(result)
|
|
return result
|
|
}
|
|
|
|
type ActivitySource = 'subagent' | 'job'
|
|
|
|
/** Deliver one piece of background activity through the host's own feeds. */
|
|
async function publishActivity(sidebar: MountedSidebar, source: ActivitySource): Promise<void> {
|
|
if (source === 'job') {
|
|
await publishJob(sidebar)
|
|
return
|
|
}
|
|
publishSubagent(sidebar)
|
|
flushSubagentDebounce()
|
|
}
|
|
|
|
function publishSubagent(sidebar: MountedSidebar): void {
|
|
const before = sidebar.feed.getSnapshot()
|
|
act(() => {
|
|
sidebar.feed.set({
|
|
...before,
|
|
byId: {
|
|
...before.byId,
|
|
child: {
|
|
id: 'child',
|
|
displayTitle: 'Worker',
|
|
origin: 'subagent',
|
|
parentId: sidebar.sessionId,
|
|
running: true,
|
|
},
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
function flushSubagentDebounce(): void {
|
|
act(() => { vi.advanceTimersByTime(500) })
|
|
}
|
|
|
|
/**
|
|
* Deliver one new job: the roster frame the host's client service pushes. The
|
|
* job's start stamp is AFTER the watch began, which is what makes it "new
|
|
* work" rather than a job that was already running when the page mounted.
|
|
*/
|
|
async function publishJob(sidebar: MountedSidebar): Promise<void> {
|
|
await flushFeeds()
|
|
sidebar.jobs.publish(sessionIdOf(sidebar), [{
|
|
id: 'bash-1',
|
|
kind: 'bash',
|
|
label: 'sleep 30',
|
|
status: 'running',
|
|
startedAt: Date.now() + 1,
|
|
}])
|
|
await flushFeeds()
|
|
}
|
|
|
|
/** The conversation the sidebar is bound to (its own store's session). */
|
|
function sessionIdOf(sidebar: MountedSidebar): string {
|
|
return sidebar.store.getSnapshot().sessionId ?? sidebar.sessionId
|
|
}
|
|
|
|
/** Let pending microtasks settle (the polled reads resolve outside timers). */
|
|
async function flushFeeds(): Promise<void> {
|
|
for (let tick = 0; tick < 4; tick++) {
|
|
await act(async () => { await Promise.resolve() })
|
|
}
|
|
}
|
|
|
|
/** Switch the conversation to the child session the Tasks page jumped to. */
|
|
function switchToChild(sidebar: MountedSidebar): void {
|
|
const before = sidebar.feed.getSnapshot()
|
|
act(() => {
|
|
sidebar.feed.set({
|
|
...before,
|
|
byId: {
|
|
...before.byId,
|
|
child: {
|
|
id: 'child',
|
|
displayTitle: 'Worker',
|
|
origin: 'subagent',
|
|
parentId: sidebar.sessionId,
|
|
running: true,
|
|
},
|
|
},
|
|
})
|
|
// The mounted seat is what moves the conversations: the shell binds its
|
|
// per-session state to it (the session list has no current-session field).
|
|
sidebar.column.mounted.set('child')
|
|
})
|
|
}
|
|
|
|
/** The Tasks page landed in the native right Sidebar (the default open). */
|
|
function expectNativeTasksOpen(sidebar: MountedSidebar, sessionId: string): void {
|
|
expect(sidebar.surface.opens).toEqual([{
|
|
sessionId,
|
|
kind: 'subagent',
|
|
params: expect.objectContaining({ title: expect.any(String) }),
|
|
revealIfOpened: true,
|
|
}])
|
|
}
|
|
|
|
/** The plugin's own bottom workbench kept its own state and gained no tab. */
|
|
function expectWorkbenchUntouched(sidebar: MountedSidebar, open = false): void {
|
|
const state = sidebar.store.getSnapshot().state!
|
|
expect(state.bottomOpen).toBe(open)
|
|
expect(allLeaves(state.bottomSplits).flatMap(leaf => leaf.tabs)
|
|
.filter(tab => tab.type === 'subagent')).toHaveLength(0)
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.useFakeTimers()
|
|
localStorage.clear()
|
|
})
|
|
|
|
afterEach(() => {
|
|
while (mounted.length > 0) mounted.pop()!.unmount()
|
|
vi.clearAllTimers()
|
|
vi.useRealTimers()
|
|
vi.unstubAllGlobals()
|
|
localStorage.clear()
|
|
document.body.innerHTML = ''
|
|
setViewport(1024)
|
|
})
|
|
|
|
describe('Sidebar background-activity auto-activation (#162)', () => {
|
|
it.each([
|
|
{ source: 'subagent', width: 390 },
|
|
{ source: 'job', width: 390 },
|
|
{ source: 'subagent', width: 1024 },
|
|
{ source: 'job', width: 1024 },
|
|
] as const)('$source activation at $width px activates the Tasks page in the native Sidebar', async ({ source, width }) => {
|
|
const sidebar = mountSidebar(width)
|
|
await publishActivity(sidebar, source)
|
|
expectNativeTasksOpen(sidebar, sidebar.sessionId)
|
|
expectWorkbenchUntouched(sidebar)
|
|
// Parking is the narrow-viewport half of the same promise.
|
|
expect(sidebar.column.toggles).toBe(width < 768 ? 1 : 0)
|
|
})
|
|
|
|
it.each(['subagent', 'job'] as const)('%s activation leaves a narrow fullscreen column to the park', async (source) => {
|
|
const sidebar = mountSidebar(390)
|
|
await publishActivity(sidebar, source)
|
|
expect(sidebar.column.toggles).toBe(1)
|
|
})
|
|
|
|
it('a narrow column the user already expanded is not closed under them', async () => {
|
|
const sidebar = mountSidebar(390, false, { columnExpanded: true })
|
|
await publishActivity(sidebar, 'subagent')
|
|
expectNativeTasksOpen(sidebar, sidebar.sessionId)
|
|
expect(sidebar.column.toggles).toBe(0)
|
|
})
|
|
|
|
it('a page that loads with jobs already running never triggers; the next NEW job does', async () => {
|
|
const sidebar = mountSidebar(1024)
|
|
// The conversation is already running work when the sidebar mounts: the
|
|
// first frame only ARMS the baseline (and the watch clock filters a job
|
|
// whose start stamp predates it), so it is never "new work".
|
|
sidebar.jobs.publish(sidebar.sessionId, [{
|
|
id: 'bash-0',
|
|
kind: 'bash',
|
|
label: 'already running',
|
|
status: 'running',
|
|
startedAt: Date.now() - 5_000,
|
|
}])
|
|
await flushFeeds()
|
|
expect(sidebar.surface.opens).toEqual([])
|
|
// A second, genuinely new job id is what surfaces the Tasks page.
|
|
sidebar.jobs.publish(sidebar.sessionId, [
|
|
{
|
|
id: 'bash-0',
|
|
kind: 'bash',
|
|
label: 'already running',
|
|
status: 'running',
|
|
startedAt: Date.now() - 5_000,
|
|
},
|
|
{ id: 'bash-1', kind: 'bash', label: 'sleep 30', status: 'running', startedAt: Date.now() + 1 },
|
|
])
|
|
await flushFeeds()
|
|
expectNativeTasksOpen(sidebar, sidebar.sessionId)
|
|
})
|
|
|
|
it('a session switch re-arms the job baseline instead of firing on the new session\'s jobs', async () => {
|
|
const sidebar = mountSidebar(1024)
|
|
sidebar.jobs.publish('child', [
|
|
{ id: 'bash-9', kind: 'bash', label: 'child work', status: 'running', startedAt: Date.now() + 1 },
|
|
])
|
|
switchToChild(sidebar)
|
|
await flushFeeds()
|
|
// The child's pre-existing job belongs to the NEW baseline, not to "new
|
|
// work in the session I am looking at" (the baseline resets on session).
|
|
expect(sidebar.surface.opens).toEqual([])
|
|
})
|
|
|
|
it('reads the viewport when the debounced activation fires, not when it arms', () => {
|
|
const sidebar = mountSidebar(1024)
|
|
publishSubagent(sidebar)
|
|
setViewport(390)
|
|
flushSubagentDebounce()
|
|
expectNativeTasksOpen(sidebar, sidebar.sessionId)
|
|
expect(sidebar.column.toggles).toBe(1)
|
|
})
|
|
|
|
it('leaves an already-open bottom workbench open and untouched', async () => {
|
|
const sidebar = mountSidebar(1024, true)
|
|
await publishActivity(sidebar, 'subagent')
|
|
expectNativeTasksOpen(sidebar, sidebar.sessionId)
|
|
expectWorkbenchUntouched(sidebar, true)
|
|
})
|
|
|
|
it('the topology jump-back opens the Tasks page for the child session and never parks it', () => {
|
|
const sidebar = mountSidebar(390)
|
|
// The Tasks page the user opened in the workbench (its own + menu) is what
|
|
// arms the jump: its node click records the child session.
|
|
act(() => {
|
|
sidebar.service.openTab(
|
|
{ type: 'subagent', title: 'Tasks', target: 'bottom' },
|
|
{ sessionId: sidebar.sessionId },
|
|
)
|
|
})
|
|
expect(sidebar.store.getSnapshot().state!.bottomOpen).toBe(true)
|
|
switchToChild(sidebar)
|
|
expectNativeTasksOpen(sidebar, 'child')
|
|
expect(sidebar.column.toggles).toBe(0)
|
|
})
|
|
})
|