ring-skills-mcp 1.0.4 → 1.0.6

package/dist/index.js

@@ -8,7 +8,6 @@ import path from "path";
 const execAsync = promisify(exec);
 // Configuration
 const DEFAULT_API_HOST = process.env.SKILLS_API_HOST || "";
-const DEFAULT_SKILLS_REPO = process.env.SKILLS_REPO || "anthropics/skills";
 const DEFAULT_AUTH_TOKEN = process.env.SKILLS_AUTH_TOKEN || "";
 // Create MCP server
 const server = new McpServer({
@@ -52,30 +51,85 @@ 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 = ".claude/skills", repo = DEFAULT_SKILLS_REPO) {
-    // Convert skill name to lowercase
-    const normalizedName = skillName.toLowerCase();
-    // Build full installation path
-    const destPath = path.join(projectPath, targetDir, normalizedName);
-    // Build degit command
-    const sourcePath = `${repo}/skills/${normalizedName}`;
+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 "${normalizedName}" has been successfully installed to ${destPath}\n${output}`;
+        return `✅ Skill "${skillName}" has been successfully installed to ${destPath}\n\nSource: ${sourcePath}\n${output}`;
     }
     catch (error) {
         if (error instanceof Error) {
@@ -154,9 +208,8 @@ server.tool("list_skills", "Fetch company Skills list. You can search for specif
     }
 });
 // Register tool: Install Skill
-server.tool("install_skill", "Install skill to local project by skill name or gitUrl. Uses npx degit to download skill template from remote repository. Project path is required, which can be the project path of the currently opened file in IDE.", {
-    skillName: z.string().optional().describe("Name of the skill to install (e.g., 'webapp-testing'). Either skillName or gitUrl must be provided."),
-    gitUrl: z.string().optional().describe("Git URL of the skill (e.g., 'https://github.com/anthropics/skills/tree/main/skills/webapp-testing'). The skill name will be extracted from this URL. Either skillName or gitUrl must be provided."),
+server.tool("install_skill", "Install skill to local project by gitUrl. Uses npx degit to download skill template from remote repository. Project path is required, which can be the project path of the currently opened file in IDE.", {
+    gitUrl: z.string().describe("Git URL of the skill (e.g., 'https://github.com/anthropics/skills/tree/main/skills/webapp-testing'). The skill name will be extracted from this URL."),
     projectPath: z
         .string()
         .optional()
@@ -165,11 +218,7 @@ server.tool("install_skill", "Install skill to local project by skill name or gi
         .string()
         .optional()
         .describe("Installation target directory, default: .claude/skills"),
-    repo: z
-        .string()
-        .optional()
-        .describe(`Skills repository path, default: ${DEFAULT_SKILLS_REPO}`),
-}, async ({ skillName, gitUrl, projectPath, targetDir, repo }) => {
+}, async ({ gitUrl, projectPath, targetDir }) => {
     // Check if project path is provided
     if (!projectPath) {
         return {
@@ -182,39 +231,8 @@ server.tool("install_skill", "Install skill to local project by skill name or gi
             isError: true,
         };
     }
-    // Determine the actual skill name to use
-    let actualSkillName = null;
-    // Priority: gitUrl > skillName
-    if (gitUrl) {
-        actualSkillName = extractSkillNameFromGitUrl(gitUrl);
-        if (!actualSkillName) {
-            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}`,
-                    },
-                ],
-                isError: true,
-            };
-        }
-    }
-    else if (skillName) {
-        actualSkillName = skillName;
-    }
-    if (!actualSkillName) {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: "❌ Error: Either skillName or gitUrl must be provided.",
-                },
-            ],
-            isError: true,
-        };
-    }
     try {
-        const result = await installSkill(actualSkillName, projectPath, targetDir || ".claude/skills", repo || DEFAULT_SKILLS_REPO);
+        const result = await installSkillFromGitUrl(gitUrl, projectPath, targetDir || ".claude/skills");
         return {
             content: [
                 {

package/package.json

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