ui(patches): apply and replace buttons

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

@@ -511,23 +511,24 @@ startListening({
   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));
-    }
+    const toolCallUpsertPayload = {
+      ...action.payload,
+      replaceOnly: !!action.payload.accepted,
+    };
+
+    listenerApi.dispatch(upsertToolCallIntoHistory(toolCallUpsertPayload));
+    listenerApi.dispatch(upsertToolCall(toolCallUpsertPayload));
+
     listenerApi.dispatch(updateConfirmationAfterIdeToolUse(action.payload));
 
     const pauseReasons = state.confirmation.pauseReasons.filter(
       (reason) => reason.tool_call_id !== action.payload.toolCallId,
     );
 
     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.
+          wasInteracted: true,
           confirmationStatus: !!action.payload.accepted,
         }),
       );

refact-agent/gui/src/components/ChatForm/ToolConfirmation.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
 import {
   PATCH_LIKE_FUNCTIONS,
   useAppDispatch,
@@ -88,6 +88,10 @@ export const ToolConfirmation: React.FC<ToolConfirmationProps> = ({
     confirmToolUsage();
   };
 
+  const handleReject = useCallback(() => {
+    rejectToolUsage(toolCallIds);
+  }, [rejectToolUsage, toolCallIds]);
+
   const message = getConfirmationMessage(
     commands,
     rules,
@@ -101,7 +105,7 @@ export const ToolConfirmation: React.FC<ToolConfirmationProps> = ({
     return (
       <PatchConfirmation
         handleAllowForThisChat={handleAllowForThisChat}
-        rejectToolUsage={rejectToolUsage}
+        rejectToolUsage={handleReject}
         confirmToolUsage={confirmToolUsage}
       />
     );
@@ -167,9 +171,9 @@ export const ToolConfirmation: React.FC<ToolConfirmationProps> = ({
               color="red"
               variant="surface"
               size="1"
-              onClick={rejectToolUsage}
+              onClick={handleReject}
             >
-              Deny
+              Stop
             </Button>
           )}
         </Flex>
@@ -258,7 +262,7 @@ const PatchConfirmation: React.FC<PatchConfirmationProps> = ({
             size="1"
             onClick={rejectToolUsage}
           >
-            Deny
+            Stop
           </Button>
         </Flex>
       </Flex>

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

@@ -146,7 +146,7 @@ export const fixBrokenToolMessages = createAction<PayloadWithId>(
 );
 
 export const upsertToolCall = createAction<
-  Parameters<typeof ideToolCallResponse>[0]
+  Parameters<typeof ideToolCallResponse>[0] & { replaceOnly?: boolean }
 >("chatThread/upsertToolCall");
 
 // TODO: This is the circular dep when imported from hooks :/

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

@@ -356,6 +356,7 @@ export const chatReducer = createReducer(initialState, (builder) => {
         thread.messages,
         action.payload.toolCallId,
         action.payload.accepted,
+        action.payload.replaceOnly,
       );
     }
   });
@@ -365,6 +366,7 @@ export function maybeAppendToolCallResultFromIdeToMessages(
   messages: Draft<ChatMessages>,
   toolCallId: string,
   accepted: boolean | "indeterminate",
+  replaceOnly = false,
 ) {
   const hasDiff = messages.find(
     (d) => isDiffMessage(d) && d.tool_call_id === toolCallId,
@@ -377,6 +379,8 @@ export function maybeAppendToolCallResultFromIdeToMessages(
     (d) => isToolMessage(d) && d.content.tool_call_id === toolCallId,
   );
 
+  if (replaceOnly && !hasToolCall) return;
+
   if (
     hasToolCall &&
     isToolMessage(hasToolCall) &&

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

@@ -148,13 +148,18 @@ export const historySlice = createSlice({
 
     upsertToolCallIntoHistory: (
       state,
-      action: PayloadAction<Parameters<typeof ideToolCallResponse>[0]>,
+      action: PayloadAction<
+        Parameters<typeof ideToolCallResponse>[0] & {
+          replaceOnly?: boolean;
+        }
+      >,
     ) => {
       if (!(action.payload.chatId in state)) return;
       maybeAppendToolCallResultFromIdeToMessages(
         state[action.payload.chatId].messages,
         action.payload.toolCallId,
         action.payload.accepted,
+        action.payload.replaceOnly,
       );
     },
   },

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

@@ -50,9 +50,11 @@ import {
   setChatMode,
   setIsWaitingForResponse,
   setLastUserMessageId,
+  upsertToolCall,
 } from "../features/Chat";
 
 import { v4 as uuidv4 } from "uuid";
+import { upsertToolCallIntoHistory } from "../features/History/historySlice";
 
 type SubmitHandlerParams =
   | {
@@ -319,16 +321,27 @@ export const useSendChatRequest = () => {
     dispatch(setIsWaitingForResponse(false));
   }, [abort, dispatch]);
 
-  const rejectToolUsage = useCallback(() => {
-    abort();
-    dispatch(
-      clearPauseReasonsAndHandleToolsStatus({
-        wasInteracted: true,
-        confirmationStatus: false,
-      }),
-    );
-    dispatch(setIsWaitingForResponse(false));
-  }, [abort, dispatch]);
+  const rejectToolUsage = useCallback(
+    (toolCallIds: string[]) => {
+      abort();
+
+      toolCallIds.forEach((toolCallId) => {
+        dispatch(
+          upsertToolCallIntoHistory({ toolCallId, chatId, accepted: false }),
+        );
+        dispatch(upsertToolCall({ toolCallId, chatId, accepted: false }));
+      });
+
+      dispatch(
+        clearPauseReasonsAndHandleToolsStatus({
+          wasInteracted: true,
+          confirmationStatus: false,
+        }),
+      );
+      dispatch(setIsWaitingForResponse(false));
+    },
+    [abort, chatId, dispatch],
+  );
 
   const retryFromIndex = useCallback(
     (index: number, question: UserMessage["content"]) => {