Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); emrg: TUI — Option/Ctrl+←/→ move cursor by word (macOS CSI modifier sequences) (rant 2026-08-21T11:36:56) by argszero · Pull Request #909 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (986) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (988) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (254: 45 daemon_client + 19 conn-manager + 22 app-commands + 126 renderer smoke + 15 i18n + 7 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败,v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败,如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发:Actions outage 会整段丢弃 push 事件,dispatch 走 API 路径不受影响)
Expand Down
48 changes: 48 additions & 0 deletions emrg/client/app.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@
logger = logging.getLogger(__name__)


def _csi_modifier_action(data: bytes) -> str | None:
"""Map modifier-prefixed CSI arrow sequences to an editing action.

macOS terminals (iTerm2/Ghostty) send \x1b[1;3D for Option+←, \x1b[1;3C
for Option+→, \x1b[1;5D for Ctrl+← etc. — the plain handler only inspects
data[2] (the '1' parameter) and drops the sequence, so the cursor never
moves while Option+Backspace (\x17) works (rant 2026-08-21T11:36:56).
Also handles the Kitty keyboard protocol form \x1b[68;3u (key code 68 =
'D' = Left, 67 = 'C' = Right) with an Alt modifier.

Returns 'word_left' / 'word_right' for Alt/Ctrl+←/→, else None.
"""
if len(data) < 4 or data[0] != 0x1B or data[1] != 0x5B:
return None
if b";" not in data:
return None
final = data[-1]
if not (0x40 <= final <= 0x7E):
return None
try:
parts = data[2:-1].split(b";")
if not parts or any(not p.isdigit() for p in parts):
return None
params = [int(p) for p in parts]
except ValueError:
return None
if len(params) < 2:
return None
mod = params[1]
if mod not in (3, 5, 7): # Alt(3) / Ctrl(5) / Alt+Ctrl(7)
return None
if final in (0x44, 0x43): # legacy CSI: D=← C=→
return "word_left" if final == 0x44 else "word_right"
if final == 0x75 and params[0] in (67, 68): # Kitty CSI-u: 68='D' 67='C'
return "word_left" if params[0] == 68 else "word_right"
return None


def _format_status_left(title: str, sid: str, model: str = "") -> str:
"""Format left status: version + session title + short ID + model.

Expand DownExpand Up@@ -1476,6 +1514,16 @@ async def handle_key(data: bytes) -> bool:
if b == 0x1B and len(data) >= 3:
if data[1] == 0x5B:
c = data[2]
# Modifier-prefixed arrows (macOS Option/Ctrl+←→): map to word
# movement (rant 2026-08-21T11:36:56).
_csi_action = _csi_modifier_action(data)
if _csi_action is not None:
if _csi_action == "word_left":
inp.move_word_left()
else:
inp.move_word_right()
term.render()
return True
if c == 0x41: # Up
avail = max(1, term.viewport.viewport_width - 2)
if inp._cursor_vrow(avail) == 0:
Expand Down
48 changes: 48 additions & 0 deletions tests/test_app_widgets.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,3 +325,51 @@ def test_chat_history_line_cache_remove_sync():
# Removing a row not in the list is a no-op
chat.remove(_CountingWidget("ghost"))
assert len(chat.rows) == 2


# ── Modifier-prefixed CSI arrows (rant 2026-08-21T11:36:56) ─────────────────


def test_csi_alt_arrow_mapping():
"""Option/Ctrl+←/→ map to word movement; unmodified/other keys don't."""
from emrg.client.app import _csi_modifier_action

assert _csi_modifier_action(b"\x1b[1;3D") == "word_left" # Option+←
assert _csi_modifier_action(b"\x1b[1;3C") == "word_right" # Option+→
assert _csi_modifier_action(b"\x1b[1;5D") == "word_left" # Ctrl+←
assert _csi_modifier_action(b"\x1b[1;5C") == "word_right" # Ctrl+→
assert _csi_modifier_action(b"\x1b[1;7D") == "word_left" # Alt+Ctrl+←
# Kitty keyboard protocol: key code 68='D' (Left) / 67='C' (Right)
assert _csi_modifier_action(b"\x1b[68;3u") == "word_left"
assert _csi_modifier_action(b"\x1b[67;3u") == "word_right"
# No-op sequences
assert _csi_modifier_action(b"\x1b[D") is None # bare ← (no modifier)
assert _csi_modifier_action(b"\x1b[1;2D") is None # Shift+← (mod 2)
assert _csi_modifier_action(b"\x1b[3~") is None # Delete key
assert _csi_modifier_action(b"\x1b[1;3A") is None # Alt+↑ (not mapped)
assert _csi_modifier_action(b"abc") is None # not a CSI sequence


def test_input_widget_move_word():
"""move_word_left/right jump across whitespace-delimited words."""
from emrg.client.widgets import InputWidget

w = InputWidget()
w.text = "foo bar baz"
w.cursor = len(w.text)
w.move_word_left()
assert w.cursor == 8 # start of 'baz'
w.move_word_left()
assert w.cursor == 4 # start of 'bar'
w.move_word_left()
assert w.cursor == 0 # start of 'foo'
w.move_word_left()
assert w.cursor == 0 # already at start — no-op
w.move_word_right()
assert w.cursor == 4
w.move_word_right()
assert w.cursor == 8
w.move_word_right()
assert w.cursor == 11 # end
w.move_word_right()
assert w.cursor == 11 # already at end — no-op
Loading