sema-core 1.0.14 → 2.0.1

package/dist/tools/PickOption.js.map

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

package/dist/tools/PlanToAgent.d.ts

@@ -0,0 +1,42 @@
+import { z } from 'zod';
+import { ToolControlSignal } from '../types/message';
+declare const toolParams: z.ZodObject<{
+    plan_file_path: z.ZodString;
+}, "strict", z.ZodTypeAny, {
+    plan_file_path: string;
+}, {
+    plan_file_path: string;
+}>;
+interface PlanToAgentOutput {
+    planFilePath: string;
+    planContent: string;
+    selected: 'startEditing' | 'clearContextAndStart';
+    controlSignal: ToolControlSignal;
+}
+export declare const PlanToAgent: {
+    name: string;
+    description(): string;
+    toolParams: z.ZodObject<{
+        plan_file_path: z.ZodString;
+    }, "strict", z.ZodTypeAny, {
+        plan_file_path: string;
+    }, {
+        plan_file_path: string;
+    }>;
+    isSafe(): false;
+    validateInput({ plan_file_path }: z.infer<typeof toolParams>, agentContext: any): Promise<{
+        result: false;
+        message: string;
+    } | {
+        result: true;
+        message?: undefined;
+    }>;
+    call({ plan_file_path }: z.infer<typeof toolParams>, agentContext: any): AsyncGenerator<{
+        type: "result";
+        data: PlanToAgentOutput;
+        resultForAssistant: string | (import("@anthropic-ai/sdk/resources").TextBlockParam | import("@anthropic-ai/sdk/resources").ImageBlockParam)[] | undefined;
+    }, void, unknown>;
+    genResultForAssistant(output: PlanToAgentOutput): string;
+};
+export {};
+//# sourceMappingURL=PlanToAgent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PlanToAgent.d.ts","sourceRoot":"","sources":["../../src/tools/PlanToAgent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAOvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAQpD,QAAA,MAAM,UAAU;;;;;;EAId,CAAA;AAGF,UAAU,iBAAiB;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,cAAc,GAAG,sBAAsB,CAAA;IACjD,aAAa,EAAE,iBAAiB,CAAA;CACjC;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;sCAUA,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,gBAChC,GAAG;;;;;;;6BAwBG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,gBAChC,GAAG;;;;;kCA4GW,iBAAiB;CAuBK,CAAA"}

package/dist/tools/{ExitPlanMode/ExitPlanMode.js → PlanToAgent.js}

@@ -1,44 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExitPlanModeTool = void 0;
+exports.PlanToAgent = void 0;
 const path_1 = require("path");
 const zod_1 = require("zod");
-const prompt_1 = require("./prompt");
-const file_1 = require("../../util/file");
-const cwd_1 = require("../../util/cwd");
-const secureFile_1 = require("../../util/secureFile");
-const ConfManager_1 = require("../../manager/ConfManager");
-const EventSystem_1 = require("../../events/EventSystem");
-const errors_1 = require("../../types/errors");
-const StateManager_1 = require("../../manager/StateManager");
-const message_1 = require("../../util/message");
+const planToAgent_1 = require("../prompt/tools/planToAgent");
+const tool_1 = require("../prompt/tool");
+const file_1 = require("../util/file");
+const cwd_1 = require("../util/cwd");
+const secureFile_1 = require("../util/secureFile");
+const EventSystem_1 = require("../events/EventSystem");
+const errors_1 = require("../types/errors");
+const StateManager_1 = require("../manager/StateManager");
+const message_1 = require("../util/message");
 // 输入 schema
