fix: preserve plugin maintenance config compatibility · o...

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,12 @@ export type ResolvedSessionMaintenanceConfig = {`
`47`	`47`	`highWaterBytes: number \| null;`
`48`	`48`	`};`
`49`	`49`
	`50`	`+export type ResolvedSessionMaintenanceConfigInput = Omit<`
	`51`	`+ResolvedSessionMaintenanceConfig,`
	`52`	`+"modelRunPruneAfterMs"`
	`53`	`+> &`
	`54`	`+Partial<Pick<ResolvedSessionMaintenanceConfig, "modelRunPruneAfterMs">>;`
	`55`	`+`
`50`	`56`	`function resolvePruneAfterMs(maintenance?: SessionMaintenanceConfig): number {`
`51`	`57`	`const raw = maintenance?.pruneAfter ?? maintenance?.pruneDays;`
`52`	`58`	`const normalized = normalizeStringifiedOptionalString(raw);`
`@@ -147,6 +153,15 @@ export function resolveMaintenanceConfigFromInput(`
`147`	`153`	`};`
`148`	`154`	`}`
`149`	`155`
	`156`	`+export function normalizeResolvedMaintenanceConfigInput(`
	`157`	`+maintenance: ResolvedSessionMaintenanceConfigInput,`
	`158`	`+): ResolvedSessionMaintenanceConfig {`
	`159`	`+return {`
	`160`	`+ ...maintenance,`
	`161`	`+modelRunPruneAfterMs: maintenance.modelRunPruneAfterMs ?? DEFAULT_MODEL_RUN_PRUNE_AFTER_MS,`
	`162`	`+};`
	`163`	`+}`
	`164`	`+`
`150`	`165`	`export function resolveSessionEntryMaintenanceHighWater(maxEntries: number): number {`
`151`	`166`	`if (!Number.isSafeInteger(maxEntries) \|\| maxEntries <= 0) {`
`152`	`167`	`return 1;`

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ import {`
`69`	`69`	`pruneStaleModelRunEntries,`
`70`	`70`	`pruneStaleEntries,`
`71`	`71`	`type ResolvedSessionMaintenanceConfig,`
	`72`	`+type ResolvedSessionMaintenanceConfigInput,`
`72`	`73`	`type SessionMaintenanceWarning,`
`73`	`74`	`} from "./store-maintenance.js";`
`74`	`75`	`import { runExclusiveSessionStoreWrite } from "./store-writer.js";`
`@@ -173,7 +174,11 @@ export {`
`173`	`174`	`resolveMaintenanceConfig,`
`174`	`175`	`};`
`175`	`176`	`export type { SessionMaintenanceApplyReport } from "./store-maintenance-operations.js";`
`176`		`-export type { ResolvedSessionMaintenanceConfig, SessionMaintenanceWarning };`
	`177`	`+export type {`
	`178`	`+ResolvedSessionMaintenanceConfig,`
	`179`	`+ResolvedSessionMaintenanceConfigInput,`
	`180`	`+SessionMaintenanceWarning,`
	`181`	`+};`
`177`	`182`
`178`	`183`	`type SaveSessionStoreOptions = {`
`179`	`184`	`/** Skip pruning, capping, and rotation (e.g. during one-time migrations). */`

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,51 @@ describe("session-store-runtime compatibility surface", () => {`
`165`	`165`	`expect(getSessionEntry({ sessionKey: staleSessionKey, storePath })).toBeUndefined();`
`166`	`166`	`});`
`167`	`167`
	`168`	`+it("accepts pre-model-run maintenance configs through entry patches", async () => {`
	`169`	`+const staleModelRunKey = "agent:main:explicit:model-run-123e4567-e89b-12d3-a456-426614174000";`
	`170`	`+const activeSessionKey = "agent:main:active";`
	`171`	`+const now = Date.now();`
	`172`	`+await saveSessionStore(`
	`173`	`+storePath,`
	`174`	`+{`
	`175`	`+[staleModelRunKey]: {`
	`176`	`+sessionId: "session-probe",`
	`177`	`+updatedAt: now - 2 * DAY_MS,`
	`178`	`+},`
	`179`	`+[activeSessionKey]: {`
	`180`	`+sessionId: "session-active",`
	`181`	`+updatedAt: now,`
	`182`	`+},`
	`183`	`+},`
	`184`	`+{ skipMaintenance: true },`
	`185`	`+);`
	`186`	`+`
	`187`	`+const legacyMaintenanceConfig = {`
	`188`	`+mode: "enforce" as const,`
	`189`	`+pruneAfterMs: 7 * DAY_MS,`
	`190`	`+maxEntries: 500,`
	`191`	`+resetArchiveRetentionMs: 7 * DAY_MS,`
	`192`	`+maxDiskBytes: null,`
	`193`	`+highWaterBytes: null,`
	`194`	`+};`
	`195`	`+`
	`196`	`+await expect(`
	`197`	`+patchSessionEntry({`
	`198`	`+sessionKey: activeSessionKey,`
	`199`	`+ storePath,`
	`200`	`+maintenanceConfig: legacyMaintenanceConfig,`
	`201`	`+update: () => ({ model: "gpt-5.5" }),`
	`202`	`+}),`
	`203`	`+).resolves.toMatchObject({`
	`204`	`+model: "gpt-5.5",`
	`205`	`+sessionId: "session-active",`
	`206`	`+});`
	`207`	`+`
	`208`	`+expect(getSessionEntry({ sessionKey: staleModelRunKey, storePath })).toMatchObject({`
	`209`	`+sessionId: "session-probe",`
	`210`	`+});`
	`211`	`+});`
	`212`	`+`
`168`	`213`	`it("keeps deprecated whole-store mutations grouped as one compatibility operation", async () => {`
`169`	`214`	`const firstSessionKey = "agent:main:first";`
`170`	`215`	`const secondSessionKey = "agent:main:second";`

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ import {`
`12`	`12`	`updateSessionEntry,`
`13`	`13`	`} from "../config/sessions/session-accessor.js";`
`14`	`14`	`import { loadSessionStore as loadSessionStoreImpl } from "../config/sessions/store-load.js";`
`15`		`-import type { ResolvedSessionMaintenanceConfig } from "../config/sessions/store.js";`
	`15`	`+import { normalizeResolvedMaintenanceConfigInput } from "../config/sessions/store-maintenance.js";`
	`16`	`+import type { ResolvedSessionMaintenanceConfigInput } from "../config/sessions/store.js";`
`16`	`17`	`import type { SessionEntry } from "../config/sessions/types.js";`
`17`	`18`
`18`	`19`	`type SessionStoreReadParams = {`
`@@ -42,7 +43,7 @@ type SessionStoreEntryPatch = (`
`42`	`43`
`43`	`44`	`type PatchSessionEntryParams = SessionStoreReadParams & {`
`44`	`45`	`fallbackEntry?: SessionEntry;`
`45`		`-maintenanceConfig?: ResolvedSessionMaintenanceConfig;`
	`46`	`+maintenanceConfig?: ResolvedSessionMaintenanceConfigInput;`
`46`	`47`	`preserveActivity?: boolean;`
`47`	`48`	`replaceEntry?: boolean;`
`48`	`49`	`update: SessionStoreEntryPatch;`
`@@ -128,7 +129,10 @@ export async function patchSessionEntry(`
`128`	`129`	`): Promise<SessionEntry \| null> {`
`129`	`130`	`return await patchAccessorSessionEntry(toSessionAccessScope(params), params.update, {`
`130`	`131`	`fallbackEntry: params.fallbackEntry,`
`131`		`-maintenanceConfig: params.maintenanceConfig,`
	`132`	`+maintenanceConfig:`
	`133`	`+params.maintenanceConfig !== undefined`
	`134`	`+ ? normalizeResolvedMaintenanceConfigInput(params.maintenanceConfig)`
	`135`	`+ : undefined,`
`132`	`136`	`preserveActivity: params.preserveActivity,`
`133`	`137`	`replaceEntry: params.replaceEntry,`
`134`	`138`	`});`

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,12 @@ import {`
`19`	`19`	`type SessionAccessScope,`
`20`	`20`	`updateSessionEntry,`
`21`	`21`	`} from "../../config/sessions/session-accessor.js";`
	`22`	`+import { normalizeResolvedMaintenanceConfigInput } from "../../config/sessions/store-maintenance.js";`
`22`	`23`	`import {`
`23`	`24`	`loadSessionStore,`
`24`	`25`	`saveSessionStore,`
`25`	`26`	`updateSessionStore,`
`26`		`-type ResolvedSessionMaintenanceConfig,`
	`27`	`+type ResolvedSessionMaintenanceConfigInput,`
`27`	`28`	`} from "../../config/sessions/store.js";`
`28`	`29`	`import type { SessionEntry } from "../../config/sessions/types.js";`
`29`	`30`	`import { createLazyRuntimeMethod, createLazyRuntimeModule } from "../../shared/lazy-runtime.js";`
`@@ -59,7 +60,7 @@ type RuntimeSessionStoreEntryUpdateParams = {`
`59`	`60`
`60`	`61`	`type RuntimeSessionStoreEntryPatchParams = RuntimeSessionStoreReadParams & {`
`61`	`62`	`fallbackEntry?: SessionEntry;`
`62`		`-maintenanceConfig?: ResolvedSessionMaintenanceConfig;`
	`63`	`+maintenanceConfig?: ResolvedSessionMaintenanceConfigInput;`
`63`	`64`	`preserveActivity?: boolean;`
`64`	`65`	`replaceEntry?: boolean;`
`65`	`66`	`update: (`
`@@ -123,7 +124,10 @@ async function patchSessionEntry(`
`123`	`124`	`): Promise<SessionEntry \| null> {`
`124`	`125`	`return await patchAccessorSessionEntry(toSessionAccessScope(params), params.update, {`
`125`	`126`	`fallbackEntry: params.fallbackEntry,`
`126`		`-maintenanceConfig: params.maintenanceConfig,`
	`127`	`+maintenanceConfig:`
	`128`	`+params.maintenanceConfig !== undefined`
	`129`	`+ ? normalizeResolvedMaintenanceConfigInput(params.maintenanceConfig)`
	`130`	`+ : undefined,`
`127`	`131`	`preserveActivity: params.preserveActivity,`
`128`	`132`	`replaceEntry: params.replaceEntry,`
`129`	`133`	`});`

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ type RuntimeSessionStoreEntrySummary = {`
`75`	`75`	`};`
`76`	`76`	`type RuntimeSessionStoreEntryPatchParams = RuntimeSessionStoreReadParams & {`
`77`	`77`	`fallbackEntry?: RuntimeSessionEntry;`
`78`		`-maintenanceConfig?: import("../../config/sessions/store.js").ResolvedSessionMaintenanceConfig;`
	`78`	`+maintenanceConfig?: import("../../config/sessions/store.js").ResolvedSessionMaintenanceConfigInput;`
`79`	`79`	`preserveActivity?: boolean;`
`80`	`80`	`replaceEntry?: boolean;`
`81`	`81`	`update: (`

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

推荐订阅源

Recent Commits to openclaw:main