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.
110 lines
4.5 KiB
TypeScript
110 lines
4.5 KiB
TypeScript
import { mkdtemp, readFile, rm } from 'node:fs/promises'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import { fileURLToPath } from 'node:url'
|
|
import { afterEach, describe, expect, it } from 'vitest'
|
|
import { Context } from 'cordis'
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
import SubagentService from '@deepseek-ai/dsh-subagent'
|
|
import { resolveExampleLaunch } from '@deepseek-ai/dsh-loader-smoke'
|
|
import * as acp from '../src/index.ts'
|
|
|
|
/**
|
|
* With-key cross-process seam proof: the backend spawns the real acp-agent example, speaks ACP over
|
|
* stdio, and returns its real model answer. This is the out-of-process counterpart to in-process
|
|
* spawn coverage and self-skips without `DEEPSEEK_API_KEY`.
|
|
*/
|
|
|
|
// The real acp-agent example: its bin + cordis.yml (the live DeepSeek config).
|
|
const binScript = fileURLToPath(new URL('../../../examples/acp-demo/src/bin.ts', import.meta.url))
|
|
const exampleConfig = fileURLToPath(new URL('../../../../examples/acp-agent/cordis.yml', import.meta.url))
|
|
const repoTsconfig = fileURLToPath(new URL('../../../../tsconfig.json', import.meta.url))
|
|
|
|
// How to launch the child acp-agent (src via tsx / lib via plain node, per DSH_EXAMPLE_MODE).
|
|
// The subprocess seam scrubs ambient creds while spec.env merges after it, so the model key is
|
|
// forwarded explicitly; TSX_TSCONFIG_PATH is added by the resolver in src mode only.
|
|
const childLaunch = resolveExampleLaunch({
|
|
srcBin: binScript,
|
|
configArgs: ['--config', exampleConfig],
|
|
tsconfigPath: repoTsconfig,
|
|
env: {
|
|
...process.env.DEEPSEEK_API_KEY !== undefined ? { DEEPSEEK_API_KEY: process.env.DEEPSEEK_API_KEY } : {},
|
|
...process.env.DEEPSEEK_BASE_URL !== undefined ? { DEEPSEEK_BASE_URL: process.env.DEEPSEEK_BASE_URL } : {},
|
|
DSH_PERMISSION_MODE: 'danger-full-access',
|
|
},
|
|
})
|
|
|
|
/** The ACP backend ignores the parent, but the seam requires one. */
|
|
const fakeParent = { id: 'parent', session: { header: {} } } as unknown as Agent
|
|
|
|
let ctx: Context | undefined
|
|
let workdir: string | undefined
|
|
|
|
afterEach(async () => {
|
|
await ctx?.fiber.dispose()
|
|
ctx = undefined
|
|
if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
|
|
workdir = undefined
|
|
})
|
|
|
|
describe.skipIf(!process.env.DEEPSEEK_API_KEY)('ACP backend with-key e2e (drive our own acp-agent)', () => {
|
|
it('drives the real acp-agent example process to answer a prompt', async () => {
|
|
workdir = await mkdtemp(join(tmpdir(), 'dsh-subagent-acp-e2e-'))
|
|
ctx = new Context()
|
|
await ctx.plugin(SubagentService)
|
|
await ctx.plugin(acp, {
|
|
providerName: 'acp',
|
|
command: childLaunch.command,
|
|
args: childLaunch.args,
|
|
cwd: workdir,
|
|
permission: 'reject',
|
|
env: childLaunch.env as Record<string, string>,
|
|
})
|
|
|
|
const run = await ctx.subagents.start('acp', {
|
|
prompt: [{ type: 'text', text: 'Reply with exactly the word PONG and nothing else. Do not use any tools.' }],
|
|
parent: fakeParent,
|
|
signal: new AbortController().signal,
|
|
})
|
|
const result = await run.result
|
|
await run.dispose()
|
|
|
|
// The real child process completed its turn and streamed a real answer back
|
|
// across the ACP boundary.
|
|
expect(result.stopReason).toBe('completed')
|
|
const text = result.output.filter(b => b.type === 'text').map(b => (b as { text: string }).text).join('')
|
|
expect(text.length).toBeGreaterThan(0)
|
|
expect(text.toUpperCase()).toContain('PONG')
|
|
}, 180_000)
|
|
|
|
it('drives the child to do real file work via its own bash tool', async () => {
|
|
workdir = await mkdtemp(join(tmpdir(), 'dsh-subagent-acp-e2e-'))
|
|
ctx = new Context()
|
|
await ctx.plugin(SubagentService)
|
|
await ctx.plugin(acp, {
|
|
providerName: 'acp',
|
|
command: childLaunch.command,
|
|
args: childLaunch.args,
|
|
cwd: workdir,
|
|
// The child needs to act (run bash), so approve its permission prompts.
|
|
permission: 'allow',
|
|
env: childLaunch.env as Record<string, string>,
|
|
})
|
|
|
|
const run = await ctx.subagents.start('acp', {
|
|
prompt: [{ type: 'text', text:
|
|
'Use the bash tool to write the text ACP_CHILD_WAS_HERE into a file named proof.txt '
|
|
+ 'in the current directory. Then reply DONE.' }],
|
|
parent: fakeParent,
|
|
signal: new AbortController().signal,
|
|
})
|
|
const result = await run.result
|
|
await run.dispose()
|
|
|
|
expect(result.stopReason).toBe('completed')
|
|
// Assert the filesystem effect independently of the model response.
|
|
const proof = await readFile(join(workdir, 'proof.txt'), 'utf8')
|
|
expect(proof).toContain('ACP_CHILD_WAS_HERE')
|
|
}, 180_000)
|
|
})
|