* feat(i18n): layered catalogs — plugin packs and user overlay over bundled locales
* feat(tui): i18n layer — en catalog, nanostore runtime, RPC pack loader, _keys.tui.json emitter
ui-tui/src/i18n/: en.ts (facade over topical siblings under en/), types.ts
(Translations + dotted TranslationKey derived from en), runtime.ts ($locale/
$catalog atoms, translateFrom active→en→key, pack merge with string→fn
wrapping for {0}/{1} placeholders), loader.ts (display.language →
i18n.catalog {lang, surface:'tui'}, English when the method is missing),
useT()/useLocale() hooks, t() for non-React code. useConfigSync feeds the
loader from the existing config.get full hydration. `npm run i18n:keys`
writes locales/_keys.tui.json (sorted flat key list) and runs before build.
* feat(plugins): provides_locales manifest field, ctx.register_locale/register_locale_dir, manifest-only language packs
* chore(tui): split en catalog siblings by lane (slash sibling)
* feat(plugins): validate language packs — parse, text-only, key-subset WARN against en / _keys exports
* feat(tui_gateway): i18n.languages / i18n.catalog RPC + regenerated contracts
* feat(config): display.language accepts any supported_languages() id, refuses unknown ids with the list
* docs(i18n): language packs user guide, pluggable display.language, plugin developer section, AGENTS notes
* feat(plugins): report language-pack layers in the mid-run activation summary
* feat(tui): wire status bar, composer placeholders, hotkey help and approval/clarify/confirm prompts through i18n
StatusRule maps compared state values (ready/running…/summoning) to catalog
text at render via displayStatus(); hotkeys()/placeholder() resolve lazily so
a pack that arrives after boot applies. Catalog grows to 81 keys.
* feat(desktop): pluggable app locales — registry, host.i18n.registerAppLocale, backend packs, keys emitter
- Locale widens to string (BundledLocale keeps the union); TRANSLATIONS stays
the bundled record and every consumer resolves through the registry.
- src/i18n/registry.ts: registerAppLocale(id, {endonym, rtl, translations})
layers partial packs (nested or flat dotted) over bundled/en via
mergeTranslations; a string over a function-valued en entry becomes a
positional {0}/{1} formatter; $appLocaleVersion bumps so translators
re-render; per-source disposers + replaceAppLocaleSource for atomic swaps.
- Backend packs: i18n.languages + i18n.catalog {surface:'desktop'} feed the
registry as source 'backend' (method-not-found is silent); re-synced on
socket open, display.language change and profile switch. A saved pack-only
language is promoted once its pack registers.
- SDK: host.i18n.registerAppLocale / languageOptions; ctx.i18n.registerAppLocale
tracked for unload. Docs in the desktop plugin SDK guide + skill reference.
- Language switcher lists bundled ∪ registered ∪ backend, endonym-only; RTL
from the registry (applyDocumentLocale takes rtl).
- npm run i18n:keys emits locales/_keys.desktop.json (wired into build).
* i18n(cli): route /topup + /subscription copy through t() (cli.billing.*, cli.subscription.*)
Module-level copy tables and modal choice tuples in cli_billing_mixin.py froze
English at import, before display.language was known. They are now key tables /
builder functions evaluated at call time; every user-facing line in the /usage
balance block, /subscription and the five /topup screens reads the catalog.
Choice VALUES stay English identifiers. Fragment-assembled status lines
(Plan: … → cancels · $x left · renews …) become full templates.
* i18n(gateway): exec-approval card contract + base/run/run_busy/run_inbound replies through t()
- base_exec_approval: EA_* English constants stay; add ea_header_text()/ea_reason_label_text()/
ea_smart_deny_line_text()/ea_default_reason_text()/ea_action_labels()/approval_timed_out_notice()
accessors; deadline + timed-out notice resolve via gateway.exec_approval.*
- BasePlatformAdapter._EA_HEADER/_EA_REASON_LABEL/_EA_SMART_DENY_LINE/_EA_ACTION_LABELS become
properties (adapters still shadow them with markup class attrs)
- run.py: provider error replies table holds catalog keys; _CONTEXT_OVERFLOW_REPLY -> _context_overflow_reply()
- run_busy/run_inbound: typed approval + slash-confirm matchers accept English ∪ approval.inputs.* (t())
- locales/en.yaml: gateway.exec_approval/busy/errors/... namespaces
* i18n(cli): wire modal, loops, agent-setup mixins through t() (cli.* keys)
* i18n(platforms): route Slack, Matrix and Feishu user-facing text through t()
Exec-approval markup overrides (_EA_HEADER/_EA_REASON_LABEL/_EA_SMART_DENY_LINE/
_EA_ACTION_LABELS) become per-call properties over the shared
gateway.exec_approval.* contract keys, so Slack's 3000-char section budget
measures the resolved template. Slack _APPROVAL_DECISIONS/_CONFIRM_DECISIONS,
Feishu _APPROVAL_LABEL_MAP and Matrix _EA_LEGEND/_EA_TYPED_HINT turn into
key tables resolved at click time; the Matrix typed hints become whole
sentences per offered tier instead of spliced fragments. Slack button labels
are cut to 75 chars and select placeholders to 150 after translation; the
model-facing clarify fallback answer ('choice N') stays English while the
card copy localizes.
locales/en.yaml gains the gateway.exec_approval.* contract keys plus the
platform.shared.* / platform.slack.* / platform.matrix.* / platform.feishu.*
namespaces (and the keys for the other adapters wired in follow-up commits).
* i18n(gateway): run_turn / run_turn_runner / approval-settle copy through t()
- status hints, proxy errors, background task notices, progress heartbeats, session info lines
- tool progress chrome (tool_head/tool_pending/tool_preview/tool_verbose) shared by base.format_tool_event
- run_turn_runner:1406 Chinese clarify placeholder -> gateway.clarify.native_stream_placeholder (zh text kept in zh.yaml)
- _UNEXPECTED_SILENCE_REPLY/_CLARIFY_EXPIRED_NOTICE -> accessor functions
* i18n(platforms): route Google Chat and Teams user-facing text through t()
Google Chat clarify card, typing placeholder, orphan-card labels and the whole
/setup-files reply set (module constants become platform.google_chat.setup_files.*
keys resolved at reply time). The attachment-fallback notice that shipped
hardcoded in Spanish is keyed with an English en value; es.yaml carries the
original Spanish text for those four keys.
Teams approval card header/reason use the gateway.exec_approval.* contract,
_APPROVAL_LABELS becomes a key table resolved at click time, and the meeting
summary writer resolves its section headings/fallbacks per render.
* i18n(platforms): route LINE, WeCom, email, DingTalk, IRC and Home Assistant text through t()
LINE default copy constants become catalog keys resolved in __init__ (the
LINE_*_TEXT / extra.* operator overrides still win); the busy-ack bypass
matcher keys on the leading emoji marker only, so it keeps firing once the
gateway busy heads are localized. WeCom media size/format notices that shipped
hardcoded in Chinese are keyed with English en values and zh.yaml carries the
original Chinese text. DingTalk emotion bubbles resolve per send.
* i18n(cli): route /model switch output and -q status lines through t() (cli.model.*, cli.single_query.*)
Switch-summary labels shared with the gateway reuse gateway.model.* keys
(provider/context/max-output/capabilities/prompt-caching); CLI-only variants
(glyph or no-backtick forms) live under cli.model.*. The hand-padded /model usage
block becomes a (form, description-key) table padded at render time so the
command syntax stays fixed while descriptions translate. -q 'Error:' reuses
gateway.model.error_prefix.
* i18n(cli): route TUI panel/hint/placeholder copy through t() (cli.tui.*)
_APPROVAL_CHOICE_LABELS and _TUI_MODAL_HINTS become key tables resolved at
render time; vault/sudo panel bodies are one catalog value per panel split on
newline; inline plurals use <key>_one/<key>_other. Adds the cli.* namespace
(shared/tui/voice/render/subagents/dock) to locales/en.yaml.
* i18n(cli): voice/wake-word CLI copy through t() (cli.voice.*)
RuntimeError texts raised in _voice_start_recording are human copy (callers
print {e}) and are keyed; the Termux requirement-check match stays English.
Wake state ids stay internal, only their labels localize.
* i18n(cli): live-work dock, subagent monitor and render copy through t()
cli.subagents.* / cli.dock.* / cli.render.*; count fragments pluralize via
_one/_other keys, verdict table holds keys resolved at paint time so width
clipping measures the translated text.
* i18n(gateway): unauthorized/pairing, voice, topics, shutdown, startup, notifications, kanban pings through t()
* i18n(cli): move tips + composer placeholders into the catalog (tips.tNNN / tips.placeholder.pNN)
get_random_tip()/get_random_composer_placeholder() pick a key from the English catalog
(the parity baseline, probed once per process) and resolve it through t() for the active
language, so language packs translate tips like any other string. Also lands the cli.*
en.yaml namespace consumed by the CLI info/help/error-copy wiring in the next commit.
* i18n(cli): wire chat-turn + session mixins through t(); kanban log trimmer matches t() output
* test(cli): assert TUI/dock/voice copy via t(key); prove labels resolve at render time
Pinned-English assertions in the approval-UI, live-work dock and voice tests now
go through the catalog. New test swaps the catalog after import and checks the
approval panel + hint row follow it (the reason _APPROVAL_CHOICE_LABELS and
_TUI_MODAL_HINTS became key tables).
* i18n(cli): route CLI info/help/error copy through t() (cli.* namespace)
cli_info_mixin: /help consumes CommandDef.describe() (added to commands.py: slash.<name>.description
with fallback to .description), section titles/skill/quick-command headers, /tools, /toolsets,
/usage labels, /context, /whoami, /insights, /gateway status, tool-progress labels, bang-shell
denials, MCP config-watch + /reload-mcp confirm/reload lines, /reload-skills, and the session-store
warning all read the catalog at call time (module-level label tables became functions so the
active language is honoured after startup). cli.py: worktree cleanup, tirith warning, show_config
(labels re-padded at print time), quick/plugin/skill slash-command errors, ambiguous-command hint,
stdin error, gateway start, profile warning. cli_chat_error_copy / cli_unknown_command /
cli_output / cli_init_mixin: chat error panel copy, did-you-mean lines, n-more / yes-no prompt
(localized affirmative initial alongside 'y'), unknown-toolsets warning.
* i18n(w1a): wire agent display/explainers/approval + slash registry/help through t()
- hermes_cli/commands.py: CommandDef.describe() resolves slash.<name>.description
at call time; category labels via slash.category.*; help/alias/usage suffixes
via slash.shared.*; gateway_help_lines and commands_platforms/slash_exec use them.
- agent/display.py: display.verb.* resolved at call time via get_tool_verb();
bridge/spinner/thinking-verb/cute-row/failure/preview/diff text via display.*.
- agent/turn_explainers.py: exit-reason / persistence-cause tables become call-time
lookups (explainer.exit.*, explainer.persistence.*, explainer.file_mutation.*).
- agent/background_review.py, session_activity.py, context_breakdown.py,
status_output.py: review summaries, iteration progress, context notices.
- tools/approval.py, approval_context.py: approval.summary.*, approval.noun.*,
approval.window.* pluralized keys.
- gateway/slash_commands*.py: remaining raw strings (busy, whoami, platform,
bundles, memory, skills, approvals, set_home, diff, update, debug, profile,
heartbeat, refine, review, subgoal, loop, retry, compress codex path, save,
sessions, model guard/errors, agents rows, topup, login). HISTORY_UNREADABLE
keeps its English constant; callers use history_unreadable() ->
gateway.shared.history_unreadable.
- locales/en.yaml: new approval/display/explainer/slash blocks + gateway leftovers.
* i18n(telegram): route adapter chat copy through t()
Approval card (header/reason/smart-deny as HTML-escaped properties), inline
button labels, callback toasts (cut at Telegram's 200-char cap), model/choice
pickers, clarify/update/slash-confirm prompts, gmail-triage labels and the
inbound-media failure notice now come from the catalog. _UNAUTHORIZED is a
lazy _unauthorized() so the import no longer binds a language. The command
menu carries a language+payload fingerprint (forum scopes re-register on
change) and BotCommand descriptions are cut at 256.
Adds gateway.exec_approval.* (WAVE2 contract), platform.telegram.*,
platform.discord.* and the slash.*.description keys the Discord table shares
with the CLI registry to locales/en.yaml.
* i18n(gateway/platforms): whatsapp_cloud, yuanbao, weixin, signal, api_server copy through t()
- whatsapp_cloud: clarify list/buttons, approve/deny + slash-confirm labels via platform.whatsapp.* (t()-then-truncate at 20/24/72 caps); _EA_HEADER becomes a property wrapping ea_header_text()
- yuanbao: SLOW_RESPONSE_MESSAGE -> slow_response_message() (platform.yuanbao.slow_response_notice; zh keeps the original text); cron-wrapper markers centralized as module constants for strip_cron_wrapper
- api_server: PROVIDER_AUTH_FAILED_LABEL/PROVIDER_RATE_LIMITED_LABEL stay English for run.py matchers; user_text() renders via t()
- signal/_format_wait, weixin voice caption, openai_routes transformed notice
- run_turn: second _UNEXPECTED_SILENCE_REPLY consumer -> accessor
* i18n(discord): route adapter chat copy through t()
Native slash-command table becomes _NATIVE_SLASH_COMMAND_SPECS holding catalog
keys; _native_slash_commands() resolves descriptions, parameter descriptions
and Choice names for the active language, each cut at Discord's 100-char cap,
and the app-command sync fingerprint now includes get_language() so a
display.language change re-syncs. Exec-approval card (gateway.exec_approval.*
contract), slash-confirm / clarify / update views, model+choice pickers,
thread creation, forum titles, voice acks, the response-truncation notice,
the unauthorized-slash security alert and the media upload-size notices all
read from platform.discord.*. Decorator-declared button labels are relabelled
in __init__ (80-char cap); embed titles cut at 256, select placeholders at
150, option label/description at 100. _UNAUTHORIZED is a lazy _unauthorized().
* i18n(cli): wire status-bar, stream, terminal mixins + terminal_input through t(); rename kwargs that shadow t(key)
* i18n: wire hermes_cli/cli_commands_mixin.py slash-command copy through t()
- 431 new leaves under cli.commands.<cmd>.* in locales/en.yaml; 12 rows reuse
existing gateway.* keys (rollback, diff, resume, branch, btw, model, reasoning)
via a _gt() helper so CLI and gateway replies stay identical.
- Module-level English tables (_BUSY_MODE_*, _REASONING_TOGGLES, _HATCH_PROGRESS,
_DIFF_LABELS, _LOCAL_ENGINE_LINES) become call-time catalog lookups keyed by id.
- Verb tables (Enabling/Disabling, Paused/Resumed/Triggered, planned/done,
Updating/Generating) are one full template per variant; plurals use
<key>_one/<key>_other via _tn(); hand-padded column labels (/snapshot list)
translate the value and re-pad at the call site.
- Multi-line usage blocks are single catalog values split with _lines().
- Model-facing system notes and DB-stored reasons stay English (EXCLUDED).
* tests: assert /handoff, /worktree, /login CLI copy via t(key) instead of pinned English
* test(i18n): pin Telegram/Discord adapter catalog wiring
Lazy unauthorized notice, exec-approval contract keys, HTML escaping before
Telegram <b> wrapping, 200-char toast / 256-char BotCommand caps, Discord
100-char app-command text and 80-char button caps, and language-bearing
command-menu fingerprints on both platforms.
* i18n: reconcile cli.shared on/off vs enabled/disabled after lane merge
* i18n: describe() in TUI-gateway slash listings; localize TUI exit resume hint
* i18n(tr): translate bundled catalog + tui pack
* i18n(ja): translate bundled catalog + tui pack
* i18n(ko): translate bundled catalog + tui pack
* i18n(zh): translate bundled catalog + tui pack
* i18n(fr): translate bundled catalog + tui pack
* i18n(af): translate bundled catalog + tui pack
* i18n(uk): translate bundled catalog + tui pack
* i18n(ar): translate bundled catalog + tui pack
* i18n(pt): translate bundled catalog + tui pack
* i18n(it): translate bundled catalog + tui pack
* i18n(es): translate bundled catalog + tui pack
* i18n(zh-hant): translate bundled catalog + tui pack
* i18n(ru): translate bundled catalog + tui pack
* i18n(hu): translate bundled catalog + tui pack
* i18n(hu): translate pre-existing English-valued leftovers (kanban wake, /context, /status, fast labels)
* i18n(de): translate bundled catalog + tui pack
* i18n(ga): translate bundled catalog + tui pack
* test(i18n): fixture matches _normalize_lang(lang, home) signature
* i18n(tui): scaffold userMessages/slashCmd en siblings
* i18n(tui): wire secure prompts + content tables
* feat(tui): i18n — wire billing, subscription, connection-setup and journey overlays
Adds en siblings billing.ts / subscription.ts / connection.ts (namespaces
billing, subscription, connection, journey) and routes every user-facing
literal in billingOverlay, subscriptionOverlay, connectionSetupOverlay and
journey through useT()/messages(). Module-level label tables became lazy
(scopeStillDeniedResult(), verbOf(T, action)); auto-reload rows dispatch on
stable ids instead of label text. Regenerates locales/_keys.tui.json.
* i18n(tui): wire slash ops/wake replies
* i18n(tui): wire pickers (modelPicker, activeSessionSwitcher, petPicker)
* i18n(tui): wire slash core/debug/setup replies
* i18n(tui): wire hubs (agents overlay/panel/controls, skills, plugins)
* i18n(tui): wire slash session/topup/subscription replies
* i18n(tui): wire chat bits (branding, thinking, messageLine, loaders, todo, queued, banner, entry)
* i18n(tui): register t3 siblings (pickers, hubs, secure, content, chatBits) and regenerate keys
* i18n(tui): wire userMessages copy through the userMessages namespace
* i18n(tui): lazy-copy test for userMessages, regenerate _keys.tui.json
* i18n(tui): wire session/gateway/lib text through the TUI catalog (lane t2)
Adds en siblings session.ts, gatewayMsg.ts, libText.ts (namespaces session,
gatewayMsg, libText) and routes user-facing literals in app/{useMainApp,
useSessionLifecycle,useInputHandlers,turnController,createServerRequestHandler,
setupHandoff,createGatewayEventHandler}.ts, gatewayClient displayed reasons,
lib/*, domain/*, hooks/* through t()/messages(). Status-bar state values that
code compares against, backend-matched strings, log lines, model-bound text,
and machine 'error:' prefixes stay literal. Regenerates locales/_keys.tui.json
(232 keys).
* i18n: serve bundled locales/<lang>.tui.yaml under overlay/packs; TUI pack parity test; regen _keys.tui.json (1250)
* i18n: translate pre-existing English stubs in bundled locales (424 leaves, 14 locales)
* tui: i18n-export-en script (English templates for pack translators)
* docs(i18n): bundled TUI packs are the bottom layer of the tui surface
* i18n(ru): translate TUI pack
* i18n(ar): translate TUI pack
* i18n(es): translate TUI pack
* i18n(pt): translate TUI pack
* i18n(ko): translate TUI pack
* i18n(de): translate TUI pack
* i18n(ja): translate TUI pack
* i18n(fr): translate TUI pack
* i18n(tr): translate TUI pack
* i18n(it): translate TUI pack
* i18n(zh): translate TUI pack
* i18n(zh-hant): translate TUI pack
* i18n(hu): translate TUI pack
* i18n(uk): translate TUI pack
1,169 missing keys translated; 81 pre-existing kept byte-identical. Parity OK missing=0 extra=0 placeholder_mismatch=0 empty=0.
Deliberately identical to en: chatBits.branding.mcpSummary ({0} MCP), chatBits.thinking.agentsHint ((/agents)), session.main.voiceStt (◉ STT), session.main.voiceTtsSuffix ( [tts]), slashCmd.core.help.tuiSection (TUI), slashCmd.core.history.hermesTag (Hermes #{0}), slashCmd.debug.heapdump.heapPath (heapdump: {0}), slashCmd.debug.mem.rss (rss), subscription.stepUp.title (Remote Spending — product feature name, as in core catalog), content.faces.* (glyph-only kaomoji).
* i18n(ga): translate TUI pack
* i18n(af): translate TUI pack
* plugin_guard: locale catalogs in language packs step down the agent-config family
A translated status line such as "Updating AGENTS.md" in locales/<lang>.yaml is UI text the loader
reads as a string leaf; it cannot edit a file. The bundled en.yaml itself tripped agent_config_mod
at critical, making any faithful language pack uninstallable. Injection shapes keep full severity.
* plugin_validate_locales: read key exports with utf-8-sig (Windows footgun lint)
* i18n(relay): route relay adapter prompt copy through t(); drop dead import-bound approval header
Adds platform.relay.* (5 keys) to en and all 16 bundled locales, reusing the sibling platform
translations for the confirm buttons and the Other option.
* ci: fix TUI import order, MDX table pipe, main's overflow-warning wording in all locales; fresh-install fixture carries the i18n kernel
- ui-tui/src/i18n/en.ts: perfectionist/sort-imports (slash before slashCmd)
- docs plugins/index.md: escape the | inside the provides_locales table cell (MDX parsed <id> as JSX)
- display.notice.uncompressed_context_overflow: adopt main's wording (names compression.enabled: false
and /compact) in en + 16 locales; the guardrail test pins that phrase
- tests/scripts/test_fresh_source_install.py: the installer tail now resolves CLI text through
agent.i18n, so the fixture tree carries the i18n kernel + en.yaml (not the agent runtime)
* docs(desktop-plugin-sdk): double-backtick the template-literal example (MDX evaluated ${n})
* test(e2e): display.language is validated against the live language set; exclude it from the arbitrary-string set property
* commands: keep the localized COMMANDS/COMMANDS_BY_CATEGORY module __getattr__ after the compat block removal
* build: never write locales/_keys.*.json from the desktop/TUI builds; regenerate the committed desktop key export
The desktop build regenerated locales/_keys.desktop.json in the checkout, so a
hermes update that rebuilt the app left the tree dirty (Desktop update E2E:
'M locales/_keys.desktop.json'). The key exports are committed artifacts pinned
to en.ts by apps/desktop/scripts/i18n-keys.test.mjs and ui-tui i18n:keys:check;
builds read them, never write them. Regenerated after main's new desktop strings.
* test: unbreak two main-red timing tests the PR merge-ref inherits
- test_local_runtime racing fake publishes the modern state record (legacy pid-only
records are rejected since 65ff3ad353; main has been red on this test since)
- test_run_progress_topics ManyProgressLinesAgent waits for the first bubble instead of
a fixed 0.35s, which a loaded CI runner does not always meet
* chore(i18n): regenerate desktop key catalog for main's new strings (model pricing, copy changelog)
* test(e2e): torture-chamber fd monitor confirms a deleted sidecar is still held before calling it a leak
SQLite's WAL last-close unlinks -shm before closing its descriptor (unixShmUnmap, then
unixShmPurge), so a healthy close shows a (deleted) -shm for microseconds; the 20ms poll
occasionally caught that window on the short-lived opener and failed the episode.
* chore(i18n): regenerate desktop key catalog for main's telemetry/consent strings
* chore(i18n): regenerate desktop key catalog after main sync
---------
Co-authored-by: Teknium <teknium@nousresearch.com>
808 lines
40 KiB
Python
808 lines
40 KiB
Python
"""Streaming output, reasoning preview, tool progress callbacks, and busy-command spinner for the interactive CLI
|
|
|
|
Mixin split out of ``cli.py``; bound onto ``HermesCLI`` via the MRO. cli.py-internal
|
|
symbols are imported LAZILY inside each method (``from cli import ...``) — the mixin
|
|
never imports ``cli`` at module load time (import cycle).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import re
|
|
import shutil
|
|
import textwrap
|
|
import time
|
|
|
|
from contextlib import contextmanager
|
|
from pathlib import Path
|
|
from rich.markup import escape as _escape
|
|
|
|
from agent.i18n import t
|
|
from agent.think_scrubber import THINK_CLOSE_TAGS, THINK_OPEN_TAGS
|
|
|
|
# Model-generated reasoning tags: suppressed during streaming (they'd display as raw XML;
|
|
# the agent strips them from final_response too) unless show_reasoning routes them to the box.
|
|
_OPEN_TAGS = THINK_OPEN_TAGS
|
|
_CLOSE_TAGS = THINK_CLOSE_TAGS
|
|
_MAX_CLOSE_TAG_LEN = max(len(t) for t in _CLOSE_TAGS)
|
|
|
|
# Ordered (prefix, catalog key) rows for _slow_command_status — first match wins; the key is
|
|
# resolved through t() at call time so the active language applies.
|
|
_SLOW_COMMAND_STATUS = (
|
|
("/skills search", "cli.stream.busy_skills_search"), ("/skills browse", "cli.stream.busy_skills_browse"),
|
|
("/skills inspect", "cli.stream.busy_skills_inspect"), ("/skills install", "cli.stream.busy_skills_install"),
|
|
("/skills", "cli.stream.busy_skills"), ("/browser", "cli.stream.busy_browser"))
|
|
_SLOW_COMMAND_STATUS_EXACT = {
|
|
"/reload-mcp": "cli.stream.busy_reload_mcp",
|
|
"/reload-skills": "cli.stream.busy_reload_skills",
|
|
"/reload_skills": "cli.stream.busy_reload_skills"}
|
|
|
|
|
|
def _thinking_prefix() -> str:
|
|
"""`` [thinking] `` — the reasoning-preview label; also measured for wrap width."""
|
|
return f" {t('cli.stream.thinking_label')} "
|
|
|
|
|
|
def _terminal_columns(default: int = 80) -> int:
|
|
try:
|
|
return shutil.get_terminal_size().columns
|
|
except Exception:
|
|
return default
|
|
|
|
|
|
class CLIStreamMixin:
|
|
"""Streaming output, reasoning preview, tool progress callbacks, and busy-command spinner for the interactive CLI"""
|
|
|
|
def _on_thinking(self, text: str) -> None:
|
|
"""Called by agent when thinking starts/stops. Updates TUI spinner."""
|
|
if getattr(getattr(self, "agent", None), "_mute_notification_reply", False):
|
|
return
|
|
from gateway.warning_notifications import DiagnosticText, render_notification
|
|
def show():
|
|
if not text:
|
|
self._flush_reasoning_preview(force=True)
|
|
self._spinner_text = text or ""
|
|
self._tool_start_time = 0.0 # clear tool timer when switching to thinking
|
|
self._invalidate()
|
|
render_notification(show, platform="cli", diagnostic=isinstance(text, DiagnosticText),
|
|
user_config=getattr(getattr(self, "agent", None), "_notification_config", None))
|
|
|
|
def _on_notice(self, notice) -> None:
|
|
"""Queue an out-of-band AgentNotice for rendering at the next clean boundary.
|
|
|
|
Notices fire mid-turn (cold-start seed, per-turn _capture_credits); printing immediately
|
|
races the stream and buries the line behind the prompt. Flushed by _flush_credit_notices()
|
|
after run_conversation returns. Fail-soft.
|
|
"""
|
|
try:
|
|
text = getattr(notice, "text", "") or ""
|
|
if getattr(getattr(self, "agent", None), "_mute_notification_reply", False):
|
|
return
|
|
if not text:
|
|
return
|
|
level = getattr(notice, "level", "info") or "info"
|
|
from gateway.warning_notifications import is_diagnostic_notice, render_notification
|
|
def queue_notice():
|
|
if not hasattr(self, "_pending_credit_notices"):
|
|
self._pending_credit_notices = []
|
|
self._pending_credit_notices.append((level, text))
|
|
render_notification(queue_notice, platform="cli", diagnostic=is_diagnostic_notice(notice),
|
|
user_config=getattr(getattr(self, "agent", None), "_notification_config", None))
|
|
except Exception:
|
|
pass
|
|
|
|
def _flush_credit_notices(self) -> None:
|
|
"""Print queued credit notices as level-colored lines at turn end (after
|
|
run_conversation) where _cprint paints cleanly above the prompt."""
|
|
from cli import _DIM, _RST, _cprint
|
|
try:
|
|
pending = getattr(self, "_pending_credit_notices", None)
|
|
if not pending:
|
|
return
|
|
self._pending_credit_notices = []
|
|
colors = {"error": "\033[31m", "warn": "\033[33m", "success": "\033[32m", "info": _DIM}
|
|
for level, text in pending:
|
|
_cprint(f" {colors.get(level, _DIM)}{text}{_RST}")
|
|
except Exception:
|
|
pass
|
|
|
|
def _on_notice_clear(self, key: str) -> None:
|
|
"""No-op for the REPL (lines are printed, no persistent slot to wipe); kept so the
|
|
agent's clear callback is bound symmetrically with the show callback."""
|
|
return
|
|
|
|
def _current_reasoning_callback(self):
|
|
"""Return the active reasoning display callback for the current mode."""
|
|
if self.show_reasoning and self.streaming_enabled:
|
|
return self._stream_reasoning_delta
|
|
if self.verbose and not self.show_reasoning:
|
|
return self._on_reasoning
|
|
return None
|
|
|
|
def _emit_reasoning_preview(self, reasoning_text: str) -> None:
|
|
"""Render a buffered reasoning preview as a single [thinking] block."""
|
|
from cli import _DIM, _RST, _cprint
|
|
preview_text = reasoning_text.strip()
|
|
if not preview_text:
|
|
return
|
|
wrap_width = max(30, _terminal_columns() - len(_thinking_prefix()) - 2)
|
|
paragraphs = []
|
|
for paragraph in re.split(r"\n\s*\n+", preview_text.replace("\r\n", "\n")):
|
|
compact = " ".join(line.strip() for line in paragraph.splitlines() if line.strip())
|
|
if compact:
|
|
paragraphs.append(textwrap.fill(compact, width=wrap_width))
|
|
preview_text = "\n".join(paragraphs)
|
|
if not preview_text:
|
|
return
|
|
if self.verbose:
|
|
_cprint(f"{_DIM}{_thinking_prefix()}{preview_text}{_RST}")
|
|
return
|
|
lines = preview_text.splitlines()
|
|
if len(lines) > 5:
|
|
preview = "\n".join(lines[:5]) + f"\n {t('cli.stream.thinking_more_lines', count=len(lines) - 5)}"
|
|
else:
|
|
preview = preview_text
|
|
_cprint(f"{_DIM}{_thinking_prefix()}{preview}{_RST}")
|
|
|
|
def _flush_reasoning_preview(self, *, force: bool = False) -> None:
|
|
"""Flush buffered reasoning text at natural boundaries.
|
|
|
|
Some providers stream reasoning in tiny word/punctuation chunks; buffering keeps the
|
|
preview path from printing one `[thinking]` line per token.
|
|
"""
|
|
buf = getattr(self, "_reasoning_preview_buf", "")
|
|
if not buf:
|
|
return
|
|
target_width = max(40, _terminal_columns() - len(_thinking_prefix()) - 4)
|
|
flush_text = ""
|
|
if force:
|
|
flush_text, buf = buf, ""
|
|
else:
|
|
line_break = buf.rfind("\n")
|
|
min_newline_flush = max(16, target_width // 3)
|
|
if line_break != -1 and (
|
|
line_break >= min_newline_flush
|
|
or buf.endswith(("\n\n", ".\n", "!\n", "?\n", ":\n"))):
|
|
flush_text, buf = buf[: line_break + 1], buf[line_break + 1 :]
|
|
elif len(buf) >= target_width:
|
|
search_start = max(20, target_width // 2)
|
|
search_end = min(
|
|
len(buf), max(target_width + (target_width // 3), target_width + 8))
|
|
cut = max(
|
|
buf.rfind(b, search_start, search_end)
|
|
for b in (" ", "\t", ".", "!", "?", ",", ";", ":"))
|
|
if cut != -1:
|
|
flush_text, buf = buf[: cut + 1], buf[cut + 1 :]
|
|
|
|
self._reasoning_preview_buf = buf.lstrip() if flush_text else buf
|
|
if flush_text:
|
|
self._emit_reasoning_preview(flush_text)
|
|
|
|
def _format_submitted_user_message_preview(self, user_input: str) -> str:
|
|
"""Format the submitted user-message scrollback preview."""
|
|
from cli import _accent_hex, datetime
|
|
ts_suffix = (
|
|
f" [dim]{datetime.now().strftime(getattr(self, 'timestamp_format', '%H:%M'))}[/]"
|
|
if getattr(self, "show_timestamps", False) else "")
|
|
lines = user_input.split("\n")
|
|
if len(lines) <= 1:
|
|
return f"[bold {_accent_hex()}]●[/] [bold]{_escape(user_input)}[/]{ts_suffix}"
|
|
|
|
first_lines = max(1, int(getattr(self, "user_message_preview_first_lines", 2)))
|
|
last_lines = max(0, int(getattr(self, "user_message_preview_last_lines", 2)))
|
|
head = lines[:first_lines]
|
|
tail_count = min(last_lines, max(0, len(lines) - len(head)))
|
|
tail = lines[-tail_count:] if tail_count else []
|
|
hidden_middle_count = len(lines) - len(head) - len(tail)
|
|
if hidden_middle_count < 0:
|
|
hidden_middle_count = 0
|
|
tail = []
|
|
|
|
preview_lines = [f"[bold {_accent_hex()}]●[/] [bold]{_escape(head[0])}[/]{ts_suffix}"]
|
|
preview_lines.extend(f"[bold]{_escape(line)}[/]" for line in head[1:])
|
|
if hidden_middle_count > 0:
|
|
key = "cli.stream.preview_more_lines_one" if hidden_middle_count == 1 else "cli.stream.preview_more_lines_other"
|
|
preview_lines.append(f"[dim]{_escape(t(key, count=hidden_middle_count))}[/]")
|
|
preview_lines.extend(f"[bold]{_escape(line)}[/]" for line in tail)
|
|
return "\n".join(preview_lines)
|
|
|
|
def _expand_paste_references(self, text: str | None) -> str:
|
|
"""Expand [Pasted text #N -> file] placeholders into file contents."""
|
|
from cli import logger
|
|
if not isinstance(text, str) or "[Pasted text #" not in text:
|
|
return text or ""
|
|
paste_ref_re = re.compile(r'\[Pasted text #\d+: \d+ lines \u2192 (.+?)\]')
|
|
|
|
def _expand_ref(match):
|
|
path = Path(match.group(1))
|
|
# try/except rather than path.exists(): the paste file may be deleted between
|
|
# check and read (TOCTOU), silently dropping the input.
|
|
try:
|
|
# See #17666.
|
|
return path.read_text(encoding="utf-8-sig")
|
|
except (OSError, IOError):
|
|
logger.warning("Paste file gone or unreadable, returning placeholder: %s", path)
|
|
return match.group(0)
|
|
|
|
return paste_ref_re.sub(_expand_ref, text)
|
|
|
|
def _print_user_message_preview(self, user_input: str) -> None:
|
|
"""Render a user message using the normal chat scrollback style."""
|
|
from cli import ChatConsole, _accent_hex
|
|
from tools.process_registry_notifications import TimelineNotification
|
|
if isinstance(user_input, TimelineNotification):
|
|
from gateway.warning_notifications import render_notification
|
|
render_notification(lambda: ChatConsole().print(f"[dim]◈ {_escape(user_input.display_text)}[/dim]"),
|
|
platform="cli", diagnostic=user_input.notification_category == "diagnostic")
|
|
return
|
|
ChatConsole().print(f"[{_accent_hex()}]{'─' * 40}[/]")
|
|
text = str(user_input or "")
|
|
if "\n" in text:
|
|
ChatConsole().print(self._format_submitted_user_message_preview(text))
|
|
else:
|
|
ChatConsole().print(f"[bold {_accent_hex()}]●[/] [bold]{_escape(text)}[/]")
|
|
|
|
def _stream_reasoning_delta(self, text: str) -> None:
|
|
"""Stream reasoning tokens into a dim box above the response.
|
|
|
|
Opened on the first token, closed when content arrives (_emit_stream_text). Once the
|
|
response box is open further reasoning is suppressed — a late thinking block (e.g. after
|
|
an interrupt) would otherwise draw a reasoning box inside the response box.
|
|
"""
|
|
from cli import _DIM, _RST, _cprint
|
|
if not text:
|
|
return
|
|
self._reasoning_shown_this_turn = True
|
|
if getattr(self, "_stream_box_opened", False):
|
|
return
|
|
if not getattr(self, "_reasoning_box_opened", False):
|
|
self._reasoning_box_opened = True
|
|
w = self._scrollback_box_width()
|
|
r_label = f" {t('cli.chat.reasoning_label')} "
|
|
r_fill = w - 2 - len(r_label)
|
|
_cprint(f"\n{_DIM}┌─{r_label}{'─' * max(r_fill - 1, 0)}┐{_RST}")
|
|
|
|
self._reasoning_buf = getattr(self, "_reasoning_buf", "") + text
|
|
# Emit complete lines; force-flush long partial lines so reasoning is visible in
|
|
# real-time even without newlines.
|
|
while "\n" in self._reasoning_buf:
|
|
line, self._reasoning_buf = self._reasoning_buf.split("\n", 1)
|
|
_cprint(f"{_DIM}{line}{_RST}")
|
|
if len(self._reasoning_buf) > 80:
|
|
_cprint(f"{_DIM}{self._reasoning_buf}{_RST}")
|
|
self._reasoning_buf = ""
|
|
|
|
def _agent_status_print(self, *args, **kwargs) -> None:
|
|
"""``agent._print_fn`` for the interactive CLI: agent status lines (subagent completion ``✓ [set n · i/N]``,
|
|
background-process notices, spinner ``print_above`` text) arrive from other threads at any moment. While
|
|
a response or reasoning box is being streamed they are HELD and released at the box footer, so a line
|
|
never lands between two paragraphs of the reply. Outside a box they print immediately."""
|
|
from cli import _cprint
|
|
text = kwargs.get("sep", " ").join(str(a) for a in args)
|
|
if getattr(self, "_stream_box_live", False) or getattr(self, "_reasoning_box_opened", False):
|
|
self._held_status_lines = getattr(self, "_held_status_lines", []) + [text]
|
|
return
|
|
_cprint(text)
|
|
|
|
def _release_held_status_lines(self) -> None:
|
|
"""Print status lines held while a box was open (called right after a box footer)."""
|
|
from cli import _cprint
|
|
held, self._held_status_lines = getattr(self, "_held_status_lines", []), []
|
|
for line in held:
|
|
_cprint(line)
|
|
|
|
def _close_reasoning_box(self) -> None:
|
|
"""Close the live reasoning box if it's open (renders the buffered reasoning tail)."""
|
|
from cli import _DIM, _RST, _cprint
|
|
if not getattr(self, "_reasoning_box_opened", False):
|
|
return
|
|
buf = getattr(self, "_reasoning_buf", "")
|
|
if buf:
|
|
_cprint(f"{_DIM}{buf}{_RST}")
|
|
self._reasoning_buf = ""
|
|
w = self._scrollback_box_width()
|
|
_cprint(f"{_DIM}└{'─' * (w - 2)}┘{_RST}")
|
|
self._reasoning_box_opened = False
|
|
if not getattr(self, "_stream_box_live", False):
|
|
self._release_held_status_lines()
|
|
|
|
def _stream_delta(self, text) -> None:
|
|
"""Line-buffered streaming callback for real-time token rendering.
|
|
|
|
Emits complete lines via _cprint (reliable under prompt_toolkit's patch_stdout);
|
|
reasoning tags are suppressed, or routed to the reasoning box when show_reasoning is on.
|
|
``None`` = intermediate turn boundary (tools about to run): flush boxes and reset state.
|
|
"""
|
|
if text is None:
|
|
self._flush_stream()
|
|
self._reset_stream_state()
|
|
return
|
|
if not text:
|
|
return
|
|
self._stream_started = True
|
|
self._stream_prefilt = getattr(self, "_stream_prefilt", "") + text
|
|
|
|
# Open tags only count at a "block boundary" (stream start / after a newline plus
|
|
# optional whitespace) so prose that *mentions* a tag — "(/think not producing
|
|
# <think> tags)" — is not swallowed. _stream_last_was_newline tracks the boundary.
|
|
if not hasattr(self, "_stream_last_was_newline"):
|
|
self._stream_last_was_newline = True
|
|
|
|
if not getattr(self, "_in_reasoning_block", False):
|
|
# Lowercased view catches mixed-case variants (<Think>, <THINKING>, …).
|
|
prefilt_lower = self._stream_prefilt.lower()
|
|
for tag in _OPEN_TAGS:
|
|
tag_lower = tag.lower()
|
|
search_start = 0
|
|
while True:
|
|
idx = prefilt_lower.find(tag_lower, search_start)
|
|
if idx == -1:
|
|
break
|
|
preceding = self._stream_prefilt[:idx]
|
|
# Boundary: only whitespace since the last newline — or, with no newline
|
|
# buffered yet, since the last emit (which must have ended a line).
|
|
is_block_boundary = preceding[preceding.rfind("\n") + 1:].strip() == "" and (
|
|
"\n" in preceding or getattr(self, "_stream_last_was_newline", True))
|
|
if is_block_boundary:
|
|
if preceding:
|
|
self._emit_stream_text(preceding)
|
|
self._stream_last_was_newline = preceding.endswith("\n")
|
|
self._in_reasoning_block = True
|
|
self._stream_prefilt = self._stream_prefilt[idx + len(tag):]
|
|
break
|
|
search_start = idx + 1
|
|
if getattr(self, "_in_reasoning_block", False):
|
|
break
|
|
|
|
if not getattr(self, "_in_reasoning_block", False):
|
|
# Hold back a possible partial open tag at the end (case-insensitive).
|
|
safe = self._stream_prefilt
|
|
for tag in _OPEN_TAGS:
|
|
tag_lower = tag.lower()
|
|
for i in range(1, len(tag)):
|
|
if prefilt_lower.endswith(tag_lower[:i]):
|
|
safe = self._stream_prefilt[:-i]
|
|
break
|
|
if safe:
|
|
self._emit_stream_text(safe)
|
|
self._stream_last_was_newline = safe.endswith("\n")
|
|
self._stream_prefilt = self._stream_prefilt[len(safe):]
|
|
return
|
|
|
|
# Inside a reasoning block — look for a close tag; keep accumulating because close tags
|
|
# can arrive split across tokens ("</REASONING_SCRATCH" + "PAD>...").
|
|
if getattr(self, "_in_reasoning_block", False):
|
|
prefilt_lower = self._stream_prefilt.lower()
|
|
for tag in _CLOSE_TAGS:
|
|
idx = prefilt_lower.find(tag.lower())
|
|
if idx != -1:
|
|
self._in_reasoning_block = False
|
|
if self.show_reasoning:
|
|
inner = self._stream_prefilt[:idx]
|
|
if inner:
|
|
self._stream_reasoning_delta(inner)
|
|
after = self._stream_prefilt[idx + len(tag):]
|
|
self._stream_prefilt = ""
|
|
if after: # re-filter: the remainder could contain another open tag
|
|
self._stream_delta(after)
|
|
return
|
|
# Stream reasoning live when show_reasoning is on; keep only a possible partial
|
|
# close-tag tail.
|
|
if len(self._stream_prefilt) > _MAX_CLOSE_TAG_LEN:
|
|
if self.show_reasoning:
|
|
self._stream_reasoning_delta(self._stream_prefilt[:-_MAX_CLOSE_TAG_LEN])
|
|
self._stream_prefilt = self._stream_prefilt[-_MAX_CLOSE_TAG_LEN:]
|
|
return
|
|
|
|
def _emit_stream_line(self, printed_line: str) -> None:
|
|
"""Print one response line with the skin's true-color text escape (if any)."""
|
|
from cli import _RST, _STREAM_PAD, _cprint
|
|
_tc = getattr(self, "_stream_text_ansi", "")
|
|
_cprint(
|
|
f"{_STREAM_PAD}{_tc}{printed_line}{_RST}" if _tc else f"{_STREAM_PAD}{printed_line}")
|
|
|
|
def _flush_stream_table_buf(self) -> None:
|
|
"""Emit the held table block re-aligned as a whole. Cell-level markdown is stripped FIRST
|
|
so the realigner pads to the final visible width, not the marker-decorated width."""
|
|
from cli import (
|
|
_strip_markdown_syntax, _terminal_width_for_streaming, realign_markdown_tables)
|
|
buf = self._stream_table_buf
|
|
self._stream_table_buf = []
|
|
self._in_stream_table = False
|
|
if not buf:
|
|
return
|
|
joined = "\n".join(buf)
|
|
if self.final_response_markdown == "strip":
|
|
joined = _strip_markdown_syntax(joined)
|
|
block = realign_markdown_tables(joined, _terminal_width_for_streaming())
|
|
for ln in block.split("\n"):
|
|
self._emit_stream_line(ln)
|
|
|
|
def _emit_stream_text(self, text: str) -> None:
|
|
"""Emit filtered text to the streaming display."""
|
|
from agent.markdown_tables import is_table_divider, looks_like_table_row
|
|
from cli import (
|
|
HermesCLI, _ACCENT, _RST, _STREAM_PARTIAL_PREVIEW_LEN, _cprint, _strip_markdown_syntax, datetime)
|
|
if not text:
|
|
return
|
|
# Close a still-open reasoning box on the first content token so the answer streams
|
|
# token-by-token; _close_reasoning_box renders the reasoning tail first, so ordering holds.
|
|
self._close_reasoning_box()
|
|
|
|
# Open the response box header on the very first visible text
|
|
if not self._stream_box_opened:
|
|
text = text.lstrip("\n")
|
|
if not text:
|
|
return
|
|
self._stream_box_opened = True
|
|
self._stream_box_live = True # header drawn; cleared at the footer
|
|
try:
|
|
from hermes_cli.skin_engine import get_active_skin
|
|
_skin = get_active_skin()
|
|
label = _skin.get_branding("response_label", "☤ Hermes")
|
|
_text_hex = _skin.get_color("banner_text", "#FFF8DC")
|
|
except Exception:
|
|
label = "☤ Hermes"
|
|
_text_hex = "#FFF8DC"
|
|
try: # true-color escape so streamed text matches the Rich Panel appearance
|
|
_r, _g, _b = (int(_text_hex[i:i + 2], 16) for i in (1, 3, 5))
|
|
self._stream_text_ansi = f"\033[38;2;{_r};{_g};{_b}m"
|
|
except (ValueError, IndexError):
|
|
self._stream_text_ansi = ""
|
|
if self.show_timestamps:
|
|
label = f"{label} {datetime.now().strftime(getattr(self, 'timestamp_format', '%H:%M'))}"
|
|
w = self._scrollback_box_width()
|
|
fill = w - 2 - HermesCLI._status_bar_display_width(label)
|
|
_cprint(f"\n{_ACCENT}╭─{label}{'─' * max(fill - 1, 0)}╮{_RST}")
|
|
|
|
# Turn-level record of what actually reached the screen; survives _reset_stream_state at
|
|
# tool-call boundaries so an interrupted reply isn't re-rendered as a Panel (#65666).
|
|
self._streamed_text_this_turn = getattr(self, "_streamed_text_this_turn", "") + text
|
|
self._stream_buf += text
|
|
while "\n" in self._stream_buf:
|
|
line, self._stream_buf = self._stream_buf.split("\n", 1)
|
|
# Table rows are held and re-padded as a block once it ends (already-printed rows
|
|
# can't be re-aligned), so a table appears in one batch when the block closes.
|
|
if self._in_stream_table:
|
|
if looks_like_table_row(line) or is_table_divider(line):
|
|
self._stream_table_buf.append(line)
|
|
continue
|
|
self._flush_stream_table_buf()
|
|
elif looks_like_table_row(line):
|
|
self._stream_table_buf.append(line)
|
|
self._in_stream_table = True
|
|
continue
|
|
if self.final_response_markdown == "strip":
|
|
line = _strip_markdown_syntax(line)
|
|
self._emit_stream_line(line)
|
|
|
|
# Partial lines are emitted ONLY at real newlines (no hard-wrapping — the terminal
|
|
# soft-wraps, so highlight-copy yields the original text). For TTFT perception, mirror
|
|
# the tail of a long unfinished paragraph into the status-bar spinner.
|
|
if (
|
|
self._stream_buf
|
|
and not self._in_stream_table
|
|
and not self._stream_buf.lstrip().startswith("|")
|
|
and len(self._stream_buf) >= 80):
|
|
preview = self._stream_buf[-int(_STREAM_PARTIAL_PREVIEW_LEN):]
|
|
cut = preview.find(" ")
|
|
if 0 < cut < len(preview) - 1:
|
|
preview = preview[cut + 1:]
|
|
try:
|
|
self._spinner_text = f"… {preview}"
|
|
self._invalidate()
|
|
except Exception:
|
|
pass
|
|
|
|
def _flush_stream(self) -> None:
|
|
"""Emit any remaining partial line from the stream buffer and close the box."""
|
|
from agent.markdown_tables import is_table_divider, looks_like_table_row
|
|
from cli import _ACCENT, _RST, _cprint, _strip_markdown_syntax
|
|
# Still inside a "reasoning block" at end-of-stream = false positive (the model
|
|
# mentioned a tag in prose and never closed it): recover the buffer as regular text.
|
|
if getattr(self, "_in_reasoning_block", False) and getattr(self, "_stream_prefilt", ""):
|
|
self._in_reasoning_block = False
|
|
self._emit_stream_text(self._stream_prefilt)
|
|
self._stream_prefilt = ""
|
|
self._close_reasoning_box() # in case no content tokens arrived
|
|
# A trailing partial table row joins the table buffer so the whole block is re-aligned
|
|
# together (else the final row prints under-padded).
|
|
if (
|
|
self._stream_buf
|
|
and getattr(self, "_in_stream_table", False)
|
|
and (looks_like_table_row(self._stream_buf) or is_table_divider(self._stream_buf))):
|
|
self._stream_table_buf.append(self._stream_buf)
|
|
self._stream_buf = ""
|
|
if getattr(self, "_stream_table_buf", None):
|
|
self._flush_stream_table_buf()
|
|
if self._stream_buf:
|
|
line = _strip_markdown_syntax(self._stream_buf) if self.final_response_markdown == "strip" else self._stream_buf
|
|
self._emit_stream_line(line)
|
|
self._stream_buf = ""
|
|
if self._stream_box_opened and getattr(self, "_stream_box_live", False):
|
|
w = self._scrollback_box_width()
|
|
_cprint(f"{_ACCENT}╰{'─' * (w - 2)}╯{_RST}")
|
|
self._stream_box_live = False
|
|
self._release_held_status_lines()
|
|
|
|
def _reset_stream_state(self) -> None:
|
|
"""Reset streaming state before each agent invocation."""
|
|
self._stream_buf = ""
|
|
self._stream_started = False
|
|
self._stream_box_opened = False
|
|
self._stream_text_ansi = ""
|
|
self._stream_prefilt = ""
|
|
self._in_reasoning_block = False
|
|
self._stream_last_was_newline = True
|
|
self._reasoning_box_opened = False
|
|
self._reasoning_buf = ""
|
|
self._reasoning_preview_buf = ""
|
|
# A batch cancelled/errored before any tool.started would otherwise mute the next turn's line.
|
|
self.__dict__.pop("_tool_gen_announced", None)
|
|
self._stream_table_buf = []
|
|
self._in_stream_table = False
|
|
self._stream_box_live = False
|
|
|
|
def _slow_command_status(self, command: str) -> str:
|
|
"""Return a user-facing status message for slower slash commands."""
|
|
cmd_lower = command.lower().strip()
|
|
exact = _SLOW_COMMAND_STATUS_EXACT.get(cmd_lower)
|
|
if exact:
|
|
return t(exact)
|
|
for prefix, key in _SLOW_COMMAND_STATUS:
|
|
if cmd_lower.startswith(prefix):
|
|
return t(key)
|
|
return t("cli.stream.processing_command")
|
|
|
|
def _command_spinner_frame(self) -> str:
|
|
"""Return the current spinner frame for slow slash commands."""
|
|
from cli import _COMMAND_SPINNER_FRAMES
|
|
return _COMMAND_SPINNER_FRAMES[int(time.monotonic() * 10) % len(_COMMAND_SPINNER_FRAMES)]
|
|
|
|
@contextmanager
|
|
def _busy_command(self, status: str, *, blocks_input: bool = True):
|
|
"""Expose a temporary busy state in the TUI while a slash command runs.
|
|
|
|
Most sync slash commands reserve the composer (their completion changes session state);
|
|
manual compression is safe to draft through (queued input runs against compacted history).
|
|
"""
|
|
from cli import _cprint
|
|
previous_blocks_input = getattr(self, "_command_blocks_input", False)
|
|
self._command_running = True
|
|
self._command_blocks_input = blocks_input
|
|
self._command_status = status
|
|
self._invalidate(min_interval=0.0)
|
|
try:
|
|
_cprint(f"⏳ {status}")
|
|
yield
|
|
finally:
|
|
self._command_running = False
|
|
self._command_blocks_input = previous_blocks_input
|
|
self._command_status = ""
|
|
self._invalidate(min_interval=0.0)
|
|
|
|
def _preprocess_images_with_vision(self, text: str, images: list, *, announce: bool = True) -> str:
|
|
"""Describe attached images via the auxiliary vision model and prepend the descriptions
|
|
to the user's text (works with non-vision models; same approach as the gateway). The
|
|
local path is included so the agent can re-examine via ``vision_analyze``."""
|
|
from cli import _DIM, _RST, _cprint
|
|
import asyncio as _asyncio
|
|
from gateway.warning_notifications import render_notification
|
|
from tools.vision_tools import vision_analyze_tool
|
|
analysis_prompt = (
|
|
"Describe everything visible in this image in thorough detail. "
|
|
"Include any text, code, data, objects, people, layout, colors, "
|
|
"and any other notable visual information.")
|
|
enriched_parts = []
|
|
for img_path in images:
|
|
if not img_path.exists():
|
|
continue
|
|
size_kb = img_path.stat().st_size // 1024
|
|
if announce:
|
|
_cprint(f" {_DIM}{t('cli.stream.vision_analyzing', name=img_path.name, size_kb=size_kb)}{_RST}")
|
|
try:
|
|
result_json = _asyncio.run(
|
|
vision_analyze_tool(image_url=str(img_path), user_prompt=analysis_prompt))
|
|
result = json.loads(result_json)
|
|
if result.get("success"):
|
|
description = result.get("analysis", "")
|
|
enriched_parts.append(
|
|
f"[The user attached an image. Here's what it contains:\n{description}]\n"
|
|
f"[If you need a closer look, use vision_analyze with "
|
|
f"image_url: {img_path}]")
|
|
if announce:
|
|
_cprint(f" {_DIM}{t('cli.stream.vision_analyzed')}{_RST}")
|
|
else:
|
|
enriched_parts.append(
|
|
f"[The user attached an image but it couldn't be analyzed. "
|
|
f"You can try examining it with vision_analyze using "
|
|
f"image_url: {img_path}]")
|
|
if announce:
|
|
render_notification(lambda: _cprint(f" {_DIM}{t('cli.stream.vision_failed')}{_RST}"),
|
|
platform="cli", user_config=getattr(getattr(self, "agent", None), "_notification_config", None))
|
|
except Exception as e:
|
|
enriched_parts.append(
|
|
f"[The user attached an image but analysis failed ({e}). "
|
|
f"You can try examining it with vision_analyze using "
|
|
f"image_url: {img_path}]")
|
|
if announce:
|
|
render_notification(lambda: _cprint(f" {_DIM}{t('cli.stream.vision_error')}{_RST}"),
|
|
platform="cli", user_config=getattr(getattr(self, "agent", None), "_notification_config", None))
|
|
|
|
# Vision descriptions first, then the user's original text
|
|
user_text = text if isinstance(text, str) and text else ""
|
|
if enriched_parts:
|
|
prefix = "\n\n".join(enriched_parts)
|
|
return f"{prefix}\n\n{user_text}" if user_text else prefix
|
|
return user_text or "What do you see in this image?"
|
|
|
|
def _console_print(self, *args, **kwargs):
|
|
"""Print through the active command-safe console (prompt_toolkit-safe Rich once the
|
|
TUI is live, else the plain console)."""
|
|
from cli import ChatConsole
|
|
console = ChatConsole() if getattr(self, "_app", None) else self.console
|
|
console.print(*args, **kwargs)
|
|
|
|
def _on_tool_gen_start(self, tool_name: str) -> None:
|
|
"""Model began generating tool-call arguments: close open boxes once, then print a status
|
|
line so a large payload (e.g. 45 KB write_file) doesn't look like a frozen screen.
|
|
|
|
Fires once per tool CALL, so a batch of parallel calls to the same tool printed the same
|
|
line N times (#10478); repeats within one generation batch are coalesced. The set is
|
|
cleared when a tool actually starts (``tool.started``), i.e. on the next batch."""
|
|
from cli import _cprint
|
|
if getattr(self, '_stream_box_opened', False):
|
|
self._flush_stream()
|
|
self._stream_box_opened = False
|
|
self._close_reasoning_box()
|
|
announced = self.__dict__.setdefault("_tool_gen_announced", set())
|
|
if tool_name in announced:
|
|
return
|
|
announced.add(tool_name)
|
|
from agent.display import bridge_generating_phrase, get_tool_emoji
|
|
what = bridge_generating_phrase(tool_name) or tool_name
|
|
_cprint(f" ┊ {t('cli.stream.tool_preparing', emoji=get_tool_emoji(tool_name, default='⚡'), what=what)}")
|
|
|
|
def _on_tool_progress(self, event_type: str, function_name: str = None, preview: str = None, function_args: dict = None, **kwargs):
|
|
"""Tool lifecycle events (tool.started / tool.completed / reasoning.* / moa.*).
|
|
|
|
Drives the TUI spinner (tool.started stamps the elapsed timer); in "all"/"new"/"verbose"
|
|
progress modes tool.completed also commits a stacked scrollback line (tool history).
|
|
"""
|
|
from cli import CLI_CONFIG, _DIM, _RST, _cprint, _hermes_home
|
|
# MoA reference outputs (display-only events from the MoA facade): render each answer
|
|
# as a labelled thinking-style block BEFORE the aggregator acts.
|
|
if event_type == "moa.reference":
|
|
label = function_name or t("cli.stream.reference_noun")
|
|
text = preview or ""
|
|
idx = kwargs.get("moa_index")
|
|
count = kwargs.get("moa_count")
|
|
header = (t("cli.stream.reference_header_indexed", index=idx, count=count, label=label) if idx and count
|
|
else t("cli.stream.reference_header", label=label))
|
|
try:
|
|
self._flush_reasoning_preview(force=True)
|
|
except Exception:
|
|
pass
|
|
_cprint(f" {_DIM}┊ ◇ {header}{_RST}")
|
|
try:
|
|
self._emit_reasoning_preview(text)
|
|
except Exception:
|
|
if text.strip():
|
|
_cprint(f" {_DIM}{text.strip()}{_RST}")
|
|
self._invalidate()
|
|
return
|
|
if event_type == "moa.aggregating":
|
|
agg = function_name or ""
|
|
self._spinner_text = t("cli.stream.aggregating_detail", detail=agg) if agg else t("cli.stream.aggregating")
|
|
self._invalidate()
|
|
return
|
|
|
|
# Feed the pet: tools mean "running"; a failed tool latches the turn to end on a sulk.
|
|
if event_type == "tool.started":
|
|
self._pet_reasoning = False
|
|
self.__dict__.pop("_tool_gen_announced", None)
|
|
elif event_type == "tool.completed" and kwargs.get("is_error"):
|
|
self._pet_turn_error = True
|
|
elif event_type and event_type.startswith("reasoning"):
|
|
self._pet_reasoning = True
|
|
|
|
if event_type == "tool.completed":
|
|
self._tool_start_time = 0.0
|
|
self._turn_summary_record(
|
|
function_name, kwargs.get("result"), kwargs.get("is_error", False))
|
|
# Focus view: count the hidden scrollback line for the post-turn recovery report.
|
|
if getattr(self, "_focus_view_enabled", False):
|
|
try:
|
|
self._note_focus_hidden_line(function_name or "")
|
|
except Exception:
|
|
pass
|
|
# "verbose" must commit the same line as "all": non-streaming calls (MoA aggregator,
|
|
# copilot-acp) never emit the "preparing" line, so nothing else builds history.
|
|
if function_name and self.tool_progress_mode in {"new", "all", "verbose"}:
|
|
duration = kwargs.get("duration", 0.0)
|
|
# Pop stored args from tool.started for this function
|
|
stored = self._pending_tool_info.get(function_name)
|
|
stored_args = stored.pop(0) if stored else {}
|
|
if stored is not None and not stored:
|
|
del self._pending_tool_info[function_name]
|
|
# "new" mode: skip consecutive repeats of the same tool
|
|
if self.tool_progress_mode == "new" and function_name == self._last_scrollback_tool:
|
|
self._invalidate()
|
|
return
|
|
self._last_scrollback_tool = function_name
|
|
try:
|
|
from agent.display import get_cute_tool_message
|
|
line = get_cute_tool_message(function_name, stored_args, duration, result=kwargs.get("result"))
|
|
_cprint(f" {line}")
|
|
except Exception:
|
|
pass
|
|
# One-time /verbose hint on the first long tool in the noisiest mode; latched
|
|
# on self and persisted to config.yaml.
|
|
try:
|
|
if (
|
|
not getattr(self, "_long_tool_hint_fired", False)
|
|
and self.tool_progress_mode == "all"
|
|
and duration >= 30.0):
|
|
from agent.onboarding import (
|
|
TOOL_PROGRESS_FLAG, is_seen, mark_seen, tool_progress_hint_cli)
|
|
if not is_seen(CLI_CONFIG, TOOL_PROGRESS_FLAG):
|
|
self._long_tool_hint_fired = True
|
|
_cprint(f" {_DIM}{tool_progress_hint_cli()}{_RST}")
|
|
mark_seen(_hermes_home / "config.yaml", TOOL_PROGRESS_FLAG)
|
|
CLI_CONFIG.setdefault("onboarding", {}).setdefault("seen", {})[TOOL_PROGRESS_FLAG] = True
|
|
except Exception:
|
|
pass
|
|
self._invalidate()
|
|
return
|
|
if event_type != "tool.started":
|
|
return
|
|
if function_name and not function_name.startswith("_"):
|
|
from agent.display import get_tool_preview_max_len, tool_row_emoji
|
|
label = preview or function_name
|
|
_pl = get_tool_preview_max_len()
|
|
if _pl > 0 and len(label) > _pl:
|
|
label = label[:_pl - 3] + "..."
|
|
self._spinner_text = f"{tool_row_emoji(function_name, function_args)} {label}"
|
|
self._tool_start_time = time.monotonic()
|
|
# Store args for stacked scrollback line on completion
|
|
self._pending_tool_info.setdefault(function_name, []).append(
|
|
function_args if function_args is not None else {})
|
|
self._invalidate()
|
|
|
|
def _on_tool_start(self, tool_call_id: str, function_name: str, function_args: dict):
|
|
"""Capture local before-state for write-capable tools."""
|
|
from cli import logger
|
|
try:
|
|
from agent.display import capture_local_edit_snapshot
|
|
snapshot = capture_local_edit_snapshot(function_name, function_args)
|
|
if snapshot is not None:
|
|
self._pending_edit_snapshots[tool_call_id] = snapshot
|
|
except Exception:
|
|
logger.debug("Edit snapshot capture failed for %s", function_name, exc_info=True)
|
|
|
|
def _on_tool_complete(self, tool_call_id: str, function_name: str, function_args: dict, function_result: str):
|
|
"""Render file edits with inline diff after write-capable tools complete."""
|
|
from cli import _cprint, logger
|
|
# A background delegate_task re-enters as a fresh turn when done; say so once so the
|
|
# idle prompt doesn't read as "nothing happened".
|
|
if function_name == "delegate_task":
|
|
try:
|
|
parsed = json.loads(function_result) if isinstance(function_result, str) else (function_result or {})
|
|
except Exception:
|
|
parsed = {}
|
|
if isinstance(parsed, dict) and parsed.get("status") == "dispatched" and parsed.get("mode") == "background":
|
|
n = parsed.get("count") or 1
|
|
key = "cli.stream.background_running_one" if n == 1 else "cli.stream.background_running_other"
|
|
try:
|
|
_cprint(f"\033[2m{t(key, count=n)}\033[0m")
|
|
except Exception:
|
|
pass
|
|
snapshot = self._pending_edit_snapshots.pop(tool_call_id, None)
|
|
try:
|
|
from agent.display import render_edit_diff_with_delta
|
|
render_edit_diff_with_delta(
|
|
function_name, function_result, function_args=function_args, snapshot=snapshot,
|
|
print_fn=_cprint)
|
|
except Exception:
|
|
logger.debug("Edit diff preview failed for %s", function_name, exc_info=True)
|