Type-only change (brands are zero-cost casts; no runtime/wire impact). Closes the two gaps in the "brand ids that cross package boundaries" policy and fixes the dependency direction so a capability package never pulls in an unrelated one. - Extract the `Branded<B>` primitive into a new standalone type-only package `@deepseek-ai/dsh-brand` (packages/util/brand) with no harness-package deps. dsh-llm keeps its owned CallId but imports Branded from dsh-brand; dsh-session, dsh-agent, and dsh-bash all import Branded from there. dsh-bash depends on dsh-brand ALONE — never on dsh-llm or dsh-session (the architectural fix: a generic execution backend must not couple to the LLM or session vocabulary). - Mint BashTaskId + OwnerToken in dsh-bash and thread them through BashTask.id, the get/ownerOf/list/readOutput/kill seam, the bash-local generation site, and the dsh-tool-bash validate/access surface. OwnerToken is a DISTINCT brand from SessionId so the seam stays decoupled; dsh-tool-bash is the single boundary that casts SessionId -> OwnerToken. - Brand at the SOURCE, not via mid-pipeline casts: agent-loop's Config types agents[].id as AgentId and resumeSessionId as SessionId, so the brand enters at the config boundary and the inner create()/resume casts disappear (only the genuinely-new per-run session-id string is cast). - Stop brand erosion: propagate CallId/SessionId/AgentId to the registry/store Map keys and public params/exports (SessionStore, AgentRegistry + factory options, the ACP session-id surface + ToolPresenter CallId map, the persistence coordinator, invariants pendingCalls, the pi-ai tool-call maps). - Docs: document BashTaskId/OwnerToken in bash.md (type-equiv re-pasted), point the Branded type-equiv at dsh-brand, fix stale param types in the session/ agent/bash READMEs, regenerate the cordis catalog + module graph. Implements docs/rfc/proposed/architecture/2026-06-20-branded-ids.md
202 lines
8.1 KiB
TypeScript
202 lines
8.1 KiB
TypeScript
/**
|
|
* Minimal stdio UI plugin: reads lines from stdin → `agent.send()`/`steer()`,
|
|
* and renders the agent's stream chunks and tool activity to stdout. A UI is
|
|
* "just a plugin" — it only consumes the `agent/*` event taxonomy and the
|
|
* `agents` service, so the same plugin drives any example or product surface.
|
|
*
|
|
* Consolidates what were two near-identical copies under `examples/echo-agent`
|
|
* and `examples/coding-agent` (the latter a superset). This package IS that
|
|
* superset: dimmed chain-of-thought rendering plus the robust piped-stdin
|
|
* EOF→idle exit handling, configured per consumer via {@link Config}.
|
|
*
|
|
* Plugin export shape: named `name`/`inject`/`Config`/`apply`, NO default
|
|
* export — the cordis Loader's `unwrapExports` does `exports.default ?? exports`,
|
|
* so a stray default would collapse the module to the bare function and drop
|
|
* the `inject` namespace (see docs/postmortem/0001). The keyless Loader-path
|
|
* e2e smokes in `examples/{echo,coding}-agent` guard this end-to-end.
|
|
*
|
|
* @module @deepseek-ai/dsh-ui-stdio
|
|
*/
|
|
|
|
import { createInterface } from 'node:readline'
|
|
import type { Readable, Writable } from 'node:stream'
|
|
import type { Context } from 'cordis'
|
|
import z from 'schemastery'
|
|
import { AgentId } from '@deepseek-ai/dsh-agent'
|
|
|
|
export const name = 'ui-stdio'
|
|
export const inject = ['agents']
|
|
|
|
/** Serializable plugin configuration (cordis-native, schemastery). */
|
|
export interface Config {
|
|
/** Banner printed once on start, before the first `> ` prompt. */
|
|
welcome?: string
|
|
/** Id of the agent stdin drives (`send`/`steer`) and whose status gates the EOF exit; rendering is global. Defaults to `'main'`. */
|
|
agent?: string
|
|
}
|
|
|
|
export const Config: z<Config> = z.object({
|
|
welcome: z.string().default('ready.'),
|
|
agent: z.string().default('main'),
|
|
})
|
|
|
|
/**
|
|
* Process-I/O seam — the side-effecting handles the plugin would otherwise
|
|
* reach for as globals. Defaulted to the real `process` streams in
|
|
* {@link apply}; injected by tests so the EOF, render, and disposal branches
|
|
* are exercised without hijacking globals. Deliberately NOT part of the
|
|
* serializable {@link Config} (streams/functions don't belong in YAML config).
|
|
*/
|
|
export interface StdioRuntime {
|
|
/** Line source (default `process.stdin`). */
|
|
input: Readable
|
|
/** Render sink (default `process.stdout`). */
|
|
output: Writable
|
|
/** Process-exit hook (default `process.exit`); called once on stdin EOF. */
|
|
exit: (code: number) => void
|
|
}
|
|
|
|
/**
|
|
* The plugin body, parameterized over its I/O runtime. `apply` is the thin
|
|
* production wrapper that binds the real `process` streams; tests call this
|
|
* directly with fakes. Returns nothing — all registration is via `ctx.on`/
|
|
* `ctx.effect`, so fiber disposal tears every listener and the readline
|
|
* interface down.
|
|
*/
|
|
export function createStdioChat(ctx: Context, config: Config, runtime: StdioRuntime): void {
|
|
// Default here too (not just via schemastery's `.default()`): this helper is
|
|
// exported and called directly by tests / programmatic consumers that bypass
|
|
// Loader validation, so it must be self-contained rather than trusting the
|
|
// cast — `config.welcome as string` would otherwise be `undefined` on `{}`.
|
|
const welcome = config.welcome ?? 'ready.'
|
|
const agentId = AgentId(config.agent ?? 'main')
|
|
const { input, output, exit } = runtime
|
|
|
|
let inReasoning = false
|
|
ctx.on('agent/stream-chunk', (_agent, _turn, _step, chunk) => {
|
|
if (chunk.type === 'reasoning-delta') {
|
|
// Dim the chain-of-thought so the final answer stands out.
|
|
if (!inReasoning) output.write('\x1B[2m')
|
|
inReasoning = true
|
|
output.write(chunk.text)
|
|
} else if (chunk.type === 'text-delta') {
|
|
if (inReasoning) output.write('\x1B[0m\n')
|
|
inReasoning = false
|
|
output.write(chunk.text)
|
|
}
|
|
})
|
|
|
|
ctx.on('agent/turn-start', (agent, turn) => {
|
|
output.write(`\n[${agent.id} turn ${turn}] `)
|
|
})
|
|
|
|
ctx.on('agent/turn-end', () => {
|
|
if (inReasoning) output.write('\x1B[0m')
|
|
inReasoning = false
|
|
output.write('\n> ')
|
|
})
|
|
|
|
ctx.on('session/event', (_session, event) => {
|
|
if (event.type === 'tool/call') {
|
|
const { name: toolName, arguments: args } = event.data
|
|
if (inReasoning) output.write('\x1B[0m')
|
|
inReasoning = false
|
|
output.write(`\n [tool call] ${toolName}(${args})`)
|
|
} else if (event.type === 'tool/result') {
|
|
const { content } = event.data
|
|
const text = content.filter(block => block.type === 'text').map(block => block.text).join('')
|
|
output.write(`\n [tool result] ${text}\n `)
|
|
}
|
|
})
|
|
|
|
ctx.effect(() => {
|
|
const reader = createInterface({ input })
|
|
// Piped-input exit, once stdin reaches EOF:
|
|
// - If no line ever submitted work (empty stdin, blank-only lines), exit
|
|
// immediately — no turn will ever start, so there is nothing to wait
|
|
// for. (Gating on an observed 'running' here would hang forever.)
|
|
// - If work WAS submitted, exit the next time the agent settles to idle
|
|
// AFTER having run. Two subtleties this handles: the loop batches
|
|
// several queued messages into ONE turn (one idle), so we don't count
|
|
// sends; and agent.send() does NOT synchronously flip status to
|
|
// 'running', so requiring an observed 'running' first (`sawRunning`)
|
|
// avoids exiting in the gap before the turn starts and dropping work.
|
|
let stdinClosed = false
|
|
let disposed = false
|
|
let submittedWork = false
|
|
let sawRunning = false
|
|
let exitTimer: ReturnType<typeof setTimeout> | undefined
|
|
|
|
const maybeExit = (): void => {
|
|
if (disposed || !stdinClosed) return
|
|
// No work submitted: nothing will ever run, exit straight away.
|
|
// Work submitted: wait until a turn has run and the agent is idle.
|
|
if (submittedWork) {
|
|
if (!sawRunning) return
|
|
const agent = ctx.agents.get(agentId)
|
|
if (agent && agent.status !== 'idle') return // a turn is still running
|
|
}
|
|
// Let any final output flush, then exit. The handle is tracked so the
|
|
// disposer can cancel it — a dispose within the flush window must not let
|
|
// the process exit out from under HMR. Re-entrant `maybeExit` calls (e.g.
|
|
// repeated idle signals) coalesce onto the one pending timer.
|
|
if (exitTimer !== undefined) {
|
|
return // exit already scheduled — coalesce re-entrant calls
|
|
}
|
|
exitTimer = setTimeout(() => { exit(0) }, 200)
|
|
}
|
|
|
|
const disposeStatusListener = ctx.on('agent/status', (subject, status) => {
|
|
if (subject.id !== agentId) return
|
|
if (status === 'running') sawRunning = true
|
|
if (status === 'idle') maybeExit()
|
|
})
|
|
|
|
reader.on('line', (line) => {
|
|
const text = line.trim()
|
|
if (!text) return
|
|
const agent = ctx.agents.get(agentId)
|
|
if (!agent) {
|
|
ctx.logger.error('ui-stdio: agent "%s" is not running', agentId)
|
|
return
|
|
}
|
|
submittedWork = true
|
|
if (agent.status === 'running') {
|
|
agent.steer([{ type: 'text', text }])
|
|
} else {
|
|
agent.send([{ type: 'text', text }])
|
|
}
|
|
})
|
|
reader.on('close', () => {
|
|
// Fires for BOTH stdin EOF and plugin disposal (reader.close() below);
|
|
// `disposed` guards teardown so HMR/dispose never exits the process.
|
|
stdinClosed = true
|
|
maybeExit()
|
|
})
|
|
output.write(`${welcome}\n> `)
|
|
return () => {
|
|
disposed = true
|
|
if (exitTimer !== undefined) clearTimeout(exitTimer)
|
|
disposeStatusListener()
|
|
reader.close()
|
|
}
|
|
}, 'ui-stdio')
|
|
}
|
|
|
|
/**
|
|
* Cordis entry point. Binds the real `process` streams and delegates to
|
|
* {@link createStdioChat}; the indirection keeps the side-effecting handles out
|
|
* of the testable core, which is why the unit suite drives `createStdioChat`
|
|
* directly. This thin wrapper is exercised end-to-end by the keyless
|
|
* Loader-path e2e smoke in `examples/echo-agent` (the real product entry).
|
|
*/
|
|
/* v8 ignore start -- production stdio wiring; testable core is createStdioChat() (covered), exercised e2e by echo-agent keyless smoke */
|
|
export function apply(ctx: Context, config: Config): void {
|
|
createStdioChat(ctx, config, {
|
|
input: process.stdin,
|
|
output: process.stdout,
|
|
exit: code => process.exit(code),
|
|
})
|
|
}
|
|
/* v8 ignore stop */
|