b341155652
A plugin owning a standalone open/close bracket cannot tell a dead marker from a live one: an unmatched `compact/start` reads identically whether the previous writer died mid-compaction or a compaction is running now. `Session.firstLiveSeq` already holds that answer exactly, but only in memory. Append the log-only `session/inherited` event at that seq from the seeded constructor — the single waist all six seeded-start paths pass through (resume, configured startup on a persisted id, `sessions.fork()`, a subagent fork child, `adopt()`'s live prefix, and a bare seeded `create`). Read it through the new `isInheritedSeq(events, seq)`. The constructor placement means persistence needs no changes: the marker is already in `events` when a backend captures the creation seed, so it rides the ordinary seed path with no load-time write. It also covers fork, where the inherited bracket's owner may still be running — the case a persistence-layer boundary could not reach. Activity ordering excludes the boundary through `lastActivityTime()`, since lazy resume makes browsing a pickup and the three call sites would otherwise float every opened session to the top of a picker or list.
444 lines
20 KiB
TypeScript
444 lines
20 KiB
TypeScript
import { createToolResultMessage, createUserMessage } from '@deepseek-ai/dsh-llm'
|
||
/**
|
||
* Coordinator semantics against a bare fake backend — the RFC's named unit
|
||
* tier for the seam: adoption (fresh, seeded, re-adoption via the handoff
|
||
* cursor), the fixed chunk projection, deep-copy isolation, turn-latency and
|
||
* dispose-ordering pins, failure containment, and the `agent/error` relay.
|
||
*/
|
||
|
||
import { describe, expect, it, vi } from 'vitest'
|
||
import { Context } from 'cordis'
|
||
import SessionStore, { SessionId, type Session, type SessionEvent } from '@deepseek-ai/dsh-session'
|
||
import type { Agent } from '@deepseek-ai/dsh-agent'
|
||
import { TelemetryCoordinator, type TelemetryBackend, type TelemetryRecord } from '../src/index.ts'
|
||
|
||
declare module '@deepseek-ai/dsh-session' {
|
||
interface SessionEventMap {
|
||
/**
|
||
* Test-only merged event proving unknown types flow through unchanged.
|
||
* @mode emit
|
||
* @param payload - opaque test payload
|
||
*/
|
||
'telemetry-test/opaque': { payload: { nested: string[] } }
|
||
}
|
||
}
|
||
|
||
class FakeBackend implements TelemetryBackend {
|
||
records: TelemetryRecord[] = []
|
||
calls: string[] = []
|
||
emitError: Error | undefined
|
||
rejectSeq: number | undefined
|
||
shutdownError: Error | undefined
|
||
shutdownResolved = false
|
||
|
||
emit(record: TelemetryRecord): void {
|
||
if (this.emitError) throw this.emitError
|
||
if (this.rejectSeq !== undefined && record.attributes['event.seq'] === this.rejectSeq) {
|
||
throw new Error(`backend rejected seq ${this.rejectSeq}`)
|
||
}
|
||
this.records.push(record)
|
||
this.calls.push(`emit:${String(record.attributes['event.seq'] ?? record.attributes['telemetry.op'])}`)
|
||
}
|
||
|
||
flush = vi.fn()
|
||
|
||
async shutdown(): Promise<void> {
|
||
this.calls.push('shutdown')
|
||
await new Promise(resolve => setTimeout(resolve, 5))
|
||
if (this.shutdownError) throw this.shutdownError
|
||
this.shutdownResolved = true
|
||
}
|
||
|
||
ledger(): TelemetryRecord[] {
|
||
return this.records.filter(r => r.channel === 'ledger')
|
||
}
|
||
}
|
||
|
||
async function setup(backend: FakeBackend = new FakeBackend()) {
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
const fiber = await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
return { ctx, backend, fiber }
|
||
}
|
||
|
||
function liveSession(ctx: Context, id = `s-${Math.random().toString(36).slice(2)}`): Session {
|
||
return ctx.sessions.create(SessionId(id), { meta: {} })
|
||
}
|
||
|
||
function appendTurn(session: Session): void {
|
||
session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
|
||
session.append('user/message', createUserMessage({
|
||
content: [{ type: 'text', text: 'hello' }], source: { kind: 'user' },
|
||
}), { surfaceOp: 'append' })
|
||
}
|
||
|
||
describe('TelemetryCoordinator capture', () => {
|
||
it('hands every appended event over with envelope identity and cloned body', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const session = liveSession(ctx, 'cap')
|
||
appendTurn(session)
|
||
|
||
const start = backend.ledger()[0]!
|
||
const message = backend.ledger()[1]!
|
||
expect(start.attributes).toMatchObject({ 'session.id': 'cap', 'event.type': 'turn/start', 'event.seq': 0 })
|
||
expect(start.time).toBe(session.events[0]!.time)
|
||
expect(start.severity).toBe('info')
|
||
expect(message.attributes['event.seq']).toBe(1)
|
||
// Deep-copy isolation: mutating the handed-off body never reaches the log.
|
||
;(message.body as { content: { text: string }[] }).content[0]!.text = 'tampered'
|
||
const logged = session.events[1] as SessionEvent<'user/message'>
|
||
expect(logged.data.content[0]).toMatchObject({ text: 'hello' })
|
||
})
|
||
|
||
it('stamps header facts on every record when present', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const parent = SessionId('parent')
|
||
const session = ctx.sessions.create(SessionId('child'), { meta: { cwd: '/tmp/proj', parentSession: parent } })
|
||
appendTurn(session)
|
||
for (const record of backend.ledger()) {
|
||
expect(record.attributes['session.cwd']).toBe('/tmp/proj')
|
||
expect(record.attributes['session.parent_id']).toBe('parent')
|
||
}
|
||
})
|
||
|
||
it('maps outcome flags to severity, unknown types falling through as info', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const session = liveSession(ctx)
|
||
session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
|
||
session.append('tool/result', {
|
||
turn: 1, step: 1,
|
||
message: createToolResultMessage({
|
||
callId: 'c1' as never,
|
||
content: [],
|
||
isError: true,
|
||
}),
|
||
}, { surfaceOp: 'append' })
|
||
session.append('tool/result', {
|
||
turn: 1, step: 1,
|
||
message: createToolResultMessage({
|
||
callId: 'c2' as never,
|
||
content: [],
|
||
isError: false,
|
||
}),
|
||
}, { surfaceOp: 'append' })
|
||
session.append('telemetry-test/opaque', { payload: { nested: [] } })
|
||
session.append('turn/end', { turn: 1, reason: { kind: 'error', step: 1, message: 'boom' } })
|
||
const severities = backend.ledger().map(r => [r.attributes['event.type'], r.severity])
|
||
expect(severities).toEqual([
|
||
['turn/start', 'info'],
|
||
['tool/result', 'error'],
|
||
['tool/result', 'info'],
|
||
['telemetry-test/opaque', 'info'],
|
||
['turn/end', 'error'],
|
||
])
|
||
})
|
||
|
||
it('passes unknown merged event types through unchanged', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const session = liveSession(ctx)
|
||
session.append('telemetry-test/opaque', { payload: { nested: ['a', 'b'] } })
|
||
const record = backend.ledger()[0]!
|
||
expect(record.attributes['event.type']).toBe('telemetry-test/opaque')
|
||
expect(record.severity).toBe('info')
|
||
expect(record.body).toEqual({ payload: { nested: ['a', 'b'] } })
|
||
})
|
||
|
||
it('ships only the first chunk of each (turn, step), per session', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const a = liveSession(ctx, 'a')
|
||
const b = liveSession(ctx, 'b')
|
||
const chunk = (s: Session, turn: number, step: number, text: string) =>
|
||
s.append('assistant/chunk', { turn, step, chunk: { type: 'text-delta', index: 0, text } })
|
||
chunk(a, 1, 1, 'a11-first')
|
||
chunk(a, 1, 1, 'a11-second')
|
||
chunk(a, 1, 2, 'a12-first')
|
||
chunk(b, 1, 1, 'b11-first')
|
||
chunk(b, 1, 1, 'b11-second')
|
||
const shipped = backend.ledger().map(r => [r.attributes['session.id'], (r.body as { chunk: { text: string } }).chunk.text])
|
||
expect(shipped).toEqual([
|
||
['a', 'a11-first'],
|
||
['a', 'a12-first'],
|
||
['b', 'b11-first'],
|
||
])
|
||
})
|
||
})
|
||
|
||
describe('TelemetryCoordinator adoption', () => {
|
||
it('exports an unpublished suffix without re-exporting constructor history', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
const parent = liveSession(ctx, 'seed-parent')
|
||
appendTurn(parent)
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
const child = ctx.sessions.prepare(SessionId('seeded'), { seed: [...parent.events], meta: {} })
|
||
child.append('turn/end', { turn: 1, reason: { kind: 'completed' } })
|
||
ctx.sessions.enter(child)
|
||
ctx.sessions.announce(child)
|
||
|
||
const seqs = backend.ledger().map(r => [r.attributes['session.id'], r.attributes['event.seq']])
|
||
expect(seqs).toEqual(expect.arrayContaining([['seed-parent', 0], ['seed-parent', 1]]))
|
||
// 2 the boundary, 3 the turn/end: both this lifecycle's own writes, while
|
||
// inherited 0-1 stay with the parent stream.
|
||
expect(seqs.filter(([id]) => id === 'seeded')).toEqual([['seeded', 2], ['seeded', 3]])
|
||
})
|
||
|
||
it('resume shape: a full-log seed exports nothing yet still rebuilds the chunk projection', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
const donor = ctx.sessions.create(SessionId('donor'), { meta: {} })
|
||
donor.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
|
||
donor.append('assistant/chunk', { turn: 1, step: 1, chunk: { type: 'text-delta', index: 0, text: 'first' } })
|
||
const resumed = ctx.sessions.create(SessionId('resumed'), { seed: [...donor.events], meta: {} })
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
const ofResumed = () => backend.ledger()
|
||
.filter(r => r.attributes['session.id'] === 'resumed')
|
||
.map(r => r.attributes['event.seq'])
|
||
// Nothing inherited is re-exported; seq 2 is this session's own first
|
||
// write — the boundary its constructor appended over the seed.
|
||
expect(ofResumed()).toEqual([2])
|
||
// The seed fed the projection: the (turn 1, step 1) first chunk already
|
||
// shipped from the original process, so its continuation is re-dropped…
|
||
resumed.append('assistant/chunk', { turn: 1, step: 1, chunk: { type: 'text-delta', index: 0, text: 'continuation' } })
|
||
expect(ofResumed()).toEqual([2])
|
||
// …while a new step's first chunk exports normally.
|
||
resumed.append('assistant/chunk', { turn: 1, step: 2, chunk: { type: 'text-delta', index: 0, text: 'next step' } })
|
||
expect(ofResumed()).toEqual([2, 4])
|
||
})
|
||
|
||
it('stamps session.seed_length from the header so receivers can stitch fork streams', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
const parent = liveSession(ctx, 'stitch-parent')
|
||
appendTurn(parent)
|
||
const child = ctx.sessions.create(SessionId('stitch-child'), {
|
||
seed: [...parent.events],
|
||
meta: { parentSession: SessionId('stitch-parent'), seedLength: 2 },
|
||
})
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
child.append('turn/end', { turn: 1, reason: { kind: 'completed' } })
|
||
const record = backend.ledger().find(r => r.attributes['session.id'] === 'stitch-child')!
|
||
expect(record.attributes['session.parent_id']).toBe('stitch-parent')
|
||
expect(record.attributes['session.seed_length']).toBe(2)
|
||
})
|
||
|
||
it('adopts exactly once when created fires after the sweep', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
// The enter/announce window: prepare+enter puts the session in the store
|
||
// (visible to the constructor sweep) before `session/created` fires, so a
|
||
// coordinator loaded inside that window sees the session twice — sweep
|
||
// first, created second. The second adoption must be a no-op.
|
||
const session = ctx.sessions.prepare(SessionId('overlap'))
|
||
appendTurn(session)
|
||
ctx.sessions.enter(session)
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
expect(backend.ledger()).toHaveLength(2)
|
||
ctx.sessions.announce(session)
|
||
expect(backend.ledger()).toHaveLength(2)
|
||
})
|
||
|
||
it('resumes from the handoff cursor across a reload, re-dropping mid-step chunks', async () => {
|
||
const backend = new FakeBackend()
|
||
const { ctx, fiber } = await setup(backend)
|
||
const session = liveSession(ctx, 'hmr')
|
||
session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
|
||
session.append('assistant/chunk', { turn: 1, step: 1, chunk: { type: 'text-delta', index: 0, text: 'first' } })
|
||
expect(backend.ledger()).toHaveLength(2)
|
||
|
||
await fiber.dispose()
|
||
// The reload window: appends while no telemetry listener is registered.
|
||
session.append('assistant/chunk', { turn: 1, step: 1, chunk: { type: 'text-delta', index: 0, text: 'mid-step continuation' } })
|
||
session.append('turn/end', { turn: 1, reason: { kind: 'completed' } })
|
||
|
||
const second = new FakeBackend()
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry-2',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, second),
|
||
})
|
||
// Only the window events past the cursor are re-handed, and the mid-step
|
||
// continuation is re-dropped because ≤cursor events rebuilt the projection.
|
||
expect(second.ledger().map(r => r.attributes['event.type'])).toEqual(['turn/end'])
|
||
})
|
||
|
||
it('replays past a record the backend rejects: one event withheld, the rest adopted', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
const warn = vi.spyOn(ctx.logger, 'warn').mockImplementation(() => {})
|
||
const session = liveSession(ctx, 'partial')
|
||
appendTurn(session)
|
||
session.append('turn/end', { turn: 1, reason: { kind: 'completed' } })
|
||
// The backend rejects exactly the middle historical event: fail-closed
|
||
// must withhold THAT record only — an adoption replay that dies on the
|
||
// first contained failure would silently skip the rest of the log while
|
||
// the session stays marked adopted.
|
||
backend.rejectSeq = 1
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
expect(backend.ledger().map(r => r.attributes['event.seq'])).toEqual([0, 2])
|
||
expect(warn).toHaveBeenCalled()
|
||
})
|
||
|
||
it('re-hands the full log when no cursor survived (fresh session object)', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
const session = liveSession(ctx, 'fresh')
|
||
appendTurn(session)
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
expect(backend.ledger().map(r => r.attributes['event.seq'])).toEqual([0, 1])
|
||
})
|
||
})
|
||
|
||
describe('TelemetryCoordinator lifecycle and containment', () => {
|
||
it('forwards session/flush as a hint without awaiting backend work', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const session = liveSession(ctx)
|
||
let settled = false
|
||
backend.flush.mockImplementation(() => {
|
||
// The backend may kick off arbitrary async work; the loop's parallel must not wait for it.
|
||
void new Promise(resolve => setTimeout(resolve, 50)).then(() => { settled = true })
|
||
})
|
||
await ctx.parallel('session/flush', session)
|
||
expect(backend.flush).toHaveBeenCalledTimes(1)
|
||
expect(settled).toBe(false)
|
||
})
|
||
|
||
it('ignores flush hints for sessions it never adopted', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const stranger = ctx.sessions.prepare(SessionId('stranger'), { meta: {} })
|
||
await ctx.parallel('session/flush', stranger)
|
||
expect(backend.flush).not.toHaveBeenCalled()
|
||
})
|
||
|
||
it('emits no marker for a session whose announcement was vetoed before adoption', async () => {
|
||
const backend = new FakeBackend()
|
||
const ctx = new Context()
|
||
await ctx.plugin(SessionStore)
|
||
// A listener registered BEFORE the coordinator vetoes publication: the
|
||
// store still emits the paired `session/disposed` for rollback, but the
|
||
// coordinator never saw `session/created` — a marker for a session the
|
||
// receiver saw no activity from would be noise, not signal.
|
||
ctx.on('session/created', () => {
|
||
throw new Error('vetoed by an earlier listener')
|
||
})
|
||
await ctx.plugin({
|
||
name: 'fake-telemetry',
|
||
inject: ['sessions'],
|
||
apply: (inner: Context) => void new TelemetryCoordinator(inner, backend),
|
||
})
|
||
expect(() => ctx.sessions.create(SessionId('vetoed'), { meta: {} })).toThrow('vetoed')
|
||
expect(backend.records.filter(r => r.channel === 'ops')).toHaveLength(0)
|
||
})
|
||
|
||
it('emits each adopted session’s shutdown record before awaiting backend shutdown', async () => {
|
||
const { ctx, backend, fiber } = await setup()
|
||
liveSession(ctx, 's1')
|
||
liveSession(ctx, 's2')
|
||
await fiber.dispose()
|
||
expect(backend.calls).toEqual(['emit:shutdown', 'emit:shutdown', 'shutdown'])
|
||
expect(backend.shutdownResolved).toBe(true)
|
||
const ops = backend.records.filter(r => r.channel === 'ops')
|
||
expect(ops.map(r => r.attributes['session.id']).sort()).toEqual(['s1', 's2'])
|
||
expect(ops.every(r => r.attributes['telemetry.op'] === 'shutdown' && r.severity === 'info')).toBe(true)
|
||
expect(ops.every(r => !('event.seq' in r.attributes) && !('event.type' in r.attributes))).toBe(true)
|
||
})
|
||
|
||
it('emits the shutdown marker at the session’s own disposal edge, then retires it', async () => {
|
||
const { ctx, backend, fiber } = await setup()
|
||
liveSession(ctx, 'survivor')
|
||
// A session owned by its own fiber: disposing the fiber detaches it from
|
||
// the store and emits `session/disposed` — the authoritative termination
|
||
// edge. The marker must ride THAT edge (receivers classify a session with
|
||
// activity and no marker as crashed, so a normally closed session in a
|
||
// long-running host must not look like a crash), and the session retires
|
||
// from the adopted set so unload neither retains it nor re-marks it.
|
||
const owner = await ctx.plugin(Object.assign((inner: Context) => {
|
||
inner.sessions.create(SessionId('ephemeral'), { meta: {} })
|
||
}, { inject: ['sessions'] }))
|
||
await owner.dispose()
|
||
const atEdge = backend.records.filter(r => r.channel === 'ops')
|
||
expect(atEdge.map(r => r.attributes['session.id'])).toEqual(['ephemeral'])
|
||
expect(atEdge[0]!.attributes['telemetry.op']).toBe('shutdown')
|
||
await fiber.dispose()
|
||
const ops = backend.records.filter(r => r.channel === 'ops')
|
||
expect(ops.map(r => r.attributes['session.id'])).toEqual(['ephemeral', 'survivor'])
|
||
})
|
||
|
||
it('warns instead of throwing when backend shutdown fails', async () => {
|
||
const backend = new FakeBackend()
|
||
backend.shutdownError = new Error('exporter unreachable')
|
||
const { ctx, fiber } = await setup(backend)
|
||
const warn = vi.spyOn(ctx.logger, 'warn').mockImplementation(() => {})
|
||
liveSession(ctx)
|
||
await expect(fiber.dispose()).resolves.not.toThrow()
|
||
expect(warn.mock.calls.some(args => String(args[0]).includes('shutdown failed'))).toBe(true)
|
||
})
|
||
|
||
it('contains emit failures: the append succeeds and capture heals', async () => {
|
||
const { ctx, backend } = await setup()
|
||
const warn = vi.spyOn(ctx.logger, 'warn').mockImplementation(() => {})
|
||
const session = liveSession(ctx)
|
||
backend.emitError = new Error('backend broke')
|
||
expect(() => session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })).not.toThrow()
|
||
expect(warn).toHaveBeenCalled()
|
||
backend.emitError = undefined
|
||
session.append('turn/end', { turn: 1, reason: { kind: 'completed' } })
|
||
expect(backend.ledger().map(r => r.attributes['event.type'])).toEqual(['turn/end'])
|
||
})
|
||
|
||
it.each([
|
||
['Error values', new TypeError('adapter exploded'), 'TypeError', 'adapter exploded'],
|
||
['non-Error values', 'plain failure', 'Error', 'plain failure'],
|
||
])('relays agent/error %s as an ops record with normalized identity', async (_label, error, name, message) => {
|
||
const { ctx, backend } = await setup()
|
||
const session = liveSession(ctx, 'erring')
|
||
// Only the members the relay reads; the full Agent surface is irrelevant here.
|
||
const agent = { id: 'agent-1', session } as Agent
|
||
ctx.emit('agent/error', agent, 3, 2, error)
|
||
const record = backend.records.find(r => r.channel === 'ops')!
|
||
expect(record.severity).toBe('error')
|
||
expect(record.attributes).toMatchObject({
|
||
'telemetry.op': 'agent-error',
|
||
'session.id': 'erring',
|
||
'agent.id': 'agent-1',
|
||
'error.name': name,
|
||
turn: 3,
|
||
step: 2,
|
||
})
|
||
expect(record.body).toEqual({ name, message })
|
||
})
|
||
})
|