Synced from monorepo
Synced from monorepo Changes: - Workspace server: surface preview-proxy metrics through the hub metric pump - Shell: reclaim a session’s retained state in one entry - Shell: reclaim a session’s resident state in one entry - Pager: withhold key event types from Alacritty builds that double keys - Tools: cancel a session’s subagents when it closes - Pager: keep the whole plan in scrollback and separate reasoning from output in minimal mode - Pager: probe terminal version over DA2 and include it with feedback - SuperGrok Plus: identity, CLI, and analytics tier surfaces - Shell: inherit the session process scope into subagents - Pager: build @-file-search matcher lazily on first use - Tools: fix description and output contradictions in tool definitions - Workspace: degrade @-file-search instead of aborting on thread exhaustion - Tools: reap a session’s LSP servers when it closes - Tools: fix contradictions and defects in tool descriptions, schemas, and harness pools - MCP: reap stdio MCP children on session close - Shell: reuse spawn-time skill discovery for session telemetry - Tools: stop leaking shell-wrapper positional params into sourced scripts (fixes activate_conda under persistent/static shell) - Shell: self-heal corrupt session-search SQLite cache - Workspace: cap workspace-server tokio workers on many-core hosts - Shell: reap a session’s child processes when it closes - Crash handler: capture SIGABRT so panic-aborts leave crash reports - CLI chat proxy: team-scoped Grok Code managed-config admin routes - MCP: add CLI enable/disable for MCP servers - Shell: cap tokio worker threads for startup thread demand - Workspace: harden git_commit and add git_sync_base operation - Circuit breaker: add feature-gated gRPC retry policy Source-Revision: 2a818575225183d8ca915f5632a09b8067b5156a
This commit is contained in:
grokkybara[bot]
parent
02d9359435
commit
5da6962e4a
192 changed files with 10337 additions and 3421 deletions
|
|
@ -271,7 +271,8 @@ During a session, the active method handles all mid-session refreshes.
|
|||
|
||||
## Related settings
|
||||
|
||||
`/privacy` does not change these config knobs:
|
||||
Coding-data sharing — **Coding data, retention, and training** in Settings,
|
||||
which `/privacy` opens — does not change these config knobs:
|
||||
|
||||
| Setting | How to set it |
|
||||
|---------|---------------|
|
||||
|
|
@ -279,10 +280,11 @@ During a session, the active method handles all mid-session refreshes.
|
|||
| `[telemetry] trace_upload` | `config.toml` or `GROK_TELEMETRY_TRACE_UPLOAD` |
|
||||
| External OpenTelemetry | `GROK_EXTERNAL_OTEL` / `[telemetry] otel_*`. See [Monitoring Usage](24-monitoring-usage.md). |
|
||||
|
||||
On team accounts, only a team admin can toggle privacy with `/privacy`.
|
||||
On team accounts, only a team admin can change coding-data sharing.
|
||||
Team admins can also enable or disable Zero Data Retention (ZDR) for their team.
|
||||
See [How to enable ZDR](https://docs.x.ai/developers/faq/security#how-to-enable-zdr).
|
||||
When ZDR is on, `/privacy` cannot change coding-data sharing.
|
||||
When ZDR is on, coding-data sharing cannot be changed at all — the settings
|
||||
row shows `ZDR` in place of the value.
|
||||
|
||||
See [Monitoring Usage](24-monitoring-usage.md#related-settings) and [Configuration](05-configuration.md#telemetry).
|
||||
|
||||
|
|
|
|||
|
|
@ -396,15 +396,14 @@ View credit usage or manage billing. Alias: `/cost`.
|
|||
|
||||
### `/privacy`
|
||||
|
||||
Show or toggle privacy and data-retention status.
|
||||
Open Settings on **Coding data, retention, and training**, where you choose
|
||||
**Opt in** or **Opt out**. Takes no arguments.
|
||||
|
||||
```
|
||||
/privacy
|
||||
/privacy opt-in
|
||||
/privacy opt-out
|
||||
```
|
||||
|
||||
`/privacy` doesn't touch `[features] telemetry`, `trace_upload`, or your external OTEL settings — see [Monitoring Usage](24-monitoring-usage.md#related-settings). On team accounts, only a team admin can toggle privacy this way, and admins can also enable or disable Zero Data Retention for the team ([how to enable ZDR](https://docs.x.ai/developers/faq/security#how-to-enable-zdr)).
|
||||
This setting doesn't touch `[features] telemetry`, `trace_upload`, or your external OTEL settings — see [Monitoring Usage](24-monitoring-usage.md#related-settings). On team accounts only a team admin can change it, and admins can also enable or disable Zero Data Retention for the team ([how to enable ZDR](https://docs.x.ai/developers/faq/security#how-to-enable-zdr)). When the choice isn't yours to make, the row says so — `ZDR` or `· Admin Managed` — instead of opening the chooser.
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -486,7 +486,7 @@ Keyboard shortcuts are **not** configurable — all bindings are built in. See [
|
|||
These are independent knobs (see [Monitoring Usage](24-monitoring-usage.md#related-settings)):
|
||||
|
||||
- **`[features] telemetry`** / `GROK_TELEMETRY_ENABLED` — the product-analytics master switch. `/privacy` doesn't change it.
|
||||
- **`/privacy`** / Settings — coding-data sharing, separate from telemetry.
|
||||
- **Coding data, retention, and training** — the Settings row `/privacy` opens; coding-data sharing, separate from telemetry.
|
||||
- **`[telemetry] trace_upload`** / `GROK_TELEMETRY_TRACE_UPLOAD` — session traces; follows telemetry when unset.
|
||||
- **`[telemetry] otel_*`** / `GROK_EXTERNAL_OTEL` — external OTEL to your own collector (below).
|
||||
|
||||
|
|
|
|||
|
|
@ -109,6 +109,10 @@ grok mcp add --transport sse linear https://mcp.linear.app/sse
|
|||
# Remove a server
|
||||
grok mcp remove github
|
||||
|
||||
# Enable or disable a local/TOML (or compat-sourced) server
|
||||
grok mcp enable github
|
||||
grok mcp disable github
|
||||
|
||||
# Diagnose a server's configuration and connectivity
|
||||
grok mcp doctor # Check every configured server
|
||||
grok mcp doctor github # Check one server
|
||||
|
|
@ -117,10 +121,16 @@ grok mcp doctor --json # Machine-readable output
|
|||
|
||||
The transport defaults to `stdio`; pass `--transport http` or `--transport sse` for remote servers.
|
||||
|
||||
By default `grok mcp add` writes to `~/.grok/config.toml` (`--scope user`). Use `--scope project` to write to `.grok/config.toml` in the current directory instead, which can be committed and shared with your team (see [Project-Scoped MCP Servers](#project-scoped-mcp-servers)). Header and environment variable values are stored verbatim, so reference secrets as `${VAR}` instead of pasting them into a committed project config (see [Example Configurations](#example-configurations)). `grok mcp list` shows servers from both scopes, marking project-scoped ones with `(project)`.
|
||||
By default `grok mcp add` writes to `~/.grok/config.toml` (`--scope user`). Use `--scope project` to write to `.grok/config.toml` in the current directory instead, which can be committed and shared with your team (see [Project-Scoped MCP Servers](#project-scoped-mcp-servers)). Header and environment variable values are stored verbatim, so reference secrets as `${VAR}` instead of pasting them into a committed project config (see [Example Configurations](#example-configurations)). `grok mcp list` shows servers from both scopes, marking project-scoped ones with `(project)` and disabled ones with `(disabled)`.
|
||||
|
||||
`grok mcp remove` searches both scopes and exits 0 after removing the server. It exits 1 when the name is not found, or when the name is defined in both user and project scope — pass `--scope` to say which one to remove.
|
||||
|
||||
`grok mcp enable` / `disable` persist the personal on/off state to user `~/.grok/config.toml` (`disabled_mcp_servers`, and `[mcp_servers.<name>].enabled` when that entry exists). Scope:
|
||||
|
||||
- **Known names:** user/project Grok TOML, names already on the disabled list, compat sources (`.mcp.json`, Claude, Cursor), **plugin** MCP servers (same discovery as doctor/`/mcps`), and legacy managed `grok_com_*` (no local entry required).
|
||||
- **Enable only:** if the cwd-nearest project definition has sticky `enabled = false`, that single key is cleared (comments preserved); disable never rewrites project configs.
|
||||
- **Not full `/mcps` parity:** gateway connectors (`managed_gateway:…`, stored under `disabled_mcp_tools.__managed_gateway_connectors`) stay Space-only in the TUI. Idempotent; unknown names exit 1.
|
||||
|
||||
Breaking changes from earlier releases: `--env` now takes one `KEY=value` per flag (use `-e A=1 -e B=2`, not `--env A=1 B=2`), and server names may only contain letters, numbers, hyphens, and underscores.
|
||||
|
||||
---
|
||||
|
|
@ -171,7 +181,7 @@ MCP tools are namespaced with the server name to avoid collisions:
|
|||
|
||||
## Toggle Servers at Runtime
|
||||
|
||||
You can enable or disable MCP servers during a session without restarting Grok.
|
||||
You can enable or disable MCP servers without restarting Grok (TUI `/mcps` or CLI — see [CLI Management](#cli-management)).
|
||||
|
||||
### The /mcps Modal
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ These knobs are independent of each other (and of this guide's external OTEL str
|
|||
| Setting | How to set it |
|
||||
|---------|---------------|
|
||||
| Telemetry master switch | `[features] telemetry` / `GROK_TELEMETRY_ENABLED` |
|
||||
| `/privacy` | `/privacy opt-in` / `/privacy opt-out`, or Settings |
|
||||
| Coding data, retention, and training | Settings — `/privacy` opens the row |
|
||||
| Trace upload | `[telemetry] trace_upload` / `GROK_TELEMETRY_TRACE_UPLOAD` |
|
||||
| External OpenTelemetry | `GROK_EXTERNAL_OTEL` / `[telemetry] otel_*` (this guide) |
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue