* 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
212 lines
8.6 KiB
TypeScript
212 lines
8.6 KiB
TypeScript
/**
|
|
* Tool-independent shell environment plugin: owns the `ctx.shellEnv` registry of
|
|
* trusted, per-execution `DSH_*` variables consumed by the model-facing shell
|
|
* tools (`dsh-tool-bash`, `dsh-tool-pwsh`). Built-in shell facts are owned by
|
|
* the registry itself while plugins can register additional, enumerable facts
|
|
* with effect-scoped disposal.
|
|
*
|
|
* @module @deepseek-ai/dsh-shell-env
|
|
*/
|
|
|
|
import { Service, type Context } from '@deepseek-ai/cordis'
|
|
import z from '@deepseek-ai/schemastery'
|
|
import { DSH_ENV_PREFIX } from '@deepseek-ai/dsh-shell'
|
|
import type { DshEnvironment, DshEnvironmentKey } from '@deepseek-ai/dsh-shell'
|
|
import { DSH_HOME_ENV, resolveDshHome } from '@deepseek-ai/dsh-home-paths'
|
|
import type { ToolExecution } from '@deepseek-ai/dsh-tools'
|
|
// Declares `Context.profileContext`, the launcher-provided profile the built-ins read.
|
|
import type {} from '@deepseek-ai/dsh-app-boot'
|
|
|
|
declare module '@deepseek-ai/cordis' {
|
|
interface Context {
|
|
shellEnv: ShellEnvRegistry
|
|
}
|
|
}
|
|
|
|
export const name = 'shell-env'
|
|
export const inject: string[] = []
|
|
|
|
/** Plugin config (all optional — the built-in facts resolve without defaults). */
|
|
export interface Config {
|
|
/** DeepSeek Harness home directory exposed as `DSH_HOME`; defaults to `$DSH_HOME` or `~/.dsh`. */
|
|
dshHome?: string
|
|
}
|
|
|
|
/** Runtime configuration schema for the shell-env plugin. */
|
|
export const Config: z<Config> = z.object({
|
|
dshHome: z.string(),
|
|
})
|
|
|
|
/** Model-visible metadata for one managed `DSH_*` environment variable. */
|
|
export interface BashEnvVariable {
|
|
/** Concise description of the environment fact represented by the variable. */
|
|
description: string
|
|
}
|
|
|
|
/**
|
|
* A plugin contribution to the managed environment of each model shell call.
|
|
* Declared keys make ownership conflicts detectable before the first command;
|
|
* `resolve` computes only the values available for the current execution.
|
|
*/
|
|
export interface BashEnvContributor {
|
|
/** Stable contributor name used in diagnostics and duplicate detection. */
|
|
name: string
|
|
/** Complete set of `DSH_*` keys this contributor may return. */
|
|
variables: Readonly<Record<DshEnvironmentKey, BashEnvVariable>>
|
|
/**
|
|
* Resolve this contributor's available values for one tool execution.
|
|
* @param execution - the shell tool execution and its optional calling agent.
|
|
* @returns a partial map containing only keys declared in {@link variables}.
|
|
*/
|
|
resolve(execution: ToolExecution): Readonly<Partial<Record<DshEnvironmentKey, string>>>
|
|
}
|
|
|
|
/** An enumerable declaration returned by {@link ShellEnvRegistry.list}. */
|
|
export interface BashEnvVariableInfo extends BashEnvVariable {
|
|
/** Contributor that owns the variable. */
|
|
contributor: string
|
|
/** Declared `DSH_*` environment variable name. */
|
|
key: DshEnvironmentKey
|
|
}
|
|
|
|
const DSH_SHELL_KEY = `${DSH_ENV_PREFIX}SHELL` as const
|
|
const DSH_SESSION_ID_KEY = `${DSH_ENV_PREFIX}SESSION_ID` as const
|
|
const DSH_PROFILE_KEY = `${DSH_ENV_PREFIX}PROFILE` as const
|
|
const DSH_PROFILE_DIR_KEY = `${DSH_ENV_PREFIX}PROFILE_DIR` as const
|
|
const RESERVED_BASH_ENV_KEYS = new Set<DshEnvironmentKey>([
|
|
DSH_HOME_ENV,
|
|
DSH_SHELL_KEY,
|
|
DSH_SESSION_ID_KEY,
|
|
DSH_PROFILE_KEY,
|
|
DSH_PROFILE_DIR_KEY,
|
|
])
|
|
const BASH_ENV_KEY_SUFFIX = /^[A-Z][A-Z0-9_]*$/
|
|
|
|
/**
|
|
* Registry (`ctx.shellEnv`) for trusted, per-execution `DSH_*` variables.
|
|
* The namespace is rebuilt for every model shell call: ambient `DSH_*` values
|
|
* are discarded by the executor, then the registry's current snapshot is
|
|
* injected. Built-in shell facts remain owned by the registry itself while
|
|
* plugins can register additional, enumerable facts with effect-scoped
|
|
* disposal.
|
|
*/
|
|
export class ShellEnvRegistry extends Service {
|
|
private readonly contributors = new Map<string, BashEnvContributor>()
|
|
private readonly keyOwners = new Map<DshEnvironmentKey, string>()
|
|
private readonly dshHome: string
|
|
|
|
/**
|
|
* Create and install the `ctx.shellEnv` service.
|
|
* @param ctx - Cordis context that owns the service and registrations.
|
|
* @param config - home-directory configuration for the built-in variables.
|
|
*/
|
|
constructor(ctx: Context, config: Config = {}) {
|
|
super(ctx, 'shellEnv')
|
|
this.dshHome = resolveDshHome(config.dshHome)
|
|
}
|
|
|
|
/**
|
|
* Register one environment contributor. Names and keys are unique; built-in
|
|
* keys are reserved. Registration is disposed with the calling plugin fiber.
|
|
* @param contributor - declared key ownership and per-execution resolver.
|
|
* @returns the disposer that unregisters the contribution.
|
|
*/
|
|
register(contributor: BashEnvContributor): () => void {
|
|
const dispose = this.ctx.effect(function* (this: ShellEnvRegistry) {
|
|
if (contributor.name.trim().length === 0) {
|
|
throw new Error('bash env contributor name must be non-empty')
|
|
}
|
|
if (this.contributors.has(contributor.name)) {
|
|
throw new Error(`bash env contributor "${contributor.name}" is already registered`)
|
|
}
|
|
|
|
const variables = Object.entries(contributor.variables) as [DshEnvironmentKey, BashEnvVariable][]
|
|
for (const [key, variable] of variables) {
|
|
if (!key.startsWith(DSH_ENV_PREFIX)
|
|
|| !BASH_ENV_KEY_SUFFIX.test(key.slice(DSH_ENV_PREFIX.length))) {
|
|
throw new Error(`bash env contributor "${contributor.name}" declared invalid key "${key}"`)
|
|
}
|
|
if (RESERVED_BASH_ENV_KEYS.has(key)) {
|
|
throw new Error(`bash env contributor "${contributor.name}" cannot own reserved key "${key}"`)
|
|
}
|
|
if (variable.description.trim().length === 0) {
|
|
throw new Error(`bash env contributor "${contributor.name}" must describe "${key}"`)
|
|
}
|
|
const owner = this.keyOwners.get(key)
|
|
if (owner !== undefined) {
|
|
throw new Error(`bash env key "${key}" is already owned by contributor "${owner}"; contributor "${contributor.name}" cannot also own it`)
|
|
}
|
|
}
|
|
|
|
this.contributors.set(contributor.name, contributor)
|
|
for (const [key] of variables) this.keyOwners.set(key, contributor.name)
|
|
yield () => {
|
|
this.contributors.delete(contributor.name)
|
|
for (const [key] of variables) this.keyOwners.delete(key)
|
|
}
|
|
}.bind(this), 'bashEnv.register()')
|
|
return () => void dispose()
|
|
}
|
|
|
|
/**
|
|
* Build the trusted `DSH_*` snapshot for one shell tool execution.
|
|
* @param execution - the current tool execution.
|
|
* @returns an immutable environment overlay containing built-ins and current contributions.
|
|
*/
|
|
collect(execution: ToolExecution): DshEnvironment {
|
|
const values: Record<DshEnvironmentKey, string> = {
|
|
[DSH_HOME_ENV]: this.dshHome,
|
|
[DSH_SHELL_KEY]: '1',
|
|
}
|
|
if (execution.agent !== undefined) {
|
|
values[DSH_SESSION_ID_KEY] = execution.agent.session.header.id
|
|
}
|
|
const profile = this.ctx.get('profileContext')
|
|
if (profile !== undefined) {
|
|
values[DSH_PROFILE_KEY] = profile.name
|
|
values[DSH_PROFILE_DIR_KEY] = profile.dir
|
|
}
|
|
|
|
for (const contributor of [...this.contributors.values()].sort((left, right) => left.name.localeCompare(right.name))) {
|
|
const resolved = contributor.resolve(execution)
|
|
for (const [rawKey, value] of Object.entries(resolved)) {
|
|
const key = rawKey as DshEnvironmentKey
|
|
if (!Object.hasOwn(contributor.variables, key)) {
|
|
throw new Error(`bash env contributor "${contributor.name}" returned undeclared key "${key}"`)
|
|
}
|
|
if (typeof value !== 'string') {
|
|
throw new Error(`bash env contributor "${contributor.name}" returned a non-string value for "${key}"`)
|
|
}
|
|
values[key] = value
|
|
}
|
|
}
|
|
|
|
return Object.freeze(Object.fromEntries(Object.entries(values).sort(([left], [right]) => left.localeCompare(right))))
|
|
}
|
|
|
|
// TODO(bash-env-list-builtins): Include registry-owned built-ins before diagnostics,
|
|
// prompt, or UI code treats list() as an exhaustive environment catalog.
|
|
/**
|
|
* Enumerate plugin-contributed variables without executing their resolvers.
|
|
* @returns declarations sorted by environment variable name.
|
|
*/
|
|
list(): BashEnvVariableInfo[] {
|
|
return [...this.contributors.values()]
|
|
.flatMap(contributor => Object.entries(contributor.variables).map(([key, variable]) => ({
|
|
contributor: contributor.name,
|
|
description: variable.description,
|
|
key: key as DshEnvironmentKey,
|
|
})))
|
|
.sort((left, right) => left.key.localeCompare(right.key))
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Load the shell-env plugin: register the `ctx.shellEnv` registry service.
|
|
* @param ctx - Cordis context that owns the service and registrations.
|
|
* @param config - home-directory configuration for the built-in variables.
|
|
*/
|
|
export function apply(ctx: Context, config: Config = {}): void {
|
|
new ShellEnvRegistry(ctx, config)
|
|
}
|