@mingxy/cerebro-claude-code 0.3.10 → 0.3.12

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.10",
+  "version": "0.3.12",
   "author": {
     "name": "mingxy-cerebro",
     "email": "hi@cerebro.dev"

package/hooks/common.mjs

@@ -2,7 +2,7 @@
 // Ported from common.sh — no bash/curl/python3 dependency. Pure Node.
 // Config cascade: env > ~/.config/cerebro/config.json > builtin defaults
 import { createHash } from "node:crypto";
-import { readFileSync, writeFileSync, existsSync, mkdirSync, appendFileSync, unlinkSync, copyFileSync } from "node:fs";
+import { readFileSync, writeFileSync, existsSync, mkdirSync, appendFileSync, unlinkSync, copyFileSync, readdirSync } from "node:fs";
 import { join, dirname, resolve } from "node:path";
 import { execSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
@@ -33,6 +33,7 @@ const DEF = {
   logEnabled: true,
   profileTimeoutMs: 2000,
   recentTimeoutMs: 6000,
+  webGraceMs: 60000,
 };
 
 // ─── Config cascade ──────────────────────────────────────────────────────────
@@ -62,6 +63,7 @@ function loadConfig() {
   const i = cfg.injection || {};
   const ct = cfg.content || {};
   const lg = cfg.logging || {};
+  const w = cfg.web || {};
 
   const num = (env, cfgVal, def) => {
     const v = process.env[env];
@@ -87,6 +89,7 @@ function loadConfig() {
         : DEF.logEnabled,
     profileTimeoutMs: i.profileTimeoutMs || DEF.profileTimeoutMs,
     recentTimeoutMs: i.recentTimeoutMs || DEF.recentTimeoutMs,
+    webGraceMs: num("OMEM_WEB_GRACE_MS", w.graceMs, DEF.webGraceMs),
   };
 }
 
@@ -220,31 +223,74 @@ function _log(level, msg) {
   } catch {}
 }
 
-// ─── Web server refcount (multi-session lifecycle) ───────────────────────────
-const REFCOUNT_FILE = join(HOME, ".config/cerebro/web-server.refcount");
+// ─── Web server liveness (truth = OS process table) ──────────────────────────
+// Refcount bookkeeping leaked to 169 and never hit zero — counting events is
+// unreliable (killed terminals never decrement). Instead: each CC session
+// drops sessions/<sid>.live holding its CC main pid; anyone interested sweeps
+// the dir with kill(pid, 0) — dead pids get swept, no ledger to rot.
+const SESSIONS_DIR = join(HOME, ".config/cerebro/sessions");
 const WEB_PID_FILE = join(HOME, ".config/cerebro/web-server.pid");
 
-export function refCountInc() {
+// CC runs hooks through a bash wrapper — process.ppid is the wrapper, which
+// dies the moment the hook exits. Climb past shells to the CC main process;
+// non-Linux (no /proc) or unclimbable chain falls back to the old behavior.
+function ccMainPid() {
+  let pid = process.ppid;
+  for (let i = 0; i < 4 && pid > 1; i++) {
+    try {
+      const comm = readFileSync(`/proc/${pid}/comm`, "utf-8").trim();
+      if (!/^(bash|sh|dash|zsh)$/.test(comm)) return pid;
+      const m = readFileSync(`/proc/${pid}/status`, "utf-8").match(/^PPid:\s+(\d+)/m);
+      if (!m) break;
+      pid = parseInt(m[1], 10);
+    } catch { break; }
+  }
+  return process.ppid;
+}
+
+export function writeLive(sid) {
+  if (!sid) return;
   try {
-    const n = existsSync(REFCOUNT_FILE) ? parseInt(readFileSync(REFCOUNT_FILE, "utf-8").trim(), 10) || 0 : 0;
-    writeFileSync(REFCOUNT_FILE, String(n + 1));
+    mkdirSync(SESSIONS_DIR, { recursive: true });
+    writeFileSync(join(SESSIONS_DIR, `${sid}.live`), String(ccMainPid()));
   } catch {}
 }
 
-export function refCountDec() {
+export function removeLive(sid) {
+  if (!sid) return;
+  try { unlinkSync(join(SESSIONS_DIR, `${sid}.live`)); } catch {}
+}
+
+export function countLiveCC() {
+  let alive = 0;
   try {
-    let n = existsSync(REFCOUNT_FILE) ? parseInt(readFileSync(REFCOUNT_FILE, "utf-8").trim(), 10) || 0 : 0;
-    n = Math.max(0, n - 1);
-    if (n === 0) {
+    for (const f of readdirSync(SESSIONS_DIR)) {
+      if (!f.endsWith(".live")) continue;
+      const p = join(SESSIONS_DIR, f);
       try {
-        const pid = parseInt(readFileSync(WEB_PID_FILE, "utf-8").trim(), 10);
-        if (pid) process.kill(pid, "SIGTERM");
-      } catch {}
-      try { unlinkSync(WEB_PID_FILE); } catch {}
-      try { unlinkSync(REFCOUNT_FILE); } catch {}
-    } else {
-      writeFileSync(REFCOUNT_FILE, String(n));
+        process.kill(parseInt(readFileSync(p, "utf-8").trim(), 10), 0); // throws if dead
+        alive++;
+      } catch (e) {
+        // EPERM = process exists but is root's — still alive; only ESRCH = dead
+        if (e && e.code === "EPERM") alive++;
+        else { try { unlinkSync(p); } catch {} } // stale — sweep
+      }
     }
+  } catch {} // dir missing = no session ever
+  return alive;
+}
+
+// Kill a stale web-server daemon so a fresh one can bind (rebirth on every
+// session start — no version sniffing). pid verified via /proc cmdline to
+// survive pid reuse; non-Linux (no /proc) degrades to no-op.
+export function killStaleWebServer() {
+  try {
+    const pid = parseInt(readFileSync(WEB_PID_FILE, "utf-8").trim(), 10);
+    if (!pid || pid === process.pid) return;
+    const cmdline = readFileSync(`/proc/${pid}/cmdline`, "utf-8");
+    if (!cmdline.includes("web-server.mjs")) return; // not ours — don't touch
+    process.kill(pid, "SIGTERM");
+    setTimeout(() => { try { process.kill(pid, "SIGKILL"); } catch {} }, 500).unref();
   } catch {}
 }
 

package/hooks/session-end.mjs

@@ -5,7 +5,7 @@
 // Fix: spawn detached child process, parent exits immediately.
 import { spawn } from "node:child_process";
 import { join } from "node:path";
-import { config, PLUGIN_ROOT, refCountDec, parseStdinJSON, emit, logDebug, writePendingClearFlush } from "./common.mjs";
+import { config, PLUGIN_ROOT, removeLive, parseStdinJSON, emit, logDebug, writePendingClearFlush } from "./common.mjs";
 
 if (!config.apiKey) { emit({}); process.exit(0); }
 
@@ -20,7 +20,7 @@ logDebug(`session-end: sid=${sid} reason=${reason} tp=${tp ? tp.slice(-40) : "EM
 // flush to it so the result lands in that hook's toast (detached flush is mute).
 if (reason === "clear" && tp && sid) {
   writePendingClearFlush(tp, sid);
-  refCountDec();
+  removeLive(sid);
   emit({});
   process.exit(0);
 }
@@ -38,7 +38,7 @@ if (tp && sid) {
   } catch {}
 }
 
-refCountDec();
+removeLive(sid);
 emit({
   systemMessage: `🧠 Cerebro · Session flush in background`,
 });

package/hooks/session-start.mjs

@@ -4,7 +4,7 @@ import { spawn } from "node:child_process";
 import { join } from "node:path";
 import { readFileSync } from "node:fs";
 import {
-  config, PLUGIN_ROOT, PLUGIN_VERSION, detectProjectPath, parseStdinJSON, emit, buildMemoryInjection, postRecallEvent, refCountInc, readCompactResult, readPendingClearFlush, clearPendingClearFlush, flushSessionIngest, injectionConfig,
+  config, PLUGIN_ROOT, PLUGIN_VERSION, detectProjectPath, parseStdinJSON, emit, buildMemoryInjection, postRecallEvent, writeLive, killStaleWebServer, readCompactResult, readPendingClearFlush, clearPendingClearFlush, flushSessionIngest, injectionConfig,
 } from "./common.mjs";
 import { judgeMaterial, readState, writeStateForReport, fetchOrphanResult } from "./dream.mjs";
 
@@ -61,24 +61,18 @@ const input = parseStdinJSON();
 const sid = input.session_id || "";
 const startSource = input.source || ""; // "startup" | "resume" | "clear" | "compact"
 
-// ─── web server 拉起（probe + detached spawn，跨平台）─────────────────────────
-const webPort = process.env.OMEM_LOCAL_PORT || "5212";
+// ─── web server 换血（杀旧起新，无条件——升级即生效，无版本探测分支）──────────
+killStaleWebServer();
+await new Promise((r) => setTimeout(r, 700)); // old daemon TERM→KILL, port frees
 try {
-  const resp = await fetch(`http://127.0.0.1:${webPort}/health`, {
-    signal: AbortSignal.timeout(1000),
-  });
-  if (!resp.ok) throw new Error("not healthy");
-} catch {
-  try {
-    const child = spawn(
-      process.execPath,
-      [join(PLUGIN_ROOT, "scripts", "web-server.mjs")],
-      { detached: true, stdio: "ignore", env: { ...process.env } },
-    );
-    child.unref();
-  } catch {}
-}
-refCountInc();
+  const child = spawn(
+    process.execPath,
+    [join(PLUGIN_ROOT, "scripts", "web-server.mjs")],
+    { detached: true, stdio: "ignore", env: { ...process.env, OMEM_WEB_GRACE_MS: String(config.webGraceMs) } },
+  );
+  child.unref();
+} catch {}
+writeLive(sid);
 
 // ─── API key 检查 ────────────────────────────────────────────────────────────
 if (!config.apiKey) {
@@ -119,8 +113,8 @@ out = out.replace("[CEREBRO-MEMORY]", `[CEREBRO-MEMORY]\n${timeLine}`);
 // CEREBRO-STATUS 通过 systemMessage 显示给用户（Q2: toast 替代方案）
 const memCount = injection.projectMemoryCount + injection.searchCount;
 let statusMsg = injection.recentFailed
-  ? `🧠 Cerebro v${PLUGIN_VERSION} · Recent ✗ (timeout) · Profile ${injection.profileCount > 0 ? "✓" : "✗"}`
-  : `🧠 Cerebro v${PLUGIN_VERSION} · Connected · ${memCount} memories · Profile ${injection.profileCount > 0 ? "✓" : "✗"}`;
+  ? `🧠 Cerebro v${PLUGIN_VERSION} · Recent ✗ (timeout) · Global ${injection.globalCount} · Profile ${injection.profileCount > 0 ? "✓" : "✗"}`
+  : `🧠 Cerebro v${PLUGIN_VERSION} · Connected · ${memCount} memories · Global ${injection.globalCount} · Profile ${injection.profileCount > 0 ? "✓" : "✗"}`;
 
 // After compact, PostCompact toast gets overridden by SessionStart:compact toast.
 // Merge PostCompact ingest result into this toast so user sees it.

package/package.json

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

package/scripts/web-server.mjs

@@ -128,5 +128,44 @@ server.listen(PORT, "127.0.0.1", () => {
   console.log(`[cerebro web-server] serving ${WEB_DIR} at http://localhost:${PORT} (pid=${process.pid})`);
 });
 
-process.on("SIGTERM", () => server.close(() => { try { unlinkSync(PID_FILE); } catch {} process.exit(0); }));
-process.on("SIGINT", () => server.close(() => { try { unlinkSync(PID_FILE); } catch {} process.exit(0); }));
+// ── CC-liveness watchdog ─────────────────────────────────────────────────────
+// Truth = OS process table: sessions/<sid>.live maps each CC session to its
+// CC main pid. Sweep on an interval, kill(pid, 0) each, sweep stale ones.
+// Zero CC sessions alive → count down the grace window → self-exit. Survives
+// killed terminals (no SessionEnd needed) — refcount bookkeeping is gone.
+const SESSIONS_DIR = path.join(process.env.HOME || process.env.USERPROFILE || "", ".config/cerebro/sessions");
+const GRACE_MS = parseInt(process.env.OMEM_WEB_GRACE_MS || "", 10) || 60_000;
+const WATCH_MS = parseInt(process.env.OMEM_WEB_WATCH_MS || "", 10) || 60_000;
+let zeroSince = 0; // 0 = CC alive (or unknown)
+
+setInterval(() => {
+  let alive = 0;
+  try {
+    for (const f of fs.readdirSync(SESSIONS_DIR)) {
+      if (!f.endsWith(".live")) continue;
+      const fp = path.join(SESSIONS_DIR, f);
+      try {
+        process.kill(parseInt(fs.readFileSync(fp, "utf-8").trim(), 10), 0);
+        alive++;
+      } catch (e) {
+        if (e && e.code === "EPERM") alive++; // exists, root-owned — alive
+        else { try { fs.unlinkSync(fp); } catch {} }
+      }
+    }
+  } catch {} // dir missing = no CC session ever
+  if (alive > 0) { zeroSince = 0; return; }
+  if (!zeroSince) zeroSince = Date.now();
+  if (Date.now() - zeroSince >= GRACE_MS) {
+    console.log(`[cerebro web-server] no CC sessions alive for ${GRACE_MS / 1000}s, self-exiting`);
+    try { fs.unlinkSync(PID_FILE); } catch {}
+    process.exit(0);
+  }
+}, WATCH_MS);
+
+const shutdown = () => {
+  try { server.closeAllConnections(); } catch {} // Node ≥18.2; old node degrades
+  server.close(() => { try { unlinkSync(PID_FILE); } catch {} process.exit(0); });
+  setTimeout(() => process.exit(0), 1000).unref();
+};
+process.on("SIGTERM", shutdown);
+process.on("SIGINT", shutdown);