@membank/cli 0.14.2 → 0.16.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { cancel, confirm, intro, isCancel, multiselect, note, outro } from "@clack/prompts";
-import { ACTIVITY_EVENT_TYPE_VALUES, ActivityEventTypeSchema, DatabaseManager, EmbeddingService, GLOBAL_SCOPE_HASH, MIGRATIONS, MODEL_NAME, MemoryTypeSchema, MemoryTypeSchema as MemoryTypeSchema$1, ModelDownloader, PIN_BUDGET_THRESHOLD, QueryEngine, SessionContextBuilder, createActivityLogger, createActivityRepository, createMemoryRepository, createProjectRepository, createSynthesisRepository, deleteMemory, listEvents, resolveProject, runScopeToProjectsMigration, saveMemory } from "@membank/core";
+import { ACTIVITY_EVENT_TYPE_VALUES, ActivityEventTypeSchema, DatabaseManager, EmbeddingService, GLOBAL_PROJECT_NAME, GLOBAL_SCOPE_HASH, MIGRATIONS, MODEL_NAME, MemoryTypeSchema, MemoryTypeSchema as MemoryTypeSchema$1, ModelDownloader, PIN_BUDGET_THRESHOLD, QueryEngine, SessionContextBuilder, createActivityLogger, createActivityRepository, createMemoryRepository, createProjectRepository, createSynthesisRepository, deleteMemory, listEvents, resolveProject, revertMemory, revertSynthesis, runScopeToProjectsMigration, saveMemory } from "@membank/core";
 import { runExtraction, runSynthesis, startServer } from "@membank/mcp";
 import chalk from "chalk";
 import { Command } from "commander";
@@ -9,6 +9,7 @@ import { z } from "zod";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { dirname, join } from "node:path";
+import { diffLines } from "@membank/core/client";
 import Table from "cli-table3";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
