Merge pull request #211 from rahulsolanki001/fix/conversation-merge-final-and-user-llm-text

fix: respect final flag in mergeMessages and handle user-llm-text event

Author: mattieruth

client-js/client/client.ts

@@ -38,6 +38,7 @@ import {
   TranscriptData,
   TransportState,
   UICancelJobGroupData,
+  UserLLMTextData,
   UICommandData,
   UIEventData,
   UIJobGroupData,
@@ -150,6 +151,7 @@ export type RTVIEventCallbacks = Partial<{
   onUserMuteStarted: () => void;
   onUserMuteStopped: () => void;
   onUserTranscript: (data: TranscriptData) => void;
+  onUserLlmText: (data: UserLLMTextData) => void;
   onBotOutput: (data: BotOutputData) => void;
   /** @deprecated Use onBotOutput instead */
   onBotTranscript: (data: BotLLMTextData) => void;
@@ -1173,6 +1175,12 @@ export class PipecatClient extends RTVIEventEmitter {
         this._options.callbacks?.onUserTranscript?.(TranscriptData);
         break;
       }
+      case RTVIMessageType.USER_LLM_TEXT: {
+        const llmTextData = ev.data as UserLLMTextData;
+        this._options.callbacks?.onUserLlmText?.(llmTextData);
+        this.emit(RTVIEvent.UserLlmText, llmTextData);
+        break;
+      }
       case RTVIMessageType.BOT_OUTPUT: {
         this._options.callbacks?.onBotOutput?.(ev.data as BotOutputData);
         break;

client-js/rtvi/events.ts

@@ -21,6 +21,7 @@ import {
   TranscriptData,
   UICommandData,
   UIJobGroupData,
+  UserLLMTextData,
 } from "./messages";
 
 export enum RTVIEvent {
@@ -65,6 +66,7 @@ export enum RTVIEvent {
   BotTranscript = "botTranscript",
 
   // llm events
+  UserLlmText = "userLlmText",
   BotLlmText = "botLlmText",
   BotLlmStarted = "botLlmStarted",
   BotLlmStopped = "botLlmStopped",
@@ -151,6 +153,7 @@ export type RTVIEvents = Partial<{
   botTranscript: (data: BotLLMTextData) => void;
 
   // llm events
+  userLlmText: (data: UserLLMTextData) => void;
   botLlmText: (data: BotLLMTextData) => void;
   botLlmStarted: () => void;
   botLlmStopped: () => void;

client-js/rtvi/messages.ts

@@ -153,6 +153,10 @@ export type BotLLMTextData = {
   text: string;
 };
 
+export type UserLLMTextData = {
+  text: string;
+};
+
 export type BotTTSTextData = {
   text: string;
 };

client-react/src/conversation/conversationActions.ts

@@ -130,6 +130,7 @@ export const mergeMessages = (
       lastMerged.role === currentMessage.role &&
       currentMessage.role !== "system" &&
       currentMessage.role !== "function_call" &&
+      !lastMerged.final &&
       timeDiff < MERGE_WINDOW_MS;
 
     if (shouldMerge) {