memory-gateway-sync 0.14.0 → 0.14.2

package/index.js

@@ -225,6 +225,42 @@ var index_default = definePluginEntry({
             `memory-gateway-sync: [${wsAgentId}] workspace 注册完成 → ${wsDir}`
           );
         };
+        const scanTenantWorkspaces = async (tenantDir, userId) => {
+          try {
+            const entries = await fs.promises.readdir(tenantDir, { withFileTypes: true });
+            for (const entry of entries) {
+              if (!entry.isDirectory()) continue;
+              const name = entry.name;
+              if (name !== "workspace" && !name.startsWith("workspace-")) continue;
+              const wsDir = path.join(tenantDir, name);
+              const wsAgentId = resolveAgentId(name);
+              await registerWorkspace(wsDir, wsAgentId, userId);
+            }
+          } catch {
+          }
+        };
+        const watchTenantWorkspacesDir = (tenantDir, userId) => {
+          try {
+            fs.watch(tenantDir, async (_eventType, filename) => {
+              if (!filename) return;
+              if (filename !== "workspace" && !filename.startsWith("workspace-")) return;
+              const wsDir = path.join(tenantDir, filename);
+              try {
+                const stat = await fs.promises.stat(wsDir);
+                if (!stat.isDirectory()) return;
+                const realDir = await fs.promises.realpath(wsDir).catch(() => wsDir);
+                if (registeredRealPaths.has(realDir)) return;
+                const wsAgentId = resolveAgentId(filename);
+                api.logger.info(
+                  `memory-gateway-sync: [tenants] 发现新 workspace → ${userId}/${filename} (agentId=${wsAgentId})`
+                );
+                await registerWorkspace(wsDir, wsAgentId, userId);
+              } catch {
+              }
+            });
+          } catch {
+          }
+        };
         const scanWorkspaces = async () => {
           try {
             const entries = await fs.promises.readdir(openclawDir, {
@@ -233,6 +269,13 @@ var index_default = definePluginEntry({
             for (const entry of entries) {
               if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
               const name = entry.name;
+              if (name.startsWith("user-")) {
+                const tenantDir = path.join(openclawDir, name);
+                const userId = name;
+                await scanTenantWorkspaces(tenantDir, userId);
+                watchTenantWorkspacesDir(tenantDir, userId);
+                continue;
+              }
               if (name !== "workspace" && !name.startsWith("workspace-")) continue;
               const wsDir = path.join(openclawDir, name);
               if (entry.isSymbolicLink()) {
@@ -278,6 +321,20 @@ var index_default = definePluginEntry({
           try {
             fs.watch(dir, async (eventType, filename) => {
               if (!filename) return;
+              if (dir === openclawDir && filename.startsWith("user-")) {
+                const tenantDir = path.join(openclawDir, filename);
+                try {
+                  const stat = await fs.promises.stat(tenantDir);
+                  if (!stat.isDirectory()) return;
+                  api.logger.info(
+                    `memory-gateway-sync: 发现新 tenant → ${filename}`
+                  );
+                  await scanTenantWorkspaces(tenantDir, filename);
+                  watchTenantWorkspacesDir(tenantDir, filename);
+                } catch {
+                }
+                return;
+              }
               if (filename !== "workspace" && !filename.startsWith("workspace-")) {
                 return;
               }
@@ -306,43 +363,6 @@ var index_default = definePluginEntry({
             );
           }
         };
-
-        // ── Tenants 模式 ──
-
-        const scanTenantWorkspaces = async (tenantDir, userId) => {
-          const workspacesDir = path.join(tenantDir, "workspaces");
-          try {
-            const entries = await fs.promises.readdir(workspacesDir, { withFileTypes: true });
-            for (const entry of entries) {
-              if (!entry.isDirectory()) continue;
-              const agentId = entry.name;
-              const wsDir = path.join(workspacesDir, agentId);
-              await registerWorkspace(wsDir, agentId, userId);
-            }
-          } catch {
-          }
-        };
-        const watchTenantWorkspacesDir = (tenantDir, userId) => {
-          const workspacesDir = path.join(tenantDir, "workspaces");
-          try {
-            fs.watch(workspacesDir, async (_eventType, filename) => {
-              if (!filename) return;
-              const wsDir = path.join(workspacesDir, filename);
-              try {
-                const stat = await fs.promises.stat(wsDir);
-                if (!stat.isDirectory()) return;
-                const realDir = await fs.promises.realpath(wsDir).catch(() => wsDir);
-                if (registeredRealPaths.has(realDir)) return;
-                api.logger.info(
-                  `memory-gateway-sync: [tenants] 发现新 workspace → ${userId}/${filename}`
-                );
-                await registerWorkspace(wsDir, filename, userId);
-              } catch {
-              }
-            });
-          } catch {
-          }
-        };
         const scanTenants = async () => {
           try {
             const entries = await fs.promises.readdir(tenantsDir, { withFileTypes: true });

package/openclaw.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "memory-gateway-sync",
-  "version": "0.12.0",
+  "version": "0.14.2",
   "name": "Memory Gateway Sync",
   "description": "监听 MEMORY.md / memory/*.md 文件变化，双写到外部 Gateway",
   "kind": "generic",

package/package.json

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

package/src/index.ts

@@ -295,10 +295,53 @@ export default definePluginEntry({
           );
         };
 
+        // ── Tenants 模式：扫描 {tenantsDir}/{userId}/workspace-{name}/ ──
+
+        const scanTenantWorkspaces = async (tenantDir: string, userId: string): Promise<void> => {
+          try {
+            const entries = await fs.promises.readdir(tenantDir, { withFileTypes: true });
+            for (const entry of entries) {
+              if (!entry.isDirectory()) continue;
+              const name = entry.name;
+              if (name !== "workspace" && !name.startsWith("workspace-")) continue;
+              const wsDir = path.join(tenantDir, name);
+              const wsAgentId = resolveAgentId(name);
+              await registerWorkspace(wsDir, wsAgentId, userId);
+            }
+          } catch {
+            // tenant 目录不存在或不可读，跳过
+          }
+        };
+
+        const watchTenantWorkspacesDir = (tenantDir: string, userId: string): void => {
+          try {
+            fs.watch(tenantDir, async (_eventType, filename) => {
+              if (!filename) return;
+              if (filename !== "workspace" && !filename.startsWith("workspace-")) return;
+              const wsDir = path.join(tenantDir, filename);
+              try {
+                const stat = await fs.promises.stat(wsDir);
+                if (!stat.isDirectory()) return;
+                const realDir = await fs.promises.realpath(wsDir).catch(() => wsDir);
+                if (registeredRealPaths.has(realDir)) return;
+                const wsAgentId = resolveAgentId(filename);
+                api.logger.info(
+                  `memory-gateway-sync: [tenants] 发现新 workspace → ${userId}/${filename} (agentId=${wsAgentId})`
+                );
+                await registerWorkspace(wsDir, wsAgentId, userId);
+              } catch {
+                // 目录不存在或已删除
+              }
+            });
+          } catch {
+            // tenant 目录无法监听
+          }
+        };
+
         // ── 扫描所有 workspace 目录 ──────────────────────────────────────
 
         const scanWorkspaces = async (): Promise<void> => {
-          // 1. 扫描 openclawDir（处理 symlink 和物理目录）
+          // 1. 扫描 openclawDir（处理 symlink、物理目录、user-* 子目录）
           try {
             const entries = await fs.promises.readdir(openclawDir, {
               withFileTypes: true,
@@ -306,6 +349,16 @@ export default definePluginEntry({
             for (const entry of entries) {
               if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
               const name = entry.name;
+
+              // 自动发现 user-* 子目录，作为 tenant 处理
+              if (name.startsWith("user-")) {
+                const tenantDir = path.join(openclawDir, name);
+                const userId = name;
+                await scanTenantWorkspaces(tenantDir, userId);
+                watchTenantWorkspacesDir(tenantDir, userId);
+                continue;
+              }
+
               if (name !== "workspace" && !name.startsWith("workspace-")) continue;
 
               const wsDir = path.join(openclawDir, name);
@@ -360,6 +413,24 @@ export default definePluginEntry({
           try {
             fs.watch(dir, async (eventType, filename) => {
               if (!filename) return;
+
+              // 动态感知新 user-* 子目录
+              if (dir === openclawDir && filename.startsWith("user-")) {
+                const tenantDir = path.join(openclawDir, filename);
+                try {
+                  const stat = await fs.promises.stat(tenantDir);
+                  if (!stat.isDirectory()) return;
+                  api.logger.info(
+                    `memory-gateway-sync: 发现新 tenant → ${filename}`
+                  );
+                  await scanTenantWorkspaces(tenantDir, filename);
+                  watchTenantWorkspacesDir(tenantDir, filename);
+                } catch {
+                  // 目录不存在或已删除
+                }
+                return;
+              }
+
               if (
                 filename !== "workspace" &&
                 !filename.startsWith("workspace-")
@@ -399,47 +470,6 @@ export default definePluginEntry({
           }
         };
 
-        // ── Tenants 模式：扫描 {tenantsDir}/{userId}/workspaces/{agentId}/ ──
-
-        const scanTenantWorkspaces = async (tenantDir: string, userId: string): Promise<void> => {
-          const workspacesDir = path.join(tenantDir, "workspaces");
-          try {
-            const entries = await fs.promises.readdir(workspacesDir, { withFileTypes: true });
-            for (const entry of entries) {
-              if (!entry.isDirectory()) continue;
-              const agentId = entry.name;
-              const wsDir = path.join(workspacesDir, agentId);
-              await registerWorkspace(wsDir, agentId, userId);
-            }
-          } catch {
-            // workspaces 目录不存在，跳过
-          }
-        };
-
-        const watchTenantWorkspacesDir = (tenantDir: string, userId: string): void => {
-          const workspacesDir = path.join(tenantDir, "workspaces");
-          try {
-            fs.watch(workspacesDir, async (_eventType, filename) => {
-              if (!filename) return;
-              const wsDir = path.join(workspacesDir, filename);
-              try {
-                const stat = await fs.promises.stat(wsDir);
-                if (!stat.isDirectory()) return;
-                const realDir = await fs.promises.realpath(wsDir).catch(() => wsDir);
-                if (registeredRealPaths.has(realDir)) return;
-                api.logger.info(
-                  `memory-gateway-sync: [tenants] 发现新 workspace → ${userId}/${filename}`
-                );
-                await registerWorkspace(wsDir, filename, userId);
-              } catch {
-                // 目录不存在或已删除
-              }
-            });
-          } catch {
-            // workspaces 目录不存在，无法监听
-          }
-        };
-
         const scanTenants = async (): Promise<void> => {
           try {
             const entries = await fs.promises.readdir(tenantsDir, { withFileTypes: true });