mirror of
https://github.com/deepseek-ai/deepseek-harness
synced 2026-08-15 21:04:50 +00:00
Review direction (tianyicui, PR #660): in a stacked PR, change all other process-running places to use the new service. - lsp-local: LspConnection spawns through ctx.subprocess (piped protocol streams + a no-spill collected stderr tail); its private process-tree helpers (POSIX group signalling, Windows taskkill, liveness polling) are deleted in favor of the seam's handle verbs, and its buildChildEnv now rides scrubbedParentEnv (LSP children also stop inheriting stale DSH_*). The plugin injects 'subprocess'; compositions/tests mount dsh-subprocess-local. - subagent-acp: the ACP child spawns through the seam (piped ndjson streams, inherited stderr); spawn failure surfaces through done-rejection into the same startup race; disposal is handle.dispose with the plugin's configured graces. dsh-subagent-subprocess is DELETED — its dispose ladder and scrub are the seam's, and the isolated-config-dir helper had no consumer. - mcp-client, pty-local, sdk-helper: adopt scrubbedParentEnv as the one scrub definition (their spawns stay put by ownership: the MCP SDK and node-pty own those calls; the SDK wizard runs outside any composition). - Coverage: per-file 100% over every touched src file, with each v8 ignore carrying a platform or contract reason; new suites cover stdio dispositions, the dispose ladder tiers, injected-win32 tree semantics, waitForExit, settled-kill/terminate no-ops, and spawn-failure disposal. - Docs: consumer-migration Agent Note (en; zh follows in this PR), seam note updated in place, subprocess.md rewritten for the reshaped vocabulary (type-equiv re-registered), READMEs and SERVICE_ROLES updated, taskkill added to knip ignoreBinaries.
183 lines
8.1 KiB
TypeScript
183 lines
8.1 KiB
TypeScript
/**
|
|
* Out-of-process ACP subagent backend. Each child has its own process, session, model, and
|
|
* tools, so it shares no Cordis context and advertises no parent-enforced start capabilities;
|
|
* the ONE thing it reads off `request.parent` is the session's workspace cwd (see
|
|
* {@link resolveCwd}). This plugin uses named exports only; a default would hide its
|
|
* loader metadata (see `docs/postmortem/0001-acp-default-export-drops-inject.md`).
|
|
* @module @deepseek-ai/dsh-subagent-acp
|
|
*/
|
|
|
|
import { accessSync, constants, statSync } from 'node:fs'
|
|
import { isAbsolute, resolve } from 'node:path'
|
|
import type { Context } from 'cordis'
|
|
import z from 'schemastery'
|
|
import type { SubagentCapabilities, SubagentProvider, SubagentStartRequest } from '@deepseek-ai/dsh-subagent'
|
|
import { type AcpRunSpec, DEFAULT_DISPOSE_EOF_GRACE_MS, DEFAULT_DISPOSE_GRACE_MS, type PermissionPolicy, startAcpRun } from './run.ts'
|
|
|
|
export const name = 'subagent-acp'
|
|
export const inject = ['subagents', 'subprocess']
|
|
|
|
/** Config: how to spawn and drive the child ACP agent process. */
|
|
export interface Config {
|
|
/** Provider name on `ctx.subagents` (default `acp`). */
|
|
providerName: string
|
|
/** The executable to spawn for each run (the child ACP agent). */
|
|
command: string
|
|
/** Arguments passed to {@link command}. */
|
|
args: string[]
|
|
/**
|
|
* Working directory override for the child process and its ACP session.
|
|
* Must be non-empty; a relative path resolves against the harness launch
|
|
* directory at load, and the result must be an existing directory. When
|
|
* omitted, each child inherits its delegating parent session's cwd — and
|
|
* starting one from a parent session that has no cwd fails.
|
|
*/
|
|
cwd?: string
|
|
/**
|
|
* How to auto-answer the child's `session/request_permission` prompts:
|
|
* `reject` (default — decline every prompt) or `allow` (approve via the first
|
|
* allow-shaped option). The first cut surfaces no prompt to a human.
|
|
*/
|
|
permission: PermissionPolicy
|
|
/**
|
|
* Extra environment variables for the child process — e.g. the child
|
|
* harness's own `DEEPSEEK_API_KEY`. Forwarded on top of a credential-scrubbed
|
|
* copy of the parent env, so an explicit key here reaches the child while
|
|
* ambient secrets do not leak implicitly.
|
|
*/
|
|
env: Record<string, string>
|
|
/**
|
|
* Grace period (ms) for the child's EOF-driven quiesce on dispose — its
|
|
* window to flush persistence and tear down its own nested subprocesses
|
|
* before the parent escalates to a signal.
|
|
*/
|
|
disposeEofGraceMs?: number
|
|
/** Termination confirmation window (ms), including forced exit on every platform. */
|
|
disposeGraceMs?: number
|
|
}
|
|
|
|
export const Config: z<Config> = z.object({
|
|
providerName: z.string().default('acp'),
|
|
command: z.string().required(),
|
|
args: z.array(z.string()).default([]),
|
|
cwd: z.string(),
|
|
permission: z.union(['allow', 'reject'] as const).default('reject'),
|
|
env: z.dict(z.string()).default({}),
|
|
disposeEofGraceMs: z.number().default(DEFAULT_DISPOSE_EOF_GRACE_MS),
|
|
disposeGraceMs: z.number().default(DEFAULT_DISPOSE_GRACE_MS),
|
|
})
|
|
|
|
/** A dispose grace must be a positive finite number (it bounds the teardown wait). */
|
|
function assertPositiveFinite(name: string, value: number): void {
|
|
if (!Number.isFinite(value) || value <= 0) {
|
|
throw new Error(`subagent-acp: ${name} must be a positive finite number`)
|
|
}
|
|
}
|
|
|
|
/** The shape after schemastery applied the defaults (cwd has none). */
|
|
type ResolvedConfig = Required<Omit<Config, 'cwd'>> & Pick<Config, 'cwd'>
|
|
|
|
/**
|
|
* Whether `path` names an existing directory the harness can ENTER. The
|
|
* search-permission probe matters: `statSync().isDirectory()` is true for a
|
|
* mode-600 directory, but a subprocess cwd needs `X_OK` or spawn fails EACCES.
|
|
*/
|
|
function isDirectory(path: string): boolean {
|
|
try {
|
|
if (!statSync(path).isDirectory()) return false
|
|
accessSync(path, constants.X_OK)
|
|
return true
|
|
} catch {
|
|
// statSync/accessSync throw only filesystem access errors here
|
|
// (ENOENT/EACCES/ENOTDIR/…), and every one of them means the path cannot
|
|
// serve as the child's cwd.
|
|
return false
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Assert `cwd` can actually host the child: absolute (it doubles as the ACP
|
|
* session workspace, and a relative path would be re-anchored to the server
|
|
* process's launch directory) and an existing directory (fail here, before the
|
|
* process boundary, instead of as an ambiguous spawn ENOENT).
|
|
* @param label - which source supplied the value, for the diagnostic.
|
|
* @param cwd - the candidate working directory.
|
|
* @returns `cwd`, validated.
|
|
*/
|
|
function assertUsableCwd(label: string, cwd: string): string {
|
|
if (!isAbsolute(cwd)) {
|
|
throw new Error(`subagent-acp: ${label} must be an absolute path: ${cwd}`)
|
|
}
|
|
if (!isDirectory(cwd)) {
|
|
throw new Error(`subagent-acp: ${label} is not an accessible directory: ${cwd}`)
|
|
}
|
|
return cwd
|
|
}
|
|
|
|
/**
|
|
* Resolve the child's working directory: the deployment `cwd` override when
|
|
* configured (already validated at load), else the parent session's workspace
|
|
* cwd (validated here, its earliest resolvable point). Fails loud when neither
|
|
* exists — falling back to the harness process cwd would silently bind the
|
|
* child to the server's launch directory instead of the delegating session's
|
|
* workspace (one server process serves many sessions, each with its own cwd).
|
|
*/
|
|
function resolveCwd(configured: string | undefined, request: SubagentStartRequest): string {
|
|
if (configured !== undefined) return configured
|
|
const parentCwd = request.parent.session.header.cwd
|
|
if (parentCwd === undefined) {
|
|
throw new Error('subagent-acp: no working directory for the child — configure `cwd` or delegate from a parent session that has one')
|
|
}
|
|
return assertUsableCwd('parent session cwd', parentCwd)
|
|
}
|
|
|
|
/**
|
|
* The ACP provider. Advertises NO start-time capabilities: an out-of-process
|
|
* child cannot honor `outputSchema`/`maxDepth`/`toolFilter` (the service rejects
|
|
* a request needing any of them before `start` runs).
|
|
*/
|
|
class AcpProvider implements SubagentProvider {
|
|
readonly capabilities: SubagentCapabilities = { outputSchema: false, depthLimit: false, toolFilter: false, persona: false }
|
|
// Context contract: an out-of-process ACP child starts fresh — no parent conversation crosses the process boundary.
|
|
readonly inheritsParentContext = false
|
|
|
|
constructor(readonly name: string, private readonly ctx: Context, private readonly config: ResolvedConfig) {}
|
|
|
|
start(request: SubagentStartRequest) {
|
|
const spec: AcpRunSpec = {
|
|
command: this.config.command,
|
|
args: this.config.args,
|
|
cwd: resolveCwd(this.config.cwd, request),
|
|
permission: this.config.permission,
|
|
env: this.config.env,
|
|
disposeEofGraceMs: this.config.disposeEofGraceMs,
|
|
disposeGraceMs: this.config.disposeGraceMs,
|
|
spawn: spec => this.ctx.subprocess.spawn(spec),
|
|
onError: (error, stopReason) => {
|
|
// The seam forbids `result` rejecting, so a child-level failure is
|
|
// flattened to a stop reason — preserve it here rather than losing it.
|
|
this.ctx.logger.warn(`subagent-acp "${this.name}": child run failed (${stopReason}): ${error.message}`)
|
|
},
|
|
}
|
|
return startAcpRun(request, spec)
|
|
}
|
|
}
|
|
|
|
export function apply(ctx: Context, config: Config): void {
|
|
// schemastery (Config) has already filled every defaulted field.
|
|
const resolved = config as ResolvedConfig
|
|
assertPositiveFinite('disposeEofGraceMs', resolved.disposeEofGraceMs)
|
|
assertPositiveFinite('disposeGraceMs', resolved.disposeGraceMs)
|
|
// `path.resolve('')` is the process cwd — an empty string would silently
|
|
// reintroduce the launch-directory fallback this resolution removed.
|
|
if (resolved.cwd === '') {
|
|
throw new Error('subagent-acp: config cwd must not be empty — omit the key to inherit the parent session cwd')
|
|
}
|
|
// Interpret a relative configured cwd against the harness launch directory
|
|
// ONCE, at load, and fail a misconfigured directory here — not per start.
|
|
const validated: ResolvedConfig = resolved.cwd === undefined
|
|
? resolved
|
|
: { ...resolved, cwd: assertUsableCwd('config cwd', resolve(resolved.cwd)) }
|
|
ctx.subagents.registerProvider(new AcpProvider(validated.providerName, ctx, validated))
|
|
}
|