惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

GbyAI
GbyAI
Martin Fowler
Martin Fowler
云风的 BLOG
云风的 BLOG
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
T
The Blog of Author Tim Ferriss
大猫的无限游戏
大猫的无限游戏
A
About on SuperTechFans
小众软件
小众软件
博客园_首页
博客园 - 聂微东
罗磊的独立博客
Recent Announcements
Recent Announcements
U
Unit 42
N
Netflix TechBlog - Medium
Blog — PlanetScale
Blog — PlanetScale
阮一峰的网络日志
阮一峰的网络日志
博客园 - 叶小钗
V
V2EX
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
IT之家
IT之家
Stack Overflow Blog
Stack Overflow Blog
博客园 - Franky
D
DataBreaches.Net
Last Week in AI
Last Week in AI

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix: reuse provider auth lookup facts (#85499) · openclaw...
RomneyDa · 2026-05-23 · via Recent Commits to openclaw:main

@@ -13,7 +13,7 @@ import {

1313

shouldDeferProviderSyntheticProfileAuthWithPlugin,

1414

} from "../plugins/provider-runtime.js";

1515

import { resolveOwningPluginIdsForProvider } from "../plugins/providers.js";

16-

import type { ProviderAuthEvidence } from "../secrets/provider-env-vars.js";

16+

import { resolveRuntimeSyntheticAuthProviderRefState } from "../plugins/synthetic-auth.runtime.js";

1717

import { resolveDefaultSecretProviderAlias } from "../secrets/ref-contract.js";

1818

import {

1919

normalizeLowercaseStringOrEmpty,

@@ -33,7 +33,15 @@ import {

3333

resolveAuthStorePathForDisplay,

3434

} from "./auth-profiles.js";

3535

import * as cliCredentials from "./cli-credentials.js";

36-

import { resolveEnvApiKey, type EnvApiKeyResult } from "./model-auth-env.js";

36+

import {

37+

resolveProviderEnvApiKeyCandidates,

38+

resolveProviderEnvAuthEvidence,

39+

} from "./model-auth-env-vars.js";

40+

import {

41+

resolveEnvApiKey,

42+

type EnvApiKeyLookupOptions,

43+

type EnvApiKeyResult,

44+

} from "./model-auth-env.js";

3745

import {

3846

CUSTOM_LOCAL_AUTH_MARKER,

3947

isKnownEnvApiKeyMarker,

@@ -42,6 +50,7 @@ import {

4250

} from "./model-auth-markers.js";

4351

import { type ResolvedProviderAuth } from "./model-auth-runtime-shared.js";

4452

import { normalizeProviderId } from "./model-selection.js";

53+

import { resolveProviderAuthAliasMap } from "./provider-auth-aliases.js";

45544655

export {

4756

ensureAuthProfileStore,

@@ -56,6 +65,11 @@ export {

5665

export type { ResolvedProviderAuth } from "./model-auth-runtime-shared.js";

5766

export type ProviderCredentialPrecedence = "profile-first" | "env-first";

586768+

export type RuntimeProviderAuthLookup = {

69+

envApiKey: Pick<EnvApiKeyLookupOptions, "aliasMap" | "candidateMap" | "authEvidenceMap">;

70+

syntheticAuthProviderRefs?: readonly string[];

71+

};

72+5973

const log = createSubsystemLogger("model-auth");

60746175

function resolveConfigAwareEnvApiKey(

@@ -88,6 +102,30 @@ function resolveProviderConfig(

88102

);

89103

}

90104105+

export function createRuntimeProviderAuthLookup(params: {

106+

cfg?: OpenClawConfig;

107+

workspaceDir?: string;

108+

env?: NodeJS.ProcessEnv;

109+

}): RuntimeProviderAuthLookup {

110+

const env = params.env ?? process.env;

111+

const lookupParams = {

112+

config: params.cfg,

113+

workspaceDir: params.workspaceDir,

114+

env,

115+

};

116+

const syntheticAuthProviderRefs = resolveRuntimeSyntheticAuthProviderRefState(lookupParams);

117+

return {

118+

envApiKey: {

119+

aliasMap: resolveProviderAuthAliasMap(lookupParams),

120+

candidateMap: resolveProviderEnvApiKeyCandidates(lookupParams),

121+

authEvidenceMap: resolveProviderEnvAuthEvidence(lookupParams),

122+

},

123+

syntheticAuthProviderRefs: syntheticAuthProviderRefs.complete

124+

? syntheticAuthProviderRefs.refs

125+

: undefined,

126+

};

127+

}

128+91129

export function getCustomProviderApiKey(

92130

cfg: OpenClawConfig | undefined,

93131

provider: string,

@@ -344,17 +382,51 @@ export function hasSyntheticLocalProviderAuthConfig(params: {

344382

return Boolean(providerConfig.baseUrl && isLocalBaseUrl(providerConfig.baseUrl));

345383

}

346384385+

function listProviderSyntheticAuthRefs(params: {

386+

cfg: OpenClawConfig | undefined;

387+

provider: string;

388+

modelApi?: string;

389+

}): string[] {

390+

const refs = [params.provider];

391+

const providerConfig = resolveProviderConfig(params.cfg, params.provider);

392+

if (params.modelApi) {

393+

refs.push(params.modelApi);

394+

}

395+

if (providerConfig?.api) {

396+

refs.push(providerConfig.api);

397+

}

398+

return [...new Set(refs.map((ref) => normalizeProviderId(ref)).filter(Boolean))];

399+

}

400+401+

function shouldResolvePluginSyntheticAuth(params: {

402+

cfg: OpenClawConfig | undefined;

403+

provider: string;

404+

modelApi?: string;

405+

runtimeLookup?: RuntimeProviderAuthLookup;

406+

}): boolean {

407+

const syntheticAuthProviderRefs = params.runtimeLookup?.syntheticAuthProviderRefs;

408+

if (!syntheticAuthProviderRefs) {

409+

return true;

410+

}

411+

if (resolveProviderConfig(params.cfg, params.provider)) {

412+

return true;

413+

}

414+

const eligibleRefs = new Set(

415+

syntheticAuthProviderRefs.map((ref) => normalizeProviderId(ref)).filter(Boolean),

416+

);

417+

if (eligibleRefs.size === 0) {

418+

return false;

419+

}

420+

return listProviderSyntheticAuthRefs(params).some((ref) => eligibleRefs.has(ref));

421+

}

422+347423

export function hasRuntimeAvailableProviderAuth(params: {

348424

provider: string;

349425

cfg?: OpenClawConfig;

350426

workspaceDir?: string;

351427

env?: NodeJS.ProcessEnv;

352428

allowPluginSyntheticAuth?: boolean;

353-

envAuthLookup?: {

354-

aliasMap?: Readonly<Record<string, string>>;

355-

candidateMap?: Readonly<Record<string, readonly string[]>>;

356-

authEvidenceMap?: Readonly<Record<string, readonly ProviderAuthEvidence[]>>;

357-

};

429+

runtimeLookup?: RuntimeProviderAuthLookup;

358430

}): boolean {

359431

const provider = normalizeProviderId(params.provider);

360432

const authOverride = resolveProviderAuthOverride(params.cfg, provider);

@@ -368,9 +440,7 @@ export function hasRuntimeAvailableProviderAuth(params: {

368440

resolveEnvApiKey(provider, params.env, {

369441

config: params.cfg,

370442

workspaceDir: params.workspaceDir,

371-

aliasMap: params.envAuthLookup?.aliasMap,

372-

candidateMap: params.envAuthLookup?.candidateMap,

373-

authEvidenceMap: params.envAuthLookup?.authEvidenceMap,

443+

...params.runtimeLookup?.envApiKey,

374444

})

375445

) {

376446

return true;

@@ -383,6 +453,11 @@ export function hasRuntimeAvailableProviderAuth(params: {

383453

}

384454

if (

385455

params.allowPluginSyntheticAuth !== false &&

456+

shouldResolvePluginSyntheticAuth({

457+

cfg: params.cfg,

458+

provider,

459+

runtimeLookup: params.runtimeLookup,

460+

}) &&

386461

resolveSyntheticLocalProviderAuth({ cfg: params.cfg, provider })

387462

) {

388463

return true;