Recover non-catalog OAuth models and aliased home settings

Author: TheGreatAxios

src/config/settings.ts

@@ -419,6 +419,16 @@ export function resolveLocalSettingsPath(cwd: string, globalPath: string): strin
   return physicalPathIdentity(localPath) === physicalPathIdentity(globalPath) ? null : localPath;
 }
 
+// True when `settingsPath` is a distinct settings file from the default home
+// path. Symlink and lexical aliases of the default path are not overrides —
+// treating them as such would suppress OAuth profile projection after setup.
+export function isProgrammaticSettingsOverride(
+  settingsPath: string,
+  defaultGlobalPath: string = globalSettingsPath(),
+): boolean {
+  return physicalPathIdentity(settingsPath) !== physicalPathIdentity(defaultGlobalPath);
+}
+
 function isENOENT(err: unknown): boolean {
   return (
     typeof err === "object" &&
@@ -758,7 +768,9 @@ function recoverClobberedOAuthSelection(
   projected: Record<string, ProviderSettings> | undefined,
 ): Settings | undefined {
   const provider = projected?.[selection.provider];
-  if (provider === undefined || !provider.models.includes(selection.model)) return undefined;
+  // Auth-profile presence is enough: the selected model may be outside the
+  // projected fallback catalog (CODEX_DEFAULT_MODELS / xAI equivalents).
+  if (provider === undefined) return undefined;
   return {
     defaultProvider: selection.provider,
     providers: {

src/settings.test.ts

@@ -632,6 +632,41 @@ describe("loaders", () => {
     }
   });
 
+  test("loadSettings recovers a non-catalog OAuth model when the auth profile exists", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "ic-settings-"));
+    try {
+      const path = join(dir, "settings.json");
+      await writeFile(
+        path,
+        JSON.stringify({ provider: "codex/work", model: "gpt-special-custom" }),
+      );
+      const recovered = await loadSettings(path, {
+        recoverableOAuthProviders: {
+          "codex/work": {
+            baseURL: "https://chatgpt.com/backend-api",
+            apiKey: "oauth-token",
+            models: ["gpt-5.2-codex", "gpt-5.1-codex"],
+            defaultModel: "gpt-5.2-codex",
+          },
+        },
+      });
+      expect(recovered).toEqual({
+        defaultProvider: "codex/work",
+        providers: {
+          "codex/work": {
+            baseURL: "https://chatgpt.com/backend-api",
+            models: ["gpt-special-custom"],
+            defaultModel: "gpt-special-custom",
+          },
+        },
+      });
+      expect(JSON.stringify(recovered)).not.toContain("oauth-token");
+      expect(await loadSettings(path)).toEqual(recovered);
+    } finally {
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
   test("loadSettings keeps malformed clobber documents strict", async () => {
     const dir = await mkdtemp(join(tmpdir(), "ic-settings-"));
     try {

src/tui/onboarding.ts

@@ -1,7 +1,12 @@
 import { runTUI } from "./runner.js";
 import { buildProviderSubmitHandler } from "./provider-setup-submit.js";
 import { loadConfig, type UnconfiguredConfig } from "../config/index.js";
-import { globalSettingsPath, loadSettings, resolveLocalSettingsPath } from "../config/settings.js";
+import {
+  globalSettingsPath,
+  isProgrammaticSettingsOverride,
+  loadSettings,
+  resolveLocalSettingsPath,
+} from "../config/settings.js";
 import { activateHeldTelemetry, telemetryFirstRunPending } from "../telemetry/first-run.js";
 import { runProviderSetup } from "./provider-setup.js";
 
@@ -49,7 +54,7 @@ export async function runOnboarding(config: UnconfiguredConfig): Promise<number>
   // settings source and suppresses the home-level OAuth profile projection.
   // Passing the default path would therefore hide a provider the operator just
   // signed into, so it is only forwarded when it really is an override.
-  const overridesSettingsPath = settingsPath !== globalSettingsPath();
+  const overridesSettingsPath = isProgrammaticSettingsOverride(settingsPath);
   const newConfig = await loadConfig(
     argv,
     overridesSettingsPath ? { globalSettingsPath: settingsPath } : {},

tests/unit/config.test.ts

@@ -119,6 +119,25 @@ test("local settings target detects a symlink alias before the settings file exi
   }
 });
 
+test("symlink alias of the default global settings path is not a programmatic override", async () => {
+  const { globalSettingsPath, isProgrammaticSettingsOverride } =
+    await import("../../src/config/settings.js");
+  const root = await mkdtemp(join(tmpdir(), "ic-unit-config-global-symlink-"));
+  const home = join(root, "home");
+  try {
+    await mkdir(join(home, ".corbits"), { recursive: true });
+    const realPath = globalSettingsPath(home);
+    await writeFile(realPath, JSON.stringify({ providers: {} }));
+    const aliasPath = join(root, "alias-settings.json");
+    await symlink(realPath, aliasPath);
+
+    expect(isProgrammaticSettingsOverride(aliasPath, realPath)).toBe(false);
+    expect(isProgrammaticSettingsOverride(join(root, "other.json"), realPath)).toBe(true);
+  } finally {
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
 test("loadSettings recovers only an exact clobbered local selection", async () => {
   const { loadSettings } = await import("../../src/config/settings.js");
   const cwd = await mkdtemp(join(tmpdir(), "ic-unit-config-recovery-"));