@copilotkit/runtime 1.4.0-pre-1-4-0.13 → 1.4.0-pre-1-4-0.14

package/dist/lib/index.js

@@ -44,7 +44,7 @@ var require_package = __commonJS({
       publishConfig: {
         access: "public"
       },
-      version: "1.4.0-pre-1-4-0.13",
+      version: "1.4.0-pre-1-4-0.14",
       sideEffects: false,
       main: "./dist/index.js",
       module: "./dist/index.mjs",
@@ -424,8 +424,6 @@ 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;
@@ -434,51 +432,30 @@ var OpenAIAdapter = class {
         const content = chunk.choices[0].delta.content;
         if (mode === "message" && (toolCall == null ? void 0 : toolCall.id)) {
           mode = null;
-          eventStream$.sendTextMessageEnd({
-            messageId: currentMessageId
-          });
+          eventStream$.sendTextMessageEnd();
         } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
           mode = null;
-          eventStream$.sendActionExecutionEnd({
-            actionExecutionId: currentToolCallId
-          });
+          eventStream$.sendActionExecutionEnd();
         }
         if (mode === null) {
           if (toolCall == null ? void 0 : toolCall.id) {
             mode = "function";
-            currentToolCallId = toolCall.id;
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: currentToolCallId,
-              actionName: toolCall.function.name
-            });
+            eventStream$.sendActionExecutionStart(toolCall.id, toolCall.function.name);
           } else if (content) {
             mode = "message";
-            currentMessageId = chunk.id;
-            eventStream$.sendTextMessageStart({
-              messageId: currentMessageId
-            });
+            eventStream$.sendTextMessageStart(chunk.id);
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content
-          });
+          eventStream$.sendTextMessageContent(content);
         } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: currentToolCallId,
-            args: toolCall.function.arguments
-          });
+          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
         }
       }
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd({
-          messageId: currentMessageId
-        });
+        eventStream$.sendTextMessageEnd();
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd({
-          actionExecutionId: currentToolCallId
-        });
+        eventStream$.sendActionExecutionEnd();
       }
       eventStream$.complete();
     });
@@ -574,11 +551,7 @@ function isBaseMessageChunk(message) {
 __name(isBaseMessageChunk, "isBaseMessageChunk");
 function maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution) {
   if (actionExecution) {
-    eventStream$.sendActionExecutionResult({
-      actionExecutionId: actionExecution.id,
-      actionName: actionExecution.name,
-      result: "Sending a message"
-    });
+    eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, "Sending a message");
   }
 }
 __name(maybeSendActionExecutionResultIsMessage, "maybeSendActionExecutionResultIsMessage");
@@ -588,11 +561,7 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
     if (!actionExecution) {
       eventStream$.sendTextMessage((0, import_shared2.randomId)(), result);
     } else {
-      eventStream$.sendActionExecutionResult({
-        actionExecutionId: actionExecution.id,
-        actionName: actionExecution.name,
-        result
-      });
+      eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, result);
     }
   } else if (isAIMessage(result)) {
     maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution);
