refactor(remove last user message): use a smarter way to remove the l…

…ast user message if it's in the response

src/events/chat.ts

@@ -42,7 +42,6 @@ export enum EVENT_NAMES_TO_CHAT {
   RECEIVE_AT_COMMAND_COMPLETION = "chat_receive_at_command_completion",
   RECEIVE_AT_COMMAND_PREVIEW = "chat_receive_at_command_preview",
   SET_SELECTED_AT_COMMAND = "chat_set_selected_command",
-  REMOVE_LAST_USER_MESSAGE = "chat_remove_last_user_message",
   SET_LAST_MODEL_USED = "chat_set_last_model_used",
   SET_SELECTED_SNIPPET = "chat_set_selected_snippet",
   REMOVE_PREVIEW_FILE_BY_NAME = "chat_remove_file_from_preview",
@@ -195,18 +194,6 @@ export function isActionToChat(action: unknown): action is ActionToChat {
   return Object.values(EVENT_NAMES).includes(action.type);
 }
 
-export interface RemoveLastUserMessage extends ActionToChat {
-  type: EVENT_NAMES_TO_CHAT.REMOVE_LAST_USER_MESSAGE;
-  payload: { id: string };
-}
-
-export function isRemoveLastUserMessage(
-  action: unknown,
-): action is RemoveLastUserMessage {
-  if (!isActionToChat(action)) return false;
-  return action.type === EVENT_NAMES_TO_CHAT.REMOVE_LAST_USER_MESSAGE;
-}
-
 export interface ReceiveAtCommandCompletion extends ActionToChat {
   type: EVENT_NAMES_TO_CHAT.RECEIVE_AT_COMMAND_COMPLETION;
   payload: { id: string } & CommandCompletionResponse;

src/hooks/useEventBusForChat.ts

@@ -39,7 +39,6 @@ import {
   SetSelectedAtCommand,
   isSetSelectedAtCommand,
   isReceiveAtCommandPreview,
-  isRemoveLastUserMessage,
   isChatUserMessageResponse,
   isChatSetLastModelUsed,
   isSetSelectedSnippet,
@@ -85,6 +84,8 @@ function reducer(state: ChatState, action: ActionToChat): ChatState {
   const isThisChat =
     action.payload?.id && action.payload.id === state.chat.id ? true : false;
 
+  console.log(action.type, { isThisChat, payload: action.payload });
+
   if (isThisChat && isSetDisableChat(action)) {
     return {
       ...state,
@@ -94,7 +95,11 @@ function reducer(state: ChatState, action: ActionToChat): ChatState {
   }
 
   if (isThisChat && isResponseToChat(action)) {
-    const messages = formatChatResponse(state.chat.messages, action.payload);
+    const hasUserMessage = isChatUserMessageResponse(action.payload);
+    const current = hasUserMessage
+      ? state.chat.messages.slice(0, state.previous_message_length)
+      : state.chat.messages;
+    const messages = formatChatResponse(current, action.payload);
     return {
       ...state,
       waiting_for_response: false,
@@ -212,7 +217,10 @@ function reducer(state: ChatState, action: ActionToChat): ChatState {
       ...state,
       streaming: false,
       waiting_for_response: false,
-      error: action.payload.message,
+      error:
+        typeof action.payload.message === "string"
+          ? action.payload.message
+          : "Error streaming",
     };
   }
 
@@ -332,21 +340,6 @@ function reducer(state: ChatState, action: ActionToChat): ChatState {
     };
   }
 
-  if (isThisChat && isRemoveLastUserMessage(action)) {
-    const messages = state.chat.messages.slice(
-      0,
-      state.previous_message_length,
-    );
-
-    return {
-      ...state,
-      chat: {
-        ...state.chat,
-        messages,
-      },
-    };
-  }
-
   // TODO: this may need to be set by the editor
   if (isThisChat && isChatSetLastModelUsed(action)) {
     return {

src/hooks/useEventBusForHost.ts

@@ -19,7 +19,6 @@ import {
   isRequestAtCommandCompletion,
   ReceiveAtCommandCompletion,
   ReceiveAtCommandPreview,
-  RemoveLastUserMessage,
 } from "../events";
 import { useConfig } from "../contexts/config-context";
 
@@ -191,13 +190,6 @@ function handleSend(
       const reader = response.body?.getReader();
       if (!reader) return;
 
-      const removeLastUserMessage: RemoveLastUserMessage = {
-        type: EVENT_NAMES_TO_CHAT.REMOVE_LAST_USER_MESSAGE,
-        payload: { id: chat.id },
-      };
-
-      window.postMessage(removeLastUserMessage, "*");
-
       return reader.read().then(function pump({ done, value }): Promise<void> {
         if (done) {
           // Do something with last chunk of data then exit reader