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

推荐订阅源

Microsoft Security Blog
Microsoft Security Blog
博客园 - 聂微东
aimingoo的专栏
aimingoo的专栏
J
Java Code Geeks
腾讯CDC
大猫的无限游戏
大猫的无限游戏
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Google DeepMind News
Google DeepMind News
博客园_首页
F
Fortinet All Blogs
小众软件
小众软件
Apple Machine Learning Research
Apple Machine Learning Research
H
Help Net Security
博客园 - 【当耐特】
量子位
博客园 - 叶小钗
M
MIT News - Artificial intelligence
酷 壳 – CoolShell
酷 壳 – CoolShell
月光博客
月光博客
MyScale Blog
MyScale Blog
爱范儿
爱范儿
The Cloudflare Blog
N
Netflix TechBlog - Medium
T
Tailwind CSS Blog

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 Anthropic CLI auth routing for shorthand refs (#84374...
joshavant · 2026-05-20 · via Recent Commits to openclaw:main

@@ -4,6 +4,7 @@ import {

44

type ProviderAuthResult,

55

} from "openclaw/plugin-sdk/provider-auth";

66

import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";

7+

import { resolveClaudeCliAnthropicModelRefs } from "./claude-model-refs.js";

78

import {

89

readClaudeCliCredentialsForSetup,

910

readClaudeCliCredentialsForSetupNonInteractive,

@@ -18,21 +19,16 @@ type AgentDefaultsRuntimePolicy = NonNullable<

1819

type ClaudeCliCredential = NonNullable<ReturnType<typeof readClaudeCliCredentialsForSetup>>;

19202021

function toAnthropicModelRef(raw: string): string | null {

21-

const trimmed = raw.trim();

22-

const lower = normalizeLowercaseStringOrEmpty(trimmed);

23-

const provider = lower.startsWith("anthropic/")

24-

? "anthropic"

25-

: lower.startsWith(`${CLAUDE_CLI_BACKEND_ID}/`)

26-

? CLAUDE_CLI_BACKEND_ID

27-

: "";

28-

if (!provider) {

29-

return null;

30-

}

31-

const modelId = trimmed.slice(provider.length + 1).trim();

32-

if (!normalizeLowercaseStringOrEmpty(modelId).startsWith("claude-")) {

33-

return null;

34-

}

35-

return `anthropic/${modelId}`;

22+

return resolveClaudeCliAnthropicModelRefs(raw)?.rewriteRef ?? null;

23+

}

24+25+

function toAnthropicRuntimeRefs(raw: string): string[] {

26+

return resolveClaudeCliAnthropicModelRefs(raw)?.runtimeRefs ?? [];

27+

}

28+29+

function toAnthropicSelectedModelRef(raw: string): string | undefined {

30+

const resolved = resolveClaudeCliAnthropicModelRefs(raw);

31+

return resolved?.rewriteRef ?? resolved?.selectedRef;

3632

}

37333834

function isRecord(value: unknown): value is Record<string, unknown> {

@@ -46,10 +42,17 @@ function rewriteModelSelection(model: AgentDefaultsModel): {

4642

changed: boolean;

4743

} {

4844

if (typeof model === "string") {

45+

const runtimeRefs = toAnthropicRuntimeRefs(model);

4946

const converted = toAnthropicModelRef(model);

47+

const selectedRef = converted ?? toAnthropicSelectedModelRef(model);

5048

return converted

51-

? { value: converted, primary: converted, runtimeRefs: [converted], changed: true }

52-

: { value: model, runtimeRefs: [], changed: false };

49+

? { value: converted, primary: converted, runtimeRefs, changed: true }

50+

: {

51+

value: model,

52+

...(selectedRef ? { primary: selectedRef } : {}),

53+

runtimeRefs,

54+

changed: false,

55+

};

5356

}

5457

if (!model || typeof model !== "object" || Array.isArray(model)) {

5558

return { value: model, runtimeRefs: [], changed: false };

@@ -62,12 +65,14 @@ function rewriteModelSelection(model: AgentDefaultsModel): {

6265

let primary: string | undefined;

63666467

if (typeof current.primary === "string") {

68+

runtimeRefs.push(...toAnthropicRuntimeRefs(current.primary));

6569

const converted = toAnthropicModelRef(current.primary);

6670

if (converted) {

6771

next.primary = converted;

6872

primary = converted;

69-

runtimeRefs.push(converted);

7073

changed = true;

74+

} else {

75+

primary = toAnthropicSelectedModelRef(current.primary);

7176

}

7277

}

7378

@@ -77,10 +82,8 @@ function rewriteModelSelection(model: AgentDefaultsModel): {

7782

if (typeof entry !== "string") {

7883

return entry;

7984

}

85+

runtimeRefs.push(...toAnthropicRuntimeRefs(entry));

8086

const converted = toAnthropicModelRef(entry);

81-

if (converted) {

82-

runtimeRefs.push(converted);

83-

}

8487

return converted ?? entry;

8588

});

8689

if (nextFallbacks.some((entry, index) => entry !== currentFallbacks[index])) {

@@ -100,15 +103,18 @@ function rewriteModelSelection(model: AgentDefaultsModel): {

100103

function rewriteModelEntryMap(models: Record<string, unknown> | undefined): {

101104

value: Record<string, unknown> | undefined;

102105

migrated: string[];

106+

runtimeRefs: string[];

103107

} {

104108

if (!models) {

105-

return { value: models, migrated: [] };

109+

return { value: models, migrated: [], runtimeRefs: [] };

106110

}

107111108112

const next = { ...models };

109113

const migrated: string[] = [];

114+

const runtimeRefs: string[] = [];

110115111116

for (const [rawKey, value] of Object.entries(models)) {

117+

runtimeRefs.push(...toAnthropicRuntimeRefs(rawKey));

112118

const converted = toAnthropicModelRef(rawKey);

113119

if (!converted) {

114120

continue;

@@ -119,13 +125,16 @@ function rewriteModelEntryMap(models: Record<string, unknown> | undefined): {

119125

if (!(converted in next)) {

120126

next[converted] = value;

121127

}

122-

delete next[rawKey];

128+

if (normalizeLowercaseStringOrEmpty(rawKey).startsWith(`${CLAUDE_CLI_BACKEND_ID}/`)) {

129+

delete next[rawKey];

130+

}

123131

migrated.push(converted);

124132

}

125133126134

return {

127-

value: migrated.length > 0 ? next : models,

135+

value: migrated.length > 0 || runtimeRefs.length > 0 ? next : models,

128136

migrated,

137+

runtimeRefs,

129138

};

130139

}

131140

@@ -227,6 +236,7 @@ export function buildAnthropicCliMigrationResult(

227236

{}) as NonNullable<AgentDefaultsModels>;

228237

const nextModels = seedClaudeCliAllowlist(existingModels, [

229238

...rewrittenModel.runtimeRefs,

239+

...rewrittenModels.runtimeRefs,

230240

...rewrittenModels.migrated,

231241

]);

232242

const defaultModel = rewrittenModel.primary ?? "anthropic/claude-opus-4-7";