@copilotkit/runtime 1.5.0-tyler-reset-chat.0 → 1.5.0

package/dist/lib/index.js

@@ -44,7 +44,7 @@ var require_package = __commonJS({
       publishConfig: {
         access: "public"
       },
-      version: "1.5.0-tyler-reset-chat.0",
+      version: "1.5.0",
       sideEffects: false,
       main: "./dist/index.js",
       module: "./dist/index.mjs",
@@ -424,6 +424,8 @@ var OpenAIAdapter = class {
     eventSource.stream(async (eventStream$) => {
       var _a, _b;
       let mode = null;
+      let currentMessageId;
+      let currentToolCallId;
       for await (const chunk of stream) {
         if (chunk.choices.length === 0) {
           continue;
@@ -432,30 +434,52 @@ var OpenAIAdapter = class {
         const content = chunk.choices[0].delta.content;
         if (mode === "message" && (toolCall == null ? void 0 : toolCall.id)) {
           mode = null;
-          eventStream$.sendTextMessageEnd();
+          eventStream$.sendTextMessageEnd({
+            messageId: currentMessageId
+          });
         } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
           mode = null;
-          eventStream$.sendActionExecutionEnd();
+          eventStream$.sendActionExecutionEnd({
+            actionExecutionId: currentToolCallId
+          });
         }
         if (mode === null) {
           if (toolCall == null ? void 0 : toolCall.id) {
             mode = "function";
-            eventStream$.sendActionExecutionStart(toolCall.id, toolCall.function.name);
+            currentToolCallId = toolCall.id;
+            eventStream$.sendActionExecutionStart({
+              actionExecutionId: currentToolCallId,
+              parentMessageId: chunk.id,
+              actionName: toolCall.function.name
+            });
           } else if (content) {
             mode = "message";
-            eventStream$.sendTextMessageStart(chunk.id);
+            currentMessageId = chunk.id;
+            eventStream$.sendTextMessageStart({
+              messageId: currentMessageId
+            });
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent(content);
+          eventStream$.sendTextMessageContent({
+            messageId: currentMessageId,
+            content
+          });
         } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
+          eventStream$.sendActionExecutionArgs({
+            actionExecutionId: currentToolCallId,
+            args: toolCall.function.arguments
+          });
         }
       }
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd();
+        eventStream$.sendTextMessageEnd({
+          messageId: currentMessageId
+        });
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd();
+        eventStream$.sendActionExecutionEnd({
+          actionExecutionId: currentToolCallId
+        });
       }
       eventStream$.complete();
     });
@@ -523,17 +547,25 @@ function isBaseMessageChunk(message) {
 __name(isBaseMessageChunk, "isBaseMessageChunk");
 function maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution) {
   if (actionExecution) {
-    eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, "Sending a message");
+    eventStream$.sendActionExecutionResult({
+      actionExecutionId: actionExecution.id,
+      actionName: actionExecution.name,
+      result: "Sending a message"
+    });
   }
 }
 __name(maybeSendActionExecutionResultIsMessage, "maybeSendActionExecutionResultIsMessage");
 async function streamLangChainResponse({ result, eventStream$, actionExecution }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   if (typeof result === "string") {
     if (!actionExecution) {
       eventStream$.sendTextMessage((0, import_shared2.randomId)(), result);
     } else {
-      eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, result);
+      eventStream$.sendActionExecutionResult({
+        actionExecutionId: actionExecution.id,
+        actionName: actionExecution.name,
+        result
+      });
     }
   } else if (isAIMessage(result)) {
     maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution);
@@ -541,7 +573,11 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
       eventStream$.sendTextMessage((0, import_shared2.randomId)(), result.content);
     }
     for (const toolCall of result.tool_calls) {
-      eventStream$.sendActionExecution(toolCall.id || (0, import_shared2.randomId)(), toolCall.name, JSON.stringify(toolCall.args));
+      eventStream$.sendActionExecution({
+        actionExecutionId: toolCall.id || (0, import_shared2.randomId)(),
+        actionName: toolCall.name,
+        args: JSON.stringify(toolCall.args)
+      });
     }
   } else if (isBaseMessageChunk(result)) {
     maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution);
@@ -550,13 +586,18 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
     }
     if ((_b = result.lc_kwargs) == null ? void 0 : _b.tool_calls) {
       for (const toolCall of (_c = result.lc_kwargs) == null ? void 0 : _c.tool_calls) {
-        eventStream$.sendActionExecution(toolCall.id || (0, import_shared2.randomId)(), toolCall.name, JSON.stringify(toolCall.args));
+        eventStream$.sendActionExecution({
+          actionExecutionId: toolCall.id || (0, import_shared2.randomId)(),
+          actionName: toolCall.name,
+          args: JSON.stringify(toolCall.args)
+        });
       }
     }
   } else if (result && "getReader" in result) {
     maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution);
     let reader = result.getReader();
     let mode = null;
+    let currentMessageId;
     const toolCallDetails = {
       name: null,
       id: null,
@@ -570,9 +611,12 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
         let toolCallId = void 0;
         let toolCallArgs = void 0;
         let hasToolCall = false;
-        let content = value == null ? void 0 : value.content;
+        let content = "";
+        if (value && value.content) {
+          content = Array.isArray(value.content) ? ((_d = value.content[0]) == null ? void 0 : _d.text) ?? "" : value.content;
+        }
         if (isAIMessageChunk(value)) {
-          let chunk = (_d = value.tool_call_chunks) == null ? void 0 : _d[0];
+          let chunk = (_e = value.tool_call_chunks) == null ? void 0 : _e[0];
           toolCallArgs = chunk == null ? void 0 : chunk.args;
           hasToolCall = chunk != void 0;
           if (chunk == null ? void 0 : chunk.name)
@@ -587,18 +631,22 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
           toolCallName = toolCallDetails.name;
           toolCallId = toolCallDetails.id;
         } else if (isBaseMessageChunk(value)) {
-          let chunk = (_f = (_e = value.additional_kwargs) == null ? void 0 : _e.tool_calls) == null ? void 0 : _f[0];
-          toolCallName = (_g = chunk == null ? void 0 : chunk.function) == null ? void 0 : _g.name;
+          let chunk = (_g = (_f = value.additional_kwargs) == null ? void 0 : _f.tool_calls) == null ? void 0 : _g[0];
+          toolCallName = (_h = chunk == null ? void 0 : chunk.function) == null ? void 0 : _h.name;
           toolCallId = chunk == null ? void 0 : chunk.id;
-          toolCallArgs = (_h = chunk == null ? void 0 : chunk.function) == null ? void 0 : _h.arguments;
+          toolCallArgs = (_i = chunk == null ? void 0 : chunk.function) == null ? void 0 : _i.arguments;
           hasToolCall = (chunk == null ? void 0 : chunk.function) != void 0;
         }
         if (mode === "message" && (toolCallId || done)) {
           mode = null;
-          eventStream$.sendTextMessageEnd();
+          eventStream$.sendTextMessageEnd({
+            messageId: currentMessageId
+          });
         } else if (mode === "function" && (!hasToolCall || done)) {
           mode = null;
-          eventStream$.sendActionExecutionEnd();
+          eventStream$.sendActionExecutionEnd({
+            actionExecutionId: toolCallId
+          });
         }
         if (done) {
           break;
@@ -606,21 +654,40 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
         if (mode === null) {
           if (hasToolCall && toolCallId && toolCallName) {
             mode = "function";
-            eventStream$.sendActionExecutionStart(toolCallId, toolCallName);
+            eventStream$.sendActionExecutionStart({
+              actionExecutionId: toolCallId,
+              actionName: toolCallName,
+              parentMessageId: (_j = value.lc_kwargs) == null ? void 0 : _j.id
+            });
           } else if (content) {
             mode = "message";
-            eventStream$.sendTextMessageStart((0, import_shared2.randomId)());
+            currentMessageId = ((_k = value.lc_kwargs) == null ? void 0 : _k.id) || (0, import_shared2.randomId)();
+            eventStream$.sendTextMessageStart({
+              messageId: currentMessageId
+            });
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent(Array.isArray(content) ? ((_i = content[0]) == null ? void 0 : _i.text) ?? "" : content);
+          eventStream$.sendTextMessageContent({
+            messageId: currentMessageId,
+            content
+          });
         } else if (mode === "function" && toolCallArgs) {
           if (toolCallDetails.index !== toolCallDetails.prevIndex) {
-            eventStream$.sendActionExecutionEnd();
-            eventStream$.sendActionExecutionStart(toolCallId, toolCallName);
+            eventStream$.sendActionExecutionEnd({
+              actionExecutionId: toolCallId
+            });
+            eventStream$.sendActionExecutionStart({
+              actionExecutionId: toolCallId,
+              actionName: toolCallName,
+              parentMessageId: (_l = value.lc_kwargs) == null ? void 0 : _l.id
+            });
             toolCallDetails.prevIndex = toolCallDetails.index;
           }
-          eventStream$.sendActionExecutionArgs(toolCallArgs);
+          eventStream$.sendActionExecutionArgs({
+            actionExecutionId: toolCallId,
+            args: toolCallArgs
+          });
         }
       } catch (error) {
         console.error("Error reading from stream", error);
@@ -628,7 +695,11 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
       }
     }
   } else if (actionExecution) {
-    eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, encodeResult(result));
+    eventStream$.sendActionExecutionResult({
+      actionExecutionId: actionExecution.id,
+      actionName: actionExecution.name,
+      result: encodeResult(result)
+    });
   } else {
     throw new Error("Invalid return type from LangChain function.");
   }
