postar-pipe-mcp 1.0.0 → 1.0.2

package/dist/server.js

@@ -21015,7 +21015,7 @@ function registerGitLab(manager2) {
     manager2.registerConfig("gitlab", {
       name: "gitlab",
       command: "npx",
-      args: ["-y", "@structured-world/gitlab-mcp"],
+      args: ["-y", "gitlab-core-mcp"],
       env: {
         GITLAB_API_URL: gitlabUrl,
         GITLAB_TOKEN: gitlabToken
@@ -21057,11 +21057,21 @@ function initMCPClients() {
 }
 const GITLAB_PREFIX = "mcp_gitlab_";
 function getRegisteredServers() {
-  const servers = ["gitlab"];
+  const servers = [];
+  if (process.env.GITLAB_TOKEN) {
+    servers.push("gitlab");
+    console.error("[MCP-PIPE][DEBUG] 检测到 GITLAB_TOKEN,添加 gitlab 服务器");
+  } else {
+    console.error("[MCP-PIPE][DEBUG] 未检测到 GITLAB_TOKEN");
+  }
   if (process.env.JENKINS_URL && process.env.JENKINS_USER && process.env.JENKINS_TOKEN) {
     servers.push("jenkins");
+    console.error("[MCP-PIPE][DEBUG] 检测到默认 Jenkins 配置");
+  } else {
+    console.error("[MCP-PIPE][DEBUG] 未检测到默认 Jenkins 配置 (JENKINS_URL/JENKINS_USER/JENKINS_TOKEN)");
   }
   const urlPattern = /^JENKINS_([A-Z0-9_]+)_URL$/;
+  console.error("[MCP-PIPE][DEBUG] 开始检测命名 Jenkins 实例...");
   for (const key of Object.keys(process.env)) {
     const match = key.match(urlPattern);
     if (!match) continue;
@@ -21070,11 +21080,14 @@ function getRegisteredServers() {
     const tokenKey = `JENKINS_${suffix}_TOKEN`;
     const user = process.env[userKey];
     const token = process.env[tokenKey];
+    console.error(`[MCP-PIPE][DEBUG] 检查 ${key} -> suffix=${suffix}, user=${!!user}, token=${!!token}`);
     if (user && token) {
       const instanceName = `jenkins-${suffix.toLowerCase().replace(/_/g, "-")}`;
       servers.push(instanceName);
+      console.error(`[MCP-PIPE][DEBUG] ✅ 添加命名 Jenkins 实例: ${instanceName}`);
     }
   }
+  console.error(`[MCP-PIPE][DEBUG] 最终注册的服务器列表: ${servers.join(", ") || "(空)"}`);
   return servers;
 }
 function getToolPrefix(serverName) {
@@ -21097,49 +21110,59 @@ async function getProxiedTools() {
   const jenkinsServers = servers.filter((s) => s.startsWith("jenkins") && s !== "jenkins");
   const mainJenkins = servers.includes("jenkins") ? "jenkins" : null;
   const otherServers = servers.filter((s) => !s.startsWith("jenkins"));
-  if (mainJenkins) {
-    const prefix = getToolPrefix(mainJenkins);
-    try {
-      const tools = await manager2.listTools(mainJenkins);
-      for (const tool of tools.tools || []) {
+  const allJenkinsServers = mainJenkins ? [mainJenkins, ...jenkinsServers] : jenkinsServers;
+  let isFirstJenkins = true;
+  for (const serverName of allJenkinsServers) {
+    const prefix = getToolPrefix(serverName);
+    if (isFirstJenkins) {
+      try {
+        const tools = await manager2.listTools(serverName);
+        for (const tool of tools.tools || []) {
+          const proxiedToolName = `${prefix}${tool.name}`;
+          const proxiedTool = {
+            ...tool,
+            name: proxiedToolName,
+            description: `[${serverName}] ${tool.description || ""}`
+          };
+          allTools.push(proxiedTool);
+          toolSchemaCache.set(proxiedToolName, tool.inputSchema);
+        }
+        console.error(`[MCP-PIPE] 已从 ${serverName} 获取 ${tools.tools?.length || 0} 个工具`);
+        isFirstJenkins = false;
+      } catch (error2) {
+        console.error(`[MCP-PIPE] 无法从 ${serverName} 获取工具列表:`, error2);
+        continue;
+      }
+    } else {
+      const sourcePrefix = mainJenkins ? getToolPrefix(mainJenkins) : getToolPrefix(allJenkinsServers[0]);
+      const jenkinsTools = allTools.filter((t) => t.name.startsWith(sourcePrefix));
+      for (const tool of jenkinsTools) {
+        const originalToolName = tool.name.slice(sourcePrefix.length);
+        const proxiedToolName = `${prefix}${originalToolName}`;
         const proxiedTool = {
           ...tool,
-          name: `${prefix}${tool.name}`,
-          description: `[${mainJenkins}] ${tool.description || ""}`
+          name: proxiedToolName,
+          description: `[${serverName}] ${tool.description || ""}`
         };
         allTools.push(proxiedTool);
+        toolSchemaCache.set(proxiedToolName, tool.inputSchema);
       }
-      console.error(`[MCP-PIPE] 已代理 ${mainJenkins} 的 ${tools.tools?.length || 0} 个工具`);
-    } catch (error2) {
-      console.error(`[MCP-PIPE] 无法获取 ${mainJenkins} 的工具列表:`, error2);
-    }
-  }
-  for (const serverName of jenkinsServers) {
-    const prefix = getToolPrefix(serverName);
-    const sourcePrefix = mainJenkins ? getToolPrefix(mainJenkins) : prefix;
-    const jenkinsTools = allTools.filter((t) => t.name.startsWith(sourcePrefix));
-    for (const tool of jenkinsTools) {
-      const originalToolName = tool.name.slice(sourcePrefix.length);
-      const proxiedTool = {
-        ...tool,
-        name: `${prefix}${originalToolName}`,
-        description: `[${serverName}] ${tool.description || ""}`
-      };
-      allTools.push(proxiedTool);
+      console.error(`[MCP-PIPE] 已为 ${serverName} 生成 ${jenkinsTools.length} 个工具别名`);
     }
-    console.error(`[MCP-PIPE] 已为 ${serverName} 生成 ${jenkinsTools.length} 个工具别名`);
   }
   for (const serverName of otherServers) {
     const prefix = getToolPrefix(serverName);
     try {
       const tools = await manager2.listTools(serverName);
       for (const tool of tools.tools || []) {
+        const proxiedToolName = `${prefix}${tool.name}`;
         const proxiedTool = {
           ...tool,
-          name: `${prefix}${tool.name}`,
+          name: proxiedToolName,
           description: `[${serverName}] ${tool.description || ""}`
         };
         allTools.push(proxiedTool);
+        toolSchemaCache.set(proxiedToolName, tool.inputSchema);
       }
       console.error(`[MCP-PIPE] 已代理 ${serverName} 的 ${tools.tools?.length || 0} 个工具`);
     } catch (error2) {
@@ -21148,9 +21171,40 @@ async function getProxiedTools() {
   }
   return allTools;
 }
+function fixArgumentTypes(args, toolSchema) {
+  if (!args || typeof args !== "object") return args;
+  const fixedArgs = { ...args };
+  if (!toolSchema?.properties) {
+    console.warn(`[MCP-PIPE] 警告: 工具缺少 schema,跳过类型修复`);
+    return fixedArgs;
+  }
+  for (const [key, schema] of Object.entries(toolSchema.properties)) {
+    if (key in fixedArgs && typeof fixedArgs[key] === "string") {
+      const propSchema = schema;
+      if (propSchema.type === "number" || propSchema.type === "integer") {
+        const num = Number(fixedArgs[key]);
+        if (!isNaN(num)) {
+          fixedArgs[key] = num;
+          console.debug(`[MCP-PIPE] 类型转换: ${key} "${fixedArgs[key]}" → ${num} (number)`);
+        }
+      }
+      if (propSchema.type === "boolean") {
+        const str = fixedArgs[key].toLowerCase();
+        if (str === "true" || str === "false") {
+          fixedArgs[key] = str === "true";
+          console.debug(`[MCP-PIPE] 类型转换: ${key} "${str}" → ${fixedArgs[key]} (boolean)`);
+        }
+      }
+    }
+  }
+  return fixedArgs;
+}
+const toolSchemaCache = /* @__PURE__ */ new Map();
 async function handleProxiedTool(name, args) {
   const manager2 = getMCPClientManager();
   const servers = getRegisteredServers();
+  const toolSchema = toolSchemaCache.get(name);
+  const fixedArgs = fixArgumentTypes(args, toolSchema);
   if (name.startsWith("mcp_jenkins_")) {
     let targetMCP = null;
     const otherJenkinsServers = servers.filter((s) => s.startsWith("jenkins-"));
@@ -21168,7 +21222,7 @@ async function handleProxiedTool(name, args) {
       const prefix = getToolPrefix(targetMCP);
       const originalToolName = name.slice(prefix.length);
       try {
-        const result = await manager2.callTool(targetMCP, originalToolName, args);
+        const result = await manager2.callTool(targetMCP, originalToolName, fixedArgs);
         return result;
       } catch (error2) {
         return {
@@ -21183,7 +21237,7 @@ async function handleProxiedTool(name, args) {
     if (name.startsWith(prefix)) {
       const originalToolName = name.slice(prefix.length);
       try {
-        const result = await manager2.callTool(serverName, originalToolName, args);
+        const result = await manager2.callTool(serverName, originalToolName, fixedArgs);
         return result;
       } catch (error2) {
         return {
@@ -21199,13 +21253,26 @@ const skillCache = /* @__PURE__ */ new Map();
 const skillMetadataCache = /* @__PURE__ */ new Map();
 let remoteSkillsList = null;
 function parseSkillSource(url, index) {
-  const rawUrl = url.replace("/tree/", "/raw/").replace(/\/$/, "");
-  const match = url.match(/\/([^\/]+)\/[^\/]+\/tree\//);
+  const questionMarkIndex = url.indexOf("?");
+  let cleanUrl = url;
+  let skillsList;
+  if (questionMarkIndex !== -1) {
+    cleanUrl = url.substring(0, questionMarkIndex);
+    const queryString = url.substring(questionMarkIndex + 1);
+    const params = new URLSearchParams(queryString);
+    const skillsParam = params.get("skills");
+    if (skillsParam) {
+      skillsList = skillsParam.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+    }
+  }
+  const rawUrl = cleanUrl.replace("/tree/", "/raw/").replace(/\/$/, "");
+  const match = cleanUrl.match(/\/([^\/]+)\/[^\/]+\/tree\//);
   const name = match ? match[1] : `source-${index}`;
   return {
     name,
     baseUrl: rawUrl,
-    originalUrl: url
+    originalUrl: cleanUrl,
+    skillsList
   };
 }
 function parseCommandLineArgs() {
@@ -21345,35 +21412,52 @@ async function fetchRemoteSkillsFromDirectory(config2) {
   }
 }
 const skillSourceMap = /* @__PURE__ */ new Map();
+const CACHE_TTL_MINUTES = process.env.SKILLS_CACHE_TTL ? parseInt(process.env.SKILLS_CACHE_TTL) : 30;
+const CACHE_TTL = CACHE_TTL_MINUTES * 60 * 1e3;
+function isCacheExpired(timestamp) {
+  return Date.now() - timestamp > CACHE_TTL;
+}
 async function fetchRemoteSkillsList(config2) {
-  if (remoteSkillsList) {
-    return remoteSkillsList;
+  if (remoteSkillsList && !isCacheExpired(remoteSkillsList.timestamp)) {
+    return remoteSkillsList.data;
   }
+  console.error(`[SKILL-LOADER] Skills 列表缓存过期或不存在,重新加载...`);
   const skillsListEnv = process.env.SKILLS_LIST;
   if (skillsListEnv) {
     const skills = skillsListEnv.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
-    remoteSkillsList = skills;
+    remoteSkillsList = { data: skills, timestamp: Date.now() };
     console.error(`[SKILL-LOADER] 从环境变量加载 skills: ${skills.join(", ")}`);
     return skills;
   }
-  console.error(`[SKILL-LOADER] 未配置 SKILLS_LIST,自动遍历所有远程目录...`);
+  console.error(`[SKILL-LOADER] 未配置 SKILLS_LIST,检查各源独立配置...`);
   const allSkills = [];
   skillSourceMap.clear();
   if (config2.sources && config2.sources.length > 0) {
     for (const source of config2.sources) {
       console.error(`[SKILL-LOADER] 扫描源: ${source.name} (${source.originalUrl})`);
-      const sourceConfig = {
-        source: "remote",
-        baseUrl: source.baseUrl,
-        originalUrl: source.originalUrl
-      };
-      const skills = await fetchRemoteSkillsFromDirectory(sourceConfig);
-      console.error(`[SKILL-LOADER] 源 ${source.name} 发现 skills: ${skills.join(", ")}`);
-      for (const skillName of skills) {
-        if (!allSkills.includes(skillName)) {
-          allSkills.push(skillName);
+      if (source.skillsList && source.skillsList.length > 0) {
+        console.error(`[SKILL-LOADER] 源 ${source.name} 使用独立 skills 列表: ${source.skillsList.join(", ")}`);
+        for (const skillName of source.skillsList) {
+          if (!allSkills.includes(skillName)) {
+            allSkills.push(skillName);
+          }
+          skillSourceMap.set(skillName, source);
+        }
+      } else {
+        console.error(`[SKILL-LOADER] 源 ${source.name} 未配置独立 skills,自动遍历目录...`);
+        const sourceConfig = {
+          source: "remote",
+          baseUrl: source.baseUrl,
+          originalUrl: source.originalUrl
+        };
+        const skills = await fetchRemoteSkillsFromDirectory(sourceConfig);
+        console.error(`[SKILL-LOADER] 源 ${source.name} 发现 skills: ${skills.join(", ")}`);
+        for (const skillName of skills) {
+          if (!allSkills.includes(skillName)) {
+            allSkills.push(skillName);
+          }
+          skillSourceMap.set(skillName, source);
         }
-        skillSourceMap.set(skillName, source);
       }
     }
   } else if (config2.baseUrl && config2.originalUrl) {
@@ -21388,7 +21472,7 @@ async function fetchRemoteSkillsList(config2) {
     }
   }
   console.error(`[SKILL-LOADER] 汇总所有 skills: ${allSkills.join(", ")}`);
-  remoteSkillsList = allSkills;
+  remoteSkillsList = { data: allSkills, timestamp: Date.now() };
   return allSkills;
 }
 async function loadRemoteSkillContent(skillName, baseUrl) {
@@ -21474,11 +21558,14 @@ Skill 文件加载失败，请检查安装。`;
   }
 }
 async function getSkillContent(skillName) {
-  if (!skillCache.has(skillName)) {
-    const content = await loadSkillContent(skillName);
-    skillCache.set(skillName, content);
+  const cached2 = skillCache.get(skillName);
+  if (cached2 && !isCacheExpired(cached2.timestamp)) {
+    return cached2.data;
   }
-  return skillCache.get(skillName);
+  console.error(`[SKILL-LOADER] Skill 缓存过期或不存在,重新加载: ${skillName}`);
+  const content = await loadSkillContent(skillName);
+  skillCache.set(skillName, { data: content, timestamp: Date.now() });
+  return content;
 }
 async function parseFrontmatter(content) {
   const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
@@ -21510,21 +21597,24 @@ async function parseFrontmatter(content) {
   }
 }
 async function getSkillMetadata(skillName) {
-  if (!skillMetadataCache.has(skillName)) {
-    const content = await getSkillContent(skillName);
-    const { metadata: metadata2 } = await parseFrontmatter(content);
-    const metadataObj = {
-      name: metadata2.name || skillName,
-      description: metadata2.description || `${skillName} skill`,
-      constraint: metadata2.constraint,
-      version: metadata2.version,
-      tools: metadata2.tools || [],
-      ...metadata2
-      // 包含其他自定义字段
-    };
-    skillMetadataCache.set(skillName, metadataObj);
-  }
-  return skillMetadataCache.get(skillName);
+  const cached2 = skillMetadataCache.get(skillName);
+  if (cached2 && !isCacheExpired(cached2.timestamp)) {
+    return cached2.data;
+  }
+  console.error(`[SKILL-LOADER] Skill 元数据缓存过期或不存在,重新加载: ${skillName}`);
+  const content = await getSkillContent(skillName);
+  const { metadata: metadata2 } = await parseFrontmatter(content);
+  const metadataObj = {
+    name: metadata2.name || skillName,
+    description: metadata2.description || `${skillName} skill`,
+    constraint: metadata2.constraint,
+    version: metadata2.version,
+    tools: metadata2.tools || [],
+    ...metadata2
+    // 包含其他自定义字段
+  };
+  skillMetadataCache.set(skillName, { data: metadataObj, timestamp: Date.now() });
+  return metadataObj;
 }
 async function getAllSkillsMetadata() {
   const skills = await getAvailableSkills();