memory-privacy 1.2.0 → 1.5.0

package/filters.ts

@@ -116,10 +116,10 @@ function isPathAllowedRelative(
     }
 
     if (identity.type === "peer") {
-      // 私聊中访问群记忆：按 _members.json 时间线过滤
+      // 私聊中访问群记忆：通过 API 获取成员资格，按时间线过滤
       const fileDate = extractDateFromPath(relPath);
       if (!fileDate) return false;
-      return isWithinMembershipPeriod(workspaceDir, groupId, identity.peerId, fileDate);
+      return isWithinMembershipPeriod(groupId, identity.peerId, fileDate);
     }
 
     return false;

package/index.ts

@@ -75,21 +75,21 @@ export default {
         case "owner":
           return {
             prependContext:
-              `[SYSTEM] 你是主人的私人助理，像正常对话一样自然回复。` +
+              `` +
               memoryBlock,
           };
 
         case "peer":
           return {
             prependContext:
-              `[SYSTEM] 你是一个私人助理，像正常对话一样自然回复。\n` +
+              `` +
               memoryBlock,
           };
 
         case "group":
           return {
             prependContext:
-              `[SYSTEM] 你是群助理，像正常对话一样自然回复。\n` +
+              `` +
               memoryBlock,
           };
       }
@@ -441,7 +441,7 @@ export default {
       // 提取虾的最新回复（只取纯文本，过滤 toolCall）
       const lastAssistantMsg = [...messages].reverse().find((m: any) => m.role === "assistant");
 
-      const userText = extractText(lastUserMsg);
+      const userText = cleanMessageContent(extractText(lastUserMsg));
       const assistantText = extractText(lastAssistantMsg);
       if (!userText && !assistantText) return;
 
@@ -470,14 +470,45 @@ export default {
       // 文件不存在则创建（含目录）
       ensureFileWithHeader(filePath!, header!);
       // 追加写入（格式与 im-sync 一致）
-      if (userText) fs.appendFileSync(filePath!, `[${time}] ${getUserId(identity)}: ${userText}\n`);
-      if (assistantText) fs.appendFileSync(filePath!, `[${time}] 某只虾: ${assistantText}\n`);
+      if (userText) fs.appendFileSync(filePath!, `[${getUserId(identity)}] ${userText}\n`);
+      if (assistantText) fs.appendFileSync(filePath!, `[${time}] AI助理: ${assistantText}\n`);
     });
 
     api.logger.info("[memory-privacy] Plugin registered successfully.");
   },
 };
 
