sema-core 1.0.14 → 2.0.1

package/dist/tools/{Skill/Skill.js → Skill.js}

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SkillTool = void 0;
+exports.Skill = void 0;
 const zod_1 = require("zod");
-const prompt_1 = require("./prompt");
-const skillsManager_1 = require("../../services/skills/skillsManager");
+const skill_1 = require("../prompt/tools/skill");
+const skillsManager_1 = require("../services/skills/skillsManager");
+const tool_1 = require("../prompt/tool");
+const TOOL_NAME = tool_1.TOOL_NAME_SKILL;
 // 辅助函数：生成显示标题
 function getTitle(input) {
     if (input?.skill) {
@@ -13,19 +15,19 @@ function getTitle(input) {
         }
         return parts.join(', ');
     }
-    return prompt_1.TOOL_NAME_FOR_PROMPT;
+    return TOOL_NAME;
 }
-const inputSchema = zod_1.z.strictObject({
-    skill: zod_1.z.string().describe('The skill name. E.g., "commit", "review-pr", or "pdf"'),
-    args: zod_1.z.string().optional().describe('Optional arguments for the skill'),
+const toolParams = zod_1.z.strictObject({
+    skill: zod_1.z.string().describe('Name of the skill to invoke (e.g. "commit", "review-pr", "pdf")'),
+    args: zod_1.z.string().optional().describe('Extra arguments to pass to the skill, if any'),
 });
-exports.SkillTool = {
-    name: prompt_1.TOOL_NAME_FOR_PROMPT,
+exports.Skill = {
+    name: TOOL_NAME,
     description() {
-        return prompt_1.DESCRIPTION;
+        return skill_1.TOOL_DESCRIPTION;
     },
-    inputSchema,
-    isReadOnly() {
+    toolParams,
+    isSafe() {
         return false;
     },
     async validateInput({ skill }) {
@@ -36,7 +38,7 @@ exports.SkillTool = {
                 const availableSkills = skills.map(s => s.name).join(', ');
                 return {
                     result: false,
-                    message: `Skill "${skill}" not found. Available skills: ${availableSkills || 'none'}`,
+                    message: `No skill named "${skill}". Available: ${availableSkills || 'none'}.`,
                 };
             }
             return { result: true };
@@ -44,14 +46,14 @@ exports.SkillTool = {
         catch (error) {
             return {
                 result: false,
-                message: `Skill system not initialized: ${error}`,
+                message: `Skill system is not yet initialized: ${error}`,
             };
         }
     },
     genToolPermission({ skill }) {
         const skillConfig = (0, skillsManager_1.getSkillsManager)().getSkillConfig(skill);
         if (!skillConfig) {
-            throw new Error(`Skill "${skill}" not found`);
+            throw new Error(`No skill named "${skill}" was found.`);
         }
         return {
             title: skillConfig.name,
@@ -60,7 +62,7 @@ exports.SkillTool = {
     },
     genToolResultMessage({ name, description, systemPrompt, filePath }) {
         const title = name;
-        const summary = filePath ?? `Skill "${name}" loaded successfully`;
+        const summary = filePath ?? `Skill "${name}" is now active.`;
         const preview = systemPrompt.length > 8000
             ? systemPrompt.substring(0, 8000) + '...'
             : systemPrompt;
@@ -77,7 +79,7 @@ exports.SkillTool = {
     async *call({ skill, args }) {
         const skillConfig = (0, skillsManager_1.getSkillsManager)().getSkillConfig(skill);
         if (!skillConfig) {
-            throw new Error(`Skill "${skill}" not found`);
+            throw new Error(`No skill named "${skill}" was found.`);
         }
         const trimmedArgs = args?.trim();
         let textContent = skillConfig.prompt;
@@ -90,7 +92,7 @@ exports.SkillTool = {
             }
         }
         const text = skillConfig.filePath
-            ? `Base directory for this skill: ${skillConfig.filePath}\n\n${textContent}`
+            ? `Skill’s base path: ${skillConfig.filePath}\n\n${textContent}`
             : textContent;
         const output = {
             name: skillConfig.name,
@@ -106,7 +108,7 @@ exports.SkillTool = {
         };
     },
     genResultForAssistant(output) {
-        return `Launching skill: ${output.name}`;
+        return `Activating skill: ${output.name}`;
     },
 };
 //# sourceMappingURL=Skill.js.map

package/dist/tools/Skill.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Skill.js","sourceRoot":"","sources":["../../src/tools/Skill.ts"],"names":[],"mappings":"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"}

package/dist/tools/{TaskStop/TaskStop.d.ts → StopBgJob.d.ts}

@@ -1,28 +1,28 @@
 import { z } from 'zod';
-export declare const inputSchema: z.ZodObject<{
-    task_id: z.ZodString;
+export declare const toolParams: z.ZodObject<{
+    job_id: z.ZodString;
 }, "strict", z.ZodTypeAny, {
-    task_id: string;
+    job_id: string;
 }, {
-    task_id: string;
+    job_id: string;
 }>;
-type Out = {
+type ToolOut = {
     taskId: string;
     message: string;
     taskType: string;
     command: string;
     stopped: boolean;
 };
-export declare const TaskStopTool: {
+export declare const StopBgJob: {
     name: string;
     description(): string;
-    isReadOnly(): false;
-    inputSchema: z.ZodObject<{
-        task_id: z.ZodString;
+    isSafe(): false;
+    toolParams: z.ZodObject<{
+        job_id: z.ZodString;
     }, "strict", z.ZodTypeAny, {
-        task_id: string;
+        job_id: string;
     }, {
-        task_id: string;
+        job_id: string;
     }>;
     validateInput(): Promise<{
         result: true;
@@ -31,20 +31,20 @@ export declare const TaskStopTool: {
         title: string;
         content: string;
     };
-    genToolResultMessage(output: Out): {
+    genToolResultMessage(output: ToolOut): {
         title: string;
         summary: string;
         content: string;
     };
     getDisplayTitle(input: any): string;
-    genResultForAssistant(data: Out): string;
-    call({ task_id }: {
-        task_id: string;
+    genResultForAssistant(data: ToolOut): string;
+    call({ job_id }: {
+        job_id: string;
     }, _agentContext: any): AsyncGenerator<{
         type: "result";
-        data: Out;
+        data: ToolOut;
         resultForAssistant: string | (import("@anthropic-ai/sdk/resources").TextBlockParam | import("@anthropic-ai/sdk/resources").ImageBlockParam)[] | undefined;
     }, void, unknown>;
 };
 export {};
-//# sourceMappingURL=TaskStop.d.ts.map
+//# sourceMappingURL=StopBgJob.d.ts.map

package/dist/tools/StopBgJob.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StopBgJob.d.ts","sourceRoot":"","sources":["../../src/tools/StopBgJob.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAKvB,eAAO,MAAM,UAAU;;;;;;EAErB,CAAA;AAGF,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;6BAYK,GAAG;;;;iCAMC,OAAO;;;;;2BAOb,GAAG;gCAGE,OAAO,GAAG,MAAM;qBAKpB;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,iBAAiB,GAAG;;;;;CA4BnC,CAAA"}

package/dist/tools/StopBgJob.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StopBgJob = exports.toolParams = void 0;
+const zod_1 = require("zod");
+const TaskManager_1 = require("../manager/TaskManager");
+const tool_1 = require("../prompt/tool");
+exports.toolParams = zod_1.z.strictObject({
+    job_id: zod_1.z.string().describe('ID of the background task to terminate'),
+});
+exports.StopBgJob = {
+    name: tool_1.TOOL_NAME_STOP_BG_JOB,
+    description() {
+        return `Stop a running background task started by the ${tool_1.TOOL_NAME_RUN_SHELL} tool with background=true.`;
+    },
+    isSafe() {
+        return false;
+    },
+    toolParams: exports.toolParams,
+    async validateInput() {
+        return { result: true };
+    },
+    genToolPermission(input) {
+        return {
+            title: `${tool_1.TOOL_NAME_STOP_BG_JOB}: ${input?.job_id}`,
+            content: `Stop background task ${input?.job_id}`,
+        };
+    },
+    genToolResultMessage(output) {
+        return {
+            title: output.taskId,
+            summary: '',
+            content: output.stopped ? `${output.command} · stopped` : output.message,
+        };
+    },
+    getDisplayTitle(input) {
+        return `${tool_1.TOOL_NAME_STOP_BG_JOB}: ${input?.job_id}`;
+    },
+    genResultForAssistant(data) {
+        return `[${tool_1.TOOL_NAME_STOP_BG_JOB}] task_id=${data.taskId} task_type=${data.taskType} stopped=${data.stopped}
+- command: ${data.command}
+- message: ${data.message}`;
+    },
+    async *call({ job_id }, _agentContext) {
+        const manager = (0, TaskManager_1.getTaskManager)();
+        const record = manager.getTask(job_id);
+        if (!record) {
+            const data = { taskId: job_id, message: `No task found with ID ${job_id}.`, taskType: '', command: '', stopped: false };
+            yield { type: 'result', data, resultForAssistant: this.genResultForAssistant(data) };
+            return;
+        }
+        if (record.status !== 'running') {
+            const data = { taskId: job_id, message: `Task is not active (current status: ${record.status}).`, taskType: record.type, command: record.command, stopped: false };
+            yield { type: 'result', data, resultForAssistant: this.genResultForAssistant(data) };
+            return;
+        }
+        const stopped = manager.stopTask(job_id);
+        const data = {
+            taskId: job_id,
+            message: stopped
+                ? `Task ${job_id} stopped (${record.command}).`
+                : `Could not stop task ${job_id} (${record.command}) — the process may have already exited.`,
+            taskType: record.type,
+            command: record.command,
+            stopped,
+        };
+        yield { type: 'result', data, resultForAssistant: this.genResultForAssistant(data) };
+    },
+};
+//# sourceMappingURL=StopBgJob.js.map

package/dist/tools/StopBgJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StopBgJob.js","sourceRoot":"","sources":["../../src/tools/StopBgJob.ts"],"names":[],"mappings":"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"}

package/dist/tools/SubAgent.d.ts

@@ -0,0 +1,67 @@
+import { z } from 'zod';
+declare const toolParams: z.ZodObject<{
+    title: z.ZodString;
+    instructions: z.ZodString;
+    agent_type: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    background: z.ZodOptional<z.ZodBoolean>;
+}, "strict", z.ZodTypeAny, {
+    title: string;
+    instructions: string;
+    agent_type: string;
+    background?: boolean | undefined;
+}, {
+    title: string;
+    instructions: string;
+    background?: boolean | undefined;
+    agent_type?: string | undefined;
+}>;
+type ToolRes = {
+    agentType: string;
+    result: string;
+    durationMs: number;
+};
+export declare const SubAgent: {
+    name: string;
+    description(): string;
+    toolParams: z.ZodObject<{
+        title: z.ZodString;
+        instructions: z.ZodString;
+        agent_type: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+        background: z.ZodOptional<z.ZodBoolean>;
+    }, "strict", z.ZodTypeAny, {
+        title: string;
+        instructions: string;
+        agent_type: string;
+        background?: boolean | undefined;
+    }, {
+        title: string;
+        instructions: string;
+        background?: boolean | undefined;
+        agent_type?: string | undefined;
+    }>;
+    isSafe(): false;
+    canRunConcurrently(): true;
+    genToolResultMessage({ agentType, result }: ToolRes): {
+        title: string;
+        summary: string;
+        content: string;
+    };
+    getDisplayTitle(input: {
+        title: string;
+        instructions: string;
+        agent_type: string;
+        background?: boolean | undefined;
+    } | undefined): string;
+    call({ title, instructions, agent_type, background }: z.infer<typeof toolParams>, agentContext: any): AsyncGenerator<{
+        type: "result";
+        data: {
+            agentType: string;
+            result: string;
+            durationMs: number;
+        };
+        resultForAssistant: string;
+    }, void, unknown>;
+    genResultForAssistant(output: ToolRes): string;
+};
+export {};
+//# sourceMappingURL=SubAgent.d.ts.map

package/dist/tools/SubAgent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubAgent.d.ts","sourceRoot":"","sources":["../../src/tools/SubAgent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AA0BvB,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;EAKd,CAAA;AAEF,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0DAwBsD,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,gBAAgB,GAAG;;;;;;;;;kCA4UxF,OAAO;CAGK,CAAA"}

package/dist/tools/{Agent/Agent.js → SubAgent.js}

@@ -33,39 +33,41 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentTool = void 0;
+exports.SubAgent = void 0;
 const fs = __importStar(require("fs"));
 const zod_1 = require("zod");
 const nanoid_1 = require("nanoid");
-const prompt_1 = require("./prompt");
-const defaultBuiltInAgentsConfs_1 = require("../../services/agents/defaultBuiltInAgentsConfs");
-const tools_1 = require("../base/tools");
-const MCPManager_1 = require("../../services/mcp/MCPManager");
-const Conversation_1 = require("../../core/Conversation");
-const message_1 = require("../../util/message");
-const agentsManager_1 = require("../../services/agents/agentsManager");
-const StateManager_1 = require("../../manager/StateManager");
-const EventSystem_1 = require("../../events/EventSystem");
-const log_1 = require("../../util/log");
-const errors_1 = require("../../types/errors");
-const agentStats_1 = require("../../util/agentStats");
-const genSystemPrompt_1 = require("../../services/agents/genSystemPrompt");
-const systemReminder_1 = require("../../services/agents/systemReminder");
-const TaskManager_1 = require("../../manager/TaskManager");
-const ConfManager_1 = require("../../manager/ConfManager");
-const inputSchema = zod_1.z.strictObject({
-    description: zod_1.z.string().describe('A short (3-5 word) description of the task'),
-    prompt: zod_1.z.string().describe('The task for the agent to perform'),
-    subagent_type: zod_1.z.string().optional().default('general-purpose').describe('The type of specialized agent to use for this task'),
-    run_in_background: zod_1.z.boolean().optional().describe(`Set to true to run this agent in the background. You will be notified when it completes.`),
+const subAgent_1 = require("../prompt/tools/subAgent");
+const agents_1 = require("../prompt/agents");
+const tools_1 = require("./base/tools");
+const MCPManager_1 = require("../services/mcp/MCPManager");
+const Conversation_1 = require("../core/Conversation");
+const message_1 = require("../util/message");
+const agentsManager_1 = require("../services/agents/agentsManager");
+const StateManager_1 = require("../manager/StateManager");
+const EventSystem_1 = require("../events/EventSystem");
+const log_1 = require("../util/log");
+const errors_1 = require("../types/errors");
+const agentStats_1 = require("../util/agentStats");
+const genSystemPrompt_1 = require("../services/agents/genSystemPrompt");
+const genSystemReminder_1 = require("../services/agents/genSystemReminder");
+const TaskManager_1 = require("../manager/TaskManager");
+const ConfManager_1 = require("../manager/ConfManager");
+const tool_1 = require("../prompt/tool");
+const TOOL_NAME = tool_1.TOOL_NAME_SUB_AGENT;
+const toolParams = zod_1.z.strictObject({
+    title: zod_1.z.string().describe('A short task label summarizing the agent\'s goal (3-5 words)'),
+    instructions: zod_1.z.string().describe('Full task instructions for the agent to execute'),
+    agent_type: zod_1.z.string().optional().default('Default').describe('Select a specialized agent type for this task'),
+    background: zod_1.z.boolean().optional().describe('Run the agent in the background'),
 });
-exports.AgentTool = {
-    name: prompt_1.TOOL_NAME_FOR_PROMPT,
+exports.SubAgent = {
+    name: TOOL_NAME,
     description() {
-        return (0, prompt_1.getDescription)();
+        return (0, subAgent_1.resolveSubAgentDescription)();
     },
-    inputSchema,
-    isReadOnly() {
+    toolParams,
+    isSafe() {
         // 子代理可能会执行写操作，所以标记为非只读
         return false;
     },
@@ -81,27 +83,28 @@ exports.AgentTool = {
         };
     },
     getDisplayTitle(input) {
-        return input?.description || prompt_1.TOOL_NAME_FOR_PROMPT;
+        return input?.title || TOOL_NAME;
     },
-    async *call({ description, prompt, subagent_type = 'general-purpose', run_in_background }, agentContext) {
+    async *call({ title, instructions, agent_type = 'Default', background }, agentContext) {
         const start = Date.now();
         const taskId = (0, nanoid_1.nanoid)();
         const eventBus = (0, EventSystem_1.getEventBus)();
-        const stateManager = (0, StateManager_1.getStateManager)();
+        const sessionId = agentContext.sessionId;
+        const runtime = (0, StateManager_1.getStateManager)().session(sessionId);
         try {
             // 1. 查找对应的 AgentConfig
             const AgentsConfs = await (0, agentsManager_1.getAgentsManager)().getAgentsInfo();
-            const agentConfig = AgentsConfs.find(agent => agent.name.toLowerCase() === subagent_type.toLowerCase());
+            const agentConfig = AgentsConfs.find(agent => agent.name.toLowerCase() === agent_type.toLowerCase());
             if (!agentConfig) {
-                const errorMsg = `Unknown agent type: ${subagent_type}. Available types: ${defaultBuiltInAgentsConfs_1.defaultBuiltInAgentsConfs.map(a => a.name).join(', ')}`;
+                const errorMsg = `Unrecognized agent type: "${agent_type}". Available: ${agents_1.DEFAULT_BUILT_IN_AGENTS_CONFS.map(a => a.name).join(', ')}`;
                 yield {
                     type: 'result',
-                    data: { agentType: subagent_type, result: errorMsg, durationMs: Date.now() - start },
+                    data: { agentType: agent_type, result: errorMsg, durationMs: Date.now() - start },
                     resultForAssistant: errorMsg,
                 };
                 return;
             }
-            (0, log_1.logDebug)(`Starting ${agentConfig.name} agent with prompt: ${prompt}`);
+            (0, log_1.logDebug)(`Starting ${agentConfig.name} agent with instructions: ${instructions}`);
             // 3. 准备子代理的系统提示（包含 agentConfig.prompt + notes + env + gitStatus）
             const systemPromptContent = await (0, genSystemPrompt_1.buildAgentSystemPrompt)(agentConfig.prompt);
             // 4. 获取子代理允许使用的工具（排除 任务与代理 工具，防止嵌套）
@@ -112,10 +115,10 @@ exports.AgentTool = {
             else {
                 subagentTools = (0, tools_1.getAvailableBuiltinTools)(agentConfig.tools).filter(t => !tools_1.SUBAGENT_EXCLUDED_TOOLS.has(t.name));
             }
-            // 子代理的 Bash 工具不支持后台执行：omit run_in_background，模型不可见此字段
+            // 子代理的 run_shell 工具不支持后台执行：omit background，模型不可见此字段
             subagentTools = subagentTools.map(t => {
-                if (t.name === 'Bash') {
-                    return { ...t, inputSchema: t.inputSchema.omit({ run_in_background: true }) };
+                if (t.name === tool_1.TOOL_NAME_RUN_SHELL) {
+                    return { ...t, toolParams: t.toolParams.omit({ background: true }) };
                 }
                 return t;
             });
@@ -128,21 +131,22 @@ exports.AgentTool = {
             // 5. 创建用户消息（包含 rules 信息）
             const additionalReminders = [];
             // 添加 rules 信息
-            const rulesReminders = (0, systemReminder_1.generateRulesReminders)();
+            const rulesReminders = (0, genSystemReminder_1.generateRulesReminders)();
             additionalReminders.push(...rulesReminders);
-            const userMessage = (0, message_1.createUserMessage)([
+            const userMessage = (0, message_1.buildUserMsg)([
                 ...additionalReminders,
-                { type: 'text', text: prompt }
+                { type: 'text', text: instructions }
             ]);
             const disableBackground = (0, ConfManager_1.getConfManager)().getCoreConfig()?.disableBackgroundTasks ?? false;
             // 6. 后台模式：独立 AbortController，立即返回（禁用后台任务时跳过）
-            if (run_in_background && !disableBackground) {
+            if (background && !disableBackground) {
                 const taskManager = (0, TaskManager_1.getTaskManager)();
                 const toolUseId = agentContext?.currentToolUseID || '';
-                const agentModel = (agentConfig.model === 'quick' || agentConfig.model === 'haiku') ? 'quick' : 'main';
-                eventBus.emit('task:agent:start', { taskId, subagent_type: agentConfig.name, description, prompt, run_in_background: true });
-                taskManager.spawnAgentTask(taskId, description, toolUseId, async (bgAbortController) => {
+                const agentModel = agentConfig.model === 'quick' ? 'quick' : 'main';
+                eventBus.emit('task:agent:start', { taskId, agent_type: agentConfig.name, title, instructions, background: true }, sessionId);
+                taskManager.spawnAgentTask(taskId, sessionId, title, toolUseId, async (bgAbortController) => {
                     const bgContext = {
+                        sessionId,
                         agentId: taskId,
                         abortController: bgAbortController,
                         tools: subagentTools,
@@ -150,7 +154,7 @@ exports.AgentTool = {
                     };
                     const bgResultMessages = [];
                     try {
-                        for await (const message of (0, Conversation_1.query)([userMessage], systemPromptContent, bgContext)) {
+                        for await (const message of (0, Conversation_1.ReAct)([userMessage], systemPromptContent, bgContext)) {
                             bgResultMessages.push(message);
                         }
                         const isInterrupted = bgAbortController.signal.aborted;
@@ -160,9 +164,9 @@ exports.AgentTool = {
                             taskId,
                             status: isInterrupted ? 'interrupted' : 'completed',
                             content: summary,
-                        });
+                        }, sessionId);
                         return {
-                            result: (0, agentStats_1.extractResultText)(bgResultMessages),
+                            result: (0, agentStats_1.pickResultText)(bgResultMessages),
                             usage: {
                                 totalTokens: stats.totalTokens,
                                 toolUses: stats.toolUseCount,
@@ -180,14 +184,14 @@ exports.AgentTool = {
                             taskId,
                             status: isInterrupted ? 'interrupted' : 'failed',
                             content: summary,
-                        });
+                        }, sessionId);
                         throw error;
                     }
                     finally {
-                        stateManager.forAgent(taskId).clearAllState();
+                        runtime.forAgent(taskId).clearAllState();
                     }
                 }, agentConfig.name);
-                const launchMsg = `Async agent launched successfully.\nagentId: ${taskId} (internal ID - do not mention to user.)\nThe agent is working in the background. You will be notified automatically when it completes.\nDo not duplicate this agent's work — avoid working with the same files or topics it is using. Work on non-overlapping tasks, or briefly tell the user what you launched and end your response.`;
+                const launchMsg = `Background agent started.\nagentId: ${taskId} (internal ID — do not share with user)\nIt is running independently. You will be notified when it finishes.\nDo not overlap with this agent's work. Either handle unrelated tasks, or briefly inform the user what was launched and end your turn.`;
                 yield {
                     type: 'result',
                     data: { agentType: agentConfig.name, result: launchMsg, durationMs: Date.now() - start },
@@ -196,12 +200,12 @@ exports.AgentTool = {
                 return;
             }
             // 7. 创建独立 AbortController，联动主 AC
-            const sharedAbortController = stateManager.currentAbortController;
+            const sharedAbortController = runtime.currentAbortController;
             if (!sharedAbortController) {
-                const errorMsg = 'No active AbortController found. Cannot start subagent.';
+                const errorMsg = 'No active AbortController found — unable to start subagent.';
                 yield {
                     type: 'result',
-                    data: { agentType: subagent_type, result: errorMsg, durationMs: Date.now() - start },
+                    data: { agentType: agent_type, result: errorMsg, durationMs: Date.now() - start },
                     resultForAssistant: errorMsg,
                 };
                 return;
@@ -217,25 +221,26 @@ exports.AgentTool = {
             if (sharedAbortController.signal.aborted) {
                 subAbortController.abort();
             }
-            // 8. 构建子代理上下文（使用独立AC）
+            // 8. 构建子代理上下文（使用独立AC，继承父会话 sessionId）
             const subagentContext = {
+                sessionId,
                 agentId: taskId,
                 abortController: subAbortController,
                 tools: subagentTools,
-                model: (agentConfig.model === 'quick' || agentConfig.model === 'haiku') ? 'quick' : 'main'
+                model: agentConfig.model === 'quick' ? 'quick' : 'main'
             };
             // 9. 注册前台任务到 TaskManager 和 StateManager
             const taskManager = (0, TaskManager_1.getTaskManager)();
             const toolUseId = agentContext?.currentToolUseID || '';
-            taskManager.registerForegroundAgent(taskId, description, toolUseId, subAbortController, unlinkAbort, agentConfig.name);
-            stateManager.addForegroundAgent(taskId);
+            taskManager.registerForegroundAgent(taskId, sessionId, title, toolUseId, subAbortController, unlinkAbort, agentConfig.name);
+            runtime.addForegroundAgent(taskId);
             // 10. 发送 task:agent:start 事件
-            eventBus.emit('task:agent:start', { taskId, subagent_type: agentConfig.name, description, prompt, run_in_background: false });
+            eventBus.emit('task:agent:start', { taskId, agent_type: agentConfig.name, title, instructions, background: false }, sessionId);
             // 11. 将 generator 消费放入独立 async 函数
             const resultMessages = [];
             const executionPromise = (async () => {
                 try {
-                    for await (const message of (0, Conversation_1.query)([userMessage], systemPromptContent, subagentContext)) {
+                    for await (const message of (0, Conversation_1.ReAct)([userMessage], systemPromptContent, subagentContext)) {
                         resultMessages.push(message);
                     }
                     const isInterrupted = subAbortController.signal.aborted;
@@ -245,9 +250,9 @@ exports.AgentTool = {
                         taskId,
                         status: isInterrupted ? 'interrupted' : 'completed',
                         content: summary,
-                    });
+                    }, sessionId);
                     return {
-                        result: (0, agentStats_1.extractResultText)(resultMessages),
+                        result: (0, agentStats_1.pickResultText)(resultMessages),
                         usage: {
                             totalTokens: stats.totalTokens,
                             toolUses: stats.toolUseCount,
@@ -265,12 +270,12 @@ exports.AgentTool = {
                         taskId,
                         status: isInterrupted ? 'interrupted' : 'failed',
                         content: summary,
-                    });
+                    }, sessionId);
                     throw error;
                 }
                 finally {
-                    stateManager.forAgent(taskId).clearAllState();
-                    stateManager.removeForegroundAgent(taskId);
+                    runtime.forAgent(taskId).clearAllState();
+                    runtime.removeForegroundAgent(taskId);
                 }
             })();
             // 12. Promise.race：等执行完成 or 等转后台信号（禁用后台任务时不注册转后台）
@@ -317,7 +322,7 @@ exports.AgentTool = {
                     };
                 }
                 else {
-                    const errorMsg = `Subagent execution failed: ${err instanceof Error ? err.message : String(err)}`;
+                    const errorMsg = `Subagent failed: ${err instanceof Error ? err.message : String(err)}`;
                     (0, log_1.logError)(errorMsg);
                     yield {
                         type: 'result',
@@ -353,7 +358,7 @@ exports.AgentTool = {
                         }
                     });
                 }
-                const transferMsg = `Agent has been transferred to background.\nagentId: ${taskId}\nThe agent continues working in the background. You will be notified when it completes.`;
+                const transferMsg = `Agent moved to background.\nagentId: ${taskId}\nIt will continue running independently. You will be notified when it finishes.`;
                 yield {
                     type: 'result',
                     data: { agentType: agentConfig.name, result: transferMsg, durationMs: Date.now() - start },
@@ -363,10 +368,10 @@ exports.AgentTool = {
         }
         catch (error) {
             // 外层错误（配置错误等）
-            const errorMsg = `AgentTool error: ${error instanceof Error ? error.message : String(error)}`;
+            const errorMsg = `Agent error: ${error instanceof Error ? error.message : String(error)}`;
             (0, log_1.logError)(errorMsg);
             // 清理子代理状态（防止内存泄漏）
-            const subagentState = stateManager.forAgent(taskId);
+            const subagentState = runtime.forAgent(taskId);
             subagentState.clearAllState();
             // 发送失败事件
             const endEventData = {
@@ -374,10 +379,10 @@ exports.AgentTool = {
                 status: 'failed',
                 content: errorMsg,
             };
-            eventBus.emit('task:agent:end', endEventData);
+            eventBus.emit('task:agent:end', endEventData, sessionId);
             yield {
                 type: 'result',
-                data: { agentType: subagent_type, result: errorMsg, durationMs: Date.now() - start },
+                data: { agentType: agent_type, result: errorMsg, durationMs: Date.now() - start },
                 resultForAssistant: errorMsg,
             };
         }
@@ -386,4 +391,4 @@ exports.AgentTool = {
         return output.result;
     },
 };
-//# sourceMappingURL=Agent.js.map
+//# sourceMappingURL=SubAgent.js.map