Skip to content

armgit / ruflo

Public Imported from GitHub
0

🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated

fix(session): honor component selectors before restoring stores

Rudy Celekli55be3a7efa83
diff --git a/v3/@claude-flow/cli/__tests__/session-restore-selection.test.ts b/v3/@claude-flow/cli/__tests__/session-restore-selection.test.ts
new file mode 100644
index 0000000000..37ee0b0545
--- /dev/null
+++ b/v3/@claude-flow/cli/__tests__/session-restore-selection.test.ts
@@ -0,0 +1,37 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+const state = vi.hoisted(() => ({ cwd: '', storeEntry: vi.fn(async () => ({success:true})) }));
+vi.mock('../src/mcp-tools/types.js', () => ({ getProjectCwd: () => state.cwd }));
+vi.mock('../src/memory/memory-initializer.js', () => ({ storeEntry: state.storeEntry }));
+import { sessionTools } from '../src/mcp-tools/session-tools.js';
+const call = (name: string, input: any) => sessionTools.find(t=>t.name===name)!.handler(input);
+const file = (kind: string) => join(state.cwd, '.claude-flow', kind, 'store.json');
+beforeEach(() => {
+ state.cwd=mkdtempSync(join(tmpdir(),'ruflo-restore-')); state.storeEntry.mockClear();
+ for(const kind of ['tasks','agents','memory']) {
+ mkdirSync(join(state.cwd,'.claude-flow',kind),{recursive:true});
+ writeFileSync(file(kind),JSON.stringify({[kind==='memory'?'entries':kind]: { saved: {key:'saved',value:'snapshot'} }}));
+ }
+});
+afterEach(()=>rmSync(state.cwd,{recursive:true,force:true}));
+it.each(['Memory','Tasks','Agents'])('restores only selected %s data and preserves excluded live stores',async selected=>{
+ const saved:any=await call('session_save',{name:'checkpoint',includeMemory:true,includeTasks:true,includeAgents:true});
+ for(const kind of ['tasks','agents','memory'])writeFileSync(file(kind),JSON.stringify({live:kind}));
+ const flags=Object.fromEntries(['Memory','Tasks','Agents'].map(kind=>['restore'+kind,kind===selected]));
+ const result:any=await call('session_restore',{sessionId:saved.sessionId,...flags});
+ expect(result.restored).toBe(true);
+ for(const kind of ['tasks','agents','memory']) {
+ const data=JSON.parse(readFileSync(file(kind),'utf8'));
+ if(kind===selected.toLowerCase())expect(data[kind==='memory'?'entries':kind].saved.value).toBe('snapshot');
+ else expect(data).toEqual({live:kind});
+ }
+ expect(state.storeEntry).toHaveBeenCalledTimes(selected==='Memory'?1:0);
+});
+it('keeps default restore-all behavior',async()=>{
+ const saved:any=await call('session_save',{name:'checkpoint',includeMemory:true,includeTasks:true,includeAgents:true});
+ for(const kind of ['tasks','agents','memory'])writeFileSync(file(kind),'{}');
+ await call('session_restore',{sessionId:saved.sessionId});
+ for(const kind of ['tasks','agents','memory'])expect(readFileSync(file(kind),'utf8')).toContain('snapshot');
+});
diff --git a/v3/@claude-flow/cli/src/commands/session.ts b/v3/@claude-flow/cli/src/commands/session.ts
index d99bc8894f..e88b70a42a 100644
--- a/v3/@claude-flow/cli/src/commands/session.ts
+++ b/v3/@claude-flow/cli/src/commands/session.ts
@@ -374,15 +374,16 @@ const restoreCommand: Command = {
const result = await callMCPTool<{
sessionId: string;
restoredAt: string;
- restored: {
+ restored: boolean;
+ restoredComponents: {
memory: boolean;
agents: boolean;
tasks: boolean;
};
stats: {
- agentsRestored: number;
- tasksRestored: number;
- memoryEntriesRestored: number;
+ agents: number;
+ tasks: number;
+ memoryEntries: number;
};
}>('session_restore', {
sessionId,
@@ -403,18 +404,18 @@ const restoreCommand: Command = {
data: [
{
component: 'Memory',
- status: result.restored.memory ? output.success('Restored') : output.dim('Skipped'),
- count: result.stats.memoryEntriesRestored
+ status: result.restoredComponents.memory ? output.success('Restored') : output.dim('Skipped'),
+ count: result.restoredComponents.memory ? result.stats.memoryEntries : 0
},
{
component: 'Agents',
- status: result.restored.agents ? output.success('Restored') : output.dim('Skipped'),
- count: result.stats.agentsRestored
+ status: result.restoredComponents.agents ? output.success('Restored') : output.dim('Skipped'),
+ count: result.restoredComponents.agents ? result.stats.agents : 0
},
{
component: 'Tasks',
- status: result.restored.tasks ? output.success('Restored') : output.dim('Skipped'),
- count: result.stats.tasksRestored
+ status: result.restoredComponents.tasks ? output.success('Restored') : output.dim('Skipped'),
+ count: result.restoredComponents.tasks ? result.stats.tasks : 0
}
]
});
diff --git a/v3/@claude-flow/cli/src/mcp-tools/session-tools.ts b/v3/@claude-flow/cli/src/mcp-tools/session-tools.ts
index 5d9af7682b..738dbc2893 100644
--- a/v3/@claude-flow/cli/src/mcp-tools/session-tools.ts
+++ b/v3/@claude-flow/cli/src/mcp-tools/session-tools.ts
@@ -212,6 +212,9 @@ export const sessionTools: MCPTool[] = [
properties: {
sessionId: { type: 'string', description: 'Session ID to restore' },
name: { type: 'string', description: 'Session name to restore' },
+ restoreMemory: { type: 'boolean', description: 'Restore memory (default true)' },
+ restoreTasks: { type: 'boolean', description: 'Restore tasks (default true)' },
+ restoreAgents: { type: 'boolean', description: 'Restore agents (default true)' },
},
},
handler: async (input) => {
@@ -250,7 +253,7 @@ export const sessionTools: MCPTool[] = [
if (session) {
// Restore data to respective stores (legacy JSON for backward compat).
// audit_1776853149979: tighten perms on the restored stores too.
- if (session.data?.memory) {
+ if (input.restoreMemory !== false && session.data?.memory) {
const memoryDir = join(getProjectCwd(), STORAGE_DIR, 'memory');
if (!existsSync(memoryDir)) mkdirRestricted(memoryDir);
writeFileRestricted(join(memoryDir, 'store.json'), JSON.stringify(session.data.memory, null, 2));
@@ -277,12 +280,12 @@ export const sessionTools: MCPTool[] = [
// Legacy JSON restore is the fallback -- sql.js import may not be available
}
}
- if (session.data?.tasks) {
+ if (input.restoreTasks !== false && session.data?.tasks) {
const taskDir = join(getProjectCwd(), STORAGE_DIR, 'tasks');
if (!existsSync(taskDir)) mkdirRestricted(taskDir);
writeFileRestricted(join(taskDir, 'store.json'), JSON.stringify(session.data.tasks, null, 2));
}
- if (session.data?.agents) {
+ if (input.restoreAgents !== false && session.data?.agents) {
const agentDir = join(getProjectCwd(), STORAGE_DIR, 'agents');
if (!existsSync(agentDir)) mkdirRestricted(agentDir);
writeFileRestricted(join(agentDir, 'store.json'), JSON.stringify(session.data.agents, null, 2));
@@ -292,6 +295,11 @@ export const sessionTools: MCPTool[] = [
sessionId: session.sessionId,
name: session.name,
restored: true,
+ restoredComponents: {
+ memory: input.restoreMemory !== false && !!session.data?.memory,
+ tasks: input.restoreTasks !== false && !!session.data?.tasks,
+ agents: input.restoreAgents !== false && !!session.data?.agents,
+ },
restoredAt: new Date().toISOString(),
stats: session.stats,
};