@@ -600,11 +569,7 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
       eventStream$.sendTextMessage((0, import_shared2.randomId)(), result.content);
     }
     for (const toolCall of result.tool_calls) {
-      eventStream$.sendActionExecution({
-        actionExecutionId: toolCall.id || (0, import_shared2.randomId)(),
-        actionName: toolCall.name,
-        args: JSON.stringify(toolCall.args)
-      });
+      eventStream$.sendActionExecution(toolCall.id || (0, import_shared2.randomId)(), toolCall.name, JSON.stringify(toolCall.args));
     }
   } else if (isBaseMessageChunk(result)) {
     maybeSendActionExecutionResultIsMessage(eventStream$, actionExecution);
@@ -613,11 +578,7 @@ 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({
-          actionExecutionId: toolCall.id || (0, import_shared2.randomId)(),
-          actionName: toolCall.name,
-          args: JSON.stringify(toolCall.args)
-        });
+        eventStream$.sendActionExecution(toolCall.id || (0, import_shared2.randomId)(), toolCall.name, JSON.stringify(toolCall.args));
       }
     }
   } else if (result && "getReader" in result) {
@@ -635,7 +596,6 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
         const { done, value } = await reader.read();
         let toolCallName = void 0;
         let toolCallId = void 0;
-        let currentMessageId;
         let toolCallArgs = void 0;
         let hasToolCall = false;
         let content = value == null ? void 0 : value.content;
@@ -663,14 +623,10 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
         }
         if (mode === "message" && (toolCallId || done)) {
           mode = null;
-          eventStream$.sendTextMessageEnd({
-            messageId: currentMessageId
-          });
+          eventStream$.sendTextMessageEnd();
         } else if (mode === "function" && (!hasToolCall || done)) {
           mode = null;
-          eventStream$.sendActionExecutionEnd({
-            actionExecutionId: toolCallId
-          });
+          eventStream$.sendActionExecutionEnd();
         }
         if (done) {
           break;
@@ -678,38 +634,21 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
         if (mode === null) {
           if (hasToolCall && toolCallId && toolCallName) {
             mode = "function";
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: toolCallId,
-              actionName: toolCallName
-            });
+            eventStream$.sendActionExecutionStart(toolCallId, toolCallName);
           } else if (content) {
             mode = "message";
-            currentMessageId = (0, import_shared2.randomId)();
-            eventStream$.sendTextMessageStart({
-              messageId: currentMessageId
-            });
+            eventStream$.sendTextMessageStart((0, import_shared2.randomId)());
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content: Array.isArray(content) ? ((_i = content[0]) == null ? void 0 : _i.text) ?? "" : content
-          });
+          eventStream$.sendTextMessageContent(Array.isArray(content) ? ((_i = content[0]) == null ? void 0 : _i.text) ?? "" : content);
         } else if (mode === "function" && toolCallArgs) {
           if (toolCallDetails.index !== toolCallDetails.prevIndex) {
-            eventStream$.sendActionExecutionEnd({
-              actionExecutionId: toolCallId
-            });
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: toolCallId,
-              actionName: toolCallName
-            });
+            eventStream$.sendActionExecutionEnd();
+            eventStream$.sendActionExecutionStart(toolCallId, toolCallName);
             toolCallDetails.prevIndex = toolCallDetails.index;
           }
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: toolCallId,
-            args: toolCallArgs
-          });
+          eventStream$.sendActionExecutionArgs(toolCallArgs);
         }
       } catch (error) {
         console.error("Error reading from stream", error);
@@ -717,11 +656,7 @@ async function streamLangChainResponse({ result, eventStream$, actionExecution }
       }
     }
   } else if (actionExecution) {
-    eventStream$.sendActionExecutionResult({
-      actionExecutionId: actionExecution.id,
-      actionName: actionExecution.name,
-      result: encodeResult(result)
-    });
+    eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, encodeResult(result));
   } else {
     throw new Error("Invalid return type from LangChain function.");
   }
@@ -901,33 +836,21 @@ 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({
-                actionExecutionId: currentToolCallId
-              });
+              eventStream$.sendActionExecutionEnd();
             }
-            currentMessageId = chunk.data.id;
-            eventStream$.sendTextMessageStart({
-              messageId: currentMessageId
-            });
+            eventStream$.sendTextMessageStart(chunk.data.id);
             break;
           case "thread.message.delta":
             if (((_a = chunk.data.delta.content) == null ? void 0 : _a[0].type) === "text") {
-              eventStream$.sendTextMessageContent({
-                messageId: currentMessageId,
-                content: (_b = chunk.data.delta.content) == null ? void 0 : _b[0].text.value
-              });
+              eventStream$.sendTextMessageContent((_b = chunk.data.delta.content) == null ? void 0 : _b[0].text.value);
             }
             break;
           case "thread.message.completed":
-            eventStream$.sendTextMessageEnd({
-              messageId: currentMessageId
-            });
+            eventStream$.sendTextMessageEnd();
             break;
           case "thread.run.step.delta":
             let toolCallId;
