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/tests/pty_xtversion.rs

@@ -64,7 +64,7 @@ fn wait_for_raw_bytes(harness: &mut PtyHarness, needle: &[u8], timeout: Duration
 }
 
 /// Unknown brand → probe fires; the harness's scripted reply is surfaced
-/// in `/terminal-setup`, never as screen garbage.
+/// in `/doctor`, never as screen garbage.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 #[ignore]
 async fn unknown_brand_probe_round_trip() {
@@ -87,13 +87,11 @@ async fn unknown_brand_probe_round_trip() {
         .expect("welcome text");
     assert_no_probe_garbage_on_screen(&harness);
 
-    // Surface check: /terminal-setup shows the probed identity.
-    harness
-        .inject_keys(b"/terminal-setup\r")
-        .expect("run /terminal-setup");
+    // Surface check: /doctor shows the probed identity.
+    harness.inject_keys(b"/doctor\r").expect("run /doctor");
     harness
         .wait_for_text("PtyHarnessTerm 9.9", Duration::from_secs(10))
-        .expect("XTVERSION identity shown in /terminal-setup");
+        .expect("XTVERSION identity shown in /doctor");
 
     assert!(!harness.contains_text("panicked"));
     harness.quit().expect("clean quit");
@@ -123,9 +121,7 @@ async fn allowlisted_brand_probe_fires() {
         .expect("welcome text");
     assert_no_probe_garbage_on_screen(&harness);
 
-    harness
-        .inject_keys(b"/terminal-setup\r")
-        .expect("run /terminal-setup");
+    harness.inject_keys(b"/doctor\r").expect("run /doctor");
     harness
         .wait_for_text("PtyHarnessTerm 9.9", Duration::from_secs(10))
         .expect("XTVERSION identity shown for an allowlisted brand");
@@ -195,13 +191,11 @@ async fn unknown_brand_no_reply_starts_cleanly() {
     assert!(!harness.contains_text("panicked"));
     assert_no_probe_garbage_on_screen(&harness);
 
-    // /terminal-setup must omit the xtversion line entirely.
-    harness
-        .inject_keys(b"/terminal-setup\r")
-        .expect("run /terminal-setup");
+    // /doctor must omit the xtversion line entirely.
+    harness.inject_keys(b"/doctor\r").expect("run /doctor");
     harness
         .wait_for_text("Environment", Duration::from_secs(10))
-        .expect("terminal-setup output");
+        .expect("doctor output");
     assert!(
         !harness.contains_text("xtversion"),
         "xtversion line should be absent when the terminal never replied"
@@ -235,12 +229,10 @@ async fn unknown_brand_malformed_reply_is_discarded() {
     assert!(!harness.contains_text("panicked"));
     assert_no_probe_garbage_on_screen(&harness);
 
-    harness
-        .inject_keys(b"/terminal-setup\r")
-        .expect("run /terminal-setup");
+    harness.inject_keys(b"/doctor\r").expect("run /doctor");
     harness
         .wait_for_text("Environment", Duration::from_secs(10))
-        .expect("terminal-setup output");
+        .expect("doctor output");
     assert!(
         !harness.contains_text("xtversion"),
         "malformed reply must not produce an xtversion line"
@@ -276,12 +268,10 @@ async fn unknown_brand_late_reply_swallowed_and_recorded() {
         .expect("welcome text");
     assert_no_probe_garbage_on_screen(&harness);
 
-    harness
-        .inject_keys(b"/terminal-setup\r")
-        .expect("run /terminal-setup");
+    harness.inject_keys(b"/doctor\r").expect("run /doctor");
     harness
         .wait_for_text("PtyHarnessTerm 9.9", Duration::from_secs(10))
-        .expect("late XTVERSION identity shown in /terminal-setup");
+        .expect("late XTVERSION identity shown in /doctor");
 
     assert!(!harness.contains_text("panicked"));
     harness.quit().expect("clean quit");
@@ -345,12 +335,10 @@ async fn unknown_brand_split_reply_round_trip() {
         .expect("welcome text");
     assert_no_probe_garbage_on_screen(&harness);
 
-    harness
-        .inject_keys(b"/terminal-setup\r")
-        .expect("run /terminal-setup");
+    harness.inject_keys(b"/doctor\r").expect("run /doctor");
     harness
         .wait_for_text("PtyHarnessTerm 9.9", Duration::from_secs(10))
-        .expect("split XTVERSION reply shown in /terminal-setup");
+        .expect("split XTVERSION reply shown in /doctor");
 
     assert!(!harness.contains_text("panicked"));
     harness.quit().expect("clean quit");