refactor: send executing tool call event for tools without confirmation to go with other event handling

Author: norman-le

src/uipath_langchain/agent/tools/client_side_tool.py

@@ -61,10 +61,9 @@ def create_client_side_tool(
 ) -> StructuredTool:
     """Create a client-side tool that pauses the graph and waits for the client to execute it.
 
-    The tool uses @durable_interrupt to suspend the graph. The client SDK receives
-    an executingToolCall event, runs its registered handler, and sends endToolCall
-    back through CAS. The bridge routes that endToolCall to wait_for_resume(),
-    which unblocks the graph with the client's result.
+    The tool uses @durable_interrupt to suspend the graph. The client receives
+    an executingToolCall event, executes its registered handler, and sends
+    endToolCall back through CAS.
     """
     tool_name = sanitize_tool_name(resource.name)
     input_model = create_model_from_schema(resource.input_schema)
@@ -96,7 +95,6 @@ async def wait_for_client_execution() -> dict[str, Any]:
                     "tool_call_id": tool_call_id,
                     "tool_name": tool_name,
                     "input": kwargs,
-                    "is_execution_phase": True,
                 }
 
             result = await wait_for_client_execution()

src/uipath_langchain/chat/hitl.py

@@ -127,21 +127,12 @@ def request_approval(
     """
     tool_call_id: str = tool_args.pop("tool_call_id")
 
-    # For server-side tools, is_execution_phase=True so the bridge emits
-    # executingToolCall at the confirmation interrupt.
-    # For client-side tools, is_execution_phase=False here because the
-    # execution interrupt in client_side_tool.py handles it separately.
-    is_execution_trigger = not (tool.metadata or {}).get(
-        IS_CONVERSATIONAL_CLIENT_SIDE_TOOL, False
-    )
-
     @durable_interrupt
     def ask_confirmation():
         return {
             "tool_call_id": tool_call_id,
             "tool_name": tool.name,
             "input": tool_args,
-            "is_execution_phase": is_execution_trigger,
         }
 
     response = ask_confirmation()

src/uipath_langchain/runtime/messages.py

@@ -465,10 +465,10 @@ async def map_current_message_to_start_tool_call_events(self):
                             )
                         )
 
-                        # Emit executingToolCall from MessageMapper for tools without
-                        # a durable interrupt. Tools with interrupts (client-side, HITL)
-                        # get executingToolCall from the bridge instead.
-                        if not require_confirmation and not is_client_side:
+                        # Emit executingToolCall for tools without confirmation.
+                        # Confirmed tools get executingToolCall from the runtime
+                        # loop after the confirmation resumes.
+                        if not require_confirmation:
                             events.append(
                                 UiPathConversationMessageEvent(
                                     message_id=self.current_message.id,

tests/runtime/test_chat_message_mapper.py

@@ -2259,8 +2259,8 @@ async def test_no_executing_for_confirmation_tool(self):
         assert len(executing_events) == 0
 
     @pytest.mark.asyncio
-    async def test_no_executing_for_client_side_tool(self):
-        """Should NOT emit executingToolCall for a client-side tool (bridge handles it)."""
+    async def test_emits_executing_for_client_side_tool(self):
+        """Should emit executingToolCall for a client-side tool without confirmation."""
         storage = create_mock_storage()
         storage.get_value.return_value = {}
         mapper = UiPathChatMessagesMapper("test-runtime", storage)
@@ -2287,7 +2287,8 @@ async def test_no_executing_for_client_side_tool(self):
             for e in result
             if e.tool_call is not None and e.tool_call.executing is not None
         ]
-        assert len(executing_events) == 0
+        assert len(executing_events) == 1
+        assert executing_events[0].tool_call.executing.input == {"title": "Avatar"}
 
 
 class TestClientSideToolEndSuppression: