@ian2018cs/agenthub 0.1.93 → 0.1.95

package/server/routes/agents.js

@@ -797,21 +797,14 @@ router.post('/refresh', async (_req, res) => {
 });
 
 /**
- * POST /api/agents/install
- * Install an agent: create project, copy CLAUDE.md, install Skills + MCPs
+ * Core agent install logic, extracted for reuse (e.g., clone flow).
+ * Returns { project, skillResults, mcpResults, gitRepoResults } or throws.
  */
-router.post('/install', async (req, res) => {
-  try {
-    const userUuid = req.user?.uuid;
-    if (!userUuid) return res.status(401).json({ error: 'User authentication required' });
-
-    const { agentName, force = false } = req.body;
-    if (!agentName) return res.status(400).json({ error: 'agentName is required' });
-
+async function installAgentForUser(agentName, userUuid, force = false) {
     // Scan to find the agent
     const agents = await scanAgents();
     const agent = agents.find(a => a.name === agentName || a.dirName === agentName);
-    if (!agent) return res.status(404).json({ error: `Agent "${agentName}" not found` });
+    if (!agent) throw Object.assign(new Error(`Agent "${agentName}" not found`), { notFound: true });
 
     const userPaths = getUserPaths(userUuid);
     const projectDir = path.join(userPaths.projectsDir, agentName);
@@ -851,11 +844,14 @@ router.post('/install', async (req, res) => {
           if (localHash !== storedHash) {
             let repoContent = '';
             try { repoContent = await fs.readFile(path.join(agent.path, 'CLAUDE.md'), 'utf-8'); } catch {}
-            return res.status(409).json({
+            throw Object.assign(new Error('本地 CLAUDE.md 已被修改，更新将覆盖本地改动'), {
               conflict: true,
-              error: '本地 CLAUDE.md 已被修改，更新将覆盖本地改动',
-              localContent,
-              repoContent
+              conflictData: {
+                conflict: true,
+                error: '本地 CLAUDE.md 已被修改，更新将覆盖本地改动',
+                localContent,
+                repoContent,
+              },
             });
           }
         } catch {}
@@ -1018,14 +1014,37 @@ router.post('/install', async (req, res) => {
     };
     await saveProjectConfig(config, userUuid);
 
+    return {
+      project: { ...project, agentInfo: config[projectKey].agentInfo },
+      skillResults,
+      mcpResults,
+      gitRepoResults,
+    };
+}
+
+/**
+ * POST /api/agents/install
+ * Install an agent: create project, copy CLAUDE.md, install Skills + MCPs
+ */
+router.post('/install', async (req, res) => {
+  try {
+    const userUuid = req.user?.uuid;
+    if (!userUuid) return res.status(401).json({ error: 'User authentication required' });
+
+    const { agentName, force = false } = req.body;
+    if (!agentName) return res.status(400).json({ error: 'agentName is required' });
+
+    const result = await installAgentForUser(agentName, userUuid, force);
     res.json({
       success: true,
-      project: { ...project, agentInfo: config[projectKey].agentInfo },
-      skills: skillResults,
-      mcps: mcpResults,
-      gitRepos: gitRepoResults
+      project: result.project,
+      skills: result.skillResults,
+      mcps: result.mcpResults,
+      gitRepos: result.gitRepoResults,
     });
   } catch (error) {
+    if (error.notFound) return res.status(404).json({ error: error.message });
+    if (error.conflict) return res.status(409).json(error.conflictData);
     console.error('Error installing agent:', error);
     res.status(500).json({ error: 'Failed to install agent', details: error.message });
   }
@@ -2083,3 +2102,4 @@ router.post('/submissions/:id/reject', async (req, res) => {
 });
 
 export default router;
+export { installAgentForUser };

package/server/routes/share.js

@@ -1,10 +1,14 @@
 import express from 'express';
 import fs from 'fs';
-import { shareDb, userDb, imageDb } from '../database/db.js';
-import { getImagePath } from '../services/image-storage.js';
-import { getSessionMessages, loadProjectConfig } from '../projects.js';
+import path from 'path';
+import { randomUUID } from 'crypto';
+import { shareDb, userDb, imageDb, agentSubmissionDb } from '../database/db.js';
+import { getImagePath, saveImage } from '../services/image-storage.js';
+import { getSessionMessages, loadProjectConfig, addProjectManually, cloneSession } from '../projects.js';
 import { extractShareMessages, saveStaticSnapshot, readStaticSnapshot, stripImagePaths } from '../services/share-renderer.js';
 import { authenticateToken } from '../middleware/auth.js';
+import { getUserPaths } from '../services/user-directories.js';
+import { installAgentForUser } from './agents.js';
 
 const router = express.Router();
 
@@ -155,6 +159,117 @@ router.delete('/:sessionId', authenticateToken, (req, res) => {
   res.json({ ok: true });
 });
 
+// POST /api/share/:userUuid/:sessionId/clone — 克隆公开分享的会话（需要鉴权）
+router.post('/:userUuid/:sessionId/clone', authenticateToken, async (req, res) => {
+  const { userUuid: sourceUserUuid, sessionId: sourceSessionId } = req.params;
+  const targetUserUuid = req.user.uuid;
+
+  const share = shareDb.getShare(sourceUserUuid, sourceSessionId);
+  if (!share || share.status !== 'active') {
+    return res.status(404).json({ error: '分享不存在或已关闭' });
+  }
+
+  // 读取源项目配置，判断是否为 Agent 项目
+  const sourceConfig = await loadProjectConfig(sourceUserUuid);
+  const sourceProjectEntry = sourceConfig[share.project_name];
+  const isAgentProject = sourceProjectEntry?.agentInfo?.isAgent === true;
+  const agentName = sourceProjectEntry?.agentInfo?.agentName || null;
+  const sourceDisplayName = sourceProjectEntry?.displayName || share.session_title || 'Cloned Project';
+
+  let targetProjectName;
+  let targetProjectDir;
+
+  if (isAgentProject && agentName) {
+    // 检查目标用户是否有该 agent 的可见权限
+    const targetUser = userDb.getUserByUuid(targetUserUuid);
+    const isAdmin = targetUser?.role === 'admin' || targetUser?.role === 'super_admin';
+    let canInstallAgent = isAdmin;
+    if (!isAdmin && targetUser?.id) {
+      const visibleRaw = userDb.getVisibleAgents(targetUser.id);
+      const visibleSet = new Set();
+      if (visibleRaw) {
+        try { JSON.parse(visibleRaw).forEach(n => visibleSet.add(n)); } catch (_) {}
+      }
+      agentSubmissionDb.getApprovedAgentNamesByUser(targetUser.id).forEach(n => visibleSet.add(n));
+      canInstallAgent = visibleSet.has(agentName);
+    }
+    if (!canInstallAgent) {
+      return res.status(403).json({ error: '您没有该 Agent 项目的使用权限，请联系管理员授权后再克隆' });
+    }
+
+    // Agent 项目：触发完整安装流程（复制模板文件、skills、MCPs、写 agentInfo）
+    try {
+      const result = await installAgentForUser(agentName, targetUserUuid);
+      targetProjectDir = result.project.fullPath;
+      targetProjectName = result.project.name;
+    } catch (err) {
+      // Agent 可能已下架 → 降级为普通项目克隆
+      console.warn('[clone] agent install failed, falling back to plain project:', err.message);
+      const targetUserPaths = getUserPaths(targetUserUuid);
+      targetProjectDir = path.join(targetUserPaths.projectsDir, agentName);
+      await fs.promises.mkdir(targetProjectDir, { recursive: true });
+      try {
+        const proj = await addProjectManually(targetProjectDir, sourceDisplayName, targetUserUuid);
+        targetProjectName = proj.name;
+      } catch {
+        targetProjectName = targetProjectDir.replace(/\//g, '-');
+      }
+    }
+  } else {
+    // 普通项目：创建同名目录并注册
+    const targetUserPaths = getUserPaths(targetUserUuid);
+    const safeDirName = sourceDisplayName.replace(/[^a-zA-Z0-9\u4e00-\u9fff._-]/g, '_').substring(0, 80);
+    targetProjectDir = path.join(targetUserPaths.projectsDir, safeDirName);
+    await fs.promises.mkdir(targetProjectDir, { recursive: true });
+    try {
+      const proj = await addProjectManually(targetProjectDir, sourceDisplayName, targetUserUuid);
+      targetProjectName = proj.name;
+    } catch {
+      targetProjectName = targetProjectDir.replace(/\//g, '-');
+    }
+  }
+
+  // 克隆 JSONL 会话
+  const newSessionId = await cloneSession(
+    sourceUserUuid, share.project_name, sourceSessionId,
+    targetUserUuid, targetProjectDir
+  );
+  if (!newSessionId) {
+    return res.status(500).json({ error: '克隆会话失败：源会话为空' });
+  }
+
+  // 克隆图片（文件 + DB 记录）
+  const sourceImages = imageDb.getImagesBySession(sourceSessionId);
+  for (const img of sourceImages) {
+    const srcPath = getImagePath(sourceUserUuid, img.file_hash, img.file_ext);
+    try {
+      const buffer = await fs.promises.readFile(srcPath);
+      await saveImage(targetUserUuid, buffer, img.file_ext);
+      const batchId = randomUUID();
+      imageDb.insertImage({
+        upload_batch_id: batchId,
+        user_uuid: targetUserUuid,
+        original_name: img.original_name,
+        file_hash: img.file_hash,
+        file_ext: img.file_ext,
+        file_size: buffer.length,
+        mime_type: img.mime_type,
+      });
+      imageDb.associateBatch(batchId, newSessionId, img.message_content);
+    } catch {
+      // 图片文件可能已被清理，跳过不阻塞整体克隆
+    }
+  }
+
+  res.json({
+    success: true,
+    sessionId: newSessionId,
+    projectName: targetProjectName,
+    isAgentProject,
+    agentName,
+  });
+});
+
 // GET /api/share/:userUuid/:sessionId/images/:imageId — 公开访问，分享页图片
 router.get('/:userUuid/:sessionId/images/:imageId', (req, res) => {
   const { userUuid, sessionId, imageId } = req.params;