fix(provider): let meta oauth profiles sign in again

Author: TheGreatAxios

src/tui/provider-setup.test.ts

@@ -343,7 +343,23 @@ describe("provider setup pure helpers", () => {
     expect(suggestMetaOAuthProfileSlug([], ["meta/default"])).toBe("default-2");
     expect(suggestMetaOAuthProfileSlug([], [])).toBe("default");
     expect(metaOAuthSlugBlockedByApiKey("work", ["meta/work"])).toBe(true);
-    expect(metaOAuthSlugBlockedByApiKey("work", ["meta-api/work"])).toBe(false);
+    expect(metaOAuthSlugBlockedByApiKey("work", ["meta-api/work"])).toBe(true);
+  });
+
+  test("an existing Meta OAuth profile is not treated as an API key", () => {
+    expect(metaOAuthSlugBlockedByApiKey("work", ["meta/work"], ["work"])).toBe(
+      false,
+    );
+    expect(
+      metaOAuthSlugBlockedByApiKey("work", [
+        { name: "meta/work", apiKey: "identity-token", metaProfile: "work" },
+      ]),
+    ).toBe(false);
+    expect(
+      metaOAuthSlugBlockedByApiKey("work", [
+        { name: "meta/work", apiKey: "LLM|pasted" },
+      ]),
+    ).toBe(true);
   });
 
   test("the pick-list ends with custom and every known provider is launchable", () => {

src/tui/provider/oauth.ts

@@ -93,12 +93,38 @@ export function suggestMetaOAuthProfileSlug(
   ]);
 }
 
-/** True when `slug` is already an API-key instance, not an OAuth profile. */
+/** True when `slug` names an API-key row, not an OAuth profile. */
 export function metaOAuthSlugBlockedByApiKey(
   slug: string,
-  existingProviderNames: readonly string[],
+  rows: readonly (
+    | string
+    | {
+        readonly name: string;
+        readonly apiKey?: string;
+        readonly metaProfile?: string;
+      }
+  )[],
+  authProfiles: readonly string[] = [],
 ): boolean {
-  return instanceSlugsForKind("meta", existingProviderNames).includes(slug);
+  if (authProfiles.includes(slug)) return false;
+  for (const row of rows) {
+    if (typeof row !== "string" && row.metaProfile === slug) return false;
+  }
+  const names = rows.map((row) => (typeof row === "string" ? row : row.name));
+  if (instanceSlugsForKind("meta-api", names).includes(slug)) return true;
+  for (const row of rows) {
+    const name = typeof row === "string" ? row : row.name;
+    if (!instanceSlugsForKind("meta", [name]).includes(slug)) continue;
+    if (typeof row !== "string" && row.metaProfile !== undefined) continue;
+    if (
+      typeof row !== "string" &&
+      (typeof row.apiKey !== "string" || row.apiKey.length === 0)
+    ) {
+      continue;
+    }
+    return true;
+  }
+  return false;
 }
 
 /**
@@ -450,7 +476,7 @@ export function createAccountNameFlow(
       if (state.settled || attempt !== state.oauthNameAttempt) return;
       if (
         state.choice?.oauth === "meta" &&
-        metaOAuthSlugBlockedByApiKey(slug, state.existingProviderNames)
+        metaOAuthSlugBlockedByApiKey(slug, state.existingProviderNames, names)
       ) {
         state.oauthProfileError = "that name is an API key";
         state.oauthProfileConfirmPending = false;