feat(subagent): 添加子任务执行进度显示功能

echoVic · echoVic · commit a3254c314bcb · 2026-01-22T15:57:01.000+08:00
添加子任务执行进度状态管理及UI显示组件，包括：
1. 在SubagentContext中添加onToolStart回调
2. 新增SubagentProgress类型和状态管理
3. 实现进度显示组件SubagentProgress
4. 在task工具中集成进度显示逻辑
5. 优化错误信息展示
diff --git a/src/agent/subagents/SubagentExecutor.ts b/src/agent/subagents/SubagentExecutor.ts
@@ -34,14 +34,26 @@ export class SubagentExecutor {
       let toolCallCount = 0;
       let tokensUsed = 0;
 
-      const loopResult = await agent.runAgenticLoop(context.prompt, {
-        messages: [],
-        userId: 'subagent',
-        sessionId: context.parentSessionId || `subagent_${Date.now()}`,
-        workspaceRoot: process.cwd(),
-        permissionMode: context.permissionMode, // 继承父 Agent 的权限模式
-        systemPrompt, // 🆕 无状态设计：通过 context 传入 systemPrompt
-      });
+      const loopResult = await agent.runAgenticLoop(
+        context.prompt,
+        {
+          messages: [],
+          userId: 'subagent',
+          sessionId: context.parentSessionId || `subagent_${Date.now()}`,
+          workspaceRoot: process.cwd(),
+          permissionMode: context.permissionMode, // 继承父 Agent 的权限模式
+          systemPrompt, // 🆕 无状态设计：通过 context 传入 systemPrompt
+        },
+        {
+          onToolStart: context.onToolStart
+            ? (toolCall) => {
+                const name =
+                  'function' in toolCall ? toolCall.function.name : 'unknown';
+                context.onToolStart!(name);
+              }
+            : undefined,
+        }
+      );
 
       if (loopResult.success) {
         finalMessage = loopResult.finalMessage || '';
diff --git a/src/agent/subagents/types.ts b/src/agent/subagents/types.ts
@@ -120,6 +120,9 @@ export interface SubagentContext {
 
   /** 父 Agent 的权限模式（继承给子 Agent） */
   permissionMode?: PermissionMode;
+
+  /** 工具执行开始回调（用于 UI 进度显示） */
+  onToolStart?: (toolName: string) => void;
 }
 
 /**
diff --git a/src/store/slices/appSlice.ts b/src/store/slices/appSlice.ts
@@ -33,6 +33,7 @@ const initialAppState: AppState = {
   todos: [],
   awaitingSecondCtrlC: false,
   thinkingModeEnabled: false, // Thinking 模式默认关闭
+  subagentProgress: null, // 当前无 subagent 执行
 };
 
 /**
@@ -158,5 +159,67 @@ export const createAppSlice: StateCreator<BladeStore, [], [], AppSlice> = (set)
         app: { ...state.app, thinkingModeEnabled: !state.app.thinkingModeEnabled },
       }));
     },
+
+    // ==================== Subagent 进度相关 actions ====================
+
+    /**
+     * 开始 subagent 执行进度
+     */
+    startSubagentProgress: (id: string, type: string, description: string) => {
+      set((state) => ({
+        app: {
+          ...state.app,
+          subagentProgress: {
+            id,
+            type,
+            description,
+            status: 'running',
+            startTime: Date.now(),
+          },
+        },
+      }));
+    },
+
+    /**
+     * 更新当前执行的工具名称
+     */
+    updateSubagentTool: (toolName: string) => {
+      set((state) => {
+        if (!state.app.subagentProgress) return state;
+        return {
+          app: {
+            ...state.app,
+            subagentProgress: {
+              ...state.app.subagentProgress,
+              currentTool: toolName,
+            },
+          },
+        };
+      });
+    },
+
+    /**
+     * 完成 subagent 执行
+     */
+    completeSubagentProgress: (success: boolean) => {
+      set((state) => {
+        if (!state.app.subagentProgress) return state;
+        return {
+          app: {
+            ...state.app,
+            subagentProgress: {
+              ...state.app.subagentProgress,
+              status: success ? 'completed' : 'failed',
+              currentTool: undefined,
+            },
+          },
+        };
+      });
+      setTimeout(() => {
+        set((state) => ({
+          app: { ...state.app, subagentProgress: null },
+        }));
+      }, 1500);
+    },
   },
 });
