mr-memory 3.2.0 → 3.2.2

package/index.ts

@@ -392,6 +392,36 @@ const memoryRouterPlugin = {
       api.logger.info?.("memoryrouter: get your free API key at https://memoryrouter.ai");
     }
 
+    // ==================================================================
+    // Workspace sync (debounced, fire-and-forget)
+    // ==================================================================
+
+    let lastSyncMs = 0;
+    const SYNC_DEBOUNCE_MS = 60_000; // At most once per 60 seconds
+
+    const triggerSync = (workspaceDir: string) => {
+      if (!memoryKey) return;
+      const now = Date.now();
+      if (now - lastSyncMs < SYNC_DEBOUNCE_MS) return;
+      lastSyncMs = now;
+      syncWorkspaceFiles({ workspaceDir, endpoint, memoryKey, embeddings, logging })
+        .then((result) => {
+          if (result.uploaded > 0 || result.deleted > 0) {
+            api.logger.info?.(
+              `memoryrouter: sync complete — ${result.uploaded} uploaded, ${result.deleted} deleted, ${result.unchanged} unchanged`,
+            );
+          } else {
+            log(`memoryrouter: sync complete — ${result.unchanged} files unchanged`);
+          }
+          if (result.errors.length > 0) {
+            api.logger.warn?.(`memoryrouter: sync had ${result.errors.length} errors`);
+          }
+        })
+        .catch((err) => {
+          log(`memoryrouter: sync error — ${err instanceof Error ? err.message : String(err)}`);
+        });
+    };
+
     // ==================================================================
     // Core: before_agent_start — search memories, inject context
     // ==================================================================
