npm - @ian2018cs/agenthub - Versions diffs - 0.1.68 → 0.1.70 - Mend

@ian2018cs/agenthub 0.1.68 → 0.1.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/assets/index-DURCpZD_.css +32 -0
package/dist/assets/index-DxBc5bLY.js +186 -0
package/dist/assets/{vendor-icons-DxBNDMja.js → vendor-icons-BWqhkbta.js} +1 -1
package/dist/index.html +3 -3
package/package.json +1 -1
package/server/claude-sdk.js +75 -13
package/server/index.js +6 -1
package/server/routes/agents.js +337 -6
package/server/routes/mcp.js +122 -147
package/server/routes/skills.js +83 -0
package/server/services/system-mcp-repo.js +1 -1
package/server/services/system-repo.js +1 -1
package/dist/assets/index-C9BhBQzI.js +0 -184
package/dist/assets/index-HOTjBpXH.css +0 -32

package/dist/assets/{vendor-icons-DxBNDMja.js → vendor-icons-BWqhkbta.js} RENAMED Viewed

@@ -378,4 +378,4 @@ import{a as y}from"./vendor-react-Bv0Nkan8.js";/**
  *
  * This source code is licensed under the ISC license.
  * See the LICENSE file in the root directory of this source tree.
- */const Z1=[["path",{d:"M4 14a1 1 0 0 1-.78-1.63l9.9-10.2a.5.5 0 0 1 .86.46l-1.92 6.02A1 1 0 0 0 13 10h7a1 1 0 0 1 .78 1.63l-9.9 10.2a.5.5 0 0 1-.86-.46l1.92-6.02A1 1 0 0 0 11 14z",key:"1xq2db"}]],t0=e("zap",Z1);export{u2 as $,B1 as A,E1 as B,W1 as C,c2 as D,o2 as E,i2 as F,r2 as G,E2 as H,x2 as I,K1 as J,Q1 as K,m2 as L,f2 as M,X1 as N,q2 as O,b2 as P,T2 as Q,j2 as R,L2 as S,O2 as T,K2 as U,F1 as V,M2 as W,a0 as X,_2 as Y,t0 as Z,a2 as _,l2 as a,V2 as a0,z2 as a1,J2 as a2,T1 as a3,t2 as a4,D1 as a5,X2 as a6,F2 as a7,n2 as a8,Q2 as a9,W2 as aa,Y2 as ab,Z2 as ac,g2 as ad,e0 as ae,I2 as af,B2 as ag,v2 as ah,k2 as b,G1 as c,R2 as d,G2 as e,I1 as f,O1 as g,e2 as h,C2 as i,H2 as j,U2 as k,P2 as l,Y1 as m,J1 as n,R1 as o,A2 as p,w2 as q,$2 as r,y2 as s,s2 as t,d2 as u,N2 as v,D2 as w,S2 as x,p2 as y,h2 as z};
+ */const Z1=[["path",{d:"M4 14a1 1 0 0 1-.78-1.63l9.9-10.2a.5.5 0 0 1 .86.46l-1.92 6.02A1 1 0 0 0 13 10h7a1 1 0 0 1 .78 1.63l-9.9 10.2a.5.5 0 0 1-.86-.46l1.92-6.02A1 1 0 0 0 11 14z",key:"1xq2db"}]],t0=e("zap",Z1);export{u2 as $,B1 as A,E1 as B,W1 as C,c2 as D,o2 as E,i2 as F,r2 as G,h2 as H,x2 as I,K1 as J,Q1 as K,m2 as L,f2 as M,X1 as N,q2 as O,b2 as P,T2 as Q,j2 as R,L2 as S,O2 as T,K2 as U,F1 as V,M2 as W,a0 as X,_2 as Y,t0 as Z,a2 as _,E2 as a,V2 as a0,z2 as a1,J2 as a2,T1 as a3,t2 as a4,D1 as a5,X2 as a6,F2 as a7,n2 as a8,Q2 as a9,W2 as aa,Y2 as ab,Z2 as ac,g2 as ad,e0 as ae,I2 as af,B2 as ag,v2 as ah,s2 as b,S2 as c,I1 as d,O1 as e,l2 as f,k2 as g,G1 as h,R2 as i,G2 as j,e2 as k,C2 as l,H2 as m,U2 as n,P2 as o,Y1 as p,J1 as q,R1 as r,A2 as s,w2 as t,$2 as u,y2 as v,d2 as w,N2 as x,D2 as y,p2 as z};