@@ -43,8 +44,8 @@ async function activityCommand(options, formatter) {
 		}
 		const events = listEvents({
 			scope,
-			type: validatedType,
-			since: options.since,
+			...validatedType !== void 0 && { type: validatedType },
+			...options.since !== void 0 && { since: options.since },
 			limit: options.limit !== void 0 ? parseInt(options.limit, 10) : 50
 		}, activityRepo);
 		if (formatter.isJson) {
@@ -380,11 +381,16 @@ async function importCommand(filePath, db, formatter, prompt) {
 }
 //#endregion
 //#region src/commands/inject.ts
-const MEMORY_GUIDANCE = ["Save (call save_memory) when: (1) user states a preference or makes a decision; (2) user corrects you; (3) you discover a working fix after a tool error; (4) you learn a non-obvious project fact. Type ∈ correction|preference|decision|learning|fact. When unsure, save.", "Query (call query_memory) before: answering anything that touches prior decisions, and before exploration tasks (file reads, searches, web lookups) where past corrections or preferences may apply. Skip when clearly irrelevant (e.g. trivial arithmetic). Soft guideline, not a hard rule."].join("\n");
+const SAVE_GUIDANCE = "Save (call save_memory) when: (1) user states a preference or makes a decision; (2) user corrects you; (3) you discover a working fix after a tool error; (4) you learn a non-obvious project fact. Type ∈ correction|preference|decision|learning|fact. When unsure, save.";
+const QUERY_GUIDANCE = "Query (call query_memory) before: answering anything that touches prior decisions, and before exploration tasks (file reads, searches, web lookups) where past corrections or preferences may apply. Skip when clearly irrelevant (e.g. trivial arithmetic). Soft guideline, not a hard rule.";
+const MEMORY_GUIDANCE = [SAVE_GUIDANCE, QUERY_GUIDANCE].join("\n");
+function buildGuidance(harness) {
+	return harness === "claude-code" ? QUERY_GUIDANCE : MEMORY_GUIDANCE;
+}
 function xmlEscape(s) {
 	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function formatContext(ctx) {
+function formatContext(ctx, guidance) {
 	const parts = [];
 	const statParts = Object.entries(ctx.stats).filter(([, count]) => count > 0).map(([type, count]) => `${count} ${type}${count !== 1 ? "s" : ""}`);
 	if (statParts.length > 0) parts.push(`<memory-stats>\n${statParts.join(", ")}\n</memory-stats>`);
@@ -396,7 +402,7 @@ function formatContext(ctx) {
 			parts.push(`<pinned-memories>\n${memLines.join("\n")}\n</pinned-memories>`);
 		}
 	}
-	parts.push(`<memory-guidance>\n${MEMORY_GUIDANCE}\n</memory-guidance>`);
+	parts.push(`<memory-guidance>\n${guidance}\n</memory-guidance>`);
 	return parts.join("\n");
 }
 function outputAdditionalContext(text, harness, eventName) {
@@ -416,7 +422,7 @@ function outputAdditionalContext(text, harness, eventName) {
 function pickBestSynthesis(globalSynthesis, projectSynthesis) {
 	return projectSynthesis ?? globalSynthesis;
 }
-async function buildText() {
+async function buildText(harness) {
 	const resolved = await resolveProject();
 	const db = DatabaseManager.open();
 	try {
@@ -425,13 +431,13 @@ async function buildText() {
 		const globalRow = synthRepo.getSynthesis(GLOBAL_SCOPE_HASH);
 		const projectRow = synthRepo.getSynthesis(resolved.hash);
 		const synthesis = pickBestSynthesis(globalRow?.inFlightSince === null ? globalRow.content : void 0, projectRow?.inFlightSince === null ? projectRow.content : void 0);
-		return formatContext(builder.getSessionContext(resolved.hash, synthesis));
+		return formatContext(builder.getSessionContext(resolved.hash, synthesis), buildGuidance(harness));
 	} finally {
 		db.close();
 	}
 }
 async function handleEvent(harness, eventName) {
-	const text = await buildText().catch((err) => {
+	const text = await buildText(harness).catch((err) => {
 		const msg = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`membank inject: ${msg}\n`);
 		return null;
@@ -447,6 +453,7 @@ async function injectCommand(opts) {
 		return;
 	}
 	if (opts.event === "user-prompt-submit") {
+		if (harness === "claude-code") process.exit(0);
 		await handleEvent(harness, "UserPromptSubmit");
 		return;
 	}
@@ -458,8 +465,8 @@ async function listCommand(options, formatter) {
 	const db = DatabaseManager.open();
 	try {
 		const memories = createMemoryRepository(db, createProjectRepository(db)).list({
-			type: options.type !== void 0 ? MemoryTypeSchema$1.parse(options.type) : void 0,
-			pinned: options.pinned
+			...options.type !== void 0 && { type: MemoryTypeSchema$1.parse(options.type) },
+			...options.pinned !== void 0 && { pinned: options.pinned }
 		});
 		formatter.outputMemories(memories);
 	} finally {
@@ -467,6 +474,102 @@ async function listCommand(options, formatter) {
 	}
 }
 //#endregion
+//#region src/commands/memory/diff.ts
+function memoryDiffCommand(id, v1, v2, db, formatter) {
+	const repo = createMemoryRepository(db, createProjectRepository(db));
+	const version1 = repo.getVersion(id, v1);
+	if (version1 === void 0) {
+		formatter.error(`Version ${v1} not found for memory: ${id}`);
+		process.exit(1);
+	}
+	const version2 = repo.getVersion(id, v2);
+	if (version2 === void 0) {
+		formatter.error(`Version ${v2} not found for memory: ${id}`);
+		process.exit(1);
+	}
+	const diff = diffLines(version1.content, version2.content);
+	if (formatter.isJson) {
+		process.stdout.write(`${JSON.stringify(diff)}\n`);
+		return;
+	}
+	process.stdout.write(`--- version ${v1}\n+++ version ${v2}\n`);
+	for (const entry of diff) if (entry.kind === "added") process.stdout.write(chalk.green(`+ ${entry.line}\n`));
+	else if (entry.kind === "removed") process.stdout.write(chalk.red(`- ${entry.line}\n`));
+	else process.stdout.write(`  ${entry.line}\n`);
+}
+//#endregion
+//#region src/commands/memory/history.ts
+function truncate$2(str, max) {
+	return str.length > max ? `${str.slice(0, max - 1)}…` : str;
+}
+function memoryHistoryCommand(id, db, formatter) {
+	const versions = createMemoryRepository(db, createProjectRepository(db)).listVersions(id);
+	if (versions.length === 0) {
+		formatter.error(`No version history found for memory: ${id}`);
+		process.exit(1);
+	}
+	if (formatter.isJson) {
+		process.stdout.write(`${JSON.stringify(versions)}\n`);
+		return;
+	}
+	const table = new Table({
+		head: [
+			chalk.bold("version"),
+			chalk.bold("created_at"),
+			chalk.bold("preview")
+		],
+		style: { head: [] }
+	});
+	for (const v of versions) table.push([
+		String(v.version),
+		v.createdAt,
+		truncate$2(v.content.replace(/\n/g, " "), 60)
+	]);
+	process.stdout.write(`${table.toString()}\n`);
+}
+//#endregion
+//#region src/commands/memory/revert.ts
+async function memoryRevertCommand(id, version, db, formatter, prompt) {
+	const repo = createMemoryRepository(db, createProjectRepository(db));
+	if (repo.findById(id) === void 0) {
+		formatter.error(`Memory not found: ${id}`);
+		process.exit(1);
+	}
+	if (repo.getVersion(id, version) === void 0) {
+		formatter.error(`Version ${version} not found for memory: ${id}`);
+		process.exit(1);
+	}
+	if (!await prompt.confirm(`Revert memory ${id} to version ${version}?`)) return;
+	await revertMemory(id, version, {
+		repo,
+		embedder: new EmbeddingService(),
+		activityLogger: createActivityLogger(db)
+	});
+	process.stdout.write(`${chalk.green("✓")} Reverted memory ${chalk.dim(id)} to version ${version}\n`);
+}
+//#endregion
+//#region src/commands/memory/show.ts
+function memoryShowCommand(id, db, formatter, opts) {
+	const repo = createMemoryRepository(db, createProjectRepository(db));
+	if (opts.version !== void 0) {
+		const v = repo.getVersion(id, opts.version);
+		if (v === void 0) {
+			formatter.error(`Version ${opts.version} not found for memory: ${id}`);
+			process.exit(1);
+		}
+		if (formatter.isJson) process.stdout.write(`${JSON.stringify(v)}\n`);
+		else process.stdout.write(`${v.content}\n`);
+		return;
+	}
+	const memory = repo.findById(id);
+	if (memory === void 0) {
+		formatter.error(`Memory not found: ${id}`);
+		process.exit(1);
+	}
+	if (formatter.isJson) process.stdout.write(`${JSON.stringify(memory)}\n`);
+	else process.stdout.write(`${memory.content}\n`);
+}
+//#endregion
 //#region src/commands/migrate.ts
 async function migrateCommand(mode, name, formatter) {
 	if (mode === "list") {
@@ -568,9 +671,85 @@ async function statsCommand(formatter) {
 	}
 }
 //#endregion
-//#region src/commands/synthesize.ts
+//#region src/commands/synthesize/resolve-scope.ts
+function resolveScope(scope, db) {
+	if (scope === GLOBAL_PROJECT_NAME) return GLOBAL_SCOPE_HASH;
+	if (/^[0-9a-f]{16}$/.test(scope)) return scope;
+	const project = createProjectRepository(db).getByName(scope);
+	return project !== void 0 ? project.scopeHash : scope;
+}
+//#endregion
+//#region src/commands/synthesize/diff.ts
+function synthesizeDiffCommand(v1, v2, opts, formatter) {
+	const db = DatabaseManager.open();
+	try {
+		const scope = opts.scope ?? GLOBAL_PROJECT_NAME;
+		const resolvedScope = resolveScope(scope, db);
+		const repo = createSynthesisRepository(db);
+		const version1 = repo.getVersion(resolvedScope, v1);
+		if (version1 === void 0) {
+			formatter.error(`Version ${v1} not found for scope: ${scope}`);
+			process.exit(1);
+		}
+		const version2 = repo.getVersion(resolvedScope, v2);
+		if (version2 === void 0) {
+			formatter.error(`Version ${v2} not found for scope: ${scope}`);
+			process.exit(1);
+		}
+		const diff = diffLines(version1.content, version2.content);
+		if (formatter.isJson) {
+			process.stdout.write(`${JSON.stringify(diff)}\n`);
+			return;
+		}
+		process.stdout.write(`--- version ${v1}\n+++ version ${v2}\n`);
+		for (const entry of diff) if (entry.kind === "added") process.stdout.write(chalk.green(`+ ${entry.line}\n`));
+		else if (entry.kind === "removed") process.stdout.write(chalk.red(`- ${entry.line}\n`));
+		else process.stdout.write(`  ${entry.line}\n`);
+	} finally {
+		db.close();
+	}
+}
+//#endregion
+//#region src/commands/synthesize/history.ts
+function truncate$1(str, max) {
+	return str.length > max ? `${str.slice(0, max - 1)}…` : str;
+}
+function synthesizeHistoryCommand(opts, formatter) {
+	const db = DatabaseManager.open();
+	try {
+		const scope = opts.scope ?? GLOBAL_PROJECT_NAME;
+		const resolvedScope = resolveScope(scope, db);
+		const versions = createSynthesisRepository(db).listVersions(resolvedScope);
+		if (versions.length === 0) {
+			formatter.error(`No version history found for scope: ${scope}`);
+			process.exit(1);
+		}
+		if (formatter.isJson) {
+			process.stdout.write(`${JSON.stringify(versions)}\n`);
+			return;
+		}
+		const table = new Table({
+			head: [
+				chalk.bold("version"),
+				chalk.bold("synthesized_at"),
+				chalk.bold("preview")
+			],
+			style: { head: [] }
+		});
+		for (const v of versions) table.push([
+			String(v.version),
+			new Date(v.synthesizedAt).toLocaleString(),
+			truncate$1(v.content.replace(/\n/g, " "), 60)
+		]);
+		process.stdout.write(`${table.toString()}\n`);
+	} finally {
+		db.close();
+	}
+}
+//#endregion
+//#region src/commands/synthesize/index.ts
 async function synthesizeRunCommand(opts, formatter) {
-	const scope = opts.scope ?? "global";
+	const scope = opts.scope ?? GLOBAL_PROJECT_NAME;
 	if (!formatter.isJson) process.stdout.write(`Running synthesis for scope: ${scope}\n`);
 	const content = await runSynthesis(scope);
 	if (formatter.isJson) process.stdout.write(`${JSON.stringify({
@@ -582,14 +761,26 @@ async function synthesizeRunCommand(opts, formatter) {
 function synthesizeShowCommand(opts, formatter) {
 	const db = DatabaseManager.open();
 	try {
-		const scope = opts.scope ?? "global";
-		let resolvedScope = scope;
-		if (scope === "global") resolvedScope = GLOBAL_SCOPE_HASH;
-		else if (!/^[0-9a-f]{16}$/.test(scope)) {
-			const project = createProjectRepository(db).getByName(scope);
-			if (project !== void 0) resolvedScope = project.scopeHash;
+		const scope = opts.scope ?? GLOBAL_PROJECT_NAME;
+		const resolvedScope = resolveScope(scope, db);
+		const repo = createSynthesisRepository(db);
+		if (opts.version !== void 0) {
+			const version = repo.getVersion(resolvedScope, opts.version);
+			if (version === void 0) {
+				if (formatter.isJson) process.stdout.write(`${JSON.stringify(null)}\n`);
+				else process.stdout.write(`Version ${opts.version} not found for scope: ${scope}\n`);
+				return;
+			}
+			if (formatter.isJson) process.stdout.write(`${JSON.stringify(version)}\n`);
+			else {
+				process.stdout.write(`\nScope: ${resolvedScope} (version ${version.version})\n`);
+				process.stdout.write(`Synthesized: ${new Date(version.synthesizedAt).toLocaleString()}\n`);
+				process.stdout.write(`Archived: ${new Date(version.createdAt).toLocaleString()}\n`);
+				process.stdout.write(`\n${version.content}\n\n`);
+			}
+			return;
 		}
-		const synthesis = createSynthesisRepository(db).getSynthesis(resolvedScope);
+		const synthesis = repo.getSynthesis(resolvedScope);
 		if (synthesis === void 0) {
 			if (formatter.isJson) process.stdout.write(`${JSON.stringify(null)}\n`);
 			else process.stdout.write(`No synthesis found for scope: ${scope}\n`);
@@ -622,7 +813,7 @@ function synthesizeStatusCommand(formatter) {
 		}
 		process.stdout.write("\n");
 		for (const s of syntheses) {
-			const displayScope = (s.scope !== GLOBAL_SCOPE_HASH ? projectRepo.getByHash(s.scope) : void 0)?.name ?? (s.scope === GLOBAL_SCOPE_HASH ? "global" : s.scope);
+			const displayScope = (s.scope !== GLOBAL_SCOPE_HASH ? projectRepo.getByHash(s.scope) : void 0)?.name ?? (s.scope === GLOBAL_SCOPE_HASH ? GLOBAL_PROJECT_NAME : s.scope);
 			const inFlight = s.inFlightSince !== null ? " [in-flight]" : "";
 			const synthesized = new Date(s.synthesizedAt).toLocaleString();
 			const expires = new Date(s.expiresAt).toLocaleString();
@@ -636,6 +827,25 @@ function synthesizeStatusCommand(formatter) {
 	}
 }
 //#endregion
+//#region src/commands/synthesize/revert.ts
+async function synthesizeRevertCommand(version, opts, formatter, prompt) {
+	const db = DatabaseManager.open();
+	try {
+		const scope = opts.scope ?? GLOBAL_PROJECT_NAME;
+		const resolvedScope = resolveScope(scope, db);
+		const repo = createSynthesisRepository(db);
+		if (repo.getVersion(resolvedScope, version) === void 0) {
+			formatter.error(`Version ${version} not found for scope: ${scope}`);
+			process.exit(1);
+		}
+		if (!await prompt.confirm(`Revert synthesis for scope "${scope}" to version ${version}?`)) return;
+		revertSynthesis(resolvedScope, version, repo);
+		process.stdout.write(`${chalk.green("✓")} Reverted synthesis for scope ${chalk.dim(scope)} to version ${version}\n`);
+	} finally {
+		db.close();
+	}
+}
+//#endregion
 //#region src/commands/unpin.ts
 function unpinCommand(id, db) {
 	const ownDb = db === void 0;
@@ -1133,28 +1343,19 @@ const writers = {
 			const cfg = readJson(cfgPath);
 			const hooks = MaybeJsonObjectSchema.parse(cfg.hooks) ?? {};
 			const sessionStartInner = (Array.isArray(hooks.SessionStart) ? hooks.SessionStart : []).flatMap(getHooksArray);
-			const userPromptSubmitInner = (Array.isArray(hooks.UserPromptSubmit) ? hooks.UserPromptSubmit : []).flatMap(getHooksArray);
 			const sessionEndInner = (Array.isArray(hooks.SessionEnd) ? hooks.SessionEnd : []).flatMap(getHooksArray);
 			return {
 				status: "ready",
 				configPath: cfgPath,
-				hooks: [
-					{
-						event: "SessionStart",
-						command: "npx -y @membank/cli inject --harness claude-code",
-						existingCommand: extractInjectCommand(sessionStartInner) || null
-					},
-					{
-						event: "UserPromptSubmit",
-						command: "npx -y @membank/cli inject --harness claude-code --event user-prompt-submit",
-						existingCommand: extractInjectCommand(userPromptSubmitInner) || null
-					},
-					{
-						event: "SessionEnd",
-						command: "npx -y @membank/cli extract --harness claude-code",
-						existingCommand: extractInjectCommand(sessionEndInner) || null
-					}
-				]
+				hooks: [{
+					event: "SessionStart",
+					command: "npx -y @membank/cli inject --harness claude-code",
+					existingCommand: extractInjectCommand(sessionStartInner) || null
+				}, {
+					event: "SessionEnd",
+					command: "npx -y @membank/cli extract --harness claude-code",
+					existingCommand: extractInjectCommand(sessionEndInner) || null
+				}]
 			};
 		},
 		write(resolver, events) {
@@ -1164,6 +1365,7 @@ const writers = {
 			const newHooks = { ...hooks };
 			pruneNestedEvent(newHooks, "PostToolUseFailure");
 			pruneNestedEvent(newHooks, "Stop");
+			pruneNestedEvent(newHooks, "UserPromptSubmit");
 			if (events.includes("SessionStart")) newHooks.SessionStart = [...filterOutMembank(Array.isArray(hooks.SessionStart) ? hooks.SessionStart : []), {
 				matcher: "",
 				hooks: [{
@@ -1171,13 +1373,6 @@ const writers = {
 					command: "npx -y @membank/cli inject --harness claude-code"
 				}]
 			}];
-			if (events.includes("UserPromptSubmit")) newHooks.UserPromptSubmit = [...filterOutMembank(Array.isArray(hooks.UserPromptSubmit) ? hooks.UserPromptSubmit : []), {
-				matcher: "",
-				hooks: [{
-					type: "command",
-					command: "npx -y @membank/cli inject --harness claude-code --event user-prompt-submit"
-				}]
-			}];
 			if (events.includes("SessionEnd")) newHooks.SessionEnd = [...filterOutMembank(Array.isArray(hooks.SessionEnd) ? hooks.SessionEnd : []), {
 				matcher: "clear|resume|logout|prompt_input_exit|other",
 				hooks: [{
@@ -1750,9 +1945,9 @@ program.command("inject").description("output session context for harness inject
 program.command("extract").description("(internal) run session-end memory extraction; reads the harness's SessionEnd hook payload from stdin").option("--harness <name>", "harness whose session-end hook payload is on stdin (only claude-code is supported today)", "claude-code").option("--session <id>", "session id (otherwise read from stdin)").option("--transcript <path>", "transcript JSONL path (otherwise read from stdin)").action(async (cmdOptions) => {
 	try {
 		await extractCommand({
-			harness: cmdOptions.harness,
-			sessionId: cmdOptions.session,
-			transcript: cmdOptions.transcript
+			...cmdOptions.harness !== void 0 && { harness: cmdOptions.harness },
+			...cmdOptions.session !== void 0 && { sessionId: cmdOptions.session },
+			...cmdOptions.transcript !== void 0 && { transcript: cmdOptions.transcript }
 		});
 	} catch (err) {
 		process.stderr.write(`${err instanceof Error ? err.message : String(err)}\n`);
@@ -1834,16 +2029,16 @@ setupCmd.action(async (cmdOptions) => {
 		writer,
 		hookWriter,
 		prompter: (question) => promptHelper.confirm(question),
-		harnessSelector,
+		...harnessSelector !== void 0 && { harnessSelector },
 		modelDownloader: new ModelDownloader(),
-		out: formatter.isJson ? void 0 : decoratedOut,
+		...!formatter.isJson && { out: decoratedOut },
 		synthesisOptIn: true
 	});
 	try {
 		const results = await orchestrator.run({
 			yes: autoYes,
-			dryRun: cmdOptions.dryRun,
-			harness: cmdOptions.harness,
+			...cmdOptions.dryRun !== void 0 && { dryRun: cmdOptions.dryRun },
+			...cmdOptions.harness !== void 0 && { harness: cmdOptions.harness },
 			json: formatter.isJson
 		});
 		if (!formatter.isJson && !cmdOptions.dryRun && results.length > 0) {
@@ -1909,11 +2104,14 @@ synthesizeCmd.command("run").description("trigger a synthesis run for a scope").
 		process.exit(2);
 	}
 });
-synthesizeCmd.command("show").description("display current synthesis for a scope").option("--scope <scope>", "scope to show (default: global)").action((cmdOptions) => {
+synthesizeCmd.command("show").description("display current synthesis for a scope, or a specific archived version").option("--scope <scope>", "scope to show (default: global)").option("--version <n>", "show this archived version number instead of the active synthesis").action((cmdOptions) => {
 	const globalOpts = program.opts();
 	const formatter = Formatter.create(globalOpts.json === true);
 	try {
-		synthesizeShowCommand(cmdOptions, formatter);
+		synthesizeShowCommand({
+			...cmdOptions.scope !== void 0 && { scope: cmdOptions.scope },
+			...cmdOptions.version !== void 0 && { version: Number(cmdOptions.version) }
+		}, formatter);
 	} catch (err) {
 		formatter.error(err instanceof Error ? err.message : String(err));
 		process.exit(2);
@@ -1929,13 +2127,90 @@ synthesizeCmd.command("status").description("show all scopes with synthesis stat
 		process.exit(2);
 	}
 });
+synthesizeCmd.command("history").description("list archived synthesis versions for a scope").option("--scope <scope>", "scope to list history for (default: global)").action((cmdOptions) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	try {
+		synthesizeHistoryCommand(cmdOptions, formatter);
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
+synthesizeCmd.command("diff <v1> <v2>").description("show a line diff between two archived synthesis versions").option("--scope <scope>", "scope to diff (default: global)").action((v1, v2, cmdOptions) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	try {
+		synthesizeDiffCommand(Number(v1), Number(v2), cmdOptions, formatter);
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
+synthesizeCmd.command("revert <version>").description("revert the active synthesis to a previous archived version (records a new version)").option("--scope <scope>", "scope to revert (default: global)").action(async (version, cmdOptions) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	const prompt = new PromptHelper(globalOpts.yes === true);
+	try {
+		await synthesizeRevertCommand(Number(version), cmdOptions, formatter, prompt);
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
+const memoryCmd = program.command("memory").description("view and manage memory version history");
+memoryCmd.command("history <id>").description("list version history for a memory").action((id) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	const db = DatabaseManager.open();
+	try {
+		memoryHistoryCommand(id, db, formatter);
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
+memoryCmd.command("show <id>").description("show content of a memory, optionally at a specific version").option("--version <n>", "show this version number instead of current content").action((id, cmdOptions) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	const db = DatabaseManager.open();
+	try {
+		memoryShowCommand(id, db, formatter, { ...cmdOptions.version !== void 0 && { version: Number(cmdOptions.version) } });
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
+memoryCmd.command("diff <id> <v1> <v2>").description("show a line diff between two versions of a memory").action((id, v1, v2) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	const db = DatabaseManager.open();
+	try {
+		memoryDiffCommand(id, Number(v1), Number(v2), db, formatter);
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
+memoryCmd.command("revert <id> <version>").description("revert a memory to a previous version (records the revert as a new version)").action(async (id, version) => {
+	const globalOpts = program.opts();
+	const formatter = Formatter.create(globalOpts.json === true);
+	const db = DatabaseManager.open();
+	const prompt = new PromptHelper(globalOpts.yes === true);
+	try {
+		await memoryRevertCommand(id, Number(version), db, formatter, prompt);
+	} catch (err) {
+		formatter.error(err instanceof Error ? err.message : String(err));
+		process.exit(2);
+	}
+});
 program.command("activity").description("list activity events for the current project (or --global for global memories)").option("--type <event_type>", "filter by event type (memory.created|updated|deleted|flagged|queried)").option("--since <date>", "return events after this ISO date/time").option("--memory-id <id>", "filter by memory id").option("--limit <n>", "maximum number of results (default 50)").option("--global", "show activity for global (sentinel) project").option("--scope <hash>", "show activity for a specific scope hash (advanced)").action(async (cmdOptions) => {
 	const globalOpts = program.opts();
 	const formatter = Formatter.create(globalOpts.json === true);
 	try {
 		await activityCommand({
 			...cmdOptions,
-			json: globalOpts.json
+			...globalOpts.json !== void 0 && { json: globalOpts.json }
 		}, formatter);
 	} catch (err) {
 		formatter.error(err instanceof Error ? err.message : String(err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@membank/cli",
-  "version": "0.14.2",
+  "version": "0.16.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -21,8 +21,8 @@
     "commander": "^14.0.3",
     "ora": "^9.4.0",
     "zod": "^4.4.3",
-    "@membank/mcp": "0.14.3",
-    "@membank/core": "0.12.1"
+    "@membank/core": "0.14.0",
+    "@membank/mcp": "0.16.0"
   },
   "devDependencies": {
     "@types/node": "^25.6.0",