@@ -496,6 +526,10 @@ const memoryRouterPlugin = {
       api.on("before_prompt_build", async (event, ctx) => {
         promptBuildFiredThisRun = true;
         log(`memoryrouter: before_prompt_build fired (sessionKey=${ctx.sessionKey}, promptLen=${event.prompt?.length})`);
+
+        // Trigger workspace sync (fire-and-forget, debounced — catches new files mid-run)
+        if (ctx.workspaceDir) triggerSync(ctx.workspaceDir);
+
         try {
           const prompt = event.prompt;
 
@@ -1236,35 +1270,11 @@ const memoryRouterPlugin = {
           api.logger.info?.(`memoryrouter: active (key: ${memoryKey.slice(0, 6)}...)`);
 
           // ── Auto-sync workspace files (non-blocking) ──
-          // Resolve workspace directory
           const configWorkspace = (api.config as any).workspace || (api.config as any).agents?.defaults?.workspace;
           const workspaceDir = configWorkspace
             ? path.resolve(configWorkspace.replace(/^~/, homedir()))
             : path.join(homedir(), ".openclaw", "workspace");
-
-          // Fire and forget — don't block service startup
-          syncWorkspaceFiles({
-            workspaceDir,
-            endpoint,
-            memoryKey,
-            embeddings,
-            logging,
-          })
-            .then((result) => {
-              if (result.uploaded > 0 || result.deleted > 0) {
-                api.logger.info?.(
-                  `memoryrouter: sync complete — ${result.uploaded} uploaded, ${result.deleted} deleted, ${result.unchanged} unchanged`,
-                );
-              } else {
-                log(`memoryrouter: sync complete — ${result.unchanged} files unchanged`);
-              }
-              if (result.errors.length > 0) {
-                api.logger.warn?.(`memoryrouter: sync had ${result.errors.length} errors`);
-              }
-            })
-            .catch((err) => {
-              api.logger.warn?.(`memoryrouter: sync error — ${err instanceof Error ? err.message : String(err)}`);
-            });
+          triggerSync(workspaceDir);
         }
       },
       stop: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mr-memory",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "MemoryRouter persistent memory plugin for OpenClaw — your AI remembers every conversation",
   "type": "module",
   "files": [

package/upload.ts

@@ -370,10 +370,11 @@ export async function runUpload(params: {
 
   const workspacePath = params.workspacePath ?? process.cwd();
 
-  let files: string[];
+  // ── Target path: specific file/dir upload (old behavior, no sync) ──
   if (targetPath) {
     const resolved = path.resolve(targetPath);
     const stat = await fs.stat(resolved);
+    let files: string[];
     if (stat.isDirectory()) {
       const allDirFiles = await fs.readdir(resolved, { recursive: true });
       files = (allDirFiles as string[])
@@ -385,19 +386,58 @@ export async function runUpload(params: {
     } else {
       files = [resolved];
     }
-  } else if (params.hasBrainFlag && !params.hasWorkspaceFlag) {
-    // --brain only: upload sessions from brain path
-    files = await discoverBrainFiles(stateDir);
-  } else if (params.hasWorkspaceFlag && !params.hasBrainFlag) {
-    // --workspace only: upload workspace files only
-    files = await discoverWorkspaceFiles(workspacePath);
-  } else {
-    // No flags or both flags: upload both workspace + sessions
-    const wsFiles = await discoverWorkspaceFiles(workspacePath);
-    const brainFiles = await discoverBrainFiles(stateDir);
-    files = [...wsFiles, ...brainFiles];
+    await uploadFilesLegacy(files, memoryKey, endpoint, embeddings);
+    return;
+  }
+
+  // ── Determine what to upload ──
+  const doWorkspace = !params.hasBrainFlag || params.hasWorkspaceFlag;  // default: yes
+  const doSessions = !params.hasWorkspaceFlag || params.hasBrainFlag;   // default: yes
+
+  // ── Workspace files: use source_hash sync (smart, tracks changes) ──
+  if (doWorkspace) {
+    console.log("📁 Syncing workspace files...");
+    const { syncWorkspaceFiles } = await import("./sync.js");
+    const syncResult = await syncWorkspaceFiles({
+      workspaceDir: workspacePath,
+      endpoint,
+      memoryKey,
+      embeddings,
+      logging: true,
+    });
+    console.log(`\n   Workspace: ${syncResult.uploaded} uploaded, ${syncResult.deleted} deleted, ${syncResult.unchanged} unchanged`);
+    if (syncResult.errors.length > 0) {
+      console.log(`   ⚠️ ${syncResult.errors.length} errors`);
+      for (const err of syncResult.errors.slice(0, 3)) {
+        console.log(`      • ${err}`);
+      }
+    }
   }
 
+  // ── Session transcripts: batch upload (append-only, no sync needed) ──
+  if (doSessions) {
+    console.log("\n📝 Uploading session transcripts...");
+    const sessionFiles = await discoverBrainFiles(stateDir);
+    if (sessionFiles.length === 0) {
+      console.log("   No session files found.");
+    } else {
+      await uploadFilesLegacy(sessionFiles, memoryKey, endpoint, embeddings);
+    }
+  }
+}
+
+/**
+ * Legacy batch upload for session transcripts and specific-path uploads.
+ * Sessions are append-only, so they don't need source_hash tracking.
+ */
+async function uploadFilesLegacy(
+  files: string[],
+  memoryKey: string,
+  endpoint: string,
+  embeddings?: string,
+): Promise<void> {
+  const uploadUrl = `${endpoint}/v1/memory/upload`;
+
   if (files.length === 0) {
     console.log("No files found to upload.");
     return;
@@ -496,7 +536,6 @@ export async function runUpload(params: {
       if (batchFailed > 0) {
         const errHint = result.errors?.[0] ? ` (${result.errors[0].slice(0, 120)})` : "";
         console.log(`⚠ ${batchStored} stored, ${batchFailed} skipped${errHint}`);
-        // Show detailed error diagnostics (up to 5 per batch)
         if (result.errors && result.errors.length > 1) {
           for (const err of result.errors.slice(0, 5)) {
             console.log(`    → ${err.slice(0, 200)}`);