feat: open local runtime clients from the composer
Add composer shortcuts for local Continue and OpenCode terminals and the official DeepSeek Harness Web client, using the current project and model bridge. Manage browser service reuse, stop actions and terminal cleanup. Upgrade DeepSeek Harness to 0.1.7-rc.2 and Cordis to 4.0.4. Include the coordinated IPC handler extraction and related tests and documentation. Remote native-client coordinator wiring, managed Node consolidation, Ask MCP mappings and full desktop/package acceptance remain unfinished; this commit records the implemented local workflow and supporting SSH groundwork. Validation: typecheck and lint passed; 267 focused tests passed and 5 skipped. No new real-provider calls were made for this commit. Prior real-model evidence and remaining acceptance work are documented in the feature progress files. Release note: 本地项目选择 Continue 或 OpenCode 后，可从输入框下方打开原生终端；选择 DS 后，可打开使用当前项目和模型的官方 Web 客户端。客户端使用独立会话，DS 网页关闭后服务继续运行，可在 GoodBuddy 中停止；远程入口尚未完成。
This commit is contained in:
mesalogo
@@ -0,0 +1,232 @@
|
||||
import { execFile, spawn, type ChildProcess } from 'node:child_process'
|
||||
import { createHash, randomUUID } from 'node:crypto'
|
||||
import { mkdir, realpath, rm, stat, writeFile } from 'node:fs/promises'
|
||||
import { createRequire } from 'node:module'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { promisify } from 'node:util'
|
||||
import { AgentModelCallLedger, AgentModelGateway } from '../../agent-daemon/agent-model-gateway'
|
||||
import { MODEL_BRIDGE_SDK_AUTH_SENTINEL, ModelBridgeLoopbackProxy } from '../../agent-daemon/model-bridge-helper'
|
||||
import { canonicalJson } from '../../shared/agent-protocol/canonical'
|
||||
import type { ResolvedModelProfile } from '../runtime-settings-store'
|
||||
import { createManagedModelBridge } from '../remote-agent/managed-model-bridge'
|
||||
import { terminateProcessTreeAndWait } from './child-process-termination'
|
||||
import { buildCredentialFilteredUserEnvironment } from './process-environment'
|
||||
import { nativeDshMcpToolName, nativeDshWebPatch, nativeDshWebPolicySource, type NativeDshMcpServer } from './native-dsh-web-policy'
|
||||
|
||||
export type { NativeDshMcpServer } from './native-dsh-web-policy'
|
||||
|
||||
export type NativeDshWebRequest = {
|
||||
projectId: string
|
||||
ownerId?: number
|
||||
/** Includes the coordinator's current capability digests and launch settings. */
|
||||
configurationKey?: string
|
||||
workspace: string
|
||||
profile: ResolvedModelProfile
|
||||
workMode: 'ask' | 'execute'
|
||||
/** Directories containing SKILL.md, or roots containing skill bundles. */
|
||||
skillDirectories?: string[]
|
||||
/** Already resolved by Main; GoodBuddy-only tools need a caller-owned MCP adapter. */
|
||||
mcpServers?: NativeDshMcpServer[]
|
||||
}
|
||||
|
||||
export type NativeDshWebHandle = { id: string; url: string }
|
||||
export type NativeDshWebClientOptions = {
|
||||
rootDirectory: string
|
||||
resolveLaunchEnvironment: () => Promise<{
|
||||
nodeExecutablePath: string
|
||||
environment: Readonly<NodeJS.ProcessEnv>
|
||||
}>
|
||||
/** Packaged: process.resourcesPath. Omit in development. */
|
||||
resourcesPath?: string
|
||||
cliPath?: string
|
||||
startupTimeoutMs?: number
|
||||
/** Existing gateway supports injecting fetch for focused protocol tests. */
|
||||
fetcher?: typeof fetch
|
||||
}
|
||||
|
||||
type Instance = {
|
||||
id: string
|
||||
controller: AbortController
|
||||
ready: Promise<NativeDshWebHandle>
|
||||
child?: ChildProcess
|
||||
proxy?: ModelBridgeLoopbackProxy
|
||||
ledger?: AgentModelCallLedger
|
||||
cleanup?: Promise<void>
|
||||
home: string
|
||||
}
|
||||
|
||||
export function resolveNativeDshCli(resourcesPath?: string): string {
|
||||
return resourcesPath
|
||||
? join(resourcesPath, 'runtimes', 'dsh', 'node_modules', '@deepseek-ai', 'dsh', 'lib', 'bin.js')
|
||||
: join(dirname(createRequire(import.meta.url).resolve('@deepseek-ai/dsh/package.json')), 'lib', 'bin.js')
|
||||
}
|
||||
|
||||
export class NativeDshWebClientService {
|
||||
private readonly instances = new Map<string, Instance>()
|
||||
private disposed = false
|
||||
|
||||
constructor(private readonly options: NativeDshWebClientOptions) {}
|
||||
|
||||
async start(input: NativeDshWebRequest): Promise<NativeDshWebHandle> {
|
||||
if (this.disposed) throw new Error('DS Web service is disposed')
|
||||
const request = structuredClone(input)
|
||||
request.workspace = await realpath(request.workspace)
|
||||
if (!(await stat(request.workspace)).isDirectory()) throw new Error('DS Web workspace is not a directory')
|
||||
if (this.disposed) throw new Error('DS Web service is disposed')
|
||||
// Include credentials in the in-memory match hash so credential rotation starts
|
||||
// a fresh bridge. Only the digest is used as a directory name.
|
||||
const key = createHash('sha256').update(canonicalJson(JSON.parse(JSON.stringify(request)))).digest('hex')
|
||||
const existing = this.instances.get(key)
|
||||
if (existing) {
|
||||
if (existing.controller.signal.aborted || (existing.child &&
|
||||
(existing.child.exitCode !== null || existing.child.signalCode !== null))) {
|
||||
await existing.ready.catch(() => undefined)
|
||||
await this.cleanup(existing)
|
||||
return this.start(request)
|
||||
}
|
||||
return existing.ready
|
||||
}
|
||||
const instance: Instance = {
|
||||
id: key, controller: new AbortController(),
|
||||
home: join(this.options.rootDirectory, key),
|
||||
ready: Promise.resolve({ id: key, url: '' })
|
||||
}
|
||||
this.instances.set(key, instance)
|
||||
instance.ready = this.launch(instance, request).catch(async error => {
|
||||
await this.cleanup(instance)
|
||||
throw error
|
||||
})
|
||||
return instance.ready
|
||||
}
|
||||
|
||||
async stop(id: string): Promise<void> {
|
||||
const instance = this.instances.get(id)
|
||||
if (!instance) return
|
||||
instance.controller.abort(new Error('DS Web service stopped'))
|
||||
await instance.ready.catch(() => undefined)
|
||||
await this.cleanup(instance)
|
||||
}
|
||||
|
||||
async get(id: string): Promise<NativeDshWebHandle | null> {
|
||||
const instance = this.instances.get(id)
|
||||
if (!instance || instance.controller.signal.aborted) return null
|
||||
const handle = await instance.ready.catch(() => null)
|
||||
return instance.controller.signal.aborted || (instance.child &&
|
||||
(instance.child.exitCode !== null || instance.child.signalCode !== null)) ? null : handle
|
||||
}
|
||||
|
||||
async dispose(): Promise<void> {
|
||||
this.disposed = true
|
||||
await Promise.all([...this.instances.keys()].map(id => this.stop(id)))
|
||||
}
|
||||
|
||||
private async cleanup(instance: Instance): Promise<void> {
|
||||
instance.cleanup ??= (async () => {
|
||||
instance.controller.abort(new Error('DS Web service stopped'))
|
||||
if (instance.child && instance.child.signalCode === null) {
|
||||
await terminateProcessTreeAndWait(instance.child, { processGroup: process.platform !== 'win32' })
|
||||
}
|
||||
await instance.proxy?.close()
|
||||
instance.ledger?.close()
|
||||
// Native history and profile settings are persistent; only launch material is disposable.
|
||||
await Promise.all(['cordis.patch.yml', 'goodbuddy-mode.mjs', 'bridge.sqlite', 'bridge.sqlite-wal', 'bridge.sqlite-shm']
|
||||
.map(name => rm(join(instance.home, name), { force: true })))
|
||||
if (this.instances.get(instance.id) === instance) this.instances.delete(instance.id)
|
||||
})()
|
||||
return instance.cleanup
|
||||
}
|
||||
|
||||
private async launch(instance: Instance, request: NativeDshWebRequest): Promise<NativeDshWebHandle> {
|
||||
const signal = AbortSignal.any([instance.controller.signal, AbortSignal.timeout(this.options.startupTimeoutMs ?? 60_000)])
|
||||
const launch = await this.options.resolveLaunchEnvironment()
|
||||
signal.throwIfAborted()
|
||||
if (!launch.nodeExecutablePath) throw new Error('DS Web requires a standard Node executable from the local tool environment')
|
||||
const environment = buildCredentialFilteredUserEnvironment({ ...launch.environment })
|
||||
const { stdout } = await promisify(execFile)(launch.nodeExecutablePath,
|
||||
['-p', 'JSON.stringify({node:process.versions.node,electron:process.versions.electron})'],
|
||||
{ env: { ...environment, ELECTRON_RUN_AS_NODE: '1' }, signal, timeout: 5_000, windowsHide: true })
|
||||
const runtime = JSON.parse(stdout.trim()) as { node?: string; electron?: string }
|
||||
if (!runtime.node || runtime.electron) throw new Error('DS Web requires standard Node, not Electron')
|
||||
const cli = this.options.cliPath ?? resolveNativeDshCli(this.options.resourcesPath)
|
||||
await stat(cli)
|
||||
await mkdir(instance.home, { recursive: true, mode: 0o700 })
|
||||
const managed = createManagedModelBridge({ profile: request.profile })
|
||||
instance.ledger = new AgentModelCallLedger(join(instance.home, 'bridge.sqlite'))
|
||||
const gateway = new AgentModelGateway({ ledger: instance.ledger, fetcher: this.options.fetcher })
|
||||
const operationId = randomUUID()
|
||||
let roundIndex = 0
|
||||
instance.proxy = new ModelBridgeLoopbackProxy({ exchange: (message, context) => gateway.dispatch({
|
||||
bindingId: instance.id, operationId, promptSequence: 0, roundIndex: roundIndex++,
|
||||
profileDigest: managed.profile.modelProfileDigest, profile: managed.profile
|
||||
}, message, context.signal) })
|
||||
const origin = await instance.proxy.listen()
|
||||
const policyPath = join(instance.home, 'goodbuddy-mode.mjs')
|
||||
const mcpServers = request.mcpServers ?? []
|
||||
const patch = nativeDshWebPatch({
|
||||
model: request.profile.modelName,
|
||||
api: request.profile.protocol === 'anthropic-messages' ? 'anthropic-messages'
|
||||
: request.profile.protocol === 'openai-responses' ? 'openai-responses' : 'openai-completions',
|
||||
baseURL: `${origin}/v1`, workMode: request.workMode, policyPath,
|
||||
skillDirectories: request.skillDirectories ?? [], mcpServers,
|
||||
readOnlyTools: mcpServers.flatMap(server => (server.readOnlyTools ?? []).map(name => nativeDshMcpToolName(server.serverName, name)))
|
||||
})
|
||||
await writeFile(policyPath, nativeDshWebPolicySource, 'utf8')
|
||||
await writeFile(join(instance.home, 'cordis.patch.yml'), JSON.stringify(patch), 'utf8')
|
||||
signal.throwIfAborted()
|
||||
for (const name of Object.keys(environment)) if (name.startsWith('DSH_')) delete environment[name]
|
||||
instance.child = spawn(launch.nodeExecutablePath, [cli, 'web', '--no-open', '--host', '127.0.0.1', '--port', '0'], {
|
||||
cwd: request.workspace, shell: false, windowsHide: true,
|
||||
detached: process.platform !== 'win32', stdio: ['ignore', 'pipe', 'pipe'],
|
||||
env: { ...environment, DSH_HOME: instance.home, DSH_TELEMETRY_DISABLED: '1',
|
||||
DSH_PERMISSION_MODE: 'danger-full-access', GOODBUDDY_DSH_MODEL_KEY: MODEL_BRIDGE_SDK_AUTH_SENTINEL }
|
||||
})
|
||||
const child = instance.child
|
||||
const url = await new Promise<string>((resolve, reject) => {
|
||||
let output = ''
|
||||
const finish = (error?: Error, address?: string): void => {
|
||||
signal.removeEventListener('abort', onAbort)
|
||||
child.removeListener('error', onError)
|
||||
child.removeListener('exit', onExit)
|
||||
child.stdout?.removeListener('data', onData)
|
||||
child.stderr?.removeListener('data', onData)
|
||||
if (error) reject(error)
|
||||
else resolve(address!)
|
||||
}
|
||||
const onAbort = (): void => finish(new Error('DS Web startup cancelled or timed out', { cause: signal.reason }))
|
||||
const onError = (error: Error): void => finish(new Error(`DS Web process could not start: ${error.message}`))
|
||||
const onExit = (code: number | null): void => finish(new Error(`DS Web exited during startup (${code})`))
|
||||
const onData = (chunk: Buffer): void => {
|
||||
output = (output + chunk.toString()).slice(-32_768)
|
||||
// Wait for the full line; stdout can split in the middle of the token.
|
||||
// eslint-disable-next-line no-control-regex
|
||||
const match = output.match(/http:\/\/127\.0\.0\.1:\d+[^\s\x1b]*(?=[\s\x1b])/u)
|
||||
if (match) finish(undefined, match[0])
|
||||
}
|
||||
child.once('error', onError)
|
||||
child.once('exit', onExit)
|
||||
child.stdout?.on('data', onData)
|
||||
child.stderr?.on('data', onData)
|
||||
signal.addEventListener('abort', onAbort, { once: true })
|
||||
if (signal.aborted) onAbort()
|
||||
})
|
||||
// Drain subsequent logs without retaining token-bearing output.
|
||||
child.stdout?.resume()
|
||||
child.stderr?.resume()
|
||||
child.once('exit', () => { void this.cleanup(instance) })
|
||||
const auth = await fetch(url, { redirect: 'manual', signal })
|
||||
if (auth.status !== 303) throw new Error(`DS Web authentication failed (HTTP ${auth.status})`)
|
||||
const cookie = auth.headers.getSetCookie().map(value => value.split(';')[0]).join('; ')
|
||||
const response = await fetch(new URL('/api/workspace/create', url), {
|
||||
method: 'POST', signal,
|
||||
headers: { 'content-type': 'application/json', cookie, origin: new URL(url).origin },
|
||||
body: JSON.stringify({ type: 'client-request', rpcId: randomUUID(), method: 'workspace/create',
|
||||
payload: { args: { request: { path: request.workspace } } } })
|
||||
})
|
||||
if (!response.ok) throw new Error(`DS Web workspace creation failed (HTTP ${response.status})`)
|
||||
const result = await response.json() as { result?: { ok?: boolean } }
|
||||
if (result.result?.ok !== true) throw new Error('DS Web workspace creation was rejected')
|
||||
signal.throwIfAborted()
|
||||
if (child.exitCode !== null || child.signalCode !== null) throw new Error('DS Web exited during workspace initialization')
|
||||
return { id: instance.id, url }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user