Onboard: fix non-interactive auth-choice routing

sawyer-shi · sawyer-shi · commit 2d72eebbb72c · 2026-03-16T22:04:30.000+08:00
diff --git a/src/commands/onboard-core-auth-flags.ts b/src/commands/onboard-core-auth-flags.ts
@@ -1,6 +1,6 @@
 import type { AuthChoice, OnboardOptions } from "./onboard-types.js";
 
-type OnboardCoreAuthOptionKey = keyof Pick<OnboardOptions, "litellmApiKey">;
+type OnboardCoreAuthOptionKey = keyof Pick<OnboardOptions, "litellmApiKey" | "azureOpenaiApiKey">;
 
 export type OnboardCoreAuthFlag = {
   optionKey: OnboardCoreAuthOptionKey;
@@ -11,6 +11,13 @@ export type OnboardCoreAuthFlag = {
 };
 
 export const CORE_ONBOARD_AUTH_FLAGS: ReadonlyArray<OnboardCoreAuthFlag> = [
+  {
+    optionKey: "azureOpenaiApiKey",
+    authChoice: "azure-openai-api-key",
+    cliFlag: "--azure-openai-api-key",
+    cliOption: "--azure-openai-api-key <key>",
+    description: "Azure OpenAI API key",
+  },
   {
     optionKey: "litellmApiKey",
     authChoice: "litellm-api-key",
diff --git a/src/commands/onboard-non-interactive/local/auth-choice.ts b/src/commands/onboard-non-interactive/local/auth-choice.ts
@@ -162,24 +162,6 @@ export async function applyNonInteractiveAuthChoice(params: {
     return null;
   }
 
-  const pluginProviderChoice = await applyNonInteractivePluginProviderChoice({
-    nextConfig,
-    authChoice,
-    opts,
-    runtime,
-    baseConfig,
-    resolveApiKey: (input) =>
-      resolveApiKey({
-        ...input,
-        cfg: baseConfig,
-        runtime,
-      }),
-    toApiKeyCredential,
-  });
-  if (pluginProviderChoice !== undefined) {
-    return pluginProviderChoice;
-  }
-
   const simpleApiKeyChoice = await applySimpleNonInteractiveApiKeyChoice({
     authChoice,
     nextConfig,
@@ -485,6 +467,24 @@ export async function applyNonInteractiveAuthChoice(params: {
     }
   }
 
+  const pluginProviderChoice = await applyNonInteractivePluginProviderChoice({
+    nextConfig,
+    authChoice,
+    opts,
+    runtime,
+    baseConfig,
+    resolveApiKey: (input) =>
+      resolveApiKey({
+        ...input,
+        cfg: baseConfig,
+        runtime,
+      }),
+    toApiKeyCredential,
+  });
+  if (pluginProviderChoice !== undefined) {
+    return pluginProviderChoice;
+  }
+
   if (
     authChoice === "oauth" ||
     authChoice === "chutes" ||