@@ -808,21 +879,33 @@ var OpenAIAssistantAdapter = class {
     eventSource.stream(async (eventStream$) => {
       var _a, _b, _c, _d, _e, _f;
       let inFunctionCall = false;
+      let currentMessageId;
+      let currentToolCallId;
       for await (const chunk of stream) {
         switch (chunk.event) {
           case "thread.message.created":
             if (inFunctionCall) {
-              eventStream$.sendActionExecutionEnd();
+              eventStream$.sendActionExecutionEnd({
+                actionExecutionId: currentToolCallId
+              });
             }
-            eventStream$.sendTextMessageStart(chunk.data.id);
+            currentMessageId = chunk.data.id;
+            eventStream$.sendTextMessageStart({
+              messageId: currentMessageId
+            });
             break;
           case "thread.message.delta":
             if (((_a = chunk.data.delta.content) == null ? void 0 : _a[0].type) === "text") {
-              eventStream$.sendTextMessageContent((_b = chunk.data.delta.content) == null ? void 0 : _b[0].text.value);
+              eventStream$.sendTextMessageContent({
+                messageId: currentMessageId,
+                content: (_b = chunk.data.delta.content) == null ? void 0 : _b[0].text.value
+              });
             }
             break;
           case "thread.message.completed":
-            eventStream$.sendTextMessageEnd();
+            eventStream$.sendTextMessageEnd({
+              messageId: currentMessageId
+            });
             break;
           case "thread.run.step.delta":
             let toolCallId;
@@ -835,18 +918,30 @@ var OpenAIAssistantAdapter = class {
             }
             if (toolCallName && toolCallId) {
               if (inFunctionCall) {
-                eventStream$.sendActionExecutionEnd();
+                eventStream$.sendActionExecutionEnd({
+                  actionExecutionId: currentToolCallId
+                });
               }
               inFunctionCall = true;
-              eventStream$.sendActionExecutionStart(toolCallId, toolCallName);
+              currentToolCallId = toolCallId;
+              eventStream$.sendActionExecutionStart({
+                actionExecutionId: currentToolCallId,
+                parentMessageId: chunk.data.id,
+                actionName: toolCallName
+              });
             } else if (toolCallArgs) {
-              eventStream$.sendActionExecutionArgs(toolCallArgs);
+              eventStream$.sendActionExecutionArgs({
+                actionExecutionId: currentToolCallId,
+                args: toolCallArgs
+              });
             }
             break;
         }
       }
       if (inFunctionCall) {
-        eventStream$.sendActionExecutionEnd();
+        eventStream$.sendActionExecutionEnd({
+          actionExecutionId: currentToolCallId
+        });
       }
       eventStream$.complete();
     });
@@ -899,46 +994,77 @@ var UnifyAdapter = class {
       }
     });
     let model = null;
+    let currentMessageId;
+    let currentToolCallId;
     request.eventSource.stream(async (eventStream$) => {
       var _a, _b;
       let mode = null;
       for await (const chunk of stream) {
         if (this.start) {
           model = chunk.model;
-          eventStream$.sendTextMessageStart((0, import_shared4.randomId)());
-          eventStream$.sendTextMessageContent(`Model used: ${model}
-`);
-          eventStream$.sendTextMessageEnd();
+          currentMessageId = (0, import_shared4.randomId)();
+          eventStream$.sendTextMessageStart({
+            messageId: currentMessageId
+          });
+          eventStream$.sendTextMessageContent({
+            messageId: currentMessageId,
+            content: `Model used: ${model}
+`
+          });
+          eventStream$.sendTextMessageEnd({
+            messageId: currentMessageId
+          });
           this.start = false;
         }
         const toolCall = (_a = chunk.choices[0].delta.tool_calls) == null ? void 0 : _a[0];
         const content = chunk.choices[0].delta.content;
         if (mode === "message" && (toolCall == null ? void 0 : toolCall.id)) {
           mode = null;
-          eventStream$.sendTextMessageEnd();
+          eventStream$.sendTextMessageEnd({
+            messageId: currentMessageId
+          });
         } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
           mode = null;
-          eventStream$.sendActionExecutionEnd();
+          eventStream$.sendActionExecutionEnd({
+            actionExecutionId: currentToolCallId
+          });
         }
         if (mode === null) {
           if (toolCall == null ? void 0 : toolCall.id) {
             mode = "function";
-            eventStream$.sendActionExecutionStart(toolCall.id, toolCall.function.name);
+            currentToolCallId = toolCall.id;
+            eventStream$.sendActionExecutionStart({
+              actionExecutionId: currentToolCallId,
+              actionName: toolCall.function.name
+            });
           } else if (content) {
             mode = "message";
-            eventStream$.sendTextMessageStart(chunk.id);
+            currentMessageId = chunk.id;
+            eventStream$.sendTextMessageStart({
+              messageId: currentMessageId
+            });
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent(content);
+          eventStream$.sendTextMessageContent({
+            messageId: currentMessageId,
+            content
+          });
         } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
+          eventStream$.sendActionExecutionArgs({
+            actionExecutionId: currentToolCallId,
+            args: toolCall.function.arguments
+          });
         }
       }
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd();
+        eventStream$.sendTextMessageEnd({
+          messageId: currentMessageId
+        });
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd();
+        eventStream$.sendActionExecutionEnd({
+          actionExecutionId: currentToolCallId
+        });
       }
       eventStream$.complete();
     });
@@ -1004,35 +1130,59 @@ var GroqAdapter = class {
     eventSource.stream(async (eventStream$) => {
       var _a, _b;
       let mode = null;
+      let currentMessageId;
+      let currentToolCallId;
       for await (const chunk of stream) {
         const toolCall = (_a = chunk.choices[0].delta.tool_calls) == null ? void 0 : _a[0];
         const content = chunk.choices[0].delta.content;
         if (mode === "message" && (toolCall == null ? void 0 : toolCall.id)) {
           mode = null;
-          eventStream$.sendTextMessageEnd();
+          eventStream$.sendTextMessageEnd({
+            messageId: currentMessageId
+          });
         } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
           mode = null;
-          eventStream$.sendActionExecutionEnd();
+          eventStream$.sendActionExecutionEnd({
+            actionExecutionId: currentToolCallId
+          });
         }
         if (mode === null) {
           if (toolCall == null ? void 0 : toolCall.id) {
             mode = "function";
-            eventStream$.sendActionExecutionStart(toolCall.id, toolCall.function.name);
+            currentToolCallId = toolCall.id;
+            eventStream$.sendActionExecutionStart({
+              actionExecutionId: currentToolCallId,
+              actionName: toolCall.function.name,
+              parentMessageId: chunk.id
+            });
           } else if (content) {
             mode = "message";
-            eventStream$.sendTextMessageStart(chunk.id);
+            currentMessageId = chunk.id;
+            eventStream$.sendTextMessageStart({
+              messageId: currentMessageId
+            });
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent(content);
+          eventStream$.sendTextMessageContent({
+            messageId: currentMessageId,
+            content
+          });
         } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
+          eventStream$.sendActionExecutionArgs({
+            actionExecutionId: currentToolCallId,
+            args: toolCall.function.arguments
+          });
         }
       }
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd();
+        eventStream$.sendTextMessageEnd({
+          messageId: currentMessageId
+        });
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd();
+        eventStream$.sendActionExecutionEnd({
+          actionExecutionId: currentToolCallId
+        });
       }
       eventStream$.complete();
     });
@@ -1093,163 +1243,167 @@ var RemoteLangGraphEventSource = class {
     }
     return shouldEmitToolCalls === toolCallName;
   }
