Delete @deepseek-ai/dsh-home and make dsh-paths the sole owner of the single-root harness home ($DSH_HOME || ~/.dsh). Migrate tool-bash, skill-local, and agent-spine-demo off dsh-home, and fold telemetry's divergent globalConfigDir onto the shared resolver, dropping its second XDG/APPDATA policy and the deepseek-harness namespace so the anonymous id lives under the harness home. Add dshHomeDisplay() for symbolic user-facing paths, replacing workspace-context's bespoke check.
454 lines
21 KiB
TypeScript
454 lines
21 KiB
TypeScript
/**
|
|
* Model-facing `bash` tool over the `ctx.bash` executor seam. Background calls
|
|
* register process handles with `ctx.tasks`; their work uses task cancellation
|
|
* rather than the tool-call signal after an id is returned.
|
|
*
|
|
* TODO(permissions): deployment policy belongs in `tools/pre-execute` and
|
|
* sandboxing executors; see docs/architecture.md § Extending The Harness.
|
|
* @module @deepseek-ai/dsh-tool-bash
|
|
*/
|
|
|
|
import { Service, type Context } from 'cordis'
|
|
import z from 'schemastery'
|
|
import { isAbsolute, resolve as resolvePath } from 'node:path'
|
|
import { defineTool } from '@deepseek-ai/dsh-tools'
|
|
import type { GenericCallView, TerminalCallView, ToolExecution, ToolResult, ToolResultView } from '@deepseek-ai/dsh-tools'
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
import type {} from '@deepseek-ai/dsh-session-persistence'
|
|
import type {} from '@deepseek-ai/dsh-system-prompt'
|
|
import type {} from '@deepseek-ai/dsh-tasks'
|
|
import type {} from '@deepseek-ai/dsh-user-approval'
|
|
import type { SandboxMode } from '@deepseek-ai/dsh-sandbox'
|
|
import { ESCALATION_TARGETS, approveEscalation, validateEscalationArgs } from '@deepseek-ai/dsh-sandbox'
|
|
import { effectiveSandboxMode } from '@deepseek-ai/dsh-sandbox-policy'
|
|
import { DSH_ENV_PREFIX } from '@deepseek-ai/dsh-bash'
|
|
import type { DshEnvironment, DshEnvironmentKey } from '@deepseek-ai/dsh-bash'
|
|
import { DSH_HOME_ENV, resolveDshHome } from '@deepseek-ai/dsh-paths'
|
|
import { processOutcome } from './background.ts'
|
|
import { parseExitStatus, renderProcessRead, renderResult } from './render.ts'
|
|
|
|
declare module 'cordis' {
|
|
interface Context {
|
|
bashEnv: BashEnvRegistry
|
|
}
|
|
}
|
|
|
|
export const name = 'tool-bash'
|
|
export const inject = ['tools', 'bash', 'systemPrompt']
|
|
|
|
/** Configuration for the bash tool and its managed child environment. */
|
|
export interface Config {
|
|
/** Expose `run_in_background` (default true); disabled calls are also rejected. */
|
|
enableRunInBackground?: boolean
|
|
/** DeepSeek Harness home directory exposed as `DSH_HOME`; defaults to `$DSH_HOME` or `~/.dsh`. */
|
|
dshHome?: string
|
|
}
|
|
|
|
/** Runtime configuration schema for the bash tool plugin. */
|
|
export const Config: z<Config> = z.object({
|
|
enableRunInBackground: z.boolean().default(true),
|
|
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 bash 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 bash 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 BashEnvRegistry.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_SESSION_JSONL_KEY = `${DSH_ENV_PREFIX}SESSION_JSONL` as const
|
|
const RESERVED_BASH_ENV_KEYS = new Set<DshEnvironmentKey>([
|
|
DSH_HOME_ENV,
|
|
DSH_SHELL_KEY,
|
|
DSH_SESSION_ID_KEY,
|
|
])
|
|
const BASH_ENV_KEY_SUFFIX = /^[A-Z][A-Z0-9_]*$/
|
|
|
|
/**
|
|
* Registry (`ctx.bashEnv`) for trusted, per-execution `DSH_*` variables.
|
|
* The namespace is rebuilt for every model bash 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 BashEnvRegistry 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.bashEnv` 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, 'bashEnv')
|
|
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: BashEnvRegistry) {
|
|
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 bash 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
|
|
}
|
|
|
|
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))
|
|
}
|
|
}
|
|
|
|
/** Parsed tool args; execute validates value constraints absent from SchemaSpec. */
|
|
interface BashToolArgs {
|
|
command: string
|
|
description: string
|
|
timeoutMs?: number
|
|
workdir?: string
|
|
run_in_background?: boolean
|
|
sandbox_permissions?: string
|
|
justification?: string
|
|
}
|
|
|
|
function validateBashArgs(args: BashToolArgs): void {
|
|
if (args.command.trim().length === 0) {
|
|
throw new Error('invalid command: expected a non-empty string')
|
|
}
|
|
if (args.description.trim().length === 0) {
|
|
throw new Error('invalid description: expected a non-empty string')
|
|
}
|
|
if (args.timeoutMs !== undefined && (!Number.isFinite(args.timeoutMs) || args.timeoutMs <= 0)) {
|
|
throw new Error(`invalid timeoutMs: expected a positive number, got ${JSON.stringify(args.timeoutMs)}`)
|
|
}
|
|
// The escalation pairing (sandbox_permissions ⇔ justification, non-empty) is
|
|
// the shared rule both enforcing families validate identically.
|
|
validateEscalationArgs(args.sandbox_permissions, args.justification)
|
|
}
|
|
|
|
function bashDescription(backgroundEnabled: boolean, escalationModes: readonly SandboxMode[]): string {
|
|
const background = backgroundEnabled
|
|
? 'Set `run_in_background: true` for long-running commands: the call returns a task id immediately; read its output with `task_output` and stop it with `task_kill`.'
|
|
: 'Background execution is not available; long-running commands must finish within the timeout.'
|
|
const base = 'Execute a bash command (`bash -c`) and return its stdout/stderr. '
|
|
+ 'Each call runs in a fresh shell: no state (cwd, variables, functions) persists between calls — '
|
|
+ 'pass `workdir` instead of using `cd`. Non-zero exits are reported as `[exit code: N]`. '
|
|
+ `Current harness environment facts are exposed through managed \`$${DSH_ENV_PREFIX}*\` variables; inspect them when needed. `
|
|
+ 'Commands may run under a file sandbox; a blocked file operation is reported as `[sandbox: file access denied under <mode> mode]` — a policy denial, not a bug in the command; do not retry another way. '
|
|
+ 'Long output is truncated to its tail; the full output is saved to a file whose path is reported when available. '
|
|
+ background
|
|
if (escalationModes.length === 0) return base
|
|
return base + ' Attempting a command the sandbox may deny is safe and expected: run it and read the '
|
|
+ 'marker rather than assuming the denial. When a command is denied and a wider mode would let it '
|
|
+ 'succeed, escalate immediately in the same turn — the one sanctioned exception to a denial: retry '
|
|
+ 'the exact same command once with `sandbox_permissions` (the narrowest wider mode that suffices) '
|
|
+ 'plus a one-sentence `justification`. Do not detour through chat to ask permission first — the '
|
|
+ 'approval prompt raised by that retry is how the user consents. If the session states approval '
|
|
+ 'prompts are disabled, there is no exception: a denial is final — do not set `sandbox_permissions`. '
|
|
+ 'Never escalate speculatively: ground the request in a real denial — normally the one this command '
|
|
+ 'just hit; escalating up front is fine only when this session already denied the same access. '
|
|
+ 'A rejected escalation is final for that command — stop and explain, never work around '
|
|
+ 'it — but it does not forbid attempting or escalating other commands later.'
|
|
}
|
|
|
|
/**
|
|
* Present foreground calls as terminals and background starts as generic cards.
|
|
* The command remains the title on both paths; foreground cwd is passed through
|
|
* for the bridge to resolve, while background descriptions remain card content.
|
|
*/
|
|
type BashCallArgs = { command: string; description: string; workdir?: string; run_in_background?: boolean }
|
|
|
|
function presentBashCall(args: BashCallArgs): GenericCallView | TerminalCallView {
|
|
if (args.run_in_background === true) {
|
|
return {
|
|
card: 'generic',
|
|
title: args.command,
|
|
kind: 'execute',
|
|
rawInput: args.command,
|
|
content: [{ type: 'text', text: args.description }],
|
|
}
|
|
}
|
|
return {
|
|
card: 'terminal',
|
|
title: args.command,
|
|
description: args.description,
|
|
...args.workdir !== undefined ? { cwd: args.workdir } : {},
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Present completed foreground output as a terminal; background acknowledgements
|
|
* and execution errors use generic fenced output without an exit-status pill.
|
|
*/
|
|
function presentBashResult(args: unknown, result: ToolResult): ToolResultView | undefined {
|
|
const block = result.content.length === 1 ? result.content[0] : undefined
|
|
if (block === undefined || block.type !== 'text') return undefined
|
|
const raw = block.text
|
|
const isBackground = typeof args === 'object' && args !== null && (args as { run_in_background?: unknown }).run_in_background === true
|
|
// Background acknowledgements and errors have no terminal exit status.
|
|
if (isBackground || result.isError) {
|
|
return { card: 'generic', content: [{ type: 'text', text: `\`\`\`console\n${raw.replace(/\n+$/, '')}\n\`\`\`` }] }
|
|
}
|
|
return { card: 'terminal', output: raw, ...parseExitStatus(raw) }
|
|
}
|
|
|
|
/**
|
|
* Resolve an explicit workdir first, making a relative one session-cwd-relative;
|
|
* otherwise use the session cwd and leave executor defaulting as the fallback.
|
|
*/
|
|
function resolveWorkdir(modelWorkdir: string | undefined, exec: { agent?: Agent }): string | undefined {
|
|
const sessionCwd = exec.agent?.session.header.cwd
|
|
if (modelWorkdir === undefined) return sessionCwd
|
|
if (sessionCwd !== undefined && !isAbsolute(modelWorkdir)) {
|
|
return resolvePath(sessionCwd, modelWorkdir)
|
|
}
|
|
return modelWorkdir
|
|
}
|
|
|
|
export function apply(ctx: Context, config: Config = {}): void {
|
|
const bashEnv = new BashEnvRegistry(ctx, config)
|
|
bashEnv.register({
|
|
name: 'session-persistence',
|
|
variables: {
|
|
[DSH_SESSION_JSONL_KEY]: {
|
|
description: 'Absolute target path of the current session JSONL when the active persistence backend provides one.',
|
|
},
|
|
},
|
|
resolve(execution) {
|
|
const agent = execution.agent
|
|
if (agent === undefined) return {}
|
|
const location = ctx.get('sessionPersistence')?.locate(agent.session.header)
|
|
return location?.kind === 'jsonl' ? { [DSH_SESSION_JSONL_KEY]: location.path } : {}
|
|
},
|
|
})
|
|
const backgroundEnabled = config.enableRunInBackground ?? true
|
|
const defaultMode = ctx.bash.sandboxMode
|
|
const escalationModes: readonly SandboxMode[] = defaultMode === undefined ? [] : ESCALATION_TARGETS
|
|
|
|
const sessionOverride = (exec: ToolExecution): SandboxMode | undefined =>
|
|
defaultMode === undefined || exec.agent === undefined ? undefined : effectiveSandboxMode(exec.agent.session.events)
|
|
|
|
/**
|
|
* Resolve a sandbox-escalation request through `ctx.approval` BEFORE
|
|
* anything executes, delegating the shared fail-closed sequence (strict
|
|
* widening, channel resolution, outcome mapping) to
|
|
* {@link approveEscalation}. This tool contributes only the composition
|
|
* guard (the fields are unadvertised without a sandboxing executor, yet
|
|
* schema validation checks advertised keys only, so an unadvertised
|
|
* `sandbox_permissions` still reaches execute) and the approval ingredients
|
|
* — the seam is consumed opportunistically (`ctx.get`) so a deployment
|
|
* without it degrades per call.
|
|
*/
|
|
const approveBashEscalation = (mode: string, justification: string, exec: ToolExecution): Promise<SandboxMode> => {
|
|
if (escalationModes.length === 0) {
|
|
throw new Error('sandbox_permissions is not available in this composition (no sandboxing executor to escalate)')
|
|
}
|
|
const effectiveMode = (sessionOverride(exec) ?? defaultMode) as SandboxMode
|
|
return approveEscalation(
|
|
{ requestedMode: mode, justification, effectiveMode, subject: 'command' },
|
|
{
|
|
approver: ctx.get('approval'),
|
|
agent: exec.agent,
|
|
callId: exec.callId,
|
|
toolName: 'bash',
|
|
...exec.signal ? { signal: exec.signal } : {},
|
|
},
|
|
)
|
|
}
|
|
|
|
// Cross-call guidance belongs in the prompt rather than one-call schema prose.
|
|
ctx.systemPrompt.section({
|
|
name: 'tool:bash',
|
|
order: 105,
|
|
text: 'Check the [exit code: N] marker on every bash result; investigate failures before moving on.',
|
|
})
|
|
|
|
ctx.tools.register(defineTool({
|
|
name: 'bash',
|
|
description: bashDescription(backgroundEnabled, escalationModes),
|
|
parameters: {
|
|
command: { type: 'string', required: true, description: 'The bash command to execute.' },
|
|
description: {
|
|
type: 'string',
|
|
required: true,
|
|
description: 'Clear, concise description of what this command does in active voice, '
|
|
+ '5-10 words (shown in the UI). Examples: "ls" → "List files in current directory"; '
|
|
+ '"git status" → "Show working tree status"; "npm install" → "Install package dependencies".',
|
|
},
|
|
timeoutMs: { type: 'number', description: 'Timeout in milliseconds. The executor applies its configured default and cap, and kills the command on expiry.' },
|
|
workdir: { type: 'string', description: 'Working directory for this command. Defaults to the session workspace; a relative path is resolved against it.' },
|
|
...backgroundEnabled ? {
|
|
run_in_background: { type: 'boolean' as const, description: 'Run in the background and return a task id immediately (collect with task_output, stop with task_kill). No timeout applies.' },
|
|
} : {},
|
|
...escalationModes.length > 0 ? {
|
|
sandbox_permissions: {
|
|
type: 'string' as const,
|
|
enum: [...escalationModes],
|
|
description: 'The wider sandbox mode this command needs. Only valid as a one-shot retry of a command the sandbox just denied; requires justification and user approval.',
|
|
},
|
|
justification: {
|
|
type: 'string' as const,
|
|
description: 'Required with sandbox_permissions: one sentence for the user explaining why this exact command needs the wider access.',
|
|
},
|
|
} : {},
|
|
},
|
|
async execute(args: BashToolArgs, exec) {
|
|
validateBashArgs(args)
|
|
// Description is display metadata; workdir defaults to the caller's session.
|
|
const sandboxMode = args.sandbox_permissions !== undefined && args.justification !== undefined
|
|
? await approveBashEscalation(args.sandbox_permissions, args.justification, exec)
|
|
: sessionOverride(exec)
|
|
const workdir = resolveWorkdir(args.workdir, exec)
|
|
const dshEnv = bashEnv.collect(exec)
|
|
const request = {
|
|
command: args.command,
|
|
...workdir !== undefined ? { workdir } : {},
|
|
...args.timeoutMs !== undefined ? { timeoutMs: args.timeoutMs } : {},
|
|
dshEnv,
|
|
...sandboxMode !== undefined ? { sandboxMode } : {},
|
|
}
|
|
if (args.run_in_background === true) {
|
|
// Undeclared keys are allowed, so schema omission also needs enforcement.
|
|
if (!backgroundEnabled) {
|
|
throw new Error('run_in_background is disabled for this deployment (enableRunInBackground: false)')
|
|
}
|
|
const tasks = ctx.get('tasks')
|
|
if (tasks === undefined) {
|
|
throw new Error('background tasks unavailable: load @deepseek-ai/dsh-tasks and @deepseek-ai/dsh-tool-tasks')
|
|
}
|
|
// Reject pre-start cancellation; returned tasks use their own lifecycle.
|
|
if (exec.signal?.aborted) throw new Error('command aborted')
|
|
// Task preflight finishes before the starter can spawn a process.
|
|
const id = tasks.start({
|
|
kind: 'bash',
|
|
label: args.command,
|
|
...exec.agent ? { owner: exec.agent } : {},
|
|
run: () => {
|
|
const proc = ctx.bash.start(ctx.bash.resolve(request))
|
|
return {
|
|
cancel: () => void proc.kill(),
|
|
done: proc.done.then(() => processOutcome(proc)),
|
|
readOutput: () => renderProcessRead(proc.readOutput(), proc.sandbox, escalationModes),
|
|
}
|
|
},
|
|
})
|
|
return [{ type: 'text', text: `started background task ${id}` }]
|
|
}
|
|
const result = await ctx.bash.run(ctx.bash.resolve({
|
|
...request,
|
|
...exec.signal ? { signal: exec.signal } : {},
|
|
}))
|
|
if (result.aborted) throw new Error('command aborted')
|
|
return [{ type: 'text', text: renderResult(result, escalationModes) }]
|
|
},
|
|
presentCall: presentBashCall,
|
|
presentResult: presentBashResult,
|
|
}))
|
|
}
|