perf(sessions): add precomputed patch writer · openclaw/o...

Recent Commits to openclaw:main

steipete · 2026-05-28 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@ import type { OpenClawConfig } from "../config/types.openclaw.js";`
`4`	`4`	`import { CommandLane } from "../process/lanes.js";`
`5`	`5`
`6`	`6`	`const sessionStoreMocks = vi.hoisted(() => ({`
`7`		`-updateSessionStoreEntry: vi.fn(async (params: { update: (entry: unknown) => unknown }) => {`
`8`		`-await params.update({ sessionId: "session-1" });`
`9`		`-}),`
	`7`	`+applySessionStoreEntryPatch: vi.fn(),`
`10`	`8`	`}));`
`11`	`9`
`12`	`10`	`const commandQueueMocks = vi.hoisted(() => ({`
`@@ -44,7 +42,7 @@ describe("session suspension", () => {`
`44`	`42`	`cancelLaneAutoResume(CommandLane.Cron);`
`45`	`43`	`cancelLaneAutoResume(CommandLane.CronNested);`
`46`	`44`	`vi.useRealTimers();`
`47`		`-sessionStoreMocks.updateSessionStoreEntry.mockClear();`
	`45`	`+sessionStoreMocks.applySessionStoreEntryPatch.mockClear();`
`48`	`46`	`commandQueueMocks.setCommandLaneConcurrency.mockClear();`
`49`	`47`	`});`
`50`	`48`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import path from "node:path";`
`2`	`2`	`import { resolveAgentMaxConcurrent, resolveSubagentMaxConcurrent } from "../config/agent-limits.js";`
`3`	`3`	`import { resolveCronMaxConcurrentRuns } from "../config/cron-limits.js";`
`4`		`-import { updateSessionStoreEntry } from "../config/sessions.js";`
	`4`	`+import { applySessionStoreEntryPatch } from "../config/sessions.js";`
`5`	`5`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`6`	`6`	`import { createSubsystemLogger } from "../logging/subsystem.js";`
`7`	`7`	`import { setCommandLaneConcurrency } from "../process/command-queue.js";`
`@@ -98,10 +98,10 @@ export async function suspendSession(params: {`
`98`	`98`	`const now = Date.now();`
`99`	`99`
`100`	`100`	`try {`
`101`		`-await updateSessionStoreEntry({`
	`101`	`+await applySessionStoreEntryPatch({`
`102`	`102`	`storePath,`
`103`	`103`	`sessionKey,`
`104`		`-update: async () => ({`
	`104`	`+patch: {`
`105`	`105`	`quotaSuspension: {`
`106`	`106`	`schemaVersion: 1,`
`107`	`107`	`suspendedAt: now,`
`@@ -113,7 +113,7 @@ export async function suspendSession(params: {`
`113`	`113`	`expectedResumeBy: now + ttlMs,`
`114`	`114`	`state: "suspended",`
`115`	`115`	`},`
`116`		`-}),`
	`116`	`+},`
`117`	`117`	`});`
`118`	`118`	`} catch (err) {`
`119`	`119`	`log.warn("failed to persist quota suspension; not throttling lane", {`

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import {`
`26`	`26`	`resolveSessionFilePath,`
`27`	`27`	`resolveSessionFilePathOptions,`
`28`	`28`	`type SessionEntry,`
	`29`	`+applySessionStoreEntryPatch,`
`29`	`30`	`updateSessionStoreEntry,`
`30`	`31`	`} from "../../config/sessions.js";`
`31`	`32`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`@@ -1038,10 +1039,10 @@ export async function runMemoryFlushIfNeeded(params: {`
`1038`	`1039`	`}`
`1039`	`1040`	`if (params.storePath && params.sessionKey) {`
`1040`	`1041`	`try {`
`1041`		`-const updatedEntry = await updateSessionStoreEntry({`
	`1042`	`+const updatedEntry = await applySessionStoreEntryPatch({`
`1042`	`1043`	`storePath: params.storePath,`
`1043`	`1044`	`sessionKey: params.sessionKey,`
`1044`		`-update: async () => ({ totalTokens: transcriptPromptTokens, totalTokensFresh: true }),`
	`1045`	`+patch: { totalTokens: transcriptPromptTokens, totalTokensFresh: true },`
`1045`	`1046`	`});`
`1046`	`1047`	`if (updatedEntry) {`
`1047`	`1048`	`entry = updatedEntry;`

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ import { deriveContextPromptTokens, hasNonzeroUsage, normalizeUsage } from "../.`
`17`	`17`	`import { enqueueCommitmentExtraction } from "../../commitments/runtime.js";`
`18`	`18`	`import type { OpenClawConfig } from "../../config/config.js";`
`19`	`19`	`import {`
	`20`	`+applySessionStoreEntryPatch,`
`20`	`21`	`loadSessionStore,`
`21`	`22`	`resolveSessionPluginStatusLines,`
`22`	`23`	`resolveSessionPluginTraceLines,`
`23`	`24`	`type SessionEntry,`
`24`		`-updateSessionStoreEntry,`
`25`	`25`	`} from "../../config/sessions.js";`
`26`	`26`	`import type { TypingMode } from "../../config/types.js";`
`27`	`27`	`import { resolveSessionTranscriptCandidates } from "../../gateway/session-utils.fs.js";`
`@@ -1140,10 +1140,10 @@ export async function runReplyAgent(params: {`
`1140`	`1140`	`activeSessionEntry.updatedAt = updatedAt;`
`1141`	`1141`	`activeSessionStore[sessionKey] = activeSessionEntry;`
`1142`	`1142`	`if (storePath) {`
`1143`		`-await updateSessionStoreEntry({`
	`1143`	`+await applySessionStoreEntryPatch({`
`1144`	`1144`	`storePath,`
`1145`	`1145`	`sessionKey,`
`1146`		`-update: async () => ({ updatedAt }),`
	`1146`	`+patch: { updatedAt },`
`1147`	`1147`	`});`
`1148`	`1148`	`}`
`1149`	`1149`	`};`
`@@ -1523,13 +1523,13 @@ export async function runReplyAgent(params: {`
`1523`	`1523`	`activeSessionEntry.updatedAt = updatedAt;`
`1524`	`1524`	`activeSessionStore[sessionKey] = activeSessionEntry;`
`1525`	`1525`	`if (storePath) {`
`1526`		`-await updateSessionStoreEntry({`
	`1526`	`+await applySessionStoreEntryPatch({`
`1527`	`1527`	`storePath,`
`1528`	`1528`	`sessionKey,`
`1529`		`-update: async () => ({`
	`1529`	`+patch: {`
`1530`	`1530`	`groupActivationNeedsSystemIntro: false,`
`1531`	`1531`	`updatedAt,`
`1532`		`-}),`
	`1532`	`+},`
`1533`	`1533`	`});`
`1534`	`1534`	`}`
`1535`	`1535`	`}`
`@@ -1585,14 +1585,14 @@ export async function runReplyAgent(params: {`
`1585`	`1585`	`activeSessionStore[sessionKey] = fallbackStateEntry;`
`1586`	`1586`	`}`
`1587`	`1587`	`if (sessionKey && storePath) {`
`1588`		`-await updateSessionStoreEntry({`
	`1588`	`+await applySessionStoreEntryPatch({`
`1589`	`1589`	`storePath,`
`1590`	`1590`	`sessionKey,`
`1591`		`-update: async () => ({`
	`1591`	`+patch: {`
`1592`	`1592`	`fallbackNoticeSelectedModel: fallbackTransition.nextState.selectedModel,`
`1593`	`1593`	`fallbackNoticeActiveModel: fallbackTransition.nextState.activeModel,`
`1594`	`1594`	`fallbackNoticeReason: fallbackTransition.nextState.reason,`
`1595`		`-}),`
	`1595`	`+},`
`1596`	`1596`	`});`
`1597`	`1597`	`}`
`1598`	`1598`	`}`
`@@ -2160,17 +2160,17 @@ export async function runReplyAgent(params: {`
`2160`	`2160`	`})()`
`2161`	`2161`	`: pendingText;`
`2162`	`2162`	`if (resolvedPendingText) {`
`2163`		`-await updateSessionStoreEntry({`
	`2163`	`+await applySessionStoreEntryPatch({`
`2164`	`2164`	`storePath,`
`2165`	`2165`	`sessionKey,`
`2166`	`2166`	`skipMaintenance: true,`
`2167`	`2167`	`takeCacheOwnership: true,`
`2168`		`-update: async () => ({`
	`2168`	`+patch: {`
`2169`	`2169`	`pendingFinalDelivery: true,`
`2170`	`2170`	`pendingFinalDeliveryText: resolvedPendingText,`
`2171`	`2171`	`pendingFinalDeliveryCreatedAt: Date.now(),`
`2172`	`2172`	`updatedAt: Date.now(),`
`2173`		`-}),`
	`2173`	`+},`
`2174`	`2174`	`});`
`2175`	`2175`	`}`
`2176`	`2176`	`}`

Original file line number	Diff line number	Diff line change
`@@ -516,21 +516,21 @@ export async function getReplyFromConfig(`
`516`	`516`	`sessionStore[sessionKey] = sessionEntry;`
`517`	`517`	`}`
`518`	`518`	`if (sessionKey && storePath) {`
`519`		`-const { updateSessionStoreEntry } = await import("../../config/sessions.js");`
`520`		`-await updateSessionStoreEntry({`
	`519`	`+const { applySessionStoreEntryPatch } = await import("../../config/sessions.js");`
	`520`	`+await applySessionStoreEntryPatch({`
`521`	`521`	`storePath,`
`522`	`522`	`sessionKey,`
`523`	`523`	`skipMaintenance: true,`
`524`	`524`	`takeCacheOwnership: true,`
`525`		`-update: async () => ({`
	`525`	`+patch: {`
`526`	`526`	`pendingFinalDelivery: undefined,`
`527`	`527`	`pendingFinalDeliveryText: undefined,`
`528`	`528`	`pendingFinalDeliveryCreatedAt: undefined,`
`529`	`529`	`pendingFinalDeliveryLastAttemptAt: undefined,`
`530`	`530`	`pendingFinalDeliveryAttemptCount: undefined,`
`531`	`531`	`pendingFinalDeliveryLastError: undefined,`
`532`	`532`	`pendingFinalDeliveryContext: undefined,`
`533`		`-}),`
	`533`	`+},`
`534`	`534`	`});`
`535`	`535`	`}`
`536`	`536`	`} else {`
`@@ -546,19 +546,19 @@ export async function getReplyFromConfig(`
`546`	`546`	`sessionStore[sessionKey] = sessionEntry;`
`547`	`547`	`}`
`548`	`548`	`if (sessionKey && storePath) {`
`549`		`-const { updateSessionStoreEntry } = await import("../../config/sessions.js");`
`550`		`-await updateSessionStoreEntry({`
	`549`	`+const { applySessionStoreEntryPatch } = await import("../../config/sessions.js");`
	`550`	`+await applySessionStoreEntryPatch({`
`551`	`551`	`storePath,`
`552`	`552`	`sessionKey,`
`553`	`553`	`skipMaintenance: true,`
`554`	`554`	`takeCacheOwnership: true,`
`555`		`-update: async () => ({`
	`555`	`+patch: {`
`556`	`556`	`pendingFinalDeliveryText: replayText,`
`557`	`557`	`pendingFinalDeliveryLastAttemptAt: updatedAt,`
`558`	`558`	`pendingFinalDeliveryAttemptCount: attemptCount,`
`559`	`559`	`pendingFinalDeliveryLastError: null,`
`560`	`560`	`updatedAt,`
`561`		`-}),`
	`561`	`+},`
`562`	`562`	`});`
`563`	`563`	`}`
`564`	`564`	`logResolverTiming("completed", "pending_final_delivery_replay");`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import path from "node:path";`
`5`	`5`	`import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";`
`6`	`6`	`import { withEnv } from "../test-utils/env.js";`
`7`	`7`	`import {`
	`8`	`+applySessionStoreEntryPatch,`
`8`	`9`	`buildGroupDisplayName,`
`9`	`10`	`deriveSessionKey,`
`10`	`11`	`loadSessionStore,`
`@@ -534,6 +535,34 @@ describe("sessions", () => {`
`534`	`535`	`expect(store[sessionKey]?.reasoningLevel).toBe("on");`
`535`	`536`	`});`
`536`	`537`
	`538`	`+it("applySessionStoreEntryPatch applies a precomputed patch without a callback", async () => {`
	`539`	`+const sessionKey = "agent:main:main";`
	`540`	`+const { storePath } = await createSessionStoreFixture({`
	`541`	`+prefix: "applySessionStoreEntryPatch",`
	`542`	`+entries: {`
	`543`	`+[sessionKey]: {`
	`544`	`+sessionId: "sess-1",`
	`545`	`+updatedAt: 100,`
	`546`	`+reasoningLevel: "on",`
	`547`	`+},`
	`548`	`+},`
	`549`	`+});`
	`550`	`+`
	`551`	`+const result = await applySessionStoreEntryPatch({`
	`552`	`+ storePath,`
	`553`	`+ sessionKey,`
	`554`	`+patch: {`
	`555`	`+updatedAt: 200,`
	`556`	`+thinkingLevel: "high",`
	`557`	`+},`
	`558`	`+});`
	`559`	`+`
	`560`	`+expect(result?.thinkingLevel).toBe("high");`
	`561`	`+const store = loadSessionStore(storePath);`
	`562`	`+expect(store[sessionKey]?.updatedAt).toBeGreaterThanOrEqual(200);`
	`563`	`+expect(store[sessionKey]?.reasoningLevel).toBe("on");`
	`564`	`+});`
	`565`	`+`
`537`	`566`	`it("updateSessionStoreEntry returns null when session key does not exist", async () => {`
`538`	`567`	`const { storePath } = await createSessionStoreFixture({`
`539`	`568`	`prefix: "updateSessionStoreEntry-missing",`

Original file line number	Diff line number	Diff line change
`@@ -1 +1,5 @@`
`1`		`-export { updateSessionStore, updateSessionStoreEntry } from "./store.js";`
	`1`	`+export {`
	`2`	`+applySessionStoreEntryPatch,`
	`3`	`+updateSessionStore,`
	`4`	`+updateSessionStoreEntry,`
	`5`	`+} from "./store.js";`

Original file line number	Diff line number	Diff line change
`@@ -744,6 +744,33 @@ export async function updateSessionStoreEntry(params: {`
`744`	`744`	`});`
`745`	`745`	`}`
`746`	`746`
	`747`	`+export async function applySessionStoreEntryPatch(params: {`
	`748`	`+storePath: string;`
	`749`	`+sessionKey: string;`
	`750`	`+patch: Partial<SessionEntry>;`
	`751`	`+skipMaintenance?: boolean;`
	`752`	`+takeCacheOwnership?: boolean;`
	`753`	`+}): Promise<SessionEntry \| null> {`
	`754`	`+const { storePath, sessionKey, patch } = params;`
	`755`	`+return await runExclusiveSessionStoreWrite(storePath, async () => {`
	`756`	`+const store = loadMutableSessionStoreForWriter(storePath);`
	`757`	`+const resolved = resolveSessionStoreEntry({ store, sessionKey });`
	`758`	`+const existing = resolved.existing;`
	`759`	`+if (!existing) {`
	`760`	`+return null;`
	`761`	`+}`
	`762`	`+const next = mergeSessionEntry(existing, patch);`
	`763`	`+return await persistResolvedSessionEntry({`
	`764`	`+ storePath,`
	`765`	`+ store,`
	`766`	`+ resolved,`
	`767`	`+ next,`
	`768`	`+skipMaintenance: params.skipMaintenance,`
	`769`	`+takeCacheOwnership: params.takeCacheOwnership,`
	`770`	`+});`
	`771`	`+});`
	`772`	`+}`
	`773`	`+`
`747`	`774`	`export async function patchSessionEntry(`
`748`	`775`	`params: SessionEntryWorkflowOptions & {`
`749`	`776`	`sessionKey: string;`

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

推荐订阅源

Recent Commits to openclaw:main