fix(onboard): set codex primary when auth-choice is openai-codex

mwfj · mwfj · commit dd080977c07e · 2026-03-04T01:07:33.000+08:00
When onboarding explicitly chooses openai-codex, apply the codex
primary model directly instead of using the conservative helper that
only rewrites openai/* or empty defaults. This avoids silent intent
mismatch where auth profile is codex but primary remains anthropic.

Also add regression test covering anthropic-&gt;openai-codex switch when
setDefaultModel=true.
diff --git a/src/commands/auth-choice.apply.openai.ts b/src/commands/auth-choice.apply.openai.ts
@@ -1,18 +1,17 @@
+import type { ApplyAuthChoiceParams, ApplyAuthChoiceResult } from "./auth-choice.apply.js";
+import { resolveAgentModelPrimaryValue } from "../config/model-input.js";
 import { normalizeApiKeyInput, validateApiKeyInput } from "./auth-choice.api-key.js";
 import {
   createAuthChoiceAgentModelNoter,
   ensureApiKeyFromOptionEnvOrPrompt,
   normalizeSecretInputModeInput,
 } from "./auth-choice.apply-helpers.js";
-import type { ApplyAuthChoiceParams, ApplyAuthChoiceResult } from "./auth-choice.apply.js";
 import { applyDefaultModelChoice } from "./auth-choice.default-model.js";
+import { applyPrimaryModel } from "./model-picker.js";
 import { isRemoteEnvironment } from "./oauth-env.js";
 import { applyAuthProfileConfig, setOpenaiApiKey, writeOAuthCredentials } from "./onboard-auth.js";
 import { openUrl } from "./onboard-helpers.js";
-import {
-  applyOpenAICodexModelDefault,
-  OPENAI_CODEX_DEFAULT_MODEL,
-} from "./openai-codex-model-default.js";
+import { OPENAI_CODEX_DEFAULT_MODEL } from "./openai-codex-model-default.js";
 import { loginOpenAICodexOAuth } from "./openai-codex-oauth.js";
 import {
   applyOpenAIConfig,
@@ -103,9 +102,10 @@ export async function applyAuthChoiceOpenAI(
         mode: "oauth",
       });
       if (params.setDefaultModel) {
-        const applied = applyOpenAICodexModelDefault(nextConfig);
-        nextConfig = applied.next;
-        if (applied.changed) {
+        const previousPrimary = resolveAgentModelPrimaryValue(nextConfig.agents?.defaults?.model);
+        nextConfig = applyPrimaryModel(nextConfig, OPENAI_CODEX_DEFAULT_MODEL);
+        const nextPrimary = resolveAgentModelPrimaryValue(nextConfig.agents?.defaults?.model);
+        if (nextPrimary !== previousPrimary) {
           await params.prompter.note(
             `Default model set to ${OPENAI_CODEX_DEFAULT_MODEL}`,
             "Model configured",
diff --git a/src/commands/auth-choice.test.ts b/src/commands/auth-choice.test.ts
@@ -1,16 +1,16 @@
-import fs from "node:fs/promises";
 import type { OAuthCredentials } from "@mariozechner/pi-ai";
+import fs from "node:fs/promises";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { resolveAgentModelPrimaryValue } from "../config/model-input.js";
 import type { WizardPrompter } from "../wizard/prompts.js";
+import type { AuthChoice } from "./onboard-types.js";
+import { resolveAgentModelPrimaryValue } from "../config/model-input.js";
 import { applyAuthChoice, resolvePreferredProviderForAuthChoice } from "./auth-choice.js";
 import { GOOGLE_GEMINI_DEFAULT_MODEL } from "./google-gemini-model-default.js";
 import {
   MINIMAX_CN_API_BASE_URL,
   ZAI_CODING_CN_BASE_URL,
   ZAI_CODING_GLOBAL_BASE_URL,
 } from "./onboard-auth.js";
-import type { AuthChoice } from "./onboard-types.js";
 import {
   authProfilePathForAgent,
   createAuthTestLifecycle,
@@ -189,6 +189,40 @@ describe("applyAuthChoice", () => {
     });
   });
 
+  it("sets openai-codex as primary model when onboarding chooses openai-codex", async () => {
+    await setupTempState();
+
+    loginOpenAICodexOAuth.mockResolvedValueOnce({
+      email: "user@example.com",
+      refresh: "refresh-token",
+      access: "access-token",
+      expires: Date.now() + 60_000,
+    });
+
+    const prompter = createPrompter({});
+    const runtime = createExitThrowingRuntime();
+
+    const result = await applyAuthChoice({
+      authChoice: "openai-codex",
+      config: {
+        agents: {
+          defaults: {
+            model: {
+              primary: "anthropic/claude-sonnet-4-6",
+            },
+          },
+        },
+      },
+      prompter,
+      runtime,
+      setDefaultModel: true,
+    });
+
+    expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
+      "openai-codex/gpt-5.3-codex",
+    );
+  });
+
   it("prompts and writes provider API key for common providers", async () => {
     const scenarios: Array<{
       authChoice:
