memorix 0.3.0 → 0.3.2

package/dist/cli/index.js

@@ -532,11 +532,14 @@ async function getObservationsByIds(ids, projectId) {
 }
 async function getTimeline(anchorId, projectId, depthBefore = 3, depthAfter = 3) {
   const database = await getDb();
-  const allResults = await search(database, {
+  const searchParams = {
     term: "",
-    where: { projectId },
     limit: 1e3
-  });
+  };
+  if (projectId) {
+    searchParams.where = { projectId };
+  }
+  const allResults = await search(database, searchParams);
   const docs = allResults.hits.map((h) => h.document).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
   const anchorIndex = docs.findIndex((d) => d.observationId === anchorId);
   if (anchorIndex === -1) {
@@ -2311,8 +2314,8 @@ var init_engine2 = __esm({
           rulesCount = rules.length;
         } catch {
         }
-        const skills = this.scanSkills();
-        return { mcpConfigs, workflows, rulesCount, skills };
+        const { skills, conflicts: skillConflicts } = this.scanSkills();
+        return { mcpConfigs, workflows, rulesCount, skills, skillConflicts };
       }
       /**
        * Migrate workspace configs to a target agent format.
@@ -2323,7 +2326,7 @@ var init_engine2 = __esm({
           mcpServers: { scanned: [], generated: [] },
           workflows: { scanned: [], generated: [] },
           rules: { scanned: 0, generated: 0 },
-          skills: { scanned: [], copied: [] }
+          skills: { scanned: [], conflicts: [], copied: [], skipped: [] }
         };
         const allServers = /* @__PURE__ */ new Map();
         for (const servers of Object.values(scan.mcpConfigs)) {
@@ -2361,6 +2364,7 @@ var init_engine2 = __esm({
         } catch {
         }
         result.skills.scanned = scan.skills;
+        result.skills.conflicts = scan.skillConflicts;
         return result;
       }
       // ---- Private helpers ----
@@ -2381,7 +2385,8 @@ var init_engine2 = __esm({
        */
       scanSkills() {
         const skills = [];
-        const seen = /* @__PURE__ */ new Set();
+        const conflicts = [];
+        const seen = /* @__PURE__ */ new Map();
         const home = homedir5();
         for (const [agent, dirs] of Object.entries(_WorkspaceSyncEngine.SKILLS_DIRS)) {
           for (const dir of dirs) {
@@ -2395,7 +2400,6 @@ var init_engine2 = __esm({
                 const entries = readdirSync(skillsRoot, { withFileTypes: true });
                 for (const entry of entries) {
                   if (!entry.isDirectory()) continue;
-                  if (seen.has(entry.name)) continue;
                   const skillMd = join6(skillsRoot, entry.name, "SKILL.md");
                   if (!existsSync3(skillMd)) continue;
                   let description = "";
@@ -2405,20 +2409,32 @@ var init_engine2 = __esm({
                     if (match) description = match[1];
                   } catch {
                   }
-                  seen.add(entry.name);
-                  skills.push({
+                  const newEntry = {
                     name: entry.name,
                     description,
                     sourcePath: join6(skillsRoot, entry.name),
                     sourceAgent: agent
-                  });
+                  };
+                  const existing = seen.get(entry.name);
+                  if (existing) {
+                    if (existing.sourceAgent !== agent) {
+                      conflicts.push({
+                        name: entry.name,
+                        kept: existing,
+                        skipped: newEntry
+                      });
+                    }
+                    continue;
+                  }
+                  seen.set(entry.name, newEntry);
+                  skills.push(newEntry);
                 }
               } catch {
               }
             }
           }
         }
-        return skills;
+        return { skills, conflicts };
       }
       /**
        * Copy skills to a target agent's skills directory.
@@ -2427,9 +2443,14 @@ var init_engine2 = __esm({
       copySkills(skills, target) {
         const targetDir = this.getTargetSkillsDir(target);
         const copied = [];
+        const skipped = [];
         for (const skill of skills) {
+          if (skill.sourceAgent === target) continue;
           const dest = join6(targetDir, skill.name);
-          if (existsSync3(dest)) continue;
+          if (existsSync3(dest)) {
+            skipped.push(`${skill.name} (already exists in ${target})`);
+            continue;
+          }
           try {
             mkdirSync2(targetDir, { recursive: true });
             cpSync(skill.sourcePath, dest, { recursive: true });
@@ -2437,7 +2458,7 @@ var init_engine2 = __esm({
           } catch {
           }
         }
-        return copied;
+        return { copied, skipped };
       }
       scanWorkflows() {
         const workflows = [];
@@ -2473,9 +2494,9 @@ var init_engine2 = __esm({
           ...syncResult.workflows.generated
         ];
         const applyResult = await applier.apply(filesToWrite);
-        let copiedSkills = [];
+        let skillResult = { copied: [], skipped: [] };
         if (syncResult.skills.scanned.length > 0) {
-          copiedSkills = this.copySkills(syncResult.skills.scanned, target);
+          skillResult = this.copySkills(syncResult.skills.scanned, target);
         }
         const lines = [];
         if (applyResult.success) {
@@ -2483,13 +2504,27 @@ var init_engine2 = __esm({
           for (const f of applyResult.filesWritten) {
             lines.push(`  \u2192 ${f}`);
           }
-          if (copiedSkills.length > 0) {
+          if (skillResult.copied.length > 0) {
             lines.push(`
-\u{1F9E9} Copied ${copiedSkills.length} skill(s):`);
-            for (const sk of copiedSkills) {
+\u{1F9E9} Copied ${skillResult.copied.length} skill(s):`);
+            for (const sk of skillResult.copied) {
               lines.push(`  \u2192 ${sk}`);
             }
           }
+          if (skillResult.skipped.length > 0) {
+            lines.push(`
+\u23ED\uFE0F Skipped ${skillResult.skipped.length} skill(s):`);
+            for (const sk of skillResult.skipped) {
+              lines.push(`  \u2192 ${sk}`);
+            }
+          }
+          if (syncResult.skills.conflicts.length > 0) {
+            lines.push(`
+\u26A0\uFE0F Name conflicts (${syncResult.skills.conflicts.length}):`);
+            for (const c of syncResult.skills.conflicts) {
+              lines.push(`  \u2192 "${c.name}": kept ${c.kept.sourceAgent}, skipped ${c.skipped.sourceAgent}`);
+            }
+          }
           if (applyResult.backups.length > 0) {
             lines.push(`
 \u{1F4E6} Backups created (${applyResult.backups.length}):`);
@@ -3505,6 +3540,12 @@ Entity: ${entityName} | Type: ${type} | Project: ${project.id}${enrichment}`
         } else {
           lines2.push("- No skills found");
         }
+        if (scan.skillConflicts.length > 0) {
+          lines2.push("", `### \u26A0\uFE0F Skill Name Conflicts`);
+          for (const c of scan.skillConflicts) {
+            lines2.push(`- **${c.name}**: kept from ${c.kept.sourceAgent}, duplicate in ${c.skipped.sourceAgent}`);
+          }
+        }
         return {
           content: [{ type: "text", text: lines2.join("\n") }]
         };