diff --git a/content/en/docs/claude-code/self-hosted-environments-configuration.md b/content/en/docs/claude-code/self-hosted-environments-configuration.md
index 27ac571b0..b5360a1a9 100644
--- a/content/en/docs/claude-code/self-hosted-environments-configuration.md
+++ b/content/en/docs/claude-code/self-hosted-environments-configuration.md
@@ -7,7 +7,7 @@
> Customize self-hosted environment sessions with wrapper scripts for per-session credentials, lifecycle hooks, and on-demand runner spawning.
- Self-hosted environments are in public beta on Team and Enterprise plans; an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) enables them by turning on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments). This page assumes a working runner; see the [quickstart](/docs/en/self-hosted-environments-quickstart) for setup and [Deploy to production](/docs/en/self-hosted-environments-deploy) for the fleet recipes.
+ Self-hosted environments are in public beta on Team and Enterprise plans; an [Owner](/docs/en/cloud-environments#organization-shared-environments) enables them by turning on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments). This page assumes a working runner; see the [quickstart](/docs/en/self-hosted-environments-quickstart) for setup and [Deploy to production](/docs/en/self-hosted-environments-deploy) for the fleet recipes.
A [self-hosted environment](/docs/en/self-hosted-environments) runs Claude Code [cloud sessions](/docs/en/claude-code-on-the-web) on your own infrastructure, executed by a runner process you deploy. With no configuration, that runner clones the session's repository, spawns Claude Code, and cleans up. This page is for the platform engineer operating the runners: it covers the extension points for when those defaults don't fit, from per-session credential provisioning to replacing checkout entirely. Wrappers and hooks run as executable files on the runner host, which is Linux or macOS, and the examples on this page assume a POSIX shell.
@@ -225,7 +225,7 @@ The contract has four provisioner-agnostic rules:
1. **Be idempotent on `CLAUDE_RUNNER_ORDER_ID`.** Redelivery of the same request must spawn at most one runner. Derive a deterministic resource name from the ID and let your platform reject the duplicate.
2. **Don't retry the workload.** One order ID means at most one created workload. If the runner never registers, Anthropic re-requests with a fresh order ID after `--expected-spawn-seconds`.
-3. **Use the exit-code contract.** Exit 0 means submitted. Exit 1 means retryable failure; the session backs off and is re-offered. Exit 2 or higher means non-retryable; the session is blocked from spawning again until an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) selects **Retry** on it in the environment's **Activity** tab. On non-zero exit, the tail of the hook's stderr appears there as the failure reason, so write the actionable error to stderr and never secrets. For a pre-warming request there is no session to fail: the orchestrator logs a non-zero exit locally only, and the server re-requests the spawn after the lease.
+3. **Use the exit-code contract.** Exit 0 means submitted. Exit 1 means retryable failure; the session backs off and is re-offered. Exit 2 or higher means non-retryable; the session is blocked from spawning again until an [Owner](/docs/en/cloud-environments#organization-shared-environments) selects **Retry** on it in the environment's **Activity** tab. On non-zero exit, the tail of the hook's stderr appears there as the failure reason, so write the actionable error to stderr and never secrets. For a pre-warming request there is no session to fail: the orchestrator logs a non-zero exit locally only, and the server re-requests the spawn after the lease.
4. **Set `--expected-spawn-seconds` to at least your p99 boot time.** This is the server-side lease. All orchestrator replicas must use the same value.
Everything the hook writes to stdout or stderr appears in the orchestrator's log with credentials automatically redacted. If sessions stay queued, check the orchestrator's `/healthz` body for queue counts, then open your environment's **Activity** tab on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments): expand a failed session there for its spawn error, and select **Retry** to re-request it.
@@ -378,7 +378,7 @@ To pre-approve specific tools instead, append `--allowed-tools` with your rules,
The runner gives each session its own config directory, seeded from an in-memory snapshot of the host's `~/.claude/` that the runner captures once at startup: `settings.json`, `CLAUDE.md`, hooks, agents, commands, and skills in your runner image apply to every session as the user-level baseline. Because the snapshot is taken at startup, config changes on a running host take effect only after a runner restart. Set `SELF_HOSTED_RUNNER_HOST_CONFIG_DIR` to seed from a different path, or point it at an empty directory to disable seeding.
-Repository-committed `.claude/settings.json` layers on top as project settings. Sessions also read [`managed-settings.json`](/docs/en/settings#where-settings-live) from the standard system path in your runner image, but the managed tier uses one source at a time, and [server-managed settings](/docs/en/server-managed-settings) are checked first: if your organization delivers any server-managed keys, sessions ignore the runner image's managed file, except that `env` blocks merge per key across managed sources. See [settings precedence](/docs/en/settings#settings-precedence).
+Repository-committed `.claude/settings.json` layers on top as project settings. Sessions also read [`managed-settings.json`](/docs/en/settings#where-settings-live) from the standard system path in your runner image, but the managed tier uses one source at a time, and [server-managed settings](/docs/en/server-managed-settings) are checked first: if your organization delivers any server-managed keys, sessions ignore the runner image's managed file except for its cross-source keys. Claude Code still reads the `env` block and the other [keys it reads from every admin source](/docs/en/managed-settings#keys-read-from-every-admin-source) from that file, such as the sandbox locks, the sandbox binary paths, and `forceRemoteSettingsRefresh`. See [settings precedence](/docs/en/settings#settings-precedence).
When Anthropic's control plane supplies a session with [Claude Code hooks](/docs/en/hooks), the runner installs them alongside, not over, your own configuration. Requires Claude Code v2.1.229 or later.
diff --git a/content/en/docs/claude-code/self-hosted-environments-deploy.md b/content/en/docs/claude-code/self-hosted-environments-deploy.md
index 0b6797837..4e41400a8 100644
--- a/content/en/docs/claude-code/self-hosted-environments-deploy.md
+++ b/content/en/docs/claude-code/self-hosted-environments-deploy.md
@@ -29,7 +29,7 @@ A self-hosted runner executes arbitrary, model-directed code on your infrastruct
The block applies to your wrapper script and lifecycle hooks too, since they share the container. Authenticate any token exchange with the [session JWT](/docs/en/self-hosted-environments-identity) against your own token service over allowlisted egress, or use a file-based web identity such as IAM Roles for Service Accounts (IRSA) on Amazon EKS.
* **Per-runner filesystem isolation**: each runner process gets its own working directory that no other process on the host can read or write. Make `--hooks-dir`, the wrapper script, and the host's `~/.claude/` read-only to the session, either built into the image or mounted read-only.
-* **Dispatch is organization-wide**: any member of your Anthropic organization can dispatch a session to any of its environments, and there's no per-environment access control on dispatch. Treat every runner host as reachable for code execution by every org member, and place data or credentials on a runner host only if every org member is allowed to read them. [`--lock-to-account`](/docs/en/self-hosted-environments-reference#runner-cli-flags) bounds which account's sessions a given host executes, but dispatch into the environment itself stays organization-wide. To make self-hosted environments the only picker option, an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) can hide Anthropic-hosted environments for the whole organization from the [**Cloud environments** page](https://claude.ai/admin-settings/cloud-environments).
+* **Dispatch is organization-wide**: any member of your Anthropic organization can dispatch a session to any of its environments, and there's no per-environment access control on dispatch. Treat every runner host as reachable for code execution by every org member, and place data or credentials on a runner host only if every org member is allowed to read them. [`--lock-to-account`](/docs/en/self-hosted-environments-reference#runner-cli-flags) bounds which account's sessions a given host executes, but dispatch into the environment itself stays organization-wide. To make self-hosted environments the only picker option, an [Owner](/docs/en/cloud-environments#organization-shared-environments) can hide Anthropic-hosted environments for the whole organization from the [**Cloud environments** page](https://claude.ai/admin-settings/cloud-environments).
* **Enforce the repo-settings guard**: choose the guard mode with [`--confine-repo-settings`](/docs/en/self-hosted-environments-reference#runner-cli-flags). The default `warn` logs a violation and still spawns the session, `enforce` refuses the session, and `off` disables the scan. The runner scans each repository's committed settings for:
* A grant that resolves outside that session's own workspace: an `additionalDirectories` entry, an `Edit`, `Write`, or `NotebookEdit` rule in `permissions.allow`, or a `sandbox.filesystem.allowWrite` or `allowRead` entry
diff --git a/content/en/docs/claude-code/self-hosted-environments-identity.md b/content/en/docs/claude-code/self-hosted-environments-identity.md
index 6784e5b2c..a13445396 100644
--- a/content/en/docs/claude-code/self-hosted-environments-identity.md
+++ b/content/en/docs/claude-code/self-hosted-environments-identity.md
@@ -7,7 +7,7 @@
> Verify the CLAUDE_CODE_SESSION_ACCESS_TOKEN JWT so services on your network can trust requests from sessions in your self-hosted environment.
- Self-hosted environments are in public beta on Team and Enterprise plans; an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) enables them by turning on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments). This page covers session identity verification; see the [quickstart](/docs/en/self-hosted-environments-quickstart) for setup and [Deploy to production](/docs/en/self-hosted-environments-deploy) for the fleet recipes.
+ Self-hosted environments are in public beta on Team and Enterprise plans; an [Owner](/docs/en/cloud-environments#organization-shared-environments) enables them by turning on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments). This page covers session identity verification; see the [quickstart](/docs/en/self-hosted-environments-quickstart) for setup and [Deploy to production](/docs/en/self-hosted-environments-deploy) for the fleet recipes.
A [self-hosted environment](/docs/en/self-hosted-environments) lets [Claude Code on the web](/docs/en/claude-code-on-the-web) sessions run on infrastructure you operate instead of on Anthropic's. Because the session runs inside your network, Claude can call your internal services directly. Those services need a way to confirm that a request really came from a Claude Code session in your environment, and to identify which user created that session.
diff --git a/content/en/docs/claude-code/self-hosted-environments-quickstart.md b/content/en/docs/claude-code/self-hosted-environments-quickstart.md
index 6b379b49e..82aac3743 100644
--- a/content/en/docs/claude-code/self-hosted-environments-quickstart.md
+++ b/content/en/docs/claude-code/self-hosted-environments-quickstart.md
@@ -20,7 +20,7 @@ By the end you'll have an environment on the [**Cloud environments** admin page]
The claude.ai side needs:
-* **Allow self-hosted environments** turned on by an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments); the **New** button doesn't appear until it is. If you don't hold the role, someone who does can create the environment and hand you its secret; the runner and terminal steps on this page need no claude.ai role, and where a step checks status in the admin UI, the runner's own log lines give you the same signal.
+* **Allow self-hosted environments** turned on by an [Owner](/docs/en/cloud-environments#organization-shared-environments) on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments); the **New** button doesn't appear until it is. If you don't hold the role, someone who does can create the environment and hand you its secret; the runner and terminal steps on this page need no claude.ai role, and where a step checks status in the admin UI, the runner's own log lines give you the same signal.
* A [GitHub connection](/docs/en/claude-code-on-the-web#github-authentication-options) for your organization, so developers can pick repositories when they start sessions.
### Host and network
@@ -47,7 +47,7 @@ A ready host prints the runner's usage text, listing flags such as `--environmen
## Set up an environment and runner
-Claude Code includes a guided setup: an interactive Claude Code session that walks you through creating the environment in the admin UI, starts a local runner with the secret file you save, confirms that the runner registers, and writes a cheat sheet to `./runner-setup/CHEAT-SHEET.md`. Run it on a machine where you've signed in with `claude auth login` using an account that holds an Owner or admin role; it isn't available with API keys or third-party model providers. On hosts where an interactive session isn't possible, use the manual steps below instead. Confirm the [version check](#software-on-the-runner-host) passed first: on versions older than 2.1.224, this command starts an ordinary Claude session with the words as the prompt instead of the guided setup. To start the guided setup, run the setup subcommand and follow the prompts:
+Claude Code includes a guided setup: an interactive Claude Code session that walks you through creating the environment in the admin UI, starts a local runner with the secret file you save, confirms that the runner registers, and writes a cheat sheet to `./runner-setup/CHEAT-SHEET.md`. Run it on a machine where you've signed in with `claude auth login` using an account that holds an Owner role; it isn't available with API keys or third-party model providers. On hosts where an interactive session isn't possible, use the manual steps below instead. Confirm the [version check](#software-on-the-runner-host) passed first: on versions older than 2.1.224, this command starts an ordinary Claude session with the words as the prompt instead of the guided setup. To start the guided setup, run the setup subcommand and follow the prompts:
```bash theme={null}
claude self-hosted-runner setup
diff --git a/content/en/docs/claude-code/self-hosted-environments-reference.md b/content/en/docs/claude-code/self-hosted-environments-reference.md
index 38e4cfdc9..388e6da9a 100644
--- a/content/en/docs/claude-code/self-hosted-environments-reference.md
+++ b/content/en/docs/claude-code/self-hosted-environments-reference.md
@@ -7,7 +7,7 @@
> Complete reference for the self-hosted runner and orchestrator: CLI flags, environment variables, and Prometheus metrics.
- Self-hosted environments are in public beta on Team and Enterprise plans; an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) enables them by turning on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments). This page is the flag and metric reference; see the [quickstart](/docs/en/self-hosted-environments-quickstart) for setup and [Deploy to production](/docs/en/self-hosted-environments-deploy) for the fleet recipes.
+ Self-hosted environments are in public beta on Team and Enterprise plans; an [Owner](/docs/en/cloud-environments#organization-shared-environments) enables them by turning on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments). This page is the flag and metric reference; see the [quickstart](/docs/en/self-hosted-environments-quickstart) for setup and [Deploy to production](/docs/en/self-hosted-environments-deploy) for the fleet recipes.
This page is the reference for the two processes you run in a [self-hosted environment](/docs/en/self-hosted-environments): the runner, which executes Claude Code [cloud sessions](/docs/en/claude-code-on-the-web) on your hosts, and the optional autoscaling orchestrator, which starts runners as sessions queue. Each has its own flag table. Both run on Linux or macOS hosts, which the defaults such as `/workspace` and `~/.claude` assume. Run `claude self-hosted-runner --help` for the authoritative list on your installed version.
@@ -157,7 +157,7 @@ The orchestrator serves its own series at `GET /metrics` on the same port as its
| `claude_code_self_hosted_orchestrator_poll_errors_total{error_kind}` | Cumulative PollSpawnHints failures by kind: `transport`, `timeout`, `5xx`, `429`, or `4xx`. All five series are present from process start; alert on `rate(...[5m]) > 0`. |
| `claude_code_self_hosted_orchestrator_queue_pending_sessions` | Spawn requests claimable right now |
| `claude_code_self_hosted_orchestrator_queue_backing_off_sessions` | Spawn requests in retry backoff after a retryable hook failure |
-| `claude_code_self_hosted_orchestrator_queue_circuit_broken_sessions` | Spawn requests blocked until an Owner or admin retries them from the environment's **Activity** tab; alert if above zero |
+| `claude_code_self_hosted_orchestrator_queue_circuit_broken_sessions` | Spawn requests blocked until an Owner retries them from the environment's **Activity** tab; alert if above zero |
| `claude_code_self_hosted_orchestrator_pool_pending_sessions` | Total sessions waiting on a runner for this environment. Environment-wide aggregate, identical on every orchestrator instance: use `MAX` rather than `SUM` across instances. |
| `claude_code_self_hosted_orchestrator_pool_active_sessions` | Sessions currently assigned to an alive runner in this environment. Environment-wide aggregate, identical on every orchestrator instance: use `MAX` rather than `SUM` across instances. |
| `claude_code_self_hosted_orchestrator_spawn_hooks_total{result}` | Cumulative `spawn-runner` hook outcomes: `ok`, `retryable`, `non_retryable`. Counts orchestrator hook invocations, not session children the runners spawn: not comparable to `sessions_started_total`, since capacity above one, warm pools, and runners spawned again for the same session all diverge the two. |
diff --git a/content/en/docs/claude-code/self-hosted-environments-testing.md b/content/en/docs/claude-code/self-hosted-environments-testing.md
index db87c781c..6b8f29df7 100644
--- a/content/en/docs/claude-code/self-hosted-environments-testing.md
+++ b/content/en/docs/claude-code/self-hosted-environments-testing.md
@@ -202,9 +202,9 @@ Create and delete environments programmatically so each CI run gets a clean one;
### Mint the admin token
-`$ADMIN_TOKEN` is a claude.ai OAuth access token for an account that holds an Owner or admin role, minted the same way as [Authenticate from CI](#authenticate-from-ci):
+`$ADMIN_TOKEN` is a claude.ai OAuth access token for an account that holds an Owner role, minted the same way as [Authenticate from CI](#authenticate-from-ci):
-* **Mint it**: run `claude auth login` with an account that holds an Owner or admin role, then read the current access token from the OS keychain on macOS or `~/.claude/.credentials.json` on Linux and Windows.
+* **Mint it**: run `claude auth login` with an account that holds an Owner role, then read the current access token from the OS keychain on macOS or `~/.claude/.credentials.json` on Linux and Windows.
* **Read it fresh each run**: the CLI rotates the access token, and the same 30-day refresh-grant cap applies, so don't store a copy.
* **Pass it via stdin**: as the example does, so the token never lands in curl's argument list or your build log.
@@ -223,7 +223,7 @@ ENVIRONMENT_ID=$(jq -er .pool.pool_id <<<"$create")
ENVIRONMENT_SECRET=$(jq -er .pool_secret <<<"$create")
```
-Until an [Owner or admin turns on **Allow self-hosted environments**](/docs/en/self-hosted-environments#availability-and-limitations) for the organization, the call fails with a `403` `permission_error` reading `self-hosted runners are disabled by your organization's policy`.
+Until an [Owner turns on **Allow self-hosted environments**](/docs/en/self-hosted-environments#availability-and-limitations) for the organization, the call fails with a `403` `permission_error` reading `self-hosted runners are disabled by your organization's policy`.
Start a runner on this host with `SELF_HOSTED_RUNNER_ENVIRONMENT_SECRET=$ENVIRONMENT_SECRET`, plus the capture hook and `E2E_REPLY_DIR` per [Install the capture hook](#install-the-capture-hook-on-your-test-runner), then run the test script.
diff --git a/content/en/docs/claude-code/self-hosted-environments.md b/content/en/docs/claude-code/self-hosted-environments.md
index b136be11d..99069ca8e 100644
--- a/content/en/docs/claude-code/self-hosted-environments.md
+++ b/content/en/docs/claude-code/self-hosted-environments.md
@@ -40,7 +40,7 @@ You can start runners yourself and keep them running, or run the [autoscaling or
Check these before planning a rollout:
-* **Plans**: public beta for Team and Enterprise organizations. Self-hosted environments are off by default; an [Owner or admin](/docs/en/cloud-environments#organization-shared-environments) turns on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments), which requires [Claude Code on the web](/docs/en/claude-code-on-the-web) to be enabled for the organization.
+* **Plans**: public beta for Team and Enterprise organizations. Self-hosted environments are off by default; an [Owner](/docs/en/cloud-environments#organization-shared-environments) turns on **Allow self-hosted environments** on the [**Cloud environments** admin page](https://claude.ai/admin-settings/cloud-environments), which requires [Claude Code on the web](/docs/en/claude-code-on-the-web) to be enabled for the organization.
* **Zero Data Retention**: unavailable for organizations with [Zero Data Retention](/docs/en/zero-data-retention) enabled.
* **Model inference**: sessions use the Anthropic API, and inference can't be routed through [Amazon Bedrock, Google Cloud's Agent Platform, Microsoft Foundry](/docs/en/third-party-integrations), or an [LLM gateway](/docs/en/llm-gateway).
* **Surfaces**: sessions started from [Claude Code on the web](/docs/en/claude-code-on-the-web), the mobile and desktop apps, [scheduled routines](/docs/en/routines), and the terminal, with [`claude --cloud`](/docs/en/claude-code-on-the-web#from-terminal-to-web) or an [`--environment` dispatch](/docs/en/self-hosted-environments-testing#run-the-test-loop), can run in self-hosted environments. [Claude Tag](https://claude.com/docs/claude-tag/overview), [Claude Security](/docs/en/claude-security), and [Code Review](/docs/en/code-review) sessions don't route to them yet. Support for those surfaces follows separately.
diff --git a/content/en/docs/claude-code/sessions.md b/content/en/docs/claude-code/sessions.md
index 23314cd95..7c5559b57 100644
--- a/content/en/docs/claude-code/sessions.md
+++ b/content/en/docs/claude-code/sessions.md
@@ -225,6 +225,8 @@ Once you've named a config directory's project directory, keep launching with th
## See also
+These pages cover related session and parallelism mechanics:
+
* [Worktrees](/docs/en/worktrees): run isolated parallel sessions on separate branches
* [Checkpointing](/docs/en/checkpointing): rewind code and conversation to an earlier point
* [Context window](/docs/en/context-window): what fills context and what survives compaction
diff --git a/content/en/docs/claude-code/settings.md b/content/en/docs/claude-code/settings.md
index 702356b47..2e0a22d42 100644
--- a/content/en/docs/claude-code/settings.md
+++ b/content/en/docs/claude-code/settings.md
@@ -788,7 +788,7 @@ A cloud session, on [Claude Code on the web](/docs/en/claude-code-on-the-web) or
* **Shared project settings** (`.claude/settings.json`): read, because the file is part of the clone. Commit a setting there to apply it in cloud sessions.
* **User and project local settings** (`~/.claude/settings.json` and `.claude/settings.local.json`): not read. Both stay on your machine, and the local file isn't in the clone.
-* **Managed settings**: only [server-managed settings](/docs/en/server-managed-settings) reach a cloud session; a `managed-settings.json` file or MDM profile on your device doesn't. A [self-hosted environment](/docs/en/self-hosted-environments) reads the managed settings file in its runner image only when server-managed settings deliver no keys; see [settings precedence](/docs/en/server-managed-settings#settings-precedence) on that page.
+* **Managed settings**: only [server-managed settings](/docs/en/server-managed-settings) reach a cloud session; a `managed-settings.json` file or MDM profile on your device doesn't. A [self-hosted environment](/docs/en/self-hosted-environments) reads the managed settings file in its runner image only when server-managed settings deliver no keys, apart from the [keys Claude Code reads from every admin source](/docs/en/managed-settings#keys-read-from-every-admin-source); see [settings precedence](/docs/en/server-managed-settings#settings-precedence).
* **`/config`**: on the web, opens the Claude Code section of your claude.ai settings instead of changing a value. To change a setting for a cloud session, set an [environment variable](/docs/en/cloud-environments#set-environment-variables) on the environment or commit the key to the repository's `.claude/settings.json`.
[What carries over from your setup](/docs/en/cloud-environments#what-carries-over-from-your-setup) lists the rest: `CLAUDE.md`, skills, MCP servers, plugins, and credentials.
diff --git a/content/en/docs/claude-code/slack.md b/content/en/docs/claude-code/slack.md
index 553444fb5..7dc6a5024 100644
--- a/content/en/docs/claude-code/slack.md
+++ b/content/en/docs/claude-code/slack.md
@@ -189,12 +189,12 @@ This error means your Claude account has no cloud environment yet, not that an a
This entry applies to workspaces using [Claude Tag](https://claude.com/docs/claude-tag/overview), where Claude works in channels as your organization's shared identity, not as any member's account. If you created the channel's cloud environment at [claude.ai/code](https://claude.ai/code), it belongs to your personal account, and Claude can't start channel sessions in a personal environment. Claude Code fails the session immediately, and retrying doesn't help.
-If you're an Owner or admin, recreate the environment as an [organization-shared environment](/docs/en/cloud-environments#organization-shared-environments) from the **Cloud environments** page in [admin settings](https://claude.ai/admin-settings). You can apply it in two ways:
+If you're an Owner, recreate the environment as an [organization-shared environment](/docs/en/cloud-environments#organization-shared-environments) from the **Cloud environments** page in [admin settings](https://claude.ai/admin-settings). You can apply it in two ways:
* Set it as the organization default at [claude.ai/admin-settings/claude-code](https://claude.ai/admin-settings/claude-code).
* [Set it on the channel](https://claude.com/docs/claude-tag/admins/troubleshooting#channel-sessions-use-the-wrong-environment-or-can%E2%80%99t-find-one) in the Claude Tag admin settings.
-If you're not an Owner or admin, send this entry to one.
+If you're not an Owner, send this entry to one.
### Repository not showing
diff --git a/content/en/docs/claude-code/vs-code.md b/content/en/docs/claude-code/vs-code.md
index 29c42946d..8087fbc95 100644
--- a/content/en/docs/claude-code/vs-code.md
+++ b/content/en/docs/claude-code/vs-code.md
@@ -437,7 +437,7 @@ To manage MCP servers without leaving VS Code, type `/mcp` in the chat panel. Th
## Work with git
-Claude Code integrates with git to help with version control workflows directly in VS Code. Ask Claude to commit changes, create pull requests, or work across branches.
+Claude Code integrates with git to help with version control workflows directly in VS Code. Ask Claude to commit changes, create pull requests, or work across branches. To start Claude in an isolated worktree with its own files and branch, see [Run parallel sessions with worktrees](/docs/en/worktrees).
### Create commits and pull requests
@@ -451,16 +451,6 @@ summarize the changes I've made to the auth module
When creating pull requests, Claude generates descriptions based on the actual code changes and can add context about testing or implementation decisions.
-### Use git worktrees for parallel tasks
-
-Use the `--worktree` (`-w`) flag to start Claude in an isolated worktree with its own files and branch:
-
-```bash theme={null}
-claude --worktree feature-auth
-```
-
-Each worktree maintains independent file state while sharing git history. This prevents Claude instances from interfering with each other when working on different tasks. For more details, see [Run parallel sessions with Git worktrees](/docs/en/worktrees).
-
## Use third-party providers
By default, Claude Code connects directly to Anthropic's API. If your organization uses Amazon Bedrock, Google Cloud's Agent Platform, or Microsoft Foundry to access Claude, configure the extension to use your provider instead:
diff --git a/content/en/docs/claude-code/whats-new/2026-w32.md b/content/en/docs/claude-code/whats-new/2026-w32.md
index 0561816f5..16fcdc2e6 100644
--- a/content/en/docs/claude-code/whats-new/2026-w32.md
+++ b/content/en/docs/claude-code/whats-new/2026-w32.md
@@ -40,13 +40,13 @@
v2.1.224
- Self-hosted environments run Claude Code cloud sessions on your organization's own infrastructure, in public beta on Team and Enterprise plans. Run claude self-hosted-runner on your machines or containers to turn them into runners. When someone picks your environment while starting a session from claude.ai, the mobile or desktop apps, or `claude --cloud`, that session runs inside your network, with access to your internal services. An Owner or admin turns on Allow self-hosted environments in admin settings first.
+ Self-hosted environments run Claude Code cloud sessions on your organization's own infrastructure, in public beta on Team and Enterprise plans. Run claude self-hosted-runner on your machines or containers to turn them into runners. When someone picks your environment while starting a session from claude.ai, the mobile or desktop apps, or `claude --cloud`, that session runs inside your network, with access to your internal services. An Owner turns on Allow self-hosted environments in admin settings first.
- Signed in as an Owner or admin, run the guided setup, which walks you through creating the environment and starts a runner:
+ Signed in as an Owner, run the guided setup, which walks you through creating the environment and starts a runner:
```bash terminal theme={null}
claude self-hosted-runner setup
diff --git a/content/en/docs/claude-code/whats-new/2026-w33.md b/content/en/docs/claude-code/whats-new/2026-w33.md
new file mode 100644
index 000000000..207a17a83
--- /dev/null
+++ b/content/en/docs/claude-code/whats-new/2026-w33.md
@@ -0,0 +1,87 @@
+> ## Documentation Index
+> Fetch the complete documentation index at: https://code.claude.com/docs/llms.txt
+> Use this file to discover all available pages before exploring further.
+
+# Week 33 · August 10–14, 2026
+
+> Claude Code Desktop auto-continues after a usage limit resets, fork mode turns on by default, and GitLab merge requests and marketplaces join GitHub.
+
+
+
+
+
+ Auto-continue after a usage limit on Desktop
+ Desktop
+
+
+
When you hit your session limit in the Code tab of Claude Code Desktop, the limit card now offers an Auto-continue when limits reset checkbox. Check it, and the Desktop app retries the interrupted turn after the reset. The card shows the retry time. The weekly-limit card doesn't offer it.
+
+
+
+
+
+
The next time a session-limit card appears, check Auto-continue when limits reset and leave the session open. The card shows Auto-resuming at followed by the reset time, and the turn picks up on its own once the limit resets.
+
+
What to do when you hit a usage limit
+
+
+ Fork mode on by default
+ v2.1.232
+
+
+
Fork mode is now on by default in interactive sessions. Claude can request the fork subagent type, which inherits the full conversation and prompt cache instead of starting fresh, so you don't have to re-explain the context for a side task. Subagents Claude spawns in interactive sessions, apart from the ones an agent-team teammate spawns, also run in the background by default.
+
+
Start a fork yourself with a task that needs everything you've discussed so far:
+
+ ```text Claude Code theme={null}
+ > /subtask draft unit tests for the parser changes so far
+ ```
+
+
The fork appears in the panel below your prompt and its result arrives in your conversation when it finishes. To turn fork mode off, set CLAUDE\_CODE\_FORK\_SUBAGENT=0.
+
+
Turn fork mode on or off
+
+
+ GitLab merge requests and marketplaces
+ v2.1.232
+
+
+
Plugin marketplaces clone bare gitlab.com URLs, including nested subgroups. On v2.1.233 or later, pass a GitLab merge request URL to --worktree to branch from it, and the claude agents view labels sessions linked to a merge request as !N. Claude Code also redacts GitLab token families such as glpat- and glrt-, and protects the glab CLI's config store the same way it protects gh.
+
+
Start a session in a worktree branched from a merge request:
+
+ ```bash terminal theme={null}
+ claude --worktree https://gitlab.com/group/project/-/merge_requests/42
+ ```
+
+
When origin is on gitlab.com, Claude Code fetches merge-requests/42/head and opens the session on that branch in its own worktree.
+
+
Branch a worktree from a pull or merge request
+
+
Other wins
+
+
+
Type
@ in the prompt to
mention another Claude session by name, and Claude messages it directly with
SendMessage; a bare name that matches exactly one live session now delivers without a confirmation step
+
Interactive sessions on one machine keep
unique names: if you start or rename a session with a name another live session already uses, Claude Code gives yours a
name-word-word variant and tells you
+
Plugin marketplaces accept
command sources: a local command prints the plugin directory, which Claude Code re-resolves each session and applies without a restart
+
+
+
/code-review at high, xhigh, and max effort now runs in a background agent like the other levels
+
+
+
+
+
If your organization routes Claude Code through a
Claude apps gateway with spend limits, Claude Code shows the limit period, its reset time, and the operator's message when you reach the limit
+
+
+
+ /design
+ research preview
+
+
+
The /design skill brings Claude Design's artboard workflow into the CLI and Claude Code Desktop, built on artifacts. Run it with a brief and Claude publishes a canvas of editable artboards for your UI. Pick one, tweak it, then have Claude implement it. Available on Pro, Max, Team, and Enterprise. Requires v2.1.233 or later.
+
+
+
+
+
+
Describe what you want designed and let Claude draft the options:
+
+ ```text Claude Code theme={null}
+ > /design redesign the composer based on what people actually use it for
+ ```
+
+
Claude prints a link to the published canvas. Open it, pick an artboard, and tell Claude which option to implement.
+
+
Where artifacts are available
+
+
+ Concise output style
+ v2.1.237
+
+
+
Concise is a new built-in output style. Claude leads with the result and skips preamble and narration, while doing the work as thoroughly as in the Default style. When you ask for an explanation or more detail, Claude answers in full. Error reports, security warnings, and confirmations for destructive actions keep their complete content.
+
+
+
+
+
+
Turn it on under Output style in /config, or set it in your settings file:
+
+ ```json ~/.claude/settings.json {2} theme={null}
+ {
+ "outputStyle": "Concise"
+ }
+ ```
+
+
Run /clear or start a new session, and Claude's replies lead with the result.
+
+
Built-in output styles
+
+
+ Start a session on your machine from your phone
+ mobile
+
+
+
Any machine running claude remote-control now shows up as a device card at the top of the Code tab in the Claude app. Remote Control is also out of research preview.
+
+
+
+
+
+
Start Remote Control on the machine you want to reach, then open the Code tab on your phone:
+
+ ```bash terminal theme={null}
+ claude remote-control
+ ```
+
+
Your machine appears as a device card at the top of the Code tab. Tap it to pick a directory and start a session there.
+
+
Start a Remote Control session
+
+
Other wins
+
+
+
Claude Code now continues your session automatically when a claude.ai usage limit resets; turn it off from the Continue automatically at usage limit row in /config
+
The optional
spellcheck setting underlines misspelled words in the prompt input as you type, using your installed
aspell,
hunspell, or
ispell
+
On a branch with an open GitLab merge request, with the
glab CLI authenticated through
glab auth login, the footer shows an
MR !N badge colored by whether the merge request is a draft, open, or mergeable
+
Change the effort level from your phone or claude.ai/code and it
applies to the session on your machine; Remote Control sessions hosted by Desktop or VS Code also show connected devices the session's current permission mode
+
You can open
/permissions or run
/add-dir \ while Claude is working; permission rule changes apply to the rest of the current turn
+
When background tasks keep a
/goal waiting, Claude checks in on them after 30 minutes instead of waiting indefinitely and keeps checking in, at longer intervals while the session sits idle; set
CLAUDE\_CODE\_GOAL\_CHECKIN\_MINUTES=0 to opt out
+
Your own prompts now render markdown in the transcript, with highlighted code blocks, inline code, and lists, the same way replies do
+
The new
ANTHROPIC\_DEFAULT\_MODEL environment variable sets the model new sessions start on; a
/model pick still overrides it and persists across restarts
+
+
Set
keybindingFlavor to
"readline" to make
Ctrl+W in the prompt delete back to the previous whitespace, as Bash does, instead of stopping at punctuation such as
/
+
On native Windows, your Claude Code sessions can now
message each other with
SendMessage and find each other with
ListAgents, as on macOS and Linux
+
+
Self-hosted runners accept `--proxy-authorization-command` or `--proxy-authorization-file` to supply a fresh `Proxy-Authorization` header for
egress proxies that require one
+
+
+ 