@ian2018cs/agenthub 0.1.71 → 0.1.72

package/package.json

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

package/server/routes/agents.js

@@ -5,7 +5,7 @@ import path from 'path';
 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 { scanAgents, ensureAgentRepo, incrementPatchVersion, publishAgentToRepo, invalidateAgentCache } 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';
@@ -444,8 +444,7 @@ router.get('/', async (req, res) => {
  */
 router.post('/refresh', async (_req, res) => {
   try {
-    await ensureAgentRepo();
-    const agents = await scanAgents();
+    const agents = await scanAgents(true);
     res.json({ success: true, agentCount: agents.length });
   } catch (error) {
     console.error('Error refreshing agent repo:', error);
@@ -1295,7 +1294,7 @@ router.post('/submissions/:id/approve', async (req, res) => {
     if (updateAllUsers) {
       // Force-update all users who have this agent installed
       try {
-        const freshAgents = await scanAgents();
+        const freshAgents = await scanAgents(true);
         const publishedAgent = freshAgents.find(a =>
           a.dirName === submission.agent_name || a.name === submission.agent_name
         );

package/server/services/system-agent-repo.js

@@ -7,6 +7,14 @@ export const SYSTEM_AGENT_REPO_URL = 'git@git.amberweather.com:mcp-server/hupoer
 export const SYSTEM_AGENT_REPO_OWNER = 'mcp-server';
 export const SYSTEM_AGENT_REPO_NAME = 'hupoer-agents';
 
+// ─── In-memory cache ──────────────────────────────────────────────────────────
+const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
+let agentCache = { agents: null, cachedAt: 0 };
+
+export function invalidateAgentCache() {
+  agentCache = { agents: null, cachedAt: 0 };
+}
+
 function runGit(args, cwd = null) {
   return new Promise((resolve, reject) => {
     const opts = {
@@ -153,15 +161,23 @@ async function parseAgentYaml(agentDir) {
 
 /**
  * Scan the agent repo for available agents.
+ * @param {boolean} force - When true, always git pull and re-scan (bypasses cache).
+ *                          When false (default), returns cached result if < 5 min old.
  * Returns array of agent metadata objects.
  */
-export async function scanAgents() {
+export async function scanAgents(force = false) {
+  // Return cached result if fresh and not forced
+  if (!force && agentCache.agents !== null && Date.now() - agentCache.cachedAt < CACHE_TTL_MS) {
+    return agentCache.agents;
+  }
+
   let repoPath;
   try {
     repoPath = await ensureAgentRepo();
   } catch (err) {
     console.error('[AgentRepo] Could not access agent repo:', err.message);
-    return [];
+    // Return stale cache on network error rather than empty list
+    return agentCache.agents ?? [];
   }
 
   const agents = [];
@@ -195,6 +211,7 @@ export async function scanAgents() {
     });
   }
 
+  agentCache = { agents, cachedAt: Date.now() };
   return agents;
 }
 

package/server/services/system-mcp-repo.js

@@ -7,39 +7,35 @@ const SYSTEM_MCP_REPO_URL = 'git@git.amberweather.com:mcp-server/hupoer-mcps.git
 const SYSTEM_MCP_REPO_OWNER = 'mcp-server';
 const SYSTEM_MCP_REPO_NAME = 'hupoer-mcps';
 
-function cloneRepository(url, destinationPath) {
+function runGit(args, cwd) {
   return new Promise((resolve, reject) => {
-    const gitProcess = spawn('git', ['clone', '--depth', '1', url, destinationPath], {
+    const gitProcess = spawn('git', args, {
+      cwd,
       stdio: ['ignore', 'pipe', 'pipe'],
       env: { ...process.env, GIT_TERMINAL_PROMPT: '0' }
     });
-
     let stderr = '';
     gitProcess.stderr.on('data', (data) => { stderr += data.toString(); });
     gitProcess.on('close', (code) => {
       if (code === 0) resolve();
-      else reject(new Error(stderr || `Git clone failed with code ${code}`));
+      else reject(new Error(stderr || `Git ${args[0]} failed with code ${code}`));
     });
     gitProcess.on('error', (err) => { reject(err); });
   });
 }
 
-function updateRepository(repoPath) {
-  return new Promise((resolve, reject) => {
-    const gitProcess = spawn('git', ['pull', '--ff-only'], {
-      cwd: repoPath,
-      stdio: ['ignore', 'pipe', 'pipe'],
-      env: { ...process.env, GIT_TERMINAL_PROMPT: '0' }
-    });
-
-    let stderr = '';
-    gitProcess.stderr.on('data', (data) => { stderr += data.toString(); });
-    gitProcess.on('close', (code) => {
-      if (code === 0) resolve();
-      else reject(new Error(stderr || `Git pull failed with code ${code}`));
-    });
-    gitProcess.on('error', (err) => { reject(err); });
-  });
+async function updateRepository(repoPath) {
+  try {
+    await runGit(['pull', '--ff-only'], repoPath);
+  } catch (err) {
+    if (err.message.includes('overwritten by merge') || err.message.includes('overwritten by checkout') || err.message.includes('local changes')) {
+      console.log('[SystemMcpRepo] git pull failed due to local changes, discarding and retrying:', err.message);
+      await runGit(['checkout', '--', '.'], repoPath);
+      await runGit(['pull', '--ff-only'], repoPath);
+    } else {
+      throw err;
+    }
+  }
 }
 
 export async function ensureSystemMcpRepo() {
@@ -58,7 +54,7 @@ export async function ensureSystemMcpRepo() {
     // Not yet cloned
     await fs.mkdir(path.dirname(publicRepoPath), { recursive: true });
     try {
-      await cloneRepository(SYSTEM_MCP_REPO_URL, publicRepoPath);
+      await runGit(['clone', '--depth', '1', SYSTEM_MCP_REPO_URL, publicRepoPath], undefined);
       console.log('[SystemMcpRepo] Cloned system MCP repo to', publicRepoPath);
     } catch (err) {
       console.error('[SystemMcpRepo] Failed to clone system MCP repo:', err.message);

package/server/services/system-repo.js

@@ -7,43 +7,35 @@ const SYSTEM_REPO_URL = 'git@git.amberweather.com:mcp-server/hupoer-skills.git';
 const SYSTEM_REPO_OWNER = 'mcp-server';
 const SYSTEM_REPO_NAME = 'hupoer-skills';
 
-function cloneRepository(url, destinationPath) {
+function runGit(args, cwd) {
   return new Promise((resolve, reject) => {
-    const gitProcess = spawn('git', ['clone', '--depth', '1', url, destinationPath], {
+    const gitProcess = spawn('git', args, {
+      cwd,
       stdio: ['ignore', 'pipe', 'pipe'],
       env: { ...process.env, GIT_TERMINAL_PROMPT: '0' }
     });
-
     let stderr = '';
     gitProcess.stderr.on('data', (data) => { stderr += data.toString(); });
-
     gitProcess.on('close', (code) => {
       if (code === 0) resolve();
-      else reject(new Error(stderr || `Git clone failed with code ${code}`));
+      else reject(new Error(stderr || `Git ${args[0]} failed with code ${code}`));
     });
-
     gitProcess.on('error', (err) => { reject(err); });
   });
 }
 
-function updateRepository(repoPath) {
-  return new Promise((resolve, reject) => {
-    const gitProcess = spawn('git', ['pull', '--ff-only'], {
-      cwd: repoPath,
-      stdio: ['ignore', 'pipe', 'pipe'],
-      env: { ...process.env, GIT_TERMINAL_PROMPT: '0' }
-    });
-
-    let stderr = '';
-    gitProcess.stderr.on('data', (data) => { stderr += data.toString(); });
-
-    gitProcess.on('close', (code) => {
-      if (code === 0) resolve();
-      else reject(new Error(stderr || `Git pull failed with code ${code}`));
-    });
-
-    gitProcess.on('error', (err) => { reject(err); });
-  });
+async function updateRepository(repoPath) {
+  try {
+    await runGit(['pull', '--ff-only'], repoPath);
+  } catch (err) {
+    if (err.message.includes('overwritten by merge') || err.message.includes('overwritten by checkout') || err.message.includes('local changes')) {
+      console.log('[SystemRepo] git pull failed due to local changes, discarding and retrying:', err.message);
+      await runGit(['checkout', '--', '.'], repoPath);
+      await runGit(['pull', '--ff-only'], repoPath);
+    } else {
+      throw err;
+    }
+  }
 }
 
 /**
@@ -67,7 +59,7 @@ export async function ensureSystemRepo() {
     // Not yet cloned
     await fs.mkdir(path.dirname(publicRepoPath), { recursive: true });
     try {
-      await cloneRepository(SYSTEM_REPO_URL, publicRepoPath);
+      await runGit(['clone', '--depth', '1', SYSTEM_REPO_URL, publicRepoPath], undefined);
       console.log('[SystemRepo] Cloned system repo to', publicRepoPath);
     } catch (err) {
       console.error('[SystemRepo] Failed to clone system repo:', err.message);