@membank/cli 0.14.1 → 0.15.0

package/dist/index.mjs

@@ -253,12 +253,12 @@ function exportCommand(db, formatter, opts) {
 //#endregion
 //#region src/commands/extract.ts
 const ExtractionHarnessSchema = z.enum(["claude-code"]);
-const ClaudeCodeStopInputSchema = z.object({
+const ClaudeCodeSessionEndInputSchema = z.object({
 	session_id: z.string(),
 	transcript_path: z.string(),
 	cwd: z.string().optional(),
 	hook_event_name: z.string().optional(),
-	stop_hook_active: z.boolean().optional()
+	reason: z.string().optional()
 });
 function parseHookPayload(harness, raw) {
 	let parsedJson;
@@ -271,7 +271,7 @@ function parseHookPayload(harness, raw) {
 		};
 	}
 	if (harness === "claude-code") {
-		const parsed = ClaudeCodeStopInputSchema.safeParse(parsedJson);
+		const parsed = ClaudeCodeSessionEndInputSchema.safeParse(parsedJson);
 		if (!parsed.success) return {
 			ok: false,
 			reason: `invalid hook payload: ${parsed.error.message}`
@@ -280,8 +280,7 @@ function parseHookPayload(harness, raw) {
 			ok: true,
 			value: {
 				sessionId: parsed.data.session_id,
-				transcriptPath: parsed.data.transcript_path,
-				stopHookActive: parsed.data.stop_hook_active === true
+				transcriptPath: parsed.data.transcript_path
 			}
 		};
 	}
@@ -305,7 +304,6 @@ async function extractCommand(opts) {
 	const harness = harnessResult.data;
 	let sessionId = opts.sessionId;
 	let transcriptPath = opts.transcript;
-	let stopHookActive = false;
 	if (sessionId === void 0 || transcriptPath === void 0) {
 		const raw = await readStdin();
 		if (raw.trim().length > 0) {
@@ -316,17 +314,12 @@ async function extractCommand(opts) {
 			}
 			sessionId = sessionId ?? parsed.value.sessionId;
 			transcriptPath = transcriptPath ?? parsed.value.transcriptPath;
-			stopHookActive = parsed.value.stopHookActive;
 		}
 	}
 	if (sessionId === void 0 || transcriptPath === void 0) {
 		process.stderr.write("membank extract: missing session_id or transcript_path (provide via stdin or --session/--transcript).\n");
 		return;
 	}
-	if (stopHookActive) {
-		process.stderr.write("membank extract: stop_hook_active=true; skipping to avoid recursion.\n");
-		return;
-	}
 	try {
 		const result = await runExtraction({
 			sessionId,
@@ -387,11 +380,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>`);
@@ -403,7 +401,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) {
@@ -423,7 +421,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 {
@@ -432,13 +430,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;
@@ -454,6 +452,7 @@ async function injectCommand(opts) {
 		return;
 	}
 	if (opts.event === "user-prompt-submit") {
+		if (harness === "claude-code") process.exit(0);
 		await handleEvent(harness, "UserPromptSubmit");
 		return;
 	}
@@ -1140,28 +1139,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 stopInner = (Array.isArray(hooks.Stop) ? hooks.Stop : []).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: "Stop",
-						command: "npx -y @membank/cli extract --harness claude-code",
-						existingCommand: extractInjectCommand(stopInner) || 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) {
@@ -1171,6 +1161,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: [{
@@ -1178,15 +1169,8 @@ 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("Stop")) newHooks.Stop = [...filterOutMembank(Array.isArray(hooks.Stop) ? hooks.Stop : []), {
-				matcher: "",
+			if (events.includes("SessionEnd")) newHooks.SessionEnd = [...filterOutMembank(Array.isArray(hooks.SessionEnd) ? hooks.SessionEnd : []), {
+				matcher: "clear|resume|logout|prompt_input_exit|other",
 				hooks: [{
 					type: "command",
 					command: "npx -y @membank/cli extract --harness claude-code",
@@ -1754,7 +1738,7 @@ program.command("inject").description("output session context for harness inject
 		process.exit(2);
 	}
 });
-program.command("extract").description("(internal) run session-end memory extraction; reads the harness's Stop hook payload from stdin").option("--harness <name>", "harness whose stop-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) => {
+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,

package/package.json

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