remem-mcp 0.7.3 → 0.7.6

package/dist/index.js

@@ -8,25 +8,26 @@ import {
   ingestFile,
   redact,
   searchWiki
-} from "./chunk-ITMR6THY.js";
+} from "./chunk-2RKMX6EE.js";
 import {
   engine_exports,
   findCallees,
   findCallers,
+  findEntryPoints,
   impactAnalysis,
   indexDirectory,
   indexFile,
   init_engine,
   listSymbols,
   searchSymbols
-} from "./chunk-YU7WBJU5.js";
+} from "./chunk-MPEN2X43.js";
 import {
   LocalEmbedder,
   SQLiteBackend,
   init_local,
   local_exports,
   stripQueryProperNouns
-} from "./chunk-4WCDAEPP.js";
+} from "./chunk-L7YZBBIB.js";
 import {
   generateId,
   init_ulid
@@ -39,11 +40,11 @@ import {
 
 // src/index.ts
 init_esm_shims();
-import { createHash as createHash6 } from "crypto";
+import { createHash as createHash9 } from "crypto";
 import { existsSync as existsSync16, readdirSync as readdirSync2, readFileSync as readFileSync13, statSync as statSync3 } from "fs";
 import { homedir as homedir13 } from "os";
 import { dirname as dirname10, join as join16 } from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import { fileURLToPath as fileURLToPath5 } from "url";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import Database13 from "better-sqlite3";
 import * as sqliteVec4 from "sqlite-vec";
@@ -274,7 +275,12 @@ async function atomsCommand(dbPath, flags) {
 
 // src/cli/consolidate.ts
 init_esm_shims();
+import { createHash as createHash2 } from "crypto";
 init_ulid();
+function cliSessionKey() {
+  if (process.env.REMEM_SESSION_KEY) return process.env.REMEM_SESSION_KEY;
+  return createHash2("sha256").update(process.cwd()).digest("hex").slice(0, 16);
+}
 async function consolidateCommand(dbPath, flags) {
   const storage = new SQLiteBackend(dbPath);
   try {
@@ -321,7 +327,8 @@ async function consolidateCommand(dbPath, flags) {
           atomIds: groupAtoms.map((a) => a.id),
           summary: summary2.slice(0, 300),
           personaTags: [topic],
-          createdAt: Date.now()
+          createdAt: Date.now(),
+          sessionKey: cliSessionKey()
         });
         console.log(`  [${topic}] ${groupAtoms.length} atoms \u2192 ${id2}`);
         count++;
@@ -348,7 +355,8 @@ Created ${count} scenario(s).`);
       atomIds,
       summary,
       personaTags: tags,
-      createdAt: Date.now()
+      createdAt: Date.now(),
+      sessionKey: cliSessionKey()
     });
     console.log(`Consolidated ${atomIds.length} atoms into scenario ${id}.`);
   } finally {
@@ -360,7 +368,7 @@ Created ${count} scenario(s).`);
 init_esm_shims();
 init_engine();
 import { execSync, spawn } from "child_process";
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, mkdtempSync, readFileSync as readFileSync2, rmSync, writeFileSync } from "fs";
 import { homedir, tmpdir } from "os";
 import { dirname as dirname3, join as join3 } from "path";
@@ -585,7 +593,7 @@ async function demo() {
   }
   db.close();
   const project = join3(tmpDir, "project");
-  const sessionKey = createHash2("sha256").update(project).digest("hex").slice(0, 16);
+  const sessionKey = createHash3("sha256").update(project).digest("hex").slice(0, 16);
   line(`  ${C.gray}Setting up test project...${C.reset}`);
   createRealProject(project, true);
   await sleep(500);
@@ -1254,6 +1262,7 @@ async function knowledgeCommand(dbPath, flags) {
 
 // src/cli/persona.ts
 init_esm_shims();
+import { createHash as createHash4 } from "crypto";
 import Database3 from "better-sqlite3";
 async function personaCommand(dbPath, flags) {
   const storage = new SQLiteBackend(dbPath);
@@ -1261,13 +1270,14 @@ async function personaCommand(dbPath, flags) {
     const teamId = flags["team-id"] ?? "default";
     const agentId = flags["agent-id"] ?? "unknown";
     const userId = flags["user-id"] ?? "default";
+    const sessionKey = flags["session-key"] ?? (process.env.REMEM_SESSION_KEY ? process.env.REMEM_SESSION_KEY : createHash4("sha256").update(process.cwd()).digest("hex").slice(0, 16));
     if (flags.clear !== void 0) {
-      await storage.writePersona(teamId, agentId, userId, "");
+      await storage.writePersona(teamId, agentId, userId, "", sessionKey);
       console.log("Persona cleared.");
       return;
     }
     if (flags.set) {
-      const existing = await storage.readPersona(teamId, agentId, userId);
+      const existing = await storage.readPersona(teamId, agentId, userId, sessionKey);
       const entry = flags.set;
       const [trait] = entry.split(":");
       let content;
@@ -1287,15 +1297,20 @@ async function personaCommand(dbPath, flags) {
       } else {
         content = entry;
       }
-      await storage.writePersona(teamId, agentId, userId, content);
+      await storage.writePersona(teamId, agentId, userId, content, sessionKey);
       console.log(`Persona updated: ${entry}`);
       return;
     }
     const db = new Database3(dbPath, { readonly: true });
     try {
-      const row = db.prepare(
-        "SELECT content FROM persona WHERE team_id = ? AND user_id = ? ORDER BY updated_at DESC LIMIT 1"
-      ).get(teamId, userId);
+      let row = db.prepare(
+        "SELECT content FROM persona WHERE team_id = ? AND user_id = ? AND session_key = ? ORDER BY updated_at DESC LIMIT 1"
+      ).get(teamId, userId, sessionKey);
+      if (!row) {
+        row = db.prepare(
+          "SELECT content FROM persona WHERE team_id = ? AND user_id = ? AND (session_key IS NULL OR session_key = '') ORDER BY updated_at DESC LIMIT 1"
+        ).get(teamId, userId);
+      }
       if (!row || !row.content) {
         console.log('No persona set. Use --set "trait: value" to add one.');
         return;
@@ -1492,6 +1507,7 @@ Memory:  ${total.c} captures across ${sessions.c} project(s)`);
 // src/cli/worker.ts
 init_esm_shims();
 init_local();
+import { createHash as createHash5 } from "crypto";
 
 // src/pipeline/worker.ts
 init_esm_shims();
@@ -1546,7 +1562,7 @@ async function runPipelineWorker(opts, embedder) {
         result.errors.push(`capture ${cap.id}: ${err}`);
       }
     }
-    const atoms = await storage.listAtoms({ limit: 200 });
+    const atoms = await storage.listAtoms({ limit: 200, sessionKey: opts.sessionKey });
     const groups = /* @__PURE__ */ new Map();
     for (const a of atoms) {
       const words = a.fact.toLowerCase().split(/[^a-z0-9]+/).filter((w) => w.length > 3);
@@ -1554,27 +1570,32 @@ async function runPipelineWorker(opts, embedder) {
       if (!groups.has(key)) groups.set(key, []);
       groups.get(key).push(a);
     }
-    const existingScenarios = await storage.listScenarios({ limit: 100 });
+    const existingScenarios = await storage.listScenarios({
+      limit: 100,
+      sessionKey: opts.sessionKey
+    });
     const existingTopics = new Set(existingScenarios.flatMap((s) => s.personaTags ?? []));
     for (const [topic, groupAtoms] of groups) {
       if (groupAtoms.length < consolidateThreshold) continue;
       if (existingTopics.has(topic)) continue;
-      const summary = groupAtoms.slice(0, 5).map((a) => a.fact).join("; ");
+      const summary = buildScenarioSummary(topic, groupAtoms);
       const id = generateId();
       await storage.putScenario({
         id,
         atomIds: groupAtoms.map((a) => a.id),
-        summary: summary.slice(0, 300),
+        summary,
         personaTags: [topic],
-        createdAt: Date.now()
+        createdAt: Date.now(),
+        sessionKey: opts.sessionKey
       });
       result.scenariosCreated++;
     }
     const tagCounts = db.prepare(
       `SELECT tags FROM captures
          WHERE (team_id = ? OR team_id IS NULL OR team_id = 'default')
+           AND session_key = ?
          ORDER BY created_at DESC LIMIT 100`
-    ).all(teamId);
+    ).all(teamId, opts.sessionKey);
     const tagFreq = /* @__PURE__ */ new Map();
     for (const row of tagCounts) {
       if (!row.tags) continue;
@@ -1586,16 +1607,13 @@ async function runPipelineWorker(opts, embedder) {
       } catch {
       }
     }
-    const existingPersonaRow = db.prepare(
-      "SELECT content FROM persona WHERE team_id = ? AND user_id = ? ORDER BY updated_at DESC LIMIT 1"
-    ).get(teamId, userId);
-    const existingContent = existingPersonaRow?.content ?? "";
-    const repeatedTags = Array.from(tagFreq.entries()).filter(([tag, count]) => count >= personaThreshold && !existingContent.includes(tag)).sort((a, b) => b[1] - a[1]).slice(0, 3);
-    if (repeatedTags.length > 0) {
-      const newTraits = repeatedTags.map(([tag, count]) => `${tag}: ${count} occurrences`);
-      const updatedContent = existingContent ? `${existingContent}
-${newTraits.join("\n")}` : newTraits.join("\n");
-      await storage.writePersona(teamId, "default", userId, updatedContent);
+    const existingPersona = await storage.readPersona(teamId, "default", userId, opts.sessionKey);
+    const existingContent = existingPersona?.content ?? "";
+    const manualTraits = existingContent.split("\n").filter((line2) => line2.trim() && !line2.trim().endsWith("occurrences"));
+    const topTags = Array.from(tagFreq.entries()).filter(([, count]) => count >= personaThreshold).sort((a, b) => b[1] - a[1]).slice(0, 10).map(([tag, count]) => `${tag}: ${count} occurrences`);
+    if (topTags.length > 0) {
+      const updatedContent = [...manualTraits, ...topTags].join("\n");
+      await storage.writePersona(teamId, "default", userId, updatedContent, opts.sessionKey);
       result.personaUpdated = true;
     }
   } finally {
@@ -1603,16 +1621,31 @@ ${newTraits.join("\n")}` : newTraits.join("\n");
   }
   return result;
 }
+function buildScenarioSummary(topic, atoms) {
+  const seen = /* @__PURE__ */ new Set();
+  const facts = [];
+  for (const a of atoms) {
+    const normalized = a.fact.replace(/^Error:\s*/i, "").toLowerCase().slice(0, 60);
+    if (seen.has(normalized)) continue;
+    seen.add(normalized);
+    facts.push(a.fact.slice(0, 80));
+    if (facts.length >= 5) break;
+  }
+  const body = facts.join("; ");
+  return `${topic}: ${body}`.slice(0, 300);
+}
 
 // src/cli/worker.ts
 async function workerCommand(dbPath, flags) {
   const embedder = new LocalEmbedder();
+  const sessionKey = flags["session-key"] ?? (process.env.REMEM_SESSION_KEY ? process.env.REMEM_SESSION_KEY : createHash5("sha256").update(process.cwd()).digest("hex").slice(0, 16));
   const result = await runPipelineWorker(
     {
       dbPath,
       batchSize: flags["batch-size"] ? Number(flags["batch-size"]) : 50,
       teamId: flags["team-id"],
-      userId: flags["user-id"]
+      userId: flags["user-id"],
+      sessionKey
     },
     embedder
   );
@@ -4295,7 +4328,7 @@ function exportMarkdown(dbPath, outputPath, filters) {
 // src/hook-handlers.ts
 init_esm_shims();
 import { execSync as execSync2, spawn as spawn2 } from "child_process";
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash6 } from "crypto";
 import { appendFileSync as appendFileSync2, existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir7, tmpdir as tmpdir2 } from "os";
 import { dirname as dirname4, join as join9 } from "path";
@@ -4633,9 +4666,9 @@ function hookRecall(dbPath) {
       const globalKey = process.env.REMEM_GLOBAL_SESSION_KEY;
       if (globalKey) {
         const globalErrors = db.prepare(`${errorSql} AND session_key = ? ORDER BY created_at DESC LIMIT 3`).all(globalKey);
-        rows.push(...globalErrors);
+        rows.push(...globalErrors.map((row) => ({ ...row, scope: "global" })));
         const globalOthers = db.prepare(`${otherSql} AND session_key = ? ORDER BY created_at DESC LIMIT 3`).all(globalKey);
-        rows.push(...globalOthers);
+        rows.push(...globalOthers.map((row) => ({ ...row, scope: "global" })));
       }
       if (sessionKey) {
         const sessionErrors = db.prepare(`${errorSql} AND session_key = ? ORDER BY created_at DESC LIMIT 5`).all(sessionKey);
@@ -4656,7 +4689,23 @@ function hookRecall(dbPath) {
         process.stdout.write(JSON.stringify({}));
         return;
       }
-      const lines = ["[remem-mcp] Recent project memory:"];
+      const globalRows = rows.filter((row) => row.scope === "global");
+      const projectRows = rows.filter((row) => row.scope !== "global");
+      const lines = [];
+      const appendMemoryRows = (header, scopedRows) => {
+        if (scopedRows.length === 0) return;
+        if (lines.length > 0) lines.push("");
+        lines.push(header);
+        for (const row of scopedRows) {
+          const date = new Date(row.created_at).toISOString().split("T")[0];
+          const tags = safeParseTags(row.tags);
+          const tagStr = tags.length > 0 ? ` [${tags.join(", ")}]` : "";
+          const content = row.content.length > 200 ? `${row.content.slice(0, 200)}...` : row.content;
+          lines.push(`- (${row.type}${tagStr}) ${date}: ${content}`);
+        }
+      };
+      appendMemoryRows("[remem-mcp] Global memory (read automatically):", globalRows);
+      appendMemoryRows("[remem-mcp] Project memory:", projectRows);
       for (const row of rows) {
         const date = new Date(row.created_at).toISOString().split("T")[0];
         const tags = safeParseTags(row.tags);
@@ -4665,9 +4714,14 @@ function hookRecall(dbPath) {
         lines.push(`- (${row.type}${tagStr}) ${date}: ${content}`);
       }
       try {
-        const personaRow = db.prepare(
-          "SELECT content FROM persona WHERE team_id = ? AND user_id = ? ORDER BY updated_at DESC LIMIT 1"
-        ).get("default", "default");
+        let personaRow = db.prepare(
+          "SELECT content FROM persona WHERE team_id = ? AND user_id = ? AND session_key = ? ORDER BY updated_at DESC LIMIT 1"
+        ).get("default", "default", sessionKey);
+        if (!personaRow) {
+          personaRow = db.prepare(
+            "SELECT content FROM persona WHERE team_id = ? AND user_id = ? AND (session_key IS NULL OR session_key = '') ORDER BY updated_at DESC LIMIT 1"
+          ).get("default", "default");
+        }
         if (personaRow && personaRow.content) {
           lines.push("");
           lines.push(`## Persona (L3)`);
@@ -4676,7 +4730,9 @@ function hookRecall(dbPath) {
       } catch {
       }
       try {
-        const scenarios = db.prepare("SELECT summary FROM scenarios ORDER BY created_at DESC LIMIT 3").all();
+        const scenarios = db.prepare(
+          "SELECT summary FROM scenarios WHERE session_key = ? ORDER BY created_at DESC LIMIT 3"
+        ).all(sessionKey);
         if (scenarios.length > 0) {
           lines.push("");
           lines.push(`## Scenarios (L2)`);
@@ -4699,6 +4755,9 @@ function hookRecall(dbPath) {
       lines.push(
         "After completing non-trivial work, call capture() to save a 1-3 sentence summary."
       );
+      lines.push(
+        'Captures are project-local by default. Save to global only when the user explicitly asks (e.g. "remember this globally").'
+      );
       const context = lines.join("\n");
       logToFile(`SessionStart: loaded ${rows.length} capture(s)
 ${context}`);
@@ -4823,7 +4882,7 @@ function hookUserPromptSubmit(dbPath) {
       if (updateFact) {
         try {
           const content = updateFact.type === "decision" ? `Decision: ${updateFact.fact}` : updateFact.fact;
-          const contentHash = createHash3("sha256").update(content).digest("hex").slice(0, 16);
+          const contentHash = createHash6("sha256").update(content).digest("hex").slice(0, 16);
           const existing = db.prepare("SELECT id FROM captures WHERE content_hash = ? AND deleted_at IS NULL").get(contentHash);
           if (existing) {
             logToFile(`UserPromptSubmit: duplicate fact (hash match), skipping capture`);
@@ -4886,7 +4945,9 @@ function hookUserPromptSubmit(dbPath) {
             try {
               const globalRows = db.prepare(sql).all(ftsQuery, globalKey);
               const seen = new Set(rows.map((r) => r.id));
-              rows.push(...globalRows.filter((r) => !seen.has(r.id)).slice(0, 2));
+              rows.push(
+                ...globalRows.filter((r) => !seen.has(r.id)).slice(0, 2).map((r) => ({ ...r, scope: "global" }))
+              );
             } catch {
             }
           }
@@ -4895,7 +4956,8 @@ function hookUserPromptSubmit(dbPath) {
             for (const row of rows.slice(0, 5)) {
               const date = new Date(row.created_at).toISOString().split("T")[0];
               const tags = safeParseTags(row.tags);
-              const tagStr = tags.length > 0 ? ` [${tags.join(", ")}]` : "";
+              const globalTag = row.scope === "global" ? " [global]" : "";
+              const tagStr = tags.length > 0 ? ` [${tags.join(", ")}]` : globalTag;
               const content = row.content.length > 200 ? `${row.content.slice(0, 200)}...` : row.content;
               lines.push(`- (${row.type}${tagStr}) ${date}: ${content}`);
             }
@@ -4903,6 +4965,9 @@ function hookUserPromptSubmit(dbPath) {
             lines.push(
               "This is BM25-only (fast, shallow). MUST call recall() for hybrid search (BM25 + vector) with more results and filters."
             );
+            lines.push(
+              "Global entries are read-only context. Save to global only when the user explicitly asks."
+            );
             recallContext = lines.join("\n");
             logToFile(
               `UserPromptSubmit: injected ${rows.length} memorie(s) for prompt: ${prompt2.slice(0, 80)}`
@@ -4912,7 +4977,9 @@ function hookUserPromptSubmit(dbPath) {
         }
       }
       try {
-        const scenarios = db.prepare("SELECT summary FROM scenarios ORDER BY created_at DESC LIMIT 3").all();
+        const scenarios = db.prepare(
+          "SELECT summary FROM scenarios WHERE session_key = ? ORDER BY created_at DESC LIMIT 3"
+        ).all(sessionKey);
         if (scenarios.length > 0) {
           const scenarioLines = scenarios.map((s) => `- ${s.summary}`);
           if (recallContext) {
@@ -4928,9 +4995,14 @@ ${scenarioLines.join("\n")}`;
       } catch {
       }
       try {
-        const personaRow = db.prepare(
-          "SELECT content FROM persona WHERE team_id = ? AND user_id = ? ORDER BY updated_at DESC LIMIT 1"
-        ).get("default", "default");
+        let personaRow = db.prepare(
+          "SELECT content FROM persona WHERE team_id = ? AND user_id = ? AND session_key = ? ORDER BY updated_at DESC LIMIT 1"
+        ).get("default", "default", sessionKey);
+        if (!personaRow) {
+          personaRow = db.prepare(
+            "SELECT content FROM persona WHERE team_id = ? AND user_id = ? AND (session_key IS NULL OR session_key = '') ORDER BY updated_at DESC LIMIT 1"
+          ).get("default", "default");
+        }
         if (personaRow && personaRow.content) {
           if (recallContext) {
             recallContext += `
@@ -5154,9 +5226,9 @@ function hookPostToolUse(dbPath) {
           const sessionKey2 = hashPath(writeEditCwd);
           const pattern = detectPattern(toolName, toolInput);
           if (pattern) {
-            const id2 = `pat-${createHash3("sha256").update(pattern.signature + pattern.file_path).digest("hex").slice(0, 12)}`;
+            const id2 = `pat-${createHash6("sha256").update(pattern.signature + pattern.file_path).digest("hex").slice(0, 12)}`;
             const content2 = `Pattern: ${pattern.title} in ${pattern.file_path}`;
-            const hash = createHash3("sha256").update(content2).digest("hex").slice(0, 16);
+            const hash = createHash6("sha256").update(content2).digest("hex").slice(0, 16);
             const patternConflict = detectPatternConflict(db2, sessionKey2, {
               pattern_type: pattern.pattern_type,
               language: pattern.language,
@@ -5428,7 +5500,7 @@ function hookPostToolUse(dbPath) {
           const decision = detectDecision(command, stdout);
           if (decision) {
             try {
-              const decId = `dec-${createHash3("sha256").update(decision.choice + sessionKey).digest("hex").slice(0, 12)}`;
+              const decId = `dec-${createHash6("sha256").update(decision.choice + sessionKey).digest("hex").slice(0, 12)}`;
               const existingDec = db.prepare("SELECT id, metadata FROM captures WHERE id = ?").get(decId);
               const conflict = detectDecisionConflict(
                 db,
@@ -5476,7 +5548,7 @@ function hookPostToolUse(dbPath) {
                 );
               } else {
                 const decContent = `Decision: ${decision.title}`;
-                const decHash = createHash3("sha256").update(decContent).digest("hex").slice(0, 16);
+                const decHash = createHash6("sha256").update(decContent).digest("hex").slice(0, 16);
                 db.prepare(
                   "INSERT INTO captures (id, session_key, agent_id, type, content, content_hash, tags, created_at, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"
                 ).run(
@@ -5527,7 +5599,7 @@ Error (${errorType}): ${truncatedError}`;
       const normalizedError = truncatedError.replace(/line \d+/g, "line N").replace(/col \d+/g, "col N").replace(/\b\d+\b/g, "N").replace(/'[^']+'/g, "'X'").replace(/"[^"]+"/g, '"X"').replace(/src\/[^\s:]+/g, "src/PATH").replace(/\.\/[^\s:]+/g, "./PATH").replace(/\/[^\s:]+\/[^\s:]+/g, "/PATH");
       const semanticContent = `Command failed: ${command}
 Error (${errorType}): ${normalizedError}`;
-      const contentHash = createHash3("sha256").update(semanticContent).digest("hex").slice(0, 16);
+      const contentHash = createHash6("sha256").update(semanticContent).digest("hex").slice(0, 16);
       const id = generateId2();
       const now = Date.now();
       const recent = db.prepare("SELECT id FROM captures WHERE content_hash = ? AND created_at > ? LIMIT 1").get(contentHash, now - 36e5);
@@ -5923,7 +5995,7 @@ function hookPreToolUse(dbPath) {
                 lines2.push("");
                 lines2.push("Follow these patterns for consistency.");
                 for (const p of patterns) {
-                  const patId = `pat-${createHash3("sha256").update((p.sig ?? p.title) + (p.fpath ?? "")).digest("hex").slice(0, 12)}`;
+                  const patId = `pat-${createHash6("sha256").update((p.sig ?? p.title) + (p.fpath ?? "")).digest("hex").slice(0, 12)}`;
                   logInjectionDrift(sessionKey2, "pattern", patId, `edit ${filePath}`);
                 }
                 const output3 = {
@@ -6136,7 +6208,7 @@ function hookPreToolUse(dbPath) {
                 logInjectionDrift(
                   sessionKey,
                   "decision",
-                  `dec-${createHash3("sha256").update(d.choice + sessionKey).digest("hex").slice(0, 12)}`,
+                  `dec-${createHash6("sha256").update(d.choice + sessionKey).digest("hex").slice(0, 12)}`,
                   command
                 );
               }
@@ -6298,7 +6370,7 @@ function hookPreToolUse(dbPath) {
               logInjectionDrift(
                 sessionKey,
                 "decision",
-                `dec-${createHash3("sha256").update(d.choice + sessionKey).digest("hex").slice(0, 12)}`,
+                `dec-${createHash6("sha256").update(d.choice + sessionKey).digest("hex").slice(0, 12)}`,
                 command
               );
             }
@@ -6884,7 +6956,7 @@ function extractFilePaths(content) {
   return paths;
 }
 function hashPath(path) {
-  return createHash3("sha256").update(path).digest("hex").slice(0, 16);
+  return createHash6("sha256").update(path).digest("hex").slice(0, 16);
 }
 function ensureSchema2(db) {
   db.exec(`CREATE TABLE IF NOT EXISTS captures (
@@ -6943,10 +7015,12 @@ function ensureSchema2(db) {
   )`);
   db.exec(`CREATE TABLE IF NOT EXISTS persona (
     team_id TEXT NOT NULL,
+    agent_id TEXT NOT NULL,
     user_id TEXT NOT NULL,
     content TEXT NOT NULL,
     updated_at INTEGER NOT NULL,
-    PRIMARY KEY (team_id, user_id)
+    session_key TEXT,
+    PRIMARY KEY (team_id, agent_id, user_id, session_key)
   )`);
   db.exec(`CREATE TABLE IF NOT EXISTS skills (
     id TEXT PRIMARY KEY,
@@ -6978,14 +7052,21 @@ function ensureSchema2(db) {
     id TEXT PRIMARY KEY,
     atom_ids TEXT NOT NULL,
     summary TEXT,
+    persona_tags TEXT,
     created_at INTEGER NOT NULL,
-    team_id TEXT
+    team_id TEXT,
+    agent_id TEXT,
+    user_id TEXT,
+    session_key TEXT
   )`);
   db.exec(`CREATE TABLE IF NOT EXISTS schema_version (version INTEGER NOT NULL)`);
   db.exec(`CREATE INDEX IF NOT EXISTS idx_captures_session ON captures(session_key)`);
   db.exec(`CREATE INDEX IF NOT EXISTS idx_captures_type ON captures(type)`);
   db.exec(`CREATE INDEX IF NOT EXISTS idx_errors_session ON error_patterns(session_key)`);
   db.exec(`CREATE INDEX IF NOT EXISTS idx_atoms_capture ON atoms(capture_id)`);
+  db.exec(
+    `CREATE INDEX IF NOT EXISTS idx_scenarios_session ON scenarios(session_key, created_at DESC)`
+  );
 }
 function defaultTranscriptDir() {
   return process.env.DEVIN_TRANSCRIPTS_DIR ?? join9(homedir7(), ".local", "share", "devin", "cli", "transcripts");
@@ -7080,7 +7161,7 @@ async function captureSessionTranscript(dbPath, sessionId, transcriptPath, cwd)
   const content = `Session: ${sid}
 Task: ${taskText}
 Outcome: ${outcomeText}`;
-  const contentHash = createHash3("sha256").update(content).digest("hex");
+  const contentHash = createHash6("sha256").update(content).digest("hex");
   const db = new Database8(dbPath);
   ensureSchema2(db);
   try {
@@ -7233,15 +7314,15 @@ async function hookPostCommit(dbPath) {
     }
     const { readFileSync: readFileSync14 } = await import("fs");
     const { join: join17, dirname: dirname11 } = await import("path");
-    const { fileURLToPath: fileURLToPath5 } = await import("url");
+    const { fileURLToPath: fileURLToPath6 } = await import("url");
     const sqliteVec5 = await import("sqlite-vec");
-    const { indexFile: indexFile2 } = await import("./engine-S47HHGAO.js");
+    const { indexFile: indexFile2 } = await import("./engine-LAY25SCA.js");
     const db = new Database8(dbPath);
     ensureSchema2(db);
     try {
       db.pragma("journal_mode = WAL");
       sqliteVec5.load(db);
-      const schemaPath = join17(dirname11(fileURLToPath5(import.meta.url)), "storage", "schema.sql");
+      const schemaPath = join17(dirname11(fileURLToPath6(import.meta.url)), "storage", "schema.sql");
       try {
         const schema = readFileSync14(schemaPath, "utf-8");
         db.exec(schema);
@@ -7321,14 +7402,14 @@ function hookPreCompact(dbPath) {
         } catch {
         }
         try {
-          const { fileURLToPath: fileURLToPath5 } = await import("url");
-          const schemaPath = join9(dirname4(fileURLToPath5(import.meta.url)), "storage", "schema.sql");
+          const { fileURLToPath: fileURLToPath6 } = await import("url");
+          const schemaPath = join9(dirname4(fileURLToPath6(import.meta.url)), "storage", "schema.sql");
           if (existsSync8(schemaPath)) {
             db.exec(readFileSync6(schemaPath, "utf-8"));
           }
         } catch {
         }
-        const checkpointId = `ckpt-${createHash3("sha256").update(sessionKey + Date.now()).digest("hex").slice(0, 12)}`;
+        const checkpointId = `ckpt-${createHash6("sha256").update(sessionKey + Date.now()).digest("hex").slice(0, 12)}`;
         const summary = `Context compaction triggered (${trigger}). Session checkpoint saved. After compaction, recall recent memory to recover decisions made, approaches tried, and what was verified working.`;
         db.prepare(
           `INSERT INTO captures (id, type, content, tags, metadata, session_key, agent_id, created_at)
@@ -7351,7 +7432,7 @@ function hookPreCompact(dbPath) {
           try {
             const transcript = readFileSync6(input.transcript_path, "utf-8");
             const recent = transcript.slice(-2e3);
-            const transcriptId = `txcpt-${createHash3("sha256").update(sessionKey + "transcript" + Date.now()).digest("hex").slice(0, 12)}`;
+            const transcriptId = `txcpt-${createHash6("sha256").update(sessionKey + "transcript" + Date.now()).digest("hex").slice(0, 12)}`;
             db.prepare(
               `INSERT INTO captures (id, type, content, tags, metadata, session_key, agent_id, created_at)
                VALUES (?, 'task', ?, ?, ?, ?, ?, ?)`
@@ -7419,8 +7500,8 @@ function hookPostCompaction(dbPath) {
       const input = raw.trim() ? JSON.parse(raw) : {};
       const sessionKey = hashPath(input.cwd ?? process.cwd());
       const globalKey = process.env.REMEM_GLOBAL_SESSION_KEY ?? null;
-      const { fileURLToPath: fileURLToPath5 } = await import("url");
-      const schemaPath = join9(dirname4(fileURLToPath5(import.meta.url)), "storage", "schema.sql");
+      const { fileURLToPath: fileURLToPath6 } = await import("url");
+      const schemaPath = join9(dirname4(fileURLToPath6(import.meta.url)), "storage", "schema.sql");
       const db = new Database8(dbPath, { readonly: true });
       const cutoff = Date.now() - 24 * 60 * 60 * 1e3;
       const sessionKeys = globalKey ? [sessionKey, globalKey] : [sessionKey];
@@ -7774,14 +7855,16 @@ import { existsSync as existsSync9, mkdirSync as mkdirSync6, readFileSync as rea
 import { homedir as homedir8 } from "os";
 import { dirname as dirname5, join as join10 } from "path";
 function hookCommand(subcommand) {
+  const globalKey = process.env.REMEM_GLOBAL_SESSION_KEY;
+  const globalEnvPrefix = globalKey ? `env REMEM_GLOBAL_SESSION_KEY='${globalKey.replaceAll("'", `'\\''`)}' ` : "";
   try {
     const binPath = execFileSync2("which", ["remem-mcp"], { encoding: "utf-8" }).trim();
     if (binPath && existsSync9(binPath)) {
-      return `${binPath} ${subcommand}`;
+      return `${globalEnvPrefix}${binPath} ${subcommand}`;
     }
   } catch {
   }
-  return `npx --prefer-offline -y remem-mcp ${subcommand}`;
+  return `${globalEnvPrefix}npx --prefer-offline -y remem-mcp ${subcommand}`;
 }
 var CODEX_HOOK_SUBCOMMANDS = [
   "hook-recall",
@@ -7842,18 +7925,6 @@ var HOOKS_CONFIG = {
       ]
     }
   ],
-  PreToolUse: [
-    {
-      matcher: "Bash|exec",
-      hooks: [
-        {
-          type: "command",
-          command: hookCommand("hook-pre-tool-use"),
-          timeout: 5
-        }
-      ]
-    }
-  ],
   PostToolUse: [
     {
       matcher: "Bash|exec",
@@ -7881,10 +7952,6 @@ var HOOKS_CONFIG = {
       ]
     }
   ],
-  // Note: PostToolUseFailure is not supported by Devin CLI.
-  // Devin supports: PreToolUse, PostToolUse, UserPromptSubmit, Stop,
-  // PostCompaction, SessionStart, SessionEnd, PermissionRequest.
-  // Error capture is handled via PostToolUse with exit code 2.
   UserPromptSubmit: [
     {
       hooks: [
@@ -7896,17 +7963,6 @@ var HOOKS_CONFIG = {
       ]
     }
   ],
-  Stop: [
-    {
-      hooks: [
-        {
-          type: "command",
-          command: hookCommand("hook-stop"),
-          timeout: 10
-        }
-      ]
-    }
-  ],
   SessionEnd: [
     {
       hooks: [
@@ -7958,7 +8014,6 @@ function installDevinHooks() {
   const config = readJsonConfig(configPath);
   const updated = mergeHooks(config, HOOKS_CONFIG);
   writeJsonConfig(configPath, updated);
-  console.log(`  Devin CLI: Hooks wired into ${configPath}`);
   return true;
 }
 function installClaudeCodeHooks() {
@@ -7970,17 +8025,6 @@ function installClaudeCodeHooks() {
   const { PostCompaction: _omit, ...baseWithoutPostCompaction } = HOOKS_CONFIG;
   const claudeHooksConfig = {
     ...baseWithoutPostCompaction,
-    PreCompact: [
-      {
-        hooks: [
-          {
-            type: "command",
-            command: hookCommand("hook-pre-compact"),
-            timeout: 10
-          }
-        ]
-      }
-    ],
     PostCompact: [
       {
         hooks: [
@@ -7996,7 +8040,6 @@ function installClaudeCodeHooks() {
   const config = readJsonConfig(settingsPath);
   const updated = mergeHooks(config, claudeHooksConfig);
   writeJsonConfig(settingsPath, updated);
-  console.log(`  Claude Code: Hooks wired into ${settingsPath}`);
   return true;
 }
 function installCodexHooks() {
@@ -8006,7 +8049,6 @@ function installCodexHooks() {
   }
   let content = readFileSync7(configPath, "utf-8");
   if (hasCodexRememHooks(content)) {
-    console.log(`  Codex CLI: Hooks already installed in ${configPath}`);
     return true;
   }
   const hooksToml = `
@@ -8020,16 +8062,6 @@ command = "${hookCommand("hook-recall")}"
 timeout = 10
 # <<< remem-mcp SessionStart <<<
 
-# >>> remem-mcp PreToolUse >>>
-[[hooks.PreToolUse]]
-matcher = "Bash|exec"
-
-[[hooks.PreToolUse.hooks]]
-type = "command"
-command = "${hookCommand("hook-pre-tool-use")}"
-timeout = 5
-# <<< remem-mcp PreToolUse <<<
-
 # >>> remem-mcp PostToolUse >>>
 [[hooks.PostToolUse]]
 matcher = "Bash|exec"
@@ -8058,15 +8090,6 @@ command = "${hookCommand("hook-user-prompt")}"
 timeout = 5
 # <<< remem-mcp UserPromptSubmit <<<
 
-# >>> remem-mcp Stop >>>
-[[hooks.Stop]]
-
-[[hooks.Stop.hooks]]
-type = "command"
-command = "${hookCommand("hook-stop")}"
-timeout = 5
-# <<< remem-mcp Stop <<<
-
 # >>> remem-mcp SessionEnd >>>
 [[hooks.SessionEnd]]
 
@@ -8078,38 +8101,73 @@ timeout = 10
 `;
   content = content.trimEnd() + "\n" + hooksToml;
   writeFileSync6(configPath, content, "utf-8");
-  console.log(`  Codex CLI: Hooks wired into ${configPath}`);
-  console.log(`    Note: Set sandbox_mode = "danger-full-access" for MCP tools to work.`);
   return true;
 }
+function installZcodeHooks() {
+  const configPath = join10(homedir8(), ".zcode", "cli", "config.json");
+  if (!existsSync9(join10(homedir8(), ".zcode"))) {
+    return false;
+  }
+  const config = readJsonConfig(configPath);
+  const { PostCompaction: _omit, SessionEnd: _omit2, ...baseConfig } = HOOKS_CONFIG;
+  const zcodeHooksConfig = {
+    ...baseConfig,
+    Stop: [
+      {
+        hooks: [
+          {
+            type: "command",
+            command: hookCommand("hook-stop"),
+            timeout: 10
+          }
+        ]
+      }
+    ]
+  };
+  const updated = mergeZcodeHooks(config, zcodeHooksConfig);
+  writeJsonConfig(configPath, updated);
+  return true;
+}
+function mergeZcodeHooks(config, hooks) {
+  const existing = config.hooks ?? {};
+  const existingEvents = existing.events ?? {};
+  const merged = { ...existingEvents };
+  for (const [event, newEntries] of Object.entries(hooks)) {
+    const existingEntries = existingEvents[event] ?? [];
+    const filtered = existingEntries.filter((entry) => {
+      const hooks2 = entry?.hooks;
+      if (!hooks2) return true;
+      return !hooks2.some((h) => h?.command?.includes("remem-mcp"));
+    });
+    merged[event] = [...filtered, ...newEntries];
+  }
+  return {
+    ...config,
+    hooks: {
+      ...existing,
+      enabled: true,
+      // configuration-file hooks are disabled by default in ZCode
+      events: merged
+    }
+  };
+}
 async function installHooks() {
-  console.log("Installing lifecycle hooks...\n");
-  let installed = 0;
-  if (installDevinHooks()) installed++;
-  if (installClaudeCodeHooks()) installed++;
-  if (installCodexHooks()) installed++;
-  if (installed === 0) {
-    console.log("\nNo supported agents found.");
-    console.log("Install Devin CLI, Claude Code, or Codex CLI first, then run this command again.");
+  await uninstallHooks(true);
+  const names = [];
+  if (installDevinHooks()) names.push("Devin CLI");
+  if (installClaudeCodeHooks()) names.push("Claude Code");
+  if (installZcodeHooks()) names.push("ZCode");
+  if (installCodexHooks()) names.push("Codex CLI");
+  if (names.length === 0) {
+    console.log("No supported agents found.");
+    console.log(
+      "Install ZCode, Devin CLI, Claude Code, or Codex CLI first, then run this command again."
+    );
     return;
   }
-  console.log(`
-Hooks wired to ${installed} agent(s).`);
-  console.log("\nHooks installed:");
-  console.log("  SessionStart \u2192 auto-recall recent memory into agent context");
-  console.log("  UserPromptSubmit \u2192 heuristic recall: inject memory matching user prompt");
-  console.log("  PreToolUse   \u2192 inject past errors before lint/build/test commands");
-  console.log("  PostToolUse  \u2192 auto-capture failed commands as error memories");
-  console.log("  PreCompact   \u2192 save checkpoint before compaction (Claude Code only)");
-  console.log("  PostCompact  \u2192 re-inject memory after compaction (Claude Code)");
-  console.log("  PostCompaction \u2192 re-inject memory after compaction (Devin CLI, Codex CLI)");
-  console.log("  Stop         \u2192 auto-capture session transcript + remind to save");
-  console.log("  SessionEnd   \u2192 silently capture session summary to memory DB");
-  console.log("\nRestart your agent for hooks to take effect.");
-  console.log("\nTo verify: run /hooks in your agent.");
-}
-async function uninstallHooks() {
-  console.log("Removing lifecycle hooks...\n");
+  console.log(`Hooks: ${names.join(", ")}`);
+}
+async function uninstallHooks(calledFromInstall = false) {
   let removed = 0;
   const rememEvents = [
     "SessionStart",
@@ -8143,7 +8201,6 @@ async function uninstallHooks() {
         delete config.hooks;
       }
       writeJsonConfig(devinPath, config);
-      console.log(`  Devin CLI: Hooks removed from ${devinPath}`);
       removed++;
     }
   }
@@ -8168,7 +8225,41 @@ async function uninstallHooks() {
         delete config.hooks;
       }
       writeJsonConfig(claudePath, config);
-      console.log(`  Claude Code: Hooks removed from ${claudePath}`);
+      removed++;
+    }
+  }
+  const zcodePath = join10(homedir8(), ".zcode", "cli", "config.json");
+  if (existsSync9(zcodePath)) {
+    const config = readJsonConfig(zcodePath);
+    const hooks = config.hooks ?? {};
+    const events = hooks.events ?? {};
+    let changed = false;
+    for (const ev of rememEvents) {
+      if (events[ev]) {
+        events[ev] = events[ev].filter((entry) => {
+          const entryHooks = entry?.hooks;
+          if (!entryHooks) return true;
+          return !entryHooks.some((h) => h?.command?.includes("remem-mcp"));
+        });
+        if (Array.isArray(events[ev]) && events[ev].length === 0) {
+          delete events[ev];
+        }
+        changed = true;
+      }
+    }
+    if (changed) {
+      if (Object.keys(events).length === 0) {
+        delete hooks.events;
+        delete hooks.enabled;
+      } else {
+        hooks.events = events;
+      }
+      if (Object.keys(hooks).length === 0) {
+        delete config.hooks;
+      } else {
+        config.hooks = hooks;
+      }
+      writeJsonConfig(zcodePath, config);
       removed++;
     }
   }
@@ -8179,15 +8270,11 @@ async function uninstallHooks() {
     if (cleaned !== content) {
       content = cleaned;
       writeFileSync6(codexPath, content.trimEnd() + "\n", "utf-8");
-      console.log(`  Codex CLI: Hooks removed from ${codexPath}`);
       removed++;
     }
   }
-  if (removed === 0) {
-    console.log("No hooks found to remove.");
-  } else {
-    console.log(`
-Hooks removed from ${removed} agent(s).`);
+  if (removed > 0 && !calledFromInstall) {
+    console.log(`Hooks removed from ${removed} agent(s).`);
   }
 }
 
@@ -8330,20 +8417,46 @@ var JSON_TARGETS = [
     key: "mcpServers"
   }
 ];
+function registerZcodeServer() {
+  const configPath = join12(homedir9(), ".zcode", "cli", "config.json");
+  const config = readJsonConfig2(configPath);
+  const mcp = config.mcp ?? {};
+  const servers = mcp.servers ?? {};
+  if (servers["remem-mcp"]) {
+    return true;
+  }
+  servers["remem-mcp"] = MCP_SERVER_ENTRY;
+  mcp.servers = servers;
+  config.mcp = mcp;
+  writeJsonConfig2(configPath, config);
+  return true;
+}
+function readJsonConfig2(path) {
+  if (!existsSync11(path)) return {};
+  try {
+    return JSON.parse(readFileSync9(path, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function writeJsonConfig2(path, data) {
+  const dir = dirname7(path);
+  if (!existsSync11(dir)) mkdirSync7(dir, { recursive: true });
+  writeFileSync7(path, `${JSON.stringify(data, null, 2)}
+`, "utf-8");
+}
 function registerJsonServer(target) {
   let config = {};
   if (existsSync11(target.path)) {
     try {
       config = JSON.parse(readFileSync9(target.path, "utf-8"));
     } catch {
-      console.log(`  ${target.name}: Config file unreadable, skipping.`);
       return false;
     }
   }
   const servers = config[target.key] || {};
   const entry = target.useGlobal ? MCP_SERVER_ENTRY_WITH_GLOBAL : MCP_SERVER_ENTRY;
-  if (JSON.stringify(servers["remem-mcp"]) === JSON.stringify(entry)) {
-    console.log(`  ${target.name}: Already registered.`);
+  if (servers["remem-mcp"]) {
     return true;
   }
   servers["remem-mcp"] = entry;
@@ -8353,12 +8466,10 @@ function registerJsonServer(target) {
     mkdirSync7(dir, { recursive: true });
   }
   writeFileSync7(target.path, JSON.stringify(config, null, 2) + "\n", "utf-8");
-  console.log(`  ${target.name}: MCP server registered.`);
   return true;
 }
 async function installMcpServer() {
-  console.log("\nRegistering MCP server...\n");
-  let count = 0;
+  const names = [];
   for (const target of JSON_TARGETS) {
     const agentDir = dirname7(target.path);
     if (!existsSync11(agentDir)) {
@@ -8375,15 +8486,19 @@ async function installMcpServer() {
       }
     }
     if (registerJsonServer(target)) {
-      count++;
+      names.push(target.name);
+    }
+  }
+  if (existsSync11(join12(homedir9(), ".zcode"))) {
+    if (registerZcodeServer()) {
+      names.push("ZCode");
     }
   }
   const codexConfig = join12(homedir9(), ".codex", "config.toml");
   if (existsSync11(codexConfig)) {
     const content = readFileSync9(codexConfig, "utf-8");
     if (content.includes("[mcp_servers.remem-mcp]")) {
-      console.log("  Codex CLI: Already registered.");
-      count++;
+      names.push("Codex CLI");
     } else {
       const tomlEntry = `
 [mcp_servers.remem-mcp]
@@ -8394,17 +8509,10 @@ args = ["-y", "remem-mcp"]
 REMEM_GLOBAL_SESSION_KEY = "global"
 `;
       writeFileSync7(codexConfig, content + tomlEntry, "utf-8");
-      console.log("  Codex CLI: MCP server registered.");
-      count++;
+      names.push("Codex CLI");
     }
   }
-  if (count === 0) {
-    console.log("  No agent config files found. MCP server will need manual setup.");
-    console.log("  See README for manual config instructions.");
-  } else {
-    console.log(`
-MCP server registered in ${count} agent config(s).`);
-  }
+  console.log(`MCP server: ${names.join(", ")}`);
 }
 
 // src/install-skill.ts
@@ -8412,11 +8520,16 @@ init_esm_shims();
 import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "fs";
 import { homedir as homedir10 } from "os";
 import { dirname as dirname8, join as join13 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
+function moduleDir() {
+  return typeof __dirname !== "undefined" ? __dirname : dirname8(fileURLToPath4(import.meta.url));
+}
 function loadSkillContent() {
+  const here = moduleDir();
   const candidates = [
     join13(process.cwd(), "skills", "remem-mcp", "SKILL.md"),
-    join13(__dirname, "..", "skills", "remem-mcp", "SKILL.md"),
-    join13(__dirname, "skills", "remem-mcp", "SKILL.md")
+    join13(here, "..", "skills", "remem-mcp", "SKILL.md"),
+    join13(here, "skills", "remem-mcp", "SKILL.md")
   ];
   for (const path of candidates) {
     try {
@@ -8428,48 +8541,42 @@ function loadSkillContent() {
     "Could not find skills/remem-mcp/SKILL.md. Make sure the package includes the skills directory."
   );
 }
-var SKILL_TARGETS = [
-  {
-    name: "Devin CLI",
-    path: join13(homedir10(), ".config", "devin", "skills", "remem-mcp", "SKILL.md")
-  },
-  {
-    name: "Claude Code",
-    path: join13(homedir10(), ".claude", "skills", "remem-mcp", "SKILL.md")
-  },
-  {
-    name: "Codex CLI",
-    path: join13(homedir10(), ".codex", "skills", "remem-mcp", "SKILL.md")
-  },
-  {
-    name: "Generic (.agents)",
-    path: join13(homedir10(), ".agents", "skills", "remem-mcp", "SKILL.md")
-  }
-];
+function skillTargets() {
+  return [
+    {
+      name: "Devin CLI",
+      path: join13(homedir10(), ".config", "devin", "skills", "remem-mcp", "SKILL.md")
+    },
+    {
+      name: "Claude Code",
+      path: join13(homedir10(), ".claude", "skills", "remem-mcp", "SKILL.md")
+    },
+    {
+      name: "Codex CLI",
+      path: join13(homedir10(), ".codex", "skills", "remem-mcp", "SKILL.md")
+    },
+    {
+      name: "ZCode",
+      path: join13(homedir10(), ".zcode", "skills", "remem-mcp", "SKILL.md")
+    },
+    {
+      name: "Generic (.agents)",
+      path: join13(homedir10(), ".agents", "skills", "remem-mcp", "SKILL.md")
+    }
+  ];
+}
 async function installSkill() {
   const skillContent = loadSkillContent();
-  let installed = 0;
-  for (const target of SKILL_TARGETS) {
+  const names = [];
+  for (const target of skillTargets()) {
     const dir = dirname8(target.path);
     if (!existsSync12(dir)) {
       mkdirSync8(dir, { recursive: true });
     }
-    if (existsSync12(target.path)) {
-      console.log(`  ${target.name}: Already installed. Updated.`);
-    } else {
-      console.log(`  ${target.name}: Installed.`);
-    }
     writeFileSync8(target.path, skillContent, "utf-8");
-    installed++;
+    names.push(target.name);
   }
-  console.log(`
-Skill installed to ${installed} location(s).`);
-  console.log("Restart your agent to load the skill.");
-  console.log("\nThe skill teaches your agent to:");
-  console.log("  - Recall past context before answering");
-  console.log("  - Capture decisions, learnings, and fixes after completing work");
-  console.log("  - Search with filters when recall is too broad");
-  console.log("  - Forget only on explicit user request");
+  console.log(`Skill: ${names.join(", ")}`);
 }
 
 // src/pipeline/mermaid.ts
@@ -8694,7 +8801,7 @@ function extractDescription(content) {
 
 // src/security/audit.ts
 init_esm_shims();
-import { createHash as createHash4 } from "crypto";
+import { createHash as createHash7 } from "crypto";
 import { appendFileSync as appendFileSync3, existsSync as existsSync13, mkdirSync as mkdirSync9 } from "fs";
 import { dirname as dirname9 } from "path";
 var AuditLogger = class {
@@ -8726,7 +8833,7 @@ var AuditLogger = class {
   /** Hash the arguments for the audit log. The log does not store raw arguments. */
   static hashArgs(args) {
     const json = JSON.stringify(args);
-    return createHash4("sha256").update(json).digest("hex");
+    return createHash7("sha256").update(json).digest("hex");
   }
 };
 
@@ -8734,7 +8841,7 @@ var AuditLogger = class {
 init_esm_shims();
 init_engine();
 import { execSync as execSync3 } from "child_process";
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash8 } from "crypto";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import {
   CallToolRequestSchema,
@@ -8801,7 +8908,7 @@ var indexingStatus = /* @__PURE__ */ new Map();
 function defaultSessionKey() {
   if (process.env.REMEM_SESSION_KEY) return process.env.REMEM_SESSION_KEY;
   const cwd = process.cwd();
-  return createHash5("sha256").update(cwd).digest("hex").slice(0, 16);
+  return createHash8("sha256").update(cwd).digest("hex").slice(0, 16);
 }
 function globalSessionKey() {
   return process.env.REMEM_GLOBAL_SESSION_KEY ?? null;
@@ -8909,7 +9016,7 @@ var TOOLS = [
   },
   {
     name: "capture",
-    description: `Store a decision, a learning, or a task outcome to memory. Call this tool after you complete a non-trivial task, make a decision, or fix a bug with a known root cause. You can capture a single text string, or a list of role-based conversation messages. To store cross-project knowledge (rules, conventions, learnings reusable across projects), pass session_key="global" or auto_global=true \u2014 these appear in every project's recall automatically.`,
+    description: 'Store a decision, a learning, or a task outcome to memory. Call this tool after you complete a non-trivial task, make a decision, or fix a bug with a known root cause. You can capture a single text string, or a list of role-based conversation messages. Captures are project-local by default. Write to global memory ONLY when the user explicitly asks to remember something across projects/globally; then pass session_key="global".',
     inputSchema: {
       type: "object",
       properties: {
@@ -8944,7 +9051,7 @@ var TOOLS = [
         tags: { type: "array", items: { type: "string" }, description: "Optional tags." },
         session_key: {
           type: "string",
-          description: "The session key. The default is hash(cwd). Use 'global' to store cross-project knowledge (rules, conventions, learnings) that should appear in every project's recall."
+          description: "The session key. The default is hash(cwd). Use 'global' to store cross-project knowledge (rules, conventions, learnings), but ONLY when the user explicitly asks to save it globally."
         },
         metadata: { type: "object", description: "Optional metadata." },
         verified: {
@@ -8968,7 +9075,7 @@ var TOOLS = [
         auto_global: {
           type: "boolean",
           default: false,
-          description: "Set to true to auto-classify: generic rules/learnings go to global, project-specific content stays in project. Only applies when session_key is not explicitly set. Requires REMEM_GLOBAL_SESSION_KEY to be configured."
+          description: "Compatibility option for explicit global routing. Prefer session_key='global' and use this only when the user explicitly asks for cross-project classification. Requires REMEM_GLOBAL_SESSION_KEY."
         },
         atoms: {
           type: "array",
@@ -9350,6 +9457,10 @@ var TOOLS = [
           items: { type: "string" },
           description: "Optional tags for categorization (e.g., ['database', 'migration'])."
         },
+        session_key: {
+          type: "string",
+          description: "The session key. Defaults to hash(cwd) so the scenario is scoped to the current project."
+        },
         ...TENANT_PARAMS
       },
       required: ["atom_ids", "summary"]
@@ -9568,6 +9679,27 @@ var TOOLS = [
       }
     }
   },
+  {
+    name: "codegraph_entry_points",
+    description: "Find entry points in the codebase \u2014 main functions, HTTP handlers, CLI commands, event handlers. An entry point is called by external infrastructure (HTTP server, CLI framework, event loop) rather than by other code. Inspired by codegraph-ai's find_entry_points.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        repo_path: {
+          type: "string",
+          description: "The repository root path (absolute)."
+        },
+        team_id: { type: "string", description: "The team ID for isolation." },
+        limit: {
+          type: "integer",
+          default: 100,
+          maximum: 500,
+          description: "Maximum number of entry points to return."
+        }
+      },
+      required: ["repo_path"]
+    }
+  },
   // ─── Wiki tools ───
   {
     name: "wiki_ingest",
@@ -10115,6 +10247,8 @@ function createServer(opts) {
         return handleCodegraphDetectChanges(args, opts);
       case "codegraph_stats":
         return handleCodegraphStats(args, opts);
+      case "codegraph_entry_points":
+        return handleCodegraphEntryPoints(args, opts);
       case "wiki_ingest":
         return handleWikiIngest(args, opts);
       case "wiki_search":
@@ -10313,6 +10447,7 @@ ${wikiLines.join("\n")}`;
       teamId,
       agentId,
       userId,
+      sessionKey,
       limit: 3
     });
     if (scenarios.length > 0) {
@@ -10419,7 +10554,7 @@ async function handleCapture(args, opts) {
     };
   }
   const { text: redactedContent, redacted: wasRedacted } = opts.redactSecrets ? redact(content) : { text: content, redacted: false };
-  const contentHash = createHash5("sha256").update(redactedContent).digest("hex");
+  const contentHash = createHash8("sha256").update(redactedContent).digest("hex");
   if (!overrideRejection) {
     const rejected = await opts.storage.findRejectedByContentHash(contentHash, sessionKey, agentId);
     if (rejected.length > 0) {
@@ -11193,7 +11328,7 @@ async function handleUpdate(args, opts) {
   const newTags = args.tags ? JSON.stringify(args.tags) : row.tags;
   const newType = args.type ?? row.type;
   const newTrust = args.verified ? "verified" : row.trust_state;
-  const contentHash = createHash5("sha256").update(newContent).digest("hex");
+  const contentHash = createHash8("sha256").update(newContent).digest("hex");
   db.prepare(
     "UPDATE captures SET content = ?, tags = ?, type = ?, trust_state = ?, content_hash = ? WHERE id = ?"
   ).run(newContent, newTags, newType, newTrust, contentHash, id);
@@ -11948,7 +12083,7 @@ async function handleHandoff(args, opts) {
     };
   }
   const dedupPayload = JSON.stringify({ task, status: status2, progress, decisions, files, nextSteps });
-  const contentHash = createHash5("sha256").update(dedupPayload).digest("hex");
+  const contentHash = createHash8("sha256").update(dedupPayload).digest("hex");
   let existing = [];
   try {
     existing = await opts.storage.findByContentHash(contentHash, sessionKey);
@@ -12063,7 +12198,7 @@ async function handleAdr(args, opts) {
     };
   }
   const dedupPayload = JSON.stringify({ title, context, decision, alternatives, consequences });
-  const contentHash = createHash5("sha256").update(dedupPayload).digest("hex");
+  const contentHash = createHash8("sha256").update(dedupPayload).digest("hex");
   let existing = [];
   try {
     existing = await opts.storage.findByContentHash(contentHash, sessionKey);
@@ -12218,6 +12353,7 @@ async function handleScenarioConsolidate(args, opts) {
   const personaTags = args.persona_tags;
   const { teamId, userId, taskId } = extractTenant(args);
   const agentId = args.agent_id ?? detectAgentId();
+  const sessionKey = args.session_key ?? defaultSessionKey();
   if (!atomIds || atomIds.length === 0) {
     return { content: [{ type: "text", text: "Error: atom_ids is required." }], isError: true };
   }
@@ -12242,7 +12378,8 @@ async function handleScenarioConsolidate(args, opts) {
     createdAt: Date.now(),
     teamId,
     agentId,
-    userId
+    userId,
+    sessionKey
   };
   try {
     await opts.storage.putScenario(scenario);
@@ -12270,6 +12407,7 @@ async function handlePersonaUpdate(args, opts) {
   const value = args.value;
   const { teamId, userId } = extractTenant(args);
   const agentId = args.agent_id ?? detectAgentId();
+  const sessionKey = args.session_key ?? defaultSessionKey();
   if (!trait || !value) {
     return {
       content: [{ type: "text", text: "Error: trait and value are required." }],
@@ -12278,7 +12416,7 @@ async function handlePersonaUpdate(args, opts) {
   }
   const tid = teamId ?? "default";
   const uid = userId ?? "default";
-  const existing = await opts.storage.readPersona(tid, agentId, uid);
+  const existing = await opts.storage.readPersona(tid, agentId, uid, sessionKey);
   let content;
   if (existing) {
     const lines = existing.content.split("\n").filter((l) => l.trim());
@@ -12294,7 +12432,7 @@ async function handlePersonaUpdate(args, opts) {
     content = `${trait}: ${value}`;
   }
   try {
-    await opts.storage.writePersona(tid, agentId, uid, content);
+    await opts.storage.writePersona(tid, agentId, uid, content, sessionKey);
   } catch (err) {
     return { content: [{ type: "text", text: `Error: ${err}` }], isError: true };
   }
@@ -12726,6 +12864,31 @@ function handleCodegraphStats(args, opts) {
     content: [{ type: "text", text: lines.join("\n") }]
   };
 }
+function handleCodegraphEntryPoints(args, opts) {
+  const repoPath = args.repo_path;
+  const teamId = args.team_id ?? void 0;
+  const limit = args.limit ?? 100;
+  if (!repoPath) {
+    return { content: [{ type: "text", text: "Error: repo_path is required." }], isError: true };
+  }
+  const db = getDb(opts);
+  const entryPoints = findEntryPoints(db, { repoPath, teamId, limit });
+  if (entryPoints.length === 0) {
+    return { content: [{ type: "text", text: "No entry points found. Run codegraph_index first." }] };
+  }
+  const lines = entryPoints.map(
+    (s) => `${s.id}  ${s.kind.padEnd(10)}  L${s.lineStart}-${s.lineEnd}  ${s.name}  at  ${s.filePath}`
+  );
+  return {
+    content: [
+      {
+        type: "text",
+        text: `Found ${entryPoints.length} entry point(s) in ${repoPath}:
+${lines.join("\n")}`
+      }
+    ]
+  };
+}
 async function handleWikiIngest(args, opts) {
   const path = args.path;
   const repoPath = args.repo_path ?? path;
@@ -15012,7 +15175,7 @@ function openDbWithSchema(dbPath) {
   sqliteVec4.load(db);
   const hasSymbols = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='symbols'").get();
   if (!hasSymbols) {
-    const distDir = dirname10(fileURLToPath4(import.meta.url));
+    const distDir = dirname10(fileURLToPath5(import.meta.url));
     const candidates = [
       join16(distDir, "storage", "schema.sql"),
       join16(distDir, "schema.sql"),
@@ -15365,14 +15528,26 @@ After that, the agent follows the rules automatically.`);
     await installHooks();
     return;
   }
+  if (arg === "guide") {
+    console.log(`
+remem-mcp quick guide
+
+  Step 1  Restart your agent (quit and reopen)
+  Step 2  Ask: "what do you remember?"
+  Step 3  If agent recalls past context = memory working
+
+  In your agent, you can say:
+    "index the code in src"         \u2192 CodeGraph indexes symbols
+    "find who calls function X"     \u2192 caller analysis
+    "what do you remember?"         \u2192 recall past context
+`);
+    return;
+  }
   if (arg === "setup") {
     console.log("remem-mcp setup\n");
     await installMcpServer();
-    console.log("");
     await installHooks();
-    console.log("");
     await installSkill();
-    console.log("\nCapturing project basics...");
     const { Memory: Memory2 } = await import("./sdk.js");
     const mem = new Memory2();
     let captured = 0;
@@ -15427,19 +15602,16 @@ After that, the agent follows the rules automatically.`);
       if (id) captured++;
     }
     if (captured > 0) {
-      console.log(`  Captured ${captured} project basics.`);
-    } else {
-      const hasProjectFiles = existsSync16(join16(process.cwd(), "package.json")) || existsSync16(join16(process.cwd(), "Cargo.toml")) || existsSync16(join16(process.cwd(), "go.mod")) || existsSync16(join16(process.cwd(), "pyproject.toml"));
-      if (hasProjectFiles) {
-        console.log("  Project basics already captured (no changes since last setup).");
-      } else {
-        console.log("  No project files detected. Skipping bootstrap.");
-      }
-    }
-    console.log("\n\u2713 Done. Restart your agent.");
-    console.log("  Hooks auto-recall on start, auto-capture errors, auto-save on exit.");
-    console.log("  Skill teaches agent to use codegraph_search instead of grep.");
-    console.log("  `npx remem-mcp status` to see memory.");
+      console.log(`Project basics: ${captured} captured`);
+    }
+    console.log("\n\u2713 Setup complete.\n");
+    console.log("  Step 1  Restart your agent (quit and reopen)");
+    console.log('  Step 2  Ask: "what do you remember?"');
+    console.log("  Step 3  If agent recalls past context = memory working\n");
+    console.log("  In your agent, you can say:");
+    console.log('    "index the code in src"         \u2192 CodeGraph indexes symbols');
+    console.log('    "find who calls function X"     \u2192 caller analysis');
+    console.log('    "what do you remember?"         \u2192 recall past context');
     return;
   }
   if (arg === "uninstall-hooks") {
@@ -15498,7 +15670,7 @@ ${rows.length} capture(s).`);
          FROM captures WHERE deleted_at IS NULL
          GROUP BY session_key ORDER BY cnt DESC`
     ).all();
-    const cwdHash = createHash6("sha256").update(process.cwd()).digest("hex").slice(0, 16);
+    const cwdHash = createHash9("sha256").update(process.cwd()).digest("hex").slice(0, 16);
     const globalKey = process.env.REMEM_GLOBAL_SESSION_KEY ?? "global";
     if (rows.length === 0) {
       console.log("No sessions found.");
@@ -15822,7 +15994,7 @@ ${sorted.length} unique tag(s).`);
     return;
   }
   if (arg === "proxy") {
-    const { loadProxyConfig, startProxyServer } = await import("./server-5PWQTRGZ.js");
+    const { loadProxyConfig, startProxyServer } = await import("./server-MYSF7R5Y.js");
     const proxyConfig = loadProxyConfig();
     if (!proxyConfig.dbPath) {
       proxyConfig.dbPath = defaultDbPath3();
@@ -15852,7 +16024,11 @@ ${sorted.length} unique tag(s).`);
         teamId: row.team_id ?? "default",
         agentId: row.agent_id ?? "default"
       };
-      const ctx = { storage: storage2, embedder: new LocalEmbedder(), sessionKey: "default" };
+      const ctx = {
+        storage: storage2,
+        embedder: new LocalEmbedder(),
+        sessionKey: "default"
+      };
       const result = await pipeline2.process(input, ctx);
       if (Object.keys(result).length > 0) extracted++;
     }
@@ -16096,7 +16272,7 @@ ${sorted.length} unique tag(s).`);
   }
   if (arg === "version" || arg === "--version" || arg === "-v") {
     try {
-      const pkgPath = join16(dirname10(fileURLToPath4(import.meta.url)), "..", "package.json");
+      const pkgPath = join16(dirname10(fileURLToPath5(import.meta.url)), "..", "package.json");
       const pkg = JSON.parse(readFileSync13(pkgPath, "utf-8"));
       console.log(`remem-mcp v${pkg.version}`);
     } catch {
@@ -16110,6 +16286,7 @@ ${sorted.length} unique tag(s).`);
 
 Getting started:
   remem-mcp setup          One-command install (MCP + hooks + skill)
+  remem-mcp guide          Quick start guide (what to do after setup)
   remem-mcp demo           Error learning loop demo (15s)
   remem-mcp demo-codegraph Live CodeGraph demo on facebook/react
   remem-mcp status         One dashboard: health + all 3 loops + recent
@@ -16127,6 +16304,7 @@ Daily use:
 `);
     if (!showAll) {
       console.log(`The server runs as a stdio process. Add it to your MCP client:
+  ZCode:       ~/.zcode/cli/config.json (mcp.servers)
   Claude Code: ~/.claude.json
   Cursor:      ~/.cursor/mcp.json
   Devin CLI:   devin mcp add remem-mcp -- npx -y remem-mcp
@@ -16140,7 +16318,7 @@ Setup & maintenance:
   remem-mcp                Start the MCP server (stdio)
   remem-mcp setup          Install MCP + hooks + skill (one command)
   remem-mcp init           Show how to activate memory in your agent session
-  remem-mcp install-skill  Install the agent skill for Devin CLI
+  remem-mcp install-skill  Install the agent skill (ZCode, Claude Code, Devin, Codex)
   remem-mcp install-hooks  Install lifecycle hooks (SessionStart, Stop, SessionEnd)
   remem-mcp uninstall-hooks  Remove lifecycle hooks
   remem-mcp hook-post-commit  Auto-index changed files (git post-commit hook)
@@ -16237,27 +16415,28 @@ Common flags for L1-L3 and knowledge/skills commands:
   --type <type>        Filter by type (for knowledge: wiki, code-graph)
 
 The server runs as a stdio process. Add it to your MCP client configuration:
+  ZCode:       ~/.zcode/cli/config.json (mcp.servers)
   Claude Code: ~/.claude.json
   Cursor:      ~/.cursor/mcp.json
   Devin CLI:   devin mcp add remem-mcp -- npx -y remem-mcp
 
-To install the skill (Devin CLI only):
+To install the skill:
   npx remem-mcp install-skill
 `);
     return;
   }
   const config = loadConfig();
-  try {
-    importArtifact(config.dbPath, process.cwd());
-  } catch (err) {
-    console.error(`[remem-mcp] Auto-import failed: ${err}`);
-  }
   if (config.storage !== "sqlite") {
     console.error(
       `[remem-mcp] Storage backend "${config.storage}" is not implemented yet. Using sqlite.`
     );
   }
   const storage = new SQLiteBackend(config.dbPath);
+  try {
+    importArtifact(config.dbPath, process.cwd());
+  } catch (err) {
+    console.error(`[remem-mcp] Auto-import failed: ${err}`);
+  }
   const embedder = new LocalEmbedder();
   let pipeline;
   if (config.pipeline === "atom" && config.llm) {