memory-gateway-sync 0.11.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memory-gateway-sync",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Memory 双写插件：fs.watch 感知变化后同步到外部 Gateway",
   "type": "module",
   "main": "index.js",

package/src/identity.ts

@@ -0,0 +1,48 @@
+/**
+ * 身份解析模块
+ *
+ * group_id 有值 → scene = "group"
+ * group_id 无值 → scene = "owner"
+ *
+ * owner_id 用于 SQL 数据隔离。
+ */
+
+export type Scene = "owner" | "group" | "knowledge";
+
+export interface ResolvedIdentity {
+  scene: Scene;
+  owner_id: string;
+  group_id: string | null;
+}
+
+export interface IdentityParams {
+  owner_id?: string;
+  group_id?: string;
+}
+
+export function resolveIdentity(params: IdentityParams): ResolvedIdentity {
+  const testScene = process.env.MEMORY_GATEWAY_TEST_SCENE as Scene | undefined;
+  if (testScene) {
+    return {
+      scene: testScene,
+      owner_id: process.env.MEMORY_GATEWAY_TEST_OWNER_ID || "test_owner",
+      group_id: process.env.MEMORY_GATEWAY_TEST_GROUP_ID || null,
+    };
+  }
+
+  const ownerId = params.owner_id?.trim() || "";
+  const groupId = params.group_id?.trim() || null;
+
+  if (!ownerId) {
+    console.warn(
+      "[identity] owner_id is empty — " +
+        "owner queries will be skipped to prevent cross-user leak."
+    );
+  }
+
+  if (groupId) {
+    return { scene: "group", owner_id: ownerId, group_id: groupId };
+  }
+
+  return { scene: "owner", owner_id: ownerId, group_id: null };
+}

package/src/index.ts

@@ -3,6 +3,7 @@ import fs from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";
 import os from "node:os";
+import { resolveIdentity, type ResolvedIdentity } from "./identity";
 
 // ── 类型 ──────────────────────────────────��───────────────────────────────────
 
@@ -18,7 +19,9 @@ interface IngestPayload {
   content: string;
   release_name: string | null;
   agentId: string;
-  userId: string | null;
+  userId: string;
+  scene: string;
+  group_id: string | null;
   workspaceDir: string;
   eventType: string;
   syncedAt: string;
@@ -163,24 +166,30 @@ export default definePluginEntry({
             }
           }
 
-          // 根据路径解析 userId
-          // MEMORY.md / memory/owner/* → 环境变量 owner_claw_user_id
-          // memory/peers/{peerId}/*    → 路径中的 peerId
-          // 其他                       → null
-          let userId: string | null = null;
+          // 根据路径解析身份
+          // MEMORY.md / memory/owner/* → owner_id = ownerClawUserId
+          // memory/peers/{peerId}/*    → owner_id = 路径中的 peerId
+          // memory/groups/{groupId}/*  → owner_id = ownerClawUserId, group_id = groupId
+          // 其他                       → owner_id = ownerClawUserId
+          let owner_id: string | undefined = ownerClawUserId ?? undefined;
+          let group_id: string | undefined;
           const parts = relativePath.replace(/\\/g, "/").split("/");
-          if (relativePath === "MEMORY.md" || parts[0] === "memory" && parts[1] === "owner") {
-            userId = ownerClawUserId;
-          } else if (parts[0] === "memory" && parts[1] === "peers" && parts.length >= 3) {
-            userId = parts[2];
+          if (parts[0] === "memory" && parts[1] === "peers" && parts.length >= 3) {
+            owner_id = parts[2];
+          } else if (parts[0] === "memory" && parts[1] === "groups" && parts.length >= 3) {
+            group_id = parts[2];
           }
 
+          const identity = resolveIdentity({ owner_id, group_id });
+
           const payload: IngestPayload = {
             path: relativePath,
             content,
             release_name: parseReleaseName(content) ?? podReleaseName,
             agentId: ws.agentId,
-            userId,
+            userId: identity.owner_id,
+            scene: identity.scene,
+            group_id: identity.group_id,
             workspaceDir: ws.dir,
             eventType,
             syncedAt: new Date().toISOString(),