Tianyi Cui
25eccdaedc
Address four findings from the first Codex review round: - Contain subagent/start|end listener throws (emitContainedStart/End): a thrown lifecycle listener could escape SubagentService.start() before the caller received the live run to dispose it (a leaked child), and a thrown subagent/end listener could surface as an unhandled rejection on the detached result-settle hook. Both emits now log-and-contain, mirroring the agent registry's agent/created|disposed containment. - Make the model-facing tool name configurable (Config.toolName, default subagent). The docs say to load dsh-tool-subagent once per provider to expose multiple transports, but the hardcoded name made the second load throw a duplicate-tool-name error; a distinct toolName per load is now required and documented. - Reach the per-file 100% coverage gate: tests for the subagent/end error branch, lifecycle-listener containment, every stopReasonError arm + the merge-extensible default, the multi-provider toolName path, agentOptions forwarding, and the direct-apply schema-bypass fallbacks. - Document the seam vocabulary in docs/core-data-structures/subagent.md with verbatim type-equiv blocks + manifest entries, and link it from core.md (a brand-new core/seam type the doc-sync gate cannot detect on its own).
102 lines
4.5 KiB
TypeScript
102 lines
4.5 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import { Context } from 'cordis'
|
|
import Loader from '@cordisjs/plugin-loader'
|
|
import { AgentId, type Agent } from '@deepseek-ai/dsh-agent'
|
|
import SubagentService, { type SubagentStartRequest } from '@deepseek-ai/dsh-subagent'
|
|
import * as mock from '../src/index.ts'
|
|
|
|
/** A minimal parent — the mock provider only reads `parent.id`. */
|
|
function fakeParent(id = 'parent-1'): Agent {
|
|
return { id: AgentId(id) } as unknown as Agent
|
|
}
|
|
|
|
function baseRequest(over: Partial<SubagentStartRequest> = {}): SubagentStartRequest {
|
|
return { prompt: [{ type: 'text', text: 'task' }], parent: fakeParent(), ...over }
|
|
}
|
|
|
|
async function mount(config: Partial<mock.Config> = {}): Promise<Context> {
|
|
const ctx = new Context()
|
|
await ctx.plugin(SubagentService)
|
|
await ctx.plugin(mock, { name: 'mock', ...config })
|
|
return ctx
|
|
}
|
|
|
|
describe('dsh-subagent-mock', () => {
|
|
it('registers a provider on ctx.subagents and returns the scripted reply', async () => {
|
|
const ctx = await mount({ reply: 'hello from mock' })
|
|
expect(ctx.subagents.list()).toEqual(['mock'])
|
|
|
|
const run = ctx.subagents.start('mock', baseRequest())
|
|
await expect(run.result).resolves.toEqual({
|
|
output: [{ type: 'text', text: 'hello from mock' }],
|
|
structured: undefined,
|
|
stopReason: 'completed',
|
|
})
|
|
})
|
|
|
|
it('registers under a configurable name', async () => {
|
|
const ctx = await mount({ name: 'spawn' })
|
|
expect(ctx.subagents.list()).toEqual(['spawn'])
|
|
})
|
|
|
|
it('surfaces a structured result when the request carries an outputSchema', async () => {
|
|
const ctx = await mount({ reply: 'r', structured: { answer: 42 } })
|
|
const run = ctx.subagents.start('mock', baseRequest({ outputSchema: { answer: { type: 'number' } } }))
|
|
await expect(run.result).resolves.toMatchObject({ structured: { answer: 42 } })
|
|
})
|
|
|
|
it('defaults structured output to { reply } when outputSchema is requested but no structured value is configured', async () => {
|
|
const ctx = await mount({ reply: 'fallback reply' })
|
|
const run = ctx.subagents.start('mock', baseRequest({ outputSchema: { answer: { type: 'number' } } }))
|
|
await expect(run.result).resolves.toMatchObject({ structured: { reply: 'fallback reply' } })
|
|
})
|
|
|
|
it('omits structured output when outputSchema capability is off', async () => {
|
|
const ctx = await mount({ capabilities: { outputSchema: false } })
|
|
// The service rejects an outputSchema request against a no-cap provider, so
|
|
// the structured path is only reachable when the cap is on; with it off and
|
|
// no schema requested, the result has no structured field.
|
|
const run = ctx.subagents.start('mock', baseRequest())
|
|
await expect(run.result).resolves.toMatchObject({ structured: undefined })
|
|
})
|
|
|
|
it('honors a configured stop reason', async () => {
|
|
const ctx = await mount({ stopReason: 'refusal' })
|
|
const run = ctx.subagents.start('mock', baseRequest())
|
|
await expect(run.result).resolves.toMatchObject({ stopReason: 'refusal' })
|
|
})
|
|
|
|
it('flips the stop reason to aborted when cancelled before the result settles', async () => {
|
|
const ctx = await mount()
|
|
const run = ctx.subagents.start('mock', baseRequest())
|
|
run.cancel()
|
|
await expect(run.result).resolves.toMatchObject({ stopReason: 'aborted' })
|
|
})
|
|
|
|
it('unregisters the provider when the owning fiber is disposed (HMR safety)', async () => {
|
|
const ctx = new Context()
|
|
await ctx.plugin(SubagentService)
|
|
const fiber = await ctx.plugin(mock, { name: 'mock' })
|
|
expect(ctx.subagents.list()).toEqual(['mock'])
|
|
await fiber.dispose()
|
|
expect(ctx.subagents.list()).toEqual([])
|
|
})
|
|
|
|
it('has the namespace-plugin export shape (no stray default) so the Loader keeps name/inject/Config/apply', () => {
|
|
// Postmortem 0001 guard: this plugin HAS `inject = ['subagents']`, so a stray
|
|
// `export default apply` would collapse the module via `unwrapExports`
|
|
// (`exports.default ?? exports`), DROP `inject`, and crash at load with
|
|
// "cannot get property … without inject". Guard the shape directly.
|
|
expect('default' in mock).toBe(false)
|
|
expect(mock.name).toBe('subagent-mock')
|
|
expect(mock.inject).toEqual(['subagents'])
|
|
|
|
const loader = Object.create(Loader.prototype) as Loader
|
|
const unwrapped = loader.unwrapExports(mock) as Record<string, unknown>
|
|
expect(unwrapped).toBe(mock)
|
|
expect(unwrapped.name).toBe('subagent-mock')
|
|
expect(unwrapped.inject).toEqual(['subagents'])
|
|
expect(typeof unwrapped.apply).toBe('function')
|
|
})
|
|
})
|