Merge remote-tracking branch 'origin/main' into oboe

# Conflicts:
#	web/src/catalog.ts

crates/maestro-daemon/src/activity.rs

@@ -69,7 +69,7 @@ pub fn decide(idle_for: Duration, awaiting_input: bool) -> ActivityState {
 /// How long a session's pane must be continuously focused (a client's pane,
 /// not a sidebar highlight) before an `AwaitingInput` glow clears: the
 /// operator has looked, so the rail stops asking for attention.
-pub const FOCUS_CLEAR_HOLD: Duration = Duration::from_secs(5);
+pub const FOCUS_CLEAR_HOLD: Duration = Duration::from_secs(1);
 
 /// Downgrade `raw` from `AwaitingInput` to `Idle` once the pane has been
 /// focused for at least [`FOCUS_CLEAR_HOLD`].
@@ -161,7 +161,7 @@ mod tests {
     fn awaiting_input_glows_until_focus_hold_is_reached() {
         let now = std::time::Instant::now();
         let mut suppressed = false;
-        let since = now - (FOCUS_CLEAR_HOLD - Duration::from_secs(1));
+        let since = now - (FOCUS_CLEAR_HOLD - Duration::from_millis(200));
         assert_eq!(
             apply_focus_suppression(
                 ActivityState::AwaitingInput,

crates/maestro-tui/src/config.rs

@@ -52,10 +52,11 @@ const DEFAULT_NORMAL: &[(&str, &str)] = &[
     // because Normal mode only exists while the sidebar is focused, so
     // nothing forwards it to a pty.
     ("tab", "AttachHighlighted"),
-    ("s", "OpenSpawnModal"),
-    // Fast-forward spawn (#67): the spawn key's neighbour does the same
+    // `n`/`N`, the same pair the web client binds.
+    ("n", "OpenSpawnModal"),
+    // Fast-forward spawn (#67): the spawn key's shifted twin does the same
     // thing with every default resolved and no form.
-    ("S", "FastForwardSpawn"),
+    ("N", "FastForwardSpawn"),
     ("x", "KillHighlighted"),
     ("r", "RenameHighlighted"),
     // Focus
@@ -220,11 +221,11 @@ mod tests {
             Some(Action::AttachHighlighted),
         );
         assert_eq!(
-            cfg.keymap.resolve(Mode::Normal, "s"),
+            cfg.keymap.resolve(Mode::Normal, "n"),
             Some(Action::OpenSpawnModal),
         );
         assert_eq!(
-            cfg.keymap.resolve(Mode::Normal, "S"),
+            cfg.keymap.resolve(Mode::Normal, "N"),
             Some(Action::FastForwardSpawn),
         );
     }
@@ -311,18 +312,18 @@ mod tests {
         assert!(s.contains("ctrl-glorb"), "diagnostic: {s}");
     }
 
-    /// Regression for #70: the previous canonical form of a real Shift+S
-    /// keypress was `"shift-S"`, which the default `"S"` binding never
+    /// Regression for #70: the previous canonical form of a real Shift+N
+    /// keypress was `"shift-N"`, which the default `"N"` binding never
     /// matched. Drive the actual crossterm event, not the binding string,
     /// so the dead-key bug can't come back unnoticed.
     #[test]
-    fn real_shift_s_keypress_resolves_to_fast_forward_spawn() {
+    fn real_shift_n_keypress_resolves_to_fast_forward_spawn() {
         use crossterm::event::{Event as CtEvent, KeyCode, KeyEvent, KeyModifiers};
 
         use crate::input::{canonicalise, Region};
 
         let cfg = TuiConfig::load(&TuiSection::default()).unwrap();
-        let ev = CtEvent::Key(KeyEvent::new(KeyCode::Char('S'), KeyModifiers::SHIFT));
+        let ev = CtEvent::Key(KeyEvent::new(KeyCode::Char('N'), KeyModifiers::SHIFT));
         let key = canonicalise(&ev, |_, _| Region::Unknown).expect("key event canonicalises");
 
         assert_eq!(

crates/maestro-tui/src/input.rs

@@ -597,7 +597,8 @@ mod tests {
     /// so a real Shift+S delivers `Char { c: 'S', shift: true }`. Its
     /// canonical form must be the bare `"S"` a keymap binds, not `"shift-S"` —
     /// the uppercase letter already says "shifted"; a redundant prefix would
-    /// make the default `S` binding unreachable from the keyboard (#70).
+    /// make every uppercase binding (the default `N`) unreachable from the
+    /// keyboard (#70).
     #[test]
     fn shift_flag_is_redundant_for_an_already_uppercase_char() {
         let k = InputKey::Char {