@anuma/sdk 6.27.8 → 6.28.0

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?.({
@@ -21389,6 +21411,23 @@ var BUILT_IN_TOOL_SETS = [
     members: ["dropbox_list_folders", "dropbox_get_file_content", "dropbox_search"],
     anchors: ["dropbox_list_folders", "dropbox_search"],
     anchorMinSimilarity: 0.53
+  },
+  {
+    // Server tools, so this set does its work through
+    // withActiveToolSetServerTools: once a restaurant tool has run, terse
+    // follow-ups ("okay", "same as before") keep the booking chain. Each tool
+    // still reaches a fresh booking request on its own description.
+    // Anchors are deliberately empty (like the client's Nearby set): the set
+    // is only for stickiness, not a new way to activate on a prompt.
+    // prompt_user_confirm is left out of members: autoFilterClientTools always
+    // sends it, and as a member any unrelated confirmation would pin this set.
+    name: "restaurant-booking",
+    members: [
+      "AnumaPaymentsMCP-anuma_find_restaurant",
+      "AnumaPaymentsMCP-anuma_check_restaurant_availability",
+      "AnumaPaymentsMCP-anuma_book_restaurant"
+    ],
+    anchors: []
   }
 ];
 function expandToolSetsAdditive(matchedNames, availableNames, scores, toolSets, activeSetNames) {
@@ -21422,6 +21461,16 @@ function activatedToolSetNames(scores, toolSets = BUILT_IN_TOOL_SETS, activeSetN
   }
   return activated;
 }
+function withActiveToolSetServerTools(selected, allServerTools, serverToolsFilter, activeToolSets = [], extraToolSets = []) {
+  if (activeToolSets.length === 0) return selected;
+  const sticky = new Set(
+    [...BUILT_IN_TOOL_SETS, ...extraToolSets].filter((ts) => activeToolSets.includes(ts.name)).flatMap((ts) => ts.members)
+  );
+  for (const name of serverToolsFilter.excludeTools ?? []) sticky.delete(name);
+  for (const tool of selected) sticky.delete(tool.name);
+  const added = allServerTools.filter((tool) => sticky.has(tool.name));
+  return added.length > 0 ? [...selected, ...added] : selected;
+}
 function toolSetSystemPrompts(selectedToolNames, toolSets = BUILT_IN_TOOL_SETS, activatedSetNames) {
   const selected = selectedToolNames instanceof Set ? selectedToolNames : new Set(selectedToolNames);
   const prompts = [];
@@ -21535,7 +21584,9 @@ async function selectServerToolsForPrompt(options) {
     embeddingModel,
     cacheExpirationMs,
     cache,
-    deferLoading
+    deferLoading,
+    activeToolSets,
+    extraToolSets
   } = options;
   if (serverToolsFilter === void 0) return [];
   if (Array.isArray(serverToolsFilter) && serverToolsFilter.length === 0) return [];
@@ -21549,7 +21600,14 @@ async function selectServerToolsForPrompt(options) {
   if (deferLoading?.enabled)
     return resolveDeferredServerTools(allServerTools, serverToolsFilter, deferLoading);
   if (typeof serverToolsFilter === "function") {
-    if (prompt.length < MIN_CONTENT_LENGTH_FOR_TOOLS) return [];
+    const withSticky = (selected) => withActiveToolSetServerTools(
+      selected,
+      allServerTools,
+      serverToolsFilter,
+      activeToolSets,
+      extraToolSets
+    );
+    if (prompt.length < MIN_CONTENT_LENGTH_FOR_TOOLS) return withSticky([]);
     let promptEmbedding;
     try {
       promptEmbedding = await generateEmbedding(prompt, {
@@ -21558,10 +21616,10 @@ async function selectServerToolsForPrompt(options) {
         model: embeddingModel
       });
     } catch {
-      return [];
+      return withSticky([]);
     }
     const names = serverToolsFilter(promptEmbedding, allServerTools);
-    return filterServerTools(allServerTools, names);
+    return withSticky(filterServerTools(allServerTools, names));
   }
   return filterServerTools(allServerTools, serverToolsFilter);
 }
@@ -21964,7 +22022,8 @@ async function previewToolSelection(options) {
       activeToolSets ?? []
     );
     let gatedServerNames = [];
-    if (Array.isArray(serverToolsFilter) && serverToolsFilter.length > 0) {
+    const stickyOnly = typeof serverToolsFilter === "function" && !!activeToolSets?.length && !serverToolsConfig?.deferLoading?.enabled;
+    if (Array.isArray(serverToolsFilter) && serverToolsFilter.length > 0 || stickyOnly) {
       try {
         const allServerTools = await getServerTools({
           baseUrl,
@@ -21973,9 +22032,19 @@ async function previewToolSelection(options) {
           apiKey,
           cache: serverToolsConfig?.cache
         });
-        const allow = new Set(serverToolsFilter);
-        const gated = allServerTools.filter((t) => allow.has(t.name));
-        gatedServerNames = (serverToolsConfig?.deferLoading?.enabled ? resolveDeferredServerTools(gated, serverToolsFilter, serverToolsConfig.deferLoading) : gated).map((t) => t.name);
+        if (typeof serverToolsFilter === "function") {
+          gatedServerNames = withActiveToolSetServerTools(
+            [],
+            allServerTools,
+            serverToolsFilter,
+            activeToolSets,
+            extraToolSets
+          ).map((t) => t.name);
+        } else {
+          const allow = new Set(serverToolsFilter);
+          const gated = allServerTools.filter((t) => allow.has(t.name));
+          gatedServerNames = (serverToolsConfig?.deferLoading?.enabled ? resolveDeferredServerTools(gated, serverToolsFilter, serverToolsConfig.deferLoading) : gated).map((t) => t.name);
+        }
       } catch {
       }
     }
@@ -22030,7 +22099,16 @@ async function previewToolSelection(options) {
           serverToolsConfig.deferLoading
         ).map((t) => t.name);
       } else if (typeof serverToolsFilter === "function") {
-        serverToolNames = serverToolsFilter(promptEmbedding, allServerTools);
+        const sticky = withActiveToolSetServerTools(
+          [],
+          allServerTools,
+          serverToolsFilter,
+          activeToolSets,
+          extraToolSets
+        ).map((t) => t.name);
+        serverToolNames = [
+          .../* @__PURE__ */ new Set([...serverToolsFilter(promptEmbedding, allServerTools), ...sticky])
+        ];
       } else {
         const allow = new Set(serverToolsFilter);
         serverToolNames = allServerTools.filter((t) => allow.has(t.name)).map((t) => t.name);
@@ -23078,6 +23156,13 @@ function useChatStorage(options) {
                 const toolNames = serverToolsFilter(skipStorageEmbeddings, allServerTools);
                 filteredServerTools2 = filterServerTools(allServerTools, toolNames);
               }
+              filteredServerTools2 = withActiveToolSetServerTools(
+                filteredServerTools2,
+                allServerTools,
+                serverToolsFilter,
+                activeToolSetsRef.current,
+                extraToolSets
+              );
             } else {
               filteredServerTools2 = filterServerTools(allServerTools, serverToolsFilter);
             }
@@ -23525,6 +23610,13 @@ function useChatStorage(options) {
                 const toolNames = serverToolsFilter(userMessageEmbeddings, allServerTools);
                 filteredServerTools = filterServerTools(allServerTools, toolNames);
               }
+              filteredServerTools = withActiveToolSetServerTools(
+                filteredServerTools,
+                allServerTools,
+                serverToolsFilter,
+                activeToolSetsRef.current,
+                extraToolSets
+              );
             } else {
               filteredServerTools = filterServerTools(allServerTools, serverToolsFilter);
             }
@@ -35256,6 +35348,7 @@ export {
   verifyMemoriesForPublish,
   walk,
   webPlatformStorage,
+  withActiveToolSetServerTools,
   withInternalFlowMarker,
   writeEncryptedFile
 };

package/dist/server/index.cjs

@@ -33283,6 +33283,23 @@ var BUILT_IN_TOOL_SETS = [
     members: ["dropbox_list_folders", "dropbox_get_file_content", "dropbox_search"],
     anchors: ["dropbox_list_folders", "dropbox_search"],
     anchorMinSimilarity: 0.53
+  },
+  {
+    // Server tools, so this set does its work through
+    // withActiveToolSetServerTools: once a restaurant tool has run, terse
+    // follow-ups ("okay", "same as before") keep the booking chain. Each tool
+    // still reaches a fresh booking request on its own description.
+    // Anchors are deliberately empty (like the client's Nearby set): the set
+    // is only for stickiness, not a new way to activate on a prompt.
+    // prompt_user_confirm is left out of members: autoFilterClientTools always
+    // sends it, and as a member any unrelated confirmation would pin this set.
+    name: "restaurant-booking",
+    members: [
+      "AnumaPaymentsMCP-anuma_find_restaurant",
+      "AnumaPaymentsMCP-anuma_check_restaurant_availability",
+      "AnumaPaymentsMCP-anuma_book_restaurant"
+    ],
+    anchors: []
   }
 ];
 function expandToolSetsAdditive(matchedNames, availableNames, scores, toolSets, activeSetNames) {
@@ -33316,6 +33333,16 @@ function activatedToolSetNames(scores, toolSets = BUILT_IN_TOOL_SETS, activeSetN
   }
   return activated;
 }
+function withActiveToolSetServerTools(selected, allServerTools, serverToolsFilter, activeToolSets = [], extraToolSets = []) {
+  if (activeToolSets.length === 0) return selected;
+  const sticky = new Set(
+    [...BUILT_IN_TOOL_SETS, ...extraToolSets].filter((ts) => activeToolSets.includes(ts.name)).flatMap((ts) => ts.members)
+  );
+  for (const name of serverToolsFilter.excludeTools ?? []) sticky.delete(name);
+  for (const tool of selected) sticky.delete(tool.name);
+  const added = allServerTools.filter((tool) => sticky.has(tool.name));
+  return added.length > 0 ? [...selected, ...added] : selected;
+}
 function toolSetSystemPrompts(selectedToolNames, toolSets = BUILT_IN_TOOL_SETS, activatedSetNames) {
   const selected = selectedToolNames instanceof Set ? selectedToolNames : new Set(selectedToolNames);
   const prompts = [];
@@ -33429,7 +33456,9 @@ async function selectServerToolsForPrompt(options) {
     embeddingModel,
     cacheExpirationMs,
     cache,
-    deferLoading
+    deferLoading,
+    activeToolSets,
+    extraToolSets
   } = options;
   if (serverToolsFilter === void 0) return [];
   if (Array.isArray(serverToolsFilter) && serverToolsFilter.length === 0) return [];
@@ -33443,7 +33472,14 @@ async function selectServerToolsForPrompt(options) {
   if (deferLoading?.enabled)
     return resolveDeferredServerTools(allServerTools, serverToolsFilter, deferLoading);
   if (typeof serverToolsFilter === "function") {
-    if (prompt.length < MIN_CONTENT_LENGTH_FOR_TOOLS) return [];
+    const withSticky = (selected) => withActiveToolSetServerTools(
+      selected,
+      allServerTools,
+      serverToolsFilter,
+      activeToolSets,
+      extraToolSets
+    );
+    if (prompt.length < MIN_CONTENT_LENGTH_FOR_TOOLS) return withSticky([]);
     let promptEmbedding;
     try {
       promptEmbedding = await generateEmbedding(prompt, {
@@ -33452,10 +33488,10 @@ async function selectServerToolsForPrompt(options) {
         model: embeddingModel
       });
     } catch {
-      return [];
+      return withSticky([]);
     }
     const names = serverToolsFilter(promptEmbedding, allServerTools);
-    return filterServerTools(allServerTools, names);
+    return withSticky(filterServerTools(allServerTools, names));
   }
   return filterServerTools(allServerTools, serverToolsFilter);
 }
@@ -35383,6 +35419,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 +35432,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 +35441,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 +37832,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 +37846,7 @@ Executing tool: ${toolInfo}
                 toolCallId: tc.id,
                 name: tc.name,
                 error: errorMsg,
-                errorType: "execution"
+                errorType: skipErrorType
               })
             );
           }