+  getCurrentContent(event) {
+    var _a, _b, _c, _d, _e;
+    const content = ((_c = (_b = (_a = event.data) == null ? void 0 : _a.chunk) == null ? void 0 : _b.kwargs) == null ? void 0 : _c.content) ?? ((_e = (_d = event.data) == null ? void 0 : _d.chunk) == null ? void 0 : _e.content);
+    if (!content) {
+      const toolCallChunks = this.getCurrentToolCallChunks(event) ?? [];
+      for (const chunk of toolCallChunks) {
+        if (chunk.args) {
+          return chunk.args;
+        }
+      }
+    }
+    if (typeof content === "string") {
+      return content;
+    } else if (Array.isArray(content) && content.length > 0) {
+      return content[0].text;
+    }
+    return null;
+  }
+  getCurrentMessageId(event) {
+    var _a, _b, _c, _d, _e;
+    return ((_c = (_b = (_a = event.data) == null ? void 0 : _a.chunk) == null ? void 0 : _b.kwargs) == null ? void 0 : _c.id) ?? ((_e = (_d = event.data) == null ? void 0 : _d.chunk) == null ? void 0 : _e.id);
+  }
+  getCurrentToolCallChunks(event) {
+    var _a, _b, _c, _d, _e;
+    return ((_c = (_b = (_a = event.data) == null ? void 0 : _a.chunk) == null ? void 0 : _b.kwargs) == null ? void 0 : _c.tool_call_chunks) ?? ((_e = (_d = event.data) == null ? void 0 : _d.chunk) == null ? void 0 : _e.tool_call_chunks);
+  }
+  getResponseMetadata(event) {
+    var _a, _b, _c, _d, _e;
+    return ((_c = (_b = (_a = event.data) == null ? void 0 : _a.chunk) == null ? void 0 : _b.kwargs) == null ? void 0 : _c.response_metadata) ?? ((_e = (_d = event.data) == null ? void 0 : _d.chunk) == null ? void 0 : _e.response_metadata);
+  }
   processLangGraphEvents() {
     let lastEventWithState = null;
     return this.eventStream$.pipe((0, import_rxjs.scan)((acc, event) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
       if (event.event === LangGraphEventTypes.OnChatModelStream) {
-        const content = ((_c = (_b = (_a = event.data) == null ? void 0 : _a.chunk) == null ? void 0 : _b.kwargs) == null ? void 0 : _c.content) ?? ((_e = (_d = event.data) == null ? void 0 : _d.chunk) == null ? void 0 : _e.content);
-        if (typeof content === "string") {
-          acc.content = content;
-        } else if (Array.isArray(content) && content.length > 0) {
-          acc.content = content[0].text;
-        } else {
-          acc.content = null;
-        }
-        const toolCallChunks = (
-          // @ts-expect-error -- LangGraph Platform implementation stores data outside of kwargs
-          ((_h = (_g = (_f = event.data) == null ? void 0 : _f.chunk) == null ? void 0 : _g.kwargs) == null ? void 0 : _h.tool_call_chunks) ?? ((_j = (_i = event.data) == null ? void 0 : _i.chunk) == null ? void 0 : _j.tool_call_chunks)
-        );
-        const toolCallMessageId = ((_m = (_l = (_k = event.data) == null ? void 0 : _k.chunk) == null ? void 0 : _l.kwargs) == null ? void 0 : _m.id) ?? ((_o = (_n = event.data) == null ? void 0 : _n.chunk) == null ? void 0 : _o.id);
-        if (toolCallChunks && toolCallChunks.length > 0) {
-          acc.prevToolCallMessageId = acc.toolCallMessageId;
-          acc.toolCallMessageId = toolCallMessageId;
-          if ((_p = toolCallChunks[0]) == null ? void 0 : _p.name) {
-            acc.toolCallName = toolCallChunks[0].name;
-          }
-          if ((_q = toolCallChunks[0]) == null ? void 0 : _q.id) {
-            acc.toolCallId = toolCallChunks[0].id;
-          }
-          acc.prevMessageId = acc.messageId;
-          acc.messageId = toolCallMessageId;
-        } else if (acc.content && acc.content != "") {
-          acc.prevMessageId = acc.messageId;
-          acc.messageId = toolCallMessageId;
-        } else {
-          acc.prevToolCallMessageId = acc.toolCallMessageId;
-          acc.prevMessageId = acc.messageId;
-        }
-      } else {
-        acc.prevToolCallMessageId = acc.toolCallMessageId;
-        acc.toolCallMessageId = null;
-        acc.prevMessageId = acc.messageId;
-        acc.messageId = null;
-        acc.toolCallName = null;
+        const prevMessageId = acc.lastMessageId;
+        acc.currentContent = this.getCurrentContent(event);
+        acc.lastMessageId = this.getCurrentMessageId(event) ?? acc.lastMessageId;
+        const toolCallChunks = this.getCurrentToolCallChunks(event) ?? [];
+        const responseMetadata = this.getResponseMetadata(event);
+        acc.isToolCallStart = toolCallChunks.some((chunk) => chunk.name && chunk.id);
+        acc.isMessageStart = prevMessageId !== acc.lastMessageId && !acc.isToolCallStart;
+        acc.isToolCall = toolCallChunks && toolCallChunks.length > 0;
+        acc.isToolCallEnd = (responseMetadata == null ? void 0 : responseMetadata.finish_reason) === "tool_calls";
+        acc.isMessageEnd = (responseMetadata == null ? void 0 : responseMetadata.finish_reason) === "stop";
+        ({ name: acc.lastToolCallName, id: acc.lastToolCallId } = toolCallChunks.find((chunk) => chunk.name && chunk.id) ?? {
+          name: acc.lastToolCallName,
+          id: acc.lastToolCallId
+        });
       }
       acc.event = event;
       lastEventWithState = acc;
       return acc;
     }, {
       event: null,
-      toolCallId: null,
-      toolCallMessageId: null,
-      prevToolCallMessageId: null,
-      messageId: null,
-      toolCallName: null,
-      prevMessageId: null,
-      content: null
-    }), (0, import_rxjs.mergeMap)((eventWithState) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      isMessageStart: false,
+      isMessageEnd: false,
+      isToolCallStart: false,
+      isToolCallEnd: false,
+      isToolCall: false,
+      lastMessageId: null,
+      lastToolCallId: null,
+      lastToolCallName: null,
+      currentContent: null
+    }), (0, import_rxjs.mergeMap)((acc) => {
       const events = [];
       let shouldEmitMessages = true;
-      let shouldEmitToolCalls = false;
-      if (eventWithState.event.event == LangGraphEventTypes.OnChatModelStream) {
-        if ("copilotkit:emit-tool-calls" in (eventWithState.event.metadata || {})) {
-          shouldEmitToolCalls = eventWithState.event.metadata["copilotkit:emit-tool-calls"];
+      let shouldEmitToolCalls = true;
+      if (acc.event.event == LangGraphEventTypes.OnChatModelStream) {
+        if ("copilotkit:emit-tool-calls" in (acc.event.metadata || {})) {
+          shouldEmitToolCalls = acc.event.metadata["copilotkit:emit-tool-calls"];
         }
-        if ("copilotkit:emit-messages" in (eventWithState.event.metadata || {})) {
-          shouldEmitMessages = eventWithState.event.metadata["copilotkit:emit-messages"];
+        if ("copilotkit:emit-messages" in (acc.event.metadata || {})) {
+          shouldEmitMessages = acc.event.metadata["copilotkit:emit-messages"];
         }
       }
-      if (eventWithState.prevToolCallMessageId !== null && eventWithState.prevToolCallMessageId !== eventWithState.toolCallMessageId && this.shouldEmitToolCall(shouldEmitToolCalls, eventWithState.toolCallName)) {
+      const responseMetadata = this.getResponseMetadata(acc.event);
+      if ((responseMetadata == null ? void 0 : responseMetadata.finish_reason) === "tool_calls" && this.shouldEmitToolCall(shouldEmitToolCalls, acc.lastToolCallName)) {
         events.push({
-          type: RuntimeEventTypes.ActionExecutionEnd
+          type: RuntimeEventTypes.ActionExecutionEnd,
+          actionExecutionId: acc.lastToolCallId
         });
       }
-      if (eventWithState.prevMessageId !== null && eventWithState.prevMessageId !== eventWithState.messageId && shouldEmitMessages) {
+      if ((responseMetadata == null ? void 0 : responseMetadata.finish_reason) === "stop" && shouldEmitMessages) {
         events.push({
-          type: RuntimeEventTypes.TextMessageEnd
+          type: RuntimeEventTypes.TextMessageEnd,
+          messageId: acc.lastMessageId
         });
       }
-      switch (eventWithState.event.event) {
+      switch (acc.event.event) {
         case LangGraphEventTypes.OnCustomEvent:
-          if (eventWithState.event.name === CustomEventNames.CopilotKitManuallyEmitMessage) {
+          if (acc.event.name === CustomEventNames.CopilotKitManuallyEmitMessage) {
             events.push({
               type: RuntimeEventTypes.TextMessageStart,
-              messageId: eventWithState.event.data.message_id
+              messageId: acc.event.data.message_id
             });
             events.push({
               type: RuntimeEventTypes.TextMessageContent,
-              content: eventWithState.event.data.message
+              messageId: acc.event.data.message_id,
+              content: acc.event.data.message
             });
             events.push({
-              type: RuntimeEventTypes.TextMessageEnd
+              type: RuntimeEventTypes.TextMessageEnd,
+              messageId: acc.event.data.message_id
             });
-          } else if (eventWithState.event.name === CustomEventNames.CopilotKitManuallyEmitToolCall) {
+          } else if (acc.event.name === CustomEventNames.CopilotKitManuallyEmitToolCall) {
             events.push({
               type: RuntimeEventTypes.ActionExecutionStart,
-              actionExecutionId: eventWithState.event.data.id,
-              actionName: eventWithState.event.data.name
+              actionExecutionId: acc.event.data.id,
+              actionName: acc.event.data.name,
+              parentMessageId: acc.event.data.id
             });
             events.push({
               type: RuntimeEventTypes.ActionExecutionArgs,
-              args: JSON.stringify(eventWithState.event.data.args)
+              actionExecutionId: acc.event.data.id,
+              args: JSON.stringify(acc.event.data.args)
             });
             events.push({
-              type: RuntimeEventTypes.ActionExecutionEnd
+              type: RuntimeEventTypes.ActionExecutionEnd,
+              actionExecutionId: acc.event.data.id
             });
           }
           break;
         case LangGraphEventTypes.OnCopilotKitStateSync:
           events.push({
             type: RuntimeEventTypes.AgentStateMessage,
-            threadId: eventWithState.event.thread_id,
-            role: eventWithState.event.role,
-            agentName: eventWithState.event.agent_name,
-            nodeName: eventWithState.event.node_name,
-            runId: eventWithState.event.run_id,
-            active: eventWithState.event.active,
-            state: JSON.stringify(eventWithState.event.state),
-            running: eventWithState.event.running
+            threadId: acc.event.thread_id,
+            role: acc.event.role,
+            agentName: acc.event.agent_name,
+            nodeName: acc.event.node_name,
+            runId: acc.event.run_id,
+            active: acc.event.active,
+            state: JSON.stringify(acc.event.state),
+            running: acc.event.running
           });
           break;
-        case LangGraphEventTypes.OnToolEnd:
-          break;
         case LangGraphEventTypes.OnChatModelStream:
-          if (eventWithState.toolCallMessageId !== null && eventWithState.prevToolCallMessageId !== eventWithState.toolCallMessageId) {
-            if (this.shouldEmitToolCall(shouldEmitToolCalls, eventWithState.toolCallName)) {
-              events.push({
-                type: RuntimeEventTypes.ActionExecutionStart,
-                actionExecutionId: eventWithState.toolCallMessageId,
-                actionName: eventWithState.toolCallName,
-                scope: "client"
-              });
-            }
-          } else if (eventWithState.messageId !== null && eventWithState.prevMessageId !== eventWithState.messageId) {
-            if (shouldEmitMessages) {
-              events.push({
-                type: RuntimeEventTypes.TextMessageStart,
-                messageId: eventWithState.messageId
-              });
-            }
+          if (acc.isToolCallStart && this.shouldEmitToolCall(shouldEmitToolCalls, acc.lastToolCallName)) {
+            events.push({
+              type: RuntimeEventTypes.ActionExecutionStart,
+              actionExecutionId: acc.lastToolCallId,
+              actionName: acc.lastToolCallName,
+              parentMessageId: acc.lastMessageId
+            });
+          } else if (acc.isMessageStart && shouldEmitMessages) {
+            events.push({
+              type: RuntimeEventTypes.TextMessageStart,
+              messageId: acc.lastMessageId
+            });
           }
-          const args = ((_e = (_d = (_c = (_b = (_a = eventWithState.event.data) == null ? void 0 : _a.chunk) == null ? void 0 : _b.kwargs) == null ? void 0 : _c.tool_call_chunks) == null ? void 0 : _d[0]) == null ? void 0 : _e.args) ?? // @ts-expect-error -- sdf
-          ((_i = (_h = (_g = (_f = eventWithState.event.data) == null ? void 0 : _f.chunk) == null ? void 0 : _g.tool_call_chunks) == null ? void 0 : _h[0]) == null ? void 0 : _i.args);
-          const content = eventWithState.content;
-          if (args) {
-            if (this.shouldEmitToolCall(shouldEmitToolCalls, eventWithState.toolCallName)) {
-              events.push({
-                type: RuntimeEventTypes.ActionExecutionArgs,
-                args
-              });
-            }
-          } else if (eventWithState.messageId !== null && content) {
-            if (shouldEmitMessages) {
-              events.push({
-                type: RuntimeEventTypes.TextMessageContent,
-                content
-              });
-            }
+          if (acc.isToolCall && acc.currentContent && this.shouldEmitToolCall(shouldEmitToolCalls, acc.lastToolCallName)) {
+            events.push({
+              type: RuntimeEventTypes.ActionExecutionArgs,
+              actionExecutionId: acc.lastToolCallId,
+              args: acc.currentContent
+            });
+          } else if (!acc.isToolCall && acc.currentContent && shouldEmitMessages) {
+            events.push({
+              type: RuntimeEventTypes.TextMessageContent,
+              messageId: acc.lastMessageId,
+              content: acc.currentContent
+            });
           }
           break;
       }
@@ -1257,14 +1411,16 @@ var RemoteLangGraphEventSource = class {
     }), (0, import_rxjs.catchError)((error) => {
       console.error(error);
       const events = [];
-      if (lastEventWithState == null ? void 0 : lastEventWithState.messageId) {
+      if ((lastEventWithState == null ? void 0 : lastEventWithState.lastMessageId) && !lastEventWithState.isToolCall) {
         events.push({
-          type: RuntimeEventTypes.TextMessageEnd
+          type: RuntimeEventTypes.TextMessageEnd,
+          messageId: lastEventWithState.lastMessageId
         });
       }
-      if (lastEventWithState == null ? void 0 : lastEventWithState.toolCallMessageId) {
+      if (lastEventWithState == null ? void 0 : lastEventWithState.lastToolCallId) {
         events.push({
-          type: RuntimeEventTypes.ActionExecutionEnd
+          type: RuntimeEventTypes.ActionExecutionEnd,
+          actionExecutionId: lastEventWithState.lastToolCallId
         });
       }
       const messageId = (0, import_shared6.randomId)();
@@ -1274,10 +1430,12 @@ var RemoteLangGraphEventSource = class {
       });
       events.push({
         type: RuntimeEventTypes.TextMessageContent,
+        messageId,
         content: "\u274C An error occurred. Please try again."
       });
       events.push({
-        type: RuntimeEventTypes.TextMessageEnd
+        type: RuntimeEventTypes.TextMessageEnd,
+        messageId
       });
       return events;
     }));
@@ -1299,12 +1457,6 @@ var MessageRole;
   MessageRole2["system"] = "system";
   MessageRole2["tool"] = "tool";
 })(MessageRole || (MessageRole = {}));
-var ActionExecutionScope;
-(function(ActionExecutionScope2) {
-  ActionExecutionScope2["server"] = "server";
-  ActionExecutionScope2["client"] = "client";
-  ActionExecutionScope2["passThrough"] = "passThrough";
-})(ActionExecutionScope || (ActionExecutionScope = {}));
 var CopilotRequestType;
 (function(CopilotRequestType2) {
   CopilotRequestType2["Chat"] = "Chat";
@@ -1323,10 +1475,6 @@ var ActionInputAvailability;
   name: "MessageRole",
   description: "The role of the message"
 });
-(0, import_type_graphql.registerEnumType)(ActionExecutionScope, {
-  name: "ActionExecutionScope",
-  description: "The scope of the action"
-});
 (0, import_type_graphql.registerEnumType)(CopilotRequestType, {
   name: "CopilotRequestType",
   description: "The type of Copilot request"
@@ -1364,8 +1512,6 @@ async function streamEvents(controller, args) {
   if (initialThreadId && initialThreadId.startsWith("ck-")) {
     initialThreadId = initialThreadId.substring(3);
   }
-  const assistants = await client.assistants.search();
-  const retrievedAssistant = assistants.find((a) => a.name === name);
   const threadId = initialThreadId ?? (0, import_node_crypto.randomUUID)();
   if (initialThreadId === threadId) {
     await client.threads.get(threadId);
@@ -1385,7 +1531,7 @@ async function streamEvents(controller, args) {
   const mode = wasInitiatedWithExistingThread && nodeName != "__end__" ? "continue" : "start";
   let formattedMessages = [];
   try {
-    formattedMessages = formatMessages(messages);
+    formattedMessages = copilotkitMessagesToLangChain(messages);
   } catch (e) {
     logger2.error(e, `Error event thrown: ${e.message}`);
   }
@@ -1396,8 +1542,16 @@ async function streamEvents(controller, args) {
       asNode: nodeName
     });
   }
-  const assistantId = initialAssistantId ?? (retrievedAssistant == null ? void 0 : retrievedAssistant.assistant_id);
-  if (!assistantId) {
+  let streamInfo = {
+    hashedLgcKey: (0, import_node_crypto.createHash)("sha256").update(langsmithApiKey).digest("hex")
+  };
+  const assistants = await client.assistants.search();
+  const retrievedAssistant = assistants.find((a) => a.name === name || a.assistant_id === initialAssistantId);
+  if (!retrievedAssistant) {
+    telemetry_client_default.capture("oss.runtime.agent_execution_stream_errored", {
+      ...streamInfo,
+      error: `Found no assistants for given information, while ${assistants.length} assistants exists`
+    });
     console.error(`
       No agent found for the agent name specified in CopilotKit provider
       Please check your available agents or provide an agent ID in the LangGraph Platform endpoint definition.
@@ -1407,6 +1561,7 @@ async function streamEvents(controller, args) {
       `);
     throw new Error("No agent id found");
   }
+  const assistantId = retrievedAssistant.assistant_id;
   const graphInfo = await client.assistants.getGraph(assistantId);
   const streamInput = mode === "start" ? state : null;
   let streamingStateExtractor = new StreamingStateExtractor([]);
@@ -1425,9 +1580,6 @@ async function streamEvents(controller, args) {
   let latestStateValues = {};
   let updatedState = state;
   let manuallyEmittedState = null;
-  let streamInfo = {
-    hashedLgcKey: (0, import_node_crypto.createHash)("sha256").update(langsmithApiKey).digest("hex")
-  };
   try {
     telemetry_client_default.capture("oss.runtime.agent_execution_stream_started", {
       hashedLgcKey: streamInfo.hashedLgcKey
@@ -1440,7 +1592,6 @@ async function streamEvents(controller, args) {
       ].includes(chunk.event))
         continue;
       if (chunk.event === "error") {
-        logger2.error(chunk, `Error event thrown: ${chunk.data.message}`);
         throw new Error(`Error event thrown: ${chunk.data.message}`);
       }
       if (chunk.event === "values") {
@@ -1533,21 +1684,34 @@ async function streamEvents(controller, args) {
       nodeName: isEndNode ? "__end__" : nodeName,
       state: state.values,
       running: !shouldExit,
-      active: false
+      active: false,
+      includeMessages: true
     }));
     return Promise.resolve();
   } catch (e) {
+    logger2.error(e);
+    telemetry_client_default.capture("oss.runtime.agent_execution_stream_errored", {
+      ...streamInfo,
+      error: e.message
+    });
     return Promise.resolve();
   }
 }
 __name(streamEvents, "streamEvents");
-function getStateSyncEvent({ threadId, runId, agentName, nodeName, state, running, active }) {
-  const stateWithoutMessages = Object.keys(state).reduce((acc, key) => {
-    if (key !== "messages") {
-      acc[key] = state[key];
-    }
-    return acc;
-  }, {});
+function getStateSyncEvent({ threadId, runId, agentName, nodeName, state, running, active, includeMessages = false }) {
+  if (!includeMessages) {
+    state = Object.keys(state).reduce((acc, key) => {
+      if (key !== "messages") {
+        acc[key] = state[key];
+      }
+      return acc;
+    }, {});
+  } else {
+    state = {
+      ...state,
+      messages: langchainMessagesToCopilotKit(state.messages || [])
+    };
+  }
   return JSON.stringify({
     event: LangGraphEventTypes.OnCopilotKitStateSync,
     thread_id: threadId,
@@ -1555,7 +1719,7 @@ function getStateSyncEvent({ threadId, runId, agentName, nodeName, state, runnin
     agent_name: agentName,
     node_name: nodeName,
     active,
-    state: stateWithoutMessages,
+    state,
     running,
     role: "assistant"
   }) + "\n";
@@ -1631,134 +1795,157 @@ function langGraphDefaultMergeState(state, messages, actions, agentName) {
   if (messages.length > 0 && "role" in messages[0] && messages[0].role === "system") {
     messages = messages.slice(1);
   }
-  const mergedMessages = state.messages || [];
-  const existingMessageIds = new Set(mergedMessages.map((message) => message.id));
-  const existingToolCallResults = /* @__PURE__ */ new Set();
-  for (const message of mergedMessages) {
-    if ("tool_call_id" in message) {
-      existingToolCallResults.add(message.tool_call_id);
+  const existingMessages = state.messages || [];
+  const existingMessageIds = new Set(existingMessages.map((message) => message.id));
+  const newMessages = messages.filter((message) => !existingMessageIds.has(message.id));
+  return {
+    ...state,
+    messages: newMessages,
+    copilotkit: {
+      actions
+    }
+  };
+}
+__name(langGraphDefaultMergeState, "langGraphDefaultMergeState");
+function langchainMessagesToCopilotKit(messages) {
+  const result = [];
+  const tool_call_names = {};
+  for (const message of messages) {
+    if (message.type === "ai") {
+      for (const tool_call of message.tool_calls) {
+        tool_call_names[tool_call.id] = tool_call.name;
+      }
     }
   }
   for (const message of messages) {
-    if ("tool_calls" in message && message.tool_calls.length > 0 && message.tool_calls[0].name === agentName) {
-      continue;
+    let content = message.content;
+    if (content instanceof Array) {
+      content = content[0];
     }
-    if ("name" in message && message.name === agentName) {
-      continue;
+    if (content instanceof Object) {
+      content = content.text;
     }
-    if (!existingMessageIds.has(message.id)) {
-      if ("tool_call_id" in message && existingToolCallResults.has(message.tool_call_id)) {
-        console.warn("Warning: Duplicate tool call result, skipping:", message.tool_call_id);
-        continue;
-      }
-      mergedMessages.push(message);
-    } else {
-      for (let i = 0; i < mergedMessages.length; i++) {
-        if (mergedMessages[i].id === message.id && message.role === "assistant") {
-          if (("tool_calls" in mergedMessages[i] || "additional_kwargs" in mergedMessages[i]) && mergedMessages[i].content) {
-            message.tool_calls = mergedMessages[i]["tool_calls"];
-            message.additional_kwargs = mergedMessages[i].additional_kwargs;
-          }
-          mergedMessages[i] = message;
+    if (message.type === "human") {
+      result.push({
+        role: "user",
+        content,
+        id: message.id
+      });
+    } else if (message.type === "system") {
+      result.push({
+        role: "system",
+        content,
+        id: message.id
+      });
+    } else if (message.type === "ai") {
+      if (message.tool_calls && message.tool_calls.length > 0) {
+        for (const tool_call of message.tool_calls) {
+          result.push({
+            id: tool_call.id,
+            name: tool_call.name,
+            arguments: tool_call.args,
+            parentMessageId: message.id
+          });
         }
+      } else {
+        result.push({
+          role: "assistant",
+          content,
+          id: message.id,
+          parentMessageId: message.id
+        });
       }
+    } else if (message.type === "tool") {
+      const actionName = tool_call_names[message.tool_call_id] || message.name || "";
+      result.push({
+        actionExecutionId: message.tool_call_id,
+        actionName,
+        result: content,
+        id: message.id
+      });
     }
   }
-  for (let i = 0; i < mergedMessages.length - 1; i++) {
-    const currentMessage = mergedMessages[i];
-    const nextMessage = mergedMessages[i + 1];
-    if ("tool_calls" in currentMessage && currentMessage.tool_calls.length > 0 && "tool_call_id" in nextMessage) {
-      nextMessage.tool_call_id = currentMessage.tool_calls[0].id;
+  const resultsDict = {};
+  for (const msg of result) {
+    if (msg.actionExecutionId) {
+      resultsDict[msg.actionExecutionId] = msg;
     }
   }
-  const correctedMessages = [];
-  for (let i = 0; i < mergedMessages.length; i++) {
-    const currentMessage = mergedMessages[i];
-    const nextMessage = mergedMessages[i + 1] || null;
-    const prevMessage = mergedMessages[i - 1] || null;
-    if ("tool_calls" in currentMessage && currentMessage.tool_calls.length > 0) {
-      if (!nextMessage) {
-        console.warn("No next message to auto-correct tool call, skipping:", currentMessage.tool_calls[0].id);
-        continue;
-      }
-      if (!("tool_call_id" in nextMessage) || nextMessage.tool_call_id !== currentMessage.tool_calls[0].id) {
-        const toolMessage = mergedMessages.find((m) => "tool_call_id" in m && m.tool_call_id === currentMessage.tool_calls[0].id);
-        if (toolMessage) {
-          console.warn("Auto-corrected tool call alignment issue:", currentMessage.tool_calls[0].id);
-          correctedMessages.push(currentMessage, toolMessage);
-          continue;
-        } else {
-          console.warn("No corresponding tool call result found for tool call, skipping:", currentMessage.tool_calls[0].id);
-          continue;
-        }
-      }
-      correctedMessages.push(currentMessage);
-      continue;
+  const reorderedResult = [];
+  for (const msg of result) {
+    if (!("actionExecutionId" in msg)) {
+      reorderedResult.push(msg);
     }
-    if ("tool_call_id" in currentMessage) {
-      if (!prevMessage || !("tool_calls" in prevMessage)) {
-        console.warn("No previous tool call, skipping tool call result:", currentMessage.id);
-        continue;
-      }
-      if (prevMessage.tool_calls && prevMessage.tool_calls[0].id !== currentMessage.tool_call_id) {
-        console.warn("Tool call id is incorrect, skipping tool call result:", currentMessage.id);
-        continue;
+    if ("arguments" in msg) {
+      const msgId = msg.id;
+      if (msgId in resultsDict) {
+        reorderedResult.push(resultsDict[msgId]);
       }
-      correctedMessages.push(currentMessage);
-      continue;
     }
-    correctedMessages.push(currentMessage);
   }
-  return {
-    ...state,
-    messages: correctedMessages,
-    copilotkit: {
-      actions
-    }
-  };
+  return reorderedResult;
 }
-__name(langGraphDefaultMergeState, "langGraphDefaultMergeState");
-function formatMessages(messages) {
-  return messages.map((message) => {
-    if (message.isTextMessage() && message.role === "assistant") {
-      return message;
-    }
-    if (message.isTextMessage() && message.role === "system") {
-      return message;
-    }
-    if (message.isTextMessage() && message.role === "user") {
-      return message;
+__name(langchainMessagesToCopilotKit, "langchainMessagesToCopilotKit");
+function copilotkitMessagesToLangChain(messages) {
+  const result = [];
+  const processedActionExecutions = /* @__PURE__ */ new Set();
+  for (const message of messages) {
+    if (message.isTextMessage()) {
+      if (message.role === "user") {
+        result.push({
+          ...message,
+          role: MessageRole.user
+        });
+      } else if (message.role === "system") {
+        result.push({
+          ...message,
+          role: MessageRole.system
+        });
+      } else if (message.role === "assistant") {
+        result.push({
+          ...message,
+          role: MessageRole.assistant
+        });
+      }
+      continue;
     }
     if (message.isActionExecutionMessage()) {
-      const toolCall = {
-        name: message.name,
-        args: message.arguments,
-        id: message.id
-      };
-      return {
-        type: message.type,
+      const messageId = message.parentMessageId ?? message.id;
+      if (processedActionExecutions.has(messageId)) {
+        continue;
+      }
+      processedActionExecutions.add(messageId);
+      const relatedActionExecutions = messages.filter((m) => m.isActionExecutionMessage() && (m.parentMessageId && m.parentMessageId === messageId || m.id === messageId));
+      const tool_calls = relatedActionExecutions.map((m) => ({
+        name: m.name,
+        args: m.arguments,
+        id: m.id
+      }));
+      result.push({
+        id: messageId,
+        type: "ActionExecutionMessage",
         content: "",
-        tool_calls: [
-          toolCall
-        ],
-        role: MessageRole.assistant,
-        id: message.id
-      };
+        tool_calls,
+        role: MessageRole.assistant
+      });
+      continue;
     }
     if (message.isResultMessage()) {
-      return {
+      result.push({
         type: message.type,
         content: message.result,
         id: message.id,
         tool_call_id: message.actionExecutionId,
         name: message.actionName,
         role: MessageRole.tool
-      };
+      });
+      continue;
     }
     throw new Error(`Unknown message type ${message.type}`);
-  });
+  }
+  return result;
 }
-__name(formatMessages, "formatMessages");
+__name(copilotkitMessagesToLangChain, "copilotkitMessagesToLangChain");
 
 // src/lib/runtime/remote-action-constructors.ts
 function constructLGCRemoteAction({ endpoint, graphqlContext, logger: logger2, messages, agentStates }) {
@@ -1768,7 +1955,7 @@ function constructLGCRemoteAction({ endpoint, graphqlContext, logger: logger2, m
     parameters: [],
     handler: async (_args) => {
     },
-    langGraphAgentHandler: async ({ name, actionInputsWithoutAgents, threadId, nodeName }) => {
+    langGraphAgentHandler: async ({ name, actionInputsWithoutAgents, threadId, nodeName, additionalMessages = [] }) => {
       var _a;
       logger2.debug({
         actionName: agent.name
@@ -1794,7 +1981,10 @@ function constructLGCRemoteAction({ endpoint, graphqlContext, logger: logger2, m
           agent,
           threadId,
           nodeName,
-          messages,
+          messages: [
+            ...messages,
+            ...additionalMessages
+          ],
           state,
           properties: graphqlContext.properties,
           actions: actionInputsWithoutAgents.map((action) => ({
@@ -1822,6 +2012,7 @@ function constructLGCRemoteAction({ endpoint, graphqlContext, logger: logger2, m
 }
 __name(constructLGCRemoteAction, "constructLGCRemoteAction");
 function constructRemoteActions({ json, url, onBeforeRequest, graphqlContext, logger: logger2, messages, agentStates }) {
+  const totalAgents = Array.isArray(json["agents"]) ? json["agents"].length : 0;
   const actions = json["actions"].map((action) => ({
     name: action.name,
     description: action.description,
@@ -1835,7 +2026,7 @@ function constructRemoteActions({ json, url, onBeforeRequest, graphqlContext, lo
       telemetry_client_default.capture("oss.runtime.remote_action_executed", {
         agentExecution: false,
         type: "self-hosted",
-        agentsAmount: json["agents"].length
+        agentsAmount: totalAgents
       });
       try {
         const response = await fetch(`${url}/actions/execute`, {
@@ -1870,13 +2061,13 @@ function constructRemoteActions({ json, url, onBeforeRequest, graphqlContext, lo
       }
     }
   }));
-  const agents = json["agents"].map((agent) => ({
+  const agents = totalAgents ? json["agents"].map((agent) => ({
     name: agent.name,
     description: agent.description,
     parameters: [],
     handler: async (_args) => {
     },
-    langGraphAgentHandler: async ({ name, actionInputsWithoutAgents, threadId, nodeName }) => {
+    langGraphAgentHandler: async ({ name, actionInputsWithoutAgents, threadId, nodeName, additionalMessages = [] }) => {
       var _a;
       logger2.debug({
         actionName: agent.name
@@ -1901,7 +2092,10 @@ function constructRemoteActions({ json, url, onBeforeRequest, graphqlContext, lo
           name,
           threadId,
           nodeName,
-          messages,
+          messages: [
+            ...messages,
+            ...additionalMessages
+          ],
           state,
           properties: graphqlContext.properties,
           actions: actionInputsWithoutAgents.map((action) => ({
@@ -1923,7 +2117,7 @@ function constructRemoteActions({ json, url, onBeforeRequest, graphqlContext, lo
       streamResponse(response.body, eventSource.eventStream$);
       return eventSource.processLangGraphEvents();
     }
-  }));
+  })) : [];
   return [
     ...actions,
     ...agents
@@ -2144,7 +2338,94 @@ function getRuntimeInstanceTelemetryInfo(runtime) {
 __name(getRuntimeInstanceTelemetryInfo, "getRuntimeInstanceTelemetryInfo");
 var telemetry_client_default = telemetryClient;
 
+// src/graphql/types/base/index.ts
+var import_type_graphql2 = require("type-graphql");
+function _ts_decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate, "_ts_decorate");
+function _ts_metadata(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
+    return Reflect.metadata(k, v);
+}
+__name(_ts_metadata, "_ts_metadata");
+var BaseMessageInput = class {
+  id;
+  createdAt;
+};
+__name(BaseMessageInput, "BaseMessageInput");
+_ts_decorate([
+  (0, import_type_graphql2.Field)(() => String),
+  _ts_metadata("design:type", String)
+], BaseMessageInput.prototype, "id", void 0);
+_ts_decorate([
+  (0, import_type_graphql2.Field)(() => Date),
+  _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
+], BaseMessageInput.prototype, "createdAt", void 0);
+BaseMessageInput = _ts_decorate([
+  (0, import_type_graphql2.InputType)()
+], BaseMessageInput);
+
+// src/graphql/types/converted/index.ts
+var Message = class extends BaseMessageInput {
+  type;
+  isTextMessage() {
+    return this.type === "TextMessage";
+  }
+  isActionExecutionMessage() {
+    return this.type === "ActionExecutionMessage";
+  }
+  isResultMessage() {
+    return this.type === "ResultMessage";
+  }
+  isAgentStateMessage() {
+    return this.type === "AgentStateMessage";
+  }
+};
+__name(Message, "Message");
+var TextMessage = class extends Message {
+  type = "TextMessage";
+  content;
+  role;
+  parentMessageId;
+};
+__name(TextMessage, "TextMessage");
+var ActionExecutionMessage = class extends Message {
+  type = "ActionExecutionMessage";
+  name;
+  arguments;
+  parentMessageId;
+};
+__name(ActionExecutionMessage, "ActionExecutionMessage");
+var ResultMessage = class extends Message {
+  type = "ResultMessage";
+  actionExecutionId;
+  actionName;
+  result;
+};
+__name(ResultMessage, "ResultMessage");
+var AgentStateMessage = class extends Message {
+  type = "AgentStateMessage";
+  threadId;
+  agentName;
+  nodeName;
+  runId;
+  active;
+  role;
+  state;
+  running;
+};
+__name(AgentStateMessage, "AgentStateMessage");
+
 // src/service-adapters/events.ts
+var import_class_transformer = require("class-transformer");
 var RuntimeEventTypes;
 (function(RuntimeEventTypes2) {
   RuntimeEventTypes2["TextMessageStart"] = "TextMessageStart";
@@ -2160,52 +2441,74 @@ var RuntimeEventSubject = class extends import_rxjs2.ReplaySubject {
   constructor() {
     super();
   }
-  sendTextMessageStart(messageId) {
+  sendTextMessageStart({ messageId, parentMessageId }) {
     this.next({
       type: "TextMessageStart",
-      messageId
+      messageId,
+      parentMessageId
     });
   }
-  sendTextMessageContent(content) {
+  sendTextMessageContent({ messageId, content }) {
     this.next({
       type: "TextMessageContent",
-      content
+      content,
+      messageId
     });
   }
-  sendTextMessageEnd() {
+  sendTextMessageEnd({ messageId }) {
     this.next({
-      type: "TextMessageEnd"
+      type: "TextMessageEnd",
+      messageId
     });
   }
   sendTextMessage(messageId, content) {
-    this.sendTextMessageStart(messageId);
-    this.sendTextMessageContent(content);
-    this.sendTextMessageEnd();
+    this.sendTextMessageStart({
+      messageId
+    });
+    this.sendTextMessageContent({
+      messageId,
+      content
+    });
+    this.sendTextMessageEnd({
+      messageId
+    });
   }
-  sendActionExecutionStart(actionExecutionId, actionName) {
+  sendActionExecutionStart({ actionExecutionId, actionName, parentMessageId }) {
     this.next({
       type: "ActionExecutionStart",
       actionExecutionId,
-      actionName
+      actionName,
+      parentMessageId
     });
   }
-  sendActionExecutionArgs(args) {
+  sendActionExecutionArgs({ actionExecutionId, args }) {
     this.next({
       type: "ActionExecutionArgs",
-      args
+      args,
+      actionExecutionId
     });
   }
-  sendActionExecutionEnd() {
+  sendActionExecutionEnd({ actionExecutionId }) {
     this.next({
-      type: "ActionExecutionEnd"
+      type: "ActionExecutionEnd",
+      actionExecutionId
     });
   }
-  sendActionExecution(actionExecutionId, toolName, args) {
-    this.sendActionExecutionStart(actionExecutionId, toolName);
-    this.sendActionExecutionArgs(args);
-    this.sendActionExecutionEnd();
+  sendActionExecution({ actionExecutionId, actionName, args, parentMessageId }) {
+    this.sendActionExecutionStart({
+      actionExecutionId,
+      actionName,
+      parentMessageId
+    });
+    this.sendActionExecutionArgs({
+      actionExecutionId,
+      args
+    });
+    this.sendActionExecutionEnd({
+      actionExecutionId
+    });
   }
-  sendActionExecutionResult(actionExecutionId, actionName, result) {
+  sendActionExecutionResult({ actionExecutionId, actionName, result }) {
     this.next({
       type: "ActionExecutionResult",
       actionName,
@@ -2213,7 +2516,7 @@ var RuntimeEventSubject = class extends import_rxjs2.ReplaySubject {
       result
     });
   }
-  sendAgentStateMessage(threadId, agentName, nodeName, runId, active, role, state, running) {
+  sendAgentStateMessage({ threadId, agentName, nodeName, runId, active, role, state, running }) {
     this.next({
       type: "AgentStateMessage",
       threadId,
@@ -2234,8 +2537,8 @@ var RuntimeEventSource = class {
   async stream(callback) {
     this.callback = callback;
   }
-  sendErrorMessageToChat() {
-    const errorMessage = "\u274C An error occurred. Please try again.";
+  sendErrorMessageToChat(message = "An error occurred. Please try again.") {
+    const errorMessage = `\u274C ${message}`;
     if (!this.callback) {
       this.stream(async (eventStream$) => {
         eventStream$.sendTextMessage((0, import_shared8.randomId)(), errorMessage);
@@ -2250,27 +2553,19 @@ var RuntimeEventSource = class {
       this.sendErrorMessageToChat();
     });
     return this.eventStream$.pipe(
-      // mark tools for server side execution
-      (0, import_rxjs2.map)((event) => {
-        if (event.type === "ActionExecutionStart") {
-          if (event.scope !== "passThrough") {
-            event.scope = serverSideActions.find((action) => action.name === event.actionName) ? "server" : "client";
-          }
-        }
-        return event;
-      }),
       // track state
       (0, import_rxjs2.scan)((acc, event) => {
         acc = {
           ...acc
         };
         if (event.type === "ActionExecutionStart") {
-          acc.callActionServerSide = event.scope === "server";
+          acc.callActionServerSide = serverSideActions.find((action) => action.name === event.actionName) !== void 0;
           acc.args = "";
           acc.actionExecutionId = event.actionExecutionId;
           if (acc.callActionServerSide) {
             acc.action = serverSideActions.find((action) => action.name === event.actionName);
           }
+          acc.actionExecutionParentMessageId = event.parentMessageId;
         } else if (event.type === "ActionExecutionArgs") {
           acc.args += event.args;
         }
@@ -2281,12 +2576,13 @@ var RuntimeEventSource = class {
         callActionServerSide: false,
         args: "",
         actionExecutionId: null,
-        action: null
+        action: null,
+        actionExecutionParentMessageId: null
       }),
       (0, import_rxjs2.concatMap)((eventWithState) => {
         if (eventWithState.event.type === "ActionExecutionEnd" && eventWithState.callActionServerSide) {
           const toolCallEventStream$ = new RuntimeEventSubject();
-          executeAction(toolCallEventStream$, guardrailsResult$ ? guardrailsResult$ : null, eventWithState.action, eventWithState.args, eventWithState.actionExecutionId, actionInputsWithoutAgents).catch((error) => {
+          executeAction(toolCallEventStream$, guardrailsResult$ ? guardrailsResult$ : null, eventWithState.action, eventWithState.args, eventWithState.actionExecutionParentMessageId, eventWithState.actionExecutionId, actionInputsWithoutAgents).catch((error) => {
             console.error(error);
           });
           telemetry_client_default.capture("oss.runtime.server_action_executed", {});
@@ -2299,7 +2595,7 @@ var RuntimeEventSource = class {
   }
 };
 __name(RuntimeEventSource, "RuntimeEventSource");
-async function executeAction(eventStream$, guardrailsResult$, action, actionArguments, actionExecutionId, actionInputsWithoutAgents) {
+async function executeAction(eventStream$, guardrailsResult$, action, actionArguments, actionExecutionParentMessageId, actionExecutionId, actionInputsWithoutAgents) {
   var _a;
   if (guardrailsResult$) {
     const { status } = await (0, import_rxjs2.firstValueFrom)(guardrailsResult$);
@@ -2319,10 +2615,33 @@ async function executeAction(eventStream$, guardrailsResult$, action, actionArgu
     }
   }
   if (isLangGraphAgentAction(action)) {
-    eventStream$.sendActionExecutionResult(actionExecutionId, action.name, `${action.name} agent started`);
+    const result = `${action.name} agent started`;
+    const agentExecution = (0, import_class_transformer.plainToInstance)(ActionExecutionMessage, {
+      id: actionExecutionId,
+      createdAt: /* @__PURE__ */ new Date(),
+      name: action.name,
+      arguments: JSON.parse(actionArguments),
+      parentMessageId: actionExecutionParentMessageId ?? actionExecutionId
+    });
+    const agentExecutionResult = (0, import_class_transformer.plainToInstance)(ResultMessage, {
+      id: "result-" + actionExecutionId,
+      createdAt: /* @__PURE__ */ new Date(),
+      actionExecutionId,
+      actionName: action.name,
+      result
+    });
+    eventStream$.sendActionExecutionResult({
+      actionExecutionId,
+      actionName: action.name,
+      result
+    });
     const stream = await action.langGraphAgentHandler({
       name: action.name,
-      actionInputsWithoutAgents
+      actionInputsWithoutAgents,
+      additionalMessages: [
+        agentExecution,
+        agentExecutionResult
+      ]
     });
     (0, import_rxjs2.from)(stream).subscribe({
       next: (event) => eventStream$.next(event),
@@ -2343,113 +2662,29 @@ async function executeAction(eventStream$, guardrailsResult$, action, actionArgu
 }
 __name(executeAction, "executeAction");
 
-// src/graphql/types/base/index.ts
-var import_type_graphql2 = require("type-graphql");
-function _ts_decorate(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate, "_ts_decorate");
-function _ts_metadata(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-    return Reflect.metadata(k, v);
-}
-__name(_ts_metadata, "_ts_metadata");
-var BaseMessageInput = class {
-  id;
-  createdAt;
-};
-__name(BaseMessageInput, "BaseMessageInput");
-_ts_decorate([
-  (0, import_type_graphql2.Field)(() => String),
-  _ts_metadata("design:type", String)
-], BaseMessageInput.prototype, "id", void 0);
-_ts_decorate([
-  (0, import_type_graphql2.Field)(() => Date),
-  _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], BaseMessageInput.prototype, "createdAt", void 0);
-BaseMessageInput = _ts_decorate([
-  (0, import_type_graphql2.InputType)()
-], BaseMessageInput);
-
-// src/graphql/types/converted/index.ts
-var Message = class extends BaseMessageInput {
-  type;
-  isTextMessage() {
-    return this.type === "TextMessage";
-  }
-  isActionExecutionMessage() {
-    return this.type === "ActionExecutionMessage";
-  }
-  isResultMessage() {
-    return this.type === "ResultMessage";
-  }
-  isAgentStateMessage() {
-    return this.type === "AgentStateMessage";
-  }
-};
-__name(Message, "Message");
-var TextMessage = class extends Message {
-  type = "TextMessage";
-  content;
-  role;
-};
-__name(TextMessage, "TextMessage");
-var ActionExecutionMessage = class extends Message {
-  type = "ActionExecutionMessage";
-  name;
-  arguments;
-  scope;
-};
-__name(ActionExecutionMessage, "ActionExecutionMessage");
-var ResultMessage = class extends Message {
-  type = "ResultMessage";
-  actionExecutionId;
-  actionName;
-  result;
-};
-__name(ResultMessage, "ResultMessage");
-var AgentStateMessage = class extends Message {
-  type = "AgentStateMessage";
-  threadId;
-  agentName;
-  nodeName;
-  runId;
-  active;
-  role;
-  state;
-  running;
-};
-__name(AgentStateMessage, "AgentStateMessage");
-
 // src/service-adapters/conversion.ts
-var import_class_transformer = require("class-transformer");
+var import_class_transformer2 = require("class-transformer");
 function convertGqlInputToMessages(inputMessages) {
   const messages = [];
   for (const message of inputMessages) {
     if (message.textMessage) {
-      messages.push((0, import_class_transformer.plainToInstance)(TextMessage, {
+      messages.push((0, import_class_transformer2.plainToInstance)(TextMessage, {
         id: message.id,
         createdAt: message.createdAt,
         role: message.textMessage.role,
-        content: message.textMessage.content
+        content: message.textMessage.content,
+        parentMessageId: message.textMessage.parentMessageId
       }));
     } else if (message.actionExecutionMessage) {
-      messages.push((0, import_class_transformer.plainToInstance)(ActionExecutionMessage, {
+      messages.push((0, import_class_transformer2.plainToInstance)(ActionExecutionMessage, {
         id: message.id,
         createdAt: message.createdAt,
         name: message.actionExecutionMessage.name,
         arguments: JSON.parse(message.actionExecutionMessage.arguments),
-        scope: message.actionExecutionMessage.scope
+        parentMessageId: message.actionExecutionMessage.parentMessageId
       }));
     } else if (message.resultMessage) {
-      messages.push((0, import_class_transformer.plainToInstance)(ResultMessage, {
+      messages.push((0, import_class_transformer2.plainToInstance)(ResultMessage, {
         id: message.id,
         createdAt: message.createdAt,
         actionExecutionId: message.resultMessage.actionExecutionId,
@@ -2457,7 +2692,7 @@ function convertGqlInputToMessages(inputMessages) {
         result: message.resultMessage.result
       }));
     } else if (message.agentStateMessage) {
-      messages.push((0, import_class_transformer.plainToInstance)(AgentStateMessage, {
+      messages.push((0, import_class_transformer2.plainToInstance)(AgentStateMessage, {
         id: message.id,
         threadId: message.agentStateMessage.threadId,
         createdAt: message.createdAt,
@@ -2557,13 +2792,7 @@ var CopilotRuntime = class {
     } catch (error) {
       console.error("Error getting response:", error);
       eventSource.sendErrorMessageToChat();
-      return {
-        threadId: threadId || (0, import_shared9.randomId)(),
-        runId: runId || (0, import_shared9.randomId)(),
-        eventSource,
-        serverSideActions: [],
-        actionInputsWithoutAgents: []
-      };
+      throw error;
     }
   }
   async processAgentRequest(request) {
@@ -2766,6 +2995,7 @@ MessageInput = _ts_decorate2([
 ], MessageInput);
 var TextMessageInput = class {
   content;
+  parentMessageId;
   role;
 };
 __name(TextMessageInput, "TextMessageInput");
@@ -2773,6 +3003,12 @@ _ts_decorate2([
   (0, import_type_graphql3.Field)(() => String),
   _ts_metadata2("design:type", String)
 ], TextMessageInput.prototype, "content", void 0);
+_ts_decorate2([
+  (0, import_type_graphql3.Field)(() => String, {
+    nullable: true
+  }),
+  _ts_metadata2("design:type", String)
+], TextMessageInput.prototype, "parentMessageId", void 0);
 _ts_decorate2([
   (0, import_type_graphql3.Field)(() => MessageRole),
   _ts_metadata2("design:type", typeof MessageRole === "undefined" ? Object : MessageRole)
@@ -2783,6 +3019,7 @@ TextMessageInput = _ts_decorate2([
 var ActionExecutionMessageInput = class {
   name;
   arguments;
+  parentMessageId;
   scope;
 };
 __name(ActionExecutionMessageInput, "ActionExecutionMessageInput");
@@ -2795,8 +3032,17 @@ _ts_decorate2([
   _ts_metadata2("design:type", String)
 ], ActionExecutionMessageInput.prototype, "arguments", void 0);
 _ts_decorate2([
-  (0, import_type_graphql3.Field)(() => ActionExecutionScope),
-  _ts_metadata2("design:type", typeof ActionExecutionScope === "undefined" ? Object : ActionExecutionScope)
+  (0, import_type_graphql3.Field)(() => String, {
+    nullable: true
+  }),
+  _ts_metadata2("design:type", String)
+], ActionExecutionMessageInput.prototype, "parentMessageId", void 0);
+_ts_decorate2([
+  (0, import_type_graphql3.Field)(() => String, {
+    nullable: true,
+    deprecationReason: "This field will be removed in a future version"
+  }),
+  _ts_metadata2("design:type", typeof String === "undefined" ? Object : String)
 ], ActionExecutionMessageInput.prototype, "scope", void 0);
 ActionExecutionMessageInput = _ts_decorate2([
   (0, import_type_graphql3.InputType)()
@@ -2804,6 +3050,7 @@ ActionExecutionMessageInput = _ts_decorate2([
 var ResultMessageInput = class {
   actionExecutionId;
   actionName;
+  parentMessageId;
   result;
 };
 __name(ResultMessageInput, "ResultMessageInput");
@@ -2815,6 +3062,12 @@ _ts_decorate2([
   (0, import_type_graphql3.Field)(() => String),
   _ts_metadata2("design:type", String)
 ], ResultMessageInput.prototype, "actionName", void 0);
+_ts_decorate2([
+  (0, import_type_graphql3.Field)(() => String, {
+    nullable: true
+  }),
+  _ts_metadata2("design:type", String)
+], ResultMessageInput.prototype, "parentMessageId", void 0);
 _ts_decorate2([
   (0, import_type_graphql3.Field)(() => String),
   _ts_metadata2("design:type", String)
@@ -3537,6 +3790,7 @@ BaseMessageOutput = _ts_decorate13([
 var TextMessageOutput = class {
   role;
   content;
+  parentMessageId;
 };
 __name(TextMessageOutput, "TextMessageOutput");
 _ts_decorate13([
@@ -3549,6 +3803,12 @@ _ts_decorate13([
   ]),
   _ts_metadata13("design:type", Array)
 ], TextMessageOutput.prototype, "content", void 0);
+_ts_decorate13([
+  (0, import_type_graphql14.Field)(() => String, {
+    nullable: true
+  }),
+  _ts_metadata13("design:type", String)
+], TextMessageOutput.prototype, "parentMessageId", void 0);
 TextMessageOutput = _ts_decorate13([
   (0, import_type_graphql14.ObjectType)({
     implements: BaseMessageOutput
@@ -3558,6 +3818,7 @@ var ActionExecutionMessageOutput = class {
   name;
   scope;
   arguments;
+  parentMessageId;
 };
 __name(ActionExecutionMessageOutput, "ActionExecutionMessageOutput");
 _ts_decorate13([
@@ -3565,8 +3826,11 @@ _ts_decorate13([
   _ts_metadata13("design:type", String)
 ], ActionExecutionMessageOutput.prototype, "name", void 0);
 _ts_decorate13([
-  (0, import_type_graphql14.Field)(() => ActionExecutionScope),
-  _ts_metadata13("design:type", typeof ActionExecutionScope === "undefined" ? Object : ActionExecutionScope)
+  (0, import_type_graphql14.Field)(() => String, {
+    nullable: true,
+    deprecationReason: "This field will be removed in a future version"
+  }),
+  _ts_metadata13("design:type", String)
 ], ActionExecutionMessageOutput.prototype, "scope", void 0);
 _ts_decorate13([
   (0, import_type_graphql14.Field)(() => [
@@ -3574,6 +3838,12 @@ _ts_decorate13([
   ]),
   _ts_metadata13("design:type", Array)
 ], ActionExecutionMessageOutput.prototype, "arguments", void 0);
+_ts_decorate13([
+  (0, import_type_graphql14.Field)(() => String, {
+    nullable: true
+  }),
+  _ts_metadata13("design:type", String)
+], ActionExecutionMessageOutput.prototype, "parentMessageId", void 0);
 ActionExecutionMessageOutput = _ts_decorate13([
   (0, import_type_graphql14.ObjectType)({
     implements: BaseMessageOutput
@@ -3684,7 +3954,7 @@ CopilotResponse = _ts_decorate13([
 // src/graphql/resolvers/copilot.resolver.ts
 var import_graphql_yoga = require("graphql-yoga");
 var import_graphql_scalars2 = require("graphql-scalars");
-var import_class_transformer2 = require("class-transformer");
+var import_class_transformer3 = require("class-transformer");
 var import_graphql = require("graphql");
 
 // src/utils/failed-response-status-reasons.ts
@@ -3882,7 +4152,7 @@ var CopilotResolver = class {
                   reason: `Interrupted due to Guardrails validation failure. Reason: ${result.reason}`
                 });
                 outputMessages = [
-                  (0, import_class_transformer2.plainToInstance)(TextMessage, {
+                  (0, import_class_transformer3.plainToInstance)(TextMessage, {
                     id: (0, import_shared10.randomId)(),
                     createdAt: /* @__PURE__ */ new Date(),
                     content: result.reason,
@@ -3931,12 +4201,15 @@ var CopilotResolver = class {
                   // skip until this message start event
                   (0, import_rxjs4.skipWhile)((e) => e !== event),
                   // take until the message end event
-                  (0, import_rxjs4.takeWhile)((e) => e.type != RuntimeEventTypes.TextMessageEnd)
+                  (0, import_rxjs4.takeWhile)((e) => !(e.type === RuntimeEventTypes.TextMessageEnd && e.messageId == event.messageId)),
+                  // filter out any other message events or message ids
+                  (0, import_rxjs4.filter)((e) => e.type == RuntimeEventTypes.TextMessageContent && e.messageId == event.messageId)
                 );
                 const streamingTextStatus = new import_rxjs4.Subject();
                 const messageId = event.messageId;
                 pushMessage({
                   id: messageId,
+                  parentMessageId: event.parentMessageId,
                   status: (0, import_rxjs4.firstValueFrom)(streamingTextStatus),
                   createdAt: /* @__PURE__ */ new Date(),
                   role: MessageRole.assistant,
@@ -3949,7 +4222,7 @@ var CopilotResolver = class {
                         reason,
                         messageId: messageId2
                       }, "Text streaming interrupted");
-                      streamingTextStatus.next((0, import_class_transformer2.plainToInstance)(FailedMessageStatus, {
+                      streamingTextStatus.next((0, import_class_transformer3.plainToInstance)(FailedMessageStatus, {
                         reason
                       }));
                       responseStatus$.next(new MessageStreamInterruptedResponse({
@@ -3982,7 +4255,7 @@ var CopilotResolver = class {
                         streamingTextStatus.next(new SuccessMessageStatus());
                         stopStreamingText();
                         textSubscription == null ? void 0 : textSubscription.unsubscribe();
-                        outputMessages.push((0, import_class_transformer2.plainToInstance)(TextMessage, {
+                        outputMessages.push((0, import_class_transformer3.plainToInstance)(TextMessage, {
                           id: messageId,
                           createdAt: /* @__PURE__ */ new Date(),
                           content: textChunks.join(""),
@@ -3995,14 +4268,20 @@ var CopilotResolver = class {
                 break;
               case RuntimeEventTypes.ActionExecutionStart:
                 logger2.debug("Action execution start event received");
-                const actionExecutionArgumentStream = eventStream.pipe((0, import_rxjs4.skipWhile)((e) => e !== event), (0, import_rxjs4.takeWhile)((e) => e.type != RuntimeEventTypes.ActionExecutionEnd));
+                const actionExecutionArgumentStream = eventStream.pipe(
+                  (0, import_rxjs4.skipWhile)((e) => e !== event),
+                  // take until the action execution end event
+                  (0, import_rxjs4.takeWhile)((e) => !(e.type === RuntimeEventTypes.ActionExecutionEnd && e.actionExecutionId == event.actionExecutionId)),
+                  // filter out any other action execution events or action execution ids
+                  (0, import_rxjs4.filter)((e) => e.type == RuntimeEventTypes.ActionExecutionArgs && e.actionExecutionId == event.actionExecutionId)
+                );
                 const streamingArgumentsStatus = new import_rxjs4.Subject();
                 pushMessage({
                   id: event.actionExecutionId,
+                  parentMessageId: event.parentMessageId,
                   status: (0, import_rxjs4.firstValueFrom)(streamingArgumentsStatus),
                   createdAt: /* @__PURE__ */ new Date(),
                   name: event.actionName,
-                  scope: event.scope,
                   arguments: new import_graphql_yoga.Repeater(async (pushArgumentsChunk, stopStreamingArguments) => {
                     logger2.debug("Action execution argument stream created");
                     const argumentChunks = [];
@@ -4018,7 +4297,7 @@ var CopilotResolver = class {
                         logger2.error({
                           err
                         }, "Error in action execution argument stream");
-                        streamingArgumentsStatus.next((0, import_class_transformer2.plainToInstance)(FailedMessageStatus, {
+                        streamingArgumentsStatus.next((0, import_class_transformer3.plainToInstance)(FailedMessageStatus, {
                           reason: "An unknown error has occurred in the action execution argument stream"
                         }));
                         stopStreamingArguments();
@@ -4029,11 +4308,10 @@ var CopilotResolver = class {
                         streamingArgumentsStatus.next(new SuccessMessageStatus());
                         stopStreamingArguments();
                         actionExecutionArgumentSubscription == null ? void 0 : actionExecutionArgumentSubscription.unsubscribe();
-                        outputMessages.push((0, import_class_transformer2.plainToInstance)(ActionExecutionMessage, {
+                        outputMessages.push((0, import_class_transformer3.plainToInstance)(ActionExecutionMessage, {
                           id: event.actionExecutionId,
                           createdAt: /* @__PURE__ */ new Date(),
                           name: event.actionName,
-                          scope: event.scope,
                           arguments: argumentChunks.join("")
                         }));
                       }
@@ -4046,15 +4324,15 @@ var CopilotResolver = class {
                   result: event.result
                 }, "Action execution result event received");
                 pushMessage({
-                  id: (0, import_shared10.randomId)(),
+                  id: "result-" + event.actionExecutionId,
                   status: new SuccessMessageStatus(),
                   createdAt: /* @__PURE__ */ new Date(),
                   actionExecutionId: event.actionExecutionId,
                   actionName: event.actionName,
                   result: event.result
                 });
-                outputMessages.push((0, import_class_transformer2.plainToInstance)(ResultMessage, {
-                  id: (0, import_shared10.randomId)(),
+                outputMessages.push((0, import_class_transformer3.plainToInstance)(ResultMessage, {
+                  id: "result-" + event.actionExecutionId,
                   createdAt: /* @__PURE__ */ new Date(),
                   actionExecutionId: event.actionExecutionId,
                   actionName: event.actionName,
@@ -4078,7 +4356,7 @@ var CopilotResolver = class {
                   role: MessageRole.assistant,
                   createdAt: /* @__PURE__ */ new Date()
                 });
-                outputMessages.push((0, import_class_transformer2.plainToInstance)(AgentStateMessage, {
+                outputMessages.push((0, import_class_transformer3.plainToInstance)(AgentStateMessage, {
                   id: (0, import_shared10.randomId)(),
                   threadId: event.threadId,
                   agentName: event.agentName,