@@ -940,29 +863,18 @@ var OpenAIAssistantAdapter = class {
             }
             if (toolCallName && toolCallId) {
               if (inFunctionCall) {
-                eventStream$.sendActionExecutionEnd({
-                  actionExecutionId: currentToolCallId
-                });
+                eventStream$.sendActionExecutionEnd();
               }
               inFunctionCall = true;
-              currentToolCallId = toolCallId;
-              eventStream$.sendActionExecutionStart({
-                actionExecutionId: currentToolCallId,
-                actionName: toolCallName
-              });
+              eventStream$.sendActionExecutionStart(toolCallId, toolCallName);
             } else if (toolCallArgs) {
-              eventStream$.sendActionExecutionArgs({
-                actionExecutionId: currentToolCallId,
-                args: toolCallArgs
-              });
+              eventStream$.sendActionExecutionArgs(toolCallArgs);
             }
             break;
         }
       }
       if (inFunctionCall) {
-        eventStream$.sendActionExecutionEnd({
-          actionExecutionId: currentToolCallId
-        });
+        eventStream$.sendActionExecutionEnd();
       }
       eventStream$.complete();
     });
@@ -1015,77 +927,46 @@ 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;
-          currentMessageId = (0, import_shared4.randomId)();
-          eventStream$.sendTextMessageStart({
-            messageId: currentMessageId
-          });
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content: `Model used: ${model}
-`
-          });
-          eventStream$.sendTextMessageEnd({
-            messageId: currentMessageId
-          });
+          eventStream$.sendTextMessageStart((0, import_shared4.randomId)());
+          eventStream$.sendTextMessageContent(`Model used: ${model}
+`);
+          eventStream$.sendTextMessageEnd();
           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({
-            messageId: currentMessageId
-          });
+          eventStream$.sendTextMessageEnd();
         } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
           mode = null;
-          eventStream$.sendActionExecutionEnd({
-            actionExecutionId: currentToolCallId
-          });
+          eventStream$.sendActionExecutionEnd();
         }
         if (mode === null) {
           if (toolCall == null ? void 0 : toolCall.id) {
             mode = "function";
-            currentToolCallId = toolCall.id;
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: currentToolCallId,
-              actionName: toolCall.function.name
-            });
+            eventStream$.sendActionExecutionStart(toolCall.id, toolCall.function.name);
           } else if (content) {
             mode = "message";
-            currentMessageId = chunk.id;
-            eventStream$.sendTextMessageStart({
-              messageId: currentMessageId
-            });
+            eventStream$.sendTextMessageStart(chunk.id);
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content
-          });
+          eventStream$.sendTextMessageContent(content);
         } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: currentToolCallId,
-            args: toolCall.function.arguments
-          });
+          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
         }
       }
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd({
-          messageId: currentMessageId
-        });
+        eventStream$.sendTextMessageEnd();
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd({
-          actionExecutionId: currentToolCallId
-        });
+        eventStream$.sendActionExecutionEnd();
       }
       eventStream$.complete();
     });
@@ -1151,58 +1032,35 @@ 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({
-            messageId: currentMessageId
-          });
+          eventStream$.sendTextMessageEnd();
         } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
           mode = null;
-          eventStream$.sendActionExecutionEnd({
-            actionExecutionId: currentToolCallId
-          });
+          eventStream$.sendActionExecutionEnd();
         }
         if (mode === null) {
           if (toolCall == null ? void 0 : toolCall.id) {
             mode = "function";
-            currentToolCallId = toolCall.id;
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: currentToolCallId,
-              actionName: toolCall.function.name
-            });
+            eventStream$.sendActionExecutionStart(toolCall.id, toolCall.function.name);
           } else if (content) {
             mode = "message";
-            currentMessageId = chunk.id;
-            eventStream$.sendTextMessageStart({
-              messageId: currentMessageId
-            });
+            eventStream$.sendTextMessageStart(chunk.id);
           }
         }
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content
-          });
+          eventStream$.sendTextMessageContent(content);
         } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: currentToolCallId,
