iframe-proxy

ibetitsmike · 2026-08-21T23:03:25Z

Moves chat model override settings from deployment scope to organization scope, following the org-scoping of chat model configs in #28440.

Depends on #28440 (based on ethan/chat-models-availability-consolidation).

Remote dogfood UAT passed on this change, including multi-organization scenarios on a licensed deployment with real models.

Problem

Chat model configs are now owned by organizations, but the override settings that reference them stayed deployment-wide: admin subagent/title/compaction overrides in site_configs, personal overrides in user_configs, and the advisor model embedded in the advisor runtime JSON. A single deployment-level override can only point at one organization's model config, so overrides effectively worked for the default organization only, and title generation had to soften its hard-failure contract to tolerate unusable overrides.

Fix

Admin overrides (general, explore, title generation, compaction, advisor) and personal overrides (root, general, explore) become organization-scoped rows in two new typed tables, chat_organization_model_overrides and chat_user_model_overrides. Composite foreign keys on (organization_id, model_config_id) make cross-organization model references unrepresentable. The migration deletes the legacy serialized site_configs/user_configs override keys instead of migrating them; admins and users re-select models in the new organization-scoped settings.

New endpoints live under /api/experimental/organizations/{organization}/chats/model-overrides (admin defaults) and /api/experimental/organizations/{organization}/members/{user}/chats/model-overrides (personal overrides); the legacy deployment-level routes are removed. chatd resolves overrides via the chat's organization, restoring the hard-failure contract for configured-but-unusable title generation overrides. The deployment-level AllowUsers switch and advisor runtime limits stay deployment-scoped.

The Coder Agents settings UI gains a per-organization "Defaults & overrides" page under AI Settings > Models, and the personal overrides page gains an organization selector for users in multiple organizations. Advisor telemetry now reports per-organization override rows.

BREAKING CHANGE: Existing deployment-level overrides are dropped, not migrated. Every organization starts with no overrides after upgrade, and model selections must be re-applied in the new settings. The legacy deployment-level override endpoints are removed.

Closes https://linear.app/coder/issue/CODAGT-872

Note

Xum (AI agent) authored this PR on behalf of @ibetitsmike.

linear-code · 2026-08-21T23:03:29Z

github-actions · 2026-08-21T23:03:35Z

Docs preview

Check off each page once it's been reviewed. If a page changes in a later push, its checkbox clears automatically so it gets a fresh look. Pages not yet wired into the docs navigation aren't listed here.

ibetitsmike · 2026-08-21T23:04:25Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5a57249cba

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-21T23:36:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9363044002

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-21T23:57:30Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e4f1af0b11

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-22T00:09:15Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2935b3d438

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-22T00:33:22Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 940b95cb8f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-22T00:50:22Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 137f88b755

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-22T02:06:04Z

@codex review

chatgpt-codex-connector · 2026-08-22T02:11:01Z

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: 4b8e4c84d1

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

coderagents · 2026-08-22T05:33:48Z

Documentation Check

This PR moves chat model override settings from deployment scope to organization scope. The two affected published docs have been updated to match.

Updates Needed

