@anuma/sdk 6.27.7 → 6.27.9

package/dist/expo/index.cjs

@@ -5954,6 +5954,12 @@ var ToolTimeoutError = class extends Error {
     this.name = "ToolTimeoutError";
   }
 };
+var ToolCancelledError = class extends Error {
+  constructor() {
+    super("Tool execution cancelled");
+    this.name = "ToolCancelledError";
+  }
+};
 function safeJsonStringify(value) {
   try {
     return JSON.stringify(value) ?? "null";
@@ -5961,7 +5967,7 @@ function safeJsonStringify(value) {
     return String(value);
   }
 }
-async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS) {
+async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS, signal) {
   let args = {};
   if (toolCall.arguments) {
     const parsed = parseToolArguments(toolCall.arguments);
@@ -5970,28 +5976,42 @@ async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIM
     }
     args = parsed.args;
   }
+  if (signal?.aborted) {
+    return { error: "Tool execution cancelled", errorType: "cancelled" };
+  }
+  let timer;
+  let onAbort;
   try {
-    if (!isFinite(timeoutMs)) {
-      return { result: await executor(args) };
+    const racers = [];
+    if (signal) {
+      racers.push(
+        new Promise((_, reject) => {
+          onAbort = () => reject(new ToolCancelledError());
+          signal.addEventListener("abort", onAbort, { once: true });
+        })
+      );
     }
-    let timer;
-    try {
-      const result = await Promise.race([
-        executor(args),
+    racers.push(Promise.resolve(signal ? executor(args, signal) : executor(args)));
+    if (isFinite(timeoutMs)) {
+      racers.push(
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new ToolTimeoutError()), timeoutMs);
         })
-      ]);
-      return { result };
-    } finally {
-      clearTimeout(timer);
+      );
     }
