szn

Bug 552 — Lone Escape key (0x1B) never flushes in command_mode, copy_mode, or choose_mode

552. Single 0x1B byte leaves input_reader stuck in .esc without arming escape-time in modal states

Severity: HIGH
Status: ✅ RESOLVED
Files: src/server/server.zig:611-633, src/server/server.zig:1477, src/server/server.zig:1607, src/server/server.zig:1691, src/tty/tty_key.zig:68-115

Problem

When a terminal sends a raw 0x1B byte for the Escape key (or before the host terminal processes the Kitty keyboard push sequence), self.input_reader.feed(0x1B) transitions self.input_reader.state from .normal to .esc and returns null.

In Server:

  1. command_mode (src/server/server.zig:1477):
    const ev = self.input_reader.feed(byte) catch return;
    if (ev == null) return;
    

    Returns early without setting self.esc_pending_since_ms.

  2. choose_mode (src/server/server.zig:1607) and copy_mode (src/server/server.zig:1691): handleChooseModeKey and handleCopyModeKey likewise return early when self.input_reader.feed(byte) returns null, before reaching Server.handleClientKey’s if (self.input_reader.state == .esc) { self.esc_pending_since_ms = currentMillis(); } at line 1538.
  3. Server.flushPendingEscape (src/server/server.zig:611-633): Even if esc_pending_since_ms were armed, flushPendingEscape unconditionally resets self.input_reader.state = .normal and writes "\x1b" to the active pane’s PTY (pty.writeInput("\x1b")) instead of delivering .key = .{ .special = .{ .key = .escape } } to command_mode, choose_mode, or copy_mode!

As a result, pressing Escape once in command_mode, copy_mode (including search-input sub-mode), or choose_mode:

Proposed Fix

  1. Arm self.esc_pending_since_ms = currentMillis() whenever self.input_reader.state == .esc after feeding a byte in any mode (command_mode, choose_mode, copy_mode, or normal mode).
  2. In Server.flushPendingEscape, when self.command_mode, pane.choose_mode.active, or pane.in_mode (copy_mode) is active, dispatch the synthesized Escape key (key.Key{ .special = .{ .key = .escape } }) to the active mode handler instead of writing "\x1b" to pane.pty.