fix(providers): lock auth setup profile writes · openclaw/openclaw@f410a95

Recent Commits to openclaw:main

vincentkoc · 2026-05-16 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import {`
`16`	`16`	`type OpenClawConfig as ProviderAuthConfig,`
`17`	`17`	`type ProviderAuthResult,`
`18`	`18`	`suggestOAuthProfileIdForLegacyDefault,`
`19`		`-upsertAuthProfile,`
	`19`	`+upsertAuthProfileWithLock,`
`20`	`20`	`validateAnthropicSetupToken,`
`21`	`21`	`} from "openclaw/plugin-sdk/provider-auth";`
`22`	`22`	`import {`
`@@ -44,6 +44,7 @@ import { buildAnthropicReplayPolicy } from "./replay-policy.js";`
`44`	`44`	`import { wrapAnthropicProviderStream } from "./stream-wrappers.js";`
`45`	`45`
`46`	`46`	`const PROVIDER_ID = "anthropic";`
	`47`	`+type UpsertAuthProfileParams = Parameters<typeof upsertAuthProfileWithLock>[0];`
`47`	`48`	`const DEFAULT_ANTHROPIC_MODEL = "anthropic/claude-opus-4-7";`
`48`	`49`	`const ANTHROPIC_OPUS_47_MODEL_ID = "claude-opus-4-7";`
`49`	`50`	`const ANTHROPIC_OPUS_47_DOT_MODEL_ID = "claude-opus-4.7";`
`@@ -80,6 +81,15 @@ const CLAUDE_CLI_CANONICAL_ALLOWLIST_REFS = CLAUDE_CLI_DEFAULT_ALLOWLIST_REFS.ma`
`80`	`81`	? `anthropic/${ref.slice(CLAUDE_CLI_BACKEND_ID.length + 1)}`
`81`	`82`	`: ref,`
`82`	`83`	`);`
	`84`	`+`
	`85`	`+async function upsertAuthProfileWithLockOrThrow(params: UpsertAuthProfileParams): Promise<void> {`
	`86`	`+const updated = await upsertAuthProfileWithLock(params);`
	`87`	`+if (!updated) {`
	`88`	`+throw new Error(`
	`89`	`+"Failed to update auth profile store; the auth store lock may be busy. Wait a moment and retry.",`
	`90`	`+);`
	`91`	`+}`
	`92`	`+}`
`83`	`93`	`const CLAUDE_CLI_CANONICAL_DEFAULT_MODEL_REF = CLAUDE_CLI_DEFAULT_MODEL_REF.startsWith(`
`84`	`94`	`${CLAUDE_CLI_BACKEND_ID}/`,
`85`	`95`	`)`
`@@ -166,7 +176,7 @@ async function runAnthropicSetupTokenNonInteractive(`
`166`	`176`
`167`	`177`	`const profileId = resolveAnthropicSetupTokenProfileId(ctx.opts.tokenProfileId);`
`168`	`178`	`const expires = resolveAnthropicSetupTokenExpiry(ctx.opts.tokenExpiresIn);`
`169`		`-upsertAuthProfile({`
	`179`	`+await upsertAuthProfileWithLockOrThrow({`
`170`	`180`	`profileId,`
`171`	`181`	`credential: {`
`172`	`182`	`type: "token",`

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import {`
`7`	`7`	`listProfilesForProvider,`
`8`	`8`	`normalizeApiKeyInput,`
`9`	`9`	`normalizeOptionalSecretInput,`
`10`		`-upsertAuthProfile,`
	`10`	`+upsertAuthProfileWithLock,`
`11`	`11`	`validateApiKeyInput,`
`12`	`12`	`} from "openclaw/plugin-sdk/provider-auth";`
`13`	`13`	`import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";`
`@@ -19,6 +19,16 @@ import { wrapCloudflareAiGatewayProviderStream } from "./stream-wrappers.js";`
`19`	`19`	`const PROVIDER_ID = "cloudflare-ai-gateway";`
`20`	`20`	`const PROVIDER_ENV_VAR = "CLOUDFLARE_AI_GATEWAY_API_KEY";`
`21`	`21`	`const PROFILE_ID = "cloudflare-ai-gateway:default";`
	`22`	`+type UpsertAuthProfileParams = Parameters<typeof upsertAuthProfileWithLock>[0];`
	`23`	`+`
	`24`	`+async function upsertAuthProfileWithLockOrThrow(params: UpsertAuthProfileParams): Promise<void> {`
	`25`	`+const updated = await upsertAuthProfileWithLock(params);`
	`26`	`+if (!updated) {`
	`27`	`+throw new Error(`
	`28`	`+"Failed to update auth profile store; the auth store lock may be busy. Wait a moment and retry.",`
	`29`	`+);`
	`30`	`+}`
	`31`	`+}`
`22`	`32`
`23`	`33`	`function readRequiredTextInput(value: unknown): string {`
`24`	`34`	`return typeof value === "string" ? value.trim() : "";`
`@@ -176,7 +186,7 @@ export default definePluginEntry({`
`176`	`186`	`if (!credential) {`
`177`	`187`	`return null;`
`178`	`188`	`}`
`179`		`-upsertAuthProfile({`
	`189`	`+await upsertAuthProfileWithLockOrThrow({`
`180`	`190`	`profileId: PROFILE_ID,`
`181`	`191`	`credential,`
`182`	`192`	`agentDir: ctx.agentDir,`

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { logConfigUpdated, updateConfig } from "openclaw/plugin-sdk/config-mutat`
`4`	`4`	`import {`
`5`	`5`	`applyAuthProfileConfig,`
`6`	`6`	`ensureAuthProfileStore,`
`7`		`-upsertAuthProfile,`
	`7`	`+upsertAuthProfileWithLock,`
`8`	`8`	`} from "openclaw/plugin-sdk/provider-auth";`
`9`	`9`	`import type { RuntimeEnv } from "openclaw/plugin-sdk/runtime";`
`10`	`10`
`@@ -36,6 +36,8 @@ type DeviceTokenResponse =`
`36`	`36`	`const GITHUB_DEVICE_ACCESS_DENIED = Symbol("github-device-access-denied");`
`37`	`37`	`const GITHUB_DEVICE_EXPIRED = Symbol("github-device-expired");`
`38`	`38`
	`39`	`+type UpsertAuthProfileParams = Parameters<typeof upsertAuthProfileWithLock>[0];`
	`40`	`+`
`39`	`41`	`class GitHubDeviceFlowError extends Error {`
`40`	`42`	`readonly kind: symbol;`
`41`	`43`	`constructor(kind: symbol, message: string) {`
`@@ -45,6 +47,15 @@ class GitHubDeviceFlowError extends Error {`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`
	`50`	`+async function upsertAuthProfileWithLockOrThrow(params: UpsertAuthProfileParams): Promise<void> {`
	`51`	`+const updated = await upsertAuthProfileWithLock(params);`
	`52`	`+if (!updated) {`
	`53`	`+throw new Error(`
	`54`	`+"Failed to update auth profile store; the auth store lock may be busy. Wait a moment and retry.",`
	`55`	`+);`
	`56`	`+}`
	`57`	`+}`
	`58`	`+`
`48`	`59`	`function isGitHubDeviceAccessDeniedError(err: unknown): boolean {`
`49`	`60`	`return err instanceof GitHubDeviceFlowError && err.kind === GITHUB_DEVICE_ACCESS_DENIED;`
`50`	`61`	`}`
`@@ -266,7 +277,7 @@ export async function githubCopilotLoginCommand(`
`266`	`277`	`});`
`267`	`278`	`polling.stop("GitHub access token acquired");`
`268`	`279`
`269`		`-upsertAuthProfile({`
	`280`	`+await upsertAuthProfileWithLockOrThrow({`
`270`	`281`	`profileId,`
`271`	`282`	`credential: {`
`272`	`283`	`type: "token",`

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import {`
`14`	`14`	`normalizeApiKeyInput,`
`15`	`15`	`normalizeOptionalSecretInput,`
`16`	`16`	`type SecretInput,`
`17`		`-upsertAuthProfile,`
	`17`	`+upsertAuthProfileWithLock,`
`18`	`18`	`validateApiKeyInput,`
`19`	`19`	`} from "openclaw/plugin-sdk/provider-auth-api-key";`
`20`	`20`	`import {`
`@@ -36,6 +36,16 @@ import { applyZaiConfig, applyZaiProviderConfig, ZAI_DEFAULT_MODEL_REF } from ".`
`36`	`36`	`const PROVIDER_ID = "zai";`
`37`	`37`	`const GLM5_TEMPLATE_MODEL_ID = "glm-4.7";`
`38`	`38`	`const PROFILE_ID = "zai:default";`
	`39`	`+type UpsertAuthProfileParams = Parameters<typeof upsertAuthProfileWithLock>[0];`
	`40`	`+`
	`41`	`+async function upsertAuthProfileWithLockOrThrow(params: UpsertAuthProfileParams): Promise<void> {`
	`42`	`+const updated = await upsertAuthProfileWithLock(params);`
	`43`	`+if (!updated) {`
	`44`	`+throw new Error(`
	`45`	`+"Failed to update auth profile store; the auth store lock may be busy. Wait a moment and retry.",`
	`46`	`+);`
	`47`	`+}`
	`48`	`+}`
`39`	`49`
`40`	`50`	`function resolveGlm5ForwardCompatModel(`
`41`	`51`	`ctx: ProviderResolveDynamicModelContext,`
`@@ -229,7 +239,7 @@ async function runZaiApiKeyAuthNonInteractive(`
`229`	`239`	`if (!credential) {`
`230`	`240`	`return null;`
`231`	`241`	`}`
`232`		`-upsertAuthProfile({`
	`242`	`+await upsertAuthProfileWithLockOrThrow({`
`233`	`243`	`profileId: PROFILE_ID,`
`234`	`244`	`credential,`
`235`	`245`	`agentDir: ctx.agentDir,`

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`export type { OpenClawConfig } from "../config/config.js";`
`4`	`4`	`export type { SecretInput } from "../config/types.secrets.js";`
`5`	`5`
`6`		`-export { upsertAuthProfile } from "../agents/auth-profiles/profiles.js";`
	`6`	`+export { upsertAuthProfile, upsertAuthProfileWithLock } from "../agents/auth-profiles/profiles.js";`
`7`	`7`	`export {`
`8`	`8`	`formatApiKeyPreview,`
`9`	`9`	`normalizeApiKeyInput,`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { upsertAuthProfile } from "../agents/auth-profiles/profiles.js";`
	`1`	`+import { upsertAuthProfileWithLock } from "../agents/auth-profiles/profiles.js";`
`2`	`2`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`3`	`3`	`import type { SecretInput } from "../config/types.secrets.js";`
`4`	`4`	`import { createLazyRuntimeSurface } from "../shared/lazy-runtime.js";`
`@@ -32,6 +32,8 @@ type ProviderApiKeyAuthMethodOptions = {`
`32`	`32`	`applyConfig?: (cfg: OpenClawConfig) => OpenClawConfig;`
`33`	`33`	`};`
`34`	`34`
	`35`	`+type UpsertAuthProfileParams = Parameters<typeof upsertAuthProfileWithLock>[0];`
	`36`	`+`
`35`	`37`	`const loadProviderApiKeyAuthRuntime = createLazyRuntimeSurface(`
`36`	`38`	`() => import("./provider-api-key-auth.runtime.js"),`
`37`	`39`	`({ providerApiKeyAuthRuntime }) => providerApiKeyAuthRuntime,`
`@@ -57,6 +59,15 @@ function resolveProfileIds(params: {`
`57`	`59`	`return [resolveProfileId(params)];`
`58`	`60`	`}`
`59`	`61`
	`62`	`+async function upsertAuthProfileWithLockOrThrow(params: UpsertAuthProfileParams): Promise<void> {`
	`63`	`+const updated = await upsertAuthProfileWithLock(params);`
	`64`	`+if (!updated) {`
	`65`	`+throw new Error(`
	`66`	`+"Failed to update auth profile store; the auth store lock may be busy. Wait a moment and retry.",`
	`67`	`+);`
	`68`	`+}`
	`69`	`+}`
	`70`	`+`
`60`	`71`	`async function applyApiKeyConfig(params: {`
`61`	`72`	`ctx: ProviderAuthMethodNonInteractiveContext;`
`62`	`73`	`providerId: string;`
`@@ -177,7 +188,7 @@ export function createProviderApiKeyAuthMethod(`
`177`	`188`	`if (!credential) {`
`178`	`189`	`return null;`
`179`	`190`	`}`
`180`		`-upsertAuthProfile({`
	`191`	`+await upsertAuthProfileWithLockOrThrow({`
`181`	`192`	`profileId,`
`182`	`193`	`credential,`
`183`	`194`	`agentDir: ctx.agentDir,`

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

推荐订阅源

Recent Commits to openclaw:main