@codemcp/ade 0.6.1 → 0.8.0

package/packages/core/src/resolver.ts

@@ -5,7 +5,6 @@ import type {
   LogicalConfig,
   McpServerEntry,
   ResolutionContext,
-  DocsetDef,
   Provision,
   PermissionPolicy
 } from "./types.js";
@@ -61,33 +60,6 @@ export async function resolve(
     }
   }
 
-  // Collect docsets from all selected options, dedup by id, filter exclusions
-  const seenDocsets = new Map<string, DocsetDef>();
-  for (const [facetId, optionId] of Object.entries(userConfig.choices)) {
-    const facet = getFacet(catalog, facetId);
-    if (!facet) continue;
-    const selectedIds = Array.isArray(optionId) ? optionId : [optionId];
-    for (const selectedId of selectedIds) {
-      const option = getOption(facet, selectedId);
-      if (!option?.docsets) continue;
-      for (const docset of option.docsets) {
-        if (!seenDocsets.has(docset.id)) {
-          seenDocsets.set(docset.id, docset);
-        }
-      }
-    }
-  }
-
-  const excludedSet = new Set(userConfig.excluded_docsets ?? []);
-  for (const [id, docset] of seenDocsets) {
-    if (excludedSet.has(id)) continue;
-    result.knowledge_sources.push({
-      name: docset.id,
-      origin: docset.origin,
-      description: docset.description
-    });
-  }
-
   // Add knowledge-server MCP entry if any knowledge_sources were collected
   if (result.knowledge_sources.length > 0) {
     result.mcp_servers.push({
@@ -125,6 +97,22 @@ export async function resolve(
   }
   result.mcp_servers = Array.from(serversByRef.values());
 
+  // Dedup skills: collect all names declared as replaced, dedup by name
+  // (last-writer-wins), then filter out replaced ones.
+  const replacedNames = new Set<string>();
+  for (const skill of result.skills) {
+    for (const r of skill.replaces ?? []) {
+      replacedNames.add(r);
+    }
+  }
+  const skillsByName = new Map<string, (typeof result.skills)[number]>();
+  for (const skill of result.skills) {
+    skillsByName.set(skill.name, skill);
+  }
+  result.skills = Array.from(skillsByName.values()).filter(
+    (skill) => !replacedNames.has(skill.name)
+  );
+
   return result;
 }
 
@@ -182,29 +170,3 @@ function mergePermissionPolicy(
     ...incoming
   };
 }
-
-/**
- * Collect all unique docsets implied by the given choices.
- * Used by the TUI to present docsets for confirmation before resolution.
- */
-export function collectDocsets(
-  choices: Record<string, string | string[]>,
-  catalog: Catalog
-): DocsetDef[] {
-  const seen = new Map<string, DocsetDef>();
-  for (const [facetId, optionId] of Object.entries(choices)) {
-    const facet = getFacet(catalog, facetId);
-    if (!facet) continue;
-    const selectedIds = Array.isArray(optionId) ? optionId : [optionId];
-    for (const selectedId of selectedIds) {
-      const option = getOption(facet, selectedId);
-      if (!option?.docsets) continue;
-      for (const docset of option.docsets) {
-        if (!seen.has(docset.id)) {
-          seen.set(docset.id, docset);
-        }
-      }
-    }
-  }
-  return Array.from(seen.values());
-}

package/packages/core/src/types.ts

@@ -21,17 +21,9 @@ export interface Option {
   label: string;
   description: string;
   recipe: Provision[];
-  docsets?: DocsetDef[];
   available?: (deps: Record<string, Option | undefined>) => boolean;
 }
 
-export interface DocsetDef {
-  id: string;
-  label: string;
-  origin: string;
-  description: string;
-}
-
 export interface Provision {
   writer: ProvisionWriter;
   config: Record<string, unknown>;
@@ -40,7 +32,7 @@ export interface Provision {
 export type ProvisionWriter =
   | "workflows"
   | "skills"
-  | "knowledge"
+  | "docset"
   | "mcp-server"
   | "instruction"
   | "installable"
@@ -54,11 +46,25 @@ export interface InlineSkill {
   name: string;
   description: string;
   body: string;
+  /**
+   * Names of other skills that this skill supersedes.
+   * Any skill whose `name` appears here will be removed from the final
+   * resolved skills list. Used by extension-contributed skills to suppress
+   * the generic baseline skills registered by the process option.
+   */
+  replaces?: string[];
 }
 
 export interface ExternalSkill {
   name: string;
   source: string;
+  /**
+   * Names of other skills that this skill supersedes.
+   * Any skill whose `name` appears here will be removed from the final
+   * resolved skills list. Used by extension-contributed skills to suppress
+   * the generic baseline skills registered by the process option.
+   */
+  replaces?: string[];
 }
 
 export type SkillDefinition = InlineSkill | ExternalSkill;
@@ -103,10 +109,14 @@ export interface CliAction {
   phase: "setup" | "install";
 }
 
+export type DocsetPreset = "git-repo" | "local-folder" | "archive";
+
 export interface KnowledgeSource {
   name: string;
   origin: string;
   description: string;
+  /** Preset type controlling how the source is fetched. Defaults to "git-repo". */
+  preset?: DocsetPreset;
 }
 
 // --- Resolution context ---
@@ -124,7 +134,6 @@ export interface ResolvedFacet {
 
 export interface UserConfig {
   choices: Record<string, string | string[]>;
-  excluded_docsets?: string[];
   harnesses?: string[];
   custom?: {
     mcp_servers?: McpServerEntry[];

package/packages/core/src/writers/docset.spec.ts

@@ -0,0 +1,40 @@
+import { describe, it, expect } from "vitest";
+import { docsetWriter } from "./docset.js";
+
+describe("docsetWriter", () => {
+  it("has id 'docset'", () => {
+    expect(docsetWriter.id).toBe("docset");
+  });
+
+  it("produces a knowledge_sources entry from config", async () => {
+    const result = await docsetWriter.write(
+      {
+        id: "tanstack-router-docs",
+        label: "TanStack Router",
+        origin: "https://github.com/TanStack/router.git",
+        description: "File-based routing, loaders, and search params"
+      },
+      { resolved: {} }
+    );
+
+    expect(result.knowledge_sources).toHaveLength(1);
+    expect(result.knowledge_sources![0]).toEqual({
+      name: "tanstack-router-docs",
+      origin: "https://github.com/TanStack/router.git",
+      description: "File-based routing, loaders, and search params"
+    });
+  });
+
+  it("uses label as fallback when description is absent", async () => {
+    const result = await docsetWriter.write(
+      {
+        id: "some-docs",
+        label: "Some Docs",
+        origin: "https://github.com/example/some-docs.git"
+      },
+      { resolved: {} }
+    );
+
+    expect(result.knowledge_sources![0].description).toBe("Some Docs");
+  });
+});

package/packages/core/src/writers/docset.ts

@@ -0,0 +1,24 @@
+import type { DocsetPreset, ProvisionWriterDef } from "../types.js";
+
+export const docsetWriter: ProvisionWriterDef = {
+  id: "docset",
+  async write(config) {
+    const { id, label, origin, description, preset } = config as {
+      id: string;
+      label: string;
+      origin: string;
+      description: string;
+      preset?: DocsetPreset;
+    };
+    return {
+      knowledge_sources: [
+        {
+          name: id,
+          origin,
+          description: description ?? label,
+          ...(preset && { preset })
+        }
+      ]
+    };
+  }
+};

package/packages/core/src/writers/skills.spec.ts

@@ -85,6 +85,52 @@ describe("skillsWriter", () => {
     });
   });
 
+  it("passes through replaces field on inline skills", async () => {
+    const result = await skillsWriter.write(
+      {
+        skills: [
+          {
+            name: "ext-architecture",
+            description: "Extension architecture",
+            body: "Extension body.",
+            replaces: ["architecture"]
+          }
+        ]
+      },
+      emptyContext
+    );
+
+    expect(result.skills).toHaveLength(1);
+    expect(result.skills![0]).toEqual({
+      name: "ext-architecture",
+      description: "Extension architecture",
+      body: "Extension body.",
+      replaces: ["architecture"]
+    });
+  });
+
+  it("passes through replaces field on external skills", async () => {
+    const result = await skillsWriter.write(
+      {
+        skills: [
+          {
+            name: "ext-tdd",
+            source: "org/repo/skills/ext-tdd",
+            replaces: ["tdd"]
+          }
+        ]
+      },
+      emptyContext
+    );
+
+    expect(result.skills).toHaveLength(1);
+    expect(result.skills![0]).toEqual({
+      name: "ext-tdd",
+      source: "org/repo/skills/ext-tdd",
+      replaces: ["tdd"]
+    });
+  });
+
   it("handles mixed inline and external skills", async () => {
     const result = await skillsWriter.write(
       {

package/packages/harnesses/package.json

@@ -40,5 +40,5 @@
     "typescript": "catalog:",
     "vitest": "catalog:"
   },
-  "version": "0.6.1"
+  "version": "0.8.0"
 }

package/packages/harnesses/src/writers/opencode.spec.ts

@@ -102,7 +102,7 @@ describe("opencodeWriter", () => {
     expect(defaultsAgent).toContain('grep: "allow"');
     expect(defaultsAgent).toContain('list: "allow"');
     expect(defaultsAgent).toContain('lsp: "allow"');
-    expect(defaultsAgent).toContain('task: "deny"');
+    expect(defaultsAgent).toContain('task: "allow"');
     expect(defaultsAgent).toContain('skill: "deny"');
     expect(defaultsAgent).toContain('todoread: "deny"');
     expect(defaultsAgent).toContain('todowrite: "deny"');
@@ -110,7 +110,6 @@ describe("opencodeWriter", () => {
     expect(defaultsAgent).toContain('websearch: "ask"');
     expect(defaultsAgent).toContain('codesearch: "ask"');
     expect(defaultsAgent).toContain('external_directory: "ask"');
-    expect(defaultsAgent).toContain('doom_loop: "deny"');
     expect(defaultsAgent).toContain('"grep *": "allow"');
     expect(defaultsAgent).toContain('"rm *": "deny"');
     expect(defaultsFrontmatter.permission).toMatchObject({
@@ -119,15 +118,14 @@ describe("opencodeWriter", () => {
       grep: "allow",
       list: "allow",
       lsp: "allow",
-      task: "deny",
+      task: "allow",
       skill: "deny",
       todoread: "deny",
       todowrite: "deny",
       webfetch: "ask",
       websearch: "ask",
       codesearch: "ask",
-      external_directory: "ask",
-      doom_loop: "deny"
+      external_directory: "ask"
     });
     const defaultsPermission = defaultsFrontmatter.permission as {
       bash: Record<string, string>;

package/packages/harnesses/src/writers/opencode.ts

@@ -24,9 +24,9 @@ const APPLICABLE_TO_ALL: Record<string, PermissionRule> = {
     "*.env.example": "allow"
   },
   skill: "deny", //we're using an own skills-mcp
-  todoread: "deny", //no agent-proprieatry todo tools
+  todoread: "deny", //no agent-proprietary todo tools
   todowrite: "deny",
-  task: "deny",
+  task: "allow", //starts subagents
   lsp: "allow",
   glob: "allow",
   grep: "allow",
@@ -129,8 +129,7 @@ const SENSIBLE_DEFAULTS_RULES: Record<string, PermissionRule> = {
     "useradd *": "deny",
     "userdel *": "deny",
     "iptables *": "deny"
-  },
-  doom_loop: "deny"
+  }
 };
 
 const MAX_AUTONOMY_RULES: Record<string, PermissionRule> = {

package/packages/core/src/writers/knowledge.spec.ts

@@ -1,26 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { knowledgeWriter } from "./knowledge.js";
-
-describe("knowledgeWriter", () => {
-  it("has id 'knowledge'", () => {
-    expect(knowledgeWriter.id).toBe("knowledge");
-  });
-
-  it("produces a knowledge_sources entry from config", async () => {
-    const result = await knowledgeWriter.write(
-      {
-        name: "react-docs",
-        origin: "https://github.com/facebook/react.git",
-        description: "Official React documentation"
-      },
-      { resolved: {} }
-    );
-
-    expect(result.knowledge_sources).toHaveLength(1);
-    expect(result.knowledge_sources![0]).toEqual({
-      name: "react-docs",
-      origin: "https://github.com/facebook/react.git",
-      description: "Official React documentation"
-    });
-  });
-});

package/packages/core/src/writers/knowledge.ts

@@ -1,15 +0,0 @@
-import type { ProvisionWriterDef } from "../types.js";
-
-export const knowledgeWriter: ProvisionWriterDef = {
-  id: "knowledge",
-  async write(config) {
-    const { name, origin, description } = config as {
-      name: string;
-      origin: string;
-      description: string;
-    };
-    return {
-      knowledge_sources: [{ name, origin, description }]
-    };
-  }
-};