APEX/BrowserUse_and_ComputerUse_skills
5
0
Fork 0
Code Issues 6 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

fix: resolve merge conflict markers in cli.py breaking hermes startup (#2347)

Browse source 
fix: resolve merge conflict markers in cli.py breaking hermes startup
This commit is contained in:
Teknium 2026-03-21 10:34:40 -07:00 • committed by GitHub
commit 9be42e49f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cli.py
View file

@ -6044,7 +6044,18 @@ class HermesCLI:
"""Ctrl+Enter (c-j) inserts a newline. Most terminals send c-j for Ctrl+Enter.""" """Ctrl+Enter (c-j) inserts a newline. Most terminals send c-j for Ctrl+Enter."""
event.current_buffer.insert_text('\n') event.current_buffer.insert_text('\n')
<<<<<<< Updated upstream @kb.add('s-enter')
def handle_shift_enter(event):
"""Shift+Enter inserts a newline (standard terminals)."""
event.current_buffer.insert_text('\n')
# Kitty keyboard protocol: Ghostty and other Kitty-protocol terminals
# encode Shift+Enter as CSI 13;2u instead of a simple escape sequence.
@kb.add('escape', '[', '1', '3', ';', '2', 'u')
def handle_kitty_shift_enter(event):
"""Shift+Enter in Kitty keyboard protocol (Ghostty, WezTerm, etc.)."""
event.current_buffer.insert_text('\n')
@kb.add('tab', eager=True) @kb.add('tab', eager=True)
def handle_tab(event): def handle_tab(event):
"""Tab: accept completion, auto-suggestion, or start completions. """Tab: accept completion, auto-suggestion, or start completions.
@ -6081,19 +6092,6 @@ class HermesCLI:
else: else:
# No menu and no suggestion — start completions from scratch # No menu and no suggestion — start completions from scratch
buf.start_completion() buf.start_completion()
=======
@kb.add('s-enter')
def handle_shift_enter(event):
"""Shift+Enter inserts a newline (standard terminals)."""
event.current_buffer.insert_text('\n')
# Kitty keyboard protocol: Ghostty and other Kitty-protocol terminals
# encode Shift+Enter as CSI 13;2u instead of a simple escape sequence.
@kb.add('escape', '[', '1', '3', ';', '2', 'u')
def handle_kitty_shift_enter(event):
"""Shift+Enter in Kitty keyboard protocol (Ghostty, WezTerm, etc.)."""
event.current_buffer.insert_text('\n')
>>>>>>> Stashed changes
# --- Clarify tool: arrow-key navigation for multiple-choice questions --- # --- Clarify tool: arrow-key navigation for multiple-choice questions ---