fix(maestro): leader twice sends one literal leader byte
ctrl-a is consumed as the leader on every press, so it never reaches the shell and readline's beginning-of-line was gone with no way back — unlike Ctrl-K, which already has an escape hatch. Fix it the way tmux does: pressing the leader twice sends the literal leader byte to the focused pane and clears the pending chord, on both web and TUI, built from the configured leader so a rebound leader carries it. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
151438094e
commit
331039df11
@@ -60,6 +60,10 @@ pub enum Action {
|
||||
/// byte to the focused pane instead of opening the command bar, giving
|
||||
/// readline's kill-to-end-of-line back.
|
||||
SendLiteralCtrlK,
|
||||
/// Escape hatch (#158): the leader pressed twice sends one literal
|
||||
/// leader byte to the focused pane and drops the pending chord, the way
|
||||
/// tmux resolves a doubled prefix key.
|
||||
SendLiteralLeader,
|
||||
ToggleSidebar,
|
||||
ShowHelp,
|
||||
Quit,
|
||||
@@ -103,6 +107,7 @@ impl Action {
|
||||
Action::RenameHighlighted => "Rename selected session".into(),
|
||||
Action::OpenCommandBar => "Go to a session".into(),
|
||||
Action::SendLiteralCtrlK => "Send literal Ctrl-K to session".into(),
|
||||
Action::SendLiteralLeader => "Send literal leader key to session".into(),
|
||||
Action::ToggleSidebar => "Show or hide sidebar".into(),
|
||||
Action::ShowHelp => "Show help".into(),
|
||||
Action::Quit => "Quit Maestro".into(),
|
||||
@@ -131,6 +136,7 @@ impl Action {
|
||||
"RenameHighlighted" => return Ok(Action::RenameHighlighted),
|
||||
"OpenCommandBar" => return Ok(Action::OpenCommandBar),
|
||||
"SendLiteralCtrlK" => return Ok(Action::SendLiteralCtrlK),
|
||||
"SendLiteralLeader" => return Ok(Action::SendLiteralLeader),
|
||||
"ToggleSidebar" => return Ok(Action::ToggleSidebar),
|
||||
"ShowHelp" => return Ok(Action::ShowHelp),
|
||||
"Quit" => return Ok(Action::Quit),
|
||||
|
||||
@@ -565,6 +565,12 @@ impl App {
|
||||
Action::SendLiteralCtrlK => {
|
||||
effects.extend(self.forward_to_session(&InputKey::ctrl_char('k')));
|
||||
}
|
||||
// Escape hatch (#158): the leader's own byte, built from the
|
||||
// configured leader rather than a hardcoded key.
|
||||
Action::SendLiteralLeader => {
|
||||
let leader = self.cfg.leader.clone();
|
||||
effects.extend(self.forward_to_session(&leader));
|
||||
}
|
||||
Action::OpenSpawnModal => {
|
||||
self.open_spawn_modal();
|
||||
effects.push(Effect::LoadDraft);
|
||||
@@ -3068,6 +3074,52 @@ mod tests {
|
||||
assert_eq!(app.state.mode, Mode::Normal, "leader still leaves Insert");
|
||||
}
|
||||
|
||||
/// Leader pressed twice sends one literal leader byte, tmux-style, and
|
||||
/// clears the pending chord rather than leaving Insert (#158) — the
|
||||
/// default leader, `ctrl-a`.
|
||||
#[tokio::test]
|
||||
async fn leader_twice_sends_the_literal_leader_byte_and_stays_in_insert() {
|
||||
let (app, sent) = drive_insert_sequence(
|
||||
&TuiSection::default(),
|
||||
&[ctrl_key_event('a'), ctrl_key_event('a')],
|
||||
)
|
||||
.await;
|
||||
assert_eq!(sent, vec![vec![0x01]]);
|
||||
assert_eq!(app.state.mode, Mode::Insert, "still in Insert, not left");
|
||||
}
|
||||
|
||||
/// The escape hatch is built from the configured leader, not a hardcoded
|
||||
/// `ctrl-a` — rebinding `[tui].leader` rebinds it too (#158).
|
||||
#[tokio::test]
|
||||
async fn a_rebound_leader_still_reaches_the_literal_leader_escape() {
|
||||
let section = TuiSection {
|
||||
leader: Some("ctrl-b".into()),
|
||||
..Default::default()
|
||||
};
|
||||
let (app, sent) =
|
||||
drive_insert_sequence(§ion, &[ctrl_key_event('b'), ctrl_key_event('b')]).await;
|
||||
assert_eq!(sent, vec![vec![0x02]]);
|
||||
assert_eq!(app.state.mode, Mode::Insert);
|
||||
}
|
||||
|
||||
/// After the literal-leader escape fires, the chord is gone — a further
|
||||
/// leader press starts a fresh chord rather than resolving as a
|
||||
/// three-deep sequence (#158).
|
||||
#[tokio::test]
|
||||
async fn leader_twice_then_ctrl_k_is_a_fresh_chord() {
|
||||
let (_app, sent) = drive_insert_sequence(
|
||||
&TuiSection::default(),
|
||||
&[
|
||||
ctrl_key_event('a'),
|
||||
ctrl_key_event('a'),
|
||||
ctrl_key_event('a'),
|
||||
ctrl_key_event('k'),
|
||||
],
|
||||
)
|
||||
.await;
|
||||
assert_eq!(sent, vec![vec![0x01], vec![0x0b]]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pane_scrollback_moves_and_user_input_returns_to_live_output() {
|
||||
use crate::session_task::{SessionHandle, SessionState};
|
||||
|
||||
@@ -155,6 +155,16 @@ impl TuiConfig {
|
||||
"SendLiteralCtrlK",
|
||||
)
|
||||
.expect("leader canonical form is valid by construction");
|
||||
// Leader, leader → the literal-leader escape hatch (#158), tmux-style:
|
||||
// pressing it twice sends the leader byte itself. Built from the same
|
||||
// leader spec, so rebinding leader rebinds this chord too.
|
||||
keymap
|
||||
.set(
|
||||
Mode::Insert,
|
||||
&format!("{} {}", leader.canonical(), leader.canonical()),
|
||||
"SendLiteralLeader",
|
||||
)
|
||||
.expect("leader canonical form is valid by construction");
|
||||
|
||||
for (input, action) in §ion.keymap_normal {
|
||||
keymap.set(Mode::Normal, input, action).map_err(|source| {
|
||||
@@ -314,6 +324,33 @@ mod tests {
|
||||
assert_eq!(cfg.keymap.resolve(Mode::Insert, "ctrl-a ctrl-k"), None);
|
||||
}
|
||||
|
||||
/// The literal-leader escape hatch (#158) is chorded off the leader
|
||||
/// doubled: `ctrl-a ctrl-a` — tmux's doubled-prefix resolution.
|
||||
#[test]
|
||||
fn default_leader_escapes_a_literal_leader() {
|
||||
let cfg = TuiConfig::load(&TuiSection::default()).unwrap();
|
||||
assert_eq!(
|
||||
cfg.keymap.resolve(Mode::Insert, "ctrl-a ctrl-a"),
|
||||
Some(Action::SendLiteralLeader),
|
||||
);
|
||||
}
|
||||
|
||||
/// Rebinding the leader must rebind the literal-leader chord with it,
|
||||
/// not just the Insert escape and the Ctrl-K chord — proving it too is
|
||||
/// built from the configured leader rather than a hardcoded `ctrl-a`.
|
||||
#[test]
|
||||
fn rebinding_leader_moves_the_literal_leader_chord() {
|
||||
let mut section = TuiSection::default();
|
||||
section.leader = Some("ctrl-b".into());
|
||||
let cfg = TuiConfig::load(§ion).unwrap();
|
||||
assert_eq!(
|
||||
cfg.keymap.resolve(Mode::Insert, "ctrl-b ctrl-b"),
|
||||
Some(Action::SendLiteralLeader),
|
||||
);
|
||||
// The old leader's chord is gone along with the rest of its bindings.
|
||||
assert_eq!(cfg.keymap.resolve(Mode::Insert, "ctrl-a ctrl-a"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn user_normal_override_replaces_default() {
|
||||
let mut section = TuiSection::default();
|
||||
|
||||
Reference in New Issue
Block a user