Synced from monorepo
Synced from monorepo Changes: - Workspace server: report `/ready` as failed with dwell on hub connect failure - Refresh OIDC token for the Grok agent in the shell - ACP terminal output recorder - Cross-platform provider auth commands in the shell - Default `/resume` to Grok sessions with a hint for hidden external sessions - Resume sessions by title with `--resume` - Limit app-builder archive size - Data-driven tag labels for slash commands - Doctor fixes for tmux - Custom provider gateways and subprocess environment policy in the shell - `/tutorial` — opt-in onboarding tour of Grok Build - Soft and required CLI version checks in the shell - Privacy banner env overrides survive live settings updates - Add remote flag to override the image-edit model - Return profile fields from auth info even when the access token is expired - Add edit control on queued prompt rows - Keep fail-closed policy when clearing orphans with no team - Setting to disable the Ctrl+Space/F8 voice shortcut - Pass `--raw` to pw-record so Linux dictation works on older PipeWire - Validate git URLs when adding marketplace entries - Stop shipping stale tool-doc parameter and tool names - Re-point dashboard attach after `/fork` only when the parent was attached - Surface Grok Computer media-generation results as file-path chunks - Clear web background-task tray on kill and keep the task description - Show privacy upsell banner in agent view until acted on - Add tools-server client callback surface - Protect persistent global hook sources Source-Revision: 95d84f443eddcbed6cbfd6eed22e2eafe6b3939d
This commit is contained in:
parent
a5727c5960
commit
69f0ba880a
286 changed files with 22939 additions and 9624 deletions
|
|
@ -221,9 +221,11 @@ temperature = 0.7 # sampling temperature (0.0-2.0)
|
|||
top_p = 0.95 # nucleus sampling parameter
|
||||
max_completion_tokens = 8192 # max tokens per response
|
||||
context_window = 128000 # context window size (for auto-compact)
|
||||
query_params = { api-version = "2026-07-22" } # query params appended to every request URL
|
||||
env_http_headers = { "X-Tenant" = "TENANT_TOKEN" } # request headers from env vars, resolved at client build
|
||||
```
|
||||
|
||||
Credential resolution: `api_key` > `env_key` > signed-in session token > `XAI_API_KEY`.
|
||||
Credential resolution: `api_key` > `env_key` > signed-in session token > `XAI_API_KEY`. See [Custom Models](11-custom-models.md#request-query-parameters) for `query_params` and `env_http_headers`, and [Sandbox Mode](18-sandbox.md#shell-environment-policy) for `[shell_environment_policy]`, which restricts the environment variables tool subprocesses inherit.
|
||||
|
||||
To override a built-in model, use its name as the section key and set only the fields you need:
|
||||
|
||||
|
|
@ -513,6 +515,41 @@ otel_log_user_prompts = false # content gate (admins
|
|||
otel_log_tool_details = false # content gate (admins can pin via requirements)
|
||||
```
|
||||
|
||||
### Version pinning
|
||||
|
||||
Control which versions the CLI may auto-update to and which versions may run. Set
|
||||
these in `[cli]`, or in a managed layer for fleet-wide policy. Each has an
|
||||
environment override that can only tighten the bound, for CI and testing.
|
||||
|
||||
> **Changed:** `minimum_version` no longer blocks startup. It is now a soft
|
||||
> anti-downgrade floor for the updater. For a hard floor that prevents old
|
||||
> versions from starting, use `required_minimum_version`.
|
||||
|
||||
```toml
|
||||
[cli]
|
||||
minimum_version = "0.2.109" # updater won't downgrade below this
|
||||
maximum_version = "0.2.180" # updater won't install above this
|
||||
required_minimum_version = "0.2.100" # refuse to start below this
|
||||
required_maximum_version = "0.2.200" # refuse to start above this
|
||||
```
|
||||
|
||||
- `minimum_version` (`GROK_MINIMUM_VERSION`) is a soft anti-downgrade floor. The
|
||||
updater skips a target below it and keeps the current version. It never blocks
|
||||
startup.
|
||||
- `maximum_version` (`GROK_MAXIMUM_VERSION`) is a soft ceiling. The updater caps
|
||||
its target at it and never installs above it.
|
||||
- `required_minimum_version` (`GROK_REQUIRED_MINIMUM_VERSION`) and
|
||||
`required_maximum_version` (`GROK_REQUIRED_MAXIMUM_VERSION`) are hard bounds. If
|
||||
the running version is outside the range, the CLI exits at startup and instructs
|
||||
the user to install an approved version. `grok update` and `grok --version` keep
|
||||
working so an out-of-range install can recover.
|
||||
- Bounds resolve across config layers by tightening only: a floor takes the
|
||||
highest value and a ceiling the lowest, so a managed bound can't be loosened,
|
||||
and a user or environment bound can't cancel a managed hard bound. An invalid
|
||||
value is ignored so a bad policy can't block startup.
|
||||
- An explicit `grok update --version X` is allowed above the ceiling, to recover
|
||||
from a too-new install, and rejected below the hard floor.
|
||||
|
||||
### Enterprise deployment
|
||||
|
||||
A complete config for enterprise use:
|
||||
|
|
|
|||
Loading…
Reference in a new issue