feat(子代理): 添加子代理会话ID支持并优化相关功能

refactor(任务工具): 重构任务工具以支持子代理会话跟踪

fix(会话路由): 修复会话列表去重逻辑并添加子代理过滤

style(前端): 优化子任务引用组件的交互和显示

perf(持久化存储): 改进子代理任务状态跟踪性能

chore(配置): 更新web开发命令以支持环境变量配置

Author: echoVic

.gitignore

@@ -82,3 +82,4 @@ packages/vscode/*.vsix
 
 # Web 构建缓存
 packages/web/.vite/
+packages/cli/web/.vite/

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "dev": "pnpm -r --parallel dev",
     "dev:cli": "pnpm --filter blade-code dev",
-    "dev:web": "cd packages/cli/web && pnpm dev",
+    "dev:web": "pnpm --filter blade-code dev:serve & VITE_API_TARGET=http://localhost:4097 pnpm -C packages/cli/web dev",
     "build": "pnpm -r build",
     "build:cli": "pnpm --filter blade-code build",
     "build:vscode": "pnpm --filter blade-vscode build",

packages/cli/src/agent/Agent.ts

@@ -10,6 +10,7 @@
  * 负责：LLM 交互、工具执行、循环检测
  */
 
+import { nanoid } from 'nanoid';
 import * as os from 'os';
 import * as path from 'path';
 import {
@@ -1104,6 +1105,16 @@ IMPORTANT: Execute according to the approved plan above. Follow the steps exactl
           try {
             // 解析工具参数
             const params = JSON.parse(toolCall.function.arguments);
+            if (
+              toolCall.function.name === 'Task' &&
+              (typeof params.subagent_session_id !== 'string' ||
+                params.subagent_session_id.length === 0)
+            ) {
+              params.subagent_session_id =
+                typeof params.resume === 'string' && params.resume.length > 0
+                  ? params.resume
+                  : nanoid();
+            }
 
             // 智能修复: 如果 todos 参数被错误地序列化为字符串,自动解析
             if (params.todos && typeof params.todos === 'string') {
@@ -1729,7 +1740,7 @@ IMPORTANT: Execute according to the approved plan above. Follow the steps exactl
     }
 
     // 规范化上下文为 ChatContext
-    // 🔧 修复：确保复制 systemPrompt 和 permissionMode，避免子代理行为回归
+    // 🔧 修复：确保复制 systemPrompt、permissionMode 和 subagentInfo，避免子代理行为回归
     const chatContext: ChatContext = {
       messages: context.messages as Message[],
       userId: (context.userId as string) || 'subagent',
@@ -1739,6 +1750,7 @@ IMPORTANT: Execute according to the approved plan above. Follow the steps exactl
       confirmationHandler: context.confirmationHandler,
       permissionMode: context.permissionMode, // 继承权限模式
       systemPrompt: context.systemPrompt, // 🆕 继承系统提示词（无状态设计关键）
+      subagentInfo: context.subagentInfo, // 🆕 继承 subagent 信息（用于 JSONL 写入）
     };
 
     // 调用重构后的 runLoop

packages/cli/src/agent/subagents/SubagentExecutor.ts

@@ -21,7 +21,7 @@ export class SubagentExecutor {
    */
   async execute(context: SubagentContext): Promise<SubagentResult> {
     const startTime = Date.now();
-    const agentId = nanoid();
+    const agentId = context.subagentSessionId ?? nanoid();
 
     try {
       const systemPrompt = this.buildSystemPrompt(context);
@@ -34,6 +34,12 @@ export class SubagentExecutor {
       let toolCallCount = 0;
       let tokensUsed = 0;
 
+      const subagentInfo = {
+        parentSessionId: context.parentSessionId || '',
+        subagentType: this.config.name,
+        isSidechain: false,
+      };
+      
       const loopResult = await agent.runAgenticLoop(
         context.prompt,
         {
@@ -43,11 +49,7 @@ export class SubagentExecutor {
           workspaceRoot: process.cwd(),
           permissionMode: context.permissionMode,
           systemPrompt,
-          subagentInfo: {
-            parentSessionId: context.parentSessionId || '',
-            subagentType: this.config.name,
-          isSidechain: false,
-          },
+          subagentInfo,
         },
         {
           onToolStart: context.onToolStart

packages/cli/src/agent/subagents/types.ts

@@ -121,6 +121,9 @@ export interface SubagentContext {
   /** 父 Agent 的权限模式（继承给子 Agent） */
   permissionMode?: PermissionMode;
 
+  /** 子代理会话 ID（用于与主会话关联） */
+  subagentSessionId?: string;
+
   /** 工具执行开始回调（用于 UI 进度显示） */
   onToolStart?: (toolName: string) => void;
 }

packages/cli/src/context/storage/PersistentStore.ts

@@ -3,20 +3,20 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import type { JsonValue, MessageRole } from '../../store/types.js';
 import type {
-    ContextData,
-    ConversationContext,
-    MessageInfo,
-    PartInfo,
-    SessionContext,
-    SessionEvent,
-    SessionInfo,
+  ContextData,
+  ConversationContext,
+  MessageInfo,
+  PartInfo,
+  SessionContext,
+  SessionEvent,
+  SessionInfo,
 } from '../types.js';
 import { JSONLStore } from './JSONLStore.js';
 import {
-    detectGitBranch,
-    getProjectStoragePath,
-    getSessionFilePath,
-    listProjectDirectories,
+  detectGitBranch,
+  getProjectStoragePath,
+  getSessionFilePath,
+  listProjectDirectories,
 } from './pathUtils.js';
 
 /**
@@ -197,6 +197,36 @@ export class PersistentStore {
         createdAt: now,
       };
       entries.push(this.createEvent('part_created', sessionId, partInfo));
+      if (toolName === 'Task' && toolInput && typeof toolInput === 'object') {
+        const subtaskInput = toolInput as Record<string, unknown>;
+        const childSessionId =
+          typeof subtaskInput.subagent_session_id === 'string'
+            ? subtaskInput.subagent_session_id
+            : undefined;
+        const agentType =
+          typeof subtaskInput.subagent_type === 'string'
+            ? subtaskInput.subagent_type
+            : undefined;
+        if (childSessionId && agentType) {
+          const subtaskPart: PartInfo = {
+            partId: nanoid(),
+            messageId,
+            partType: 'subtask_ref',
+            payload: {
+              childSessionId,
+              agentType,
+              status: 'running',
+              summary:
+                typeof subtaskInput.description === 'string'
+                  ? subtaskInput.description
+                  : '',
+              startedAt: now,
+            },
+            createdAt: now,
+          };
+          entries.push(this.createEvent('part_created', sessionId, subtaskPart));
+        }
+      }
       await store.appendBatch(entries);
       return toolCallId;
     } catch (error) {
@@ -255,6 +285,8 @@ export class PersistentStore {
       };
       entries.push(this.createEvent('part_created', sessionId, toolResultPart));
       if (subagentRef) {
+        const finishedAt =
+          subagentRef.subagentStatus === 'running' ? null : now;
         const subtaskPart: PartInfo = {
           partId: nanoid(),
           messageId,
@@ -265,7 +297,7 @@ export class PersistentStore {
             status: subagentRef.subagentStatus,
             summary: subagentRef.subagentSummary ?? '',
             startedAt: now,
-            finishedAt: now,
+            finishedAt,
           },
           createdAt: now,
         };

packages/cli/src/server/routes/session.ts

@@ -56,6 +56,7 @@ interface SessionInfo {
   createdAt: Date;
   messages: Message[];
   currentRunId?: string;
+  relationType?: 'subagent';
 }
 
 const sessions = new Map<string, SessionInfo>();
@@ -95,7 +96,13 @@ export const SessionRoutes = () => {
     try {
       const persistedSessions = await SessionService.listSessions();
 
-      const activeSessionsList = Array.from(sessions.values()).map((s) => ({
+      const subagentSessionIds = new Set(
+        persistedSessions.filter((s) => s.relationType === 'subagent').map((s) => s.sessionId)
+      );
+
+      const activeSessionsList = Array.from(sessions.values())
+        .filter((s) => !subagentSessionIds.has(s.id) && s.relationType !== 'subagent')
+        .map((s) => ({
         sessionId: s.id,
         projectPath: s.projectPath,
         title: s.title,
@@ -111,11 +118,22 @@ export const SessionRoutes = () => {
         isActive: true,
       }));
 
+      const activeSessionIds = new Set(activeSessionsList.map((s) => s.sessionId));
+      const filteredPersisted = persistedSessions.filter(
+        (s) => !sessions.has(s.sessionId) && !activeSessionIds.has(s.sessionId) && s.relationType !== 'subagent'
+      );
+
+      const seenSessionIds = new Set(activeSessionIds);
+      const deduplicatedPersisted = filteredPersisted.filter((s) => {
+        if (seenSessionIds.has(s.sessionId)) return false;
+        seenSessionIds.add(s.sessionId);
+        return true;
+      });
+
       const allSessions = [
         ...activeSessionsList,
-        ...persistedSessions.filter((s) => !sessions.has(s.sessionId)),
+        ...deduplicatedPersisted,
       ];
-
       return c.json(allSessions);
     } catch (error) {
       logger.error('[SessionRoutes] Failed to list sessions:', error);
@@ -472,6 +490,7 @@ async function executeRunAsync(
       onToolStart: async (toolCall, toolKind) => {
         if (toolCall.type !== 'function') return;
         emit('tool.start', {
+          messageId: assistantMessageId,
           toolName: toolCall.function.name,
           toolCallId: toolCall.id,
           arguments: toolCall.function.arguments,
@@ -481,6 +500,7 @@ async function executeRunAsync(
       onToolResult: async (toolCall, result) => {
         if (toolCall.type !== 'function') return;
         emit('tool.result', {
+          messageId: assistantMessageId,
           toolName: toolCall.function.name,
           toolCallId: toolCall.id,
           success: !result.error,

packages/cli/src/tools/builtin/task/task.ts

@@ -157,6 +157,10 @@ export const taskTool = createTool({
       .describe(
         'Optional agent ID to resume from. If provided, the agent will continue from the previous execution transcript.'
       ),
+    subagent_session_id: z
+      .string()
+      .optional()
+      .describe('Internal subagent session id for tracking'),
   }),
 
   // 工具描述
@@ -202,8 +206,15 @@ export const taskTool = createTool({
       prompt,
       run_in_background = false,
       resume,
+      subagent_session_id,
     } = params;
     const { updateOutput } = context;
+    const subagentSessionId =
+      typeof subagent_session_id === 'string' && subagent_session_id.length > 0
+        ? subagent_session_id
+        : typeof resume === 'string' && resume.length > 0
+          ? resume
+          : nanoid();
 
     try {
       // 1. 获取 subagent 配置
@@ -229,7 +240,13 @@ export const taskTool = createTool({
 
       // 3. 处理后台执行模式
       if (run_in_background) {
-        return handleBackgroundExecution(subagentConfig, description, prompt, context);
+        return handleBackgroundExecution(
+          subagentConfig,
+          description,
+          prompt,
+          context,
+          subagentSessionId
+        );
       }
 
       // 4. 同步执行模式（原有逻辑）
@@ -249,6 +266,7 @@ export const taskTool = createTool({
         prompt,
         parentSessionId: context.sessionId,
         permissionMode: context.permissionMode, // 继承父 Agent 的权限模式
+        subagentSessionId,
         onToolStart: (toolName) => {
           vanillaStore.getState().app.actions.updateSubagentTool(toolName);
         },
@@ -330,7 +348,7 @@ export const taskTool = createTool({
             description,
             duration,
             stats: result.stats,
-            subagentSessionId: result.agentId,
+            subagentSessionId,
             subagentType: subagent_type,
             subagentStatus: 'completed' as const,
             subagentSummary: result.message.slice(0, 500),
@@ -352,7 +370,7 @@ export const taskTool = createTool({
             message: result.error || 'Unknown error',
           },
           metadata: {
-            subagentSessionId: result.agentId,
+            subagentSessionId,
             subagentType: subagent_type,
             subagentStatus: 'failed' as const,
           },
@@ -398,7 +416,8 @@ function handleBackgroundExecution(
   },
   description: string,
   prompt: string,
-  context: ExecutionContext
+  context: ExecutionContext,
+  subagentSessionId: string
 ): ToolResult {
   const manager = BackgroundAgentManager.getInstance();
 
@@ -409,6 +428,7 @@ function handleBackgroundExecution(
     prompt,
     parentSessionId: context.sessionId,
     permissionMode: context.permissionMode,
+    agentId: subagentSessionId,
   });
 
   return {

packages/cli/src/tools/builtin/task/taskOutput.ts

@@ -241,6 +241,13 @@ async function handleAgentOutput(
     stats: session.stats,
   };
 
+  const subagentStatus =
+    session.status === 'completed'
+      ? 'completed'
+      : session.status === 'failed'
+        ? 'failed'
+        : 'running';
+
   const statusEmoji = getStatusEmoji(session.status);
   const displayContent =
     `${statusEmoji} TaskOutput(${taskId}) - Agent\n` +
@@ -256,7 +263,16 @@ async function handleAgentOutput(
     success: true,
     llmContent: payload,
     displayContent,
-    metadata: payload,
+    metadata: {
+      ...payload,
+      subagentSessionId: session.id,
+      subagentType: session.subagentType,
+      subagentStatus,
+      subagentSummary:
+        typeof session.result?.message === 'string'
+          ? session.result.message.slice(0, 500)
+          : undefined,
+    },
   };
 }