Machine-produced by `pnpm run rescope-vendor --apply` plus the regeneration it prints: `pnpm install` for the lockfile, `pnpm run gen-third-party-notices`, `verify-translation-pairing --write` for the touched bilingual pairs, `gen-doc-graphs`, and one typert snapshot whose ids embed character offsets. `pnpm run rescope-vendor --check` verifies the result. Renames nine vendored packages (cordis, cosmokit, schemastery and the six @cordisjs plugins) and every reference that resolves them: manifest names and dependency keys, module specifiers including declare-module merges, cordis.yml plugin names, tsconfig paths, every Markdown fence, and `docs/` prose. Directory names, upstream versions, and dependency ranges are unchanged, so vendor/README.md still reads as an upstream snapshot; its manifest table gains an upstream-name column so THIRD_PARTY_NOTICES keeps MIT attribution pointed at each fork's origin. The tutorial tier follows the rename end to end: its yaml fences named plugins the Loader can no longer resolve, its `ts ignore-check` fences disagreed with the compiled fences beside them, and its prose quoted both. The contracts that told readers to keep upstream names — the root convention and the vendoring cookbook's tree comment and manifest invariant — now say to rescope instead. Two rules read `@deepseek-ai/` as "another workspace plugin": the client bundle purity gate now names the vendored libraries a browser bundle inlines, and the files where a bare `cordis` is an agent-preset id keep that product data.
143 lines
5.2 KiB
TypeScript
143 lines
5.2 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import { Context } from '@deepseek-ai/cordis'
|
|
import AgentRegistry from '@deepseek-ai/dsh-agent'
|
|
import AgentLoop from '@deepseek-ai/dsh-agent-loop'
|
|
import LlmService, { createUserMessage, LlmError } from '@deepseek-ai/dsh-llm'
|
|
import type { LlmFailure, ResolvedRetryPolicy } from '@deepseek-ai/dsh-llm'
|
|
import SessionStore, { SessionId } from '@deepseek-ai/dsh-session'
|
|
import SystemPrompt from '@deepseek-ai/dsh-system-prompt'
|
|
import ToolRegistry from '@deepseek-ai/dsh-tools'
|
|
import { MockAdapter, textResponse } from './mock-adapter.ts'
|
|
|
|
async function harness(adapter: MockAdapter): Promise<Context> {
|
|
const ctx = new Context()
|
|
await ctx.plugin(LlmService)
|
|
await ctx.plugin(SessionStore)
|
|
await ctx.plugin(SystemPrompt)
|
|
await ctx.plugin(ToolRegistry)
|
|
await ctx.plugin(AgentRegistry)
|
|
await ctx.plugin(AgentLoop, { agents: [] })
|
|
ctx.llm.registerAdapter(['mock'], adapter)
|
|
return ctx
|
|
}
|
|
|
|
function fail(message: string, code: string): () => never {
|
|
return () => {
|
|
throw new LlmError(message, code)
|
|
}
|
|
}
|
|
|
|
describe('agent/request-error', () => {
|
|
it('does not offer middleware failures to request recovery', async () => {
|
|
const adapter = new MockAdapter([textResponse('unused')])
|
|
const ctx = await harness(adapter)
|
|
const agent = ctx.agentLoop.create(SessionId('request-error-narrow'), { provider: 'mock', model: 'mock' })
|
|
let recoveries = 0
|
|
ctx.on('agent/request', () => {
|
|
throw new LlmError('middleware failed', 'MIDDLEWARE')
|
|
})
|
|
ctx.on('agent/request-error', async () => {
|
|
recoveries += 1
|
|
})
|
|
|
|
agent.followup(createUserMessage({ content: [{ type: 'text', text: 'go' }], source: { kind: 'user' } }))
|
|
await agent.whenIdle()
|
|
|
|
expect(recoveries).toBe(0)
|
|
expect(adapter.requests).toHaveLength(0)
|
|
})
|
|
|
|
it('lets each failed request return a retry action before its turn closes', async () => {
|
|
const adapter = new MockAdapter([
|
|
fail('busy', 'RATE_LIMIT'),
|
|
fail('unavailable', 'SERVICE_UNAVAILABLE'),
|
|
textResponse('ok'),
|
|
])
|
|
const ctx = await harness(adapter)
|
|
const agent = ctx.agentLoop.create(SessionId('request-error-retry'), { provider: 'mock', model: 'mock' })
|
|
const seen: {
|
|
turn: number
|
|
step: number
|
|
failure: LlmFailure
|
|
retryPolicy: ResolvedRetryPolicy | undefined
|
|
}[] = []
|
|
const statuses: string[] = []
|
|
ctx.on('agent/status', ({ agent: subject, status }) => {
|
|
if (subject === agent) statuses.push(status)
|
|
})
|
|
ctx.on('agent/request-error', async ({ agent: subject, turn, step, failure, retryPolicy }) => {
|
|
expect(subject).toBe(agent)
|
|
seen.push({ turn, step, failure, retryPolicy })
|
|
return { kind: 'retry' }
|
|
})
|
|
|
|
agent.followup(createUserMessage({ content: [{ type: 'text', text: 'go' }], source: { kind: 'user' } }))
|
|
await agent.whenIdle()
|
|
|
|
expect(seen.map(item => ({
|
|
turn: item.turn,
|
|
step: item.step,
|
|
code: item.failure.code,
|
|
}))).toEqual([
|
|
{
|
|
turn: 1,
|
|
step: 1,
|
|
code: 'RATE_LIMIT',
|
|
},
|
|
{
|
|
turn: 1,
|
|
step: 1,
|
|
code: 'SERVICE_UNAVAILABLE',
|
|
},
|
|
])
|
|
expect(agent.session.events.filter(event => event.type === 'turn/start')).toHaveLength(1)
|
|
expect(seen.map(item => item.retryPolicy)).toEqual([
|
|
expect.objectContaining({ mode: 'normal' }),
|
|
expect.objectContaining({ mode: 'normal' }),
|
|
])
|
|
expect(statuses).toEqual(['running', 'idle'])
|
|
})
|
|
|
|
it('lets cancellation win over a retry action', async () => {
|
|
const adapter = new MockAdapter([fail('busy', 'RATE_LIMIT'), textResponse('unused')])
|
|
const ctx = await harness(adapter)
|
|
const agent = ctx.agentLoop.create(SessionId('request-error-cancel'), { provider: 'mock', model: 'mock' })
|
|
ctx.on('agent/request-error', async ({ agent: subject }) => {
|
|
subject.cancel({ kind: 'user' })
|
|
return { kind: 'retry' }
|
|
})
|
|
|
|
agent.followup(createUserMessage({ content: [{ type: 'text', text: 'go' }], source: { kind: 'user' } }))
|
|
await agent.whenIdle()
|
|
|
|
expect(adapter.requests).toHaveLength(1)
|
|
expect(agent.session.events.filter(event => event.type === 'turn/start')).toHaveLength(1)
|
|
expect(agent.session.events.find(event => event.type === 'turn/end')).toMatchObject({
|
|
type: 'turn/end',
|
|
data: { reason: { kind: 'aborted', reason: { kind: 'user' } } },
|
|
})
|
|
})
|
|
|
|
it('does not retry when the recovery listener fails before returning its action', async () => {
|
|
const adapter = new MockAdapter([fail('busy', 'RATE_LIMIT'), textResponse('unused')])
|
|
const ctx = await harness(adapter)
|
|
const agent = ctx.agentLoop.create(SessionId('request-error-recovery-failed'), {
|
|
provider: 'mock',
|
|
model: 'mock',
|
|
})
|
|
ctx.on('agent/request-error', async () => {
|
|
throw new Error('recovery failed')
|
|
})
|
|
|
|
agent.followup(createUserMessage({ content: [{ type: 'text', text: 'go' }], source: { kind: 'user' } }))
|
|
await agent.whenIdle()
|
|
|
|
expect(adapter.requests).toHaveLength(1)
|
|
expect(agent.session.events.filter(event => event.type === 'turn/start')).toHaveLength(1)
|
|
expect(agent.session.events.find(event => event.type === 'turn/end')).toMatchObject({
|
|
type: 'turn/end',
|
|
data: { reason: { kind: 'error' } },
|
|
})
|
|
})
|
|
})
|