@copilotkit/react-core 1.4.6 → 1.4.8-coagents-v0-3.1

package/dist/index.js

@@ -1088,28 +1088,28 @@ function useChat(options) {
     setMessages([...previousMessages, ...newMessages]);
     const systemMessage = makeSystemMessageCallback();
     const messagesWithContext = [systemMessage, ...initialMessages || [], ...previousMessages];
+    const filteredActions = actions.filter((action) => action.available !== import_runtime_client_gql4.ActionInputAvailability.Disabled || !action.disabled).map((action) => {
+      let available = import_runtime_client_gql4.ActionInputAvailability.Enabled;
+      if (action.disabled) {
+        available = import_runtime_client_gql4.ActionInputAvailability.Disabled;
+      } else if (action.available === "disabled") {
+        available = import_runtime_client_gql4.ActionInputAvailability.Disabled;
+      } else if (action.available === "remote") {
+        available = import_runtime_client_gql4.ActionInputAvailability.Remote;
+      }
+      return {
+        name: action.name,
+        description: action.description || "",
+        jsonSchema: JSON.stringify((0, import_shared5.actionParametersToJsonSchema)(action.parameters || [])),
+        available
+      };
+    });
+    const isAgentRun = agentSessionRef.current !== null;
     const stream = runtimeClient.asStream(
       runtimeClient.generateCopilotResponse({
         data: __spreadProps(__spreadValues(__spreadProps(__spreadValues({
           frontend: {
-            actions: actions.filter(
-              (action) => action.available !== import_runtime_client_gql4.ActionInputAvailability.Disabled || !action.disabled
-            ).map((action) => {
-              let available = import_runtime_client_gql4.ActionInputAvailability.Enabled;
-              if (action.disabled) {
-                available = import_runtime_client_gql4.ActionInputAvailability.Disabled;
-              } else if (action.available === "disabled") {
-                available = import_runtime_client_gql4.ActionInputAvailability.Disabled;
-              } else if (action.available === "remote") {
-                available = import_runtime_client_gql4.ActionInputAvailability.Remote;
-              }
-              return {
-                name: action.name,
-                description: action.description || "",
-                jsonSchema: JSON.stringify((0, import_shared5.actionParametersToJsonSchema)(action.parameters || [])),
-                available
-              };
-            }),
+            actions: filteredActions,
             url: window.location.href
           },
           threadId: threadIdRef.current,
@@ -1142,9 +1142,10 @@ function useChat(options) {
     );
     const guardrailsEnabled = ((_g = (_f = (_e = copilotConfig.cloud) == null ? void 0 : _e.guardrails) == null ? void 0 : _f.input) == null ? void 0 : _g.restrictToTopic.enabled) || false;
     const reader = stream.getReader();
-    let actionResults = {};
     let executedCoAgentStateRenders = [];
     let followUp = void 0;
+    let messages2 = [];
+    let syncedMessages = [];
     try {
       while (true) {
         let done, value;
@@ -1163,7 +1164,7 @@ function useChat(options) {
         }
         threadIdRef.current = value.generateCopilotResponse.threadId || null;
         runIdRef.current = value.generateCopilotResponse.runId || null;
-        const messages2 = (0, import_runtime_client_gql4.convertGqlOutputToMessages)(
+        messages2 = (0, import_runtime_client_gql4.convertGqlOutputToMessages)(
           (0, import_runtime_client_gql4.filterAdjacentAgentStateMessages)(value.generateCopilotResponse.messages)
         );
         if (messages2.length === 0) {
@@ -1177,39 +1178,11 @@ function useChat(options) {
               content: ((_i = value.generateCopilotResponse.status.details) == null ? void 0 : _i.guardrailsReason) || ""
             })
           ];
+          setMessages([...previousMessages, ...newMessages]);
+          break;
         } else {
+          newMessages = [...messages2];
           for (const message of messages2) {
-            newMessages.push(message);
-            if (message.isActionExecutionMessage() && message.status.code !== import_runtime_client_gql4.MessageStatusCode.Pending && message.scope === "client" && onFunctionCall) {
-              if (!(message.id in actionResults)) {
-                if (guardrailsEnabled && value.generateCopilotResponse.status === void 0) {
-                  break;
-                }
-                try {
-                  setMessages([...previousMessages, ...newMessages]);
-                  const action = actions.find((action2) => action2.name === message.name);
-                  if (action) {
-                    followUp = action.followUp;
-                  }
-                  const result = yield onFunctionCall({
-                    messages: previousMessages,
-                    name: message.name,
-                    args: message.arguments
-                  });
-                  actionResults[message.id] = result;
-                } catch (e) {
-                  actionResults[message.id] = `Failed to execute action ${message.name}`;
-                  console.error(`Failed to execute action ${message.name}: ${e}`);
-                }
-              }
-              newMessages.push(
-                new import_runtime_client_gql4.ResultMessage({
-                  result: import_runtime_client_gql4.ResultMessage.encodeResult(actionResults[message.id]),
-                  actionExecutionId: message.id,
-                  actionName: message.name
-                })
-              );
-            }
             if (message.isAgentStateMessage() && !message.active && !executedCoAgentStateRenders.includes(message.id) && onCoAgentStateRender) {
               if (guardrailsEnabled && value.generateCopilotResponse.status === void 0) {
                 break;
@@ -1224,6 +1197,11 @@ function useChat(options) {
           }
           const lastAgentStateMessage = [...messages2].reverse().find((message) => message.isAgentStateMessage());
           if (lastAgentStateMessage) {
+            if (lastAgentStateMessage.state.messages && lastAgentStateMessage.state.messages.length > 0) {
+              syncedMessages = (0, import_runtime_client_gql4.loadMessagesFromJsonRepresentation)(
+                lastAgentStateMessage.state.messages
+              );
+            }
             setCoagentStatesWithRef((prevAgentStates) => __spreadProps(__spreadValues({}, prevAgentStates), {
               [lastAgentStateMessage.agentName]: {
                 name: lastAgentStateMessage.agentName,
@@ -1250,14 +1228,52 @@ function useChat(options) {
           setMessages([...previousMessages, ...newMessages]);
         }
       }
+      const finalMessages = constructFinalMessages(syncedMessages, previousMessages, newMessages);
+      let didExecuteAction = false;
+      if (onFunctionCall) {
+        const lastMessages = [];
+        for (let i = finalMessages.length - 1; i >= 0; i--) {
+          const message = finalMessages[i];
+          if (message.isActionExecutionMessage() && message.status.code !== import_runtime_client_gql4.MessageStatusCode.Pending) {
+            lastMessages.unshift(message);
+          } else {
+            break;
+          }
+        }
+        for (const message of lastMessages) {
+          setMessages(finalMessages);
+          const action = actions.find((action2) => action2.name === message.name);
+          if (action) {
+            followUp = action.followUp;
+            const result = yield onFunctionCall({
+              messages: finalMessages,
+              name: message.name,
+              args: message.arguments
+            });
+            didExecuteAction = true;
+            const messageIndex = finalMessages.findIndex((msg) => msg.id === message.id);
+            finalMessages.splice(
+              messageIndex + 1,
+              0,
+              new import_runtime_client_gql4.ResultMessage({
+                id: "result-" + message.id,
+                result: import_runtime_client_gql4.ResultMessage.encodeResult(result),
+                actionExecutionId: message.id,
+                actionName: message.name
+              })
+            );
+          }
+        }
+        setMessages(finalMessages);
+      }
       if (
         // if followUp is not explicitly false
-        followUp !== false && // if we have client side results
-        (Object.values(actionResults).length || // or the last message we received is a result
-        newMessages.length && newMessages[newMessages.length - 1].isResultMessage())
+        followUp !== false && // and we executed an action
+        (didExecuteAction || // the last message is a server side result
+        !isAgentRun && finalMessages.length && finalMessages[finalMessages.length - 1].isResultMessage())
       ) {
         yield new Promise((resolve) => setTimeout(resolve, 10));
-        return yield runChatCompletionRef.current([...previousMessages, ...newMessages]);
+        return yield runChatCompletionRef.current(finalMessages);
       } else {
         return newMessages.slice();
       }
@@ -1300,6 +1316,23 @@ function useChat(options) {
     runChatCompletion: () => runChatCompletionRef.current(messages)
   };
 }
+function constructFinalMessages(syncedMessages, previousMessages, newMessages) {
+  const finalMessages = syncedMessages.length > 0 ? [...syncedMessages] : [...previousMessages, ...newMessages];
+  if (syncedMessages.length > 0) {
+    const messagesWithAgentState = [...previousMessages, ...newMessages];
+    let previousMessageId = void 0;
+    for (const message of messagesWithAgentState) {
+      if (message.isAgentStateMessage()) {
+        const index = finalMessages.findIndex((msg) => msg.id === previousMessageId);
+        if (index !== -1) {
+          finalMessages.splice(index + 1, 0, message);
+        }
+      }
+      previousMessageId = message.id;
+    }
+  }
+  return finalMessages;
+}
 
 // src/hooks/use-copilot-chat.ts
 function useCopilotChat(_a = {}) {