@ian2018cs/agenthub 0.1.75 → 0.1.77

package/server/services/builtin-tools/share-project-template.js

@@ -0,0 +1,124 @@
+/**
+ * 内置工具：分享项目模板
+ *
+ * AI 调用 Bash(__share_project_template__ '<json>') 命令，
+ * 由 PreToolUse hook 拦截 → 通过 WebSocket 打开前端弹窗 → 等待用户操作 → 返回结果。
+ *
+ * 飞书端不支持此工具（检测 mutableWriter.current.ws）。
+ */
+
+import { loadProjectConfig, addProjectManually } from '../../projects.js';
+
+const TIMEOUT_MS = 5 * 60 * 1000; // 5 分钟（用户需要时间审阅和修改模板）
+
+export default {
+  name: '__share_project_template__',
+  responseType: 'share-project-template-response',
+
+  systemPrompt: `
+
+## 分享项目模板工具
+
+当用户想要分享项目、创建项目模板、发布共享项目时，使用以下 Bash 命令打开分享弹窗：
+
+\`\`\`bash
+__share_project_template__ '{"path":"/项目路径","displayName":"显示名称","description":"描述","updateNotes":"更新说明","skills":["skill1"],"mcps":["mcp1"],"files":["file1.md"],"gitRepos":[{"name":"子目录名","repo":"git远程地址","branch":"分支名"}]}'
+\`\`\`
+
+参数说明：
+- path (必填): 项目文件夹路径，可以是当前项目、子文件夹或其他项目路径
+- displayName (可选): 模板显示名称，仅首次创建时使用（更新时忽略）
+- description (可选): 模板描述，仅首次创建时使用（更新时忽略）
+- updateNotes (可选): 更新说明，仅更新已有模板时使用
+- skills (可选): 要包含的技能名称数组，空数组=让用户在弹窗中选择
+- mcps (可选): 要包含的 MCP 服务名称数组，空数组=让用户在弹窗中选择
+- files (可选): 要包含的文件相对路径数组，空数组=让用户在弹窗中选择
+- gitRepos (可选): 要包含的 Git 仓库依赖数组，每项包含 name(子目录名)、repo(远程地址)、branch(分支)，空数组=让用户在弹窗中选择
+
+该命令会打开一个 UI 弹窗供用户确认和修改，等待用户操作完成后返回结果。
+`,
+
+  match(hookInput) {
+    return hookInput.tool_name === 'Bash' &&
+      hookInput.tool_input?.command?.trimStart().startsWith('__share_project_template__');
+  },
+
+  async execute(hookInput, context) {
+    const { userUuid, mutableWriter, createRequestId, waitForResponse } = context;
+
+    // 检测飞书模式：MutableWriter.current 有 .ws 属性（WebSocketWriter），FakeSendWriter 没有
+    if (!mutableWriter?.current?.ws) {
+      return { decision: 'deny', reason: '分享项目模板功能仅支持网页端使用。' };
+    }
+
+    // 解析参数
+    const rawArgs = hookInput.tool_input.command.replace(/^\s*__share_project_template__\s*/, '');
+    let jsonStr = rawArgs.trim();
+    if ((jsonStr.startsWith("'") && jsonStr.endsWith("'")) ||
+        (jsonStr.startsWith('"') && jsonStr.endsWith('"'))) {
+      jsonStr = jsonStr.slice(1, -1);
+    }
+    const params = JSON.parse(jsonStr);
+
+    if (!params.path) {
+      return { decision: 'deny', reason: '缺少必需参数 path（项目路径）。' };
+    }
+
+    // 解析 path → projectKey，并判断是否为已有项目
+    const config = await loadProjectConfig(userUuid);
+    let projectKey = null;
+    let isExistingProject = false;
+    for (const [key, entry] of Object.entries(config)) {
+      if ((entry.originalPath || key.replace(/-/g, '/')) === params.path) {
+        projectKey = key;
+        isExistingProject = true;
+        break;
+      }
+    }
+    if (!projectKey) {
+      // 路径不在项目列表中（可能是子文件夹），自动添加为新项目
+      try {
+        const project = await addProjectManually(params.path, params.displayName, userUuid);
+        projectKey = project.name;
+        isExistingProject = false;
+      } catch (e) {
+        return { decision: 'deny', reason: `无法解析项目路径: ${e.message}` };
+      }
+    }
+
+    // 发送 WebSocket 消息打开分享弹窗
+    const shareRequestId = createRequestId();
+    mutableWriter.send({
+      type: 'share-project-template-request',
+      requestId: shareRequestId,
+      prefillData: {
+        projectKey,
+        projectPath: params.path,
+        isExistingProject,
+        displayName: params.displayName || '',
+        description: params.description || '',
+        updateNotes: params.updateNotes || '',
+        skills: params.skills || [],
+        mcps: params.mcps || [],
+        files: params.files || [],
+        gitRepos: params.gitRepos || [],
+      }
+    });
+
+    // 等待前端响应（5 分钟超时）
+    const response = await waitForResponse(shareRequestId, TIMEOUT_MS);
+
+    let reason;
+    if (!response) {
+      reason = '分享项目模板请求超时（5分钟内未收到响应）。';
+    } else if (response.cancelled) {
+      reason = '用户取消了分享项目模板操作。';
+    } else if (response.success) {
+      reason = `项目模板已成功提交！提交 ID: ${response.submissionId}。${response.message || ''}`;
+    } else {
+      reason = `提交失败: ${response.error || '未知错误'}`;
+    }
+
+    return { decision: 'deny', reason };
+  }
+};

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

