shumengya/sproutclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tui): resolve raw backspace ambiguity closes #2293

Browse Source
This commit is contained in:
Mario Zechner
2026-03-18 00:48:03 +01:00
parent 9651e4114d
commit fa877de1fb
3 changed files with 117 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
packages/tui/src/keys.ts
View File

@@ -663,6 +663,27 @@ function matchesModifyOtherKeys(data: string, expectedKeycode: number, expectedM
return parsed.codepoint === expectedKeycode && parsed.modifier === expectedModifier;
}
function isWindowsTerminalSession(): boolean {
return (
Boolean(process.env.WT_SESSION) && !process.env.SSH_CONNECTION && !process.env.SSH_CLIENT && !process.env.SSH_TTY
);
}
/**
* Raw 0x08 (BS) is ambiguous in legacy terminals.
*
* - Windows Terminal uses it for Ctrl+Backspace.
* - Some legacy terminals and tmux setups send it for plain Backspace.
*
* Prefer explicit Kitty / CSI-u / modifyOtherKeys sequences whenever they are
* available. Fall back to a Windows Terminal heuristic only for raw BS bytes.
*/
function matchesRawBackspace(data: string, expectedModifier: number): boolean {
if (data === "\x7f") return expectedModifier === 0;
if (data !== "\x08") return false;
return isWindowsTerminalSession() ? expectedModifier === MODIFIERS.ctrl : expectedModifier === 0;
}
// =============================================================================
// Generic Key Matching
// =============================================================================
@@ -751,7 +772,11 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
case "escape":
case "esc":
if (modifier !== 0) return false;
return data === "\x1b" || matchesKittySequence(data, CODEPOINTS.escape, 0);
return (
data === "\x1b" ||
matchesKittySequence(data, CODEPOINTS.escape, 0) ||
matchesModifyOtherKeys(data, CODEPOINTS.escape, 0)
);
case "space":
if (!_kittyProtocolActive) {
@@ -763,9 +788,16 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
}
}
if (modifier === 0) {
return data === " " || matchesKittySequence(data, CODEPOINTS.space, 0);
return (
data === " " ||
matchesKittySequence(data, CODEPOINTS.space, 0) ||
matchesModifyOtherKeys(data, CODEPOINTS.space, 0)
);
}
return matchesKittySequence(data, CODEPOINTS.space, modifier);
return (
matchesKittySequence(data, CODEPOINTS.space, modifier) ||
matchesModifyOtherKeys(data, CODEPOINTS.space, modifier)
);
case "tab":
if (shift && !ctrl && !alt) {
@@ -844,18 +876,32 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
if (data === "\x1b\x7f" || data === "\x1b\b") {
return true;
}
return matchesKittySequence(data, CODEPOINTS.backspace, MODIFIERS.alt);
return (
matchesKittySequence(data, CODEPOINTS.backspace, MODIFIERS.alt) ||
matchesModifyOtherKeys(data, CODEPOINTS.backspace, MODIFIERS.alt)
);
}
if (ctrl && !alt && !shift) {
// Legacy: 0x08 (BS) is sent by Windows Terminal for Ctrl+Backspace.
// Also matches Ctrl+H (same byte, ambiguous in legacy terminals).
if (data === "\x08") return true;
return matchesKittySequence(data, CODEPOINTS.backspace, MODIFIERS.ctrl);
// Legacy raw 0x08 is ambiguous: it can be Ctrl+Backspace on Windows
// Terminal or plain Backspace on other terminals, while also
// overlapping with Ctrl+H.
if (matchesRawBackspace(data, MODIFIERS.ctrl)) return true;
return (
matchesKittySequence(data, CODEPOINTS.backspace, MODIFIERS.ctrl) ||
matchesModifyOtherKeys(data, CODEPOINTS.backspace, MODIFIERS.ctrl)
);
}
if (modifier === 0) {
return data === "\x7f" || matchesKittySequence(data, CODEPOINTS.backspace, 0);
return (
matchesRawBackspace(data, 0) ||
matchesKittySequence(data, CODEPOINTS.backspace, 0) ||
matchesModifyOtherKeys(data, CODEPOINTS.backspace, 0)
);
}
return matchesKittySequence(data, CODEPOINTS.backspace, modifier);
return (
matchesKittySequence(data, CODEPOINTS.backspace, modifier) ||
matchesModifyOtherKeys(data, CODEPOINTS.backspace, modifier)
);
case "insert":
if (modifier === 0) {
@@ -1172,7 +1218,7 @@ export function parseKey(data: string): string | undefined {
if (data === "\x00") return "ctrl+space";
if (data === " ") return "space";
if (data === "\x7f") return "backspace";
if (data === "\x08") return "ctrl+backspace";
if (data === "\x08") return isWindowsTerminalSession() ? "ctrl+backspace" : "backspace";
if (data === "\x1b[Z") return "shift+tab";
if (!_kittyProtocolActive && data === "\x1b\r") return "alt+enter";
if (!_kittyProtocolActive && data === "\x1b ") return "alt+space";