@copilotkit/react-core 1.9.2-next.19 → 1.9.2-next.20

package/dist/hooks/index.js

@@ -192,6 +192,7 @@ var import_runtime_client_gql4 = require("@copilotkit/runtime-client-gql");
 
 // src/hooks/use-chat.ts
 var import_react5 = require("react");
+var import_react_dom = require("react-dom");
 var import_shared4 = require("@copilotkit/shared");
 var import_runtime_client_gql3 = require("@copilotkit/runtime-client-gql");
 
@@ -798,6 +799,39 @@ function useChat(options) {
           newMessages
         );
         let didExecuteAction = false;
+        const executeActionFromMessage = (currentAction, actionMessage) => __async(this, null, function* () {
+          var _a2;
+          const isInterruptAction = interruptMessages.find((m) => m.id === actionMessage.id);
+          followUp = (_a2 = currentAction == null ? void 0 : currentAction.followUp) != null ? _a2 : !isInterruptAction;
+          if (currentAction == null ? void 0 : currentAction._setActivatingMessageId) {
+            currentAction._setActivatingMessageId(actionMessage.id);
+          }
+          const resultMessage = yield executeAction({
+            onFunctionCall,
+            message: actionMessage,
+            chatAbortControllerRef,
+            onError: (error) => {
+              addErrorToast([error]);
+              console.error(`Failed to execute action ${actionMessage.name}: ${error}`);
+            },
+            setMessages,
+            getFinalMessages: () => finalMessages,
+            isRenderAndWait: (currentAction == null ? void 0 : currentAction._isRenderAndWait) || false
+          });
+          didExecuteAction = true;
+          const messageIndex = finalMessages.findIndex((msg) => msg.id === actionMessage.id);
+          finalMessages.splice(messageIndex + 1, 0, resultMessage);
+          if (currentAction == null ? void 0 : currentAction._isRenderAndWait) {
+            const messagesForImmediateUpdate = [...finalMessages];
+            (0, import_react_dom.flushSync)(() => {
+              setMessages(messagesForImmediateUpdate);
+            });
+          }
+          if (currentAction == null ? void 0 : currentAction._setActivatingMessageId) {
+            currentAction._setActivatingMessageId(null);
+          }
+          return resultMessage;
+        });
         if (onFunctionCall) {
           const lastMessages = [];
           for (let i = finalMessages.length - 1; i >= 0; i--) {
@@ -814,37 +848,28 @@ function useChat(options) {
               (action2) => action2.name === message.name
             );
             const currentResultMessagePairedFeAction = message.isResultMessage() ? getPairedFeAction(actions, message) : null;
-            const executeActionFromMessage = (action2, message2) => __async(this, null, function* () {
-              var _a2;
-              const isInterruptAction = interruptMessages.find((m) => m.id === message2.id);
-              followUp = (_a2 = action2 == null ? void 0 : action2.followUp) != null ? _a2 : !isInterruptAction;
-              const resultMessage = yield executeAction({
-                onFunctionCall,
-                previousMessages,
-                message: message2,
-                chatAbortControllerRef,
-                onError: (error) => {
-                  addErrorToast([error]);
-                  console.error(`Failed to execute action ${message2.name}: ${error}`);
-                }
-              });
-              didExecuteAction = true;
-              const messageIndex = finalMessages.findIndex((msg) => msg.id === message2.id);
-              finalMessages.splice(messageIndex + 1, 0, resultMessage);
-              return resultMessage;
-            });
             if (action && message.isActionExecutionMessage()) {
-              const resultMessage = yield executeActionFromMessage(action, message);
-              const pairedFeAction = getPairedFeAction(actions, resultMessage);
-              if (pairedFeAction) {
-                const newExecutionMessage = new import_runtime_client_gql3.ActionExecutionMessage({
-                  name: pairedFeAction.name,
-                  arguments: (0, import_shared4.parseJson)(resultMessage.result, resultMessage.result),
-                  status: message.status,
-                  createdAt: message.createdAt,
-                  parentMessageId: message.parentMessageId
-                });
-                yield executeActionFromMessage(pairedFeAction, newExecutionMessage);
+              const isRenderAndWaitAction = (action == null ? void 0 : action._isRenderAndWait) || false;
+              const alreadyProcessed = isRenderAndWaitAction && finalMessages.some(
+                (fm) => fm.isResultMessage() && fm.actionExecutionId === message.id
+              );
+              if (alreadyProcessed) {
+              } else {
+                const resultMessage = yield executeActionFromMessage(
+                  action,
+                  message
+                );
+                const pairedFeAction = getPairedFeAction(actions, resultMessage);
+                if (pairedFeAction) {
+                  const newExecutionMessage = new import_runtime_client_gql3.ActionExecutionMessage({
+                    name: pairedFeAction.name,
+                    arguments: (0, import_shared4.parseJson)(resultMessage.result, resultMessage.result),
+                    status: message.status,
+                    createdAt: message.createdAt,
+                    parentMessageId: message.parentMessageId
+                  });
+                  yield executeActionFromMessage(pairedFeAction, newExecutionMessage);
+                }
               }
             } else if (message.isResultMessage() && currentResultMessagePairedFeAction) {
               const newExecutionMessage = new import_runtime_client_gql3.ActionExecutionMessage({
@@ -862,13 +887,9 @@ function useChat(options) {
           }
           setMessages(finalMessages);
         }
-        if (
-          // if followUp is not explicitly false
-          followUp !== false && // and we executed an action
-          (didExecuteAction || // the last message is a server side result
-          !isAgentRun && finalMessages.length && finalMessages[finalMessages.length - 1].isResultMessage()) && // the user did not stop generation
-          !((_r = chatAbortControllerRef.current) == null ? void 0 : _r.signal.aborted)
-        ) {
+        if (followUp !== false && (didExecuteAction || // the last message is a server side result
+        !isAgentRun && finalMessages.length && finalMessages[finalMessages.length - 1].isResultMessage()) && // the user did not stop generation
+        !((_r = chatAbortControllerRef.current) == null ? void 0 : _r.signal.aborted)) {
           yield new Promise((resolve) => setTimeout(resolve, 10));
           return yield runChatCompletionRef.current(finalMessages);
         } else if ((_s = chatAbortControllerRef.current) == null ? void 0 : _s.signal.aborted) {
@@ -1039,20 +1060,31 @@ function constructFinalMessages(syncedMessages, previousMessages, newMessages) {
 function executeAction(_0) {
   return __async(this, arguments, function* ({
     onFunctionCall,
-    previousMessages,
     message,
     chatAbortControllerRef,
-    onError
+    onError,
+    setMessages,
+    getFinalMessages,
+    isRenderAndWait
   }) {
     let result;
     let error = null;
+    const currentMessagesForHandler = getFinalMessages();
+    const handlerReturnedPromise = onFunctionCall({
+      messages: currentMessagesForHandler,
+      name: message.name,
+      args: message.arguments
+    });
+    if (isRenderAndWait) {
+      const currentMessagesForRender = getFinalMessages();
+      (0, import_react_dom.flushSync)(() => {
+        setMessages([...currentMessagesForRender]);
+      });
+    }
     try {
       result = yield Promise.race([
-        onFunctionCall({
-          messages: previousMessages,
-          name: message.name,
-          args: message.arguments
-        }),
+        handlerReturnedPromise,
+        // Await the promise returned by the handler
         new Promise(
           (resolve) => {
             var _a;
@@ -1100,7 +1132,7 @@ function getPairedFeAction(actions, message) {
 
 // src/components/copilot-provider/copilotkit.tsx
 var import_react7 = require("react");
-var import_react_dom = require("react-dom");
+var import_react_dom2 = require("react-dom");
 var import_shared5 = require("@copilotkit/shared");
 
 // src/context/copilot-messages-context.tsx
@@ -1345,6 +1377,7 @@ function useCopilotAction(action, dependencies) {
   const { setAction, removeAction, actions, chatComponentsCache } = useCopilotContext();
   const idRef = (0, import_react9.useRef)((0, import_shared6.randomId)());
   const renderAndWaitRef = (0, import_react9.useRef)(null);
+  const activatingMessageIdRef = (0, import_react9.useRef)(null);
   const { addToast } = useToast();
   action = __spreadValues({}, action);
   if (
@@ -1352,30 +1385,48 @@ function useCopilotAction(action, dependencies) {
     isFrontendAction(action) && // check if renderAndWaitForResponse is set
     (action.renderAndWait || action.renderAndWaitForResponse)
   ) {
+    action._isRenderAndWait = true;
     const renderAndWait = action.renderAndWait || action.renderAndWaitForResponse;
     action.renderAndWait = void 0;
     action.renderAndWaitForResponse = void 0;
+    action._setActivatingMessageId = (id) => {
+      activatingMessageIdRef.current = id;
+    };
     action.handler = useAsyncCallback(() => __async(this, null, function* () {
+      const currentActivatingId = activatingMessageIdRef.current;
       let resolve;
       let reject;
       const promise = new Promise((resolvePromise, rejectPromise) => {
         resolve = resolvePromise;
         reject = rejectPromise;
       });
-      renderAndWaitRef.current = { promise, resolve, reject };
-      return yield promise;
+      renderAndWaitRef.current = {
+        promise,
+        resolve,
+        reject,
+        messageId: currentActivatingId
+      };
+      const result = yield promise;
+      return result;
     }), []);
     action.render = (props) => {
+      const currentRenderMessageId = props.messageId;
       let status = props.status;
-      if (props.status === "executing" && !renderAndWaitRef.current) {
-        status = "inProgress";
+      if (props.status === "executing") {
+        if (!renderAndWaitRef.current || !renderAndWaitRef.current.promise) {
+          status = "inProgress";
+        } else if (renderAndWaitRef.current.messageId !== currentRenderMessageId && activatingMessageIdRef.current !== currentRenderMessageId) {
+          status = "inProgress";
+        }
       }
       const waitProps = {
         status,
         args: props.args,
         result: props.result,
-        handler: status === "executing" ? renderAndWaitRef.current.resolve : void 0,
-        respond: status === "executing" ? renderAndWaitRef.current.resolve : void 0
+        // handler and respond should only be provided if this is the truly active instance
+        // and its promise infrastructure is ready.
+        handler: status === "executing" && renderAndWaitRef.current && renderAndWaitRef.current.messageId === currentRenderMessageId ? renderAndWaitRef.current.resolve : void 0,
+        respond: status === "executing" && renderAndWaitRef.current && renderAndWaitRef.current.messageId === currentRenderMessageId ? renderAndWaitRef.current.resolve : void 0
       };
       const isNoArgsRenderWait = (_fn) => {
         var _a;