0512b12714
$DSH_HOME/.env had just become an ordinary environment layer, which left the harness resolving user-facing values from a flattened process.env that could no longer say where a value came from. A key stored through the web page stayed shadowed by an older key in the user's own .env. An endpoint could be redirected by the project: the invoking directory's .env is materialized like every other layer, and a base URL decides where a resolved API key is sent, so a DEEPSEEK_BASE_URL written into a model-editable workspace would send the user's credential — and the prompts carrying their code — to whatever host that file named. Give every user-facing value one ordering, with four kinds of source: explicit for this run per-operation override, CLI argument > authored by deployment --config / --config-replace > this launch's shell inherited process environment > product-managed store settings.yaml, .credentials.yaml > discovered file $DSH_HOME/.env > defaults schema default, shipped base, public default The domains differ only in which tiers exist. The earlier split — credentials ranking the environment over the managed file while settings ranked over the environment — was inconsistent: the distinguishing fact is who authored the source, not the domain. packages/util/environment owns an immutable snapshot with per-layer provenance. getFrom(name, sources) searches only the layers a caller names, and omitting one is a refusal rather than a demotion: the adapters ask for ['process', 'user-env'], so no reordering can let a project file back into a decision it was excluded from. isBootstrapOnly rejects, before anything is materialized, any .env setting a variable that governs how a process launches (PATH, SHELL, NODE_OPTIONS, LD_PRELOAD), where code or model-visible instructions load from (the whole DSH_* namespace, HOME, XDG_*), or how the network is reached (proxy and CA variables). The namespace is denied wholesale so a switch added later cannot become settable by being forgotten, and there is no opt-out. verify-config-source-ownership keeps both rules: no unregistered process.env read under packages/*/*/src (26 allowlisted with reasons), and no apiKey, baseURL, or headers inlined from the environment in shipped Cordis config — removing those inlines is what makes the deployment tier meaningful.
133 lines
6.0 KiB
TypeScript
133 lines
6.0 KiB
TypeScript
/**
|
|
* `dsh -p "task"` — headless over the one shared composition: AppCLIEntry
|
|
* boots the same base plus Web overlay as `dsh web` (port 0, so parallel runs never
|
|
* collide), then in-process isomorphic injection (InProcessApiClient over
|
|
* toFetchHandler(ctx.apiProxy), so the full carrier chain — wire
|
|
* serialization, zod, SSE framing — really runs). The printed URL opens the
|
|
* live session in a browser while the task runs. Runs one task turn, prints
|
|
* the final assistant text, exits (completed → 0, else 1).
|
|
*/
|
|
|
|
import { fileURLToPath } from 'node:url'
|
|
import { resolveConfigPath } from '@deepseek-ai/dsh-app-boot'
|
|
import type { EnvironmentSnapshot } from '@deepseek-ai/dsh-environment'
|
|
import { InProcessApiClient, toFetchHandler } from '@deepseek-ai/dsh-host-apiproxy'
|
|
import type { MuxFrame } from '@deepseek-ai/dsh-host-apiproxy/api'
|
|
import type { RpcRequest, RpcResponse } from '@deepseek-ai/dsh-host-apiproxy/api/rpc'
|
|
import type { SessionId } from '@deepseek-ai/dsh-session'
|
|
import { AppCLIEntry } from './app-cli-entry.ts'
|
|
|
|
/** Outcome of one headless turn: aggregated final text plus the turn-end reason kind. */
|
|
interface TurnOutcome {
|
|
text: string
|
|
reason: string
|
|
}
|
|
|
|
/** Unwrap an RpcResponse or fail loud: business errors print and exit 1 (dispose first). */
|
|
async function unwrap<T>(response: RpcResponse<T>, dispose: () => Promise<void>): Promise<T> {
|
|
if (response.result.ok) return response.result.value
|
|
const { code, message } = response.result.error
|
|
process.stderr.write(`dsh: ${code}: ${message}\n`)
|
|
await dispose()
|
|
process.exit(1)
|
|
}
|
|
|
|
/**
|
|
* Consume mux frames until the task turn ends, per the cli-demo runOneShot
|
|
* correlation precedent: anchor on the first turn/start whose trigger kind is
|
|
* 'message' (startup-injected turns are skipped), aggregate text from that
|
|
* turn's assistant/message events (last one wins), finish on its turn/end.
|
|
*/
|
|
async function consumeUntilTurnEnd(frames: AsyncIterable<RpcRequest<MuxFrame>>, sessionId: SessionId): Promise<TurnOutcome> {
|
|
let targetTurn: number | undefined
|
|
let text = ''
|
|
try {
|
|
for await (const frame of frames) {
|
|
const payload = frame.payload
|
|
if (payload.type === 'stream/error') {
|
|
process.stderr.write(`dsh: stream error: ${payload.error.message}\n`)
|
|
return { text, reason: 'error' }
|
|
}
|
|
if (payload.type !== 'session/event' || payload.sessionId !== sessionId) continue
|
|
const event = payload.event
|
|
if (targetTurn === undefined) {
|
|
if (event.type === 'turn/start' && event.data.trigger.kind === 'message') targetTurn = event.data.turn
|
|
continue
|
|
}
|
|
if (event.type === 'assistant/message' && event.data.turn === targetTurn) {
|
|
const joined = event.data.message.content.filter(block => block.type === 'text').map(block => block.text).join('')
|
|
if (joined !== '') text = joined
|
|
}
|
|
if (event.type === 'turn/end' && event.data.turn === targetTurn) {
|
|
return { text, reason: event.data.reason.kind }
|
|
}
|
|
}
|
|
} catch (error: unknown) {
|
|
process.stderr.write(`dsh: event stream failed: ${String(error)}\n`)
|
|
}
|
|
return { text, reason: 'error' }
|
|
}
|
|
|
|
/**
|
|
* Run one headless turn for `task` and exit (completed → 0, else 1). The task
|
|
* is the non-empty prompt the argument adapter parsed from `-p`/`--prompt`
|
|
* (the adapter rejects an empty task, so no guard is needed here).
|
|
* @param environment - this run's frozen environment snapshot.
|
|
* @param task - the prompt text for the single turn.
|
|
* @param config - a `--config` overlay applied over the shipped composition, or `undefined`.
|
|
* @param configReplace - a `--config-replace` tree booted instead of the
|
|
* shipped composition, or `undefined`. It must mount a webserver row: this
|
|
* surface reaches its own agent over the same HTTP gateway the browser uses.
|
|
*/
|
|
export async function runHeadless(
|
|
environment: EnvironmentSnapshot, task: string, config?: string, configReplace?: string,
|
|
): Promise<void> {
|
|
// A missing DEEPSEEK_API_KEY throws here (plugin load is fail-loud, uncaught by design).
|
|
const entry = new AppCLIEntry({
|
|
environment,
|
|
configPath: fileURLToPath(new URL('../config/base.cordis.yml', import.meta.url)),
|
|
overlayPath: fileURLToPath(new URL('../config/web.cordis.yml', import.meta.url)),
|
|
...config !== undefined && { extraOverlayPath: resolveConfigPath(config, undefined) },
|
|
...configReplace !== undefined && { configReplacePath: resolveConfigPath(configReplace, undefined) },
|
|
dev: false,
|
|
port: 0,
|
|
})
|
|
const { ctx, port } = await entry.run()
|
|
const dispose = async (): Promise<void> => { await ctx.fiber.dispose() }
|
|
// Signal exits must still dispose the tree: the composition mounts
|
|
// exit-drained plugins (telemetry's queued tail and shutdown marker would
|
|
// otherwise be lost), and Node's default signal exit skips disposal.
|
|
let signalled = false
|
|
const disposeAndExit = (code: number): void => {
|
|
if (signalled) return
|
|
signalled = true
|
|
void dispose().finally(() => { process.exit(code) })
|
|
}
|
|
process.on('SIGTERM', () => { disposeAndExit(143) })
|
|
process.on('SIGINT', () => { disposeAndExit(130) })
|
|
// The headless session is web-observable while it runs (same composition).
|
|
process.stderr.write(`dsh: observing at http://127.0.0.1:${String(port)}\n`)
|
|
const api = new InProcessApiClient(toFetchHandler(ctx.apiProxy))
|
|
|
|
const created = await unwrap(await api.sessions.create({}), dispose)
|
|
|
|
// Open the stream before prompting so no frame is lost — kept in this order
|
|
// even though in-process delivery has no race, so the code survives a move
|
|
// to a remote HTTP carrier unchanged.
|
|
const abort = new AbortController()
|
|
const frames = api.events.mux({}, abort.signal)
|
|
const done = consumeUntilTurnEnd(frames, created.sessionId)
|
|
|
|
await unwrap(await api.sessions.prompt({
|
|
sessionId: created.sessionId,
|
|
mode: 'queue',
|
|
content: [{ type: 'text', text: task }],
|
|
}), dispose)
|
|
|
|
const outcome = await done
|
|
process.stdout.write(outcome.text + '\n')
|
|
abort.abort()
|
|
await dispose()
|
|
process.exit(outcome.reason === 'completed' ? 0 : 1)
|
|
}
|