* feat(tui): pluggable busy-indicator styles (kaomoji/emoji/unicode/ascii) The status-bar `FaceTicker` rotated through wide-and-variable kaomoji glyphs (`(。•́︿•̀。)`, `( ͡° ͜ʖ ͡°)`, …) every 2.5s. Real display widths range from ~5 to ~16 columns, so the rest of the bar (cwd, ctx %, voice, bg counter) shifted on every cycle. Padding the verb alone (#17116) helped but didn't address the dominant jitter source — the glyph itself. Add four indicator styles, configurable + hot-swappable: * `kaomoji` (default — preserves the existing vibe; verb is now pad-stable so the only width churn left is the kaomoji itself). * `emoji` — single 2-col emoji frame (`⚕ 🌀 🤔 ✨ 🍵 🔮`). * `unicode` — `unicode-animations` braille spinner (1-col, smooth). * `ascii` — `| / - \` (1-col, max compat). Wires: * `display.tui_status_indicator` in `DEFAULT_CONFIG` (default `kaomoji`). * New JSON-RPC `config.set/get indicator` keys, narrow allow-list. * `applyDisplay` reads the field and patches `UiState.indicatorStyle`, so the existing `mtime` poll picks up `~/.hermes/config.yaml` edits within ~5s without a TUI restart. * `/indicator [style]` slash command (alias `/indicator-style`, subcommand completion `kaomoji|emoji|unicode|ascii`). Bare form shows the current style; setter fires `config.set` and optimistically `patchUiState({ indicatorStyle })` so the live TUI swaps immediately, matching the `/skin` UX. * `CommandDef("indicator", ..., subcommands=...)` so classic CLI autocomplete + TUI `complete.slash` both surface it. * `FaceTicker` decouples spinner cadence from verb cadence — the glyph runs at the spinner's authored interval (or `FACE_TICK_MS` for kaomoji), the verb stays on the original 2.5s cycle, and both re-arm cleanly when style changes. Tests: * `normalizeIndicatorStyle` rejects unknown / non-string input. * `applyDisplay → tui_status_indicator` covers fan-out + fallback. * `/indicator <style>` hot-swaps `UiState.indicatorStyle` after a successful `config.set`. * `/indicator sparkle` rejects with the usage hint and never hits the gateway. * Slash-parity matrix gets `'/indicator'` → `config.get`. Validation: cd ui-tui && npm run type-check — clean; npm test --run — 398/398. scripts/run_tests.sh tests/test_tui_gateway_server.py tests/hermes_cli/test_commands.py — 220/220. * chore(tui): drop /indicator-style alias to declutter autocomplete * fix(tui): drop verb-width pad — /indicator handles glyph jitter directly * fix(tui): unicode indicator style hides the verb (cleanest option) * refactor(tui): single source of truth for INDICATOR_STYLES; cleaner error format Round 1 Copilot review on PR #17150: - Exported `INDICATOR_STYLES` const tuple from `interfaces.ts`; `IndicatorStyle` union type is derived from it. `useConfigSync` builds its validation Set from the tuple, and `session.ts` uses it for both the usage hint and the runtime allow-list — adding/removing a style now touches one line. - Backend `config.set indicator` error message: switched `sorted(allowed)` list repr to `pick one of ascii|emoji|kaomoji|unicode` (matches the TUI usage hint), and reports the normalized `raw` instead of the original `value`. Backend allowed tuple now has a comment pointing back at `INDICATOR_STYLES` so the two stay aligned. Note: kept the verb portion unpadded per design intent — fixed-width padding was the exact UX the `/indicator` command was added to remove. Stable width comes from the glyph; verbs cycling is part of the kawaii aesthetic. Reply on the verb thread will explain. * fix(tui): drop type collapse + gate verb timer + DEFAULT_INDICATOR_STYLE Round 2 Copilot review on PR #17150: - `tui_status_indicator?: 'ascii' | ... | string` collapses to `string` in TS — consumers got no narrowing. Documented as plain `string` with a comment about runtime validation via `normalizeIndicatorStyle`. - `FaceTicker` always started a 2.5s verb interval, even for the `unicode` style which hides the verb entirely. Now gated on `showVerb` from `renderIndicator` — `unicode` stays calm. Pre-emptive self-review (avoid round 3): - Three call sites duplicated the literal `'kaomoji'` default (uiStore, normalizeIndicatorStyle, slash command). Added `DEFAULT_INDICATOR_STYLE` to interfaces.ts and threaded it through so changing the default touches one line. * fix(tui-gateway): normalize config.get indicator output to match TUI render Round 4 Copilot review on PR #17150: `config.get` for `indicator` returned the raw `display.tui_status_indicator` value without validation, so a hand-edited config.yaml with stray casing or an unknown style would leave `/indicator` printing one thing while the TUI rendered the kaomoji default (frontend's `normalizeIndicatorStyle` does this normalization on receive). Lifted the allow-list to module scope as `_INDICATOR_STYLES` / `_INDICATOR_DEFAULT`, reused by both `config.set` and `config.get`. Comment notes the alignment with `INDICATOR_STYLES` / `DEFAULT_INDICATOR_STYLE` in interfaces.ts so adding/removing a style is a one-line change on each end. Tests cover: known value verbatim, casing/whitespace normalize, unknown→default, unset→default. * fix(tui-gateway): preserve falsy-input diagnostics in config.set indicator error Round 5 Copilot review on PR #17150: `raw = str(value or "").strip().lower()` collapsed any falsy non-string (`0`, `False`, `[]`) to empty string, so the error message read `unknown indicator: ` with nothing after — losing the original input. Switched to `("" if value is None else str(value)).strip().lower()` so only `None` (the genuine 'no value' case) becomes blank. Used `{raw!r}` in the error so the diagnostic is unambiguous (`'0'` vs `0`). Tests: - known-value happy path (`'EMOJI'` → `'emoji'`) - falsy non-string inputs (`0` / `False` / `[]`) surface meaningfully - `None` keeps the blank-repr error
481 lines
13 KiB
TypeScript
481 lines
13 KiB
TypeScript
import type { SessionInfo, SlashCategory, Usage } from './types.js'
|
|
|
|
export interface GatewaySkin {
|
|
banner_hero?: string
|
|
banner_logo?: string
|
|
branding?: Record<string, string>
|
|
colors?: Record<string, string>
|
|
help_header?: string
|
|
tool_prefix?: string
|
|
}
|
|
|
|
export interface GatewayCompletionItem {
|
|
display: string
|
|
meta?: string
|
|
text: string
|
|
}
|
|
|
|
export interface GatewayTranscriptMessage {
|
|
context?: string
|
|
name?: string
|
|
role: 'assistant' | 'system' | 'tool' | 'user'
|
|
text?: string
|
|
}
|
|
|
|
// ── Commands / completion ────────────────────────────────────────────
|
|
|
|
export interface CommandsCatalogResponse {
|
|
canon?: Record<string, string>
|
|
categories?: SlashCategory[]
|
|
pairs?: [string, string][]
|
|
skill_count?: number
|
|
sub?: Record<string, string[]>
|
|
warning?: string
|
|
}
|
|
|
|
export interface CompletionResponse {
|
|
items?: GatewayCompletionItem[]
|
|
replace_from?: number
|
|
}
|
|
|
|
export interface SlashExecResponse {
|
|
output?: string
|
|
warning?: string
|
|
}
|
|
|
|
export type CommandDispatchResponse =
|
|
| { output?: string; type: 'exec' | 'plugin' }
|
|
| { target: string; type: 'alias' }
|
|
| { message?: string; name: string; type: 'skill' }
|
|
| { message: string; type: 'send' }
|
|
|
|
// ── Config ───────────────────────────────────────────────────────────
|
|
|
|
export interface ConfigDisplayConfig {
|
|
bell_on_complete?: boolean
|
|
busy_input_mode?: string
|
|
details_mode?: string
|
|
inline_diffs?: boolean
|
|
sections?: Record<string, string>
|
|
show_cost?: boolean
|
|
show_reasoning?: boolean
|
|
streaming?: boolean
|
|
thinking_mode?: string
|
|
tui_auto_resume_recent?: boolean
|
|
tui_compact?: boolean
|
|
tui_mouse?: boolean
|
|
// Forward-compat: backend may send styles this client doesn't know yet —
|
|
// `normalizeIndicatorStyle` falls back to 'kaomoji' for those — but the
|
|
// wire type is documented as `string` so consumers don't get a false
|
|
// narrowing-and-autocomplete contract on a value that requires runtime
|
|
// validation anyway.
|
|
tui_status_indicator?: string
|
|
tui_statusbar?: 'bottom' | 'off' | 'on' | 'top' | boolean
|
|
}
|
|
|
|
export interface ConfigFullResponse {
|
|
config?: { display?: ConfigDisplayConfig }
|
|
}
|
|
|
|
export interface ConfigMtimeResponse {
|
|
mtime?: number
|
|
}
|
|
|
|
export interface ConfigGetValueResponse {
|
|
display?: string
|
|
home?: string
|
|
value?: string
|
|
}
|
|
|
|
export interface ConfigSetResponse {
|
|
credential_warning?: string
|
|
history_reset?: boolean
|
|
info?: SessionInfo
|
|
value?: string
|
|
warning?: string
|
|
}
|
|
|
|
export interface SetupStatusResponse {
|
|
provider_configured?: boolean
|
|
}
|
|
|
|
// ── Session lifecycle ────────────────────────────────────────────────
|
|
|
|
export interface SessionCreateResponse {
|
|
info?: SessionInfo & { config_warning?: string; credential_warning?: string }
|
|
session_id: string
|
|
}
|
|
|
|
export interface SessionResumeResponse {
|
|
info?: SessionInfo
|
|
message_count?: number
|
|
messages: GatewayTranscriptMessage[]
|
|
resumed?: string
|
|
session_id: string
|
|
}
|
|
|
|
export interface SessionListItem {
|
|
id: string
|
|
message_count: number
|
|
preview: string
|
|
source?: string
|
|
started_at: number
|
|
title: string
|
|
}
|
|
|
|
export interface SessionListResponse {
|
|
sessions?: SessionListItem[]
|
|
}
|
|
|
|
export interface SessionMostRecentResponse {
|
|
session_id?: null | string
|
|
source?: string
|
|
started_at?: number
|
|
title?: string
|
|
}
|
|
|
|
export interface SessionTitleResponse {
|
|
pending?: boolean
|
|
session_key?: string
|
|
title?: string
|
|
}
|
|
|
|
export interface SessionSaveResponse {
|
|
file?: string
|
|
}
|
|
|
|
export interface SessionUndoResponse {
|
|
removed?: number
|
|
}
|
|
|
|
export interface SessionUsageResponse {
|
|
cache_read?: number
|
|
cache_write?: number
|
|
calls?: number
|
|
compressions?: number
|
|
context_max?: number
|
|
context_percent?: number
|
|
context_used?: number
|
|
cost_status?: 'estimated' | 'exact'
|
|
cost_usd?: number
|
|
input?: number
|
|
model?: string
|
|
output?: number
|
|
total?: number
|
|
}
|
|
|
|
export interface SessionCompressResponse {
|
|
info?: SessionInfo
|
|
messages?: GatewayTranscriptMessage[]
|
|
removed?: number
|
|
usage?: Usage
|
|
}
|
|
|
|
export interface SessionBranchResponse {
|
|
session_id?: string
|
|
title?: string
|
|
}
|
|
|
|
export interface SessionCloseResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
export interface SessionInterruptResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
export interface SessionSteerResponse {
|
|
status?: 'queued' | 'rejected'
|
|
text?: string
|
|
}
|
|
|
|
// ── Prompt / submission ──────────────────────────────────────────────
|
|
|
|
export interface PromptSubmitResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
export interface BackgroundStartResponse {
|
|
task_id?: string
|
|
}
|
|
|
|
export interface ClarifyRespondResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
export interface ApprovalRespondResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
export interface SudoRespondResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
export interface SecretRespondResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
// ── Shell / clipboard / input ────────────────────────────────────────
|
|
|
|
export interface ShellExecResponse {
|
|
code: number
|
|
stderr?: string
|
|
stdout?: string
|
|
}
|
|
|
|
export interface ClipboardPasteResponse {
|
|
attached?: boolean
|
|
count?: number
|
|
height?: number
|
|
message?: string
|
|
token_estimate?: number
|
|
width?: number
|
|
}
|
|
|
|
export interface InputDetectDropResponse {
|
|
height?: number
|
|
is_image?: boolean
|
|
matched?: boolean
|
|
name?: string
|
|
text?: string
|
|
token_estimate?: number
|
|
width?: number
|
|
}
|
|
|
|
export interface TerminalResizeResponse {
|
|
ok?: boolean
|
|
}
|
|
|
|
// ── Image attach ─────────────────────────────────────────────────────
|
|
|
|
export interface ImageAttachResponse {
|
|
height?: number
|
|
name?: string
|
|
remainder?: string
|
|
token_estimate?: number
|
|
width?: number
|
|
}
|
|
|
|
// ── Voice ────────────────────────────────────────────────────────────
|
|
|
|
export interface VoiceToggleResponse {
|
|
audio_available?: boolean
|
|
available?: boolean
|
|
details?: string
|
|
enabled?: boolean
|
|
stt_available?: boolean
|
|
tts?: boolean
|
|
}
|
|
|
|
export interface VoiceRecordResponse {
|
|
status?: string
|
|
text?: string
|
|
}
|
|
|
|
// ── Tools (TS keeps configure since it resets local history) ─────────
|
|
|
|
export interface ToolsConfigureResponse {
|
|
changed?: string[]
|
|
enabled_toolsets?: string[]
|
|
info?: SessionInfo
|
|
missing_servers?: string[]
|
|
reset?: boolean
|
|
unknown?: string[]
|
|
}
|
|
|
|
// ── Model picker ─────────────────────────────────────────────────────
|
|
|
|
export interface ModelOptionProvider {
|
|
is_current?: boolean
|
|
models?: string[]
|
|
name: string
|
|
slug: string
|
|
total_models?: number
|
|
warning?: string
|
|
}
|
|
|
|
export interface ModelOptionsResponse {
|
|
model?: string
|
|
provider?: string
|
|
providers?: ModelOptionProvider[]
|
|
}
|
|
|
|
// ── MCP ──────────────────────────────────────────────────────────────
|
|
|
|
export interface ReloadMcpResponse {
|
|
status?: string
|
|
}
|
|
|
|
export interface ProcessStopResponse {
|
|
killed?: number
|
|
}
|
|
|
|
export interface BrowserManageResponse {
|
|
connected?: boolean
|
|
url?: string
|
|
}
|
|
|
|
export interface RollbackCheckpoint {
|
|
hash: string
|
|
message?: string
|
|
timestamp?: string
|
|
}
|
|
|
|
export interface RollbackListResponse {
|
|
checkpoints?: RollbackCheckpoint[]
|
|
enabled?: boolean
|
|
}
|
|
|
|
export interface RollbackDiffResponse {
|
|
diff?: string
|
|
rendered?: string
|
|
stat?: string
|
|
}
|
|
|
|
export interface RollbackRestoreResponse {
|
|
error?: string
|
|
history_removed?: number
|
|
message?: string
|
|
reason?: string
|
|
restored_to?: string
|
|
success?: boolean
|
|
}
|
|
|
|
// ── Subagent events ──────────────────────────────────────────────────
|
|
|
|
export interface SubagentEventPayload {
|
|
api_calls?: number
|
|
cost_usd?: number
|
|
depth?: number
|
|
duration_seconds?: number
|
|
files_read?: string[]
|
|
files_written?: string[]
|
|
goal: string
|
|
input_tokens?: number
|
|
iteration?: number
|
|
model?: string
|
|
output_tail?: { is_error?: boolean; preview?: string; tool?: string }[]
|
|
output_tokens?: number
|
|
parent_id?: null | string
|
|
reasoning_tokens?: number
|
|
status?: 'completed' | 'failed' | 'interrupted' | 'queued' | 'running'
|
|
subagent_id?: string
|
|
summary?: string
|
|
task_count?: number
|
|
task_index: number
|
|
text?: string
|
|
tool_count?: number
|
|
tool_name?: string
|
|
tool_preview?: string
|
|
toolsets?: string[]
|
|
}
|
|
|
|
// ── Delegation control RPCs ──────────────────────────────────────────
|
|
|
|
export interface DelegationStatusResponse {
|
|
active?: {
|
|
depth?: number
|
|
goal?: string
|
|
model?: null | string
|
|
parent_id?: null | string
|
|
started_at?: number
|
|
status?: string
|
|
subagent_id?: string
|
|
tool_count?: number
|
|
}[]
|
|
max_concurrent_children?: number
|
|
max_spawn_depth?: number
|
|
paused?: boolean
|
|
}
|
|
|
|
export interface DelegationPauseResponse {
|
|
paused?: boolean
|
|
}
|
|
|
|
export interface SubagentInterruptResponse {
|
|
found?: boolean
|
|
subagent_id?: string
|
|
}
|
|
|
|
// ── Spawn-tree snapshots ─────────────────────────────────────────────
|
|
|
|
export interface SpawnTreeListEntry {
|
|
count: number
|
|
finished_at?: number
|
|
label?: string
|
|
path: string
|
|
session_id?: string
|
|
started_at?: number | null
|
|
}
|
|
|
|
export interface SpawnTreeListResponse {
|
|
entries?: SpawnTreeListEntry[]
|
|
}
|
|
|
|
export interface SpawnTreeLoadResponse {
|
|
finished_at?: number
|
|
label?: string
|
|
session_id?: string
|
|
started_at?: null | number
|
|
subagents?: unknown[]
|
|
}
|
|
|
|
export type GatewayEvent =
|
|
| { payload?: { skin?: GatewaySkin }; session_id?: string; type: 'gateway.ready' }
|
|
| { payload?: GatewaySkin; session_id?: string; type: 'skin.changed' }
|
|
| { payload: SessionInfo; session_id?: string; type: 'session.info' }
|
|
| { payload?: { text?: string }; session_id?: string; type: 'thinking.delta' }
|
|
| { payload?: undefined; session_id?: string; type: 'message.start' }
|
|
| { payload?: { kind?: string; text?: string }; session_id?: string; type: 'status.update' }
|
|
| { payload?: { state?: 'idle' | 'listening' | 'transcribing' }; session_id?: string; type: 'voice.status' }
|
|
| { payload?: { no_speech_limit?: boolean; text?: string }; session_id?: string; type: 'voice.transcript' }
|
|
| { payload: { line: string }; session_id?: string; type: 'gateway.stderr' }
|
|
| {
|
|
payload?: { cwd?: string; python?: string; stderr_tail?: string }
|
|
session_id?: string
|
|
type: 'gateway.start_timeout'
|
|
}
|
|
| { payload?: { preview?: string }; session_id?: string; type: 'gateway.protocol_error' }
|
|
| { payload?: { text?: string }; session_id?: string; type: 'reasoning.delta' | 'reasoning.available' }
|
|
| { payload: { name?: string; preview?: string }; session_id?: string; type: 'tool.progress' }
|
|
| { payload: { name?: string }; session_id?: string; type: 'tool.generating' }
|
|
| {
|
|
payload: { context?: string; name?: string; tool_id: string; todos?: unknown[] }
|
|
session_id?: string
|
|
type: 'tool.start'
|
|
}
|
|
| {
|
|
payload: {
|
|
duration_s?: number
|
|
error?: string
|
|
inline_diff?: string
|
|
name?: string
|
|
summary?: string
|
|
tool_id: string
|
|
todos?: unknown[]
|
|
}
|
|
session_id?: string
|
|
type: 'tool.complete'
|
|
}
|
|
| {
|
|
payload: { choices: string[] | null; question: string; request_id: string }
|
|
session_id?: string
|
|
type: 'clarify.request'
|
|
}
|
|
| { payload: { command: string; description: string }; session_id?: string; type: 'approval.request' }
|
|
| { payload: { request_id: string }; session_id?: string; type: 'sudo.request' }
|
|
| { payload: { env_var: string; prompt: string; request_id: string }; session_id?: string; type: 'secret.request' }
|
|
| { payload: { task_id: string; text: string }; session_id?: string; type: 'background.complete' }
|
|
| { payload: SubagentEventPayload; session_id?: string; type: 'subagent.spawn_requested' }
|
|
| { payload: SubagentEventPayload; session_id?: string; type: 'subagent.start' }
|
|
| { payload: SubagentEventPayload; session_id?: string; type: 'subagent.thinking' }
|
|
| { payload: SubagentEventPayload; session_id?: string; type: 'subagent.tool' }
|
|
| { payload: SubagentEventPayload; session_id?: string; type: 'subagent.progress' }
|
|
| { payload: SubagentEventPayload; session_id?: string; type: 'subagent.complete' }
|
|
| { payload: { rendered?: string; text?: string }; session_id?: string; type: 'message.delta' }
|
|
| {
|
|
payload?: { reasoning?: string; rendered?: string; text?: string; usage?: Usage }
|
|
session_id?: string
|
|
type: 'message.complete'
|
|
}
|
|
| { payload?: { message?: string }; session_id?: string; type: 'error' }
|