-const inputSchema = zod_1.z.strictObject({
-    planFilePath: zod_1.z
+const toolParams = zod_1.z.strictObject({
+    plan_file_path: zod_1.z
         .string()
-        .describe('The absolute path to the plan file (.md)'),
+        .describe('Absolute path to the markdown plan file (.md) to finalize'),
 });
-exports.ExitPlanModeTool = {
-    name: prompt_1.TOOL_NAME_FOR_PROMPT,
+exports.PlanToAgent = {
+    name: tool_1.TOOL_NAME_PLAN_TO_AGENT,
     description() {
-        return prompt_1.DESCRIPTION;
+        return planToAgent_1.TOOL_DESCRIPTION;
     },
-    inputSchema,
-    isReadOnly() {
+    toolParams,
+    isSafe() {
         return false;
     },
-    async validateInput({ planFilePath }, agentContext) {
-        const fullFilePath = (0, file_1.normalizeFilePath)(planFilePath);
+    async validateInput({ plan_file_path }, agentContext) {
+        const fullFilePath = (0, file_1.canonicalizeFilePath)(plan_file_path);
         // 验证文件是否存在
-        const fileCheck = secureFile_1.secureFileService.safeGetFileInfo(fullFilePath);
+        const fileCheck = (0, secureFile_1.safeGetFileInfo)(fullFilePath);
         if (!fileCheck.success) {
             return {
                 result: false,
-                message: fileCheck.error || `Plan file not found: ${planFilePath}`,
+                message: fileCheck.error || `Plan file not found: ${plan_file_path}`,
             };
         }
         // 验证文件扩展名
-        if (!planFilePath.endsWith('.md')) {
+        if (!plan_file_path.endsWith('.md')) {
             return {
                 result: false,
                 message: 'Plan file must be a markdown file (.md)',
@@ -46,25 +46,25 @@ exports.ExitPlanModeTool = {
         }
         return { result: true };
     },
-    async *call({ planFilePath }, agentContext) {
-        const fullFilePath = (0, file_1.normalizeFilePath)(planFilePath);
+    async *call({ plan_file_path }, agentContext) {
+        const fullFilePath = (0, file_1.canonicalizeFilePath)(plan_file_path);
         const eventBus = (0, EventSystem_1.getEventBus)();
         const abortController = agentContext.abortController;
         // 读取计划文件内容
         const { content } = (0, file_1.readTextContent)(fullFilePath, 0);
         // 获取相对路径用于事件
-        const relativePath = (0, path_1.relative)((0, cwd_1.getCwd)(), fullFilePath);
+        const relativePath = (0, path_1.relative)((0, cwd_1.readInitialCwd)(), fullFilePath);
         // 发送权限请求事件
         const requestData = {
             agentId: agentContext.agentId,
             planFilePath: relativePath,
             planContent: content,
             options: {
-                startEditing: '开始代码编辑',
-                clearContextAndStart: '清理上下文，并开始代码编辑',
+                startEditing: '直接开始编码',
+                clearContextAndStart: '重置上下文后开始编码',
             },
         };
-        eventBus.emit('plan:exit:request', requestData);
+        eventBus.emit('plan:exit:request', requestData, agentContext.sessionId);
         // 等待用户响应
         const selected = await new Promise((resolve, reject) => {
             const handleResponse = (response) => {
@@ -74,42 +74,46 @@ exports.ExitPlanModeTool = {
                 resolve(response.selected);
             };
             // 监听中断
-            const handleAbort = () => {
+            const onAbortRequested = () => {
                 eventBus.off('plan:exit:response', handleResponse);
                 reject(new Error('User cancelled the plan exit'));
             };
             if (abortController?.signal) {
-                abortController.signal.addEventListener('abort', handleAbort, {
+                abortController.signal.addEventListener('abort', onAbortRequested, {
                     once: true,
                 });
             }
-            eventBus.on('plan:exit:response', handleResponse);
+            eventBus.on('plan:exit:response', handleResponse, agentContext.sessionId);
         });
         // 检查是否被中断
         (0, errors_1.checkAbortSignal)(abortController);
-        // 退出Plan模式，切换回Agent模式
-        (0, ConfManager_1.getConfManager)().updateAgentMode('Agent');
+        const runtime = (0, StateManager_1.getStateManager)().session(agentContext.sessionId);
+        // 退出Plan模式，切换回Agent模式（会话级）
+        runtime.agentMode = 'Agent';
         // 如果选择清理上下文
         if (selected === 'clearContextAndStart') {
-            const stateManager = (0, StateManager_1.getStateManager)();
-            // 清空状态
-            stateManager.clearAllState();
+            // 清空 plan 阶段所有上下文
+            runtime.clearAllState();
+            // clearAllState 会把生命周期状态和当前请求的 abort 句柄一并清掉，
+            // 但工具仍在执行中，需立刻还原回 processing 态
+            runtime.updateState('processing');
+            runtime.currentAbortController = abortController;
             // 设置新的用户消息
-            const newUserMessage = (0, message_1.createUserMessage)([
+            const newUserMessage = (0, message_1.buildUserMsg)([
                 {
                     type: 'text',
-                    text: `Implement the following plan:\n\n${content}`,
+                    text: `按照以下计划进行实现：\n\n${content}`,
                 },
             ]);
-            stateManager.setMessageHistory([newUserMessage], StateManager_1.MAIN_AGENT_ID);
+            runtime.setMessageHistory([newUserMessage], StateManager_1.MAIN_AGENT_ID);
             // 触发 plan:implement 事件
             eventBus.emit('plan:implement', {
                 planFilePath: relativePath,
                 planContent: content,
-            });
+            }, agentContext.sessionId);
         }
         const data = {
-            planFilePath,
+            planFilePath: plan_file_path,
             planContent: content,
             selected,
             // 添加控制信号，通知 query 函数需要重建上下文
@@ -120,7 +124,7 @@ exports.ExitPlanModeTool = {
                     // 如果选择清理上下文，传递重建消息
                     rebuildMessage: selected === 'clearContextAndStart' ? [{
                             type: 'text',
-                            text: `Implement the following plan:\n\n${content}`,
+                            text: `按照以下计划进行实现：\n\n${content}`,
                         }] : undefined,
                 },
             },
@@ -134,24 +138,23 @@ exports.ExitPlanModeTool = {
     genResultForAssistant(output) {
         const { planFilePath, planContent, selected } = output;
         if (selected === 'clearContextAndStart') {
-            return `User has approved your plan and requested to clear context. The conversation history has been cleared.
+            return `The plan has been confirmed. Context has been reset to keep things focused.
 
-You can now start implementing the plan. The plan file is located at ${planFilePath} if you need to reference it.
+Proceed with implementing the plan below. Reference ${planFilePath} as needed.
 
 ## Plan to Implement:
 ${planContent}`;
         }
-        return `User has approved your plan. You can now start coding. Start with updating your todo list if applicable
+        return `The plan has been confirmed. Begin implementation whenever ready — update your task list first if applicable.
 
-Your plan has been saved to: ${planFilePath}
-You can refer back to it if needed during implementation.
+Plan saved at: ${planFilePath}
 
 ## Approved Plan:
 ${planContent}
 
-## Exited Plan Mode
+## Plan Mode Exited
 
-You have exited plan mode. You can now make edits, run tools, and take actions. The plan file is located at ${planFilePath} if you need to reference it.`;
+Editing, tool use, and all other actions are now available. The plan file remains at ${planFilePath} for reference.`;
     },
 };
-//# sourceMappingURL=ExitPlanMode.js.map
+//# sourceMappingURL=PlanToAgent.js.map

package/dist/tools/PlanToAgent.js.map

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

package/dist/tools/{Bash/Bash.d.ts → RunShell.d.ts}

@@ -1,22 +1,24 @@
 import { z } from 'zod';
-import { ValidationResult } from '../base/Tool';
-export declare const inputSchema: z.ZodObject<{
+import { ValidationResult } from './base/Tool';
+export declare const RUN_SHELL_MAX_TIMEOUT_MS = 600000;
+export declare const DEFAULT_RUN_SHELL_TIMEOUT_MS = 120000;
+export declare const toolParams: z.ZodObject<{
     command: z.ZodString;
     timeout: z.ZodOptional<z.ZodNumber>;
     description: z.ZodOptional<z.ZodString>;
-    run_in_background: z.ZodOptional<z.ZodBoolean>;
+    background: z.ZodOptional<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     command: string;
     timeout?: number | undefined;
     description?: string | undefined;
-    run_in_background?: boolean | undefined;
+    background?: boolean | undefined;
 }, {
     command: string;
     timeout?: number | undefined;
     description?: string | undefined;
-    run_in_background?: boolean | undefined;
+    background?: boolean | undefined;
 }>;
-export type Out = {
+export type ToolOut = {
     stdout: string;
     stdoutLines: number;
     stderr: string;
@@ -24,43 +26,43 @@ export type Out = {
     interrupted: boolean;
     command?: string;
 };
-export declare const BashTool: {
+export declare const RunShell: {
     name: string;
     description(): string;
-    isReadOnly(): false;
+    isSafe(): false;
     supportsInterrupt(): true;
-    inputSchema: z.ZodObject<{
+    toolParams: z.ZodObject<{
         command: z.ZodString;
         timeout: z.ZodOptional<z.ZodNumber>;
         description: z.ZodOptional<z.ZodString>;
-        run_in_background: z.ZodOptional<z.ZodBoolean>;
+        background: z.ZodOptional<z.ZodBoolean>;
     }, "strict", z.ZodTypeAny, {
         command: string;
         timeout?: number | undefined;
         description?: string | undefined;
-        run_in_background?: boolean | undefined;
+        background?: boolean | undefined;
     }, {
         command: string;
         timeout?: number | undefined;
         description?: string | undefined;
-        run_in_background?: boolean | undefined;
+        background?: boolean | undefined;
     }>;
     validateInput({ command }: {
         command: string;
         timeout?: number | undefined;
         description?: string | undefined;
-        run_in_background?: boolean | undefined;
+        background?: boolean | undefined;
     }, agentContext: any): Promise<ValidationResult>;
     genToolPermission(input: {
         command: string;
         timeout?: number | undefined;
         description?: string | undefined;
-        run_in_background?: boolean | undefined;
+        background?: boolean | undefined;
     }): {
         title: string;
         content: string;
     };
-    genToolResultMessage({ stdout, stderr, interrupted, command }: Out): {
+    genToolResultMessage({ stdout, stderr, interrupted, command }: ToolOut): {
         title: string;
         summary: string;
         content: string;
@@ -69,18 +71,18 @@ export declare const BashTool: {
         command: string;
         timeout?: number | undefined;
         description?: string | undefined;
-        run_in_background?: boolean | undefined;
+        background?: boolean | undefined;
     } | undefined): string;
-    genResultForAssistant({ interrupted, stdout, stderr }: Out): string;
-    call({ command, timeout, run_in_background }: {
+    genResultForAssistant({ interrupted, stdout, stderr }: ToolOut): string;
+    call({ command, timeout, background }: {
         command: string;
         timeout?: number | undefined;
         description?: string | undefined;
-        run_in_background?: boolean | undefined;
+        background?: boolean | undefined;
     }, 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>;
 };
-//# sourceMappingURL=Bash.d.ts.map
+//# sourceMappingURL=RunShell.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RunShell.d.ts","sourceRoot":"","sources":["../../src/tools/RunShell.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAQ,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAepD,eAAO,MAAM,wBAAwB,SAAS,CAAC;AAC/C,eAAO,MAAM,4BAA4B,SAAS,CAAC;AA8BnD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAkBrB,CAAA;AAGF,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;qBAY4B,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC;;;;;;;;;;;;;;;;;;;;;qEAmEtB,MAAM;;;;;;qBAmB9C,GAAG;;;;;CA+KQ,CAAA"}

package/dist/tools/{Bash/Bash.js → RunShell.js}

@@ -1,21 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BashTool = exports.inputSchema = void 0;
+exports.RunShell = exports.toolParams = exports.DEFAULT_RUN_SHELL_TIMEOUT_MS = exports.RUN_SHELL_MAX_TIMEOUT_MS = void 0;
 const os_1 = require("os");
 const path_1 = require("path");
 const zod_1 = require("zod");
-const commands_1 = require("../../util/commands");
-const file_1 = require("../../util/file");
-const shell_1 = require("../../util/shell");
-const TaskManager_1 = require("../../manager/TaskManager");
-const cwd_1 = require("../../util/cwd");
-const format_1 = require("../../util/format");
-const prompt_1 = require("./prompt");
-const ConfManager_1 = require("../../manager/ConfManager");
-const utils_1 = require("./utils");
-const EventSystem_1 = require("../../events/EventSystem");
-const StateManager_1 = require("../../manager/StateManager");
-const message_1 = require("../../constants/message");
+const commands_1 = require("../util/commands");
+const file_1 = require("../util/file");
+const shell_1 = require("../util/shell");
+const TaskManager_1 = require("../manager/TaskManager");
+const cwd_1 = require("../util/cwd");
+const tool_1 = require("../prompt/tool");
+const runShell_1 = require("../prompt/tools/runShell");
+const ConfManager_1 = require("../manager/ConfManager");
+const shell_2 = require("../util/shell");
+const EventSystem_1 = require("../events/EventSystem");
+const StateManager_1 = require("../manager/StateManager");
+const message_1 = require("../util/message");
+exports.RUN_SHELL_MAX_TIMEOUT_MS = 600000; // 最大超时毫秒数 10分钟
+exports.DEFAULT_RUN_SHELL_TIMEOUT_MS = 120000; // 默认超时毫秒数 2分钟
 const BANNED_COMMANDS = [
     'alias',
     'curl',
@@ -38,46 +40,41 @@ const BANNED_COMMANDS = [
 // 辅助函数：生成显示标题
 function getTitle(input) {
     if (input?.command) {
-        const content = (0, format_1.processHeredocCommand)(input.command);
-        return `${content}`;
+        return input.command;
     }
-    return prompt_1.TOOL_NAME_FOR_PROMPT;
+    return tool_1.TOOL_NAME_RUN_SHELL;
 }
-exports.inputSchema = zod_1.z.strictObject({
-    command: zod_1.z.string().describe('The command to execute'),
+exports.toolParams = zod_1.z.strictObject({
+    command: zod_1.z.string().describe('The shell command to run'),
     timeout: zod_1.z
         .number()
         .optional()
-        .describe(`Optional timeout in milliseconds (max ${prompt_1.MAX_TIMEOUT_MS})`),
-    description: zod_1.z.string().optional().describe(`Clear, concise description of what this command does in 5-10 words, in active voice. Examples:
-Input: ls
-Output: List files in current directory
+        .describe(`Timeout duration in milliseconds, up to ${exports.RUN_SHELL_MAX_TIMEOUT_MS}ms (${exports.RUN_SHELL_MAX_TIMEOUT_MS / 60000} min). Defaults to ${exports.DEFAULT_RUN_SHELL_TIMEOUT_MS}ms if omitted.`),
+    description: zod_1.z.string().optional().describe(`A brief active-voice summary (5-10 words) explaining what this command does. Keep it simple for common commands, add context for complex ones.
 
-Input: git status
-Output: Show working tree status
-
-Input: npm install
-Output: Install package dependencies
-
-Input: mkdir foo
-Output: Create directory 'foo'`),
-    run_in_background: zod_1.z
+Examples:
+  pwd → "Print current working directory"
+  git log --oneline -5 → "Show last 5 commits"
+  docker ps → "List running containers"
+  cat .env | wc -l → "Count lines in .env file"
+  tar -czf backup.tar.gz src/ → "Compress src directory into tarball"`),
+    background: zod_1.z
         .boolean()
         .optional()
-        .describe(`Set to true to run this command in the background. Use TaskOutput to read the output later.`),
+        .describe(`When true, the command runs as a background task. Retrieve its output later via ${tool_1.TOOL_NAME_PEEK_BG_JOB}.`),
 });
-exports.BashTool = {
-    name: prompt_1.TOOL_NAME_FOR_PROMPT,
+exports.RunShell = {
+    name: tool_1.TOOL_NAME_RUN_SHELL,
     description() {
-        return prompt_1.DESCRIPTION;
+        return (0, runShell_1.getToolDescription)(exports.DEFAULT_RUN_SHELL_TIMEOUT_MS, exports.RUN_SHELL_MAX_TIMEOUT_MS);
     },
-    isReadOnly() {
+    isSafe() {
         return false;
     },
     supportsInterrupt() {
         return true;
     },
-    inputSchema: exports.inputSchema,
+    toolParams: exports.toolParams,
     async validateInput({ command }, agentContext) {
         const commands = (0, commands_1.splitCommand)(command);
         for (const cmd of commands) {
@@ -93,11 +90,11 @@ exports.BashTool = {
                 const targetDir = parts[1].replace(/^['"]|['"]$/g, '');
                 const fullTargetDir = (0, path_1.isAbsolute)(targetDir)
                     ? targetDir
-                    : (0, path_1.resolve)((0, cwd_1.getCwd)(), targetDir);
-                if (!(0, file_1.isInDirectory)((0, path_1.relative)((0, cwd_1.getOriginalCwd)(), fullTargetDir), (0, path_1.relative)((0, cwd_1.getCwd)(), (0, cwd_1.getOriginalCwd)()))) {
+                    : (0, path_1.resolve)((0, cwd_1.readInitialCwd)(), targetDir);
+                if (!(0, file_1.isInDirectory)((0, path_1.relative)((0, cwd_1.readInitialCwd)(), fullTargetDir), (0, path_1.relative)((0, cwd_1.readInitialCwd)(), (0, cwd_1.readInitialCwd)()))) {
                     return {
                         result: false,
-                        message: `ERROR: cd to '${fullTargetDir}' was blocked. For security, agent may only change directories to child directories of the original working directory (${(0, cwd_1.getOriginalCwd)()}) for this session.`,
+                        message: `ERROR: cd to '${fullTargetDir}' was blocked. For security, agent may only change directories to child directories of the original working directory (${(0, cwd_1.readInitialCwd)()}) for this session.`,
                     };
                 }
             }
@@ -114,10 +111,10 @@ exports.BashTool = {
     genToolResultMessage({ stdout, stderr, interrupted, command }) {
         let result = '';
         if (stdout !== '') {
-            result += (0, utils_1.formatOutput)(stdout.trim(), utils_1.STDOUT_HEAD_TAIL_LINES).truncatedContent + '\n';
+            result += (0, shell_2.formatOutput)(stdout.trim(), shell_2.STDOUT_HEAD_TAIL_LINES).truncatedContent + '\n';
         }
         if (stderr !== '') {
-            result += (0, utils_1.formatOutput)(stderr.trim(), utils_1.STDERR_HEAD_TAIL_LINES).truncatedContent + '\n';
+            result += (0, shell_2.formatOutput)(stderr.trim(), shell_2.STDERR_HEAD_TAIL_LINES).truncatedContent + '\n';
         }
         if (stdout === '' && stderr === '') {
             result = '(No content)';
@@ -134,28 +131,28 @@ exports.BashTool = {
     },
     genResultForAssistant({ interrupted, stdout, stderr }) {
         const { truncatedContent: stdoutContent } = stdout.trim()
-            ? (0, utils_1.formatOutput)(stdout.trim(), utils_1.STDOUT_HEAD_TAIL_LINES)
+            ? (0, shell_2.formatOutput)(stdout.trim(), shell_2.STDOUT_HEAD_TAIL_LINES)
             : { truncatedContent: '' };
         const { truncatedContent: stderrContent } = stderr.trim()
-            ? (0, utils_1.formatOutput)(stderr.trim(), utils_1.STDERR_HEAD_TAIL_LINES)
+            ? (0, shell_2.formatOutput)(stderr.trim(), shell_2.STDERR_HEAD_TAIL_LINES)
             : { truncatedContent: '' };
         if (interrupted) {
-            const parts = [stdoutContent, message_1.INTERRUPT_MESSAGE_FOR_TOOL_USE, stderrContent].filter(Boolean);
+            const parts = [stdoutContent, message_1.TOOL_INTERRUPT_MSG, stderrContent].filter(Boolean);
             return parts.join('\n');
         }
         const hasBoth = stdoutContent && stderrContent;
         const result = `${stdoutContent}${hasBoth ? '\n' : ''}${stderrContent}`;
         return result || '(no content)';
     },
-    async *call({ command, timeout = prompt_1.DEFAULT_TIMEOUT_MS, run_in_background }, agentContext) {
+    async *call({ command, timeout = exports.DEFAULT_RUN_SHELL_TIMEOUT_MS, background }, agentContext) {
         const abortController = agentContext.abortController;
         // 子代理不支持后台执行，强制前台
         const isSubAgent = agentContext.agentId !== StateManager_1.MAIN_AGENT_ID;
         const disableBackground = (0, ConfManager_1.getConfManager)().getCoreConfig()?.disableBackgroundTasks ?? false;
-        // ① run_in_background=true → 直接 spawn 独立进程（仅主代理，且未禁用后台任务）
-        if (run_in_background && !isSubAgent && !disableBackground) {
+        // ① background=true → 直接 spawn 独立进程（仅主代理，且未禁用后台任务）
+        if (background && !isSubAgent && !disableBackground) {
             try {
-                const { taskId, filepath } = (0, TaskManager_1.getTaskManager)().spawnBashTask(command, agentContext.currentToolUseID || '', agentContext);
+                const { taskId, filepath } = (0, TaskManager_1.getTaskManager)().spawnRunShellTask(command, agentContext.currentToolUseID || '', agentContext);
                 const msg = `Command running in background. Task ID: ${taskId}. Output: ${filepath}`;
                 const data = {
                     stdout: msg,
@@ -200,7 +197,7 @@ exports.BashTool = {
             return;
         }
         // 确保不超过最大超时限制
-        const effectiveTimeout = Math.min(timeout, prompt_1.MAX_TIMEOUT_MS);
+        const effectiveTimeout = Math.min(timeout, exports.RUN_SHELL_MAX_TIMEOUT_MS);
         // 与 genToolResultMessage 保持一致的 title 计算逻辑
         let commandDisplay = command || '';
         // 流式输出回调：格式与 genToolResultMessage 一致，仅在有内容变化时触发
@@ -209,18 +206,18 @@ exports.BashTool = {
         const onChunk = isMainAgent ? (chunkStdout, chunkStderr) => {
             let content = '';
             if (chunkStdout.trim())
-                content += (0, utils_1.formatOutput)(chunkStdout.trim(), undefined, { resolveCR: false }).truncatedContent;
+                content += (0, shell_2.formatOutput)(chunkStdout.trim(), undefined, { resolveCR: false }).truncatedContent;
             if (chunkStderr.trim())
-                content += (content ? '\n' : '') + (0, utils_1.formatOutput)(chunkStderr.trim(), undefined, { resolveCR: false }).truncatedContent;
+                content += (content ? '\n' : '') + (0, shell_2.formatOutput)(chunkStderr.trim(), undefined, { resolveCR: false }).truncatedContent;
             const chunkData = {
                 agentId: agentContext.agentId,
                 toolId: agentContext.currentToolUseID || '',
-                toolName: prompt_1.TOOL_NAME_FOR_PROMPT,
+                toolName: tool_1.TOOL_NAME_RUN_SHELL,
                 title: commandDisplay,
                 summary: '',
                 content: content,
             };
-            (0, EventSystem_1.getEventBus)().emit('tool:execution:chunk', chunkData);
+            (0, EventSystem_1.getEventBus)().emit('tool:execution:chunk', chunkData, agentContext.sessionId);
         } : undefined;
         // ② 超时接管回调（子代理不接管，超时直接 kill；禁用后台任务时同样直接 kill）
         let bgTaskId;
@@ -234,7 +231,7 @@ exports.BashTool = {
             const result = await shell_1.PersistentShell.getInstance().exec(command, abortController?.signal, effectiveTimeout, onChunk, onTimeout);
             // ③ 超时接管标记（code === -1）
             if (result.code === -1 && bgTaskId) {
-                const msg = `Command timed out after ${(0, shell_1.formatDuration)(effectiveTimeout)}, moved to background.\nTask ID: ${bgTaskId}.\nOutput: ${bgFilepath}`;
+                const msg = `Command timed out after ${(0, shell_1.humanizeDuration)(effectiveTimeout)}, moved to background.\nTask ID: ${bgTaskId}.\nOutput: ${bgFilepath}`;
                 const data = {
                     stdout: msg,
                     stdoutLines: 1,
@@ -253,8 +250,8 @@ exports.BashTool = {
             stderr += (result.stderr || '').trim() + os_1.EOL;
             const stdoutTrimmed = stdout.trim();
             const stderrTrimmed = stderr.trim();
-            const { totalLines: stdoutLines, truncatedContent: stdoutContent } = stdoutTrimmed ? (0, utils_1.formatOutput)(stdoutTrimmed) : { totalLines: 0, truncatedContent: '' };
-            const { totalLines: stderrLines, truncatedContent: stderrContent } = stderrTrimmed ? (0, utils_1.formatOutput)(stderrTrimmed) : { totalLines: 0, truncatedContent: '' };
+            const { totalLines: stdoutLines, truncatedContent: stdoutContent } = stdoutTrimmed ? (0, shell_2.formatOutput)(stdoutTrimmed) : { totalLines: 0, truncatedContent: '' };
+            const { totalLines: stderrLines, truncatedContent: stderrContent } = stderrTrimmed ? (0, shell_2.formatOutput)(stderrTrimmed) : { totalLines: 0, truncatedContent: '' };
             const data = {
                 stdout: stdoutContent,
                 stdoutLines,
@@ -274,7 +271,7 @@ exports.BashTool = {
             const errorMessage = isAborted
                 ? 'Command was cancelled by user'
                 : `Command failed: ${error instanceof Error ? error.message : String(error)}`;
-            const { totalLines: stdoutLines, truncatedContent: stdoutContent } = (0, utils_1.formatOutput)(stdout.trim());
+            const { totalLines: stdoutLines, truncatedContent: stdoutContent } = (0, shell_2.formatOutput)(stdout.trim());
             const data = {
                 stdout: stdoutContent,
                 stdoutLines,
@@ -291,4 +288,4 @@ exports.BashTool = {
         }
     },
 };
-//# sourceMappingURL=Bash.js.map
+//# sourceMappingURL=RunShell.js.map