npm - @ian2018cs/agenthub - Versions diffs - 0.1.76 → 0.1.78 - Mend

@ian2018cs/agenthub 0.1.76 → 0.1.78

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 (16) hide show

package/dist/assets/index-DkNpDSsg.css +32 -0
package/dist/assets/index-NaMmXkCt.js +197 -0
package/dist/index.html +2 -2
package/package.json +2 -2
package/server/claude-sdk.js +7 -152
package/server/index.js +119 -12
package/server/routes/agents.js +331 -3
package/server/services/builtin-tools/background-task-pool.js +316 -0
package/server/services/builtin-tools/background-task.js +231 -0
package/server/services/builtin-tools/index.js +146 -0
package/server/services/builtin-tools/share-project-template.js +124 -0
package/server/services/system-agent-repo.js +17 -1
package/server/services/user-directories.js +1 -0
package/shared/brand.js +4 -0
package/dist/assets/index-B5imuFpg.js +0 -192
package/dist/assets/index-oUz7uC99.css +0 -32

package/dist/index.html CHANGED Viewed

@@ -25,7 +25,7 @@
     <!-- Prevent zoom on iOS -->
     <meta name="format-detection" content="telephone=no" />
-    <script type="module" crossorigin src="/assets/index-B5imuFpg.js"></script>
+    <script type="module" crossorigin src="/assets/index-NaMmXkCt.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">
@@ -34,7 +34,7 @@
     <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-oUz7uC99.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DkNpDSsg.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ian2018cs/agenthub",
-  "version": "0.1.76",
+  "version": "0.1.78",
   "description": "A web-based UI for AI Agents",
   "type": "module",
   "main": "server/index.js",
@@ -51,7 +51,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.77",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.79",
     "@codemirror/lang-css": "^6.3.1",
     "@codemirror/lang-html": "^6.4.9",
     "@codemirror/lang-javascript": "^6.2.4",

package/server/claude-sdk.js CHANGED Viewed

@@ -13,9 +13,6 @@
  */
 import { query, renameSession, forkSession } from '@anthropic-ai/claude-agent-sdk';
-// Used to mint unique approval request IDs when randomUUID is not available.
-// This keeps parallel tool approvals from colliding; it does not add any crypto/security guarantees.
-import crypto from 'crypto';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { CLAUDE_MODELS } from '../shared/modelConstants.js';
@@ -24,7 +21,7 @@ import { getUserPaths } from './services/user-directories.js';
 import { usageDb } from './database/db.js';
 import { calculateCost, normalizeModelName } from './services/pricing.js';
 import { evaluate as evaluateToolGuard } from './services/tool-guard/index.js';
-import { loadProjectConfig, addProjectManually } from './projects.js';
+import builtinTools, { createRequestId } from './services/builtin-tools/index.js';
 // Session tracking: Map of session IDs to active query instances
 const activeSessions = new Map();
@@ -78,41 +75,6 @@ const pendingToolApprovals = new Map();
 // introduced to avoid hanging the run when no decision arrives.
 const TOOL_APPROVAL_TIMEOUT_MS = parseInt(process.env.CLAUDE_TOOL_APPROVAL_TIMEOUT_MS, 10) || 55000;
-// ─── 分享项目模板：pending 请求管理 ───
-const pendingShareTemplateRequests = new Map();
-const SHARE_TEMPLATE_TIMEOUT_MS = 5 * 60 * 1000; // 5 分钟（用户需要时间审阅和修改模板）
-function waitForShareTemplateResponse(requestId) {
-  return new Promise(resolve => {
-    let settled = false;
-    const finalize = (result) => {
-      if (settled) return;
-      settled = true;
-      pendingShareTemplateRequests.delete(requestId);
-      clearTimeout(timeout);
-      resolve(result);
-    };
-    const timeout = setTimeout(() => finalize(null), SHARE_TEMPLATE_TIMEOUT_MS);
-    pendingShareTemplateRequests.set(requestId, finalize);
-  });
-}
-function resolveShareTemplateRequest(requestId, result) {
-  const resolver = pendingShareTemplateRequests.get(requestId);
-  if (resolver) resolver(result);
-}
-// Generate a stable request ID for UI approval flows.
-// This does not encode tool details or get shown to users; it exists so the UI
-// can respond to the correct pending request without collisions.
-function createRequestId() {
-  // if clause is used because randomUUID is not available in older Node.js versions
-  if (typeof crypto.randomUUID === 'function') {
-    return crypto.randomUUID();
-  }
-  return crypto.randomBytes(16).toString('hex');
-}
 // Wait for a UI approval decision, honoring SDK cancellation.
 // This does not auto-approve or auto-deny; it only resolves with UI input,
 // and it cleans up the pending map to avoid leaks, introduced to prevent
