@templmf/temp-solf-lmf 0.0.42 → 0.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@templmf/temp-solf-lmf",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "description": "",
   "main": "index.js",
   "scripts": {

package/skill-mcp/index.ts

@@ -1,13 +1,10 @@
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import {
-  CallToolRequestSchema,
-  ListToolsRequestSchema,
-} from "@modelcontextprotocol/sdk/types.js";
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 import matter from "gray-matter";
+import { z } from "zod";
 
 // ──────────────────────────────────────────────
 // 路径解析：支持项目级 + 全局两个 Skills 目录
@@ -16,18 +13,17 @@ import matter from "gray-matter";
 function getSkillDirs(): string[] {
   const dirs: string[] = [];
 
-  // 全局路径：%USERPROFILE%\.roo\skills （Windows）或 ~/.roo/skills（Linux/macOS）
+  // 全局路径：~/.roo/skills（Linux/macOS）或 %USERPROFILE%\.roo\skills（Windows）
   const globalDir = path.join(os.homedir(), ".roo", "skills");
   if (fs.existsSync(globalDir)) dirs.push(globalDir);
 
-  // 项目路径：cwd()\.roo\skills
+  // 项目路径：cwd()/.roo/skills
   const projectDir = path.join(process.cwd(), ".roo", "skills");
   if (fs.existsSync(projectDir) && projectDir !== globalDir) {
     dirs.push(projectDir);
   }
 
   // 支持通过环境变量追加自定义路径，多个路径用分号分隔
-  // 例：SKILLS_EXTRA_DIRS=C:\my-skills;D:\shared-skills
   if (process.env.SKILLS_EXTRA_DIRS) {
     for (const d of process.env.SKILLS_EXTRA_DIRS.split(";")) {
       const trimmed = d.trim();
@@ -53,7 +49,7 @@ interface SkillMeta {
 }
 
 // ──────────────────────────────────────────────
-// 核心：扫描所有 Skills
+// 核心：扫描所有 Skills（用于 list / search）
 // ──────────────────────────────────────────────
 
 function scanSkills(): SkillMeta[] {
@@ -61,17 +57,10 @@ function scanSkills(): SkillMeta[] {
   const skillMap = new Map<string, SkillMeta>(); // name → meta，项目级覆盖全局
 
   for (const baseDir of skillDirs) {
-    // 判断来源标签
-    const globalDir = path.join(os.homedir(), ".roo", "skills");
-    const projectDir = path.join(process.cwd(), ".roo", "skills");
-    let source = "custom";
-    if (baseDir === globalDir) source = "global";
-    else if (baseDir === projectDir) source = "project";
-
+    const source = resolveSource(baseDir);
     if (!fs.existsSync(baseDir)) continue;
 
-    const entries = fs.readdirSync(baseDir, { withFileTypes: true });
-    for (const entry of entries) {
+    for (const entry of fs.readdirSync(baseDir, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
 
       const skillDir = path.join(baseDir, entry.name);
@@ -79,13 +68,10 @@ function scanSkills(): SkillMeta[] {
       if (!fs.existsSync(skillFile)) continue;
 
       try {
-        const raw = fs.readFileSync(skillFile, "utf-8");
-        const { data } = matter(raw);
-
+        const { data } = matter(fs.readFileSync(skillFile, "utf-8"));
         const name = (data.name as string | undefined)?.trim() ?? entry.name;
         const description = (data.description as string | undefined)?.trim() ?? "";
-
-        // 项目级 > 全局（后扫描的覆盖先扫描的，skillDirs 里项目在后）
+        // 项目级 > 全局（后扫描的覆盖先扫描的）
         skillMap.set(name, { name, description, skillDir, skillFile, source });
       } catch {
         // 解析失败跳过
@@ -93,15 +79,68 @@ function scanSkills(): SkillMeta[] {
     }
   }
 
-  return Array.from(skillMap.values()).sort((a, b) =>
-    a.name.localeCompare(b.name)
-  );
+  return Array.from(skillMap.values()).sort((a, b) => a.name.localeCompare(b.name));
+}
+
+// ──────────────────────────────────────────────
+// 直接按名称查找 Skill（无需全量扫描）
+// 优先级：project > global > custom
+// ──────────────────────────────────────────────
+
+function findSkillByName(skillName: string): SkillMeta | null {
+  const skillDirs = getSkillDirs();
+
+  // 倒序遍历使项目级优先（skillDirs 里项目在后）
+  for (const baseDir of [...skillDirs].reverse()) {
+    if (!fs.existsSync(baseDir)) continue;
+
+    // 先尝试以 skillName 作为目录名直接定位
+    const directDir = path.join(baseDir, skillName);
+    const directFile = path.join(directDir, "SKILL.md");
+    if (fs.existsSync(directFile)) {
+      try {
+        const { data } = matter(fs.readFileSync(directFile, "utf-8"));
+        const name = (data.name as string | undefined)?.trim() ?? skillName;
+        const description = (data.description as string | undefined)?.trim() ?? "";
+        return { name, description, skillDir: directDir, skillFile: directFile, source: resolveSource(baseDir) };
+      } catch {
+        // 继续尝试其他路径
+      }
+    }
+
+    // 若目录名不匹配，遍历子目录对比 frontmatter name
+    for (const entry of fs.readdirSync(baseDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+      const skillDir = path.join(baseDir, entry.name);
+      const skillFile = path.join(skillDir, "SKILL.md");
+      if (!fs.existsSync(skillFile)) continue;
+
+      try {
+        const { data } = matter(fs.readFileSync(skillFile, "utf-8"));
+        const name = (data.name as string | undefined)?.trim() ?? entry.name;
+        if (name === skillName) {
+          const description = (data.description as string | undefined)?.trim() ?? "";
+          return { name, description, skillDir, skillFile, source: resolveSource(baseDir) };
+        }
+      } catch {
+        // 跳过
+      }
+    }
+  }
+
+  return null;
 }
 
 // ──────────────────────────────────────────────
 // 工具函数
 // ──────────────────────────────────────────────
 
+function resolveSource(baseDir: string): string {
+  if (baseDir === path.join(os.homedir(), ".roo", "skills")) return "global";
+  if (baseDir === path.join(process.cwd(), ".roo", "skills")) return "project";
+  return "custom";
+}
+
 /** 列出所有文件（含子目录），返回相对路径列表 */
 function listFilesRecursive(dir: string, base: string = dir): string[] {
   const result: string[] = [];
@@ -109,11 +148,10 @@ function listFilesRecursive(dir: string, base: string = dir): string[] {
 
   for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
     const full = path.join(dir, entry.name);
-    const rel = path.relative(base, full);
     if (entry.isDirectory()) {
       result.push(...listFilesRecursive(full, base));
     } else {
-      result.push(rel);
+      result.push(path.relative(base, full));
     }
   }
   return result;
@@ -135,211 +173,157 @@ function fuzzyMatch(needle: string, haystack: string): boolean {
 // MCP Server
 // ──────────────────────────────────────────────
 
-const server = new Server(
-  { name: "skills-mcp", version: "1.0.0" },
-  { capabilities: { tools: {} } }
-);
-
-// 注册工具列表
-server.setRequestHandler(ListToolsRequestSchema, async () => ({
-  tools: [
-    {
-      name: "list_skills",
-      description:
-        "列出所有可用的 Skills（来自全局 ~/.roo/skills 和项目 .roo/skills）",
-      inputSchema: {
-        type: "object",
-        properties: {},
-        required: [],
-      },
-    },
-    {
-      name: "read_skill",
-      description: "读取指定 Skill 的完整 SKILL.md 内容",
-      inputSchema: {
-        type: "object",
-        properties: {
-          name: {
-            type: "string",
-            description: "Skill 名称（目录名或 frontmatter 中的 name）",
-          },
-        },
-        required: ["name"],
-      },
-    },
-    {
-      name: "search_skills",
-      description: "模糊搜索 Skills，匹配名称或描述",
-      inputSchema: {
-        type: "object",
-        properties: {
-          query: {
-            type: "string",
-            description: "搜索关键词",
-          },
-        },
-        required: ["query"],
-      },
-    },
-    {
-      name: "list_skill_files",
-      description: "列出指定 Skill 目录下的所有附属文件（脚本、模板等）",
-      inputSchema: {
-        type: "object",
-        properties: {
-          name: {
-            type: "string",
-            description: "Skill 名称",
-          },
-        },
-        required: ["name"],
-      },
-    },
-  ],
-}));
-
-// 处理工具调用
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  const { name, arguments: args } = request.params;
+const server = new McpServer({
+  name: "skills-mcp",
+  version: "1.0.0",
+});
 
-  // ── list_skills ──
-  if (name === "list_skills") {
+// ── list_skills ──
+server.registerTool(
+  "list_skills",
+  {
+    description: "列出所有可用的 Skills（来自全局 ~/.roo/skills 和项目 .roo/skills）",
+    inputSchema: {},
+  },
+  async () => {
     const skills = scanSkills();
+
     if (skills.length === 0) {
+      const dirList = getSkillDirs().map((d) => `  - ${d}`).join("\n");
       return {
-        content: [
-          {
-            type: "text",
-            text: "未找到任何 Skill。\n\n请检查以下目录是否存在 SKILL.md 文件：\n" +
-              getSkillDirs().map((d) => `  - ${d}`).join("\n"),
-          },
-        ],
+        content: [{
+          type: "text",
+          text: `未找到任何 Skill。\n\n请检查以下目录是否存在 SKILL.md 文件：\n${dirList}`,
+        }],
       };
     }
 
     const rows = skills.map((s) => {
-      const desc = s.description.length > 80
-        ? s.description.slice(0, 77) + "..."
-        : s.description;
+      const desc = s.description.length > 80 ? s.description.slice(0, 77) + "..." : s.description;
       return `| \`${s.name}\` | ${desc} | ${s.source} |`;
     });
 
-    const text =
-      `## 可用 Skills（共 ${skills.length} 个）\n\n` +
-      `| 名称 | 描述 | 来源 |\n` +
-      `|------|------|------|\n` +
-      rows.join("\n");
-
-    return { content: [{ type: "text", text }] };
+    return {
+      content: [{
+        type: "text",
+        text:
+          `## 可用 Skills（共 ${skills.length} 个）\n\n` +
+          `| 名称 | 描述 | 来源 |\n|------|------|------|\n` +
+          rows.join("\n"),
+      }],
+    };
   }
+);
 
-  // ── read_skill ──
-  if (name === "read_skill") {
-    const skillName = (args as { name: string }).name.trim();
-    const skills = scanSkills();
-    const skill = skills.find(
-      (s) => s.name === skillName || s.skillDir.endsWith(path.sep + skillName)
-    );
+// ── read_skill ──
+server.registerTool(
+  "read_skill",
+  {
+    description: "读取指定 Skill 的完整 SKILL.md 内容",
+    inputSchema: {
+      name: z.string().describe("Skill 名称（目录名或 frontmatter 中的 name）"),
+    },
+  },
+  async ({ name: skillName }) => {
+    const skill = findSkillByName(skillName.trim());
 
     if (!skill) {
-      const available = skills.map((s) => `\`${s.name}\``).join(", ");
       return {
-        content: [
-          {
-            type: "text",
-            text: `未找到 Skill \`${skillName}\`。\n\n可用的 Skills：${available || "（无）"}`,
-          },
-        ],
+        content: [{
+          type: "text",
+          text: `未找到 Skill \`${skillName}\`。\n\n请确认名称是否正确，或使用 list_skills 查看所有可用 Skills。`,
+        }],
       };
     }
 
     const content = fs.readFileSync(skill.skillFile, "utf-8");
     return {
-      content: [
-        {
-          type: "text",
-          text: `## Skill: ${skill.name}\n**来源**: ${skill.source} (${skill.skillFile})\n\n---\n\n${content}`,
-        },
-      ],
+      content: [{
+        type: "text",
+        text: `## Skill: ${skill.name}\n**来源**: ${skill.source} (${skill.skillFile})\n\n---\n\n${content}`,
+      }],
     };
   }
+);
 
-  // ── search_skills ──
-  if (name === "search_skills") {
-    const query = (args as { query: string }).query.trim();
+// ── search_skills ──
+server.registerTool(
+  "search_skills",
+  {
+    description: "模糊搜索 Skills，匹配名称或描述",
+    inputSchema: {
+      query: z.string().describe("搜索关键词"),
+    },
+  },
+  async ({ query }) => {
     const skills = scanSkills();
+    const q = query.trim();
 
     const matched = skills.filter(
       (s) =>
-        fuzzyMatch(query, s.name) ||
-        s.name.toLowerCase().includes(query.toLowerCase()) ||
-        s.description.toLowerCase().includes(query.toLowerCase())
+        fuzzyMatch(q, s.name) ||
+        s.name.toLowerCase().includes(q.toLowerCase()) ||
+        s.description.toLowerCase().includes(q.toLowerCase())
     );
 
     if (matched.length === 0) {
       return {
-        content: [
-          {
-            type: "text",
-            text: `未找到匹配 "${query}" 的 Skill。`,
-          },
-        ],
+        content: [{ type: "text", text: `未找到匹配 "${q}" 的 Skill。` }],
       };
     }
 
     const rows = matched.map((s) => {
-      const desc = s.description.length > 100
-        ? s.description.slice(0, 97) + "..."
-        : s.description;
+      const desc = s.description.length > 100 ? s.description.slice(0, 97) + "..." : s.description;
       return `| \`${s.name}\` | ${desc} | ${s.source} |`;
     });
 
-    const text =
-      `## 搜索结果：${matched.length} 个匹配 "${query}"\n\n` +
-      `| 名称 | 描述 | 来源 |\n` +
-      `|------|------|------|\n` +
-      rows.join("\n");
-
-    return { content: [{ type: "text", text }] };
+    return {
+      content: [{
+        type: "text",
+        text:
+          `## 搜索结果：${matched.length} 个匹配 "${q}"\n\n` +
+          `| 名称 | 描述 | 来源 |\n|------|------|------|\n` +
+          rows.join("\n"),
+      }],
+    };
   }
+);
 
-  // ── list_skill_files ──
-  if (name === "list_skill_files") {
-    const skillName = (args as { name: string }).name.trim();
-    const skills = scanSkills();
-    const skill = skills.find(
-      (s) => s.name === skillName || s.skillDir.endsWith(path.sep + skillName)
-    );
+// ── list_skill_files ──
+server.registerTool(
+  "list_skill_files",
+  {
+    description: "列出指定 Skill 目录下的所有附属文件（脚本、模板等）",
+    inputSchema: {
+      name: z.string().describe("Skill 名称"),
+    },
+  },
+  async ({ name: skillName }) => {
+    const skill = findSkillByName(skillName.trim());
 
     if (!skill) {
       return {
-        content: [
-          {
-            type: "text",
-            text: `未找到 Skill \`${skillName}\`。`,
-          },
-        ],
+        content: [{ type: "text", text: `未找到 Skill \`${skillName}\`。` }],
       };
     }
 
     const files = listFilesRecursive(skill.skillDir);
-    const text =
-      `## Skill \`${skill.name}\` 的附属文件\n` +
-      `**路径**: ${skill.skillDir}\n\n` +
-      (files.length === 0
-        ? "_（无附属文件）_"
-        : files.map((f) => `- \`${f}\``).join("\n"));
-
-    return { content: [{ type: "text", text }] };
+    return {
+      content: [{
+        type: "text",
+        text:
+          `## Skill \`${skill.name}\` 的附属文件\n` +
+          `**路径**: ${skill.skillDir}\n\n` +
+          (files.length === 0 ? "_（无附属文件）_" : files.map((f) => `- \`${f}\``).join("\n")),
+      }],
+    };
   }
+);
 
-  return {
-    content: [{ type: "text", text: `未知工具: ${name}` }],
-    isError: true,
-  };
-});
-
+// ──────────────────────────────────────────────
 // 启动
+// ──────────────────────────────────────────────
+
 async function main() {
   const transport = new StdioServerTransport();
   await server.connect(transport);
@@ -349,4 +333,4 @@ async function main() {
 main().catch((err) => {
   console.error("Fatal error:", err);
   process.exit(1);
-});
+});