warpdotdev · hongyi-chen · May 21, 2026 · May 21, 2026
diff --git a/src/content/docs/agent-platform/capabilities/index.mdx b/src/content/docs/agent-platform/capabilities/index.mdx
@@ -13,7 +13,6 @@ Agent capabilities are the core building blocks that define how Warp's agents op
 * [Skills](/agent-platform/capabilities/skills/) - Reusable, scoped instructions that teach agents how to perform specific tasks in your codebase.
 * [Planning](/agent-platform/capabilities/planning/) - Turn agent requests into organized, editable plans that execute step-by-step with full visibility.
 * [Task Lists](/agent-platform/capabilities/task-lists/) - Track complex workflows with automatic task lists that update progress in real time.
-* [Model Choice](/agent-platform/capabilities/model-choice/) - Pick your preferred LLM from a curated set of top models, or let Warp choose the optimal one.
 * [Rules](/agent-platform/capabilities/rules/) - Define global and project-level guidelines that shape agent behavior and responses.
 * [Full Terminal Use](/agent-platform/capabilities/full-terminal-use/) - Let the agent drive interactive terminal apps, seeing live output and running commands.
 * [Computer Use](/agent-platform/capabilities/computer-use/) - Let agents interact with desktop environments by taking screenshots, clicking, typing, and controlling the GUI.
@@ -24,4 +23,5 @@ Agent capabilities are the core building blocks that define how Warp's agents op
 
 ## Related
 
-For hands-on agent interactions, see [Local Agents](/agent-platform/local-agents/overview/).
+* [Inference & providers](/agent-platform/inference/model-choice/) - Pick the model that powers your agents, bring your own API key, or connect a custom inference endpoint.
+* [Local Agents](/agent-platform/local-agents/overview/) - Hands-on agent interactions in Warp.
diff --git a/src/content/docs/agent-platform/cloud-agents/faqs.mdx b/src/content/docs/agent-platform/cloud-agents/faqs.mdx
@@ -60,7 +60,7 @@ The cloud agents platform supports self-hosting the **agent sandbox** (the execu
 Self-hosted execution is available on **Enterprise** plans. See [Self-hosting](/agent-platform/cloud-agents/self-hosting/) and [Deployment patterns](/agent-platform/cloud-agents/deployment-patterns/) for details.
 
 :::note
-[Bring Your Own Key (BYOK)](/support-and-community/plans-and-billing/bring-your-own-api-key/) does not apply to cloud agents. BYOK keys are stored locally on your device and cannot be passed to cloud-hosted or self-hosted agent runs. All cloud agent runs consume [Warp credits](/support-and-community/plans-and-billing/credits/).
+[Bring Your Own Key (BYOK)](/agent-platform/inference/bring-your-own-api-key/) does not apply to cloud agents. BYOK keys are stored locally on your device and cannot be passed to cloud-hosted or self-hosted agent runs. All cloud agent runs consume [Warp credits](/support-and-community/plans-and-billing/credits/).
 :::
 
 ## Models

diff --git a/src/content/docs/agent-platform/cloud-agents/harnesses/authentication.mdx b/src/content/docs/agent-platform/cloud-agents/harnesses/authentication.mdx
@@ -12,7 +12,7 @@ Third-party cloud agent authentication in Oz stores provider credentials for clo
 Auth secrets can be scoped to a **team** (available to all teammates' runs) or **personal** (only your own runs), like any other Warp-managed secret.
 
 :::note
-[Bring Your Own Key (BYOK)](/support-and-community/plans-and-billing/bring-your-own-api-key/) configured in the Warp desktop app applies to local agent runs only. Cloud runs of Claude Code and Codex always use Warp-managed secrets.
+[Bring Your Own Key (BYOK)](/agent-platform/inference/bring-your-own-api-key/) configured in the Warp desktop app applies to local agent runs only. Cloud runs of Claude Code and Codex always use Warp-managed secrets.
 :::
 
 ## Connecting Claude Code credentials

diff --git a/src/content/docs/agent-platform/cloud-agents/harnesses/warp-agent.mdx b/src/content/docs/agent-platform/cloud-agents/harnesses/warp-agent.mdx
@@ -13,7 +13,7 @@ Warp Agent is the same agent runtime that powers Agent Mode in the Warp terminal
 
 ## Key features
 
-* **Multi-model auto-routing** - Routes between Anthropic, OpenAI, Google, and Fireworks-hosted models. Choose a specific model, or let Warp pick via `auto`, `auto-efficient`, `auto-genius`, or `auto-open`. See [Model choice](/agent-platform/capabilities/model-choice/) for the full catalog.
+* **Multi-model auto-routing** - Routes between Anthropic, OpenAI, Google, and Fireworks-hosted models. Choose a specific model, or let Warp pick via `auto`, `auto-efficient`, `auto-genius`, or `auto-open`. See [Model choice](/agent-platform/inference/model-choice/) for the full catalog.
 * **Full terminal and tool access** - Runs commands, edits files, reads logs, executes tests, navigates repos, and calls MCP servers — the same toolbelt Warp Agent uses locally.
 * **Platform-native context** - Reads [Codebase Context](/agent-platform/capabilities/codebase-context/), applies [Rules](/agent-platform/capabilities/rules/), reuses saved [Skills](/agent-platform/capabilities/skills/), and respects Memory and Warp Drive context with no extra setup.
 * **Multi-repo execution** - Clones every repo configured on the [environment](/agent-platform/cloud-agents/environments/) and works across them in a single run.
@@ -28,7 +28,7 @@ Team admins can disable any harness for their workspace. Users on that team can
 
 ### Available models
 
-Warp Agent supports the full Warp model catalog. Configure the model per [Agent Profile](/agent-platform/capabilities/agent-profiles-permissions/), or pick one at run time. See [Model choice](/agent-platform/capabilities/model-choice/) for the supported model IDs, including the `auto`, `auto-efficient`, `auto-genius`, and `auto-open` routing options.
+Warp Agent supports the full Warp model catalog. Configure the model per [Agent Profile](/agent-platform/capabilities/agent-profiles-permissions/), or pick one at run time. See [Model choice](/agent-platform/inference/model-choice/) for the supported model IDs, including the `auto`, `auto-efficient`, `auto-genius`, and `auto-open` routing options.
 
 ### Cross-harness orchestration
 
@@ -64,6 +64,6 @@ For a complete walkthrough, see the [Cloud agents quickstart](/agent-platform/cl
 * [Harnesses in Oz](/agent-platform/cloud-agents/harnesses/) — pick between Warp Agent, Claude Code, and Codex.
 * [Claude Code with Oz](/agent-platform/cloud-agents/harnesses/claude-code/) — Claude Code as a cloud harness.
 * [Codex with Oz](/agent-platform/cloud-agents/harnesses/codex/) — Codex as a cloud harness.
-* [Model choice](/agent-platform/capabilities/model-choice/) — the model catalog Warp Agent routes across.
+* [Model choice](/agent-platform/inference/model-choice/) — the model catalog Warp Agent routes across.
 * [Agent Profiles and permissions](/agent-platform/capabilities/agent-profiles-permissions/) — configure the default model, autonomy, and tool access for Warp Agent.
 * [Skills as agents](/agent-platform/cloud-agents/skills-as-agents/) — turn a saved skill into a reusable Warp Agent run.
diff --git a/src/content/docs/agent-platform/cloud-agents/overview.mdx b/src/content/docs/agent-platform/cloud-agents/overview.mdx
@@ -110,7 +110,7 @@ If your team also uses Warp's terminal, you get an additional workflow: tasks la
 Cloud agents and [integrations](/agent-platform/cloud-agents/integrations/) run on the [Oz Platform](/agent-platform/cloud-agents/platform/) control plane, and usage is billed using credits.
 
 :::note
-[Bring Your Own Key (BYOK)](/support-and-community/plans-and-billing/bring-your-own-api-key/) is not supported for cloud agent runs. BYOK keys are stored locally on your device and are not accessible to cloud-hosted agents. All cloud agent runs consume Warp credits.
+[Bring Your Own Key (BYOK)](/agent-platform/inference/bring-your-own-api-key/) is not supported for cloud agent runs. BYOK keys are stored locally on your device and are not accessible to cloud-hosted agents. All cloud agent runs consume Warp credits.
 :::
 
 #### For cloud agents via CLI/API

diff --git a/src/content/docs/agent-platform/getting-started/faqs.mdx b/src/content/docs/agent-platform/getting-started/faqs.mdx
@@ -25,11 +25,11 @@ Warp reserves the right to use data collected to train models and improve Warp.
 
 ### What model are you using for Agent Mode?
 
-Warp supports a curated list of LLMs from providers like OpenAI, Anthropic, and Gemini. To view the full list of supported models and learn how to switch between them, visit the [Model Choice](/agent-platform/capabilities/model-choice/) page.
+Warp supports a curated list of LLMs from providers like OpenAI, Anthropic, and Gemini. To view the full list of supported models and learn how to switch between them, visit the [Model Choice](/agent-platform/inference/model-choice/) page.
 
 ### Can I use my own LLM API key?
 
-Warp supports [Bring Your Own Key (BYOK)](/support-and-community/plans-and-billing/bring-your-own-api-key/) for users on paid plans (starting with Build). You can connect your own Anthropic, OpenAI, or Google API keys to route requests directly through your account. Organizations on the Enterprise plan can additionally enable managed "Bring Your Own LLM" configurations to meet strict security or compliance requirements.
+Warp supports [Bring Your Own Key (BYOK)](/agent-platform/inference/bring-your-own-api-key/) for users on paid plans (starting with Build). You can connect your own Anthropic, OpenAI, or Google API keys to route requests directly through your account. Organizations on the Enterprise plan can additionally enable managed "Bring Your Own LLM" configurations to meet strict security or compliance requirements.
 
 ## Billing
 

diff --git a/...ns-and-billing/bring-your-own-api-key.mdx → ...form/inference/bring-your-own-api-key.mdx b/...ns-and-billing/bring-your-own-api-key.mdx → ...form/inference/bring-your-own-api-key.mdx
@@ -7,7 +7,7 @@ description: >-
 
 Warp supports **Bring Your Own API Key (BYOK)** for users who want to connect Warp's agents to their own Anthropic, OpenAI, or Google API accounts.
 
-This lets you use your own API keys to access models directly, giving you full control over model selection, billing, and data routing. See [Model Choice](/agent-platform/capabilities/model-choice/) for a list of supported models.
+This lets you use your own API keys to access models directly, giving you full control over model selection, billing, and data routing. See [Model Choice](/agent-platform/inference/model-choice/) for a list of supported models.
 
 BYOK provides greater flexibility in model access and ensures Warp **never consumes your** [AI credits](/support-and-community/plans-and-billing/credits/) for requests routed through your own keys.
 
@@ -22,7 +22,7 @@ Warp offers three ways to bring your own AI infrastructure. Use this table to pi
 | Name | Meaning | Plans |
 | --- | --- | --- |
 | **Bring your own API key** (BYOK) | Use your own API key for OpenAI, Anthropic, or Google models. Keys are stored locally on your device. | Free and all eligible paid plans |
-| **[Custom inference endpoint](/support-and-community/plans-and-billing/custom-inference-endpoint/)** | Connect Warp to an OpenAI-compatible endpoint such as OpenRouter, LiteLLM, z.ai, or an internal gateway. | Free and all eligible paid plans |
+| **[Custom inference endpoint](/agent-platform/inference/custom-inference-endpoint/)** | Connect Warp to an OpenAI-compatible endpoint such as OpenRouter, LiteLLM, z.ai, or an internal gateway. | Free and all eligible paid plans |
 | **[Bring your own LLM](/enterprise/enterprise-features/bring-your-own-llm/)** (BYOLLM) | Enterprise-managed inference through your cloud provider (AWS Bedrock today; Azure Foundry and Google Vertex coming soon), with Warp handling routing, orchestration, governance, and observability. | Enterprise only |
 
 See [warp.dev/pricing](https://www.warp.dev/pricing) for current plan availability.
@@ -136,7 +136,7 @@ If your organization needs centrally managed model routing today, see [Bring you
 
 ## Related resources
 
-* [Custom inference endpoint](/support-and-community/plans-and-billing/custom-inference-endpoint/) — Route Warp through any OpenAI-compatible endpoint, such as OpenRouter, LiteLLM, z.ai, or an internal gateway.
+* [Custom inference endpoint](/agent-platform/inference/custom-inference-endpoint/) — Route Warp through any OpenAI-compatible endpoint, such as OpenRouter, LiteLLM, z.ai, or an internal gateway.
 * [Bring your own LLM](/enterprise/enterprise-features/bring-your-own-llm/) — Enterprise-managed inference through your cloud provider or approved infrastructure.
-* [Model Choice](/agent-platform/capabilities/model-choice/) — Full list of supported models and `model_id` values.
+* [Model Choice](/agent-platform/inference/model-choice/) — Full list of supported models and `model_id` values.
 * [Credits](/support-and-community/plans-and-billing/credits/) — How Warp credits work and when they're consumed.
diff --git a/...and-billing/custom-inference-endpoint.mdx → ...m/inference/custom-inference-endpoint.mdx b/...and-billing/custom-inference-endpoint.mdx → ...m/inference/custom-inference-endpoint.mdx
@@ -52,7 +52,7 @@ To enable and configure a custom inference endpoint:
 
 When you explicitly select an endpoint-routed model from the model picker, Warp routes the request through your endpoint instead of consuming Warp's AI credits.
 
-The configuration flow mirrors the [Bring your own API key](/support-and-community/plans-and-billing/bring-your-own-api-key/) setup, so the steps will feel familiar if you've already configured BYOK.
+The configuration flow mirrors the [Bring your own API key](/agent-platform/inference/bring-your-own-api-key/) setup, so the steps will feel familiar if you've already configured BYOK.
 
 ## Billing behavior
 
@@ -98,15 +98,15 @@ Warp offers three ways to bring your own AI infrastructure. Use this table to pi
 
 | Name | Meaning | Plans |
 | --- | --- | --- |
-| **[Bring your own API key](/support-and-community/plans-and-billing/bring-your-own-api-key/)** (BYOK) | Use your own API key for OpenAI, Anthropic, or Google models. Keys are stored locally on your device. | Free and all eligible paid plans |
+| **[Bring your own API key](/agent-platform/inference/bring-your-own-api-key/)** (BYOK) | Use your own API key for OpenAI, Anthropic, or Google models. Keys are stored locally on your device. | Free and all eligible paid plans |
 | **Custom inference endpoint** | Connect Warp to an OpenAI-compatible endpoint such as OpenRouter, LiteLLM, z.ai, or an internal gateway. | Free and all eligible paid plans |
 | **[Bring your own LLM](/enterprise/enterprise-features/bring-your-own-llm/)** (BYOLLM) | Enterprise-managed inference through your cloud provider (AWS Bedrock today; Azure Foundry and Google Vertex coming soon), with Warp handling routing, orchestration, governance, and observability. | Enterprise only |
 
 Platform credits may apply for local agent runs on Business and Enterprise when using BYOK, a custom inference endpoint, or BYOLLM. See [platform credits](/support-and-community/plans-and-billing/platform-credits/).
 
 ## Related resources
 
-* [Bring your own API key](/support-and-community/plans-and-billing/bring-your-own-api-key/) — Use your own OpenAI, Anthropic, or Google API keys.
+* [Bring your own API key](/agent-platform/inference/bring-your-own-api-key/) — Use your own OpenAI, Anthropic, or Google API keys.
 * [Bring your own LLM](/enterprise/enterprise-features/bring-your-own-llm/) — Enterprise-managed inference through your cloud provider or approved infrastructure.
-* [Model Choice](/agent-platform/capabilities/model-choice/) — Full list of supported models and `model_id` values.
+* [Model Choice](/agent-platform/inference/model-choice/) — Full list of supported models and `model_id` values.
 * [Credits](/support-and-community/plans-and-billing/credits/) — How Warp credits work and when they're consumed.
diff --git a/...nt-platform/capabilities/model-choice.mdx → ...agent-platform/inference/model-choice.mdx b/...nt-platform/capabilities/model-choice.mdx → ...agent-platform/inference/model-choice.mdx
diff --git a/src/content/docs/agent-platform/local-agents/agent-context/images-as-context.mdx b/src/content/docs/agent-platform/local-agents/agent-context/images-as-context.mdx
@@ -40,7 +40,7 @@ You can attach up to **5 images per request**, and up to **20 images across a si
 
 ### Model behavior and image handling
 
-All supported models listed in [Model Choice](/agent-platform/capabilities/model-choice/) can interpret image input.
+All supported models listed in [Model Choice](/agent-platform/inference/model-choice/) can interpret image input.
 
 Attaching images will consume additional requests, proportional to the number of images added. To stay within model limits, Warp will intelligently resize images before passing them as context, minimizing token usage and respecting the model's maximum image dimensions.
 
diff --git a/src/content/docs/agent-platform/local-agents/overview.mdx b/src/content/docs/agent-platform/local-agents/overview.mdx
@@ -26,7 +26,7 @@ This section covers how to interact with Warp's agents and the capabilities avai
 
 * [Interacting with Agents](/agent-platform/local-agents/interacting-with-agents/) - Manage AI conversations tied to sessions, attach context, continue previous threads, or start new ones.
 * [Agent Context](/agent-platform/local-agents/agent-context/) - Attach images, URLs, files, code blocks, and selections as context for your prompts.
-* [Model Choice](/agent-platform/capabilities/model-choice/) - Pick your preferred LLM from a curated set of top models, or let Warp choose the optimal one.
+* [Model Choice](/agent-platform/inference/model-choice/) - Pick your preferred LLM from a curated set of top models, or let Warp choose the optimal one.
 * [Full Terminal Use](/agent-platform/capabilities/full-terminal-use/) - Let the agent drive interactive terminal apps, seeing live output and running commands.
 * [Interactive Code Review](/agent-platform/local-agents/interactive-code-review/) - Review agent-generated diffs, leave inline comments, and have the agent address your feedback.
 * [Task Lists](/agent-platform/capabilities/task-lists/) - Track complex workflows with automatic task lists that update progress in real time.

diff --git a/src/content/docs/enterprise/enterprise-features/bring-your-own-llm.mdx b/src/content/docs/enterprise/enterprise-features/bring-your-own-llm.mdx
@@ -54,7 +54,7 @@ BYOLLM supports the intersection of models that Warp supports and models availab
 
 To determine which models you can use with BYOLLM:
 
-* [Model Choice](/agent-platform/capabilities/model-choice/) - Full list of Warp-supported models.
+* [Model Choice](/agent-platform/inference/model-choice/) - Full list of Warp-supported models.
 * [Supported models in Amazon Bedrock](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html) - AWS Bedrock model availability.
 
 A model must appear on both lists to be available through BYOLLM.
@@ -222,7 +222,7 @@ Yes. Admins can configure routing policies to require specific models to use BYO
 
 ## Related resources
 
-* [Bring Your Own API Key](/support-and-community/plans-and-billing/bring-your-own-api-key/)
-* [Model Choice](/agent-platform/capabilities/model-choice/) — Full list of supported models
+* [Bring Your Own API Key](/agent-platform/inference/bring-your-own-api-key/)
+* [Model Choice](/agent-platform/inference/model-choice/) — Full list of supported models
 * [Admin Panel](/enterprise/team-management/admin-panel/) — Configure team settings
 * [Contact Sales](https://www.warp.dev/contact-sales) — Get help with enterprise setup
diff --git a/...ntent/docs/getting-started/migrate-to-warp/migrate-to-warp-from-claude-code.mdx b/...ntent/docs/getting-started/migrate-to-warp/migrate-to-warp-from-claude-code.mdx
@@ -67,7 +67,7 @@ Warp's agent also pulls context from several other explicit sources:
 
 * **Bring over your `CLAUDE.md`.** Rename it to `AGENTS.md` (or copy it into a Warp [Rule](/agent-platform/capabilities/rules/) if you want it scoped beyond the repo). Warp applies it automatically to new conversations.
 * **Set up [MCP servers](/agent-platform/capabilities/mcp/)** you relied on in Claude Code.
-* **Pick a model** per conversation using the model selector. See [model choice](/agent-platform/capabilities/model-choice/). Warp supports Claude, GPT, Gemini, and Auto.
+* **Pick a model** per conversation using the model selector. See [model choice](/agent-platform/inference/model-choice/). Warp supports Claude, GPT, Gemini, and Auto.
 * **Configure [agent profiles and permissions](/agent-platform/capabilities/agent-profiles-permissions/)** for what the agent can auto-execute.
 
 ### Key differences from Claude Code

diff --git a/src/content/docs/getting-started/migrate-to-warp/migrate-to-warp-from-cursor.mdx b/src/content/docs/getting-started/migrate-to-warp/migrate-to-warp-from-cursor.mdx
@@ -40,7 +40,7 @@ Cursor's Composer and Agent features don't have a one-to-one migration path - th
 
 ### Model choice
 
-Cursor lets you pick a model per conversation. Warp does the same - use the model selector in any agent conversation. See [model choice](/agent-platform/capabilities/model-choice/).
+Cursor lets you pick a model per conversation. Warp does the same - use the model selector in any agent conversation. See [model choice](/agent-platform/inference/model-choice/).
 
 ### Keybindings
 
@@ -71,7 +71,7 @@ Cursor features and their Warp counterparts:
 | Agent tabs | Multiple [agents in parallel](/agent-platform/local-agents/overview/) across tabs |
 | `.cursorrules` | `AGENTS.md` / `WARP.md` at the project root, picked up as a [Rule](/agent-platform/capabilities/rules/) |
 | MCP servers | [MCP](/agent-platform/capabilities/mcp/) |
-| Model choice per conversation | [Model selector](/agent-platform/capabilities/model-choice/) |
+| Model choice per conversation | [Model selector](/agent-platform/inference/model-choice/) |
 | Codebase indexing | [Codebase Context](/agent-platform/capabilities/codebase-context/) |
 | Inline diff review | [Code Review](/code/code-review/) |