refactor(config): let an OAuth projection choose models per profile

Author: bwachman

src/config/codex-providers.ts

@@ -13,7 +13,7 @@ export const CODEX_PROVIDER_PREFIX = "codex/";
 const projection = createOAuthProviderProjection<CodexProfile>({
   prefix: CODEX_PROVIDER_PREFIX,
   baseURL: CODEX_BASE_URL,
-  defaultModels: CODEX_DEFAULT_MODELS,
+  models: () => CODEX_DEFAULT_MODELS,
   catalogExtras: (profile) => ({
     codexProfile: profile.name,
     ...(profile.tokens.accountId !== undefined

src/config/meta-providers.ts

@@ -7,7 +7,7 @@ export const META_PROVIDER_PREFIX = "meta/";
 const projection = createOAuthProviderProjection<MetaProfile>({
   prefix: META_PROVIDER_PREFIX,
   baseURL: META_BASE_URL,
-  defaultModels: META_DEFAULT_MODELS,
+  models: () => META_DEFAULT_MODELS,
   catalogExtras: (profile) => ({ metaProfile: profile.name }),
 });
 

src/config/oauth-providers.test.ts

@@ -3,12 +3,14 @@ import { describe, expect, test } from "bun:test";
 import type { CodexProfile } from "../auth/codex/store.js";
 import type { XaiProfile } from "../auth/xai/store.js";
 import { codexProfilesToCatalogEntries } from "./codex-providers.js";
+import { createOAuthProviderProjection } from "./oauth-providers.js";
 import { xaiProfilesToCatalogEntries } from "./xai-providers.js";
 
 // Characterization tests pinning the projection behavior both provider
 // wrappers must preserve. Name round-trips and settings projection are
 // characterized in codex-providers.test.ts and xai-providers.test.ts — only
-// cross-provider marker isolation lives here.
+// cross-provider marker isolation and the per-profile models contract live
+// here.
 
 const codexProfile: CodexProfile = {
   name: "work",
@@ -50,3 +52,45 @@ describe("catalog projection", () => {
     expect(entries[0]?.codexAccountId).toBeUndefined();
   });
 });
+
+describe("per-profile models", () => {
+  const profiles = [
+    { name: "a", tokens: { access: "ta" } },
+    { name: "b", tokens: { access: "tb" } },
+  ];
+  const perProfile: Record<string, readonly [string, ...string[]]> = {
+    a: ["m-a1", "m-a2"],
+    b: ["m-b1"],
+  };
+  const projection = createOAuthProviderProjection({
+    prefix: "p/",
+    baseURL: "https://example.invalid",
+    models: (profile) => {
+      const list = perProfile[profile.name];
+      if (list === undefined) throw new Error(`no models for ${profile.name}`);
+      return list;
+    },
+    catalogExtras: () => ({}),
+  });
+
+  test("the settings projection lists each profile's models with the first as default", () => {
+    const settings = projection.providersAsSettings(profiles);
+    expect(settings["p/a"]?.models).toEqual(["m-a1", "m-a2"]);
+    expect(settings["p/a"]?.defaultModel).toBe("m-a1");
+    expect(settings["p/b"]?.models).toEqual(["m-b1"]);
+    expect(settings["p/b"]?.defaultModel).toBe("m-b1");
+  });
+
+  test("the catalog projection lists each profile's models with the first as default", () => {
+    const entries = projection.profilesToCatalogEntries(profiles);
+    expect(entries.map((e) => [e.name, e.models, e.defaultModel])).toEqual([
+      ["p/a", ["m-a1", "m-a2"], "m-a1"],
+      ["p/b", ["m-b1"], "m-b1"],
+    ]);
+  });
+
+  test("projected lists are copies the caller can mutate without touching the source", () => {
+    projection.providersAsSettings(profiles)["p/a"]?.models.push("mutated");
+    expect(perProfile["a"]).toEqual(["m-a1", "m-a2"]);
+  });
+});

src/config/oauth-providers.ts

@@ -26,8 +26,9 @@ export interface OAuthProviderProjectionOptions<P extends OAuthProfileLike> {
   // Provider namespace including the trailing slash (e.g. "codex/").
   prefix: string;
   baseURL: string;
-  // Non-empty: the first entry doubles as the default model.
-  defaultModels: readonly [string, ...string[]];
+  // Models a profile can select. Non-empty: the first entry doubles as the
+  // default model.
+  models: (profile: P) => readonly [string, ...string[]];
   // Provider-specific catalog fields (profile marker, account id, …) merged
   // into each catalog entry so the runtime can route it to the right adapter.
   catalogExtras: (profile: P) => Partial<ProviderCatalogEntry>;
@@ -60,12 +61,13 @@ export function createOAuthProviderProjection<P extends OAuthProfileLike>(
     ): Record<string, ProviderSettings> {
       const entries: Record<string, ProviderSettings> = {};
       for (const profile of profiles) {
+        const models = options.models(profile);
         entries[providerName(profile.name)] = {
           name: providerName(profile.name),
           baseURL: options.baseURL,
           apiKey: profile.tokens.access,
-          models: [...options.defaultModels],
-          defaultModel: options.defaultModels[0],
+          models: [...models],
+          defaultModel: models[0],
         };
       }
       return entries;
@@ -74,14 +76,17 @@ export function createOAuthProviderProjection<P extends OAuthProfileLike>(
     // these carry the provider's marker fields (via catalogExtras) so the
     // runtime can route them to the matching adapter and headers.
     profilesToCatalogEntries(profiles: readonly P[]): ProviderCatalogEntry[] {
-      return profiles.map((profile) => ({
-        name: providerName(profile.name),
-        baseURL: options.baseURL,
-        apiKey: profile.tokens.access,
-        models: [...options.defaultModels],
-        defaultModel: options.defaultModels[0],
-        ...options.catalogExtras(profile),
-      }));
+      return profiles.map((profile) => {
+        const models = options.models(profile);
+        return {
+          name: providerName(profile.name),
+          baseURL: options.baseURL,
+          apiKey: profile.tokens.access,
+          models: [...models],
+          defaultModel: models[0],
+          ...options.catalogExtras(profile),
+        };
+      });
     },
   };
 }

src/config/xai-providers.ts

@@ -7,7 +7,7 @@ export const XAI_PROVIDER_PREFIX = "xai/";
 const projection = createOAuthProviderProjection<XaiProfile>({
   prefix: XAI_PROVIDER_PREFIX,
   baseURL: XAI_BASE_URL,
-  defaultModels: XAI_DEFAULT_MODELS,
+  models: () => XAI_DEFAULT_MODELS,
   catalogExtras: (profile) => ({ xaiProfile: profile.name }),
 });