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

推荐订阅源

J
Java Code Geeks
Martin Fowler
Martin Fowler
MongoDB | Blog
MongoDB | Blog
博客园 - Franky
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
Microsoft Security Blog
Microsoft Security Blog
H
Hackread – Cybersecurity News, Data Breaches, AI and More
博客园_首页
腾讯CDC
D
Docker
The Cloudflare Blog
量子位
爱范儿
爱范儿
L
LangChain Blog
博客园 - 三生石上(FineUI控件)
博客园 - 司徒正美
aimingoo的专栏
aimingoo的专栏
Blog — PlanetScale
Blog — PlanetScale
Jina AI
Jina AI
Apple Machine Learning Research
Apple Machine Learning Research
Hugging Face - Blog
Hugging Face - Blog
博客园 - 聂微东
Vercel News
Vercel News
MyScale Blog
MyScale 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
Preserve session list model normalization · openclaw/open...
2026-05-06 · via Recent Commits to openclaw:main

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

1919

import {

2020

inferUniqueProviderFromConfiguredModels,

2121

isCliProvider,

22-

normalizeProviderId,

2322

normalizeStoredOverrideModel,

2423

parseModelRef,

2524

resolveConfiguredModelRef,

@@ -78,7 +77,6 @@ import {

7877

normalizeLowercaseStringOrEmpty,

7978

normalizeOptionalString,

8079

normalizeOptionalLowercaseString,

81-

resolvePrimaryStringValue,

8280

} from "../shared/string-coerce.js";

8381

import { normalizeSessionDeliveryFields } from "../utils/delivery-context.shared.js";

8482

import { estimateUsageCost, resolveModelCostConfig } from "../utils/usage-format.js";

@@ -375,7 +373,7 @@ type SessionListRowContext = {

375373

subagentRuns: ReturnType<typeof buildSubagentRunReadIndex>;

376374

storeChildSessionsByKey: Map<string, string[]>;

377375

selectedModelByOverrideRef: Map<string, ReturnType<typeof resolveSessionModelRef>>;

378-

modelIdentityByEntryKey: Map<string, ReturnType<typeof resolveSessionModelIdentityRef>>;

376+

modelIdentityByResolutionKey: Map<string, ReturnType<typeof resolveSessionModelIdentityRef>>;

379377

thinkingLevelsByModelRef: Map<string, ReturnType<typeof listThinkingLevelOptions>>;

380378

};

381379

@@ -494,7 +492,7 @@ function buildSessionListRowContext(params: {

494492

subagentRuns,

495493

storeChildSessionsByKey: buildStoreChildSessionIndex(params.store, params.now, subagentRuns),

496494

selectedModelByOverrideRef: new Map(),

497-

modelIdentityByEntryKey: new Map(),

495+

modelIdentityByResolutionKey: new Map(),

498496

thinkingLevelsByModelRef: new Map(),

499497

};

500498

}

@@ -503,27 +501,6 @@ function createSessionRowModelCacheKey(provider: string | undefined, model: stri

503501

return `${normalizeLowercaseStringOrEmpty(provider)}\0${normalizeOptionalString(model) ?? ""}`;

504502

}

505503506-

function parseQualifiedModelRefForSessionList(

507-

raw: string | undefined,

508-

): { provider: string; model: string } | undefined {

509-

const trimmed = normalizeOptionalString(raw);

510-

const slash = trimmed?.indexOf("/") ?? -1;

511-

if (!trimmed || slash <= 0 || slash === trimmed.length - 1) {

512-

return undefined;

513-

}

514-

const provider = normalizeProviderId(trimmed.slice(0, slash).trim());

515-

const model = normalizeOptionalString(trimmed.slice(slash + 1));

516-

return model ? { provider, model } : undefined;

517-

}

518-519-

function createSessionDefaultModelCacheKey(cfg: OpenClawConfig, agentId?: string): string {

520-

const normalizedAgentId = normalizeAgentId(agentId);

521-

const primary = normalizedAgentId

522-

? resolveAgentEffectiveModelPrimary(cfg, normalizedAgentId)

523-

: resolvePrimaryStringValue(cfg.agents?.defaults?.model);

524-

return normalizeOptionalString(primary) ?? "";

525-

}

526-527504

function createSessionEntryModelCacheKey(params: {

528505

cfg: OpenClawConfig;

529506

agentId?: string;

@@ -533,7 +510,7 @@ function createSessionEntryModelCacheKey(params: {

533510

fallbackModelRef?: string;

534511

}) {

535512

return [

536-

createSessionDefaultModelCacheKey(params.cfg, params.agentId),

513+

normalizeAgentId(params.agentId),

537514

normalizeOptionalString(params.entry?.providerOverride) ?? "",

538515

normalizeOptionalString(params.entry?.modelOverride) ?? "",

539516

normalizeOptionalString(params.entry?.modelProvider) ?? "",

@@ -547,11 +524,6 @@ function resolveSessionDefaultModelRefForRow(

547524

agentId?: string,

548525

): { provider: string; model: string } {

549526

if (agentId) {

550-

const primary = resolveAgentEffectiveModelPrimary(cfg, agentId)?.trim();

551-

const parsed = parseQualifiedModelRefForSessionList(primary);

552-

if (parsed) {

553-

return parsed;

554-

}

555527

return resolveDefaultModelForAgent({ cfg, agentId });

556528

}

557529

return resolveConfiguredModelRef({

@@ -581,9 +553,39 @@ function resolveSessionRowModelIdentityRef(params: {

581553

const runtimeModel = normalizeOptionalString(params.entry?.model);

582554

const runtimeProvider = normalizeOptionalString(params.entry?.modelProvider);

583555

const fallbackModelRef = normalizeOptionalString(params.fallbackModelRef);

584-

if (runtimeModel && runtimeProvider && !fallbackModelRef) {

556+

if (runtimeModel && runtimeProvider) {

585557

return { provider: runtimeProvider, model: runtimeModel };

586558

}

559+

if (runtimeModel) {

560+

const key = `runtime\0${runtimeModel}`;

561+

const cached = params.rowContext.modelIdentityByResolutionKey.get(key);

562+

if (cached) {

563+

return cached;

564+

}

565+

const resolved = resolveSessionModelIdentityRef(

566+

params.cfg,

567+

params.entry,

568+

params.agentId,

569+

params.fallbackModelRef,

570+

);

571+

params.rowContext.modelIdentityByResolutionKey.set(key, resolved);

572+

return resolved;

573+

}

574+

if (fallbackModelRef) {

575+

const key = `fallback\0${fallbackModelRef}`;

576+

const cached = params.rowContext.modelIdentityByResolutionKey.get(key);

577+

if (cached) {

578+

return cached;

579+

}

580+

const resolved = resolveSessionModelIdentityRef(

581+

params.cfg,

582+

params.entry,

583+

params.agentId,

584+

params.fallbackModelRef,

585+

);

586+

params.rowContext.modelIdentityByResolutionKey.set(key, resolved);

587+

return resolved;

588+

}

587589

const normalizedOverride = normalizeStoredOverrideModel({

588590

providerOverride: params.entry?.providerOverride,

589591

modelOverride: params.entry?.modelOverride,

@@ -605,7 +607,7 @@ function resolveSessionRowModelIdentityRef(params: {

605607

entry: params.entry,

606608

fallbackModelRef: params.fallbackModelRef,

607609

});

608-

const cached = params.rowContext.modelIdentityByEntryKey.get(key);

610+

const cached = params.rowContext.modelIdentityByResolutionKey.get(key);

609611

if (cached) {

610612

return cached;

611613

}

@@ -618,7 +620,7 @@ function resolveSessionRowModelIdentityRef(params: {

618620

!normalizedOverride.modelOverride

619621

) {

620622

const resolved = resolveSessionDefaultModelRefForRow(params.cfg, params.agentId);

621-

params.rowContext.modelIdentityByEntryKey.set(key, resolved);

623+

params.rowContext.modelIdentityByResolutionKey.set(key, resolved);

622624

return resolved;

623625

}

624626

@@ -628,7 +630,7 @@ function resolveSessionRowModelIdentityRef(params: {

628630

params.agentId,

629631

params.fallbackModelRef,

630632

);

631-

params.rowContext.modelIdentityByEntryKey.set(key, resolved);

633+

params.rowContext.modelIdentityByResolutionKey.set(key, resolved);

632634

return resolved;

633635

}

634636