refactor: route live model reads through session accessor (#96206) · openclaw/openclaw@96cee6c

Recent Commits to openclaw:main

jalehman · 2026-06-24 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,10 @@ export const migratedSessionAccessorFiles = new Set([`
`82`	`82`	`"src/agents/embedded-agent-runner/tool-result-truncation.ts",`
`83`	`83`	`"src/agents/embedded-agent-runner/transcript-rewrite.ts",`
`84`	`84`	`"src/agents/embedded-agent-runner/transcript-runtime-state.ts",`
`85`		`-"src/auto-reply/reply/abort.ts",`
	`85`	`+"src/agents/live-model-switch.ts",`
`86`	`86`	`"src/agents/subagent-control.ts",`
`87`	`87`	`"src/agents/subagent-registry-helpers.ts",`
	`88`	`+"src/auto-reply/reply/abort.ts",`
`88`	`89`	`"src/auto-reply/reply/agent-runner-helpers.ts",`
`89`	`90`	`"src/auto-reply/reply/agent-runner.ts",`
`90`	`91`	`"src/auto-reply/reply/commands-subagents/action-info.ts",`

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,6 @@ vi.mock("./model-selection.js", async () => {`
`27`	`27`	`};`
`28`	`28`	`});`
`29`	`29`
`30`		`-vi.mock("../config/sessions/store.js", () => ({`
`31`		`-loadSessionStore: (...args: unknown[]) => state.loadSessionStoreMock(...args),`
`32`		`-updateSessionStore: (...args: unknown[]) => state.updateSessionStoreMock(...args),`
`33`		`-}));`
`34`		`-`
`35`	`30`	`vi.mock("../config/sessions/session-accessor.js", () => ({`
`36`	`31`	`loadSessionEntry: (scope: { sessionKey: string }) => {`
`37`	`32`	`const store = state.loadSessionStoreMock(scope) as Record<string, unknown> \| undefined;`
`@@ -44,12 +39,6 @@ vi.mock("../config/sessions/paths.js", () => ({`
`44`	`39`	`resolveStorePath: (...args: unknown[]) => state.resolveStorePathMock(...args),`
`45`	`40`	`}));`
`46`	`41`
`47`		`-vi.mock("../config/sessions.js", () => ({`
`48`		`-loadSessionStore: (...args: unknown[]) => state.loadSessionStoreMock(...args),`
`49`		`-resolveStorePath: (...args: unknown[]) => state.resolveStorePathMock(...args),`
`50`		`-updateSessionStore: (...args: unknown[]) => state.updateSessionStoreMock(...args),`
`51`		`-}));`
`52`		`-`
`53`	`42`	`let mod: typeof import("./live-model-switch.js");`
`54`	`43`
`55`	`44`	`async function loadModule() {`
`@@ -193,6 +182,12 @@ describe("live model switch", () => {`
`193`	`182`	`expect(state.resolveStorePathMock).toHaveBeenCalledWith("/tmp/custom-store.json", {`
`194`	`183`	`agentId: "reply",`
`195`	`184`	`});`
	`185`	`+expect(state.loadSessionStoreMock).toHaveBeenCalledWith({`
	`186`	`+storePath: "/tmp/session-store.json",`
	`187`	`+sessionKey: "main",`
	`188`	`+hydrateSkillPromptRefs: false,`
	`189`	`+readConsistency: "latest",`
	`190`	`+});`
`196`	`191`	`});`
`197`	`192`
`198`	`193`	`it("prefers persisted session overrides ahead of stale runtime model fields", async () => {`
`@@ -468,10 +463,12 @@ describe("live model switch", () => {`
`468`	`463`	`const result = shouldSwitchToLiveModel(makeShouldSwitchParams());`
`469`	`464`
`470`	`465`	`expect(result).toBeUndefined();`
`471`		`-expect(state.loadSessionStoreMock).toHaveBeenCalledWith("/tmp/session-store.json", {`
	`466`	`+expect(state.loadSessionStoreMock).toHaveBeenCalledWith({`
`472`	`467`	`hydrateSkillPromptRefs: false,`
`473`		`-skipCache: true,`
`474`	`468`	`clone: false,`
	`469`	`+readConsistency: "latest",`
	`470`	`+sessionKey: "main",`
	`471`	`+storePath: "/tmp/session-store.json",`
`475`	`472`	`});`
`476`	`473`	`});`
`477`	`474`

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,8 @@`
`3`	`3`	`*/`
`4`	`4`	`import { normalizeProviderId } from "@openclaw/model-catalog-core/provider-id";`
`5`	`5`	`import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";`
`6`		`-`
`7`	`6`	`import { resolveStorePath } from "../config/sessions/paths.js";`
`8`		`-import { patchSessionEntry } from "../config/sessions/session-accessor.js";`
`9`		`-import { loadSessionStore } from "../config/sessions/store.js";`
	`7`	`+import { loadSessionEntry, patchSessionEntry } from "../config/sessions/session-accessor.js";`
`10`	`8`	`import {`
`11`	`9`	`normalizeStoredOverrideModel,`
`12`	`10`	`resolveDefaultModelForAgent,`
`@@ -45,10 +43,12 @@ export function resolveLiveSessionModelSelection(params: {`
`45`	`43`	`const storePath = resolveStorePath(cfg.session?.store, {`
`46`	`44`	`agentId,`
`47`	`45`	`});`
`48`		`-const entry = loadSessionStore(storePath, {`
	`46`	`+const entry = loadSessionEntry({`
	`47`	`+ storePath,`
	`48`	`+ sessionKey,`
`49`	`49`	`hydrateSkillPromptRefs: false,`
`50`		`-skipCache: true,`
`51`		`-})[sessionKey];`
	`50`	`+readConsistency: "latest",`
	`51`	`+});`
`52`	`52`	`const normalizedSelection = normalizeStoredOverrideModel({`
`53`	`53`	`providerOverride: entry?.providerOverride,`
`54`	`54`	`modelOverride: entry?.modelOverride,`
`@@ -151,11 +151,13 @@ export function shouldSwitchToLiveModel(params: {`
`151`	`151`	`const storePath = resolveStorePath(cfg.session?.store, {`
`152`	`152`	`agentId: params.agentId?.trim(),`
`153`	`153`	`});`
`154`		`-const entry = loadSessionStore(storePath, {`
	`154`	`+const entry = loadSessionEntry({`
	`155`	`+ storePath,`
	`156`	`+ sessionKey,`
`155`	`157`	`hydrateSkillPromptRefs: false,`
`156`		`-skipCache: true,`
`157`	`158`	`clone: false,`
`158`		`-})[sessionKey];`
	`159`	`+readConsistency: "latest",`
	`160`	`+});`
`159`	`161`	`if (!entry?.liveModelSwitchPending) {`
`160`	`162`	`return undefined;`
`161`	`163`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import fs from "node:fs";`
`2`	`2`	`import os from "node:os";`
`3`	`3`	`import path from "node:path";`
`4`		`-import { afterEach, beforeEach, describe, expect, it } from "vitest";`
	`4`	`+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";`
`5`	`5`	`import { SessionManager } from "../../agents/sessions/session-manager.js";`
`6`	`6`	`import { onSessionTranscriptUpdate } from "../../sessions/transcript-events.js";`
`7`	`7`	`import type { OpenClawConfig } from "../types.openclaw.js";`
`@@ -36,6 +36,7 @@ import {`
`36`	`36`	`updateSessionEntry,`
`37`	`37`	`upsertSessionEntry,`
`38`	`38`	`} from "./session-accessor.js";`
	`39`	`+import * as sessionStore from "./store.js";`
`39`	`40`	`import { loadSessionStore, saveSessionStore, updateSessionStoreEntry } from "./store.js";`
`40`	`41`	`import { withOwnedSessionTranscriptWrites } from "./transcript-write-context.js";`
`41`	`42`	`import type { SessionEntry } from "./types.js";`
`@@ -464,6 +465,47 @@ describe("session accessor file-backed seam", () => {`
`464`	`465`	`);`
`465`	`466`	`});`
`466`	`467`
	`468`	`+it("maps latest entry reads to the file backend cache bypass", () => {`
	`469`	`+fs.writeFileSync(`
	`470`	`+storePath,`
	`471`	`+JSON.stringify({`
	`472`	`+"agent:main:main": {`
	`473`	`+sessionId: "session-1",`
	`474`	`+model: "gpt-5.4",`
	`475`	`+},`
	`476`	`+}),`
	`477`	`+"utf8",`
	`478`	`+);`
	`479`	`+const loadSessionStoreSpy = vi.spyOn(sessionStore, "loadSessionStore");`
	`480`	`+`
	`481`	`+try {`
	`482`	`+expect(`
	`483`	`+loadSessionEntry({`
	`484`	`+readConsistency: "latest",`
	`485`	`+sessionKey: "agent:main:main",`
	`486`	`+ storePath,`
	`487`	`+})?.model,`
	`488`	`+).toBe("gpt-5.4");`
	`489`	`+expect(loadSessionStoreSpy).toHaveBeenLastCalledWith(`
	`490`	`+storePath,`
	`491`	`+expect.objectContaining({ skipCache: true }),`
	`492`	`+);`
	`493`	`+`
	`494`	`+loadSessionEntry({`
	`495`	`+clone: false,`
	`496`	`+readConsistency: "latest",`
	`497`	`+sessionKey: "agent:main:main",`
	`498`	`+ storePath,`
	`499`	`+});`
	`500`	`+expect(loadSessionStoreSpy).toHaveBeenLastCalledWith(`
	`501`	`+storePath,`
	`502`	`+expect.objectContaining({ clone: false, skipCache: true }),`
	`503`	`+);`
	`504`	`+} finally {`
	`505`	`+loadSessionStoreSpy.mockRestore();`
	`506`	`+}`
	`507`	`+});`
	`508`	`+`
`467`	`509`	`it("resolves canonical entry reads without requiring exact key casing", async () => {`
`468`	`510`	`fs.writeFileSync(`
`469`	`511`	`storePath,`

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ export type SessionAccessScope = {`
`125`	`125`	`env?: NodeJS.ProcessEnv;`
`126`	`126`	`/** Set false for metadata-only reads that do not need hydrated prompt refs. */`
`127`	`127`	`hydrateSkillPromptRefs?: boolean;`
	`128`	`+/** Use latest when the caller must bypass any in-process metadata snapshot. */`
	`129`	`+readConsistency?: "latest";`
`128`	`130`	`/** Canonical or alias session key for the entry being read or written. */`
`129`	`131`	`sessionKey: string;`
`130`	`132`	`/** Explicit store path for callers that already resolved the owning store. */`
`@@ -720,9 +722,10 @@ export async function updateResolvedSessionEntry<T>(`
`720`	`722`
`721`	`723`	`/** Returns the entry for a canonical or alias session key, if one exists. */`
`722`	`724`	`export function loadSessionEntry(scope: SessionAccessScope): SessionEntry \| undefined {`
`723`		`-if (scope.clone === false) {`
	`725`	`+if (scope.clone === false \|\| scope.readConsistency === "latest") {`
`724`	`726`	`const store = loadSessionStore(resolveAccessStorePath(scope), {`
`725`		`-clone: false,`
	`727`	`+ ...(scope.clone === false ? { clone: false } : {}),`
	`728`	`+ ...(scope.readConsistency === "latest" ? { skipCache: true } : {}),`
`726`	`729`	`...(scope.hydrateSkillPromptRefs === false ? { hydrateSkillPromptRefs: false } : {}),`
`727`	`730`	`});`
`728`	`731`	`return resolveSessionStoreEntry({ store, sessionKey: scope.sessionKey }).existing;`

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,10 @@ describe("session accessor boundary guard", () => {`
`32`	`32`	`"src/agents/embedded-agent-runner/tool-result-truncation.ts",`
`33`	`33`	`"src/agents/embedded-agent-runner/transcript-rewrite.ts",`
`34`	`34`	`"src/agents/embedded-agent-runner/transcript-runtime-state.ts",`
`35`		`-"src/auto-reply/reply/abort.ts",`
	`35`	`+"src/agents/live-model-switch.ts",`
`36`	`36`	`"src/agents/subagent-control.ts",`
`37`	`37`	`"src/agents/subagent-registry-helpers.ts",`
	`38`	`+"src/auto-reply/reply/abort.ts",`
`38`	`39`	`"src/auto-reply/reply/agent-runner-helpers.ts",`
`39`	`40`	`"src/auto-reply/reply/agent-runner.ts",`
`40`	`41`	`"src/auto-reply/reply/commands-subagents/action-info.ts",`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main