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

package/src/graphql/resolvers/copilot.resolver.ts

@@ -3,7 +3,6 @@ import {
   ReplaySubject,
   Subject,
   Subscription,
-  filter,
   finalize,
   firstValueFrom,
   shareReplay,
@@ -287,19 +286,7 @@ export class CopilotResolver {
                   // skip until this message start event
                   skipWhile((e) => e !== event),
                   // take until the message end event
-                  takeWhile(
-                    (e) =>
-                      !(
-                        e.type === RuntimeEventTypes.TextMessageEnd &&
-                        e.messageId == event.messageId
-                      ),
-                  ),
-                  // filter out any other message events or message ids
-                  filter(
-                    (e) =>
-                      e.type == RuntimeEventTypes.TextMessageContent &&
-                      e.messageId == event.messageId,
-                  ),
+                  takeWhile((e) => e.type != RuntimeEventTypes.TextMessageEnd),
                 );
 
                 // signal when we are done streaming
@@ -380,20 +367,7 @@ export class CopilotResolver {
                 logger.debug("Action execution start event received");
                 const actionExecutionArgumentStream = eventStream.pipe(
                   skipWhile((e) => e !== event),
-                  // take until the action execution end event
-                  takeWhile(
-                    (e) =>
-                      !(
-                        e.type === RuntimeEventTypes.ActionExecutionEnd &&
-                        e.actionExecutionId == event.actionExecutionId
-                      ),
-                  ),
-                  // filter out any other action execution events or action execution ids
-                  filter(
-                    (e) =>
-                      e.type == RuntimeEventTypes.ActionExecutionArgs &&
-                      e.actionExecutionId == event.actionExecutionId,
-                  ),
+                  takeWhile((e) => e.type != RuntimeEventTypes.ActionExecutionEnd),
                 );
                 const streamingArgumentsStatus = new Subject<typeof MessageStatusUnion>();
                 pushMessage({

package/src/service-adapters/anthropic/anthropic-adapter.ts

@@ -122,10 +122,7 @@ export class AnthropicAdapter implements CopilotServiceAdapter {
             mode = "message";
           } else if (chunk.content_block.type === "tool_use") {
             currentToolCallId = chunk.content_block.id;
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: currentToolCallId,
-              actionName: chunk.content_block.name,
-            });
+            eventStream$.sendActionExecutionStart(currentToolCallId, chunk.content_block.name);
             mode = "function";
           }
         } else if (chunk.type === "content_block_delta") {
@@ -133,27 +130,21 @@ export class AnthropicAdapter implements CopilotServiceAdapter {
             const text = filterThinkingTextBuffer.onTextChunk(chunk.delta.text);
             if (text.length > 0) {
               if (!didOutputText) {
-                eventStream$.sendTextMessageStart({ messageId: currentMessageId });
+                eventStream$.sendTextMessageStart(currentMessageId);
                 didOutputText = true;
               }
-              eventStream$.sendTextMessageContent({
-                messageId: currentMessageId,
-                content: text,
-              });
+              eventStream$.sendTextMessageContent(text);
             }
           } else if (chunk.delta.type === "input_json_delta") {
-            eventStream$.sendActionExecutionArgs({
-              actionExecutionId: currentToolCallId,
-              args: chunk.delta.partial_json,
-            });
+            eventStream$.sendActionExecutionArgs(chunk.delta.partial_json);
           }
         } else if (chunk.type === "content_block_stop") {
           if (mode === "message") {
             if (didOutputText) {
-              eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+              eventStream$.sendTextMessageEnd();
             }
           } else if (mode === "function") {
-            eventStream$.sendActionExecutionEnd({ actionExecutionId: currentToolCallId });
+            eventStream$.sendActionExecutionEnd();
           }
         }
       }

package/src/service-adapters/events.ts

@@ -33,18 +33,17 @@ export type RuntimeEvent =
   | { type: RuntimeEventTypes.TextMessageStart; messageId: string }
   | {
       type: RuntimeEventTypes.TextMessageContent;
-      messageId: string;
       content: string;
     }
-  | { type: RuntimeEventTypes.TextMessageEnd; messageId: string }
+  | { type: RuntimeEventTypes.TextMessageEnd }
   | {
       type: RuntimeEventTypes.ActionExecutionStart;
       actionExecutionId: string;
       actionName: string;
       scope?: FunctionCallScope;
     }
