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-shell/src/util/config/mcp.rs

@@ -1414,11 +1414,79 @@ pub fn session_registry_from_toml_opt(root: &TomlValue) -> Option<bool> {
     }
 }
 
+/// Overrides `[cli] session_registry`; usable before `~/.grok/config.toml` exists.
+pub const SESSION_REGISTRY_ENV_VAR: &str = "GROK_SESSION_REGISTRY";
+
+pub fn session_registry_from_env_opt() -> Option<bool> {
+    xai_grok_config::env_bool(SESSION_REGISTRY_ENV_VAR)
+}
+
+/// Where a local session-registry override came from.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum RegistrySource {
+    /// [`SESSION_REGISTRY_ENV_VAR`].
+    Env,
+    /// `[cli] session_registry` in config.toml.
+    ConfigToml,
+}
+
+impl RegistrySource {
+    /// The user-facing name of this source, for diagnostics.
+    pub const fn label(self) -> &'static str {
+        match self {
+            RegistrySource::Env => SESSION_REGISTRY_ENV_VAR,
+            RegistrySource::ConfigToml => "[cli] session_registry",
+        }
+    }
+}
+
+/// Env var, then `[cli] session_registry`; `None` defers to remote settings.
+pub fn session_registry_local_override_sourced(
+    root: Option<&TomlValue>,
+) -> Option<(bool, RegistrySource)> {
+    if let Some(v) = session_registry_from_env_opt() {
+        return Some((v, RegistrySource::Env));
+    }
+    root.and_then(session_registry_from_toml_opt)
+        .map(|v| (v, RegistrySource::ConfigToml))
+}
+
+pub fn session_registry_local_override(root: Option<&TomlValue>) -> Option<bool> {
+    session_registry_local_override_sourced(root).map(|(v, _)| v)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use toml::Value as TomlValue;
 
+    /// Env beats config.toml; unrecognized env defers; both absent defers to remote.
+    #[test]
+    #[serial_test::serial]
+    fn session_registry_local_override_precedence() {
+        let toml_true: TomlValue = toml::from_str("[cli]\nsession_registry = true").unwrap();
+        {
+            let _g = xai_grok_test_support::EnvGuard::set(SESSION_REGISTRY_ENV_VAR, "false");
+            assert_eq!(
+                session_registry_local_override_sourced(Some(&toml_true)),
+                Some((false, RegistrySource::Env)),
+                "env wins and reports itself as the source"
+            );
+        }
+        {
+            let _g = xai_grok_test_support::EnvGuard::set(SESSION_REGISTRY_ENV_VAR, "bogus");
+            assert_eq!(
+                session_registry_local_override_sourced(Some(&toml_true)),
+                Some((true, RegistrySource::ConfigToml)),
+                "unrecognized env values defer to config.toml"
+            );
+        }
+        {
+            let _g = xai_grok_test_support::EnvGuard::unset(SESSION_REGISTRY_ENV_VAR);
+            assert_eq!(session_registry_local_override_sourced(None), None);
+        }
+    }
+
     #[test]
     fn mcp_server_defined_at_checks_raw_key_presence() {
         let dir = tempfile::tempdir().unwrap();