fix(acceot / reject): prevent sending message no rejection.

Author: MarcMcIntosh

refact-agent/gui/src/app/middleware.ts

@@ -12,6 +12,7 @@ import {
   newIntegrationChat,
   chatResponse,
   setIsWaitingForResponse,
+  upsertToolCall,
 } from "../features/Chat/Thread";
 import { statisticsApi } from "../services/refact/statistics";
 import { integrationsApi } from "../services/refact/integrations";
@@ -46,6 +47,7 @@ import {
   updateMaxAgentUsageAmount,
 } from "../features/AgentUsage/agentUsageSlice";
 import { ideToolCallResponse } from "../hooks/useEventBusForIDE";
+import { upsertToolCallIntoHistory } from "../features/History/historySlice";
 
 const AUTH_ERROR_MESSAGE =
   "There is an issue with your API key. Check out your API Key or re-login";
@@ -508,6 +510,12 @@ startListening({
   actionCreator: ideToolCallResponse,
   effect: (action, listenerApi) => {
     const state = listenerApi.getState();
+
+    // TODO: also handle this in confirmation box
+    if (action.payload.accepted === false) {
+      listenerApi.dispatch(upsertToolCallIntoHistory(action.payload));
+      listenerApi.dispatch(upsertToolCall(action.payload));
+    }
     listenerApi.dispatch(updateConfirmationAfterIdeToolUse(action.payload));
 
     const pauseReasons = state.confirmation.pauseReasons.filter(
@@ -516,6 +524,7 @@ startListening({
 
     if (pauseReasons.length === 0) {
       // TODO: it seems odd tool confirmation opens with no reasons.
+      // changin pause should remove it too.
       listenerApi.dispatch(
         clearPauseReasonsAndHandleToolsStatus({
           wasInteracted: true, // bit of a work around to enable auto send again.

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

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

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,
@@ -38,8 +38,14 @@ import {
 } from "./actions";
 import { formatChatResponse } from "./utils";
 import {
+  ChatMessages,
   DEFAULT_MAX_NEW_TOKENS,
+  isAssistantMessage,
+  isDiffMessage,
+  isMultiModalToolResult,
   isToolCallMessage,
+  isToolMessage,
+  ToolMessage,
   validateToolCall,
 } from "../../../services/refact";
 
@@ -335,76 +341,76 @@ export const chatReducer = createReducer(initialState, (builder) => {
     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,
-  //     );
-  //   }
-  // });
+  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 &&
-//     isToolMessage(hasToolCall) &&
-//     typeof hasToolCall.content.content === "string"
-//   ) {
-//     hasToolCall.content.content = message;
-//     return;
-//   } else if (
-//     hasToolCall &&
-//     isToolMessage(hasToolCall) &&
-//     isMultiModalToolResult(hasToolCall.content)
-//   ) {
-//     hasToolCall.content.content.push({ m_type: "text", m_content: message });
-//     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.";
-// }
+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 &&
+    isToolMessage(hasToolCall) &&
+    typeof hasToolCall.content.content === "string"
+  ) {
+    hasToolCall.content.content = message;
+    return;
+  } else if (
+    hasToolCall &&
+    isToolMessage(hasToolCall) &&
+    isMultiModalToolResult(hasToolCall.content)
+  ) {
+    hasToolCall.content.content.push({ m_type: "text", m_content: message });
+    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,
@@ -20,6 +21,7 @@ import {
   isUserMessage,
 } from "../../services/refact";
 import { AppDispatch, RootState } from "../../app/store";
+import { ideToolCallResponse } from "../../hooks/useEventBusForIDE";
 
 export type ChatHistoryItem = Omit<ChatThread, "new_chat_suggested"> & {
   createdAt: string;
@@ -144,17 +146,17 @@ export const historySlice = createSlice({
       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,
-    //   );
-    // },
+    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 => {
@@ -177,6 +179,7 @@ export const {
   setTitleGenerationCompletionForChat,
   updateChatTitleById,
   clearHistory,
+  upsertToolCallIntoHistory,
 } = historySlice.actions;
 export const { getChatById, getHistory } = historySlice.selectors;