omniharness-cli 0.1.31 → 0.1.33

package/dist/ui/keys.d.ts

@@ -1,19 +1,43 @@
 /**
  * Keyboard input normalization for the chat.
  *
- * Terminals cannot distinguish Shift+Enter from Enter by default: both send
- * `\r`. Capable terminals (kitty, foot, WezTerm, Ghostty, modern Windows
- * Terminal, …) fix this with the kitty keyboard protocol — the app pushes
- * `CSI > 1 u` and the terminal then encodes colliding keys as `CSI keycode ;
- * modifier u` (Shift+Enter = `ESC[13;2u`). Ink 5.x does not parse those
- * sequences; they reach `useInput` as plain text with the leading ESC
- * stripped. This module recovers their meaning, and also maps the bare LF
- * some terminals send for Shift+Enter.
+ * Two problems make raw byte handling necessary instead of Ink's `useInput`:
+ *
+ * 1. Windows ConPTY sends DEL (0x7f) for the Backspace key. Ink labels 0x7f
+ *    as `delete`, so an app that trusts `key.delete` deletes forward — a no-op
+ *    at the end of the line. We intercept 0x7f on raw stdin and treat it as
+ *    backspace, while the real Delete key (`ESC[3~` / kitty `ESC[3u`) keeps
+ *    deleting forward.
+ *
+ * 2. The kitty keyboard protocol (pushed via `CSI > 1 u`) re-encodes Enter,
+ *    Tab, Backspace, Escape, arrows, Home/End, Delete and ctrl+letters as
+ *    `CSI keycode ; modifier u` sequences. Ink 5.x misparses most of them:
+ *    some arrive as empty input with bogus ctrl/meta flags, others as raw text
+ *    like `[13;2u`. `parseRawKey` recovers their meaning from the raw chunk.
+ *
+ * Plain text, paste and legacy (non-kitty) keys like `\r`, `\n`, `\x08`,
+ * `ESC[A` arrows and ctrl+letters are left to Ink's `useInput`.
  */
