* feat(tui): opt-in auto-resume of the most recent session
`hermes --tui` always forges a fresh session at startup unless the user
sets `HERMES_TUI_RESUME=<id>`. Disconnects, terminal-window crashes,
and accidental Ctrl+D therefore lose every piece of in-flight context
even though `state.db` still has the full history a `/resume` away.
Add an opt-in path that mirrors classic CLI's `hermes -c` muscle
memory: when `display.tui_auto_resume_recent: true` is set in
`~/.hermes/config.yaml`, the TUI looks up the most recent human-facing
session and resumes it instead of starting fresh. Default off so
existing users aren't surprised; explicit `HERMES_TUI_RESUME` always
wins.
Wires:
* New `session.most_recent` JSON-RPC in `tui_gateway/server.py` that
returns the first non-`tool` row from `list_sessions_rich`, or
`{"session_id": null}` when none. Uses the same deny-list as
`session.list` so sub-agent rows can't sneak in.
* `createGatewayEventHandler.handleReady` re-ordered: explicit
`STARTUP_RESUME_ID` first (unchanged), then conditional auto-resume
via `config.get full → display.tui_auto_resume_recent`, then the
legacy `newSession()` fallback. Failures of either RPC fall back
to `newSession()` so the path is always finite.
* Default `display.tui_auto_resume_recent: False` added to
`DEFAULT_CONFIG` in `hermes_cli/config.py` (no `_config_version`
bump per AGENTS.md — deep-merge handles the additive key).
Tests:
* 4 new vitest cases in `createGatewayEventHandler.test.ts` cover
every gate-and-fallback combination (env wins, config off, config
on with hit, config on with miss).
* 3 new pytest cases for `session.most_recent` (denied row skip,
tool-only → null, db-unavailable → null).
Validation:
scripts/run_tests.sh tests/test_tui_gateway_server.py — 93/93.
cd ui-tui && npm run type-check — clean; npm test --run — 393/393.
* review(copilot): fold session.most_recent errors into null + extend ConfigDisplayConfig
* review(copilot): cover RPC-rejection fallbacks in auto-resume tests
470 lines
13 KiB
TypeScript
470 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
|
|
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
|
|
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' }
|