dogsbay 0.2.0-beta.6 → 0.2.0-beta.7

package/dist/commands/agent.js

@@ -17,7 +17,7 @@
  * See plans/dogsbay-agent-skills.md for the four-tier ownership
  * model and how this fits.
  */
-import { existsSync, mkdirSync, symlinkSync, unlinkSync, writeFileSync, readlinkSync } from "node:fs";
+import { existsSync, lstatSync, mkdirSync, readdirSync, symlinkSync, unlinkSync, writeFileSync, statSync, readlinkSync } from "node:fs";
 import { dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import pc from "picocolors";
@@ -25,15 +25,22 @@ const SUPPORTED_AGENTS = ["claude", "cursor"];
 const AGENT_TARGETS = {
     claude: {
         name: "claude",
-        path: ".claude/skills/dogsbay",
-        label: "Claude Code (.claude/skills/dogsbay/)",
+        skillsDir: ".claude/skills",
+        label: "Claude Code",
     },
     cursor: {
         name: "cursor",
-        path: ".cursor/rules/dogsbay",
-        label: "Cursor (.cursor/rules/dogsbay/)",
+        skillsDir: ".cursor/rules",
+        label: "Cursor",
     },
 };
+/**
+ * Prefix every Dogsbay-shipped skill so it doesn't collide with
+ * the user's own skills under the same agent's discovery path.
+ */
+const PLATFORM_PREFIX = "dogsbay-";
+const SITE_PREFIX = "dogsbay-site-";
+const PLUGIN_PREFIX = "dogsbay-plugin-";
 export async function agentInstall(cwd, options) {
     const projectRoot = resolve(cwd || ".");
     // Resolve the bundled platform-skills directory. We're running
@@ -99,13 +106,58 @@ The agent loader checks overrides first.
     if (!existsSync(pluginsDir)) {
         mkdirSync(pluginsDir, { recursive: true });
     }
-    // 2. Per-agent discovery symlinks.
+    // 2. Per-agent discovery — symlink each skill INDIVIDUALLY at
+    // the top level of the agent's skills dir. Claude Code (and
+    // similar harnesses) discover skills as direct children of
+    // .claude/skills/, each containing a SKILL.md. Nested
+    // .claude/skills/dogsbay/platform/<skill>/ doesn't get scanned.
     for (const agent of agents) {
         const target = AGENT_TARGETS[agent];
-        const agentLink = join(projectRoot, target.path);
-        mkdirSync(dirname(agentLink), { recursive: true });
-        refreshSymlink(agentLink, skillsDir);
-        console.log(pc.green(`  ✓ ${target.label} → .dogsbay/skills/`));
+        const agentSkillsDir = join(projectRoot, target.skillsDir);
+        mkdirSync(agentSkillsDir, { recursive: true });
+        let installed = 0;
+        let removed = 0;
+        // Platform skills: dogsbay-<name>
+        for (const entry of readSkillDirs(join(skillsDir, "platform"))) {
+            const dest = join(agentSkillsDir, `${PLATFORM_PREFIX}${entry.name}`);
+            refreshSymlink(dest, entry.path);
+            installed++;
+        }
+        // Site skills: dogsbay-site-<name> (skipping overrides/ and the README)
+        for (const entry of readSkillDirs(join(skillsDir, "site"))) {
+            if (entry.name === "overrides")
+                continue;
+            const dest = join(agentSkillsDir, `${SITE_PREFIX}${entry.name}`);
+            refreshSymlink(dest, entry.path);
+            installed++;
+        }
+        // Plugin skills: dogsbay-plugin-<name>
+        for (const entry of readSkillDirs(join(skillsDir, "plugins"))) {
+            const dest = join(agentSkillsDir, `${PLUGIN_PREFIX}${entry.name}`);
+            refreshSymlink(dest, entry.path);
+            installed++;
+        }
+        // Sweep any stale dogsbay-* symlinks whose target no longer
+        // exists (e.g. user uninstalled a plugin, or a platform skill
+        // was renamed across CLI versions).
+        if (existsSync(agentSkillsDir)) {
+            for (const name of readdirSync(agentSkillsDir)) {
+                if (!name.startsWith("dogsbay-"))
+                    continue;
+                const path = join(agentSkillsDir, name);
+                if (isBrokenSymlink(path)) {
+                    try {
+                        unlinkSync(path);
+                        removed++;
+                    }
+                    catch { /* ignore */ }
+                }
+            }
+        }
+        console.log(pc.green(`  ✓ ${target.label}: ${installed} skills under ${target.skillsDir}/`));
+        if (removed > 0) {
+            console.log(pc.gray(`    (cleaned up ${removed} stale symlink${removed === 1 ? "" : "s"})`));
+        }
     }
     console.log("");
     console.log(pc.cyan("Next:"));
@@ -180,6 +232,34 @@ function printDetected(projectRoot) {
     console.log("");
     console.log(`Supported agents: ${SUPPORTED_AGENTS.join(", ")}`);
 }
+/**
+ * List each subdirectory of `dir` that looks like a skill — i.e.
+ * contains a SKILL.md file. Returns an empty array if `dir`
+ * doesn't exist or has no skill subdirs.
+ */
+function readSkillDirs(dir) {
+    if (!existsSync(dir))
+        return [];
+    const out = [];
+    for (const name of readdirSync(dir)) {
+        if (name.startsWith("."))
+            continue;
+        const path = join(dir, name);
+        let isDir = false;
+        try {
+            isDir = statSync(path).isDirectory();
+        }
+        catch {
+            isDir = false;
+        }
+        if (!isDir)
+            continue;
+        if (!existsSync(join(path, "SKILL.md")))
+            continue;
+        out.push({ name, path });
+    }
+    return out;
+}
 /**
  * Replace any existing entry at `linkPath` with a fresh symlink
  * pointing at `target`. Idempotent: if the link already points at
@@ -205,12 +285,21 @@ function refreshSymlink(linkPath, target) {
     }
     symlinkSync(target, linkPath, "dir");
 }
+/**
+ * True only when `p` IS a symlink AND its target doesn't exist.
+ * Used by the cleanup pass to remove links pointing at gone paths
+ * (e.g. an uninstalled plugin or a renamed platform skill across
+ * CLI versions).
+ */
 function isBrokenSymlink(p) {
     try {
-        readlinkSync(p);
-        return true; // it's a symlink, regardless of target validity
+        const lst = lstatSync(p);
+        if (!lst.isSymbolicLink())
+            return false;
     }
     catch {
         return false;
     }
+    // It's a symlink. existsSync follows the link; false → target gone.
+    return !existsSync(p);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dogsbay",
-  "version": "0.2.0-beta.6",
+  "version": "0.2.0-beta.7",
   "description": "CLI for Dogsbay — scaffold, build, and serve documentation sites with markdown / MkDocs / Obsidian / OpenAPI sources",
   "type": "module",
   "bin": {
@@ -31,14 +31,14 @@
     "picocolors": "^1.1.0",
     "prompts": "^2.4.2",
     "yaml": "^2.8.3",
-    "@dogsbay/format-astro": "0.2.0-beta.6",
-    "@dogsbay/format-obsidian": "0.2.0-beta.6",
-    "@dogsbay/format-mkdocs": "0.2.0-beta.6",
-    "@dogsbay/format-mdx": "0.2.0-beta.6",
-    "@dogsbay/format-starlight": "0.2.0-beta.6",
-    "@dogsbay/format-dogsbay-md": "0.2.0-beta.6",
-    "@dogsbay/format-openapi": "0.2.0-beta.6",
-    "@dogsbay/types": "0.2.0-beta.6"
+    "@dogsbay/format-mkdocs": "0.2.0-beta.7",
+    "@dogsbay/format-astro": "0.2.0-beta.7",
+    "@dogsbay/format-mdx": "0.2.0-beta.7",
+    "@dogsbay/format-obsidian": "0.2.0-beta.7",
+    "@dogsbay/format-starlight": "0.2.0-beta.7",
+    "@dogsbay/format-dogsbay-md": "0.2.0-beta.7",
+    "@dogsbay/format-openapi": "0.2.0-beta.7",
+    "@dogsbay/types": "0.2.0-beta.7"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",