@copilotkit/react-core 1.5.0-tyler-reset-chat.0 → 1.5.0

package/dist/hooks/use-coagent.js

@@ -85,7 +85,7 @@ __export(use_coagent_exports, {
   useCoAgent: () => useCoAgent
 });
 module.exports = __toCommonJS(use_coagent_exports);
-var import_react8 = require("react");
+var import_react9 = require("react");
 
 // src/context/copilot-context.tsx
 var import_react = __toESM(require("react"));
@@ -136,6 +136,9 @@ var emptyCopilotContext = {
   coagentStates: {},
   setCoagentStates: () => {
   },
+  coagentStatesRef: { current: {} },
+  setCoagentStatesWithRef: () => {
+  },
   agentSession: null,
   setAgentSession: () => {
   },
@@ -179,20 +182,160 @@ function useCopilotMessagesContext() {
 }
 
 // src/hooks/use-copilot-chat.ts
-var import_react7 = require("react");
-var import_runtime_client_gql3 = require("@copilotkit/runtime-client-gql");
+var import_react8 = require("react");
+var import_runtime_client_gql4 = require("@copilotkit/runtime-client-gql");
 
 // src/hooks/use-chat.ts
-var import_react5 = require("react");
+var import_react6 = require("react");
+var import_shared2 = require("@copilotkit/shared");
+var import_runtime_client_gql3 = require("@copilotkit/runtime-client-gql");
+
+// src/types/frontend-action.ts
+var import_runtime_client_gql = require("@copilotkit/runtime-client-gql");
 var import_shared = require("@copilotkit/shared");
-var import_runtime_client_gql2 = require("@copilotkit/runtime-client-gql");
+function processActionsForRuntimeRequest(actions) {
+  const filteredActions = actions.filter(
+    (action) => action.available !== import_runtime_client_gql.ActionInputAvailability.Disabled && action.disabled !== true && action.name !== "*"
+  ).map((action) => {
+    let available = import_runtime_client_gql.ActionInputAvailability.Enabled;
+    if (action.disabled) {
+      available = import_runtime_client_gql.ActionInputAvailability.Disabled;
+    } else if (action.available === "disabled") {
+      available = import_runtime_client_gql.ActionInputAvailability.Disabled;
+    } else if (action.available === "remote") {
+      available = import_runtime_client_gql.ActionInputAvailability.Remote;
+    }
+    return {
+      name: action.name,
+      description: action.description || "",
+      jsonSchema: JSON.stringify((0, import_shared.actionParametersToJsonSchema)(action.parameters || [])),
+      available
+    };
+  });
+  return filteredActions;
+}
 
 // src/components/toast/toast-provider.tsx
+var import_react4 = require("react");
+
+// src/components/error-boundary/error-utils.tsx
 var import_react3 = require("react");
+
+// src/components/toast/exclamation-mark-icon.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
-var ToastContext = (0, import_react3.createContext)(void 0);
+var ExclamationMarkIcon = ({
+  className,
+  style
+}) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+  "svg",
+  {
+    xmlns: "http://www.w3.org/2000/svg",
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "2",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    className: `lucide lucide-circle-alert ${className ? className : ""}`,
+    style,
+    children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", { cx: "12", cy: "12", r: "10" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("line", { x1: "12", x2: "12", y1: "8", y2: "12" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("line", { x1: "12", x2: "12.01", y1: "16", y2: "16" })
+    ]
+  }
+);
+
+// src/components/error-boundary/error-utils.tsx
+var import_jsx_runtime2 = require("react/jsx-runtime");
+function ErrorToast({ errors }) {
+  const errorsToRender = errors.map((error, idx) => {
+    var _a, _b, _c;
+    const message = "extensions" in error ? (_b = (_a = error.extensions) == null ? void 0 : _a.originalError) == null ? void 0 : _b.message : error.message;
+    const code = "extensions" in error ? (_c = error.extensions) == null ? void 0 : _c.code : null;
+    return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+      "div",
+      {
+        style: {
+          marginTop: idx === 0 ? 0 : 10,
+          marginBottom: 14
+        },
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(ExclamationMarkIcon, { style: { marginBottom: 4 } }),
+          code && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+            "div",
+            {
+              style: {
+                fontWeight: "600",
+                marginBottom: 4
+              },
+              children: [
+                "Copilot Cloud Error:",
+                " ",
+                /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { fontFamily: "monospace", fontWeight: "normal" }, children: code })
+              ]
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { children: message })
+        ]
+      },
+      idx
+    );
+  });
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+    "div",
+    {
+      style: {
+        fontSize: "13px",
+        maxWidth: "600px"
+      },
+      children: [
+        errorsToRender,
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { style: { fontSize: "11px", opacity: 0.75 }, children: "NOTE: This error only displays during local development." })
+      ]
+    }
+  );
+}
+function useErrorToast() {
+  const { addToast } = useToast();
+  return (0, import_react3.useCallback)(
+    (error) => {
+      const errorId = error.map((err) => {
+        var _a, _b;
+        const message = "extensions" in err ? ((_b = (_a = err.extensions) == null ? void 0 : _a.originalError) == null ? void 0 : _b.message) || err.message : err.message;
+        const stack = err.stack || "";
+        return btoa(message + stack).slice(0, 32);
+      }).join("|");
+      addToast({
+        type: "error",
+        id: errorId,
+        // Toast libraries typically dedupe by id
+        message: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(ErrorToast, { errors: error })
+      });
+    },
+    [addToast]
+  );
+}
+function useAsyncCallback(callback, deps) {
+  const addErrorToast = useErrorToast();
+  return (0, import_react3.useCallback)((...args) => __async(this, null, function* () {
+    try {
+      return yield callback(...args);
+    } catch (error) {
+      console.error("Error in async callback:", error);
+      addErrorToast([error]);
+      throw error;
+    }
+  }), deps);
+}
+
+// src/components/toast/toast-provider.tsx
+var import_jsx_runtime3 = require("react/jsx-runtime");
+var ToastContext = (0, import_react4.createContext)(void 0);
 function useToast() {
-  const context = (0, import_react3.useContext)(ToastContext);
+  const context = (0, import_react4.useContext)(ToastContext);
   if (!context) {
     throw new Error("useToast must be used within a ToastProvider");
   }
@@ -200,15 +343,18 @@ function useToast() {
 }
 
 // src/hooks/use-copilot-runtime-client.ts
-var import_runtime_client_gql = require("@copilotkit/runtime-client-gql");
-var import_react4 = require("react");
+var import_runtime_client_gql2 = require("@copilotkit/runtime-client-gql");
+var import_react5 = require("react");
 var useCopilotRuntimeClient = (options) => {
   const { addGraphQLErrorsToast } = useToast();
-  const runtimeClient = (0, import_react4.useMemo)(() => {
-    return new import_runtime_client_gql.CopilotRuntimeClient(__spreadProps(__spreadValues({}, options), {
+  const addErrorToast = useErrorToast();
+  const runtimeClient = (0, import_react5.useMemo)(() => {
+    return new import_runtime_client_gql2.CopilotRuntimeClient(__spreadProps(__spreadValues({}, options), {
       handleGQLErrors: (error) => {
         if (error.graphQLErrors.length) {
           addGraphQLErrorsToast(error.graphQLErrors);
+        } else {
+          addErrorToast([error]);
         }
       }
     }));
@@ -229,8 +375,8 @@ function useChat(options) {
     actions,
     onFunctionCall,
     onCoAgentStateRender,
-    setCoagentStates,
-    coagentStates,
+    setCoagentStatesWithRef,
+    coagentStatesRef,
     agentSession,
     setAgentSession,
     threadId,
@@ -239,244 +385,298 @@ function useChat(options) {
     setRunId,
     chatAbortControllerRef
   } = options;
-  const abortController = new AbortController();
-  chatAbortControllerRef.current = abortController;
   const { addGraphQLErrorsToast } = useToast();
-  const runChatCompletionRef = (0, import_react5.useRef)();
-  const coagentStatesRef = (0, import_react5.useRef)(coagentStates);
-  coagentStatesRef.current = coagentStates;
-  const agentSessionRef = (0, import_react5.useRef)(agentSession);
+  const runChatCompletionRef = (0, import_react6.useRef)();
+  const agentSessionRef = (0, import_react6.useRef)(agentSession);
   agentSessionRef.current = agentSession;
-  const threadIdRef = (0, import_react5.useRef)(threadId);
+  const threadIdRef = (0, import_react6.useRef)(threadId);
   threadIdRef.current = threadId;
-  const runIdRef = (0, import_react5.useRef)(runId);
+  const runIdRef = (0, import_react6.useRef)(runId);
   runIdRef.current = runId;
   const publicApiKey = copilotConfig.publicApiKey;
-  const headers = __spreadValues(__spreadValues({}, copilotConfig.headers || {}), publicApiKey ? { [import_shared.COPILOT_CLOUD_PUBLIC_API_KEY_HEADER]: publicApiKey } : {});
+  const headers = __spreadValues(__spreadValues({}, copilotConfig.headers || {}), publicApiKey ? { [import_shared2.COPILOT_CLOUD_PUBLIC_API_KEY_HEADER]: publicApiKey } : {});
   const runtimeClient = useCopilotRuntimeClient({
     url: copilotConfig.chatApiEndpoint,
     publicApiKey: copilotConfig.publicApiKey,
     headers,
     credentials: copilotConfig.credentials
   });
-  const runChatCompletion = (previousMessages) => __async(this, null, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-    setIsLoading(true);
-    let newMessages = [
-      new import_runtime_client_gql2.TextMessage({
-        content: "",
-        role: import_runtime_client_gql2.Role.Assistant
-      })
-    ];
-    chatAbortControllerRef.current = new AbortController();
-    setMessages([...previousMessages, ...newMessages]);
-    const systemMessage = makeSystemMessageCallback();
-    const messagesWithContext = [systemMessage, ...initialMessages || [], ...previousMessages];
-    const stream = runtimeClient.asStream(
-      runtimeClient.generateCopilotResponse({
-        data: __spreadProps(__spreadValues(__spreadProps(__spreadValues({
-          frontend: {
-            actions: actions.filter(
-              (action) => action.available !== import_runtime_client_gql2.ActionInputAvailability.Disabled || !action.disabled
-            ).map((action) => {
-              let available = import_runtime_client_gql2.ActionInputAvailability.Enabled;
-              if (action.disabled) {
-                available = import_runtime_client_gql2.ActionInputAvailability.Disabled;
-              } else if (action.available === "disabled") {
-                available = import_runtime_client_gql2.ActionInputAvailability.Disabled;
-              } else if (action.available === "remote") {
-                available = import_runtime_client_gql2.ActionInputAvailability.Remote;
-              }
-              return {
-                name: action.name,
-                description: action.description || "",
-                jsonSchema: JSON.stringify((0, import_shared.actionParametersToJsonSchema)(action.parameters || [])),
-                available
-              };
-            }),
-            url: window.location.href
-          },
-          threadId: threadIdRef.current,
-          runId: runIdRef.current,
-          messages: (0, import_runtime_client_gql2.convertMessagesToGqlInput)((0, import_runtime_client_gql2.filterAgentStateMessages)(messagesWithContext))
-        }, copilotConfig.cloud ? {
-          cloud: __spreadValues({}, ((_c = (_b = (_a = copilotConfig.cloud.guardrails) == null ? void 0 : _a.input) == null ? void 0 : _b.restrictToTopic) == null ? void 0 : _c.enabled) ? {
-            guardrails: {
-              inputValidationRules: {
-                allowList: copilotConfig.cloud.guardrails.input.restrictToTopic.validTopics,
-                denyList: copilotConfig.cloud.guardrails.input.restrictToTopic.invalidTopics
+  const runChatCompletion = useAsyncCallback(
+    (previousMessages) => __async(this, null, function* () {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+      setIsLoading(true);
+      let newMessages = [
+        new import_runtime_client_gql3.TextMessage({
+          content: "",
+          role: import_runtime_client_gql3.Role.Assistant
+        })
+      ];
+      chatAbortControllerRef.current = new AbortController();
+      setMessages([...previousMessages, ...newMessages]);
+      const systemMessage = makeSystemMessageCallback();
+      const messagesWithContext = [systemMessage, ...initialMessages || [], ...previousMessages];
+      const isAgentRun = agentSessionRef.current !== null;
+      const stream = runtimeClient.asStream(
+        runtimeClient.generateCopilotResponse({
+          data: __spreadProps(__spreadValues(__spreadProps(__spreadValues({
+            frontend: {
+              actions: processActionsForRuntimeRequest(actions),
+              url: window.location.href
+            },
+            threadId: threadIdRef.current,
+            runId: runIdRef.current,
+            messages: (0, import_runtime_client_gql3.convertMessagesToGqlInput)((0, import_runtime_client_gql3.filterAgentStateMessages)(messagesWithContext))
+          }, copilotConfig.cloud ? {
+            cloud: __spreadValues({}, ((_c = (_b = (_a = copilotConfig.cloud.guardrails) == null ? void 0 : _a.input) == null ? void 0 : _b.restrictToTopic) == null ? void 0 : _c.enabled) ? {
+              guardrails: {
+                inputValidationRules: {
+                  allowList: copilotConfig.cloud.guardrails.input.restrictToTopic.validTopics,
+                  denyList: copilotConfig.cloud.guardrails.input.restrictToTopic.invalidTopics
+                }
               }
+            } : {})
+          } : {}), {
+            metadata: {
+              requestType: import_runtime_client_gql3.CopilotRequestType.Chat
             }
-          } : {})
-        } : {}), {
-          metadata: {
-            requestType: import_runtime_client_gql2.CopilotRequestType.Chat
+          }), agentSessionRef.current ? {
+            agentSession: agentSessionRef.current
+          } : {}), {
+            agentStates: Object.values(coagentStatesRef.current).map((state) => ({
+              agentName: state.name,
+              state: JSON.stringify(state.state)
+            }))
+          }),
+          properties: copilotConfig.properties,
+          signal: (_d = chatAbortControllerRef.current) == null ? void 0 : _d.signal
+        })
+      );
+      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 executedCoAgentStateRenders = [];
+      let followUp = void 0;
+      let messages2 = [];
+      let syncedMessages = [];
+      try {
+        while (true) {
+          let done, value;
+          try {
+            const readResult = yield reader.read();
+            done = readResult.done;
+            value = readResult.value;
+          } catch (readError) {
+            break;
           }
-        }), agentSessionRef.current ? {
-          agentSession: agentSessionRef.current
-        } : {}), {
-          agentStates: Object.values(coagentStatesRef.current).map((state) => ({
-            agentName: state.name,
-            state: JSON.stringify(state.state)
-          }))
-        }),
-        properties: copilotConfig.properties,
-        signal: (_d = chatAbortControllerRef.current) == null ? void 0 : _d.signal
-      })
-    );
-    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;
-    try {
-      while (true) {
-        let done, value;
-        try {
-          const readResult = yield reader.read();
-          done = readResult.done;
-          value = readResult.value;
-        } catch (readError) {
-          break;
-        }
-        if (done) {
-          if (chatAbortControllerRef.current.signal.aborted) {
-            return newMessages.slice();
+          if (done) {
+            if (chatAbortControllerRef.current.signal.aborted) {
+              return [];
+            }
+            break;
           }
-          break;
-        }
-        if (!(value == null ? void 0 : value.generateCopilotResponse)) {
-          continue;
-        }
-        threadIdRef.current = value.generateCopilotResponse.threadId || null;
-        runIdRef.current = value.generateCopilotResponse.runId || null;
-        setThreadId(threadIdRef.current);
-        setRunId(runIdRef.current);
-        const messages2 = (0, import_runtime_client_gql2.convertGqlOutputToMessages)(
-          (0, import_runtime_client_gql2.filterAdjacentAgentStateMessages)(value.generateCopilotResponse.messages)
-        );
-        if (messages2.length === 0) {
-          continue;
-        }
-        newMessages = [];
-        if (((_h = value.generateCopilotResponse.status) == null ? void 0 : _h.__typename) === "FailedResponseStatus" && value.generateCopilotResponse.status.reason === "GUARDRAILS_VALIDATION_FAILED") {
-          newMessages = [
-            new import_runtime_client_gql2.TextMessage({
-              role: import_runtime_client_gql2.MessageRole.Assistant,
-              content: ((_i = value.generateCopilotResponse.status.details) == null ? void 0 : _i.guardrailsReason) || ""
-            })
-          ];
-        } else {
-          for (const message of messages2) {
-            newMessages.push(message);
-            if (message.isActionExecutionMessage() && message.status.code !== import_runtime_client_gql2.MessageStatusCode.Pending && message.scope === "client" && onFunctionCall) {
-              if (!(message.id in actionResults)) {
+          if (!(value == null ? void 0 : value.generateCopilotResponse)) {
+            continue;
+          }
+          threadIdRef.current = value.generateCopilotResponse.threadId || null;
+          runIdRef.current = value.generateCopilotResponse.runId || null;
+          setThreadId(threadIdRef.current);
+          setRunId(runIdRef.current);
+          messages2 = (0, import_runtime_client_gql3.convertGqlOutputToMessages)(
+            (0, import_runtime_client_gql3.filterAdjacentAgentStateMessages)(value.generateCopilotResponse.messages)
+          );
+          if (messages2.length === 0) {
+            continue;
+          }
+          newMessages = [];
+          if (((_h = value.generateCopilotResponse.status) == null ? void 0 : _h.__typename) === "FailedResponseStatus" && value.generateCopilotResponse.status.reason === "GUARDRAILS_VALIDATION_FAILED") {
+            newMessages = [
+              new import_runtime_client_gql3.TextMessage({
+                role: import_runtime_client_gql3.MessageRole.Assistant,
+                content: ((_i = value.generateCopilotResponse.status.details) == null ? void 0 : _i.guardrailsReason) || ""
+              })
+            ];
+            setMessages([...previousMessages, ...newMessages]);
+            break;
+          } else {
+            newMessages = [...messages2];
+            for (const message of messages2) {
+              if (message.isAgentStateMessage() && !message.active && !executedCoAgentStateRenders.includes(message.id) && onCoAgentStateRender) {
                 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 Promise.race([
-                    onFunctionCall({
-                      messages: previousMessages,
-                      name: message.name,
-                      args: message.arguments
-                    }),
-                    new Promise((_, reject) => {
-                      var _a2;
-                      return (_a2 = chatAbortControllerRef.current) == null ? void 0 : _a2.signal.addEventListener("abort", () => reject(new Error("Operation was aborted")));
-                    })
-                  ]);
-                  if (chatAbortControllerRef.current.signal.aborted) {
-                    actionResults[message.id] = "";
-                  } else {
-                    actionResults[message.id] = result;
-                  }
-                } catch (e) {
-                  actionResults[message.id] = `Failed to execute action ${message.name}`;
-                  console.error(`Failed to execute action ${message.name}: ${e}`);
+                yield onCoAgentStateRender({
+                  name: message.agentName,
+                  nodeName: message.nodeName,
+                  state: message.state
+                });
+                executedCoAgentStateRenders.push(message.id);
+              }
+            }
+            const lastAgentStateMessage = [...messages2].reverse().find((message) => message.isAgentStateMessage());
+            if (lastAgentStateMessage) {
+              if (lastAgentStateMessage.state.messages && lastAgentStateMessage.state.messages.length > 0) {
+                syncedMessages = (0, import_runtime_client_gql3.loadMessagesFromJsonRepresentation)(
+                  lastAgentStateMessage.state.messages
+                );
+              }
+              setCoagentStatesWithRef((prevAgentStates) => __spreadProps(__spreadValues({}, prevAgentStates), {
+                [lastAgentStateMessage.agentName]: {
+                  name: lastAgentStateMessage.agentName,
+                  state: lastAgentStateMessage.state,
+                  running: lastAgentStateMessage.running,
+                  active: lastAgentStateMessage.active,
+                  threadId: lastAgentStateMessage.threadId,
+                  nodeName: lastAgentStateMessage.nodeName,
+                  runId: lastAgentStateMessage.runId
                 }
+              }));
+              if (lastAgentStateMessage.running) {
+                setAgentSession({
+                  threadId: lastAgentStateMessage.threadId,
+                  agentName: lastAgentStateMessage.agentName,
+                  nodeName: lastAgentStateMessage.nodeName
+                });
+              } else {
+                setAgentSession(null);
               }
-              newMessages.push(
-                new import_runtime_client_gql2.ResultMessage({
-                  result: import_runtime_client_gql2.ResultMessage.encodeResult(actionResults[message.id]),
+            }
+          }
+          if (newMessages.length > 0) {
+            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_gql3.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;
+              let result;
+              try {
+                result = yield Promise.race([
+                  onFunctionCall({
+                    messages: previousMessages,
+                    name: message.name,
+                    args: message.arguments
+                  }),
+                  new Promise(
+                    (resolve) => {
+                      var _a2;
+                      return (_a2 = chatAbortControllerRef.current) == null ? void 0 : _a2.signal.addEventListener(
+                        "abort",
+                        () => resolve("Operation was aborted by the user")
+                      );
+                    }
+                  ),
+                  // if the user stopped generation, we also abort consecutive actions
+                  new Promise((resolve) => {
+                    var _a2;
+                    if ((_a2 = chatAbortControllerRef.current) == null ? void 0 : _a2.signal.aborted) {
+                      resolve("Operation was aborted by the user");
+                    }
+                  })
+                ]);
+              } catch (e) {
+                result = `Failed to execute action ${message.name}`;
+                console.error(`Failed to execute action ${message.name}: ${e}`);
+              }
+              didExecuteAction = true;
+              const messageIndex = finalMessages.findIndex((msg) => msg.id === message.id);
+              finalMessages.splice(
+                messageIndex + 1,
+                0,
+                new import_runtime_client_gql3.ResultMessage({
+                  id: "result-" + message.id,
+                  result: import_runtime_client_gql3.ResultMessage.encodeResult(result),
                   actionExecutionId: message.id,
                   actionName: message.name
                 })
               );
             }
-            if (message.isAgentStateMessage() && !message.active && !executedCoAgentStateRenders.includes(message.id) && onCoAgentStateRender) {
-              if (guardrailsEnabled && value.generateCopilotResponse.status === void 0) {
-                break;
-              }
-              yield onCoAgentStateRender({
-                name: message.agentName,
-                nodeName: message.nodeName,
-                state: message.state
-              });
-              executedCoAgentStateRenders.push(message.id);
-            }
           }
-          const lastAgentStateMessage = [...messages2].reverse().find((message) => message.isAgentStateMessage());
-          if (lastAgentStateMessage) {
-            setCoagentStates((prevAgentStates) => __spreadProps(__spreadValues({}, prevAgentStates), {
-              [lastAgentStateMessage.agentName]: {
-                name: lastAgentStateMessage.agentName,
-                state: lastAgentStateMessage.state,
-                running: lastAgentStateMessage.running,
-                active: lastAgentStateMessage.active,
-                threadId: lastAgentStateMessage.threadId,
-                nodeName: lastAgentStateMessage.nodeName,
-                runId: lastAgentStateMessage.runId
-              }
-            }));
-            if (lastAgentStateMessage.running) {
-              setAgentSession({
-                threadId: lastAgentStateMessage.threadId,
-                agentName: lastAgentStateMessage.agentName,
-                nodeName: lastAgentStateMessage.nodeName
-              });
-            } else {
-              setAgentSession(null);
+          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
+          !((_j = chatAbortControllerRef.current) == null ? void 0 : _j.signal.aborted)
+        ) {
+          yield new Promise((resolve) => setTimeout(resolve, 10));
+          return yield runChatCompletionRef.current(finalMessages);
+        } else if ((_k = chatAbortControllerRef.current) == null ? void 0 : _k.signal.aborted) {
+          const repairedMessages = finalMessages.filter((message, actionExecutionIndex) => {
+            if (message.isActionExecutionMessage()) {
+              return finalMessages.find(
+                (msg, resultIndex) => msg.isResultMessage() && msg.actionExecutionId === message.id && resultIndex === actionExecutionIndex + 1
+              );
             }
+            return true;
+          });
+          const repairedMessageIds = repairedMessages.map((message) => message.id);
+          setMessages(repairedMessages);
+          if ((_l = agentSessionRef.current) == null ? void 0 : _l.nodeName) {
+            setAgentSession({
+              threadId: agentSessionRef.current.threadId,
+              agentName: agentSessionRef.current.agentName,
+              nodeName: "__end__"
+            });
           }
+          return newMessages.filter((message) => repairedMessageIds.includes(message.id));
+        } else {
+          return newMessages.slice();
         }
-        if (newMessages.length > 0) {
-          setMessages([...previousMessages, ...newMessages]);
-        }
+      } finally {
+        setIsLoading(false);
       }
-      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())
-      ) {
-        yield new Promise((resolve) => setTimeout(resolve, 10));
-        return yield runChatCompletionRef.current([...previousMessages, ...newMessages]);
-      } else {
-        return newMessages.slice();
-      }
-    } finally {
-      setIsLoading(false);
-    }
-  });
+    }),
+    [
+      messages,
+      setMessages,
+      makeSystemMessageCallback,
+      copilotConfig,
+      setIsLoading,
+      initialMessages,
+      isLoading,
+      actions,
+      onFunctionCall,
+      onCoAgentStateRender,
+      setCoagentStatesWithRef,
+      coagentStatesRef,
+      agentSession,
+      setAgentSession
+    ]
+  );
   runChatCompletionRef.current = runChatCompletion;
-  const runChatCompletionAndHandleFunctionCall = (messages2) => __async(this, null, function* () {
-    yield runChatCompletionRef.current(messages2);
-  });
-  const append = (message) => __async(this, null, function* () {
-    if (isLoading) {
-      return;
-    }
-    const newMessages = [...messages, message];
-    setMessages(newMessages);
-    return runChatCompletionAndHandleFunctionCall(newMessages);
-  });
-  const reload = () => __async(this, null, function* () {
+  const runChatCompletionAndHandleFunctionCall = useAsyncCallback(
+    (messages2) => __async(this, null, function* () {
+      yield runChatCompletionRef.current(messages2);
+    }),
+    [messages]
+  );
+  const append = useAsyncCallback(
+    (message) => __async(this, null, function* () {
+      if (isLoading) {
+        return;
+      }
+      const newMessages = [...messages, message];
+      setMessages(newMessages);
+      return runChatCompletionAndHandleFunctionCall(newMessages);
+    }),
+    [isLoading, messages, setMessages, runChatCompletionAndHandleFunctionCall]
+  );
+  const reload = useAsyncCallback(() => __async(this, null, function* () {
     if (isLoading || messages.length === 0) {
       return;
     }
@@ -487,7 +687,7 @@ function useChat(options) {
     }
     setMessages(newMessages);
     return runChatCompletionAndHandleFunctionCall(newMessages);
-  });
+  }), [isLoading, messages, setMessages, runChatCompletionAndHandleFunctionCall]);
   const stop = () => {
     var _a;
     (_a = chatAbortControllerRef.current) == null ? void 0 : _a.abort("Stop was called");
@@ -495,15 +695,33 @@ function useChat(options) {
   return {
     append,
     reload,
-    stop
+    stop,
+    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/components/copilot-provider/copilotkit.tsx
-var import_react6 = require("react");
+var import_react7 = require("react");
 var import_react_dom = require("react-dom");
-var import_shared2 = require("@copilotkit/shared");
-var import_jsx_runtime2 = require("react/jsx-runtime");
+var import_shared3 = require("@copilotkit/shared");
+var import_jsx_runtime4 = require("react/jsx-runtime");
 var defaultCopilotContextCategories = ["global"];
 
 // src/hooks/use-copilot-chat.ts
@@ -521,8 +739,8 @@ function useCopilotChat(_a = {}) {
     setIsLoading,
     chatInstructions,
     actions,
-    coagentStates,
-    setCoagentStates,
+    coagentStatesRef,
+    setCoagentStatesWithRef,
     coAgentStateRenders,
     agentSession,
     setAgentSession,
@@ -535,21 +753,21 @@ function useCopilotChat(_a = {}) {
   } = useCopilotContext();
   const { messages, setMessages } = useCopilotMessagesContext();
   const latestGetContextString = useUpdatedRef(getContextString);
-  const deleteMessage = (0, import_react7.useCallback)(
+  const deleteMessage = (0, import_react8.useCallback)(
     (messageId) => {
       setMessages((prev) => prev.filter((message) => message.id !== messageId));
     },
     [setMessages]
   );
-  const makeSystemMessageCallback = (0, import_react7.useCallback)(() => {
+  const makeSystemMessageCallback = (0, import_react8.useCallback)(() => {
     const systemMessageMaker = makeSystemMessage || defaultSystemMessage;
     const contextString = latestGetContextString.current([], defaultCopilotContextCategories);
-    return new import_runtime_client_gql3.TextMessage({
+    return new import_runtime_client_gql4.TextMessage({
       content: systemMessageMaker(contextString, chatInstructions),
-      role: import_runtime_client_gql3.Role.System
+      role: import_runtime_client_gql4.Role.System
     });
   }, [getContextString, makeSystemMessage, chatInstructions]);
-  const onCoAgentStateRender = (0, import_react7.useCallback)(
+  const onCoAgentStateRender = useAsyncCallback(
     (args) => __async(this, null, function* () {
       var _a2;
       const { name, nodeName, state } = args;
@@ -567,7 +785,7 @@ function useCopilotChat(_a = {}) {
     }),
     [coAgentStateRenders]
   );
-  const { append, reload, stop } = useChat(__spreadProps(__spreadValues({}, options), {
+  const { append, reload, stop, runChatCompletion } = useChat(__spreadProps(__spreadValues({}, options), {
     actions: Object.values(actions),
     copilotConfig: copilotApiConfig,
     initialMessages: options.initialMessages || [],
@@ -578,8 +796,8 @@ function useCopilotChat(_a = {}) {
     makeSystemMessageCallback,
     isLoading,
     setIsLoading,
-    coagentStates,
-    setCoagentStates,
+    coagentStatesRef,
+    setCoagentStatesWithRef,
     agentSession,
     setAgentSession,
     threadId,
@@ -589,40 +807,44 @@ function useCopilotChat(_a = {}) {
     chatAbortControllerRef
   }));
   const latestAppend = useUpdatedRef(append);
-  const latestAppendFunc = (0, import_react7.useCallback)(
-    (message) => {
-      return latestAppend.current(message);
-    },
+  const latestAppendFunc = useAsyncCallback(
+    (message) => __async(this, null, function* () {
+      return yield latestAppend.current(message);
+    }),
     [latestAppend]
   );
   const latestReload = useUpdatedRef(reload);
-  const latestReloadFunc = (0, import_react7.useCallback)(() => {
-    return latestReload.current();
-  }, [latestReload]);
+  const latestReloadFunc = useAsyncCallback(() => __async(this, null, function* () {
+    return yield latestReload.current();
+  }), [latestReload]);
   const latestStop = useUpdatedRef(stop);
-  const latestStopFunc = (0, import_react7.useCallback)(() => {
+  const latestStopFunc = (0, import_react8.useCallback)(() => {
     return latestStop.current();
   }, [latestStop]);
   const latestDelete = useUpdatedRef(deleteMessage);
-  const latestDeleteFunc = (0, import_react7.useCallback)(
+  const latestDeleteFunc = (0, import_react8.useCallback)(
     (messageId) => {
       return latestDelete.current(messageId);
     },
     [latestDelete]
   );
   const latestSetMessages = useUpdatedRef(setMessages);
-  const latestSetMessagesFunc = (0, import_react7.useCallback)(
+  const latestSetMessagesFunc = (0, import_react8.useCallback)(
     (messages2) => {
       return latestSetMessages.current(messages2);
     },
     [latestSetMessages]
   );
-  const reset = (0, import_react7.useCallback)(() => {
+  const latestRunChatCompletion = useUpdatedRef(runChatCompletion);
+  const latestRunChatCompletionFunc = useAsyncCallback(() => __async(this, null, function* () {
+    return yield latestRunChatCompletion.current();
+  }), [latestRunChatCompletion]);
+  const reset = (0, import_react8.useCallback)(() => {
     latestStopFunc();
     setMessages([]);
     setThreadId(null);
     setRunId(null);
-    setCoagentStates({});
+    setCoagentStatesWithRef({});
     let initialAgentSession = null;
     if (agentLock) {
       initialAgentSession = {
@@ -630,9 +852,16 @@ function useCopilotChat(_a = {}) {
       };
     }
     setAgentSession(initialAgentSession);
-  }, [latestStopFunc, setMessages, setThreadId, setCoagentStates, setAgentSession, agentLock]);
+  }, [
+    latestStopFunc,
+    setMessages,
+    setThreadId,
+    setCoagentStatesWithRef,
+    setAgentSession,
+    agentLock
+  ]);
   const latestReset = useUpdatedRef(reset);
-  const latestResetFunc = (0, import_react7.useCallback)(() => {
+  const latestResetFunc = (0, import_react8.useCallback)(() => {
     return latestReset.current();
   }, [latestReset]);
   return {
@@ -643,12 +872,13 @@ function useCopilotChat(_a = {}) {
     stopGeneration: latestStopFunc,
     reset: latestResetFunc,
     deleteMessage: latestDeleteFunc,
+    runChatCompletion: latestRunChatCompletionFunc,
     isLoading
   };
 }
 function useUpdatedRef(value) {
-  const ref = (0, import_react7.useRef)(value);
-  (0, import_react7.useEffect)(() => {
+  const ref = (0, import_react8.useRef)(value);
+  (0, import_react8.useEffect)(() => {
     ref.current = value;
   }, [value]);
   return ref;
@@ -689,8 +919,8 @@ function useCoAgent(options) {
   const generalContext = useCopilotContext();
   const messagesContext = useCopilotMessagesContext();
   const context = __spreadValues(__spreadValues({}, generalContext), messagesContext);
-  const { coagentStates, setCoagentStates } = context;
-  const { appendMessage } = useCopilotChat();
+  const { coagentStates, coagentStatesRef, setCoagentStatesWithRef } = context;
+  const { appendMessage, runChatCompletion } = useCopilotChat();
   const getCoagentState = (coagentStates2, name2) => {
     if (coagentStates2[name2]) {
       return coagentStates2[name2];
@@ -707,19 +937,17 @@ function useCoAgent(options) {
     }
   };
   const setState = (newState) => {
-    setCoagentStates((prevAgentStates) => {
-      let coagentState2 = getCoagentState(prevAgentStates, name);
-      const updatedState = typeof newState === "function" ? newState(coagentState2.state) : newState;
-      return __spreadProps(__spreadValues({}, prevAgentStates), {
-        [name]: __spreadProps(__spreadValues({}, coagentState2), {
-          state: updatedState
-        })
-      });
-    });
+    let coagentState2 = getCoagentState(coagentStatesRef.current || {}, name);
+    const updatedState = typeof newState === "function" ? newState(coagentState2.state) : newState;
+    setCoagentStatesWithRef(__spreadProps(__spreadValues({}, coagentStatesRef.current), {
+      [name]: __spreadProps(__spreadValues({}, coagentState2), {
+        state: updatedState
+      })
+    }));
   };
   const coagentState = getCoagentState(coagentStates, name);
   const state = isExternalStateManagement(options) ? options.state : coagentState.state;
-  (0, import_react8.useEffect)(() => {
+  (0, import_react9.useEffect)(() => {
     if (isExternalStateManagement(options)) {
       setState(options.state);
     } else if (coagentStates[name] === void 0) {
@@ -728,23 +956,24 @@ function useCoAgent(options) {
   }, [
     isExternalStateManagement(options) ? JSON.stringify(options.state) : void 0,
     // reset initialstate on reset
-    coagentStates === void 0
+    coagentStates[name] === void 0
   ]);
+  const runAgentCallback = useAsyncCallback(
+    (hint) => __async(this, null, function* () {
+      yield runAgent(name, context, appendMessage, runChatCompletion, hint);
+    }),
+    [name, context, appendMessage, runChatCompletion]
+  );
   return {
     name,
     nodeName: coagentState.nodeName,
-    state,
-    setState,
+    threadId: coagentState.threadId,
     running: coagentState.running,
-    start: () => {
-      startAgent(name, context);
-    },
-    stop: () => {
-      stopAgent(name, context);
-    },
-    run: (hint) => {
-      return runAgent(name, context, appendMessage, hint);
-    }
+    state: coagentState.state,
+    setState: isExternalStateManagement(options) ? options.setState : setState,
+    start: () => startAgent(name, context),
+    stop: () => stopAgent(name, context),
+    run: runAgentCallback
   };
 }
 function startAgent(name, context) {
@@ -772,7 +1001,7 @@ function stopAgent(name, context) {
     console.warn(`No agent session found for ${name}`);
   }
 }
-function runAgent(name, context, appendMessage, hint) {
+function runAgent(name, context, appendMessage, runChatCompletion, hint) {
   return __async(this, null, function* () {
     var _a, _b;
     const { agentSession, setAgentSession } = context;
@@ -788,12 +1017,16 @@ function runAgent(name, context, appendMessage, hint) {
         previousState = message.state;
       }
     }
-    let state = ((_b = (_a = context.coagentStates) == null ? void 0 : _a[name]) == null ? void 0 : _b.state) || {};
+    let state = ((_b = (_a = context.coagentStatesRef.current) == null ? void 0 : _a[name]) == null ? void 0 : _b.state) || {};
     if (hint) {
       const hintMessage = hint({ previousState, currentState: state });
       if (hintMessage) {
         yield appendMessage(hintMessage);
+      } else {
+        yield runChatCompletion();
       }
+    } else {
+      yield runChatCompletion();
     }
   });
 }