feat(子任务): 增强子任务执行状态展示和交互

echoVic · echoVic · commit f725f00bf3d7 · 2026-02-01T19:16:18.000+08:00
扩展子任务进度类型定义，增加会话ID和输出等字段
实现子任务工具调用和状态更新的完整事件处理链
重构子任务展示组件，支持折叠展开和实时内容更新
添加子任务取消时的状态处理逻辑
diff --git a/packages/cli/src/agent/subagents/SubagentExecutor.ts b/packages/cli/src/agent/subagents/SubagentExecutor.ts
@@ -52,13 +52,15 @@ export class SubagentExecutor {
           subagentInfo,
         },
         {
-          onToolStart: context.onToolStart
-            ? (toolCall) => {
-                const name =
-                  'function' in toolCall ? toolCall.function.name : 'unknown';
-                context.onToolStart!(name);
+          onToolStart: context.onToolStart,
+          onToolResult: context.onToolResult
+            ? async (toolCall, result) => {
+                context.onToolResult?.(toolCall, result);
               }
             : undefined,
+          onContentDelta: context.onContentDelta,
+          onThinkingDelta: context.onThinkingDelta,
+          onStreamEnd: context.onStreamEnd,
         }
       );
 
diff --git a/packages/cli/src/agent/subagents/types.ts b/packages/cli/src/agent/subagents/types.ts
@@ -2,7 +2,9 @@
  * Subagent 系统类型定义
  */
 
+import type { ChatCompletionMessageToolCall } from 'openai/resources/chat';
 import { PermissionMode } from '../../config/types.js';
+import type { ToolResult } from '../../tools/types/index.js';
 
 /**
  * Claude Code permissionMode 类型
@@ -125,7 +127,18 @@ export interface SubagentContext {
   subagentSessionId?: string;
 
   /** 工具执行开始回调（用于 UI 进度显示） */
-  onToolStart?: (toolName: string) => void;
+  onToolStart?: (
+    toolCall: ChatCompletionMessageToolCall,
+    toolKind?: 'readonly' | 'write' | 'execute'
+  ) => void;
+  onToolResult?: (
+    toolCall: ChatCompletionMessageToolCall,
+    result: ToolResult
+  ) => void;
+
+  onContentDelta?: (delta: string) => void;
+  onThinkingDelta?: (delta: string) => void;
+  onStreamEnd?: () => void;
 }
 
 /**
diff --git a/packages/cli/src/server/routes/session.ts b/packages/cli/src/server/routes/session.ts
@@ -254,6 +254,11 @@ export const SessionRoutes = () => {
         activeRuns.delete(session.currentRunId);
       }
     }
+    try {
+      await SessionService.deleteSession(sessionId);
+    } catch (error) {
+      logger.warn('[SessionRoutes] Failed to delete session file:', error);
+    }
     sessions.delete(sessionId);
 
     return c.json({ success: true });
diff --git a/packages/cli/src/services/SessionService.ts b/packages/cli/src/services/SessionService.ts
@@ -3,7 +3,7 @@
  * 负责加载和恢复历史会话
  */
 
-import { readdir, readFile } from 'node:fs/promises';
+import { readdir, readFile, rm } from 'node:fs/promises';
 import * as path from 'node:path';
 import {
   getBladeStorageRoot,
@@ -173,6 +173,18 @@ export class SessionService {
     }
   }
 
+  static async deleteSession(sessionId: string): Promise<number> {
+    const sessions = await this.listSessions();
+    const matches = sessions.filter((s) => s.sessionId === sessionId);
+    if (matches.length === 0) return 0;
+    await Promise.all(
+      matches.map((s) =>
+        rm(s.filePath, { force: true })
+      )
+    );
+    return matches.length;
+  }
+
   /**
    * 从 JSONL 文件加载并转换消息
    */
diff --git a/packages/cli/src/tools/builtin/task/task.ts b/packages/cli/src/tools/builtin/task/task.ts
@@ -20,6 +20,7 @@ import type {
 } from '../../../agent/subagents/types.js';
 import { PermissionMode } from '../../../config/types.js';
 import { HookManager } from '../../../hooks/HookManager.js';
+import { Bus } from '../../../server/bus.js';
 import { vanillaStore } from '../../../store/vanilla.js';
 import { createTool } from '../../core/createTool.js';
 import type { ExecutionContext, ToolResult } from '../../types/index.js';
