Address AliceLJY review round 2

Must fix:
- Flat memory scan: move before the mdFiles.length===0 early return so it
  is always reachable (not just when nested workspaces are empty)
- Tests: runImportMarkdown now uses embedPassage (not embedQuery) and
  JSON.stringify(metadata) to match production. Added embedPassage mock.
- Tests: setupWorkspace now creates files at workspace/<name>/ to match
  the actual path structure runImportMarkdown expects

Worth considering:
- Flat memory scan now skips when workspaceGlob is set, avoiding accidental
  root flat memory import when user specifies --workspace
- Removed dev artifacts: ANALYSIS.md and recall-benchmark.py contained
  personal absolute paths and are not suitable for repo commit

Author: jlin53882

cli.ts

@@ -1138,31 +1138,32 @@ export function registerMemoryCLI(program: Command, context: CLIContext): void {
         } catch { /* not found */ }
       }
 
+      // Also scan the flat `workspace/memory/` directory directly under workspace root
+      // (not inside any workspace subdirectory — supports James's actual structure).
+      // This scan runs regardless of whether nested workspace mdFiles were found,
+      // so flat memory is always reachable even when all nested workspaces are empty.
+      // Skip if a specific workspace was requested (workspaceGlob), to avoid importing
+      // root flat memory when the user meant to import only one workspace.
+      if (!workspaceGlob) {
+        const flatMemoryDir = path.join(workspaceDir, "memory");
+        try {
+          const stats = await fsPromises.stat(flatMemoryDir);
+          if (stats.isDirectory()) {
+            const files = await fsPromises.readdir(flatMemoryDir);
+            for (const f of files) {
+              if (f.endsWith(".md") && /^\d{4}-\d{2}-\d{2}/.test(f)) {
+                mdFiles.push({ filePath: path.join(flatMemoryDir, f), scope: workspaceScope || "shared" });
+              }
+            }
+          }
+        } catch { /* not found */ }
+      }
+
       if (mdFiles.length === 0) {
         console.log("No Markdown memory files found.");
         return;
       }
 
-      // Also scan the flat `workspace/memory/` directory directly under workspace root
-      // (not inside any workspace subdirectory — supports James's actual structure)
-      const flatMemoryDir = path.join(workspaceDir, "memory");
-      try {
-        const stats = await fsPromises.stat(flatMemoryDir);
-        if (stats.isDirectory()) {
-          const files = await fsPromises.readdir(flatMemoryDir);
-          let added = 0;
-          for (const f of files) {
-            if (f.endsWith(".md") && /^\d{4}-\d{2}-\d{2}/.test(f)) {
-              mdFiles.push({ filePath: path.join(flatMemoryDir, f), scope: workspaceScope || "shared" });
-              added++;
-            }
-          }
-          if (added > 0) {
-            console.log(`Found ${added} entries in flat memory directory (scope: memory).`);
-          }
-        }
-      } catch { /* not found */ }
-
       const targetScope = options.scope || "global";
       const minTextLength = parseInt(options.minTextLength ?? "5", 10);
       const importanceDefault = parseFloat(options.importance ?? "0.7");

test/import-markdown/ANALYSIS.md

@@ -23,6 +23,17 @@ const mockEmbedder = {
     }
     return vec;
   }),
+  embedPassage: jest.fn(async (text) => {
+    // Use same deterministic vector as embedQuery for test consistency
+    const dim = 384;
+    const vec = [];
+    let seed = hashString(text);
+    for (let i = 0; i < dim; i++) {
+      seed = (seed * 1664525 + 1013904223) & 0xffffffff;
+      vec.push((seed >>> 8) / 16777215 - 1);
+    }
+    return vec;
+  }),
 };
 
 const mockStore = {
@@ -63,7 +74,9 @@ import { tmpdir } from "node:os";
 let testWorkspaceDir;
 
 async function setupWorkspace(name) {
-  const wsDir = join(testWorkspaceDir, name);
+  // Files must be created at: <testWorkspaceDir>/workspace/<name>/
+  // because runImportMarkdown looks for path.join(openclawHome, "workspace")
+  const wsDir = join(testWorkspaceDir, "workspace", name);
   await mkdir(wsDir, { recursive: true });
   return wsDir;
 }
@@ -82,6 +95,7 @@ beforeAll(async () => {
 afterEach(async () => {
   mockStore.reset();
   mockEmbedder.embedQuery.mockClear();
+  mockEmbedder.embedPassage.mockClear();
 });
 
 afterAll(async () => {
@@ -373,14 +387,14 @@ async function runImportMarkdown(context, options = {}) {
       }
 
       try {
-        const vector = await context.embedder.embedQuery(text);
+        const vector = await context.embedder.embedPassage(text);
         await context.store.store({
           text,
           vector,
           importance,
           category: "other",
           scope,
-          metadata: { importedFrom: filePath, sourceScope: srcScope },
+          metadata: JSON.stringify({ importedFrom: filePath, sourceScope: srcScope }),
         });
         imported++;
       } catch (err) {