Full codebase pass using the /clean doctrine (KISS/DRY, no one-off
helpers, no variables-used-once, pure functional where natural,
inlined obvious one-liners, killed dead exports, narrowed types,
spaced JSX). All contracts preserved — no RPC method, event name,
or exported type shape changed.
app/ — 15 files, -134 LOC
- inlined 4 one-off helpers (titleCase, isLong, statusToneFrom,
focusOutside predicate)
- stores to arrow-const style (buildUiState, buildTurnState,
buildOverlayState plus get/patch/reset triplets)
- functional slash/registry byName map (flatMap over for-loops)
- dropped dead param `live` in cancelOverlayFromCtrlC
- DRY'd duplicate shift() call in scrollWithSelection
- consolidated sections.push calls in /help
components/ — 12 files, -40 LOC
- extracted inline prop types to interfaces at file bottom (13×)
- inlined 6 one-off vars (pctLabel, logoW, heroW, cwd, title, hint)
- promoted HEART_COLORS + OPTS/LABELS to module scope
- JSX sibling spacing across 9 files
- un-shadowed `raw` in textInput
- components/thinking.tsx + components/markdown.tsx untouched
(structurally load-bearing / edge-case-heavy)
config content domain protocol/ — 8 files, -77 LOC
- tightened 3 regexes (MOUSE_TRACKING, looksLikeSlashCommand,
hasInterpolation — dropped stateful lastIndex dance)
- dead export ParsedSlashCommand removed
- MODES narrowed to `as const`, `.find(m => m === s)` replaces
`.includes() ? (as cast) : null`
- fortunes.ts hash via reduce
- fmtDuration ternary chain
- inlined aboveViewport predicate in viewport.ts
hooks/ + lib/ — 9 files, -38 LOC
- ANSI_RE via String.fromCharCode(27) + WS_RE lifted to module
scope (no more eslint-disable no-control-regex)
- compactPreview/edgePreview/thinkingPreview → ternary arrows
- useCompletion: hoisted pathReplace, moved stale-ref guard earlier
- useInputHistory: dropped useCallback wrapper (append is stable)
- useVirtualHistory: replaced 4× any with unknown + narrow
MeasuredNode interface + one cast site
root TS — 3 files, -63 LOC
- banner.ts: parseRichMarkup via matchAll instead of exec/lastIndex,
artWidth via reduce
- gatewayClient.ts: resolvePython candidate list collapse, inlined
one-branch guards in dispatch/pushLog/drain/request
- types.ts: alpha-sorted ActiveTool / Msg / SudoReq / SecretReq
members
eslint config
- disabled react-hooks/exhaustive-deps on packages/hermes-ink/**
(compiled by react/compiler, deps live in $[N] memo arrays that
eslint can't introspect) and removed the now-orphan in-file
disable directive in ScrollBox.tsx
fixes (not from the cleaner pass)
- useComposerState: unlinkSync(file) + try/catch → rmSync(file,
{ force: true }) — kills the no-empty lint error and is more
idiomatic
- useConfigSync: added setBellOnComplete + setVoiceEnabled to the
two useEffect dep arrays (they're stable React setState setters;
adding is safe and silences exhaustive-deps)
verification
- npx eslint src/ packages/ → 0 errors, 0 warnings
- npm run type-check → clean
- npm test → 50/50
- npm run build → 394.8kb ink-bundle.js, 11ms esbuild
- pytest tests/tui_gateway/ tests/test_tui_gateway_server.py
tests/hermes_cli/test_tui_resume_flow.py
tests/hermes_cli/test_tui_npm_install.py → 57/57
259 lines
7.0 KiB
TypeScript
259 lines
7.0 KiB
TypeScript
import { type ChildProcess, spawn } from 'node:child_process'
|
|
import { EventEmitter } from 'node:events'
|
|
import { existsSync } from 'node:fs'
|
|
import { delimiter, resolve } from 'node:path'
|
|
import { createInterface } from 'node:readline'
|
|
|
|
import type { GatewayEvent } from './gatewayTypes.js'
|
|
|
|
const MAX_GATEWAY_LOG_LINES = 200
|
|
const MAX_LOG_PREVIEW = 240
|
|
const STARTUP_TIMEOUT_MS = Math.max(5000, parseInt(process.env.HERMES_TUI_STARTUP_TIMEOUT_MS ?? '15000', 10) || 15000)
|
|
const REQUEST_TIMEOUT_MS = Math.max(30000, parseInt(process.env.HERMES_TUI_RPC_TIMEOUT_MS ?? '120000', 10) || 120000)
|
|
|
|
const resolvePython = (root: string) => {
|
|
const configured = process.env.HERMES_PYTHON?.trim() || process.env.PYTHON?.trim()
|
|
|
|
if (configured) {
|
|
return configured
|
|
}
|
|
|
|
const venv = process.env.VIRTUAL_ENV?.trim()
|
|
|
|
const hit = [
|
|
venv && resolve(venv, 'bin/python'),
|
|
venv && resolve(venv, 'Scripts/python.exe'),
|
|
resolve(root, '.venv/bin/python'),
|
|
resolve(root, '.venv/bin/python3'),
|
|
resolve(root, 'venv/bin/python'),
|
|
resolve(root, 'venv/bin/python3')
|
|
].find(p => p && existsSync(p))
|
|
|
|
return hit || (process.platform === 'win32' ? 'python' : 'python3')
|
|
}
|
|
|
|
const asGatewayEvent = (value: unknown): GatewayEvent | null =>
|
|
value && typeof value === 'object' && !Array.isArray(value) && typeof (value as { type?: unknown }).type === 'string'
|
|
? (value as GatewayEvent)
|
|
: null
|
|
|
|
interface Pending {
|
|
reject: (e: Error) => void
|
|
resolve: (v: unknown) => void
|
|
}
|
|
|
|
export class GatewayClient extends EventEmitter {
|
|
private proc: ChildProcess | null = null
|
|
private reqId = 0
|
|
private logs: string[] = []
|
|
private pending = new Map<string, Pending>()
|
|
private bufferedEvents: GatewayEvent[] = []
|
|
private pendingExit: number | null | undefined
|
|
private ready = false
|
|
private readyTimer: ReturnType<typeof setTimeout> | null = null
|
|
private subscribed = false
|
|
private stdoutRl: ReturnType<typeof createInterface> | null = null
|
|
private stderrRl: ReturnType<typeof createInterface> | null = null
|
|
|
|
private publish(ev: GatewayEvent) {
|
|
if (ev.type === 'gateway.ready') {
|
|
this.ready = true
|
|
|
|
if (this.readyTimer) {
|
|
clearTimeout(this.readyTimer)
|
|
this.readyTimer = null
|
|
}
|
|
}
|
|
|
|
if (this.subscribed) {
|
|
return void this.emit('event', ev)
|
|
}
|
|
|
|
this.bufferedEvents.push(ev)
|
|
}
|
|
|
|
start() {
|
|
const root = process.env.HERMES_PYTHON_SRC_ROOT ?? resolve(import.meta.dirname, '../../')
|
|
const python = resolvePython(root)
|
|
const cwd = process.env.HERMES_CWD || root
|
|
const env = { ...process.env }
|
|
const pyPath = env.PYTHONPATH?.trim()
|
|
env.PYTHONPATH = pyPath ? `${root}${delimiter}${pyPath}` : root
|
|
|
|
this.ready = false
|
|
this.bufferedEvents = []
|
|
this.pendingExit = undefined
|
|
this.stdoutRl?.close()
|
|
this.stderrRl?.close()
|
|
this.stdoutRl = null
|
|
this.stderrRl = null
|
|
|
|
if (this.proc && !this.proc.killed && this.proc.exitCode === null) {
|
|
this.proc.kill()
|
|
}
|
|
|
|
if (this.readyTimer) {
|
|
clearTimeout(this.readyTimer)
|
|
}
|
|
|
|
this.readyTimer = setTimeout(() => {
|
|
if (this.ready) {
|
|
return
|
|
}
|
|
|
|
this.pushLog(`[startup] timed out waiting for gateway.ready (python=${python}, cwd=${cwd})`)
|
|
this.publish({ type: 'gateway.start_timeout', payload: { cwd, python } })
|
|
}, STARTUP_TIMEOUT_MS)
|
|
|
|
this.proc = spawn(python, ['-m', 'tui_gateway.entry'], { cwd, env, stdio: ['pipe', 'pipe', 'pipe'] })
|
|
|
|
this.stdoutRl = createInterface({ input: this.proc.stdout! })
|
|
this.stdoutRl.on('line', raw => {
|
|
try {
|
|
this.dispatch(JSON.parse(raw))
|
|
} catch {
|
|
const preview = raw.trim().slice(0, MAX_LOG_PREVIEW) || '(empty line)'
|
|
|
|
this.pushLog(`[protocol] malformed stdout: ${preview}`)
|
|
this.publish({ type: 'gateway.protocol_error', payload: { preview } })
|
|
}
|
|
})
|
|
|
|
this.stderrRl = createInterface({ input: this.proc.stderr! })
|
|
this.stderrRl.on('line', raw => {
|
|
const line = raw.trim()
|
|
|
|
if (!line) {
|
|
return
|
|
}
|
|
|
|
this.pushLog(line)
|
|
this.publish({ type: 'gateway.stderr', payload: { line } })
|
|
})
|
|
|
|
this.proc.on('error', err => {
|
|
this.pushLog(`[spawn] ${err.message}`)
|
|
this.rejectPending(new Error(`gateway error: ${err.message}`))
|
|
this.publish({ type: 'gateway.stderr', payload: { line: `[spawn] ${err.message}` } })
|
|
})
|
|
|
|
this.proc.on('exit', code => {
|
|
if (this.readyTimer) {
|
|
clearTimeout(this.readyTimer)
|
|
this.readyTimer = null
|
|
}
|
|
|
|
this.rejectPending(new Error(`gateway exited${code === null ? '' : ` (${code})`}`))
|
|
|
|
if (this.subscribed) {
|
|
this.emit('exit', code)
|
|
} else {
|
|
this.pendingExit = code
|
|
}
|
|
})
|
|
}
|
|
|
|
private dispatch(msg: Record<string, unknown>) {
|
|
const id = msg.id as string | undefined
|
|
const p = id ? this.pending.get(id) : undefined
|
|
|
|
if (p) {
|
|
this.pending.delete(id!)
|
|
|
|
if (msg.error) {
|
|
const err = msg.error as { message?: unknown } | null | undefined
|
|
|
|
p.reject(new Error(typeof err?.message === 'string' ? err.message : 'request failed'))
|
|
} else {
|
|
p.resolve(msg.result)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
if (msg.method === 'event') {
|
|
const ev = asGatewayEvent(msg.params)
|
|
|
|
if (ev) {
|
|
this.publish(ev)
|
|
}
|
|
}
|
|
}
|
|
|
|
private pushLog(line: string) {
|
|
if (this.logs.push(line) > MAX_GATEWAY_LOG_LINES) {
|
|
this.logs.splice(0, this.logs.length - MAX_GATEWAY_LOG_LINES)
|
|
}
|
|
}
|
|
|
|
private rejectPending(err: Error) {
|
|
for (const p of this.pending.values()) {
|
|
p.reject(err)
|
|
}
|
|
|
|
this.pending.clear()
|
|
}
|
|
|
|
drain() {
|
|
this.subscribed = true
|
|
|
|
for (const ev of this.bufferedEvents.splice(0)) {
|
|
this.emit('event', ev)
|
|
}
|
|
|
|
if (this.pendingExit !== undefined) {
|
|
const code = this.pendingExit
|
|
|
|
this.pendingExit = undefined
|
|
this.emit('exit', code)
|
|
}
|
|
}
|
|
|
|
getLogTail(limit = 20): string {
|
|
return this.logs.slice(-Math.max(1, limit)).join('\n')
|
|
}
|
|
|
|
request<T = unknown>(method: string, params: Record<string, unknown> = {}): Promise<T> {
|
|
if (!this.proc?.stdin || this.proc.killed || this.proc.exitCode !== null) {
|
|
this.start()
|
|
}
|
|
|
|
if (!this.proc?.stdin) {
|
|
return Promise.reject(new Error('gateway not running'))
|
|
}
|
|
|
|
const id = `r${++this.reqId}`
|
|
|
|
return new Promise((resolve, reject) => {
|
|
const timeout = setTimeout(() => {
|
|
if (this.pending.delete(id)) {
|
|
reject(new Error(`timeout: ${method}`))
|
|
}
|
|
}, REQUEST_TIMEOUT_MS)
|
|
|
|
this.pending.set(id, {
|
|
reject: e => {
|
|
clearTimeout(timeout)
|
|
reject(e)
|
|
},
|
|
resolve: v => {
|
|
clearTimeout(timeout)
|
|
resolve(v as T)
|
|
}
|
|
})
|
|
|
|
try {
|
|
this.proc!.stdin!.write(JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n')
|
|
} catch (e) {
|
|
clearTimeout(timeout)
|
|
this.pending.delete(id)
|
|
reject(e instanceof Error ? e : new Error(String(e)))
|
|
}
|
|
})
|
|
}
|
|
|
|
kill() {
|
|
this.proc?.kill()
|
|
}
|
|
}
|