ring-skills-mcp 1.0.3 → 1.0.5

package/dist/index.js

@@ -52,19 +52,97 @@ async function fetchSkills(host, search = "", pageSize = 5000, token = "") {
         throw new Error("Failed to fetch Skills list: Unknown error");
     }
 }
+function parseGitUrl(gitUrl) {
+    // GitHub URL pattern: https://github.com/{owner}/{repo}/tree/{branch}/{path}
+    const githubMatch = gitUrl.match(/https?:\/\/github\.com\/([^\/]+)\/([^\/]+)\/tree\/([^\/]+)\/(.+)/);
+    if (githubMatch) {
+        const skillPath = githubMatch[4];
+        const skillName = skillPath.split("/").pop() || "";
+        return {
+            type: "github",
+            host: "github.com",
+            owner: githubMatch[1],
+            repo: githubMatch[2],
+            branch: githubMatch[3],
+            skillPath,
+            skillName: skillName.toLowerCase(),
+        };
+    }
+    // GitLab URL pattern: https://{host}/{owner}/{repo}/-/tree/{branch}/{path}
+    const gitlabMatch = gitUrl.match(/https?:\/\/([^\/]+)\/([^\/]+)\/([^\/]+)\/-\/tree\/([^\/]+)\/(.+)/);
+    if (gitlabMatch) {
+        const skillPath = gitlabMatch[5];
+        const skillName = skillPath.split("/").pop() || "";
+        return {
+            type: "gitlab",
+            host: gitlabMatch[1],
+            owner: gitlabMatch[2],
+            repo: gitlabMatch[3],
+            branch: gitlabMatch[4],
+            skillPath,
+            skillName: skillName.toLowerCase(),
+        };
+    }
+    // Fallback: try to extract skill name from URL
+    const skillMatch = gitUrl.match(/\/skills\/([^\/\s]+)/);
+    if (skillMatch) {
+        return {
+            type: "unknown",
+            host: "",
+            owner: "",
+            repo: "",
+            branch: "main",
+            skillPath: "",
+            skillName: skillMatch[1].toLowerCase(),
+        };
+    }
+    return null;
+}
 /**
- * Extract skill name from gitUrl
- * Example: "https://github.com/anthropics/skills/tree/main/skills/webapp-testing" -> "webapp-testing"
+ * Build degit source path from git URL info
  */
