fix(callout retry loop): don't retry automatically when dismising the error message, and validate tool_calls on abort or error. (#333) (#337)

Conflicts:
	src/components/ChatForm/ChatForm.tsx
	src/features/Chat/Thread/reducer.ts

 Changes to be committed:
	modified:   src/components/ChatForm/ChatForm.tsx
	modified:   src/features/Chat/Thread/actions.ts
	modified:   src/features/Chat/Thread/reducer.ts
	modified:   src/services/refact/types.ts

Author: MarcMcIntosh

src/components/ChatForm/ChatForm.tsx

@@ -15,7 +15,6 @@ import {
   useIsOnline,
   useConfig,
   useAgentUsage,
-  useSendChatRequest,
   useCapsForToolUse,
   USAGE_LIMIT_EXHAUSTED_MESSAGE,
 } from "../../hooks";
@@ -49,7 +48,7 @@ import {
   selectPreventSend,
   selectToolUse,
 } from "../../features/Chat";
-import { isUserMessage, telemetryApi } from "../../services/refact";
+import { telemetryApi } from "../../services/refact";
 import { push } from "../../features/Pages/pagesSlice";
 
 export type ChatFormProps = {
@@ -68,7 +67,6 @@ export const ChatForm: React.FC<ChatFormProps> = ({
   const dispatch = useAppDispatch();
   const isStreaming = useAppSelector(selectIsStreaming);
   const isWaiting = useAppSelector(selectIsWaiting);
-  const { retryFromIndex } = useSendChatRequest();
   const { isMultimodalitySupportedForCurrentModel } = useCapsForToolUse();
   const config = useConfig();
   const toolUse = useAppSelector(selectToolUse);
@@ -83,22 +81,7 @@ export const ChatForm: React.FC<ChatFormProps> = ({
   const messages = useAppSelector(selectMessages);
   const preventSend = useAppSelector(selectPreventSend);
 
-  const onClearError = useCallback(() => {
-    dispatch(clearError());
-    const userMessages = messages.filter(isUserMessage);
-
-    // getting second-to-last user message
-    const lastSuccessfulUserMessage =
-      userMessages.slice(-2, -1)[0] || userMessages[0];
-
-    const lastSuccessfulUserMessageIndex = messages.indexOf(
-      lastSuccessfulUserMessage,
-    );
-    retryFromIndex(
-      lastSuccessfulUserMessageIndex,
-      lastSuccessfulUserMessage.content,
-    );
-  }, [dispatch, retryFromIndex, messages]);
+  const onClearError = useCallback(() => dispatch(clearError()), [dispatch]);
 
   const disableSend = useMemo(() => {
     // TODO: if interrupting chat some errors can occur

src/features/Chat/Thread/actions.ts

@@ -123,6 +123,10 @@ export const setMaxNewTokens = createAction<number>(
   "chatThread/setMaxNewTokens",
 );
 
+export const fixBrokenToolMessages = createAction<PayloadWithId>(
+  "chatThread/fixBrokenToolMessages",
+);
+
 // TODO: This is the circular dep when imported from hooks :/
 const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
@@ -309,7 +313,10 @@ export const chatAskQuestionThunk = createAppAsyncThunk<
         }
         const reader = response.body?.getReader();
         if (!reader) return;
-        const onAbort = () => thunkAPI.dispatch(setPreventSend({ id: chatId }));
+        const onAbort = () => {
+          thunkAPI.dispatch(setPreventSend({ id: chatId }));
+          thunkAPI.dispatch(fixBrokenToolMessages({ id: chatId }));
+        };
         const onChunk = (json: Record<string, unknown>) => {
           const action = chatResponse({
             ...(json as ChatResponse),
@@ -323,6 +330,7 @@ export const chatAskQuestionThunk = createAppAsyncThunk<
         // console.log("Catch called");
         thunkAPI.dispatch(doneStreaming({ id: chatId }));
         thunkAPI.dispatch(chatError({ id: chatId, message: err.message }));
+        thunkAPI.dispatch(fixBrokenToolMessages({ id: chatId }));
         return thunkAPI.rejectWithValue(err.message);
       })
       .finally(() => {

src/features/Chat/Thread/reducer.ts

@@ -31,9 +31,14 @@ import {
   setMaxNewTokens,
   setAutomaticPatch,
   setLastUserMessageId,
+  fixBrokenToolMessages,
 } from "./actions";
 import { formatChatResponse } from "./utils";
-import { DEFAULT_MAX_NEW_TOKENS } from "../../../services/refact";
+import {
+  DEFAULT_MAX_NEW_TOKENS,
+  isToolCallMessage,
+  validateToolCall,
+} from "../../../services/refact";
 
 const createChatThread = (
   tool_use: ToolUse,
@@ -263,4 +268,16 @@ export const chatReducer = createReducer(initialState, (builder) => {
   builder.addCase(setMaxNewTokens, (state, action) => {
     state.max_new_tokens = action.payload;
   });
+
+  builder.addCase(fixBrokenToolMessages, (state, action) => {
+    if (action.payload.id !== state.thread.id) return state;
+    if (state.thread.messages.length === 0) return state;
+    const lastMessage = state.thread.messages[state.thread.messages.length - 1];
+    if (!isToolCallMessage(lastMessage)) return state;
+    if (lastMessage.tool_calls.every(validateToolCall)) return state;
+    const validToolCalls = lastMessage.tool_calls.filter(validateToolCall);
+    const messages = state.thread.messages.slice(0, -1);
+    const newMessage = { ...lastMessage, tool_calls: validToolCalls };
+    state.thread.messages = [...messages, newMessage];
+  });
 });

src/services/refact/types.ts

@@ -46,6 +46,16 @@ function isToolCall(call: unknown): call is ToolCall {
   return true;
 }
 
+export const validateToolCall = (toolCall: ToolCall) => {
+  if (!isToolCall(toolCall)) return false;
+  try {
+    JSON.parse(toolCall.function.arguments);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
 type ToolContent = string | MultiModalToolContent[];
 
 export function isToolContent(json: unknown): json is ToolContent {