opencode-gitlab-dap 1.13.0 → 1.14.0

package/dist/index.js

@@ -3778,6 +3778,10 @@ ${e.content}`).join("\n\n---\n\n");
 
 // src/tools/skill-tools.ts
 import { tool as tool6 } from "@opencode-ai/plugin";
+import { execSync } from "child_process";
+import { mkdtempSync, readFileSync as readFileSync2, rmSync, readdirSync, statSync } from "fs";
+import { join as join2 } from "path";
+import { tmpdir } from "os";
 var z6 = tool6.schema;
 var PREFIX2 = "agents";
 var SKILLS_PREFIX = `${PREFIX2}/skills`;
@@ -3908,6 +3912,83 @@ async function upsertPage(instanceUrl, token, scope, id, slug, content) {
     await createWikiPage(instanceUrl, token, scope, id, slug, content);
   }
 }
+function searchSkillsSh(query) {
+  try {
+    const raw = execSync(`npx skills find ${JSON.stringify(query)}`, {
+      timeout: 3e4,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const lines = raw.split("\n");
+    const results = [];
+    for (let i = 0; i < lines.length; i++) {
+      const clean = lines[i].replace(/\x1b\[[0-9;]*m/g, "").trim();
+      const match = clean.match(/^(\S+\/\S+@\S+)\s+(.+installs?)$/);
+      if (match) {
+        const urlLine = (lines[i + 1] ?? "").replace(/\x1b\[[0-9;]*m/g, "").trim();
+        const url = urlLine.startsWith("\u2514 ") ? urlLine.slice(2) : urlLine;
+        results.push({ identifier: match[1], installs: match[2], url });
+      }
+    }
+    return results;
+  } catch {
+    return [];
+  }
+}
+function downloadSkillFromSkillsSh(identifier) {
+  const tmp = mkdtempSync(join2(tmpdir(), "skill-install-"));
+  try {
+    execSync(`npx skills add ${JSON.stringify(identifier)} -y --copy`, {
+      timeout: 6e4,
+      cwd: tmp,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const agentsDir = join2(tmp, ".agents", "skills");
+    if (!statSync(agentsDir).isDirectory()) return null;
+    const dirs = readdirSync(agentsDir);
+    if (dirs.length === 0) return null;
+    const skillName = dirs[0];
+    const skillDir = join2(agentsDir, skillName);
+    const skillMd = join2(skillDir, "SKILL.md");
+    let mainContent;
+    try {
+      mainContent = readFileSync2(skillMd, "utf-8");
+    } catch {
+      return null;
+    }
+    let description = "";
+    const descMatch = mainContent.match(/^---\s*\n[\s\S]*?description:\s*(.+)\n[\s\S]*?---/);
+    if (descMatch) {
+      description = descMatch[1].trim();
+    } else {
+      const firstParagraph = mainContent.replace(/^---[\s\S]*?---\s*\n/, "").replace(/^#[^\n]*\n+/, "").split("\n\n")[0].replace(/\n/g, " ").trim();
+      description = firstParagraph.slice(0, 200);
+    }
+    const files = [];
+    const walkStack = [{ dir: skillDir, prefix: "" }];
+    while (walkStack.length > 0) {
+      const { dir, prefix } = walkStack.pop();
+      for (const entry of readdirSync(dir)) {
+        const full = join2(dir, entry);
+        const rel = prefix ? `${prefix}/${entry}` : entry;
+        if (statSync(full).isDirectory()) {
+          walkStack.push({ dir: full, prefix: rel });
+        } else if (entry !== "SKILL.md") {
+          files.push({ path: rel, content: readFileSync2(full, "utf-8") });
+        }
+      }
+    }
+    return { name: skillName, content: mainContent, description, files };
+  } catch {
+    return null;
+  } finally {
+    try {
+      rmSync(tmp, { recursive: true, force: true });
+    } catch {
+    }
+  }
+}
 function makeSkillTools(ctx) {
   function authAndValidate(projectId) {
     const auth = ctx.ensureAuth();
@@ -4075,55 +4156,125 @@ Load with: gitlab_skill_load_reference(name="${args.name}", reference="<name>")`
       }
     }),
     gitlab_skill_discover: tool6({
-      description: "Search for skills available in the group wiki.\nReads the group-level skill index and filters by query.\nUse gitlab_skill_install to copy a discovered skill to your project.",
+      description: "Search for skills in the group wiki and the skills.sh public registry.\nGroup wiki skills are searched first, then skills.sh for community skills.\nUse gitlab_skill_install to install a discovered skill into your project.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
         query: z6.string().describe("Search query (matches skill name and description)"),
-        group_id: z6.string().describe("Group path to search for shared skills")
+        group_id: z6.string().optional().describe("Group path to search for shared skills (optional)")
       },
       execute: async (args) => {
         const auth = authAndValidate(args.project_id);
-        try {
-          const entries = await readIndex(
-            auth.instanceUrl,
-            auth.token,
-            "groups",
-            args.group_id,
-            SKILLS_INDEX
-          );
-          if (entries.length === 0) {
-            return `No skills found in group "${args.group_id}" wiki. The group skill index (${SKILLS_INDEX}) is empty or does not exist.`;
-          }
-          const q = args.query.toLowerCase();
-          const matches = entries.filter(
-            (e) => e.name.toLowerCase().includes(q) || e.description.toLowerCase().includes(q)
-          );
-          if (matches.length === 0) {
-            return `No skills matching "${args.query}" in group "${args.group_id}". Available skills:
-${entries.map((e) => `- ${e.name}: ${e.description}`).join("\n")}`;
-          }
-          return `Found ${matches.length} skill(s) in group "${args.group_id}":
+        const sections = [];
+        if (args.group_id) {
+          try {
+            const entries = await readIndex(
+              auth.instanceUrl,
+              auth.token,
+              "groups",
+              args.group_id,
+              SKILLS_INDEX
+            );
+            const q = args.query.toLowerCase();
+            const matches = entries.filter(
+              (e) => e.name.toLowerCase().includes(q) || e.description.toLowerCase().includes(q)
+            );
+            if (matches.length > 0) {
+              sections.push(
+                `### Group skills (${matches.length})
 
 ` + matches.map(
-            (e) => `**${e.name}**: ${e.description}
-Install: gitlab_skill_install(name="${e.name}", group_id="${args.group_id}")`
-          ).join("\n\n");
-        } catch (err) {
-          return `Error discovering skills: ${err.message}`;
+                  (e) => `**${e.name}**: ${e.description}
+Install: \`gitlab_skill_install(name="${e.name}", source="group", group_id="${args.group_id}")\``
+                ).join("\n\n")
+              );
+            }
+          } catch {
+          }
         }
