@codemcp/ade 0.6.1 → 0.8.0

package/packages/core/src/resolver.spec.ts

@@ -1,11 +1,12 @@
 import { describe, it, expect } from "vitest";
-import { resolve, collectDocsets } from "./resolver.js";
+import { resolve } from "./resolver.js";
 import { getDefaultCatalog } from "./catalog/index.js";
 import { createRegistry, registerProvisionWriter } from "./registry.js";
 import { instructionWriter } from "./writers/instruction.js";
 import { workflowsWriter } from "./writers/workflows.js";
 import { skillsWriter } from "./writers/skills.js";
 import { setupNoteWriter } from "./writers/setup-note.js";
+import { docsetWriter } from "./writers/docset.js";
 import type { UserConfig, WriterRegistry, Catalog } from "./types.js";
 
 function buildRegistry(): WriterRegistry {
@@ -246,6 +247,336 @@ describe("resolve", () => {
       );
       expect(agentskills).toBeUndefined();
     });
+
+    it("removes a skill when another skill declares it in replaces", async () => {
+      const skillsCatalog: Catalog = {
+        facets: [
+          {
+            id: "process",
+            label: "Process",
+            description: "Process",
+            required: true,
+            options: [
+              {
+                id: "base",
+                label: "Base",
+                description: "Base process",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "architecture",
+                          description: "Generic architecture skill",
+                          body: "Generic architecture content."
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            id: "architecture",
+            label: "Architecture",
+            description: "Stack",
+            required: false,
+            options: [
+              {
+                id: "sabdx",
+                label: "SABDX",
+                description: "SABDX frontend",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "sabdx-architecture",
+                          description: "SABDX architecture skill",
+                          body: "SABDX architecture content.",
+                          replaces: ["architecture"]
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      };
+
+      const userConfig: UserConfig = {
+        choices: { process: "base", architecture: "sabdx" }
+      };
+
+      const result = await resolve(userConfig, skillsCatalog, registry);
+
+      expect(result.skills).toHaveLength(1);
+      expect(result.skills[0].name).toBe("sabdx-architecture");
+      expect(
+        result.skills.find((s) => s.name === "architecture")
+      ).toBeUndefined();
+    });
+
+    it("removes multiple skills when a single skill declares several replaces entries", async () => {
+      const skillsCatalog: Catalog = {
+        facets: [
+          {
+            id: "process",
+            label: "Process",
+            description: "Process",
+            required: true,
+            options: [
+              {
+                id: "base",
+                label: "Base",
+                description: "Base",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "coding",
+                          description: "Generic coding",
+                          body: "Generic coding."
+                        },
+                        {
+                          name: "testing",
+                          description: "Generic testing",
+                          body: "Generic testing."
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            id: "architecture",
+            label: "Architecture",
+            description: "Stack",
+            required: false,
+            options: [
+              {
+                id: "ext",
+                label: "Extension",
+                description: "Extension",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "ext-all",
+                          description: "Replaces both",
+                          body: "Extension content.",
+                          replaces: ["coding", "testing"]
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      };
+
+      const userConfig: UserConfig = {
+        choices: { process: "base", architecture: "ext" }
+      };
+
+      const result = await resolve(userConfig, skillsCatalog, registry);
+
+      expect(result.skills).toHaveLength(1);
+      expect(result.skills[0].name).toBe("ext-all");
+    });
+
+    it("keeps all skills when no replaces are declared", async () => {
+      const skillsCatalog: Catalog = {
+        facets: [
+          {
+            id: "process",
+            label: "Process",
+            description: "Process",
+            required: true,
+            options: [
+              {
+                id: "base",
+                label: "Base",
+                description: "Base",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        { name: "skill-a", description: "A", body: "Body A." },
+                        { name: "skill-b", description: "B", body: "Body B." }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      };
+
+      const userConfig: UserConfig = { choices: { process: "base" } };
+      const result = await resolve(userConfig, skillsCatalog, registry);
+
+      expect(result.skills).toHaveLength(2);
+      expect(result.skills.map((s) => s.name)).toEqual(["skill-a", "skill-b"]);
+    });
+
+    it("deduplicates skills by name — last writer wins", async () => {
+      const skillsCatalog: Catalog = {
+        facets: [
+          {
+            id: "process",
+            label: "Process",
+            description: "Process",
+            required: true,
+            options: [
+              {
+                id: "base",
+                label: "Base",
+                description: "Base",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "shared-skill",
+                          description: "First",
+                          body: "First body."
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            id: "architecture",
+            label: "Architecture",
+            description: "Stack",
+            required: false,
+            options: [
+              {
+                id: "ext",
+                label: "Extension",
+                description: "Extension",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "shared-skill",
+                          description: "Second",
+                          body: "Second body."
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      };
+
+      const userConfig: UserConfig = {
+        choices: { process: "base", architecture: "ext" }
+      };
+
+      const result = await resolve(userConfig, skillsCatalog, registry);
+
+      expect(result.skills).toHaveLength(1);
+      expect(result.skills[0]).toMatchObject({
+        name: "shared-skill",
+        body: "Second body."
+      });
+    });
+
+    it("works with external skills that declare replaces", async () => {
+      const skillsCatalog: Catalog = {
+        facets: [
+          {
+            id: "process",
+            label: "Process",
+            description: "Process",
+            required: true,
+            options: [
+              {
+                id: "base",
+                label: "Base",
+                description: "Base",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "tdd",
+                          description: "Generic TDD",
+                          body: "Generic TDD."
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            id: "architecture",
+            label: "Architecture",
+            description: "Stack",
+            required: false,
+            options: [
+              {
+                id: "ext",
+                label: "Extension",
+                description: "Extension",
+                recipe: [
+                  {
+                    writer: "skills",
+                    config: {
+                      skills: [
+                        {
+                          name: "ext-tdd",
+                          source: "org/repo/skills/ext-tdd",
+                          replaces: ["tdd"]
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      };
+
+      const userConfig: UserConfig = {
+        choices: { process: "base", architecture: "ext" }
+      };
+
+      const result = await resolve(userConfig, skillsCatalog, registry);
+
+      expect(result.skills).toHaveLength(1);
+      expect(result.skills[0].name).toBe("ext-tdd");
+    });
   });
 
   describe("setup_notes merging", () => {
@@ -283,7 +614,7 @@ describe("resolve", () => {
     });
   });
 
-  describe("docset collection", () => {
+  describe("docset collection via recipe writer", () => {
     it("collects docsets from selected options into knowledge_sources", async () => {
       const docsetCatalog: Catalog = {
         facets: [
@@ -297,13 +628,15 @@ describe("resolve", () => {
                 id: "react",
                 label: "React",
                 description: "React framework",
-                recipe: [],
-                docsets: [
+                recipe: [
                   {
-                    id: "react-docs",
-                    label: "React Reference",
-                    origin: "https://github.com/facebook/react.git",
-                    description: "Official React documentation"
+                    writer: "docset",
+                    config: {
+                      id: "react-docs",
+                      label: "React Reference",
+                      origin: "https://github.com/facebook/react.git",
+                      description: "Official React documentation"
+                    }
                   }
                 ]
               }
@@ -312,8 +645,11 @@ describe("resolve", () => {
         ]
       };
 
+      const reg = createRegistry();
+      registerProvisionWriter(reg, docsetWriter);
+
       const userConfig: UserConfig = { choices: { arch: "react" } };
-      const result = await resolve(userConfig, docsetCatalog, registry);
+      const result = await resolve(userConfig, docsetCatalog, reg);
 
       expect(result.knowledge_sources).toHaveLength(1);
       expect(result.knowledge_sources[0]).toEqual({
@@ -323,7 +659,7 @@ describe("resolve", () => {
       });
     });
 
-    it("deduplicates docsets by id across multiple options", async () => {
+    it("deduplicates docsets by id across multiple options via last-writer-wins on knowledge_sources name", async () => {
       const docsetCatalog: Catalog = {
         facets: [
           {
@@ -337,13 +673,15 @@ describe("resolve", () => {
                 id: "react",
                 label: "React",
                 description: "React",
-                recipe: [],
-                docsets: [
+                recipe: [
                   {
-                    id: "react-docs",
-                    label: "React Reference",
-                    origin: "https://github.com/facebook/react.git",
-                    description: "React docs"
+                    writer: "docset",
+                    config: {
+                      id: "react-docs",
+                      label: "React Reference",
+                      origin: "https://github.com/facebook/react.git",
+                      description: "React docs"
+                    }
                   }
                 ]
               },
@@ -351,19 +689,24 @@ describe("resolve", () => {
                 id: "nextjs",
                 label: "Next.js",
                 description: "Next.js",
-                recipe: [],
-                docsets: [
+                recipe: [
                   {
-                    id: "react-docs",
-                    label: "React Reference",
-                    origin: "https://github.com/facebook/react.git",
-                    description: "React docs"
+                    writer: "docset",
+                    config: {
+                      id: "react-docs",
+                      label: "React Reference",
+                      origin: "https://github.com/facebook/react.git",
+                      description: "React docs"
+                    }
                   },
                   {
-                    id: "nextjs-docs",
-                    label: "Next.js Docs",
-                    origin: "https://nextjs.org/docs",
-                    description: "Next.js docs"
+                    writer: "docset",
+                    config: {
+                      id: "nextjs-docs",
+                      label: "Next.js Docs",
+                      origin: "https://nextjs.org/docs",
+                      description: "Next.js docs"
+                    }
                   }
                 ]
               }
@@ -372,59 +715,19 @@ describe("resolve", () => {
         ]
       };
 
-      const userConfig: UserConfig = {
-        choices: { stack: ["react", "nextjs"] }
-      };
-      const result = await resolve(userConfig, docsetCatalog, registry);
-
-      expect(result.knowledge_sources).toHaveLength(2);
-      const ids = result.knowledge_sources.map((ks) => ks.name);
-      expect(ids).toContain("react-docs");
-      expect(ids).toContain("nextjs-docs");
-    });
-
-    it("filters out excluded_docsets", async () => {
-      const docsetCatalog: Catalog = {
-        facets: [
-          {
-            id: "arch",
-            label: "Architecture",
-            description: "Stack",
-            required: false,
-            options: [
-              {
-                id: "react",
-                label: "React",
-                description: "React",
-                recipe: [],
-                docsets: [
-                  {
-                    id: "react-docs",
-                    label: "React Reference",
-                    origin: "https://github.com/facebook/react.git",
-                    description: "React docs"
-                  },
-                  {
-                    id: "react-tutorial",
-                    label: "React Tutorial",
-                    origin: "https://github.com/reactjs/react.dev.git",
-                    description: "React tutorial"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      };
+      const reg = createRegistry();
+      registerProvisionWriter(reg, docsetWriter);
 
       const userConfig: UserConfig = {
-        choices: { arch: "react" },
-        excluded_docsets: ["react-tutorial"]
+        choices: { stack: ["react", "nextjs"] }
       };
-      const result = await resolve(userConfig, docsetCatalog, registry);
+      const result = await resolve(userConfig, docsetCatalog, reg);
 
-      expect(result.knowledge_sources).toHaveLength(1);
-      expect(result.knowledge_sources[0].name).toBe("react-docs");
+      // react-docs appears twice but mergeLogicalConfig pushes all entries;
+      // both entries are present (dedup is intentionally not done at writer level)
+      const names = result.knowledge_sources.map((ks) => ks.name);
+      expect(names).toContain("react-docs");
+      expect(names).toContain("nextjs-docs");
     });
 
     it("adds knowledge-server MCP entry when knowledge_sources are present", async () => {
@@ -440,13 +743,15 @@ describe("resolve", () => {
                 id: "react",
                 label: "React",
                 description: "React",
-                recipe: [],
-                docsets: [
+                recipe: [
                   {
-                    id: "react-docs",
-                    label: "React Reference",
-                    origin: "https://github.com/facebook/react.git",
-                    description: "React docs"
+                    writer: "docset",
+                    config: {
+                      id: "react-docs",
+                      label: "React Reference",
+                      origin: "https://github.com/facebook/react.git",
+                      description: "React docs"
+                    }
                   }
                 ]
               }
@@ -455,8 +760,11 @@ describe("resolve", () => {
         ]
       };
 
+      const reg = createRegistry();
+      registerProvisionWriter(reg, docsetWriter);
+
       const userConfig: UserConfig = { choices: { arch: "react" } };
-      const result = await resolve(userConfig, docsetCatalog, registry);
+      const result = await resolve(userConfig, docsetCatalog, reg);
 
       const knowledgeServer = result.mcp_servers.find(
         (s) => s.ref === "knowledge"
@@ -478,7 +786,7 @@ describe("resolve", () => {
       expect(knowledgeServer).toBeUndefined();
     });
 
-    it("produces no knowledge_sources when option has no docsets", async () => {
+    it("produces no knowledge_sources when option has no docset provisions", async () => {
       const userConfig: UserConfig = {
         choices: { process: "native-agents-md" }
       };
@@ -488,77 +796,6 @@ describe("resolve", () => {
     });
   });
 
-  describe("collectDocsets", () => {
-    it("returns deduplicated docsets for given choices", () => {
-      const docsetCatalog: Catalog = {
-        facets: [
-          {
-            id: "stack",
-            label: "Stack",
-            description: "Stack",
-            required: false,
-            multiSelect: true,
-            options: [
-              {
-                id: "a",
-                label: "A",
-                description: "A",
-                recipe: [],
-                docsets: [
-                  {
-                    id: "shared",
-                    label: "Shared",
-                    origin: "https://x",
-                    description: "shared"
-                  },
-                  {
-                    id: "a-only",
-                    label: "A Only",
-                    origin: "https://a",
-                    description: "a"
-                  }
-                ]
-              },
-              {
-                id: "b",
-                label: "B",
-                description: "B",
-                recipe: [],
-                docsets: [
-                  {
-                    id: "shared",
-                    label: "Shared",
-                    origin: "https://x",
-                    description: "shared"
-                  },
-                  {
-                    id: "b-only",
-                    label: "B Only",
-                    origin: "https://b",
-                    description: "b"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      };
-
-      const result = collectDocsets({ stack: ["a", "b"] }, docsetCatalog);
-
-      expect(result).toHaveLength(3);
-      const ids = result.map((d) => d.id);
-      expect(ids).toContain("shared");
-      expect(ids).toContain("a-only");
-      expect(ids).toContain("b-only");
-    });
-
-    it("returns empty array when no options have docsets", () => {
-      const result = collectDocsets({ process: "native-agents-md" }, catalog);
-      expect(result).toEqual([]);
-    });
-  });
-
   describe("MCP server dedup by ref", () => {
     it("deduplicates mcp_servers by ref, keeping the last one", async () => {
       // Create a custom registry with a writer that produces duplicate refs