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/app/queue_edit.rs

@@ -282,7 +282,7 @@ impl AgentView {
             self.prompt_mode = PromptMode::EditingQueued {
                 id,
                 original: text,
-                server_id,
+                server_id: server_id.clone(),
                 kind,
             };
             self.prompt_input_mode = if kind == QueueEntryKind::BashCommand {
@@ -291,6 +291,13 @@ impl AgentView {
                 PromptInputMode::Normal
             };
             self.set_active_pane(AgentPane::Prompt, false);
+            if let (Some(sid), Some(session_id)) = (server_id, self.session.session_id.clone()) {
+                self.pending_effects
+                    .push(crate::app::actions::Effect::QueueHoldEdit {
+                        session_id,
+                        id: sid,
+                    });
+            }
         }
     }
 
@@ -499,6 +506,18 @@ impl AgentView {
         if !matches!(self.prompt_mode, PromptMode::EditingQueued { .. }) {
             return;
         }
+        if let PromptMode::EditingQueued {
+            server_id: Some(sid),
+            ..
+        } = &self.prompt_mode
+            && let Some(session_id) = self.session.session_id.clone()
+        {
+            self.pending_effects
+                .push(crate::app::actions::Effect::QueueReleaseEdit {
+                    session_id,
+                    id: sid.clone(),
+                });
+        }
         let stash = self.stashed_prompt.take().unwrap_or_default();
         self.prompt.restore(stash);
         self.finish_editing_exit();
@@ -1156,7 +1175,10 @@ mod tests {
         // early-return) is what leaves the palette alone.
         agent.prompt_mode = editing_lone_local();
         agent.active_modal = Some(ActiveModal::CommandPalette {
-            entries: crate::views::modal::default_palette_entries(agent.sharing_enabled),
+            entries: crate::views::modal::default_palette_entries(
+                agent.sharing_enabled,
+                agent.prompt.slash_controller.screen_mode(),
+            ),
             state: crate::views::picker::PickerState::input_active(),
             window: crate::views::modal_window::ModalWindowState::new(),
         });