@mingxy/cerebro-claude-code 0.3.7 → 0.3.9

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "cerebro",
   "description": "Persistent memory for Claude Code — memories survive across sessions, projects, and machines",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "author": {
     "name": "mingxy-cerebro",
     "email": "hi@cerebro.dev"

package/.mcp.json

@@ -4,7 +4,8 @@
     "args": ["-y", "@mingxy/cerebro-mcp@latest"],
     "env": {
       "OMEM_API_KEY": "${OMEM_API_KEY}",
-      "OMEM_API_URL": "${OMEM_API_URL:-https://www.mengxy.cc}"
+      "OMEM_API_URL": "${OMEM_API_URL:-https://www.mengxy.cc}",
+      "OMEM_DISABLE_STORE": "1"
     }
   }
 }

package/hooks/apply-dream.mjs

@@ -5,6 +5,8 @@
 //   unknown kept name → surfaced as `unknown`, NEVER silently dropped (that is memory evaporation)
 //   dropped → removal candidate, listed for review; applied only with --apply
 //   merged/updated/added → LLM version wins (content is allowed to change there)
+//     except: added onto an existing local file is a conflict (LLM relabeled an
+//     existing memory as new) — skipped and surfaced, never blindly overwrites
 //   stats.total still counts kept entries — the ledger is the server's, not ours to re-derive
 //
 // Read-only review by default (prints the diff); `--apply` writes after user approval.
@@ -88,6 +90,7 @@ let entries = JSON.parse(readFileSync(archivePath, "utf8")).entries || [];
 // ─── merge ────────────────────────────────────────────────────────────────────
 const unknown = [];   // kept names missing from the old archive — LLM renamed, memory at risk
 const empty = [];     // content actions with empty body+description — never written, surfaced
