fix: separate preprocessed tool args (#8111)

Author: RomneyDa

core/index.d.ts

@@ -478,6 +478,7 @@ interface ToolCallState {
   toolCall: ToolCall;
   status: ToolStatus;
   parsedArgs: any;
+  processedArgs?: Record<string, any>; // Added in preprocesing step
   output?: ContextItem[];
   tool?: Tool;
 }

gui/src/pages/gui/ToolCallDiv/FunctionSpecificToolCallDiv.tsx

@@ -14,6 +14,7 @@ function FunctionSpecificToolCallDiv({
   historyIndex: number;
 }) {
   const args = toolCallState.parsedArgs;
+  const processedArgs = toolCallState.processedArgs;
   const toolCall = toolCallState.toolCall;
 
   switch (toolCall.function?.name) {
@@ -28,26 +29,26 @@ function FunctionSpecificToolCallDiv({
     case BuiltInToolNames.EditExistingFile:
       return (
         <EditFile
-          relativeFilePath={args?.filepath ?? ""}
-          changes={args?.changes ?? ""}
+          relativeFilePath={processedArgs?.filepath ?? args?.filepath ?? ""}
+          changes={processedArgs?.changes ?? args?.changes ?? ""}
           toolCallId={toolCall.id}
           historyIndex={historyIndex}
         />
       );
     case BuiltInToolNames.SingleFindAndReplace:
       const edits: EditOperation[] = [
         {
-          old_string: args?.old_string ?? "",
-          new_string: args?.new_string ?? "",
-          replace_all: args?.replace_all,
+          old_string: processedArgs?.old_string ?? args?.old_string ?? "",
+          new_string: processedArgs?.new_string ?? args?.new_string ?? "",
+          replace_all: processedArgs?.replace_all ?? args?.replace_all,
         },
       ];
       return (
         <FindAndReplaceDisplay
-          editingFileContents={args?.editingFileContents}
-          fileUri={args?.fileUri ?? ""}
-          newFileContents={args?.newFileContents}
-          relativeFilePath={args?.filepath ?? ""}
+          editingFileContents={processedArgs?.editingFileContents}
+          fileUri={processedArgs?.fileUri ?? ""}
+          newFileContents={processedArgs?.newFileContents}
+          relativeFilePath={processedArgs?.filepath ?? args?.filepath ?? ""}
           edits={edits}
           toolCallId={toolCall.id}
           historyIndex={historyIndex}
@@ -56,11 +57,11 @@ function FunctionSpecificToolCallDiv({
     case BuiltInToolNames.MultiEdit:
       return (
         <FindAndReplaceDisplay
-          editingFileContents={args?.editingFileContents}
-          relativeFilePath={args?.filepath ?? ""}
-          fileUri={args?.fileUri ?? ""}
-          newFileContents={args?.newFileContents}
-          edits={args?.edits ?? []}
+          editingFileContents={processedArgs?.editingFileContents}
+          relativeFilePath={processedArgs?.filepath ?? args?.filepath ?? ""}
+          fileUri={processedArgs?.fileUri ?? ""}
+          newFileContents={processedArgs?.newFileContents}
+          edits={processedArgs?.edits ?? args?.edits ?? []}
           toolCallId={toolCall.id}
           historyIndex={historyIndex}
         />

gui/src/redux/slices/sessionSlice.ts

@@ -848,7 +848,7 @@ export const sessionSlice = createSlice({
         );
       }
     },
-    setToolCallArgs: (
+    setProcessedToolCallArgs: (
       state,
       action: PayloadAction<{
         toolCallId: string;
@@ -860,7 +860,7 @@ export const sessionSlice = createSlice({
         action.payload.toolCallId,
       );
       if (toolCallState) {
-        toolCallState.parsedArgs = action.payload.newArgs;
+        toolCallState.processedArgs = action.payload.newArgs;
       }
     },
     cancelToolCall: (
@@ -1038,7 +1038,7 @@ export const {
   acceptToolCall,
   setToolGenerated,
   updateToolCallOutput,
-  setToolCallArgs,
+  setProcessedToolCallArgs,
   setMode,
   setIsSessionMetadataLoading,
   setAllSessionMetadata,

gui/src/redux/thunks/enhanceParsedArgs.ts

@@ -4,7 +4,7 @@ import posthog from "posthog-js";
 import { IIdeMessenger } from "../../context/IdeMessenger";
 import {
   errorToolCall,
-  setToolCallArgs,
+  setProcessedToolCallArgs,
   updateToolCallOutput,
 } from "../slices/sessionSlice";
 import { AppThunkDispatch } from "../store";
@@ -61,7 +61,7 @@ export async function preprocessToolCalls(
         );
       } else if (preprocessedArgs) {
         dispatch(
-          setToolCallArgs({
+          setProcessedToolCallArgs({
             toolCallId: tcState.toolCallId,
             newArgs: preprocessedArgs,
           }),

gui/src/redux/thunks/preprocessToolCallArgs.ts

@@ -2,6 +2,7 @@ import { resolveRelativePathInDir } from "core/util/ideUtils";
 import { v4 as uuid } from "uuid";
 import { applyForEditTool } from "../../redux/thunks/handleApplyStateUpdate";
 import { ClientToolImpl } from "./callClientTool";
+
 export const editToolImpl: ClientToolImpl = async (
   args,
   toolCallId,