@@ -209,6 +210,7 @@ export const taskTool = createTool({
       subagent_session_id,
     } = params;
     const { updateOutput } = context;
+    const parentSessionId = context.sessionId;
     const subagentSessionId =
       typeof subagent_session_id === 'string' && subagent_session_id.length > 0
         ? subagent_session_id
@@ -267,8 +269,61 @@ export const taskTool = createTool({
         parentSessionId: context.sessionId,
         permissionMode: context.permissionMode, // 继承父 Agent 的权限模式
         subagentSessionId,
-        onToolStart: (toolName) => {
+        onToolStart: (toolCall, toolKind) => {
+          const toolName =
+            toolCall.type === 'function' ? toolCall.function.name : 'Unknown';
           vanillaStore.getState().app.actions.updateSubagentTool(toolName);
+          if (parentSessionId) {
+            Bus.publish(parentSessionId, 'subagent.update', {
+              subagentSessionId,
+              toolName,
+            });
+            if (toolCall.type === 'function') {
+              Bus.publish(parentSessionId, 'subagent.tool.start', {
+                subagentSessionId,
+                toolCallId: toolCall.id,
+                toolName,
+                arguments: toolCall.function.arguments,
+                toolKind,
+              });
+            }
+          }
+        },
+        onToolResult: (toolCall, result) => {
+          if (!parentSessionId) return;
+          if (toolCall.type !== 'function') return;
+          Bus.publish(parentSessionId, 'subagent.tool.result', {
+            subagentSessionId,
+            toolCallId: toolCall.id,
+            toolName: toolCall.function.name,
+            success: !result.error,
+            summary: result.metadata?.summary,
+            output: result.displayContent,
+            metadata: result.metadata,
+          });
+        },
+        onContentDelta: (delta) => {
+          if (parentSessionId) {
+            Bus.publish(parentSessionId, 'subagent.delta', {
+              subagentSessionId,
+              delta,
+            });
+          }
+        },
+        onThinkingDelta: (delta) => {
+          if (parentSessionId) {
+            Bus.publish(parentSessionId, 'subagent.thinking.delta', {
+              subagentSessionId,
+              delta,
+            });
+          }
+        },
+        onStreamEnd: () => {
+          if (parentSessionId) {
+            Bus.publish(parentSessionId, 'subagent.stream.end', {
+              subagentSessionId,
+            });
+          }
         },
       };
 
diff --git a/packages/cli/web/src/components/chat/ChatMessage.tsx b/packages/cli/web/src/components/chat/ChatMessage.tsx
@@ -5,7 +5,7 @@ import type { AgentResponseContent, Message, ToolCallInfo } from '@/store/sessio
 import { useSessionStore } from '@/store/session'
 import { aggregateMessages } from '@/store/session/utils/aggregateMessages'
 import { ChevronDown, ChevronRight, FileText, Loader2 } from 'lucide-react'
-import { useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { MarkdownRenderer } from './MarkdownRenderer'
 
 export type { Message }
@@ -225,107 +225,83 @@ function ChangedFilesSection({ toolCalls }: { toolCalls: ToolCallInfo[] }) {
 }
 
 function SubagentSection({ subagent }: { subagent: AgentResponseContent['subagent'] }) {
+  const [manualToggle, setManualToggle] = useState<boolean | null>(null)
+  const [loading, setLoading] = useState(false)
+  const [loadedToolCalls, setLoadedToolCalls] = useState<ToolCallInfo[] | null>(null)
+  
   if (!subagent) return null
 
-  return (
-    <div className="bg-[#F9FAFB] dark:bg-[#18181b] border border-[#E5E7EB] dark:border-[#27272a] rounded-lg px-3 py-2">
-      <div className="flex gap-2 items-center">
-        {subagent.status === 'running' && <Loader2 className="h-3 w-3 animate-spin text-[#6B7280]" />}
-        <span className="text-[12px] text-[#6B7280] dark:text-[#71717a] font-mono">
-          {subagent.type}: {subagent.description}
-        </span>
-        <StatusPill status={subagent.status === 'completed' ? 'success' : subagent.status === 'failed' ? 'error' : 'running'} />
-      </div>
-    </div>
-  )
-}
-
-function SubtaskRefSection({ subtaskRef }: { subtaskRef: Record<string, unknown> }) {
-  const { currentSessionId } = useSessionStore()
-  const [expanded, setExpanded] = useState(false)
-  const [loading, setLoading] = useState(false)
-  const [subagentToolCalls, setSubagentToolCalls] = useState<ToolCallInfo[] | null>(null)
-  const status = typeof subtaskRef.status === 'string' ? subtaskRef.status : undefined
-  const summary = typeof subtaskRef.summary === 'string' ? subtaskRef.summary : ''
-  const agentType = typeof subtaskRef.agentType === 'string' ? subtaskRef.agentType : 'subagent'
-  const sessionId = typeof subtaskRef.childSessionId === 'string' ? subtaskRef.childSessionId : undefined
-  const pillStatus =
-    status === 'completed' ? 'success' : status === 'failed' ? 'error' : status === 'running' ? 'running' : 'info'
-  const isActive = sessionId && sessionId === currentSessionId
-  const canExpand = !!sessionId
-
-  const handleToggleExpand = async () => {
-    if (!sessionId) return
-    const next = !expanded
-    setExpanded(next)
-    if (next && subagentToolCalls === null) {
-      setLoading(true)
-      try {
-        const rawMessages = await sessionService.getMessages(sessionId)
-        const aggregated = aggregateMessages(rawMessages)
-        const toolCalls: ToolCallInfo[] = []
-        for (const message of aggregated) {
-          if (message.agentContent?.toolCalls?.length) {
-            toolCalls.push(...message.agentContent.toolCalls)
+  const isRunning = subagent.status === 'running'
+  const expanded = manualToggle !== null ? manualToggle : isRunning
+  const toolCalls = subagent.toolCalls || loadedToolCalls || []
+  const hasContent = subagent.output || subagent.thinking || toolCalls.length > 0 || subagent.sessionId
+
+  useEffect(() => {
+    if (!expanded || isRunning || !subagent.sessionId || loadedToolCalls !== null || (subagent.toolCalls && subagent.toolCalls.length > 0)) return
+    let mounted = true
+    setLoading(true)
+    sessionService.getMessages(subagent.sessionId).then((rawMessages) => {
+      if (!mounted) return
+      const aggregated = aggregateMessages(rawMessages)
+      const toolCallsMap = new Map<string, ToolCallInfo>()
+      for (const message of aggregated) {
+        if (message.agentContent?.toolCalls?.length) {
+          for (const tc of message.agentContent.toolCalls) {
+            if (!toolCallsMap.has(tc.toolCallId)) {
+              toolCallsMap.set(tc.toolCallId, tc)
+            }
           }
         }
-        setSubagentToolCalls(toolCalls)
-      } finally {
-        setLoading(false)
       }
-    }
-  }
+      setLoadedToolCalls(Array.from(toolCallsMap.values()))
+    }).finally(() => {
+      if (mounted) setLoading(false)
+    })
+    return () => { mounted = false }
+  }, [expanded, isRunning, subagent.sessionId, subagent.toolCalls, loadedToolCalls])
 
   return (
-    <div
-      className={cn(
-        'bg-[#F9FAFB] dark:bg-[#18181b] border border-[#E5E7EB] dark:border-[#27272a] rounded-lg px-3 py-2 space-y-1',
-        isActive ? 'ring-1 ring-[#22C55E]/60' : ''
-      )}
-    >
-      <div className="flex gap-2 justify-between items-center">
+    <div className="bg-[#F9FAFB] dark:bg-[#18181b] border border-[#E5E7EB] dark:border-[#27272a] rounded-lg px-3 py-2">
+      <button
+        type="button"
+        onClick={() => setManualToggle(!expanded)}
+        className="flex gap-2 justify-between items-center w-full transition-opacity cursor-pointer hover:opacity-80"
+      >
         <div className="flex gap-2 items-center">
+          {isRunning && <Loader2 className="h-3 w-3 animate-spin text-[#6B7280]" />}
           <span className="text-[12px] text-[#6B7280] dark:text-[#71717a] font-mono">
-            Subtask @{agentType}
+            {subagent.type}: {subagent.description}
           </span>
-          <StatusPill status={pillStatus} />
+          <StatusPill status={subagent.status === 'completed' ? 'success' : subagent.status === 'failed' ? 'error' : 'running'} />
         </div>
-        <button
-          type="button"
-          onClick={(event) => {
-            event.stopPropagation()
-            void handleToggleExpand()
-          }}
-          disabled={!canExpand}
-          className={cn(
-            'flex items-center gap-1 text-[11px] font-mono px-2 py-1 rounded',
-            canExpand
-              ? 'text-[#6B7280] hover:text-[#111827] hover:bg-[#E5E7EB] dark:text-[#71717a] dark:hover:text-[#E5E5E5] dark:hover:bg-[#27272a]'
-              : 'text-[#9CA3AF] dark:text-[#52525b] cursor-not-allowed'
-          )}
-        >
-          {expanded ? <ChevronDown className="w-3 h-3" /> : <ChevronRight className="w-3 h-3" />}
-          Logs
-        </button>
-      </div>
-      {summary && (
-        <div className="text-[12px] text-[#374151] dark:text-[#d4d4d8] whitespace-pre-wrap">{summary}</div>
-      )}
+        {hasContent && (
+          <ChevronDown className={cn('h-3.5 w-3.5 text-[#6B7280] transition-transform', expanded && 'rotate-180')} />
+        )}
+      </button>
       {expanded && (
-        <div className="pt-2">
+        <div className="mt-2 space-y-2">
+          {(subagent.output || subagent.thinking) && (
+            <>
+              {subagent.output && (
+                <pre className="text-[11px] text-[#374151] dark:text-[#d4d4d8] bg-[#F3F4F6] dark:bg-[#111113] border border-[#E5E7EB] dark:border-[#27272a] rounded-md p-2 overflow-x-auto whitespace-pre-wrap font-mono max-h-[160px] overflow-y-auto">
+                  {subagent.output}
+                </pre>
+              )}
+              {subagent.thinking && (
+                <pre className="text-[11px] text-[#6B7280] dark:text-[#a1a1aa] bg-[#F3F4F6] dark:bg-[#111113] border border-[#E5E7EB] dark:border-[#27272a] rounded-md p-2 overflow-x-auto whitespace-pre-wrap font-mono max-h-[120px] overflow-y-auto">
+                  {subagent.thinking}
+                </pre>
+              )}
+            </>
+          )}
           {loading && (
             <div className="flex items-center gap-2 text-[11px] text-[#6B7280] dark:text-[#71717a] font-mono">
               <Loader2 className="w-3 h-3 animate-spin" />
               Loading subagent logs...
             </div>
           )}
-          {!loading && subagentToolCalls && subagentToolCalls.length > 0 && (
-            <ToolCallsList toolCalls={subagentToolCalls} />
-          )}
-          {!loading && subagentToolCalls && subagentToolCalls.length === 0 && (
-            <div className="text-[11px] text-[#6B7280] dark:text-[#71717a] font-mono">
-              No tool calls recorded.
-            </div>
+          {!loading && toolCalls.length > 0 && (
+            <ToolCallsList toolCalls={toolCalls} />
           )}
         </div>
       )}
@@ -487,11 +463,7 @@ function AgentMessageContent({ message }: { message: Message }) {
   }
 
   const { textBefore, toolCalls, textAfter, thinkingContent, todos, subagent, confirmation, question } = agentContent
-  const subtaskRef =
-    message.metadata && typeof message.metadata === 'object' && 'subtaskRef' in message.metadata
-      ? (message.metadata.subtaskRef as Record<string, unknown>)
-      : null
-  const hasContent = textBefore || toolCalls.length > 0 || textAfter || thinkingContent || todos.length > 0 || subagent || confirmation || question || subtaskRef
+  const hasContent = textBefore || toolCalls.length > 0 || textAfter || thinkingContent || todos.length > 0 || subagent || confirmation || question
 
   if (!hasContent && isCurrentMessage && isStreaming) {
     return (
@@ -511,7 +483,6 @@ function AgentMessageContent({ message }: { message: Message }) {
       {textBefore && <MarkdownRenderer content={textBefore} />}
       {todos.length > 0 && <TodoSection todos={todos} />}
       {subagent && <SubagentSection subagent={subagent} />}
-      {subtaskRef && <SubtaskRefSection subtaskRef={subtaskRef} />}
       <ToolCallsList toolCalls={toolCalls} />
       {confirmation && <ConfirmationSection confirmation={confirmation} messageId={message.id} />}
       {question && <QuestionSection question={question} />}
diff --git a/packages/cli/web/src/store/session/handlers/eventHandlers.ts b/packages/cli/web/src/store/session/handlers/eventHandlers.ts
diff --git a/packages/cli/web/src/store/session/types.ts b/packages/cli/web/src/store/session/types.ts
diff --git a/packages/cli/web/src/store/session/utils/aggregateMessages.ts b/packages/cli/web/src/store/session/utils/aggregateMessages.ts

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,11 @@ export const SessionRoutes = () => {`
`254`	`254`	`activeRuns.delete(session.currentRunId);`
`255`	`255`	`}`
`256`	`256`	`}`
	`257`	`+ try {`
	`258`	`+ await SessionService.deleteSession(sessionId);`
	`259`	`+ } catch (error) {`
	`260`	`+ logger.warn('[SessionRoutes] Failed to delete session file:', error);`
	`261`	`+ }`
`257`	`262`	`sessions.delete(sessionId);`
`258`	`263`
`259`	`264`	`return c.json({ success: true });`