Tianyi Cui
ee4cad3ada
The bridge now holds each session's `AgentHandle` disposer in its `SessionRecord` and runs it on teardown (client disconnect or fiber dispose) instead of the old `abort()` + `whenIdle()` drain that left agents registered. A bare client disconnect now leaves NO registered agent and NO session-store entry — not an idled-but-still-registered one. The queue-aware `cancel()` inside the disposer also closes the former pre-step best-effort window (a turn about to start is dropped), so teardown reaches true quiescence. The `session/load`-races-teardown leak is fixed: if the bridge closed while `resume()` was pending, the just-resumed handle is disposed before throwing, so it leaves no orphan (it has no SessionRecord, so quiesce() never sees it). Tests: the disconnect test now asserts (through the SAME memoized teardown) that the agent is unregistered AND its session removed; a durability test re-loads the persisted log after dispose and asserts the closing turn/end is on disk (guards the teardown-order contract); a sibling-isolation test proves one handle's dispose() leaves other agents untouched. Docs: agent / agent-loop / acp READMEs, architecture.md, and the stale in-code quiesce() ownership comment updated to the per-agent disposal model; the now-resolved TODO(rfc010-agent-disposal) / TODO(rfc010-cancel-prestep) teardown notes removed.
65 lines
3.3 KiB
TypeScript
65 lines
3.3 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it } from 'vitest'
|
|
import { mkdtemp, rm } from 'node:fs/promises'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import { PROTOCOL_VERSION } from '@agentclientprotocol/sdk'
|
|
import { makeBridgeHarness, textResponse, type BridgeHarness } from './harness.ts'
|
|
|
|
describe('acp bridge — demux & config edges', () => {
|
|
let storageDir: string
|
|
let harness: BridgeHarness | undefined
|
|
|
|
beforeEach(async () => { storageDir = await mkdtemp(join(tmpdir(), 'acp-edge-')) })
|
|
afterEach(async () => {
|
|
if (harness) await harness.dispose()
|
|
harness = undefined
|
|
await rm(storageDir, { recursive: true, force: true })
|
|
})
|
|
|
|
it('ignores events from an agent the bridge does not own (strict id demux)', async () => {
|
|
// A second agent created directly on the registry (NOT via the bridge) runs
|
|
// a turn. Its session/event + agent/status must NOT produce ACP updates and
|
|
// must not settle anything — the bridge demuxes strictly by its own id.
|
|
harness = await makeBridgeHarness({ storageDir, script: [textResponse('foreign')] })
|
|
await harness.client.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} })
|
|
await harness.client.newSession({ cwd: process.cwd(), mcpServers: [] })
|
|
const before = harness.updates.length
|
|
|
|
const { agent: foreign } = harness.ctx.agents.create({ agentId: 'foreign', sessionId: 'foreign-session', agentOptions: { model: 'mock' } })
|
|
foreign.send([{ type: 'text', text: 'hi' }])
|
|
await foreign.whenIdle()
|
|
await new Promise(r => setTimeout(r, 10))
|
|
|
|
// No update was emitted for the foreign agent's stream.
|
|
expect(harness.updates.length).toBe(before)
|
|
})
|
|
|
|
it('survives a session/update that the client rejects (best-effort notify)', async () => {
|
|
harness = await makeBridgeHarness({ storageDir, script: [textResponse('ok')] })
|
|
await harness.client.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} })
|
|
const { sessionId } = await harness.client.newSession({ cwd: process.cwd(), mcpServers: [] })
|
|
// Make the client reject every update — the bridge's notify() must swallow
|
|
// the rejection and the prompt must still settle normally.
|
|
harness.onSessionUpdateError = () => { throw new Error('client update rejected') }
|
|
const res = await harness.client.prompt({ sessionId, prompt: [{ type: 'text', text: 'go' }] })
|
|
expect(res.stopReason).toBe('end_turn')
|
|
})
|
|
|
|
it('accepts session/new with additionalDirectories empty', async () => {
|
|
// Exercises the defined-but-empty additionalDirectories branch (length 0 → allowed).
|
|
harness = await makeBridgeHarness({ storageDir })
|
|
await harness.client.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} })
|
|
const a = await harness.client.newSession({ cwd: process.cwd(), mcpServers: [], additionalDirectories: [] })
|
|
expect(a.sessionId).toBeTruthy()
|
|
})
|
|
|
|
it('rejects non-empty mcpServers until MCP wiring is implemented', async () => {
|
|
harness = await makeBridgeHarness({ storageDir })
|
|
await harness.client.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} })
|
|
await expect(harness.client.newSession({
|
|
cwd: process.cwd(),
|
|
mcpServers: [{ name: 'fs', command: 'npx', args: ['server'], env: [] }],
|
|
})).rejects.toThrow(/mcpServers/)
|
|
})
|
|
})
|