-  | { type: RuntimeEventTypes.ActionExecutionArgs; actionExecutionId: string; args: string }
-  | { type: RuntimeEventTypes.ActionExecutionEnd; actionExecutionId: string }
+  | { type: RuntimeEventTypes.ActionExecutionArgs; args: string }
+  | { type: RuntimeEventTypes.ActionExecutionEnd }
   | {
       type: RuntimeEventTypes.ActionExecutionResult;
       actionName: string;
@@ -78,31 +77,25 @@ export class RuntimeEventSubject extends ReplaySubject<RuntimeEvent> {
     super();
   }
 
-  sendTextMessageStart({ messageId }: { messageId: string }) {
+  sendTextMessageStart(messageId: string) {
     this.next({ type: RuntimeEventTypes.TextMessageStart, messageId });
   }
 
-  sendTextMessageContent({ messageId, content }: { messageId: string; content: string }) {
-    this.next({ type: RuntimeEventTypes.TextMessageContent, content, messageId });
+  sendTextMessageContent(content: string) {
+    this.next({ type: RuntimeEventTypes.TextMessageContent, content });
   }
 
-  sendTextMessageEnd({ messageId }: { messageId: string }) {
-    this.next({ type: RuntimeEventTypes.TextMessageEnd, messageId });
+  sendTextMessageEnd() {
+    this.next({ type: RuntimeEventTypes.TextMessageEnd });
   }
 
   sendTextMessage(messageId: string, content: string) {
-    this.sendTextMessageStart({ messageId });
-    this.sendTextMessageContent({ messageId, content });
-    this.sendTextMessageEnd({ messageId });
+    this.sendTextMessageStart(messageId);
+    this.sendTextMessageContent(content);
+    this.sendTextMessageEnd();
   }
 
-  sendActionExecutionStart({
-    actionExecutionId,
-    actionName,
-  }: {
-    actionExecutionId: string;
-    actionName: string;
-  }) {
+  sendActionExecutionStart(actionExecutionId: string, actionName: string) {
     this.next({
       type: RuntimeEventTypes.ActionExecutionStart,
       actionExecutionId,
@@ -110,43 +103,21 @@ export class RuntimeEventSubject extends ReplaySubject<RuntimeEvent> {
     });
   }
 
-  sendActionExecutionArgs({
-    actionExecutionId,
-    args,
-  }: {
-    actionExecutionId: string;
-    args: string;
-  }) {
-    this.next({ type: RuntimeEventTypes.ActionExecutionArgs, args, actionExecutionId });
+  sendActionExecutionArgs(args: string) {
+    this.next({ type: RuntimeEventTypes.ActionExecutionArgs, args });
   }
 
-  sendActionExecutionEnd({ actionExecutionId }: { actionExecutionId: string }) {
-    this.next({ type: RuntimeEventTypes.ActionExecutionEnd, actionExecutionId });
+  sendActionExecutionEnd() {
+    this.next({ type: RuntimeEventTypes.ActionExecutionEnd });
   }
 
-  sendActionExecution({
-    actionExecutionId,
-    actionName,
-    args,
-  }: {
-    actionExecutionId: string;
-    actionName: string;
-    args: string;
-  }) {
-    this.sendActionExecutionStart({ actionExecutionId, actionName });
-    this.sendActionExecutionArgs({ actionExecutionId, args });
-    this.sendActionExecutionEnd({ actionExecutionId });
+  sendActionExecution(actionExecutionId: string, toolName: string, args: string) {
+    this.sendActionExecutionStart(actionExecutionId, toolName);
+    this.sendActionExecutionArgs(args);
+    this.sendActionExecutionEnd();
   }
 
-  sendActionExecutionResult({
-    actionExecutionId,
-    actionName,
-    result,
-  }: {
-    actionExecutionId: string;
-    actionName: string;
-    result: string;
-  }) {
+  sendActionExecutionResult(actionExecutionId: string, actionName: string, result: string) {
     this.next({
       type: RuntimeEventTypes.ActionExecutionResult,
       actionName,
@@ -155,25 +126,16 @@ export class RuntimeEventSubject extends ReplaySubject<RuntimeEvent> {
     });
   }
 
-  sendAgentStateMessage({
-    threadId,
-    agentName,
-    nodeName,
-    runId,
-    active,
-    role,
-    state,
-    running,
-  }: {
-    threadId: string;
-    agentName: string;
-    nodeName: string;
-    runId: string;
-    active: boolean;
-    role: string;
-    state: string;
-    running: boolean;
-  }) {
+  sendAgentStateMessage(
+    threadId: string,
+    agentName: string,
+    nodeName: string,
+    runId: string,
+    active: boolean,
+    role: string,
+    state: string,
+    running: boolean,
+  ) {
     this.next({
       type: RuntimeEventTypes.AgentStateMessage,
       threadId,
@@ -319,11 +281,11 @@ async function executeAction(
 
   // handle LangGraph agents
   if (isLangGraphAgentAction(action)) {
-    eventStream$.sendActionExecutionResult({
+    eventStream$.sendActionExecutionResult(
       actionExecutionId,
-      actionName: action.name,
-      result: `${action.name} agent started`,
-    });
+      action.name,
+      `${action.name} agent started`,
+    );
     const stream = await action.langGraphAgentHandler({
       name: action.name,
       actionInputsWithoutAgents,

package/src/service-adapters/experimental/ollama/ollama-adapter.ts

@@ -58,15 +58,11 @@ export class ExperimentalOllamaAdapter implements CopilotServiceAdapter {
     const _stream = await ollama.stream(contents); // [TODO] role info is dropped...
 
     eventSource.stream(async (eventStream$) => {
-      const currentMessageId = randomId();
-      eventStream$.sendTextMessageStart({ messageId: currentMessageId });
+      eventStream$.sendTextMessageStart(randomId());
       for await (const chunkText of _stream) {
-        eventStream$.sendTextMessageContent({
-          messageId: currentMessageId,
-          content: chunkText,
-        });
+        eventStream$.sendTextMessageContent(chunkText);
       }
-      eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+      eventStream$.sendTextMessageEnd();
       // we may need to add this later.. [nc]
       // let calls = (await result.response).functionCalls();
 

package/src/service-adapters/groq/groq-adapter.ts

@@ -108,9 +108,6 @@ export class GroqAdapter implements CopilotServiceAdapter {
 
     eventSource.stream(async (eventStream$) => {
       let mode: "function" | "message" | null = null;
-      let currentMessageId: string;
-      let currentToolCallId: string;
-
       for await (const chunk of stream) {
         const toolCall = chunk.choices[0].delta.tool_calls?.[0];
         const content = chunk.choices[0].delta.content;
@@ -120,47 +117,36 @@ export class GroqAdapter implements CopilotServiceAdapter {
         // If toolCall?.id is defined, it means a new tool call starts.
         if (mode === "message" && toolCall?.id) {
           mode = null;
-          eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+          eventStream$.sendTextMessageEnd();
         } else if (mode === "function" && (toolCall === undefined || toolCall?.id)) {
           mode = null;
-          eventStream$.sendActionExecutionEnd({ actionExecutionId: currentToolCallId });
+          eventStream$.sendActionExecutionEnd();
         }
 
         // If we send a new message type, send the appropriate start event.
         if (mode === null) {
           if (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);
           }
         }
 
         // send the content events
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content,
-          });
+          eventStream$.sendTextMessageContent(content);
         } else if (mode === "function" && toolCall?.function?.arguments) {
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: currentToolCallId,
-            args: toolCall.function.arguments,
-          });
+          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
         }
       }
 
       // send the end events
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+        eventStream$.sendTextMessageEnd();
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd({ actionExecutionId: currentToolCallId });
+        eventStream$.sendActionExecutionEnd();
       }
 
       eventStream$.complete();

package/src/service-adapters/langchain/utils.ts

@@ -129,11 +129,11 @@ function maybeSendActionExecutionResultIsMessage(
   // language models need a result after the function call
   // we simply let them know that we are sending a message
   if (actionExecution) {
-    eventStream$.sendActionExecutionResult({
-      actionExecutionId: actionExecution.id,
-      actionName: actionExecution.name,
-      result: "Sending a message",
-    });
+    eventStream$.sendActionExecutionResult(
+      actionExecution.id,
+      actionExecution.name,
+      "Sending a message",
+    );
   }
 }
 
@@ -152,11 +152,7 @@ export async function streamLangChainResponse({
       eventStream$.sendTextMessage(randomId(), result);
     } else {
       // Send as a result
-      eventStream$.sendActionExecutionResult({
-        actionExecutionId: actionExecution.id,
-        actionName: actionExecution.name,
-        result: result,
-      });
+      eventStream$.sendActionExecutionResult(actionExecution.id, actionExecution.name, result);
     }
   }
 
@@ -169,11 +165,11 @@ export async function streamLangChainResponse({
       eventStream$.sendTextMessage(randomId(), result.content as string);
     }
     for (const toolCall of result.tool_calls) {
-      eventStream$.sendActionExecution({
-        actionExecutionId: toolCall.id || randomId(),
-        actionName: toolCall.name,
-        args: JSON.stringify(toolCall.args),
-      });
+      eventStream$.sendActionExecution(
+        toolCall.id || randomId(),
+        toolCall.name,
+        JSON.stringify(toolCall.args),
+      );
     }
   }
 
@@ -187,11 +183,11 @@ export async function streamLangChainResponse({
     }
     if (result.lc_kwargs?.tool_calls) {
       for (const toolCall of result.lc_kwargs?.tool_calls) {
-        eventStream$.sendActionExecution({
-          actionExecutionId: toolCall.id || randomId(),
-          actionName: toolCall.name,
-          args: JSON.stringify(toolCall.args),
-        });
+        eventStream$.sendActionExecution(
+          toolCall.id || randomId(),
+          toolCall.name,
+          JSON.stringify(toolCall.args),
+        );
       }
     }
   }
@@ -218,7 +214,6 @@ export async function streamLangChainResponse({
 
         let toolCallName: string | undefined = undefined;
         let toolCallId: string | undefined = undefined;
-        let currentMessageId: string;
         let toolCallArgs: string | undefined = undefined;
         let hasToolCall: boolean = false;
         let content = value?.content as string;
@@ -253,10 +248,10 @@ export async function streamLangChainResponse({
         // If toolCallName is defined, it means a new tool call starts.
         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) {
@@ -267,37 +262,26 @@ export async function streamLangChainResponse({
         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 = randomId();
-            eventStream$.sendTextMessageStart({ messageId: currentMessageId });
+            eventStream$.sendTextMessageStart(randomId());
           }
         }
 
         // send the content events
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content: Array.isArray(content) ? (content[0]?.text ?? "") : content,
-          });
+          eventStream$.sendTextMessageContent(
+            Array.isArray(content) ? (content[0]?.text ?? "") : content,
+          );
         } else if (mode === "function" && toolCallArgs) {
           // For calls of the same tool with different index, we seal last tool call and register a new one
           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);
@@ -305,11 +289,11 @@ export async function streamLangChainResponse({
       }
     }
   } else if (actionExecution) {
-    eventStream$.sendActionExecutionResult({
-      actionExecutionId: actionExecution.id,
-      actionName: actionExecution.name,
-      result: encodeResult(result),
-    });
+    eventStream$.sendActionExecutionResult(
+      actionExecution.id,
+      actionExecution.name,
+      encodeResult(result),
+    );
   }
 
   // unsupported type

package/src/service-adapters/openai/openai-adapter.ts

@@ -144,8 +144,7 @@ export class OpenAIAdapter implements CopilotServiceAdapter {
 
     eventSource.stream(async (eventStream$) => {
       let mode: "function" | "message" | null = null;
-      let currentMessageId: string;
-      let currentToolCallId: string;
+
       for await (const chunk of stream) {
         if (chunk.choices.length === 0) {
           continue;
@@ -159,47 +158,36 @@ export class OpenAIAdapter implements CopilotServiceAdapter {
         // If toolCall?.id is defined, it means a new tool call starts.
         if (mode === "message" && toolCall?.id) {
           mode = null;
-          eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+          eventStream$.sendTextMessageEnd();
         } else if (mode === "function" && (toolCall === undefined || toolCall?.id)) {
           mode = null;
-          eventStream$.sendActionExecutionEnd({ actionExecutionId: currentToolCallId });
+          eventStream$.sendActionExecutionEnd();
         }
 
         // If we send a new message type, send the appropriate start event.
         if (mode === null) {
           if (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);
           }
         }
 
         // send the content events
         if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content: content,
-          });
+          eventStream$.sendTextMessageContent(content);
         } else if (mode === "function" && toolCall?.function?.arguments) {
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: currentToolCallId,
-            args: toolCall.function.arguments,
-          });
+          eventStream$.sendActionExecutionArgs(toolCall.function.arguments);
         }
       }
 
       // send the end events
       if (mode === "message") {
-        eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+        eventStream$.sendTextMessageEnd();
       } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd({ actionExecutionId: currentToolCallId });
+        eventStream$.sendActionExecutionEnd();
       }
 
       eventStream$.complete();

package/src/service-adapters/openai/openai-assistant-adapter.ts

@@ -228,28 +228,22 @@ export class OpenAIAssistantAdapter implements CopilotServiceAdapter {
   private async streamResponse(stream: AssistantStream, eventSource: RuntimeEventSource) {
     eventSource.stream(async (eventStream$) => {
       let inFunctionCall = false;
-      let currentMessageId: string;
-      let currentToolCallId: string;
 
       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 (chunk.data.delta.content?.[0].type === "text") {
-              eventStream$.sendTextMessageContent({
-                messageId: currentMessageId,
-                content: chunk.data.delta.content?.[0].text.value,
-              });
+              eventStream$.sendTextMessageContent(chunk.data.delta.content?.[0].text.value);
             }
             break;
           case "thread.message.completed":
-            eventStream$.sendTextMessageEnd({ messageId: currentMessageId });
+            eventStream$.sendTextMessageEnd();
             break;
           case "thread.run.step.delta":
             let toolCallId: string | undefined;
@@ -266,25 +260,18 @@ export class OpenAIAssistantAdapter implements CopilotServiceAdapter {
 
             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();
     });