@ian2018cs/agenthub 0.1.69 → 0.1.71

package/server/claude-sdk.js

@@ -12,7 +12,7 @@
  * - WebSocket message streaming
  */
 
-import { query, renameSession } from '@anthropic-ai/claude-agent-sdk';
+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';
@@ -24,9 +24,50 @@ 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';
 
 // Session tracking: Map of session IDs to active query instances
 const activeSessions = new Map();
+
+/**
+ * MutableWriter wraps a WebSocketWriter and buffers messages while the client
+ * is disconnected. When the client reconnects, switchTo() replays the buffer
+ * to the new writer so no streaming chunks are lost.
+ */
+class MutableWriter {
+  constructor(ws) {
+    this.current = ws;
+    this.buffer = [];
+    this.MAX_BUFFER = 500;
+  }
+
+  send(data) {
+    if (this.current?.ws?.readyState === 1) {
+      this.current.send(data);
+    } else if (this.buffer.length < this.MAX_BUFFER) {
+      this.buffer.push(data);
+    }
+  }
+
+  setSessionId(sessionId) {
+    this.current?.setSessionId(sessionId);
+  }
+
+  getSessionId() {
+    return this.current?.getSessionId();
+  }
+
+  /** Attach a new WebSocketWriter and replay any buffered messages to it. */
+  switchTo(newWs) {
+    this.current = newWs;
+    const buf = this.buffer;
+    this.buffer = [];
+    for (const msg of buf) {
+      newWs.send(msg);
+    }
+  }
+}
+
 // In-memory registry of pending tool approvals keyed by requestId.
 // This does not persist approvals or share across processes; it exists so the
 // SDK can pause tool execution while the UI decides what to do.
