@ian2018cs/agenthub 0.1.69 → 0.1.71

package/server/routes/agents.js

@@ -6,6 +6,8 @@ import { spawn } from 'child_process';
 import AdmZip from 'adm-zip';
 import { getUserPaths, getPublicPaths } from '../services/user-directories.js';
 import { scanAgents, ensureAgentRepo, incrementPatchVersion, publishAgentToRepo } from '../services/system-agent-repo.js';
+import { ensureSystemRepo, SYSTEM_REPO_URL } from '../services/system-repo.js';
+import { ensureSystemMcpRepo, SYSTEM_MCP_REPO_URL } from '../services/system-mcp-repo.js';
 import { addProjectManually, loadProjectConfig, saveProjectConfig } from '../projects.js';
 import { agentSubmissionDb, userDb } from '../database/db.js';
 import { chatCompletion } from '../services/llm.js';
@@ -77,6 +79,86 @@ function runGit(args, cwd = null) {
   });
 }
 
+/**
+ * Recursively copy all files and directories from src to dst.
+ */
+async function copyDirRecursive(src, dst) {
+  await fs.mkdir(dst, { recursive: true });
+  const entries = await fs.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const dstPath = path.join(dst, entry.name);
+    if (entry.isDirectory()) {
+      await copyDirRecursive(srcPath, dstPath);
+    } else {
+      await fs.copyFile(srcPath, dstPath);
+    }
+  }
+}
+
+/**
+ * Recursively add all files under dirPath into a ZIP object under the given zipPrefix.
+ */
+async function addDirToZip(zip, dirPath, zipPrefix) {
+  const entries = await fs.readdir(dirPath, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path.join(dirPath, entry.name);
+    const zipPath = zipPrefix ? `${zipPrefix}/${entry.name}` : entry.name;
+    if (entry.isDirectory()) {
+      await addDirToZip(zip, fullPath, zipPath);
+    } else {
+      const content = await fs.readFile(fullPath);
+      zip.addFile(zipPath, content);
+    }
+  }
+}
+
+/**
+ * Parse skills list from agent.yaml content string.
+ * Returns array of { name, repo }.
+ */
+function parseYamlSkills(yamlContent) {
+  const skills = [];
+  const section = yamlContent.match(/^skills:\s*\n((?:[ \t]+.+\n?)*)/m);
+  if (!section) return skills;
+  const lines = section[1].split('\n');
+  let current = null;
+  for (const line of lines) {
+    const nameMatch = line.match(/^\s+-\s+name:\s*["']?(.+?)["']?\s*$/);
+    if (nameMatch) {
+      if (current) skills.push(current);
+      current = { name: nameMatch[1].trim(), repo: '' };
+    }
+    const repoMatch = line.match(/^\s+repo:\s*["']?(.*?)["']?\s*$/);
+    if (repoMatch && current) current.repo = repoMatch[1].trim();
+  }
+  if (current) skills.push(current);
+  return skills;
+}
+
+/**
+ * Parse MCPs list from agent.yaml content string.
+ * Returns array of { name, repo }.
+ */
+function parseYamlMcps(yamlContent) {
+  const mcps = [];
+  const section = yamlContent.match(/^mcps:\s*\n((?:[ \t]+.+\n?)*)/m);
+  if (!section) return mcps;
+  const lines = section[1].split('\n');
+  let current = null;
+  for (const line of lines) {
+    const nameMatch = line.match(/^\s+-\s+name:\s*["']?(.+?)["']?\s*$/);
+    if (nameMatch) {
+      if (current) mcps.push(current);
+      current = { name: nameMatch[1].trim(), repo: '' };
+    }
+    const repoMatch = line.match(/^\s+repo:\s*["']?(.*?)["']?\s*$/);
+    if (repoMatch && current) current.repo = repoMatch[1].trim();
+  }
+  if (current) mcps.push(current);
+  return mcps;
+}
+
 /**
  * Ensure a skill repo is available for the user. Clone if needed.
  * Returns the local path to the skill directory inside the repo.
@@ -549,7 +631,15 @@ router.get('/preview', async (req, res) => {
         if (name.startsWith('.')) continue;
         const linkPath = path.join(userPaths.skillsDir, name);
         const repo = await getSkillRepoUrl(linkPath, publicPaths.skillsRepoDir);
-        skills.push({ name, repo });
+        let localPath = '';
+        if (!repo) {
+          // Skill not from a git repo — check if it's a user-imported skill
+          try {
+            const realPath = await fs.realpath(linkPath);
+            if (realPath.includes('/skills-import/')) localPath = realPath;
+          } catch {}
+        }
+        skills.push({ name, repo, localPath });
       }
     } catch {}
 
@@ -558,9 +648,22 @@ router.get('/preview', async (req, res) => {
     try {
       const claudeJsonPath = path.join(userPaths.claudeDir, '.claude.json');
       const claudeConfig = JSON.parse(await fs.readFile(claudeJsonPath, 'utf-8'));
+
+      // User-scoped MCPs (top-level mcpServers)
       for (const name of Object.keys(claudeConfig.mcpServers || {})) {
         const repo = await getMcpRepoUrl(name, publicPaths.mcpRepoDir);
-        mcps.push({ name, repo });
+        const config = !repo ? (claudeConfig.mcpServers[name] || null) : null;
+        mcps.push({ name, repo, config, scope: 'user', mcpProjectPath: null });
+      }
+
+      // Project-scoped MCPs (projects[projectPath].mcpServers)
+      const projectMcpServers = claudeConfig.projects?.[projectPath]?.mcpServers || {};
+      for (const name of Object.keys(projectMcpServers)) {
+        // Skip if already listed as user-scoped
+        if (mcps.some(m => m.name === name)) continue;
+        const repo = await getMcpRepoUrl(name, publicPaths.mcpRepoDir);
+        const config = !repo ? (projectMcpServers[name] || null) : null;
+        mcps.push({ name, repo, config, scope: 'local', mcpProjectPath: projectPath });
       }
     } catch {}
 
@@ -708,15 +811,15 @@ router.post('/generate-description', async (req, res) => {
     const skillList = skills.length > 0 ? skills.map(s => `- ${s}`).join('\n') : '(无)';
     const mcpList = mcps.length > 0 ? mcps.map(m => `- ${m}`).join('\n') : '(无)';
 
-    const systemPrompt = `你是一个技术文档专家，专门为 AI Agent 编写简洁、清晰的功能描述。
+    const systemPrompt = `你是一个技术文档专家，专门为 共享项目 编写简洁、清晰的功能描述。
 描述应该：
 - 简明扼要，2-4 句话
-- 说明 Agent 的主要用途和能力
+- 说明项目的主要用途和能力
 - 自然流畅，不使用模板化套话
 - 使用中文
 只输出描述内容，不要有前缀或标题。`;
 
-    const userPrompt = `请根据以下信息，为这个 Claude Agent 生成一段功能描述：
+    const userPrompt = `请根据以下信息，为这个项目生成一段功能描述：
 
 ${claudeMdContent ? `## CLAUDE.md 内容\n${claudeMdContent.slice(0, 3000)}\n` : '## CLAUDE.md\n(未找到)\n'}
 ## 已集成的 Skills
@@ -792,6 +895,41 @@ router.post('/submit', async (req, res) => {
       }
     }
 
+    // Include local skill files for imported skills (repo is absolute path)
+    const parsedSkills = parseYamlSkills(agentYaml);
+    for (const skill of parsedSkills) {
+      if (!skill.repo.startsWith('/')) continue; // Only handle absolute local paths
+      try {
+        await addDirToZip(zip, skill.repo, `_skill_files/${skill.name}`);
+        console.log(`[AgentSubmit] Included local skill files for "${skill.name}" from ${skill.repo}`);
+      } catch (e) {
+        console.warn(`[AgentSubmit] Could not include skill files for "${skill.name}": ${e.message}`);
+      }
+    }
+
+    // Capture user-configured MCP configs (repo is empty)
+    const parsedMcps = parseYamlMcps(agentYaml);
+    if (parsedMcps.some(m => !m.repo)) {
+      try {
+        const userPaths = getUserPaths(userUuid);
+        const claudeJsonPath = path.join(userPaths.claudeDir, '.claude.json');
+        const claudeConfig = JSON.parse(await fs.readFile(claudeJsonPath, 'utf-8'));
+        const projectMcpServers = claudeConfig.projects?.[projectPath]?.mcpServers || {};
+        for (const mcp of parsedMcps) {
+          if (mcp.repo) continue; // Already has a repo URL
+          // Check user-scoped first, then project-scoped
+          const serverConfig = claudeConfig.mcpServers?.[mcp.name] ?? projectMcpServers[mcp.name];
+          if (serverConfig) {
+            const mcpConfig = { [mcp.name]: serverConfig };
+            zip.addFile(`_mcp_configs/${mcp.name}/mcp.json`, Buffer.from(JSON.stringify(mcpConfig, null, 2)));
+            console.log(`[AgentSubmit] Captured user-configured MCP config for "${mcp.name}"`);
+          }
+        }
+      } catch (e) {
+        console.warn(`[AgentSubmit] Could not capture MCP configs: ${e.message}`);
+      }
+    }
+
     // Save ZIP to disk
     const publicPaths = getPublicPaths();
     const userSubmitDir = path.join(publicPaths.agentSubmissionsDir, userUuid);
@@ -946,6 +1084,199 @@ router.post('/submissions/:id/approve', async (req, res) => {
     // Get submitter name for commit message
     const submitter = submission.username || submission.email || `user-${submission.user_id}`;
 
+    // Get submitter's UUID for skill/MCP operations
+    const allUsers = userDb.getAllUsers();
+    const submitterUser = allUsers.find(u => u.id === submission.user_id);
+    const submitterUuid = submitterUser?.uuid;
+
+    // Migrate local skills and user-configured MCPs before publishing
+    const agentYamlPath = path.join(extractDir, 'agent.yaml');
+    let agentYamlContent;
+    try {
+      agentYamlContent = await fs.readFile(agentYamlPath, 'utf-8');
+    } catch {
+      agentYamlContent = null;
+    }
+
+    if (agentYamlContent && submitterUuid) {
+      // === A. Migrate local skills (repo is absolute path starting with "/") ===
+      const yamlSkills = parseYamlSkills(agentYamlContent);
+      const localSkills = yamlSkills.filter(s => s.repo.startsWith('/'));
+
+      if (localSkills.length > 0) {
+        let skillRepoPath;
+        try {
+          skillRepoPath = await ensureSystemRepo(); // git pull or clone
+        } catch (e) {
+          console.error('[AgentApprove] Failed to ensure system skill repo:', e.message);
+        }
+
+        if (skillRepoPath) {
+          for (const skill of localSkills) {
+            try {
+              // Copy skill folder from extracted ZIP to system skill repo
+              const srcSkillDir = path.join(extractDir, '_skill_files', skill.name);
+              const destSkillDir = path.join(skillRepoPath, skill.name);
+
+              // Verify source exists in ZIP
+              try {
+                await fs.access(srcSkillDir);
+              } catch {
+                console.warn(`[AgentApprove] Skill files for "${skill.name}" not found in submission ZIP, skipping`);
+                continue;
+              }
+
+              // Remove old version in repo if it exists
+              await fs.rm(destSkillDir, { recursive: true, force: true });
+              await copyDirRecursive(srcSkillDir, destSkillDir);
+              console.log(`[AgentApprove] Copied skill "${skill.name}" to system skill repo`);
+
+              // Git: add, commit, push
+              await runGit(['add', skill.name], skillRepoPath);
+              await runGit(
+                ['commit', '-m', `feat: add skill ${skill.name} from approved agent submission #${submission.id}`],
+                skillRepoPath
+              );
+              await runGit(['push'], skillRepoPath);
+              console.log(`[AgentApprove] Pushed skill "${skill.name}" to remote`);
+
+              // Clean up submitter's skills-import directory for this skill
+              const userPaths = getUserPaths(submitterUuid);
+              try {
+                await fs.rm(path.join(userPaths.skillsImportDir, skill.name), { recursive: true, force: true });
+              } catch {}
+
+              // Re-install skill for submitter from the system repo
+              await installSkill(skill.name, SYSTEM_REPO_URL, submitterUuid);
+              console.log(`[AgentApprove] Re-installed skill "${skill.name}" for submitter from system repo`);
+
+              // Update agent.yaml: replace absolute path with system repo git URL
+              const escapedName = skill.name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+              agentYamlContent = agentYamlContent.replace(
+                new RegExp(`(- name: "${escapedName}"\\s*\\n\\s+repo: )"[^"]*"`, 'gm'),
+                `$1"${SYSTEM_REPO_URL}"`
+              );
+            } catch (e) {
+              console.error(`[AgentApprove] Failed to migrate skill "${skill.name}":`, e.message);
+              // Continue with other skills even if one fails
+            }
+          }
+        }
+      }
+
+      // === B. Migrate user-configured MCPs (repo is empty, config in _mcp_configs/) ===
+      const yamlMcps = parseYamlMcps(agentYamlContent);
+      const localMcps = yamlMcps.filter(m => !m.repo);
+
+      if (localMcps.length > 0) {
+        let mcpRepoPath;
+        try {
+          mcpRepoPath = await ensureSystemMcpRepo(); // git pull or clone
+        } catch (e) {
+          console.error('[AgentApprove] Failed to ensure system MCP repo:', e.message);
+        }
+
+        if (mcpRepoPath) {
+          for (const mcp of localMcps) {
+            try {
+              // Read captured MCP config from ZIP extraction
+              const mcpConfigPath = path.join(extractDir, '_mcp_configs', mcp.name, 'mcp.json');
+              let mcpConfig;
+              try {
+                mcpConfig = JSON.parse(await fs.readFile(mcpConfigPath, 'utf-8'));
+              } catch {
+                console.warn(`[AgentApprove] No captured config for MCP "${mcp.name}", skipping`);
+                continue;
+              }
+
+              // Create MCP folder in system MCP repo
+              const mcpFolderPath = path.join(mcpRepoPath, mcp.name);
+              await fs.mkdir(mcpFolderPath, { recursive: true });
+
+              // Write mcp.json
+              await fs.writeFile(path.join(mcpFolderPath, 'mcp.json'), JSON.stringify(mcpConfig, null, 2));
+
+              // Write mcp.yaml with basic metadata
+              const mcpYaml = `name: "${mcp.name}"\ndescription: "MCP service migrated from shared project '${submission.display_name}' (submission #${submission.id})"\n`;
+              await fs.writeFile(path.join(mcpFolderPath, 'mcp.yaml'), mcpYaml);
+              console.log(`[AgentApprove] Created MCP "${mcp.name}" in system MCP repo`);
+
+              // Git: add, commit, push
+              await runGit(['add', mcp.name], mcpRepoPath);
+              await runGit(
+                ['commit', '-m', `feat: add mcp ${mcp.name} from approved agent submission #${submission.id}`],
+                mcpRepoPath
+              );
+              await runGit(['push'], mcpRepoPath);
+              console.log(`[AgentApprove] Pushed MCP "${mcp.name}" to remote`);
+
+              // Remove MCP from submitter's .claude.json (user-scoped or project-scoped)
+              const userPaths = getUserPaths(submitterUuid);
+              const claudeJsonPath = path.join(userPaths.claudeDir, '.claude.json');
+              try {
+                const claudeConfig = JSON.parse(await fs.readFile(claudeJsonPath, 'utf-8'));
+                let changed = false;
+                // Remove from user-scoped
+                if (claudeConfig.mcpServers) {
+                  for (const serverKey of Object.keys(mcpConfig)) {
+                    if (serverKey in claudeConfig.mcpServers) {
+                      delete claudeConfig.mcpServers[serverKey];
+                      changed = true;
+                    }
+                  }
+                }
+                // Remove from all project-scoped entries
+                if (claudeConfig.projects) {
+                  for (const projectConfig of Object.values(claudeConfig.projects)) {
+                    if (projectConfig?.mcpServers) {
+                      for (const serverKey of Object.keys(mcpConfig)) {
+                        if (serverKey in projectConfig.mcpServers) {
+                          delete projectConfig.mcpServers[serverKey];
+                          changed = true;
+                        }
+                      }
+                    }
+                  }
+                }
+                if (changed) {
+                  await fs.writeFile(claudeJsonPath, JSON.stringify(claudeConfig, null, 2), 'utf-8');
+                }
+              } catch (e) {
+                console.warn(`[AgentApprove] Could not remove MCP "${mcp.name}" from submitter .claude.json:`, e.message);
+              }
+
+              // Re-install MCP for submitter from system repo
+              await installMcp(mcp.name, SYSTEM_MCP_REPO_URL, submitterUuid);
+              console.log(`[AgentApprove] Re-installed MCP "${mcp.name}" for submitter from system repo`);
+
+              // Update agent.yaml: replace empty repo with system MCP repo git URL
+              const escapedName = mcp.name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+              agentYamlContent = agentYamlContent.replace(
+                new RegExp(`(- name: "${escapedName}"\\s*\\n\\s+repo: )""`, 'gm'),
+                `$1"${SYSTEM_MCP_REPO_URL}"`
+              );
+            } catch (e) {
+              console.error(`[AgentApprove] Failed to migrate MCP "${mcp.name}":`, e.message);
+              // Continue with other MCPs even if one fails
+            }
+          }
+        }
+      }
+
+      // Write updated agent.yaml back to extractDir so publishAgentToRepo uses correct repo URLs
+      if (localSkills.length > 0 || localMcps.length > 0) {
+        try {
+          await fs.writeFile(agentYamlPath, agentYamlContent, 'utf-8');
+        } catch (e) {
+          console.error('[AgentApprove] Failed to write updated agent.yaml:', e.message);
+        }
+      }
+
+      // Remove temporary migration directories from extractDir before publishing to agent repo
+      await fs.rm(path.join(extractDir, '_skill_files'), { recursive: true, force: true });
+      await fs.rm(path.join(extractDir, '_mcp_configs'), { recursive: true, force: true });
+    }
+
     // Publish to git repo
     try {
       await publishAgentToRepo(submission.agent_name, extractDir, newVersion, submitter);