mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-05 02:31:47 +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
|
|
@ -34,7 +34,7 @@ export function useCompletion(input: string, blocked: boolean, gw: GatewayClient
|
|||
ref.current = input
|
||||
|
||||
const isSlash = input.startsWith('/')
|
||||
const pathWord = !isSlash ? (input.match(TAB_PATH_RE)?.[1] ?? null) : null
|
||||
const pathWord = isSlash ? null : (input.match(TAB_PATH_RE)?.[1] ?? null)
|
||||
|
||||
if (!isSlash && !pathWord) {
|
||||
clear()
|
||||
|
|
@ -42,6 +42,8 @@ export function useCompletion(input: string, blocked: boolean, gw: GatewayClient
|
|||
return
|
||||
}
|
||||
|
||||
const pathReplace = input.length - (pathWord?.length ?? 0)
|
||||
|
||||
const t = setTimeout(() => {
|
||||
if (ref.current !== input) {
|
||||
return
|
||||
|
|
@ -53,15 +55,15 @@ export function useCompletion(input: string, blocked: boolean, gw: GatewayClient
|
|||
|
||||
req
|
||||
.then(raw => {
|
||||
const r = asRpcResult<CompletionResponse>(raw)
|
||||
|
||||
if (ref.current !== input) {
|
||||
return
|
||||
}
|
||||
|
||||
const r = asRpcResult<CompletionResponse>(raw)
|
||||
|
||||
setCompletions(r?.items ?? [])
|
||||
setCompIdx(0)
|
||||
setCompReplace(isSlash ? (r?.replace_from ?? 1) : input.length - (pathWord?.length ?? 0))
|
||||
setCompReplace(isSlash ? (r?.replace_from ?? 1) : pathReplace)
|
||||
})
|
||||
.catch((e: unknown) => {
|
||||
if (ref.current !== input) {
|
||||
|
|
@ -76,7 +78,7 @@ export function useCompletion(input: string, blocked: boolean, gw: GatewayClient
|
|||
}
|
||||
])
|
||||
setCompIdx(0)
|
||||
setCompReplace(isSlash ? 1 : input.length - (pathWord?.length ?? 0))
|
||||
setCompReplace(isSlash ? 1 : pathReplace)
|
||||
})
|
||||
}, 60)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { useCallback, useRef, useState } from 'react'
|
||||
import { useRef, useState } from 'react'
|
||||
|
||||
import * as inputHistory from '../lib/history.js'
|
||||
|
||||
|
|
@ -7,9 +7,5 @@ export function useInputHistory() {
|
|||
const [historyIdx, setHistoryIdx] = useState<number | null>(null)
|
||||
const historyDraftRef = useRef('')
|
||||
|
||||
const pushHistory = useCallback((text: string) => {
|
||||
inputHistory.append(text)
|
||||
}, [])
|
||||
|
||||
return { historyRef, historyIdx, setHistoryIdx, historyDraftRef, pushHistory }
|
||||
return { historyRef, historyIdx, setHistoryIdx, historyDraftRef, pushHistory: inputHistory.append }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@ export function useQueue() {
|
|||
const queueEditRef = useRef<number | null>(null)
|
||||
const [queueEditIdx, setQueueEditIdx] = useState<number | null>(null)
|
||||
|
||||
const syncQueue = useCallback(() => {
|
||||
setQueuedDisplay([...queueRef.current])
|
||||
}, [])
|
||||
const syncQueue = useCallback(() => setQueuedDisplay([...queueRef.current]), [])
|
||||
|
||||
const setQueueEdit = useCallback((idx: number | null) => {
|
||||
queueEditRef.current = idx
|
||||
|
|
@ -39,12 +37,12 @@ export function useQueue() {
|
|||
)
|
||||
|
||||
return {
|
||||
queueRef,
|
||||
queueEditRef,
|
||||
queuedDisplay,
|
||||
queueEditIdx,
|
||||
enqueue,
|
||||
dequeue,
|
||||
enqueue,
|
||||
queueEditIdx,
|
||||
queueEditRef,
|
||||
queueRef,
|
||||
queuedDisplay,
|
||||
replaceQ,
|
||||
setQueueEdit,
|
||||
syncQueue
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ export function useVirtualHistory(
|
|||
items: readonly { key: string }[],
|
||||
{ estimate = ESTIMATE, overscan = OVERSCAN, maxMounted = MAX_MOUNTED, coldStartCount = COLD_START } = {}
|
||||
) {
|
||||
const nodes = useRef(new Map<string, any>())
|
||||
const nodes = useRef(new Map<string, unknown>())
|
||||
const heights = useRef(new Map<string, number>())
|
||||
const refs = useRef(new Map<string, (el: any) => void>())
|
||||
const refs = useRef(new Map<string, (el: unknown) => void>())
|
||||
const [ver, setVer] = useState(0)
|
||||
|
||||
useSyncExternalStore(
|
||||
|
|
@ -108,7 +108,7 @@ export function useVirtualHistory(
|
|||
let fn = refs.current.get(key)
|
||||
|
||||
if (!fn) {
|
||||
fn = (el: any) => (el ? nodes.current.set(key, el) : nodes.current.delete(key))
|
||||
fn = (el: unknown) => (el ? nodes.current.set(key, el) : nodes.current.delete(key))
|
||||
refs.current.set(key, fn)
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ export function useVirtualHistory(
|
|||
continue
|
||||
}
|
||||
|
||||
const h = Math.ceil(nodes.current.get(k)?.yogaNode?.getComputedHeight?.() ?? 0)
|
||||
const h = Math.ceil((nodes.current.get(k) as MeasuredNode | undefined)?.yogaNode?.getComputedHeight?.() ?? 0)
|
||||
|
||||
if (h > 0 && heights.current.get(k) !== h) {
|
||||
heights.current.set(k, h)
|
||||
|
|
@ -139,11 +139,15 @@ export function useVirtualHistory(
|
|||
}, [end, items, start])
|
||||
|
||||
return {
|
||||
start,
|
||||
end,
|
||||
offsets,
|
||||
topSpacer: offsets[start] ?? 0,
|
||||
bottomSpacer: Math.max(0, total - (offsets[end] ?? total)),
|
||||
measureRef
|
||||
end,
|
||||
measureRef,
|
||||
offsets,
|
||||
start,
|
||||
topSpacer: offsets[start] ?? 0
|
||||
}
|
||||
}
|
||||
|
||||
interface MeasuredNode {
|
||||
yogaNode?: { getComputedHeight?: () => number } | null
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue