From ecfff8a7db2f6b6a62fd7bc3bcb047772c123c78 Mon Sep 17 00:00:00 2001
From: Danielle Maywood <danielle@themaywoods.com>
Date: Tue, 23 Jun 2026 12:33:28 +0100
Subject: [PATCH] feat: move model settings page to ai settings

---
 codersdk/chats.go                             |    8 +-
 docs/ai-coder/agents/getting-started.md       |    7 +-
 docs/ai-coder/agents/models.md                |   13 +-
 .../agents/tasks-to-chats-migration.md        |    4 +-
 scripts/modeloptionsgen/main.go               |   74 +-
 site/src/api/chatModelOptions.ts              |    2 +
 site/src/api/chatModelOptionsGenerated.json   |   14 +-
 site/src/api/queries/chats.ts                 |   78 -
 site/src/modules/aiModels/helpers.ts          |   15 +
 .../modules/aiModels/providerStates.test.ts   |  282 ++
 site/src/modules/aiModels/providerStates.ts   |  237 ++
 .../management/AISettingsSidebarView.tsx      |    3 +
 .../ModelsPage/AddModelPage/AddModelPage.tsx  |   92 +
 .../AddModelPage/AddModelPageView.stories.tsx |   67 +
 .../AddModelPage/AddModelPageView.tsx         |   73 +
 .../AISettingsPage/ModelsPage/ModelsPage.tsx  |   56 +
 .../ModelsPage/ModelsPageView.stories.tsx     |   99 +
 .../ModelsPage/ModelsPageView.tsx             |  178 ++
 .../UpdateModelPage/UpdateModelPage.tsx       |  140 +
 .../UpdateModelPageView.stories.tsx           |   40 +
 .../UpdateModelPage/UpdateModelPageView.tsx   |   61 +
 .../components/ModelForm.stories.tsx          |  201 ++
 .../ModelsPage/components/ModelForm.tsx       |  349 +++
 .../components/ModelFormDialogs.tsx           |  121 +
 .../ModelsPage/components/ModelFormFields.tsx |  349 +++
 .../ModelsPage/components/ModelFormHeader.tsx |  153 ++
 .../components/ModelFormProviderSelect.tsx    |   55 +
 .../ModelsPage/components/ModelRow.tsx        |   84 +
 .../AISettingsPage/ModelsPage/testFixtures.ts |   84 +
 .../UpdateProviderPageView.tsx                |    2 +-
 .../AgentsPage/AgentChatPageView.stories.tsx  |    4 +-
 .../AgentsPage/AgentSettingsModelsPage.tsx    |  101 -
 .../components/AgentCreateForm.stories.tsx    |    2 +-
 .../components/AgentSetupNotice.tsx           |    4 +-
 .../ChatModelAdminPanel.stories.tsx           | 2380 -----------------
 .../ChatModelAdminPanel.tsx                   |  373 ---
 .../ChatModelAdminPanel/ModelConfigFields.tsx |  165 +-
 .../ChatModelAdminPanel/ModelForm.tsx         |  662 -----
 .../ModelIdentifierField.tsx                  |   30 +-
 .../ModelsSection.stories.tsx                 |  471 ----
 .../ChatModelAdminPanel/ModelsSection.tsx     |  471 ----
 .../ChatModelAdminPanel/ProviderField.tsx     |   35 +
 .../ChatModelAdminPanel/ProviderForm.tsx      |  413 ---
 .../ChatModelAdminPanel/ProviderIcon.tsx      |    2 +-
 .../ChatModelAdminPanel/ProvidersSection.tsx  |  296 --
 .../components/ChatModelAdminPanel/helpers.ts |   41 -
 .../ChatModelAdminPanel/knownModels/index.ts  |    2 +-
 .../modelConfigFormLogic.test.ts              |  136 +
 .../modelConfigFormLogic.ts                   |   38 +
 .../ChatsSidebar/settings/SettingsPanel.tsx   |    6 +-
 .../components/MCPServerAdminPanel.tsx        |    2 +-
 site/src/router.tsx                           |   24 +-
 site/src/testHelpers/chatModels.ts            |   12 +-
 53 files changed, 3166 insertions(+), 5445 deletions(-)
 create mode 100644 site/src/modules/aiModels/helpers.ts
 create mode 100644 site/src/modules/aiModels/providerStates.test.ts
 create mode 100644 site/src/modules/aiModels/providerStates.ts
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPage.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.stories.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/ModelsPage.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.stories.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPage.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.stories.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.stories.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelFormDialogs.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelFormFields.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelFormHeader.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelFormProviderSelect.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/components/ModelRow.tsx
 create mode 100644 site/src/pages/AISettingsPage/ModelsPage/testFixtures.ts
 delete mode 100644 site/src/pages/AgentsPage/AgentSettingsModelsPage.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.stories.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelForm.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.stories.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.tsx
 create mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderField.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderForm.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProvidersSection.tsx
 delete mode 100644 site/src/pages/AgentsPage/components/ChatModelAdminPanel/helpers.ts

diff --git a/codersdk/chats.go b/codersdk/chats.go
index a8e01a481d..eadeec97ef 100644
--- a/codersdk/chats.go
+++ b/codersdk/chats.go
@@ -1296,8 +1296,8 @@ type ChatModelOpenAIProviderOptions struct {
 	StructuredOutputs   *bool            `json:"structured_outputs,omitempty" description:"Whether to enable structured JSON output mode" hidden:"true"`
 	StrictJSONSchema    *bool            `json:"strict_json_schema,omitempty" description:"Whether to enforce strict adherence to the JSON schema" hidden:"true"`
 	WebSearchEnabled    *bool            `json:"web_search_enabled,omitempty" description:"Enable OpenAI web search tool for grounding responses with real-time information"`
-	SearchContextSize   *string          `json:"search_context_size,omitempty" description:"Amount of search context to use" enum:"low,medium,high"`
-	AllowedDomains      []string         `json:"allowed_domains,omitempty" label:"Web Search: Allowed Domains" description:"Restrict web search to these domains"`
+	SearchContextSize   *string          `json:"search_context_size,omitempty" description:"Amount of search context to use" enum:"low,medium,high" visible_when:"web_search_enabled"`
+	AllowedDomains      []string         `json:"allowed_domains,omitempty" label:"Web Search: Allowed Domains" description:"Restrict web search to these domains" visible_when:"web_search_enabled"`
 }
 
 // ChatModelAnthropicThinkingOptions configures Anthropic thinking budget.
@@ -1313,8 +1313,8 @@ type ChatModelAnthropicProviderOptions struct {
 	ThinkingDisplay        *string                            `json:"thinking_display,omitempty" label:"Thinking Display" description:"Controls how Anthropic returns thinking content" enum:"summarized,omitted"`
 	DisableParallelToolUse *bool                              `json:"disable_parallel_tool_use,omitempty" description:"Whether to disable parallel tool execution"`
 	WebSearchEnabled       *bool                              `json:"web_search_enabled,omitempty" description:"Enable Anthropic web search tool for grounding responses with real-time information"`
-	AllowedDomains         []string                           `json:"allowed_domains,omitempty" label:"Web Search: Allowed Domains" description:"Restrict web search to these domains (cannot be used with blocked_domains)"`
-	BlockedDomains         []string                           `json:"blocked_domains,omitempty" label:"Web Search: Blocked Domains" description:"Block web search on these domains (cannot be used with allowed_domains)"`
+	AllowedDomains         []string                           `json:"allowed_domains,omitempty" label:"Web Search: Allowed Domains" description:"Restrict web search to these domains (cannot be used with blocked_domains)" visible_when:"web_search_enabled" conflicts_with:"blocked_domains"`
+	BlockedDomains         []string                           `json:"blocked_domains,omitempty" label:"Web Search: Blocked Domains" description:"Block web search on these domains (cannot be used with allowed_domains)" visible_when:"web_search_enabled" conflicts_with:"allowed_domains"`
 }
 
 // ChatModelGoogleThinkingConfig configures Google thinking behavior.
diff --git a/docs/ai-coder/agents/getting-started.md b/docs/ai-coder/agents/getting-started.md
index a513cba745..ad315ecc7c 100644
--- a/docs/ai-coder/agents/getting-started.md
+++ b/docs/ai-coder/agents/getting-started.md
@@ -40,8 +40,7 @@ To configure Coder Agents:
 1. Navigate to **Admin settings** > **AI** and select **Providers**.
 1. Add or update a provider with its credentials and upstream endpoint, then
    save it.
-1. Navigate to the **Agents** page, open **Settings** > **Manage Agents**, and
-   select **Models**.
+1. Navigate to **Admin settings** > **AI** > **Models**.
 1. Click **Add** and configure at least one model with its identifier, display
    name, and context limit.
 1. Click the **star icon** next to a model to set it as the default.
@@ -217,8 +216,8 @@ sub-agent delegation, and complex multi-step work can consume significant
 token volume. Consider:
 
 - Starting with a single model to establish a cost baseline.
-- Setting per-model token pricing under **Agents** > **Settings** >
-  **Manage Agents** > **Models** (Input Price, Output Price) to track spend.
+- Setting per-model token pricing under **Admin settings** > **AI** >
+  **Models** (Input Price, Output Price) to track spend.
 - Monitoring provider dashboards for usage trends during the evaluation.
 
 ### Pilot with a small group
diff --git a/docs/ai-coder/agents/models.md b/docs/ai-coder/agents/models.md
index 9e29f621db..fe01a5c20a 100644
--- a/docs/ai-coder/agents/models.md
+++ b/docs/ai-coder/agents/models.md
@@ -1,9 +1,9 @@
 # Models
 
 Administrators configure LLM providers from **Admin settings** > **AI** and
-Coder Agents models from the **Agents** settings page. Providers, models, and
-centrally managed credentials are deployment-wide settings managed by platform
-teams. Developers select from the set of models that an administrator has
+Coder Agents models from **Admin settings** > **AI** > **Models**. Providers,
+models, and centrally managed credentials are deployment-wide settings managed
+by platform teams. Developers select from the set of models that an administrator has
 enabled.
 
 Optionally, administrators can enable AI Gateway Bring Your Own Key (BYOK)
@@ -49,9 +49,8 @@ settings page.
    [endpoint/base URL](#endpointbase-url-for-openai-compatible-providers).
 1. Click **Save**.
 
-After saving a provider, add an Agents model for it from **Agents** >
-**Settings** > **Manage Agents** > **Models**. For provider-specific setup,
-including AWS Bedrock, see
+After saving a provider, add an Agents model for it from **Admin settings** >
+**AI** > **Models**. For provider-specific setup, including AWS Bedrock, see
 [AI Gateway provider configuration](../ai-gateway/providers.md#provider-types).
 
 ## Endpoint/base URL for OpenAI-compatible providers
@@ -122,7 +121,7 @@ generation parameters, and provider-specific options.
 
 ### Add a model
 
-1. Open **Settings** > **Manage Agents** and select the **Models** tab.
+1. Navigate to **Admin settings** > **AI** > **Models**.
 1. Click **Add** and select the provider for the new model.
 1. Enter the **Model Identifier**, the exact model string your provider
    expects (e.g., `claude-opus-4-6`, `gpt-5.3-codex`).
diff --git a/docs/ai-coder/agents/tasks-to-chats-migration.md b/docs/ai-coder/agents/tasks-to-chats-migration.md
index db31d2fb4f..8fb2b86322 100644
--- a/docs/ai-coder/agents/tasks-to-chats-migration.md
+++ b/docs/ai-coder/agents/tasks-to-chats-migration.md
@@ -71,8 +71,8 @@ configured once in the control plane:
 1. Navigate to **Admin settings** > **AI** and select **Providers**.
 1. Add or update a provider with its credentials and upstream endpoint, then
    save it.
-1. Navigate to the **Agents** page, open **Settings** > **Manage Agents** >
-   **Models**, add at least one model, and set it as the default.
+1. Navigate to **Admin settings** > **AI** > **Models**, add at least one model,
+   and set it as the default.
 
 You no longer pass API keys in template variables or workspace environment. See https://coder.com/docs/ai-coder/agents/getting-started for more information.
 
diff --git a/scripts/modeloptionsgen/main.go b/scripts/modeloptionsgen/main.go
index f7446bd335..89b6b0ffa9 100644
--- a/scripts/modeloptionsgen/main.go
+++ b/scripts/modeloptionsgen/main.go
@@ -8,21 +8,24 @@ import (
 	"strings"
 
 	"github.com/shopspring/decimal"
+	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/codersdk"
 )
 
 // SchemaField describes a single form field in the generated schema.
 type SchemaField struct {
-	JSONName    string   `json:"json_name"`
-	GoName      string   `json:"go_name"`
-	Type        string   `json:"type"`
-	Description string   `json:"description,omitempty"`
-	Label       string   `json:"label,omitempty"`
-	Required    bool     `json:"required"`
-	Enum        []string `json:"enum,omitempty"`
-	InputType   string   `json:"input_type"`
-	Hidden      bool     `json:"hidden,omitempty"`
+	JSONName      string   `json:"json_name"`
+	GoName        string   `json:"go_name"`
+	Type          string   `json:"type"`
+	Description   string   `json:"description,omitempty"`
+	Label         string   `json:"label,omitempty"`
+	Required      bool     `json:"required"`
+	Enum          []string `json:"enum,omitempty"`
+	InputType     string   `json:"input_type"`
+	Hidden        bool     `json:"hidden,omitempty"`
+	VisibleWhen   string   `json:"visible_when,omitempty"`
+	ConflictsWith []string `json:"conflicts_with,omitempty"`
 }
 
 // FieldGroup holds the fields for a struct or provider.
@@ -53,6 +56,10 @@ func main() {
 		"",
 		map[string]bool{"ProviderOptions": true},
 	)
+	if err := validateFieldReferences("general", schema.General); err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
 
 	// Provider-specific options. Each entry maps a provider key
 	// to the concrete options struct used for that provider.
@@ -70,6 +77,10 @@ func main() {
 
 	for _, p := range providerTypes {
 		schema.Providers[p.key] = extractFields(p.typ, "", nil)
+		if err := validateFieldReferences(p.key, schema.Providers[p.key]); err != nil {
+			_, _ = fmt.Fprintln(os.Stderr, err)
+			os.Exit(1)
+		}
 	}
 
 	out, err := json.MarshalIndent(schema, "", "\t")
@@ -83,6 +94,25 @@ func main() {
 	_, _ = fmt.Println(string(out))
 }
 
+func validateFieldReferences(group string, fg FieldGroup) error {
+	names := make(map[string]bool, len(fg.Fields))
+	for _, f := range fg.Fields {
+		names[f.JSONName] = true
+	}
+
+	for _, f := range fg.Fields {
+		if f.VisibleWhen != "" && !names[f.VisibleWhen] {
+			return xerrors.Errorf("field %q in group %q has visible_when=%q referencing an unknown sibling field", f.JSONName, group, f.VisibleWhen)
+		}
+		for _, sibling := range f.ConflictsWith {
+			if !names[sibling] {
+				return xerrors.Errorf("field %q in group %q has conflicts_with entry %q referencing an unknown sibling field", f.JSONName, group, sibling)
+			}
+		}
+	}
+	return nil
+}
+
 // extractFields walks the struct fields of t and returns a FieldGroup.
 // prefix is used to build dot-separated json_name values for nested
 // structs. skip lists Go field names to exclude from output.
@@ -138,6 +168,12 @@ func extractFields(t reflect.Type, prefix string, skip map[string]bool) FieldGro
 		description := f.Tag.Get("description")
 		label := f.Tag.Get("label")
 		enumTag := f.Tag.Get("enum")
+		visibleWhen := f.Tag.Get("visible_when")
+
+		var conflictsWith []string
+		if conflictsTag := f.Tag.Get("conflicts_with"); conflictsTag != "" {
+			conflictsWith = strings.Split(conflictsTag, ",")
+		}
 
 		var enumValues []string
 		if enumTag != "" {
@@ -148,15 +184,17 @@ func extractFields(t reflect.Type, prefix string, skip map[string]bool) FieldGro
 		inputType := inferInputType(typeName, enumValues)
 
 		fields = append(fields, SchemaField{
-			JSONName:    fullJSONName,
-			GoName:      goFieldPath(prefix, f.Name, t, fullJSONName),
-			Type:        typeName,
-			Description: description,
-			Label:       label,
-			Required:    required,
-			Enum:        enumValues,
-			InputType:   inputType,
-			Hidden:      hidden,
+			JSONName:      fullJSONName,
+			GoName:        goFieldPath(prefix, f.Name, t, fullJSONName),
+			Type:          typeName,
+			Description:   description,
+			Label:         label,
+			Required:      required,
+			Enum:          enumValues,
+			InputType:     inputType,
+			Hidden:        hidden,
+			VisibleWhen:   visibleWhen,
+			ConflictsWith: conflictsWith,
 		})
 	}
 
diff --git a/site/src/api/chatModelOptions.ts b/site/src/api/chatModelOptions.ts
index 67c60da120..2f11abf2ad 100644
--- a/site/src/api/chatModelOptions.ts
+++ b/site/src/api/chatModelOptions.ts
@@ -23,6 +23,8 @@ export interface FieldSchema {
 	enum?: string[];
 	/** If true, this field should not be rendered in admin UI forms. */
 	hidden?: boolean;
+	visible_when?: string;
+	conflicts_with?: string[];
 }
 
 /**
diff --git a/site/src/api/chatModelOptionsGenerated.json b/site/src/api/chatModelOptionsGenerated.json
index d64f1f22e7..fb3bafadce 100644
--- a/site/src/api/chatModelOptionsGenerated.json
+++ b/site/src/api/chatModelOptionsGenerated.json
@@ -145,7 +145,9 @@
 					"description": "Restrict web search to these domains (cannot be used with blocked_domains)",
 					"label": "Web Search: Allowed Domains",
 					"required": false,
-					"input_type": "json"
+					"input_type": "json",
+					"visible_when": "web_search_enabled",
+					"conflicts_with": ["blocked_domains"]
 				},
 				{
 					"json_name": "blocked_domains",
@@ -154,7 +156,9 @@
 					"description": "Block web search on these domains (cannot be used with allowed_domains)",
 					"label": "Web Search: Blocked Domains",
 					"required": false,
-					"input_type": "json"
+					"input_type": "json",
+					"visible_when": "web_search_enabled",
+					"conflicts_with": ["allowed_domains"]
 				}
 			]
 		},
@@ -404,7 +408,8 @@
 					"description": "Amount of search context to use",
 					"required": false,
 					"enum": ["low", "medium", "high"],
-					"input_type": "select"
+					"input_type": "select",
+					"visible_when": "web_search_enabled"
 				},
 				{
 					"json_name": "allowed_domains",
@@ -413,7 +418,8 @@
 					"description": "Restrict web search to these domains",
 					"label": "Web Search: Allowed Domains",
 					"required": false,
-					"input_type": "json"
+					"input_type": "json",
+					"visible_when": "web_search_enabled"
 				}
 			]
 		},
diff --git a/site/src/api/queries/chats.ts b/site/src/api/queries/chats.ts
index a9acf46c5d..d3e1e94597 100644
--- a/site/src/api/queries/chats.ts
+++ b/site/src/api/queries/chats.ts
@@ -10,9 +10,7 @@ import {
 	type CreateChatMessageRequestWithClearablePlanMode,
 } from "#/api/api";
 import type * as TypesGen from "#/api/typesGenerated";
-import { type AIProviderType, AIProviderTypes } from "#/api/typesGenerated";
 import type { UsePaginatedQueryOptions } from "#/hooks/usePaginatedQuery";
-import { formatProviderLabel } from "#/utils/aiProviders";
 import {
 	projectEditedConversationIntoCache,
 	reconcileEditedMessageInCache,
@@ -1797,82 +1795,6 @@ const invalidateChatConfigurationQueries = async (queryClient: QueryClient) => {
 	]);
 };
 
-const generatedAIProviderName = (provider: string): string => {
-	const suffix =
-		globalThis.crypto?.randomUUID?.() ??
-		`${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
-	return `${provider}-${suffix}`;
-};
-
-const normalizeAIProviderType = (provider: string): AIProviderType => {
-	const normalized = provider.trim().toLowerCase();
-	const aliased =
-		normalized === "openai-compatible" || normalized === "openai_compatible"
-			? "openai-compat"
-			: normalized;
-	const providerType = AIProviderTypes.find(
-		(candidate) => candidate === aliased,
-	);
-	if (!providerType) {
-		throw new Error(`Unsupported AI provider type "${provider}".`);
-	}
-	return providerType;
-};
-
-export const createChatProviderConfig = (queryClient: QueryClient) => ({
-	mutationFn: (req: TypesGen.CreateChatProviderConfigRequest) => {
-		const providerType = normalizeAIProviderType(req.provider);
-		const apiKey = req.api_key;
-		return API.experimental.createAIProvider({
-			type: providerType,
-			name: generatedAIProviderName(providerType),
-			display_name: req.display_name || formatProviderLabel(providerType),
-			base_url: req.base_url ?? "",
-			enabled: req.enabled ?? true,
-			api_keys: apiKey ? [apiKey] : undefined,
-		});
-	},
-	onSuccess: async () => {
-		await invalidateChatConfigurationQueries(queryClient);
-	},
-});
-
-type UpdateChatProviderConfigMutationArgs = {
-	providerConfigId: string;
-	req: TypesGen.UpdateChatProviderConfigRequest;
-};
-
-export const updateChatProviderConfig = (queryClient: QueryClient) => ({
-	mutationFn: async ({
-		providerConfigId,
-		req,
-	}: UpdateChatProviderConfigMutationArgs) => {
-		const apiKey = req.api_key;
-		return API.experimental.updateAIProvider(providerConfigId, {
-			display_name: req.display_name,
-			base_url: req.base_url,
-			enabled: req.enabled,
-			api_keys:
-				req.api_key === undefined
-					? undefined
-					: apiKey
-						? [{ api_key: apiKey }]
-						: [],
-		});
-	},
-	onSuccess: async () => {
-		await invalidateChatConfigurationQueries(queryClient);
-	},
-});
-
-export const deleteChatProviderConfig = (queryClient: QueryClient) => ({
-	mutationFn: (providerConfigId: string) =>
-		API.experimental.deleteAIProvider(providerConfigId),
-	onSuccess: async () => {
-		await invalidateChatConfigurationQueries(queryClient);
-	},
-});
-
 export const createChatModelConfig = (queryClient: QueryClient) => ({
 	mutationFn: (req: TypesGen.CreateChatModelConfigRequest) =>
 		API.experimental.createChatModelConfig(req),
diff --git a/site/src/modules/aiModels/helpers.ts b/site/src/modules/aiModels/helpers.ts
new file mode 100644
index 0000000000..6c81519bf8
--- /dev/null
+++ b/site/src/modules/aiModels/helpers.ts
@@ -0,0 +1,15 @@
+export function normalizeProvider(provider: string): string {
+	return provider.trim().toLowerCase();
+}
+
+const canonicalProviderBaseURLs: Record<string, string> = {
+	anthropic: "https://api.anthropic.com",
+	google: "https://generativelanguage.googleapis.com/v1beta",
+	openai: "https://api.openai.com/v1",
+	openrouter: "https://openrouter.ai/api/v1",
+	vercel: "https://ai-gateway.vercel.sh/v1",
+};
+
+export function getDefaultProviderBaseURL(provider: string): string {
+	return canonicalProviderBaseURLs[normalizeProvider(provider)] ?? "";
+}
diff --git a/site/src/modules/aiModels/providerStates.test.ts b/site/src/modules/aiModels/providerStates.test.ts
new file mode 100644
index 0000000000..9cf9ae4e9d
--- /dev/null
+++ b/site/src/modules/aiModels/providerStates.test.ts
@@ -0,0 +1,282 @@
+import { describe, expect, it } from "vitest";
+import type * as TypesGen from "#/api/typesGenerated";
+import {
+	MockChatModelConfig,
+	MockChatModelProvider,
+	MockChatProviderConfig,
+} from "#/testHelpers/chatModels";
+import {
+	canManageProviderModels,
+	deriveProviderStates,
+	type ProviderState,
+	resolveModelProviderKey,
+} from "./providerStates";
+
+const baseProviderState: ProviderState = {
+	key: "prov-openai",
+	provider: "openai",
+	label: "OpenAI",
+	providerConfig: MockChatProviderConfig,
+	modelConfigs: [],
+	catalogModelCount: 0,
+	hasManagedAPIKey: true,
+	hasCatalogAPIKey: false,
+	hasEffectiveAPIKey: true,
+	allowUserAPIKey: false,
+	isEnvPreset: false,
+	baseURL: "",
+};
+
+describe("deriveProviderStates", () => {
+	it("orders provider configs first, then catalog-only, then model-only providers", () => {
+		const providerConfigs = [
+			{
+				...MockChatProviderConfig,
+				id: "prov-anthropic",
+				provider: "anthropic",
+				display_name: "Anthropic",
+			},
+		];
+		const catalog: TypesGen.ChatModelsResponse = {
+			providers: [
+				{ ...MockChatModelProvider, provider: "anthropic" },
+				{ ...MockChatModelProvider, provider: "google" },
+			],
+		};
+		const modelConfigs = [
+			{ ...MockChatModelConfig, id: "m-vercel", provider: "vercel" },
+		];
+
+		const states = deriveProviderStates(modelConfigs, providerConfigs, catalog);
+
+		expect(states.map((s) => s.provider)).toEqual([
+			"anthropic",
+			"google",
+			"vercel",
+		]);
+		expect(states[0].key).toBe("prov-anthropic");
+		expect(states[1].key).toBe("google");
+		expect(states[2].key).toBe("vercel");
+		expect(states[0].hasEffectiveAPIKey).toBe(true);
+		expect(states[1].hasEffectiveAPIKey).toBe(true);
+		expect(states[2].hasEffectiveAPIKey).toBe(false);
+	});
+
+	it("matches model configs to provider configs by ai_provider_id", () => {
+		const providerConfigs = [
+			{ ...MockChatProviderConfig, id: "prov-openai", provider: "openai" },
+		];
+		const modelConfigs = [
+			{
+				...MockChatModelConfig,
+				id: "m1",
+				provider: "openai",
+				ai_provider_id: "prov-openai",
+			},
+			{ ...MockChatModelConfig, id: "m2", provider: "openai" },
+		];
+
+		const states = deriveProviderStates(modelConfigs, providerConfigs, null);
+
+		expect(states).toHaveLength(1);
+		expect(states[0].key).toBe("prov-openai");
+		expect(states[0].modelConfigs.map((m) => m.id)).toEqual(["m1", "m2"]);
+	});
+
+	it("treats bedrock with central_api_key_enabled as having an effective key", () => {
+		const providerConfigs = [
+			{
+				...MockChatProviderConfig,
+				id: "prov-bedrock",
+				provider: "bedrock",
+				has_api_key: false,
+				central_api_key_enabled: true,
+			},
+		];
+
+		const states = deriveProviderStates([], providerConfigs, null);
+
+		expect(states[0].hasEffectiveAPIKey).toBe(true);
+	});
+
+	it("drops models without ai_provider_id when multiple configs exist for the same provider", () => {
+		const providerConfigs = [
+			{ ...MockChatProviderConfig, id: "prov-a", provider: "openai" },
+			{ ...MockChatProviderConfig, id: "prov-b", provider: "openai" },
+		];
+		const modelConfigs = [
+			{ ...MockChatModelConfig, id: "m1", provider: "openai" },
+		];
+
+		const states = deriveProviderStates(modelConfigs, providerConfigs, null);
+
+		expect(states.flatMap((s) => s.modelConfigs)).toHaveLength(0);
+	});
+
+	it("detects env-preset providers from the catalog when no config exists", () => {
+		const catalog: TypesGen.ChatModelsResponse = {
+			providers: [
+				{ ...MockChatModelProvider, provider: "openai", available: true },
+			],
+		};
+
+		const states = deriveProviderStates([], null, catalog);
+
+		expect(states).toHaveLength(1);
+		expect(states[0].provider).toBe("openai");
+		expect(states[0].isEnvPreset).toBe(true);
+		expect(states[0].hasCatalogAPIKey).toBe(true);
+	});
+
+	it("flags env-preset providers via the provider config source", () => {
+		const providerConfigs = [
+			{
+				...MockChatProviderConfig,
+				id: "prov-openai",
+				provider: "openai",
+				source: "env_preset" as const,
+			},
+		];
+
+		const states = deriveProviderStates([], providerConfigs, null);
+
+		expect(states[0].isEnvPreset).toBe(true);
+		expect(states[0].providerConfig).toBeUndefined();
+	});
+
+	it("treats an unavailable catalog provider as having a key unless the api key is missing", () => {
+		const catalog: TypesGen.ChatModelsResponse = {
+			providers: [
+				{
+					...MockChatModelProvider,
+					provider: "openai",
+					available: false,
+					unavailable_reason: "fetch_failed",
+				},
+			],
+		};
+
+		const states = deriveProviderStates([], null, catalog);
+
+		expect(states[0].hasCatalogAPIKey).toBe(true);
+	});
+
+	it("derives label, catalogModelCount, and baseURL from the inputs", () => {
+		const providerConfigs = [
+			{
+				...MockChatProviderConfig,
+				id: "prov-openai",
+				provider: "openai",
+				display_name: "Custom OpenAI",
+				base_url: "https://custom.example.com/v1",
+			},
+		];
+		const catalog: TypesGen.ChatModelsResponse = {
+			providers: [
+				{
+					...MockChatModelProvider,
+					provider: "openai",
+					models: [
+						{
+							id: "gpt-x",
+							provider: "openai",
+							model: "gpt-x",
+							display_name: "GPT-X",
+						},
+					],
+				},
+			],
+		};
+
+		const states = deriveProviderStates([], providerConfigs, catalog);
+
+		expect(states[0].label).toBe("Custom OpenAI");
+		expect(states[0].catalogModelCount).toBe(1);
+		expect(states[0].baseURL).toBe("https://custom.example.com/v1");
+	});
+});
+
+describe("canManageProviderModels", () => {
+	const baseState = baseProviderState;
+
+	it("returns false without a managed provider config", () => {
+		expect(
+			canManageProviderModels({ ...baseState, providerConfig: undefined }),
+		).toBe(false);
+	});
+
+	it("returns true when the provider has an effective API key", () => {
+		expect(canManageProviderModels(baseState)).toBe(true);
+	});
+
+	it("returns true when user-supplied API keys are allowed", () => {
+		expect(
+			canManageProviderModels({
+				...baseState,
+				hasEffectiveAPIKey: false,
+				providerConfig: { ...MockChatProviderConfig, allow_user_api_key: true },
+			}),
+		).toBe(true);
+	});
+
+	it("returns false with no key and user keys disallowed", () => {
+		expect(
+			canManageProviderModels({
+				...baseState,
+				hasEffectiveAPIKey: false,
+				providerConfig: {
+					...MockChatProviderConfig,
+					allow_user_api_key: false,
+				},
+			}),
+		).toBe(false);
+	});
+
+	it("returns false for undefined provider state", () => {
+		expect(canManageProviderModels(undefined)).toBe(false);
+	});
+});
+
+describe("resolveModelProviderKey", () => {
+	const states: ProviderState[] = [
+		{ ...baseProviderState, key: "prov-a", provider: "openai" },
+		{ ...baseProviderState, key: "prov-b", provider: "openai" },
+		{ ...baseProviderState, key: "prov-anthropic", provider: "anthropic" },
+	];
+
+	it("prefers ai_provider_id when present", () => {
+		expect(
+			resolveModelProviderKey(
+				{ ...MockChatModelConfig, ai_provider_id: "prov-explicit" },
+				states,
+			),
+		).toBe("prov-explicit");
+	});
+
+	it("falls back to the single matching provider state key", () => {
+		expect(
+			resolveModelProviderKey(
+				{ ...MockChatModelConfig, provider: "anthropic" },
+				states,
+			),
+		).toBe("prov-anthropic");
+	});
+
+	it("returns an empty key when multiple states match the provider", () => {
+		expect(
+			resolveModelProviderKey(
+				{ ...MockChatModelConfig, provider: "openai" },
+				states,
+			),
+		).toBe("");
+	});
+
+	it("falls back to the provider name when no states match", () => {
+		expect(
+			resolveModelProviderKey(
+				{ ...MockChatModelConfig, provider: "google" },
+				states,
+			),
+		).toBe("google");
+	});
+});
diff --git a/site/src/modules/aiModels/providerStates.ts b/site/src/modules/aiModels/providerStates.ts
new file mode 100644
index 0000000000..79d8732142
--- /dev/null
+++ b/site/src/modules/aiModels/providerStates.ts
@@ -0,0 +1,237 @@
+import type * as TypesGen from "#/api/typesGenerated";
+import {
+	getDefaultProviderBaseURL,
+	normalizeProvider,
+} from "#/modules/aiModels/helpers";
+import { formatProviderLabel } from "#/utils/aiProviders";
+
+export type ProviderState = {
+	key: string;
+	provider: string;
+	label: string;
+	providerConfig: TypesGen.ChatProviderConfig | undefined;
+	modelConfigs: readonly TypesGen.ChatModelConfig[];
+	catalogModelCount: number;
+	hasManagedAPIKey: boolean;
+	hasCatalogAPIKey: boolean;
+	hasEffectiveAPIKey: boolean;
+	allowUserAPIKey: boolean;
+	isEnvPreset: boolean;
+	baseURL: string;
+};
+
+type CatalogProvider = TypesGen.ChatModelsResponse["providers"][number];
+
+const envPresetProviders = new Set(["openai", "anthropic"]);
+
+const readOptionalString = (value: unknown): string | undefined => {
+	if (typeof value !== "string") return undefined;
+	const trimmed = value.trim();
+	return trimmed || undefined;
+};
+
+const isDatabaseProviderConfig = (
+	providerConfig: TypesGen.ChatProviderConfig | undefined,
+	source: TypesGen.ChatProviderConfigSource | undefined,
+): providerConfig is TypesGen.ChatProviderConfig => {
+	if (!providerConfig) return false;
+	if (providerConfig.id === "00000000-0000-0000-0000-000000000000") {
+		return false;
+	}
+	return source === undefined || source === "database";
+};
+
+const getCatalogProviders = (
+	catalog: TypesGen.ChatModelsResponse | null | undefined,
+): readonly CatalogProvider[] => {
+	const providers = catalog?.providers;
+	return Array.isArray(providers) ? providers : [];
+};
+
+const providerHasCatalogAPIKey = (provider: CatalogProvider): boolean =>
+	provider.available ||
+	(Boolean(provider.unavailable_reason) &&
+		provider.unavailable_reason !== "missing_api_key");
+
+const getProviderModels = (
+	provider: CatalogProvider | undefined,
+): readonly CatalogProvider["models"][number][] => {
+	const models = provider?.models;
+	return Array.isArray(models) ? models : [];
+};
+
+const getProviderBaseURL = (
+	providerConfig: TypesGen.ChatProviderConfig | undefined,
+): string => {
+	return (
+		readOptionalString(providerConfig?.base_url) ??
+		getDefaultProviderBaseURL(providerConfig?.provider ?? "")
+	);
+};
+
+const providerConfigStateKey = (
+	providerConfig: TypesGen.ChatProviderConfig,
+): string => {
+	const providerID = readOptionalString(providerConfig.id);
+	if (providerID && providerID !== "00000000-0000-0000-0000-000000000000") {
+		return providerID;
+	}
+	return normalizeProvider(providerConfig.provider);
+};
+
+type ProviderEntry = {
+	key: string;
+	provider: string;
+};
+
+export const deriveProviderStates = (
+	modelConfigs: readonly TypesGen.ChatModelConfig[],
+	providerConfigs: TypesGen.ChatProviderConfig[] | null | undefined,
+	catalog: TypesGen.ChatModelsResponse | null | undefined,
+): readonly ProviderState[] => {
+	const orderedEntries: ProviderEntry[] = [];
+	const seenEntries = new Set<string>();
+	const includeEntry = (keyValue: string, providerValue: string) => {
+		const key = readOptionalString(keyValue);
+		const provider = normalizeProvider(providerValue);
+		if (!key || !provider || seenEntries.has(key)) return;
+		seenEntries.add(key);
+		orderedEntries.push({ key, provider });
+	};
+
+	const catalogProviders = getCatalogProviders(catalog);
+	const catalogProvidersByProvider = new Map<string, CatalogProvider>();
+	for (const cp of catalogProviders) {
+		const provider = normalizeProvider(cp.provider);
+		if (!provider) continue;
+		catalogProvidersByProvider.set(provider, cp);
+	}
+
+	const providerConfigKeysByProvider = new Map<string, string[]>();
+	const providerTypesWithConfigs = new Set<string>();
+	for (const pc of providerConfigs ?? []) {
+		const provider = normalizeProvider(pc.provider);
+		if (!provider) continue;
+		const key = providerConfigStateKey(pc);
+		providerTypesWithConfigs.add(provider);
+		providerConfigKeysByProvider.set(provider, [
+			...(providerConfigKeysByProvider.get(provider) ?? []),
+			key,
+		]);
+		includeEntry(key, provider);
+	}
+	const modelStateKey = (modelConfig: TypesGen.ChatModelConfig): string => {
+		const aiProviderID = readOptionalString(modelConfig.ai_provider_id);
+		if (aiProviderID) {
+			return aiProviderID;
+		}
+		const provider = normalizeProvider(modelConfig.provider);
+		const providerConfigKeys = providerConfigKeysByProvider.get(provider) ?? [];
+		if (providerConfigKeys.length === 1) {
+			return providerConfigKeys[0];
+		}
+		return providerConfigKeys.length === 0 ? provider : "";
+	};
+
+	for (const cp of catalogProviders) {
+		const provider = normalizeProvider(cp.provider);
+		if (!provider || providerTypesWithConfigs.has(provider)) continue;
+		includeEntry(provider, provider);
+	}
+	for (const mc of modelConfigs) {
+		includeEntry(modelStateKey(mc), mc.provider);
+	}
+
+	const providerConfigsByKey = new Map<string, TypesGen.ChatProviderConfig>();
+	for (const pc of providerConfigs ?? []) {
+		const key = providerConfigStateKey(pc);
+		if (!key) continue;
+		providerConfigsByKey.set(key, pc);
+	}
+
+	const modelConfigsByKey = new Map<string, TypesGen.ChatModelConfig[]>();
+	for (const mc of modelConfigs) {
+		const key = modelStateKey(mc);
+		if (!key) continue;
+		const existing = modelConfigsByKey.get(key);
+		if (existing) {
+			existing.push(mc);
+		} else {
+			modelConfigsByKey.set(key, [mc]);
+		}
+	}
+
+	return orderedEntries.map(({ key, provider }) => {
+		const providerConfigEntry = providerConfigsByKey.get(key);
+		const providerConfigSource = providerConfigEntry?.source;
+		const providerConfig = isDatabaseProviderConfig(
+			providerConfigEntry,
+			providerConfigSource,
+		)
+			? providerConfigEntry
+			: undefined;
+		const catalogProvider = catalogProvidersByProvider.get(provider);
+		const hasManagedAPIKey = providerConfig?.has_api_key ?? false;
+		const hasProviderEntryAPIKey = providerConfigEntry?.has_api_key ?? false;
+		const hasCatalogAPIKey = catalogProvider
+			? providerHasCatalogAPIKey(catalogProvider)
+			: false;
+		const label =
+			readOptionalString(providerConfigEntry?.display_name) ??
+			formatProviderLabel(provider);
+		const hasBedrockAmbientCredentials =
+			provider === "bedrock" &&
+			providerConfig?.central_api_key_enabled === true;
+		const modelConfigsForProvider = modelConfigsByKey.get(key) ?? [];
+		const isCatalogEnvPreset =
+			!providerConfig && envPresetProviders.has(provider) && hasCatalogAPIKey;
+		const isEnvPreset =
+			providerConfigSource === "env_preset" || isCatalogEnvPreset;
+
+		return {
+			key,
+			provider,
+			label,
+			providerConfig,
+			modelConfigs: modelConfigsForProvider,
+			catalogModelCount: getProviderModels(catalogProvider).length,
+			hasManagedAPIKey,
+			hasCatalogAPIKey,
+			hasEffectiveAPIKey: providerConfigEntry
+				? hasProviderEntryAPIKey || hasBedrockAmbientCredentials
+				: hasManagedAPIKey || hasCatalogAPIKey,
+			allowUserAPIKey: providerConfigEntry?.allow_user_api_key ?? true,
+			isEnvPreset,
+			baseURL: getProviderBaseURL(providerConfigEntry),
+		};
+	});
+};
+
+export const canManageProviderModels = (
+	providerState: ProviderState | undefined,
+): boolean => {
+	return Boolean(
+		providerState?.providerConfig &&
+			(providerState.hasEffectiveAPIKey ||
+				providerState.providerConfig.allow_user_api_key),
+	);
+};
+
+export const resolveModelProviderKey = (
+	modelConfig: TypesGen.ChatModelConfig,
+	providerStates: readonly ProviderState[],
+): string => {
+	const providerID = readOptionalString(modelConfig.ai_provider_id);
+	if (providerID) {
+		return providerID;
+	}
+	const provider = normalizeProvider(modelConfig.provider);
+	const matches = providerStates.filter((s) => s.provider === provider);
+	if (matches.length === 1) {
+		return matches[0].key;
+	}
+	if (matches.length > 1) {
+		return "";
+	}
+	return provider;
+};
diff --git a/site/src/modules/management/AISettingsSidebarView.tsx b/site/src/modules/management/AISettingsSidebarView.tsx
index 664e4529cc..f3290bc4f4 100644
--- a/site/src/modules/management/AISettingsSidebarView.tsx
+++ b/site/src/modules/management/AISettingsSidebarView.tsx
@@ -32,6 +32,9 @@ const AISettingsSidebarView: FC<AISettingsSidebarViewProps> = ({
 						AI Gateway Keys
 					</SidebarNavItem>
 				)}
+				{permissions.editDeploymentConfig && (
+					<SidebarNavItem href="/ai/settings/models">Models</SidebarNavItem>
+				)}
 				{permissions.editDeploymentConfig && (
 					<SidebarNavItem href="/agents/settings/agents">
 						<div className="flex flex-row items-center gap-1">
diff --git a/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPage.tsx b/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPage.tsx
new file mode 100644
index 0000000000..e65120b6a7
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPage.tsx
@@ -0,0 +1,92 @@
+import { type FC, useMemo } from "react";
+import { useMutation, useQuery, useQueryClient } from "react-query";
+import { useNavigate, useSearchParams } from "react-router";
+import { toast } from "sonner";
+import { getErrorMessage } from "#/api/errors";
+import {
+	chatModelConfigs,
+	chatModels,
+	chatProviderConfigs,
+	createChatModelConfig,
+} from "#/api/queries/chats";
+import { useAuthenticated } from "#/hooks/useAuthenticated";
+import {
+	canManageProviderModels,
+	deriveProviderStates,
+} from "#/modules/aiModels/providerStates";
+import { RequirePermission } from "#/modules/permissions/RequirePermission";
+import { pageTitle } from "#/utils/page";
+import AddModelPageView from "./AddModelPageView";
+
+const AddModelPage: FC = () => {
+	const { permissions } = useAuthenticated();
+	const navigate = useNavigate();
+	const queryClient = useQueryClient();
+	const [searchParams] = useSearchParams();
+	const providerKey = searchParams.get("provider") ?? "";
+	const duplicateId = searchParams.get("duplicate");
+
+	const providerConfigsQuery = useQuery(chatProviderConfigs());
+	const modelConfigsQuery = useQuery(chatModelConfigs());
+	const modelCatalogQuery = useQuery(chatModels());
+
+	const createMutation = useMutation(createChatModelConfig(queryClient));
+
+	const providerStates = useMemo(
+		() =>
+			deriveProviderStates(
+				modelConfigsQuery.data ?? [],
+				providerConfigsQuery.data,
+				modelCatalogQuery.data,
+			),
+		[modelConfigsQuery.data, providerConfigsQuery.data, modelCatalogQuery.data],
+	);
+
+	const isLoading =
+		providerConfigsQuery.isLoading ||
+		modelConfigsQuery.isLoading ||
+		modelCatalogQuery.isLoading;
+
+	const selectedProviderState = providerKey
+		? (providerStates.find((ps) => ps.key === providerKey) ?? null)
+		: (providerStates.find(canManageProviderModels) ?? null);
+	const duplicateSourceModel = duplicateId
+		? modelConfigsQuery.data?.find((m) => m.id === duplicateId)
+		: undefined;
+	const currentDefaultModel = modelConfigsQuery.data?.find((m) => m.is_default);
+
+	return (
+		<RequirePermission isFeatureVisible={permissions.editDeploymentConfig}>
+			<title>{pageTitle("Add model", "AI Settings")}</title>
+
+			<AddModelPageView
+				isLoading={isLoading}
+				providerStates={providerStates}
+				selectedProviderState={selectedProviderState}
+				duplicateSourceModel={duplicateSourceModel}
+				currentDefaultModel={currentDefaultModel}
+				isSaving={createMutation.isPending}
+				onProviderChange={(key) => {
+					const next = new URLSearchParams(searchParams);
+					next.set("provider", key);
+					void navigate(`/ai/settings/models/add?${next.toString()}`, {
+						replace: true,
+					});
+				}}
+				onCreateModel={async (req) => {
+					try {
+						const created = await createMutation.mutateAsync(req);
+						toast.success(
+							`Model "${created.display_name || created.model}" added.`,
+						);
+						await navigate(`/ai/settings/models/${created.id}`);
+					} catch (error) {
+						toast.error(getErrorMessage(error, "Failed to add model."));
+					}
+				}}
+			/>
+		</RequirePermission>
+	);
+};
+
+export default AddModelPage;
diff --git a/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.stories.tsx b/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.stories.tsx
new file mode 100644
index 0000000000..901a886817
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.stories.tsx
@@ -0,0 +1,67 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { expect, fn, userEvent, within } from "storybook/test";
+import { withToaster } from "#/testHelpers/storybook";
+import {
+	MockAnthropicProviderState,
+	MockOpenAIProviderState,
+} from "../testFixtures";
+import AddModelPageView from "./AddModelPageView";
+
+const meta: Meta<typeof AddModelPageView> = {
+	title: "pages/AISettingsPage/ModelsPage/AddModelPageView",
+	component: AddModelPageView,
+	decorators: [withToaster],
+	args: {
+		isLoading: false,
+		providerStates: [MockOpenAIProviderState, MockAnthropicProviderState],
+		selectedProviderState: MockOpenAIProviderState,
+		isSaving: false,
+		onProviderChange: fn(),
+		onCreateModel: fn(async () => undefined),
+	},
+};
+
+export default meta;
+type Story = StoryObj<typeof AddModelPageView>;
+
+export const Default: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(
+			canvas.getByRole("heading", { name: /add an? OpenAI model/i }),
+		).toBeInTheDocument();
+	},
+};
+
+export const WebSearchDependentFields: Story = {
+	args: { selectedProviderState: MockAnthropicProviderState },
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await userEvent.click(
+			await canvas.findByRole("button", { name: /provider configuration/i }),
+		);
+		expect(canvas.queryByLabelText(/allowed domains/i)).not.toBeInTheDocument();
+		const webSearchField = canvas.getByRole("radiogroup", {
+			name: /web search enabled/i,
+		});
+		await userEvent.click(
+			within(webSearchField).getByRole("radio", { name: /on/i }),
+		);
+		const allowed = await canvas.findByLabelText(/allowed domains/i);
+		const blocked = await canvas.findByLabelText(/blocked domains/i);
+		await userEvent.type(allowed, "example.com");
+		expect(blocked).toBeDisabled();
+	},
+};
+
+export const ProviderNotFound: Story = {
+	args: { selectedProviderState: null },
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(canvas.getByText("Provider not found")).toBeInTheDocument();
+	},
+};
+
+export const Loading: Story = {
+	args: { isLoading: true },
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.tsx b/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.tsx
new file mode 100644
index 0000000000..76af38450b
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPageView.tsx
@@ -0,0 +1,73 @@
+import { ArrowLeftIcon } from "lucide-react";
+import type { FC } from "react";
+import { Link } from "react-router";
+import type * as TypesGen from "#/api/typesGenerated";
+import { Alert, AlertDescription, AlertTitle } from "#/components/Alert/Alert";
+import { Button } from "#/components/Button/Button";
+import { Loader } from "#/components/Loader/Loader";
+import type { ProviderState } from "#/modules/aiModels/providerStates";
+import { ModelForm } from "../components/ModelForm";
+
+interface AddModelPageViewProps {
+	isLoading: boolean;
+	providerStates: readonly ProviderState[];
+	selectedProviderState: ProviderState | null;
+	duplicateSourceModel?: TypesGen.ChatModelConfig;
+	currentDefaultModel?: TypesGen.ChatModelConfig;
+	isSaving: boolean;
+	onProviderChange: (providerKey: string) => void;
+	onCreateModel: (
+		req: TypesGen.CreateChatModelConfigRequest,
+	) => Promise<unknown>;
+}
+
+const AddModelPageView: FC<AddModelPageViewProps> = ({
+	isLoading,
+	providerStates,
+	selectedProviderState,
+	duplicateSourceModel,
+	currentDefaultModel,
+	isSaving,
+	onProviderChange,
+	onCreateModel,
+}) => {
+	if (isLoading) {
+		return <Loader fullscreen />;
+	}
+
+	if (!selectedProviderState) {
+		return (
+			<div className="flex flex-col items-start gap-4">
+				<Link to="/ai/settings/models" className="-ml-3">
+					<Button variant="subtle">
+						<ArrowLeftIcon />
+						<span>Back to models</span>
+					</Button>
+				</Link>
+				<Alert severity="warning">
+					<AlertTitle>Provider not found</AlertTitle>
+					<AlertDescription>
+						The provider you are trying to add a model for is not available.
+						Please try again.
+					</AlertDescription>
+				</Alert>
+			</div>
+		);
+	}
+
+	return (
+		<ModelForm
+			duplicateSourceModel={duplicateSourceModel}
+			currentDefaultModel={currentDefaultModel}
+			providerStates={providerStates}
+			selectedProviderState={selectedProviderState}
+			onProviderChange={onProviderChange}
+			isSaving={isSaving}
+			isDeleting={false}
+			onCreateModel={onCreateModel}
+			onUpdateModel={async () => {}}
+		/>
+	);
+};
+
+export default AddModelPageView;
diff --git a/site/src/pages/AISettingsPage/ModelsPage/ModelsPage.tsx b/site/src/pages/AISettingsPage/ModelsPage/ModelsPage.tsx
new file mode 100644
index 0000000000..49a28aa98d
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/ModelsPage.tsx
@@ -0,0 +1,56 @@
+import type { FC } from "react";
+import { useQuery } from "react-query";
+import {
+	chatModelConfigs,
+	chatModels,
+	chatProviderConfigs,
+} from "#/api/queries/chats";
+import { useAuthenticated } from "#/hooks/useAuthenticated";
+import { deriveProviderStates } from "#/modules/aiModels/providerStates";
+import { RequirePermission } from "#/modules/permissions/RequirePermission";
+import { pageTitle } from "#/utils/page";
+import ModelsPageView from "./ModelsPageView";
+
+const ModelsPage: FC = () => {
+	const { permissions } = useAuthenticated();
+
+	const providerConfigsQuery = useQuery({
+		...chatProviderConfigs(),
+		enabled: permissions.editDeploymentConfig,
+	});
+	const modelConfigsQuery = useQuery(chatModelConfigs());
+	const modelCatalogQuery = useQuery(chatModels());
+
+	const models = (modelConfigsQuery.data ?? []).slice().sort((a, b) => {
+		const cmp = a.provider.localeCompare(b.provider);
+		return cmp !== 0 ? cmp : a.model.localeCompare(b.model);
+	});
+	const providerStates = deriveProviderStates(
+		models,
+		providerConfigsQuery.data,
+		modelCatalogQuery.data,
+	);
+
+	return (
+		<RequirePermission isFeatureVisible={permissions.editDeploymentConfig}>
+			<title>{pageTitle("Models", "AI Settings")}</title>
+
+			<ModelsPageView
+				isLoading={
+					providerConfigsQuery.isLoading ||
+					modelConfigsQuery.isLoading ||
+					modelCatalogQuery.isLoading
+				}
+				error={
+					providerConfigsQuery.error ??
+					modelConfigsQuery.error ??
+					modelCatalogQuery.error
+				}
+				models={models}
+				providerStates={providerStates}
+			/>
+		</RequirePermission>
+	);
+};
+
+export default ModelsPage;
diff --git a/site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.stories.tsx b/site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.stories.tsx
new file mode 100644
index 0000000000..39994900f0
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.stories.tsx
@@ -0,0 +1,99 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { expect, userEvent, within } from "storybook/test";
+import { reactRouterParameters } from "storybook-addon-remix-react-router";
+import type { ChatModelConfig } from "#/api/typesGenerated";
+import ModelsPageView from "./ModelsPageView";
+import {
+	MockAnthropicProviderState,
+	MockOpenAIProviderState,
+	mockClaude,
+	mockDisabledModel,
+	mockGPT5,
+} from "./testFixtures";
+
+const meta: Meta<typeof ModelsPageView> = {
+	title: "pages/AISettingsPage/ModelsPage/ModelsPageView",
+	component: ModelsPageView,
+	args: {
+		isLoading: false,
+		error: null,
+		models: [mockGPT5, mockClaude, mockDisabledModel],
+		providerStates: [MockOpenAIProviderState, MockAnthropicProviderState],
+	},
+	parameters: {
+		reactRouter: reactRouterParameters({
+			location: { path: "/ai/settings/models" },
+			routing: [
+				{ path: "/ai/settings/models", useStoryElement: true },
+				{ path: "/ai/settings/models/add", useStoryElement: true },
+				{ path: "/ai/settings/models/:modelId", useStoryElement: true },
+			],
+		}),
+	},
+};
+
+export default meta;
+type Story = StoryObj<typeof ModelsPageView>;
+
+export const Default: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(
+			canvas.getByRole("button", { name: /add model/i }),
+		).toBeInTheDocument();
+		await expect(canvas.getByText("GPT-5")).toBeInTheDocument();
+		await expect(canvas.getByText("Claude Sonnet 4.5")).toBeInTheDocument();
+		await expect(canvas.getAllByText("OpenAI").length).toBeGreaterThan(0);
+		await expect(canvas.getByText("Anthropic")).toBeInTheDocument();
+		await expect(canvas.getAllByText("Enabled").length).toBeGreaterThan(0);
+		await expect(canvas.getByText("Default")).toBeInTheDocument();
+		await expect(canvas.getByText("Disabled")).toBeInTheDocument();
+	},
+};
+
+export const Loading: Story = {
+	args: {
+		isLoading: true,
+		models: [],
+	},
+};
+
+export const Empty: Story = {
+	args: {
+		models: [],
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(canvas.getByText("No models configured")).toBeInTheDocument();
+	},
+};
+
+export const LoadError: Story = {
+	args: {
+		error: new Error("Failed to load models"),
+		models: [],
+	},
+};
+
+const manyModels: ChatModelConfig[] = Array.from({ length: 23 }, (_, i) => ({
+	...mockClaude,
+	id: `model-${i}`,
+	model: `model-${i}`,
+	display_name: `Model ${i}`,
+	is_default: false,
+}));
+
+export const Paginated: Story = {
+	args: {
+		models: manyModels,
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(canvas.getByText("Model 0")).toBeInTheDocument();
+		await expect(canvas.queryByText("Model 10")).not.toBeInTheDocument();
+		await expect(canvas.getByText(/Showing/)).toBeInTheDocument();
+		await userEvent.click(canvas.getByRole("button", { name: /next page/i }));
+		await expect(canvas.getByText("Model 10")).toBeInTheDocument();
+		await expect(canvas.queryByText("Model 0")).not.toBeInTheDocument();
+	},
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.tsx b/site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.tsx
new file mode 100644
index 0000000000..2cf3f67f24
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/ModelsPageView.tsx
@@ -0,0 +1,178 @@
+import { ChevronDownIcon, PlusIcon } from "lucide-react";
+import { type FC, useState } from "react";
+import { useNavigate } from "react-router";
+import type { ChatModelConfig } from "#/api/typesGenerated";
+import { ErrorAlert } from "#/components/Alert/ErrorAlert";
+import { Button } from "#/components/Button/Button";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuTrigger,
+} from "#/components/DropdownMenu/DropdownMenu";
+import { PaginationWidgetBase } from "#/components/PaginationWidget/PaginationWidgetBase";
+import {
+	SettingsHeader,
+	SettingsHeaderDescription,
+	SettingsHeaderTitle,
+} from "#/components/SettingsHeader/SettingsHeader";
+import {
+	Table,
+	TableBody,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "#/components/Table/Table";
+import { TableEmpty } from "#/components/TableEmpty/TableEmpty";
+import { TableLoader } from "#/components/TableLoader/TableLoader";
+import {
+	canManageProviderModels,
+	type ProviderState,
+} from "#/modules/aiModels/providerStates";
+import { ProviderIcon } from "#/pages/AISettingsPage/ProvidersPage/components/ProviderIcon";
+import { paginateItems } from "#/utils/paginateItems";
+import { ModelRow } from "./components/ModelRow";
+
+const MODELS_PAGE_SIZE = 10;
+
+const AddModelDropdown: FC<{ providerStates: readonly ProviderState[] }> = ({
+	providerStates,
+}) => {
+	const navigate = useNavigate();
+	const manageableProviderStates = providerStates.filter(
+		canManageProviderModels,
+	);
+
+	return (
+		<DropdownMenu>
+			<DropdownMenuTrigger asChild>
+				<Button variant="outline">
+					<PlusIcon />
+					<span>Add model</span>
+					<ChevronDownIcon className="ml-1 size-icon-xs" />
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="end" className="min-w-56">
+				<div className="px-2 py-1.5 text-xs font-medium text-content-secondary">
+					Select a provider
+				</div>
+				{manageableProviderStates.length === 0 ? (
+					<DropdownMenuItem disabled>No providers available</DropdownMenuItem>
+				) : (
+					manageableProviderStates.map((providerState) => (
+						<DropdownMenuItem
+							key={providerState.key}
+							onSelect={() =>
+								void navigate(
+									`/ai/settings/models/add?provider=${encodeURIComponent(
+										providerState.key,
+									)}`,
+								)
+							}
+						>
+							<ProviderIcon provider={providerState.provider} />
+							<span>{providerState.label}</span>
+						</DropdownMenuItem>
+					))
+				)}
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+};
+
+interface ModelsPageViewProps {
+	isLoading: boolean;
+	error: unknown;
+	models: readonly ChatModelConfig[];
+	providerStates: readonly ProviderState[];
+}
+
+const ModelsPageView: FC<ModelsPageViewProps> = ({
+	isLoading,
+	error,
+	models,
+	providerStates,
+}) => {
+	const navigate = useNavigate();
+	const [page, setPage] = useState(1);
+	const { pagedItems, clampedPage, hasPreviousPage, hasNextPage } =
+		paginateItems(models, MODELS_PAGE_SIZE, page);
+
+	const providerLabelByModelId = new Map<string, string>();
+	for (const providerState of providerStates) {
+		for (const providerModel of providerState.modelConfigs) {
+			providerLabelByModelId.set(providerModel.id, providerState.label);
+		}
+	}
+
+	return (
+		<div>
+			<SettingsHeader
+				actions={<AddModelDropdown providerStates={providerStates} />}
+			>
+				<SettingsHeaderTitle>Models</SettingsHeaderTitle>
+				<SettingsHeaderDescription>
+					Choose which models from your configured providers are available for
+					users to select. You can set a default and adjust context limits.
+				</SettingsHeaderDescription>
+			</SettingsHeader>
+			{Boolean(error) && (
+				<div className="mb-4">
+					<ErrorAlert error={error} />
+				</div>
+			)}
+			<Table className="table-fixed" aria-label="Models">
+				<TableHeader>
+					<TableRow>
+						<TableHead className="w-1/3">Name</TableHead>
+						<TableHead className="w-1/4">Provider</TableHead>
+						<TableHead className="w-1/4">Context limit</TableHead>
+						<TableHead className="w-40">Status</TableHead>
+						<TableHead className="w-12">
+							<span className="sr-only">Open model</span>
+						</TableHead>
+					</TableRow>
+				</TableHeader>
+				<TableBody>
+					{isLoading ? (
+						<TableLoader />
+					) : models.length === 0 ? (
+						<TableEmpty
+							message="No models configured"
+							description="Configured models will appear here."
+						/>
+					) : (
+						pagedItems.map((model) => (
+							<ModelRow
+								key={model.id}
+								model={model}
+								providerLabel={providerLabelByModelId.get(model.id) ?? ""}
+								onClick={() => void navigate(`/ai/settings/models/${model.id}`)}
+							/>
+						))
+					)}
+				</TableBody>
+			</Table>
+			{models.length > 0 && (
+				<div className="flex items-center justify-between pt-4">
+					<div className="flex-1">
+						<PaginationWidgetBase
+							currentPage={clampedPage}
+							pageSize={MODELS_PAGE_SIZE}
+							totalRecords={models.length}
+							onPageChange={setPage}
+							hasPreviousPage={hasPreviousPage}
+							hasNextPage={hasNextPage}
+						/>
+					</div>
+					<span className="text-xs text-content-secondary">
+						Showing <strong className="font-medium">{pagedItems.length}</strong>{" "}
+						of <strong className="font-medium">{models.length}</strong> models
+					</span>
+				</div>
+			)}
+		</div>
+	);
+};
+
+export default ModelsPageView;
diff --git a/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPage.tsx b/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPage.tsx
new file mode 100644
index 0000000000..e7d95aaabf
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPage.tsx
@@ -0,0 +1,140 @@
+import { type FC, useMemo, useState } from "react";
+import { useMutation, useQuery, useQueryClient } from "react-query";
+import { Navigate, useNavigate, useParams } from "react-router";
+import { toast } from "sonner";
+import { getErrorMessage } from "#/api/errors";
+import {
+	chatModelConfigs,
+	chatModels,
+	chatProviderConfigs,
+	deleteChatModelConfig,
+	updateChatModelConfig,
+} from "#/api/queries/chats";
+import { Loader } from "#/components/Loader/Loader";
+import { useAuthenticated } from "#/hooks/useAuthenticated";
+import { deriveProviderStates } from "#/modules/aiModels/providerStates";
+import { RequirePermission } from "#/modules/permissions/RequirePermission";
+import { pageTitle } from "#/utils/page";
+import UpdateModelPageView from "./UpdateModelPageView";
+
+const UpdateModelPage: FC = () => {
+	const { permissions } = useAuthenticated();
+	const { modelId } = useParams<{ modelId: string }>();
+	const navigate = useNavigate();
+	const queryClient = useQueryClient();
+
+	const providerConfigsQuery = useQuery(chatProviderConfigs());
+	const modelConfigsQuery = useQuery(chatModelConfigs());
+	const modelCatalogQuery = useQuery(chatModels());
+
+	const updateMutation = useMutation(updateChatModelConfig(queryClient));
+	const deleteMutation = useMutation(deleteChatModelConfig(queryClient));
+
+	const providerStates = useMemo(
+		() =>
+			deriveProviderStates(
+				modelConfigsQuery.data ?? [],
+				providerConfigsQuery.data,
+				modelCatalogQuery.data,
+			),
+		[modelConfigsQuery.data, providerConfigsQuery.data, modelCatalogQuery.data],
+	);
+
+	const isLoading =
+		providerConfigsQuery.isLoading ||
+		modelConfigsQuery.isLoading ||
+		modelCatalogQuery.isLoading;
+
+	const model = modelConfigsQuery.data?.find((m) => m.id === modelId);
+	const currentDefaultModel = modelConfigsQuery.data?.find((m) => m.is_default);
+	const [providerKeyOverride, setProviderKeyOverride] = useState<string | null>(
+		null,
+	);
+	const selectedProviderState =
+		(providerKeyOverride
+			? providerStates.find((ps) => ps.key === providerKeyOverride)
+			: undefined) ??
+		providerStates.find((ps) =>
+			ps.modelConfigs.some((m) => m.id === modelId),
+		) ??
+		null;
+
+	return (
+		<RequirePermission isFeatureVisible={permissions.editDeploymentConfig}>
+			{!modelId ? (
+				<Navigate to="/ai/settings/models" replace />
+			) : isLoading ? (
+				<>
+					<title>{pageTitle("Loading...", "AI Settings")}</title>
+					<Loader fullscreen />
+				</>
+			) : !model ? (
+				<Navigate to="/ai/settings/models" replace />
+			) : (
+				<UpdateModelPageView
+					model={model}
+					currentDefaultModel={currentDefaultModel}
+					providerStates={providerStates}
+					selectedProviderState={selectedProviderState}
+					onProviderChange={setProviderKeyOverride}
+					isSaving={updateMutation.isPending}
+					isDeleting={deleteMutation.isPending}
+					onUpdateModel={async (id, req) => {
+						try {
+							const updated = await updateMutation.mutateAsync({
+								modelConfigId: id,
+								req,
+							});
+							toast.success(
+								`Model "${updated.display_name || updated.model}" updated.`,
+							);
+							await navigate("/ai/settings/models");
+						} catch (error) {
+							toast.error(getErrorMessage(error, "Failed to update model."));
+						}
+					}}
+					onDeleteModel={async (id) => {
+						try {
+							await deleteMutation.mutateAsync(id);
+							toast.success(
+								`Model "${model.display_name || model.model}" deleted.`,
+							);
+							await navigate("/ai/settings/models", { replace: true });
+						} catch (error) {
+							toast.error(getErrorMessage(error, "Failed to delete model."));
+						}
+					}}
+					onDuplicate={() => {
+						if (!selectedProviderState) return;
+						void navigate(
+							`/ai/settings/models/add?provider=${encodeURIComponent(
+								selectedProviderState.key,
+							)}&duplicate=${encodeURIComponent(model.id)}`,
+						);
+					}}
+					onToggleEnabled={(enabled) => {
+						updateMutation.mutate(
+							{ modelConfigId: model.id, req: { enabled } },
+							{
+								onSuccess: () => {
+									toast.success(
+										`Model "${model.display_name || model.model}" ${
+											enabled ? "enabled" : "disabled"
+										}.`,
+									);
+								},
+								onError: (error) => {
+									toast.error(
+										getErrorMessage(error, "Failed to update model."),
+									);
+								},
+							},
+						);
+					}}
+				/>
+			)}
+		</RequirePermission>
+	);
+};
+
+export default UpdateModelPage;
diff --git a/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.stories.tsx b/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.stories.tsx
new file mode 100644
index 0000000000..cb416ad598
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.stories.tsx
@@ -0,0 +1,40 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { expect, fn, within } from "storybook/test";
+import { withToaster } from "#/testHelpers/storybook";
+import {
+	MockAnthropicProviderState,
+	MockOpenAIProviderState,
+	mockGPT5,
+} from "../testFixtures";
+import UpdateModelPageView from "./UpdateModelPageView";
+
+const meta: Meta<typeof UpdateModelPageView> = {
+	title: "pages/AISettingsPage/ModelsPage/UpdateModelPageView",
+	component: UpdateModelPageView,
+	decorators: [withToaster],
+	args: {
+		model: mockGPT5,
+		providerStates: [MockOpenAIProviderState, MockAnthropicProviderState],
+		selectedProviderState: MockOpenAIProviderState,
+		onProviderChange: fn(),
+		isSaving: false,
+		isDeleting: false,
+		onUpdateModel: fn(async () => undefined),
+		onDeleteModel: fn(async () => undefined),
+		onDuplicate: fn(),
+		onToggleEnabled: fn(),
+	},
+};
+
+export default meta;
+type Story = StoryObj<typeof UpdateModelPageView>;
+
+export const Default: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(
+			canvas.getByRole("button", { name: /^update model$/i }),
+		).toBeVisible();
+		await expect(canvas.getByLabelText(/model identifier/i)).toBeEnabled();
+	},
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.tsx b/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.tsx
new file mode 100644
index 0000000000..5d4d017039
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPageView.tsx
@@ -0,0 +1,61 @@
+import type { FC } from "react";
+import type * as TypesGen from "#/api/typesGenerated";
+import type { ProviderState } from "#/modules/aiModels/providerStates";
+import { pageTitle } from "#/utils/page";
+import { ModelForm } from "../components/ModelForm";
+
+interface UpdateModelPageViewProps {
+	model: TypesGen.ChatModelConfig;
+	currentDefaultModel?: TypesGen.ChatModelConfig;
+	providerStates: readonly ProviderState[];
+	selectedProviderState: ProviderState | null;
+	onProviderChange: (providerKey: string) => void;
+	isSaving: boolean;
+	isDeleting: boolean;
+	onUpdateModel: (
+		modelConfigId: string,
+		req: TypesGen.UpdateChatModelConfigRequest,
+	) => Promise<unknown>;
+	onDeleteModel: (modelConfigId: string) => Promise<void>;
+	onDuplicate: () => void;
+	onToggleEnabled: (enabled: boolean) => void;
+}
+
+const UpdateModelPageView: FC<UpdateModelPageViewProps> = ({
+	model,
+	currentDefaultModel,
+	providerStates,
+	selectedProviderState,
+	onProviderChange,
+	isSaving,
+	isDeleting,
+	onUpdateModel,
+	onDeleteModel,
+	onDuplicate,
+	onToggleEnabled,
+}) => {
+	return (
+		<>
+			<title>
+				{pageTitle(model.display_name || model.model, "AI Settings")}
+			</title>
+			<ModelForm
+				key={model.id}
+				editingModel={model}
+				currentDefaultModel={currentDefaultModel}
+				providerStates={providerStates}
+				selectedProviderState={selectedProviderState}
+				onProviderChange={onProviderChange}
+				isSaving={isSaving}
+				isDeleting={isDeleting}
+				onCreateModel={async () => {}}
+				onUpdateModel={onUpdateModel}
+				onDeleteModel={onDeleteModel}
+				onDuplicate={onDuplicate}
+				onToggleEnabled={onToggleEnabled}
+			/>
+		</>
+	);
+};
+
+export default UpdateModelPageView;
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.stories.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.stories.tsx
new file mode 100644
index 0000000000..53dc60d4e0
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.stories.tsx
@@ -0,0 +1,201 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { expect, fn, screen, userEvent, within } from "storybook/test";
+import { reactRouterParameters } from "storybook-addon-remix-react-router";
+import { withToaster } from "#/testHelpers/storybook";
+import {
+	MockAnthropicProviderState,
+	MockOpenAIProviderState,
+	mockGPT5,
+} from "../testFixtures";
+import { ModelForm } from "./ModelForm";
+
+const meta: Meta<typeof ModelForm> = {
+	title: "pages/AISettingsPage/ModelsPage/ModelForm",
+	component: ModelForm,
+	decorators: [withToaster],
+	args: {
+		providerStates: [MockOpenAIProviderState, MockAnthropicProviderState],
+		selectedProviderState: MockOpenAIProviderState,
+		onProviderChange: fn(),
+		isSaving: false,
+		isDeleting: false,
+		onCreateModel: fn(async () => undefined),
+		onUpdateModel: fn(async () => undefined),
+	},
+	parameters: {
+		reactRouter: reactRouterParameters({
+			location: { path: "/ai/settings/models/add" },
+			routing: [
+				{ path: "/ai/settings/models/add", useStoryElement: true },
+				{ path: "/ai/settings/models", element: <div>Models</div> },
+			],
+		}),
+	},
+};
+
+export default meta;
+type Story = StoryObj<typeof ModelForm>;
+
+export const Add: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(
+			canvas.getByRole("heading", { name: /add an? OpenAI model/i }),
+		).toBeInTheDocument();
+		await expect(
+			canvas.getByRole("checkbox", { name: /set as default model/i }),
+		).toBeInTheDocument();
+		const submit = canvas.getByRole("button", { name: /add model/i });
+		await expect(submit).toBeDisabled();
+	},
+};
+
+export const AddValidSubmit: Story = {
+	play: async ({ canvasElement, args }) => {
+		const canvas = within(canvasElement);
+		const modelInput = canvas.getByLabelText(/model identifier/i);
+		await userEvent.type(modelInput, "gpt-5");
+		const contextLimit = canvas.getByLabelText(/context limit/i);
+		await userEvent.type(contextLimit, "200000");
+		const submit = canvas.getByRole("button", { name: /add model/i });
+		await expect(submit).toBeEnabled();
+		await userEvent.click(submit);
+		await expect(args.onCreateModel).toHaveBeenCalledTimes(1);
+	},
+};
+
+export const AddSetAsDefault: Story = {
+	play: async ({ canvasElement, args }) => {
+		const canvas = within(canvasElement);
+		await userEvent.type(canvas.getByLabelText(/model identifier/i), "gpt-5");
+		await userEvent.type(canvas.getByLabelText(/context limit/i), "200000");
+		await userEvent.click(
+			canvas.getByRole("checkbox", { name: /set as default model/i }),
+		);
+		await userEvent.click(canvas.getByRole("button", { name: /add model/i }));
+		await expect(args.onCreateModel).toHaveBeenCalledTimes(1);
+		await expect(args.onCreateModel).toHaveBeenCalledWith(
+			expect.objectContaining({ is_default: true }),
+		);
+	},
+};
+
+export const LeaveWithUnsavedChanges: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await userEvent.type(canvas.getByLabelText(/model identifier/i), "gpt-5");
+		await userEvent.click(
+			canvas.getByRole("link", { name: /back to models/i }),
+		);
+		const dialog = await screen.findByRole("dialog", {
+			name: /unsaved changes/i,
+		});
+		await expect(dialog).toBeInTheDocument();
+	},
+};
+
+export const ReplaceDefaultWarning: Story = {
+	args: {
+		currentDefaultModel: { ...mockGPT5, is_default: true },
+	},
+	play: async ({ canvasElement, args }) => {
+		const canvas = within(canvasElement);
+		await userEvent.type(
+			canvas.getByLabelText(/model identifier/i),
+			"gpt-5-mini",
+		);
+		await userEvent.type(canvas.getByLabelText(/context limit/i), "200000");
+		await userEvent.click(
+			canvas.getByRole("checkbox", { name: /set as default model/i }),
+		);
+		await userEvent.click(canvas.getByRole("button", { name: /add model/i }));
+		await expect(
+			await screen.findByText(/replace default model/i),
+		).toBeInTheDocument();
+		await expect(args.onCreateModel).not.toHaveBeenCalled();
+		await userEvent.click(screen.getByRole("button", { name: /^confirm$/i }));
+		await expect(args.onCreateModel).toHaveBeenCalledWith(
+			expect.objectContaining({ is_default: true }),
+		);
+	},
+};
+
+export const Edit: Story = {
+	args: {
+		editingModel: mockGPT5,
+		onDeleteModel: fn(async () => undefined),
+		onDuplicate: fn(),
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(
+			canvas.getByRole("button", { name: /^update model$/i }),
+		).toBeVisible();
+		await expect(
+			canvas.getByRole("button", { name: /^cancel$/i }),
+		).toBeVisible();
+		await expect(
+			canvas.getByRole("checkbox", { name: /set as default model/i }),
+		).toBeInTheDocument();
+		await expect(canvas.getByLabelText(/model identifier/i)).toBeEnabled();
+		await expect(
+			canvas.getByRole("combobox", { name: /provider/i }),
+		).toBeEnabled();
+		await userEvent.click(
+			canvas.getByRole("button", { name: /model actions/i }),
+		);
+		await expect(
+			screen.getByRole("menuitem", { name: /duplicate model/i }),
+		).toBeInTheDocument();
+		await expect(
+			screen.getByRole("menuitem", { name: /delete/i }),
+		).toBeInTheDocument();
+	},
+};
+
+export const EditDefaultBadge: Story = {
+	args: {
+		editingModel: { ...mockGPT5, is_default: true, enabled: true },
+		onDeleteModel: fn(async () => undefined),
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(canvas.getByText(/^default$/i)).toBeInTheDocument();
+	},
+};
+
+export const EditDisabledBadge: Story = {
+	args: {
+		editingModel: { ...mockGPT5, is_default: false, enabled: false },
+		onDeleteModel: fn(async () => undefined),
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		await expect(canvas.getByText(/^disabled$/i)).toBeInTheDocument();
+	},
+};
+
+export const EditSaveSubmits: Story = {
+	args: {
+		editingModel: mockGPT5,
+		onDeleteModel: fn(async () => undefined),
+	},
+	play: async ({ canvasElement, args }) => {
+		const canvas = within(canvasElement);
+		const save = canvas.getByRole("button", { name: /^update model$/i });
+		await userEvent.click(save);
+		await expect(args.onUpdateModel).toHaveBeenCalledTimes(1);
+	},
+};
+
+export const CostTrackingExpanded: Story = {
+	args: {
+		editingModel: mockGPT5,
+		onDeleteModel: fn(async () => undefined),
+	},
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		const toggle = canvas.getByRole("button", { name: /cost tracking/i });
+		await userEvent.click(toggle);
+	},
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.tsx
new file mode 100644
index 0000000000..e20ac5673d
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelForm.tsx
@@ -0,0 +1,349 @@
+import { useFormik } from "formik";
+import { type FC, useRef, useState } from "react";
+import * as Yup from "yup";
+import type * as TypesGen from "#/api/typesGenerated";
+import { SettingsHeaderTitle } from "#/components/SettingsHeader/SettingsHeader";
+import { useUnsavedChangesPrompt } from "#/hooks/useUnsavedChangesPrompt";
+import {
+	canManageProviderModels,
+	type ProviderState,
+} from "#/modules/aiModels/providerStates";
+import {
+	buildInitialModelFormValues,
+	buildModelConfigFromForm,
+	type ModelFormValues,
+	parsePositiveInteger,
+	parseThresholdInteger,
+} from "#/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic";
+import { getFormHelpers } from "#/utils/formUtils";
+import { ModelFormDialogs } from "./ModelFormDialogs";
+import { ModelFormFields } from "./ModelFormFields";
+import { ModelFormBackLink, ModelFormHeader } from "./ModelFormHeader";
+import { ModelFormProviderSelect } from "./ModelFormProviderSelect";
+
+const indefiniteArticle = (word: string): string =>
+	/^[aeiou]/i.test(word) ? "an" : "a";
+
+const validationSchema = Yup.object({
+	model: Yup.string().trim().required("Model ID is required."),
+	displayName: Yup.string(),
+	enabled: Yup.boolean(),
+	contextLimit: Yup.string()
+		.required("Context limit is required.")
+		.test(
+			"positive-integer",
+			"Context limit must be a positive integer.",
+			(value) => !value?.trim() || parsePositiveInteger(value) !== null,
+		),
+	compressionThreshold: Yup.string().test(
+		"threshold-range",
+		"Compression threshold must be a number between 0 and 100.",
+		(value) => !value?.trim() || parseThresholdInteger(value) !== null,
+	),
+	isDefault: Yup.boolean(),
+});
+
+interface ModelFormProps {
+	editingModel?: TypesGen.ChatModelConfig;
+	duplicateSourceModel?: TypesGen.ChatModelConfig;
+	providerStates: readonly ProviderState[];
+	selectedProviderState: ProviderState | null;
+	onProviderChange: (providerKey: string) => void;
+	isSaving: boolean;
+	isDeleting: boolean;
+	onCreateModel: (
+		req: TypesGen.CreateChatModelConfigRequest,
+	) => Promise<unknown>;
+	onUpdateModel: (
+		modelConfigId: string,
+		req: TypesGen.UpdateChatModelConfigRequest,
+	) => Promise<unknown>;
+	onDeleteModel?: (modelConfigId: string) => Promise<void>;
+	currentDefaultModel?: TypesGen.ChatModelConfig;
+	onSetDefault?: () => void;
+	onDuplicate?: () => void;
+	onToggleEnabled?: (enabled: boolean) => void;
+}
+
+export const ModelForm: FC<ModelFormProps> = ({
+	editingModel,
+	duplicateSourceModel,
+	providerStates,
+	selectedProviderState,
+	onProviderChange,
+	isSaving,
+	isDeleting,
+	onCreateModel,
+	onUpdateModel,
+	onDeleteModel,
+	onDuplicate,
+	currentDefaultModel,
+	onToggleEnabled,
+}) => {
+	const initialModel = editingModel ?? duplicateSourceModel;
+	const isEditing = Boolean(editingModel);
+	const isDuplicating = Boolean(duplicateSourceModel) && !isEditing;
+	const initialValues = {
+		...buildInitialModelFormValues(initialModel),
+		...(isDuplicating && { isDefault: false }),
+	};
+	const [showAdvanced, setShowAdvanced] = useState(false);
+	const [showPricing, setShowPricing] = useState(false);
+	const [showProviderConfig, setShowProviderConfig] = useState(false);
+	const [confirmingDelete, setConfirmingDelete] = useState(false);
+	const [confirmingReplaceDefault, setConfirmingReplaceDefault] =
+		useState(false);
+	const replaceDefaultConfirmedRef = useRef(false);
+
+	const canAddModelForSelectedProvider = canManageProviderModels(
+		selectedProviderState ?? undefined,
+	);
+	const mode: "add" | "edit" | "duplicate" = isEditing
+		? "edit"
+		: isDuplicating
+			? "duplicate"
+			: "add";
+
+	const selectedProviderType =
+		selectedProviderState?.provider ?? selectedProviderState?.key ?? "";
+	const selectedProviderKey = selectedProviderState?.key ?? "";
+
+	const form = useFormik<ModelFormValues>({
+		initialValues,
+		validationSchema,
+		validateOnMount: true,
+		validateOnBlur: false,
+		onSubmit: async (values) => {
+			if (isSaving) return;
+
+			const replacingDefault =
+				values.isDefault &&
+				currentDefaultModel != null &&
+				currentDefaultModel.id !== editingModel?.id;
+			if (replacingDefault && !replaceDefaultConfirmedRef.current) {
+				setConfirmingReplaceDefault(true);
+				return;
+			}
+			replaceDefaultConfirmedRef.current = false;
+
+			const trimmedModel = values.model.trim();
+			if (!trimmedModel) return;
+
+			const parsedContextLimit = parsePositiveInteger(values.contextLimit);
+			const parsedCompressionThreshold = parseThresholdInteger(
+				values.compressionThreshold,
+			);
+
+			const buildResult = buildModelConfigFromForm(
+				selectedProviderType,
+				values.config,
+			);
+			if (Object.keys(buildResult.fieldErrors).length > 0) return;
+
+			const trimmedDisplayName = values.displayName.trim();
+			const builtModelConfig = buildResult.modelConfig;
+
+			const selectedProviderConfigID =
+				selectedProviderState?.providerConfig?.id;
+			const editingProviderConfigID =
+				editingModel?.ai_provider_id?.trim() ?? "";
+
+			if (isEditing && editingModel) {
+				const req: TypesGen.UpdateChatModelConfigRequest = {
+					...(selectedProviderConfigID &&
+						selectedProviderConfigID !== editingProviderConfigID && {
+							provider: selectedProviderState.provider,
+							ai_provider_id: selectedProviderConfigID,
+						}),
+					...(trimmedModel !== editingModel.model && {
+						model: trimmedModel,
+					}),
+					...(trimmedDisplayName !== (editingModel.display_name ?? "") && {
+						display_name: trimmedDisplayName,
+					}),
+					...(parsedContextLimit !== null &&
+						parsedContextLimit !== editingModel.context_limit && {
+							context_limit: parsedContextLimit,
+						}),
+					...(parsedCompressionThreshold !== null &&
+						parsedCompressionThreshold !==
+							editingModel.compression_threshold && {
+							compression_threshold: parsedCompressionThreshold,
+						}),
+					...(values.isDefault !== editingModel.is_default && {
+						is_default: values.isDefault,
+					}),
+					model_config: builtModelConfig,
+				};
+
+				await onUpdateModel(editingModel.id, req);
+			} else {
+				if (!selectedProviderState?.providerConfig) return;
+
+				const req: TypesGen.CreateChatModelConfigRequest = {
+					provider: selectedProviderState.provider,
+					ai_provider_id: selectedProviderState.providerConfig.id,
+					model: trimmedModel,
+					enabled: values.enabled,
+					is_default: values.isDefault,
+					...(parsedContextLimit !== null && {
+						context_limit: parsedContextLimit,
+					}),
+					...(parsedCompressionThreshold !== null && {
+						compression_threshold: parsedCompressionThreshold,
+					}),
+					...(trimmedDisplayName && {
+						display_name: trimmedDisplayName,
+					}),
+					...(builtModelConfig && {
+						model_config: builtModelConfig,
+					}),
+				};
+
+				await onCreateModel(req);
+			}
+		},
+	});
+
+	const getFieldHelpers = getFormHelpers(form);
+
+	const unsavedChanges = useUnsavedChangesPrompt(
+		form.dirty && !form.isSubmitting,
+	);
+
+	const modelConfigFormBuildResult = buildModelConfigFromForm(
+		selectedProviderType,
+		form.values.config,
+	);
+	const hasFieldErrors =
+		Object.keys(modelConfigFormBuildResult.fieldErrors).length > 0;
+	const enabledToggleDisabled =
+		isSaving ||
+		(editingModel?.is_default === true && editingModel.enabled === true);
+	const setDefaultDisabled =
+		isSaving ||
+		(isEditing &&
+			(editingModel?.is_default === true || editingModel?.enabled === false));
+
+	const contextLimitValid =
+		parsePositiveInteger(form.values.contextLimit) !== null;
+	const compressionThresholdValid =
+		!form.values.compressionThreshold.trim() ||
+		parseThresholdInteger(form.values.compressionThreshold) !== null;
+	const canSubmit =
+		!isSaving &&
+		!hasFieldErrors &&
+		form.values.model.trim().length > 0 &&
+		contextLimitValid &&
+		compressionThresholdValid;
+
+	const handleConfirmReplaceDefault = () => {
+		replaceDefaultConfirmedRef.current = true;
+		setConfirmingReplaceDefault(false);
+		void form.submitForm();
+	};
+
+	if (
+		!selectedProviderState ||
+		(!canAddModelForSelectedProvider && !isEditing)
+	) {
+		return (
+			<>
+				<ModelFormBackLink />
+				<div className="flex flex-col gap-6 pt-6">
+					<SettingsHeaderTitle>Add model</SettingsHeaderTitle>
+					<div className="border border-solid p-6 rounded-lg">
+						<div className="space-y-3">
+							<ModelFormProviderSelect
+								providerStates={providerStates}
+								selectedProviderKey={selectedProviderKey}
+								onProviderChange={onProviderChange}
+								disabled={isDuplicating || providerStates.length === 0}
+							/>
+							{selectedProviderState && (
+								<p className="text-sm text-content-secondary m-0">
+									{!selectedProviderState.providerConfig
+										? "Create a managed provider before adding models."
+										: "Set an API key for this provider before adding models."}
+								</p>
+							)}
+						</div>
+					</div>
+				</div>
+			</>
+		);
+	}
+
+	const modelField = getFieldHelpers("model");
+	const contextLimitField = getFieldHelpers("contextLimit");
+	const compressionThresholdField = getFieldHelpers("compressionThreshold");
+	const displayNameField = getFieldHelpers("displayName");
+
+	const providerLabel = selectedProviderState.label;
+	const title = isEditing
+		? editingModel
+			? editingModel.display_name || editingModel.model
+			: "Edit model"
+		: isDuplicating
+			? `Duplicate ${providerLabel} model`
+			: `Add ${indefiniteArticle(providerLabel)} ${providerLabel} model`;
+
+	return (
+		<>
+			<ModelFormHeader
+				title={title}
+				selectedProviderState={selectedProviderState}
+				isEditing={isEditing}
+				editingModel={editingModel}
+				onDeleteModel={onDeleteModel}
+				onDuplicate={onDuplicate}
+				onToggleEnabled={onToggleEnabled}
+				isSaving={isSaving}
+				enabledToggleDisabled={enabledToggleDisabled}
+				onRequestDelete={() => setConfirmingDelete(true)}
+			/>
+			<div className="flex flex-col gap-6 pt-6">
+				<ModelFormFields
+					form={form}
+					mode={mode}
+					providerStates={providerStates}
+					selectedProviderState={selectedProviderState}
+					selectedProviderKey={selectedProviderKey}
+					selectedProviderType={selectedProviderType}
+					onProviderChange={onProviderChange}
+					isDuplicating={isDuplicating}
+					isEditing={isEditing}
+					isSaving={isSaving}
+					canSubmit={canSubmit}
+					initialModel={initialModel}
+					modelField={modelField}
+					contextLimitField={contextLimitField}
+					compressionThresholdField={compressionThresholdField}
+					displayNameField={displayNameField}
+					setDefaultDisabled={setDefaultDisabled}
+					modelConfigFormBuildResult={modelConfigFormBuildResult}
+					showPricing={showPricing}
+					setShowPricing={setShowPricing}
+					showProviderConfig={showProviderConfig}
+					setShowProviderConfig={setShowProviderConfig}
+					showAdvanced={showAdvanced}
+					setShowAdvanced={setShowAdvanced}
+				/>
+			</div>
+			<ModelFormDialogs
+				editingModel={editingModel}
+				onDeleteModel={onDeleteModel}
+				isDeleting={isDeleting}
+				confirmingDelete={confirmingDelete}
+				setConfirmingDelete={setConfirmingDelete}
+				resetForm={(values) => form.resetForm({ values })}
+				formValues={form.values}
+				unsavedChanges={unsavedChanges}
+				confirmingReplaceDefault={confirmingReplaceDefault}
+				setConfirmingReplaceDefault={setConfirmingReplaceDefault}
+				currentDefaultModel={currentDefaultModel}
+				onConfirmReplaceDefault={handleConfirmReplaceDefault}
+			/>
+		</>
+	);
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormDialogs.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormDialogs.tsx
new file mode 100644
index 0000000000..871bc09286
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormDialogs.tsx
@@ -0,0 +1,121 @@
+import { TriangleAlertIcon } from "lucide-react";
+import type { FC } from "react";
+import type * as TypesGen from "#/api/typesGenerated";
+import { Button } from "#/components/Button/Button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+} from "#/components/Dialog/Dialog";
+import type { ModelFormValues } from "#/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic";
+import { ConfirmDeleteDialog } from "#/pages/AgentsPage/components/ConfirmDeleteDialog";
+
+export const ModelFormDialogs: FC<{
+	editingModel?: TypesGen.ChatModelConfig;
+	onDeleteModel?: (modelConfigId: string) => Promise<void>;
+	isDeleting: boolean;
+	confirmingDelete: boolean;
+	setConfirmingDelete: (open: boolean) => void;
+	resetForm: (values: ModelFormValues) => void;
+	formValues: ModelFormValues;
+	unsavedChanges: {
+		isOpen: boolean;
+		onCancel: () => void;
+		onConfirm: () => void;
+	};
+	confirmingReplaceDefault: boolean;
+	setConfirmingReplaceDefault: (open: boolean) => void;
+	currentDefaultModel?: TypesGen.ChatModelConfig;
+	onConfirmReplaceDefault: () => void;
+}> = ({
+	editingModel,
+	onDeleteModel,
+	isDeleting,
+	confirmingDelete,
+	setConfirmingDelete,
+	resetForm,
+	formValues,
+	unsavedChanges,
+	confirmingReplaceDefault,
+	setConfirmingReplaceDefault,
+	currentDefaultModel,
+	onConfirmReplaceDefault,
+}) => {
+	return (
+		<>
+			{editingModel && onDeleteModel && (
+				<ConfirmDeleteDialog
+					entity="model"
+					isPending={isDeleting}
+					open={confirmingDelete}
+					onOpenChange={(open) => !open && setConfirmingDelete(false)}
+					onConfirm={() => {
+						resetForm(formValues);
+						void onDeleteModel(editingModel.id);
+					}}
+				/>
+			)}
+			<Dialog
+				open={unsavedChanges.isOpen}
+				onOpenChange={(open) => !open && unsavedChanges.onCancel()}
+			>
+				<DialogContent className="border-border-warning">
+					<DialogHeader>
+						<DialogTitle>Unsaved changes</DialogTitle>
+						<DialogDescription className="flex items-start gap-3">
+							<TriangleAlertIcon className="size-icon-sm mt-1 shrink-0 text-content-primary" />
+							<span>Your updates haven't been saved. Leave anyway?</span>
+						</DialogDescription>
+					</DialogHeader>
+					<DialogFooter>
+						<Button
+							variant="outline"
+							type="button"
+							onClick={unsavedChanges.onCancel}
+						>
+							Cancel
+						</Button>
+						<Button type="button" onClick={unsavedChanges.onConfirm}>
+							Confirm
+						</Button>
+					</DialogFooter>
+				</DialogContent>
+			</Dialog>
+			<Dialog
+				open={confirmingReplaceDefault}
+				onOpenChange={(open) => !open && setConfirmingReplaceDefault(false)}
+			>
+				<DialogContent className="border-border-warning">
+					<DialogHeader>
+						<DialogTitle>Replace default model</DialogTitle>
+						<DialogDescription className="flex items-center gap-2">
+							<TriangleAlertIcon className="size-icon-sm shrink-0 text-content-primary" />
+							<span>
+								<strong className="text-content-primary">
+									{currentDefaultModel?.display_name ||
+										currentDefaultModel?.model}
+								</strong>{" "}
+								is currently the default. Replace it?
+							</span>
+						</DialogDescription>
+					</DialogHeader>
+					<DialogFooter>
+						<Button
+							variant="outline"
+							type="button"
+							onClick={() => setConfirmingReplaceDefault(false)}
+						>
+							Cancel
+						</Button>
+						<Button type="button" onClick={onConfirmReplaceDefault}>
+							Confirm
+						</Button>
+					</DialogFooter>
+				</DialogContent>
+			</Dialog>
+		</>
+	);
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormFields.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormFields.tsx
new file mode 100644
index 0000000000..da1e3a1da6
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormFields.tsx
@@ -0,0 +1,349 @@
+import type { FormikContextType } from "formik";
+import { ChevronDownIcon, ChevronRightIcon, InfoIcon } from "lucide-react";
+import type { FC, ReactNode } from "react";
+import { Link } from "react-router";
+import type * as TypesGen from "#/api/typesGenerated";
+import { Button } from "#/components/Button/Button";
+import { Checkbox } from "#/components/Checkbox/Checkbox";
+import {
+	Collapsible,
+	CollapsibleContent,
+	CollapsibleTrigger,
+} from "#/components/Collapsible/Collapsible";
+import { Input } from "#/components/Input/Input";
+import {
+	InputGroup,
+	InputGroupAddon,
+	InputGroupInput,
+} from "#/components/InputGroup/InputGroup";
+import { Label } from "#/components/Label/Label";
+import { Spinner } from "#/components/Spinner/Spinner";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "#/components/Tooltip/Tooltip";
+import type { ProviderState } from "#/modules/aiModels/providerStates";
+import {
+	GeneralModelConfigFields,
+	ModelConfigFields,
+	PricingModelConfigFields,
+} from "#/pages/AgentsPage/components/ChatModelAdminPanel/ModelConfigFields";
+import { ModelIdentifierField } from "#/pages/AgentsPage/components/ChatModelAdminPanel/ModelIdentifierField";
+import type {
+	ModelConfigFormBuildResult,
+	ModelFormValues,
+} from "#/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic";
+import { cn } from "#/utils/cn";
+import type { FormHelpers } from "#/utils/formUtils";
+import { ModelFormProviderSelect } from "./ModelFormProviderSelect";
+
+const CollapsibleSection: FC<{
+	title: string;
+	description: string;
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	className?: string;
+	contentClassName?: string;
+	children: ReactNode;
+}> = ({
+	title,
+	description,
+	open,
+	onOpenChange,
+	className,
+	contentClassName,
+	children,
+}) => {
+	return (
+		<Collapsible
+			open={open}
+			onOpenChange={onOpenChange}
+			className={cn("p-4", className)}
+		>
+			<CollapsibleTrigger className="flex w-full cursor-pointer items-start gap-2 border-0 bg-transparent p-0 text-left transition-colors hover:text-content-primary">
+				{open ? (
+					<ChevronDownIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
+				) : (
+					<ChevronRightIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
+				)}
+				<div>
+					<h3 className="m-0 text-sm font-medium text-content-primary">
+						{title}
+					</h3>
+					<p className="m-0 text-xs text-content-secondary">{description}</p>
+				</div>
+			</CollapsibleTrigger>
+			<CollapsibleContent>
+				<div className={contentClassName}>{children}</div>
+			</CollapsibleContent>
+		</Collapsible>
+	);
+};
+
+export const ModelFormFields: FC<{
+	form: FormikContextType<ModelFormValues>;
+	mode: "add" | "edit" | "duplicate";
+	providerStates: readonly ProviderState[];
+	selectedProviderState: ProviderState;
+	selectedProviderKey: string;
+	selectedProviderType: string;
+	onProviderChange: (providerKey: string) => void;
+	isDuplicating: boolean;
+	isEditing: boolean;
+	isSaving: boolean;
+	canSubmit: boolean;
+	initialModel?: TypesGen.ChatModelConfig;
+	modelField: FormHelpers;
+	contextLimitField: FormHelpers;
+	compressionThresholdField: FormHelpers;
+	displayNameField: FormHelpers;
+	setDefaultDisabled: boolean;
+	modelConfigFormBuildResult: ModelConfigFormBuildResult;
+	showPricing: boolean;
+	setShowPricing: (open: boolean) => void;
+	showProviderConfig: boolean;
+	setShowProviderConfig: (open: boolean) => void;
+	showAdvanced: boolean;
+	setShowAdvanced: (open: boolean) => void;
+}> = ({
+	form,
+	mode,
+	providerStates,
+	selectedProviderState,
+	selectedProviderKey,
+	selectedProviderType,
+	onProviderChange,
+	isDuplicating,
+	isEditing,
+	isSaving,
+	canSubmit,
+	initialModel,
+	modelField,
+	contextLimitField,
+	compressionThresholdField,
+	displayNameField,
+	setDefaultDisabled,
+	modelConfigFormBuildResult,
+	showPricing,
+	setShowPricing,
+	showProviderConfig,
+	setShowProviderConfig,
+	showAdvanced,
+	setShowAdvanced,
+}) => {
+	return (
+		<div className="border border-solid p-6 rounded-lg">
+			<form
+				onSubmit={form.handleSubmit}
+				spellCheck={false}
+				autoComplete="off"
+				className="flex flex-col gap-6"
+			>
+				<div className="grid items-start gap-4 sm:grid-cols-2">
+					<ModelFormProviderSelect
+						providerStates={providerStates}
+						selectedProviderKey={selectedProviderKey}
+						onProviderChange={onProviderChange}
+						disabled={isDuplicating || providerStates.length === 0}
+					/>
+					<div className="flex flex-col gap-1">
+						<ModelIdentifierField
+							form={form}
+							modelField={modelField}
+							mode={mode}
+							selectedProvider={selectedProviderType}
+							disabled={isSaving}
+							controlClassName="shadow-none"
+						/>
+						<label
+							htmlFor="isDefault"
+							className="flex w-fit cursor-pointer items-center gap-2 font-normal text-sm leading-6 text-content-secondary"
+						>
+							<Checkbox
+								id="isDefault"
+								checked={form.values.isDefault}
+								onCheckedChange={(checked) =>
+									form.setFieldValue("isDefault", checked === true)
+								}
+								disabled={setDefaultDisabled}
+							/>
+							Set as default model
+						</label>
+					</div>
+					<div className="grid gap-1.5">
+						<Label
+							htmlFor={displayNameField.id}
+							className="flex items-center gap-1 leading-6 text-content-primary"
+						>
+							Display name{" "}
+							<span className="text-xs font-bold text-content-destructive">
+								*
+							</span>
+						</Label>
+						<p className="m-0 text-xs text-content-secondary">
+							Friendly name. Defaults to identifier if blank.
+						</p>
+						<Input
+							id={displayNameField.id}
+							name={displayNameField.name}
+							className="placeholder:text-content-disabled shadow-none"
+							placeholder={initialModel?.model ?? "Model name"}
+							value={displayNameField.value}
+							onChange={displayNameField.onChange}
+							onBlur={displayNameField.onBlur}
+							disabled={isSaving}
+						/>
+					</div>
+					<div className="grid gap-1.5">
+						<Label
+							htmlFor={contextLimitField.id}
+							className="flex items-center gap-1 leading-6 text-content-primary"
+						>
+							Context limit{" "}
+							<span className="text-xs font-bold text-content-destructive">
+								*
+							</span>
+						</Label>
+						{contextLimitField.error ? (
+							<p className="m-0 text-xs text-content-destructive">
+								{contextLimitField.helperText}
+							</p>
+						) : (
+							<p className="m-0 text-xs text-content-secondary">
+								Max tokens in the context window.
+							</p>
+						)}
+						<InputGroup
+							className={cn(
+								contextLimitField.error && "border-border-destructive",
+							)}
+						>
+							<InputGroupInput
+								id={contextLimitField.id}
+								name={contextLimitField.name}
+								className="min-w-0 placeholder:text-content-disabled"
+								placeholder="200000"
+								value={contextLimitField.value}
+								onChange={contextLimitField.onChange}
+								onBlur={contextLimitField.onBlur}
+								disabled={isSaving}
+								aria-invalid={contextLimitField.error}
+							/>
+							<InputGroupAddon align="inline-end">
+								<span className="text-xs text-content-disabled">Tokens</span>
+							</InputGroupAddon>
+						</InputGroup>
+					</div>
+				</div>
+
+				<div className="overflow-hidden rounded-lg border border-solid border-border">
+					<CollapsibleSection
+						title="Cost tracking"
+						description="Set per-token pricing so Coder can track costs and enforce spending limits."
+						open={showPricing}
+						onOpenChange={setShowPricing}
+						contentClassName="grid grid-cols-2 gap-3 pt-3 pl-6 sm:grid-cols-4"
+					>
+						<PricingModelConfigFields
+							provider={selectedProviderState.provider}
+							form={form}
+							fieldErrors={modelConfigFormBuildResult.fieldErrors}
+							disabled={isSaving}
+						/>
+					</CollapsibleSection>
+
+					<CollapsibleSection
+						title="Provider configuration"
+						description="Tune provider-specific behavior like reasoning, tool calling, and web search."
+						open={showProviderConfig}
+						onOpenChange={setShowProviderConfig}
+						className="border-0 border-t border-solid border-border"
+						contentClassName="pt-3 pl-6"
+					>
+						<ModelConfigFields
+							provider={selectedProviderState.provider}
+							form={form}
+							fieldErrors={modelConfigFormBuildResult.fieldErrors}
+							disabled={isSaving}
+						/>
+					</CollapsibleSection>
+
+					<CollapsibleSection
+						title="Advanced"
+						description="Low-level parameters like temperature and penalties. Rarely need changing."
+						open={showAdvanced}
+						onOpenChange={setShowAdvanced}
+						className="border-0 border-t border-solid border-border"
+						contentClassName="grid grid-cols-2 gap-3 pt-3 pl-6 sm:grid-cols-3"
+					>
+						<GeneralModelConfigFields
+							provider={selectedProviderState.provider}
+							form={form}
+							fieldErrors={modelConfigFormBuildResult.fieldErrors}
+							disabled={isSaving}
+						/>
+						<div className="flex min-w-0 flex-col gap-1.5">
+							<Label
+								htmlFor={compressionThresholdField.id}
+								className="flex items-center gap-1 leading-6 text-content-primary"
+							>
+								Compression threshold
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<InfoIcon className="size-3 text-content-secondary" />
+									</TooltipTrigger>
+									<TooltipContent side="top" className="max-w-[240px]">
+										Percentage at which context is compressed.
+									</TooltipContent>
+								</Tooltip>
+							</Label>
+							<InputGroup
+								className={cn(
+									compressionThresholdField.error &&
+										"border-border-destructive",
+								)}
+							>
+								<InputGroupInput
+									id={compressionThresholdField.id}
+									name={compressionThresholdField.name}
+									className="placeholder:text-content-disabled"
+									placeholder="70"
+									value={compressionThresholdField.value}
+									onChange={compressionThresholdField.onChange}
+									onBlur={compressionThresholdField.onBlur}
+									disabled={isSaving}
+									aria-invalid={compressionThresholdField.error}
+								/>
+								<InputGroupAddon align="inline-end">
+									<span className="text-xs text-content-disabled">%</span>
+								</InputGroupAddon>
+							</InputGroup>
+							{compressionThresholdField.error && (
+								<p className="m-0 text-xs text-content-destructive">
+									{compressionThresholdField.helperText}
+								</p>
+							)}
+						</div>
+					</CollapsibleSection>
+				</div>
+
+				<div className="flex items-center justify-end gap-3">
+					<Link to="/ai/settings/models">
+						<Button variant="outline" type="button">
+							Cancel
+						</Button>
+					</Link>
+					<Button type="submit" disabled={!canSubmit}>
+						{isSaving && <Spinner loading />}
+						{isEditing
+							? "Update model"
+							: isDuplicating
+								? "Create duplicate"
+								: "Add Model"}
+					</Button>
+				</div>
+			</form>
+		</div>
+	);
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormHeader.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormHeader.tsx
new file mode 100644
index 0000000000..b167bcef61
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormHeader.tsx
@@ -0,0 +1,153 @@
+import {
+	ArrowLeftIcon,
+	CopyIcon,
+	EllipsisVerticalIcon,
+	TrashIcon,
+} from "lucide-react";
+import type { FC } from "react";
+import { Link } from "react-router";
+import type * as TypesGen from "#/api/typesGenerated";
+import { Avatar } from "#/components/Avatar/Avatar";
+import { Badge } from "#/components/Badge/Badge";
+import { Button } from "#/components/Button/Button";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuSeparator,
+	DropdownMenuTrigger,
+} from "#/components/DropdownMenu/DropdownMenu";
+import { SettingsHeaderTitle } from "#/components/SettingsHeader/SettingsHeader";
+import { Switch } from "#/components/Switch/Switch";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "#/components/Tooltip/Tooltip";
+import type { ProviderState } from "#/modules/aiModels/providerStates";
+import { getProviderIcon } from "#/pages/AISettingsPage/ProvidersPage/components/ProviderIcon";
+import { cn } from "#/utils/cn";
+
+export const ModelFormBackLink: FC = () => {
+	return (
+		<Link to="/ai/settings/models" className="-ml-3">
+			<Button variant="subtle" type="button">
+				<ArrowLeftIcon />
+				<span>Back to models</span>
+			</Button>
+		</Link>
+	);
+};
+
+export const ModelFormHeader: FC<{
+	title: string;
+	selectedProviderState: ProviderState;
+	isEditing: boolean;
+	editingModel?: TypesGen.ChatModelConfig;
+	onDeleteModel?: (modelConfigId: string) => Promise<void>;
+	onDuplicate?: () => void;
+	onToggleEnabled?: (enabled: boolean) => void;
+	isSaving: boolean;
+	enabledToggleDisabled: boolean;
+	onRequestDelete: () => void;
+}> = ({
+	title,
+	selectedProviderState,
+	isEditing,
+	editingModel,
+	onDeleteModel,
+	onDuplicate,
+	onToggleEnabled,
+	isSaving,
+	enabledToggleDisabled,
+	onRequestDelete,
+}) => {
+	return (
+		<>
+			<div className="flex items-center justify-between">
+				<ModelFormBackLink />
+				{isEditing && editingModel && onDeleteModel && (
+					<DropdownMenu>
+						<DropdownMenuTrigger asChild>
+							<Button
+								variant="subtle"
+								size="icon"
+								type="button"
+								disabled={isSaving}
+								aria-label="Model actions"
+							>
+								<EllipsisVerticalIcon />
+							</Button>
+						</DropdownMenuTrigger>
+						<DropdownMenuContent align="end">
+							{onDuplicate && (
+								<DropdownMenuItem onClick={onDuplicate}>
+									<CopyIcon className="size-icon-sm" />
+									Duplicate model
+								</DropdownMenuItem>
+							)}
+							<DropdownMenuSeparator />
+							<DropdownMenuItem
+								className="text-content-destructive focus:text-content-destructive"
+								onClick={onRequestDelete}
+							>
+								<TrashIcon />
+								Delete…
+							</DropdownMenuItem>
+						</DropdownMenuContent>
+					</DropdownMenu>
+				)}
+			</div>
+			<div className="flex items-center justify-between gap-4">
+				<div className="flex items-center gap-4 min-w-0">
+					<Avatar
+						variant="icon"
+						size="lg"
+						src={getProviderIcon(selectedProviderState.provider)}
+					/>
+					<SettingsHeaderTitle>
+						<span
+							className={cn(
+								"block min-w-0 truncate",
+								editingModel?.enabled === false && "text-content-secondary",
+							)}
+						>
+							{title}
+						</span>
+					</SettingsHeaderTitle>
+					{isEditing && editingModel?.is_default && (
+						<Badge variant="default">Default</Badge>
+					)}
+					{isEditing &&
+						editingModel &&
+						!editingModel.is_default &&
+						!editingModel.enabled && <Badge variant="default">Disabled</Badge>}
+				</div>
+				{isEditing && editingModel && (
+					<div className="flex shrink-0 items-center gap-2">
+						<Tooltip>
+							<TooltipTrigger asChild>
+								<span className="inline-flex">
+									<Switch
+										checked={editingModel.enabled}
+										onCheckedChange={(checked) => onToggleEnabled?.(checked)}
+										disabled={enabledToggleDisabled}
+										aria-label="Model enabled"
+									/>
+								</span>
+							</TooltipTrigger>
+							<TooltipContent side="bottom">
+								{editingModel.is_default && editingModel.enabled
+									? "Default model cannot be disabled. Set another model as default first."
+									: editingModel.enabled
+										? "Disable this model. It will be hidden from users."
+										: "Enable this model. It will be visible to users."}
+							</TooltipContent>
+						</Tooltip>
+						<span className="text-sm">Enable</span>
+					</div>
+				)}
+			</div>
+		</>
+	);
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormProviderSelect.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormProviderSelect.tsx
new file mode 100644
index 0000000000..9ae0b7d5c1
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelFormProviderSelect.tsx
@@ -0,0 +1,55 @@
+import type { FC } from "react";
+import { Label } from "#/components/Label/Label";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "#/components/Select/Select";
+import type { ProviderState } from "#/modules/aiModels/providerStates";
+import { ProviderIcon } from "#/pages/AISettingsPage/ProvidersPage/components/ProviderIcon";
+
+export const ModelFormProviderSelect: FC<{
+	providerStates: readonly ProviderState[];
+	selectedProviderKey: string;
+	onProviderChange: (providerKey: string) => void;
+	disabled: boolean;
+}> = ({ providerStates, selectedProviderKey, onProviderChange, disabled }) => {
+	return (
+		<div className="grid gap-1.5">
+			<Label
+				htmlFor="providerSelect"
+				className="flex items-center gap-1 leading-6 text-content-primary"
+			>
+				Provider{" "}
+				<span className="text-xs font-bold text-content-destructive">*</span>
+			</Label>
+			<p className="m-0 text-xs text-content-secondary">
+				The provider this model belongs to.
+			</p>
+			<Select
+				value={selectedProviderKey}
+				onValueChange={onProviderChange}
+				disabled={disabled}
+			>
+				<SelectTrigger
+					id="providerSelect"
+					className="text-content-primary shadow-none"
+				>
+					<SelectValue placeholder="Select provider" />
+				</SelectTrigger>
+				<SelectContent>
+					{providerStates.map((ps) => (
+						<SelectItem key={ps.key} value={ps.key}>
+							<span className="flex items-center gap-2">
+								<ProviderIcon provider={ps.provider} />
+								{ps.label}
+							</span>
+						</SelectItem>
+					))}
+				</SelectContent>
+			</Select>
+		</div>
+	);
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/components/ModelRow.tsx b/site/src/pages/AISettingsPage/ModelsPage/components/ModelRow.tsx
new file mode 100644
index 0000000000..73b1f1a6b3
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/components/ModelRow.tsx
@@ -0,0 +1,84 @@
+import { ChevronRightIcon } from "lucide-react";
+import type { FC } from "react";
+import type { ChatModelConfig } from "#/api/typesGenerated";
+import { Avatar } from "#/components/Avatar/Avatar";
+import { Badge } from "#/components/Badge/Badge";
+import { TableCell, TableRow } from "#/components/Table/Table";
+import { useClickableTableRow } from "#/hooks/useClickableTableRow";
+import { ProviderIcon } from "#/pages/AISettingsPage/ProvidersPage/components/ProviderIcon";
+import { cn } from "#/utils/cn";
+
+type ModelRowProps = {
+	model: ChatModelConfig;
+	providerLabel: string;
+	onClick: () => void;
+};
+
+const formatContextLimit = (contextLimit: number): string => {
+	if (!Number.isFinite(contextLimit)) {
+		return "N/A";
+	}
+	return `${contextLimit.toLocaleString("en-US")} tokens`;
+};
+
+export const ModelRow: FC<ModelRowProps> = ({
+	model,
+	providerLabel,
+	onClick,
+}) => {
+	const clickableProps = useClickableTableRow({ onClick });
+	const displayName = model.display_name || model.model;
+
+	return (
+		<TableRow
+			{...clickableProps}
+			className={cn(clickableProps.className, "h-[72px]")}
+		>
+			<TableCell className="min-w-0 p-4">
+				<div className="flex min-w-0 items-center gap-4">
+					<Avatar
+						size="lg"
+						className="flex shrink-0 items-center justify-center"
+					>
+						<ProviderIcon provider={model.provider} />
+					</Avatar>
+					<span
+						className="truncate text-sm font-medium leading-6 text-content-primary"
+						title={displayName}
+					>
+						{displayName}
+					</span>
+				</div>
+			</TableCell>
+			<TableCell className="min-w-0">
+				<span
+					className="block truncate text-sm font-medium leading-6 text-content-secondary"
+					title={providerLabel}
+				>
+					{providerLabel || "N/A"}
+				</span>
+			</TableCell>
+			<TableCell className="min-w-0">
+				<span className="block truncate text-sm font-medium leading-6 text-content-secondary">
+					{formatContextLimit(model.context_limit)}
+				</span>
+			</TableCell>
+			<TableCell>
+				<div className="flex flex-wrap items-center gap-2">
+					{model.is_default && <Badge variant="default">Default</Badge>}
+					<Badge variant="default">
+						{model.enabled ? "Enabled" : "Disabled"}
+					</Badge>
+				</div>
+			</TableCell>
+			<TableCell className="w-10 text-center">
+				<div className="flex justify-end items-center gap-8 pr-4">
+					<ChevronRightIcon
+						aria-hidden
+						className="size-icon-md text-content-primary flex-shrink-0"
+					/>
+				</div>
+			</TableCell>
+		</TableRow>
+	);
+};
diff --git a/site/src/pages/AISettingsPage/ModelsPage/testFixtures.ts b/site/src/pages/AISettingsPage/ModelsPage/testFixtures.ts
new file mode 100644
index 0000000000..e4aada6716
--- /dev/null
+++ b/site/src/pages/AISettingsPage/ModelsPage/testFixtures.ts
@@ -0,0 +1,84 @@
+import type { ChatModelConfig, ChatProviderConfig } from "#/api/typesGenerated";
+import type { ProviderState } from "#/modules/aiModels/providerStates";
+
+const now = "2026-02-18T12:00:00.000Z";
+
+const MockOpenAIProviderConfig: ChatProviderConfig = {
+	id: "prov-openai",
+	provider: "openai",
+	display_name: "OpenAI",
+	enabled: true,
+	has_api_key: true,
+	central_api_key_enabled: true,
+	allow_user_api_key: false,
+	allow_central_api_key_fallback: true,
+	base_url: "",
+	source: "database",
+	created_at: now,
+	updated_at: now,
+};
+
+const MockAnthropicProviderConfig: ChatProviderConfig = {
+	...MockOpenAIProviderConfig,
+	id: "prov-anthropic",
+	provider: "anthropic",
+	display_name: "Anthropic",
+};
+
+export const mockGPT5: ChatModelConfig = {
+	id: "model-gpt5",
+	provider: "openai",
+	ai_provider_id: "prov-openai",
+	model: "gpt-5",
+	display_name: "GPT-5",
+	enabled: true,
+	is_default: true,
+	context_limit: 200000,
+	compression_threshold: 70,
+	created_at: now,
+	updated_at: now,
+};
+
+export const mockClaude: ChatModelConfig = {
+	...mockGPT5,
+	id: "model-claude",
+	provider: "anthropic",
+	ai_provider_id: "prov-anthropic",
+	model: "claude-sonnet-4-5",
+	display_name: "Claude Sonnet 4.5",
+	is_default: false,
+};
+
+export const mockDisabledModel: ChatModelConfig = {
+	...mockGPT5,
+	id: "model-disabled",
+	model: "gpt-4o-mini",
+	display_name: "GPT-4o mini",
+	is_default: false,
+	enabled: false,
+	context_limit: 128000,
+};
+
+export const MockOpenAIProviderState: ProviderState = {
+	key: "prov-openai",
+	provider: "openai",
+	label: "OpenAI",
+	providerConfig: MockOpenAIProviderConfig,
+	modelConfigs: [mockGPT5, mockDisabledModel],
+	catalogModelCount: 0,
+	hasManagedAPIKey: true,
+	hasCatalogAPIKey: true,
+	hasEffectiveAPIKey: true,
+	allowUserAPIKey: false,
+	isEnvPreset: false,
+	baseURL: "",
+};
+
+export const MockAnthropicProviderState: ProviderState = {
+	...MockOpenAIProviderState,
+	key: "prov-anthropic",
+	provider: "anthropic",
+	label: "Anthropic",
+	providerConfig: MockAnthropicProviderConfig,
+	modelConfigs: [mockClaude],
+};
diff --git a/site/src/pages/AISettingsPage/ProvidersPage/UpdateProviderPage/UpdateProviderPageView.tsx b/site/src/pages/AISettingsPage/ProvidersPage/UpdateProviderPage/UpdateProviderPageView.tsx
index 005ece6744..009902322a 100644
--- a/site/src/pages/AISettingsPage/ProvidersPage/UpdateProviderPage/UpdateProviderPageView.tsx
+++ b/site/src/pages/AISettingsPage/ProvidersPage/UpdateProviderPage/UpdateProviderPageView.tsx
@@ -158,7 +158,7 @@ const UpdateProviderPageView: React.FC = () => {
 					<p className="text-sm text-content-secondary m-0">
 						Add or update models for this provider.{" "}
 						<a
-							href="/agents/settings/models"
+							href="/ai/settings/models"
 							className="text-content-link no-underline hover:underline"
 						>
 							Model settings
diff --git a/site/src/pages/AgentsPage/AgentChatPageView.stories.tsx b/site/src/pages/AgentsPage/AgentChatPageView.stories.tsx
index 8cfa4dd4b1..d8ebbad85d 100644
--- a/site/src/pages/AgentsPage/AgentChatPageView.stories.tsx
+++ b/site/src/pages/AgentsPage/AgentChatPageView.stories.tsx
@@ -548,7 +548,7 @@ export const MissingProviderAndModelSetup: Story = {
 		);
 		expect(canvas.getByRole("link", { name: "model" })).toHaveAttribute(
 			"href",
-			"/agents/settings/models",
+			"/ai/settings/models",
 		);
 	},
 };
@@ -579,7 +579,7 @@ export const MissingModelSetup: Story = {
 		});
 		expect(canvas.getByRole("link", { name: "model" })).toHaveAttribute(
 			"href",
-			"/agents/settings/models",
+			"/ai/settings/models",
 		);
 	},
 };
diff --git a/site/src/pages/AgentsPage/AgentSettingsModelsPage.tsx b/site/src/pages/AgentsPage/AgentSettingsModelsPage.tsx
deleted file mode 100644
index 4b8c50fd96..0000000000
--- a/site/src/pages/AgentsPage/AgentSettingsModelsPage.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { FC } from "react";
-import { useMutation, useQuery, useQueryClient } from "react-query";
-import {
-	chatModelConfigs,
-	chatModels,
-	chatProviderConfigs,
-	createChatModelConfig,
-	createChatProviderConfig,
-	deleteChatModelConfig,
-	deleteChatProviderConfig,
-	updateChatModelConfig,
-	updateChatProviderConfig,
-} from "#/api/queries/chats";
-import { useAuthenticated } from "#/hooks/useAuthenticated";
-import { RequirePermission } from "#/modules/permissions/RequirePermission";
-import { ChatModelAdminPanel } from "./components/ChatModelAdminPanel/ChatModelAdminPanel";
-
-const AgentSettingsModelsPage: FC = () => {
-	const { permissions } = useAuthenticated();
-
-	const queryClient = useQueryClient();
-
-	// Queries.
-	const providerConfigsQuery = useQuery({
-		...chatProviderConfigs(),
-		enabled: permissions.editDeploymentConfig,
-	});
-	const modelConfigsQuery = useQuery(chatModelConfigs());
-	const modelCatalogQuery = useQuery(chatModels());
-
-	// Mutations.
-	const createProviderMutation = useMutation(
-		createChatProviderConfig(queryClient),
-	);
-	const updateProviderMutation = useMutation(
-		updateChatProviderConfig(queryClient),
-	);
-	const deleteProviderMutation = useMutation(
-		deleteChatProviderConfig(queryClient),
-	);
-	const createModelMutation = useMutation(createChatModelConfig(queryClient));
-	const updateModelMutation = useMutation(updateChatModelConfig(queryClient));
-	const deleteModelMutation = useMutation(deleteChatModelConfig(queryClient));
-
-	return (
-		<RequirePermission isFeatureVisible={permissions.editDeploymentConfig}>
-			<ChatModelAdminPanel
-				section="models"
-				sectionLabel="Models"
-				sectionDescription="Choose which models from your configured providers are available for Coder Agents. Set a default and adjust context limits."
-				providerConfigsData={providerConfigsQuery.data}
-				modelConfigsData={modelConfigsQuery.data}
-				modelCatalogData={modelCatalogQuery.data}
-				isLoading={
-					providerConfigsQuery.isLoading ||
-					modelConfigsQuery.isLoading ||
-					modelCatalogQuery.isLoading
-				}
-				providerConfigsError={
-					providerConfigsQuery.isError ? providerConfigsQuery.error : null
-				}
-				modelConfigsError={
-					modelConfigsQuery.isError ? modelConfigsQuery.error : null
-				}
-				modelCatalogError={
-					modelCatalogQuery.isError ? modelCatalogQuery.error : null
-				}
-				onCreateProvider={(req) => createProviderMutation.mutateAsync(req)}
-				onUpdateProvider={(providerConfigId, req) =>
-					updateProviderMutation.mutateAsync({ providerConfigId, req })
-				}
-				onDeleteProvider={(id) => deleteProviderMutation.mutateAsync(id)}
-				isProviderMutationPending={
-					createProviderMutation.isPending ||
-					updateProviderMutation.isPending ||
-					deleteProviderMutation.isPending
-				}
-				providerMutationError={
-					createProviderMutation.error ??
-					updateProviderMutation.error ??
-					deleteProviderMutation.error
-				}
-				onCreateModel={(req) => createModelMutation.mutateAsync(req)}
-				onUpdateModel={(modelConfigId, req) =>
-					updateModelMutation.mutateAsync({ modelConfigId, req })
-				}
-				onDeleteModel={(id) => deleteModelMutation.mutateAsync(id)}
-				isCreatingModel={createModelMutation.isPending}
-				isUpdatingModel={updateModelMutation.isPending}
-				isDeletingModel={deleteModelMutation.isPending}
-				modelMutationError={
-					createModelMutation.error ??
-					updateModelMutation.error ??
-					deleteModelMutation.error
-				}
-			/>
-		</RequirePermission>
-	);
-};
-
-export default AgentSettingsModelsPage;
diff --git a/site/src/pages/AgentsPage/components/AgentCreateForm.stories.tsx b/site/src/pages/AgentsPage/components/AgentCreateForm.stories.tsx
index 0e54638ac4..8ba97d6b84 100644
--- a/site/src/pages/AgentsPage/components/AgentCreateForm.stories.tsx
+++ b/site/src/pages/AgentsPage/components/AgentCreateForm.stories.tsx
@@ -494,7 +494,7 @@ export const MissingProviderAndModelSetup: Story = {
 		);
 		expect(canvas.getByRole("link", { name: "model" })).toHaveAttribute(
 			"href",
-			"/agents/settings/models",
+			"/ai/settings/models",
 		);
 	},
 };
diff --git a/site/src/pages/AgentsPage/components/AgentSetupNotice.tsx b/site/src/pages/AgentsPage/components/AgentSetupNotice.tsx
index b2932b48c9..dbd1966d20 100644
--- a/site/src/pages/AgentsPage/components/AgentSetupNotice.tsx
+++ b/site/src/pages/AgentsPage/components/AgentSetupNotice.tsx
@@ -45,7 +45,7 @@ export const AgentSetupNotice: FC<AgentSetupNoticeProps> = ({
 						{" "}
 						then add a{" "}
 						<Link
-							to="/agents/settings/models"
+							to="/ai/settings/models"
 							className="text-content-link transition-colors hover:text-content-link/80"
 						>
 							model
@@ -62,7 +62,7 @@ export const AgentSetupNotice: FC<AgentSetupNoticeProps> = ({
 		<NoticeContainer>
 			To chat with Coder Agents, set up a{" "}
 			<Link
-				to="/agents/settings/models"
+				to="/ai/settings/models"
 				className="text-content-link transition-colors hover:text-content-link/80"
 			>
 				model
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.stories.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.stories.tsx
deleted file mode 100644
index 9a44057ff4..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.stories.tsx
+++ /dev/null
@@ -1,2380 +0,0 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
-import { type ComponentProps, useState } from "react";
-import {
-	expect,
-	fireEvent,
-	fn,
-	spyOn,
-	userEvent,
-	waitFor,
-	within,
-} from "storybook/test";
-import { API } from "#/api/api";
-import type * as TypesGen from "#/api/typesGenerated";
-import {
-	MockChatModelConfig,
-	MockChatProviderConfig,
-} from "#/testHelpers/chatModels";
-import {
-	ChatModelAdminPanel,
-	type ChatModelAdminSection,
-} from "./ChatModelAdminPanel";
-import { formatContextBadge, getKnownModelsForProvider } from "./knownModels";
-
-const now = "2026-02-18T12:00:00.000Z";
-const nilProviderConfigID = "00000000-0000-0000-0000-000000000000";
-
-const createProviderConfig = (
-	overrides: Partial<TypesGen.ChatProviderConfig> &
-		Pick<TypesGen.ChatProviderConfig, "id" | "provider">,
-): TypesGen.ChatProviderConfig => ({
-	...MockChatProviderConfig,
-	display_name: "",
-	has_api_key: false,
-	allow_central_api_key_fallback: false,
-	created_at: now,
-	updated_at: now,
-	...overrides,
-});
-
-const createProviderKey = (providerId: string): TypesGen.AIProviderKey => ({
-	id: `key-${providerId}`,
-	masked: "sk-...test",
-	created_at: now,
-});
-
-const toAIProvider = (
-	providerConfig: TypesGen.ChatProviderConfig,
-): TypesGen.AIProvider => ({
-	id: providerConfig.id,
-	type: providerConfig.provider as TypesGen.AIProviderType,
-	name: providerConfig.provider,
-	display_name: providerConfig.display_name,
-	enabled: providerConfig.enabled,
-	base_url: providerConfig.base_url ?? "",
-	api_keys: providerConfig.has_api_key
-		? [createProviderKey(providerConfig.id)]
-		: [],
-	settings: {},
-	created_at: providerConfig.created_at ?? now,
-	updated_at: providerConfig.updated_at ?? now,
-});
-
-const createModelConfig = (
-	overrides: Partial<TypesGen.ChatModelConfig> &
-		Pick<TypesGen.ChatModelConfig, "id" | "provider" | "model">,
-): TypesGen.ChatModelConfig => ({
-	...MockChatModelConfig,
-	created_at: now,
-	updated_at: now,
-	...overrides,
-});
-
-type ChatModelAdminPanelStoryProps = ComponentProps<typeof ChatModelAdminPanel>;
-
-/**
- * Set up spies for all chat admin API methods. The mutable `state`
- * object lets mutation spies update what queries return on refetch,
- * mimicking the real server round-trip.
- */
-const setupChatSpies = (state: {
-	providerConfigs: TypesGen.ChatProviderConfig[];
-	modelConfigs: TypesGen.ChatModelConfig[];
-	modelCatalog: TypesGen.ChatModelsResponse;
-}) => {
-	spyOn(API.experimental, "listAIProviders").mockImplementation(async () => {
-		return state.providerConfigs.map(toAIProvider);
-	});
-	spyOn(API.experimental, "getChatModelConfigs").mockImplementation(
-		async () => {
-			return state.modelConfigs;
-		},
-	);
-	spyOn(API.experimental, "getChatModels").mockImplementation(async () => {
-		return state.modelCatalog;
-	});
-
-	spyOn(API.experimental, "createAIProvider").mockImplementation(
-		async (req) => {
-			const created = createProviderConfig({
-				id: `provider-${Date.now()}`,
-				provider: req.type ?? "openai",
-				display_name: req.display_name ?? "",
-				has_api_key:
-					req.api_keys?.some((apiKey) => apiKey.trim().length > 0) ?? false,
-				base_url: req.base_url ?? "",
-				enabled: req.enabled ?? true,
-				source: "database",
-			});
-			state.providerConfigs = [
-				...state.providerConfigs.filter((p) => p.id !== created.id),
-				created,
-			];
-			return toAIProvider(created);
-		},
-	);
-	spyOn(API.experimental, "updateAIProvider").mockImplementation(
-		async (providerConfigId, req) => {
-			const idx = state.providerConfigs.findIndex(
-				(p) => p.id === providerConfigId,
-			);
-			if (idx < 0) {
-				throw new Error("Provider config not found.");
-			}
-			const current = state.providerConfigs[idx];
-			const updated: TypesGen.ChatProviderConfig = {
-				...current,
-				display_name:
-					typeof req.display_name === "string"
-						? req.display_name
-						: current.display_name,
-				has_api_key:
-					req.api_keys === undefined
-						? current.has_api_key
-						: req.api_keys.some((apiKey) =>
-								apiKey.api_key !== undefined
-									? apiKey.api_key.trim().length > 0
-									: apiKey.id !== undefined,
-							),
-				base_url:
-					typeof req.base_url === "string" ? req.base_url : current.base_url,
-				enabled:
-					typeof req.enabled === "boolean" ? req.enabled : current.enabled,
-				updated_at: now,
-			};
-			state.providerConfigs = state.providerConfigs.map((p, i) =>
-				i === idx ? updated : p,
-			);
-			return toAIProvider(updated);
-		},
-	);
-	spyOn(API.experimental, "deleteAIProvider").mockImplementation(
-		async (providerConfigId) => {
-			state.providerConfigs = state.providerConfigs.filter(
-				(p) => p.id !== providerConfigId,
-			);
-		},
-	);
-
-	spyOn(API.experimental, "createChatModelConfig").mockImplementation(
-		async (req) => {
-			const created = createModelConfig({
-				id: `model-${state.modelConfigs.length + 1}`,
-				provider: req.provider ?? "",
-				model: req.model,
-				ai_provider_id: req.ai_provider_id,
-				display_name: req.display_name || req.model,
-				enabled: req.enabled ?? true,
-				context_limit:
-					typeof req.context_limit === "number" &&
-					Number.isFinite(req.context_limit)
-						? req.context_limit
-						: 200000,
-				compression_threshold:
-					typeof req.compression_threshold === "number" &&
-					Number.isFinite(req.compression_threshold)
-						? req.compression_threshold
-						: 70,
-				model_config: req.model_config,
-			});
-			state.modelConfigs = [...state.modelConfigs, created];
-			return created;
-		},
-	);
-
-	spyOn(API.experimental, "deleteChatModelConfig").mockImplementation(
-		async (modelConfigId) => {
-			state.modelConfigs = state.modelConfigs.filter(
-				(m) => m.id !== modelConfigId,
-			);
-		},
-	);
-
-	spyOn(API.experimental, "updateChatModelConfig").mockImplementation(
-		async (modelConfigId, req) => {
-			const idx = state.modelConfigs.findIndex((m) => m.id === modelConfigId);
-			if (idx < 0) {
-				throw new Error("Model config not found.");
-			}
-
-			const current = state.modelConfigs[idx];
-			const updated = createModelConfig({
-				...current,
-				...req,
-				id: current.id,
-				provider: current.provider,
-				model: current.model,
-				updated_at: now,
-			});
-
-			state.modelConfigs = state.modelConfigs.map((modelConfig, i) =>
-				i === idx ? updated : modelConfig,
-			);
-
-			return updated;
-		},
-	);
-};
-
-const meta: Meta<typeof ChatModelAdminPanel> = {
-	title: "pages/AgentsPage/ChatModelAdminPanel",
-	component: ChatModelAdminPanel,
-	args: {
-		providerConfigsData: [],
-		modelConfigsData: [],
-		modelCatalogData: { providers: [] },
-		isLoading: false,
-		providerConfigsError: null,
-		modelConfigsError: null,
-		modelCatalogError: null,
-		onCreateProvider: fn(async () => ({ id: "" })),
-		onUpdateProvider: fn(async () => ({})),
-		onDeleteProvider: fn(async () => undefined),
-		isProviderMutationPending: false,
-		providerMutationError: null,
-		onCreateModel: fn(async () => ({})),
-		onUpdateModel: fn(async () => ({})),
-		onDeleteModel: fn(async () => undefined),
-		isCreatingModel: false,
-		isUpdatingModel: false,
-		isDeletingModel: false,
-		modelMutationError: null,
-	},
-};
-
-export default meta;
-type Story = StoryObj<typeof ChatModelAdminPanel>;
-
-export const ProviderAccordionCards: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: nilProviderConfigID,
-				provider: "openrouter",
-				display_name: "OpenRouter",
-				source: "supported",
-				enabled: false,
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await expect(await body.findByText("OpenRouter")).toBeInTheDocument();
-		// OpenAI should not be rendered.
-		expect(body.queryByText("OpenAI")).not.toBeInTheDocument();
-
-		await userEvent.click(body.getByRole("button", { name: /OpenRouter/i }));
-		await expect(await body.findByLabelText("Base URL")).toBeInTheDocument();
-	},
-};
-
-export const AddProviderFromMenu: Story = {
-	render: function AddProviderFromMenu(args) {
-		const [providerConfigsData, setProviderConfigsData] = useState(
-			args.providerConfigsData,
-		);
-
-		const handleCreateProvider: ChatModelAdminPanelStoryProps["onCreateProvider"] =
-			async (req) => {
-				const created = createProviderConfig({
-					id: `provider-${req.provider}`,
-					provider: req.provider ?? "",
-					display_name: req.display_name ?? "",
-					has_api_key: (req.api_key ?? "").trim().length > 0,
-					central_api_key_enabled: req.central_api_key_enabled ?? true,
-					allow_user_api_key: req.allow_user_api_key ?? true,
-					allow_central_api_key_fallback:
-						req.allow_central_api_key_fallback ?? true,
-					base_url: req.base_url ?? "",
-					source: "database",
-				});
-				await args.onCreateProvider(req);
-				setProviderConfigsData((current) => [...(current ?? []), created]);
-				return created;
-			};
-
-		return (
-			<ChatModelAdminPanel
-				{...args}
-				providerConfigsData={providerConfigsData}
-				onCreateProvider={handleCreateProvider}
-			/>
-		);
-	},
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		sectionLabel: "Providers",
-		sectionDescription:
-			"Connect third-party LLM services like OpenAI, Anthropic, or Google.",
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-anthropic",
-				provider: "anthropic",
-				display_name: "Anthropic Migration Test",
-				has_api_key: true,
-				allow_user_api_key: true,
-			}),
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI Migration Test",
-				has_api_key: true,
-				allow_user_api_key: true,
-			}),
-			createProviderConfig({
-				id: "provider-openai-compatible",
-				provider: "openai-compat",
-				display_name: "OpenAI Compatible Migration Test",
-				has_api_key: true,
-				allow_user_api_key: true,
-			}),
-		],
-		modelCatalogData: { providers: [] },
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		await userEvent.click(
-			await body.findByRole("button", { name: "Add provider" }),
-		);
-		await userEvent.click(
-			await body.findByRole("menuitem", { name: /Google/i }),
-		);
-
-		expect(await body.findByLabelText(/^API Key$/i)).toBeInTheDocument();
-		await userEvent.click(
-			await body.findByRole("button", { name: "Create provider config" }),
-		);
-
-		await waitFor(() => {
-			expect(args.onCreateProvider).toHaveBeenCalledWith(
-				expect.objectContaining({ provider: "google" }),
-			);
-		});
-		await waitFor(() => {
-			expect(body.getByRole("button", { name: "Save changes" })).toBeDisabled();
-		});
-
-		await userEvent.click(body.getByText("Back"));
-		expect(
-			await body.findByRole("button", { name: "Google" }),
-		).toBeInTheDocument();
-	},
-};
-
-export const EnvPresetProviders: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: nilProviderConfigID,
-				provider: "openai",
-				display_name: "OpenAI",
-				has_api_key: true,
-				source: "env_preset",
-				enabled: true,
-			}),
-			createProviderConfig({
-				id: nilProviderConfigID,
-				provider: "anthropic",
-				display_name: "Anthropic",
-				has_api_key: true,
-				source: "env_preset",
-				enabled: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Both providers should be visible in the list.
-		await expect(
-			await body.findByRole("button", { name: /OpenAI/i }),
-		).toBeInTheDocument();
-		expect(
-			body.getByRole("button", { name: /Anthropic/i }),
-		).toBeInTheDocument();
-
-		// Navigate to OpenAI detail view.
-		await userEvent.click(body.getByRole("button", { name: /OpenAI/i }));
-
-		// In the detail view we should see the env-managed alert.
-		await expect(
-			await body.findByText(
-				"This provider key is configured from deployment environment settings and cannot be edited in this UI.",
-			),
-		).toBeVisible();
-		// No API key input or create button should be present.
-		expect(body.queryByLabelText(/^API Key$/i)).not.toBeInTheDocument();
-		expect(
-			body.queryByRole("button", {
-				name: "Create provider config",
-			}),
-		).not.toBeInTheDocument();
-
-		// Navigate back to the list.
-		await userEvent.click(body.getByText("Back"));
-
-		// Verify Anthropic is visible in the list again.
-		await expect(
-			await body.findByRole("button", { name: /Anthropic/i }),
-		).toBeInTheDocument();
-
-		// Navigate to Anthropic detail view and verify it's also env-managed.
-		await userEvent.click(
-			await body.findByRole("button", { name: /Anthropic/i }),
-		);
-		await expect(
-			await body.findByText(
-				"This provider key is configured from deployment environment settings and cannot be edited in this UI.",
-			),
-		).toBeVisible();
-	},
-};
-
-export const CreateAndUpdateProvider: Story = {
-	render: function CreateAndUpdateProvider(args) {
-		const [providerConfigsData, setProviderConfigsData] = useState(
-			args.providerConfigsData,
-		);
-
-		const handleCreateProvider: ChatModelAdminPanelStoryProps["onCreateProvider"] =
-			async (req) => {
-				const created = createProviderConfig({
-					id: `provider-${Date.now()}`,
-					provider: req.provider ?? "",
-					display_name: req.display_name ?? "",
-					has_api_key: (req.api_key ?? "").trim().length > 0,
-					central_api_key_enabled: req.central_api_key_enabled ?? true,
-					allow_user_api_key: req.allow_user_api_key ?? false,
-					allow_central_api_key_fallback:
-						req.allow_central_api_key_fallback ?? false,
-					base_url: req.base_url ?? "",
-					source: "database",
-				});
-				await args.onCreateProvider(req);
-				setProviderConfigsData((current) => [
-					...(current ?? []).filter(
-						(p) =>
-							!(p.id === nilProviderConfigID && p.provider === req.provider),
-					),
-					created,
-				]);
-				return created;
-			};
-
-		const handleUpdateProvider: ChatModelAdminPanelStoryProps["onUpdateProvider"] =
-			async (providerConfigId, req) => {
-				const result = await args.onUpdateProvider(providerConfigId, req);
-				setProviderConfigsData((current) => {
-					if (!current) {
-						return current;
-					}
-					return current.map((providerConfig) =>
-						providerConfig.id === providerConfigId
-							? {
-									...providerConfig,
-									display_name:
-										typeof req.display_name === "string"
-											? req.display_name
-											: providerConfig.display_name,
-									has_api_key:
-										typeof req.api_key === "string"
-											? req.api_key.trim().length > 0
-											: providerConfig.has_api_key,
-									central_api_key_enabled:
-										typeof req.central_api_key_enabled === "boolean"
-											? req.central_api_key_enabled
-											: providerConfig.central_api_key_enabled,
-									allow_user_api_key:
-										typeof req.allow_user_api_key === "boolean"
-											? req.allow_user_api_key
-											: providerConfig.allow_user_api_key,
-									allow_central_api_key_fallback:
-										typeof req.allow_central_api_key_fallback === "boolean"
-											? req.allow_central_api_key_fallback
-											: providerConfig.allow_central_api_key_fallback,
-									base_url:
-										typeof req.base_url === "string"
-											? req.base_url
-											: providerConfig.base_url,
-									updated_at: "2026-02-18T12:00:00.000Z",
-								}
-							: providerConfig,
-					);
-				});
-				return result;
-			};
-
-		return (
-			<ChatModelAdminPanel
-				{...args}
-				providerConfigsData={providerConfigsData}
-				onCreateProvider={handleCreateProvider}
-				onUpdateProvider={handleUpdateProvider}
-			/>
-		);
-	},
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: nilProviderConfigID,
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "supported",
-				enabled: false,
-				has_api_key: false,
-			}),
-		],
-		modelCatalogData: {
-			providers: [
-				{
-					provider: "openai",
-					available: false,
-					unavailable_reason: "missing_api_key",
-					models: [],
-				},
-			],
-		},
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		await userEvent.click(await body.findByRole("button", { name: /OpenAI/i }));
-
-		await userEvent.type(
-			await body.findByLabelText(/^API Key$/i),
-			"sk-provider-key",
-		);
-		const createBaseURLInput = await body.findByLabelText("Base URL");
-		await userEvent.clear(createBaseURLInput);
-		await userEvent.type(createBaseURLInput, "https://proxy.example.com/v1");
-		await userEvent.click(
-			await body.findByRole("button", { name: "Create provider config" }),
-		);
-
-		await waitFor(() => {
-			expect(args.onCreateProvider).toHaveBeenCalledTimes(1);
-		});
-		await waitFor(() => {
-			expect(body.getByRole("button", { name: "Save changes" })).toBeDisabled();
-		});
-		expect(args.onCreateProvider).toHaveBeenCalledWith(
-			expect.objectContaining({
-				provider: "openai",
-				api_key: "sk-provider-key",
-				base_url: "https://proxy.example.com/v1",
-			}),
-		);
-
-		await waitFor(() => {
-			expect(
-				body.getByRole("button", { name: "Save changes" }),
-			).toBeInTheDocument();
-		});
-
-		const apiKeyInput = body.getByLabelText(/^API Key$/i);
-		await userEvent.clear(apiKeyInput);
-		await userEvent.type(apiKeyInput, "sk-updated-provider-key");
-		const baseURLInput = body.getByLabelText("Base URL");
-		await userEvent.clear(baseURLInput);
-		await userEvent.type(baseURLInput, "https://internal-proxy.example.com/v2");
-		await userEvent.click(body.getByRole("button", { name: "Save changes" }));
-
-		await waitFor(() => {
-			expect(args.onUpdateProvider).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onUpdateProvider).toHaveBeenCalledWith(
-			expect.any(String),
-			expect.objectContaining({
-				api_key: "sk-updated-provider-key",
-				base_url: "https://internal-proxy.example.com/v2",
-			}),
-		);
-	},
-};
-
-export const ProviderApiKeyInputMasked: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai-mask",
-				provider: "openai",
-				display_name: "OpenAI",
-				has_api_key: true,
-			}),
-		],
-		modelCatalogData: { providers: [] },
-	},
-	beforeEach: () => {
-		setupChatSpies({
-			providerConfigs: [
-				createProviderConfig({
-					id: "provider-openai-mask",
-					provider: "openai",
-					display_name: "OpenAI",
-					has_api_key: true,
-				}),
-			],
-			modelConfigs: [],
-			modelCatalog: { providers: [] },
-		});
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await userEvent.click(await body.findByRole("button", { name: /OpenAI/i }));
-		await expect(await body.findByLabelText(/^API Key$/i)).toHaveAttribute(
-			"type",
-			"password",
-		);
-	},
-};
-
-export const ModelFormUserKeyOnlyProvider: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-google-user-only-models",
-				provider: "google",
-				display_name: "Google",
-				has_api_key: false,
-				central_api_key_enabled: false,
-				allow_user_api_key: true,
-				allow_central_api_key_fallback: false,
-			}),
-		],
-		modelCatalogData: { providers: [] },
-	},
-	beforeEach: () => {
-		setupChatSpies({
-			providerConfigs: [
-				createProviderConfig({
-					id: "provider-google-user-only-models",
-					provider: "google",
-					display_name: "Google",
-					has_api_key: false,
-					central_api_key_enabled: false,
-					allow_user_api_key: true,
-					allow_central_api_key_fallback: false,
-				}),
-			],
-			modelConfigs: [],
-			modelCatalog: { providers: [] },
-		});
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Google");
-		await expect(
-			await body.findByLabelText(/Model Identifier/i),
-		).toBeInTheDocument();
-		expect(
-			body.queryByText(
-				"Set an API key for this provider on the Providers tab before adding models.",
-			),
-		).not.toBeInTheDocument();
-	},
-};
-
-export const ProviderFormBedrockAmbientCredentials: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: nilProviderConfigID,
-				provider: "bedrock",
-				display_name: "AWS Bedrock",
-				source: "supported",
-				enabled: false,
-			}),
-		],
-		modelCatalogData: { providers: [] },
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await userEvent.click(
-			await body.findByRole("button", { name: /AWS Bedrock/i }),
-		);
-
-		const apiKeyInput = await body.findByLabelText(/^API Key$/i);
-		const baseURLInput = await body.findByLabelText("Base URL");
-		const createButton = body.getByRole("button", {
-			name: "Create provider config",
-		});
-
-		await expect(apiKeyInput).not.toBeRequired();
-		await expect(apiKeyInput).toHaveAttribute(
-			"placeholder",
-			"Enter bearer token",
-		);
-		await expect(
-			body.findByText(
-				"Bearer token for Bedrock authentication. Leave empty to use ambient AWS credentials.",
-			),
-		).resolves.toBeInTheDocument();
-		await expect(
-			body.findByText(
-				/Bedrock runtime endpoint\.\s+Use the AWS region for the models this provider should call\./i,
-			),
-		).resolves.toBeInTheDocument();
-		await expect(createButton).toBeDisabled();
-		await userEvent.type(
-			baseURLInput,
-			"https://bedrock-runtime.us-east-1.amazonaws.com",
-		);
-		await waitFor(() => {
-			expect(createButton).toBeEnabled();
-		});
-
-		await userEvent.click(createButton);
-		await waitFor(() => {
-			expect(args.onCreateProvider).toHaveBeenCalledTimes(1);
-		});
-		const createProviderMock = args.onCreateProvider as ReturnType<typeof fn>;
-		const createRequest = createProviderMock.mock.calls[0][0] as Record<
-			string,
-			unknown
-		>;
-		expect(createRequest).toMatchObject({
-			provider: "bedrock",
-			base_url: "https://bedrock-runtime.us-east-1.amazonaws.com",
-		});
-		expect(createRequest).not.toHaveProperty("api_key");
-	},
-};
-
-export const ProviderFormBedrockBearerToken: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-bedrock-bearer",
-				provider: "bedrock",
-				display_name: "AWS Bedrock",
-				base_url: "https://bedrock-runtime.us-east-1.amazonaws.com",
-				has_api_key: true,
-				central_api_key_enabled: true,
-				allow_user_api_key: false,
-				allow_central_api_key_fallback: false,
-			}),
-		],
-		modelCatalogData: { providers: [] },
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await userEvent.click(
-			await body.findByRole("button", { name: /AWS Bedrock/i }),
-		);
-
-		const apiKeyInput = await body.findByLabelText(/^API Key$/i);
-		const saveButton = body.getByRole("button", { name: "Save changes" });
-
-		await expect(apiKeyInput).not.toBeRequired();
-		await expect(apiKeyInput).toHaveValue("••••••••••••••••");
-
-		await userEvent.click(apiKeyInput);
-		await userEvent.type(apiKeyInput, "bedrock-bearer-token");
-		await waitFor(() => {
-			expect(saveButton).toBeEnabled();
-		});
-		await userEvent.click(saveButton);
-
-		await waitFor(() => {
-			expect(args.onUpdateProvider).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onUpdateProvider).toHaveBeenCalledWith(
-			"provider-bedrock-bearer",
-			expect.objectContaining({ api_key: "bedrock-bearer-token" }),
-		);
-	},
-};
-
-export const ProviderFormBedrockClearBearerToken: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-bedrock-clear",
-				provider: "bedrock",
-				display_name: "AWS Bedrock",
-				base_url: "https://bedrock-runtime.us-east-1.amazonaws.com",
-				has_api_key: true,
-				central_api_key_enabled: true,
-				allow_user_api_key: false,
-				allow_central_api_key_fallback: false,
-			}),
-		],
-		modelCatalogData: { providers: [] },
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await userEvent.click(
-			await body.findByRole("button", { name: /AWS Bedrock/i }),
-		);
-
-		const apiKeyInput = await body.findByLabelText(/^API Key$/i);
-		const clearStoredTokenButton = body.getByRole("button", {
-			name: /Clear stored token/i,
-		});
-		const saveButton = body.getByRole("button", { name: "Save changes" });
-
-		await expect(apiKeyInput).toHaveValue("••••••••••••••••");
-		await userEvent.click(clearStoredTokenButton);
-		await waitFor(() => {
-			expect(apiKeyInput).toHaveValue("");
-			expect(saveButton).toBeEnabled();
-		});
-		await userEvent.click(saveButton);
-
-		await waitFor(() => {
-			expect(args.onUpdateProvider).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onUpdateProvider).toHaveBeenCalledWith(
-			"provider-bedrock-clear",
-			expect.objectContaining({ api_key: "" }),
-		);
-	},
-};
-
-const openAddModelForm = async (
-	body: ReturnType<typeof within>,
-	providerLabel: string,
-) => {
-	// Click the dropdown trigger to open the provider menu.
-	const trigger = await body.findByRole("button", { name: "Add model" });
-	await userEvent.click(trigger);
-	// Radix portals dropdown content into the document body.
-	// Wait for the menu to appear and click the provider item.
-	await waitFor(async () => {
-		const item = body.getByRole("menuitem", {
-			name: new RegExp(providerLabel, "i"),
-		});
-		await userEvent.click(item);
-	});
-};
-
-/** Expand a collapsible section by clicking its header button. */
-const expandSection = async (body: ReturnType<typeof within>, name: string) => {
-	const btn = await body.findByRole("button", {
-		name: new RegExp(name, "i"),
-	});
-	await userEvent.click(btn);
-};
-
-const enterModelIdentifier = async (
-	body: ReturnType<typeof within>,
-	value: string,
-) => {
-	const field = await body.findByLabelText(/Model Identifier/i);
-	if (field instanceof HTMLInputElement) {
-		await userEvent.type(field, value);
-		return;
-	}
-
-	await userEvent.click(field);
-	await userEvent.type(await body.findByRole("combobox"), value);
-};
-
-export const NoModelConfigByDefault: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Open "Add model" dropdown and select the OpenAI provider.
-		await openAddModelForm(body, "OpenAI");
-
-		await enterModelIdentifier(body, "gpt-5-pro");
-		await userEvent.type(body.getByLabelText(/Context limit/i), "200000");
-
-		// Max output tokens is under the "Advanced" toggle.
-		await userEvent.click(body.getByText("Advanced"));
-		await expect(await body.findByLabelText(/Max output tokens/i)).toHaveValue(
-			"",
-		);
-
-		// The submit button in ModelForm also says "Add model".
-		await userEvent.click(body.getByRole("button", { name: "Add model" }));
-		await waitFor(() => {
-			expect(args.onCreateModel).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onCreateModel).toHaveBeenCalledWith(
-			expect.objectContaining({
-				provider: "openai",
-				model: "gpt-5-pro",
-			}),
-		);
-		// Blank pricing fields should remain unset in the payload.
-		const createModelMock = args.onCreateModel as ReturnType<typeof fn>;
-		const callArgs = createModelMock.mock.calls[0][0] as Record<
-			string,
-			unknown
-		>;
-		expect(callArgs).not.toHaveProperty("model_config");
-	},
-};
-
-export const SubmitModelConfigExplicitly: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Open "Add model" dropdown and select the OpenAI provider.
-		await openAddModelForm(body, "OpenAI");
-
-		await enterModelIdentifier(body, "gpt-5-pro-custom");
-		await userEvent.type(body.getByLabelText(/Context limit/i), "200000");
-		// Max output tokens is under "Advanced".
-		await expandSection(body, "Advanced");
-		await userEvent.type(
-			await body.findByLabelText(/Max output tokens/i),
-			"32000",
-		);
-		await expandSection(body, "Provider configuration");
-		const effortGroup = await body.findByRole("radiogroup", {
-			name: "Reasoning Effort",
-		});
-		await userEvent.click(within(effortGroup).getByText("High"));
-
-		await userEvent.click(body.getByRole("button", { name: "Add model" }));
-		await waitFor(() => {
-			expect(args.onCreateModel).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onCreateModel).toHaveBeenCalledWith(
-			expect.objectContaining({
-				provider: "openai",
-				model: "gpt-5-pro-custom",
-				model_config: expect.objectContaining({
-					max_output_tokens: 32000,
-					provider_options: {
-						openai: {
-							reasoning_effort: "high",
-						},
-					},
-				}),
-			}),
-		);
-	},
-};
-
-export const UpdateModelEnabledToggle: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-		modelConfigsData: [
-			createModelConfig({
-				id: "model-enabled",
-				provider: "openai",
-				model: "gpt-test-enabled",
-				display_name: "GPT Test Enabled",
-				enabled: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		await userEvent.click(await body.findByText("GPT Test Enabled"));
-
-		const enabledSwitch = await body.findByRole("switch", { name: "Enabled" });
-		await expect(enabledSwitch).toBeChecked();
-		await userEvent.click(enabledSwitch);
-		await expect(enabledSwitch).not.toBeChecked();
-
-		await userEvent.click(body.getByRole("button", { name: "Save" }));
-
-		await waitFor(() => {
-			expect(args.onUpdateModel).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onUpdateModel).toHaveBeenCalledWith(
-			"model-enabled",
-			expect.objectContaining({ enabled: false }),
-		);
-	},
-};
-
-// Each story opens the "Add model" form for a specific provider
-// so you can visually verify the schema-driven fields render.
-
-const providerFormSetup = (provider: string, displayName: string) => ({
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: `provider-${provider}`,
-				provider,
-				display_name: displayName,
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-});
-
-const findOptionByText = (options: HTMLElement[], text: string) => {
-	for (const option of options) {
-		if (option.textContent?.includes(text)) {
-			return option;
-		}
-	}
-	throw new Error(`Expected visible option containing ${text}.`);
-};
-
-const expectKnownModelOptionsInOrder = async (
-	body: ReturnType<typeof within>,
-	provider: string,
-) => {
-	const knownModels = getKnownModelsForProvider(provider);
-	const options = await body.findAllByRole("option");
-	expect(options.length).toBeGreaterThanOrEqual(knownModels.length);
-
-	for (const [index, knownModel] of knownModels.entries()) {
-		const option = options[index];
-		if (!option) {
-			throw new Error(`Expected option at index ${index}.`);
-		}
-		expect(option).toHaveTextContent(knownModel.displayName);
-		expect(option).toHaveTextContent(knownModel.modelIdentifier);
-		if (knownModel.contextLimit !== undefined) {
-			expect(option).toHaveTextContent(
-				formatContextBadge(knownModel.contextLimit),
-			);
-		}
-	}
-
-	return options;
-};
-
-const knownModelDefaultsFeedback = (displayName: string) =>
-	`Defaults applied from ${displayName}. Review and adjust before saving.`;
-
-const noMatchingKnownModelsText =
-	"No matching known models. You can still use this identifier.";
-
-const openKnownModelPopover = async (body: ReturnType<typeof within>) => {
-	await userEvent.click(await body.findByLabelText(/Model Identifier/i));
-	const input = await body.findByRole("combobox");
-	await expect(input).toHaveFocus();
-	return input;
-};
-
-const expectKnownModelPopoverClosed = async (
-	body: ReturnType<typeof within>,
-) => {
-	await waitFor(() => {
-		expect(body.queryByRole("listbox")).not.toBeInTheDocument();
-		expect(body.queryAllByRole("option")).toHaveLength(0);
-		expect(body.queryByText(noMatchingKnownModelsText)).not.toBeInTheDocument();
-	});
-};
-
-const closeKnownModelPopoverToContextLimit = async (
-	body: ReturnType<typeof within>,
-) => {
-	await userEvent.click(body.getByLabelText(/Context limit/i));
-	await expectKnownModelPopoverClosed(body);
-};
-
-const selectKnownModel = async (
-	body: ReturnType<typeof within>,
-	modelIdentifier: string,
-) => {
-	const input = await openKnownModelPopover(body);
-	await userEvent.clear(input);
-	await expect(input).toHaveValue("");
-	const options = await body.findAllByRole("option");
-	await userEvent.click(findOptionByText(options, modelIdentifier));
-	await expectModelIdentifierValue(body, modelIdentifier);
-};
-
-const clearAndTypeKnownModelSearch = async (
-	body: ReturnType<typeof within>,
-	value: string,
-) => {
-	let input = await body.findByRole("combobox");
-	await userEvent.clear(input);
-	input = await body.findByRole("combobox");
-	await expect(input).toHaveValue("");
-	await expect(input).toHaveFocus();
-	await userEvent.keyboard(value);
-	input = await body.findByRole("combobox");
-	await expect(input).toHaveValue(value);
-	return input;
-};
-
-const expectModelIdentifierValue = async (
-	body: ReturnType<typeof within>,
-	value: string,
-) => {
-	const control = await body.findByLabelText(/Model Identifier/i);
-	if (control.matches("input,textarea")) {
-		await waitFor(() => expect(control).toHaveValue(value));
-		return;
-	}
-
-	await waitFor(() => expect(control).toHaveTextContent(value));
-};
-
-const getDefaultsFeedback = (
-	body: ReturnType<typeof within>,
-	message: string,
-) =>
-	body
-		.queryAllByRole("status")
-		.filter((el: HTMLElement) => el.textContent === message);
-
-const expectDefaultsFeedbackCount = (
-	body: ReturnType<typeof within>,
-	message: string,
-	count: number,
-) => {
-	expect(getDefaultsFeedback(body, message)).toHaveLength(count);
-};
-
-const expectOffCatalogModelCommitted = async (
-	body: ReturnType<typeof within>,
-	value: string,
-) => {
-	await openKnownModelPopover(body);
-	await clearAndTypeKnownModelSearch(body, value);
-	await closeKnownModelPopoverToContextLimit(body);
-
-	await expectModelIdentifierValue(body, value);
-	expect(body.queryByRole("status")).not.toBeInTheDocument();
-	expect(body.queryByText("Model ID is required.")).not.toBeInTheDocument();
-};
-
-const ensureCostTrackingOpen = async (body: ReturnType<typeof within>) => {
-	if (body.queryByLabelText(/^Input$/i)) {
-		return;
-	}
-	await expandSection(body, "Cost tracking");
-	await body.findByLabelText(/^Input$/i);
-};
-
-const expectPricingValue = async (
-	body: ReturnType<typeof within>,
-	label: RegExp,
-	value: string,
-) => {
-	await expect(await body.findByLabelText(label)).toHaveValue(value);
-};
-
-const expectReasoningEffort = async (
-	body: ReturnType<typeof within>,
-	value: string,
-) => {
-	const reasoningEffortGroup = await body.findByRole("radiogroup", {
-		name: "Reasoning Effort",
-	});
-
-	if (value === "") {
-		for (const option of within(reasoningEffortGroup).getAllByRole("radio")) {
-			await expect(option).toHaveAttribute("aria-checked", "false");
-		}
-		return;
-	}
-
-	const label = value.charAt(0).toUpperCase() + value.slice(1);
-	await expect(
-		within(reasoningEffortGroup).getByRole("radio", { name: label }),
-	).toHaveAttribute("aria-checked", "true");
-};
-
-type OpenAIDefaultExpectations = {
-	modelIdentifier: string;
-	contextLimit: string;
-	maxCompletionTokens: string;
-	reasoningEffort: string;
-	inputCost: string;
-	outputCost: string;
-	cacheReadCost?: string;
-	cacheWriteCost?: string;
-};
-
-const gpt55Defaults = {
-	modelIdentifier: "gpt-5.5",
-	contextLimit: "1050000",
-	maxCompletionTokens: "128000",
-	reasoningEffort: "medium",
-	inputCost: "5",
-	outputCost: "30",
-	cacheReadCost: "0.5",
-} satisfies OpenAIDefaultExpectations;
-
-const gpt55ProDefaults = {
-	modelIdentifier: "gpt-5.5-pro",
-	contextLimit: "1050000",
-	maxCompletionTokens: "128000",
-	reasoningEffort: "high",
-	inputCost: "30",
-	outputCost: "180",
-} satisfies OpenAIDefaultExpectations;
-
-const gpt54MiniDefaults = {
-	modelIdentifier: "gpt-5.4-mini",
-	contextLimit: "400000",
-	maxCompletionTokens: "128000",
-	reasoningEffort: "medium",
-	inputCost: "0.75",
-	outputCost: "4.5",
-	cacheReadCost: "0.075",
-} satisfies OpenAIDefaultExpectations;
-
-const ensureProviderConfigurationOpen = async (
-	body: ReturnType<typeof within>,
-) => {
-	if (body.queryByLabelText(/Max Completion Tokens/i)) {
-		return;
-	}
-	await expandSection(body, "Provider configuration");
-	await body.findByLabelText(/Max Completion Tokens/i);
-};
-
-const expectOpenAIKnownModelDefaults = async (
-	body: ReturnType<typeof within>,
-	expectations: OpenAIDefaultExpectations,
-) => {
-	await expectModelIdentifierValue(body, expectations.modelIdentifier);
-	await expect(body.getByLabelText(/Context limit/i)).toHaveValue(
-		expectations.contextLimit,
-	);
-
-	await ensureProviderConfigurationOpen(body);
-	await expect(
-		await body.findByLabelText(/Max Completion Tokens/i),
-	).toHaveValue(expectations.maxCompletionTokens);
-	await expectReasoningEffort(body, expectations.reasoningEffort);
-
-	await ensureCostTrackingOpen(body);
-	await expectPricingValue(body, /^Input$/i, expectations.inputCost);
-	await expectPricingValue(body, /^Output$/i, expectations.outputCost);
-	await expectPricingValue(
-		body,
-		/^Cache Read$/i,
-		expectations.cacheReadCost ?? "",
-	);
-	await expectPricingValue(
-		body,
-		/^Cache Write$/i,
-		expectations.cacheWriteCost ?? "",
-	);
-};
-
-export const OpenAIKnownModelHappyPath: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await openKnownModelPopover(body);
-		const options = await expectKnownModelOptionsInOrder(body, "openai");
-		await userEvent.click(findOptionByText(options, "gpt-5.5"));
-
-		await expectModelIdentifierValue(body, "gpt-5.5");
-		await expect(await body.findByRole("status")).toHaveTextContent(
-			"Defaults applied from GPT-5.5. Review and adjust before saving.",
-		);
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("1050000");
-
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Max Completion Tokens/i),
-		).toHaveValue("128000");
-	},
-};
-
-export const OpenAIKnownModelKeyboardSelection: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-25: keyboard selection applies defaults",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		const input = await openKnownModelPopover(body);
-		fireEvent.keyDown(input, { key: "ArrowDown" });
-		await userEvent.keyboard("{Enter}");
-
-		await expectOpenAIKnownModelDefaults(body, gpt55ProDefaults);
-		await expect(await body.findByRole("status")).toHaveTextContent(
-			knownModelDefaultsFeedback("GPT-5.5 Pro"),
-		);
-	},
-};
-
-export const OpenAIKnownModelReclickSelectedDoesNotClearField: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-26: re-clicking selected Known Model does not clear field",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await openKnownModelPopover(body);
-		const options = await body.findAllByRole("option");
-		await userEvent.click(findOptionByText(options, "gpt-5.5"));
-
-		await expectModelIdentifierValue(body, "gpt-5.5");
-		await expectKnownModelPopoverClosed(body);
-		expect(
-			body.queryByRole("button", { name: /clear/i }),
-		).not.toBeInTheDocument();
-	},
-};
-
-export const AnthropicKnownModelHappyPath: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		await openKnownModelPopover(body);
-		const options = await body.findAllByRole("option");
-		await userEvent.click(findOptionByText(options, "claude-opus-4-8"));
-
-		await expectModelIdentifierValue(body, "claude-opus-4-8");
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("1000000");
-
-		await expandSection(body, "Advanced");
-		await expect(await body.findByLabelText(/Max Output Tokens/i)).toHaveValue(
-			"128000",
-		);
-
-		await expandSection(body, "Provider configuration");
-		const sendReasoningGroup = await body.findByRole("radiogroup", {
-			name: "Send Reasoning",
-		});
-		await expect(
-			within(sendReasoningGroup).getByRole("radio", { name: "On" }),
-		).toHaveAttribute("aria-checked", "false");
-		await expect(
-			within(sendReasoningGroup).getByRole("radio", { name: "Off" }),
-		).toHaveAttribute("aria-checked", "false");
-		await expect(
-			await body.findByLabelText(/Thinking Budget Tokens/i),
-		).toHaveValue("");
-		await expectReasoningEffort(body, "high");
-	},
-};
-
-export const AnthropicHaikuKnownModelUsesThinkingBudgetNotEffort: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-43: Haiku 4.5 sets thinking budget instead of effort",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-		await selectKnownModel(body, "claude-haiku-4-5");
-
-		await expandSection(body, "Provider configuration");
-
-		// Reasoning Effort should remain empty because Haiku 4.5 uses the
-		// thinking budget path instead of Anthropic adaptive thinking.
-		await expectReasoningEffort(body, "");
-		await expect(
-			await body.findByLabelText(/Thinking Budget Tokens/i),
-		).toHaveValue("8192");
-	},
-};
-
-export const OpenAIKnownModelDoesNotPreFireRequiredError: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-3: open does not pre-fire required error",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await openKnownModelPopover(body);
-
-		expect(body.queryByText("Model ID is required.")).not.toBeInTheDocument();
-	},
-};
-
-export const OpenAIKnownModelOpenDoesNotFlashInvalidBorder: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-31: open does not flash invalid border on trigger",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		const trigger = await body.findByLabelText(/Model Identifier/i);
-		await openKnownModelPopover(body);
-
-		expect([null, "false"]).toContain(trigger.getAttribute("aria-invalid"));
-		expect(trigger).not.toHaveClass("border-content-destructive");
-		expect(body.queryByText("Model ID is required.")).not.toBeInTheDocument();
-	},
-};
-
-export const KnownModelClickOffEmptyDoesNotFireRequired: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-47: clicking off empty model does not fire required error",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		const trigger = await body.findByLabelText(/Model Identifier/i);
-		await openKnownModelPopover(body);
-
-		// Click another field to close the popover without typing or selecting.
-		// Mirrors the QA-reported flow: focus the field, change your mind, click
-		// elsewhere; the empty value should NOT surface "Model ID is required."
-		// before the user has actually attempted to commit anything.
-		await closeKnownModelPopoverToContextLimit(body);
-
-		expect(body.queryByText("Model ID is required.")).not.toBeInTheDocument();
-		expect([null, "false"]).toContain(trigger.getAttribute("aria-invalid"));
-		expect(trigger).not.toHaveClass("border-content-destructive");
-	},
-};
-
-export const OpenAIKnownModelEscapeCancelsSearch: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-5: Escape cancels and preserves committed value",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		const feedback = knownModelDefaultsFeedback("GPT-5.5");
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await expectModelIdentifierValue(body, "gpt-5.5");
-		expectDefaultsFeedbackCount(body, feedback, 1);
-
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "cod");
-		await userEvent.keyboard("{Escape}");
-
-		await expectKnownModelPopoverClosed(body);
-		await expectModelIdentifierValue(body, "gpt-5.5");
-		expectDefaultsFeedbackCount(body, feedback, 1);
-
-		const reopenedInput = await openKnownModelPopover(body);
-		await expect(reopenedInput).toHaveValue("gpt-5.5");
-		await userEvent.keyboard("{Escape}");
-	},
-};
-
-export const OpenAIKnownModelEscapeDoesNotReapplyDefaultsFeedback: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-30: type-then-Escape does not re-apply defaults feedback",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		const feedback = knownModelDefaultsFeedback("GPT-5.5");
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		expectDefaultsFeedbackCount(body, feedback, 1);
-		const initialFeedback = getDefaultsFeedback(body, feedback)[0];
-		if (!initialFeedback) {
-			throw new Error("Expected Known Model defaults feedback.");
-		}
-
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "a");
-		await userEvent.keyboard("{Escape}");
-
-		await expectKnownModelPopoverClosed(body);
-		await userEvent.click(body.getByLabelText(/Context limit/i));
-
-		expectDefaultsFeedbackCount(body, feedback, 1);
-		expect(getDefaultsFeedback(body, feedback)[0]).toBe(initialFeedback);
-		await expectModelIdentifierValue(body, "gpt-5.5");
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("1050000");
-	},
-};
-
-export const OpenAIKnownModelSequentialSelectionReplacesDefaults: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-4, DEREM-10: sequential selection replaces catalog defaults",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await selectKnownModel(body, "gpt-5.4-mini");
-
-		await expectModelIdentifierValue(body, "gpt-5.4-mini");
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("400000");
-		await ensureCostTrackingOpen(body);
-		await expectPricingValue(body, /^Input$/i, "0.75");
-		await expectPricingValue(body, /^Output$/i, "4.5");
-	},
-};
-
-export const OpenAIKnownModelReasoningEffortClearsForNonReasoningModel: Story =
-	{
-		...providerFormSetup("openai", "OpenAI"),
-		name: "Add mode / DEREM-31: reasoningEffort clears when switching to non-reasoning model",
-		play: async ({ canvasElement }) => {
-			const body = within(canvasElement.ownerDocument.body);
-			await openAddModelForm(body, "OpenAI");
-
-			await selectKnownModel(body, "gpt-5.5");
-			await ensureProviderConfigurationOpen(body);
-			await expectReasoningEffort(body, "medium");
-
-			await selectKnownModel(body, "gpt-5.4");
-			await expectReasoningEffort(body, "");
-		},
-	};
-
-export const OpenAIKnownModelStaleCostFieldDoesNotPersist: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-24: stale cost fields do not persist",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5-pro");
-		await selectKnownModel(body, "gpt-5.4-mini");
-		await selectKnownModel(body, "gpt-5.5");
-
-		await expectOpenAIKnownModelDefaults(body, gpt55Defaults);
-	},
-};
-
-export const OpenAIKnownModelOffCatalogInterleavingKeepsTracking: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-24: off-catalog interleaving keeps tracking",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "my-custom-fine-tune");
-		await closeKnownModelPopoverToContextLimit(body);
-		await expectModelIdentifierValue(body, "my-custom-fine-tune");
-
-		await selectKnownModel(body, "gpt-5.4-mini");
-
-		await expectOpenAIKnownModelDefaults(body, gpt54MiniDefaults);
-	},
-};
-
-export const OpenAIKnownModelChainTrackingDoesNotLoseFields: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-24: chained selections retain tracking",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await selectKnownModel(body, "gpt-5.5-pro");
-		await expectOpenAIKnownModelDefaults(body, gpt55ProDefaults);
-		await selectKnownModel(body, "gpt-5.4-mini");
-
-		await expectOpenAIKnownModelDefaults(body, gpt54MiniDefaults);
-	},
-};
-
-export const OpenAIKnownModelDoubleApplyGuard: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-10: double-apply guard keeps defaults stable",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		const feedback = knownModelDefaultsFeedback("GPT-5.5");
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await expect(await body.findByRole("status")).toHaveTextContent(feedback);
-		await ensureCostTrackingOpen(body);
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("1050000");
-		await expectPricingValue(body, /^Input$/i, "5");
-		await expectPricingValue(body, /^Output$/i, "30");
-
-		await openKnownModelPopover(body);
-		await closeKnownModelPopoverToContextLimit(body);
-
-		expectDefaultsFeedbackCount(body, feedback, 1);
-		await expectModelIdentifierValue(body, "gpt-5.5");
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("1050000");
-		await expectPricingValue(body, /^Input$/i, "5");
-		await expectPricingValue(body, /^Output$/i, "30");
-	},
-};
-
-export const OpenAIKnownModelExactCanonicalBlurAppliesDefaults: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-10: exact canonical blur applies defaults",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "gpt-5.5-pro");
-		await closeKnownModelPopoverToContextLimit(body);
-
-		await expectModelIdentifierValue(body, "gpt-5.5-pro");
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("1050000");
-		await ensureCostTrackingOpen(body);
-		await expectPricingValue(body, /^Input$/i, "30");
-		await expectPricingValue(body, /^Output$/i, "180");
-		await expect(await body.findByRole("status")).toHaveTextContent(
-			knownModelDefaultsFeedback("GPT-5.5 Pro"),
-		);
-	},
-};
-
-export const AnthropicKnownModelAliasTypedValueCancels: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-10: alias typed value cancels",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "custom-anthropic-model");
-		await closeKnownModelPopoverToContextLimit(body);
-		await expectModelIdentifierValue(body, "custom-anthropic-model");
-
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "claude-haiku-4-5-20251001");
-		const filteredOptions = await body.findAllByRole("option");
-		expect(
-			findOptionByText(filteredOptions, "Claude Haiku 4.5"),
-		).toHaveTextContent("claude-haiku-4-5");
-		await closeKnownModelPopoverToContextLimit(body);
-
-		await expectModelIdentifierValue(body, "custom-anthropic-model");
-		expect(body.queryByRole("status")).not.toBeInTheDocument();
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("");
-	},
-};
-
-export const AnthropicKnownModelPunctuationVariantCommits: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-27: off-catalog with punctuation variant commits",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		await expectOffCatalogModelCommitted(body, "claude.haiku.4.5.20251001");
-	},
-};
-
-export const KnownModelOffCatalogSubstringCommits: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-anthropic-known-model-substring",
-				provider: "anthropic",
-				display_name: "Anthropic",
-				source: "database",
-				has_api_key: true,
-			}),
-			createProviderConfig({
-				id: "provider-openai-known-model-substring",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	name: "Add mode / DEREM-19: off-catalog identifier substring-matching catalog metadata commits",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		await openAddModelForm(body, "Anthropic");
-		await expectOffCatalogModelCommitted(body, "haiku");
-		await userEvent.click(body.getByRole("button", { name: /^Cancel$/i }));
-		await waitFor(() => {
-			expect(
-				body.queryByLabelText(/Model Identifier/i),
-			).not.toBeInTheDocument();
-		});
-
-		await openAddModelForm(body, "OpenAI");
-		await expectOffCatalogModelCommitted(body, "mini");
-		await expectOffCatalogModelCommitted(body, "pro");
-		await expectOffCatalogModelCommitted(body, "gpt-5");
-	},
-};
-
-export const KnownModelProviderChangeResetsDefaultsFeedback: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai-known-model-reset",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-			createProviderConfig({
-				id: "provider-anthropic-known-model-reset",
-				provider: "anthropic",
-				display_name: "Anthropic",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	name: "Add mode / DEREM-10: provider change resets Known Model defaults",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await selectKnownModel(body, "gpt-5.5");
-		await expect(await body.findByRole("status")).toHaveTextContent(
-			knownModelDefaultsFeedback("GPT-5.5"),
-		);
-
-		await userEvent.click(body.getByRole("button", { name: /^Cancel$/i }));
-		await waitFor(() => {
-			expect(
-				body.queryByLabelText(/Model Identifier/i),
-			).not.toBeInTheDocument();
-		});
-		await openAddModelForm(body, "Anthropic");
-		await selectKnownModel(body, "claude-haiku-4-5");
-
-		await expectModelIdentifierValue(body, "claude-haiku-4-5");
-		await expect(body.getByLabelText(/Context limit/i)).toHaveValue("200000");
-		await ensureCostTrackingOpen(body);
-		await expectPricingValue(body, /^Input$/i, "1");
-		await expectPricingValue(body, /^Output$/i, "5");
-		await expect(await body.findByRole("status")).toHaveTextContent(
-			knownModelDefaultsFeedback("Claude Haiku 4.5"),
-		);
-	},
-};
-
-export const OpenAIKnownModelTriggerAriaParity: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-1: aria parity on autocomplete trigger",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		// Surface the required-field error through a real user action:
-		// open the popover, type then clear the search, and click off. The
-		// off-catalog close path commits an empty string and marks the field
-		// touched, so Formik validation renders "Model ID is required." This
-		// verifies the inline-search trigger forwards aria-invalid +
-		// aria-describedby with the same parity as the plain <Input>
-		// fallback used in edit/duplicate modes.
-		await openKnownModelPopover(body);
-		const input = await clearAndTypeKnownModelSearch(body, "x");
-		await userEvent.clear(input);
-		await closeKnownModelPopoverToContextLimit(body);
-
-		const trigger = await body.findByLabelText(/Model Identifier/i);
-		const error = await body.findByText("Model ID is required.");
-		expect(error.id).toBeTruthy();
-		await expect(trigger).toHaveAttribute("aria-invalid", "true");
-		await expect(trigger).toHaveAttribute("aria-describedby", error.id);
-	},
-};
-
-export const OpenAIKnownModelNoOptionsCopy: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-6: no-options auto-hides popover",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		await openKnownModelPopover(body);
-		await clearAndTypeKnownModelSearch(body, "zzzzzzz");
-
-		await expectKnownModelPopoverClosed(body);
-		expect(body.queryByText(noMatchingKnownModelsText)).not.toBeInTheDocument();
-	},
-};
-
-export const AnthropicKnownModelEnterCommitsOffCatalogIdentifier: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-34: Enter commits off-catalog identifier",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		const input = await openKnownModelPopover(body);
-		await userEvent.type(input, "claude-opus-4-5");
-		await expectKnownModelPopoverClosed(body);
-		await expect(input).toHaveAttribute("aria-expanded", "false");
-		await userEvent.keyboard("{Enter}");
-
-		await expectKnownModelPopoverClosed(body);
-		await expectModelIdentifierValue(body, "claude-opus-4-5");
-		expect(body.queryByRole("status")).not.toBeInTheDocument();
-	},
-};
-
-export const KnownModelAutoHidePopoverWhenNoMatches: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-42: popover auto-hides when search has no matches",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		const input = await body.findByRole("combobox", {
-			name: /Model Identifier/i,
-		});
-		await userEvent.click(input);
-		await expect(await body.findByText("Claude Opus 4.8")).toBeInTheDocument();
-
-		await userEvent.clear(input);
-		await userEvent.type(input, "claude-opus-4-5");
-
-		await waitFor(() => {
-			expect(body.queryByRole("listbox")).not.toBeInTheDocument();
-		});
-		expect(
-			body.queryByText(/No matching known models/i),
-		).not.toBeInTheDocument();
-		await expect(input).toHaveAttribute("aria-expanded", "false");
-
-		await userEvent.keyboard("{Enter}");
-		await expectModelIdentifierValue(body, "claude-opus-4-5");
-	},
-};
-
-export const KnownModelBlurAfterAutoHideCommitsOffCatalog: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	name: "Add mode / DEREM-45: blur after auto-hide commits off-catalog identifier",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-
-		const input = await body.findByRole("combobox", {
-			name: /Model Identifier/i,
-		});
-		await userEvent.click(input);
-		await userEvent.clear(input);
-		await userEvent.type(input, "claude-opus-4-5");
-
-		// Popover should auto-hide for the unmatched query.
-		await waitFor(() => {
-			expect(body.queryByRole("listbox")).not.toBeInTheDocument();
-		});
-		await expect(input).toHaveAttribute("aria-expanded", "false");
-
-		// Blur via Tab: focus moves to the next field, exercising the
-		// handleBlur auto-hide path that calls handleOpenChange(false).
-		await userEvent.tab();
-
-		await expectModelIdentifierValue(body, "claude-opus-4-5");
-		// No defaults feedback for off-catalog identifiers.
-		expect(body.queryByRole("status")).not.toBeInTheDocument();
-		// Critical: in the buggy variant where handleBlur skips the
-		// handleOpenChange(false) branch for the auto-hidden popover,
-		// the inline input still visually shows the typed search text
-		// (via the controlled inputValue prop), so any DOM-value
-		// assertion would pass vacuously. The committed form value is
-		// what diverges, surfaced here via the required-field error:
-		// markTouched() runs in the buggy path with form.values.model
-		// still empty, producing "Model ID is required." The fixed path
-		// commits the typed text via setFieldValue first, clearing the
-		// validation error.
-		expect(body.queryByText("Model ID is required.")).not.toBeInTheDocument();
-	},
-};
-
-export const OpenAIKnownModelTriggerInputIsTypedField: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-35: trigger input is the typed field",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		const input = await openKnownModelPopover(body);
-		await userEvent.type(input, "5.4");
-
-		await expect(input).toHaveFocus();
-		await expect(input).toHaveValue("5.4");
-		const options = await body.findAllByRole("option");
-		expect(findOptionByText(options, "gpt-5.4")).toBeInTheDocument();
-		expect(findOptionByText(options, "gpt-5.4-mini")).toBeInTheDocument();
-		expect(findOptionByText(options, "gpt-5.4-nano")).toBeInTheDocument();
-		expect(body.queryByText("gpt-5.5")).not.toBeInTheDocument();
-		expect(body.queryByText("gpt-5.5-pro")).not.toBeInTheDocument();
-		expect(body.queryByText("gpt-5.3-codex")).not.toBeInTheDocument();
-	},
-};
-
-export const OpenAIKnownModelArrowDownEnterSelectsHighlighted: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	name: "Add mode / DEREM-36: ArrowDown Enter selects highlighted option",
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-
-		const input = await openKnownModelPopover(body);
-		fireEvent.keyDown(input, { key: "ArrowDown" });
-		await userEvent.keyboard("{Enter}");
-
-		await expectModelIdentifierValue(body, "gpt-5.5-pro");
-		await expectOpenAIKnownModelDefaults(body, gpt55ProDefaults);
-		await expect(await body.findByRole("status")).toHaveTextContent(
-			knownModelDefaultsFeedback("GPT-5.5 Pro"),
-		);
-	},
-};
-
-export const UnsupportedProviderFallback: Story = {
-	...providerFormSetup("google", "Google"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Google");
-
-		const modelInput = await body.findByLabelText(/Model Identifier/i);
-		await userEvent.click(modelInput);
-		expect(body.queryByRole("option")).not.toBeInTheDocument();
-		await userEvent.type(modelInput, "gemini-custom-model");
-		await userEvent.tab();
-
-		await expect(modelInput).toHaveValue("gemini-custom-model");
-		expect(body.queryByText("Model ID is required.")).not.toBeInTheDocument();
-		expect(body.queryByRole("status")).not.toBeInTheDocument();
-	},
-};
-
-export const ModelFormOpenAI: Story = {
-	...providerFormSetup("openai", "OpenAI"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI");
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Reasoning Effort/i),
-		).toBeInTheDocument();
-		await expect(
-			await body.findByLabelText(/Parallel Tool Calls/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormAnthropic: Story = {
-	...providerFormSetup("anthropic", "Anthropic"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Anthropic");
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Send Reasoning/i),
-		).toBeInTheDocument();
-		await expect(
-			await body.findByLabelText(/Thinking Budget Tokens/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormGoogle: Story = {
-	...providerFormSetup("google", "Google"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Google");
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Thinking Config Thinking Budget/i),
-		).toBeInTheDocument();
-		await expect(
-			await body.findByLabelText(/Thinking Config Include Thoughts/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormOpenAICompat: Story = {
-	...providerFormSetup("openaicompat", "OpenAI-compatible"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenAI-compatible");
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Reasoning Effort/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormOpenRouter: Story = {
-	...providerFormSetup("openrouter", "OpenRouter"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "OpenRouter");
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Reasoning Enabled/i),
-		).toBeInTheDocument();
-		await expect(
-			await body.findByLabelText(/Reasoning Max Tokens/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormVercel: Story = {
-	...providerFormSetup("vercel", "Vercel AI Gateway"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Vercel AI Gateway");
-		await expandSection(body, "Provider configuration");
-		await expect(
-			await body.findByLabelText(/Reasoning Enabled/i),
-		).toBeInTheDocument();
-		await expect(
-			await body.findByLabelText(/Parallel Tool Calls/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormAzure: Story = {
-	...providerFormSetup("azure", "Azure OpenAI"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "Azure OpenAI");
-		await expandSection(body, "Provider configuration");
-		// Azure aliases to OpenAI fields.
-		await expect(
-			await body.findByLabelText(/Reasoning Effort/i),
-		).toBeInTheDocument();
-		await expect(
-			await body.findByLabelText(/Service Tier/i),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelFormBedrock: Story = {
-	...providerFormSetup("bedrock", "AWS Bedrock"),
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await openAddModelForm(body, "AWS Bedrock");
-		await expandSection(body, "Provider configuration");
-		// Bedrock aliases to Anthropic fields.
-		await expect(
-			await body.findByLabelText(/Send Reasoning/i),
-		).toBeInTheDocument();
-		await expect(await body.findByLabelText(/Effort/i)).toBeInTheDocument();
-	},
-};
-
-export const ModelPricingWarningInList: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-		modelConfigsData: [
-			createModelConfig({
-				id: "model-warning",
-				provider: "openai",
-				model: "gpt-4.1",
-				display_name: "GPT-4.1",
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-		await expect(await body.findByText("GPT-4.1")).toBeInTheDocument();
-		await expect(
-			body.getByText("Model pricing is not defined"),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelDeleteConfirmation: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-		modelConfigsData: [
-			createModelConfig({
-				id: "model-1",
-				provider: "openai",
-				model: "gpt-4o",
-				display_name: "GPT-4o",
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Click the model row to open the edit form.
-		await userEvent.click(await body.findByText("GPT-4o"));
-
-		// The Delete button should be visible in the footer.
-		const deleteButton = await body.findByRole("button", { name: "Delete" });
-		await expect(deleteButton).toBeInTheDocument();
-
-		// Click Delete to show the confirmation dialog.
-		await userEvent.click(deleteButton);
-
-		// The confirmation dialog should appear - leave it visible
-		// so the Chromatic snapshot captures this state.
-		await expect(
-			await body.findByText(/Are you sure you want to delete this model/i),
-		).toBeInTheDocument();
-		await expect(body.getByRole("dialog")).toBeInTheDocument();
-		await expect(
-			body.getByRole("button", { name: "Delete model" }),
-		).toBeInTheDocument();
-		await expect(
-			body.getByRole("button", { name: "Cancel" }),
-		).toBeInTheDocument();
-	},
-};
-
-export const ModelDeleteCancelled: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-		modelConfigsData: [
-			createModelConfig({
-				id: "model-1",
-				provider: "openai",
-				model: "gpt-4o",
-				display_name: "GPT-4o",
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Navigate to edit form, open delete dialog, then cancel.
-		await userEvent.click(await body.findByText("GPT-4o"));
-		await userEvent.click(await body.findByRole("button", { name: "Delete" }));
-		await body.findByText(/Are you sure/i);
-		await userEvent.click(body.getByRole("button", { name: "Cancel" }));
-
-		// The dialog should be closed and the form footer restored.
-		await waitFor(() => {
-			expect(body.queryByRole("dialog")).not.toBeInTheDocument();
-		});
-		await expect(
-			body.findByRole("button", { name: "Delete" }),
-		).resolves.toBeInTheDocument();
-		expect(body.getByRole("button", { name: "Save" })).toBeInTheDocument();
-	},
-};
-
-export const ModelDeleteConfirmed: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-		modelConfigsData: [
-			createModelConfig({
-				id: "model-1",
-				provider: "openai",
-				model: "gpt-4o",
-				display_name: "GPT-4o",
-			}),
-		],
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Navigate to edit form, open delete dialog, then confirm.
-		await userEvent.click(await body.findByText("GPT-4o"));
-		await userEvent.click(await body.findByRole("button", { name: "Delete" }));
-		await userEvent.click(
-			await body.findByRole("button", { name: "Delete model" }),
-		);
-
-		// The delete callback should have been called.
-		await waitFor(() => {
-			expect(args.onDeleteModel).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onDeleteModel).toHaveBeenCalledWith("model-1");
-	},
-};
-
-export const ProviderDeleteConfirmation: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Navigate to the provider detail view.
-		await userEvent.click(await body.findByRole("button", { name: /OpenAI/i }));
-
-		// Click Delete to show the confirmation dialog.
-		const deleteButton = await body.findByRole("button", { name: "Delete" });
-		await userEvent.click(deleteButton);
-
-		// The confirmation dialog should appear - leave it visible
-		// so the Chromatic snapshot captures this state.
-		await expect(
-			await body.findByText(/Are you sure you want to delete this provider/i),
-		).toBeInTheDocument();
-		await expect(body.getByRole("dialog")).toBeInTheDocument();
-		await expect(
-			body.getByRole("button", { name: "Delete provider" }),
-		).toBeInTheDocument();
-		await expect(
-			body.getByRole("button", { name: "Cancel" }),
-		).toBeInTheDocument();
-	},
-};
-
-export const ProviderDeleteCancelled: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Navigate to provider detail, open delete dialog, then cancel.
-		await userEvent.click(await body.findByRole("button", { name: /OpenAI/i }));
-		await userEvent.click(await body.findByRole("button", { name: "Delete" }));
-		await body.findByText(/Are you sure/i);
-		await userEvent.click(body.getByRole("button", { name: "Cancel" }));
-
-		// The dialog should be closed and the form footer restored.
-		await waitFor(() => {
-			expect(body.queryByRole("dialog")).not.toBeInTheDocument();
-		});
-		await expect(
-			body.findByRole("button", { name: "Delete" }),
-		).resolves.toBeInTheDocument();
-		expect(
-			body.getByRole("button", { name: /Save changes/i }),
-		).toBeInTheDocument();
-	},
-};
-
-export const ProviderDeleteConfirmed: Story = {
-	args: {
-		section: "providers" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Navigate to provider detail, open delete dialog, then confirm.
-		await userEvent.click(await body.findByRole("button", { name: /OpenAI/i }));
-		await userEvent.click(await body.findByRole("button", { name: "Delete" }));
-		await userEvent.click(
-			await body.findByRole("button", { name: "Delete provider" }),
-		);
-
-		// The delete callback should have been called.
-		await waitFor(() => {
-			expect(args.onDeleteProvider).toHaveBeenCalledTimes(1);
-		});
-		expect(args.onDeleteProvider).toHaveBeenCalledWith("provider-openai");
-	},
-};
-
-export const ValidatesModelConfigFields: Story = {
-	args: {
-		section: "models" as ChatModelAdminSection,
-		providerConfigsData: [
-			createProviderConfig({
-				id: "provider-openai",
-				provider: "openai",
-				display_name: "OpenAI",
-				source: "database",
-				has_api_key: true,
-			}),
-		],
-	},
-	play: async ({ canvasElement, args }) => {
-		const body = within(canvasElement.ownerDocument.body);
-
-		// Open "Add model" dropdown and select the OpenAI provider.
-		await openAddModelForm(body, "OpenAI");
-
-		await enterModelIdentifier(body, "gpt-5-pro");
-		await userEvent.type(body.getByLabelText(/Context limit/i), "200000");
-		// Max output tokens is under the "Advanced" toggle.
-		await userEvent.click(body.getByText("Advanced"));
-		const maxOutputTokensInput =
-			await body.findByLabelText(/Max output tokens/i);
-		await userEvent.type(maxOutputTokensInput, "not-a-number");
-		await waitFor(() => {
-			expect(body.getByRole("button", { name: "Add model" })).toBeDisabled();
-		});
-		// No callback should have been invoked.
-		expect(args.onCreateModel).not.toHaveBeenCalled();
-	},
-};
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.tsx
deleted file mode 100644
index 6ecb1b0cc9..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.tsx
+++ /dev/null
@@ -1,373 +0,0 @@
-import type { FC } from "react";
-
-import type * as TypesGen from "#/api/typesGenerated";
-import { Alert, AlertDescription, AlertTitle } from "#/components/Alert/Alert";
-import { ErrorAlert } from "#/components/Alert/ErrorAlert";
-import { Spinner } from "#/components/Spinner/Spinner";
-import { cn } from "#/utils/cn";
-import { formatProviderLabel } from "../../utils/modelOptions";
-import {
-	getDefaultProviderBaseURL,
-	normalizeProvider,
-	readOptionalString,
-} from "./helpers";
-import { ModelsSection } from "./ModelsSection";
-import { ProvidersSection } from "./ProvidersSection";
-
-export type CreateProviderResult = { id: string };
-
-export type ProviderState = {
-	key: string;
-	provider: string;
-	label: string;
-	providerConfig: TypesGen.ChatProviderConfig | undefined;
-	modelConfigs: readonly TypesGen.ChatModelConfig[];
-	catalogModelCount: number;
-	hasManagedAPIKey: boolean;
-	hasCatalogAPIKey: boolean;
-	hasEffectiveAPIKey: boolean;
-	allowUserAPIKey: boolean;
-	isEnvPreset: boolean;
-	baseURL: string;
-};
-
-export type ChatModelAdminSection = "providers" | "models";
-
-type CatalogProvider = TypesGen.ChatModelsResponse["providers"][number];
-
-const nilUUID = "00000000-0000-0000-0000-000000000000";
-const envPresetProviders = new Set(["openai", "anthropic"]);
-
-const hasProviderAPIKey = (
-	providerConfig: TypesGen.ChatProviderConfig | undefined,
-): boolean => {
-	if (!providerConfig) return false;
-	return providerConfig.has_api_key;
-};
-
-const getProviderConfigSource = (
-	providerConfig: TypesGen.ChatProviderConfig | undefined,
-): TypesGen.ChatProviderConfigSource | undefined => {
-	return providerConfig?.source;
-};
-
-const isDatabaseProviderConfig = (
-	providerConfig: TypesGen.ChatProviderConfig | undefined,
-	source: TypesGen.ChatProviderConfigSource | undefined,
-): providerConfig is TypesGen.ChatProviderConfig => {
-	if (!providerConfig) return false;
-	if (providerConfig.id === nilUUID) return false;
-	return source === undefined || source === "database";
-};
-
-const getCatalogProviders = (
-	catalog: TypesGen.ChatModelsResponse | null | undefined,
-): readonly CatalogProvider[] => {
-	const providers = catalog?.providers;
-	return Array.isArray(providers) ? providers : [];
-};
-
-const providerHasCatalogAPIKey = (provider: CatalogProvider): boolean =>
-	provider.available ||
-	(Boolean(provider.unavailable_reason) &&
-		provider.unavailable_reason !== "missing_api_key");
-
-const getProviderModels = (
-	provider: CatalogProvider | undefined,
-): readonly CatalogProvider["models"][number][] => {
-	const models = provider?.models;
-	return Array.isArray(models) ? models : [];
-};
-
-const getProviderBaseURL = (
-	providerConfig: TypesGen.ChatProviderConfig | undefined,
-): string => {
-	return (
-		readOptionalString(providerConfig?.base_url) ??
-		getDefaultProviderBaseURL(providerConfig?.provider ?? "")
-	);
-};
-
-const providerConfigStateKey = (
-	providerConfig: TypesGen.ChatProviderConfig,
-): string => {
-	const providerID = readOptionalString(providerConfig.id);
-	if (providerID && providerID !== nilUUID) {
-		return providerID;
-	}
-	return normalizeProvider(providerConfig.provider);
-};
-
-type ProviderEntry = {
-	key: string;
-	provider: string;
-};
-
-const useProviderStates = (
-	modelConfigs: readonly TypesGen.ChatModelConfig[],
-	providerConfigsData: TypesGen.ChatProviderConfig[] | null | undefined,
-	catalogData: TypesGen.ChatModelsResponse | null | undefined,
-): readonly ProviderState[] => {
-	const orderedEntries: ProviderEntry[] = [];
-	const seenEntries = new Set<string>();
-	const includeEntry = (keyValue: string, providerValue: string) => {
-		const key = readOptionalString(keyValue);
-		const provider = normalizeProvider(providerValue);
-		if (!key || !provider || seenEntries.has(key)) return;
-		seenEntries.add(key);
-		orderedEntries.push({ key, provider });
-	};
-
-	const catalogProviders = getCatalogProviders(catalogData);
-	const catalogProvidersByProvider = new Map<string, CatalogProvider>();
-	for (const cp of catalogProviders) {
-		const provider = normalizeProvider(cp.provider);
-		if (!provider) continue;
-		catalogProvidersByProvider.set(provider, cp);
-	}
-
-	const providerConfigKeysByProvider = new Map<string, string[]>();
-	const providerTypesWithConfigs = new Set<string>();
-	for (const pc of providerConfigsData ?? []) {
-		const provider = normalizeProvider(pc.provider);
-		if (!provider) continue;
-		const key = providerConfigStateKey(pc);
-		providerTypesWithConfigs.add(provider);
-		providerConfigKeysByProvider.set(provider, [
-			...(providerConfigKeysByProvider.get(provider) ?? []),
-			key,
-		]);
-		includeEntry(key, provider);
-	}
-	const modelStateKey = (modelConfig: TypesGen.ChatModelConfig): string => {
-		const aiProviderID = readOptionalString(modelConfig.ai_provider_id);
-		if (aiProviderID) {
-			return aiProviderID;
-		}
-		const provider = normalizeProvider(modelConfig.provider);
-		const providerConfigKeys = providerConfigKeysByProvider.get(provider) ?? [];
-		if (providerConfigKeys.length === 1) {
-			return providerConfigKeys[0];
-		}
-		return providerConfigKeys.length === 0 ? provider : "";
-	};
-
-	for (const cp of catalogProviders) {
-		const provider = normalizeProvider(cp.provider);
-		if (!provider || providerTypesWithConfigs.has(provider)) continue;
-		includeEntry(provider, provider);
-	}
-	for (const mc of modelConfigs) {
-		includeEntry(modelStateKey(mc), mc.provider);
-	}
-
-	const providerConfigsByKey = new Map<string, TypesGen.ChatProviderConfig>();
-	for (const pc of providerConfigsData ?? []) {
-		const key = providerConfigStateKey(pc);
-		if (!key) continue;
-		providerConfigsByKey.set(key, pc);
-	}
-
-	const modelConfigsByKey = new Map<string, TypesGen.ChatModelConfig[]>();
-	for (const mc of modelConfigs) {
-		const key = modelStateKey(mc);
-		if (!key) continue;
-		const existing = modelConfigsByKey.get(key);
-		if (existing) {
-			existing.push(mc);
-		} else {
-			modelConfigsByKey.set(key, [mc]);
-		}
-	}
-
-	return orderedEntries.map(({ key, provider }) => {
-		const providerConfigEntry = providerConfigsByKey.get(key);
-		const providerConfigSource = getProviderConfigSource(providerConfigEntry);
-		const providerConfig = isDatabaseProviderConfig(
-			providerConfigEntry,
-			providerConfigSource,
-		)
-			? providerConfigEntry
-			: undefined;
-		const catalogProvider = catalogProvidersByProvider.get(provider);
-		const hasManagedAPIKey = hasProviderAPIKey(providerConfig);
-		const hasProviderEntryAPIKey = hasProviderAPIKey(providerConfigEntry);
-		const hasCatalogAPIKey = catalogProvider
-			? providerHasCatalogAPIKey(catalogProvider)
-			: false;
-		const label =
-			readOptionalString(providerConfigEntry?.display_name) ??
-			formatProviderLabel(provider);
-		const hasBedrockAmbientCredentials =
-			provider === "bedrock" &&
-			providerConfig?.central_api_key_enabled === true;
-		const modelConfigsForProvider = modelConfigsByKey.get(key) ?? [];
-		const isCatalogEnvPreset =
-			!providerConfig && envPresetProviders.has(provider) && hasCatalogAPIKey;
-		const isEnvPreset =
-			providerConfigSource === "env_preset" || isCatalogEnvPreset;
-
-		return {
-			key,
-			provider,
-			label,
-			providerConfig,
-			modelConfigs: modelConfigsForProvider,
-			catalogModelCount: getProviderModels(catalogProvider).length,
-			hasManagedAPIKey,
-			hasCatalogAPIKey,
-			hasEffectiveAPIKey: providerConfigEntry
-				? hasProviderEntryAPIKey || hasBedrockAmbientCredentials
-				: hasManagedAPIKey || hasCatalogAPIKey,
-			allowUserAPIKey: providerConfigEntry?.allow_user_api_key ?? true,
-			isEnvPreset,
-			baseURL: getProviderBaseURL(providerConfigEntry),
-		};
-	});
-};
-
-interface ChatModelAdminPanelProps {
-	className?: string;
-	section?: ChatModelAdminSection;
-	sectionLabel?: string;
-	sectionDescription?: string;
-	// Data from queries.
-	providerConfigsData: TypesGen.ChatProviderConfig[] | undefined;
-	modelConfigsData: TypesGen.ChatModelConfig[] | undefined;
-	modelCatalogData: TypesGen.ChatModelsResponse | undefined;
-	isLoading: boolean;
-	// Query error states.
-	providerConfigsError: Error | null;
-	modelConfigsError: Error | null;
-	modelCatalogError: Error | null;
-	// Provider mutation handlers.
-	onCreateProvider: (
-		req: TypesGen.CreateChatProviderConfigRequest,
-	) => Promise<CreateProviderResult>;
-	onUpdateProvider: (
-		providerConfigId: string,
-		req: TypesGen.UpdateChatProviderConfigRequest,
-	) => Promise<unknown>;
-	onDeleteProvider: (providerConfigId: string) => Promise<void>;
-	isProviderMutationPending: boolean;
-	providerMutationError: Error | null;
-	// Model mutation handlers.
-	onCreateModel: (
-		req: TypesGen.CreateChatModelConfigRequest,
-	) => Promise<unknown>;
-	onUpdateModel: (
-		modelConfigId: string,
-		req: TypesGen.UpdateChatModelConfigRequest,
-	) => Promise<unknown>;
-	onDeleteModel: (modelConfigId: string) => Promise<void>;
-	isCreatingModel: boolean;
-	isUpdatingModel: boolean;
-	isDeletingModel: boolean;
-	modelMutationError: Error | null;
-}
-
-export const ChatModelAdminPanel: FC<ChatModelAdminPanelProps> = ({
-	className,
-	section = "providers",
-	sectionLabel,
-	sectionDescription,
-	providerConfigsData,
-	modelConfigsData,
-	modelCatalogData,
-	isLoading,
-	providerConfigsError,
-	modelConfigsError,
-	modelCatalogError,
-	onCreateProvider,
-	onUpdateProvider,
-	onDeleteProvider,
-	isProviderMutationPending,
-	providerMutationError,
-	onCreateModel,
-	onUpdateModel,
-	onDeleteModel,
-	isCreatingModel,
-	isUpdatingModel,
-	isDeletingModel,
-	modelMutationError,
-}) => {
-	const modelConfigs = (modelConfigsData ?? []).slice().sort((a, b) => {
-		const cmp = a.provider.localeCompare(b.provider);
-		return cmp !== 0 ? cmp : a.model.localeCompare(b.model);
-	});
-	const providerStates = useProviderStates(
-		modelConfigs,
-		providerConfigsData,
-		modelCatalogData,
-	);
-
-	const providerConfigsUnavailable = providerConfigsData === null;
-	const modelConfigsUnavailable = modelConfigsData === null;
-
-	return (
-		<div className={cn("flex min-h-full flex-col", className)}>
-			{isLoading && (
-				<div className="flex items-center gap-1.5 text-xs text-content-secondary">
-					<Spinner className="h-4 w-4" loading />
-					Loading
-				</div>
-			)}
-
-			<div className="flex flex-1 flex-col gap-8">
-				{section === "providers" ? (
-					<ProvidersSection
-						sectionLabel={sectionLabel}
-						sectionDescription={sectionDescription}
-						providerStates={providerStates}
-						providerConfigsUnavailable={providerConfigsUnavailable}
-						isProviderMutationPending={isProviderMutationPending}
-						onCreateProvider={onCreateProvider}
-						onUpdateProvider={onUpdateProvider}
-						onDeleteProvider={onDeleteProvider}
-					/>
-				) : (
-					<ModelsSection
-						sectionLabel={sectionLabel}
-						sectionDescription={sectionDescription}
-						providerStates={providerStates}
-						modelConfigs={modelConfigs}
-						modelConfigsUnavailable={modelConfigsUnavailable}
-						isCreating={isCreatingModel}
-						isUpdating={isUpdatingModel}
-						isDeleting={isDeletingModel}
-						onCreateModel={onCreateModel}
-						onUpdateModel={onUpdateModel}
-						onDeleteModel={onDeleteModel}
-					/>
-				)}
-			</div>
-			{providerConfigsError && <ErrorAlert error={providerConfigsError} />}
-			{modelConfigsError && <ErrorAlert error={modelConfigsError} />}
-			{modelCatalogError && <ErrorAlert error={modelCatalogError} />}
-			{providerMutationError && <ErrorAlert error={providerMutationError} />}
-			{modelMutationError && <ErrorAlert error={modelMutationError} />}
-
-			{providerConfigsUnavailable && (
-				<Alert severity="info">
-					<AlertTitle>
-						Chat provider admin API is unavailable on this deployment.
-					</AlertTitle>
-					<AlertDescription>
-						/api/v2/chats/providers is missing.
-					</AlertDescription>
-				</Alert>
-			)}
-
-			{modelConfigsUnavailable && (
-				<Alert severity="info">
-					<AlertTitle>
-						Chat model admin API is unavailable on this deployment.
-					</AlertTitle>
-					<AlertDescription>
-						/api/v2/chats/model-configs is missing.
-					</AlertDescription>
-				</Alert>
-			)}
-		</div>
-	);
-};
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelConfigFields.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelConfigFields.tsx
index 5c253f3254..b9ea8337c9 100644
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelConfigFields.tsx
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelConfigFields.tsx
@@ -29,17 +29,24 @@ import {
 	TooltipContent,
 	TooltipTrigger,
 } from "#/components/Tooltip/Tooltip";
+import { normalizeProvider } from "#/modules/aiModels/helpers";
 import { cn } from "#/utils/cn";
-import { normalizeProvider } from "./helpers";
-import type {
-	ModelConfigFormBuildResult,
-	ModelFormValues,
+import {
+	isFieldConflictDisabled,
+	isVisibleWhenSatisfied,
+	type ModelConfigFormBuildResult,
+	type ModelFormValues,
 } from "./modelConfigFormLogic";
 import {
 	getPricingPlaceholderForField,
 	pricingFieldNames,
 } from "./pricingFields";
 
+const booleanFieldOptions = [
+	{ label: "On", value: "true" },
+	{ label: "Off", value: "false" },
+] as const;
+
 /** Sentinel value for Select components to represent "no selection". */
 const unsetSelectValue = "__unset__";
 
@@ -143,7 +150,7 @@ const FieldLabel: FC<{
 }> = ({ htmlFor, label, description }) => (
 	<Label
 		htmlFor={htmlFor}
-		className="inline-flex items-center gap-1 text-[13px] font-medium text-content-primary"
+		className="flex items-center gap-1 leading-6 text-content-primary"
 	>
 		{label}
 		{description && (
@@ -184,12 +191,10 @@ const InputField: FC<
 	const fieldProps = form.getFieldProps(fieldKey);
 
 	const inputEl = suffix ? (
-		<InputGroup
-			className={cn("h-9", fieldError && "border-border-destructive")}
-		>
+		<InputGroup className={cn(fieldError && "border-border-destructive")}>
 			<InputGroupInput
 				id={fieldKey}
-				className="h-9 min-w-0 text-[13px] placeholder:text-content-disabled"
+				className="min-w-0 placeholder:text-content-disabled"
 				placeholder={placeholder}
 				{...fieldProps}
 				disabled={disabled}
@@ -204,7 +209,7 @@ const InputField: FC<
 		<Input
 			id={fieldKey}
 			className={cn(
-				"h-9 min-w-0 text-[13px] placeholder:text-content-disabled",
+				"min-w-0 placeholder:text-content-disabled",
 				fieldError && "border-content-destructive",
 			)}
 			placeholder={placeholder}
@@ -264,10 +269,7 @@ const SelectField: FC<
 			>
 				<SelectTrigger
 					id={fieldKey}
-					className={cn(
-						"h-9 min-w-0 text-[13px]",
-						fieldError && "border-content-destructive",
-					)}
+					className={cn("min-w-0", fieldError && "border-content-destructive")}
 					aria-invalid={Boolean(fieldError)}
 					aria-describedby={fieldError ? errorId : undefined}
 				>
@@ -277,7 +279,7 @@ const SelectField: FC<
 					<SelectItem value={unsetSelectValue}>Default</SelectItem>
 					{options.map((option) => (
 						<SelectItem key={option} value={option}>
-							{option}
+							{capitalize(option)}
 						</SelectItem>
 					))}
 				</SelectContent>
@@ -379,6 +381,10 @@ const JSONField: FC<
 	const errorId = `${fieldKey}-error`;
 	const fieldError = fieldErrors[errorKey ?? fieldKey];
 	const fieldProps = form.getFieldProps(fieldKey);
+	// Only surface the error once the field has been blurred, so a partially
+	// typed array like "[" doesn't complain mid-edit.
+	const showError =
+		Boolean(fieldError) && Boolean(getIn(form.touched, fieldKey));
 	return (
 		<div className="flex min-w-0 flex-col gap-1.5">
 			<FieldLabel htmlFor={fieldKey} label={label} description={description} />
@@ -387,15 +393,15 @@ const JSONField: FC<
 				rows={1}
 				className={cn(
 					"min-h-0 resize-y font-mono text-xs leading-tight placeholder:text-content-disabled",
-					fieldError && "border-content-destructive",
+					showError && "border-content-destructive",
 				)}
 				placeholder={placeholder}
 				{...fieldProps}
 				disabled={disabled}
-				aria-invalid={Boolean(fieldError)}
-				aria-describedby={fieldError ? errorId : undefined}
+				aria-invalid={showError}
+				aria-describedby={showError ? errorId : undefined}
 			/>
-			{fieldError && (
+			{showError && (
 				<p id={errorId} className="m-0 text-xs text-content-destructive">
 					{fieldError}
 				</p>
@@ -451,10 +457,7 @@ const SchemaField: FC<SchemaFieldProps> = ({
 						errorKey={errorKey}
 						label={label}
 						description={field.description}
-						options={[
-							{ label: "On", value: "true" },
-							{ label: "Off", value: "false" },
-						]}
+						options={booleanFieldOptions}
 					/>
 				);
 			}
@@ -468,7 +471,10 @@ const SchemaField: FC<SchemaFieldProps> = ({
 						errorKey={errorKey}
 						label={label}
 						description={field.description}
-						options={options.map((v) => ({ label: capitalize(v), value: v }))}
+						options={options.map((value) => ({
+							label: capitalize(value),
+							value,
+						}))}
 					/>
 				);
 			}
@@ -503,8 +509,8 @@ const SchemaField: FC<SchemaFieldProps> = ({
 
 /**
  * How many grid columns a field should span in the 3-col layout.
- *   1 = default (inputs, booleans, small enums ≤3)
- *   3 = full-width (4+ option enums, json textareas)
+ *   1 = default (inputs, booleans, small enums)
+ *   3 = full-width (large enums, json textareas)
  */
 function colSpan(field: FieldSchema): 1 | 3 {
 	if (field.input_type === "json") {
@@ -553,11 +559,17 @@ export const ModelConfigFields: FC<ModelConfigFieldsProps> = ({
 		return null;
 	}
 
-	const ctx: FieldRenderContext = { form, fieldErrors, disabled };
+	const fieldValueByName = (jsonName: string): unknown =>
+		getIn(form.values, `config.${toFormFieldKey(resolved, jsonName)}`);
+
+	const isFieldVisible = (field: FieldSchema): boolean =>
+		isVisibleWhenSatisfied(field, fieldValueByName);
 
 	// Sort wider fields to the end so compact fields fill the
 	// grid first, keeping the layout dense.
-	const sorted = [...fields].sort((a, b) => colSpan(a) - colSpan(b));
+	const sorted = [...fields]
+		.filter(isFieldVisible)
+		.sort((a, b) => colSpan(a) - colSpan(b));
 
 	return (
 		<div className="grid min-w-0 gap-3 sm:grid-cols-3">
@@ -570,7 +582,11 @@ export const ModelConfigFields: FC<ModelConfigFieldsProps> = ({
 							field={field}
 							fieldKey={fieldKey}
 							errorKey={errorKey}
-							{...ctx}
+							form={form}
+							fieldErrors={fieldErrors}
+							disabled={
+								disabled || isFieldConflictDisabled(field, fieldValueByName)
+							}
 						/>
 					</div>
 				);
@@ -579,50 +595,6 @@ export const ModelConfigFields: FC<ModelConfigFieldsProps> = ({
 	);
 };
 
-/**
- * Shared renderer for general model config fields backed by the
- * top-level ChatModelCallConfig schema.
- */
-const GeneralFieldsGroup: FC<
-	ModelConfigFieldsProps & {
-		fields: FieldSchema[];
-		suppressDescriptions?: boolean;
-	}
-> = ({ form, fieldErrors, disabled, fields, suppressDescriptions }) => {
-	const ctx: FieldRenderContext = { form, fieldErrors, disabled };
-
-	return (
-		<>
-			{fields.map((field) => {
-				// General field keys support nested json_name values, such as
-				// cost.input_price_per_million_tokens.
-				const camelName = field.json_name
-					.split(".")
-					.map(snakeToCamel)
-					.join(".");
-				const fieldKey = `config.${camelName}`;
-				const label = snakeToPrettyLabel(field);
-
-				return (
-					<InputField
-						key={fieldKey}
-						{...ctx}
-						fieldKey={fieldKey}
-						errorKey={camelName}
-						label={label}
-						description={suppressDescriptions ? undefined : field.description}
-						placeholder={
-							placeholderOverrides[field.json_name] ??
-							placeholderForField(field)
-						}
-						suffix={fieldSuffix[field.json_name]}
-					/>
-				);
-			})}
-		</>
-	);
-};
-
 /**
  * Pricing fields rendered with $ prefix and /1M suffix using
  * InputGroup for a compact, readable layout.
@@ -653,12 +625,12 @@ export const PricingModelConfigFields: FC<ModelConfigFieldsProps> = ({
 					<div key={fieldKey} className="flex min-w-0 flex-col gap-1.5">
 						<FieldLabel htmlFor={fieldKey} label={label} />
 						<InputGroup
-							className={cn("h-9", fieldError && "border-border-destructive")}
+							className={cn(fieldError && "border-border-destructive")}
 						>
 							<InputGroupAddon align="inline-start">$</InputGroupAddon>
 							<InputGroupInput
 								id={fieldKey}
-								className="h-9 min-w-0 text-[13px] placeholder:text-content-disabled"
+								className="min-w-0 placeholder:text-content-disabled"
 								placeholder="0"
 								{...fieldProps}
 								disabled={disabled}
@@ -691,20 +663,43 @@ export const PricingModelConfigFields: FC<ModelConfigFieldsProps> = ({
  * `api/chatModelOptions`.
  */
 export const GeneralModelConfigFields: FC<ModelConfigFieldsProps> = ({
-	provider,
 	form,
 	fieldErrors,
 	disabled,
 }) => {
+	const ctx: FieldRenderContext = { form, fieldErrors, disabled };
+	const fields = getVisibleGeneralFields().filter(
+		({ json_name }) => !pricingFieldNames.has(json_name),
+	);
+
 	return (
-		<GeneralFieldsGroup
-			provider={provider}
-			form={form}
-			fieldErrors={fieldErrors}
-			disabled={disabled}
-			fields={getVisibleGeneralFields().filter(
-				({ json_name }) => !pricingFieldNames.has(json_name),
-			)}
-		/>
+		<>
+			{fields.map((field) => {
+				// General field keys support nested json_name values, such as
+				// cost.input_price_per_million_tokens.
+				const camelName = field.json_name
+					.split(".")
+					.map(snakeToCamel)
+					.join(".");
+				const fieldKey = `config.${camelName}`;
+				const label = snakeToPrettyLabel(field);
+
+				return (
+					<InputField
+						key={fieldKey}
+						{...ctx}
+						fieldKey={fieldKey}
+						errorKey={camelName}
+						label={label}
+						description={field.description}
+						placeholder={
+							placeholderOverrides[field.json_name] ??
+							placeholderForField(field)
+						}
+						suffix={fieldSuffix[field.json_name]}
+					/>
+				);
+			})}
+		</>
 	);
 };
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelForm.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelForm.tsx
deleted file mode 100644
index 43dc08ca35..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelForm.tsx
+++ /dev/null
@@ -1,662 +0,0 @@
-import { useFormik } from "formik";
-import {
-	ChevronDownIcon,
-	ChevronRightIcon,
-	InfoIcon,
-	PencilIcon,
-} from "lucide-react";
-import { type FC, useState } from "react";
-import * as Yup from "yup";
-import type * as TypesGen from "#/api/typesGenerated";
-import { Button } from "#/components/Button/Button";
-import {
-	InputGroup,
-	InputGroupAddon,
-	InputGroupInput,
-} from "#/components/InputGroup/InputGroup";
-import { Label } from "#/components/Label/Label";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "#/components/Select/Select";
-import { Spinner } from "#/components/Spinner/Spinner";
-import { Switch } from "#/components/Switch/Switch";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "#/components/Tooltip/Tooltip";
-import { cn } from "#/utils/cn";
-import { getFormHelpers } from "#/utils/formUtils";
-import { BackButton } from "../BackButton";
-import { ConfirmDeleteDialog } from "../ConfirmDeleteDialog";
-import type { ProviderState } from "./ChatModelAdminPanel";
-import { readOptionalString } from "./helpers";
-import {
-	GeneralModelConfigFields,
-	ModelConfigFields,
-	PricingModelConfigFields,
-} from "./ModelConfigFields";
-import { ModelIdentifierField } from "./ModelIdentifierField";
-import {
-	buildInitialModelFormValues,
-	buildModelConfigFromForm,
-	type ModelFormValues,
-	parsePositiveInteger,
-	parseThresholdInteger,
-} from "./modelConfigFormLogic";
-import { ProviderIcon } from "./ProviderIcon";
-
-// ── Validation ──────────────────────────────────────────────────
-
-const validationSchema = Yup.object({
-	model: Yup.string().trim().required("Model ID is required."),
-	displayName: Yup.string(),
-	enabled: Yup.boolean(),
-	contextLimit: Yup.string()
-		.required("Context limit is required.")
-		.test(
-			"positive-integer",
-			"Context limit must be a positive integer.",
-			(value) => !value?.trim() || parsePositiveInteger(value) !== null,
-		),
-	compressionThreshold: Yup.string().test(
-		"threshold-range",
-		"Compression threshold must be a number between 0 and 100.",
-		(value) => !value?.trim() || parseThresholdInteger(value) !== null,
-	),
-	isDefault: Yup.boolean(),
-});
-
-// ── Component ──────────────────────────────────────────────────
-
-interface ModelFormProps {
-	/** When set, the form is in "edit" mode for the given model. */
-	editingModel?: TypesGen.ChatModelConfig;
-	/** When set without editingModel, the form creates from this model. */
-	duplicateSourceModel?: TypesGen.ChatModelConfig;
-	providerStates: readonly ProviderState[];
-	selectedProvider: string | null;
-	selectedProviderState: ProviderState | null;
-	onSelectedProviderChange: (provider: string) => void;
-	modelConfigsUnavailable: boolean;
-	isSaving: boolean;
-	isDeleting: boolean;
-	onCreateModel: (
-		req: TypesGen.CreateChatModelConfigRequest,
-	) => Promise<unknown>;
-	onUpdateModel: (
-		modelConfigId: string,
-		req: TypesGen.UpdateChatModelConfigRequest,
-	) => Promise<unknown>;
-	onCancel: () => void;
-	onDeleteModel?: (modelConfigId: string) => Promise<void>;
-}
-
-export const ModelForm: FC<ModelFormProps> = ({
-	editingModel,
-	duplicateSourceModel,
-	providerStates,
-	selectedProvider,
-	selectedProviderState,
-	onSelectedProviderChange,
-	modelConfigsUnavailable,
-	isSaving,
-	isDeleting,
-	onCreateModel,
-	onUpdateModel,
-	onCancel,
-	onDeleteModel,
-}) => {
-	const initialModel = editingModel ?? duplicateSourceModel;
-	const isEditing = Boolean(editingModel);
-	const isDuplicating = Boolean(duplicateSourceModel) && !isEditing;
-	const initialValues = {
-		...buildInitialModelFormValues(initialModel),
-		...(isDuplicating && { isDefault: false }),
-	};
-	const [showAdvanced, setShowAdvanced] = useState(false);
-	const [showPricing, setShowPricing] = useState(false);
-	const [showProviderConfig, setShowProviderConfig] = useState(false);
-	const [confirmingDelete, setConfirmingDelete] = useState(false);
-
-	const canManageModels = Boolean(
-		selectedProviderState?.providerConfig &&
-			(selectedProviderState.hasEffectiveAPIKey ||
-				selectedProviderState.providerConfig.allow_user_api_key),
-	);
-	const formTitle = isEditing
-		? "Edit model"
-		: isDuplicating
-			? "Duplicate model"
-			: "Add model";
-	const formDescription = isDuplicating
-		? "Review the copied settings, then save to create a new model."
-		: undefined;
-	const mode: "add" | "edit" | "duplicate" = (() => {
-		if (isEditing) return "edit";
-		if (isDuplicating) return "duplicate";
-		return "add";
-	})();
-
-	const selectedProviderType =
-		selectedProviderState?.provider ?? selectedProvider;
-
-	const form = useFormik<ModelFormValues>({
-		initialValues,
-		validationSchema,
-		validateOnMount: true,
-		validateOnBlur: false,
-		onSubmit: async (values) => {
-			if (isSaving) return;
-
-			const trimmedModel = values.model.trim();
-			if (!trimmedModel) return;
-
-			const parsedContextLimit = parsePositiveInteger(values.contextLimit);
-			const parsedCompressionThreshold = parseThresholdInteger(
-				values.compressionThreshold,
-			);
-
-			const buildResult = buildModelConfigFromForm(
-				selectedProviderType,
-				values.config,
-			);
-			if (Object.keys(buildResult.fieldErrors).length > 0) return;
-
-			const trimmedDisplayName = values.displayName.trim();
-			const builtModelConfig = buildResult.modelConfig;
-
-			const selectedProviderConfigID =
-				selectedProviderState?.providerConfig?.id;
-
-			if (isEditing && editingModel) {
-				const req: TypesGen.UpdateChatModelConfigRequest = {
-					...(selectedProviderConfigID &&
-						selectedProviderConfigID !==
-							readOptionalString(editingModel.ai_provider_id) && {
-							provider: selectedProviderState.provider,
-							ai_provider_id: selectedProviderConfigID,
-						}),
-					...(trimmedModel !== editingModel.model && {
-						model: trimmedModel,
-					}),
-					...(trimmedDisplayName !== (editingModel.display_name ?? "") && {
-						display_name: trimmedDisplayName,
-					}),
-					...(values.enabled !== editingModel.enabled && {
-						enabled: values.enabled,
-					}),
-					...(parsedContextLimit !== null &&
-						parsedContextLimit !== editingModel.context_limit && {
-							context_limit: parsedContextLimit,
-						}),
-					...(parsedCompressionThreshold !== null &&
-						parsedCompressionThreshold !==
-							editingModel.compression_threshold && {
-							compression_threshold: parsedCompressionThreshold,
-						}),
-					...(values.isDefault !== editingModel.is_default && {
-						is_default: values.isDefault,
-					}),
-					// Always send model_config so it can be cleared or updated.
-					model_config: builtModelConfig,
-				};
-
-				await onUpdateModel(editingModel.id, req);
-			} else {
-				if (!selectedProvider || !selectedProviderState?.providerConfig) return;
-
-				const req: TypesGen.CreateChatModelConfigRequest = {
-					provider: selectedProviderState.provider,
-					ai_provider_id: selectedProviderState.providerConfig.id,
-					model: trimmedModel,
-					enabled: values.enabled,
-					is_default: values.isDefault,
-					...(parsedContextLimit !== null && {
-						context_limit: parsedContextLimit,
-					}),
-					...(parsedCompressionThreshold !== null && {
-						compression_threshold: parsedCompressionThreshold,
-					}),
-					...(trimmedDisplayName && {
-						display_name: trimmedDisplayName,
-					}),
-					...(builtModelConfig && {
-						model_config: builtModelConfig,
-					}),
-				};
-
-				await onCreateModel(req);
-			}
-			// Navigation is handled by the parent (ModelsSection) after
-			// the mutation promise resolves, so we do not call onCancel()
-			// here to avoid a double view-transition.
-		},
-	});
-
-	const getFieldHelpers = getFormHelpers(form);
-
-	const modelConfigFormBuildResult = buildModelConfigFromForm(
-		selectedProviderType,
-		form.values.config,
-	);
-
-	const hasFieldErrors =
-		Object.keys(modelConfigFormBuildResult.fieldErrors).length > 0;
-	const defaultModelDisableGuard =
-		isEditing && form.values.isDefault && form.values.enabled;
-
-	// ── Provider select (shared across all form states) ───────
-
-	const providerSelect = (
-		<div className="grid gap-1.5">
-			<Label
-				htmlFor="providerSelect"
-				className="text-[13px] font-medium text-content-primary"
-			>
-				Provider
-			</Label>
-			<Select
-				value={selectedProvider ?? ""}
-				onValueChange={onSelectedProviderChange}
-				disabled={
-					((isEditing || isDuplicating) && selectedProviderState !== null) ||
-					providerStates.length === 0
-				}
-			>
-				<SelectTrigger
-					id="providerSelect"
-					className="h-10 max-w-[240px] text-[13px]"
-				>
-					<SelectValue placeholder="Select provider" />
-				</SelectTrigger>
-				<SelectContent>
-					{providerStates.map((ps) => (
-						<SelectItem key={ps.key} value={ps.key}>
-							<span className="flex items-center gap-2">
-								<ProviderIcon provider={ps.provider} className="size-4" />
-								{ps.label}
-							</span>
-						</SelectItem>
-					))}
-				</SelectContent>
-			</Select>
-		</div>
-	);
-
-	// No provider selected or configs unavailable.
-	if (!selectedProviderState || modelConfigsUnavailable) {
-		return (
-			<div>
-				<BackButton onClick={onCancel} />
-				<h2 className="m-0 text-lg font-medium text-content-primary">
-					{formTitle}
-				</h2>
-				<hr className="my-4 border-0 border-t border-solid border-border" />
-				<div className="space-y-3">{providerSelect}</div>
-			</div>
-		);
-	}
-
-	// Provider can't manage models.
-	if (!canManageModels && !isEditing) {
-		return (
-			<div>
-				<BackButton onClick={onCancel} />
-				<h2 className="m-0 text-lg font-medium text-content-primary">
-					{formTitle}
-				</h2>
-				<hr className="my-4 border-0 border-t border-solid border-border" />
-				<div className="space-y-3">
-					{providerSelect}
-					<p className="text-sm text-content-secondary">
-						{!selectedProviderState.providerConfig
-							? "Create a managed provider config on the Providers tab before managing models."
-							: "Set an API key for this provider on the Providers tab before managing models."}
-					</p>
-				</div>
-			</div>
-		);
-	}
-
-	// ── Full form ─────────────────────────────────────────────
-
-	const modelField = getFieldHelpers("model");
-	const contextLimitField = getFieldHelpers("contextLimit");
-	const compressionThresholdField = getFieldHelpers("compressionThreshold");
-
-	return (
-		<div className="flex min-h-full flex-col">
-			{/* Back */}
-			<BackButton onClick={onCancel} />
-			<div className="mb-4">
-				<h2 className="m-0 text-lg font-medium text-content-primary">
-					{formTitle}
-				</h2>
-				{formDescription && (
-					<p className="m-0 mt-1 text-sm text-content-secondary">
-						{formDescription}
-					</p>
-				)}
-			</div>
-			{/* Header - editable display name */}
-			<div className="flex items-center gap-3">
-				{selectedProviderState && (
-					<ProviderIcon
-						provider={selectedProviderState.provider}
-						className="size-8"
-					/>
-				)}
-				<div className="inline-flex items-center gap-1">
-					<div className="relative inline-grid">
-						<span
-							className="invisible col-start-1 row-start-1 whitespace-pre text-lg font-medium"
-							aria-hidden="true"
-						>
-							{form.values.displayName || initialModel?.model || "Model name"}
-						</span>
-						<input
-							type="text"
-							{...form.getFieldProps("displayName")}
-							disabled={isSaving}
-							spellCheck={false}
-							className="col-start-1 row-start-1 m-0 min-w-0 border-0 bg-transparent p-0 text-lg font-medium text-content-primary outline-none placeholder:text-content-secondary focus:ring-0"
-							placeholder={initialModel?.model ?? "Model name"}
-						/>
-					</div>
-					<PencilIcon className="size-3.5 shrink-0 text-content-secondary" />
-				</div>{" "}
-				{initialModel && (
-					<Tooltip>
-						<TooltipTrigger asChild>
-							<span className="ml-auto inline-flex">
-								<Switch
-									checked={form.values.enabled}
-									onCheckedChange={(v) => {
-										form.setFieldValue("enabled", v);
-									}}
-									aria-label="Enabled"
-									disabled={isSaving || defaultModelDisableGuard}
-								/>
-							</span>
-						</TooltipTrigger>
-						<TooltipContent side="bottom">
-							{defaultModelDisableGuard
-								? "Default model cannot be disabled. Remove default status first."
-								: form.values.enabled
-									? "Disable this model. It will be hidden from users."
-									: "Enable this model. It will be visible to users."}
-						</TooltipContent>
-					</Tooltip>
-				)}
-			</div>
-			<hr className="my-4 border-0 border-t border-solid border-border" />
-			{/* Form body */}
-			<form
-				className="flex flex-1 flex-col"
-				onSubmit={form.handleSubmit}
-				spellCheck={false}
-				autoComplete="off"
-			>
-				<div className="space-y-6">
-					{/* Model ID + Context limit + Pricing */}
-					<div className="space-y-4">
-						<div className="grid items-start gap-4 sm:grid-cols-2">
-							{" "}
-							<ModelIdentifierField
-								form={form}
-								modelField={modelField}
-								mode={mode}
-								selectedProvider={selectedProviderType}
-								disabled={isSaving}
-							/>
-							<div className="grid gap-1.5">
-								<Label
-									htmlFor={contextLimitField.id}
-									className="inline-flex items-center gap-1 text-sm font-medium text-content-primary"
-								>
-									Context limit{" "}
-									<span className="text-xs font-bold text-content-destructive">
-										*
-									</span>
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<InfoIcon className="size-3 text-content-secondary" />
-										</TooltipTrigger>
-										<TooltipContent side="top" className="max-w-[240px]">
-											Max tokens in the context window.
-										</TooltipContent>
-									</Tooltip>
-								</Label>
-								<InputGroup
-									className={cn(
-										"h-9",
-										contextLimitField.error && "border-border-destructive",
-									)}
-								>
-									<InputGroupInput
-										id={contextLimitField.id}
-										name={contextLimitField.name}
-										className="h-9 min-w-0 text-[13px] placeholder:text-content-disabled"
-										placeholder="200000"
-										value={contextLimitField.value}
-										onChange={contextLimitField.onChange}
-										onBlur={contextLimitField.onBlur}
-										disabled={isSaving}
-										aria-invalid={contextLimitField.error}
-									/>
-									<InputGroupAddon align="inline-end">
-										<span className="text-xs text-content-disabled">
-											tokens
-										</span>
-									</InputGroupAddon>
-								</InputGroup>{" "}
-								{contextLimitField.error && (
-									<p className="m-0 text-xs text-content-destructive">
-										{contextLimitField.helperText}
-									</p>
-								)}
-							</div>
-						</div>
-					</div>
-
-					{/* Cost tracking */}
-					<div className="border-0 border-t border-solid border-border pt-4">
-						<button
-							type="button"
-							onClick={() => setShowPricing((v) => !v)}
-							className="flex w-full cursor-pointer items-start justify-between border-0 bg-transparent p-0 text-left transition-colors hover:text-content-primary"
-						>
-							<div>
-								<h3 className="m-0 text-sm font-medium text-content-primary">
-									Cost tracking
-								</h3>
-								<p className="m-0 text-xs text-content-secondary">
-									Set per-token pricing so Coder can track costs and enforce
-									spending limits.
-								</p>
-							</div>
-							{showPricing ? (
-								<ChevronDownIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
-							) : (
-								<ChevronRightIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
-							)}
-						</button>
-						{showPricing && (
-							<div className="grid grid-cols-2 gap-3 pt-3 sm:grid-cols-4">
-								<PricingModelConfigFields
-									provider={selectedProviderState.provider}
-									form={form}
-									fieldErrors={modelConfigFormBuildResult.fieldErrors}
-									disabled={isSaving}
-								/>
-							</div>
-						)}
-					</div>
-
-					{/* Provider configuration */}
-					<div className="border-0 border-t border-solid border-border pt-4">
-						<button
-							type="button"
-							onClick={() => setShowProviderConfig((v) => !v)}
-							className="flex w-full cursor-pointer items-start justify-between border-0 bg-transparent p-0 text-left transition-colors hover:text-content-primary"
-						>
-							<div>
-								<h3 className="m-0 text-sm font-medium text-content-primary">
-									Provider configuration
-								</h3>
-								<p className="m-0 text-xs text-content-secondary">
-									Tune provider-specific behavior like reasoning, tool calling,
-									and web search.
-								</p>
-							</div>
-							{showProviderConfig ? (
-								<ChevronDownIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
-							) : (
-								<ChevronRightIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
-							)}
-						</button>
-						{showProviderConfig && (
-							<div className="pt-3">
-								<ModelConfigFields
-									provider={selectedProviderState.provider}
-									form={form}
-									fieldErrors={modelConfigFormBuildResult.fieldErrors}
-									disabled={isSaving}
-								/>
-							</div>
-						)}
-					</div>
-
-					{/* Advanced */}
-					<div className="border-0 border-t border-solid border-border pt-4">
-						<button
-							type="button"
-							onClick={() => setShowAdvanced((v) => !v)}
-							className="flex w-full cursor-pointer items-start justify-between border-0 bg-transparent p-0 text-left transition-colors hover:text-content-primary"
-						>
-							<div>
-								<h3 className="m-0 text-sm font-medium text-content-primary">
-									Advanced
-								</h3>
-								<p className="m-0 text-xs text-content-secondary">
-									Low-level parameters like temperature and penalties. Rarely
-									need changing.
-								</p>
-							</div>
-							{showAdvanced ? (
-								<ChevronDownIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
-							) : (
-								<ChevronRightIcon className="mt-0.5 size-4 shrink-0 text-content-secondary" />
-							)}
-						</button>
-						{showAdvanced && (
-							<div className="grid grid-cols-2 gap-3 pt-3 sm:grid-cols-3">
-								<GeneralModelConfigFields
-									provider={selectedProviderState.provider}
-									form={form}
-									fieldErrors={modelConfigFormBuildResult.fieldErrors}
-									disabled={isSaving}
-								/>
-								<div className="flex min-w-0 flex-col gap-1.5">
-									<Label
-										htmlFor={compressionThresholdField.id}
-										className="inline-flex items-center gap-1 text-[13px] font-medium text-content-primary"
-									>
-										Compression threshold
-										<Tooltip>
-											<TooltipTrigger asChild>
-												<InfoIcon className="size-3 text-content-secondary" />
-											</TooltipTrigger>
-											<TooltipContent side="top" className="max-w-[240px]">
-												Percentage at which context is compressed.
-											</TooltipContent>
-										</Tooltip>
-									</Label>
-									<InputGroup
-										className={cn(
-											"h-9",
-											compressionThresholdField.error &&
-												"border-border-destructive",
-										)}
-									>
-										<InputGroupInput
-											id={compressionThresholdField.id}
-											name={compressionThresholdField.name}
-											className="h-9 text-[13px] placeholder:text-content-disabled"
-											placeholder="70"
-											value={compressionThresholdField.value}
-											onChange={compressionThresholdField.onChange}
-											onBlur={compressionThresholdField.onBlur}
-											disabled={isSaving}
-											aria-invalid={compressionThresholdField.error}
-										/>
-										<InputGroupAddon align="inline-end">
-											<span className="text-xs text-content-disabled">%</span>
-										</InputGroupAddon>
-									</InputGroup>
-									{compressionThresholdField.error && (
-										<p className="m-0 text-xs text-content-destructive">
-											{compressionThresholdField.helperText}
-										</p>
-									)}
-								</div>
-							</div>
-						)}
-					</div>
-				</div>
-				<div className="mt-auto py-6">
-					<hr className="mb-4 border-0 border-t border-solid border-border" />
-					<div className="flex items-center justify-between">
-						{isEditing && editingModel && onDeleteModel ? (
-							<Button
-								variant="outline"
-								size="lg"
-								type="button"
-								className="text-content-secondary hover:text-content-destructive hover:border-border-destructive"
-								disabled={isSaving}
-								onClick={() => setConfirmingDelete(true)}
-							>
-								Delete
-							</Button>
-						) : (
-							<Button
-								variant="outline"
-								size="lg"
-								type="button"
-								onClick={onCancel}
-							>
-								Cancel
-							</Button>
-						)}
-						<Button
-							size="lg"
-							type="submit"
-							disabled={isSaving || !form.isValid || hasFieldErrors}
-						>
-							{isSaving && <Spinner className="h-4 w-4" loading />}{" "}
-							{isEditing
-								? "Save"
-								: isDuplicating
-									? "Create duplicate"
-									: "Add model"}
-						</Button>
-					</div>
-				</div>
-			</form>
-			{editingModel && onDeleteModel && (
-				<ConfirmDeleteDialog
-					entity="model"
-					onConfirm={() => void onDeleteModel(editingModel.id)}
-					isPending={isDeleting}
-					open={confirmingDelete}
-					onOpenChange={(open) => !open && setConfirmingDelete(false)}
-				/>
-			)}{" "}
-		</div>
-	);
-};
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelIdentifierField.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelIdentifierField.tsx
index fa679a0e37..5f82016875 100644
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelIdentifierField.tsx
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelIdentifierField.tsx
@@ -1,5 +1,5 @@
 import type { FormikContextType } from "formik";
-import { CheckIcon, InfoIcon } from "lucide-react";
+import { CheckIcon } from "lucide-react";
 import {
 	type FocusEvent,
 	type KeyboardEvent,
@@ -10,14 +10,9 @@ import {
 import { Autocomplete } from "#/components/Autocomplete/Autocomplete";
 import { Input } from "#/components/Input/Input";
 import { Label } from "#/components/Label/Label";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "#/components/Tooltip/Tooltip";
+import { normalizeProvider } from "#/modules/aiModels/helpers";
 import { cn } from "#/utils/cn";
 import type { FormHelpers } from "#/utils/formUtils";
-import { normalizeProvider } from "./helpers";
 import {
 	findKnownModelByCanonicalId,
 	findKnownModelByExactAlias,
@@ -37,6 +32,7 @@ type ModelIdentifierFieldProps = {
 	mode: ModelFormMode;
 	selectedProvider: string | null;
 	disabled: boolean;
+	controlClassName?: string;
 };
 
 type ModelIdentifierOption = {
@@ -69,6 +65,7 @@ export const ModelIdentifierField = ({
 	mode,
 	selectedProvider,
 	disabled,
+	controlClassName,
 }: ModelIdentifierFieldProps) => {
 	const [initialFormValues] = useState(() => form.initialValues);
 	const [open, setOpen] = useState(false);
@@ -383,7 +380,8 @@ export const ModelIdentifierField = ({
 					id={modelField.id}
 					name={modelField.name}
 					className={cn(
-						"h-9 text-[13px] placeholder:text-content-disabled",
+						"placeholder:text-content-disabled",
+						controlClassName,
 						hasError && "border-content-destructive",
 					)}
 					placeholder="e.g. gpt-5, claude-sonnet-4-5"
@@ -437,7 +435,8 @@ export const ModelIdentifierField = ({
 				onEnterEmpty={() => handleOpenChange(false)}
 				placeholder="e.g. gpt-5, claude-sonnet-4-5"
 				className={cn(
-					"h-9 text-[13px] placeholder:text-content-disabled",
+					"placeholder:text-content-disabled",
+					controlClassName,
 					hasError && "border-content-destructive",
 				)}
 				triggerAriaInvalid={hasError}
@@ -457,19 +456,14 @@ export const ModelIdentifierField = ({
 		>
 			<Label
 				htmlFor={modelField.id}
-				className="inline-flex items-center gap-1 text-sm font-medium text-content-primary"
+				className="flex items-center gap-1 leading-6 text-content-primary"
 			>
 				Model identifier{" "}
 				<span className="text-xs font-bold text-content-destructive">*</span>
-				<Tooltip>
-					<TooltipTrigger asChild>
-						<InfoIcon className="size-3 text-content-secondary" />
-					</TooltipTrigger>
-					<TooltipContent side="top" className="max-w-[240px]">
-						The model identifier sent to the provider API.
-					</TooltipContent>
-				</Tooltip>
 			</Label>
+			<p className="m-0 text-xs text-content-secondary">
+				The model identifier sent to the provider API.
+			</p>
 			{renderControl()}
 			{hasError && (
 				<p id={errorId} className="m-0 text-xs text-content-destructive">
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.stories.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.stories.tsx
deleted file mode 100644
index 977c2402f8..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.stories.tsx
+++ /dev/null
@@ -1,471 +0,0 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
-import { expect, fn, userEvent, waitFor, within } from "storybook/test";
-import type * as TypesGen from "#/api/typesGenerated";
-import { TooltipProvider } from "#/components/Tooltip/Tooltip";
-import {
-	MockChatModelConfig,
-	MockChatProviderConfig,
-} from "#/testHelpers/chatModels";
-import type { ProviderState } from "./ChatModelAdminPanel";
-import { ModelsSection } from "./ModelsSection";
-
-const providerState: ProviderState = {
-	key: "provider-config-id",
-	provider: "openai",
-	label: "OpenAI",
-	providerConfig: {
-		...MockChatProviderConfig,
-		id: "provider-config-id",
-		allow_central_api_key_fallback: false,
-		base_url: undefined,
-		created_at: "2025-01-01T00:00:00Z",
-		updated_at: "2025-01-01T00:00:00Z",
-	},
-	modelConfigs: [],
-	catalogModelCount: 0,
-	hasManagedAPIKey: true,
-	hasCatalogAPIKey: true,
-	hasEffectiveAPIKey: true,
-	allowUserAPIKey: false,
-	isEnvPreset: false,
-	baseURL: "",
-};
-
-const providerStateWithoutAPIKey: ProviderState = {
-	...providerState,
-	providerConfig: {
-		...providerState.providerConfig!,
-		has_api_key: false,
-		central_api_key_enabled: false,
-		allow_user_api_key: false,
-	},
-	hasManagedAPIKey: false,
-	hasCatalogAPIKey: false,
-	hasEffectiveAPIKey: false,
-	allowUserAPIKey: false,
-};
-
-const baseModelConfig: TypesGen.ChatModelConfig = {
-	...MockChatModelConfig,
-	id: "model-config-id",
-	model: "gpt-4.1",
-	display_name: "GPT-4.1",
-	context_limit: 128000,
-	compression_threshold: 80,
-	created_at: "2025-01-01T00:00:00Z",
-	updated_at: "2025-01-01T00:00:00Z",
-};
-
-const disabledModelConfig: TypesGen.ChatModelConfig = {
-	...baseModelConfig,
-	id: "disabled-model-config-id",
-	model: "gpt-4.1-disabled",
-	display_name: "GPT-4.1 Disabled",
-	enabled: false,
-};
-
-const defaultModelConfig: TypesGen.ChatModelConfig = {
-	...baseModelConfig,
-	id: "default-model-config-id",
-	model: "gpt-4o",
-	display_name: "GPT-4o",
-	is_default: true,
-};
-
-const duplicateSourceModel: TypesGen.ChatModelConfig = {
-	...baseModelConfig,
-	id: "duplicate-source-model-id",
-	model: "gpt-4.1-default",
-	display_name: "GPT-4.1 Default",
-	is_default: true,
-	context_limit: 200000,
-	compression_threshold: 65,
-	model_config: {
-		max_output_tokens: 4096,
-		provider_options: {
-			openai: {
-				max_tool_calls: 4,
-				reasoning_effort: "high",
-			},
-		},
-	},
-};
-
-const meta: Meta<typeof ModelsSection> = {
-	title: "pages/AgentsPage/ChatModelAdminPanel/ModelsSection",
-	component: ModelsSection,
-	args: {
-		sectionLabel: "Models",
-		providerStates: [providerState],
-		modelConfigs: [baseModelConfig],
-		modelConfigsUnavailable: false,
-		isCreating: false,
-		isUpdating: false,
-		isDeleting: false,
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-		onDeleteModel: fn(async () => undefined),
-	},
-	decorators: [
-		(Story) => (
-			<TooltipProvider>
-				<Story />
-			</TooltipProvider>
-		),
-	],
-};
-
-export default meta;
-type Story = StoryObj<typeof ModelsSection>;
-
-export const ShowsPricingWarning: Story = {
-	play: async ({ canvasElement }) => {
-		const canvas = within(canvasElement);
-		await expect(
-			canvas.getByText("Model pricing is not defined"),
-		).toBeInTheDocument();
-	},
-};
-
-export const HidesPricingWarningForExplicitZeroPricing: Story = {
-	args: {
-		modelConfigs: [
-			{
-				...baseModelConfig,
-				id: "model-config-id-zero-pricing",
-				model_config: {
-					cost: {
-						output_price_per_million_tokens: "0",
-					},
-				},
-			},
-		],
-	},
-	play: async ({ canvasElement }) => {
-		const canvas = within(canvasElement);
-		expect(
-			canvas.queryByText("Model pricing is not defined"),
-		).not.toBeInTheDocument();
-	},
-};
-
-export const LinksToProvidersFromEmptyState: Story = {
-	args: {
-		providerStates: [providerStateWithoutAPIKey],
-		modelConfigs: [],
-	},
-	play: async ({ canvasElement }) => {
-		const canvas = within(canvasElement);
-		const providerLink = canvas.getByRole("link", { name: /provider/i });
-
-		await expect(canvas.getByText("No models configured yet.")).toBeVisible();
-		await expect(providerLink).toBeVisible();
-		expect(providerLink).toHaveAttribute("href", "/ai/settings");
-	},
-};
-
-export const ShowsExplicitRowActions: Story = {
-	play: async ({ canvasElement }) => {
-		const canvas = within(canvasElement);
-		const user = userEvent.setup();
-		const rowButton = canvas.getByRole("button", {
-			name: "Open model: GPT-4.1",
-		});
-		const starButton = canvas.getByRole("button", {
-			name: "Set as default model: GPT-4.1",
-		});
-		const editButton = canvas.getByRole("button", {
-			name: "Edit model: GPT-4.1",
-		});
-		const copyButton = canvas.getByRole("button", {
-			name: "Duplicate model: GPT-4.1",
-		});
-
-		await expect(starButton).toBeVisible();
-		await expect(editButton).toBeVisible();
-		await expect(copyButton).toBeVisible();
-		rowButton.focus();
-		await expect(rowButton).toHaveFocus();
-		await user.tab();
-		await expect(starButton).toHaveFocus();
-		await user.tab();
-		await expect(editButton).toHaveFocus();
-		await user.tab();
-		await expect(copyButton).toHaveFocus();
-	},
-};
-
-export const OpensDuplicateFormWithoutCreating: Story = {
-	args: {
-		modelConfigs: [duplicateSourceModel],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		await userEvent.click(
-			canvas.getByRole("button", {
-				name: "Duplicate model: GPT-4.1 Default",
-			}),
-		);
-
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-		expect(args.onCreateModel).not.toHaveBeenCalled();
-		expect(args.onUpdateModel).not.toHaveBeenCalled();
-		expect(canvas.getByDisplayValue("GPT-4.1 Default")).toBeVisible();
-		expect(canvas.getByLabelText(/Model identifier/)).toHaveValue(
-			"gpt-4.1-default",
-		);
-		expect(canvas.getByLabelText(/Context limit/)).toHaveValue("200000");
-		const enabledSwitch = canvas.getByRole("switch", { name: "Enabled" });
-		expect(enabledSwitch).toBeChecked();
-		expect(enabledSwitch).toBeEnabled();
-
-		await userEvent.click(canvas.getByRole("button", { name: /Advanced/ }));
-		expect(canvas.getByLabelText(/Compression threshold/)).toHaveValue("65");
-
-		await userEvent.click(
-			canvas.getByRole("button", { name: /Provider configuration/ }),
-		);
-		expect(canvas.getByLabelText("Max Tool Calls")).toHaveValue("4");
-	},
-};
-
-export const AbandonsDuplicateWithoutSaving: Story = {
-	args: {
-		modelConfigs: [duplicateSourceModel],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		const copyButtonName = "Duplicate model: GPT-4.1 Default";
-
-		await userEvent.click(canvas.getByRole("button", { name: copyButtonName }));
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-		await userEvent.click(canvas.getByRole("button", { name: "Cancel" }));
-		await expect(
-			canvas.findByRole("button", { name: copyButtonName }),
-		).resolves.toBeVisible();
-
-		await userEvent.click(canvas.getByRole("button", { name: copyButtonName }));
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-		await userEvent.click(canvas.getByRole("button", { name: "Back" }));
-		await expect(
-			canvas.findByRole("button", { name: copyButtonName }),
-		).resolves.toBeVisible();
-		expect(args.onCreateModel).not.toHaveBeenCalled();
-		expect(args.onUpdateModel).not.toHaveBeenCalled();
-	},
-};
-
-export const SavesDuplicateAsCreateRequest: Story = {
-	args: {
-		modelConfigs: [duplicateSourceModel],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		await userEvent.click(
-			canvas.getByRole("button", {
-				name: "Duplicate model: GPT-4.1 Default",
-			}),
-		);
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-
-		const modelInput = canvas.getByLabelText(/Model identifier/);
-		await userEvent.clear(modelInput);
-		await userEvent.type(modelInput, "gpt-4.1-copy");
-		const displayNameInput = canvas.getByDisplayValue("GPT-4.1 Default");
-		await userEvent.clear(displayNameInput);
-		await userEvent.type(displayNameInput, "GPT-4.1 Copy");
-		await userEvent.click(
-			canvas.getByRole("button", { name: "Create duplicate" }),
-		);
-
-		await waitFor(() => expect(args.onCreateModel).toHaveBeenCalledTimes(1));
-		expect(args.onUpdateModel).not.toHaveBeenCalled();
-
-		const createModelMock = args.onCreateModel as ReturnType<typeof fn>;
-		const createReq = createModelMock.mock.calls[0]?.[0];
-		if (!createReq) {
-			throw new Error("Expected create request.");
-		}
-		expect(createReq).toEqual({
-			ai_provider_id: "provider-config-id",
-			provider: "openai",
-			model: "gpt-4.1-copy",
-			display_name: "GPT-4.1 Copy",
-			enabled: true,
-			is_default: false,
-			context_limit: 200000,
-			compression_threshold: 65,
-			model_config: {
-				max_output_tokens: 4096,
-				provider_options: {
-					openai: {
-						max_tool_calls: 4,
-						reasoning_effort: "high",
-					},
-				},
-			},
-		});
-	},
-};
-
-export const SavesNonDefaultDuplicateWithEditableEnabled: Story = {
-	args: {
-		modelConfigs: [baseModelConfig],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		await userEvent.click(
-			canvas.getByRole("button", { name: "Duplicate model: GPT-4.1" }),
-		);
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-
-		const enabledSwitch = canvas.getByRole("switch", { name: "Enabled" });
-		expect(enabledSwitch).toBeChecked();
-		expect(enabledSwitch).toBeEnabled();
-		await userEvent.click(enabledSwitch);
-
-		const modelInput = canvas.getByLabelText(/Model identifier/);
-		await userEvent.clear(modelInput);
-		await userEvent.type(modelInput, "gpt-4.1-copy");
-		await userEvent.click(
-			canvas.getByRole("button", { name: "Create duplicate" }),
-		);
-
-		await waitFor(() => expect(args.onCreateModel).toHaveBeenCalledTimes(1));
-		expect(args.onUpdateModel).not.toHaveBeenCalled();
-
-		const createModelMock = args.onCreateModel as ReturnType<typeof fn>;
-		expect(createModelMock.mock.calls[0]?.[0]).toEqual({
-			ai_provider_id: "provider-config-id",
-			provider: "openai",
-			model: "gpt-4.1-copy",
-			display_name: "GPT-4.1",
-			enabled: false,
-			is_default: false,
-			context_limit: 128000,
-			compression_threshold: 80,
-		});
-	},
-};
-
-export const SavesDisabledDuplicateWithEditableEnabled: Story = {
-	args: {
-		modelConfigs: [disabledModelConfig],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		await userEvent.click(
-			canvas.getByRole("button", {
-				name: "Duplicate model: GPT-4.1 Disabled",
-			}),
-		);
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-
-		const enabledSwitch = canvas.getByRole("switch", { name: "Enabled" });
-		expect(enabledSwitch).not.toBeChecked();
-		expect(enabledSwitch).toBeEnabled();
-		await userEvent.click(enabledSwitch);
-
-		const modelInput = canvas.getByLabelText(/Model identifier/);
-		await userEvent.clear(modelInput);
-		await userEvent.type(modelInput, "gpt-4.1-disabled-copy");
-		await userEvent.click(
-			canvas.getByRole("button", { name: "Create duplicate" }),
-		);
-
-		await waitFor(() => expect(args.onCreateModel).toHaveBeenCalledTimes(1));
-		const createModelMock = args.onCreateModel as ReturnType<typeof fn>;
-		expect(createModelMock.mock.calls[0]?.[0]).toEqual({
-			ai_provider_id: "provider-config-id",
-			provider: "openai",
-			model: "gpt-4.1-disabled-copy",
-			display_name: "GPT-4.1 Disabled",
-			enabled: true,
-			is_default: false,
-			context_limit: 128000,
-			compression_threshold: 80,
-		});
-	},
-};
-
-export const DisablesDuplicateWhenProviderCannotManageModels: Story = {
-	args: {
-		providerStates: [providerStateWithoutAPIKey],
-		modelConfigs: [baseModelConfig],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		const duplicateButton = canvas.getByRole("button", {
-			name: "Duplicate model: GPT-4.1",
-		});
-
-		expect(duplicateButton).toHaveAttribute("aria-disabled", "true");
-		await userEvent.click(duplicateButton);
-		expect(canvas.queryByText("Duplicate model")).not.toBeInTheDocument();
-		expect(args.onCreateModel).not.toHaveBeenCalled();
-	},
-};
-
-export const RowActionsDoNotOpenRowBody: Story = {
-	args: {
-		modelConfigs: [baseModelConfig, defaultModelConfig, disabledModelConfig],
-		onCreateModel: fn(async () => undefined),
-		onUpdateModel: fn(async () => undefined),
-	},
-	play: async ({ args, canvasElement }) => {
-		const canvas = within(canvasElement);
-		const updateModelMock = args.onUpdateModel as ReturnType<typeof fn>;
-
-		await userEvent.click(
-			canvas.getByRole("button", {
-				name: "Set as default model: GPT-4.1",
-			}),
-		);
-		await waitFor(() => expect(args.onUpdateModel).toHaveBeenCalledTimes(1));
-		expect(updateModelMock.mock.calls[0]).toEqual([
-			"model-config-id",
-			{ is_default: true },
-		]);
-		expect(canvas.queryByText("Edit model")).not.toBeInTheDocument();
-
-		await userEvent.click(
-			canvas.getByRole("button", { name: "Default model: GPT-4o" }),
-		);
-		expect(args.onUpdateModel).toHaveBeenCalledTimes(1);
-		expect(canvas.queryByText("Edit model")).not.toBeInTheDocument();
-
-		const disabledStarButton = canvas.getByRole("button", {
-			name: "Set as default model: GPT-4.1 Disabled",
-		});
-		expect(disabledStarButton).toHaveAttribute("aria-disabled", "true");
-		await userEvent.click(disabledStarButton);
-		expect(args.onUpdateModel).toHaveBeenCalledTimes(1);
-		expect(canvas.queryByText("Edit model")).not.toBeInTheDocument();
-
-		await userEvent.click(
-			canvas.getByRole("button", { name: "Duplicate model: GPT-4.1" }),
-		);
-		await expect(canvas.findByText("Duplicate model")).resolves.toBeVisible();
-		expect(args.onCreateModel).not.toHaveBeenCalled();
-		expect(args.onUpdateModel).toHaveBeenCalledTimes(1);
-		expect(canvas.queryByText("Edit model")).not.toBeInTheDocument();
-
-		await userEvent.click(canvas.getByRole("button", { name: "Back" }));
-		await userEvent.click(
-			await canvas.findByRole("button", { name: "Edit model: GPT-4.1" }),
-		);
-		await expect(canvas.findByText("Edit model")).resolves.toBeVisible();
-	},
-};
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.tsx
deleted file mode 100644
index f4738bc9f3..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.tsx
+++ /dev/null
@@ -1,471 +0,0 @@
-import {
-	ChevronDownIcon,
-	CopyIcon,
-	PencilIcon,
-	PlusIcon,
-	StarIcon,
-	TriangleAlertIcon,
-} from "lucide-react";
-import { type FC, useEffect, useState } from "react";
-import { Link, useLocation, useSearchParams } from "react-router";
-import type * as TypesGen from "#/api/typesGenerated";
-import { Badge } from "#/components/Badge/Badge";
-import { Button } from "#/components/Button/Button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from "#/components/DropdownMenu/DropdownMenu";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "#/components/Tooltip/Tooltip";
-import { cn } from "#/utils/cn";
-import { SectionHeader } from "../SectionHeader";
-import type { ProviderState } from "./ChatModelAdminPanel";
-import { normalizeProvider, readOptionalString } from "./helpers";
-import { ModelForm } from "./ModelForm";
-import { ProviderIcon } from "./ProviderIcon";
-import { hasCustomPricing } from "./pricingFields";
-
-type ModelView =
-	| { mode: "list" }
-	| { mode: "add"; provider: string }
-	| { mode: "edit"; model: TypesGen.ChatModelConfig }
-	| { mode: "duplicate"; sourceModel: TypesGen.ChatModelConfig };
-
-const MODEL_VIEW_PARAMS = ["model", "newModel", "duplicate"] as const;
-type ModelViewParam = (typeof MODEL_VIEW_PARAMS)[number];
-
-const clearModelViewParams = (params: URLSearchParams) => {
-	for (const param of MODEL_VIEW_PARAMS) {
-		params.delete(param);
-	}
-};
-
-const modelConfigProviderKey = (
-	modelConfig: TypesGen.ChatModelConfig,
-	providerStates: readonly ProviderState[],
-): string => {
-	const providerID = readOptionalString(modelConfig.ai_provider_id);
-	if (providerID) {
-		return providerID;
-	}
-
-	const provider = normalizeProvider(modelConfig.provider);
-	const providerMatches = providerStates.filter(
-		(providerState) => providerState.provider === provider,
-	);
-	if (providerMatches.length === 1) {
-		return providerMatches[0].key;
-	}
-	if (providerMatches.length > 1) {
-		return "";
-	}
-	return provider;
-};
-
-const canManageProviderModels = (providerState: ProviderState | undefined) => {
-	return Boolean(
-		providerState?.providerConfig &&
-			(providerState.hasEffectiveAPIKey ||
-				providerState.providerConfig.allow_user_api_key),
-	);
-};
-
-interface ModelsSectionProps {
-	sectionLabel?: string;
-	sectionDescription?: string;
-	providerStates: readonly ProviderState[];
-	modelConfigs: readonly TypesGen.ChatModelConfig[];
-	modelConfigsUnavailable: boolean;
-	isCreating: boolean;
-	isUpdating: boolean;
-	isDeleting: boolean;
-	onCreateModel: (
-		req: TypesGen.CreateChatModelConfigRequest,
-	) => Promise<unknown>;
-	onUpdateModel: (
-		modelConfigId: string,
-		req: TypesGen.UpdateChatModelConfigRequest,
-	) => Promise<unknown>;
-	onDeleteModel: (modelConfigId: string) => Promise<void>;
-}
-
-export const ModelsSection: FC<ModelsSectionProps> = ({
-	sectionLabel,
-	sectionDescription,
-	providerStates,
-	modelConfigs,
-	modelConfigsUnavailable,
-	isCreating,
-	isUpdating,
-	isDeleting,
-	onCreateModel,
-	onUpdateModel,
-	onDeleteModel,
-}) => {
-	const [searchParams, setSearchParams] = useSearchParams();
-	const [selectedProviderOverride, setSelectedProviderOverride] = useState<
-		string | null
-	>(null);
-	const location = useLocation();
-
-	// Derive the current view from URL search params so that
-	// browser back/forward navigation works as expected.
-	const view: ModelView = (() => {
-		const editModelId = searchParams.get("model");
-		if (editModelId) {
-			const model = modelConfigs.find((m) => m.id === editModelId);
-			return model ? { mode: "edit", model } : { mode: "list" };
-		}
-		const duplicateModelId = searchParams.get("duplicate");
-		if (duplicateModelId) {
-			const sourceModel = modelConfigs.find((m) => m.id === duplicateModelId);
-			return sourceModel
-				? { mode: "duplicate", sourceModel }
-				: { mode: "list" };
-		}
-		const addProvider = searchParams.get("newModel");
-		if (addProvider) {
-			return { mode: "add", provider: addProvider };
-		}
-		return { mode: "list" };
-	})();
-
-	const setModelViewParam = (
-		param: ModelViewParam,
-		value: string,
-		options?: { replace?: boolean },
-	) => {
-		const nextParams = new URLSearchParams(searchParams);
-		clearModelViewParams(nextParams);
-		nextParams.set(param, value);
-		setSearchParams(nextParams, {
-			replace: options?.replace,
-			state: options?.replace ? location.state : { pushed: true },
-		});
-	};
-	const modelViewIdentity = (() => {
-		switch (view.mode) {
-			case "add":
-				return `add:${view.provider}`;
-			case "edit":
-				return `edit:${view.model.id}`;
-			case "duplicate":
-				return `duplicate:${view.sourceModel.id}`;
-			default:
-				return "list";
-		}
-	})();
-
-	useEffect(() => {
-		void modelViewIdentity;
-		setSelectedProviderOverride(null);
-	}, [modelViewIdentity]);
-
-	// Clear model-related search params and return to the list.
-	const clearModelView = () => {
-		setSelectedProviderOverride(null);
-		setSearchParams((prev) => {
-			const next = new URLSearchParams(prev);
-			clearModelViewParams(next);
-			return next;
-		});
-	};
-
-	const exitModelView = () => {
-		setSelectedProviderOverride(null);
-		setSearchParams(
-			(prev) => {
-				const next = new URLSearchParams(prev);
-				clearModelViewParams(next);
-				return next;
-			},
-			{ replace: true },
-		);
-	};
-
-	// When the form is open it takes over the full panel.
-	if (
-		view.mode === "add" ||
-		view.mode === "edit" ||
-		view.mode === "duplicate"
-	) {
-		const editingModel = view.mode === "edit" ? view.model : undefined;
-		const duplicateSourceModel =
-			view.mode === "duplicate" ? view.sourceModel : undefined;
-		const effectiveProvider =
-			selectedProviderOverride ??
-			(view.mode === "edit"
-				? modelConfigProviderKey(view.model, providerStates)
-				: view.mode === "duplicate"
-					? modelConfigProviderKey(view.sourceModel, providerStates)
-					: view.provider);
-		const effectiveProviderState =
-			providerStates.find((ps) => ps.key === effectiveProvider) ?? null;
-		const formKey =
-			view.mode === "edit"
-				? `edit:${view.model.id}`
-				: view.mode === "duplicate"
-					? `duplicate:${view.sourceModel.id}`
-					: `add:${view.provider}`;
-
-		return (
-			<ModelForm
-				key={formKey}
-				editingModel={editingModel}
-				duplicateSourceModel={duplicateSourceModel}
-				providerStates={providerStates}
-				selectedProvider={effectiveProvider}
-				selectedProviderState={effectiveProviderState}
-				onSelectedProviderChange={(provider) => {
-					if (view.mode === "add") {
-						setModelViewParam("newModel", provider, { replace: true });
-						return;
-					}
-					setSelectedProviderOverride(provider);
-				}}
-				modelConfigsUnavailable={modelConfigsUnavailable}
-				isSaving={isCreating || isUpdating}
-				isDeleting={isDeleting}
-				onCreateModel={async (req) => {
-					await onCreateModel(req);
-					exitModelView();
-				}}
-				onUpdateModel={async (id, req) => {
-					await onUpdateModel(id, req);
-					clearModelView();
-				}}
-				onCancel={clearModelView}
-				onDeleteModel={
-					editingModel
-						? async (id) => {
-								await onDeleteModel(id);
-								exitModelView();
-							}
-						: undefined
-				}
-			/>
-		);
-	}
-
-	// ── List view ──────────────────────────────────────────────
-
-	// Only show providers that have a deployment key configured or allow
-	// end users to bring their own key.
-	const addableProviders = providerStates.filter(canManageProviderModels);
-
-	const addButton = addableProviders.length > 0 && (
-		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
-				<Button size="sm" className="gap-1.5" aria-label="Add model">
-					<PlusIcon className="size-4" />
-					Add
-					<ChevronDownIcon className="size-3.5 text-content-secondary" />
-				</Button>
-			</DropdownMenuTrigger>
-			<DropdownMenuContent align="end">
-				{addableProviders.map((ps) => (
-					<DropdownMenuItem
-						key={ps.key}
-						onClick={() => {
-							setModelViewParam("newModel", ps.key);
-						}}
-						className="gap-2"
-					>
-						<ProviderIcon provider={ps.provider} className="size-5" />
-						{ps.label}
-					</DropdownMenuItem>
-				))}
-			</DropdownMenuContent>
-		</DropdownMenu>
-	);
-
-	const handleSetDefault = (modelConfig: TypesGen.ChatModelConfig) => {
-		if (isUpdating || modelConfig.is_default || !modelConfig.enabled) return;
-		void onUpdateModel(modelConfig.id, { is_default: true });
-	};
-
-	return (
-		<>
-			{sectionLabel && (
-				<SectionHeader
-					label={sectionLabel}
-					description={
-						sectionDescription ?? "Manage models available to Agents."
-					}
-					action={addButton || undefined}
-				/>
-			)}
-
-			{modelConfigs.length === 0 ? (
-				<div className="flex flex-col items-center justify-center gap-3 px-6 py-12 text-center">
-					<p className="m-0 text-sm text-content-secondary">
-						No models configured yet.
-					</p>
-					{addableProviders.length > 0 && addButton}
-					{addableProviders.length === 0 && (
-						<p className="m-0 text-xs text-content-secondary">
-							Connect a{" "}
-							<Link
-								to="/ai/settings"
-								className="underline transition-colors hover:text-content-primary"
-							>
-								provider
-							</Link>{" "}
-							first to add models.
-						</p>
-					)}
-				</div>
-			) : (
-				<div>
-					{modelConfigs.map((modelConfig, i) => {
-						const showPricingWarning = !hasCustomPricing(
-							modelConfig.model_config,
-						);
-						const modelName = modelConfig.display_name || modelConfig.model;
-						const starLabel = modelConfig.is_default
-							? `Default model: ${modelName}`
-							: `Set as default model: ${modelName}`;
-						const starUnavailable =
-							isUpdating || modelConfig.is_default || !modelConfig.enabled;
-						const providerState = providerStates.find(
-							(ps) =>
-								ps.key === modelConfigProviderKey(modelConfig, providerStates),
-						);
-						const duplicateUnavailable = Boolean(
-							providerState && !canManageProviderModels(providerState),
-						);
-
-						return (
-							<div
-								key={modelConfig.id}
-								className={cn(
-									"flex items-center gap-3.5 px-3 py-3 transition-colors hover:bg-surface-secondary/30",
-									i > 0 && "border-0 border-t border-solid border-border/50",
-								)}
-							>
-								<button
-									type="button"
-									onClick={() => setModelViewParam("model", modelConfig.id)}
-									aria-label={`Open model: ${modelName}`}
-									className="flex min-w-0 flex-1 cursor-pointer items-center gap-3.5 border-0 bg-transparent p-0 text-left"
-								>
-									<ProviderIcon
-										provider={modelConfig.provider}
-										className="size-8 shrink-0"
-									/>
-									<div className="min-w-0 flex-1">
-										<span
-											className={cn(
-												"block truncate text-[15px] font-medium",
-												modelConfig.enabled === false
-													? "text-content-secondary"
-													: "text-content-primary",
-											)}
-										>
-											{modelName}
-										</span>
-										{showPricingWarning && (
-											<span className="mt-1 flex items-center gap-1 text-xs text-content-warning">
-												<TriangleAlertIcon className="size-3.5 shrink-0" />
-												Model pricing is not defined
-											</span>
-										)}
-									</div>
-									{modelConfig.enabled === false && (
-										<Badge size="xs" variant="warning">
-											disabled
-										</Badge>
-									)}
-								</button>
-								<div className="flex shrink-0 items-center gap-1">
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<Button
-												size="icon"
-												variant="subtle"
-												onClick={(event) => {
-													event.stopPropagation();
-													handleSetDefault(modelConfig);
-												}}
-												aria-disabled={starUnavailable}
-												aria-label={starLabel}
-												className={cn(
-													"hover:bg-surface-secondary",
-													starUnavailable &&
-														"cursor-not-allowed text-content-secondary/40 hover:bg-transparent hover:text-content-secondary/40",
-													modelConfig.is_default && "text-content-primary",
-												)}
-											>
-												<StarIcon
-													className={cn(
-														modelConfig.is_default && "fill-current",
-													)}
-												/>
-											</Button>
-										</TooltipTrigger>
-										<TooltipContent side="top">
-											{!modelConfig.enabled
-												? "Cannot set a disabled model as default"
-												: modelConfig.is_default
-													? "Default for new conversations"
-													: "Set as default for new conversations"}
-										</TooltipContent>
-									</Tooltip>
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<Button
-												size="icon"
-												variant="subtle"
-												onClick={(event) => {
-													event.stopPropagation();
-													setModelViewParam("model", modelConfig.id);
-												}}
-												aria-label={`Edit model: ${modelName}`}
-												className="hover:bg-surface-secondary"
-											>
-												<PencilIcon />
-											</Button>
-										</TooltipTrigger>
-										<TooltipContent side="top">Edit model</TooltipContent>
-									</Tooltip>
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<Button
-												size="icon"
-												variant="subtle"
-												onClick={(event) => {
-													event.stopPropagation();
-													if (duplicateUnavailable) return;
-													setModelViewParam("duplicate", modelConfig.id);
-												}}
-												aria-disabled={duplicateUnavailable}
-												aria-label={`Duplicate model: ${modelName}`}
-												className={cn(
-													"hover:bg-surface-secondary",
-													duplicateUnavailable &&
-														"cursor-not-allowed text-content-secondary/40 hover:bg-transparent hover:text-content-secondary/40",
-												)}
-											>
-												<CopyIcon />
-											</Button>
-										</TooltipTrigger>
-										<TooltipContent side="top">
-											{duplicateUnavailable
-												? "Set an API key for this provider before duplicating models"
-												: "Duplicate model"}
-										</TooltipContent>
-									</Tooltip>
-								</div>
-							</div>
-						);
-					})}
-				</div>
-			)}
-		</>
-	);
-};
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderField.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderField.tsx
new file mode 100644
index 0000000000..1c6e0ec259
--- /dev/null
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderField.tsx
@@ -0,0 +1,35 @@
+import type { FC, ReactNode } from "react";
+
+interface ProviderFieldProps {
+	label: string;
+	htmlFor?: string;
+	required?: boolean;
+	description?: string;
+	children: ReactNode;
+}
+
+export const ProviderField: FC<ProviderFieldProps> = ({
+	label,
+	htmlFor,
+	required,
+	description,
+	children,
+}) => (
+	<div className="grid gap-1.5">
+		<div className="flex items-baseline gap-1.5">
+			<label
+				htmlFor={htmlFor}
+				className="text-sm font-medium text-content-primary"
+			>
+				{label}
+			</label>
+			{required && (
+				<span className="text-xs font-bold text-content-destructive">*</span>
+			)}
+		</div>
+		{description && (
+			<p className="m-0 text-xs text-content-secondary">{description}</p>
+		)}
+		{children}
+	</div>
+);
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderForm.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderForm.tsx
deleted file mode 100644
index 5924dedcad..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderForm.tsx
+++ /dev/null
@@ -1,413 +0,0 @@
-import { InfoIcon } from "lucide-react";
-import {
-	type FC,
-	type FormEvent,
-	type ReactNode,
-	useId,
-	useState,
-} from "react";
-import { useNavigate } from "react-router";
-import type * as TypesGen from "#/api/typesGenerated";
-import { Alert, AlertDescription, AlertTitle } from "#/components/Alert/Alert";
-import { Button } from "#/components/Button/Button";
-import { Input } from "#/components/Input/Input";
-import { Spinner } from "#/components/Spinner/Spinner";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "#/components/Tooltip/Tooltip";
-import { formatProviderLabel } from "../../utils/modelOptions";
-import { BackButton } from "../BackButton";
-import { ConfirmDeleteDialog } from "../ConfirmDeleteDialog";
-import type {
-	CreateProviderResult,
-	ProviderState,
-} from "./ChatModelAdminPanel";
-import { getProviderBaseURLPlaceholder, readOptionalString } from "./helpers";
-import { ProviderIcon } from "./ProviderIcon";
-
-// Sentinel value used to represent an existing API key that the
-// backend will not reveal. If the user has not touched the field,
-// we know nothing changed.
-const API_KEY_PLACEHOLDER = "••••••••••••••••";
-
-interface ProviderFormProps {
-	providerState: ProviderState;
-	providerConfigsUnavailable: boolean;
-	isProviderMutationPending: boolean;
-	onCreateProvider: (
-		req: TypesGen.CreateChatProviderConfigRequest,
-	) => Promise<CreateProviderResult>;
-	onUpdateProvider: (
-		providerConfigId: string,
-		req: TypesGen.UpdateChatProviderConfigRequest,
-	) => Promise<unknown>;
-	onDeleteProvider: (providerConfigId: string) => Promise<void>;
-	onBack: () => void;
-}
-
-export const ProviderForm: FC<ProviderFormProps> = ({
-	providerState,
-	providerConfigsUnavailable,
-	isProviderMutationPending,
-	onCreateProvider,
-	onUpdateProvider,
-	onDeleteProvider,
-	onBack,
-}) => {
-	const navigate = useNavigate();
-	const { provider, providerConfig, baseURL, isEnvPreset } = providerState;
-
-	const apiKeyInputId = useId();
-	const baseURLInputId = useId();
-
-	const baseURLPlaceholder = getProviderBaseURLPlaceholder(provider);
-
-	// Initial values are snapshotted when the provider config changes
-	// so we can detect dirty state.
-	const [initialValues] = useState(() => ({
-		displayName: readOptionalString(providerConfig?.display_name) ?? "",
-		baseURL,
-	}));
-
-	const [displayName, setDisplayName] = useState(initialValues.displayName);
-	const [apiKey, setApiKey] = useState(
-		providerState.hasManagedAPIKey ? API_KEY_PLACEHOLDER : "",
-	);
-	const [apiKeyTouched, setApiKeyTouched] = useState(false);
-	const [apiKeyModified, setApiKeyModified] = useState(false);
-	const [baseURLValue, setBaseURLValue] = useState(initialValues.baseURL);
-	const [confirmingDelete, setConfirmingDelete] = useState(false);
-
-	const isBedrockProvider = provider === "bedrock";
-	const isAPIKeyEnvManaged = isEnvPreset && !providerConfig;
-	const requiresAPIKey =
-		!providerState.allowUserAPIKey &&
-		!isBedrockProvider &&
-		!providerState.hasManagedAPIKey;
-
-	const effectiveApiKey =
-		apiKeyTouched && apiKey !== API_KEY_PLACEHOLDER ? apiKey : "";
-	const hasTypedAPIKey = effectiveApiKey.length > 0;
-	const hasAPIKeyWhitespace =
-		hasTypedAPIKey && effectiveApiKey.trim() !== effectiveApiKey;
-	// Clearing a saved provider-scoped key switches the provider to
-	// BYOK-only behavior, or ambient AWS credentials for Bedrock.
-	const isClearingAPIKey =
-		providerState.hasManagedAPIKey && apiKeyModified && effectiveApiKey === "";
-	const hasPendingAPIKeyChange = hasTypedAPIKey || isClearingAPIKey;
-	const shouldCreateAPIKey = hasTypedAPIKey;
-	const apiKeyDescription = isBedrockProvider
-		? "Bearer token for Bedrock authentication. Leave empty to use ambient AWS credentials."
-		: "Secret key used to authenticate requests to this provider.";
-	const baseURLDescription = isBedrockProvider
-		? "Bedrock runtime endpoint. Use the AWS region for the models this provider should call."
-		: "Endpoint used to call this provider.";
-	const apiKeyPlaceholder = isBedrockProvider ? "Enter bearer token" : "sk-...";
-	const deleteProviderDescription =
-		"Are you sure you want to delete this provider? The provider will be " +
-		"disabled and hidden from new model configuration. Existing model " +
-		"configs that reference it remain saved but cannot run until updated.";
-	const hasNewProviderConfiguration = !providerConfig;
-
-	const isDirty =
-		displayName.trim() !== initialValues.displayName ||
-		hasPendingAPIKeyChange ||
-		baseURLValue.trim() !== initialValues.baseURL.trim() ||
-		hasNewProviderConfiguration;
-
-	const hasBaseURL = baseURLValue.trim().length > 0;
-	const canSave =
-		!providerConfigsUnavailable &&
-		!isProviderMutationPending &&
-		!isAPIKeyEnvManaged &&
-		isDirty &&
-		hasBaseURL &&
-		!hasAPIKeyWhitespace &&
-		(!requiresAPIKey || hasTypedAPIKey);
-	const canAddModel =
-		Boolean(providerConfig) &&
-		(providerState.hasEffectiveAPIKey ||
-			providerConfig?.allow_user_api_key === true);
-
-	const handleAddModel = () => {
-		const params = new URLSearchParams({ newModel: providerState.key });
-		navigate(`/agents/settings/models?${params.toString()}`, {
-			state: { pushed: true },
-		});
-	};
-
-	const handleSubmit = async (event: FormEvent) => {
-		event.preventDefault();
-		if (
-			providerConfigsUnavailable ||
-			isProviderMutationPending ||
-			isAPIKeyEnvManaged ||
-			!hasBaseURL ||
-			hasAPIKeyWhitespace
-		) {
-			return;
-		}
-
-		if (requiresAPIKey && !hasTypedAPIKey) {
-			return;
-		}
-
-		const trimmedDisplayName = displayName.trim();
-		const trimmedBaseURL = baseURLValue.trim();
-
-		if (providerConfig) {
-			const currentDisplayName =
-				readOptionalString(providerConfig.display_name) ?? "";
-			const currentBaseURL = baseURL.trim();
-			const req: TypesGen.UpdateChatProviderConfigRequest = {
-				...(trimmedDisplayName !== currentDisplayName && {
-					display_name: trimmedDisplayName,
-				}),
-				...(hasPendingAPIKeyChange && { api_key: effectiveApiKey }),
-				...(trimmedBaseURL !== currentBaseURL && {
-					base_url: trimmedBaseURL,
-				}),
-			};
-
-			if (Object.keys(req).length === 0) {
-				return;
-			}
-
-			try {
-				await onUpdateProvider(providerConfig.id, req);
-			} catch {
-				return;
-			}
-		} else {
-			const req: TypesGen.CreateChatProviderConfigRequest = {
-				provider,
-				base_url: trimmedBaseURL,
-				...(shouldCreateAPIKey && { api_key: effectiveApiKey }),
-				...(trimmedDisplayName && {
-					display_name: trimmedDisplayName,
-				}),
-			};
-
-			try {
-				await onCreateProvider(req);
-			} catch {
-				return;
-			}
-		}
-
-		setApiKeyTouched(false);
-		setApiKeyModified(false);
-		setApiKey(API_KEY_PLACEHOLDER);
-	};
-
-	const handleApiKeyFocus = () => {
-		// Clear the placeholder on first focus so the user starts
-		// with a blank field and Chrome does not try to autofill.
-		if (!apiKeyTouched && apiKey === API_KEY_PLACEHOLDER) {
-			setApiKey("");
-			setApiKeyTouched(true);
-		}
-	};
-
-	const isDisabled = providerConfigsUnavailable || isProviderMutationPending;
-
-	return (
-		<div className="flex min-h-full flex-col">
-			<BackButton onClick={onBack} />
-			<div className="flex items-center gap-3">
-				<ProviderIcon provider={provider} className="size-8" />
-				<div className="min-w-0 flex-1">
-					<input
-						type="text"
-						value={displayName || formatProviderLabel(provider)}
-						onChange={(event) => setDisplayName(event.target.value)}
-						disabled={isDisabled || isAPIKeyEnvManaged}
-						className="m-0 w-full border-0 bg-transparent p-0 text-lg font-medium text-content-primary outline-none placeholder:text-content-secondary focus:ring-0"
-						placeholder={formatProviderLabel(provider)}
-					/>
-				</div>
-				<Tooltip>
-					<TooltipTrigger asChild>
-						<InfoIcon className="size-4 shrink-0 cursor-help text-content-secondary" />
-					</TooltipTrigger>
-					<TooltipContent>
-						Uses the {formatProviderLabel(provider)} API specification
-					</TooltipContent>
-				</Tooltip>
-			</div>
-			<hr className="my-4 border-0 border-t border-solid border-border" />
-			{isAPIKeyEnvManaged ? (
-				<Alert severity="info">
-					<AlertTitle>API key managed by environment variable</AlertTitle>
-					<AlertDescription>
-						This provider key is configured from deployment environment settings
-						and cannot be edited in this UI.
-					</AlertDescription>
-				</Alert>
-			) : (
-				<form
-					className="flex flex-1 flex-col"
-					onSubmit={(event) => void handleSubmit(event)}
-					autoComplete="off"
-					data-form-type="other"
-				>
-					<div className="space-y-5">
-						<ProviderField
-							label="API Key"
-							htmlFor={apiKeyInputId}
-							required={requiresAPIKey}
-							description={apiKeyDescription}
-						>
-							<div className="space-y-1.5">
-								<Input
-									id={apiKeyInputId}
-									name="provider_api_token"
-									type="password"
-									autoComplete="off"
-									data-1p-ignore
-									data-lpignore="true"
-									data-form-type="other"
-									data-bwignore
-									className="h-9 font-mono text-[13px] [-webkit-text-security:disc]"
-									placeholder={apiKeyPlaceholder}
-									required={requiresAPIKey}
-									value={apiKey}
-									onFocus={handleApiKeyFocus}
-									onChange={(event) => {
-										setApiKey(event.target.value);
-										setApiKeyTouched(true);
-										setApiKeyModified(true);
-									}}
-									disabled={isDisabled}
-								/>
-								{hasAPIKeyWhitespace && (
-									<p className="m-0 text-xs text-content-destructive">
-										API key must not contain leading or trailing whitespace.
-									</p>
-								)}
-								{isBedrockProvider &&
-									providerState.hasManagedAPIKey &&
-									!isDisabled &&
-									(!apiKeyModified || apiKey !== "") && (
-										<div className="flex justify-end">
-											<button
-												type="button"
-												className="appearance-none border-0 bg-transparent p-0 text-xs text-content-link hover:cursor-pointer hover:underline"
-												onClick={() => {
-													setApiKey("");
-													setApiKeyTouched(true);
-													setApiKeyModified(true);
-												}}
-											>
-												Clear stored token
-											</button>
-										</div>
-									)}
-							</div>
-						</ProviderField>
-
-						<ProviderField
-							label="Base URL"
-							htmlFor={baseURLInputId}
-							description={baseURLDescription}
-						>
-							<Input
-								id={baseURLInputId}
-								name="provider_base_url"
-								className="h-9 text-[13px]"
-								placeholder={baseURLPlaceholder}
-								required
-								autoComplete="off"
-								value={baseURLValue}
-								onChange={(event) => setBaseURLValue(event.target.value)}
-								disabled={isDisabled}
-							/>
-						</ProviderField>
-					</div>
-					<div className="mt-auto pt-6">
-						<hr className="mb-4 border-0 border-t border-solid border-border" />
-						<div className="flex items-center justify-between">
-							{providerConfig ? (
-								<Button
-									variant="outline"
-									size="lg"
-									type="button"
-									className="text-content-secondary hover:text-content-destructive hover:border-border-destructive"
-									disabled={isDisabled}
-									onClick={() => setConfirmingDelete(true)}
-								>
-									Delete
-								</Button>
-							) : (
-								<div />
-							)}
-							<div className="flex items-center gap-2">
-								{canAddModel && (
-									<Button size="lg" type="button" onClick={handleAddModel}>
-										Add model
-									</Button>
-								)}
-								<Button
-									size="lg"
-									type="submit"
-									variant={canAddModel ? "outline" : undefined}
-									disabled={!canSave}
-								>
-									{isProviderMutationPending && (
-										<Spinner className="h-4 w-4" loading />
-									)}
-									{providerConfig ? "Save changes" : "Create provider config"}
-								</Button>
-							</div>
-						</div>
-					</div>
-				</form>
-			)}
-			{providerConfig && (
-				<ConfirmDeleteDialog
-					entity="provider"
-					description={deleteProviderDescription}
-					onConfirm={() => void onDeleteProvider(providerConfig.id)}
-					isPending={isProviderMutationPending}
-					open={confirmingDelete}
-					onOpenChange={(open) => !open && setConfirmingDelete(false)}
-				/>
-			)}
-		</div>
-	);
-};
-interface ProviderFieldProps {
-	label: string;
-	htmlFor?: string;
-	required?: boolean;
-	description?: string;
-	children: ReactNode;
-}
-
-export const ProviderField: FC<ProviderFieldProps> = ({
-	label,
-	htmlFor,
-	required,
-	description,
-	children,
-}) => (
-	<div className="grid gap-1.5">
-		<div className="flex items-baseline gap-1.5">
-			<label
-				htmlFor={htmlFor}
-				className="text-sm font-medium text-content-primary"
-			>
-				{label}
-			</label>
-			{required && (
-				<span className="text-xs font-bold text-content-destructive">*</span>
-			)}
-		</div>
-		{description && (
-			<p className="m-0 text-xs text-content-secondary">{description}</p>
-		)}
-		{children}
-	</div>
-);
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderIcon.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderIcon.tsx
index 4bbf2ed585..b42c214d9b 100644
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderIcon.tsx
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderIcon.tsx
@@ -1,9 +1,9 @@
 import { ServerIcon } from "lucide-react";
 import type { FC } from "react";
 import { ExternalImage } from "#/components/ExternalImage/ExternalImage";
+import { normalizeProvider } from "#/modules/aiModels/helpers";
 import { cn } from "#/utils/cn";
 import { formatProviderLabel } from "../../utils/modelOptions";
-import { normalizeProvider } from "./helpers";
 
 const providerIconMap: Record<string, string> = {
 	openai: "/icon/openai.svg",
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProvidersSection.tsx b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProvidersSection.tsx
deleted file mode 100644
index 56b3d293bf..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProvidersSection.tsx
+++ /dev/null
@@ -1,296 +0,0 @@
-import {
-	CheckCircleIcon,
-	ChevronRightIcon,
-	CircleIcon,
-	PlusIcon,
-} from "lucide-react";
-import type { FC } from "react";
-import { useLocation, useNavigate, useSearchParams } from "react-router";
-import {
-	type AIProviderType,
-	AIProviderTypes,
-	type CreateChatProviderConfigRequest,
-	type UpdateChatProviderConfigRequest,
-} from "#/api/typesGenerated";
-import { Badge } from "#/components/Badge/Badge";
-import { Button } from "#/components/Button/Button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from "#/components/DropdownMenu/DropdownMenu";
-import { cn } from "#/utils/cn";
-import { formatProviderLabel } from "../../utils/modelOptions";
-import { SectionHeader } from "../SectionHeader";
-import type {
-	CreateProviderResult,
-	ProviderState,
-} from "./ChatModelAdminPanel";
-import { getDefaultProviderBaseURL } from "./helpers";
-import { ProviderForm } from "./ProviderForm";
-import { ProviderIcon } from "./ProviderIcon";
-
-type ProviderView =
-	| { mode: "list" }
-	| { mode: "detail"; provider: string }
-	| { mode: "new"; providerType: AIProviderType };
-
-const providerTypeOptions = AIProviderTypes.map((providerType) => ({
-	providerType,
-	label: formatProviderLabel(providerType),
-})).sort((a, b) => a.label.localeCompare(b.label));
-
-const getAIProviderType = (
-	value: string | null,
-): AIProviderType | undefined => {
-	if (!value) {
-		return undefined;
-	}
-	return AIProviderTypes.find((providerType) => providerType === value);
-};
-
-const newProviderState = (providerType: AIProviderType): ProviderState => ({
-	key: `new:${providerType}`,
-	provider: providerType,
-	label: formatProviderLabel(providerType),
-	providerConfig: undefined,
-	modelConfigs: [],
-	catalogModelCount: 0,
-	hasManagedAPIKey: false,
-	hasCatalogAPIKey: false,
-	hasEffectiveAPIKey: false,
-	allowUserAPIKey: true,
-	isEnvPreset: false,
-	baseURL: getDefaultProviderBaseURL(providerType),
-});
-
-interface ProvidersSectionProps {
-	sectionLabel?: string;
-	sectionDescription?: string;
-	providerStates: readonly ProviderState[];
-	providerConfigsUnavailable: boolean;
-	isProviderMutationPending: boolean;
-	onCreateProvider: (
-		req: CreateChatProviderConfigRequest,
-	) => Promise<CreateProviderResult>;
-	onUpdateProvider: (
-		providerConfigId: string,
-		req: UpdateChatProviderConfigRequest,
-	) => Promise<unknown>;
-	onDeleteProvider: (providerConfigId: string) => Promise<void>;
-}
-
-export const ProvidersSection: FC<ProvidersSectionProps> = ({
-	sectionLabel,
-	sectionDescription,
-	providerStates,
-	providerConfigsUnavailable,
-	isProviderMutationPending,
-	onCreateProvider,
-	onUpdateProvider,
-	onDeleteProvider,
-}) => {
-	const [searchParams, setSearchParams] = useSearchParams();
-	const navigate = useNavigate();
-	const location = useLocation();
-	const canGoBack =
-		(location.state as { pushed?: boolean } | null)?.pushed === true;
-
-	// Derive the current view from URL search params so that
-	// browser back/forward navigation works as expected.
-	const view: ProviderView = (() => {
-		const providerParam = searchParams.get("provider");
-		if (providerParam) {
-			const exists = providerStates.some((ps) => ps.key === providerParam);
-			return exists
-				? { mode: "detail", provider: providerParam }
-				: { mode: "list" };
-		}
-
-		const newProviderType = getAIProviderType(searchParams.get("newProvider"));
-		if (newProviderType) {
-			return { mode: "new", providerType: newProviderType };
-		}
-
-		return { mode: "list" };
-	})();
-
-	// Clear provider search param and return to the list.
-	const clearProviderView = () => {
-		setSearchParams((prev) => {
-			const next = new URLSearchParams(prev);
-			next.delete("provider");
-			next.delete("newProvider");
-			return next;
-		});
-	};
-
-	const openNewProviderView = (providerType: AIProviderType) => {
-		setSearchParams(
-			(prev) => {
-				const next = new URLSearchParams(prev);
-				next.delete("provider");
-				next.set("newProvider", providerType);
-				return next;
-			},
-			{ state: { pushed: true } },
-		);
-	};
-	// Detail view.
-	const detailProvider =
-		view.mode === "detail"
-			? providerStates.find((ps) => ps.key === view.provider)
-			: view.mode === "new"
-				? newProviderState(view.providerType)
-				: undefined;
-
-	if ((view.mode === "detail" || view.mode === "new") && detailProvider) {
-		const providerFormKey = [
-			detailProvider.provider,
-			detailProvider.providerConfig?.id ?? "new",
-			detailProvider.providerConfig?.display_name ?? "",
-			detailProvider.providerConfig?.base_url ?? detailProvider.baseURL,
-			detailProvider.providerConfig?.central_api_key_enabled ?? true,
-			detailProvider.providerConfig?.allow_user_api_key ?? false,
-			detailProvider.providerConfig?.allow_central_api_key_fallback ?? false,
-			detailProvider.providerConfig?.has_api_key ??
-				detailProvider.hasManagedAPIKey,
-			detailProvider.providerConfig?.updated_at ?? "",
-		].join("|");
-
-		return (
-			<ProviderForm
-				key={providerFormKey}
-				providerState={detailProvider}
-				providerConfigsUnavailable={providerConfigsUnavailable}
-				isProviderMutationPending={isProviderMutationPending}
-				onCreateProvider={async (req) => {
-					const createdProvider = await onCreateProvider(req);
-					if (createdProvider.id) {
-						setSearchParams(
-							(prev) => {
-								const next = new URLSearchParams(prev);
-								next.set("provider", createdProvider.id);
-								next.delete("newProvider");
-								return next;
-							},
-							{ replace: true, state: location.state },
-						);
-					}
-					return createdProvider;
-				}}
-				onUpdateProvider={onUpdateProvider}
-				onDeleteProvider={async (id) => {
-					await onDeleteProvider(id);
-					if (canGoBack) {
-						navigate(-1);
-					} else {
-						setSearchParams(
-							(prev) => {
-								const next = new URLSearchParams(prev);
-								next.delete("provider");
-								next.delete("newProvider");
-								return next;
-							},
-							{ replace: true },
-						);
-					}
-				}}
-				onBack={clearProviderView}
-			/>
-		);
-	}
-
-	// List view.
-	const addProviderAction = (
-		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
-				<Button
-					variant="outline"
-					size="sm"
-					disabled={providerConfigsUnavailable || isProviderMutationPending}
-				>
-					<PlusIcon className="size-4" />
-					Add provider
-				</Button>
-			</DropdownMenuTrigger>
-			<DropdownMenuContent align="end" className="w-56">
-				{providerTypeOptions.map(({ providerType, label }) => (
-					<DropdownMenuItem
-						key={providerType}
-						className="gap-2"
-						onSelect={() => openNewProviderView(providerType)}
-					>
-						<ProviderIcon provider={providerType} className="size-5" />
-						<span>{label}</span>
-					</DropdownMenuItem>
-				))}
-			</DropdownMenuContent>
-		</DropdownMenu>
-	);
-
-	const header = sectionLabel ? (
-		<SectionHeader
-			label={sectionLabel}
-			description={
-				sectionDescription ?? "Configure AI providers to use with Agents."
-			}
-			action={addProviderAction}
-		/>
-	) : null;
-
-	return (
-		<>
-			{header}
-			{providerStates.length === 0 ? (
-				<div className="rounded-lg border border-dashed border-border bg-surface-primary p-6 text-center text-[13px] text-content-secondary">
-					No providers have been added yet.
-				</div>
-			) : (
-				<div>
-					{providerStates.map((providerState, i) => (
-						<button
-							type="button"
-							key={providerState.key}
-							aria-label={providerState.label}
-							onClick={() => {
-								setSearchParams(
-									{ provider: providerState.key },
-									{ state: { pushed: true } },
-								);
-							}}
-							className={cn(
-								"flex w-full cursor-pointer items-center gap-3.5 border-0 bg-transparent p-0 px-3 py-3 text-left transition-colors hover:bg-surface-secondary/30",
-								i > 0 && "border-0 border-t border-solid border-border/50",
-							)}
-						>
-							<ProviderIcon
-								provider={providerState.provider}
-								className="size-8 shrink-0"
-							/>
-							<div className="min-w-0 flex-1 space-y-1">
-								<div className="flex flex-wrap items-center gap-2">
-									<span className="min-w-0 truncate text-[15px] font-medium text-content-primary text-left">
-										{providerState.label}
-									</span>
-									{providerState.providerConfig?.allow_user_api_key && (
-										<Badge size="xs" className="text-content-secondary">
-											User keys enabled
-										</Badge>
-									)}
-								</div>
-							</div>
-							{providerState.hasEffectiveAPIKey ? (
-								<CheckCircleIcon className="size-4 shrink-0 text-content-success" />
-							) : (
-								<CircleIcon className="size-4 shrink-0 text-content-secondary opacity-40" />
-							)}
-							<ChevronRightIcon className="size-5 shrink-0 text-content-secondary" />
-						</button>
-					))}
-				</div>
-			)}
-		</>
-	);
-};
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/helpers.ts b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/helpers.ts
deleted file mode 100644
index ed0c57c5f6..0000000000
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/helpers.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Reads a value as a non-empty string, returning undefined for
- * empty strings, null, or undefined values.
- */
-export function readOptionalString(value: unknown): string | undefined {
-	if (typeof value !== "string") return undefined;
-	const trimmed = value.trim();
-	return trimmed || undefined;
-}
-
-/**
- * Normalizes a provider name for case-insensitive comparison.
- */
-export function normalizeProvider(provider: string): string {
-	return provider.trim().toLowerCase();
-}
-
-const canonicalProviderBaseURLs: Record<string, string> = {
-	anthropic: "https://api.anthropic.com",
-	google: "https://generativelanguage.googleapis.com/v1beta",
-	openai: "https://api.openai.com/v1",
-	openrouter: "https://openrouter.ai/api/v1",
-	vercel: "https://ai-gateway.vercel.sh/v1",
-};
-
-export function getDefaultProviderBaseURL(provider: string): string {
-	return canonicalProviderBaseURLs[normalizeProvider(provider)] ?? "";
-}
-
-export function getProviderBaseURLPlaceholder(provider: string): string {
-	switch (normalizeProvider(provider)) {
-		case "azure":
-			return "https://<resource-name>.openai.azure.com";
-		case "bedrock":
-			return "https://bedrock-runtime.<region>.amazonaws.com";
-		case "openai-compat":
-			return "https://api.example.com/v1";
-		default:
-			return getDefaultProviderBaseURL(provider) || "https://api.example.com";
-	}
-}
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/knownModels/index.ts b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/knownModels/index.ts
index 6635e82725..76161aaa34 100644
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/knownModels/index.ts
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/knownModels/index.ts
@@ -1,4 +1,4 @@
-import { normalizeProvider } from "../helpers";
+import { normalizeProvider } from "#/modules/aiModels/helpers";
 import { anthropicKnownModels } from "./anthropic";
 import { openAIKnownModels } from "./openai";
 import type { KnownModel, KnownModelSourceMetadata } from "./types";
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.test.ts b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.test.ts
index 4ea0d39b63..bcd1a6b0d2 100644
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.test.ts
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import type { FieldSchema } from "#/api/chatModelOptions";
 import type * as TypesGen from "#/api/typesGenerated";
 import { MockChatModelConfig } from "#/testHelpers/chatModels";
 import {
@@ -6,6 +7,8 @@ import {
 	buildModelConfigFromForm,
 	emptyModelConfigFormState,
 	extractModelConfigFormState,
+	hasFieldValue,
+	isFieldConflictDisabled,
 	type ModelConfigFormState,
 	parsePositiveInteger,
 	parseThresholdInteger,
@@ -694,6 +697,50 @@ describe("buildModelConfigFromForm", () => {
 		});
 	});
 
+	describe("visible_when gating", () => {
+		it("drops gated sub-fields when the gating field is off", () => {
+			const result = buildModelConfigFromForm(
+				"openai",
+				formWith({
+					openai: {
+						webSearchEnabled: "false",
+						searchContextSize: "high",
+						allowedDomains: '["example.com"]',
+					},
+				}),
+			);
+			expect(result.fieldErrors).toEqual({});
+			const openai = result.modelConfig?.provider_options?.openai as Record<
+				string,
+				unknown
+			>;
+			expect(openai).not.toHaveProperty("search_context_size");
+			expect(openai).not.toHaveProperty("allowed_domains");
+			expect(openai.web_search_enabled).toBe(false);
+		});
+
+		it("keeps gated sub-fields when the gating field is on", () => {
+			const result = buildModelConfigFromForm(
+				"openai",
+				formWith({
+					openai: {
+						webSearchEnabled: "true",
+						searchContextSize: "high",
+						allowedDomains: '["example.com"]',
+					},
+				}),
+			);
+			expect(result.fieldErrors).toEqual({});
+			const openai = result.modelConfig?.provider_options?.openai as Record<
+				string,
+				unknown
+			>;
+			expect(openai.web_search_enabled).toBe(true);
+			expect(openai.search_context_size).toBe("high");
+			expect(openai.allowed_domains).toEqual(["example.com"]);
+		});
+	});
+
 	describe("Anthropic / Bedrock provider", () => {
 		it("builds Anthropic provider options with effort", () => {
 			const result = buildModelConfigFromForm(
@@ -1177,3 +1224,92 @@ describe("buildModelConfigFromForm", () => {
 		});
 	});
 });
+
+// ── hasFieldValue ─────────────────────────────────────────────
+
+describe("hasFieldValue", () => {
+	it("returns false for an empty string", () => {
+		expect(hasFieldValue("")).toBe(false);
+	});
+
+	it("returns false for whitespace-only string", () => {
+		expect(hasFieldValue("   ")).toBe(false);
+		expect(hasFieldValue("\t\n")).toBe(false);
+	});
+
+	it("returns false for the empty JSON array sentinel '[]'", () => {
+		expect(hasFieldValue("[]")).toBe(false);
+	});
+
+	it("returns false for '[]' with surrounding whitespace", () => {
+		expect(hasFieldValue("  []  ")).toBe(false);
+	});
+
+	it("returns true for a non-empty string", () => {
+		expect(hasFieldValue("hello")).toBe(true);
+		expect(hasFieldValue("  hello  ")).toBe(true);
+	});
+
+	it("returns true for a non-empty JSON array", () => {
+		expect(hasFieldValue('["example.com"]')).toBe(true);
+	});
+
+	it("returns false for non-string values", () => {
+		expect(hasFieldValue(undefined)).toBe(false);
+		expect(hasFieldValue(null)).toBe(false);
+		expect(hasFieldValue(42)).toBe(false);
+		expect(hasFieldValue(true)).toBe(false);
+		expect(hasFieldValue({})).toBe(false);
+	});
+});
+
+// ── isFieldConflictDisabled ──────────────────────────────────
+
+describe("isFieldConflictDisabled", () => {
+	const makeReader =
+		(values: Record<string, unknown>): ((jsonName: string) => unknown) =>
+		(jsonName: string): unknown =>
+			values[jsonName];
+
+	const field = (overrides: Partial<FieldSchema> = {}): FieldSchema => ({
+		json_name: "field_a",
+		go_name: "FieldA",
+		type: "string",
+		required: false,
+		input_type: "input",
+		conflicts_with: ["field_b"],
+		...overrides,
+	});
+
+	it("disables the field when a sibling has a value and this field is empty", () => {
+		const reader = makeReader({ field_a: "", field_b: "some-value" });
+		expect(isFieldConflictDisabled(field(), reader)).toBe(true);
+	});
+
+	it("does not disable when the field has its own value, even if a sibling is set", () => {
+		const reader = makeReader({ field_a: "my-value", field_b: "some-value" });
+		expect(isFieldConflictDisabled(field(), reader)).toBe(false);
+	});
+
+	it("does not disable when the field has no conflicts_with", () => {
+		const reader = makeReader({ field_a: "", field_b: "some-value" });
+		expect(
+			isFieldConflictDisabled(field({ conflicts_with: undefined }), reader),
+		).toBe(false);
+	});
+
+	it("does not disable when the sibling value is empty", () => {
+		const reader = makeReader({ field_a: "", field_b: "" });
+		expect(isFieldConflictDisabled(field(), reader)).toBe(false);
+	});
+
+	it("does not disable when the sibling value is whitespace-only", () => {
+		const reader = makeReader({ field_a: "", field_b: "   " });
+		expect(isFieldConflictDisabled(field(), reader)).toBe(false);
+	});
+
+	it("does not disable when the sibling value is the empty array sentinel '[]'", () => {
+		const reader = makeReader({ field_a: "", field_b: "[]" });
+		expect(isFieldConflictDisabled(field(), reader)).toBe(false);
+	});
+});
diff --git a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.ts b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.ts
index b62b73de08..972e81e620 100644
--- a/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.ts
+++ b/site/src/pages/AgentsPage/components/ChatModelAdminPanel/modelConfigFormLogic.ts
@@ -98,6 +98,37 @@ export function deepGet(obj: unknown, path: string[]): unknown {
 const hasObjectKeys = (value: Record<string, unknown>): boolean =>
 	Object.keys(value).length > 0;
 
+export const isVisibleWhenSatisfied = (
+	field: FieldSchema,
+	readSiblingValue: (jsonName: string) => unknown,
+): boolean =>
+	!field.visible_when || readSiblingValue(field.visible_when) === "true";
+
+// A field counts as "set" when it holds a non-empty value. JSON array fields
+// serialize to "[]" when empty, so that is treated as unset too.
+export const hasFieldValue = (raw: unknown): boolean => {
+	if (typeof raw !== "string") {
+		return false;
+	}
+	const trimmed = raw.trim();
+	return trimmed.length > 0 && trimmed !== "[]";
+};
+
+/**
+ * conflicts_with: disable the field while a mutually exclusive sibling holds
+ * a value, unless this field also has one so a both-set state stays
+ * recoverable.
+ */
+export const isFieldConflictDisabled = (
+	field: FieldSchema,
+	readSiblingValue: (jsonName: string) => unknown,
+): boolean =>
+	Boolean(field.conflicts_with) &&
+	!hasFieldValue(readSiblingValue(field.json_name)) &&
+	(field.conflicts_with ?? []).some((sibling) =>
+		hasFieldValue(readSiblingValue(sibling)),
+	);
+
 /**
  * Convert a form string value to its API representation based on
  * the field schema type. Empty strings yield `undefined` so
@@ -507,7 +538,14 @@ export const buildModelConfigFromForm = (
 	if (providerFormState && typeof providerFormState === "object") {
 		const providerPayload: Record<string, unknown> = {};
 
+		const readProviderValue = (jsonName: string): unknown =>
+			deepGet(providerFormState, jsonName.split(".").map(snakeToCamel));
+
 		for (const field of getProviderFields(resolved)) {
+			// Skip fields hidden by an unsatisfied `visible_when` gate so
+			// stale values left in form state are not serialized.
+			if (!isVisibleWhenSatisfied(field, readProviderValue)) continue;
+
 			// Read the form value from the nested camelCase structure.
 			const camelSegments = field.json_name.split(".").map(snakeToCamel);
 			const formValue = deepGet(providerFormState, camelSegments);
diff --git a/site/src/pages/AgentsPage/components/ChatsSidebar/settings/SettingsPanel.tsx b/site/src/pages/AgentsPage/components/ChatsSidebar/settings/SettingsPanel.tsx
index e5b3bec748..fc1535e5be 100644
--- a/site/src/pages/AgentsPage/components/ChatsSidebar/settings/SettingsPanel.tsx
+++ b/site/src/pages/AgentsPage/components/ChatsSidebar/settings/SettingsPanel.tsx
@@ -173,9 +173,9 @@ export const SettingsPanel: FC<SettingsPanelProps> = ({
 					<SettingsNavItem
 						icon={BoxesIcon}
 						label="Models"
-						active={settingsSection === "models"}
-						to="/agents/settings/models"
-						state={location.state}
+						active={false}
+						to="/ai/settings/models"
+						trailingIcon={ArrowUpRightIcon}
 					/>
 					<SettingsNavItem
 						icon={ServerIcon}
diff --git a/site/src/pages/AgentsPage/components/MCPServerAdminPanel.tsx b/site/src/pages/AgentsPage/components/MCPServerAdminPanel.tsx
index c9d67b108f..2ec4cabcb2 100644
--- a/site/src/pages/AgentsPage/components/MCPServerAdminPanel.tsx
+++ b/site/src/pages/AgentsPage/components/MCPServerAdminPanel.tsx
@@ -51,7 +51,7 @@ import {
 } from "#/components/Tooltip/Tooltip";
 import { cn } from "#/utils/cn";
 import { BackButton } from "./BackButton";
-import { ProviderField as Field } from "./ChatModelAdminPanel/ProviderForm";
+import { ProviderField as Field } from "./ChatModelAdminPanel/ProviderField";
 import { ConfirmDeleteDialog } from "./ConfirmDeleteDialog";
 import { SectionHeader } from "./SectionHeader";
 
diff --git a/site/src/router.tsx b/site/src/router.tsx
index 7a6f0cee4b..9d46c3c6c8 100644
--- a/site/src/router.tsx
+++ b/site/src/router.tsx
@@ -391,9 +391,6 @@ const AgentSettingsPersonalSkillsPage = lazy(
 const AgentSettingsAPIKeysPage = lazy(
 	() => import("./pages/AgentsPage/AgentSettingsAPIKeysPage"),
 );
-const AgentSettingsModelsPage = lazy(
-	() => import("./pages/AgentsPage/AgentSettingsModelsPage"),
-);
 const AgentSettingsMCPServersPage = lazy(
 	() => import("./pages/AgentsPage/AgentSettingsMCPServersPage"),
 );
@@ -450,6 +447,16 @@ const AISettingsAddProviderPage = lazy(
 const AISettingsGatewayKeysPage = lazy(
 	() => import("./pages/AISettingsPage/GatewayKeysPage/GatewayKeysPage"),
 );
+const AISettingsModelsPage = lazy(
+	() => import("./pages/AISettingsPage/ModelsPage/ModelsPage"),
+);
+const AISettingsAddModelPage = lazy(
+	() => import("./pages/AISettingsPage/ModelsPage/AddModelPage/AddModelPage"),
+);
+const AISettingsUpdateModelPage = lazy(
+	() =>
+		import("./pages/AISettingsPage/ModelsPage/UpdateModelPage/UpdateModelPage"),
+);
 
 const AISettingsIndexPage = () => {
 	const { permissions } = useAuthenticated();
@@ -723,6 +730,12 @@ export const router = createBrowserRouter(
 							element={<AISettingsGatewayKeysPage />}
 						/>
 						<Route index element={<AISettingsIndexPage />} />
+						<Route path="models" element={<AISettingsModelsPage />} />
+						<Route path="models/add" element={<AISettingsAddModelPage />} />
+						<Route
+							path="models/:modelId"
+							element={<AISettingsUpdateModelPage />}
+						/>
 						<Route path="add" element={<AISettingsAddProviderPage />} />
 						<Route
 							path=":providerId"
@@ -812,7 +825,10 @@ export const router = createBrowserRouter(
 							path="providers"
 							element={<Navigate to="/ai/settings" replace />}
 						/>
-						<Route path="models" element={<AgentSettingsModelsPage />} />
+						<Route
+							path="models"
+							element={<Navigate to="/ai/settings/models" replace />}
+						/>
 						<Route
 							path="mcp-servers"
 							element={<AgentSettingsMCPServersPage />}
diff --git a/site/src/testHelpers/chatModels.ts b/site/src/testHelpers/chatModels.ts
index 04e69328fc..bc4e9a62ec 100644
--- a/site/src/testHelpers/chatModels.ts
+++ b/site/src/testHelpers/chatModels.ts
@@ -1,4 +1,8 @@
-import type { ChatModelConfig, ChatProviderConfig } from "#/api/typesGenerated";
+import type {
+	ChatModelConfig,
+	ChatModelProvider,
+	ChatProviderConfig,
+} from "#/api/typesGenerated";
 import { MOCK_TIMESTAMP } from "./chatEntities";
 
 export const MockChatModelConfig: ChatModelConfig = {
@@ -28,3 +32,9 @@ export const MockChatProviderConfig: ChatProviderConfig = {
 	created_at: MOCK_TIMESTAMP,
 	updated_at: MOCK_TIMESTAMP,
 };
+
+export const MockChatModelProvider: ChatModelProvider = {
+	provider: "openai",
+	available: true,
+	models: [],
+};