@membank/cli 0.7.1 → 0.8.0

package/dist/index.mjs

@@ -1,20 +1,60 @@
 #!/usr/bin/env node
 import { cancel, confirm, intro, isCancel, multiselect, note, outro } from "@clack/prompts";
-import { DatabaseManager, EmbeddingService, MEMORY_TYPE_VALUES, MIGRATIONS, MemoryRepository, ProjectRepository, QueryEngine, SessionContextBuilder, resolveProject, runScopeToProjectsMigration } from "@membank/core";
+import { DatabaseManager, EmbeddingService, MIGRATIONS, MemoryRepository, MemoryTypeSchema, MemoryTypeSchema as MemoryTypeSchema$1, ProjectRepository, QueryEngine, SessionContextBuilder, TagsJsonSchema as TagsRowSchema, resolveProject, runScopeToProjectsMigration } from "@membank/core";
 import { startServer } from "@membank/mcp";
 import chalk from "chalk";
 import { Command } from "commander";
 import ora from "ora";
+import { z } from "zod";
 import { startDashboard } from "@membank/dashboard";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import Table from "cli-table3";
-import { homedir, tmpdir } from "node:os";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
+import { homedir, tmpdir } from "node:os";
 import { EventEmitter } from "node:events";
 import { pipeline } from "@huggingface/transformers";
 import { createInterface } from "node:readline";
