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

推荐订阅源

IT之家
IT之家
博客园_首页
S
SegmentFault 最新的问题
罗磊的独立博客
博客园 - 【当耐特】
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
阮一峰的网络日志
阮一峰的网络日志
D
Docker
雷峰网
雷峰网
Google DeepMind News
Google DeepMind News
博客园 - 司徒正美
V
V2EX
大猫的无限游戏
大猫的无限游戏
V
Visual Studio Blog
腾讯CDC
宝玉的分享
宝玉的分享
酷 壳 – CoolShell
酷 壳 – CoolShell
人人都是产品经理
人人都是产品经理
T
Tailwind CSS Blog
Vercel News
Vercel News
H
Help Net Security
博客园 - Franky
D
DataBreaches.Net
aimingoo的专栏
aimingoo的专栏

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(agents): scope external CLI auth discovery · openclaw...
steipete · 2026-04-29 · via Recent Commits to openclaw:main

@@ -0,0 +1,110 @@

1+

import {

2+

resolveAgentModelFallbackValues,

3+

resolveAgentModelPrimaryValue,

4+

} from "../../config/model-input.js";

5+

import type { AgentModelConfig } from "../../config/types.agents-shared.js";

6+

import type { OpenClawConfig } from "../../config/types.openclaw.js";

7+

import { normalizeProviderId } from "../provider-id.js";

8+9+

export type ExternalCliAuthScope = {

10+

providerIds: string[];

11+

profileIds: string[];

12+

};

13+14+

function addProviderScopeId(out: Set<string>, value: string | undefined): void {

15+

const raw = value?.trim();

16+

if (!raw) {

17+

return;

18+

}

19+

out.add(raw);

20+

const normalized = normalizeProviderId(raw);

21+

if (normalized) {

22+

out.add(normalized);

23+

}

24+

}

25+26+

function addProviderScopeFromModelRef(out: Set<string>, value: string | undefined): void {

27+

const raw = value?.trim();

28+

if (!raw) {

29+

return;

30+

}

31+

const slash = raw.indexOf("/");

32+

if (slash <= 0) {

33+

return;

34+

}

35+

addProviderScopeId(out, raw.slice(0, slash));

36+

}

37+38+

function addProviderScopeFromModelConfig(out: Set<string>, model: AgentModelConfig | undefined) {

39+

addProviderScopeFromModelRef(out, resolveAgentModelPrimaryValue(model));

40+

for (const fallback of resolveAgentModelFallbackValues(model)) {

41+

addProviderScopeFromModelRef(out, fallback);

42+

}

43+

}

44+45+

function addExternalCliRuntimeScope(out: Set<string>, value: string | undefined): void {

46+

const normalized = normalizeProviderId(value?.trim() ?? "");

47+

if (

48+

normalized === "claude-cli" ||

49+

normalized === "codex" ||

50+

normalized === "codex-cli" ||

51+

normalized === "openai-codex" ||

52+

normalized === "minimax" ||

53+

normalized === "minimax-cli" ||

54+

normalized === "minimax-portal"

55+

) {

56+

addProviderScopeId(out, normalized);

57+

}

58+

}

59+60+

export function resolveExternalCliAuthScopeFromConfig(

61+

cfg: OpenClawConfig,

62+

): ExternalCliAuthScope | undefined {

63+

const providerIds = new Set<string>();

64+

const profileIds = new Set<string>();

65+66+

for (const id of Object.keys(cfg.models?.providers ?? {})) {

67+

addProviderScopeId(providerIds, id);

68+

}

69+

for (const [profileId, profile] of Object.entries(cfg.auth?.profiles ?? {})) {

70+

const normalizedProfileId = profileId.trim();

71+

if (normalizedProfileId) {

72+

profileIds.add(normalizedProfileId);

73+

}

74+

addProviderScopeId(providerIds, profile?.provider);

75+

}

76+

for (const provider of Object.keys(cfg.auth?.order ?? {})) {

77+

addProviderScopeId(providerIds, provider);

78+

}

79+80+

const defaults = cfg.agents?.defaults;

81+

addProviderScopeFromModelConfig(providerIds, defaults?.model);

82+

addProviderScopeFromModelConfig(providerIds, defaults?.imageModel);

83+

addProviderScopeFromModelConfig(providerIds, defaults?.imageGenerationModel);

84+

addProviderScopeFromModelConfig(providerIds, defaults?.videoGenerationModel);

85+

addProviderScopeFromModelConfig(providerIds, defaults?.musicGenerationModel);

86+

addProviderScopeFromModelConfig(providerIds, defaults?.pdfModel);

87+

for (const modelRef of Object.keys(defaults?.models ?? {})) {

88+

addProviderScopeFromModelRef(providerIds, modelRef);

89+

}

90+

addExternalCliRuntimeScope(providerIds, defaults?.agentRuntime?.id);

91+

addExternalCliRuntimeScope(providerIds, defaults?.embeddedHarness?.runtime);

92+

for (const backendId of Object.keys(defaults?.cliBackends ?? {})) {

93+

addExternalCliRuntimeScope(providerIds, backendId);

94+

}

95+96+

for (const agent of cfg.agents?.list ?? []) {

97+

addProviderScopeFromModelConfig(providerIds, agent.model);

98+

addProviderScopeFromModelConfig(providerIds, agent.subagents?.model);

99+

addExternalCliRuntimeScope(providerIds, agent.agentRuntime?.id);

100+

addExternalCliRuntimeScope(providerIds, agent.embeddedHarness?.runtime);

101+

}

102+103+

if (providerIds.size === 0 && profileIds.size === 0) {

104+

return undefined;

105+

}

106+

return {

107+

providerIds: [...providerIds].toSorted((left, right) => left.localeCompare(right)),

108+

profileIds: [...profileIds].toSorted((left, right) => left.localeCompare(right)),

109+

};

110+

}