mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-30 01:41:43 +00:00
refactor(tui): /clean pass across ui-tui — 49 files, −217 LOC
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
This commit is contained in:
parent
c730ab8ad7
commit
39231f29c6
49 changed files with 527 additions and 744 deletions
|
|
@ -12,49 +12,34 @@ const STARTUP_TIMEOUT_MS = Math.max(5000, parseInt(process.env.HERMES_TUI_STARTU
|
|||
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()
|
||||
const configured = process.env.HERMES_PYTHON?.trim() || process.env.PYTHON?.trim()
|
||||
|
||||
if (configured) {
|
||||
return configured
|
||||
}
|
||||
|
||||
const envPython = process.env.PYTHON?.trim()
|
||||
|
||||
if (envPython) {
|
||||
return envPython
|
||||
}
|
||||
|
||||
const venv = process.env.VIRTUAL_ENV?.trim()
|
||||
|
||||
const candidates = [
|
||||
venv ? resolve(venv, 'bin/python') : '',
|
||||
venv ? resolve(venv, 'Scripts/python.exe') : '',
|
||||
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')
|
||||
].filter(Boolean)
|
||||
].find(p => p && existsSync(p))
|
||||
|
||||
const hit = candidates.find(path => existsSync(path))
|
||||
|
||||
if (hit) {
|
||||
return hit
|
||||
}
|
||||
|
||||
return process.platform === 'win32' ? 'python' : 'python3'
|
||||
return hit || (process.platform === 'win32' ? 'python' : 'python3')
|
||||
}
|
||||
|
||||
const asGatewayEvent = (value: unknown): GatewayEvent | null => {
|
||||
if (!value || typeof value !== 'object' || Array.isArray(value)) {
|
||||
return null
|
||||
}
|
||||
|
||||
return typeof (value as { type?: unknown }).type === 'string' ? (value as GatewayEvent) : null
|
||||
}
|
||||
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 {
|
||||
resolve: (v: unknown) => void
|
||||
reject: (e: Error) => void
|
||||
resolve: (v: unknown) => void
|
||||
}
|
||||
|
||||
export class GatewayClient extends EventEmitter {
|
||||
|
|
@ -81,9 +66,7 @@ export class GatewayClient extends EventEmitter {
|
|||
}
|
||||
|
||||
if (this.subscribed) {
|
||||
this.emit('event', ev)
|
||||
|
||||
return
|
||||
return void this.emit('event', ev)
|
||||
}
|
||||
|
||||
this.bufferedEvents.push(ev)
|
||||
|
|
@ -94,8 +77,9 @@ export class GatewayClient extends EventEmitter {
|
|||
const python = resolvePython(root)
|
||||
const cwd = process.env.HERMES_CWD || root
|
||||
const env = { ...process.env }
|
||||
const pyPath = (env.PYTHONPATH ?? '').trim()
|
||||
const pyPath = env.PYTHONPATH?.trim()
|
||||
env.PYTHONPATH = pyPath ? `${root}${delimiter}${pyPath}` : root
|
||||
|
||||
this.ready = false
|
||||
this.bufferedEvents = []
|
||||
this.pendingExit = undefined
|
||||
|
|
@ -121,11 +105,7 @@ export class GatewayClient extends EventEmitter {
|
|||
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.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 => {
|
||||
|
|
@ -133,8 +113,9 @@ export class GatewayClient extends EventEmitter {
|
|||
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 } } satisfies GatewayEvent)
|
||||
this.publish({ type: 'gateway.protocol_error', payload: { preview } })
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -147,13 +128,13 @@ export class GatewayClient extends EventEmitter {
|
|||
}
|
||||
|
||||
this.pushLog(line)
|
||||
this.publish({ type: 'gateway.stderr', payload: { line } } satisfies GatewayEvent)
|
||||
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}` } } satisfies GatewayEvent)
|
||||
this.publish({ type: 'gateway.stderr', payload: { line: `[spawn] ${err.message}` } })
|
||||
})
|
||||
|
||||
this.proc.on('exit', code => {
|
||||
|
|
@ -181,6 +162,7 @@ export class GatewayClient extends EventEmitter {
|
|||
|
||||
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)
|
||||
|
|
@ -199,30 +181,29 @@ export class GatewayClient extends EventEmitter {
|
|||
}
|
||||
|
||||
private pushLog(line: string) {
|
||||
this.logs.push(line)
|
||||
|
||||
if (this.logs.length > MAX_GATEWAY_LOG_LINES) {
|
||||
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 [id, pending] of this.pending) {
|
||||
this.pending.delete(id)
|
||||
pending.reject(err)
|
||||
for (const p of this.pending.values()) {
|
||||
p.reject(err)
|
||||
}
|
||||
|
||||
this.pending.clear()
|
||||
}
|
||||
|
||||
drain() {
|
||||
this.subscribed = true
|
||||
const pending = this.bufferedEvents.splice(0)
|
||||
|
||||
for (const ev of pending) {
|
||||
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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue