* feat(tool-cordis): inspect live plugin Config schemas Replace the Host `Builtin` inspect provider, which described a dynamic Host half the model can no longer define, with a `Config` provider that lists every live Loader entry with its Config status and projects one entry's native Schemastery Config into a self-contained JSON Schema document. app-boot exports its projector, native-schema check, and the shared `loaderExpression` definition for the live walk; the CLI dump keeps its profile-composition path. * fix(tool-cordis): refresh config catalog pointer and presets e2e provider list * feat(agent-preset): progressive creator skills and profile shell facts Split `cordis-plugin-development` into a short procedure with `references/` read on demand and copyable `templates/`, replace the source-reading ban in both creator skills with an ordered list of knowledge sources, and add the `cordis-composition-reference` skill with the Loader patch dialect and a generated, doc-sync-gated list of loadable plugin packages. `shell-env` exposes `DSH_PROFILE` and `DSH_PROFILE_DIR` so skills can address the installed profile. * chore(agent-preset): regenerate plugin package list after merging master * fix(tool-cordis): resolve the Loader at Config query time A Host composed programmatically without a Loader keeps registering the inspect providers; `Config.listConfigs` reports the missing Loader when queried. Refresh the advanced-toolchain recordings whose provider list now carries `Config` in place of `Builtin`. * chore(agent-preset): regenerate plugin package list after merging master * docs: regenerate module graph for the tool-cordis app-boot dependency * docs: regenerate module graph for the shell-env app-boot dependency * docs: regenerate event graph pointer for app-boot exports * fix(agent-preset): address review on creator skills `Config.listConfigs` reports each entry's resolved `packageDir` through the profile package lookup, and the skills read READMEs and built declarations there instead of guessing `$DSH_PROFILE_DIR/node_modules`, which holds only profile-installed packages. Skills name the PowerShell variable syntax and the no-profile omission; the composition reference no longer attributes `overridden` to `list_plugins`; references point at the templates instead of pasting them. The skills spec renders every skill and bounds it by the pruner threshold in code points, checks referenced files and the source-reading ban across all skill files. * fix(tool-cordis): address review on the Config inspect provider Report the Loader entry id (unique across include trees) beside the tree-local patch id, classify group and include carriers as `tree`, treat disabled and disposed fibers as `inactive`, and drop the unreachable boolean-schema branch by narrowing the projector's root type. The presets e2e now queries `Config.listConfigs` over the booted Web profile and projects the shipped `tools` row; the advanced-toolchain recordings carry the updated manifest. * fix(tool-cordis): page the Config directory and filter it by plugin name A full directory of a shipped Web profile exceeds the 50000-byte spill cap once rows carry more fields, and the spilled preview is no longer JSON. `Config.listConfigs` now returns pages (`offset`, `limit` up to 100, default 25) with `total` and `nextOffset`, and an exact plugin `name` filter; the presets e2e reads the shipped rows through the filter. * chore(agent-preset): refresh skill recordings after the paged Config query * docs(agent-preset): teach the composition skill to migrate legacy presets A preset authored before declaration rows lived in `$DSH_HOME/.agent-presets/<id>/` as `preset.yml` plus `agent.cordis.yml`; the skill now maps those files onto a declaration bundle and re-checks plugin names against the package list. * docs(agent-preset): read skill files through the file-read tool only Desktop ships the skill directory inside app.asar, which the Host process can open but shell commands, node, and pnpm cannot. The skills now say to read references and templates with the file-read tool and copy templates into the workspace before installing or checking them; the spec rejects shell reads of skill files. * docs(agent-preset): document bundle display metadata and package.json icon in the host-plugin reference
231 lines
8.7 KiB
TypeScript
231 lines
8.7 KiB
TypeScript
/**
|
|
* Registry tests for `@deepseek-ai/dsh-shell-env`: built-in facts, contributor
|
|
* ownership and validation, collection ordering, effect-scoped disposal, and
|
|
* the explicit disposer contract.
|
|
*/
|
|
|
|
import { homedir } from 'node:os'
|
|
import { join, resolve } from 'node:path'
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { Context } from '@deepseek-ai/cordis'
|
|
import { ToolCallId } from '@deepseek-ai/dsh-llm'
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
import { SESSION_FORMAT_VERSION } from '@deepseek-ai/dsh-session'
|
|
import type { ToolExecution } from '@deepseek-ai/dsh-tools'
|
|
import { ShellEnvRegistry } from '@deepseek-ai/dsh-shell-env'
|
|
import * as BashEnvPlugin from '@deepseek-ai/dsh-shell-env'
|
|
|
|
const testToolSignal = new AbortController().signal
|
|
|
|
afterEach(() => vi.unstubAllEnvs())
|
|
|
|
function execution(sessionId?: string): ToolExecution {
|
|
return {
|
|
signal: testToolSignal,
|
|
token: Symbol('bash-env-test') as ToolExecution['token'],
|
|
callId: ToolCallId('bash-env-call'),
|
|
rootCallId: ToolCallId('bash-env-call'),
|
|
name: 'bash',
|
|
arguments: { command: 'true' },
|
|
...(sessionId === undefined
|
|
? {}
|
|
: {
|
|
agent: {
|
|
session: {
|
|
header: { version: SESSION_FORMAT_VERSION, id: sessionId, createdAt: 0, isSeeded: false },
|
|
},
|
|
} as unknown as Agent,
|
|
}),
|
|
}
|
|
}
|
|
|
|
describe('ShellEnvRegistry', () => {
|
|
it('collects unconditional shell facts and the current agent session id', () => {
|
|
const ctx = new Context()
|
|
const registry = new ShellEnvRegistry(ctx, { dshHome: './test-dsh-home' })
|
|
|
|
expect(registry.collect(execution())).toEqual({
|
|
DSH_HOME: resolve('./test-dsh-home'),
|
|
DSH_SHELL: '1',
|
|
})
|
|
expect(registry.collect(execution('session-a'))).toEqual({
|
|
DSH_HOME: resolve('./test-dsh-home'),
|
|
DSH_SESSION_ID: 'session-a',
|
|
DSH_SHELL: '1',
|
|
})
|
|
})
|
|
|
|
it('collects the launcher-provided profile name and directory when a profile context exists', () => {
|
|
const ctx = new Context()
|
|
ctx.provide('profileContext', {
|
|
name: 'web', dir: '/profiles/web', patchPath: '/profiles/web/cordis.patch.yml', installAnchor: '/dsh/package.json',
|
|
cwd: '/work', home: '/home', startedBundles: [], overlays: [], telemetryDisabledEnv: undefined,
|
|
})
|
|
const registry = new ShellEnvRegistry(ctx, { dshHome: './test-dsh-home' })
|
|
expect(registry.collect(execution())).toMatchObject({ DSH_PROFILE: 'web', DSH_PROFILE_DIR: '/profiles/web' })
|
|
expect(() => registry.register({
|
|
name: 'profile-claimer',
|
|
variables: { DSH_PROFILE: { description: 'Reserved key.' } },
|
|
resolve: () => ({}),
|
|
})).toThrow(/reserved key "DSH_PROFILE"/)
|
|
})
|
|
|
|
it('resolves DSH_HOME from the ambient override or the user-home default', () => {
|
|
vi.stubEnv('DSH_HOME', './ambient-dsh-home')
|
|
const fromEnvironment = new ShellEnvRegistry(new Context())
|
|
expect(fromEnvironment.collect(execution()).DSH_HOME).toBe(resolve('./ambient-dsh-home'))
|
|
|
|
vi.stubEnv('DSH_HOME', undefined)
|
|
const fromDefault = new ShellEnvRegistry(new Context())
|
|
expect(fromDefault.collect(execution()).DSH_HOME).toBe(join(homedir(), '.dsh'))
|
|
})
|
|
|
|
it('collects declared contributor variables and omits unavailable values', () => {
|
|
const ctx = new Context()
|
|
const registry = new ShellEnvRegistry(ctx, { dshHome: './test-dsh-home' })
|
|
registry.register({
|
|
name: 'optional-session-fact',
|
|
variables: {
|
|
DSH_SESSION_OPTIONAL: { description: 'Optional session-scoped test fact.' },
|
|
},
|
|
resolve: exec => exec.agent === undefined ? {} : { DSH_SESSION_OPTIONAL: exec.agent.session.header.id },
|
|
})
|
|
registry.register({
|
|
name: 'always-available-fact',
|
|
variables: {
|
|
DSH_ALWAYS_AVAILABLE: { description: 'Always-available test fact.' },
|
|
},
|
|
resolve: () => ({ DSH_ALWAYS_AVAILABLE: 'yes' }),
|
|
})
|
|
|
|
expect(registry.collect(execution())).not.toHaveProperty('DSH_SESSION_OPTIONAL')
|
|
expect(registry.collect(execution()).DSH_ALWAYS_AVAILABLE).toBe('yes')
|
|
expect(registry.collect(execution('session-b')).DSH_SESSION_OPTIONAL).toBe('session-b')
|
|
expect(registry.list()).toEqual([
|
|
{
|
|
contributor: 'always-available-fact',
|
|
description: 'Always-available test fact.',
|
|
key: 'DSH_ALWAYS_AVAILABLE',
|
|
},
|
|
{
|
|
contributor: 'optional-session-fact',
|
|
description: 'Optional session-scoped test fact.',
|
|
key: 'DSH_SESSION_OPTIONAL',
|
|
},
|
|
])
|
|
})
|
|
|
|
it('rejects duplicate variable ownership at registration time', () => {
|
|
const ctx = new Context()
|
|
const registry = new ShellEnvRegistry(ctx, { dshHome: './test-dsh-home' })
|
|
registry.register({
|
|
name: 'first',
|
|
variables: { DSH_SHARED: { description: 'First owner.' } },
|
|
resolve: () => ({ DSH_SHARED: 'first' }),
|
|
})
|
|
|
|
expect(() => registry.register({
|
|
name: 'second',
|
|
variables: { DSH_SHARED: { description: 'Second owner.' } },
|
|
resolve: () => ({ DSH_SHARED: 'second' }),
|
|
})).toThrow(/DSH_SHARED.*first.*second|DSH_SHARED.*second.*first/)
|
|
})
|
|
|
|
it('rejects duplicate contributor names and malformed declarations', () => {
|
|
const registry = new ShellEnvRegistry(new Context(), { dshHome: './test-dsh-home' })
|
|
registry.register({
|
|
name: 'declared',
|
|
variables: { DSH_DECLARED: { description: 'Declared fact.' } },
|
|
resolve: () => ({}),
|
|
})
|
|
|
|
expect(() => registry.register({
|
|
name: 'declared',
|
|
variables: { DSH_ANOTHER: { description: 'Another fact.' } },
|
|
resolve: () => ({}),
|
|
})).toThrow(/already registered/)
|
|
expect(() => registry.register({
|
|
name: ' ',
|
|
variables: { DSH_BLANK_NAME: { description: 'Blank owner.' } },
|
|
resolve: () => ({}),
|
|
})).toThrow(/name must be non-empty/)
|
|
expect(() => registry.register({
|
|
name: 'invalid-key',
|
|
variables: { dsh_invalid: { description: 'Invalid key.' } } as unknown as Record<'DSH_INVALID', { description: string }>,
|
|
resolve: () => ({}),
|
|
})).toThrow(/invalid key/)
|
|
expect(() => registry.register({
|
|
name: 'reserved-key',
|
|
variables: { DSH_HOME: { description: 'Reserved key.' } },
|
|
resolve: () => ({}),
|
|
})).toThrow(/reserved key/)
|
|
expect(() => registry.register({
|
|
name: 'blank-description',
|
|
variables: { DSH_BLANK_DESCRIPTION: { description: ' ' } },
|
|
resolve: () => ({}),
|
|
})).toThrow(/must describe/)
|
|
})
|
|
|
|
it('rejects undeclared variables returned by a contributor', () => {
|
|
const ctx = new Context()
|
|
const registry = new ShellEnvRegistry(ctx, { dshHome: './test-dsh-home' })
|
|
registry.register({
|
|
name: 'drifted-provider',
|
|
variables: { DSH_DECLARED: { description: 'Declared fact.' } },
|
|
resolve: () => ({ DSH_UNDECLARED: 'bad' }),
|
|
})
|
|
|
|
expect(() => registry.collect(execution())).toThrow(/drifted-provider.*DSH_UNDECLARED/)
|
|
})
|
|
|
|
it('rejects non-string values returned by a contributor', () => {
|
|
const registry = new ShellEnvRegistry(new Context(), { dshHome: './test-dsh-home' })
|
|
registry.register({
|
|
name: 'wrong-value-type',
|
|
variables: { DSH_STRING: { description: 'String fact.' } },
|
|
resolve: () => ({ DSH_STRING: 42 }) as unknown as Record<'DSH_STRING', string>,
|
|
})
|
|
|
|
expect(() => registry.collect(execution())).toThrow(/wrong-value-type.*non-string.*DSH_STRING/)
|
|
})
|
|
|
|
it('removes an effect-scoped contributor when its plugin is disposed', async () => {
|
|
const ctx = new Context()
|
|
const registry = new ShellEnvRegistry(ctx, { dshHome: './test-dsh-home' })
|
|
const fiber = await ctx.plugin({
|
|
inject: ['shellEnv'],
|
|
apply(inner: Context) {
|
|
inner.shellEnv.register({
|
|
name: 'temporary',
|
|
variables: { DSH_TEMPORARY: { description: 'Temporary fact.' } },
|
|
resolve: () => ({ DSH_TEMPORARY: 'present' }),
|
|
})
|
|
},
|
|
})
|
|
|
|
expect(registry.collect(execution()).DSH_TEMPORARY).toBe('present')
|
|
await fiber.dispose()
|
|
expect(registry.collect(execution())).not.toHaveProperty('DSH_TEMPORARY')
|
|
})
|
|
|
|
it('returns an explicit contributor disposer', () => {
|
|
const registry = new ShellEnvRegistry(new Context(), { dshHome: './test-dsh-home' })
|
|
const dispose = registry.register({
|
|
name: 'explicit-disposal',
|
|
variables: { DSH_EXPLICIT_DISPOSAL: { description: 'Explicitly disposed fact.' } },
|
|
resolve: () => ({ DSH_EXPLICIT_DISPOSAL: 'present' }),
|
|
})
|
|
|
|
expect(registry.collect(execution()).DSH_EXPLICIT_DISPOSAL).toBe('present')
|
|
dispose()
|
|
expect(registry.collect(execution())).not.toHaveProperty('DSH_EXPLICIT_DISPOSAL')
|
|
})
|
|
|
|
it('the plugin registers the service with no contributors on load', async () => {
|
|
const ctx = new Context()
|
|
await ctx.plugin(BashEnvPlugin)
|
|
expect(ctx.shellEnv).toBeInstanceOf(ShellEnvRegistry)
|
|
expect(ctx.shellEnv.list()).toEqual([])
|
|
})
|
|
})
|