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

推荐订阅源

MongoDB | Blog
MongoDB | Blog
宝玉的分享
宝玉的分享
博客园 - 三生石上(FineUI控件)
小众软件
小众软件
罗磊的独立博客
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
S
SegmentFault 最新的问题
Last Week in AI
Last Week in AI
人人都是产品经理
人人都是产品经理
博客园 - 聂微东
博客园 - 司徒正美
博客园 - 叶小钗
T
Tailwind CSS Blog
博客园 - Franky
V
V2EX
有赞技术团队
有赞技术团队
美团技术团队
雷峰网
雷峰网
爱范儿
爱范儿
Jina AI
Jina AI
D
DataBreaches.Net
H
Help Net Security
酷 壳 – CoolShell
酷 壳 – CoolShell

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
perf: speed up reset model tests · openclaw/openclaw@7aeb7c2
steipete · 2026-04-28 · via Recent Commits to openclaw:main

@@ -1,18 +1,16 @@

11

import type { ModelCatalogEntry } from "../../agents/model-catalog.types.js";

2-

import { modelKey, normalizeProviderId } from "../../agents/model-selection-normalize.js";

3-

import {

4-

buildAllowedModelSetWithFallbacks,

5-

resolveModelRefFromString,

6-

type ModelAliasIndex,

7-

} from "../../agents/model-selection-shared.js";

2+

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

83

import { resolveAgentModelFallbackValues } from "../../config/model-input.js";

94

import type { SessionEntry } from "../../config/sessions.js";

105

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

116

import { applyModelOverrideToSessionEntry } from "../../sessions/model-overrides.js";

127

import { normalizeOptionalString } from "../../shared/string-coerce.js";

138

import type { MsgContext, TemplateContext } from "../templating.js";

149

import {

10+

modelKey,

1511

resolveModelDirectiveSelection,

12+

resolveModelRefFromDirectiveString,

13+

type ModelAliasIndex,

1614

type ModelDirectiveSelection,

1715

} from "./model-selection-directive.js";

1816

@@ -50,14 +48,39 @@ async function resolveResetFallbackModels(params: {

5048

return resolveAgentModelFallbackValues(params.cfg.agents?.defaults?.model);

5149

}

525051+

async function buildResetAllowedModelKeys(params: {

52+

cfg: OpenClawConfig;

53+

catalog: ModelCatalogEntry[];

54+

defaultProvider: string;

55+

defaultModel?: string;

56+

fallbackModels: readonly string[];

57+

}): Promise<Set<string>> {

58+

const rawAllowlist = Object.keys(params.cfg.agents?.defaults?.models ?? {});

59+

if (rawAllowlist.length > 0 || params.cfg.models?.providers) {

60+

const { buildAllowedModelSetWithFallbacks } =

61+

await import("../../agents/model-selection-shared.js");

62+

return buildAllowedModelSetWithFallbacks(params).allowedKeys;

63+

}

64+65+

const allowedKeys = new Set<string>();

66+

for (const entry of params.catalog) {

67+

allowedKeys.add(modelKey(entry.provider, entry.id));

68+

}

69+

const defaultModel = params.defaultModel?.trim();

70+

if (defaultModel) {

71+

allowedKeys.add(modelKey(normalizeProviderId(params.defaultProvider), defaultModel));

72+

}

73+

return allowedKeys;

74+

}

75+5376

function buildSelectionFromExplicit(params: {

5477

raw: string;

5578

defaultProvider: string;

5679

defaultModel: string;

5780

aliasIndex: ModelAliasIndex;

5881

allowedModelKeys: Set<string>;

5982

}): ModelDirectiveSelection | undefined {

60-

const resolved = resolveModelRefFromString({

83+

const resolved = resolveModelRefFromDirectiveString({

6184

raw: params.raw,

6285

defaultProvider: params.defaultProvider,

6386

aliasIndex: params.aliasIndex,

@@ -141,7 +164,7 @@ export async function applyResetModelOverride(params: {

141164

}

142165143166

const catalog = params.modelCatalog ?? (await loadResetModelCatalog(params.cfg));

144-

const allowed = buildAllowedModelSetWithFallbacks({

167+

const allowedModelKeys = await buildResetAllowedModelKeys({

145168

cfg: params.cfg,

146169

catalog,

147170

defaultProvider: params.defaultProvider,

@@ -151,7 +174,6 @@ export async function applyResetModelOverride(params: {

151174

agentId: params.agentId,

152175

}),

153176

});

154-

const allowedModelKeys = allowed.allowedKeys;

155177

if (allowedModelKeys.size === 0) {

156178

return {};

157179

}