2026-04-18 09:23:29 -05:00
|
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
|
|
|
|
|
|
import { $uiState, resetUiState } from '../app/uiStore.js'
|
feat(tui): pluggable busy-indicator styles (#13610) (#17150)
* 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
2026-04-28 16:19:16 -07:00
|
|
|
import {
|
|
|
|
|
applyDisplay,
|
|
|
|
|
normalizeBusyInputMode,
|
|
|
|
|
normalizeIndicatorStyle,
|
2026-04-28 17:39:07 -07:00
|
|
|
normalizeMouseTracking,
|
feat(tui): pluggable busy-indicator styles (#13610) (#17150)
* 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
2026-04-28 16:19:16 -07:00
|
|
|
normalizeStatusBar
|
|
|
|
|
} from '../app/useConfigSync.js'
|
2026-04-18 09:23:29 -05:00
|
|
|
|
|
|
|
|
describe('applyDisplay', () => {
|
|
|
|
|
beforeEach(() => {
|
|
|
|
|
resetUiState()
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('fans every display flag out to $uiState and the bell callback', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay(
|
|
|
|
|
{
|
|
|
|
|
config: {
|
|
|
|
|
display: {
|
|
|
|
|
bell_on_complete: true,
|
|
|
|
|
details_mode: 'expanded',
|
|
|
|
|
inline_diffs: false,
|
|
|
|
|
show_cost: true,
|
|
|
|
|
show_reasoning: true,
|
|
|
|
|
streaming: false,
|
|
|
|
|
tui_compact: true,
|
|
|
|
|
tui_statusbar: false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
setBell
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
const s = $uiState.get()
|
|
|
|
|
expect(setBell).toHaveBeenCalledWith(true)
|
|
|
|
|
expect(s.compact).toBe(true)
|
|
|
|
|
expect(s.detailsMode).toBe('expanded')
|
|
|
|
|
expect(s.inlineDiffs).toBe(false)
|
|
|
|
|
expect(s.showCost).toBe(true)
|
|
|
|
|
expect(s.showReasoning).toBe(true)
|
2026-04-22 13:41:01 -05:00
|
|
|
expect(s.statusBar).toBe('off')
|
2026-04-18 09:23:29 -05:00
|
|
|
expect(s.streaming).toBe(false)
|
|
|
|
|
})
|
|
|
|
|
|
2026-04-22 13:55:40 -05:00
|
|
|
it('coerces legacy true + "on" alias to top', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_statusbar: true as unknown as 'on' } } }, setBell)
|
|
|
|
|
expect($uiState.get().statusBar).toBe('top')
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_statusbar: 'on' } } }, setBell)
|
|
|
|
|
expect($uiState.get().statusBar).toBe('top')
|
|
|
|
|
})
|
|
|
|
|
|
2026-04-18 09:23:29 -05:00
|
|
|
it('applies v1 parity defaults when display fields are missing', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: {} } }, setBell)
|
|
|
|
|
|
|
|
|
|
const s = $uiState.get()
|
|
|
|
|
expect(setBell).toHaveBeenCalledWith(false)
|
|
|
|
|
expect(s.inlineDiffs).toBe(true)
|
|
|
|
|
expect(s.showCost).toBe(false)
|
|
|
|
|
expect(s.showReasoning).toBe(false)
|
2026-04-22 13:55:40 -05:00
|
|
|
expect(s.statusBar).toBe('top')
|
2026-04-18 09:23:29 -05:00
|
|
|
expect(s.streaming).toBe(true)
|
2026-04-24 02:34:32 -05:00
|
|
|
expect(s.sections).toEqual({})
|
|
|
|
|
})
|
|
|
|
|
|
2026-04-28 17:39:07 -07:00
|
|
|
it('uses documented mouse_tracking with legacy tui_mouse fallback', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { mouse_tracking: false } } }, setBell)
|
|
|
|
|
expect($uiState.get().mouseTracking).toBe(false)
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { mouse_tracking: true, tui_mouse: false } } }, setBell)
|
|
|
|
|
expect($uiState.get().mouseTracking).toBe(true)
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_mouse: false } } }, setBell)
|
|
|
|
|
expect($uiState.get().mouseTracking).toBe(false)
|
|
|
|
|
})
|
|
|
|
|
|
2026-04-24 02:34:32 -05:00
|
|
|
it('parses display.sections into per-section overrides', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay(
|
|
|
|
|
{
|
|
|
|
|
config: {
|
|
|
|
|
display: {
|
|
|
|
|
details_mode: 'collapsed',
|
|
|
|
|
sections: {
|
|
|
|
|
activity: 'hidden',
|
|
|
|
|
tools: 'expanded',
|
|
|
|
|
thinking: 'expanded',
|
|
|
|
|
bogus: 'expanded'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
setBell
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
const s = $uiState.get()
|
|
|
|
|
expect(s.detailsMode).toBe('collapsed')
|
|
|
|
|
expect(s.sections).toEqual({
|
|
|
|
|
activity: 'hidden',
|
|
|
|
|
tools: 'expanded',
|
|
|
|
|
thinking: 'expanded'
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('drops invalid section modes', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay(
|
|
|
|
|
{
|
|
|
|
|
config: {
|
|
|
|
|
display: {
|
|
|
|
|
sections: { tools: 'maximised' as unknown as string, activity: 'hidden' }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
setBell
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
expect($uiState.get().sections).toEqual({ activity: 'hidden' })
|
2026-04-18 09:23:29 -05:00
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('treats a null config like an empty display block', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay(null, setBell)
|
|
|
|
|
|
|
|
|
|
const s = $uiState.get()
|
|
|
|
|
expect(setBell).toHaveBeenCalledWith(false)
|
|
|
|
|
expect(s.inlineDiffs).toBe(true)
|
|
|
|
|
expect(s.streaming).toBe(true)
|
|
|
|
|
})
|
2026-04-22 13:41:01 -05:00
|
|
|
|
|
|
|
|
it('accepts the new string statusBar modes', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_statusbar: 'bottom' } } }, setBell)
|
|
|
|
|
expect($uiState.get().statusBar).toBe('bottom')
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_statusbar: 'top' } } }, setBell)
|
|
|
|
|
expect($uiState.get().statusBar).toBe('top')
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
describe('normalizeStatusBar', () => {
|
2026-04-22 13:55:40 -05:00
|
|
|
it('maps legacy bool + on alias to top/off', () => {
|
|
|
|
|
expect(normalizeStatusBar(true)).toBe('top')
|
2026-04-22 13:41:01 -05:00
|
|
|
expect(normalizeStatusBar(false)).toBe('off')
|
2026-04-22 13:55:40 -05:00
|
|
|
expect(normalizeStatusBar('on')).toBe('top')
|
2026-04-22 13:41:01 -05:00
|
|
|
})
|
|
|
|
|
|
2026-04-22 13:55:40 -05:00
|
|
|
it('passes through the canonical enum', () => {
|
2026-04-22 13:41:01 -05:00
|
|
|
expect(normalizeStatusBar('off')).toBe('off')
|
|
|
|
|
expect(normalizeStatusBar('top')).toBe('top')
|
2026-04-22 13:55:40 -05:00
|
|
|
expect(normalizeStatusBar('bottom')).toBe('bottom')
|
2026-04-22 13:41:01 -05:00
|
|
|
})
|
|
|
|
|
|
2026-04-22 13:55:40 -05:00
|
|
|
it('defaults missing/unknown values to top', () => {
|
|
|
|
|
expect(normalizeStatusBar(undefined)).toBe('top')
|
|
|
|
|
expect(normalizeStatusBar(null)).toBe('top')
|
|
|
|
|
expect(normalizeStatusBar('sideways')).toBe('top')
|
|
|
|
|
expect(normalizeStatusBar(42)).toBe('top')
|
2026-04-22 13:41:01 -05:00
|
|
|
})
|
2026-04-22 15:19:50 -05:00
|
|
|
|
|
|
|
|
it('trims whitespace and folds case', () => {
|
|
|
|
|
expect(normalizeStatusBar(' Bottom ')).toBe('bottom')
|
|
|
|
|
expect(normalizeStatusBar('TOP')).toBe('top')
|
|
|
|
|
expect(normalizeStatusBar(' on ')).toBe('top')
|
|
|
|
|
expect(normalizeStatusBar('OFF')).toBe('off')
|
|
|
|
|
})
|
2026-04-18 09:23:29 -05:00
|
|
|
})
|
fix(tui): honor display.busy_input_mode in TUI v2 (#17110)
* fix(tui): honor display.busy_input_mode in TUI v2
The TUI v2 frontend hard-coded `composerActions.enqueue(full)` whenever
`ui.busy` was true. The classic CLI and gateway adapters honor the
`display.busy_input_mode` config key (`interrupt` | `queue` | `steer`),
but Ink ignored it — sending a message during a long-running turn always
landed in the queue regardless of config. The config default is already
`interrupt` (hermes_cli/config.py), so users who explicitly opted into
that experience were silently stuck on the legacy queue path.
This wires the value through the existing config-sync surface:
* `applyDisplay` now reads `display.busy_input_mode`, defaults to
`interrupt` (matching `_load_busy_input_mode` in tui_gateway), and
drops it into a new `UiState.busyInputMode` field.
* `dispatchSubmission` and the queue-edit fall-through call a shared
`handleBusyInput` helper that branches on the mode:
* `queue` — legacy behavior, append to the queue.
* `steer` — call `session.steer`; on rejection, fall back to
queue with a sys note.
* `interrupt` — `turnController.interruptTurn(...)` then `send()`,
so the new prompt actually moves.
* Mtime polling in `useConfigSync` already re-applies `config.full`, so
flipping `display.busy_input_mode` in `~/.hermes/config.yaml` takes
effect on the next 5s tick without restarting the TUI.
Tests:
* `applyDisplay → busy_input_mode` covers normalization + UiState fan-out.
* `normalizeBusyInputMode` mirrors the Python side's allow-list.
Validation:
* `npm run type-check` (in `ui-tui/`) — clean.
* `npm test --run` (in `ui-tui/`) — 394/394.
* review(copilot): narrow busy_input_mode type, preserve queue order on steer fallback
* review(copilot): clarify handleBusyInput comment (option, not return value)
* fix(tui): default busy_input_mode to queue in TUI (CLI keeps interrupt)
In a full-screen TUI users typically author the next prompt while the
agent is still streaming, so an unintended interrupt loses in-flight
typing. TUI fallback now defaults to `queue`; CLI / messaging
adapters keep `interrupt` as the framework default.
Override per-config via `display.busy_input_mode: interrupt` (or
`steer`) — the normalize/wire path is unchanged, only the missing-
value branch differs from the Python default.
uiStore initial value also flipped to `queue` so first-frame render
before `config.full` lands matches the eventual normalized value.
2026-04-28 15:52:13 -07:00
|
|
|
|
2026-04-28 17:39:07 -07:00
|
|
|
describe('normalizeMouseTracking', () => {
|
|
|
|
|
it('defaults on and prefers canonical mouse_tracking over legacy tui_mouse', () => {
|
|
|
|
|
expect(normalizeMouseTracking({})).toBe(true)
|
|
|
|
|
expect(normalizeMouseTracking({ mouse_tracking: false })).toBe(false)
|
|
|
|
|
expect(normalizeMouseTracking({ mouse_tracking: 0 })).toBe(false)
|
|
|
|
|
expect(normalizeMouseTracking({ mouse_tracking: 'off' })).toBe(false)
|
|
|
|
|
expect(normalizeMouseTracking({ mouse_tracking: 'false' })).toBe(false)
|
|
|
|
|
expect(normalizeMouseTracking({ mouse_tracking: null, tui_mouse: false })).toBe(true)
|
|
|
|
|
expect(normalizeMouseTracking({ mouse_tracking: true, tui_mouse: false })).toBe(true)
|
|
|
|
|
expect(normalizeMouseTracking({ tui_mouse: false })).toBe(false)
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
fix(tui): honor display.busy_input_mode in TUI v2 (#17110)
* fix(tui): honor display.busy_input_mode in TUI v2
The TUI v2 frontend hard-coded `composerActions.enqueue(full)` whenever
`ui.busy` was true. The classic CLI and gateway adapters honor the
`display.busy_input_mode` config key (`interrupt` | `queue` | `steer`),
but Ink ignored it — sending a message during a long-running turn always
landed in the queue regardless of config. The config default is already
`interrupt` (hermes_cli/config.py), so users who explicitly opted into
that experience were silently stuck on the legacy queue path.
This wires the value through the existing config-sync surface:
* `applyDisplay` now reads `display.busy_input_mode`, defaults to
`interrupt` (matching `_load_busy_input_mode` in tui_gateway), and
drops it into a new `UiState.busyInputMode` field.
* `dispatchSubmission` and the queue-edit fall-through call a shared
`handleBusyInput` helper that branches on the mode:
* `queue` — legacy behavior, append to the queue.
* `steer` — call `session.steer`; on rejection, fall back to
queue with a sys note.
* `interrupt` — `turnController.interruptTurn(...)` then `send()`,
so the new prompt actually moves.
* Mtime polling in `useConfigSync` already re-applies `config.full`, so
flipping `display.busy_input_mode` in `~/.hermes/config.yaml` takes
effect on the next 5s tick without restarting the TUI.
Tests:
* `applyDisplay → busy_input_mode` covers normalization + UiState fan-out.
* `normalizeBusyInputMode` mirrors the Python side's allow-list.
Validation:
* `npm run type-check` (in `ui-tui/`) — clean.
* `npm test --run` (in `ui-tui/`) — 394/394.
* review(copilot): narrow busy_input_mode type, preserve queue order on steer fallback
* review(copilot): clarify handleBusyInput comment (option, not return value)
* fix(tui): default busy_input_mode to queue in TUI (CLI keeps interrupt)
In a full-screen TUI users typically author the next prompt while the
agent is still streaming, so an unintended interrupt loses in-flight
typing. TUI fallback now defaults to `queue`; CLI / messaging
adapters keep `interrupt` as the framework default.
Override per-config via `display.busy_input_mode: interrupt` (or
`steer`) — the normalize/wire path is unchanged, only the missing-
value branch differs from the Python default.
uiStore initial value also flipped to `queue` so first-frame render
before `config.full` lands matches the eventual normalized value.
2026-04-28 15:52:13 -07:00
|
|
|
describe('normalizeBusyInputMode', () => {
|
|
|
|
|
it('passes through the canonical CLI parity values', () => {
|
|
|
|
|
expect(normalizeBusyInputMode('queue')).toBe('queue')
|
|
|
|
|
expect(normalizeBusyInputMode('steer')).toBe('steer')
|
|
|
|
|
expect(normalizeBusyInputMode('interrupt')).toBe('interrupt')
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('trims and lowercases input', () => {
|
|
|
|
|
expect(normalizeBusyInputMode(' Queue ')).toBe('queue')
|
|
|
|
|
expect(normalizeBusyInputMode('STEER')).toBe('steer')
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('defaults to queue for missing/unknown values (TUI-only override)', () => {
|
|
|
|
|
// CLI / messaging adapters keep `interrupt` as the framework default
|
|
|
|
|
// (see hermes_cli/config.py + tui_gateway/server.py::_load_busy_input_mode);
|
|
|
|
|
// the TUI ships `queue` because typing a follow-up while the agent
|
|
|
|
|
// streams is the common authoring pattern and an unintended interrupt
|
|
|
|
|
// loses work.
|
|
|
|
|
expect(normalizeBusyInputMode(undefined)).toBe('queue')
|
|
|
|
|
expect(normalizeBusyInputMode(null)).toBe('queue')
|
|
|
|
|
expect(normalizeBusyInputMode('')).toBe('queue')
|
|
|
|
|
expect(normalizeBusyInputMode('drop')).toBe('queue')
|
|
|
|
|
expect(normalizeBusyInputMode(42)).toBe('queue')
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
feat(tui): pluggable busy-indicator styles (#13610) (#17150)
* 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
2026-04-28 16:19:16 -07:00
|
|
|
describe('normalizeIndicatorStyle', () => {
|
|
|
|
|
it('passes through the canonical enum', () => {
|
|
|
|
|
expect(normalizeIndicatorStyle('kaomoji')).toBe('kaomoji')
|
|
|
|
|
expect(normalizeIndicatorStyle('emoji')).toBe('emoji')
|
|
|
|
|
expect(normalizeIndicatorStyle('unicode')).toBe('unicode')
|
|
|
|
|
expect(normalizeIndicatorStyle('ascii')).toBe('ascii')
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('trims and lowercases input', () => {
|
|
|
|
|
expect(normalizeIndicatorStyle(' Emoji ')).toBe('emoji')
|
|
|
|
|
expect(normalizeIndicatorStyle('UNICODE')).toBe('unicode')
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('defaults to kaomoji for missing/unknown values', () => {
|
|
|
|
|
expect(normalizeIndicatorStyle(undefined)).toBe('kaomoji')
|
|
|
|
|
expect(normalizeIndicatorStyle(null)).toBe('kaomoji')
|
|
|
|
|
expect(normalizeIndicatorStyle('')).toBe('kaomoji')
|
|
|
|
|
expect(normalizeIndicatorStyle('sparkle')).toBe('kaomoji')
|
|
|
|
|
expect(normalizeIndicatorStyle(42)).toBe('kaomoji')
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
fix(tui): honor display.busy_input_mode in TUI v2 (#17110)
* fix(tui): honor display.busy_input_mode in TUI v2
The TUI v2 frontend hard-coded `composerActions.enqueue(full)` whenever
`ui.busy` was true. The classic CLI and gateway adapters honor the
`display.busy_input_mode` config key (`interrupt` | `queue` | `steer`),
but Ink ignored it — sending a message during a long-running turn always
landed in the queue regardless of config. The config default is already
`interrupt` (hermes_cli/config.py), so users who explicitly opted into
that experience were silently stuck on the legacy queue path.
This wires the value through the existing config-sync surface:
* `applyDisplay` now reads `display.busy_input_mode`, defaults to
`interrupt` (matching `_load_busy_input_mode` in tui_gateway), and
drops it into a new `UiState.busyInputMode` field.
* `dispatchSubmission` and the queue-edit fall-through call a shared
`handleBusyInput` helper that branches on the mode:
* `queue` — legacy behavior, append to the queue.
* `steer` — call `session.steer`; on rejection, fall back to
queue with a sys note.
* `interrupt` — `turnController.interruptTurn(...)` then `send()`,
so the new prompt actually moves.
* Mtime polling in `useConfigSync` already re-applies `config.full`, so
flipping `display.busy_input_mode` in `~/.hermes/config.yaml` takes
effect on the next 5s tick without restarting the TUI.
Tests:
* `applyDisplay → busy_input_mode` covers normalization + UiState fan-out.
* `normalizeBusyInputMode` mirrors the Python side's allow-list.
Validation:
* `npm run type-check` (in `ui-tui/`) — clean.
* `npm test --run` (in `ui-tui/`) — 394/394.
* review(copilot): narrow busy_input_mode type, preserve queue order on steer fallback
* review(copilot): clarify handleBusyInput comment (option, not return value)
* fix(tui): default busy_input_mode to queue in TUI (CLI keeps interrupt)
In a full-screen TUI users typically author the next prompt while the
agent is still streaming, so an unintended interrupt loses in-flight
typing. TUI fallback now defaults to `queue`; CLI / messaging
adapters keep `interrupt` as the framework default.
Override per-config via `display.busy_input_mode: interrupt` (or
`steer`) — the normalize/wire path is unchanged, only the missing-
value branch differs from the Python default.
uiStore initial value also flipped to `queue` so first-frame render
before `config.full` lands matches the eventual normalized value.
2026-04-28 15:52:13 -07:00
|
|
|
describe('applyDisplay → busy_input_mode', () => {
|
|
|
|
|
beforeEach(() => {
|
|
|
|
|
resetUiState()
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('threads display.busy_input_mode into $uiState', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { busy_input_mode: 'queue' } } }, setBell)
|
|
|
|
|
expect($uiState.get().busyInputMode).toBe('queue')
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { busy_input_mode: 'steer' } } }, setBell)
|
|
|
|
|
expect($uiState.get().busyInputMode).toBe('steer')
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('falls back to queue when value is missing or invalid (TUI-only default)', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: {} } }, setBell)
|
|
|
|
|
expect($uiState.get().busyInputMode).toBe('queue')
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { busy_input_mode: 'drop' } } }, setBell)
|
|
|
|
|
expect($uiState.get().busyInputMode).toBe('queue')
|
|
|
|
|
})
|
|
|
|
|
})
|
feat(tui): pluggable busy-indicator styles (#13610) (#17150)
* 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
2026-04-28 16:19:16 -07:00
|
|
|
|
|
|
|
|
describe('applyDisplay → tui_status_indicator', () => {
|
|
|
|
|
beforeEach(() => {
|
|
|
|
|
resetUiState()
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('threads display.tui_status_indicator into $uiState', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_status_indicator: 'emoji' } } }, setBell)
|
|
|
|
|
expect($uiState.get().indicatorStyle).toBe('emoji')
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_status_indicator: 'unicode' } } }, setBell)
|
|
|
|
|
expect($uiState.get().indicatorStyle).toBe('unicode')
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
it('falls back to kaomoji default when missing or invalid', () => {
|
|
|
|
|
const setBell = vi.fn()
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: {} } }, setBell)
|
|
|
|
|
expect($uiState.get().indicatorStyle).toBe('kaomoji')
|
|
|
|
|
|
|
|
|
|
applyDisplay({ config: { display: { tui_status_indicator: 'rainbow' } } }, setBell)
|
|
|
|
|
expect($uiState.get().indicatorStyle).toBe('kaomoji')
|
|
|
|
|
})
|
|
|
|
|
})
|