-function extractSkillNameFromGitUrl(gitUrl) {
-    // Match pattern: .../skills/{skill-name} or .../skills/{skill-name}/...
-    const match = gitUrl.match(/\/skills\/([^\/\s]+)/);
-    return match ? match[1].toLowerCase() : null;
+function buildDegitSource(urlInfo) {
+    if (urlInfo.type === "github") {
+        // GitHub: owner/repo/path#branch
+        return `${urlInfo.owner}/${urlInfo.repo}/${urlInfo.skillPath}#${urlInfo.branch}`;
+    }
+    else if (urlInfo.type === "gitlab") {
+        // GitLab (self-hosted): host:owner/repo/path#branch
+        return `${urlInfo.host}:${urlInfo.owner}/${urlInfo.repo}/${urlInfo.skillPath}#${urlInfo.branch}`;
+    }
+    return "";
 }
 /**
- * Install Skill to specified project
+ * Install Skill to specified project using gitUrl
  */
-async function installSkill(skillName, projectPath, targetDir = "skills", repo = DEFAULT_SKILLS_REPO) {
+async function installSkillFromGitUrl(gitUrl, projectPath, targetDir = ".claude/skills") {
+    const urlInfo = parseGitUrl(gitUrl);
+    if (!urlInfo) {
+        throw new Error(`Could not parse git URL: ${gitUrl}`);
+    }
+    const skillName = urlInfo.skillName;
+    const destPath = path.join(projectPath, targetDir, skillName);
+    const sourcePath = buildDegitSource(urlInfo);
+    if (!sourcePath) {
+        throw new Error(`Could not build degit source from URL: ${gitUrl}`);
+    }
+    const command = `npx degit ${sourcePath} ${destPath}`;
+    try {
+        const { stdout, stderr } = await execAsync(command);
+        const output = stdout || stderr || "Installation completed";
+        return `✅ Skill "${skillName}" has been successfully installed to ${destPath}\n\nSource: ${sourcePath}\n${output}`;
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            throw new Error(`Failed to install Skill: ${error.message}`);
+        }
+        throw new Error("Failed to install Skill: Unknown error");
+    }
+}
+/**
+ * Install Skill to specified project using skill name and repo
+ */
+async function installSkillFromRepo(skillName, projectPath, targetDir = ".claude/skills", repo = DEFAULT_SKILLS_REPO) {
     // Convert skill name to lowercase
     const normalizedName = skillName.toLowerCase();
     // Build full installation path
@@ -164,7 +242,7 @@ server.tool("install_skill", "Install skill to local project by skill name or gi
     targetDir: z
         .string()
         .optional()
-        .describe("Installation target directory, default: skills"),
+        .describe("Installation target directory, default: .claude/skills"),
     repo: z
         .string()
         .optional()
@@ -176,23 +254,32 @@ server.tool("install_skill", "Install skill to local project by skill name or gi
             content: [
                 {
                     type: "text",
-                    text: "❌ Please provide project path (projectPath).\n\nYou can provide the project root directory path of the currently opened file in IDE, skill will be installed to the skills directory of that project.\n\nExample: /Users/xxx/my-project",
+                    text: "❌ Please provide project path (projectPath).\n\nYou can provide the project root directory path of the currently opened file in IDE, skill will be installed to the .claude/skills directory of that project.\n\nExample: /Users/xxx/my-project",
                 },
             ],
             isError: true,
         };
     }
-    // Determine the actual skill name to use
-    let actualSkillName = null;
     // Priority: gitUrl > skillName
     if (gitUrl) {
-        actualSkillName = extractSkillNameFromGitUrl(gitUrl);
-        if (!actualSkillName) {
+        // Install from gitUrl (supports GitHub and GitLab)
+        try {
+            const result = await installSkillFromGitUrl(gitUrl, projectPath, targetDir || ".claude/skills");
             return {
                 content: [
                     {
                         type: "text",
-                        text: `❌ Error: Could not extract skill name from gitUrl: ${gitUrl}\n\nExpected format: https://github.com/org/repo/tree/main/skills/{skill-name}`,
+                        text: result,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `❌ Error: ${error instanceof Error ? error.message : "Unknown error"}`,
                     },
                 ],
                 isError: true,
@@ -200,9 +287,31 @@ server.tool("install_skill", "Install skill to local project by skill name or gi
         }
     }
     else if (skillName) {
-        actualSkillName = skillName;
+        // Install from repo using skill name
+        try {
+            const result = await installSkillFromRepo(skillName, projectPath, targetDir || ".claude/skills", repo || DEFAULT_SKILLS_REPO);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: result,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `❌ Error: ${error instanceof Error ? error.message : "Unknown error"}`,
+                    },
+                ],
+                isError: true,
+            };
+        }
     }
-    if (!actualSkillName) {
+    else {
         return {
             content: [
                 {
@@ -213,28 +322,6 @@ server.tool("install_skill", "Install skill to local project by skill name or gi
             isError: true,
         };
     }
-    try {
-        const result = await installSkill(actualSkillName, projectPath, targetDir || "skills", repo || DEFAULT_SKILLS_REPO);
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: result,
-                },
-            ],
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: `❌ Error: ${error instanceof Error ? error.message : "Unknown error"}`,
-                },
-            ],
-            isError: true,
-        };
-    }
 });
 // Start server
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-skills-mcp",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "MCP service for fetching and installing company Skills",
   "type": "module",
   "main": "dist/index.js",