memorix 0.3.0 → 0.3.2

package/dist/index.js

@@ -283,11 +283,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) {
@@ -2598,8 +2601,8 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
       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.
@@ -2610,7 +2613,7 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
       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)) {
@@ -2648,6 +2651,7 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
     } catch {
     }
     result.skills.scanned = scan.skills;
+    result.skills.conflicts = scan.skillConflicts;
     return result;
   }
   // ---- Private helpers ----
@@ -2668,7 +2672,8 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
    */
   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) {
@@ -2682,7 +2687,6 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
             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 = "";
@@ -2692,20 +2696,32 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
                 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.
@@ -2714,9 +2730,14 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
   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 });
@@ -2724,7 +2745,7 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
       } catch {
       }
     }
-    return copied;
+    return { copied, skipped };
   }
   scanWorkflows() {
     const workflows = [];
@@ -2760,9 +2781,9 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
       ...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) {
@@ -2770,13 +2791,27 @@ var WorkspaceSyncEngine = class _WorkspaceSyncEngine {
       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}):`);
@@ -3331,6 +3366,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") }]
         };