+        const shResults = searchSkillsSh(args.query);
+        if (shResults.length > 0) {
+          sections.push(
+            `### skills.sh (${shResults.length})
+
+` + shResults.map(
+              (r) => `**${r.identifier}** (${r.installs})
+${r.url}
+Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
+            ).join("\n\n")
+          );
+        }
+        if (sections.length === 0) {
+          return `No skills found matching "${args.query}" in ${args.group_id ? "group wiki or " : ""}skills.sh.`;
+        }
+        return sections.join("\n\n---\n\n");
       }
     }),
     gitlab_skill_install: tool6({
-      description: "Install a skill from a group wiki into the project wiki.\nCopies all skill pages (SKILL + references) from the group to the project.\nUpdates the project skill index with the installed skill.",
+      description: "Install a skill from a group wiki or skills.sh into the project wiki.\nFor group: copies all skill pages (SKILL + references) from the group.\nFor skills.sh: downloads via npx, extracts SKILL.md and files, writes to wiki.\nUpdates the project skill index with the installed skill.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
-        name: z6.string().describe('Skill name to install (e.g., "incident-retro")'),
-        group_id: z6.string().describe("Group path to install from"),
+        name: z6.string().describe(
+          'Skill identifier. For group: skill name (e.g., "incident-retro"). For skills.sh: full identifier (e.g., "vercel-labs/agent-skills@nextjs-developer").'
+        ),
+        source: z6.enum(["group", "skills.sh"]).describe('Where to install from: "group" (group wiki) or "skills.sh" (public registry)'),
+        group_id: z6.string().optional().describe("Group path (required when source is group)"),
         draft: z6.boolean().optional().describe("Install as draft (default: false)")
       },
       execute: async (args) => {
         const auth = authAndValidate(args.project_id);
         const projectScope = resolveScope2(args);
+        const targetPrefix = args.draft ? DRAFTS_PREFIX : SKILLS_PREFIX;
+        const targetIndex = args.draft ? DRAFTS_INDEX : SKILLS_INDEX;
+        if (args.source === "skills.sh") {
+          const downloaded = downloadSkillFromSkillsSh(args.name);
+          if (!downloaded) {
+            return `Failed to download skill "${args.name}" from skills.sh. Check that the identifier is correct (e.g., "owner/repo@skill-name").`;
+          }
+          const skillSlug = `${targetPrefix}/${downloaded.name}/SKILL`;
+          try {
+            await upsertPage(
+              auth.instanceUrl,
+              auth.token,
+              projectScope.scope,
+              projectScope.id,
+              skillSlug,
+              downloaded.content
+            );
+            let fileCount = 1;
+            for (const file of downloaded.files) {
+              const ext = file.path.replace(/\.[^.]+$/, "");
+              const refSlug = `${targetPrefix}/${downloaded.name}/${ext}`;
+              await upsertPage(
+                auth.instanceUrl,
+                auth.token,
+                projectScope.scope,
+                projectScope.id,
+                refSlug,
+                file.content
+              );
+              fileCount++;
+            }
+            await upsertIndexEntry(
+              auth.instanceUrl,
+              auth.token,
+              projectScope.scope,
+              projectScope.id,
+              targetIndex,
+              {
+                name: downloaded.name,
+                description: downloaded.description,
+                source: `skills.sh:${args.name}`,
+                draft: !!args.draft
+              }
+            );
+            return `Installed skill "${downloaded.name}" from skills.sh. ${fileCount} page(s) written.`;
+          } catch (err) {
+            return `Error installing skill from skills.sh: ${err.message}`;
+          }
+        }
+        if (!args.group_id) {
+          return 'Error: group_id is required when source is "group".';
+        }
         try {
           const groupPages = await listWikiPages(
             auth.instanceUrl,
@@ -4139,8 +4290,6 @@ Install: gitlab_skill_install(name="${e.name}", group_id="${args.group_id}")`
           if (skillPages.length === 0) {
             return `Skill "${args.name}" not found in group "${args.group_id}" wiki.`;
           }
-          const targetPrefix = args.draft ? DRAFTS_PREFIX : SKILLS_PREFIX;
-          const targetIndex = args.draft ? DRAFTS_INDEX : SKILLS_INDEX;
           for (const page of skillPages) {
             const newSlug = page.slug.replace(SKILLS_PREFIX, targetPrefix);
             await upsertPage(
@@ -4174,7 +4323,7 @@ Install: gitlab_skill_install(name="${e.name}", group_id="${args.group_id}")`
               draft: !!args.draft
             }
           );
-          return `Installed skill "${args.name}" from group "${args.group_id}" into project. ${skillPages.length} page(s) copied.`;
+          return `Installed skill "${args.name}" from group "${args.group_id}". ${skillPages.length} page(s) copied.`;
         } catch (err) {
           return `Error installing skill: ${err.message}`;
         }