@ian2018cs/agenthub 0.1.33 → 0.1.35

package/dist/index.html

@@ -25,7 +25,7 @@
     
     <!-- Prevent zoom on iOS -->
     <meta name="format-detection" content="telephone=no" />
-    <script type="module" crossorigin src="/assets/index-Bmv1O2Q1.js"></script>
+    <script type="module" crossorigin src="/assets/index-SA2TCeJ4.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BeVl62c0.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-codemirror-C_VWDoZS.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-utils-00TdZexr.js">

package/package.json

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

package/server/routes/auth.js

@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { userDb, verificationDb, domainWhitelistDb, usageDb, settingsDb } from '../database/db.js';
 import { generateToken, authenticateToken, JWT_SECRET } from '../middleware/auth.js';
 import { initUserDirectories } from '../services/user-directories.js';
-import { initBuiltinSkills } from '../services/builtin-skills.js';
+import { initSystemRepoForUser } from '../services/system-repo.js';
 import { sendVerificationCode, isSmtpConfigured } from '../services/email.js';
 
 const router = express.Router();
@@ -126,8 +126,8 @@ router.post('/verify-code', async (req, res) => {
       // Initialize user directories
       await initUserDirectories(uuid);
     } else {
-      // Sync built-in skills for existing user (clean up dangling + add new)
-      await initBuiltinSkills(user.uuid);
+      // Ensure system repo is linked for existing user
+      await initSystemRepoForUser(user.uuid);
     }
 
     // Check if user is disabled

package/server/routes/skills.js

@@ -5,7 +5,7 @@ import { spawn } from 'child_process';
 import multer from 'multer';
 import AdmZip from 'adm-zip';
 import { getUserPaths, getPublicPaths, DATA_DIR } from '../services/user-directories.js';
-import { markBuiltinSkillRemoved, isBuiltinSkillPath } from '../services/builtin-skills.js';
+import { SYSTEM_REPO_OWNER, SYSTEM_REPO_NAME } from '../services/system-repo.js';
 
 const router = express.Router();
 
@@ -328,8 +328,6 @@ router.get('/', async (req, res) => {
             if (repoMatch) {
               repository = `${repoMatch[1]}/${repoMatch[2]}`;
             }
-          } else if (realPath.includes('/builtin-skills/')) {
-            source = 'builtin';
           }
         }
 
@@ -467,7 +465,6 @@ router.delete('/:name', async (req, res) => {
     let realPath = null;
     let isSymlink = false;
     let isImported = false;
-    let isBuiltin = false;
 
     try {
       const stat = await fs.lstat(linkPath);
@@ -475,7 +472,6 @@ router.delete('/:name', async (req, res) => {
       if (isSymlink) {
         realPath = await fs.realpath(linkPath);
         isImported = realPath.includes('/skills-import/');
-        isBuiltin = isBuiltinSkillPath(realPath);
       }
     } catch (err) {
       return res.status(404).json({ error: 'Skill not found' });
@@ -496,9 +492,6 @@ router.delete('/:name', async (req, res) => {
       } catch (err) {
         console.error('Error removing imported skill files:', err);
       }
-    } else if (isBuiltin) {
-      // Mark as removed so it won't be re-added on next sync
-      await markBuiltinSkillRemoved(userUuid, name);
     }
 
     res.json({ success: true, message: 'Skill deleted' });
@@ -793,13 +786,15 @@ router.get('/repos', async (req, res) => {
           // Count skills in repo (supports nested dirs like skills/XXX)
           const repoSkills = await scanDirForSkills(realPath, `${owner}/${repo}`, null);
           const skillCount = repoSkills.length;
+          const isSystem = owner === SYSTEM_REPO_OWNER && repo === SYSTEM_REPO_NAME;
 
           repos.push({
             owner,
             repo,
-            url: `https://github.com/${owner}/${repo}`,
+            url: isSystem ? null : `https://github.com/${owner}/${repo}`,
             skillCount,
-            path: realPath
+            path: realPath,
+            isSystem
           });
         }
       }
@@ -988,6 +983,11 @@ router.delete('/repos/:owner/:repo', async (req, res) => {
       return res.status(400).json({ error: 'Owner and repo are required' });
     }
 
+    // System repo cannot be removed
+    if (owner === SYSTEM_REPO_OWNER && repo === SYSTEM_REPO_NAME) {
+      return res.status(403).json({ error: '内置仓库不能删除' });
+    }
+
     const userPaths = getUserPaths(userUuid);
     const userRepoPath = path.join(userPaths.skillsRepoDir, owner, repo);
 

package/server/services/system-repo.js

@@ -0,0 +1,116 @@
+import { promises as fs } from 'fs';
+import path from 'path';
+import { spawn } from 'child_process';
+import { getUserPaths, getPublicPaths } from './user-directories.js';
+
+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) {
+  return new Promise((resolve, reject) => {
+    const gitProcess = spawn('git', ['clone', '--depth', '1', url, destinationPath], {
+      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}`));
+    });
+
+    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); });
+  });
+}
+
+/**
+ * Ensure the system repo is cloned to the shared public directory.
+ * If already cloned, attempts to pull latest changes.
+ * Returns the path to the public clone.
+ */
+async function ensureSystemRepo() {
+  const publicPaths = getPublicPaths();
+  const publicRepoPath = path.join(publicPaths.skillsRepoDir, SYSTEM_REPO_OWNER, SYSTEM_REPO_NAME);
+
+  try {
+    await fs.access(publicRepoPath);
+    // Already cloned — try to update
+    try {
+      await updateRepository(publicRepoPath);
+    } catch (err) {
+      console.log('[SystemRepo] Failed to pull system repo, using existing clone:', err.message);
+    }
+  } catch {
+    // Not yet cloned
+    await fs.mkdir(path.dirname(publicRepoPath), { recursive: true });
+    try {
+      await cloneRepository(SYSTEM_REPO_URL, publicRepoPath);
+      console.log('[SystemRepo] Cloned system repo to', publicRepoPath);
+    } catch (err) {
+      console.error('[SystemRepo] Failed to clone system repo:', err.message);
+      throw err;
+    }
+  }
+
+  return publicRepoPath;
+}
+
+/**
+ * Initialize the system repo for a user.
+ * Idempotent: if the user already has the symlink, skip.
+ */
+export async function initSystemRepoForUser(userUuid) {
+  const userPaths = getUserPaths(userUuid);
+  const userRepoPath = path.join(userPaths.skillsRepoDir, SYSTEM_REPO_OWNER, SYSTEM_REPO_NAME);
+
+  // If symlink/dir already exists, skip
+  try {
+    await fs.lstat(userRepoPath);
+    // Already set up — nothing to do
+    return;
+  } catch {
+    // Doesn't exist — proceed with setup
+  }
+
+  let publicRepoPath;
+  try {
+    publicRepoPath = await ensureSystemRepo();
+  } catch (err) {
+    console.error('[SystemRepo] Could not ensure system repo, skipping user init:', err.message);
+    return;
+  }
+
+  // Create user symlink
+  await fs.mkdir(path.dirname(userRepoPath), { recursive: true });
+  try {
+    await fs.symlink(publicRepoPath, userRepoPath);
+    console.log(`[SystemRepo] Linked system repo for user ${userUuid}`);
+  } catch (err) {
+    console.error(`[SystemRepo] Failed to create symlink for user ${userUuid}:`, err.message);
+  }
+}
+
+export { SYSTEM_REPO_OWNER, SYSTEM_REPO_NAME, SYSTEM_REPO_URL };

package/server/services/user-directories.js

@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs';
 import path from 'path';
-import { initBuiltinSkills } from './builtin-skills.js';
+import { initSystemRepoForUser } from './system-repo.js';
 
 // Base data directory (configurable via env)
 const DATA_DIR = process.env.DATA_DIR || path.join(process.cwd(), 'data');
@@ -280,8 +280,8 @@ export async function initUserDirectories(userUuid) {
   await fs.writeFile(usageScanStatePath, JSON.stringify(scanState, null, 2));
   console.log(`Created .usage-scan-state.json for user ${userUuid}`);
 
-  // Initialize built-in skills
-  await initBuiltinSkills(userUuid);
+  // Initialize system repo (built-in skill repository)
+  await initSystemRepoForUser(userUuid);
 
   return paths;
 }

package/server/builtin-skills/html-deploy/SKILL.md

@@ -1,40 +0,0 @@
----
-name: html-deploy
-description: 将 HTML 内容部署为可访问的网页。使用场景：(1) 用户要求将生成的 HTML/网页部署上线或发布，(2) 用户要求更新已部署的页面内容，(3) 用户要求删除已部署的页面，(4) 用户提到"部署"、"发布"、"上线"HTML 页面，(5) 用户要求预览生成的网页效果。
----
-
-# HTML Deploy
-
-将 HTML 内容部署到远程服务，生成可访问的 URL。
-
-## 使用流程
-
-1. 根据用户需求生成完整的 HTML 页面，写入文件
-2. 调用脚本部署、更新或删除，传入相应参数
-3. 将结果告知用户
-
-### 部署新页面
-
-```bash
-python3 skills/html-deploy/scripts/deploy.py <html_file>
-```
-
-### 更新已有页面
-
-从之前的部署 URL 中提取 page_id（UUID 部分）：
-
-```bash
-python3 skills/html-deploy/scripts/update.py <page_id> <html_file>
-```
-
-page_id 不存在时会报 404 错误。
-
-### 删除已有页面
-
-从之前的部署 URL 中提取 page_id（UUID 部分）：
-
-```bash
-python3 skills/html-deploy/scripts/delete.py <page_id>
-```
-
-page_id 不存在时会报 404 错误。

package/server/builtin-skills/html-deploy/scripts/delete.py

@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-"""删除已部署的页面。
-
-用法: delete.py <page_id>
-输出: 删除结果
-"""
-import sys
-import json
-import urllib.request
-
-API_BASE = "http://10.0.0.252:11004"
-
-
-def main():
-    if len(sys.argv) != 2:
-        print(f"用法: {sys.argv[0]} <page_id>", file=sys.stderr)
-        sys.exit(1)
-
-    page_id = sys.argv[1]
-    req = urllib.request.Request(
-        f"{API_BASE}/deploy/{page_id}",
-        method="DELETE",
-    )
-
-    with urllib.request.urlopen(req) as resp:
-        result = json.loads(resp.read())
-        print(result["detail"])
-
-
-if __name__ == "__main__":
-    main()

package/server/builtin-skills/html-deploy/scripts/deploy.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-"""部署 HTML 文件为网页。
-
-用法: deploy.py <html_file>
-输出: 部署成功后的访问 URL
-"""
-import sys
-import json
-import urllib.request
-
-API_BASE = "http://10.0.0.252:11004"
-
-
-def main():
-    if len(sys.argv) != 2:
-        print(f"用法: {sys.argv[0]} <html_file>", file=sys.stderr)
-        sys.exit(1)
-
-    with open(sys.argv[1], "r", encoding="utf-8") as f:
-        html = f.read()
-
-    data = json.dumps({"html": html}).encode("utf-8")
-    req = urllib.request.Request(
-        f"{API_BASE}/deploy",
-        data=data,
-        headers={"Content-Type": "application/json"},
-        method="POST",
-    )
-
-    with urllib.request.urlopen(req) as resp:
-        result = json.loads(resp.read())
-        print(result["url"])
-
-
-if __name__ == "__main__":
-    main()

package/server/builtin-skills/html-deploy/scripts/update.py

@@ -1,38 +0,0 @@
-#!/usr/bin/env python3
-"""更新已部署的页面内容。
-
-用法: update.py <page_id> <html_file>
-输出: 更新成功后的访问 URL
-"""
-import sys
-import json
-import urllib.request
-
-API_BASE = "http://10.0.0.252:11004"
-
-
-def main():
-    if len(sys.argv) != 3:
-        print(f"用法: {sys.argv[0]} <page_id> <html_file>", file=sys.stderr)
-        sys.exit(1)
-
-    page_id = sys.argv[1]
-
-    with open(sys.argv[2], "r", encoding="utf-8") as f:
-        html = f.read()
-
-    data = json.dumps({"html": html}).encode("utf-8")
-    req = urllib.request.Request(
-        f"{API_BASE}/deploy/{page_id}",
-        data=data,
-        headers={"Content-Type": "application/json"},
-        method="PUT",
-    )
-
-    with urllib.request.urlopen(req) as resp:
-        result = json.loads(resp.read())
-        print(result["url"])
-
-
-if __name__ == "__main__":
-    main()

package/server/services/builtin-skills.js

@@ -1,182 +0,0 @@
-import { promises as fs } from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { getUserPaths } from './user-directories.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-// Path to built-in skills directory
-const BUILTIN_SKILLS_DIR = path.join(__dirname, '../builtin-skills');
-
-// State file version for future migrations
-const STATE_VERSION = 1;
-
-/**
- * Get list of all available built-in skills
- */
-export async function getBuiltinSkills() {
-  const skills = [];
-
-  try {
-    const entries = await fs.readdir(BUILTIN_SKILLS_DIR, { withFileTypes: true });
-
-    for (const entry of entries) {
-      if (entry.isDirectory() && !entry.name.startsWith('.')) {
-        const skillPath = path.join(BUILTIN_SKILLS_DIR, entry.name);
-
-        // Check for SKILLS.md or SKILL.md
-        const skillsFile = path.join(skillPath, 'SKILLS.md');
-        const skillFile = path.join(skillPath, 'SKILL.md');
-
-        try {
-          // Try SKILLS.md first, then SKILL.md
-          let found = false;
-          try {
-            await fs.access(skillsFile);
-            found = true;
-          } catch {
-            await fs.access(skillFile);
-            found = true;
-          }
-
-          if (found) {
-            skills.push({
-              name: entry.name,
-              path: skillPath
-            });
-          }
-        } catch {
-          // Skip if neither file exists
-        }
-      }
-    }
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      console.error('Error reading builtin skills:', err);
-    }
-  }
-
-  return skills;
-}
-
-/**
- * Get path to user's builtin skills state file
- */
-function getStatePath(userUuid) {
-  const userPaths = getUserPaths(userUuid);
-  return path.join(userPaths.claudeDir, '.builtin-skills-state.json');
-}
-
-/**
- * Load user's builtin skills state
- */
-export async function loadBuiltinSkillsState(userUuid) {
-  try {
-    const statePath = getStatePath(userUuid);
-    const content = await fs.readFile(statePath, 'utf-8');
-    return JSON.parse(content);
-  } catch {
-    return {
-      version: STATE_VERSION,
-      removedSkills: []
-    };
-  }
-}
-
-/**
- * Save user's builtin skills state
- */
-export async function saveBuiltinSkillsState(userUuid, state) {
-  const statePath = getStatePath(userUuid);
-  await fs.writeFile(statePath, JSON.stringify(state, null, 2));
-}
-
-/**
- * Initialize built-in skills for a user
- * Creates symlinks for all built-in skills not in user's removed list
- * Also cleans up dangling symlinks from deleted built-in skills
- */
-export async function initBuiltinSkills(userUuid) {
-  const userPaths = getUserPaths(userUuid);
-  const builtinSkills = await getBuiltinSkills();
-  const state = await loadBuiltinSkillsState(userUuid);
-  // Clean up dangling symlinks pointing to removed built-in skills
-  try {
-    const entries = await fs.readdir(userPaths.skillsDir, { withFileTypes: true });
-    for (const entry of entries) {
-      const entryPath = path.join(userPaths.skillsDir, entry.name);
-      try {
-        const stat = await fs.lstat(entryPath);
-        if (!stat.isSymbolicLink()) continue;
-
-        const target = await fs.readlink(entryPath);
-        const realBuiltinDir = await fs.realpath(BUILTIN_SKILLS_DIR);
-        const resolvedTarget = path.resolve(path.dirname(entryPath), target);
-
-        // Only clean up symlinks that point into builtin-skills directory
-        if (!resolvedTarget.startsWith(realBuiltinDir)) continue;
-
-        // Check if the symlink target still exists
-        try {
-          await fs.access(resolvedTarget);
-        } catch {
-          // Target no longer exists, remove the dangling symlink
-          await fs.unlink(entryPath);
-          console.log(`Removed dangling builtin skill symlink: ${entry.name}`);
-        }
-      } catch (err) {
-        // Ignore errors on individual entries
-      }
-    }
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      console.error('Error cleaning up builtin skill symlinks:', err);
-    }
-  }
-
-  // Create symlinks for new built-in skills
-  for (const skill of builtinSkills) {
-    // Skip if user has explicitly removed this skill
-    if (state.removedSkills.includes(skill.name)) {
-      continue;
-    }
-
-    const linkPath = path.join(userPaths.skillsDir, skill.name);
-
-    try {
-      // Check if link already exists
-      await fs.lstat(linkPath);
-      // Link exists, skip
-    } catch {
-      // Link doesn't exist, create it
-      try {
-        await fs.symlink(skill.path, linkPath);
-        console.log(`Created builtin skill symlink: ${skill.name}`);
-      } catch (err) {
-        console.error(`Error creating builtin skill symlink ${skill.name}:`, err);
-      }
-    }
-  }
-}
-
-/**
- * Mark a built-in skill as removed by user
- */
-export async function markBuiltinSkillRemoved(userUuid, skillName) {
-  const state = await loadBuiltinSkillsState(userUuid);
-
-  if (!state.removedSkills.includes(skillName)) {
-    state.removedSkills.push(skillName);
-    await saveBuiltinSkillsState(userUuid, state);
-  }
-}
-
-/**
- * Check if a path is a built-in skill
- */
-export function isBuiltinSkillPath(realPath) {
-  return realPath?.includes('/builtin-skills/') ?? false;
-}
-
-export { BUILTIN_SKILLS_DIR };