* feat(preset): declare Agent compositions in profile YAML * fix(preset): share scope binding cleanup and refresh module graph * fix(preset): use host syntax colors in the YAML editor * fix(preset): write new profile declarations as block YAML * fix(preset): align eager activation with browser and worker surfaces * fix(ui-agent-preset): retain the existing preset card layout * fix(preset): keep rows waiting for a Host service mounted and re-audit after settlement A preset row whose Host provider was still activating at declaration time was reported as waiting for a missing service, and the registry recorded the definition as broken for the rest of the process. Split the mount audit into failed and pending rows: failures and root-realm leaks still reject the mount, while pending rows stay mounted and every read and binding re-audits them after the Host Loader tree settles. Remove the accidental self-dependency of @deepseek-ai/dsh-web-app and its lockfile self-link. Archive the copy-only preset authoring note, which the declarative-preset note fully supersedes, and update the ralph note's restore recipe to the profile-patch mechanism. * chore(lint): re-key and prune the unknown-cast baseline after the master merge * refactor(web-app): ship each Agent preset as its own bundle patch file `dsh.bundle.patch` accepts an ordered file list, so the four shipped preset declarations move out of the 1000-line web patch into `presets/<id>.patch.yml`, one insert per file, applied after the host patch. The host patch keeps the preset registry row. Gates and test scaffolds that read the web layer resolve every patch file through `bundlePatchPaths` instead of one hardcoded path. * refactor(preset): drop the save notice injected into live Agents The notice duplicated the save result the Web editor already shows, and after the producer-owned message sources it would have needed its own persisted source kind. Saving now only persists and reports the activation diagnostic; the persistence catalog is unchanged from master. * docs: regenerate the module graph after dropping the registry's llm dependency * test(ui-agent-preset): cover the guide dialog's keyboard handling on the declarative section * fix(preset): address the remaining review comments Apply the lowercase id rule only when creating a declaration, so presets declared with other ids stay editable. Export `isBuiltInPreset` from the display fold and key the client card groups on it. Remove the dead `error` and `retry` locale keys, the JSDoc orphaned by the `trust` removal, the `trust` fields in the plugin-inventory test fixtures, and the stale `dsh-agent-presets` package name in comments and READMEs. * refactor(preset): make the Web preset page view-and-select only Remove the child-plugin YAML editor, the `agent_preset` tool and the registry's read/save Remote methods. Presets are declared and changed only by bundle patches; the settings page keeps the roster, the new-task default and the mode help, and its question icon explains that and offers to start a Creator-mode task. The `editing-cordis-compositions` skill and the Creator persona describe the bundle-based path, and the authored skill-load Session and Web snapshots are refreshed for it. * docs(skill): make the composition skill self-sufficient for preset authoring State where the shipped declarations live, list every declaration field, inline a complete minimal bundle and an override example, and name the verification calls, so Creator mode no longer reads DSH package sources to infer the format. Refresh the authored skill-load Session for the new text. * test(tools): drop the removed agent_preset tool from the catalog expectation
230 lines
8.9 KiB
TypeScript
230 lines
8.9 KiB
TypeScript
import { Context } from '@deepseek-ai/cordis'
|
|
import AgentRegistry from '@deepseek-ai/dsh-agent'
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
import SessionStore, { SESSION_FORMAT_VERSION, SessionId, SessionLogOffset } from '@deepseek-ai/dsh-session'
|
|
import { SessionQueryError, type SessionObservation } from '@deepseek-ai/dsh-session-query'
|
|
import type {} from '@deepseek-ai/dsh-skill'
|
|
import { describe, expect, it, vi } from 'vitest'
|
|
import { SessionSkillCatalog } from '../src/skill-catalog.ts'
|
|
|
|
function observation(
|
|
sessionId: SessionId,
|
|
options: { readonly cwd?: string; readonly agentPreset?: string } = {},
|
|
): SessionObservation {
|
|
const events = Object.freeze([])
|
|
const lease = (): SessionObservation => ({
|
|
source: 'live',
|
|
header: {
|
|
version: SESSION_FORMAT_VERSION,
|
|
id: sessionId,
|
|
createdAt: 1,
|
|
isSeeded: false,
|
|
...options.cwd === undefined ? {} : { cwd: options.cwd },
|
|
},
|
|
events,
|
|
inheritedEventCount: SessionLogOffset(0),
|
|
cursor: -1,
|
|
projections: {
|
|
asOfSeq: -1,
|
|
values: {
|
|
...options.agentPreset === undefined ? {} : { agentPreset: options.agentPreset },
|
|
},
|
|
},
|
|
retain: lease,
|
|
[Symbol.dispose]: () => {},
|
|
})
|
|
return lease()
|
|
}
|
|
|
|
async function context(): Promise<Context> {
|
|
const ctx = new Context()
|
|
await ctx.plugin(SessionStore)
|
|
await ctx.plugin(AgentRegistry)
|
|
return ctx
|
|
}
|
|
|
|
describe('SessionSkillCatalog', () => {
|
|
it('reads a cold Session catalog without resuming an Agent', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('cold-skills')
|
|
const observed = observation(sessionId, { cwd: '/cold/project' })
|
|
const dispose = vi.spyOn(observed, Symbol.dispose)
|
|
const observeSession = vi.fn(() => Promise.resolve(observed))
|
|
ctx.provide('sessionQuery', { observeSession } as never)
|
|
const resume = vi.spyOn(ctx.agents, 'resume')
|
|
const list = vi.fn(() => Promise.resolve([
|
|
{
|
|
name: 'review',
|
|
description: 'Review the current change.',
|
|
whenToUse: 'Before publishing.',
|
|
path: '/cold/project/.agents/skills/review/SKILL.md',
|
|
invocation: { modelInvocable: true, userInvocable: true },
|
|
},
|
|
{
|
|
name: 'model-only',
|
|
description: 'Not shown to the user.',
|
|
invocation: { modelInvocable: true, userInvocable: false },
|
|
},
|
|
]))
|
|
ctx.provide('skills', { list } as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
await expect(catalog.list({ sessionId }, new AbortController().signal)).resolves.toEqual({
|
|
skills: [{
|
|
name: 'review',
|
|
description: 'Review the current change.',
|
|
whenToUse: 'Before publishing.',
|
|
path: '/cold/project/.agents/skills/review/SKILL.md',
|
|
modelInvocable: true,
|
|
}],
|
|
})
|
|
expect(observeSession).toHaveBeenCalledWith(sessionId)
|
|
expect(dispose).toHaveBeenCalledOnce()
|
|
expect(resume).not.toHaveBeenCalled()
|
|
expect(ctx.agents.list()).toEqual([])
|
|
expect(list).toHaveBeenCalledWith({ cwd: '/cold/project', scope: undefined })
|
|
})
|
|
|
|
it('uses a live Agent to address a preset-owned registry', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('live-skills')
|
|
const session = ctx.sessions.create(sessionId, { meta: { cwd: '/live/project' } })
|
|
const agent = { id: sessionId, session, status: 'idle', ctx } as Agent
|
|
await ctx.agents.register(agent)
|
|
ctx.provide('sessionQuery', {
|
|
observeSession: () => Promise.resolve(observation(sessionId, { cwd: '/live/project' })),
|
|
} as never)
|
|
const scopedList = vi.fn(() => Promise.resolve([{
|
|
name: 'preset-owned',
|
|
description: 'Composed for this Agent.',
|
|
invocation: { modelInvocable: false, userInvocable: true },
|
|
}]))
|
|
const acquireScope = vi.fn()
|
|
ctx.provide('agentPresets', {
|
|
serviceFor: () => ({ list: scopedList }),
|
|
acquireScope,
|
|
} as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
await expect(catalog.list({ sessionId }, new AbortController().signal)).resolves.toEqual({
|
|
skills: [{
|
|
name: 'preset-owned',
|
|
description: 'Composed for this Agent.',
|
|
modelInvocable: false,
|
|
}],
|
|
})
|
|
expect(scopedList).toHaveBeenCalledWith({ cwd: '/live/project', scope: agent })
|
|
expect(acquireScope).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('uses the recorded preset standing scope for a cold Session', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('standing-skills')
|
|
const scope = { agentPreset: 'minimal' }
|
|
ctx.provide('sessionQuery', {
|
|
observeSession: () => Promise.resolve(observation(sessionId, {
|
|
cwd: '/cold/project',
|
|
agentPreset: 'minimal',
|
|
})),
|
|
} as never)
|
|
const acquireScope = vi.fn(() => Promise.resolve({ key: scope, [Symbol.asyncDispose]: async () => {} }))
|
|
ctx.provide('agentPresets', { acquireScope } as never)
|
|
const list = vi.fn(() => Promise.resolve([]))
|
|
ctx.provide('skills', { list } as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
await expect(catalog.list({ sessionId }, new AbortController().signal)).resolves.toEqual({ skills: [] })
|
|
expect(acquireScope).toHaveBeenCalledWith('minimal')
|
|
expect(list).toHaveBeenCalledWith({ cwd: '/cold/project', scope })
|
|
expect(ctx.agents.list()).toEqual([])
|
|
})
|
|
|
|
it('falls back to the global registry when the recorded preset is unavailable', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('gone-preset')
|
|
ctx.provide('sessionQuery', {
|
|
observeSession: () => Promise.resolve(observation(sessionId, {
|
|
cwd: '/cold/project',
|
|
agentPreset: 'gone',
|
|
})),
|
|
} as never)
|
|
ctx.provide('agentPresets', {
|
|
acquireScope: () => Promise.reject(new Error('unknown preset')),
|
|
} as never)
|
|
const list = vi.fn(() => Promise.resolve([]))
|
|
ctx.provide('skills', { list } as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
await expect(catalog.list({ sessionId }, new AbortController().signal)).resolves.toEqual({ skills: [] })
|
|
expect(list).toHaveBeenCalledWith({ cwd: '/cold/project', scope: undefined })
|
|
})
|
|
|
|
it.each([
|
|
{
|
|
error: new SessionQueryError(
|
|
'session "missing-skills" not found',
|
|
'SESSION_QUERY_SESSION_NOT_FOUND',
|
|
),
|
|
code: 'session/not-found',
|
|
},
|
|
{ error: new Error('storage offline'), code: 'gateway/internal' },
|
|
] as const)('classifies failed Session inspection as $code', async ({ error, code }) => {
|
|
const ctx = await context()
|
|
ctx.provide('sessionQuery', { observeSession: () => Promise.reject(error) } as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
await expect(catalog.list(
|
|
{ sessionId: SessionId('missing-skills') },
|
|
new AbortController().signal,
|
|
)).rejects.toMatchObject({ code })
|
|
})
|
|
|
|
it('reports an absent skill registry instead of an empty catalog', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('no-skills')
|
|
ctx.provide('sessionQuery', {
|
|
observeSession: () => Promise.resolve(observation(sessionId, { cwd: '/project' })),
|
|
} as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
const failed = catalog.list({ sessionId }, new AbortController().signal)
|
|
await expect(failed).rejects.toMatchObject({ code: 'gateway/internal' })
|
|
await expect(failed).rejects.toThrow('skill registry is absent')
|
|
})
|
|
|
|
it('rejects observations without projections or a project cwd', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('incomplete-skills')
|
|
const withoutProjections = { ...observation(sessionId, { cwd: '/project' }), projections: undefined }
|
|
const observeSession = vi.fn()
|
|
.mockResolvedValueOnce(withoutProjections)
|
|
.mockResolvedValueOnce(observation(sessionId))
|
|
ctx.provide('sessionQuery', { observeSession } as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
const unprojected = catalog.list({ sessionId }, new AbortController().signal)
|
|
await expect(unprojected).rejects.toMatchObject({ code: 'gateway/internal' })
|
|
await expect(unprojected).rejects.toThrow('projected Session observation')
|
|
const cwdless = catalog.list({ sessionId }, new AbortController().signal)
|
|
await expect(cwdless).rejects.toMatchObject({ code: 'gateway/internal' })
|
|
await expect(cwdless).rejects.toThrow('has no project cwd')
|
|
})
|
|
|
|
it('classifies a provider listing failure', async () => {
|
|
const ctx = await context()
|
|
const sessionId = SessionId('failed-skills')
|
|
ctx.provide('sessionQuery', {
|
|
observeSession: () => Promise.resolve(observation(sessionId, { cwd: '/project' })),
|
|
} as never)
|
|
ctx.provide('skills', {
|
|
list: () => Promise.reject(new Error('catalog offline')),
|
|
} as never)
|
|
const catalog = new SessionSkillCatalog(ctx)
|
|
|
|
await expect(catalog.list({ sessionId }, new AbortController().signal))
|
|
.rejects.toMatchObject({
|
|
code: 'gateway/internal', message: 'skill listing failed: Error: catalog offline',
|
|
})
|
|
})
|
|
})
|