+/** 清洗消息内容，去除系统提示和 IM 元数据，只保留真实对话 */
+function cleanMessageContent(text: string): string {
+  if (!text) return "";
+
+  // 策略：找到最后一个 IM 时间戳 [Day YYYY-MM-DD HH:MM GMT+N]，取其后的内容
+  const imTsPattern = /\[(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+GMT[+-]\d+\]\s*/g;
+  let lastMatch: RegExpExecArray | null = null;
+  let m: RegExpExecArray | null;
+  while ((m = imTsPattern.exec(text)) !== null) {
+    lastMatch = m;
+  }
+  if (lastMatch) {
+    return text.slice(lastMatch.index + lastMatch[0].length).trim();
+  }
+
+  // 回退：逐步清除已知的元数据模式
+  let cleaned = text;
+  // [SYSTEM] 行
+  cleaned = cleaned.replace(/^\[SYSTEM\].*$/gm, "");
+  // Sender / Conversation info 元数据块（含 ```json...``` 代码块）
+  cleaned = cleaned.replace(/^(?:Sender|Conversation info) \(untrusted metadata\):\s*\n```(?:json)?\s*\n[\s\S]*?\n```/gm, "");
+  // 对话标题行
+  cleaned = cleaned.replace(/^#\s+.+$/gm, "");
+  // 历史记录行 [HH:MM] xxx: ...
+  cleaned = cleaned.replace(/^\[\d{2}:\d{2}\]\s+\S+?:.*$/gm, "");
+  // 压缩空行
+  cleaned = cleaned.replace(/\n{3,}/g, "\n\n").trim();
+
+  return cleaned;
+}
+
 /** 从消息中提取纯文本（过滤 toolCall） */
 function extractText(msg: any): string {
   if (!msg) return "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memory-privacy",
-  "version": "1.2.0",
+  "version": "1.5.0",
   "type": "module",
   "main": "index.ts",
   "files": [

package/utils.ts

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { execSync } from "child_process";
 import type { SessionIdentity } from "./identity.js";
 
 // ========== 类型定义 ==========
@@ -7,17 +8,16 @@ import type { SessionIdentity } from "./identity.js";
 export interface MemberPeriod {
   joined: number;   // Unix 毫秒时间戳
   left: number | null;
-  reason?: string;
 }
 
-export interface MemberInfo {
-  displayName: string;
+export interface MemberGroupInfo {
+  group_id: string;
   periods: MemberPeriod[];
 }
 
-export interface MembersJson {
-  groupName?: string;
-  members: Record<string, MemberInfo>;
+export interface MemberApiResponse {
+  user_id: string;
+  groups: MemberGroupInfo[];
 }
 
 export interface KnowledgeBaseRule {
@@ -67,22 +67,37 @@ export function extractKnowledgeBaseId(filePath: string): string {
   return knowledgeIndex >= 0 && parts[knowledgeIndex + 1] ? parts[knowledgeIndex + 1] : "unknown-kb";
 }
 
-// ========== 文件加载 ==========
+// ========== API 调用 ==========
 
 /**
- * 加载 _members.json
+ * 根据 HELM_ENV 环境变量返回 API base URL
  */
-export function loadMembersRegistry(filePath: string): MembersJson | null {
+export function getApiBaseUrl(): string {
+  const env = (process.env.HELM_ENV || "dev").toLowerCase();
+  switch (env) {
+    case "prod": return "https://claw-server.csagentai.com";
+    case "staging": return "https://claw-server.csjkagent.com";
+    default: return "https://claw-server.csaiagent.com";
+  }
+}
+
+/**
+ * 同步调用 API 获取用户的群成员资格数据
+ * 使用 execSync + curl 实现同步 HTTP 请求
+ */
+export function fetchMemberGroupsSync(userId: string): MemberApiResponse | null {
   try {
-    if (fs.existsSync(filePath)) {
-      return JSON.parse(fs.readFileSync(filePath, "utf-8"));
-    }
+    const baseUrl = getApiBaseUrl();
+    const url = `${baseUrl}/api/members?user_id=${encodeURIComponent(userId)}`;
+    const result = execSync(`curl -s --max-time 5 "${url}"`, { encoding: "utf-8" });
+    return JSON.parse(result) as MemberApiResponse;
   } catch {
-    // ignore parse errors
+    return null;
   }
-  return null;
 }
 
+// ========== 文件加载 ==========
+
 /**
  * 加载知识库 ACL（带 mtime 缓存）
  */
@@ -111,29 +126,25 @@ export function loadKnowledgeACL(workspaceDir: string): KnowledgeACL {
 /**
  * 检查某个用户在某个日期是否处于群成员期内
  *
+ * 通过外部 API 获取成员资格数据
  * 规则：fileTimestamp >= joined && (left === null || fileTimestamp < left)
  * fileTimestamp = 文件日期 00:00:00 UTC
  */
 export function isWithinMembershipPeriod(
-  workspaceDir: string,
   groupId: string,
   peerId: string,
   fileDate: string // "2026-03-17"
 ): boolean {
-  const registryPath = path.join(workspaceDir, "memory", "groups", groupId, "_members.json");
-  const registry = loadMembersRegistry(registryPath);
-
-  if (!registry) return false;
+  const response = fetchMemberGroupsSync(peerId);
+  if (!response || !response.groups) return false;
 
-  // OpenClaw 把 sessionKey 转小写，但 _members.json 里的 key 保留原始大小写
-  const lowerPeerId = peerId.toLowerCase();
-  const memberKey = Object.keys(registry.members).find(k => k.toLowerCase() === lowerPeerId);
-  const member = memberKey ? registry.members[memberKey] : undefined;
-  if (!member || !member.periods || member.periods.length === 0) return false;
+  const lowerGroupId = groupId.toLowerCase();
+  const group = response.groups.find(g => g.group_id.toLowerCase() === lowerGroupId);
+  if (!group || !group.periods || group.periods.length === 0) return false;
 
   const fileTimestamp = new Date(`${fileDate}T00:00:00Z`).getTime();
 
-  return member.periods.some((period) => {
+  return group.periods.some((period) => {
     const afterJoin = fileTimestamp >= period.joined;
     const beforeLeft = period.left === null || fileTimestamp < period.left;
     return afterJoin && beforeLeft;
@@ -160,7 +171,7 @@ export function toRelativeMemoryPath(absolutePath: string, workspaceDir: string)
 /**
  * 获取某个身份有权限访问的所有 memory 子目录（绝对路径列表）
  *
- * peer: peers/{peerId}/ + _acl.json 中 userids 包含 peerId 的知识库 + _members.json 中当前在群的群组
+ * peer: peers/{peerId}/ + _acl.json 中 userids 包含 peerId 的知识库 + API 返回当前在群的群组
  * group: groups/{groupId}/ + _acl.json 中 allowGroups 包含 groupId 的知识库
  * owner: memory/ 整个目录
  */
@@ -191,29 +202,16 @@ export function getAllowedDirs(wsDir: string, identity: SessionIdentity): string
       }
     }
 
-    // 3. 群组：_members.json 中 members 的 key 匹配且 left === null
-    const groupsDir = path.join(memDir, "groups");
-    try {
-      if (fs.existsSync(groupsDir)) {
-        for (const groupId of fs.readdirSync(groupsDir)) {
-          const groupPath = path.join(groupsDir, groupId);
-          if (!fs.statSync(groupPath).isDirectory()) continue;
-          const membersPath = path.join(groupPath, "_members.json");
-          const registry = loadMembersRegistry(membersPath);
-          if (!registry) continue;
-
-          const memberKey = Object.keys(registry.members)
-            .find(k => k.toLowerCase() === lowerPeerId);
-          if (!memberKey) continue;
-
-          const member = registry.members[memberKey];
-          const lastPeriod = member.periods?.[member.periods.length - 1];
-          if (lastPeriod && lastPeriod.left === null) {
-            dirs.push(groupPath);
-          }
+    // 3. 群组：通过 API 获取当前在群的群组（last period.left === null）
+    const response = fetchMemberGroupsSync(identity.peerId);
+    if (response && response.groups) {
+      for (const group of response.groups) {
+        const lastPeriod = group.periods?.[group.periods.length - 1];
+        if (lastPeriod && lastPeriod.left === null) {
+          dirs.push(path.join(memDir, "groups", group.group_id));
         }
       }
-    } catch { /* ignore fs errors */ }
+    }
   }
 
   if (identity.type === "group") {