fix(onboard): reject deprecated external auth choices · openclaw/openclaw@4e03762

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,13 @@ async function formatDeprecatedProviderChoiceError(`
`58`	`58`	`if (deprecatedChoice) {`
`59`	`59`	return `Auth choice ${JSON.stringify(authChoice)} is no longer supported. Use ${JSON.stringify(deprecatedChoice.choiceId)} instead, or run ${formatCliCommand("openclaw onboard")} to choose interactively.`;
`60`	`60`	`}`
`61`		`-const { resolveProviderInstallCatalogEntries } =`
	`61`	`+const { resolveDeprecatedProviderInstallCatalogEntry } =`
`62`	`62`	`await import("../plugins/provider-install-catalog.js");`
`63`		`-const externalDeprecatedChoice = resolveProviderInstallCatalogEntries({`
	`63`	`+const externalDeprecatedChoice = resolveDeprecatedProviderInstallCatalogEntry(authChoice, {`
`64`	`64`	`config: params.config,`
`65`	`65`	`env: params.env,`
`66`	`66`	`includeUntrustedWorkspacePlugins: false,`
`67`		`-}).find((entry) => entry.deprecatedChoiceIds?.includes(authChoice));`
	`67`	`+});`
`68`	`68`	`if (!externalDeprecatedChoice) {`
`69`	`69`	`return undefined;`
`70`	`70`	`}`

Original file line number	Diff line number	Diff line change
`@@ -29,22 +29,22 @@ type DetectZaiEndpoint = (params: {`
`29`	`29`	`modelId: string;`
`30`	`30`	`note: string;`
`31`	`31`	`} \| null>;`
`32`		`-type ResolveProviderInstallCatalogEntries =`
`33`		`-typeof import("../plugins/provider-install-catalog.js").resolveProviderInstallCatalogEntries;`
	`32`	`+type ResolveDeprecatedProviderInstallCatalogEntry =`
	`33`	`+typeof import("../plugins/provider-install-catalog.js").resolveDeprecatedProviderInstallCatalogEntry;`
`34`	`34`
`35`	`35`	`const GOOGLE_GEMINI_DEFAULT_MODEL = "google/gemini-3.1-pro-preview";`
`36`	`36`	`const ZAI_CODING_GLOBAL_BASE_URL = "https://api.z.ai/api/coding/paas/v4";`
`37`	`37`	`const ZAI_CODING_CN_BASE_URL = "https://open.bigmodel.cn/api/coding/paas/v4";`
`38`	`38`
`39`	`39`	`const resolvePluginProviders = vi.hoisted(() => vi.fn<() => ProviderPlugin[]>(() => []));`
`40`	`40`	`const runProviderModelSelectedHook = vi.hoisted(() => vi.fn(async () => {}));`
`41`		`-const resolveProviderInstallCatalogEntries = vi.hoisted(() =>`
`42`		`-vi.fn<ResolveProviderInstallCatalogEntries>(() => []),`
	`41`	`+const resolveDeprecatedProviderInstallCatalogEntry = vi.hoisted(() =>`
	`42`	`+vi.fn<ResolveDeprecatedProviderInstallCatalogEntry>(() => undefined),`
`43`	`43`	`);`
`44`	`44`
`45`	`45`	`vi.mock("../plugins/provider-install-catalog.js", () => ({`
	`46`	`+ resolveDeprecatedProviderInstallCatalogEntry,`
`46`	`47`	`resolveProviderInstallCatalogEntry: vi.fn(() => undefined),`
`47`		`- resolveProviderInstallCatalogEntries,`
`48`	`48`	`}));`
`49`	`49`
`50`	`50`	`vi.mock("./auth-choice.apply.api-providers.js", () => {`
`@@ -697,8 +697,8 @@ describe("applyAuthChoice", () => {`
`697`	`697`	`runProviderModelSelectedHook.mockClear();`
`698`	`698`	`detectZaiEndpoint.mockReset();`
`699`	`699`	`detectZaiEndpoint.mockResolvedValue(null);`
`700`		`-resolveProviderInstallCatalogEntries.mockReset();`
`701`		`-resolveProviderInstallCatalogEntries.mockReturnValue([]);`
	`700`	`+resolveDeprecatedProviderInstallCatalogEntry.mockReset();`
	`701`	`+resolveDeprecatedProviderInstallCatalogEntry.mockReturnValue(undefined);`
`702`	`702`	`testAuthProfileStores.clear();`
`703`	`703`	`await lifecycle.cleanup();`
`704`	`704`	`});`
`@@ -808,12 +808,9 @@ describe("applyAuthChoice", () => {`
`808`	`808`	`const deprecatedChoiceSpy = vi`
`809`	`809`	`.spyOn(providerAuthChoices, "resolveManifestDeprecatedProviderAuthChoice")`
`810`	`810`	`.mockReturnValueOnce(undefined);`
`811`		`-resolveProviderInstallCatalogEntries.mockReturnValueOnce([`
`812`		`-{`
`813`		`-choiceId: "qwen-api-key",`
`814`		`-deprecatedChoiceIds: ["modelstudio-api-key"],`
`815`		`-},`
`816`		`-] as never);`
	`811`	`+resolveDeprecatedProviderInstallCatalogEntry.mockReturnValueOnce({`
	`812`	`+choiceId: "qwen-api-key",`
	`813`	`+} as never);`
`817`	`814`	`try {`
`818`	`815`	`await expect(`
`819`	`816`	`applyAuthChoice({`

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ vi.mock("../../../plugins/provider-auth-choices.js", () => ({`
`43`	`43`	`resolveManifestProviderAuthChoice,`
`44`	`44`	`}));`
`45`	`45`	`const resolveProviderInstallCatalogEntry = vi.hoisted(() => vi.fn(() => undefined));`
	`46`	`+const resolveDeprecatedProviderInstallCatalogEntry = vi.hoisted(() => vi.fn(() => undefined));`
`46`	`47`	`vi.mock("../../../plugins/provider-install-catalog.js", () => ({`
	`48`	`+ resolveDeprecatedProviderInstallCatalogEntry,`
`47`	`49`	`resolveProviderInstallCatalogEntry,`
`48`	`50`	`}));`
`49`	`51`	`const ensureOnboardingPluginInstalled = vi.hoisted(() => vi.fn());`
`@@ -66,6 +68,7 @@ beforeEach(() => {`
`66`	`68`	`vi.clearAllMocks();`
`67`	`69`	`resolvePreferredProviderForAuthChoice.mockResolvedValue(undefined);`
`68`	`70`	`resolveManifestProviderAuthChoice.mockReturnValue(undefined);`
	`71`	`+resolveDeprecatedProviderInstallCatalogEntry.mockReturnValue(undefined);`
`69`	`72`	`resolveProviderInstallCatalogEntry.mockReturnValue(undefined);`
`70`	`73`	`ensureOnboardingPluginInstalled.mockResolvedValue(undefined);`
`71`	`74`	`resolveOwningPluginIdsForProvider.mockReturnValue(undefined as never);`
`@@ -243,6 +246,32 @@ describe("applyNonInteractivePluginProviderChoice", () => {`
`243`	`246`	`});`
`244`	`247`	`});`
`245`	`248`
	`249`	`+it("guides deprecated official auth choices before their plugin is installed", async () => {`
	`250`	`+const runtime = createRuntime();`
	`251`	`+resolveDeprecatedProviderInstallCatalogEntry.mockReturnValue({`
	`252`	`+choiceId: "qwen-api-key",`
	`253`	`+} as never);`
	`254`	`+`
	`255`	`+const result = await applyNonInteractivePluginProviderChoice({`
	`256`	`+nextConfig: { agents: { defaults: {} } } as OpenClawConfig,`
	`257`	`+authChoice: "modelstudio-api-key",`
	`258`	`+opts: {} as never,`
	`259`	`+runtime: runtime as never,`
	`260`	`+baseConfig: { agents: { defaults: {} } } as OpenClawConfig,`
	`261`	`+resolveApiKey: vi.fn(),`
	`262`	`+toApiKeyCredential: vi.fn(),`
	`263`	`+});`
	`264`	`+`
	`265`	`+expect(result).toBeNull();`
	`266`	`+expectRuntimeErrorIncludes(`
	`267`	`+runtime,`
	`268`	`+'"modelstudio-api-key" is no longer supported. Use --auth-choice "qwen-api-key" instead.',`
	`269`	`+);`
	`270`	`+expect(runtime.exit).toHaveBeenCalledWith(1);`
	`271`	`+expect(ensureOnboardingPluginInstalled).not.toHaveBeenCalled();`
	`272`	`+expect(resolveProviderInstallCatalogEntry).not.toHaveBeenCalled();`
	`273`	`+});`
	`274`	`+`
`246`	`275`	`it("fails explicitly when a provider-plugin auth choice resolves to no trusted setup provider", async () => {`
`247`	`276`	`const runtime = createRuntime();`
`248`	`277`

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,10 @@ import type { OpenClawConfig } from "../../../config/types.openclaw.js";`
`16`	`16`	`import { enablePluginInConfig } from "../../../plugins/enable.js";`
`17`	`17`	`import { resolvePreferredProviderForAuthChoice } from "../../../plugins/provider-auth-choice-preference.js";`
`18`	`18`	`import { resolveManifestProviderAuthChoice } from "../../../plugins/provider-auth-choices.js";`
`19`		`-import { resolveProviderInstallCatalogEntry } from "../../../plugins/provider-install-catalog.js";`
	`19`	`+import {`
	`20`	`+resolveDeprecatedProviderInstallCatalogEntry,`
	`21`	`+resolveProviderInstallCatalogEntry,`
	`22`	`+} from "../../../plugins/provider-install-catalog.js";`
`20`	`23`	`import type {`
`21`	`24`	`ProviderAuthOptionBag,`
`22`	`25`	`ProviderNonInteractiveApiKeyCredentialParams,`
`@@ -137,11 +140,26 @@ export async function applyNonInteractivePluginProviderChoice(params: {`
`137`	`140`	`params.runtime.exit(1);`
`138`	`141`	`return null;`
`139`	`142`	`}`
`140`		`-const installCatalogEntry = resolveProviderInstallCatalogEntry(params.authChoice, {`
	`143`	`+const installCatalogParams = {`
`141`	`144`	`config: nextConfig,`
`142`	`145`	`workspaceDir,`
`143`	`146`	`includeUntrustedWorkspacePlugins: false,`
`144`		`-});`
	`147`	`+};`
	`148`	`+const deprecatedInstallCatalogEntry = resolveDeprecatedProviderInstallCatalogEntry(`
	`149`	`+params.authChoice,`
	`150`	`+installCatalogParams,`
	`151`	`+);`
	`152`	`+if (deprecatedInstallCatalogEntry) {`
	`153`	`+params.runtime.error(`
	`154`	+`${JSON.stringify(params.authChoice)} is no longer supported. Use --auth-choice ${JSON.stringify(deprecatedInstallCatalogEntry.choiceId)} instead.`,
	`155`	`+);`
	`156`	`+params.runtime.exit(1);`
	`157`	`+return null;`
	`158`	`+}`
	`159`	`+const installCatalogEntry = resolveProviderInstallCatalogEntry(`
	`160`	`+params.authChoice,`
	`161`	`+installCatalogParams,`
	`162`	`+);`
`145`	`163`	`if (!installCatalogEntry) {`
`146`	`164`	`return undefined;`
`147`	`165`	`}`

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ vi.mock("./official-external-plugin-catalog.js", async () => {`
`64`	`64`	`});`
`65`	`65`
`66`	`66`	`import {`
	`67`	`+resolveDeprecatedProviderInstallCatalogEntry,`
`67`	`68`	`resolveProviderInstallCatalogEntries,`
`68`	`69`	`resolveProviderInstallCatalogEntry,`
`69`	`70`	`} from "./provider-install-catalog.js";`
`@@ -657,6 +658,42 @@ describe("provider install catalog", () => {`
`657`	`658`	`});`
`658`	`659`	`});`
`659`	`660`
	`661`	`+it("resolves deprecated official external auth choices before their plugin is installed", () => {`
	`662`	`+listOfficialExternalProviderCatalogEntries.mockReturnValue([`
	`663`	`+{`
	`664`	`+name: "@openclaw/qwen-provider",`
	`665`	`+source: "official",`
	`666`	`+kind: "provider",`
	`667`	`+openclaw: {`
	`668`	`+plugin: { id: "qwen", label: "Qwen Cloud" },`
	`669`	`+providers: [`
	`670`	`+{`
	`671`	`+id: "qwen",`
	`672`	`+name: "Qwen Cloud",`
	`673`	`+authChoices: [`
	`674`	`+{`
	`675`	`+method: "api-key",`
	`676`	`+choiceId: "qwen-api-key",`
	`677`	`+deprecatedChoiceIds: ["modelstudio-api-key"],`
	`678`	`+choiceLabel: "Qwen Cloud API key",`
	`679`	`+},`
	`680`	`+],`
	`681`	`+},`
	`682`	`+],`
	`683`	`+install: {`
	`684`	`+npmSpec: "@openclaw/qwen-provider",`
	`685`	`+defaultChoice: "npm",`
	`686`	`+},`
	`687`	`+},`
	`688`	`+},`
	`689`	`+]);`
	`690`	`+`
	`691`	`+expect(resolveDeprecatedProviderInstallCatalogEntry("modelstudio-api-key")).toMatchObject({`
	`692`	`+pluginId: "qwen",`
	`693`	`+choiceId: "qwen-api-key",`
	`694`	`+});`
	`695`	`+});`
	`696`	`+`
`660`	`697`	`it("surfaces provider-index ClawHub install metadata as the preferred source", () => {`
`661`	`698`	`loadOpenClawProviderIndex.mockReturnValue({`
`662`	`699`	`version: 1,`

Original file line number	Diff line number	Diff line change
`@@ -439,3 +439,17 @@ export function resolveProviderInstallCatalogEntry(`
`439`	`439`	`(entry) => entry.choiceId === normalizedChoiceId,`
`440`	`440`	`);`
`441`	`441`	`}`
	`442`	`+`
	`443`	`+/** Resolves an uninstalled provider's deprecated setup choice to its replacement entry. */`
	`444`	`+export function resolveDeprecatedProviderInstallCatalogEntry(`
	`445`	`+choiceId: string,`
	`446`	`+params?: ProviderInstallCatalogParams,`
	`447`	`+): ProviderInstallCatalogEntry \| undefined {`
	`448`	`+const normalizedChoiceId = choiceId.trim();`
	`449`	`+if (!normalizedChoiceId) {`
	`450`	`+return undefined;`
	`451`	`+}`
	`452`	`+return resolveProviderInstallCatalogEntries(params).find((entry) =>`
	`453`	`+entry.deprecatedChoiceIds?.includes(normalizedChoiceId),`
	`454`	`+);`
	`455`	`+}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main