package/dist/index.html CHANGED Viewed

@@ -25,16 +25,16 @@
     <!-- Prevent zoom on iOS -->
     <meta name="format-detection" content="telephone=no" />
-    <script type="module" crossorigin src="/assets/index-C9BhBQzI.js"></script>
+    <script type="module" crossorigin src="/assets/index-DxBc5bLY.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-Bv0Nkan8.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-codemirror-sVRjxPVQ.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-utils-00TdZexr.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-icons-DxBNDMja.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-icons-BWqhkbta.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-katex-DK8hFnhL.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-markdown-CjscLcYM.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-syntax-BKENXTeY.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-xterm-CvdiG4-n.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-HOTjBpXH.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DURCpZD_.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ian2018cs/agenthub",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "A web-based UI for AI Agents",
   "type": "module",
   "main": "server/index.js",

package/server/claude-sdk.js CHANGED Viewed

@@ -27,6 +27,46 @@ import { evaluate as evaluateToolGuard } from './services/tool-guard/index.js';
 // Session tracking: Map of session IDs to active query instances
 const activeSessions = new Map();
+/**
+ * MutableWriter wraps a WebSocketWriter and buffers messages while the client
+ * is disconnected. When the client reconnects, switchTo() replays the buffer
+ * to the new writer so no streaming chunks are lost.
+ */
+class MutableWriter {
+  constructor(ws) {
+    this.current = ws;
+    this.buffer = [];
+    this.MAX_BUFFER = 500;
+  }
+  send(data) {
+    if (this.current?.ws?.readyState === 1) {
+      this.current.send(data);
+    } else if (this.buffer.length < this.MAX_BUFFER) {
+      this.buffer.push(data);
+    }
+  }
+  setSessionId(sessionId) {
+    this.current?.setSessionId(sessionId);
+  }
+  getSessionId() {
+    return this.current?.getSessionId();
+  }
+  /** Attach a new WebSocketWriter and replay any buffered messages to it. */
+  switchTo(newWs) {
+    this.current = newWs;
+    const buf = this.buffer;
+    this.buffer = [];
+    for (const msg of buf) {
+      newWs.send(msg);
+    }
+  }
+}
 // In-memory registry of pending tool approvals keyed by requestId.
 // This does not persist approvals or share across processes; it exists so the
 // SDK can pause tool execution while the UI decides what to do.
