@mastra/react 0.0.10 → 0.0.11-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/react-hooks
 
+## 0.0.11-alpha.0
+
+### Patch Changes
+
+- Add tool call approval ([#8649](https://github.com/mastra-ai/mastra/pull/8649))
+
+- Updated dependencies [[`5df9cce`](https://github.com/mastra-ai/mastra/commit/5df9cce1a753438413f64c11eeef8f845745c2a8), [`2060766`](https://github.com/mastra-ai/mastra/commit/20607667bf78ea104cca3e15dfb93ae0b62c9d18)]:
+  - @mastra/client-js@0.16.5-alpha.0
+
 ## 0.0.10
 
 ### Patch Changes

package/dist/index.cjs

@@ -253,6 +253,7 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
         }
       ];
     }
+    case "tool-error":
     case "tool-result": {
       const lastMessage = result[result.length - 1];
       if (!lastMessage || lastMessage.role !== "assistant") return result;
@@ -263,14 +264,15 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
       if (toolPartIndex !== -1) {
         const toolPart = parts[toolPartIndex];
         if (toolPart.type === "dynamic-tool") {
-          if (chunk.payload.isError) {
+          if (chunk.type === "tool-result" && chunk.payload.isError || chunk.type === "tool-error") {
+            const error = chunk.type === "tool-error" ? chunk.payload.error : chunk.payload.result;
             parts[toolPartIndex] = {
               type: "dynamic-tool",
               toolName: toolPart.toolName,
               toolCallId: toolPart.toolCallId,
               state: "output-error",
               input: toolPart.input,
-              errorText: String(chunk.payload.result),
+              errorText: String(error),
               callProviderMetadata: chunk.payload.providerMetadata
             };
           } else {
@@ -399,6 +401,29 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
         }
       ];
     }
+    case "tool-call-approval": {
+      const lastMessage = result[result.length - 1];
+      if (!lastMessage || lastMessage.role !== "assistant") return result;
+      const lastRequireApprovalMetadata = lastMessage.metadata?.mode === "stream" ? lastMessage.metadata?.requireApprovalMetadata : {};
+      return [
+        ...result.slice(0, -1),
+        {
+          ...lastMessage,
+          metadata: {
+            ...lastMessage.metadata,
+            mode: "stream",
+            requireApprovalMetadata: {
+              ...lastRequireApprovalMetadata,
+              [chunk.payload.toolCallId]: {
+                toolCallId: chunk.payload.toolCallId,
+                toolName: chunk.payload.toolName,
+                args: chunk.payload.args
+              }
+            }
+          }
+        }
+      ];
+    }
     case "finish": {
       const lastMessage = result[result.length - 1];
       if (!lastMessage || lastMessage.role !== "assistant") return result;
@@ -1137,9 +1162,12 @@ class AISdkNetworkTransformer {
 }
 
 const useChat = ({ agentId, initializeMessages }) => {
+  const _currentRunId = react.useRef(void 0);
+  const _onChunk = react.useRef(void 0);
   const [messages, setMessages] = react.useState(
     () => resolveInitialMessages(initializeMessages?.() || [])
   );
+  const [toolCallApprovals, setToolCallApprovals] = react.useState({});
   const baseClient = useMastraClient();
   const [isRunning, setIsRunning] = react.useState(false);
   const generate = async ({
@@ -1209,7 +1237,8 @@ const useChat = ({ agentId, initializeMessages }) => {
       topP,
       instructions,
       providerOptions,
-      maxSteps
+      maxSteps,
+      requireToolApproval
     } = modelSettings || {};
     setIsRunning(true);
     const clientWithAbort = new clientJs.MastraClient({
@@ -1217,9 +1246,10 @@ const useChat = ({ agentId, initializeMessages }) => {
       abortSignal: signal
     });
     const agent = clientWithAbort.getAgent(agentId);
+    const runId = agentId;
     const response = await agent.stream({
       messages: coreUserMessages,
-      runId: agentId,
+      runId,
       maxSteps,
       modelSettings: {
         frequencyPenalty,
@@ -1233,12 +1263,11 @@ const useChat = ({ agentId, initializeMessages }) => {
       instructions,
       runtimeContext,
       ...threadId ? { threadId, resourceId: agentId } : {},
-      providerOptions
+      providerOptions,
+      requireToolApproval
     });
-    if (!response.body) {
-      setIsRunning(false);
-      throw new Error("[Stream] No response body");
-    }
+    _onChunk.current = onChunk;
+    _currentRunId.current = runId;
     await response.processDataStream({
       onChunk: async (chunk) => {
         setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
@@ -1287,6 +1316,45 @@ const useChat = ({ agentId, initializeMessages }) => {
     });
     setIsRunning(false);
   };
+  const handleCancelRun = () => {
+    setIsRunning(false);
+    _currentRunId.current = void 0;
+    _onChunk.current = void 0;
+  };
+  const approveToolCall = async (toolCallId) => {
+    const onChunk = _onChunk.current;
+    const currentRunId = _currentRunId.current;
+    if (!currentRunId)
+      return console.info("[approveToolCall] approveToolCall can only be called after a stream has started");
+    setIsRunning(true);
+    setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "approved" } }));
+    const agent = baseClient.getAgent(agentId);
+    const response = await agent.approveToolCall({ runId: currentRunId, toolCallId });
+    await response.processDataStream({
+      onChunk: async (chunk) => {
+        setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
+        onChunk?.(chunk);
+      }
+    });
+    setIsRunning(false);
+  };
+  const declineToolCall = async (toolCallId) => {
+    const onChunk = _onChunk.current;
+    const currentRunId = _currentRunId.current;
+    if (!currentRunId)
+      return console.info("[declineToolCall] declineToolCall can only be called after a stream has started");
+    setIsRunning(true);
+    setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "declined" } }));
+    const agent = baseClient.getAgent(agentId);
+    const response = await agent.declineToolCall({ runId: currentRunId, toolCallId });
+    await response.processDataStream({
+      onChunk: async (chunk) => {
+        setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
+        onChunk?.(chunk);
+      }
+    });
+    setIsRunning(false);
+  };
   const sendMessage = async ({ mode = "stream", ...args }) => {
     const nextMessage = { role: "user", content: [{ type: "text", text: args.message }] };
     const messages2 = args.coreUserMessages ? [nextMessage, ...args.coreUserMessages] : [nextMessage];
@@ -1304,7 +1372,10 @@ const useChat = ({ agentId, initializeMessages }) => {
     sendMessage,
     isRunning,
     messages,
-    cancelRun: () => setIsRunning(false)
+    approveToolCall,
+    declineToolCall,
+    cancelRun: handleCancelRun,
+    toolCallApprovals
   };
 };