@@ -271,28 +233,7 @@ function mapCliOptionsToSDK(options = {}) {
   console.log(`Using model: ${sdkOptions.model}`);
   // Map system prompt configuration
-  const SHARE_PROJECT_TEMPLATE_TOOL_DESC = `
-## 分享项目模板工具
-当用户想要分享项目、创建项目模板、发布共享项目时，使用以下 Bash 命令打开分享弹窗：
-\`\`\`bash
-__share_project_template__ '{"path":"/项目路径","displayName":"显示名称","description":"描述","updateNotes":"更新说明","skills":["skill1"],"mcps":["mcp1"],"files":["file1.md"]}'
-\`\`\`
-参数说明：
-- path (必填): 项目文件夹路径，可以是当前项目、子文件夹或其他项目路径
-- displayName (可选): 模板显示名称，仅首次创建时使用（更新时忽略）
-- description (可选): 模板描述，仅首次创建时使用（更新时忽略）
-- updateNotes (可选): 更新说明，仅更新已有模板时使用
-- skills (可选): 要包含的技能名称数组，空数组=让用户在弹窗中选择
-- mcps (可选): 要包含的 MCP 服务名称数组，空数组=让用户在弹窗中选择
-- files (可选): 要包含的文件相对路径数组，空数组=让用户在弹窗中选择
-该命令会打开一个 UI 弹窗供用户确认和修改，等待用户操作完成后返回结果。
-`;
-  const baseAppend = PRODUCT_SYSTEM_DESC + SHARE_PROJECT_TEMPLATE_TOOL_DESC;
+  const baseAppend = PRODUCT_SYSTEM_DESC + builtinTools.getSystemPromptAppend();
   const extraAppend = options.appendSystemPrompt ? `\n\n${options.appendSystemPrompt}` : '';
   sdkOptions.systemPrompt = {
     type: 'preset',
@@ -647,96 +588,11 @@ async function queryClaudeSDK(command, options = {}, ws) {
           ...((sdkOptions.hooks || {}).PreToolUse || []),
           {
             hooks: [async (hookInput) => {
-              // ===== 分享项目模板拦截（在 ToolGuard 之前，匹配后直接 return） =====
-              if (hookInput.tool_name === 'Bash' &&
-                  hookInput.tool_input?.command?.trimStart().startsWith('__share_project_template__')) {
-                try {
-                  // 检测飞书模式：MutableWriter.current 有 .ws 属性（WebSocketWriter），FakeSendWriter 没有
-                  if (!mutableWriter?.current?.ws) {
-                    return {
-                      hookSpecificOutput: {
-                        hookEventName: 'PreToolUse',
-                        permissionDecision: 'deny',
-                        permissionDecisionReason: '分享项目模板功能仅支持网页端使用。',
-                      }
-                    };
-                  }
-                  // 解析参数
-                  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 { hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'deny',
-                      permissionDecisionReason: '缺少必需参数 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 { hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'deny',
-                        permissionDecisionReason: `无法解析项目路径: ${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 || [],
-                    }
-                  });
-                  // 等待前端响应（5 分钟超时）
-                  const response = await waitForShareTemplateResponse(shareRequestId);
-                  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 { hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'deny', permissionDecisionReason: reason } };
-                } catch (err) {
-                  return { hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'deny',
-                    permissionDecisionReason: `分享项目模板失败: ${err.message}` } };
-                }
-              }
+              // ===== 内置工具拦截（在 ToolGuard 之前，匹配后直接 return） =====
+              const builtinResult = await builtinTools.handlePreToolUse(hookInput, {
+                userUuid, mutableWriter, cwd: sdkOptions.cwd,
+              });
+              if (builtinResult) return builtinResult;
               // ===== 安全守卫（Tool Guard）=====
               try {
@@ -1140,7 +996,6 @@ export {
   isClaudeSDKSessionActive,
   getActiveClaudeSDKSessions,
   resolveToolApproval,
-  resolveShareTemplateRequest,
   renameSessionForUser,
   forkSessionForUser,
   updateSessionWriter

package/server/index.js CHANGED Viewed

@@ -64,7 +64,14 @@ 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, resolveShareTemplateRequest, renameSessionForUser, forkSessionForUser, updateSessionWriter } from './claude-sdk.js';
+import { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval, renameSessionForUser, forkSessionForUser, updateSessionWriter } from './claude-sdk.js';
+import builtinTools, {
+    backgroundTaskPool,
+    enqueueResult,
+    dequeueResult,
+    hasResults,
+    getAllPendingForUser,
+} from './services/builtin-tools/index.js';
 import authRoutes from './routes/auth.js';
 import mcpRoutes from './routes/mcp.js';
 import mcpUtilsRoutes from './routes/mcp-utils.js';
@@ -88,6 +95,82 @@ import { startImageCleanup } from './services/image-cleanup.js';
 const userWatchers = new Map(); // Map<userUuid, { watcher, clients: Set<ws> }>
 const connectedClients = new Set();
+// ─── 后台任务：用户连接映射 & 结果投递 ───
+// Map<userUuid, Set<{ws, writer}>> — 追踪每个用户的所有 WebSocket 连接
+const userConnections = new Map();
+function addUserConnection(userUuid, ws, writer) {
+    if (!userUuid) return;
+    if (!userConnections.has(userUuid)) userConnections.set(userUuid, new Set());
+    userConnections.get(userUuid).add({ ws, writer });
+}
+function removeUserConnection(userUuid, ws) {
+    if (!userUuid) return;
+    const conns = userConnections.get(userUuid);
+    if (!conns) return;
+    for (const conn of conns) {
+        if (conn.ws === ws) { conns.delete(conn); break; }
+    }
+    if (conns.size === 0) userConnections.delete(userUuid);
+}
+/**
+ * 尝试向前端投递一条后台任务完成结果
+ * 条件：有待投递结果 + session 空闲 + 用户在线
+ */
+function tryDeliverBgResult(userUuid, sessionId) {
+    if (!hasResults(userUuid, sessionId)) return;
+    if (isClaudeSDKSessionActive(sessionId)) return; // session 忙，等 query 结束后再投递
+    const result = dequeueResult(userUuid, sessionId);
+    if (!result) return;
+    const conns = userConnections.get(userUuid);
+    if (!conns || conns.size === 0) {
+        // 用户不在线，放回队列（入队到头部）
+        enqueueResult(userUuid, sessionId, result);
+        return;
+    }
+    // 找到一个可用的 WebSocket 连接发送通知
+    for (const { ws } of conns) {
+        if (ws.readyState === 1) { // WebSocket.OPEN
+            try {
+                ws.send(JSON.stringify({
+                    type: 'background-task-complete',
+                    taskId: result.id,
+                    sessionId: result.sessionId,
+                    command: result.command,
+                    label: result.label,
+                    status: result.status,
+                    exitCode: result.exitCode,
+                    signal: result.signal,
+                    stdout: result.stdout,
+                    stderr: result.stderr,
+                    truncated: result.truncated,
+                    duration: (result.endTime || Date.now()) - result.startTime,
+                    cwd: result.cwd,
+                }));
+                console.log(`[BgTask] Delivered result ${result.id} to user ${userUuid}, session ${sessionId}`);
+                return;
+            } catch (err) {
+                console.error(`[BgTask] Failed to send result:`, err.message);
+            }
+        }
+    }
+    // 所有连接都不可用，放回队列
+    enqueueResult(userUuid, sessionId, result);
+}
+// 监听后台任务完成事件
+backgroundTaskPool.on('task-complete', (task) => {
+    enqueueResult(task.userUuid, task.sessionId, task);
+    // 立即尝试投递
+    tryDeliverBgResult(task.userUuid, task.sessionId);
+});
 // Setup file system watcher for a specific user's Claude projects folder
 async function setupUserProjectsWatcher(userUuid, ws) {
     if (!userUuid) {
@@ -364,6 +447,17 @@ app.use(express.static(path.join(__dirname, '../dist'), {
 // /api/config endpoint removed - no longer needed
 // Frontend now uses window.location for WebSocket URLs
+// Public version endpoint - reads from package.json at runtime to avoid build-time lag
+app.get('/api/version', (req, res) => {
+    try {
+        const pkgPath = path.join(__dirname, '..', 'package.json');
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+        res.json({ version: pkg.version });
+    } catch (e) {
+        res.json({ version: 'unknown' });
+    }
+});
 app.get('/api/projects', authenticateToken, async (req, res) => {
     try {
         const projects = await getProjects(req.user.uuid);
@@ -788,6 +882,17 @@ function handleChatConnection(ws, userData) {
     // Wrap WebSocket with writer for consistent interface with SSEStreamWriter
     const writer = new WebSocketWriter(ws);
+    // Register in user connections mapping (for background task result delivery)
+    addUserConnection(userUuid, ws, writer);
+    // On reconnect, deliver any pending background task results
+    if (userUuid) {
+        const pendingSessions = getAllPendingForUser(userUuid);
+        for (const { sessionId } of pendingSessions) {
+            tryDeliverBgResult(userUuid, sessionId);
+        }
+    }
     ws.on('message', async (message) => {
         try {
             const data = JSON.parse(message);
@@ -818,6 +923,14 @@ function handleChatConnection(ws, userData) {
                         }
                     }
                 }
+                // Query 结束后，尝试投递待处理的后台任务结果
+                {
+                    const sid = data.options?.sessionId || writer.getSessionId();
+                    if (userUuid && sid) {
+                        tryDeliverBgResult(userUuid, sid);
+                    }
+                }
             } else if (data.type === 'abort-session') {
                 console.log('[DEBUG] Abort session request:', data.sessionId);
                 // Use Claude Agents SDK
@@ -841,17 +954,9 @@ function handleChatConnection(ws, userData) {
                         rememberEntry: data.rememberEntry
                     });
                 }
-            } else if (data.type === 'share-project-template-response') {
-                // Relay the user's share-project-template decision back to the PreToolUse hook.
-                if (data.requestId) {
-                    resolveShareTemplateRequest(data.requestId, {
-                        success: Boolean(data.success),
-                        cancelled: Boolean(data.cancelled),
-                        submissionId: data.submissionId || null,
-                        message: data.message || '',
-                        error: data.error || '',
-                    });
-                }
+            } else if (builtinTools.canHandleResponse(data.type) && data.requestId) {
+                // Relay the user's builtin-tool response back to the PreToolUse hook.
+                builtinTools.resolveResponse(data.requestId, data);
             } else if (data.type === 'check-session-status') {
                 // Check if a specific session is currently processing
                 const sessionId = data.sessionId;
@@ -891,6 +996,7 @@ function handleChatConnection(ws, userData) {
         console.log('🔌 Chat client disconnected');
         // Remove from connected clients
         connectedClients.delete(ws);
+        removeUserConnection(userUuid, ws);
         // Cleanup projects watcher for this user
         if (userUuid) {
             cleanupUserProjectsWatcher(userUuid, ws);
@@ -901,6 +1007,7 @@ function handleChatConnection(ws, userData) {
         console.error('[ERROR] Chat WebSocket error:', error.message);
         // Ensure cleanup on error as well (close may not fire after error)
         connectedClients.delete(ws);
+        removeUserConnection(userUuid, ws);
         if (userUuid) {
             cleanupUserProjectsWatcher(userUuid, ws);
         }