@@ -37809,7 +37866,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
  */
@@ -3393,6 +3393,20 @@ interface SelectServerToolsForPromptOptions {
      * {@link resolveDeferredServerTools}). Omit/disabled → today's filtered selection.
      */
     deferLoading?: DeferLoadingConfig;
+    /**
+     * Tool-set names that are sticky for this conversation — the same list you
+     * pass to `useChatStorage`'s `activeToolSets`, e.g. from
+     * `deriveActiveToolSets`. With a filter function, the server-tool members of
+     * these sets are selected whatever the prompt scored, even on a prompt too
+     * short to embed. Omit for selection from the prompt alone.
+     */
+    activeToolSets?: string[];
+    /**
+     * The caller's sets beyond {@link BUILT_IN_TOOL_SETS} — the same list you pass
+     * to `useChatStorage`'s `extraToolSets` — so a custom set named in
+     * `activeToolSets` stays sticky here too.
+     */
+    extraToolSets?: ToolSet[];
 }
 /**
  * Select server-side tools for a prompt using the same path

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
  */
@@ -3393,6 +3393,20 @@ interface SelectServerToolsForPromptOptions {
      * {@link resolveDeferredServerTools}). Omit/disabled → today's filtered selection.
      */
     deferLoading?: DeferLoadingConfig;
+    /**
+     * Tool-set names that are sticky for this conversation — the same list you
+     * pass to `useChatStorage`'s `activeToolSets`, e.g. from
+     * `deriveActiveToolSets`. With a filter function, the server-tool members of
+     * these sets are selected whatever the prompt scored, even on a prompt too
+     * short to embed. Omit for selection from the prompt alone.
+     */
+    activeToolSets?: string[];
+    /**
+     * The caller's sets beyond {@link BUILT_IN_TOOL_SETS} — the same list you pass
+     * to `useChatStorage`'s `extraToolSets` — so a custom set named in
+     * `activeToolSets` stays sticky here too.
+     */
+    extraToolSets?: ToolSet[];
 }
 /**
  * Select server-side tools for a prompt using the same path