feat(chat): append tool call accepted message to chat when the user accepts the diff.

Author: MarcMcIntosh

refact-agent/gui/src/features/Chat/Thread/actions.ts

@@ -33,6 +33,7 @@ import {
 import { ToolCommand } from "../../../services/refact/tools";
 import { scanFoDuplicatesWith, takeFromEndWhile } from "../../../utils";
 import { debugApp } from "../../../debugConfig";
+import { ideToolCallResponse } from "../../../hooks";
 
 export const newChatAction = createAction("chatThread/new");
 
@@ -141,6 +142,10 @@ export const fixBrokenToolMessages = createAction<PayloadWithId>(
   "chatThread/fixBrokenToolMessages",
 );
 
+export const upsertToolCall = createAction<
+  Parameters<typeof ideToolCallResponse>[0]
+>("chatThread/upsertToolCall");
+
 // TODO: This is the circular dep when imported from hooks :/
 const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;

refact-agent/gui/src/features/Chat/Thread/reducer.ts

@@ -1,4 +1,4 @@
-import { createReducer } from "@reduxjs/toolkit";
+import { createReducer, Draft } from "@reduxjs/toolkit";
 import {
   Chat,
   ChatThread,
@@ -35,11 +35,17 @@ import {
   fixBrokenToolMessages,
   setIsNewChatSuggested,
   setIsNewChatSuggestionRejected,
+  upsertToolCall,
 } from "./actions";
 import { formatChatResponse } from "./utils";
 import {
+  ChatMessages,
   DEFAULT_MAX_NEW_TOKENS,
+  isAssistantMessage,
+  isDiffMessage,
   isToolCallMessage,
+  isToolMessage,
+  ToolMessage,
   validateToolCall,
 } from "../../../services/refact";
 
@@ -331,4 +337,63 @@ export const chatReducer = createReducer(initialState, (builder) => {
     const newMessage = { ...lastMessage, tool_calls: validToolCalls };
     state.thread.messages = [...messages, newMessage];
   });
+
+  builder.addCase(upsertToolCall, (state, action) => {
+    // if (action.payload.toolCallId !== state.thread.id && !(action.payload.chatId in state.cache)) return state;
+    if (action.payload.chatId === state.thread.id) {
+      maybeAppendToolCallResultFromIdeToMessages(
+        state.thread.messages,
+        action.payload.toolCallId,
+        action.payload.accepted,
+      );
+    } else if (action.payload.chatId in state.cache) {
+      const thread = state.cache[action.payload.chatId];
+      maybeAppendToolCallResultFromIdeToMessages(
+        thread.messages,
+        action.payload.toolCallId,
+        action.payload.accepted,
+      );
+    }
+  });
 });
+
+export function maybeAppendToolCallResultFromIdeToMessages(
+  messages: Draft<ChatMessages>,
+  toolCallId: string,
+  accepted: boolean | "indeterminate",
+) {
+  const hasDiff = messages.find(
+    (d) => isDiffMessage(d) && d.tool_call_id === toolCallId,
+  );
+  if (hasDiff) return;
+
+  const message = messageForToolCall(accepted);
+
+  const hasToolCall = messages.find(
+    (d) => isToolMessage(d) && d.content.tool_call_id === toolCallId,
+  );
+
+  if (hasToolCall) return;
+
+  const assistantMessageIndex = messages.findIndex((message) => {
+    if (!isAssistantMessage(message)) return false;
+    return message.tool_calls?.find((toolCall) => toolCall.id === toolCallId);
+  });
+
+  if (assistantMessageIndex === -1) return;
+  const toolMessage: ToolMessage = {
+    role: "tool",
+    content: {
+      content: message,
+      tool_call_id: toolCallId,
+    },
+  };
+
+  messages.splice(assistantMessageIndex + 1, 0, toolMessage);
+}
+
+function messageForToolCall(accepted: boolean | "indeterminate") {
+  if (accepted === false) return "The user rejected the changes.";
+  if (accepted === true) return "The user accepted the changes.";
+  return "The user may have made modifications to changes.";
+}

refact-agent/gui/src/features/History/historySlice.ts

@@ -9,6 +9,7 @@ import {
   chatGenerateTitleThunk,
   ChatThread,
   doneStreaming,
+  maybeAppendToolCallResultFromIdeToMessages,
   removeChatFromCache,
   restoreChat,
   setChatMode,
@@ -19,6 +20,7 @@ import {
   isUserMessage,
 } from "../../services/refact";
 import { AppDispatch, RootState } from "../../app/store";
+import { ideToolCallResponse } from "../../hooks/useEventBusForIDE";
 
 export type ChatHistoryItem = ChatThread & {
   createdAt: string;
@@ -141,6 +143,18 @@ export const historySlice = createSlice({
     clearHistory: () => {
       return {};
     },
+
+    upsertToolCallIntoHistory: (
+      state,
+      action: PayloadAction<Parameters<typeof ideToolCallResponse>[0]>,
+    ) => {
+      if (!(action.payload.chatId in state)) return;
+      maybeAppendToolCallResultFromIdeToMessages(
+        state[action.payload.chatId].messages,
+        action.payload.toolCallId,
+        action.payload.accepted,
+      );
+    },
   },
   selectors: {
     getChatById: (state, id: string): ChatHistoryItem | null => {
@@ -163,6 +177,7 @@ export const {
   setTitleGenerationCompletionForChat,
   updateChatTitleById,
   clearHistory,
+  upsertToolCallIntoHistory,
 } = historySlice.actions;
 export const { getChatById, getHistory } = historySlice.selectors;
 

refact-agent/gui/src/hooks/useEventBusForApp.ts

@@ -6,13 +6,14 @@ import { updateConfig } from "../features/Config/configSlice";
 import { setFileInfo } from "../features/Chat/activeFile";
 import { setSelectedSnippet } from "../features/Chat/selectedSnippet";
 import { setCurrentProjectInfo } from "../features/Chat/currentProject";
-import { newChatAction } from "../features/Chat/Thread/actions";
+import { newChatAction, upsertToolCall } from "../features/Chat/Thread/actions";
 import {
   isPageInHistory,
   push,
   selectPages,
 } from "../features/Pages/pagesSlice";
 import { ideToolCallResponse } from "./useEventBusForIDE";
+import { upsertToolCallIntoHistory } from "../features/History/historySlice";
 
 export function useEventBusForApp() {
   const config = useConfig();
@@ -45,9 +46,11 @@ export function useEventBusForApp() {
       }
 
       if (ideToolCallResponse.match(event.data)) {
-        console.log("IDE TOOL EDIT RESPONSE");
-        console.log(event.data);
-        // TODO: handle the edits
+        const actions = [
+          upsertToolCall(event.data.payload),
+          upsertToolCallIntoHistory(event.data.payload),
+        ];
+        actions.forEach((action) => dispatch(action));
       }
 
       // TODO: ideToolEditResponse.

refact-agent/gui/src/services/refact/types.ts

@@ -80,12 +80,12 @@ export interface MultiModalToolResult extends BaseToolResult {
 
 export type ToolResult = SingleModelToolResult | MultiModalToolResult;
 
-type MultiModalToolContent = {
+export type MultiModalToolContent = {
   m_type: string; // "image/*" | "text" ... maybe narrow this?
   m_content: string; // base64 if image,
 };
 
-function isMultiModalToolContent(
+export function isMultiModalToolContent(
   content: unknown,
 ): content is MultiModalToolContent {
   if (!content) return false;