|
|
@@ -3,18 +3,27 @@
|
|
|
* frame routing, and control baselines for uninstantiated sessions.
|
|
|
*/
|
|
|
|
|
|
-import { describe, expect, it, vi } from 'vitest'
|
|
|
+import { describe, expect, vi } from 'vitest'
|
|
|
import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client'
|
|
|
import { SessionSeq } from '@deepseek-ai/dsh-session/types'
|
|
|
import { RemoteError } from '@deepseek-ai/dsh-typert-protocol'
|
|
|
import type { SessionControlFrame } from '@deepseek-ai/dsh-api-session-controller/types'
|
|
|
+import type { SubagentAddress } from '@deepseek-ai/dsh-subagent/client'
|
|
|
+import { ok, type RemoteMock } from '@deepseek-ai/dsh-remote-mock'
|
|
|
+import {
|
|
|
+ createClientTest, type ClientTestFixtures, webApp,
|
|
|
+} from '@deepseek-ai/dsh-client-test-runtime/src/assembly/index.ts'
|
|
|
import type {} from '@deepseek-ai/dsh-session-title/client'
|
|
|
import { SessionManager } from '../src/client/sessions/manager.ts'
|
|
|
-import { FakeApiClient, deferred, err, fakeRemote, ok } from './fake-api.client.ts'
|
|
|
+import type { SessionRemotes } from '../src/client/sessions/remotes.ts'
|
|
|
import { entries, plainTurn } from './event-script.client.ts'
|
|
|
+import { FOLLOW, err, followScript, sessionWorld } from './remote/session.client.ts'
|
|
|
|
|
|
const S1 = 'fk-m1' as SessionId
|
|
|
const S2 = 'fk-m2' as SessionId
|
|
|
+/** A SessionManager's Remote methods use the same native mocks as an assembled client. */
|
|
|
+const API_ROSTER = webApp.closure(['@deepseek-ai/dsh-api-gateway'])
|
|
|
+const it = createClientTest({ roster: API_ROSTER })
|
|
|
|
|
|
type SummaryOver = Partial<{
|
|
|
updatedAt: number
|
|
|
@@ -29,16 +38,21 @@ function summary(sessionId: SessionId, over: SummaryOver = {}) {
|
|
|
return { sessionId, updatedAt: 100, running: false, blank: false, ...over }
|
|
|
}
|
|
|
|
|
|
-function makeManager(): SessionManager {
|
|
|
- const api = new FakeApiClient()
|
|
|
- return new SessionManager(fakeRemote(api))
|
|
|
+function makeManager(
|
|
|
+ mock: RemoteMock,
|
|
|
+ remote: ClientTestFixtures['remote'],
|
|
|
+ restoredSelection?: SessionId,
|
|
|
+ restoredAddress?: SubagentAddress,
|
|
|
+): SessionManager {
|
|
|
+ mock.load(sessionWorld)
|
|
|
+ // Cases using this helper never open a Session, so they do not need the broader Client Remote's $stream member.
|
|
|
+ return new SessionManager(remote as unknown as SessionRemotes, restoredSelection, restoredAddress)
|
|
|
}
|
|
|
|
|
|
describe('SessionManager instances', () => {
|
|
|
- it('lazily builds one resident instance per id and syncs the running bit from the list', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1, { running: true })] as never[] }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('lazily builds one resident instance per id and syncs the running bit from the list', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1, { running: true })] as never[] }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
const session = manager.get(S1)
|
|
|
expect(manager.get(S1)).toBe(session) // resident: same instance forever
|
|
|
@@ -48,97 +62,90 @@ describe('SessionManager instances', () => {
|
|
|
})
|
|
|
|
|
|
describe('list lifecycle', () => {
|
|
|
- it('single-flights refreshList and preserves the Host baseline order', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const gate = deferred<Awaited<ReturnType<FakeApiClient['onList']>>>()
|
|
|
- api.onList = () => gate.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('single-flights refreshList and preserves the Host baseline order', async ({ mock, remote }) => {
|
|
|
+ const gate = Promise.withResolvers<Awaited<ReturnType<typeof remote.session.list>>>()
|
|
|
+ remote.session.list.mockReturnValue(gate.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const first = manager.refreshList()
|
|
|
const second = manager.refreshList()
|
|
|
expect(manager.getListSnapshot().state).toBe('loading')
|
|
|
gate.resolve(ok({ items: [summary(S2, { updatedAt: 200 }), summary(S1)] as never[] }))
|
|
|
await Promise.all([first, second])
|
|
|
- expect(api.callsOf('session.list')).toHaveLength(1)
|
|
|
+ expect(remote.session.list).toHaveBeenCalledOnce()
|
|
|
const snapshot = manager.getListSnapshot()
|
|
|
expect(snapshot.state).toBe('idle')
|
|
|
expect(snapshot.items.map(i => i.sessionId)).toEqual([S2, S1])
|
|
|
})
|
|
|
|
|
|
- it('replays incremental frames over hydration and never batch-reorders established ids', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const first = deferred<Awaited<ReturnType<FakeApiClient['onList']>>>()
|
|
|
- api.onList = () => first.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('replays incremental frames over hydration and never batch-reorders established ids', async ({ mock, remote }) => {
|
|
|
+ const first = Promise.withResolvers<Awaited<ReturnType<typeof remote.session.list>>>()
|
|
|
+ remote.session.list.mockReturnValue(first.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const hydration = manager.refreshList()
|
|
|
manager.handleSessionAdded(summary(S2, { blank: true }))
|
|
|
first.resolve(ok({ items: [summary(S1)] as never[] }))
|
|
|
await hydration
|
|
|
expect(manager.getListSnapshot().items.map(item => item.sessionId)).toEqual([S2, S1])
|
|
|
|
|
|
- api.onList = () => Promise.resolve(ok({
|
|
|
+ remote.session.list.mockResolvedValue(ok({
|
|
|
items: [summary(S1, { updatedAt: 900 }), summary(S2, { updatedAt: 800 })] as never[],
|
|
|
}))
|
|
|
await manager.refreshList()
|
|
|
expect(manager.getListSnapshot().items.map(item => item.sessionId)).toEqual([S2, S1])
|
|
|
})
|
|
|
|
|
|
- it('advances list activity from the filtered Host notification', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1)] as never[] }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('advances list activity from the filtered Host notification', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1)] as never[] }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
|
|
|
manager.handleSessionActivity(S1, 500)
|
|
|
expect(manager.getListSnapshot().items[0]?.updatedAt).toBe(500)
|
|
|
})
|
|
|
|
|
|
- it('keeps the error in the list snapshot on failure', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(err(new RemoteError('gateway/internal', 'boom', {})))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('keeps the error in the list snapshot on failure', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(err(new RemoteError('gateway/internal', 'boom', {})))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
expect(manager.getListSnapshot()).toMatchObject({ state: 'error', error: { code: 'gateway/internal' } })
|
|
|
// A failed pull does not step the arrival phase: still pending.
|
|
|
expect(manager.getListSnapshot().phase).toBe('pending')
|
|
|
})
|
|
|
|
|
|
- it('phase steps pending → ready on the first successful pull and never returns', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('phase steps pending → ready on the first successful pull and never returns', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
expect(manager.getListSnapshot().phase).toBe('pending')
|
|
|
await manager.refreshList()
|
|
|
expect(manager.getListSnapshot().phase).toBe('ready')
|
|
|
// Sticky across later failures: the pull-activity axis reports the error,
|
|
|
// the arrival phase holds.
|
|
|
- api.onList = () => Promise.resolve(err(new RemoteError('gateway/internal', 'down', {})))
|
|
|
+ remote.session.list.mockResolvedValue(err(new RemoteError('gateway/internal', 'down', {})))
|
|
|
await manager.refreshList()
|
|
|
expect(manager.getListSnapshot()).toMatchObject({ state: 'error', phase: 'ready' })
|
|
|
// And across an empty re-pull (empty-with-ready = truly no sessions).
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [] as never[] }))
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [] as never[] }))
|
|
|
await manager.refreshList()
|
|
|
expect(manager.getListSnapshot()).toMatchObject({ state: 'idle', phase: 'ready' })
|
|
|
expect(manager.getListSnapshot().items).toEqual([])
|
|
|
})
|
|
|
|
|
|
- it('merges create into the list immediately without waiting for a refresh', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onCreate = () => Promise.resolve(ok({ sessionId: S2 }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('merges create into the list immediately without waiting for a refresh', async ({ mock, remote }) => {
|
|
|
+ remote.session.create.mockResolvedValue(ok({ sessionId: S2 }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const result = await manager.create()
|
|
|
expect(result).toMatchObject({ ok: true, value: { sessionId: S2 } })
|
|
|
expect(manager.getListSnapshot().items.map(i => i.sessionId)).toEqual([S2])
|
|
|
})
|
|
|
|
|
|
- it('retains title projections before list arrival, keeps last-wins by seq, and clears them on removal', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('retains title projections before list arrival, keeps last-wins by seq, and clears them on removal', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const titleFrame = (title: string, seq: number) => {
|
|
|
manager.handleControlFrame({ type: 'projection', sessionId: S1, key: 'title', value: title, seq })
|
|
|
}
|
|
|
titleFrame('Newest', 4)
|
|
|
titleFrame('Stale', 3)
|
|
|
titleFrame('Equal', 4)
|
|
|
- api.onList = () => Promise.resolve(ok({
|
|
|
+ remote.session.list.mockResolvedValue(ok({
|
|
|
items: [summary(S1), summary(S2, { updatedAt: 200 })] as never[],
|
|
|
}))
|
|
|
await manager.refreshList()
|
|
|
@@ -153,14 +160,13 @@ describe('list lifecycle', () => {
|
|
|
expect(manager.getListSnapshot().items.find(item => item.sessionId === S1)?.title).toBeUndefined()
|
|
|
})
|
|
|
|
|
|
- it('seeds cold titles from the list rows\' projections block under higher-seq-wins', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('seeds cold titles from the list rows\' projections block under higher-seq-wins', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
// A push frame landed before the list (S2's title is newer than the block's cut).
|
|
|
manager.handleControlFrame({
|
|
|
type: 'projection', sessionId: S2, key: 'title', value: 'Pushed', seq: 9,
|
|
|
})
|
|
|
- api.onList = () => Promise.resolve(ok({
|
|
|
+ remote.session.list.mockResolvedValue(ok({
|
|
|
items: [
|
|
|
{ ...summary(S1), projections: { asOfSeq: 4, values: { title: 'Cold cached' } } },
|
|
|
{ ...summary(S2, { updatedAt: 200 }), projections: { asOfSeq: 5, values: { title: 'List stale' } } },
|
|
|
@@ -174,10 +180,9 @@ describe('list lifecycle', () => {
|
|
|
expect(items.find(item => item.sessionId === S2)?.title).toBe('Pushed')
|
|
|
})
|
|
|
|
|
|
- it('drops a projection row beyond the subscription baseline before accepting its durable replay', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1)] as never[] }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('drops a projection row beyond the subscription baseline before accepting its durable replay', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1)] as never[] }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
const frame = (payload: SessionControlFrame) => { manager.handleControlFrame(payload) }
|
|
|
frame({ type: 'projection', sessionId: S1, key: 'title', value: 'Unflushed', seq: 4 })
|
|
|
@@ -209,13 +214,12 @@ describe('list lifecycle', () => {
|
|
|
})
|
|
|
|
|
|
describe('search', () => {
|
|
|
- it('returns bounded Host results and forwards the caller signal', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onSearch = () => Promise.resolve(ok({
|
|
|
+ it('returns bounded Host results and forwards the caller signal', async ({ mock, remote }) => {
|
|
|
+ remote.session.search.mockResolvedValue(ok({
|
|
|
items: [{ sessionId: S1, snippet: 'matching excerpt' }],
|
|
|
hasMore: true,
|
|
|
}))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const signal = new AbortController().signal
|
|
|
|
|
|
await expect(manager.search('exact phrase', signal)).resolves.toEqual({
|
|
|
@@ -225,29 +229,26 @@ describe('search', () => {
|
|
|
hasMore: true,
|
|
|
},
|
|
|
})
|
|
|
- expect(api.callsOf('session.search')).toEqual([{ query: 'exact phrase' }])
|
|
|
- expect(api.lastSearchSignal).toBe(signal)
|
|
|
+ expect(remote.session.search).toHaveBeenCalledWith({ query: 'exact phrase' }, signal)
|
|
|
})
|
|
|
|
|
|
- it('preserves business errors and propagates a non-Remote throw', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
- api.onSearch = () => Promise.resolve(err(new RemoteError('gateway/internal', 'index unavailable', {})))
|
|
|
+ it('preserves business errors and propagates a non-Remote throw', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
+ remote.session.search.mockResolvedValue(err(new RemoteError('gateway/internal', 'index unavailable', {})))
|
|
|
const signal = new AbortController().signal
|
|
|
await expect(manager.search('first', signal)).resolves.toMatchObject({
|
|
|
ok: false,
|
|
|
error: { code: 'gateway/internal', message: 'index unavailable' },
|
|
|
})
|
|
|
|
|
|
- api.onSearch = () => Promise.reject(new Error('wire down'))
|
|
|
+ remote.session.search.mockRejectedValue(new Error('wire down'))
|
|
|
await expect(manager.search('second', signal)).rejects.toThrow('wire down')
|
|
|
})
|
|
|
})
|
|
|
|
|
|
describe('Host Remote event routing', () => {
|
|
|
- it('adds/removes/flips sessions and keeps removed instances resident', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('adds/removes/flips sessions and keeps removed instances resident', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleSessionAdded(summary(S1, { blank: true }))
|
|
|
manager.handleSessionAdded(summary(S1, { blank: true })) // dup: ignored
|
|
|
expect(manager.getListSnapshot().items).toHaveLength(1)
|
|
|
@@ -268,20 +269,21 @@ describe('Host Remote event routing', () => {
|
|
|
})
|
|
|
|
|
|
describe('subagent catalogs', () => {
|
|
|
- it('keeps a catalog-discovered child address across ordinary selection and status frames', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [
|
|
|
+ it('keeps a catalog-discovered child address across ordinary selection and status frames', async ({ mock, remote, start }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [
|
|
|
summary(S1),
|
|
|
summary(S2, { parentSessionId: S1, origin: 'subagent' }),
|
|
|
] as never[] }))
|
|
|
- api.onSubagentList = () => Promise.resolve(ok({
|
|
|
+ remote.subagents.list.mockResolvedValue(ok({
|
|
|
entries: [{
|
|
|
kind: 'child', id: S2, mode: 'continuable', label: 'worker',
|
|
|
activity: 'running', hasChildren: false,
|
|
|
}] as never[],
|
|
|
parentAvailable: true,
|
|
|
}))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ mock.load(sessionWorld)
|
|
|
+ const client = await start()
|
|
|
+ const manager = new SessionManager(client.ctx.remote)
|
|
|
await manager.refreshList()
|
|
|
await manager.refreshSubagents(S1)
|
|
|
manager.selectSubagent({ parentSessionId: S1, childSessionId: S2, mode: 'continuable' })
|
|
|
@@ -305,7 +307,7 @@ describe('subagent catalogs', () => {
|
|
|
})
|
|
|
await manager.get(S2).open()
|
|
|
await manager.get(S2).prompt([{ type: 'text', text: 'continue' }], 'queue')
|
|
|
- expect(api.callsOf('session.follow')).toEqual([
|
|
|
+ expect(remote.session.follow.mock.calls.map(([request]) => request)).toEqual([
|
|
|
{
|
|
|
address: {
|
|
|
kind: 'subagent', parentSessionId: S1, childSessionId: S2, mode: 'continuable',
|
|
|
@@ -314,8 +316,8 @@ describe('subagent catalogs', () => {
|
|
|
maxMessages: 50,
|
|
|
},
|
|
|
])
|
|
|
- expect(api.callsOf('subagent.history')).toEqual([])
|
|
|
- expect(api.callsOf('subagents.prompt')).toEqual([
|
|
|
+ expect(remote.session.page).not.toHaveBeenCalled()
|
|
|
+ expect(remote.subagents.prompt.mock.calls.map(([request]) => request)).toEqual([
|
|
|
{
|
|
|
requestId: expect.any(String) as unknown as string,
|
|
|
parentSessionId: S1, childSessionId: S2,
|
|
|
@@ -325,14 +327,13 @@ describe('subagent catalogs', () => {
|
|
|
clientTimeZone: new Intl.DateTimeFormat().resolvedOptions().timeZone,
|
|
|
},
|
|
|
])
|
|
|
- expect(api.callsOf('session.history')).toEqual([])
|
|
|
- expect(api.callsOf('session.prompt')).toEqual([])
|
|
|
- const listCalls = api.callsOf('subagents.list').length
|
|
|
+ expect(remote.session.prompt).not.toHaveBeenCalled()
|
|
|
+ const listCalls = remote.subagents.list.mock.calls.length
|
|
|
manager.handleSessionStatus(S2, false)
|
|
|
expect(manager.getListSnapshot().subagentsByParent[S1]?.entries[0]).toMatchObject({
|
|
|
kind: 'child', id: S2, activity: 'inactive',
|
|
|
})
|
|
|
- expect(api.callsOf('subagents.list')).toHaveLength(listCalls)
|
|
|
+ expect(remote.subagents.list).toHaveBeenCalledTimes(listCalls)
|
|
|
|
|
|
manager.handleSessionRemoved(S2)
|
|
|
expect(manager.getListSnapshot().items.find(item => item.sessionId === S2)).toMatchObject({
|
|
|
@@ -346,33 +347,31 @@ describe('subagent catalogs', () => {
|
|
|
})
|
|
|
})
|
|
|
|
|
|
- it('refetches debounced membership only while the parent catalog is open', async () => {
|
|
|
+ it('refetches debounced membership only while the parent catalog is open', async ({ mock, remote }) => {
|
|
|
vi.useFakeTimers()
|
|
|
try {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshSubagents(S1)
|
|
|
manager.setSubagentCatalogOpen(S1, true)
|
|
|
await Promise.resolve()
|
|
|
- const baseline = api.callsOf('subagents.list').length
|
|
|
+ const baseline = remote.subagents.list.mock.calls.length
|
|
|
manager.handleSessionAdded(summary(S2, { parentSessionId: S1 }))
|
|
|
manager.handleSessionAdded(summary('fk-m3' as SessionId, { parentSessionId: S1 }))
|
|
|
await vi.advanceTimersByTimeAsync(50)
|
|
|
- expect(api.callsOf('subagents.list')).toHaveLength(baseline + 1)
|
|
|
+ expect(remote.subagents.list).toHaveBeenCalledTimes(baseline + 1)
|
|
|
|
|
|
manager.setSubagentCatalogOpen(S1, false)
|
|
|
manager.handleSessionAdded(summary('fk-m4' as SessionId, { parentSessionId: S1 }))
|
|
|
await vi.advanceTimersByTimeAsync(50)
|
|
|
- expect(api.callsOf('subagents.list')).toHaveLength(baseline + 1)
|
|
|
+ expect(remote.subagents.list).toHaveBeenCalledTimes(baseline + 1)
|
|
|
} finally {
|
|
|
vi.useRealTimers()
|
|
|
}
|
|
|
})
|
|
|
|
|
|
- it('marks a loaded parent row expandable only for a direct subagent publication', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('marks a loaded parent row expandable only for a direct subagent publication', async ({ mock, remote }) => {
|
|
|
const root = 'fk-root' as SessionId
|
|
|
- api.onSubagentList = () => Promise.resolve(ok({
|
|
|
+ remote.subagents.list.mockResolvedValue(ok({
|
|
|
entries: [
|
|
|
{
|
|
|
kind: 'child', id: S1, mode: 'continuable', label: 'parent',
|
|
|
@@ -385,7 +384,7 @@ describe('subagent catalogs', () => {
|
|
|
] as never[],
|
|
|
parentAvailable: true,
|
|
|
}))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshSubagents(root)
|
|
|
|
|
|
manager.handleSessionAdded(summary('fk-grandchild' as SessionId, {
|
|
|
@@ -399,12 +398,11 @@ describe('subagent catalogs', () => {
|
|
|
])
|
|
|
})
|
|
|
|
|
|
- it('preserves a live expandability hint across only the older in-flight catalog response', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('preserves a live expandability hint across only the older in-flight catalog response', async ({ mock, remote }) => {
|
|
|
const root = 'fk-root' as SessionId
|
|
|
- const response = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => response.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const response = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValue(response.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const refresh = manager.refreshSubagents(root)
|
|
|
|
|
|
manager.handleSessionAdded(summary('fk-grandchild' as SessionId, {
|
|
|
@@ -423,7 +421,7 @@ describe('subagent catalogs', () => {
|
|
|
{ kind: 'child', id: S1, hasChildren: true },
|
|
|
])
|
|
|
|
|
|
- api.onSubagentList = () => Promise.resolve(ok({
|
|
|
+ remote.subagents.list.mockResolvedValue(ok({
|
|
|
entries: [{
|
|
|
kind: 'child', id: S1, mode: 'continuable', label: 'parent',
|
|
|
activity: 'inactive', hasChildren: false,
|
|
|
@@ -436,12 +434,11 @@ describe('subagent catalogs', () => {
|
|
|
])
|
|
|
})
|
|
|
|
|
|
- it('replays status frames over an older in-flight catalog response', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('replays status frames over an older in-flight catalog response', async ({ mock, remote }) => {
|
|
|
const root = 'fk-root' as SessionId
|
|
|
- const response = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => response.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const response = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValue(response.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const refresh = manager.refreshSubagents(root)
|
|
|
|
|
|
manager.handleSessionStatus(S1, false)
|
|
|
@@ -467,16 +464,15 @@ describe('subagent catalogs', () => {
|
|
|
])
|
|
|
})
|
|
|
|
|
|
- it('marks a detached catalog child inactive without requiring a selected address', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onSubagentList = () => Promise.resolve(ok({
|
|
|
+ it('marks a detached catalog child inactive without requiring a selected address', async ({ mock, remote }) => {
|
|
|
+ remote.subagents.list.mockResolvedValue(ok({
|
|
|
entries: [{
|
|
|
kind: 'child', id: S2, mode: 'continuable', label: 'worker',
|
|
|
activity: 'running', hasChildren: false,
|
|
|
}] as never[],
|
|
|
parentAvailable: true,
|
|
|
}))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshSubagents(S1)
|
|
|
|
|
|
manager.handleSessionRemoved(S2)
|
|
|
@@ -486,31 +482,29 @@ describe('subagent catalogs', () => {
|
|
|
])
|
|
|
})
|
|
|
|
|
|
- it('coalesces overlapping catalog reads without scheduling a trailing pull', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('coalesces overlapping catalog reads without scheduling a trailing pull', async ({ mock, remote }) => {
|
|
|
const root = 'fk-root' as SessionId
|
|
|
- const first = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => first.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const first = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValue(first.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
|
|
|
const refresh = manager.refreshSubagents(root)
|
|
|
expect(manager.refreshSubagents(root)).toBe(refresh)
|
|
|
- api.onSubagentList = () => Promise.resolve(ok({ entries: [], parentAvailable: true }))
|
|
|
+ remote.subagents.list.mockResolvedValue(ok({ entries: [], parentAvailable: true }))
|
|
|
first.resolve(ok({ entries: [], parentAvailable: true }))
|
|
|
await refresh
|
|
|
|
|
|
- expect(api.callsOf('subagents.list')).toHaveLength(1)
|
|
|
+ expect(remote.subagents.list).toHaveBeenCalledOnce()
|
|
|
})
|
|
|
|
|
|
- it('runs one trailing catalog refresh for a membership change coalesced into an in-flight pull', async () => {
|
|
|
+ it('runs one trailing catalog refresh for a membership change coalesced into an in-flight pull', async ({ mock, remote }) => {
|
|
|
vi.useFakeTimers()
|
|
|
try {
|
|
|
- const api = new FakeApiClient()
|
|
|
const root = 'fk-root' as SessionId
|
|
|
- const first = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- const second = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => first.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api), root)
|
|
|
+ const first = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ const second = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValue(first.promise)
|
|
|
+ const manager = makeManager(mock, remote, root)
|
|
|
const refresh = manager.refreshSubagents(root)
|
|
|
manager.setSubagentCatalogOpen(root, true)
|
|
|
|
|
|
@@ -520,7 +514,7 @@ describe('subagent catalogs', () => {
|
|
|
// queue one trailing pull carrying the change.
|
|
|
manager.handleSessionAdded(summary(S2, { parentSessionId: root }))
|
|
|
await vi.advanceTimersByTimeAsync(50)
|
|
|
- api.onSubagentList = () => second.promise
|
|
|
+ remote.subagents.list.mockReturnValueOnce(second.promise)
|
|
|
first.resolve(ok({
|
|
|
entries: [{
|
|
|
kind: 'child', id: S1, mode: 'continuable', label: 'older',
|
|
|
@@ -547,7 +541,7 @@ describe('subagent catalogs', () => {
|
|
|
// The Remote face resolves one microtask after the response settles.
|
|
|
await vi.advanceTimersByTimeAsync(0)
|
|
|
|
|
|
- expect(api.callsOf('subagents.list')).toHaveLength(2)
|
|
|
+ expect(remote.subagents.list).toHaveBeenCalledTimes(2)
|
|
|
expect(manager.getListSnapshot().subagentsByParent[root]?.entries).toMatchObject([
|
|
|
{ kind: 'child', id: S1, label: 'older' },
|
|
|
{ kind: 'child', id: S2, label: 'new child' },
|
|
|
@@ -557,16 +551,15 @@ describe('subagent catalogs', () => {
|
|
|
}
|
|
|
})
|
|
|
|
|
|
- it('keeps removal invalidation across a stale success and failed trailing pull', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('keeps removal invalidation across a stale success and failed trailing pull', async ({ mock, remote }) => {
|
|
|
const root = 'fk-root' as SessionId
|
|
|
const child = () => ({
|
|
|
kind: 'child' as const, id: S2, mode: 'continuable' as const, label: 'worker',
|
|
|
activity: 'inactive' as const, hasChildren: false,
|
|
|
})
|
|
|
- const first = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => first.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const first = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValue(first.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const refresh = manager.refreshSubagents(root)
|
|
|
first.resolve(ok({ entries: [child()] as never[], parentAvailable: true }))
|
|
|
await refresh
|
|
|
@@ -574,12 +567,12 @@ describe('subagent catalogs', () => {
|
|
|
|
|
|
// The removal lands while a second pull is in flight: the invalidation
|
|
|
// must survive the pre-removal ok response, so one trailing pull runs.
|
|
|
- const mid = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => mid.promise
|
|
|
+ const mid = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValueOnce(mid.promise)
|
|
|
const midRefresh = manager.refreshSubagents(root)
|
|
|
manager.handleSessionRemoved(root)
|
|
|
- const trailing = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = () => trailing.promise
|
|
|
+ const trailing = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockReturnValueOnce(trailing.promise)
|
|
|
mid.resolve(ok({ entries: [child()] as never[], parentAvailable: true }))
|
|
|
await midRefresh
|
|
|
expect(manager.getListSnapshot().subagentsByParent[root]?.parentAvailable).toBe(false)
|
|
|
@@ -593,23 +586,22 @@ describe('subagent catalogs', () => {
|
|
|
})
|
|
|
})
|
|
|
|
|
|
- const rootCalls = api.callsOf('subagents.list').filter(call => call === root)
|
|
|
+ const rootCalls = remote.subagents.list.mock.calls.filter(([call]) => call === root)
|
|
|
expect(rootCalls).toHaveLength(3)
|
|
|
expect(manager.getListSnapshot().subagentsByParent[root]?.parentAvailable).toBe(false)
|
|
|
expect(manager.get(S2).getSnapshot().subagent).toMatchObject({ parentAvailable: false })
|
|
|
})
|
|
|
|
|
|
- it('invalidates catalog availability when the owning parent is removed', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('invalidates catalog availability when the owning parent is removed', async ({ mock, remote }) => {
|
|
|
const root = 'fk-root' as SessionId
|
|
|
- api.onSubagentList = () => Promise.resolve(ok({
|
|
|
+ remote.subagents.list.mockResolvedValue(ok({
|
|
|
entries: [{
|
|
|
kind: 'child', id: S2, mode: 'continuable', label: 'worker',
|
|
|
activity: 'inactive', hasChildren: false,
|
|
|
}] as never[],
|
|
|
parentAvailable: true,
|
|
|
}))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshSubagents(root)
|
|
|
manager.selectSubagent({ parentSessionId: root, childSessionId: S2, mode: 'continuable' })
|
|
|
expect(manager.get(S2).getSnapshot().subagent).toMatchObject({ parentAvailable: true })
|
|
|
@@ -622,56 +614,51 @@ describe('subagent catalogs', () => {
|
|
|
})
|
|
|
|
|
|
describe('remaining branches', () => {
|
|
|
- it('refreshList propagates a non-Remote throw', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.reject(new Error('list wire down'))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('refreshList propagates a non-Remote throw', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockRejectedValue(new Error('list wire down'))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await expect(manager.refreshList()).rejects.toThrow('list wire down')
|
|
|
})
|
|
|
|
|
|
- it('refreshList pushes running bits down to already-instantiated sessions', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('refreshList pushes running bits down to already-instantiated sessions', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const session = manager.get(S1)
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1, { running: true })] as never[] }))
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1, { running: true })] as never[] }))
|
|
|
await manager.refreshList()
|
|
|
expect(session.getSnapshot().running).toBe(true)
|
|
|
})
|
|
|
|
|
|
- it('create passes cwd and a preallocated id, folds transport throws, and deduplicates the echo', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onCreate = () => Promise.resolve(ok({ sessionId: S1 }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('create passes cwd and a preallocated id, folds transport throws, and deduplicates the echo', async ({ mock, remote }) => {
|
|
|
+ remote.session.create.mockResolvedValue(ok({ sessionId: S1 }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.create({ cwd: '/tmp/w', sessionId: S1 })
|
|
|
- expect(api.callsOf('session.create')).toEqual([{ cwd: '/tmp/w', sessionId: S1 }])
|
|
|
+ expect(remote.session.create).toHaveBeenCalledWith({ cwd: '/tmp/w', sessionId: S1 })
|
|
|
expect(manager.getListSnapshot().items[0]).toMatchObject({ sessionId: S1, cwd: '/tmp/w' })
|
|
|
await manager.create({ cwd: '/tmp/w' }) // same id returned: no duplicate row
|
|
|
expect(manager.getListSnapshot().items).toHaveLength(1)
|
|
|
- api.onCreate = () => Promise.reject(new Error('create wire down'))
|
|
|
+ remote.session.create.mockRejectedValue(new Error('create wire down'))
|
|
|
await expect(manager.create()).rejects.toThrow('create wire down')
|
|
|
// Business error passes through untouched.
|
|
|
- api.onCreate = () => Promise.resolve(err(new RemoteError('gateway/internal', 'no', {})))
|
|
|
+ remote.session.create.mockResolvedValue(err(new RemoteError('gateway/internal', 'no', {})))
|
|
|
expect(await manager.create()).toMatchObject({ ok: false })
|
|
|
})
|
|
|
|
|
|
- it('publishes a real Ungrouped summary from workspace-attach-failed', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onCreate = () => Promise.resolve(err(new RemoteError('session/workspace-attach-failed', 'published but unattached', {
|
|
|
+ it('publishes a real Ungrouped summary from workspace-attach-failed', async ({ mock, remote }) => {
|
|
|
+ remote.session.create.mockResolvedValue(err(new RemoteError('session/workspace-attach-failed', 'published but unattached', {
|
|
|
sessionId: S1, workspaceId: 'w1',
|
|
|
})))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const result = await manager.create({ workspaceId: 'w1' as never, sessionId: S1 })
|
|
|
expect(result).toMatchObject({ ok: false, error: { code: 'session/workspace-attach-failed' } })
|
|
|
expect(manager.getListSnapshot().items).toEqual([expect.objectContaining({ sessionId: S1 })])
|
|
|
expect(manager.getListSnapshot().items[0]).not.toHaveProperty('cwd')
|
|
|
})
|
|
|
|
|
|
- it('reconciles a fork child published before workspace attachment fails', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onFork = () => Promise.resolve(err(new RemoteError('session/workspace-attach-failed', 'forked but unattached', {
|
|
|
+ it('reconciles a fork child published before workspace attachment fails', async ({ mock, remote }) => {
|
|
|
+ remote.session.fork.mockResolvedValue(err(new RemoteError('session/workspace-attach-failed', 'forked but unattached', {
|
|
|
sessionId: S2, workspaceId: 'w1',
|
|
|
})))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const result = await manager.fork({ sessionId: S1 })
|
|
|
expect(result).toMatchObject({ ok: false, error: { code: 'session/workspace-attach-failed' } })
|
|
|
expect(manager.getListSnapshot().items).toEqual([expect.objectContaining({
|
|
|
@@ -681,10 +668,9 @@ describe('remaining branches', () => {
|
|
|
})])
|
|
|
})
|
|
|
|
|
|
- it('reconciles a preallocated id after an ordinary transport failure', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onCreate = () => Promise.reject(new Error('response lost'))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('reconciles a preallocated id after an ordinary transport failure', async ({ mock, remote }) => {
|
|
|
+ remote.session.create.mockRejectedValue(new Error('response lost'))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await expect(manager.create({ workspaceId: 'w1' as never, sessionId: S1 }))
|
|
|
.rejects.toThrow('response lost')
|
|
|
expect(manager.getListSnapshot().items).toEqual([])
|
|
|
@@ -697,9 +683,8 @@ describe('remaining branches', () => {
|
|
|
expect(manager.getListSnapshot().items).toHaveLength(1)
|
|
|
})
|
|
|
|
|
|
- it('subscribe notifies on list changes and stops after unsubscribe', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('subscribe notifies on list changes and stops after unsubscribe', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
let notified = 0
|
|
|
const unsubscribe = manager.subscribe(() => { notified++ })
|
|
|
await manager.refreshList()
|
|
|
@@ -712,17 +697,15 @@ describe('remaining branches', () => {
|
|
|
expect(notified).toBe(seen)
|
|
|
})
|
|
|
|
|
|
- it('ignores Host status and error events for sessions without an instance', () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('ignores Host status and error events for sessions without an instance', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleSessionStatus(S2, true)
|
|
|
manager.handleSessionError(S2, '无实例')
|
|
|
})
|
|
|
|
|
|
- it('keeps list-entry identity for unchanged rows across an unrelated list change', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1), summary(S2, { updatedAt: 200 })] as never[] }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('keeps list-entry identity for unchanged rows across an unrelated list change', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1), summary(S2, { updatedAt: 200 })] as never[] }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
const before = manager.getListSnapshot()
|
|
|
manager.handleSessionStatus(S2, true)
|
|
|
@@ -736,9 +719,8 @@ describe('remaining branches', () => {
|
|
|
expect(manager.getListSnapshot().items).toBe(after.items)
|
|
|
})
|
|
|
|
|
|
- it('carries parentSessionId from the added event into the lineage row', () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('carries parentSessionId from the added event into the lineage row', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleSessionAdded(summary(S1, { blank: true }))
|
|
|
manager.handleSessionAdded(summary(S2, {
|
|
|
blank: true, parentSessionId: S1, origin: 'subagent',
|
|
|
@@ -751,34 +733,34 @@ describe('remaining branches', () => {
|
|
|
})
|
|
|
|
|
|
describe('connected generation', () => {
|
|
|
- it('refreshes query baselines without rebuilding independently resumed Session sources', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onHistory = () => Promise.resolve(ok({
|
|
|
+ it('refreshes query baselines without rebuilding independently resumed Session sources', async ({ mock, remote, start }) => {
|
|
|
+ mock.stream(FOLLOW, followScript(ok({
|
|
|
records: entries(plainTurn(SessionSeq(0), 0, 'a', 'b')) as never[],
|
|
|
hasMore: false,
|
|
|
modelSelection: { provider: 'deepseek-official', model: 'deepseek-chat' },
|
|
|
- }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ })))
|
|
|
+ const client = await start()
|
|
|
+ const manager = new SessionManager(client.ctx.remote)
|
|
|
const openedSession = manager.get(S1)
|
|
|
await openedSession.open()
|
|
|
manager.get(S2) // instantiated but never opened
|
|
|
- const historyCallsBefore = api.callsOf('session.history').length
|
|
|
+ const historyCallsBefore = remote.session.page.mock.calls.length
|
|
|
manager.handleConnected()
|
|
|
await vi.waitFor(() => {
|
|
|
- expect(api.callsOf('session.list').length).toBe(1)
|
|
|
+ expect(remote.session.list).toHaveBeenCalledOnce()
|
|
|
})
|
|
|
- expect(api.callsOf('session.history')).toHaveLength(historyCallsBefore)
|
|
|
+ expect(remote.session.follow).toHaveBeenCalledOnce()
|
|
|
+ expect(remote.session.page).toHaveBeenCalledTimes(historyCallsBefore)
|
|
|
})
|
|
|
|
|
|
- it('retains the durable parent address and refreshes its catalogs across reconnect', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
+ it('retains the durable parent address and refreshes its catalogs across reconnect', async ({ mock, remote }) => {
|
|
|
const address = {
|
|
|
parentSessionId: S1, childSessionId: S2, mode: 'continuable' as const,
|
|
|
}
|
|
|
- const parent = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- const child = deferred<Awaited<ReturnType<FakeApiClient['onSubagentList']>>>()
|
|
|
- api.onSubagentList = payload => (payload === S1 ? parent.promise : child.promise)
|
|
|
- const manager = new SessionManager(fakeRemote(api), S2, address)
|
|
|
+ const parent = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ const child = Promise.withResolvers<Awaited<ReturnType<typeof remote.subagents.list>>>()
|
|
|
+ remote.subagents.list.mockImplementation(payload => (payload === S1 ? parent.promise : child.promise))
|
|
|
+ const manager = makeManager(mock, remote, S2, address)
|
|
|
|
|
|
manager.handleConnected()
|
|
|
expect(manager.get(S2).getSnapshot().subagent).toEqual({ address })
|
|
|
@@ -786,10 +768,10 @@ describe('connected generation', () => {
|
|
|
child.resolve(ok({ entries: [], parentAvailable: true }))
|
|
|
|
|
|
await vi.waitFor(() => {
|
|
|
- expect(api.callsOf('session.list')).toHaveLength(1)
|
|
|
+ expect(remote.session.list).toHaveBeenCalledOnce()
|
|
|
})
|
|
|
await vi.waitFor(() => {
|
|
|
- expect(api.callsOf('subagents.list')).toEqual([S1, S2])
|
|
|
+ expect(remote.subagents.list.mock.calls.map(([parentSessionId]) => parentSessionId)).toEqual([S1, S2])
|
|
|
})
|
|
|
expect(manager.get(S2).getSnapshot().subagent).toEqual({
|
|
|
address,
|
|
|
@@ -809,8 +791,8 @@ describe('completed reminder', () => {
|
|
|
const entry = (manager: SessionManager, sessionId: SessionId) =>
|
|
|
manager.getListSnapshot().items.find(item => item.sessionId === sessionId)
|
|
|
|
|
|
- it('arms on a running→idle flip of a non-selected session and clears on select', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('arms on a running→idle flip of a non-selected session and clears on select', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
added(manager, S1)
|
|
|
added(manager, S2)
|
|
|
manager.select(S1)
|
|
|
@@ -823,8 +805,8 @@ describe('completed reminder', () => {
|
|
|
expect(entry(manager, S2)?.completed).toBe(false)
|
|
|
})
|
|
|
|
|
|
- it('never arms for the session being watched and re-arms after a switch-away re-run', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('never arms for the session being watched and re-arms after a switch-away re-run', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
added(manager, S1)
|
|
|
added(manager, S2)
|
|
|
manager.select(S2)
|
|
|
@@ -838,8 +820,8 @@ describe('completed reminder', () => {
|
|
|
expect(entry(manager, S2)?.completed).toBe(true)
|
|
|
})
|
|
|
|
|
|
- it('a re-run disarms the reminder while running and re-arms on its completion', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('a re-run disarms the reminder while running and re-arms on its completion', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
added(manager, S1)
|
|
|
added(manager, S2)
|
|
|
manager.select(S1)
|
|
|
@@ -853,8 +835,8 @@ describe('completed reminder', () => {
|
|
|
expect(entry(manager, S2)?.completed).toBe(true)
|
|
|
})
|
|
|
|
|
|
- it('session-removed drops the reminder and a re-add starts clean', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('session-removed drops the reminder and a re-add starts clean', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
added(manager, S1)
|
|
|
added(manager, S2)
|
|
|
manager.select(S1)
|
|
|
@@ -867,35 +849,32 @@ describe('completed reminder', () => {
|
|
|
expect(entry(manager, S2)?.completed).toBe(false)
|
|
|
})
|
|
|
|
|
|
- it('a list refresh carrying the running→idle transition arms the reminder', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1), summary(S2, { updatedAt: 200, running: true })] as never[] }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('a list refresh carrying the running→idle transition arms the reminder', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1), summary(S2, { updatedAt: 200, running: true })] as never[] }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
manager.select(S1)
|
|
|
expect(entry(manager, S2)?.completed).toBe(false)
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1), summary(S2, { updatedAt: 200, running: false })] as never[] }))
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1), summary(S2, { updatedAt: 200, running: false })] as never[] }))
|
|
|
await manager.refreshList()
|
|
|
expect(entry(manager, S2)?.completed).toBe(true)
|
|
|
})
|
|
|
|
|
|
- it('never arms for sessions already idle at first observation', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1), summary(S2, { updatedAt: 200 })] as never[] }))
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('never arms for sessions already idle at first observation', async ({ mock, remote }) => {
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1), summary(S2, { updatedAt: 200 })] as never[] }))
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
await manager.refreshList()
|
|
|
manager.select(S1)
|
|
|
expect(entry(manager, S2)?.completed).toBe(false)
|
|
|
- api.onList = () => Promise.resolve(ok({ items: [summary(S1), summary(S2, { updatedAt: 201 })] as never[] }))
|
|
|
+ remote.session.list.mockResolvedValue(ok({ items: [summary(S1), summary(S2, { updatedAt: 201 })] as never[] }))
|
|
|
await manager.refreshList()
|
|
|
expect(entry(manager, S2)?.completed).toBe(false)
|
|
|
})
|
|
|
|
|
|
- it('arms a completion that happened during an in-flight first pull (baseline running, replayed idle)', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const gate = deferred<Awaited<ReturnType<FakeApiClient['onList']>>>()
|
|
|
- api.onList = () => gate.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('arms a completion that happened during an in-flight first pull (baseline running, replayed idle)', async ({ mock, remote }) => {
|
|
|
+ const gate = Promise.withResolvers<Awaited<ReturnType<typeof remote.session.list>>>()
|
|
|
+ remote.session.list.mockReturnValue(gate.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const refresh = manager.refreshList()
|
|
|
// The session finishes while the first pull is still in flight; the pull
|
|
|
// response recorded it as running at pull time.
|
|
|
@@ -905,11 +884,10 @@ describe('completed reminder', () => {
|
|
|
expect(entry(manager, S2)?.completed).toBe(true)
|
|
|
})
|
|
|
|
|
|
- it('arms when a session ran and completed entirely between in-flight mutations (baseline idle)', async () => {
|
|
|
- const api = new FakeApiClient()
|
|
|
- const gate = deferred<Awaited<ReturnType<FakeApiClient['onList']>>>()
|
|
|
- api.onList = () => gate.promise
|
|
|
- const manager = new SessionManager(fakeRemote(api))
|
|
|
+ it('arms when a session ran and completed entirely between in-flight mutations (baseline idle)', async ({ mock, remote }) => {
|
|
|
+ const gate = Promise.withResolvers<Awaited<ReturnType<typeof remote.session.list>>>()
|
|
|
+ remote.session.list.mockReturnValue(gate.promise)
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const refresh = manager.refreshList()
|
|
|
// The unknown session starts and finishes while the first pull is in
|
|
|
// flight; the pull-time baseline recorded it idle, so the running→idle
|
|
|
@@ -933,8 +911,8 @@ describe('background-job mirror', () => {
|
|
|
type: 'jobs', sessionId, jobs: jobs as never,
|
|
|
})
|
|
|
|
|
|
- it('mirrors the whole set last-wins, keyed per session, with no Session instance needed', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('mirrors the whole set last-wins, keyed per session, with no Session instance needed', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleControlFrame(tasksFrame(S1, [view()]))
|
|
|
manager.handleControlFrame(tasksFrame(S2, [view({ id: 'pwsh-1', label: 'other' })]))
|
|
|
const first = manager.getListSnapshot().jobsBySession
|
|
|
@@ -946,16 +924,16 @@ describe('background-job mirror', () => {
|
|
|
expect(manager.getListSnapshot().jobsBySession[S1]).toEqual([view({ status: 'completed' })])
|
|
|
})
|
|
|
|
|
|
- it('stores an emptied set as an absent key so absence and [] read alike', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('stores an emptied set as an absent key so absence and [] read alike', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleControlFrame(tasksFrame(S1, [view()]))
|
|
|
expect(S1 in manager.getListSnapshot().jobsBySession).toBe(true)
|
|
|
manager.handleControlFrame(tasksFrame(S1, []))
|
|
|
expect(S1 in manager.getListSnapshot().jobsBySession).toBe(false)
|
|
|
})
|
|
|
|
|
|
- it('clears the mirror when the next control baseline has no jobs', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('clears the mirror when the next control baseline has no jobs', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleControlFrame(tasksFrame(S1, [view()]))
|
|
|
manager.handleControlFrame({
|
|
|
type: 'baseline',
|
|
|
@@ -964,16 +942,16 @@ describe('background-job mirror', () => {
|
|
|
expect(S1 in manager.getListSnapshot().jobsBySession).toBe(false)
|
|
|
})
|
|
|
|
|
|
- it('drops the rows when the session is removed, whichever stream lands first', () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('drops the rows when the session is removed, whichever stream lands first', ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
manager.handleSessionAdded(summary(S1, { blank: true }))
|
|
|
manager.handleControlFrame(tasksFrame(S1, [view()]))
|
|
|
manager.handleSessionRemoved(S1)
|
|
|
expect(S1 in manager.getListSnapshot().jobsBySession).toBe(false)
|
|
|
})
|
|
|
|
|
|
- it('notifies list subscribers so an open header re-renders without a poll', async () => {
|
|
|
- const manager = makeManager()
|
|
|
+ it('notifies list subscribers so an open header re-renders without a poll', async ({ mock, remote }) => {
|
|
|
+ const manager = makeManager(mock, remote)
|
|
|
const seen = vi.fn()
|
|
|
manager.subscribe(seen)
|
|
|
manager.handleControlFrame(tasksFrame(S1, [view()]))
|
imccyu