-            args: toolCall.function.arguments
-          });
+          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
         }
       }
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd({
-          messageId: currentMessageId
-        });
+        eventStream$.sendTextMessageEnd();
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd({
-          actionExecutionId: currentToolCallId
-        });
+        eventStream$.sendActionExecutionEnd();
       }
       eventStream$.complete();
     });
@@ -1333,14 +1191,12 @@ var RemoteLangGraphEventSource = class {
       }
       if (eventWithState.prevToolCallMessageId !== null && eventWithState.prevToolCallMessageId !== eventWithState.toolCallMessageId && this.shouldEmitToolCall(shouldEmitToolCalls, eventWithState.toolCallName)) {
         events.push({
-          type: RuntimeEventTypes.ActionExecutionEnd,
-          actionExecutionId: eventWithState.prevToolCallMessageId
+          type: RuntimeEventTypes.ActionExecutionEnd
         });
       }
       if (eventWithState.prevMessageId !== null && eventWithState.prevMessageId !== eventWithState.messageId && shouldEmitMessages) {
         events.push({
-          type: RuntimeEventTypes.TextMessageEnd,
-          messageId: eventWithState.prevMessageId
+          type: RuntimeEventTypes.TextMessageEnd
         });
       }
       switch (eventWithState.event.event) {
@@ -1352,12 +1208,10 @@ var RemoteLangGraphEventSource = class {
             });
             events.push({
               type: RuntimeEventTypes.TextMessageContent,
-              messageId: eventWithState.event.data.message_id,
               content: eventWithState.event.data.message
             });
             events.push({
-              type: RuntimeEventTypes.TextMessageEnd,
-              messageId: eventWithState.event.data.message_id
+              type: RuntimeEventTypes.TextMessageEnd
             });
           } else if (eventWithState.event.name === CustomEventNames.CopilotKitManuallyEmitToolCall) {
             events.push({
@@ -1367,12 +1221,10 @@ var RemoteLangGraphEventSource = class {
             });
             events.push({
               type: RuntimeEventTypes.ActionExecutionArgs,
-              actionExecutionId: eventWithState.event.data.id,
               args: JSON.stringify(eventWithState.event.data.args)
             });
             events.push({
-              type: RuntimeEventTypes.ActionExecutionEnd,
-              actionExecutionId: eventWithState.event.data.id
+              type: RuntimeEventTypes.ActionExecutionEnd
             });
           }
           break;
@@ -1416,7 +1268,6 @@ var RemoteLangGraphEventSource = class {
             if (this.shouldEmitToolCall(shouldEmitToolCalls, eventWithState.toolCallName)) {
               events.push({
                 type: RuntimeEventTypes.ActionExecutionArgs,
-                actionExecutionId: eventWithState.toolCallMessageId,
                 args
               });
             }
@@ -1424,7 +1275,6 @@ var RemoteLangGraphEventSource = class {
             if (shouldEmitMessages) {
               events.push({
                 type: RuntimeEventTypes.TextMessageContent,
-                messageId: eventWithState.messageId,
                 content
               });
             }
@@ -1437,14 +1287,12 @@ var RemoteLangGraphEventSource = class {
       const events = [];
       if (lastEventWithState == null ? void 0 : lastEventWithState.messageId) {
         events.push({
-          type: RuntimeEventTypes.TextMessageEnd,
-          messageId: lastEventWithState.messageId
+          type: RuntimeEventTypes.TextMessageEnd
         });
       }
       if (lastEventWithState == null ? void 0 : lastEventWithState.toolCallMessageId) {
         events.push({
-          type: RuntimeEventTypes.ActionExecutionEnd,
-          actionExecutionId: lastEventWithState.toolCallMessageId
+          type: RuntimeEventTypes.ActionExecutionEnd
         });
       }
       const messageId = (0, import_shared6.randomId)();
@@ -1454,12 +1302,10 @@ var RemoteLangGraphEventSource = class {
       });
       events.push({
         type: RuntimeEventTypes.TextMessageContent,
-        messageId,
         content: "\u274C An error occurred. Please try again."
       });
       events.push({
-        type: RuntimeEventTypes.TextMessageEnd,
-        messageId
+        type: RuntimeEventTypes.TextMessageEnd
       });
       return events;
     }));
