Synced from monorepo

Synced from monorepo

Changes:
- Shell: accept target response id on rewind execute
- Shell: stamp response id on chat user message chunks
- Worktree: optional rebuild and stale git registration cleanup in auto-GC
- Worktree: kind-aware auto-GC TTLs and config knobs
- Worktree: macOS process CWD scan and Unix PID liveness for GC guards
- Worktree: automatic throttled GC on startup (Linux age-based; non-Linux dead-only)
- Pager: add `[ui].combine_queued_prompts` to batch queued follow-ups
- Shell: stop overwriting user skills
- Tools: read markdown in `skills/` directories untruncated
- `/usage` shows per-session token and dollar usage in the TUI
- Security: prompt on environment-dumping `ps` variants
- Security: always-safe `kubectl` no longer runs arbitrary kubeconfig credential plugins without permission
- Tools: make scheduler deletion durable
- Shell: add relocation storage primitives
- Shell: give side model calls their own conversation ids
- Fix five workflow-runtime bugs (budget, pause, cancel, reconnect)
- Security: peel `env -S` / `--split-string` operands in the Bash permission gate (managed deny/ask)
- Pager: expose doctor in the TUI
- Security: block unauthorized RCE via abused safe commands
- Pager idle watcher cue: "1 subagent still running" instead of "watching · 1 subagent"
- Security: block `rg --pre` arbitrary code execution in auto-mode
- Voice: diagnose silent-mic failures (macOS permission) and add doctor/terminal-setup Voice section
- App builder deployer: `allow_forking` and `show_built_with_grok`
- Pager: stop stacking duplicate "Worked for" markers on parked turns
- Shell: support `max` as a distinct reasoning effort tier
- Tools: serialize background `/loop` fires on the whole work unit
- Shell: add working-directory relocation state primitives
- Proto: `ClientToolResult` and `ChatConfig` client-side tools
- Shell: model providers
- Chat: select App Builder product on the Build path
- Shell: attach author identity to feedback when the deployment opts in
- Doctor: fix for SSH wrap setup
- Workflow authoring skills: create-workflow and import-claude-workflow docs
- Add read-only grok doctor
- Sandbox: apply Landlock without a controlling TTY
- Pager: recover image paste over grok wrap on headless remotes
- Pager: make actions screen-mode aware
- Shell: resume sessions when the working directory moves
- Pager: centralize terminal diagnostics
- Workspace: gate inline shell file access
- Pager: centralize terminal probes
- Pager: edit minimal prompts in an external editor
- Pager: standardize backgrounding on Ctrl+B
- Shell: recap rides the parent turn's prompt cache
- Tools: add scheduler lifecycle version clock

Source-Revision: 0f4d7c91b8b2b408333f6de1e8a76cb8eaa71899

crates/codegen/xai-grok-pager/src/input/keyboard_normalizer.rs

@@ -60,8 +60,14 @@ impl<P: ModifierProbe> KeyboardNormalizer<P> {
     }
 
     /// Upgrade a [`KeyEvent`] when a modifier is held but absent from the
-    /// event. Returns `Some` only if a modifier was added.
+    /// event. Returns `Some` only if the delivered event changed.
     pub fn rescue_key(&self, key: KeyEvent) -> Option<KeyEvent> {
+        if key.code == KeyCode::Char('\u{0002}') && key.modifiers.is_empty() {
+            let mut out = key;
+            out.code = KeyCode::Char('b');
+            out.modifiers = KeyModifiers::CONTROL;
+            return Some(out);
+        }
         if !self.delivery.benefits_from_rescue() {
             return None;
         }
@@ -141,6 +147,18 @@ mod tests {
         KeyEvent::new(code, KeyModifiers::NONE)
     }
 
+    #[test]
+    fn raw_ctrl_b_canonicalizes_without_modifier_probe() {
+        let native = ModifierDelivery::new_for_test(ModifierFate::Native, ModifierFate::Native);
+        let n = make(ModifierState::default(), native);
+        let raw = KeyEvent::new(KeyCode::Char('\u{0002}'), KeyModifiers::NONE);
+        let out = n.rescue_key(raw).expect("raw Ctrl+B must canonicalize");
+        assert_eq!(out.code, KeyCode::Char('b'));
+        assert_eq!(out.modifiers, KeyModifiers::CONTROL);
+        assert!(!crate::input::key::is_text_input_key(&out));
+        assert!(crate::key!('b', CONTROL).matches(&out));
+    }
+
     #[test]
     fn cmd_backspace_upgrades_to_super() {
         let n = make(

crates/codegen/xai-grok-pager/src/input/mouse.rs

@@ -793,6 +793,12 @@ impl MouseScrollState {
         self.stream.is_some()
     }
 
+    pub(crate) fn cancel_stream(&mut self) {
+        self.stream = None;
+        self.carry_lines = 0.0;
+        self.carry_direction = None;
+    }
+
     /// Deadline for the event loop's dedicated scroll clock: delay until the
     /// next flush/finalize check is due. Pending lines are due on the redraw
     /// cadence, the stream-gap finalize at the 80ms mark — never the

crates/codegen/xai-grok-pager/src/input/mouse/tests.rs

@@ -929,6 +929,25 @@ fn vscode_embed_family_shares_vscode_scroll_profile() {
     assert_eq!(zed.accel_interval_fast_ms, ACCEL_INTERVAL_FAST_MS);
 }
 
+#[test]
+fn cancel_stream_drops_pending_momentum_and_fractional_carry() {
+    let base = Instant::now();
+    let mut state = MouseScrollState::new_at(base);
+    let config = make_config(3, ScrollInputMode::Trackpad);
+
+    state.on_scroll_event_at(base, ScrollDirection::Up, config);
+    state.carry_lines = 0.75;
+    state.carry_direction = Some(ScrollDirection::Up);
+    assert!(state.has_active_stream());
+
+    state.cancel_stream();
+
+    assert!(!state.has_active_stream());
+    assert_eq!(state.carry_lines, 0.0);
+    assert_eq!(state.carry_direction, None);
+    assert_eq!(state.on_tick_at(base + Duration::from_secs(1)).lines, 0);
+}
+
 #[test]
 fn wheel_flood_flushes_capped_with_backlog_carry() {
     // Wheel-path cap: a confirmed-wheel flood (e.g. terminal momentum