fix(mobile): keep the one-shot Ctrl armed through terminal-generated reports

Review of #268 turned up two defects, both verified against a real shell
session on an isolated instance.

1. A tap spent the modifier. The onData hook consumed every chunk while
   armed, but not every chunk is a keystroke: a shell session keeps the
   narrow scrollback strip, so mouse DECSETs reach the browser, and with
   vim/htop running a tap arrives as `\x1b[<0;31;23M`. Measured in the
   real app: armed, one tap, disarmed, and the Ctrl button read as dead.
   The hook now skips mouse and focus reports via a new
   `CodemanTerminalInput.isTerminalFocusOrMouseReport()`; they still reach
   the PTY, they just no longer stand in for the next key. Focus reports
   are covered for the same reason even though FOCUS_ESCAPE_FILTER in
   session.ts strips DECSET 1004 today, since the bar refocuses the
   terminal after every key and would spend the modifier on its own
   `\x1b[I` the moment that filter changed.

2. The armed style did not land on the four light skins. The competing
   rule is (0,3,1), not (0,2,1) as the comments claimed: `:is()` takes the
   specificity of its most specific argument and that list holds
   `.btn-toolbar.btn-shell`, so it outranked the (0,3,0) armed rules in
   both stylesheets. Measured across all seven skins at 390px, armed and
   resting backgrounds were byte-identical on paper-gray, solarized-light,
   catppuccin-latte and rose-pine-dawn. The light-skin rule now excludes
   the state as `.accessory-btn:not(.armed)`, which fixes phone and tablet
   at once; adding another class to the armed rules would only have moved
   the tie.

