Merge branch 'next' into kimi-runtime-support

src/init.cts

@@ -2146,18 +2146,26 @@ function buildSkillManifest(cwd: string, skillsDir: string | null = null): Skill
       continue;
     }
 
-    let skillCount = 0;
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-
-      const skillMdPath = path.join(rootPath, entry.name, 'SKILL.md');
-      const content = platformReadSync(skillMdPath);
-      if (content === null) continue;
+    // Track skill names seen within this root to deduplicate dual-routed concretes
+    // (e.g. spec-phase nested under both gsd-ns-workflow and gsd-ns-manage).
+    const seenNamesInRoot = new Set<string>();
 
+    function pushSkillEntry(
+      // relPath must use forward slashes on all platforms (manifest paths are
+      // posix-style for cross-platform stability; flat entries use template
+      // literals that always produce '/'; nested entries are joined below
+      // with explicit '/' separators rather than path.join).
+      relPath: string,
+      content: string,
+    ): boolean {
       const frontmatter = extractFrontmatter(content);
-      const name = (frontmatter['name'] as string) || entry.name;
-      const description = (frontmatter['description'] as string) || '';
+      const dirPart = relPath.replace(/\/SKILL\.md$/, '');
+      const stem = dirPart.includes('/') ? dirPart.split('/').pop()! : dirPart;
+      const name = (frontmatter['name'] as string) || stem;
+      if (seenNamesInRoot.has(name)) return false; // dedupe dual-routed concretes
+      seenNamesInRoot.add(name);
 
+      const description = (frontmatter['description'] as string) || '';
       const triggers: string[] = [];
       const bodyMatch = content.match(/^---[\s\S]*?---\s*\n([\s\S]*)$/);
       if (bodyMatch) {
@@ -2175,14 +2183,50 @@ function buildSkillManifest(cwd: string, skillsDir: string | null = null): Skill
         name,
         description,
         triggers,
-        path: entry.name,
-        file_path: `${entry.name}/SKILL.md`,
+        path: dirPart,
+        file_path: relPath,
         root: rootInfo.root,
         scope: rootInfo.scope,
         installed: rootInfo.scope !== 'import-only',
         deprecated: !!rootInfo.deprecated,
       });
-      skillCount++;
+      return true;
+    }
+
+    let skillCount = 0;
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+
+      const skillMdPath = path.join(rootPath, entry.name, 'SKILL.md');
+      const content = platformReadSync(skillMdPath);
+      if (content !== null) {
+        if (pushSkillEntry(`${entry.name}/SKILL.md`, content)) skillCount++;
+      }
+
+      // Nested layout: <entry>/skills/<stem>/SKILL.md
+      // Used by cline, qwen, hermes, augment, trae, antigravity (#69 nested=true).
+      // Descend exactly one level into <entry>/skills/ — no deeper recursion.
+      // Scope to gsd-ns-* routers only: never vacuum up an unrelated user skill
+      // that happens to have its own `skills/` subdirectory.
+      if (!entry.name.startsWith('gsd-ns-')) continue;
+      const nestedSkillsDir = path.join(rootPath, entry.name, 'skills');
+      let nestedEntries: fs.Dirent[] = [];
+      try {
+        nestedEntries = fs.readdirSync(nestedSkillsDir, { withFileTypes: true });
+      } catch {
+        // No skills/ subdir — flat layout or unreadable; nothing to do.
+        nestedEntries = [];
+      }
+      for (const nested of nestedEntries) {
+        if (!nested.isDirectory()) continue;
+        const nestedSkillMd = path.join(nestedSkillsDir, nested.name, 'SKILL.md');
+        const nestedContent = platformReadSync(nestedSkillMd);
+        if (nestedContent === null) continue;
+        // Use forward-slash separator explicitly so manifest paths are posix-style
+        // on all platforms, matching the flat-layout behaviour above.
+        const relPath = `${entry.name}/skills/${nested.name}/SKILL.md`;
+        if (pushSkillEntry(relPath, nestedContent)) skillCount++;
+      }
     }
 
     rootSummary.skill_count = skillCount;