+const conflict = [];  // added but a local file with that name exists — LLM rewrite mislabeled as new
 const report = { keep: 0, write: [], drop: [], dropCount: 0 };
 for (let e of entries) {
   // normalize BEFORE any branch: an LLM-emitted Chinese name that the MEMORY.md
@@ -105,6 +108,11 @@ for (let e of entries) {
     // 60-byte frontmatter shell. merged/updated skip = old content survives;
     // added skip = surfaced below, not silently dropped.
     if (!(e.body || "").trim() && !(e.description || "").trim()) { empty.push(`${e.name} (${act})`); continue; }
+    // added onto an existing local file = the LLM relabeled a rewrite as new
+    // (deepseek tic, cf. the 2026-08-20 archive where 6 existing entries came
+    // back as added with condensed bodies and zero new info). Its content
+    // would trade a hand-written file for a stub — skip, surface, human decides.
+    if (act === "added" && oldFiles.has(e.name)) { conflict.push(e.name); continue; }
     report.write.push(e); // LLM content is authoritative for these actions
   } else {
     unknown.push(`${e.name} (action=${act || "?"})`);
@@ -114,15 +122,17 @@ for (let e of entries) {
 // ─── review output ────────────────────────────────────────────────────────────
 const lines = [
   `apply-dream review · archive ${archivePath}`,
-  `kept ${report.keep} / write ${report.write.length} / drop ${report.dropCount} / unknown ${unknown.length}`,
+  `kept ${report.keep} / write ${report.write.length} / drop ${report.dropCount} / unknown ${unknown.length} / conflict ${conflict.length}`,
 ];
 for (const e of report.write) lines.push(`  ${e.source || e.action}  ${e.name} — ${(e.description || "").slice(0, 60)}`);
 for (const n of report.drop) lines.push(`  drop  ${n}`);
 for (const n of unknown) lines.push(`  ?     ${n}  ← surfaced, not dropped`);
 for (const n of empty) lines.push(`  ~     ${n}  ← empty stub skipped, not written`);
+for (const n of conflict) lines.push(`  !     ${n}  ← added but exists locally, skipped — review manually`);
 if (orphanFiles.length) lines.push(`  (unparsed old files left untouched: ${orphanFiles.length})`);
 console.log(lines.join("\n"));
 if (unknown.length) console.log("\n⚠ URGENT: unknown kept names above — surface to the user BEFORE applying; they may be renames the LLM invented.");
+if (conflict.length) console.log("\n⚠ CONFLICT: added-but-exists above — old file kept, dream content discarded; merge by hand if the dream version carries new info.");
 if (!APPLY) { console.log("\ndry run — pass --apply to write"); process.exit(0); }
 
 // ─── write phase (--apply) ─────────────────────────────────────────────────────

package/hooks/common.mjs

@@ -26,6 +26,7 @@ const DEF = {
   requestTimeout: 15,
   recentCount: 8,
   searchCount: 8,
+  globalCount: 3,
   maxContent: 3000,
   maxQueryLength: 200,
   logDir: join(HOME, ".config/cerebro/logs"),
@@ -75,6 +76,7 @@ function loadConfig() {
     requestTimeout: num("MEM_REQUEST_TIMEOUT", c.requestTimeoutMs ? c.requestTimeoutMs / 1000 : null, DEF.requestTimeout),
     recentCount: num("MEM_RECENT_COUNT", i.recentCount, DEF.recentCount),
     searchCount: num("MEM_SEARCH_COUNT", i.searchCount, DEF.searchCount),
+    globalCount: num("MEM_GLOBAL_COUNT", i.globalCount, DEF.globalCount),
     maxContent: num("MEM_MAX_CONTENT", ct.maxContentLength || ct.maxContentChars, DEF.maxContent),
     maxQueryLength: num("MEM_MAX_QUERY_LENGTH", ct.maxQueryLength, DEF.maxQueryLength),
     logDir: (process.env.MEM_LOG_DIR || lg.logDir || DEF.logDir).replace(/^~/, HOME),
@@ -499,7 +501,7 @@ export async function flushSessionIngest(transcriptPath, sessionId, timeoutSec =
   const agentId = process.env.OMEM_AGENT_ID || "claude-code";
 
   if (messages.length > 0) {
-    const body = { messages, agent_id: agentId };
+    const body = { messages, agent_id: agentId, home_path: HOME };
     if (sessionId) body.session_id = sessionId;
     if (pn) body.project_name = pn;
     if (pp) body.project_path = pp;
@@ -570,12 +572,13 @@ export function truncateAtBoundary(text, maxLength) {
 }
 
 // GET /v1/memories/search — 单路语义搜索
-export async function searchMemories(query, limit, projectPath) {
+export async function searchMemories(query, limit, projectPath, excludeGlobal) {
   limit = limit || config.searchCount;
   const safeQ = truncateQuery(query);
   if (!safeQ) return [];
   const params = new URLSearchParams({ q: safeQ, limit: String(limit) });
   if (projectPath) params.set("project_path", projectPath);
+  if (excludeGlobal) params.set("exclude_global", "1");
   try {
     const resp = await fetch(`${config.apiUrl}/v1/memories/search?${params}`, {
       headers: { "X-API-Key": config.apiKey, Accept: "application/json" },
@@ -589,18 +592,23 @@ export async function searchMemories(query, limit, projectPath) {
 }
 
 // buildMemoryInjection — 对标 opencode hooks.ts:246-329
-// 三路并发：profile + recent + search(query)。query 为空跳过 search。
+// 四路并发：profile + global + recent + search(query)。query 为空跳过 search。
+// 拍板（issue #3）：项目 recent/search 路带 exclude_global（专区已单列，项目路不混全局）；
+// 全局专区 globalCount 条（SessionStart q 为空，走 list 按时间取最新全局记忆）。
 export async function buildMemoryInjection(query, projectPath, options = {}) {
   const profileEnabled = options.profileEnabled !== false;
   const recentEnabled = options.recentEnabled !== false;
+  const globalEnabled = options.globalEnabled !== false;
   const hdrs = { "X-API-Key": config.apiKey, Accept: "application/json" };
   const recentCount = config.recentCount;
   const searchCount = config.searchCount;
+  const globalCount = config.globalCount;
   const profileQs = projectPath ? `?project_path=${encodeURIComponent(projectPath)}` : "";
-  const recentQs = `?limit=${recentCount}&offset=0&sort=updated_at&order=desc${projectPath ? `&project_path=${encodeURIComponent(projectPath)}` : ""}`;
+  const recentQs = `?limit=${recentCount}&offset=0&sort=updated_at&order=desc&exclude_global=1${projectPath ? `&project_path=${encodeURIComponent(projectPath)}` : ""}`;
+  const globalQs = `?limit=${globalCount}&offset=0&sort=updated_at&order=desc&global_only=1`;
   const safeQ = truncateQuery(query);
 
-  const [profileResp, recentResp, searchResp] = await Promise.all([
+  const [profileResp, recentResp, globalResp, searchResp] = await Promise.all([
     profileEnabled
       ? fetch(`${config.apiUrl}/v2/profile/inject${profileQs}`, { headers: hdrs, signal: AbortSignal.timeout(config.profileTimeoutMs) })
         .then((r) => r.text()).catch(() => "")
@@ -609,8 +617,12 @@ export async function buildMemoryInjection(query, projectPath, options = {}) {
       ? fetch(`${config.apiUrl}/v1/memories${recentQs}`, { headers: hdrs, signal: AbortSignal.timeout(config.recentTimeoutMs) })
         .then((r) => (r.ok ? r.text() : null)).catch(() => null)
       : Promise.resolve(""),
+    globalEnabled
+      ? fetch(`${config.apiUrl}/v1/memories${globalQs}`, { headers: hdrs, signal: AbortSignal.timeout(config.recentTimeoutMs) })
+        .then((r) => (r.ok ? r.text() : null)).catch(() => null)
+      : Promise.resolve(""),
     safeQ
-      ? fetch(`${config.apiUrl}/v1/memories/search?q=${encodeURIComponent(safeQ)}&limit=${searchCount}${projectPath ? `&project_path=${encodeURIComponent(projectPath)}` : ""}`, { headers: hdrs, signal: AbortSignal.timeout(5000) })
+      ? fetch(`${config.apiUrl}/v1/memories/search?q=${encodeURIComponent(safeQ)}&limit=${searchCount}&exclude_global=1${projectPath ? `&project_path=${encodeURIComponent(projectPath)}` : ""}`, { headers: hdrs, signal: AbortSignal.timeout(5000) })
         .then((r) => r.text()).catch(() => "")
       : Promise.resolve(""),
   ]);
@@ -634,6 +646,13 @@ export async function buildMemoryInjection(query, projectPath, options = {}) {
     } catch {}
   }
 
+  // parse global (最新全局记忆，跨项目)
+  let globalMemories = [];
+  try {
+    const gd = JSON.parse(globalResp);
+    if (gd && !gd.error) globalMemories = gd.memories || [];
+  } catch {}
+
   // parse search
   let searchResults = [];
   try {
@@ -650,6 +669,16 @@ export async function buildMemoryInjection(query, projectPath, options = {}) {
   }
 
   const seenIds = new Set();
+  if (globalMemories.length > 0) {
+    sections.push("## Global Memories");
+    for (const m of globalMemories) {
+      if (m.id) seenIds.add(m.id);
+      const age = formatRelativeAge(m.updated_at || m.created_at);
+      sections.push(`- (${age}) ${m.content || ""}`);
+    }
+    sections.push("");
+  }
+
   if (projectMemories.length > 0) {
     sections.push("## Recent Project Activity");
     for (const m of projectMemories) {
@@ -682,6 +711,7 @@ export async function buildMemoryInjection(query, projectPath, options = {}) {
   return {
     text,
     profileCount: profileContent ? 1 : 0,
+    globalCount: globalMemories.length,
     projectMemoryCount: projectMemories.length,
     searchCount: dedupedResults.length,
     recentFailed,

package/hooks/session-start.mjs

@@ -158,9 +158,9 @@ if (startSource === "clear") {
 await postRecallEvent({
   sessionId: sid,
   recallType: "session_start",
-  queryText: `Session Start · ${injection.projectMemoryCount} memories · ${injection.profileCount > 0 ? "profile" : "no profile"}`,
+  queryText: `Session Start · ${injection.globalCount} global · ${injection.projectMemoryCount} project · ${injection.profileCount > 0 ? "profile" : "no profile"}`,
   profileInjected: injection.profileCount > 0,
-  keptCount: injection.projectMemoryCount,
+  keptCount: injection.globalCount + injection.projectMemoryCount,
   injectedContent: out,
   failureReason: injection.recentFailed ? "recent fetch failed/timeout" : "",
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mingxy/cerebro-claude-code",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "Persistent memory for Claude Code — memories survive across sessions, projects, and machines",
   "author": {
     "name": "mingxy-cerebro",

package/tests/hooks.test.mjs

@@ -3,6 +3,8 @@ import assert from "node:assert/strict";
 import { spawn } from "node:child_process";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 
 const HOOKS_DIR = join(dirname(fileURLToPath(import.meta.url)), "..", "hooks");
 
@@ -109,3 +111,38 @@ describe("session-end.mjs", () => {
     assert.deepEqual(out, {});
   });
 });
+
+describe("apply-dream.mjs", () => {
+  test("added onto existing local file is a conflict, not an overwrite", async () => {
+    const tmp = mkdtempSync(join(tmpdir(), "apply-dream-"));
+    try {
+      const memDir = join(tmp, "memory");
+      mkdirSync(memDir);
+      const existing = "---\nname: cc-x\ndescription: hand-written\nmetadata:\n  type: feedback\n---\n\nprecise body\n";
+      writeFileSync(join(memDir, "cc-x.md"), existing);
+      writeFileSync(join(memDir, "MEMORY.md"), "- [cc-x](cc-x.md) — hand-written\n");
+      const outDir = join(tmp, "dream", "output");
+      mkdirSync(outDir, { recursive: true });
+      writeFileSync(join(outDir, "20260820.json"), JSON.stringify({ entries: [
+        { name: "cc-x", action: "added", body: "condensed stub rewrite" }, // mislabeled rewrite
+        { name: "cc-new", action: "added", body: "genuinely new" },        // real addition
+      ] }));
+
+      const res = await new Promise((resolve) => {
+        const child = spawn(process.execPath, [join(HOOKS_DIR, "apply-dream.mjs"), "--apply"], {
+          env: { ...process.env, OMEM_DREAM_DIR: join(tmp, "dream"), OMEM_DREAM_MEMORY_DIR: memDir },
+        });
+        let stdout = "";
+        child.stdout.on("data", (d) => (stdout += d));
+        child.on("close", (code) => resolve({ stdout, code }));
+      });
+
+      assert.ok(res.stdout.includes("conflict 1"), `expected one conflict, got: ${res.stdout}`);
+      assert.ok(res.stdout.includes("!     cc-x"), "conflicting name must be listed");
+      assert.equal(readFileSync(join(memDir, "cc-x.md"), "utf8"), existing, "existing file must stay untouched");
+      assert.ok(readFileSync(join(memDir, "cc-new.md"), "utf8").includes("genuinely new"), "genuinely new entry must be written");
+    } finally {
+      rmSync(tmp, { recursive: true, force: true });
+    }
+  });
+});