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

推荐订阅源

大猫的无限游戏
大猫的无限游戏
J
Java Code Geeks
小众软件
小众软件
D
Docker
腾讯CDC
H
Hackread – Cybersecurity News, Data Breaches, AI and More
V
V2EX
博客园 - 叶小钗
GbyAI
GbyAI
Microsoft Azure Blog
Microsoft Azure Blog
Stack Overflow Blog
Stack Overflow Blog
B
Blog RSS Feed
酷 壳 – CoolShell
酷 壳 – CoolShell
博客园 - 【当耐特】
IT之家
IT之家
博客园 - 司徒正美
M
MIT News - Artificial intelligence
T
The Blog of Author Tim Ferriss
The GitHub Blog
The GitHub Blog
罗磊的独立博客
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
L
LangChain Blog
阮一峰的网络日志
阮一峰的网络日志
C
Check Point 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
fix: route deleted-agent purge through lifecycle seam (cl...
jalehman · 2026-06-18 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -108,6 +108,7 @@ export const migratedSessionAccessorWriteFiles = new Set([

108108

"src/auto-reply/reply/session-updates.ts",

109109

"src/auto-reply/reply/session-usage.ts",

110110

"src/tui/embedded-backend.ts",

111+

"src/config/sessions/cleanup-service.ts",

111112

]);

112113
113114

export const migratedTranscriptWriterFiles = new Set([

@@ -333,6 +334,7 @@ export async function main() {

333334

const writeSourceRoots = resolveSourceRoots(repoRoot, [

334335

"src/agents",

335336

"src/auto-reply",

337+

"src/config/sessions",

336338

"src/tui",

337339

]);

338340

const transcriptWriterSourceRoots = resolveSourceRoots(repoRoot, [

Original file line numberDiff line numberDiff line change

@@ -0,0 +1,52 @@

1+

import { beforeEach, describe, expect, it, vi } from "vitest";

2+

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

3+

import { purgeAgentSessionStoreEntries } from "./cleanup-service.js";

4+
5+

const sessionAccessorMocks = vi.hoisted(() => ({

6+

applySessionEntryLifecycleMutation: vi.fn(async () => ({

7+

removedEntries: 0,

8+

removedSessionKeys: [],

9+

archivedTranscriptDirectories: [],

10+

unreferencedArtifacts: null,

11+

maintenanceReport: null,

12+

afterCount: 0,

13+

})),

14+

purgeDeletedAgentSessionEntries: vi.fn(async () => ({

15+

removedEntries: 0,

16+

removedSessionKeys: [],

17+

archivedTranscriptDirectories: [],

18+

unreferencedArtifacts: null,

19+

maintenanceReport: null,

20+

afterCount: 0,

21+

})),

22+

}));

23+
24+

vi.mock("./session-accessor.js", () => sessionAccessorMocks);

25+
26+

describe("purgeAgentSessionStoreEntries", () => {

27+

beforeEach(() => {

28+

vi.clearAllMocks();

29+

});

30+
31+

it("purges deleted-agent entries through the storage boundary", async () => {

32+

const cfg = {

33+

session: { store: "/tmp/openclaw-agent-purge-sessions.json" },

34+

agents: {

35+

list: [

36+

{ id: "main", workspace: "/workspace/main" },

37+

{ id: "ops", workspace: "/workspace/ops" },

38+

],

39+

},

40+

} satisfies OpenClawConfig;

41+
42+

await purgeAgentSessionStoreEntries(cfg, "ops");

43+
44+

expect(sessionAccessorMocks.purgeDeletedAgentSessionEntries).toHaveBeenCalledWith({

45+

cfg,

46+

agentId: "ops",

47+

storeAgentId: "main",

48+

storePath: "/tmp/openclaw-agent-purge-sessions.json",

49+

});

50+

expect(sessionAccessorMocks.applySessionEntryLifecycleMutation).not.toHaveBeenCalled();

51+

});

52+

});

Original file line numberDiff line numberDiff line change

@@ -4,7 +4,6 @@

44

import fs from "node:fs";

55

import path from "node:path";

66

import { resolveDefaultAgentId } from "../../agents/agent-scope.js";

7-

import { resolveStoredSessionOwnerAgentId } from "../../gateway/session-store-key.js";

87

import { getLogger } from "../../logging/logger.js";

98

import { normalizeAgentId, parseAgentSessionKey } from "../../routing/session-key.js";

109

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

@@ -21,6 +20,7 @@ import {

2120

} from "./paths.js";

2221

import {

2322

applySessionEntryLifecycleMutation,

23+

purgeDeletedAgentSessionEntries,

2424

type SessionEntryLifecycleRemoval,

2525

} from "./session-accessor.js";

2626

import { cloneSessionStoreRecord } from "./store-cache.js";

@@ -31,7 +31,7 @@ import {

3131

pruneStaleEntries,

3232

type ResolvedSessionMaintenanceConfig,

3333

} from "./store-maintenance.js";

34-

import { loadSessionStore, updateSessionStore } from "./store.js";

34+

import { loadSessionStore } from "./store.js";

3535

import {

3636

resolveSessionStoreTargets,

3737

type SessionStoreTarget,

@@ -634,18 +634,11 @@ export async function purgeAgentSessionStoreEntries(

634634

? normalizedAgentId

635635

: normalizeAgentId(resolveDefaultAgentId(cfg));

636636

const storePath = resolveStorePath(cfg.session?.store, { agentId: normalizedAgentId });

637-

await updateSessionStore(storePath, (store) => {

638-

for (const key of Object.keys(store)) {

639-

if (

640-

resolveStoredSessionOwnerAgentId({

641-

cfg,

642-

agentId: storeAgentId,

643-

sessionKey: key,

644-

}) === normalizedAgentId

645-

) {

646-

delete store[key];

647-

}

648-

}

637+

await purgeDeletedAgentSessionEntries({

638+

cfg,

639+

agentId: normalizedAgentId,

640+

storeAgentId,

641+

storePath,

649642

});

650643

} catch (err) {

651644

getLogger().debug("session store purge skipped during agent delete", err);

Original file line numberDiff line numberDiff line change

@@ -3,6 +3,7 @@ import os from "node:os";

33

import path from "node:path";

44

import { afterEach, beforeEach, describe, expect, it } from "vitest";

55

import { onSessionTranscriptUpdate } from "../../sessions/transcript-events.js";

6+

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

67

import {

78

appendTranscriptMessage,

89

appendTranscriptEvent,

@@ -16,6 +17,7 @@ import {

1617

loadTranscriptEvents,

1718

patchSessionEntry,

1819

persistSessionTranscriptTurn,

20+

purgeDeletedAgentSessionEntries,

1921

publishTranscriptUpdate,

2022

readSessionUpdatedAt,

2123

replaceSessionEntry,

@@ -82,6 +84,39 @@ describe("session accessor file-backed seam", () => {

8284

});

8385

});

8486
87+

it("purges deleted-agent entries from the current locked store", async () => {

88+

const cfg = {

89+

session: { store: storePath },

90+

agents: {

91+

list: [

92+

{ id: "main", workspace: path.join(tempDir, "main") },

93+

{ id: "ops", workspace: path.join(tempDir, "ops") },

94+

],

95+

},

96+

} satisfies OpenClawConfig;

97+

const now = Date.now();

98+

fs.writeFileSync(

99+

storePath,

100+

JSON.stringify({

101+

main: { sessionId: "main-legacy", updatedAt: now },

102+

"agent:ops:main": { sessionId: "ops-session", updatedAt: now },

103+

}),

104+

"utf8",

105+

);

106+
107+

const result = await purgeDeletedAgentSessionEntries({

108+

cfg,

109+

agentId: "ops",

110+

storeAgentId: "main",

111+

storePath,

112+

});

113+
114+

expect(result.removedSessionKeys).toEqual(["agent:ops:main"]);

115+

expect(loadSessionStore(storePath)).toEqual({

116+

main: expect.objectContaining({ sessionId: "main-legacy" }),

117+

});

118+

});

119+
85120

it("creates durable session ids for metadata-only inserts", async () => {

86121

const scope = {

87122

sessionKey: "agent:main:main",

Original file line numberDiff line numberDiff line change

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

3232

loadSessionStore,

3333

applySessionEntryPatchProjection as applyFileSessionEntryPatchProjection,

3434

patchSessionEntry as patchFileSessionEntry,

35+

purgeDeletedAgentSessionEntries as purgeFileDeletedAgentSessionEntries,

3536

readSessionUpdatedAt as readFileSessionUpdatedAt,

3637

resolveSessionStoreEntry,

3738

resetSessionEntryLifecycle as resetFileSessionEntryLifecycle,

@@ -40,6 +41,7 @@ import {

4041

type DeleteSessionEntryLifecycleResult,

4142

type ResetSessionEntryLifecycleMutation,

4243

type ResetSessionEntryLifecycleResult,

44+

type DeletedAgentSessionEntryPurgeParams,

4345

type SessionArchivedTranscriptCleanupRule,

4446

type SessionEntryLifecycleMutationResult,

4547

type SessionEntryLifecycleRemoval,

@@ -321,6 +323,7 @@ export type {

321323

};

322324
323325

export type {

326+

DeletedAgentSessionEntryPurgeParams,

324327

SessionArchivedTranscriptCleanupRule,

325328

SessionEntryLifecycleMutationResult,

326329

SessionEntryLifecycleRemoval,

@@ -630,6 +633,13 @@ export async function applySessionEntryLifecycleMutation(params: {

630633

return await applyFileSessionEntryLifecycleMutation(params);

631634

}

632635
636+

/** Purges session entries owned by a deleted agent at the storage boundary. */

637+

export async function purgeDeletedAgentSessionEntries(

638+

params: DeletedAgentSessionEntryPurgeParams,

639+

): Promise<SessionEntryLifecycleMutationResult> {

640+

return await purgeFileDeletedAgentSessionEntries(params);

641+

}

642+
633643

/** Reads parsed transcript records from an explicit or derived transcript target. */

634644

export async function loadTranscriptEvents(

635645

scope: SessionTranscriptReadScope,

Original file line numberDiff line numberDiff line change

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

66

normalizeOptionalString,

77

} from "@openclaw/normalization-core/string-coerce";

88

import type { MsgContext } from "../../auto-reply/templating.js";

9+

import { resolveStoredSessionOwnerAgentId } from "../../gateway/session-store-key.js";

910

import { writeTextAtomic } from "../../infra/json-files.js";

1011

import { createSubsystemLogger } from "../../logging/subsystem.js";

1112

import { resolveAgentIdFromSessionKey } from "../../routing/session-key.js";

@@ -20,6 +21,7 @@ import {

2021

import type { DeliveryContext } from "../../utils/delivery-context.types.js";

2122

import { getFileStatSnapshot } from "../cache-utils.js";

2223

import { getRuntimeConfig } from "../io.js";

24+

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

2325

import { formatSessionArchiveTimestamp } from "./artifacts.js";

2426

import {

2527

enforceSessionDiskBudget,

@@ -328,6 +330,17 @@ export type SessionEntryLifecycleMutationResult = {

328330

artifactCleanupError?: unknown;

329331

};

330332
333+

export type DeletedAgentSessionEntryPurgeParams = {

334+

/** Runtime config used to preserve legacy default-agent key ownership rules. */

335+

cfg: OpenClawConfig;

336+

/** Deleted agent whose session entries should be purged. */

337+

agentId: string;

338+

/** Agent id represented by the current store path for legacy unscoped keys. */

339+

storeAgentId: string;

340+

/** Resolved session store path to mutate. */

341+

storePath: string;

342+

};

343+
331344

function cloneSessionEntry(entry: SessionEntry): SessionEntry {

332345

return cloneSessionStoreRecord({ entry }).entry;

333346

}

@@ -1518,6 +1531,50 @@ export async function applySessionEntryLifecycleMutation(params: {

15181531

};

15191532

}

15201533
1534+

/**

1535+

* Purges entries owned by a deleted agent while holding the store writer lock.

1536+

* This preserves the old delete-time current-store owner check without

1537+

* exposing a mutable whole-store callback to callers.

1538+

*/

1539+

export async function purgeDeletedAgentSessionEntries(

1540+

params: DeletedAgentSessionEntryPurgeParams,

1541+

): Promise<SessionEntryLifecycleMutationResult> {

1542+

const storePath = path.resolve(params.storePath);

1543+

const removedSessionKeys: string[] = [];

1544+

let maintenanceReport: SessionMaintenanceApplyReport | null = null;

1545+

let afterCount = 0;

1546+
1547+

await runExclusiveSessionStoreWrite(storePath, async () => {

1548+

const store = loadMutableSessionStoreForWriter(storePath);

1549+

for (const sessionKey of Object.keys(store)) {

1550+

const ownerAgentId = resolveStoredSessionOwnerAgentId({

1551+

cfg: params.cfg,

1552+

agentId: params.storeAgentId,

1553+

sessionKey,

1554+

});

1555+

if (ownerAgentId === params.agentId) {

1556+

delete store[sessionKey];

1557+

removedSessionKeys.push(sessionKey);

1558+

}

1559+

}

1560+

await saveSessionStoreUnlocked(storePath, store, {

1561+

onMaintenanceApplied: (report) => {

1562+

maintenanceReport = report;

1563+

},

1564+

});

1565+

afterCount = Object.keys(store).length;

1566+

});

1567+
1568+

return {

1569+

removedEntries: removedSessionKeys.length,

1570+

removedSessionKeys,

1571+

archivedTranscriptDirectories: [],

1572+

unreferencedArtifacts: null,

1573+

maintenanceReport,

1574+

afterCount,

1575+

};

1576+

}

1577+
15211578

async function archiveUnreferencedLifecycleTranscriptArtifacts(params: {

15221579

storePath: string;

15231580

transcriptContentMarker: string;

Original file line numberDiff line numberDiff line change

@@ -58,7 +58,7 @@ describe("session accessor boundary guard", () => {

5858

);

5959

});

6060
61-

it("ratchets only the auto-reply files migrated to session accessor writes", () => {

61+

it("ratchets only files migrated to session accessor writes", () => {

6262

expect(migratedSessionAccessorWriteFiles).toEqual(

6363

new Set([

6464

"src/agents/command/attempt-execution.shared.ts",

@@ -83,6 +83,7 @@ describe("session accessor boundary guard", () => {

8383

"src/auto-reply/reply/session-updates.ts",

8484

"src/auto-reply/reply/session-usage.ts",

8585

"src/tui/embedded-backend.ts",

86+

"src/config/sessions/cleanup-service.ts",

8687

]),

8788

);

8889

});