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-workspace/src/hub_server.rs

@@ -274,6 +274,7 @@ async fn tasks_snapshot(toolset: &FinalizedToolset) -> TasksSnapshotResponse {
             let _ = handle.0.send(SchedulerCommand::List { reply: reply_tx });
             reply_rx
                 .await
+                .map(|snapshot| snapshot.tasks)
                 .unwrap_or_default()
                 .into_iter()
                 .map(|t| ScheduledTaskSnapshotWire {
@@ -1126,7 +1127,10 @@ mod tests {
     use super::*;
     use crate::capability::CapabilityMode;
     use crate::handle::tests::{background_capable_cfg, make_handle, start_background_sleep};
-    use xai_grok_tools::implementations::grok_build::scheduler::types::ScheduledTask;
+    use xai_grok_tools::implementations::grok_build::scheduler::types::{
+        ScheduledTask, SchedulerState,
+    };
+    use xai_grok_tools::types::resources::State;
     use xai_tool_protocol::turn_hook;
     /// Helper: consume the first item from a ToolStream.
     async fn next_item(
@@ -1411,18 +1415,12 @@ mod tests {
             snap.background_tasks
         );
         {
-            let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
-            tokio::spawn(async move {
-                while let Some(cmd) = rx.recv().await {
-                    if let SchedulerCommand::List { reply } = cmd {
-                        let mut task = ScheduledTask::new(300, "check CI".into(), true, false);
-                        task.id = "loop-1".into();
-                        let _ = reply.send(vec![task]);
-                    }
-                }
-            });
             let toolset = session.toolset();
-            toolset.resources.lock().await.insert(SchedulerHandle(tx));
+            let mut resources = toolset.resources.lock().await;
+            let state = resources.get_or_default::<State<SchedulerState>>();
+            let mut task = ScheduledTask::new(300, "check CI".into(), true, false);
+            task.id = "loop-1".into();
+            state.tasks.push(task);
         }
         let snap = snapshot(&handler).await;
         assert_eq!(snap.scheduled_tasks.len(), 1);