@@ -2332,71 +2178,52 @@ var RuntimeEventSubject = class extends import_rxjs2.ReplaySubject {
   constructor() {
     super();
   }
-  sendTextMessageStart({ messageId }) {
+  sendTextMessageStart(messageId) {
     this.next({
       type: "TextMessageStart",
       messageId
     });
   }
-  sendTextMessageContent({ messageId, content }) {
+  sendTextMessageContent(content) {
     this.next({
       type: "TextMessageContent",
-      content,
-      messageId
+      content
     });
   }
-  sendTextMessageEnd({ messageId }) {
+  sendTextMessageEnd() {
     this.next({
-      type: "TextMessageEnd",
-      messageId
+      type: "TextMessageEnd"
     });
   }
   sendTextMessage(messageId, content) {
-    this.sendTextMessageStart({
-      messageId
-    });
-    this.sendTextMessageContent({
-      messageId,
-      content
-    });
-    this.sendTextMessageEnd({
-      messageId
-    });
+    this.sendTextMessageStart(messageId);
+    this.sendTextMessageContent(content);
+    this.sendTextMessageEnd();
   }
-  sendActionExecutionStart({ actionExecutionId, actionName }) {
+  sendActionExecutionStart(actionExecutionId, actionName) {
     this.next({
       type: "ActionExecutionStart",
       actionExecutionId,
       actionName
     });
   }
-  sendActionExecutionArgs({ actionExecutionId, args }) {
+  sendActionExecutionArgs(args) {
     this.next({
       type: "ActionExecutionArgs",
-      args,
-      actionExecutionId
+      args
     });
   }
-  sendActionExecutionEnd({ actionExecutionId }) {
+  sendActionExecutionEnd() {
     this.next({
-      type: "ActionExecutionEnd",
-      actionExecutionId
+      type: "ActionExecutionEnd"
     });
   }
-  sendActionExecution({ actionExecutionId, actionName, args }) {
-    this.sendActionExecutionStart({
-      actionExecutionId,
-      actionName
-    });
-    this.sendActionExecutionArgs({
-      actionExecutionId,
-      args
-    });
-    this.sendActionExecutionEnd({
-      actionExecutionId
-    });
+  sendActionExecution(actionExecutionId, toolName, args) {
+    this.sendActionExecutionStart(actionExecutionId, toolName);
+    this.sendActionExecutionArgs(args);
+    this.sendActionExecutionEnd();
   }
-  sendActionExecutionResult({ actionExecutionId, actionName, result }) {
+  sendActionExecutionResult(actionExecutionId, actionName, result) {
     this.next({
       type: "ActionExecutionResult",
       actionName,
@@ -2404,7 +2231,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,
@@ -2510,11 +2337,7 @@ async function executeAction(eventStream$, guardrailsResult$, action, actionArgu
     }
   }
   if (isLangGraphAgentAction(action)) {
-    eventStream$.sendActionExecutionResult({
-      actionExecutionId,
-      actionName: action.name,
-      result: `${action.name} agent started`
-    });
+    eventStream$.sendActionExecutionResult(actionExecutionId, action.name, `${action.name} agent started`);
     const stream = await action.langGraphAgentHandler({
       name: action.name,
       actionInputsWithoutAgents
@@ -4116,9 +3939,7 @@ 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 && 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)
+                  (0, import_rxjs4.takeWhile)((e) => e.type != RuntimeEventTypes.TextMessageEnd)
                 );
                 const streamingTextStatus = new import_rxjs4.Subject();
                 const messageId = event.messageId;
@@ -4182,13 +4003,7 @@ 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),
-                  // 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 actionExecutionArgumentStream = eventStream.pipe((0, import_rxjs4.skipWhile)((e) => e !== event), (0, import_rxjs4.takeWhile)((e) => e.type != RuntimeEventTypes.ActionExecutionEnd));
                 const streamingArgumentsStatus = new import_rxjs4.Subject();
                 pushMessage({
                   id: event.actionExecutionId,