-export type TranslatedKey = {
+export type KeyAction = {
     kind: 'submit';
 } | {
     kind: 'newline';
+} | {
+    kind: 'backspace';
+} | {
+    kind: 'delete';
+} | {
+    kind: 'left';
+} | {
+    kind: 'right';
+} | {
+    kind: 'up';
+} | {
+    kind: 'down';
+} | {
+    kind: 'home';
+} | {
+    kind: 'end';
 } | {
     kind: 'escape';
 } | {
@@ -24,25 +48,29 @@ export type TranslatedKey = {
     kind: 'ctrlM';
 } | {
     kind: 'ctrlO';
+} | {
+    kind: 'ctrlE';
 };
 /** Enable the kitty keyboard protocol (disambiguate escape codes). */
 export declare const KITTY_PUSH = "\u001B[>1u";
 /** Restore the previous keyboard state. */
 export declare const KITTY_POP = "\u001B[<1u";
+/** Query the terminal for its current progressive-enhancement flags. */
+export declare const KITTY_QUERY = "\u001B[?u";
 /**
- * Translate a CSI-u value (ESC already stripped by Ink) into a semantic key,
- * or null when it is a plain character. Returns null for encoded sequences we
- * do not act on (unknown keys) — callers should not insert those as text.
+ * True when `chunk` is the terminal's answer to the kitty-protocol query
+ * (`ESC[? flags u`), confirming the protocol is actually active. Terminals
+ * without kitty support ignore the query and answer nothing.
  */
-export declare function translateCsiU(value: string): TranslatedKey | null;
-/** True when `value` is an unrecognized CSI-u encoded key, never plain text. */
-export declare function isEncodedKey(value: string): boolean;
-export type RawKey = 'home' | 'end';
+export declare function isKittyQueryResponse(chunk: string): boolean;
+/**
+ * Map a raw stdin chunk to a semantic key action, or null when it is plain
+ * text or a key `useInput` already handles correctly (legacy arrows, `\r`,
+ * `\n`, `\x08`, ctrl+letters, …).
+ */
+export declare function parseRawKey(chunk: string): KeyAction | null;
 /**
- * Detect Home/End from a raw stdin chunk. Ink's `useInput` drops these keys
- * (its Key object has no home/end flags), so we listen on stdin directly.
- * Handles the legacy sequences (xterm `ESC[H`/`ESC[F`, rxvt `ESC[1~`/`ESC[4~`,
- * `ESC[7~`/`ESC[8~`) and the kitty-protocol forms (`ESC[1u`/`ESC[4u` with any
- * modifier). Returns null for anything that is not exactly a Home/End key.
+ * True when `value` is a CSI-u encoded key or protocol response (kitty key
+ * events, push/pop echoes, query answers), never plain text to insert.
  */
-export declare function parseRawKey(chunk: string): RawKey | null;
+export declare function isEncodedKey(value: string): boolean;

package/dist/ui/keys.js

@@ -1,61 +1,110 @@
 /**
  * Keyboard input normalization for the chat.
  *
- * Terminals cannot distinguish Shift+Enter from Enter by default: both send
- * `\r`. Capable terminals (kitty, foot, WezTerm, Ghostty, modern Windows
- * Terminal, …) fix this with the kitty keyboard protocol — the app pushes
- * `CSI > 1 u` and the terminal then encodes colliding keys as `CSI keycode ;
- * modifier u` (Shift+Enter = `ESC[13;2u`). Ink 5.x does not parse those
- * sequences; they reach `useInput` as plain text with the leading ESC
- * stripped. This module recovers their meaning, and also maps the bare LF
- * some terminals send for Shift+Enter.
+ * Two problems make raw byte handling necessary instead of Ink's `useInput`:
+ *
+ * 1. Windows ConPTY sends DEL (0x7f) for the Backspace key. Ink labels 0x7f
+ *    as `delete`, so an app that trusts `key.delete` deletes forward — a no-op
+ *    at the end of the line. We intercept 0x7f on raw stdin and treat it as
+ *    backspace, while the real Delete key (`ESC[3~` / kitty `ESC[3u`) keeps
+ *    deleting forward.
+ *
+ * 2. The kitty keyboard protocol (pushed via `CSI > 1 u`) re-encodes Enter,
+ *    Tab, Backspace, Escape, arrows, Home/End, Delete and ctrl+letters as
+ *    `CSI keycode ; modifier u` sequences. Ink 5.x misparses most of them:
+ *    some arrive as empty input with bogus ctrl/meta flags, others as raw text
+ *    like `[13;2u`. `parseRawKey` recovers their meaning from the raw chunk.
+ *
+ * Plain text, paste and legacy (non-kitty) keys like `\r`, `\n`, `\x08`,
+ * `ESC[A` arrows and ctrl+letters are left to Ink's `useInput`.
  */
 /** Enable the kitty keyboard protocol (disambiguate escape codes). */
 export const KITTY_PUSH = '\x1b[>1u';
 /** Restore the previous keyboard state. */
 export const KITTY_POP = '\x1b[<1u';
+/** Query the terminal for its current progressive-enhancement flags. */
+export const KITTY_QUERY = '\x1b[?u';
 /**
- * Translate a CSI-u value (ESC already stripped by Ink) into a semantic key,
- * or null when it is a plain character. Returns null for encoded sequences we
- * do not act on (unknown keys) — callers should not insert those as text.
+ * True when `chunk` is the terminal's answer to the kitty-protocol query
+ * (`ESC[? flags u`), confirming the protocol is actually active. Terminals
+ * without kitty support ignore the query and answer nothing.
  */
-export function translateCsiU(value) {
-    const enter = /^\[13(?:;(\d+))?u$/.exec(value);
-    if (enter) {
-        const modifier = enter[1] === undefined ? 1 : Number(enter[1]);
-        return modifier === 1 ? { kind: 'submit' } : { kind: 'newline' };
-    }
-    switch (value) {
-        case '[27u': return { kind: 'escape' };
-        case '[9u':
-        case '[9;2u':
-        case '[9;5u':
-            return { kind: 'tab' };
-        case '[99;5u': return { kind: 'ctrlC' };
-        case '[109;5u': return { kind: 'ctrlM' };
-        case '[111;5u': return { kind: 'ctrlO' };
-        default: return null;
-    }
-}
-/** True when `value` is an unrecognized CSI-u encoded key, never plain text. */
-export function isEncodedKey(value) {
-    return /^\[\d+(?:;\d+)*u$/.test(value);
+export function isKittyQueryResponse(chunk) {
+    return /^\x1b\[\?\d+(?:;\d+)*u$/.test(chunk);
 }
 /**
- * Detect Home/End from a raw stdin chunk. Ink's `useInput` drops these keys
- * (its Key object has no home/end flags), so we listen on stdin directly.
- * Handles the legacy sequences (xterm `ESC[H`/`ESC[F`, rxvt `ESC[1~`/`ESC[4~`,
- * `ESC[7~`/`ESC[8~`) and the kitty-protocol forms (`ESC[1u`/`ESC[4u` with any
- * modifier). Returns null for anything that is not exactly a Home/End key.
+ * Map a raw stdin chunk to a semantic key action, or null when it is plain
+ * text or a key `useInput` already handles correctly (legacy arrows, `\r`,
+ * `\n`, `\x08`, ctrl+letters, …).
  */
 export function parseRawKey(chunk) {
+    if (chunk === '\x7f')
+        return { kind: 'backspace' }; // Windows ConPTY Backspace
     if (!chunk.startsWith('\x1b'))
         return null;
     const body = chunk.slice(1);
-    if (body === 'H' || body === '[H' || body === 'OH' || body === '[1~' || body === '[7~' || /^\[1(?:;\d+)?u$/.test(body))
-        return 'home';
-    if (body === 'F' || body === '[F' || body === 'OF' || body === '[4~' || body === '[8~' || /^\[4(?:;\d+)?u$/.test(body))
-        return 'end';
+    // Legacy sequences Ink drops from its Key object or mislabels.
+    switch (body) {
+        case 'H':
+        case '[H':
+        case 'OH':
+        case '[1~':
+        case '[7~': return { kind: 'home' };
+        case 'F':
+        case '[F':
+        case 'OF':
+        case '[4~':
+        case '[8~': return { kind: 'end' };
+        case '[3~': return { kind: 'delete' };
+        case '[27u': return { kind: 'escape' };
+        case '[9u':
+        case '[9;2u':
+        case '[9;5u': return { kind: 'tab' };
+    }
+    // Kitty protocol: CSI keycode ; modifier u.
+    const kitty = /^\[(\d+)(?:;(\d+))?u$/.exec(body);
+    if (kitty) {
+        const code = Number(kitty[1]);
+        const modifier = kitty[2] === undefined ? 1 : Number(kitty[2]);
+        if (code === 13)
+            return modifier === 1 ? { kind: 'submit' } : { kind: 'newline' }; // Enter / Shift+Ctrl+Alt+Enter
+        if (code === 27)
+            return { kind: 'escape' };
+        if (code === 9)
+            return { kind: 'tab' };
+        if (code === 127)
+            return { kind: 'backspace' };
+        if (code === 3)
+            return { kind: 'delete' };
+        if (code === 11)
+            return { kind: 'left' };
+        if (code === 12)
+            return { kind: 'right' };
+        if (code === 7)
+            return { kind: 'up' };
+        if (code === 8)
+            return { kind: 'down' };
+        if (code === 1)
+            return { kind: 'home' };
+        if (code === 4)
+            return { kind: 'end' };
+        if (code === 99 && modifier === 5)
+            return { kind: 'ctrlC' }; // ctrl+c
+        if (code === 109 && modifier === 5)
+            return { kind: 'ctrlM' }; // ctrl+m (kitty-only: legacy Ctrl+M is \r)
+        if (code === 111 && modifier === 5)
+            return { kind: 'ctrlO' }; // ctrl+o
+        if (code === 101 && modifier === 5)
+            return { kind: 'ctrlE' }; // ctrl+e
+        return null; // other kitty-encoded keys (letters, F-keys, …) — not bound
+    }
     return null;
 }
+/**
+ * True when `value` is a CSI-u encoded key or protocol response (kitty key
+ * events, push/pop echoes, query answers), never plain text to insert.
+ */
+export function isEncodedKey(value) {
+    return /^\[\d+(?:;\d+)*u$|^\[[><?]\d+(?:;\d+)*u$/.test(value);
+}
 //# sourceMappingURL=keys.js.map

package/dist/ui/keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../src/ui/keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAWH,sEAAsE;AACtE,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;AACrC,2CAA2C;AAC3C,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC;AAEpC;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,OAAO,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACnE,CAAC;IACD,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QACvC,KAAK,KAAK,CAAC;QACX,KAAK,OAAO,CAAC;QACb,KAAK,OAAO;YACV,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACzB,KAAK,QAAQ,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACxC,KAAK,SAAS,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACzC,KAAK,SAAS,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACzC,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;IACvB,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,OAAO,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACzC,CAAC;AAID;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IACtI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACrI,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../src/ui/keys.ts"],"names":[],"mappings":"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"}