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

fix(tui): fix input buffering in iTerm2 causing delayed keypresses

Browse Source 
The cell size query response parser was incorrectly holding back Kitty
keyboard protocol sequences, thinking they might be incomplete cell size
responses. This caused Ctrl+C/Ctrl+D to require multiple presses in iTerm2.

Fixed by only waiting for more data if the buffer doesn't end with a
terminal escape sequence terminator character.
This commit is contained in:
Mario Zechner
2025-12-19 22:08:36 +01:00
parent f377c3c9c3
commit d2276ab654
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/tui/src/tui.ts
View File

@@ -166,24 +166,20 @@ export class TUI extends Container {
this.cellSizeQueryPending = false;
}
// Check if we have a partial response starting (wait for more data)
// ESC [ 6 ; ... could be incomplete
const partialPattern = /\x1b\[6;[\d;]*$/;
if (partialPattern.test(this.inputBuffer)) {
return ""; // Wait for more data
// Check if we have a partial cell size response starting (wait for more data)
// Patterns that could be incomplete cell size response: \x1b, \x1b[, \x1b[6, \x1b[6;...(no t yet)
const partialCellSizePattern = /\x1b(\[6?;?[\d;]*)?$/;
if (partialCellSizePattern.test(this.inputBuffer)) {
// Check if it's actually a complete different escape sequence (ends with a letter)
// Cell size response ends with 't', Kitty keyboard ends with 'u', arrows end with A-D, etc.
const lastChar = this.inputBuffer[this.inputBuffer.length - 1];
if (!/[a-zA-Z~]/.test(lastChar)) {
// Doesn't end with a terminator, might be incomplete - wait for more
return "";
}
}
// Check for any ESC that might be start of response
const escIndex = this.inputBuffer.lastIndexOf("\x1b");
if (escIndex !== -1 && escIndex > this.inputBuffer.length - 10) {
// Might be incomplete escape sequence, wait a bit
// But return any data before it
const before = this.inputBuffer.substring(0, escIndex);
this.inputBuffer = this.inputBuffer.substring(escIndex);
return before;
}
// No response found, return buffered data as user input
// No cell size response found, return buffered data as user input
const result = this.inputBuffer;
this.inputBuffer = "";
this.cellSizeQueryPending = false; // Give up waiting