@@ -233,14 +273,15 @@ function mapCliOptionsToSDK(options = {}) {
  * @param {Array<string>} tempImagePaths - Temp image file paths for cleanup
  * @param {string} tempDir - Temp directory for cleanup
  */
-function addSession(sessionId, queryInstance, tempImagePaths = [], tempDir = null, abortController = null) {
+function addSession(sessionId, queryInstance, tempImagePaths = [], tempDir = null, abortController = null, mutableWriter = null) {
   activeSessions.set(sessionId, {
     instance: queryInstance,
     startTime: Date.now(),
     status: 'active',
     tempImagePaths,
     tempDir,
-    abortController
+    abortController,
+    mutableWriter
   });
 }
@@ -261,6 +302,22 @@ function getSession(sessionId) {
   return activeSessions.get(sessionId);
 }
+/**
+ * Attaches a new WebSocketWriter to an active session, replaying any messages
+ * that were buffered while the previous connection was closed.
+ * @param {string} sessionId - Session identifier
+ * @param {Object} newWs - New WebSocketWriter instance
+ * @returns {boolean} True if the session was found and updated
+ */
+function updateSessionWriter(sessionId, newWs) {
+  const session = activeSessions.get(sessionId);
+  if (session?.mutableWriter) {
+    session.mutableWriter.switchTo(newWs);
+    return true;
+  }
+  return false;
+}
 /**
  * Gets all active session IDs
  * @returns {Array<string>} Array of active session IDs
@@ -497,6 +554,10 @@ async function loadMcpConfig(cwd, userUuid) {
  */
 async function queryClaudeSDK(command, options = {}, ws) {
   const { sessionId, userUuid } = options;
+  // Wrap the WebSocketWriter in a MutableWriter so messages are buffered
+  // if the client disconnects mid-stream and replayed on reconnect.
+  const mutableWriter = new MutableWriter(ws);
   let capturedSessionId = sessionId;
   let sessionCreatedSent = false;
   let tempImagePaths = [];
@@ -603,7 +664,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
       }
       const requestId = createRequestId();
-      ws.send({
+      mutableWriter.send({
         type: 'claude-permission-request',
         requestId,
         toolName,
@@ -619,7 +680,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
         timeoutMs: approvalTimeoutMs,
         signal: context?.signal,
         onCancel: (reason) => {
-          ws.send({
+          mutableWriter.send({
             type: 'claude-permission-cancelled',
             requestId,
             reason,
@@ -660,7 +721,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
     // Track the query instance for abort capability
     if (capturedSessionId) {
-      addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController);
+      addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController, mutableWriter);
     }
     // Process streaming messages
@@ -670,17 +731,17 @@ async function queryClaudeSDK(command, options = {}, ws) {
       if (message.session_id && !capturedSessionId) {
         capturedSessionId = message.session_id;
-        addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController);
+        addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController, mutableWriter);
         // Set session ID on writer
         if (ws.setSessionId && typeof ws.setSessionId === 'function') {
-          ws.setSessionId(capturedSessionId);
+          mutableWriter.setSessionId(capturedSessionId);
         }
         // Send session-created event only once for new sessions
         if (!sessionId && !sessionCreatedSent) {
           sessionCreatedSent = true;
-          ws.send({
+          mutableWriter.send({
             type: 'session-created',
             sessionId: capturedSessionId
           });
@@ -693,7 +754,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
       // Transform and send message to WebSocket
       const transformedMessage = transformMessage(message);
-      ws.send({
+      mutableWriter.send({
         type: 'claude-response',
         data: transformedMessage
       });
@@ -703,7 +764,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
         const tokenBudget = extractTokenBudget(message);
         if (tokenBudget) {
           console.log('Token budget from modelUsage:', tokenBudget);
-          ws.send({
+          mutableWriter.send({
             type: 'token-budget',
             data: tokenBudget
           });
@@ -789,7 +850,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
     // to the frontend, so we must not send a duplicate 'claude-complete'.
     if (!abortController.signal.aborted) {
       console.log('Streaming complete, sending claude-complete event');
-      ws.send({
+      mutableWriter.send({
         type: 'claude-complete',
         sessionId: capturedSessionId,
         exitCode: 0,
@@ -822,7 +883,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
     await cleanupTempFiles(tempImagePaths, tempDir);
     // Send error to WebSocket
-    ws.send({
+    mutableWriter.send({
       type: 'claude-error',
       error: error.message
     });
@@ -915,5 +976,6 @@ export {
   isClaudeSDKSessionActive,
   getActiveClaudeSDKSessions,
   resolveToolApproval,
-  renameSessionForUser
+  renameSessionForUser,
+  updateSessionWriter
 };

package/server/index.js CHANGED Viewed

@@ -43,7 +43,7 @@ import fetch from 'node-fetch';
 import mime from 'mime-types';
 import { getProjects, getSessions, getSessionMessages, renameProject, deleteSession, deleteProject, addProjectManually, extractProjectDirectory, clearProjectDirectoryCache, updateProjectLastActivity } from './projects.js';
-import { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval, renameSessionForUser } from './claude-sdk.js';
+import { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval, renameSessionForUser, updateSessionWriter } from './claude-sdk.js';
 import authRoutes from './routes/auth.js';
 import mcpRoutes from './routes/mcp.js';
 import mcpUtilsRoutes from './routes/mcp-utils.js';
@@ -808,6 +808,11 @@ function handleChatConnection(ws, userData) {
                 const sessionId = data.sessionId;
                 const isActive = isClaudeSDKSessionActive(sessionId);
+                // If still running, attach new writer to receive buffered + future messages
+                if (isActive) {
+                    updateSessionWriter(sessionId, writer);
+                }
                 writer.send({
                     type: 'session-status',
                     sessionId,

package/server/routes/agents.js CHANGED Viewed

@@ -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,9 +895,44 @@ 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, String(userId));
+    const userSubmitDir = path.join(publicPaths.agentSubmissionsDir, userUuid);
     await fs.mkdir(userSubmitDir, { recursive: true });
     const timestamp = Date.now();
@@ -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);