3672cd25b4
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.
52 lines
2.0 KiB
TypeScript
52 lines
2.0 KiB
TypeScript
/**
|
|
* Transport factory: creates the appropriate MCP transport based on the
|
|
* plugin's resolved config. Stdio spawns a child process (with credential
|
|
* scrubbing); Streamable HTTP connects to a URL.
|
|
*
|
|
* @module
|
|
*/
|
|
|
|
import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
|
|
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
|
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
|
|
import { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess'
|
|
import type { Config } from './index.ts'
|
|
|
|
/**
|
|
* The subprocess seam's scrubbed parent env (credential-shaped and stale
|
|
* `DSH_*` names dropped), plus the spec's explicit env. The MCP SDK owns the
|
|
* actual spawn, so this transport shares the scrub definition rather than the
|
|
* spawn path.
|
|
*/
|
|
function buildChildEnv(extra: Record<string, string>): Record<string, string> {
|
|
return { ...scrubbedParentEnv(), ...extra }
|
|
}
|
|
|
|
/**
|
|
* Create an MCP transport from the resolved plugin config.
|
|
*
|
|
* @param config - Resolved plugin config discriminated on `transport`.
|
|
* @returns A connected-ready MCP Transport (stdio or Streamable HTTP).
|
|
*/
|
|
export function createTransport(config: Config): Transport {
|
|
switch (config.transport) {
|
|
case 'stdio':
|
|
return new StdioClientTransport({
|
|
command: config.command,
|
|
args: config.args,
|
|
env: buildChildEnv(config.env),
|
|
cwd: config.cwd,
|
|
})
|
|
case 'streamable-http':
|
|
// The MCP SDK's StreamableHTTPClientTransport has optional callback
|
|
// properties typed without `| undefined` (exactOptionalPropertyTypes
|
|
// mismatch with the Transport interface). The cast is safe — the SDK
|
|
// constructed the object, it simply doesn't declare the optionals
|
|
// strictly enough for our tsconfig.
|
|
return new StreamableHTTPClientTransport(
|
|
new URL(config.url),
|
|
{ requestInit: { headers: config.headers } },
|
|
) as Transport
|
|
}
|
|
}
|