@mastra/react 0.4.3-alpha.5 → 0.4.3-alpha.8

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @mastra/react
 
+## 0.4.3-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`0c1ed1d`](https://github.com/mastra-ai/mastra/commit/0c1ed1d00c7d87b5ac99ca95896211a2fa9189fa), [`849efb9`](https://github.com/mastra-ai/mastra/commit/849efb9fca6dc976589c1f90a303fea618769109)]:
+  - @mastra/core@1.38.0-alpha.8
+  - @mastra/client-js@1.22.0-alpha.8
+
+## 0.4.3-alpha.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - @mastra/core@1.38.0-alpha.7
+  - @mastra/client-js@1.22.0-alpha.7
+
+## 0.4.3-alpha.6
+
+### Patch Changes
+
+- Fixed canonical user signal echoes so messages sent through the agent-signals path appear in chat history when they move from pending to active. ([#17309](https://github.com/mastra-ai/mastra/pull/17309))
+
+- Separated thread subscription cleanup from active-run aborts so closing or switching a listener only unsubscribes that listener, while explicit cancel still aborts the active run. ([#17310](https://github.com/mastra-ai/mastra/pull/17310))
+
+- Added subscription-native tool approval APIs so approving or declining a tool call resumes through the active thread subscription instead of requiring a separate continuation stream. New messages are queued while a tool approval is waiting, preventing overlapping runs from duplicating approval requests. ([#17311](https://github.com/mastra-ai/mastra/pull/17311))
+
+  ```ts
+  await agent.sendToolApproval({
+    resourceId: 'user-123',
+    threadId: 'thread-123',
+    toolCallId: 'tool-call-123',
+    approved: true,
+  });
+  ```
+
+- Enabled Studio via the CLI and deployers to use agent signal subscriptions by default while preserving `MASTRA_AGENT_SIGNALS=false`, `enableThreadSignals: false`, and explicit legacy Stream as opt-outs. The React `useChat()` hook remains opt-in for SDK consumers via `enableThreadSignals: true`. ([#17313](https://github.com/mastra-ai/mastra/pull/17313))
+
+- Updated dependencies [[`bb3fce8`](https://github.com/mastra-ai/mastra/commit/bb3fce8f8d80079170c0f98cb2efbb29ae34375d), [`19a8658`](https://github.com/mastra-ai/mastra/commit/19a86589c788ef48bb6c1b0612cc82a201857379), [`a659a77`](https://github.com/mastra-ai/mastra/commit/a659a779bdebe3a52a518c56d2260592d0240fe0), [`3332be9`](https://github.com/mastra-ai/mastra/commit/3332be9701ecd77aba840959d9a1d1ce7aef02d3)]:
+  - @mastra/client-js@1.22.0-alpha.6
+  - @mastra/core@1.38.0-alpha.6
+
 ## 0.4.3-alpha.5
 
 ### Patch Changes

package/dist/agent/hooks.d.ts

@@ -23,9 +23,8 @@ export interface MastraChatProps {
     onSignalEcho?: (signalId: string) => void;
     onThreadSignalsUnsupported?: () => void;
     /**
-     * Opt into the agent-signals streaming path (sendSignal + subscribeToThread).
-     * Defaults to `false` so consumers stay on the legacy `streamUntilIdle` route
-     * unless they explicitly enable the signals path.
+     * Use the agent-signals streaming path (sendSignal + subscribeToThread).
+     * Defaults to `false`; set to `true` to opt into thread signals.
      */
     enableThreadSignals?: boolean;
 }
@@ -65,6 +64,7 @@ export declare const useChat: ({ agentId, resourceId, threadId, initialMessages,
     setMessages: import("react").Dispatch<import("react").SetStateAction<MastraUIMessage[]>>;
     sendMessage: ({ mode, ...args }: SendMessageArgs) => Promise<void>;
     isRunning: boolean;
+    isAwaitingToolApproval: boolean;
     messages: MastraUIMessage[];
     approveToolCall: (toolCallId: string) => Promise<void>;
     declineToolCall: (toolCallId: string) => Promise<void>;

package/dist/agent/hooks.d.ts.map

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

package/dist/index.cjs

@@ -303,7 +303,7 @@ function signalContentsToUserMessages(contents, metadata) {
 var toUIMessage = ({ chunk, conversation, metadata }) => {
   const result = [...conversation];
   if (chunk.type.startsWith("data-")) {
-    if (chunk.type === "data-user-message" && "data" in chunk && chunk.data?.type === "user-message") {
+    if (chunk.type === "data-user-message" && "data" in chunk && (chunk.data?.type === "user-message" || chunk.data?.type === "user")) {
       const signalId = chunk.data.id;
       if (typeof signalId === "string" && result.some((message) => message.id === signalId)) {
         return result;
@@ -2022,6 +2022,27 @@ function convertSignalDataToBase64String(content) {
 }
 
 // src/agent/hooks.ts
+var extractPendingToolApprovalIdsFromMessages = (messages) => {
+  const pendingToolApprovalIds = /* @__PURE__ */ new Set();
+  for (const message of messages) {
+    const metadata = message.metadata;
+    const metadataSources = [
+      metadata?.pendingToolApprovals,
+      metadata?.requireApprovalMetadata,
+      metadata?.suspendedTools
+    ];
+    for (const source of metadataSources) {
+      if (!source || typeof source !== "object") continue;
+      for (const suspensionData of Object.values(source)) {
+        const toolCallId = suspensionData?.toolCallId;
+        if (typeof toolCallId === "string" && toolCallId.length > 0) {
+          pendingToolApprovalIds.add(toolCallId);
+        }
+      }
+    }
+  }
+  return pendingToolApprovalIds;
+};
 var isThreadSignalUnsupportedError = (error) => {
   const candidate = error;
   const status = candidate?.status;
@@ -2050,17 +2071,24 @@ var useChat = ({
   const _requestContext = react.useRef(propsRequestContext);
   const _streamAbortRef = react.useRef(null);
   const _threadSubscriptionAbortRef = react.useRef(null);
+  const _threadSubscriptionRef = react.useRef(
+    null
+  );
   const _threadSubscriptionKeyRef = react.useRef(void 0);
   const _threadSubscriptionPromiseRef = react.useRef(null);
   const _threadSignalsUnsupportedRef = react.useRef(false);
   const [messages, setMessages] = react.useState([]);
   const [toolCallApprovals, setToolCallApprovals] = react.useState({});
   const [networkToolCallApprovals, setNetworkToolCallApprovals] = react.useState({});
+  const pendingToolApprovalIdsRef = react.useRef(/* @__PURE__ */ new Set());
+  const [isAwaitingToolApproval, setIsAwaitingToolApproval] = react.useState(false);
   const baseClient = useMastraClient();
   const [isRunning, setIsRunning] = react.useState(false);
   react.useEffect(() => {
     const formattedMessages = resolveInitialMessages(initialMessages || []);
     setMessages(formattedMessages);
+    pendingToolApprovalIdsRef.current = extractPendingToolApprovalIdsFromMessages(formattedMessages);
+    setIsAwaitingToolApproval(pendingToolApprovalIdsRef.current.size > 0);
     _currentRunId.current = extractRunIdFromMessages(formattedMessages);
   }, [initialMessages]);
   react.useEffect(() => {
@@ -2116,7 +2144,13 @@ var useChat = ({
     return preview || "Attachment";
   };
   const closeThreadSubscription = react.useCallback(() => {
-    _threadSubscriptionAbortRef.current?.abort();
+    const subscription = _threadSubscriptionRef.current;
+    if (subscription?.unsubscribe) {
+      subscription.unsubscribe();
+    } else {
+      _threadSubscriptionAbortRef.current?.abort();
+    }
+    _threadSubscriptionRef.current = null;
     _threadSubscriptionAbortRef.current = null;
     _threadSubscriptionKeyRef.current = void 0;
     _threadSubscriptionPromiseRef.current = null;
@@ -2133,7 +2167,17 @@ var useChat = ({
           _currentRunId.current = chunk.runId;
         }
       }
+      if (chunk.type === "tool-call-approval" || chunk.type === "tool-call-suspended") {
+        const toolCallId = chunk.payload?.toolCallId;
+        if (typeof toolCallId === "string") {
+          pendingToolApprovalIdsRef.current.add(toolCallId);
+          setIsAwaitingToolApproval(true);
+        }
+        setIsRunning(false);
+      }
       if (chunk.type === "finish" || chunk.type === "abort" || chunk.type === "error") {
+        pendingToolApprovalIdsRef.current.clear();
+        setIsAwaitingToolApproval(false);
         setIsRunning(false);
       }
       void (onChunk ?? _onChunk.current)?.(chunk);
@@ -2147,7 +2191,7 @@ var useChat = ({
         await _threadSubscriptionPromiseRef.current;
         return;
       }
-      _threadSubscriptionAbortRef.current?.abort();
+      closeThreadSubscription();
       const subscriptionAbort = new AbortController();
       _threadSubscriptionAbortRef.current = subscriptionAbort;
       _threadSubscriptionKeyRef.current = subscriptionKey;
@@ -2157,7 +2201,17 @@ var useChat = ({
       });
       const subscriptionAgent = clientWithAbort.getAgent(agentId);
       _threadSubscriptionPromiseRef.current = subscriptionAgent.subscribeToThread({ resourceId: resourceId2, threadId: threadId2 }).then((response) => {
-        void response.processDataStream({
+        const subscription = response;
+        if (_threadSubscriptionAbortRef.current !== subscriptionAbort) {
+          if (subscription.unsubscribe) {
+            subscription.unsubscribe();
+          } else {
+            subscriptionAbort.abort();
+          }
+          return;
+        }
+        _threadSubscriptionRef.current = subscription;
+        void subscription.processDataStream({
           onChunk: (chunk) => processStreamChunk(chunk)
         }).catch((error) => {
           if (error.name !== "AbortError") {
@@ -2165,6 +2219,9 @@ var useChat = ({
             setIsRunning(false);
           }
         }).finally(() => {
+          if (_threadSubscriptionRef.current === subscription) {
+            _threadSubscriptionRef.current = null;
+          }
           if (_threadSubscriptionAbortRef.current === subscriptionAbort) {
             _threadSubscriptionAbortRef.current = null;
             _threadSubscriptionKeyRef.current = void 0;
@@ -2175,6 +2232,7 @@ var useChat = ({
         if (isThreadSignalUnsupportedError(error)) {
           markThreadSignalsUnsupported();
           if (_threadSubscriptionAbortRef.current === subscriptionAbort) {
+            _threadSubscriptionRef.current = null;
             _threadSubscriptionAbortRef.current = null;
             _threadSubscriptionKeyRef.current = void 0;
             _threadSubscriptionPromiseRef.current = null;
@@ -2189,7 +2247,7 @@ var useChat = ({
       });
       await _threadSubscriptionPromiseRef.current;
     },
-    [agentId, baseClient, markThreadSignalsUnsupported, processStreamChunk]
+    [agentId, baseClient, closeThreadSubscription, markThreadSignalsUnsupported, processStreamChunk]
   );
   react.useEffect(() => {
     _threadSignalsUnsupportedRef.current = false;
@@ -2410,6 +2468,9 @@ var useChat = ({
           }
         }
       });
+      if (pendingToolApprovalIdsRef.current.size > 0) {
+        setIsRunning(false);
+      }
     } catch (error) {
       onSignalEcho?.(resolvedSignalId);
       if (isThreadSignalUnsupportedError(error)) {
@@ -2473,8 +2534,14 @@ var useChat = ({
   const handleCancelRun = () => {
     _streamAbortRef.current?.abort();
     _streamAbortRef.current = null;
+    const threadSubscription = _threadSubscriptionRef.current;
+    void Promise.resolve(threadSubscription?.abort?.()).catch((error) => {
+      console.error("[useChat] Failed to abort thread subscription", error);
+    });
     closeThreadSubscription();
     setMessages((prev) => finishStreamingAssistantMessage(prev));
+    pendingToolApprovalIdsRef.current.clear();
+    setIsAwaitingToolApproval(false);
     setIsRunning(false);
     _currentRunId.current = void 0;
     _onChunk.current = void 0;
@@ -2490,18 +2557,37 @@ var useChat = ({
     setIsRunning(true);
     setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "approved" } }));
     const agent = baseClient.getAgent(agentId);
+    if (_threadSubscriptionKeyRef.current && threadId) {
+      try {
+        await agent.sendToolApproval({
+          resourceId: resourceId || agentId,
+          threadId,
+          toolCallId,
+          approved: true,
+          requestContext: _requestContext.current
+        });
+        pendingToolApprovalIdsRef.current.delete(toolCallId);
+        setIsAwaitingToolApproval(pendingToolApprovalIdsRef.current.size > 0);
+        setIsRunning(false);
+      } catch (error) {
+        setToolCallApprovals((prev) => {
+          const next = { ...prev };
+          delete next[toolCallId];
+          return next;
+        });
+        setIsRunning(false);
+        throw error;
+      }
+      return;
+    }
     const response = await agent.approveToolCall({
       runId: currentRunId,
       toolCallId,
       requestContext: _requestContext.current
     });
-    if (_threadSubscriptionKeyRef.current) {
-      return;
-    }
     await response.processDataStream({
       onChunk: async (chunk) => {
-        setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
-        void (onChunk ?? _onChunk.current)?.(chunk);
+        await processStreamChunk(chunk, onChunk);
       }
     });
     setIsRunning(false);
@@ -2514,18 +2600,37 @@ var useChat = ({
     setIsRunning(true);
     setToolCallApprovals((prev) => ({ ...prev, [toolCallId]: { status: "declined" } }));
     const agent = baseClient.getAgent(agentId);
+    if (_threadSubscriptionKeyRef.current && threadId) {
+      try {
+        await agent.sendToolApproval({
+          resourceId: resourceId || agentId,
+          threadId,
+          toolCallId,
+          approved: false,
+          requestContext: _requestContext.current
+        });
+        pendingToolApprovalIdsRef.current.delete(toolCallId);
+        setIsAwaitingToolApproval(pendingToolApprovalIdsRef.current.size > 0);
+        setIsRunning(false);
+      } catch (error) {
+        setToolCallApprovals((prev) => {
+          const next = { ...prev };
+          delete next[toolCallId];
+          return next;
+        });
+        setIsRunning(false);
+        throw error;
+      }
+      return;
+    }
     const response = await agent.declineToolCall({
       runId: currentRunId,
       toolCallId,
       requestContext: _requestContext.current
     });
-    if (_threadSubscriptionKeyRef.current) {
-      return;
-    }
     await response.processDataStream({
       onChunk: async (chunk) => {
-        setMessages((prev) => toUIMessage({ chunk, conversation: prev, metadata: { mode: "stream" } }));
-        void (onChunk ?? _onChunk.current)?.(chunk);
+        await processStreamChunk(chunk, onChunk);
       }
     });
     setIsRunning(false);
@@ -2655,6 +2760,7 @@ var useChat = ({
     setMessages,
     sendMessage,
     isRunning,
+    isAwaitingToolApproval,
     messages,
     approveToolCall,
     declineToolCall,