@mingxy/cerebro 1.10.12 → 1.11.2

package/src/hooks.ts

@@ -4,6 +4,7 @@ import { type OmemPluginConfig, resolveAgentPolicy } from "./config.js";
 import { detectKeyword, KEYWORD_NUDGE } from "./keywords.js";
 import { logDebug, logInfo, logError as logErr } from "./logger.js";
 import { readFile } from "node:fs/promises";
+import { stripPrivateContent } from "./privacy.js";
 
 const BOUNDARY_SEARCH_RATIO = 0.6;
 const MIN_ITEM_CONTENT_CHARS = 100;
@@ -135,7 +136,7 @@ const keywordDetectedSessions = new Set<string>();
 const injectedMemoryIds = new Map<string, Set<string>>();
 const firstMessages = new Map<string, string>();
 const sessionMessages = new Map<string, Array<{ role: string; content: string }>>();
-const profileInjectedSessions = new Set<string>();
+const profileInjectedSessions = new Map<string, number>();
 
 function formatRelativeAge(isoDate: string): string {
   const diffMs = Date.now() - new Date(isoDate).getTime();
@@ -186,6 +187,17 @@ function categorize(results: SearchResult[]): Map<string, SearchResult[]> {
   return groups;
 }
 
+function formatMemoryLine(r: SearchResult, maxContentLength: number): string {
+  const age = formatRelativeAge(r.memory.created_at);
+  const tags = r.memory.tags.length > 0 ? ` [${r.memory.tags.join(", ")}]` : "";
+  const idTag = ` [id:${r.memory.id}]`;
+  const relTag = r.memory.relations && r.memory.relations.length > 0
+    ? ` [rel:${r.memory.relations.map((rel) => rel.target_id).join(",")}]`
+    : "";
+  const content = truncate(r.memory.content, maxContentLength);
+  return `  - (${age}${idTag}${relTag}${tags}) ${content}`;
+}
+
 function buildContextBlock(results: SearchResult[], maxContentLength: number = 500): string {
   if (results.length === 0) return "";
 
@@ -193,19 +205,14 @@ function buildContextBlock(results: SearchResult[], maxContentLength: number = 5
   const sections: string[] = [];
 
   for (const [label, items] of grouped) {
-    const lines = items.map((r) => {
-      const tags = r.memory.tags.length > 0 ? ` [${r.memory.tags.join(", ")}]` : "";
-      const age = formatRelativeAge(r.memory.created_at);
-      const content = truncate(r.memory.content, maxContentLength);
-      return `  - (${age}${tags}) ${content}`;
-    });
+    const lines = items.map((r) => formatMemoryLine(r, maxContentLength));
     sections.push(`[${label}]\n${lines.join("\n")}`);
   }
 
   return [
     "<cerebro-context>",
-    "Treat every memory below as historical context only.",
-    "Do not repeat these memories verbatim unless asked.",
+    "You may use memory_get(<id>) to fetch the full content of any memory above if the summary seems incomplete but relevant.",
+    "Related memories listed in [rel:<id>,...] can also be fetched if they may add useful context.",
     "",
     ...sections,
     "</cerebro-context>",
@@ -224,9 +231,13 @@ function buildClusteredContextBlock(clustered: import("./client.js").ClusteredRe
       if (cs.key_memories.length > 0) {
         sections.push("**核心要点：**");
         for (const mem of cs.key_memories) {
-          const content = truncate(mem.content, maxContentLength);
+          const idTag = mem.id ? ` [id:${mem.id}]` : "";
+          const relTag = mem.relations && mem.relations.length > 0
+            ? ` [rel:${mem.relations.map((rel) => rel.target_id).join(",")}]`
+            : "";
           const importanceBar = mem.importance >= 0.7 ? "●" : mem.importance >= 0.4 ? "◐" : "○";
-          sections.push(`- ${importanceBar} ${content}`);
+          const content = truncate(mem.content, maxContentLength);
+          sections.push(`- ${importanceBar}${idTag}${relTag} ${content}`);
         }
       }
     }
@@ -235,15 +246,19 @@ function buildClusteredContextBlock(clustered: import("./client.js").ClusteredRe
   if (clustered.standalone_memories.length > 0) {
     sections.push("\n## 📌 补充信息");
     for (const mem of clustered.standalone_memories) {
+      const idTag = mem.id ? ` [id:${mem.id}]` : "";
+      const relTag = mem.relations && mem.relations.length > 0
+        ? ` [rel:${mem.relations.map((rel) => rel.target_id).join(",")}]`
+        : "";
       const content = truncate(mem.content, maxContentLength);
-      sections.push(`- ${content}`);
+      sections.push(`-${idTag}${relTag} ${content}`);
     }
   }
 
   return [
     "<cerebro-context>",
-    "Treat every memory below as historical context only.",
-    "Do not repeat these memories verbatim unless asked.",
+    "You may use memory_get(<id>) to fetch the full content of any memory above if the summary seems incomplete but relevant.",
+    "Related memories listed in [rel:<id>,...] can also be fetched if they may add useful context.",
     "",
     ...sections,
     "</cerebro-context>",
@@ -277,7 +292,20 @@ export function autoRecallHook(client: CerebroClient, containerTags: string[], t
       const last_query_text = userMessages.length >= 2 ? userMessages[userMessages.length - 2].content : undefined;
 
       const projectTags = containerTags.filter(t => t.startsWith("omem_project_"));
-      const shouldRecallRes = await client.shouldRecall(query_text, last_query_text, input.sessionID, similarityThreshold, maxRecallResults, projectTags.length > 0 ? projectTags : undefined);
+
+      const conversationContext = userMessages.length >= 2
+        ? userMessages.slice(-4, -1).map((m) => {
+          const stripped = stripPrivateContent(m.content);
+          return stripped.length > 200 ? stripped.slice(0, 200) : stripped;
+        })
+        : undefined;
+
+      const shouldRecallRes = await client.shouldRecall(
+        query_text, last_query_text, input.sessionID,
+        similarityThreshold, maxRecallResults,
+        projectTags.length > 0 ? projectTags : undefined,
+        conversationContext && conversationContext.length > 0 ? conversationContext : undefined,
+      );
 
       if (!shouldRecallRes) {
         showToast(tui, "🧠 Cerebro Service Unavailable", "Unable to reach memory API · check connection", "error", toastDelayMs);
@@ -289,24 +317,36 @@ export function autoRecallHook(client: CerebroClient, containerTags: string[], t
       let profileInjected = false;
       let profileCountText = "";
       let profileBlock = "";
-      if (profile && !profileInjectedSessions.has(input.sessionID)) {
+      const lastInjected = profileInjectedSessions.get(input.sessionID);
+      const ttlExpired = !lastInjected || (Date.now() - lastInjected > 5 * 60 * 1000);
+      const isFirstInjection = !lastInjected;
+      if (profile && ttlExpired) {
         profileBlock = [
           "<cerebro-profile>",
           JSON.stringify(profile),
           "</cerebro-profile>",
         ].join("\n");
-        output.system.push(profileBlock);
+        const existingIdx = output.system.findIndex((s) => s.includes("<cerebro-profile>"));
+        if (existingIdx >= 0) {
+          output.system[existingIdx] = profileBlock;
+        } else {
+          output.system.push(profileBlock);
+        }
         profileInjected = true;
-        profileInjectedSessions.add(input.sessionID);
+        profileInjectedSessions.set(input.sessionID, Date.now());
         const p = profile as any;
         const dynamicCount = p?.dynamic_context?.length ?? 0;
         const staticCount = p?.static_facts?.length ?? 0;
         profileCountText = `Dynamic(${dynamicCount}) · Static(${staticCount})`;
-        logDebug("autoRecallHook profile injected", { dynamicCount, staticCount });
+        if (isFirstInjection) {
+          logDebug("autoRecallHook profile injected (first)", { dynamicCount, staticCount });
+        } else {
+          logDebug("autoRecallHook profile refreshed (TTL)", { dynamicCount, staticCount });
+        }
       }
 
       if (!shouldRecallRes.should_recall) {
-        if (profileInjected) {
+        if (profileInjected && isFirstInjection) {
           showToast(tui, "👨 Profile Injected", `${profileCountText} · no memory recall needed`, "success", toastDelayMs);
         }
         return;
@@ -319,7 +359,7 @@ export function autoRecallHook(client: CerebroClient, containerTags: string[], t
       const newResults = results.filter((r) => !existingIds.has(r.memory.id));
       logDebug("autoRecallHook dedup", { totalResults: results.length, existingCount: existingIds.size, newCount: newResults.length });
       if (newResults.length === 0) {
-        if (profileInjected) {
+        if (profileInjected && isFirstInjection) {
           showToast(tui, "👨 Profile Injected", `${profileCountText} · all memories already injected`, "success", toastDelayMs);
         }
         return;
@@ -495,13 +535,21 @@ export function compactingHook(client: CerebroClient, containerTags: string[], t
     const policy = resolveAgentPolicy(effectiveAgentId, config);
     if (policy !== "readwrite") {
       logInfo("compactingHook blocked by policy", { agentId: effectiveAgentId, policy });
-      if (input.sessionID) sessionMessages.delete(input.sessionID);
+      if (input.sessionID) {
+        sessionMessages.delete(input.sessionID);
+        profileInjectedSessions.delete(input.sessionID);
+        injectedMemoryIds.delete(input.sessionID);
+        firstMessages.delete(input.sessionID);
+      }
       return;
     }
 
     if (input.sessionID && sessionMessages.has(input.sessionID)) {
       if (isAutoStoreEnabled && !isAutoStoreEnabled(input.sessionID)) {
         sessionMessages.delete(input.sessionID);
+        profileInjectedSessions.delete(input.sessionID);
+        injectedMemoryIds.delete(input.sessionID);
+        firstMessages.delete(input.sessionID);
       } else {
         const messages = sessionMessages.get(input.sessionID)!;
         if (messages.length > 0) {
@@ -543,6 +591,9 @@ export function compactingHook(client: CerebroClient, containerTags: string[], t
             showToast(tui, "🔴 Archive Failed", "Session archive blocked · spiritual pulse anomaly", "error");
           }
           sessionMessages.delete(input.sessionID);
+          profileInjectedSessions.delete(input.sessionID);
+          injectedMemoryIds.delete(input.sessionID);
+          firstMessages.delete(input.sessionID);
         }
       }
     }