@ian2018cs/agenthub 0.1.78 → 0.1.80

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-NaMmXkCt.js"></script>
+    <script type="module" crossorigin src="/assets/index-ByqBXYb8.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">

package/package.json

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

package/server/claude-sdk.js

@@ -760,6 +760,18 @@ async function queryClaudeSDK(command, options = {}, ws) {
 
       // Transform and send message to WebSocket
       const transformedMessage = transformMessage(message);
+
+      // 为内置工具拦截的 tool_result 打 _builtinHandled 标记，前端据此不显示错误样式
+      if (transformedMessage.message?.role === 'user' && Array.isArray(transformedMessage.message?.content)) {
+        for (const part of transformedMessage.message.content) {
+          if (part.type === 'tool_result' && part.is_error && part.tool_use_id) {
+            if (builtinTools.consumeBuiltinHandled(part.tool_use_id)) {
+              part._builtinHandled = true;
+            }
+          }
+        }
+      }
+
       mutableWriter.send({
         type: 'claude-response',
         data: transformedMessage

package/server/index.js

@@ -924,11 +924,14 @@ function handleChatConnection(ws, userData) {
                     }
                 }
 
-                // Query 结束后，尝试投递待处理的后台任务结果
+                // Query 结束后，延迟投递待处理的后台任务结果
+                // 必须用 setTimeout 与 claude-complete 消息错开，避免两条 WS 消息
+                // 在同一事件循环 tick 内发出，导致前端 React 批量合并渲染时
+                // claude-complete 被跳过、isLoading 永久为 true 的竞态问题。
                 {
                     const sid = data.options?.sessionId || writer.getSessionId();
                     if (userUuid && sid) {
-                        tryDeliverBgResult(userUuid, sid);
+                        setTimeout(() => tryDeliverBgResult(userUuid, sid), 100);
                     }
                 }
             } else if (data.type === 'abort-session') {

package/server/routes/agents.js

@@ -347,6 +347,47 @@ async function ensureSharedGitRepo(repoUrl, branch) {
   return targetPath;
 }
 
+/**
+ * Try to move an existing local git clone directly into the shared location,
+ * avoiding a fresh network clone. Only succeeds when:
+ *   - localPath is a real directory (not a symlink) with a .git folder
+ *   - The shared target path does not yet exist
+ * Returns the shared path on success, or null if promotion is not possible.
+ */
+async function tryPromoteLocalRepoToShared(localPath, repoUrl, branch) {
+  const parsed = parseGitUrl(repoUrl);
+  if (!parsed) return null;
+
+  const publicPaths = getPublicPaths();
+  const targetPath = path.join(publicPaths.gitRepoDir, parsed.owner, parsed.repo, branch);
+
+  // Shared repo already exists — nothing to promote
+  try {
+    await fs.access(targetPath);
+    return null;
+  } catch {}
+
+  // Source must be a real git directory (not a symlink, must have .git)
+  try {
+    const stat = await fs.lstat(localPath);
+    if (!stat.isDirectory() || stat.isSymbolicLink()) return null;
+    await fs.access(path.join(localPath, '.git'));
+  } catch {
+    return null;
+  }
+
+  try {
+    await fs.mkdir(path.dirname(targetPath), { recursive: true });
+    await fs.rename(localPath, targetPath);
+    console.log(`[GitRepo] Promoted local repo to shared: ${localPath} → ${targetPath}`);
+    return targetPath;
+  } catch (e) {
+    // rename may fail on cross-device links — fall back to normal clone
+    console.warn(`[GitRepo] Could not promote local repo (will clone instead): ${e.message}`);
+    return null;
+  }
+}
+
 /**
  * Create a symlink from a project subdirectory to a shared git repo.
  * Removes existing directory or symlink at the target location.
@@ -513,6 +554,7 @@ async function scanClaudeMdRefs(projectPath) {
     if (!ref) continue;
     if (/^https?:\/\/|^mailto:|^\/\//.test(ref)) continue; // skip absolute URLs
     if (path.isAbsolute(ref)) continue; // skip absolute paths
+    if (ref.endsWith('/')) continue; // skip directory references like [src/utils/]
     if (seen.has(ref)) continue;
     seen.add(ref);
 
@@ -1530,8 +1572,22 @@ router.post('/submissions/:id/approve', async (req, res) => {
         for (const gitRepo of yamlGitRepos) {
           if (!gitRepo.name || !gitRepo.repo) continue;
           try {
-            // Ensure shared git repo exists
-            const sharedPath = await ensureSharedGitRepo(gitRepo.repo, gitRepo.branch || 'main');
+            // Try to promote the submitter's existing local clone to shared location first
+            // (avoids a full network re-clone if the user already has the repo cloned)
+            let sharedPath = null;
+            if (submitterUuid) {
+              const submitterProjectDir = path.join(getUserPaths(submitterUuid).projectsDir, submission.agent_name);
+              const localRepoPath = path.join(submitterProjectDir, gitRepo.name);
+              sharedPath = await tryPromoteLocalRepoToShared(localRepoPath, gitRepo.repo, gitRepo.branch || 'main');
+              if (sharedPath) {
+                console.log(`[AgentApprove] Promoted local repo "${gitRepo.name}" to shared (no re-clone needed)`);
+              }
+            }
+
+            // Fall back to normal clone/update if promotion was not possible
+            if (!sharedPath) {
+              sharedPath = await ensureSharedGitRepo(gitRepo.repo, gitRepo.branch || 'main');
+            }
             console.log(`[AgentApprove] Ensured shared git repo "${gitRepo.name}" at ${sharedPath}`);
 
             // Replace submitter's original subdirectory with symlink to shared repo

package/server/services/builtin-tools/background-task.js

@@ -124,6 +124,21 @@ __bg_status__ bg_xxxxxxxxxxxx
       return { decision: 'deny', reason: `后台任务提交失败: ${err.message}` };
     }
 
+    // sessionId 可能在新会话的第一个 turn 内尚未建立（getSessionId() 返回 null）。
+    // 轮询直到 session-created 事件触发后 mutableWriter 持有真实 sessionId，
+    // 避免任务完成时以 null sessionId 投递导致前端无法匹配。
+    if (!task.sessionId) {
+      const pollTimer = setInterval(() => {
+        const sid = mutableWriter.getSessionId();
+        if (sid) {
+          task.sessionId = sid;
+          clearInterval(pollTimer);
+        }
+      }, 200);
+      // 最多等 60 秒，之后放弃（任务完成时 sessionId 仍为 null 则依赖前端兜底匹配）
+      setTimeout(() => clearInterval(pollTimer), 60_000);
+    }
+
     const timeoutSec = Math.round(task.timeout / 1000);
     return {
       decision: 'deny',

package/server/services/builtin-tools/index.js

@@ -31,6 +31,8 @@ class BuiltinToolRegistry {
   #tools = [];
   #responseTypes = new Set();
   #pendingRequests = new Map();
+  /** tool_use_id → true，记录被内置工具拦截处理的工具调用（deny 即成功）*/
+  #builtinHandledIds = new Set();
 
   /**
    * 注册一个内置工具
@@ -67,6 +69,10 @@ class BuiltinToolRegistry {
 
         try {
           const result = await tool.execute(hookInput, toolContext);
+          // deny 作为正常拦截响应时，记录 tool_use_id 供后续标记
+          if (result.decision === 'deny' && hookInput.tool_use_id) {
+            this.#builtinHandledIds.add(hookInput.tool_use_id);
+          }
           return {
             hookSpecificOutput: {
               hookEventName: 'PreToolUse',
@@ -89,6 +95,18 @@ class BuiltinToolRegistry {
     return null;
   }
 
+  /**
+   * 检查某个 tool_use_id 是否由内置工具拦截处理（deny = 成功）
+   * 调用后自动从集合中移除（一次性消费）
+   */
+  consumeBuiltinHandled(toolUseId) {
+    if (this.#builtinHandledIds.has(toolUseId)) {
+      this.#builtinHandledIds.delete(toolUseId);
+      return true;
+    }
+    return false;
+  }
+
   /**
    * 检查 WS 消息类型是否属于内置工具的响应
    */