@@ -37,6 +78,30 @@ 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.
@@ -206,7 +271,28 @@ function mapCliOptionsToSDK(options = {}) {
   console.log(`Using model: ${sdkOptions.model}`);
 
   // Map system prompt configuration
-  const baseAppend = PRODUCT_SYSTEM_DESC;
+  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 extraAppend = options.appendSystemPrompt ? `\n\n${options.appendSystemPrompt}` : '';
   sdkOptions.systemPrompt = {
     type: 'preset',
@@ -233,14 +319,15 @@ function mapCliOptionsToSDK(options = {}) {
  * @param {Array<string>} tempImagePaths - Temp image file paths for cleanup
  * @param {string} tempDir - Temp directory for cleanup
  */
-function addSession(sessionId, queryInstance, tempImagePaths = [], tempDir = null, abortController = null) {
+function addSession(sessionId, queryInstance, tempImagePaths = [], tempDir = null, abortController = null, mutableWriter = null) {
   activeSessions.set(sessionId, {
     instance: queryInstance,
     startTime: Date.now(),
     status: 'active',
     tempImagePaths,
     tempDir,
-    abortController
+    abortController,
+    mutableWriter
   });
 }
 
@@ -261,6 +348,22 @@ function getSession(sessionId) {
   return activeSessions.get(sessionId);
 }
 
+/**
+ * Attaches a new WebSocketWriter to an active session, replaying any messages
+ * that were buffered while the previous connection was closed.
+ * @param {string} sessionId - Session identifier
+ * @param {Object} newWs - New WebSocketWriter instance
+ * @returns {boolean} True if the session was found and updated
+ */
+function updateSessionWriter(sessionId, newWs) {
+  const session = activeSessions.get(sessionId);
+  if (session?.mutableWriter) {
+    session.mutableWriter.switchTo(newWs);
+    return true;
+  }
+  return false;
+}
+
 /**
  * Gets all active session IDs
  * @returns {Array<string>} Array of active session IDs
@@ -497,6 +600,10 @@ async function loadMcpConfig(cwd, userUuid) {
  */
 async function queryClaudeSDK(command, options = {}, ws) {
   const { sessionId, userUuid } = options;
+
+  // Wrap the WebSocketWriter in a MutableWriter so messages are buffered
+  // if the client disconnects mid-stream and replayed on reconnect.
+  const mutableWriter = new MutableWriter(ws);
   let capturedSessionId = sessionId;
   let sessionCreatedSent = false;
   let tempImagePaths = [];
@@ -540,6 +647,98 @@ 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}` } };
+                }
+              }
+
+              // ===== 安全守卫（Tool Guard）=====
               try {
                 const guardResult = await evaluateToolGuard(hookInput.tool_name, hookInput.tool_input, {
                   userUuid,
@@ -603,7 +802,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
       }
 
       const requestId = createRequestId();
-      ws.send({
+      mutableWriter.send({
         type: 'claude-permission-request',
         requestId,
         toolName,
@@ -619,7 +818,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
         timeoutMs: approvalTimeoutMs,
         signal: context?.signal,
         onCancel: (reason) => {
-          ws.send({
+          mutableWriter.send({
             type: 'claude-permission-cancelled',
             requestId,
             reason,
@@ -660,7 +859,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
 
     // Track the query instance for abort capability
     if (capturedSessionId) {
-      addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController);
+      addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController, mutableWriter);
     }
 
     // Process streaming messages
@@ -670,17 +869,17 @@ async function queryClaudeSDK(command, options = {}, ws) {
       if (message.session_id && !capturedSessionId) {
 
         capturedSessionId = message.session_id;
-        addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController);
+        addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController, mutableWriter);
 
         // Set session ID on writer
         if (ws.setSessionId && typeof ws.setSessionId === 'function') {
-          ws.setSessionId(capturedSessionId);
+          mutableWriter.setSessionId(capturedSessionId);
         }
 
         // Send session-created event only once for new sessions
         if (!sessionId && !sessionCreatedSent) {
           sessionCreatedSent = true;
-          ws.send({
+          mutableWriter.send({
             type: 'session-created',
             sessionId: capturedSessionId
           });
@@ -693,7 +892,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
 
       // Transform and send message to WebSocket
       const transformedMessage = transformMessage(message);
-      ws.send({
+      mutableWriter.send({
         type: 'claude-response',
         data: transformedMessage
       });
@@ -703,7 +902,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
         const tokenBudget = extractTokenBudget(message);
         if (tokenBudget) {
           console.log('Token budget from modelUsage:', tokenBudget);
-          ws.send({
+          mutableWriter.send({
             type: 'token-budget',
             data: tokenBudget
           });
@@ -789,7 +988,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
     // to the frontend, so we must not send a duplicate 'claude-complete'.
     if (!abortController.signal.aborted) {
       console.log('Streaming complete, sending claude-complete event');
-      ws.send({
+      mutableWriter.send({
         type: 'claude-complete',
         sessionId: capturedSessionId,
         exitCode: 0,
@@ -822,7 +1021,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
     await cleanupTempFiles(tempImagePaths, tempDir);
 
     // Send error to WebSocket
-    ws.send({
+    mutableWriter.send({
       type: 'claude-error',
       error: error.message
     });
@@ -908,6 +1107,20 @@ async function renameSessionForUser(sessionId, title, userUuid) {
   await renameSession(sessionId, title);
 }
 
+/**
+ * Fork a session at a given message, creating a new branch conversation.
+ * @param {string} sessionId - Session to fork
+ * @param {string} userUuid - User UUID for directory isolation
+ * @param {object} opts - Fork options (upToMessageId, title)
+ * @returns {Promise<string>} New session UUID
+ */
+async function forkSessionForUser(sessionId, userUuid, opts = {}) {
+  const userPaths = getUserPaths(userUuid);
+  process.env.CLAUDE_CONFIG_DIR = userPaths.claudeDir;
+  const result = await forkSession(sessionId, opts);
+  return result.sessionId;
+}
+
 // Export public API
 export {
   queryClaudeSDK,
@@ -915,5 +1128,8 @@ export {
   isClaudeSDKSessionActive,
   getActiveClaudeSDKSessions,
   resolveToolApproval,
-  renameSessionForUser
+  resolveShareTemplateRequest,
+  renameSessionForUser,
+  forkSessionForUser,
+  updateSessionWriter
 };

package/server/index.js

@@ -43,7 +43,7 @@ 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, renameSessionForUser } from './claude-sdk.js';
+import { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval, resolveShareTemplateRequest, renameSessionForUser, forkSessionForUser, updateSessionWriter } from './claude-sdk.js';
 import authRoutes from './routes/auth.js';
 import mcpRoutes from './routes/mcp.js';
 import mcpUtilsRoutes from './routes/mcp-utils.js';
@@ -455,6 +455,22 @@ app.put('/api/projects/:projectName/sessions/:sessionId/rename', authenticateTok
     }
 });
 
+// Fork session endpoint — creates a new branch conversation from a given point
+app.post('/api/projects/:projectName/sessions/:sessionId/fork', authenticateToken, async (req, res) => {
+    try {
+        const { sessionId } = req.params;
+        const opts = {};
+        if (req.body?.upToMessageId) {
+            opts.upToMessageId = req.body.upToMessageId;
+        }
+        const newSessionId = await forkSessionForUser(sessionId, req.user.uuid, opts);
+        res.json({ newSessionId });
+    } catch (error) {
+        console.error(`[API] Error forking session ${req.params.sessionId}:`, error);
+        res.status(500).json({ error: error.message });
+    }
+});
+
 // Delete project endpoint
 app.delete('/api/projects/:projectName', authenticateToken, async (req, res) => {
     try {
@@ -803,11 +819,27 @@ 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 (data.type === 'check-session-status') {
                 // Check if a specific session is currently processing
                 const sessionId = data.sessionId;
                 const isActive = isClaudeSDKSessionActive(sessionId);
 
+                // If still running, attach new writer to receive buffered + future messages
+                if (isActive) {
+                    updateSessionWriter(sessionId, writer);
+                }
+
                 writer.send({
                     type: 'session-status',
                     sessionId,