@ai-zen/agents-sdk 0.5.7 → 0.6.0

package/dist/capabilities/implements/builtin/RmTool.js

@@ -1,29 +1,27 @@
 import * as fsp from "fs/promises";
 import { SdkCallbackTool } from "../../../runtime/SdkCallbackTool.js";
 export class RmTool extends SdkCallbackTool {
-    constructor(env) {
-        super({
-            function: {
-                name: "rm",
-                description: "删除文件或目录",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        path: {
-                            type: "string",
-                            description: "文件或目录路径",
-                        },
-                        recursive: {
-                            type: "boolean",
-                            description: "是否递归删除子目录",
-                        },
-                    },
-                    required: ["path"],
-                    additionalProperties: false,
+    function = {
+        name: "rm",
+        description: "删除文件或目录",
+        parameters: {
+            type: "object",
+            properties: {
+                path: {
+                    type: "string",
+                    description: "文件或目录路径",
+                },
+                recursive: {
+                    type: "boolean",
+                    description: "是否递归删除子目录",
                 },
             },
-            env,
-        });
+            required: ["path"],
+            additionalProperties: false,
+        },
+    };
+    constructor(env) {
+        super({ env });
     }
     async call(input) {
         try {

package/dist/capabilities/implements/builtin/SleepTool.d.ts

@@ -1,8 +1,10 @@
 import { SdkCallbackTool } from "../../../runtime/SdkCallbackTool.js";
 import type { ToolEnv } from "../../../types/index.js";
+import type { AgentNS, ToolCallContext } from "@ai-zen/agents-core";
 export declare class SleepTool extends SdkCallbackTool {
+    function: AgentNS.FunctionDefine;
     constructor(env: ToolEnv);
     call(input: {
         ms: number;
-    }): Promise<string>;
+    }, ctx?: ToolCallContext): Promise<string>;
 }

package/dist/capabilities/implements/builtin/SleepTool.js

@@ -1,26 +1,24 @@
 import { SdkCallbackTool } from "../../../runtime/SdkCallbackTool.js";
 export class SleepTool extends SdkCallbackTool {
-    constructor(env) {
-        super({
-            function: {
-                name: "sleep",
-                description: "等待指定的时间（毫秒）。用于需要延迟执行的场景，例如等待其他操作完成、操作间隔控制等。注意：过长的等待时间会影响响应速度，建议不超过 30000 毫秒（30 秒）。",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        ms: {
-                            type: "number",
-                            description: "等待的毫秒数（1 秒 = 1000 毫秒）。建议不超过 30000（30 秒）。",
-                        },
-                    },
-                    required: ["ms"],
-                    additionalProperties: false,
+    function = {
+        name: "sleep",
+        description: "等待指定的时间（毫秒）。用于需要延迟执行的场景，例如等待其他操作完成、操作间隔控制等。注意：过长的等待时间会影响响应速度，建议不超过 30000 毫秒（30 秒）。",
+        parameters: {
+            type: "object",
+            properties: {
+                ms: {
+                    type: "number",
+                    description: "等待的毫秒数（1 秒 = 1000 毫秒）。建议不超过 30000（30 秒）。",
                 },
             },
-            env,
-        });
+            required: ["ms"],
+            additionalProperties: false,
+        },
+    };
+    constructor(env) {
+        super({ env });
     }
-    async call(input) {
+    async call(input, ctx) {
         const ms = input.ms;
         if (typeof ms !== "number" || !Number.isFinite(ms) || ms < 0) {
             return JSON.stringify({
@@ -35,7 +33,29 @@ export class SleepTool extends SdkCallbackTool {
                 error: `等待时间 ${ms}ms 过长，建议不超过 300000ms（5 分钟）。如需长时间等待请分段执行。`,
             });
         }
-        await new Promise((resolve) => setTimeout(resolve, ms));
+        // 若 signal 已处于 aborted，直接返回中断结果，避免不必要的等待
+        const signal = ctx?.signal;
+        // 等待 ms 毫秒，中断（abort）时提前结束
+        await new Promise((resolve) => {
+            if (signal?.aborted) {
+                resolve();
+                return;
+            }
+            const timer = setTimeout(resolve, ms);
+            if (signal) {
+                signal.addEventListener("abort", () => {
+                    clearTimeout(timer);
+                    resolve();
+                }, { once: true });
+            }
+        });
+        if (signal?.aborted) {
+            return JSON.stringify({
+                success: false,
+                aborted: true,
+                error: "等待被中断（aborted）",
+            });
+        }
         return JSON.stringify({
             success: true,
             waitedMs: ms,

package/dist/capabilities/implements/builtin/WriteFileTool.d.ts

@@ -1,6 +1,8 @@
 import { SdkCallbackTool } from "../../../runtime/SdkCallbackTool.js";
 import type { ToolEnv } from "../../../types/index.js";
+import type { AgentNS } from "@ai-zen/agents-core";
 export declare class WriteFileTool extends SdkCallbackTool {
+    function: AgentNS.FunctionDefine;
     constructor(env: ToolEnv);
     call(input: {
         path: string;

package/dist/capabilities/implements/builtin/WriteFileTool.js

@@ -2,29 +2,27 @@ import * as fsp from "fs/promises";
 import * as path from "path";
 import { SdkCallbackTool } from "../../../runtime/SdkCallbackTool.js";
 export class WriteFileTool extends SdkCallbackTool {
-    constructor(env) {
-        super({
-            function: {
-                name: "writeFile",
-                description: "写入文件",
-                parameters: {
-                    type: "object",
-                    properties: {
-                        path: {
-                            type: "string",
-                            description: "文件路径",
-                        },
-                        content: {
-                            type: "string",
-                            description: "文件内容",
-                        },
-                    },
-                    required: ["path", "content"],
-                    additionalProperties: false,
+    function = {
+        name: "writeFile",
+        description: "写入文件",
+        parameters: {
+            type: "object",
+            properties: {
+                path: {
+                    type: "string",
+                    description: "文件路径",
+                },
+                content: {
+                    type: "string",
+                    description: "文件内容",
                 },
             },
-            env,
-        });
+            required: ["path", "content"],
+            additionalProperties: false,
+        },
+    };
+    constructor(env) {
+        super({ env });
     }
     async call(input) {
         try {

package/dist/capabilities/implements/mcpTools.js

@@ -81,7 +81,7 @@ export function createCallMcpTool(mcpManager) {
                 additionalProperties: false,
             },
         },
-        callback: async (input) => {
+        callback: async (input, ctx) => {
             const serverName = input.server;
             const state = mcpManager.getState(serverName);
             if (state !== "connected") {
@@ -96,7 +96,7 @@ export function createCallMcpTool(mcpManager) {
                 const result = await client.callTool({
                     name: input.tool,
                     arguments: input.arguments,
-                });
+                }, undefined, { signal: ctx?.signal });
                 const contents = result.content ?? [];
                 const textParts = contents
                     .filter((c) => c.type === "text")
@@ -131,7 +131,7 @@ export function createReadMcpResourceTool(mcpManager) {
                 additionalProperties: false,
             },
         },
-        callback: async (input) => {
+        callback: async (input, ctx) => {
             const serverName = input.server;
             const state = mcpManager.getState(serverName);
             if (state !== "connected") {
@@ -143,9 +143,7 @@ export function createReadMcpResourceTool(mcpManager) {
             }
             try {
                 mcpManager.touch(serverName);
-                const result = await client.readResource({
-                    uri: input.uri,
-                });
+                const result = await client.readResource({ uri: input.uri }, { signal: ctx?.signal });
                 const contents = result?.contents ?? [];
                 const textParts = contents
                     .filter((c) => c.text)

package/dist/capabilities/implements/skillTools.js

@@ -103,7 +103,7 @@ export function createCallSkillSubAgentTool(skillDirs, filteredSkills, provider)
                 additionalProperties: false,
             },
         },
-        async callback(input) {
+        async callback(input, ctx) {
             const skillId = input.skill_id;
             const task = input.task;
             const skill = await readSkill(skillDirs, skillId);
@@ -113,7 +113,7 @@ export function createCallSkillSubAgentTool(skillDirs, filteredSkills, provider)
             if (!skill.subAgent) {
                 return `Skill "${skillId}" 不支持子 Agent 模式，请使用 load_skill 加载指导后自行处理`;
             }
-            const parentAgent = (this).agent;
+            const parentAgent = ctx.agent;
             const parentPermissions = parentAgent instanceof SdkAgent
                 ? parentAgent.permissions
                 : undefined;
@@ -130,7 +130,17 @@ export function createCallSkillSubAgentTool(skillDirs, filteredSkills, provider)
                 ],
                 tools: skillTools,
             });
-            await subAgent.run();
+            // 子 Agent 中断联动：外层 abort → subAgent.abort()
+            const onAbort = () => subAgent.abort();
+            if (ctx.signal) {
+                ctx.signal.addEventListener("abort", onAbort, { once: true });
+            }
+            try {
+                await subAgent.run();
+            }
+            finally {
+                ctx.signal?.removeEventListener("abort", onAbort);
+            }
             const lastMsg = subAgent.messages.at(-1);
             return typeof lastMsg?.content === "string" ? lastMsg.content : "";
         },

package/dist/capabilities/implements/subAgentTools.js

@@ -18,14 +18,14 @@ export function createSubAgentTool(def, provider) {
             parameters: def.function.parameters,
         },
         messages: def.messages,
-        buildAgent: function (_parsedArgs) {
+        buildAgent: (_parsed_args, ctx) => {
             // 模型解析：SubAgent 可指定独立模型，否则复用父 Agent 的模型
             let subModel;
             if (def.modelId) {
                 subModel = createModel(provider, def.modelId);
             }
             else {
-                const parentModel = this.agent?.model;
+                const parentModel = ctx.agent?.model;
                 if (!parentModel) {
                     throw new Error(`SubAgent "${selfName}" 未指定 modelId，且父 Agent 没有可复用的模型`);
                 }

package/dist/index.d.ts

@@ -21,6 +21,7 @@ export { createAgent } from "./runtime/createAgent.js";
 export { McpConnectionManager } from "./runtime/McpConnectionManager.js";
 export type { McpConnectOptions } from "./runtime/McpConnectionManager.js";
 export { SdkCallbackTool } from "./runtime/SdkCallbackTool.js";
+export type { SdkCallbackToolOptions } from "./runtime/SdkCallbackTool.js";
 export { TaskMigrationService } from "./runtime/TaskMigrationService.js";
 export type { BuildMigrationAgentOptions } from "./runtime/TaskMigrationService.js";
 export { AutoMigratePlugin } from "./plugin/AutoMigratePlugin.js";

package/dist/runtime/SdkCallbackTool.d.ts

@@ -1,6 +1,11 @@
 import { Tool, ToolCallContext } from "@ai-zen/agents-core";
 import type { AgentNS } from "@ai-zen/agents-core";
 import type { ToolEnv } from "../types/index.js";
+/** SdkCallbackTool 构造选项。env 为核心字段，未来可在此扩展可选项。 */
+export interface SdkCallbackToolOptions {
+    /** 注入的工具环境 */
+    env: ToolEnv;
+}
 /**
  * SdkCallbackTool — SDK 内置工具基类。
  *
@@ -11,16 +16,19 @@ import type { ToolEnv } from "../types/index.js";
  *   - 一个工具一个类，文件名 = 类名（PascalCase）
  *   - 依赖环境（cwd、config）通过构造参数显式注入
  *   - 相对路径统一用 resolve() 解析到 env.cwd
+ *   - 工具定义（function）由子类以类体字段提供（见 SdkCallbackTool.function）
  */
 export declare abstract class SdkCallbackTool extends Tool {
     /** 注入的工具环境 */
     readonly env: ToolEnv;
-    constructor(options: {
-        function: AgentNS.FunctionDefine;
-        env: ToolEnv;
-    });
-    /** 工具核心逻辑（由子类实现，参数为 parsed_args） */
-    abstract call(input: unknown): unknown | Promise<unknown>;
+    /** 工具定义。由子类以类体字段 function = {...} 提供。 */
+    function: AgentNS.FunctionDefine;
+    constructor(options: SdkCallbackToolOptions);
+    /**
+     * 工具核心逻辑（由子类实现，参数为 parsed_args）。
+     * 可选第二参 ctx：透传完整 ToolCallContext，需中止能力（signal）的工具自行读取。
+     */
+    abstract call(input: unknown, ctx?: ToolCallContext): unknown | Promise<unknown>;
     /** 桥接 core 的 Tool.exec：解析参数 → call → 序列化 */
     exec(ctx: ToolCallContext): Promise<string>;
     /** 将相对路径解析到 env.cwd，绝对路径原样返回 */

package/dist/runtime/SdkCallbackTool.js

@@ -10,17 +10,18 @@ import { Tool } from "@ai-zen/agents-core";
  *   - 一个工具一个类，文件名 = 类名（PascalCase）
  *   - 依赖环境（cwd、config）通过构造参数显式注入
  *   - 相对路径统一用 resolve() 解析到 env.cwd
+ *   - 工具定义（function）由子类以类体字段提供（见 SdkCallbackTool.function）
  */
 export class SdkCallbackTool extends Tool {
     /** 注入的工具环境 */
     env;
     constructor(options) {
-        super({ function: options.function });
+        super();
         this.env = options.env;
     }
     /** 桥接 core 的 Tool.exec：解析参数 → call → 序列化 */
     async exec(ctx) {
-        const result = await this.call(ctx.parsed_args);
+        const result = await this.call(ctx.parsed_args, ctx);
         if (typeof result === "string")
             return result;
         // JSON.stringify(undefined) 返回 undefined（非字符串），会破坏 Promise<string> 契约

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-zen/agents-sdk",
-  "version": "0.5.7",
+  "version": "0.6.0",
   "description": "AI-Zen Agents SDK — shared business logic for CLI and Desktop",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
     "dayjs": "^1.11.21",
-    "@ai-zen/agents-core": "^3.3.1"
+    "@ai-zen/agents-core": "^3.4.0"
   },
   "devDependencies": {
     "@types/node": "^24.12.2",