docs/ai-coder/agents/models.md (## Model overrides section) - Addressed. Overrides are now described as organization-scoped ("Admin overrides (per organization)"), the UI location is corrected to the Defaults & overrides tab under AI Settings > Models, the personal-override organization selector is documented, the Compaction and Advisor contexts were added, the resolution order and title-generation hard-fail behavior were updated, and the closing note now points to the new org-scoped API paths (/api/experimental/organizations/{organization}/chats/model-overrides and .../members/{user}/chats/model-overrides). The migration [!IMPORTANT] note accurately reflects that legacy overrides are dropped rather than migrated.
docs/ai-coder/agents/platform-controls/advisor.md (## Configuration) - Addressed. Runtime limits (max uses per turn, max output tokens) are now scoped as deployment-wide on /api/experimental/chats/config/advisor, and the advisor model / reasoning effort are documented as organization-scoped model overrides configured on the Defaults & overrides tab, with the API section pointing to PUT /api/experimental/organizations/{organization}/chats/model-overrides/advisor.

All previously flagged documentation is now accurate.

Automated review via Coder Agents

ibetitsmike · 2026-08-22T05:43:05Z

@codex review

Xum acted on Mike's behalf: migration simplified to drop legacy overrides instead of migrating them.

chatgpt-codex-connector · 2026-08-22T05:48:05Z

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: 6ad6b1ebc2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-22T06:28:35Z

@codex review

Xum acted on Mike's behalf: added a docs caveat that legacy model overrides are dropped on upgrade.

chatgpt-codex-connector · 2026-08-22T06:33:17Z

Codex Review: Didn't find any major issues. Keep it up!

Reviewed commit: 262b443231

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

johnstcn · 2026-08-22T10:59:39Z

+	Enabled         bool                             `json:"enabled"`
+	MaxUsesPerRun   int                              `json:"max_uses_per_run"`
+	MaxOutputTokens int64                            `json:"max_output_tokens"`
+	Overrides       []AgentsAdvisorOverrideTelemetry `json:"overrides"`


👀 the telemetry snapshot format is changing? Might need to handle this in the telemetry server.

The advisor entry does change shape (single provider/model -> per-org overrides array). Deployment.AgentsExperiments is documented as opaque per-experiment JSON precisely so the reported set can rotate as a code-only change, and the field is omitted entirely by older coderd versions, so consumers already have to tolerate variance. That said, I cannot see the telemetry server from here to confirm nothing parses the advisor entry structurally, so leaving this thread open for you to confirm or route.

Xum acted on Mike's behalf.

Quick check: it seems to be stored as bigquery.NullJSON so won't break telemetry-server but will need to be handled by consumers. It would be worth adding or updating fixtures in telemetry conversion tests.

Confirmed on the telemetry-server side: convert.go passes AgentsExperiments through opaquely (json.RawMessage -> bigquery.NullJSON, no structural parsing), so nothing breaks. convert_test.go's Deployment case carries an advisor fixture with the old shape ({"advisor":{"enabled":true,"provider":"openai"}}); it still passes because the payload is opaque, but it should be refreshed to the new overrides-array shape so the fixtures document reality. That fixture lives in coder-telemetry-server, so it needs a small separate PR there; queued on our side.

Xum acted on Mike's behalf.

Fixture PR opened: coder/coder-telemetry-server#48 (updates the Deployment conversion test's advisor fixture to the new overrides-array shape; conversion is confirmed opaque so no server change needed).

Xum acted on Mike's behalf.

ethanndickson · 2026-08-24T09:49:15Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d75e734178

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-08-24T09:54:53Z

+	// fails, the rows must stay rendered with the error inline so a stale
+	// override can still be cleared without the catalog.
+	const { loadError, refetchError } = splitModelQueryErrors(overridesQuery);
+	const inlineError = refetchError ?? modelsQuery.error;


Separate override refetch errors from model errors

When cached overrides exist and a background override refetch fails while the model query remains healthy, refetchError is folded into inlineError and then passed to every row as modelsError; each row consequently reports "Failed to load models" even though only the overrides request failed. Keep the override refetch error separate from modelsQuery.error so this refetch state is not misdiagnosed across all rows.

AGENTS.md reference: site/AGENTS.md:L11-L11

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-08-24T09:54:54Z

+					{mcpServersQuery.error != null && (
+						<ErrorAlert error={mcpServersQuery.error} />
+					)}


Render the MCP load error only once

When the initial MCP server request fails and has no cached data, both this unconditional block and the earlier data === undefined block render the same ErrorAlert, so users see a duplicate error banner for a single failure. Remove one rendering path or make the conditions mutually exclusive.

Useful? React with 👍 / 👎.

…erride stories

Fetch advisor overrides for telemetry in one bulk query instead of one query per organization, keep the Clear action usable when an organization has no enabled models, remount override settings forms on organization switch so mutation state never leaks across organizations, and resolve the sidebar personal-overrides feature flag through an accessible organization for users outside the default organization.

Parse the stored advisor config JSON inside plpgsql exception handlers in both migration directions so a malformed persisted value cannot abort an upgrade or rollback, and keep chat creation blocked when the personal override fetch fails so a catalog fallback is never submitted as an explicit model that bypasses the saved root override.

Seed legacy mode-only personal overrides into every organization the user belongs to (they were deployment-wide) and model-backed overrides into the organization that owns the model; prefer the default organization when rolling back. Look up the referenced model under a system context in the organization override PUT so custom roles with update-but-not-read access can use the endpoint they are authorized to call. Cover the new Defaults & overrides tab with a Storybook interaction.

…ng them The data-carry migration parsed three serialized legacy formats inside SQL (colon-joined site configs, advisor config JSON, personal override strings) with exception-guarded jsonb casts and per-organization seeding rules. Deleting the legacy keys outright removes all of that: admins and users re-select models in the new organization-scoped settings. Stale advisor model fields in agents_advisor_config are harmless because reads ignore unknown JSON keys and the next settings write rewrites the blob. The ParseChatPersonalModelOverride helper existed only to parse the legacy serialized values and is now dead code.

…ped on upgrade

…on scoping

github-actions Bot assigned ibetitsmike Aug 21, 2026

chatgpt-codex-connector Bot reviewed Aug 21, 2026

View reviewed changes

Comment thread coderd/database/migrations/000583_chat_model_override_org_scope.up.sql Outdated

Comment thread site/src/pages/AgentsPage/components/AgentCreateForm.tsx Outdated

chatgpt-codex-connector Bot reviewed Aug 22, 2026

View reviewed changes

Comment thread coderd/x/chatd/compaction_override.go

chatgpt-codex-connector Bot reviewed Aug 22, 2026

View reviewed changes

Comment thread coderd/database/migrations/000583_chat_model_override_org_scope.up.sql Outdated

Comment thread site/src/pages/AISettingsPage/ModelsPage/OrganizationModelsLayout.tsx

Comment thread coderd/exp_chats.go

chatgpt-codex-connector Bot reviewed Aug 22, 2026

View reviewed changes

Comment thread site/src/pages/AgentsPage/AgentSettingsUserAgentsPageView.tsx Outdated

Comment thread site/src/pages/AISettingsPage/ModelsPage/DefaultsPage/DefaultsPageView.tsx

chatgpt-codex-connector Bot reviewed Aug 22, 2026

View reviewed changes

Comment thread site/src/pages/AISettingsPage/ModelsPage/DefaultsPage/DefaultsPageView.tsx

Comment thread coderd/exp_chats.go

ibetitsmike marked this pull request as ready for review August 22, 2026 05:31

ibetitsmike requested a review from DanielleMaywood as a code owner August 22, 2026 05:31

ibetitsmike requested review from ethanndickson and removed request for DanielleMaywood August 22, 2026 05:31

johnstcn reviewed Aug 22, 2026

View reviewed changes

Comment thread coderd/database/migrations/000583_chat_model_override_org_scope.up.sql

johnstcn reviewed Aug 22, 2026

View reviewed changes

Comment thread coderd/x/chatd/subagent.go Outdated

johnstcn reviewed Aug 22, 2026

View reviewed changes

Comment thread docs/ai-coder/agents/models.md Outdated

ethanndickson force-pushed the mike/codagt-872-org-scope-model-overrides branch from 0a8b960 to 6fbb431 Compare August 24, 2026 09:07

ethanndickson approved these changes Aug 24, 2026

View reviewed changes

ethanndickson force-pushed the mike/codagt-872-org-scope-model-overrides branch from 6fbb431 to 91d8efc Compare August 24, 2026 09:30

ethanndickson force-pushed the mike/codagt-872-org-scope-model-overrides branch from 91d8efc to d75e734 Compare August 24, 2026 09:44

chatgpt-codex-connector Bot reviewed Aug 24, 2026

View reviewed changes

ibetitsmike and others added 16 commits August 24, 2026 10:04

feat(coderd/database): add organization-scoped model overrides

abb4cdc

feat(coderd/x/chatd): scope model overrides by organization

38c261b

feat: move chat model override settings to organization scope

261a8d1

test: update organization model override stories

c168515

refactor(site/src): remove dead model override plumbing and extend ov…

1427d1f

…erride stories

docs(coderd/x/chatd): mark override sections affected by org scoping

bf968c2

fix: address organization override review round-5 findings

dd4ebbf

fix: address organization override review round-6 findings

c031a20

docs(docs/ai-coder/agents): note that legacy model overrides are drop…

d64c3ee

…ped on upgrade

docs(docs/ai-coder/agents): update model override docs for organizati…

2027288

…on scoping

refactor(coderd): extract sql.NullString pointer helper into util/ptr

59f47c5

fix(coderd): use organization middleware for model overrides

117310c

ethanndickson force-pushed the mike/codagt-872-org-scope-model-overrides branch from d75e734 to 117310c Compare August 24, 2026 10:07

ethanndickson merged commit 0ef331f into main Aug 24, 2026
31 of 52 checks passed

ethanndickson deleted the mike/codagt-872-org-scope-model-overrides branch August 24, 2026 10:20

github-actions Bot locked and limited conversation to collaborators Aug 24, 2026

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Conversation

ibetitsmike commented Aug 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Fix

Uh oh!

linear-code Bot commented Aug 21, 2026

Uh oh!

github-actions Bot commented Aug 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Docs preview

Uh oh!

ibetitsmike commented Aug 21, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 21, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 21, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ibetitsmike commented Aug 22, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 22, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 22, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 22, 2026

Uh oh!

chatgpt-codex-connector Bot commented Aug 22, 2026

Uh oh!

coderagents Bot commented Aug 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Documentation Check

Updates Needed

Uh oh!

ibetitsmike commented Aug 22, 2026

Uh oh!

chatgpt-codex-connector Bot commented Aug 22, 2026

Uh oh!

ibetitsmike commented Aug 22, 2026

Uh oh!

ibetitsmike commented Aug 21, 2026 •

edited

Loading

github-actions Bot commented Aug 21, 2026 •

edited

Loading

coderagents Bot commented Aug 22, 2026 •

edited

Loading