+    return { result: await Promise.race(racers) };
   } catch (e) {
+    if (e instanceof ToolCancelledError) {
+      return { error: "Tool execution cancelled", errorType: "cancelled" };
+    }
     const message = e instanceof Error ? e.message : String(e);
     return {
       error: `Tool execution failed: ${message}`,
       errorType: e instanceof ToolTimeoutError ? "timeout" : "execution"
     };
+  } finally {
+    clearTimeout(timer);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
   }
 }
 function toolsToApiFormat(tools, apiType) {
@@ -8347,11 +8367,12 @@ Executing tool: ${toolInfo}
             const blockedByFailure = failedDeps.some((d) => failedNames.has(d));
             const reason = blockedByFailure ? `failed dependencies: ${failedDeps.join(", ")}` : "a dependency cycle";
             const errorMsg = `Tool "${tc.name}" was not executed due to ${reason}`;
+            const skipErrorType = combinedSignal?.aborted ? "cancelled" : "execution";
             executionResults.push({
               id: tc.id,
               name: tc.name,
               error: errorMsg,
-              errorType: "execution"
+              errorType: skipErrorType
             });
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -8360,7 +8381,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -8380,7 +8401,8 @@ Executing tool: ${toolInfo}
             const { result, error, errorType } = await executeToolCall(
               toolCallForExec,
               executorConfig.executor,
-              executorConfig.executorTimeout
+              executorConfig.executorTimeout,
+              combinedSignal
             );
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -9449,6 +9471,7 @@ function useChat(options) {
   const abortControllerRef = (0, import_react3.useRef)(null);
   const detachControllerRef = (0, import_react3.useRef)(null);
   const pendingResumeRef = (0, import_react3.useRef)(null);
+  const requestIdRef = (0, import_react3.useRef)(0);
   const fireCancel = (0, import_react3.useCallback)(
     (handle) => {
       const { inferenceId } = handle;
@@ -9577,6 +9600,8 @@ function useChat(options) {
       abortControllerRef.current = abortController;
       const detachController = new AbortController();
       detachControllerRef.current = detachController;
+      const requestId = ++requestIdRef.current;
+      const superseded = () => requestIdRef.current !== requestId;
       pendingResumeRef.current = null;
       setIsLoading(true);
       try {
@@ -9696,7 +9721,8 @@ function useChat(options) {
           piiRedaction: requestPiiRedaction ?? resolvedPiiRedaction,
           onPiiRedacted
         });
-        if ("detached" in result && result.detached && result.resume) {
+        if (superseded()) {
+        } else if ("detached" in result && result.detached && result.resume) {
           pendingResumeRef.current = result.resume;
         } else {
           pendingResumeRef.current = null;
@@ -9708,7 +9734,7 @@ function useChat(options) {
           onError
         );
       } finally {
-        setIsLoading(false);
+        if (!superseded()) setIsLoading(false);
         if (abortControllerRef.current === abortController) {
           abortControllerRef.current = null;
         }

package/dist/expo/index.d.mts

@@ -2177,12 +2177,12 @@ type ToolCallArgumentsDeltaEvent = {
     argumentsDelta: string;
     accumulatedArguments: string;
 };
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/expo/index.d.ts

@@ -2177,12 +2177,12 @@ type ToolCallArgumentsDeltaEvent = {
     argumentsDelta: string;
     accumulatedArguments: string;
 };
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/expo/index.mjs

@@ -4351,6 +4351,12 @@ var ToolTimeoutError = class extends Error {
     this.name = "ToolTimeoutError";
   }
 };
+var ToolCancelledError = class extends Error {
+  constructor() {
+    super("Tool execution cancelled");
+    this.name = "ToolCancelledError";
+  }
+};
 function safeJsonStringify(value) {
   try {
     return JSON.stringify(value) ?? "null";
@@ -4358,7 +4364,7 @@ function safeJsonStringify(value) {
     return String(value);
   }
 }
-async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS) {
+async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS, signal) {
   let args = {};
   if (toolCall.arguments) {
     const parsed = parseToolArguments(toolCall.arguments);
@@ -4367,28 +4373,42 @@ async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIM
     }
     args = parsed.args;
   }
+  if (signal?.aborted) {
+    return { error: "Tool execution cancelled", errorType: "cancelled" };
+  }
+  let timer;
+  let onAbort;
   try {
-    if (!isFinite(timeoutMs)) {
-      return { result: await executor(args) };
+    const racers = [];
+    if (signal) {
+      racers.push(
+        new Promise((_, reject) => {
+          onAbort = () => reject(new ToolCancelledError());
+          signal.addEventListener("abort", onAbort, { once: true });
+        })
+      );
     }
-    let timer;
-    try {
-      const result = await Promise.race([
-        executor(args),
+    racers.push(Promise.resolve(signal ? executor(args, signal) : executor(args)));
+    if (isFinite(timeoutMs)) {
+      racers.push(
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new ToolTimeoutError()), timeoutMs);
         })
-      ]);
-      return { result };
-    } finally {
-      clearTimeout(timer);
+      );
     }
+    return { result: await Promise.race(racers) };
   } catch (e) {
+    if (e instanceof ToolCancelledError) {
+      return { error: "Tool execution cancelled", errorType: "cancelled" };
+    }
     const message = e instanceof Error ? e.message : String(e);
     return {
       error: `Tool execution failed: ${message}`,
       errorType: e instanceof ToolTimeoutError ? "timeout" : "execution"
     };
+  } finally {
+    clearTimeout(timer);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
   }
 }
 function toolsToApiFormat(tools, apiType) {
@@ -6744,11 +6764,12 @@ Executing tool: ${toolInfo}
             const blockedByFailure = failedDeps.some((d) => failedNames.has(d));
             const reason = blockedByFailure ? `failed dependencies: ${failedDeps.join(", ")}` : "a dependency cycle";
             const errorMsg = `Tool "${tc.name}" was not executed due to ${reason}`;
+            const skipErrorType = combinedSignal?.aborted ? "cancelled" : "execution";
             executionResults.push({
               id: tc.id,
               name: tc.name,
               error: errorMsg,
-              errorType: "execution"
+              errorType: skipErrorType
             });
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -6757,7 +6778,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -6777,7 +6798,8 @@ Executing tool: ${toolInfo}
             const { result, error, errorType } = await executeToolCall(
               toolCallForExec,
               executorConfig.executor,
-              executorConfig.executorTimeout
+              executorConfig.executorTimeout,
+              combinedSignal
             );
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -7841,6 +7863,7 @@ function useChat(options) {
   const abortControllerRef = useRef3(null);
   const detachControllerRef = useRef3(null);
   const pendingResumeRef = useRef3(null);
+  const requestIdRef = useRef3(0);
   const fireCancel = useCallback3(
     (handle) => {
       const { inferenceId } = handle;
@@ -7969,6 +7992,8 @@ function useChat(options) {
       abortControllerRef.current = abortController;
       const detachController = new AbortController();
       detachControllerRef.current = detachController;
+      const requestId = ++requestIdRef.current;
+      const superseded = () => requestIdRef.current !== requestId;
       pendingResumeRef.current = null;
       setIsLoading(true);
       try {
@@ -8088,7 +8113,8 @@ function useChat(options) {
           piiRedaction: requestPiiRedaction ?? resolvedPiiRedaction,
           onPiiRedacted
         });
-        if ("detached" in result && result.detached && result.resume) {
+        if (superseded()) {
+        } else if ("detached" in result && result.detached && result.resume) {
           pendingResumeRef.current = result.resume;
         } else {
           pendingResumeRef.current = null;
@@ -8100,7 +8126,7 @@ function useChat(options) {
           onError
         );
       } finally {
-        setIsLoading(false);
+        if (!superseded()) setIsLoading(false);
         if (abortControllerRef.current === abortController) {
           abortControllerRef.current = null;
         }

package/dist/index.d.mts

@@ -7637,7 +7637,7 @@ declare function getImageModel(r: ApiResponse): string | undefined;
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/index.d.ts

@@ -7637,7 +7637,7 @@ declare function getImageModel(r: ApiResponse): string | undefined;
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/react/index.cjs

@@ -6344,6 +6344,12 @@ var ToolTimeoutError = class extends Error {
     this.name = "ToolTimeoutError";
   }
 };
+var ToolCancelledError = class extends Error {
+  constructor() {
+    super("Tool execution cancelled");
+    this.name = "ToolCancelledError";
+  }
+};
 function safeJsonStringify(value) {
   try {
     return JSON.stringify(value) ?? "null";
@@ -6351,7 +6357,7 @@ function safeJsonStringify(value) {
     return String(value);
   }
 }
-async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS) {
+async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS, signal) {
   let args = {};
   if (toolCall.arguments) {
     const parsed = parseToolArguments(toolCall.arguments);
@@ -6360,28 +6366,42 @@ async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIM
     }
     args = parsed.args;
   }
+  if (signal?.aborted) {
+    return { error: "Tool execution cancelled", errorType: "cancelled" };
+  }
+  let timer;
+  let onAbort;
   try {
-    if (!isFinite(timeoutMs)) {
-      return { result: await executor(args) };
+    const racers = [];
+    if (signal) {
+      racers.push(
+        new Promise((_, reject) => {
+          onAbort = () => reject(new ToolCancelledError());
+          signal.addEventListener("abort", onAbort, { once: true });
+        })
+      );
     }
-    let timer;
-    try {
-      const result = await Promise.race([
-        executor(args),
+    racers.push(Promise.resolve(signal ? executor(args, signal) : executor(args)));
+    if (isFinite(timeoutMs)) {
+      racers.push(
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new ToolTimeoutError()), timeoutMs);
         })
-      ]);
-      return { result };
-    } finally {
-      clearTimeout(timer);
+      );
     }
+    return { result: await Promise.race(racers) };
   } catch (e) {
+    if (e instanceof ToolCancelledError) {
+      return { error: "Tool execution cancelled", errorType: "cancelled" };
+    }
     const message = e instanceof Error ? e.message : String(e);
     return {
       error: `Tool execution failed: ${message}`,
       errorType: e instanceof ToolTimeoutError ? "timeout" : "execution"
     };
+  } finally {
+    clearTimeout(timer);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
   }
 }
 function toolsToApiFormat(tools, apiType) {
@@ -8737,11 +8757,12 @@ Executing tool: ${toolInfo}
             const blockedByFailure = failedDeps.some((d) => failedNames.has(d));
             const reason = blockedByFailure ? `failed dependencies: ${failedDeps.join(", ")}` : "a dependency cycle";
             const errorMsg = `Tool "${tc.name}" was not executed due to ${reason}`;
+            const skipErrorType = combinedSignal?.aborted ? "cancelled" : "execution";
             executionResults.push({
               id: tc.id,
               name: tc.name,
               error: errorMsg,
-              errorType: "execution"
+              errorType: skipErrorType
             });
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -8750,7 +8771,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -8770,7 +8791,8 @@ Executing tool: ${toolInfo}
             const { result, error, errorType } = await executeToolCall(
               toolCallForExec,
               executorConfig.executor,
-              executorConfig.executorTimeout
+              executorConfig.executorTimeout,
+              combinedSignal
             );
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -9406,6 +9428,7 @@ function useChat(options) {
   } = options || {};
   const [isLoading, setIsLoading] = (0, import_react.useState)(false);
   const abortControllerRef = (0, import_react.useRef)(null);
+  const requestIdRef = (0, import_react.useRef)(0);
   const piiRedactorRef = (0, import_react.useRef)(null);
   if (piiRedaction === true && !piiRedactorRef.current) {
     piiRedactorRef.current = new PiiRedactor();
@@ -9455,6 +9478,7 @@ function useChat(options) {
       }
       const abortController = new AbortController();
       abortControllerRef.current = abortController;
+      const requestId = ++requestIdRef.current;
       setIsLoading(true);
       try {
         const tokenGetterValidation = validateTokenGetter(getToken);
@@ -9554,8 +9578,8 @@ function useChat(options) {
           onError
         );
       } finally {
-        setIsLoading(false);
-        if (abortControllerRef.current === abortController) {
+        if (requestIdRef.current === requestId) {
+          setIsLoading(false);
           abortControllerRef.current = null;
         }
       }

package/dist/react/index.d.mts

@@ -2106,12 +2106,12 @@ type ToolCallArgumentsDeltaEvent = {
     argumentsDelta: string;
     accumulatedArguments: string;
 };
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/react/index.d.ts

@@ -2106,12 +2106,12 @@ type ToolCallArgumentsDeltaEvent = {
     argumentsDelta: string;
     accumulatedArguments: string;
 };
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/react/index.mjs

@@ -4480,6 +4480,12 @@ var ToolTimeoutError = class extends Error {
     this.name = "ToolTimeoutError";
   }
 };
+var ToolCancelledError = class extends Error {
+  constructor() {
+    super("Tool execution cancelled");
+    this.name = "ToolCancelledError";
+  }
+};
 function safeJsonStringify(value) {
   try {
     return JSON.stringify(value) ?? "null";
@@ -4487,7 +4493,7 @@ function safeJsonStringify(value) {
     return String(value);
   }
 }
-async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS) {
+async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS, signal) {
   let args = {};
   if (toolCall.arguments) {
     const parsed = parseToolArguments(toolCall.arguments);
@@ -4496,28 +4502,42 @@ async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIM
     }
     args = parsed.args;
   }
+  if (signal?.aborted) {
+    return { error: "Tool execution cancelled", errorType: "cancelled" };
+  }
+  let timer;
+  let onAbort;
   try {
-    if (!isFinite(timeoutMs)) {
-      return { result: await executor(args) };
+    const racers = [];
+    if (signal) {
+      racers.push(
+        new Promise((_, reject) => {
+          onAbort = () => reject(new ToolCancelledError());
+          signal.addEventListener("abort", onAbort, { once: true });
+        })
+      );
     }
-    let timer;
-    try {
-      const result = await Promise.race([
-        executor(args),
+    racers.push(Promise.resolve(signal ? executor(args, signal) : executor(args)));
+    if (isFinite(timeoutMs)) {
+      racers.push(
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new ToolTimeoutError()), timeoutMs);
         })
-      ]);
-      return { result };
-    } finally {
-      clearTimeout(timer);
+      );
     }
+    return { result: await Promise.race(racers) };
   } catch (e) {
+    if (e instanceof ToolCancelledError) {
+      return { error: "Tool execution cancelled", errorType: "cancelled" };
+    }
     const message = e instanceof Error ? e.message : String(e);
     return {
       error: `Tool execution failed: ${message}`,
       errorType: e instanceof ToolTimeoutError ? "timeout" : "execution"
     };
+  } finally {
+    clearTimeout(timer);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
   }
 }
 function toolsToApiFormat(tools, apiType) {
@@ -6873,11 +6893,12 @@ Executing tool: ${toolInfo}
             const blockedByFailure = failedDeps.some((d) => failedNames.has(d));
             const reason = blockedByFailure ? `failed dependencies: ${failedDeps.join(", ")}` : "a dependency cycle";
             const errorMsg = `Tool "${tc.name}" was not executed due to ${reason}`;
+            const skipErrorType = combinedSignal?.aborted ? "cancelled" : "execution";
             executionResults.push({
               id: tc.id,
               name: tc.name,
               error: errorMsg,
-              errorType: "execution"
+              errorType: skipErrorType
             });
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -6886,7 +6907,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -6906,7 +6927,8 @@ Executing tool: ${toolInfo}
             const { result, error, errorType } = await executeToolCall(
               toolCallForExec,
               executorConfig.executor,
-              executorConfig.executorTimeout
+              executorConfig.executorTimeout,
+              combinedSignal
             );
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -7540,6 +7562,7 @@ function useChat(options) {
   } = options || {};
   const [isLoading, setIsLoading] = useState(false);
   const abortControllerRef = useRef(null);
+  const requestIdRef = useRef(0);
   const piiRedactorRef = useRef(null);
   if (piiRedaction === true && !piiRedactorRef.current) {
     piiRedactorRef.current = new PiiRedactor();
@@ -7589,6 +7612,7 @@ function useChat(options) {
       }
       const abortController = new AbortController();
       abortControllerRef.current = abortController;
+      const requestId = ++requestIdRef.current;
       setIsLoading(true);
       try {
         const tokenGetterValidation = validateTokenGetter(getToken);
@@ -7688,8 +7712,8 @@ function useChat(options) {
           onError
         );
       } finally {
-        setIsLoading(false);
-        if (abortControllerRef.current === abortController) {
+        if (requestIdRef.current === requestId) {
+          setIsLoading(false);
           abortControllerRef.current = null;
         }
       }

package/dist/server/index.cjs

@@ -35383,6 +35383,12 @@ var ToolTimeoutError = class extends Error {
     this.name = "ToolTimeoutError";
   }
 };
+var ToolCancelledError = class extends Error {
+  constructor() {
+    super("Tool execution cancelled");
+    this.name = "ToolCancelledError";
+  }
+};
 function safeJsonStringify(value) {
   try {
     return JSON.stringify(value) ?? "null";
@@ -35390,7 +35396,7 @@ function safeJsonStringify(value) {
     return String(value);
   }
 }
-async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS) {
+async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS, signal) {
   let args = {};
   if (toolCall.arguments) {
     const parsed = parseToolArguments(toolCall.arguments);
@@ -35399,28 +35405,42 @@ async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIM
     }
     args = parsed.args;
   }
+  if (signal?.aborted) {
+    return { error: "Tool execution cancelled", errorType: "cancelled" };
+  }
+  let timer;
+  let onAbort;
   try {
-    if (!isFinite(timeoutMs)) {
-      return { result: await executor(args) };
+    const racers = [];
+    if (signal) {
+      racers.push(
+        new Promise((_, reject) => {
+          onAbort = () => reject(new ToolCancelledError());
+          signal.addEventListener("abort", onAbort, { once: true });
+        })
+      );
     }
-    let timer;
-    try {
-      const result = await Promise.race([
-        executor(args),
+    racers.push(Promise.resolve(signal ? executor(args, signal) : executor(args)));
+    if (isFinite(timeoutMs)) {
+      racers.push(
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new ToolTimeoutError()), timeoutMs);
         })
-      ]);
-      return { result };
-    } finally {
-      clearTimeout(timer);
+      );
     }
+    return { result: await Promise.race(racers) };
   } catch (e) {
+    if (e instanceof ToolCancelledError) {
+      return { error: "Tool execution cancelled", errorType: "cancelled" };
+    }
     const message = e instanceof Error ? e.message : String(e);
     return {
       error: `Tool execution failed: ${message}`,
       errorType: e instanceof ToolTimeoutError ? "timeout" : "execution"
     };
+  } finally {
+    clearTimeout(timer);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
   }
 }
 function toolsToApiFormat(tools, apiType) {
@@ -37776,11 +37796,12 @@ Executing tool: ${toolInfo}
             const blockedByFailure = failedDeps.some((d) => failedNames.has(d));
             const reason = blockedByFailure ? `failed dependencies: ${failedDeps.join(", ")}` : "a dependency cycle";
             const errorMsg = `Tool "${tc.name}" was not executed due to ${reason}`;
+            const skipErrorType = combinedSignal?.aborted ? "cancelled" : "execution";
             executionResults.push({
               id: tc.id,
               name: tc.name,
               error: errorMsg,
-              errorType: "execution"
+              errorType: skipErrorType
             });
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -37789,7 +37810,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -37809,7 +37830,8 @@ Executing tool: ${toolInfo}
             const { result, error, errorType } = await executeToolCall(
               toolCallForExec,
               executorConfig.executor,
-              executorConfig.executorTimeout
+              executorConfig.executorTimeout,
+              combinedSignal
             );
             await safeAwait(
               () => hooks?.afterToolUse?.({

package/dist/server/index.d.mts

@@ -2093,7 +2093,7 @@ type ToolUseEndEvent = {
     name: string;
     result?: unknown;
     error?: string;
-    errorType?: "parse" | "timeout" | "execution";
+    errorType?: "parse" | "timeout" | "execution" | "cancelled";
 };
 type RunStartEvent = {
     runId: string;
@@ -2219,7 +2219,7 @@ type ToolCallArgumentsDeltaEvent = {
     argumentsDelta: string;
     accumulatedArguments: string;
 };
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 
 /** A tool result from an auto-executed tool. */
 type AutoExecutedToolResult = {
@@ -2679,7 +2679,7 @@ declare function runToolLoop(options: RunToolLoopOptions): Promise<RunToolLoopRe
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/server/index.d.ts

@@ -2093,7 +2093,7 @@ type ToolUseEndEvent = {
     name: string;
     result?: unknown;
     error?: string;
-    errorType?: "parse" | "timeout" | "execution";
+    errorType?: "parse" | "timeout" | "execution" | "cancelled";
 };
 type RunStartEvent = {
     runId: string;
@@ -2219,7 +2219,7 @@ type ToolCallArgumentsDeltaEvent = {
     argumentsDelta: string;
     accumulatedArguments: string;
 };
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 
 /** A tool result from an auto-executed tool. */
 type AutoExecutedToolResult = {
@@ -2679,7 +2679,7 @@ declare function runToolLoop(options: RunToolLoopOptions): Promise<RunToolLoopRe
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/server/index.mjs

@@ -33629,6 +33629,12 @@ var ToolTimeoutError = class extends Error {
     this.name = "ToolTimeoutError";
   }
 };
+var ToolCancelledError = class extends Error {
+  constructor() {
+    super("Tool execution cancelled");
+    this.name = "ToolCancelledError";
+  }
+};
 function safeJsonStringify(value) {
   try {
     return JSON.stringify(value) ?? "null";
@@ -33636,7 +33642,7 @@ function safeJsonStringify(value) {
     return String(value);
   }
 }
-async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS) {
+async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIMEOUT_MS, signal) {
   let args = {};
   if (toolCall.arguments) {
     const parsed = parseToolArguments(toolCall.arguments);
@@ -33645,28 +33651,42 @@ async function executeToolCall(toolCall, executor, timeoutMs = TOOL_EXECUTOR_TIM
     }
     args = parsed.args;
   }
+  if (signal?.aborted) {
+    return { error: "Tool execution cancelled", errorType: "cancelled" };
+  }
+  let timer;
+  let onAbort;
   try {
-    if (!isFinite(timeoutMs)) {
-      return { result: await executor(args) };
+    const racers = [];
+    if (signal) {
+      racers.push(
+        new Promise((_, reject) => {
+          onAbort = () => reject(new ToolCancelledError());
+          signal.addEventListener("abort", onAbort, { once: true });
+        })
+      );
     }
-    let timer;
-    try {
-      const result = await Promise.race([
-        executor(args),
+    racers.push(Promise.resolve(signal ? executor(args, signal) : executor(args)));
+    if (isFinite(timeoutMs)) {
+      racers.push(
         new Promise((_, reject) => {
           timer = setTimeout(() => reject(new ToolTimeoutError()), timeoutMs);
         })
-      ]);
-      return { result };
-    } finally {
-      clearTimeout(timer);
+      );
     }
+    return { result: await Promise.race(racers) };
   } catch (e) {
+    if (e instanceof ToolCancelledError) {
+      return { error: "Tool execution cancelled", errorType: "cancelled" };
+    }
     const message = e instanceof Error ? e.message : String(e);
     return {
       error: `Tool execution failed: ${message}`,
       errorType: e instanceof ToolTimeoutError ? "timeout" : "execution"
     };
+  } finally {
+    clearTimeout(timer);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
   }
 }
 function toolsToApiFormat(tools, apiType) {
@@ -36022,11 +36042,12 @@ Executing tool: ${toolInfo}
             const blockedByFailure = failedDeps.some((d) => failedNames.has(d));
             const reason = blockedByFailure ? `failed dependencies: ${failedDeps.join(", ")}` : "a dependency cycle";
             const errorMsg = `Tool "${tc.name}" was not executed due to ${reason}`;
+            const skipErrorType = combinedSignal?.aborted ? "cancelled" : "execution";
             executionResults.push({
               id: tc.id,
               name: tc.name,
               error: errorMsg,
-              errorType: "execution"
+              errorType: skipErrorType
             });
             await safeAwait(
               () => hooks?.afterToolUse?.({
@@ -36035,7 +36056,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -36055,7 +36076,8 @@ Executing tool: ${toolInfo}
             const { result, error, errorType } = await executeToolCall(
               toolCallForExec,
               executorConfig.executor,
-              executorConfig.executorTimeout
+              executorConfig.executorTimeout,
+              combinedSignal
             );
             await safeAwait(
               () => hooks?.afterToolUse?.({

package/dist/telemetry/index.d.mts

@@ -147,7 +147,7 @@ type ToolUseEndEvent = {
     name: string;
     result?: unknown;
     error?: string;
-    errorType?: "parse" | "timeout" | "execution";
+    errorType?: "parse" | "timeout" | "execution" | "cancelled";
 };
 type RunStartEvent = {
     runId: string;

package/dist/telemetry/index.d.ts

@@ -147,7 +147,7 @@ type ToolUseEndEvent = {
     name: string;
     result?: unknown;
     error?: string;
-    errorType?: "parse" | "timeout" | "execution";
+    errorType?: "parse" | "timeout" | "execution" | "cancelled";
 };
 type RunStartEvent = {
     runId: string;

package/dist/tools/index.cjs

@@ -515,7 +515,7 @@ function createInteractiveTool(options, config) {
       description: config.description,
       arguments: config.parameters
     },
-    executor: async (args) => {
+    executor: async (args, signal) => {
       if (config.validate && !config.validate(args)) {
         return { cancelled: true };
       }
@@ -525,6 +525,8 @@ function createInteractiveTool(options, config) {
       }
       const interactionId = generateInteractionId(config.interactionType);
       const interactionData = config.mapArgs ? config.mapArgs(args) : args;
+      const onAbort = () => context.cancelInteraction?.(interactionId);
+      signal?.addEventListener("abort", onAbort, { once: true });
       try {
         const result = await context.createInteraction(interactionId, config.interactionType, {
           ...interactionData,
@@ -536,6 +538,8 @@ function createInteractiveTool(options, config) {
         return result;
       } catch {
         return { cancelled: true };
+      } finally {
+        signal?.removeEventListener("abort", onAbort);
       }
     },
     // Interactive tools wait for user input and should not be subject

package/dist/tools/index.d.mts

@@ -2,7 +2,7 @@ type LlmapiChatCompletionTool = {
     [key: string]: unknown;
 };
 
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 type ToolExecutionResult = {
     result?: unknown;
     error?: string;
@@ -13,7 +13,7 @@ type ToolExecutionResult = {
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */
@@ -140,6 +140,8 @@ declare function createChatTools(getAccessToken: () => string | null, requestCal
  */
 type UIInteractionContext = {
     createInteraction: (id: string, type: string, data: unknown) => Promise<unknown>;
+    /** Rejects and removes a pending interaction. Optional for older contexts. */
+    cancelInteraction?: (id: string) => void;
     createDisplayInteraction: (id: string, displayType: string, data: unknown, result: unknown, toolVersion?: number, replacesInteractionId?: string) => void;
 };
 /**

package/dist/tools/index.d.ts

@@ -2,7 +2,7 @@ type LlmapiChatCompletionTool = {
     [key: string]: unknown;
 };
 
-type ToolExecutionErrorType = "parse" | "timeout" | "execution";
+type ToolExecutionErrorType = "parse" | "timeout" | "execution" | "cancelled";
 type ToolExecutionResult = {
     result?: unknown;
     error?: string;
@@ -13,7 +13,7 @@ type ToolExecutionResult = {
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */
@@ -140,6 +140,8 @@ declare function createChatTools(getAccessToken: () => string | null, requestCal
  */
 type UIInteractionContext = {
     createInteraction: (id: string, type: string, data: unknown) => Promise<unknown>;
+    /** Rejects and removes a pending interaction. Optional for older contexts. */
+    cancelInteraction?: (id: string) => void;
     createDisplayInteraction: (id: string, displayType: string, data: unknown, result: unknown, toolVersion?: number, replacesInteractionId?: string) => void;
 };
 /**

package/dist/tools/index.mjs

@@ -359,7 +359,7 @@ function createInteractiveTool(options, config) {
       description: config.description,
       arguments: config.parameters
     },
-    executor: async (args) => {
+    executor: async (args, signal) => {
       if (config.validate && !config.validate(args)) {
         return { cancelled: true };
       }
@@ -369,6 +369,8 @@ function createInteractiveTool(options, config) {
       }
       const interactionId = generateInteractionId(config.interactionType);
       const interactionData = config.mapArgs ? config.mapArgs(args) : args;
+      const onAbort = () => context.cancelInteraction?.(interactionId);
+      signal?.addEventListener("abort", onAbort, { once: true });
       try {
         const result = await context.createInteraction(interactionId, config.interactionType, {
           ...interactionData,
@@ -380,6 +382,8 @@ function createInteractiveTool(options, config) {
         return result;
       } catch {
         return { cancelled: true };
+      } finally {
+        signal?.removeEventListener("abort", onAbort);
       }
     },
     // Interactive tools wait for user input and should not be subject

package/dist/tools/selection/index.d.mts

@@ -5,7 +5,7 @@ type LlmapiChatCompletionTool = {
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/dist/tools/selection/index.d.ts

@@ -5,7 +5,7 @@ type LlmapiChatCompletionTool = {
 /**
  * Tool executor function type
  */
-type ToolExecutor = (args: Record<string, unknown>) => Promise<unknown> | unknown;
+type ToolExecutor = (args: Record<string, unknown>, signal?: AbortSignal) => Promise<unknown> | unknown;
 /**
  * Tool configuration with optional executor
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anuma/sdk",
-  "version": "6.27.7",
+  "version": "6.27.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",