mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-18 04:41:56 +00:00
70bc52e408
Native Windows, WSL, SSH sessions, and Windows Terminal all send Ctrl+Enter as bare LF (c-j). Hermes was binding c-j as submit on every POSIX platform, so Ctrl+Enter submitted instead of inserting a newline on those terminals. Reported in #22379. Add _preserve_ctrl_enter_newline() predicate that detects the environments where Ctrl+Enter must produce a newline (sys.platform == 'win32', SSH_CONNECTION/SSH_CLIENT/SSH_TTY env, WT_SESSION, WSL_DISTRO_NAME, /proc/version 'microsoft' marker). Gate the c-j-as-submit binding off in those environments and gate the c-j-as-newline handler on. Local POSIX TTYs without those markers (docker exec, plain ssh from a Mac) keep c-j as submit so plain Enter still works on thin PTYs. Add install_ctrl_enter_alias() in hermes_cli/pt_input_extras.py mapping the three CSI-u / modifyOtherKeys variants of Ctrl+Enter ('\x1b[13;5u', '\x1b[27;5;13~', '\x1b[27;5;13u') to the (Escape, ControlM) tuple Alt+Enter produces. This lets Kitty / mintty / xterm-with-modifyOtherKeys users over SSH get a Ctrl+Enter newline through the existing Alt+Enter handler. 9 new tests + extended existing test_lf_enter_binds_to_submit_handler_posix to cover bare-local vs SSH branches. Closes #22379.
83 lines
3.4 KiB
Python
83 lines
3.4 KiB
Python
"""Augmentations to prompt_toolkit's input-parsing tables.
|
|
|
|
Imported once at CLI startup. Each helper installs a small mapping into
|
|
prompt_toolkit's `ANSI_SEQUENCES` so byte sequences emitted by modern
|
|
keyboard protocols (Kitty / xterm `modifyOtherKeys`) decode to existing
|
|
key tuples Hermes already binds.
|
|
|
|
Kept in a standalone module — separate from `cli.py` — so the registrations
|
|
can be unit-tested without importing the whole CLI runtime.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
def install_shift_enter_alias() -> int:
|
|
"""Map Shift+Enter byte sequences to the (Escape, ControlM) key tuple
|
|
that Alt+Enter produces, so the existing Alt+Enter newline handler
|
|
fires for terminals that emit a distinct Shift+Enter.
|
|
|
|
Sequences mapped:
|
|
- "\\x1b[13;2u" — Kitty keyboard protocol / CSI-u, modifier=2 (Shift)
|
|
- "\\x1b[27;2;13~" — xterm modifyOtherKeys=2, modifier=2 (Shift)
|
|
- "\\x1b[27;2;13u" — alternate ordering some emitters use
|
|
|
|
The CSI-u sequence is not in stock prompt_toolkit. The modifyOtherKeys
|
|
variant `\\x1b[27;2;13~` IS in stock prompt_toolkit but mapped to plain
|
|
`Keys.ControlM` — i.e. Shift+Enter behaves identically to Enter, which
|
|
is the very bug this helper exists to fix. We therefore overwrite
|
|
those two specific keys (and `\\x1b[27;2;13u`) unconditionally; other
|
|
`\\x1b[27;...;13~` sequences (Ctrl+Enter, Alt+Enter via modifyOtherKeys
|
|
variants 5/6/etc.) are left untouched.
|
|
|
|
Default macOS Terminal and stock Windows Terminal still send the same
|
|
byte for Enter and Shift+Enter, so there is no fix for those terminals
|
|
at the application layer — the sequences above never reach Hermes.
|
|
|
|
Returns the number of sequences whose mapping was changed.
|
|
"""
|
|
try:
|
|
from prompt_toolkit.input.ansi_escape_sequences import ANSI_SEQUENCES
|
|
from prompt_toolkit.keys import Keys
|
|
except Exception:
|
|
return 0
|
|
|
|
alt_enter = (Keys.Escape, Keys.ControlM)
|
|
changed = 0
|
|
for seq in ("\x1b[13;2u", "\x1b[27;2;13~", "\x1b[27;2;13u"):
|
|
if ANSI_SEQUENCES.get(seq) != alt_enter:
|
|
ANSI_SEQUENCES[seq] = alt_enter
|
|
changed += 1
|
|
return changed
|
|
|
|
|
|
def install_ctrl_enter_alias() -> int:
|
|
"""Map Ctrl+Enter byte sequences to the (Escape, ControlM) key tuple
|
|
that Alt+Enter produces, so the existing Alt+Enter newline handler
|
|
fires for terminals that emit a distinct Ctrl+Enter.
|
|
|
|
Sequences mapped:
|
|
- "\\x1b[13;5u" — Kitty keyboard protocol / CSI-u, modifier=5 (Ctrl)
|
|
- "\\x1b[27;5;13~" — xterm modifyOtherKeys=2, modifier=5 (Ctrl)
|
|
- "\\x1b[27;5;13u" — alternate ordering some emitters use
|
|
|
|
Stock prompt_toolkit doesn't map any of these. Without this alias,
|
|
Kitty/mintty/xterm-with-modifyOtherKeys users over SSH never get a
|
|
Ctrl+Enter newline — the keystroke arrives as a raw CSI sequence that
|
|
falls through to the default character-insert handler. See #22379.
|
|
|
|
Returns the number of sequences whose mapping was changed.
|
|
"""
|
|
try:
|
|
from prompt_toolkit.input.ansi_escape_sequences import ANSI_SEQUENCES
|
|
from prompt_toolkit.keys import Keys
|
|
except Exception:
|
|
return 0
|
|
|
|
alt_enter = (Keys.Escape, Keys.ControlM)
|
|
changed = 0
|
|
for seq in ("\x1b[13;5u", "\x1b[27;5;13~", "\x1b[27;5;13u"):
|
|
if ANSI_SEQUENCES.get(seq) != alt_enter:
|
|
ANSI_SEQUENCES[seq] = alt_enter
|
|
changed += 1
|
|
return changed
|