diff --git a/src/store/types.ts b/src/store/types.ts
@@ -187,6 +187,18 @@ export type ActiveModal =
   | 'hooksManager'
   | 'pluginsManager';
 
+/**
+ * Subagent 进度状态
+ */
+export interface SubagentProgress {
+  id: string;
+  type: string;
+  description: string;
+  status: 'running' | 'completed' | 'failed';
+  currentTool?: string;
+  startTime: number;
+}
+
 /**
  * 应用状态（纯 UI 状态）
  */
@@ -199,6 +211,7 @@ export interface AppState {
   todos: TodoItem[];
   awaitingSecondCtrlC: boolean; // 是否等待第二次 Ctrl+C 退出
   thinkingModeEnabled: boolean; // Thinking 模式是否启用（Tab 切换）
+  subagentProgress: SubagentProgress | null; // 当前 subagent 执行进度
 }
 
 /**
@@ -217,6 +230,10 @@ export interface AppActions {
   // Thinking 模式相关
   setThinkingModeEnabled: (enabled: boolean) => void;
   toggleThinkingMode: () => void;
+  // Subagent 进度相关
+  startSubagentProgress: (id: string, type: string, description: string) => void;
+  updateSubagentTool: (toolName: string) => void;
+  completeSubagentProgress: (success: boolean) => void;
 }
 
 /**
diff --git a/src/tools/builtin/task/task.ts b/src/tools/builtin/task/task.ts
@@ -9,6 +9,7 @@
  * 6. 会话恢复 - 支持 resume 参数
  */
 
+import { nanoid } from 'nanoid';
 import { z } from 'zod';
 import { BackgroundAgentManager } from '../../../agent/subagents/BackgroundAgentManager.js';
 import { SubagentExecutor } from '../../../agent/subagents/SubagentExecutor.js';
@@ -19,10 +20,48 @@ import type {
 } from '../../../agent/subagents/types.js';
 import { PermissionMode } from '../../../config/types.js';
 import { HookManager } from '../../../hooks/HookManager.js';
+import { vanillaStore } from '../../../store/vanilla.js';
 import { createTool } from '../../core/createTool.js';
 import type { ExecutionContext, ToolResult } from '../../types/index.js';
 import { ToolErrorType, ToolKind } from '../../types/index.js';
 
+/**
+ * 从错误中提取用户友好的错误信息
+ */
+function extractUserFriendlyError(error: Error): string {
+  const message = error.message || 'Unknown error';
+
+  // 检查是否是 API 限流错误
+  if (message.includes('Too Many Requests') || message.includes('429')) {
+    // 尝试从错误链中提取更详细的信息
+    const cause = (error as { cause?: { responseBody?: string } }).cause;
+    if (cause?.responseBody) {
+      try {
+        const body = JSON.parse(cause.responseBody);
+        if (body.message) {
+          return body.message;
+        }
+      } catch {
+        // 忽略解析错误
+      }
+    }
+    return 'API 请求过于频繁，请稍后重试';
+  }
+
+  // 检查是否是网络错误
+  if (message.includes('ECONNREFUSED') || message.includes('ETIMEDOUT')) {
+    return '网络连接失败，请检查网络设置';
+  }
+
+  // 检查是否是认证错误
+  if (message.includes('401') || message.includes('Unauthorized')) {
+    return 'API 认证失败，请检查 API Key 配置';
+  }
+
+  // 返回简化的错误信息（不包含堆栈）
+  return message.split('\n')[0];
+}
+
 /**
  * 获取可用的 subagent 类型（用于 Zod 枚举）
  */
