Merge pull request #7315 from uinstinct/tool-call-skip

feat: continue tool calls after rejection

Author: RomneyDa

core/config/sharedConfig.ts

@@ -32,6 +32,7 @@ export const sharedConfigSchema = z
     displayRawMarkdown: z.boolean(),
     showChatScrollbar: z.boolean(),
     autoAcceptEditToolDiffs: z.boolean(),
+    continueAfterToolRejection: z.boolean(),
 
     // `tabAutocompleteOptions` in `ContinueConfig`
     useAutocompleteCache: z.boolean(),
@@ -158,6 +159,11 @@ export function modifyAnyConfigWithSharedConfig<
     configCopy.ui.showSessionTabs = sharedConfig.showSessionTabs;
   }
 
+  if (sharedConfig.continueAfterToolRejection !== undefined) {
+    configCopy.ui.continueAfterToolRejection =
+      sharedConfig.continueAfterToolRejection;
+  }
+
   configCopy.experimental = {
     ...configCopy.experimental,
   };

core/index.d.ts

@@ -1346,6 +1346,7 @@ export interface ContinueUIConfig {
   codeWrap?: boolean;
   showSessionTabs?: boolean;
   autoAcceptEditToolDiffs?: boolean;
+  continueAfterToolRejection?: boolean;
 }
 
 export interface ContextMenuConfig {

gui/src/pages/config/UserSettingsForm.tsx

@@ -82,6 +82,8 @@ export function UserSettingsForm() {
 
   // TODO defaults are in multiple places, should be consolidated and probably not explicit here
   const showSessionTabs = config.ui?.showSessionTabs ?? false;
+  const continueAfterToolRejection =
+    config.ui?.continueAfterToolRejection ?? false;
   const codeWrap = config.ui?.codeWrap ?? false;
   const showChatScrollbar = config.ui?.showChatScrollbar ?? false;
   const readResponseTTS = config.experimental?.readResponseTTS ?? false;
@@ -449,6 +451,16 @@ export function UserSettingsForm() {
                   text="@Codebase: use tool calling only"
                 />
 
+                <ToggleSwitch
+                  isToggled={continueAfterToolRejection}
+                  onToggle={() =>
+                    handleUpdate({
+                      continueAfterToolRejection: !continueAfterToolRejection,
+                    })
+                  }
+                  text="Stream after tool rejection"
+                />
+
                 {hasContinueEmail && (
                   <ContinueFeaturesMenu
                     enableStaticContextualization={

gui/src/redux/thunks/cancelToolCall.ts

@@ -1,15 +1,26 @@
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import posthog from "posthog-js";
-import { cancelToolCall as cancelToolCallAction } from "../slices/sessionSlice";
+import {
+  cancelToolCall as cancelToolCallAction,
+  updateToolCallOutput,
+} from "../slices/sessionSlice";
 import { ThunkApiType } from "../store";
 import { findToolCallById } from "../util";
+import { streamResponseAfterToolCall } from "./streamResponseAfterToolCall";
+
+const DEFAULT_USER_REJECTION_MESSAGE = `The user skipped the tool call.
+If the tool call is optional or non-critical to the main goal, skip it and continue with the next step.
+If the tool call is essential, try an alternative approach.
+If no alternatives exist, offer to pause here.`;
 
 export const cancelToolCallThunk = createAsyncThunk<
   void,
   { toolCallId: string },
   ThunkApiType
 >("chat/cancelToolCall", async ({ toolCallId }, { dispatch, getState }) => {
   const state = getState();
+  const continueAfterToolRejection =
+    state.config.config.ui?.continueAfterToolRejection;
   const toolCallState = findToolCallById(state.session.history, toolCallId);
 
   if (toolCallState) {
@@ -21,6 +32,26 @@ export const cancelToolCallThunk = createAsyncThunk<
     });
   }
 
+  if (continueAfterToolRejection) {
+    // Update tool call output with rejection message
+    dispatch(
+      updateToolCallOutput({
+        toolCallId,
+        contextItems: [
+          {
+            icon: "problems",
+            name: "Tool Call Rejected",
+            description: "User skipped the tool call",
+            content: DEFAULT_USER_REJECTION_MESSAGE,
+            hidden: true,
+          },
+        ],
+      }),
+    );
+  }
+
   // Dispatch the actual cancel action
   dispatch(cancelToolCallAction({ toolCallId }));
+
+  void dispatch(streamResponseAfterToolCall({ toolCallId }));
 });

gui/src/redux/thunks/streamResponseAfterToolCall.ts

@@ -16,6 +16,7 @@ import { streamThunkWrapper } from "./streamThunkWrapper";
  */
 function areAllToolsDoneStreaming(
   assistantMessage: ChatHistoryItemWithMessageId | undefined,
+  continueAfterToolRejection: boolean | undefined,
 ): boolean {
   // This might occur because of race conditions, if so, the tools are completed
   if (!assistantMessage?.toolCallStates) {
@@ -24,7 +25,10 @@ function areAllToolsDoneStreaming(
 
   // Only continue if all tool calls are complete
   const completedToolCalls = assistantMessage.toolCallStates.filter(
-    (tc) => tc.status === "done" || tc.status === "errored",
+    (tc) =>
+      tc.status === "done" ||
+      tc.status === "errored" ||
+      (continueAfterToolRejection && tc.status === "canceled"),
   );
 
   return completedToolCalls.length === assistantMessage.toolCallStates.length;
@@ -71,7 +75,12 @@ export const streamResponseAfterToolCall = createAsyncThunk<
             item.toolCallStates?.some((tc) => tc.toolCallId === toolCallId),
         );
 
-        if (areAllToolsDoneStreaming(assistantMessage)) {
+        if (
+          areAllToolsDoneStreaming(
+            assistantMessage,
+            state.config.config.ui?.continueAfterToolRejection,
+          )
+        ) {
           unwrapResult(await dispatch(streamNormalInput({})));
         }
       }),