vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 10:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserve shared-store sessions on agent delete

Browse Source
This commit is contained in:
Gustavo Madeira Santana
2026-04-19 18:15:11 -04:00
parent 8e8d5ce530
commit 2291deff63
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/commands/agents.command-shared.ts
View File

@@ -1,3 +1,4 @@
import { resolveDefaultAgentId } from "../agents/agent-scope.js";
import { resolveStorePath, updateSessionStore } from "../config/sessions.js";
import type { OpenClawConfig } from "../config/types.openclaw.js";
import { resolveStoredSessionOwnerAgentId } from "../gateway/session-store-key.js";
@@ -28,13 +29,18 @@ export async function purgeAgentSessionStoreEntries(
): Promise<void> {
try {
const normalizedAgentId = normalizeAgentId(agentId);
const storeConfig = cfg.session?.store;
const storeAgentId =
typeof storeConfig === "string" && storeConfig.includes("{agentId}")
? normalizedAgentId
: normalizeAgentId(resolveDefaultAgentId(cfg));
const storePath = resolveStorePath(cfg.session?.store, { agentId: normalizedAgentId });
await updateSessionStore(storePath, (store) => {
for (const key of Object.keys(store)) {
if (
resolveStoredSessionOwnerAgentId({
cfg,
agentId: normalizedAgentId,
agentId: storeAgentId,
sessionKey: key,
}) === normalizedAgentId
) {

39
src/commands/agents.delete.test.ts
View File

@@ -116,4 +116,43 @@ describe("agents delete command", () => {
});
});
});
it("preserves shared-store legacy default keys when deleting another agent", async () => {
await withStateDirEnv("openclaw-agents-delete-shared-store-", async ({ stateDir }) => {
const cfg: OpenClawConfig = {
session: { store: path.join(stateDir, "sessions.json") },
agents: {
list: [
{ id: "main", default: true, workspace: path.join(stateDir, "workspace-main") },
{ id: "ops", workspace: path.join(stateDir, "workspace-ops") },
],
},
};
const storePath = resolveStorePath(cfg.session?.store, { agentId: "ops" });
await saveSessionStore(storePath, {
main: { sessionId: "sess-main", updatedAt: 1 },
"discord:direct:u1": { sessionId: "sess-main-direct", updatedAt: 2 },
"agent:ops:main": { sessionId: "sess-ops-main", updatedAt: 3 },
"agent:ops:discord:direct:u2": { sessionId: "sess-ops-direct", updatedAt: 4 },
});
await fs.mkdir(path.join(stateDir, "workspace-ops"), { recursive: true });
await fs.mkdir(path.join(stateDir, "agents", "ops", "agent"), { recursive: true });
configMocks.readConfigFileSnapshot.mockResolvedValue({
...baseConfigSnapshot,
config: cfg,
runtimeConfig: cfg,
sourceConfig: cfg,
resolved: cfg,
});
await agentsDeleteCommand({ id: "ops", force: true, json: true }, runtime);
expect(runtime.exit).not.toHaveBeenCalled();
expect(loadSessionStore(storePath, { skipCache: true })).toEqual({
main: { sessionId: "sess-main", updatedAt: 1 },
"discord:direct:u1": { sessionId: "sess-main-direct", updatedAt: 2 },
});
});
});
});