+//#region src/schemas.ts
+const SETUP_HARNESS_VALUES = [
+	"claude-code",
+	"copilot",
+	"codex",
+	"opencode"
+];
+const SetupHarnessSchema = z.enum(SETUP_HARNESS_VALUES);
+const InjectionHarnessSchema = z.enum([
+	"claude-code",
+	"copilot-cli",
+	"codex",
+	"opencode"
+]);
+const MigrateModeSchema = z.enum(["list", "run"]);
+const LimitSchema = z.coerce.number().int().positive();
+const PortSchema = z.coerce.number().int().min(1).max(65535);
+const OptionalNumberSchema = z.number().optional().catch(void 0);
+const MutableJsonObjectSchema = z.record(z.string(), z.unknown());
+const MaybeJsonObjectSchema = z.record(z.string(), z.unknown()).optional().catch(void 0);
+const ExportRecordSchema = z.object({
+	id: z.string().min(1),
+	content: z.string(),
+	type: MemoryTypeSchema,
+	tags: z.array(z.string()).optional().default([]),
+	sourceHarness: z.string().nullable().optional().default(null),
+	accessCount: z.number().optional().default(0),
+	pinned: z.boolean().optional().default(false),
+	needsReview: z.boolean().optional().default(false),
+	createdAt: z.string().optional(),
+	updatedAt: z.string().optional(),
+	embedding: z.string().nullable().optional().default(null)
+});
+const ExportFileSchema = z.object({
+	version: z.literal(1),
+	exportedAt: z.string().optional(),
+	memories: z.array(ExportRecordSchema)
+});
+//#endregion
 //#region src/commands/add.ts
 async function addCommand(content, options, formatter, db, embeddingService) {
 	const ownDb = db === void 0;
@@ -26,7 +66,7 @@ async function addCommand(content, options, formatter, db, embeddingService) {
 		const spinner = formatter.isJson ? null : ora("Saving memory…").start();
 		const memory = await repo.save({
 			content,
-			type: options.type,
+			type: MemoryTypeSchema$1.parse(options.type),
 			tags,
 			projectScope
 		});
@@ -39,7 +79,7 @@ async function addCommand(content, options, formatter, db, embeddingService) {
 //#endregion
 //#region src/commands/dashboard.ts
 async function dashboardCommand(opts) {
-	await startDashboard({ port: opts.port !== void 0 ? parseInt(opts.port, 10) : void 0 });
+	await startDashboard({ port: opts.port !== void 0 ? PortSchema.parse(opts.port) : void 0 });
 }
 //#endregion
 //#region src/commands/delete.ts
@@ -59,7 +99,7 @@ function exportCommand(db, formatter, opts) {
 		id: row.id,
 		content: row.content,
 		type: row.type,
-		tags: JSON.parse(row.tags),
+		tags: TagsRowSchema.parse(JSON.parse(row.tags)),
 		sourceHarness: row.source,
 		accessCount: row.access_count,
 		pinned: row.pinned !== 0,
@@ -83,17 +123,6 @@ function exportCommand(db, formatter, opts) {
 }
 //#endregion
 //#region src/commands/import.ts
-const MEMORY_TYPES = new Set(MEMORY_TYPE_VALUES);
-function isValidRecord(r) {
-	if (typeof r !== "object" || r === null) return false;
-	const rec = r;
-	return typeof rec.id === "string" && rec.id.length > 0 && typeof rec.content === "string" && typeof rec.type === "string" && MEMORY_TYPES.has(rec.type);
-}
-function isExportFile(parsed) {
-	if (typeof parsed !== "object" || parsed === null) return false;
-	const obj = parsed;
-	return obj.version === 1 && Array.isArray(obj.memories);
-}
 async function importCommand(filePath, db, formatter, prompt) {
 	let raw;
 	try {
@@ -109,16 +138,12 @@ async function importCommand(filePath, db, formatter, prompt) {
 		formatter.error(`Invalid JSON in file: ${filePath}`);
 		process.exit(1);
 	}
-	if (!isExportFile(parsed)) {
-		formatter.error(`Invalid export file format: expected version 1 and memories array`);
-		process.exit(1);
-	}
-	const invalidIndex = parsed.memories.findIndex((r) => !isValidRecord(r));
-	if (invalidIndex !== -1) {
-		formatter.error(`Invalid memory record at index ${invalidIndex}: must have id, content, and type`);
+	const parseResult = ExportFileSchema.safeParse(parsed);
+	if (!parseResult.success) {
+		formatter.error(`Invalid export file: ${parseResult.error.issues[0]?.message ?? "unknown error"}`);
 		process.exit(1);
 	}
-	const count = parsed.memories.length;
+	const count = parseResult.data.memories.length;
 	if (formatter.isJson) process.stdout.write(`${JSON.stringify({ found: count })}\n`);
 	else process.stdout.write(`Found ${count} memories to import.\n`);
 	if (!await prompt.confirm("Import?")) return;
@@ -126,7 +151,7 @@ async function importCommand(filePath, db, formatter, prompt) {
      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
 	const insertEmbedding = db.db.prepare(`INSERT OR REPLACE INTO embeddings (rowid, embedding) SELECT m.rowid, ? FROM memories m WHERE m.id = ?`);
 	db.db.transaction(() => {
-		for (const rec of parsed.memories) {
+		for (const rec of parseResult.data.memories) {
 			insertMemory.run(rec.id, rec.content, rec.type, JSON.stringify(rec.tags ?? []), rec.sourceHarness ?? null, rec.accessCount ?? 0, rec.pinned ? 1 : 0, rec.needsReview ? 1 : 0, rec.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(), rec.updatedAt ?? (/* @__PURE__ */ new Date()).toISOString());
 			if (rec.embedding !== null && rec.embedding !== void 0) {
 				const buf = Buffer.from(rec.embedding, "base64");
@@ -139,17 +164,21 @@ async function importCommand(filePath, db, formatter, prompt) {
 }
 //#endregion
 //#region src/commands/inject.ts
-const MEMORY_GUIDANCE = "[Memory Guidance]: Call save_memory when ANY of these happen: (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. Call query_memory before answering anything that might touch prior decisions. When unsure, save.";
+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");
+function xmlEscape(s) {
+	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 function formatContext(ctx) {
-	const lines = [];
+	const parts = [];
 	const statParts = Object.entries(ctx.stats).filter(([, count]) => count > 0).map(([type, count]) => `${count} ${type}${count !== 1 ? "s" : ""}`);
-	if (statParts.length > 0) lines.push(`[Memory Stats]: ${statParts.join(", ")}`);
-	else lines.push("[Memory Stats]: no memories saved yet");
-	const formatMemory = (m) => `"${m.content}" (${m.type})`;
-	for (const m of ctx.pinnedGlobal) lines.push(`[Pinned Global]: ${formatMemory(m)}`);
-	for (const m of ctx.pinnedProject) lines.push(`[Pinned Project]: ${formatMemory(m)}`);
-	lines.push(MEMORY_GUIDANCE);
-	return lines.join("\n");
+	if (statParts.length > 0) parts.push(`<memory-stats>\n${statParts.join(", ")}\n</memory-stats>`);
+	const allPinned = [...ctx.pinnedGlobal, ...ctx.pinnedProject];
+	if (allPinned.length > 0) {
+		const memLines = allPinned.map((m) => `  <memory type="${m.type}">${xmlEscape(m.content)}</memory>`);
+		parts.push(`<pinned-memories>\n${memLines.join("\n")}\n</pinned-memories>`);
+	}
+	parts.push(`<memory-guidance>\n${MEMORY_GUIDANCE}\n</memory-guidance>`);
+	return parts.join("\n");
 }
 function outputAdditionalContext(text, harness, eventName) {
 	if (harness === "claude-code") {
@@ -165,22 +194,36 @@ function outputAdditionalContext(text, harness, eventName) {
 	}
 	process.stdout.write(`${text}\n`);
 }
-async function handleSessionStart(opts) {
-	const projectScope = (await resolveProject()).hash;
+async function buildText() {
+	const resolved = await resolveProject();
 	const db = DatabaseManager.open();
-	let text;
 	try {
-		text = formatContext(new SessionContextBuilder(db).getSessionContext(projectScope));
+		return formatContext(new SessionContextBuilder(db).getSessionContext(resolved.hash));
 	} finally {
 		db.close();
 	}
-	if (!text) process.exit(0);
-	const harness = opts.harness;
-	outputAdditionalContext(text, harness, "SessionStart");
+}
+async function handleEvent(harness, eventName) {
+	const text = await buildText().catch((err) => {
+		const msg = err instanceof Error ? err.message : String(err);
+		process.stderr.write(`membank inject: ${msg}\n`);
+		return null;
+	});
+	if (text === null) process.exit(0);
+	outputAdditionalContext(text, harness, eventName);
 }
 async function injectCommand(opts) {
-	if (opts.event !== void 0 && opts.event !== "session-start") process.exit(0);
-	await handleSessionStart(opts);
+	const harnessResult = InjectionHarnessSchema.safeParse(opts.harness);
+	const harness = harnessResult.success ? harnessResult.data : void 0;
+	if (opts.event === "session-start" || opts.event === void 0) {
+		await handleEvent(harness, "SessionStart");
+		return;
+	}
+	if (opts.event === "user-prompt-submit") {
+		await handleEvent(harness, "UserPromptSubmit");
+		return;
+	}
+	process.exit(0);
 }
 //#endregion
 //#region src/commands/list.ts
@@ -188,7 +231,7 @@ async function listCommand(options, formatter) {
 	const db = DatabaseManager.open();
 	try {
 		const memories = new MemoryRepository(db, new EmbeddingService(), new ProjectRepository(db)).list({
-			type: options.type,
+			type: options.type !== void 0 ? MemoryTypeSchema$1.parse(options.type) : void 0,
 			pinned: options.pinned
 		});
 		formatter.outputMemories(memories);
@@ -255,12 +298,13 @@ async function queryCommand(queryText, options, formatter) {
 	try {
 		const embedding = new EmbeddingService();
 		const engine = new QueryEngine(db, embedding, new MemoryRepository(db, embedding, new ProjectRepository(db)));
-		const limit = options.limit !== void 0 ? Number.parseInt(options.limit, 10) : 10;
+		const limit = options.limit !== void 0 ? LimitSchema.parse(options.limit) : 10;
 		const spinner = formatter.isJson ? null : ora("Searching memories…").start();
 		const results = await engine.query({
 			query: queryText,
-			type: options.type,
-			limit
+			type: options.type !== void 0 ? MemoryTypeSchema$1.parse(options.type) : void 0,
+			limit,
+			includePinned: options.includePinned
 		});
 		spinner?.succeed(`${results.length} result${results.length === 1 ? "" : "s"} found`);
 		formatter.outputQueryResults(results);
@@ -473,6 +517,21 @@ async function execFileNoThrow(cmd, args) {
 	}
 }
 //#endregion
+//#region src/utils/json.ts
+function readJson(path) {
+	try {
+		return MutableJsonObjectSchema.parse(JSON.parse(readFileSync(path, "utf8")));
+	} catch {
+		return {};
+	}
+}
+function writeJsonAtomic(path, data) {
+	mkdirSync(dirname(path), { recursive: true });
+	const tmp = join(mkdtempSync(join(tmpdir(), "membank-")), "cfg.json");
+	writeFileSync(tmp, JSON.stringify(data, null, 2));
+	renameSync(tmp, path);
+}
+//#endregion
 //#region src/setup/harness-config-writer.ts
 var CommandError = class extends Error {
 	command;
@@ -490,21 +549,8 @@ const defaultPathResolver$1 = {
 	},
 	cwd: () => process.cwd()
 };
-function readJson$1(path) {
-	try {
-		return JSON.parse(readFileSync(path, "utf8"));
-	} catch {
-		return {};
-	}
-}
-function writeJsonAtomic$1(path, data) {
-	mkdirSync(dirname(path), { recursive: true });
-	const tmp = join(mkdtempSync(join(tmpdir(), "membank-")), "cfg.json");
-	writeFileSync(tmp, JSON.stringify(data, null, 2));
-	renameSync(tmp, path);
-}
 function hasKey(container, key) {
-	return container !== null && typeof container === "object" && key in container;
+	return container !== null && typeof container === "object" && Object.hasOwn(container, key);
 }
 function assertCliFound(result, cli, command) {
 	if (result.exitCode === 127) throw new CommandError(`${cli} CLI not found — install ${cli} first`, command);
@@ -524,7 +570,7 @@ const writers$1 = {
 			};
 		},
 		async write(resolver, run, { overwrite = false } = {}) {
-			const configured = hasKey(readJson$1(join(resolver.home(), ".claude.json")).mcpServers, "membank");
+			const configured = hasKey(readJson(join(resolver.home(), ".claude.json")).mcpServers, "membank");
 			if (configured && !overwrite) return { status: "already-configured" };
 			if (configured) {
 				const removeArgs = [
@@ -564,12 +610,12 @@ const writers$1 = {
 		},
 		async write(resolver, _run, { overwrite = false } = {}) {
 			const cfgPath = join(resolver.home(), ".copilot", "mcp-config.json");
-			const cfg = readJson$1(cfgPath);
+			const cfg = readJson(cfgPath);
 			if (hasKey(cfg.mcpServers, "membank") && !overwrite) return { status: "already-configured" };
-			writeJsonAtomic$1(cfgPath, {
+			writeJsonAtomic(cfgPath, {
 				...cfg,
 				mcpServers: {
-					...cfg.mcpServers,
+					...MaybeJsonObjectSchema.parse(cfg.mcpServers),
 					membank: {
 						command: "npx",
 						args: [
@@ -630,12 +676,12 @@ const writers$1 = {
 		},
 		async write(resolver, _run, { overwrite = false } = {}) {
 			const cfgPath = join(resolver.home(), ".config", "opencode", "opencode.json");
-			const cfg = readJson$1(cfgPath);
+			const cfg = readJson(cfgPath);
 			if (hasKey(cfg.mcp, "membank") && !overwrite) return { status: "already-configured" };
-			writeJsonAtomic$1(cfgPath, {
+			writeJsonAtomic(cfgPath, {
 				...cfg,
 				mcp: {
-					...cfg.mcp,
+					...MaybeJsonObjectSchema.parse(cfg.mcp),
 					membank: {
 						type: "local",
 						command: [
@@ -651,7 +697,7 @@ const writers$1 = {
 		}
 	}
 };
-const SUPPORTED_HARNESSES = Object.keys(writers$1);
+const SUPPORTED_HARNESSES = SETUP_HARNESS_VALUES;
 var HarnessConfigWriter = class {
 	#resolver;
 	#run;
@@ -677,23 +723,10 @@ const defaultPathResolver = { home: () => {
 	if (!h) throw new Error("Cannot determine home directory");
 	return h;
 } };
-function readJson(path) {
-	try {
-		return JSON.parse(readFileSync(path, "utf8"));
-	} catch {
-		return {};
-	}
-}
-function writeJsonAtomic(path, data) {
-	mkdirSync(dirname(path), { recursive: true });
-	const tmp = join(mkdtempSync(join(tmpdir(), "membank-hook-")), "cfg.json");
-	writeFileSync(tmp, JSON.stringify(data, null, 2));
-	renameSync(tmp, path);
-}
 function getHooksArray(group) {
 	if (typeof group !== "object" || group === null) return [];
-	const h = group.hooks;
-	return Array.isArray(h) ? h : [];
+	if (!("hooks" in group)) return [];
+	return Array.isArray(group.hooks) ? group.hooks : [];
 }
 function findMembankHookCommand(hooks, pattern) {
 	for (const h of hooks) {
@@ -733,23 +766,29 @@ const writers = {
 	"claude-code": {
 		inspect(resolver) {
 			const cfgPath = join(resolver.home(), ".claude", "settings.json");
-			const hooks = readJson(cfgPath).hooks ?? {};
+			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);
 			return {
 				status: "ready",
 				configPath: cfgPath,
 				hooks: [{
 					event: "SessionStart",
 					command: "npx -y @membank/cli inject --harness claude-code",
-					existingCommand: extractInjectCommand((Array.isArray(hooks.SessionStart) ? hooks.SessionStart : []).flatMap(getHooksArray)) || null
+					existingCommand: extractInjectCommand(sessionStartInner) || null
+				}, {
+					event: "UserPromptSubmit",
+					command: "npx -y @membank/cli inject --harness claude-code --event user-prompt-submit",
+					existingCommand: extractInjectCommand(userPromptSubmitInner) || null
 				}]
 			};
 		},
 		write(resolver, events) {
 			const cfgPath = join(resolver.home(), ".claude", "settings.json");
 			const cfg = readJson(cfgPath);
-			const hooks = cfg.hooks ?? {};
+			const hooks = MaybeJsonObjectSchema.parse(cfg.hooks) ?? {};
 			const newHooks = { ...hooks };
-			pruneNestedEvent(newHooks, "UserPromptSubmit");
 			pruneNestedEvent(newHooks, "PostToolUseFailure");
 			if (events.includes("SessionStart")) newHooks.SessionStart = [...filterOutMembank(Array.isArray(hooks.SessionStart) ? hooks.SessionStart : []), {
 				matcher: "",
@@ -758,6 +797,13 @@ 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"
+				}]
+			}];
 			writeJsonAtomic(cfgPath, {
 				...cfg,
 				hooks: newHooks
@@ -768,31 +814,42 @@ const writers = {
 	"copilot-cli": {
 		inspect(resolver) {
 			const cfgPath = join(resolver.home(), ".copilot", "settings.json");
-			const hooks = readJson(cfgPath).hooks ?? {};
+			const cfg = readJson(cfgPath);
+			const hooks = MaybeJsonObjectSchema.parse(cfg.hooks) ?? {};
+			const sessionStart = Array.isArray(hooks.sessionStart) ? hooks.sessionStart : [];
+			const userPromptSubmitted = Array.isArray(hooks.userPromptSubmitted) ? hooks.userPromptSubmitted : [];
 			return {
 				status: "ready",
 				configPath: cfgPath,
 				hooks: [{
 					event: "sessionStart",
 					command: "npx -y @membank/cli inject --harness copilot-cli",
-					existingCommand: extractInjectCommand(Array.isArray(hooks.sessionStart) ? hooks.sessionStart : []) || null
+					existingCommand: extractInjectCommand(sessionStart) || null
+				}, {
+					event: "userPromptSubmitted",
+					command: "npx -y @membank/cli inject --harness copilot-cli --event user-prompt-submit",
+					existingCommand: extractInjectCommand(userPromptSubmitted) || null
 				}]
 			};
 		},
 		write(resolver, events) {
 			const cfgPath = join(resolver.home(), ".copilot", "settings.json");
 			const cfg = readJson(cfgPath);
-			const hooks = cfg.hooks ?? {};
+			const hooks = MaybeJsonObjectSchema.parse(cfg.hooks) ?? {};
 			const newHooks = { ...hooks };
-			pruneFlatEvent(newHooks, "userPromptSubmitted");
 			pruneFlatEvent(newHooks, "postToolUseFailure");
 			if (events.includes("sessionStart")) newHooks.sessionStart = [...filterOutMembankFlat(Array.isArray(hooks.sessionStart) ? hooks.sessionStart : []), {
 				type: "command",
 				bash: "npx -y @membank/cli inject --harness copilot-cli",
 				timeoutSec: 30
 			}];
+			if (events.includes("userPromptSubmitted")) newHooks.userPromptSubmitted = [...filterOutMembankFlat(Array.isArray(hooks.userPromptSubmitted) ? hooks.userPromptSubmitted : []), {
+				type: "command",
+				bash: "npx -y @membank/cli inject --harness copilot-cli --event user-prompt-submit",
+				timeoutSec: 30
+			}];
 			writeJsonAtomic(cfgPath, {
-				version: cfg.version ?? 1,
+				version: OptionalNumberSchema.parse(cfg.version) ?? 1,
 				...cfg,
 				hooks: newHooks
 			});
@@ -802,23 +859,29 @@ const writers = {
 	codex: {
 		inspect(resolver) {
 			const cfgPath = join(resolver.home(), ".codex", "hooks.json");
-			const hooks = readJson(cfgPath).hooks ?? {};
+			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);
 			return {
 				status: "ready",
 				configPath: cfgPath,
 				hooks: [{
 					event: "SessionStart",
 					command: "npx -y @membank/cli inject --harness codex",
-					existingCommand: extractInjectCommand((Array.isArray(hooks.SessionStart) ? hooks.SessionStart : []).flatMap(getHooksArray)) || null
+					existingCommand: extractInjectCommand(sessionStartInner) || null
+				}, {
+					event: "UserPromptSubmit",
+					command: "npx -y @membank/cli inject --harness codex --event user-prompt-submit",
+					existingCommand: extractInjectCommand(userPromptSubmitInner) || null
 				}]
 			};
 		},
 		write(resolver, events) {
 			const cfgPath = join(resolver.home(), ".codex", "hooks.json");
 			const cfg = readJson(cfgPath);
-			const hooks = cfg.hooks ?? {};
+			const hooks = MaybeJsonObjectSchema.parse(cfg.hooks) ?? {};
 			const newHooks = { ...hooks };
-			pruneNestedEvent(newHooks, "UserPromptSubmit");
 			pruneNestedEvent(newHooks, "PostToolUse");
 			if (events.includes("SessionStart")) newHooks.SessionStart = [...filterOutMembank(Array.isArray(hooks.SessionStart) ? hooks.SessionStart : []), {
 				matcher: "",
@@ -828,6 +891,14 @@ const writers = {
 					timeout: 30
 				}]
 			}];
+			if (events.includes("UserPromptSubmit")) newHooks.UserPromptSubmit = [...filterOutMembank(Array.isArray(hooks.UserPromptSubmit) ? hooks.UserPromptSubmit : []), {
+				matcher: "",
+				hooks: [{
+					type: "command",
+					command: "npx -y @membank/cli inject --harness codex --event user-prompt-submit",
+					timeout: 30
+				}]
+			}];
 			writeJsonAtomic(cfgPath, {
 				...cfg,
 				hooks: newHooks
@@ -1034,7 +1105,7 @@ var SetupOrchestrator = class {
 		const out = json ? () => {} : this.#out;
 		let detected;
 		if (harness !== void 0) detected = [{
-			name: harness,
+			name: SetupHarnessSchema.parse(harness),
 			configPath: ""
 		}];
 		else detected = this.#detector();
@@ -1241,7 +1312,7 @@ var SetupOrchestrator = class {
 if (process.argv.includes("--mcp")) await startServer();
 const program = new Command();
 program.name("membank").description("LLM memory management system").option("--json", "emit machine-readable JSON only").option("-y, --yes", "skip all confirmation prompts").option("--mcp", "start the MCP stdio server (for harness integration)");
-program.command("query <queryText>").description("search memories by semantic similarity").option("--type <type>", "filter by memory type (correction|preference|decision|learning|fact)").option("--limit <n>", "maximum number of results", "10").action(async (queryText, cmdOptions) => {
+program.command("query <queryText>").description("search memories by semantic similarity").option("--type <type>", "filter by memory type (correction|preference|decision|learning|fact)").option("--limit <n>", "maximum number of results", "10").option("--include-pinned", "include pinned memories in results (excluded by default)").action(async (queryText, cmdOptions) => {
 	const globalOpts = program.opts();
 	const formatter = Formatter.create(globalOpts.json === true);
 	try {
@@ -1356,7 +1427,7 @@ program.command("setup").description("detect installed harnesses and write MCP c
 	const formatter = Formatter.create(globalOpts.json === true);
 	const interactive = !formatter.isJson && !autoYes && cmdOptions.harness === void 0;
 	if (cmdOptions.harness !== void 0) {
-		if (!SUPPORTED_HARNESSES.some((h) => h === cmdOptions.harness)) {
+		if (!SetupHarnessSchema.safeParse(cmdOptions.harness).success) {
 			formatter.error(`Unknown harness: "${cmdOptions.harness}". Supported: ${SUPPORTED_HARNESSES.join(", ")}`);
 			process.exit(1);
 		}
@@ -1419,14 +1490,15 @@ program.command("setup").description("detect installed harnesses and write MCP c
 	}
 });
 program.command("migrate <mode> [name]").description("list or run a named data migration (modes: list, run)").action(async (mode, name) => {
-	if (mode !== "list" && mode !== "run") {
+	const modeResult = MigrateModeSchema.safeParse(mode);
+	if (!modeResult.success) {
 		process.stderr.write(`Error: mode must be "list" or "run"\n`);
 		process.exit(1);
 	}
 	const globalOpts = program.opts();
 	const formatter = Formatter.create(globalOpts.json === true);
 	try {
-		await migrateCommand(mode, name, formatter);
+		await migrateCommand(modeResult.data, name, formatter);
 	} catch (err) {
 		formatter.error(err instanceof Error ? err.message : String(err));
 		process.exit(2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@membank/cli",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -20,9 +20,10 @@
     "cli-table3": "^0.6.5",
     "commander": "^14.0.3",
     "ora": "^9.4.0",
-    "@membank/core": "0.6.1",
-    "@membank/mcp": "0.8.0",
-    "@membank/dashboard": "0.4.0"
+    "zod": "^4.4.3",
+    "@membank/core": "0.7.0",
+    "@membank/mcp": "0.9.0",
+    "@membank/dashboard": "0.4.1"
   },
   "devDependencies": {
     "@types/node": "^25.6.0",