Tests: 20 more cases in test/mobile-shell-keyboard.test.ts (the report
classifier, the gate's effect on the modifier, and a static guard on the
light-skin selector, since the existing E2E background assertion passes on
a light skin and the browser suite runs the dark default), plus a browser
regression that taps the terminal with mouse reporting on.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Codeman maintainer
2026-08-10 04:07:19 +02:00
parent 9b9f2c21e9
commit 7c2a49d432
6 changed files with 229 additions and 9 deletions
+10 -3
View File
@@ -1163,8 +1163,9 @@ html.mobile-init .file-browser-panel {
}
/* Armed one-shot Ctrl (shell bar, issue #262). Phone palette is hardcoded in
this block, so the state needs its own entry here; three classes to outrank
the light-skin .accessory-btn rule at the bottom of this file. */
this block, so the state needs its own entry here. Three classes beat the
plain .accessory-btn rules; the light-skin rule at the bottom of this file
is higher still at (0,3,1) and is excluded by hand there, not outranked. */
.accessory-btn.accessory-btn-ctrl.armed {
background: #2563eb;
border-color: rgba(59, 130, 246, 0.9);
@@ -2918,7 +2919,13 @@ html:is([data-skin="paper-gray"], [data-skin="solarized-light"], [data-skin="cat
color: var(--text);
}
html:is([data-skin="paper-gray"], [data-skin="solarized-light"], [data-skin="catppuccin-latte"], [data-skin="rose-pine-dawn"]) :is(.btn-voice-mobile, .btn-settings-mobile, .btn-toolbar.btn-shell, .toolbar .btn-case-add, .accessory-btn) {
/* `.accessory-btn:not(.armed)` on purpose: this selector is (0,3,1) — `:is()`
takes the specificity of its most specific argument, and `.btn-toolbar
.btn-shell` is two classes — so it OUTRANKS the (0,3,0) armed-Ctrl rules in
both stylesheets and repainted the armed modifier back to a resting button on
all four light skins. Excluding the state here fixes phone and tablet at once;
adding a class to the armed rules would only have moved the tie. */
html:is([data-skin="paper-gray"], [data-skin="solarized-light"], [data-skin="catppuccin-latte"], [data-skin="rose-pine-dawn"]) :is(.btn-voice-mobile, .btn-settings-mobile, .btn-toolbar.btn-shell, .toolbar .btn-case-add, .accessory-btn:not(.armed)) {
background: var(--control-bg);
border-color: var(--control-border);
color: var(--text-dim);
+6 -4
View File
@@ -12081,10 +12081,12 @@ body.touch-device.cjk-input-visible .main {
color: var(--yellow);
}
/* Armed one-shot Ctrl (shell bar, issue #262). Three classes on purpose: the
light-skin compatibility rule in mobile.css repaints every .accessory-btn at
specificity (0,2,1), so a two-class rule here would lose and the modifier
would look unarmed on the light skins. */
/* Armed one-shot Ctrl (shell bar, issue #262). Three classes on purpose, to beat
the plain .accessory-btn rules. It still cannot outrank the light-skin
compatibility rule in mobile.css, which repaints every .accessory-btn at
(0,3,1) — `:is()` inherits its most specific argument — so that rule excludes
`.armed` by hand. Without the exclusion the modifier looks unarmed on the four
light skins, which is worse than having no armed style at all. */
.accessory-btn.accessory-btn-ctrl.armed {
background: var(--accent);
border-color: var(--accent);
+45 -1
View File
@@ -15,6 +15,15 @@
(function (global) {
const TERMINAL_QUERY_RESPONSE_PATTERN = /^\x1b\[[\?>=]?[\d;]*[cnR]$/;
const TERMINAL_OSC_RESPONSE_PATTERN = /^\x1b\][\d;]*[^\x07\x1b]*(?:\x07|\x1b\\)$/;
// Pointer and focus reports xterm emits through onData on the terminal's OWN
// initiative, with no key pressed: SGR mouse (DECSET 1006, also 1016), legacy
// X10 mouse (DECSET 1000 — three raw bytes after CSI M) and focus in/out
// (DECSET 1004). They are not query REPLIES, so the query-response filter
// above does not match them, and they must keep reaching the PTY. What they
// must NOT do is stand in for a keystroke: see isTerminalFocusOrMouseReport.
const MOUSE_SGR_REPORT_PATTERN = /^\x1b\[<\d+;\d+;\d+[Mm]$/;
const MOUSE_X10_REPORT_PATTERN = /^\x1b\[M[\s\S]{3}$/;
const FOCUS_REPORT_PATTERN = /^\x1b\[[IO]$/;
// Grace window after a manual scroll-up gesture during which sticky-scroll is
// suppressed, so high-frequency Codex status redraws don't snap the viewport
// back to the bottom while the user is inspecting earlier output.
@@ -106,6 +115,30 @@
return isTerminalQueryResponse(data);
}
/**
* Did the terminal generate this chunk itself, rather than a human pressing a
* key? True for mouse and focus reports (issue #262).
*
* Consumers that treat one onData chunk as "the next keystroke" must skip
* these. The one-shot Ctrl modifier is why this exists, and the MOUSE half is
* the live one: a shell session keeps the narrow scrollback strip, so mouse
* DECSETs reach the browser and anything the user runs that enables tracking
* (vim, htop, less) turns a tap into `\x1b[<0;31;23M`. Measured in a real
* shell session: with Ctrl armed, one tap on the terminal spent it silently.
*
* Focus reports are the same class and cost nothing to cover, but they cannot
* reach xterm today: `FOCUS_ESCAPE_FILTER` in session.ts strips `\x1b[?1004h`
* (and the reports themselves) from every PTY read, so `sendFocusMode` never
* turns on. Were that filter to go, the Ctrl button would spend the modifier
* on its OWN refocus — the bar refocuses the terminal after every key so the
* keyboard stays open, and that refocus emits `\x1b[I`.
*/
function isTerminalFocusOrMouseReport(data) {
return (
FOCUS_REPORT_PATTERN.test(data) || MOUSE_SGR_REPORT_PATTERN.test(data) || MOUSE_X10_REPORT_PATTERN.test(data)
);
}
// Per-skin xterm.js palettes. The 'daylight-blue' object equals the legacy hardcoded
// theme, so default behavior is unchanged. Shared at module scope and exported on the
// global so both terminal-ui.js (main terminal) and panels-ui.js (teammate terminals,
@@ -134,6 +167,7 @@
global.CodemanTerminalInput = {
isTerminalQueryResponse,
shouldSuppressTerminalQueryResponse,
isTerminalFocusOrMouseReport,
isComposerNavKey,
classifyPredictInput,
isCodexComposerRow,
@@ -938,7 +972,17 @@ Object.assign(CodemanApp.prototype, {
// own DA/CPR replies can never spend the modifier, and BEFORE every
// send path so the control byte follows the normal control-char route
// (immediate flush, local-echo state cleared).
if (typeof KeyboardAccessoryBar !== 'undefined' && KeyboardAccessoryBar.isCtrlArmed?.()) {
//
// Mouse and focus reports are skipped rather than suppressed: they are
// real bytes the PTY still needs, they just were not typed by anyone.
// A shell session passes mouse DECSETs through, so with vim or htop
// running, one tap on the terminal used to spend the modifier silently
// (measured against a real shell). See isTerminalFocusOrMouseReport.
if (
typeof KeyboardAccessoryBar !== 'undefined' &&
KeyboardAccessoryBar.isCtrlArmed?.() &&
!window.CodemanTerminalInput?.isTerminalFocusOrMouseReport(data)
) {
data = KeyboardAccessoryBar.consumeCtrl(data);
}