@@ -191,11 +230,20 @@ export const taskTool = createTool({
       // 创建执行器
       const executor = new SubagentExecutor(subagentConfig);
 
+      // 生成唯一 ID 并启动进度显示
+      const subagentId = nanoid(8);
+      vanillaStore
+        .getState()
+        .app.actions.startSubagentProgress(subagentId, subagent_type, description);
+
       // 构建执行上下文
       const subagentContext: SubagentContext = {
         prompt,
         parentSessionId: context.sessionId,
         permissionMode: context.permissionMode, // 继承父 Agent 的权限模式
+        onToolStart: (toolName) => {
+          vanillaStore.getState().app.actions.updateSubagentTool(toolName);
+        },
       };
 
       updateOutput?.(`⚙️  执行任务中...`);
@@ -247,7 +295,10 @@ export const taskTool = createTool({
         console.warn('[Task] SubagentStop hook execution failed:', hookError);
       }
 
-      // 6. 返回结果
+      // 6. 完成进度显示
+      vanillaStore.getState().app.actions.completeSubagentProgress(result.success);
+
+      // 7. 返回结果
       if (result.success) {
         const outputPreview =
           result.message.length > 1000
@@ -289,11 +340,16 @@ export const taskTool = createTool({
         };
       }
     } catch (error) {
+      // 异常时也要完成进度显示
+      vanillaStore.getState().app.actions.completeSubagentProgress(false);
+
       const err = error as Error;
+      const errorMessage = extractUserFriendlyError(err);
+
       return {
         success: false,
         llmContent: `Subagent execution error: ${err.message}`,
-        displayContent: `❌ Subagent 执行异常\n\n${err.message}\n\n${err.stack || ''}`,
+        displayContent: `❌ Subagent 执行异常\n\n${errorMessage}`,
         error: {
           type: ToolErrorType.EXECUTION_ERROR,
           message: err.message,
diff --git a/src/ui/components/BladeInterface.tsx b/src/ui/components/BladeInterface.tsx
@@ -2,25 +2,25 @@ import { useMemoizedFn } from 'ahooks';
 import { Box, useApp } from 'ink';
 import React, { useEffect, useRef } from 'react';
 import {
-  type ModelConfig,
-  PermissionMode,
-  type SetupConfig,
+    type ModelConfig,
+    PermissionMode,
+    type SetupConfig,
 } from '../../config/types.js';
 import { createLogger, LogCategory } from '../../logging/Logger.js';
 import { safeExit } from '../../services/GracefulShutdown.js';
 import { SessionService } from '../../services/SessionService.js';
 import { SpecManager } from '../../spec/SpecManager.js';
 import {
-  useActiveModal,
-  useAppActions,
-  useFocusActions,
-  useInitializationError,
-  useInitializationStatus,
-  useIsProcessing,
-  useModelEditorTarget,
-  usePermissionMode,
-  useSessionActions,
-  useSessionSelectorData,
+    useActiveModal,
+    useAppActions,
+    useFocusActions,
+    useInitializationError,
+    useInitializationStatus,
+    useIsProcessing,
+    useModelEditorTarget,
+    usePermissionMode,
+    useSessionActions,
+    useSessionSelectorData,
 } from '../../store/selectors/index.js';
 import { FocusId } from '../../store/types.js';
 import { configActions, getMessages } from '../../store/vanilla.js';
@@ -49,6 +49,7 @@ import { QuestionPrompt } from './QuestionPrompt.js';
 import { SessionSelector } from './SessionSelector.js';
 import { SkillsManager } from './SkillsManager.js';
 import { SpecStatusPanel } from './SpecStatusPanel.js';
+import { SubagentProgress } from './SubagentProgress.js';
 import { ThemeSelector } from './ThemeSelector.js';
 
 // 创建 BladeInterface 专用 Logger
@@ -640,6 +641,9 @@ export const BladeInterface: React.FC<BladeInterfaceProps> = ({
         {/* MessageArea 内部直接获取状态，不需要 props */}
         <MessageArea />
 
+        {/* Subagent 进度指示器 - 显示在加载指示器上方 */}
+        <SubagentProgress />
+
         {/* 加载指示器 - 当有阻塞弹窗时暂停动画，避免无意义的重渲染 */}
         <LoadingIndicator paused={hasBlockingModal} />
 
diff --git a/src/ui/components/SubagentProgress.tsx b/src/ui/components/SubagentProgress.tsx

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,9 @@ export interface SubagentContext {`
`120`	`120`
`121`	`121`	`/** 父 Agent 的权限模式（继承给子 Agent） */`
`122`	`122`	`permissionMode?: PermissionMode;`
	`123`	`+`
	`124`	`+ /** 工具执行开始回调（用于 UI 进度显示） */`
	`125`	`+ onToolStart?: (toolName: string) => void;`
`123`	`126`	`}`
`124`	`127`
`125`	`128`	`/**`