mirror of
https://github.com/deepseek-ai/deepseek-harness
synced 2026-08-15 21:04:50 +00:00
f290a8b851
`dsh` shipped two config trees that were 43 rows the same: apps/cli/cordis.yml composed web as 74 flat rows, while the TUI booted examples/tui-agent/cordis.yml whose single `@deepseek-ai/dsh-tui-demo` row mounted twelve plugins behind a twenty-key pass-through Config. Neither file was what its location claimed — apps/cli hardcoded the "example" as the product default and the "demo" bundle was the application — and every capability change had to be made twice. - apps/cli/base.cordis.yml holds the 43 shared rows; tui.cordis.yml and web.cordis.yml are patch lists stating only what differs per surface - overlays apply as SIBLING patch lists at one include level, because include patches never cross an include boundary. Precedence: base < surface < (--config | personal ~/.dsh/config.yaml) < launcher flag/profile patches - `--config` now applies an overlay INSTEAD OF the personal one, so a demo or test tree never inherits the user's route; new `--config-replace` boots a file as the entire tree (the old `--config` behaviour). Both survive /resume - vendor/include: index each `insert`ed row as it is added so a later patch can configure or disable it. Upstream built the id index once before the patch loop, leaving every surface-only row — the whole TUI front door — silently unpatchable from user config. Logged as local modification 8 - session identity moves to dsh-agent-loop's CONFIGURED_AGENT_IDENTITIES_KEY; dsh-tui's MAIN_SESSION_ID_KEY is deleted (only the bundle read it) - delete examples/tui-agent, examples/cordis-agent, packages/examples/tui-demo; TUI tests → apps/cli/tests, cordis e2e → packages/cordis/tool-cordis/tests, examples/code-mode survives as an overlay leaf - `dsh web` gains --config, threaded into AppCLIEntry as an extra overlay Three latent defects surfaced and are fixed here: the TUI captured the optional sessionQuery service once at construction and could permanently disable /resume when it won the mount race; the session-store root silently reverted to a project-local ./.sessions; --config-replace was dropped by the resume handoff. Verified by booting each tree through the real Loader (TUI 55 entries, web 75, zero unsettled) rather than reading YAML. All eight terminal snapshots replay byte-identically; 14/14 PTY smoke, 112/112 snapshots, 25/25 doc-sync, hygiene and lint clean.
70 lines
3.1 KiB
TypeScript
70 lines
3.1 KiB
TypeScript
/**
|
|
* `dsh web` — thin bin over the config-tree boot: run AppCLIEntry with the
|
|
* already-parsed host/port/dev, print the URL line, wire signals. All
|
|
* composition lives in cordis.yml; all boot glue lives in AppCLIEntry. Host and
|
|
* port are unvalidated pass-through overrides — the `dsh-host-webserver` schema
|
|
* gates them at boot.
|
|
*/
|
|
|
|
import { fileURLToPath } from 'node:url'
|
|
import { resolveConfigPath } from '@deepseek-ai/dsh-app-boot'
|
|
import { AppCLIEntry } from './app-cli-entry.ts'
|
|
import { registerLiveSessions } from './register-session.ts'
|
|
|
|
// The shared core every `dsh` surface mounts, plus this surface's overlay over it.
|
|
const BASE_CONFIG = fileURLToPath(new URL('../base.cordis.yml', import.meta.url))
|
|
const WEB_OVERLAY = fileURLToPath(new URL('../web.cordis.yml', import.meta.url))
|
|
|
|
// Display-only mirror of the webserver schema's loopback host: the address the
|
|
// local URL always prints. Not a source of truth — the schema is.
|
|
const LOOPBACK_HOST = '127.0.0.1'
|
|
|
|
/**
|
|
* Serve the browser UI from the shipped config tree. `host`/`port` are passed
|
|
* through only when the flag was given; absent, the `cordis.yml` value stands.
|
|
* @param host - the bind host, or `undefined` to keep the config default.
|
|
* @param port - the listen port (`0` requests an OS-assigned port), or `undefined` to keep the config default.
|
|
* @param dev - mount the client HMR driver and watch plugin bundles for rebuilds.
|
|
* @param workspaceRoot - parent directory for name-created workspaces, or `undefined` for the gateway's cwd fallback.
|
|
* @param trustedHosts - extra authorities for the /api browser-trust fence, or `undefined` for the derived LAN literals alone.
|
|
* @param config - an overlay of loader patches applied over the shipped web
|
|
* composition, or `undefined` for none; already parsed from `--config`.
|
|
*/
|
|
export async function runWeb(
|
|
host: string | undefined,
|
|
port: number | undefined,
|
|
dev: boolean,
|
|
workspaceRoot: string | undefined,
|
|
trustedHosts: string[] | undefined,
|
|
config?: string,
|
|
): Promise<void> {
|
|
const entry = new AppCLIEntry({
|
|
configPath: BASE_CONFIG,
|
|
overlayPath: WEB_OVERLAY,
|
|
...config !== undefined && { extraOverlayPath: resolveConfigPath(config, undefined) },
|
|
dev,
|
|
...host !== undefined && { host },
|
|
...port !== undefined && { port },
|
|
...workspaceRoot !== undefined && { workspaceRoot },
|
|
...trustedHosts !== undefined && { trustedHosts },
|
|
})
|
|
const { ctx, port: boundPort } = await entry.run()
|
|
await registerLiveSessions(ctx)
|
|
|
|
let exiting = false
|
|
const shutdown = (code: number): void => {
|
|
if (exiting) return
|
|
exiting = true
|
|
void Promise.resolve(ctx.fiber.dispose()).finally(() => { process.exit(code) })
|
|
}
|
|
|
|
// The entry's boot-time snapshot, not a fresh sample: the printed LAN URL
|
|
// must name an address the /api trust fence was configured with.
|
|
const lanCandidate = entry.lanAddresses[0]
|
|
const localUrl = `http://${LOOPBACK_HOST}:${boundPort}`
|
|
console.log(`dsh web: ${localUrl}${lanCandidate === undefined ? '' : ` (LAN: http://${lanCandidate}:${boundPort})`}`)
|
|
|
|
process.on('SIGTERM', () => { shutdown(0) })
|
|
process.on('SIGINT', () => { shutdown(130) })
|
|
}
|