@@ -7,13 +7,6 @@ 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) => {
@@ -42,7 +35,7 @@ function getRepoPath() {
 }
 
 /**
- * Ensure the agent repo is cloned locally. If already present, tries to pull.
+ * Ensure the agent repo is cloned locally. Does NOT pull; call pullAgentRepo() explicitly.
  * Returns the path to the local clone.
  */
 export async function ensureAgentRepo() {
@@ -50,12 +43,6 @@ export async function ensureAgentRepo() {
 
   try {
     await fs.access(repoPath);
-    // Already cloned — try to pull latest
-    try {
-      await runGit(['pull', '--ff-only'], repoPath);
-    } catch (err) {
-      console.log('[AgentRepo] Failed to pull, using existing clone:', err.message);
-    }
   } catch {
     // Not yet cloned
     await fs.mkdir(path.dirname(repoPath), { recursive: true });
@@ -71,6 +58,19 @@ export async function ensureAgentRepo() {
   return repoPath;
 }
 
+/**
+ * Pull latest from remote. Called explicitly on user-triggered refresh.
+ */
+export async function pullAgentRepo() {
+  const repoPath = getRepoPath();
+  try {
+    await runGit(['pull', '--ff-only'], repoPath);
+  } catch (err) {
+    console.log('[AgentRepo] Failed to pull:', err.message);
+    throw err;
+  }
+}
+
 /**
  * Parse agent.yaml from an agent directory.
  * Returns the parsed metadata object or null if invalid.
@@ -89,7 +89,8 @@ async function parseAgentYaml(agentDir) {
       author: '',
       skills: [],
       mcps: [],
-      files: []
+      files: [],
+      git_repos: []
     };
 
     // Parse scalar fields
@@ -153,6 +154,21 @@ async function parseAgentYaml(agentDir) {
       }
     }
 
+    // Parse git_repos list
+    const gitReposSection = content.match(/^git_repos:\s*\n((?:[ \t]+.+\n?)*)/m);
+    if (gitReposSection) {
+      const lines = gitReposSection[1].split('\n');
+      let current = null;
+      for (const line of lines) {
+        const nameLine = line.match(/^\s+-\s+name:\s*["']?(.+?)["']?\s*$/);
+        const repoLine = line.match(/^\s+repo:\s*["']?(.+?)["']?\s*$/);
+        const branchLine = line.match(/^\s+branch:\s*["']?(.+?)["']?\s*$/);
+        if (nameLine) { current = { name: nameLine[1].trim() }; result.git_repos.push(current); }
+        else if (repoLine && current) { current.repo = repoLine[1].trim(); }
+        else if (branchLine && current) { current.branch = branchLine[1].trim(); }
+      }
+    }
+
     return result;
   } catch {
     return null;
@@ -161,23 +177,25 @@ 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.
+ * @param {boolean} pull - When true, git pull before scanning (e.g. user-triggered refresh).
+ *                         When false (default), read directly from local disk — fast path.
  * Returns array of agent metadata objects.
  */
-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;
-  }
-
+export async function scanAgents(pull = false) {
   let repoPath;
   try {
     repoPath = await ensureAgentRepo();
   } catch (err) {
     console.error('[AgentRepo] Could not access agent repo:', err.message);
-    // Return stale cache on network error rather than empty list
-    return agentCache.agents ?? [];
+    return [];
+  }
+
+  if (pull) {
+    try {
+      await pullAgentRepo();
+    } catch (err) {
+      console.warn('[AgentRepo] Pull failed, scanning existing local data:', err.message);
+    }
   }
 
   const agents = [];
@@ -211,7 +229,6 @@ export async function scanAgents(force = false) {
     });
   }
 
-  agentCache = { agents, cachedAt: Date.now() };
   return agents;
 }
 

package/server/services/user-directories.js

@@ -43,6 +43,7 @@ export function getPublicPaths() {
     mcpRepoDir: path.join(DATA_DIR, 'mcp-repo'),
     agentRepoDir: path.join(DATA_DIR, 'agent-repo'),
     agentSubmissionsDir: path.join(DATA_DIR, 'agent-submissions'),
+    gitRepoDir: path.join(DATA_DIR, 'git-repo'),
   };
 }
 

package/shared/brand.js

@@ -27,6 +27,10 @@ export const CHAT_EXAMPLE_PROMPTS = [
   { icon: '💡', text: '给我一些解决问题的思路' },
 ];
 
+// 新对话的默认权限模式。
+// 可选值: 'default'（默认模式）| 'acceptEdits'（接受编辑）| 'bypassPermissions'（跳过权限）| 'plan'（计划模式）
+export const DEFAULT_PERMISSION_MODE = 'default';
+
 // 飞书绑定引导文案（出现 3 次，统一成函数避免漂移）
 export const feishuBindingGuide = () =>
   `👋 你好！请先完成账号绑定：\n\n` +