minitap-mobile-use 2.0.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

minitap/mobile_use/tools/mobile/copy_text_from.py

@@ -1,16 +1,15 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.controllers.mobile_command_controller import SelectorRequest
 from minitap.mobile_use.controllers.mobile_command_controller import (
     copy_text_from as copy_text_from_controller,
 )
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
 from pydantic import Field
-from typing_extensions import Annotated
+from typing import Annotated
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.graph.state import State
 from langgraph.prebuilt import InjectedState
@@ -22,7 +21,6 @@ def get_copy_text_from_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         selector_request: SelectorRequest = Field(
             ..., description="The selector to copy text from"
         ),
@@ -50,18 +48,16 @@ def get_copy_text_from_tool(ctx: MobileUseContext):
             if has_failed
             else copy_text_from_wrapper.on_success_fn(selector_request),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=copy_text_from_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/erase_one_char.py

@@ -0,0 +1,56 @@
+from langchain_core.messages import ToolMessage
+from langchain_core.tools import tool
+from langchain_core.tools.base import InjectedToolCallId
+from langgraph.prebuilt import InjectedState
+from langgraph.types import Command
+from typing import Annotated
+
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
+from minitap.mobile_use.context import MobileUseContext
+from minitap.mobile_use.controllers.mobile_command_controller import (
+    erase_text as erase_text_controller,
+)
+from minitap.mobile_use.graph.state import State
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+
+
+def get_erase_one_char_tool(ctx: MobileUseContext):
+    @tool
+    def erase_one_char(
+        tool_call_id: Annotated[str, InjectedToolCallId],
+        state: Annotated[State, InjectedState],
+        agent_thought: str,
+    ):
+        """
+        Erase one character from a text area.
+        It acts the same as pressing backspace a single time.
+        """
+        output = erase_text_controller(ctx=ctx, nb_chars=1)
+        has_failed = output is not None
+        tool_message = ToolMessage(
+            tool_call_id=tool_call_id,
+            content=erase_one_char_wrapper.on_failure_fn()
+            if has_failed
+            else erase_one_char_wrapper.on_success_fn(),
+            additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
+        )
+        return Command(
+            update=state.sanitize_update(
+                ctx=ctx,
+                update={
+                    "agents_thoughts": [agent_thought],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
+                },
+                agent="executor",
+            ),
+        )
+
+    return erase_one_char
+
+
+erase_one_char_wrapper = ToolWrapper(
+    tool_fn_getter=get_erase_one_char_tool,
+    on_success_fn=lambda: "Erased one character successfully.",
+    on_failure_fn=lambda: "Failed to erase one character.",
+)

minitap/mobile_use/tools/mobile/find_packages.py

@@ -0,0 +1,69 @@
+from langchain_core.messages import ToolMessage
+from langchain_core.tools import tool
+from langchain_core.tools.base import InjectedToolCallId
+from langgraph.prebuilt import InjectedState
+from langgraph.types import Command
+from minitap.mobile_use.agents.hopper.hopper import HopperOutput, hopper
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
+from minitap.mobile_use.context import MobileUseContext
+from minitap.mobile_use.controllers.platform_specific_commands_controller import list_packages
+from minitap.mobile_use.graph.state import State
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
+
+
+def get_find_packages_tool(ctx: MobileUseContext):
+    @tool
+    async def find_packages(
+        tool_call_id: Annotated[str, InjectedToolCallId],
+        state: Annotated[State, InjectedState],
+        appNames: list[str],
+        agent_thought: str,
+    ) -> Command:
+        """
+        Finds relevant applications.
+        Outputs the full package names list (android) or bundle ids list (IOS).
+        """
+        output: str = list_packages(ctx=ctx)
+
+        try:
+            hopper_output: HopperOutput = await hopper(
+                ctx=ctx,
+                request=f"I'm looking for the package names of the following apps: {appNames}",
+                data=output,
+            )
+            tool_message = ToolMessage(
+                tool_call_id=tool_call_id,
+                content=find_packages_wrapper.on_success_fn(
+                    hopper_output.step, hopper_output.output
+                ),
+                status="success",
+            )
+        except Exception as e:
+            print("Failed to extract insights from data: " + str(e))
+            tool_message = ToolMessage(
+                tool_call_id=tool_call_id,
+                content=find_packages_wrapper.on_failure_fn(),
+                additional_kwargs={"output": output},
+                status="error",
+            )
+
+        return Command(
+            update=state.sanitize_update(
+                ctx=ctx,
+                update={
+                    "agents_thoughts": [agent_thought, tool_message.content],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
+                },
+                agent="executor",
+            ),
+        )
+
+    return find_packages
+
+
+find_packages_wrapper = ToolWrapper(
+    tool_fn_getter=get_find_packages_tool,
+    on_success_fn=lambda thought, output: f"Packages found successfully ({thought}): {output}",
+    on_failure_fn=lambda: "Failed to find packages.",
+)

minitap/mobile_use/tools/mobile/input_text.py

@@ -1,17 +1,43 @@
-from typing import Optional
+from __future__ import annotations
+
+from typing import Literal
 
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
+from langgraph.prebuilt import InjectedState
 from langgraph.types import Command
+from pydantic import BaseModel
+from typing import Annotated
+
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
+from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import (
     input_text as input_text_controller,
 )
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
 from minitap.mobile_use.graph.state import State
-from langgraph.prebuilt import InjectedState
-from minitap.mobile_use.context import MobileUseContext
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from minitap.mobile_use.tools.utils import focus_element_if_needed, move_cursor_to_end_if_bounds
+from minitap.mobile_use.utils.logger import get_logger
+
+logger = get_logger(__name__)
+
+
+class InputResult(BaseModel):
+    """Result of an input operation from the controller layer."""
+
+    ok: bool
+    error: str | None = None
+
+
+def _controller_input_text(ctx: MobileUseContext, text: str) -> InputResult:
+    """
+    Thin wrapper to normalize the controller result.
+    """
+    controller_out = input_text_controller(ctx=ctx, text=text)
+    if controller_out is None:
+        return InputResult(ok=True)
+    return InputResult(ok=False, error=str(controller_out))
 
 
 def get_input_text_tool(ctx: MobileUseContext):
@@ -20,47 +46,44 @@ def get_input_text_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         text: str,
+        text_input_resource_id: str,
     ):
         """
-        Inputs the specified text into the UI (works even if no field is focused).
+        Focus a text field and type text into it.
 
-        Example:
-            - inputText: "Hello World"
+        - Ensure the corresponding element is focused (tap if necessary).
+        - If bounds are available, tap near the end to place the cursor at the end.
+        - Type the provided `text` using the controller.
+        """
+        focused = focus_element_if_needed(ctx=ctx, resource_id=text_input_resource_id)
+        if focused:
+            move_cursor_to_end_if_bounds(ctx=ctx, state=state, resource_id=text_input_resource_id)
 
-        Notes:
-        - Unicode not supported on Android.
+        result = _controller_input_text(ctx=ctx, text=text)
 
-        Random Input Options:
-            - inputRandomEmail
-            - inputRandomPersonName
-            - inputRandomNumber (with optional 'length', default 8)
-            - inputRandomText (with optional 'length', default 8)
+        status: Literal["success", "error"] = "success" if result.ok else "error"
+        content_msg = (
+            input_text_wrapper.on_success_fn(text)
+            if result.ok
+            else input_text_wrapper.on_failure_fn(text)
+        )
 
-        Tip:
-            Use `copyTextFrom` to reuse generated inputs in later steps.
-        """
-        output = input_text_controller(ctx=ctx, text=text)
-        has_failed = output is not None
         tool_message = ToolMessage(
             tool_call_id=tool_call_id,
-            content=input_text_wrapper.on_failure_fn(text)
-            if has_failed
-            else input_text_wrapper.on_success_fn(text),
-            additional_kwargs={"error": output} if has_failed else {},
+            content=content_msg,
+            additional_kwargs={"error": result.error} if not result.ok else {},
+            status=status,
         )
+
         return Command(
-            update=input_text_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/launch_app.py

@@ -1,14 +1,13 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.controllers.mobile_command_controller import (
     launch_app as launch_app_controller,
 )
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.graph.state import State
 from langgraph.prebuilt import InjectedState
@@ -20,7 +19,6 @@ def get_launch_app_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         package_name: str,
     ):
         """
@@ -34,18 +32,16 @@ def get_launch_app_tool(ctx: MobileUseContext):
             if has_failed
             else launch_app_wrapper.on_success_fn(package_name),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=launch_app_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/long_press_on.py

@@ -1,18 +1,17 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.prebuilt import InjectedState
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import SelectorRequest
 from minitap.mobile_use.controllers.mobile_command_controller import (
     long_press_on as long_press_on_controller,
 )
 from minitap.mobile_use.graph.state import State
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 
 
 def get_long_press_on_tool(ctx: MobileUseContext):
@@ -21,9 +20,8 @@ def get_long_press_on_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         selector_request: SelectorRequest,
-        index: Optional[int] = None,
+        index: int | None = None,
     ):
         """
         Long press on a UI element identified by the given selector.
@@ -37,18 +35,16 @@ def get_long_press_on_tool(ctx: MobileUseContext):
             if has_failed
             else long_press_on_wrapper.on_success_fn(),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=long_press_on_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/open_link.py

@@ -1,17 +1,16 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.prebuilt import InjectedState
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import (
     open_link as open_link_controller,
 )
 from minitap.mobile_use.graph.state import State
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 
 
 def get_open_link_tool(ctx: MobileUseContext):
@@ -20,7 +19,6 @@ def get_open_link_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         url: str,
     ):
         """
@@ -34,18 +32,16 @@ def get_open_link_tool(ctx: MobileUseContext):
             if has_failed
             else open_link_wrapper.on_success_fn(url),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=open_link_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/paste_text.py

@@ -1,17 +1,16 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import (
     paste_text as paste_text_controller,
 )
 from minitap.mobile_use.graph.state import State
 from langgraph.prebuilt import InjectedState
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 
 
 def get_paste_text_tool(ctx: MobileUseContext):
@@ -20,7 +19,6 @@ def get_paste_text_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
     ):
         """
         Pastes text previously copied via `copyTextFrom` into the currently focused field.
@@ -41,18 +39,16 @@ def get_paste_text_tool(ctx: MobileUseContext):
             if has_failed
             else paste_text_wrapper.on_success_fn(),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=paste_text_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/press_key.py

@@ -1,18 +1,17 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.prebuilt import InjectedState
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import Key
 from minitap.mobile_use.controllers.mobile_command_controller import (
     press_key as press_key_controller,
 )
 from minitap.mobile_use.graph.state import State
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 
 
 def get_press_key_tool(ctx: MobileUseContext):
@@ -21,7 +20,6 @@ def get_press_key_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         key: Key,
     ):
         """Press a key on the device."""
@@ -33,18 +31,16 @@ def get_press_key_tool(ctx: MobileUseContext):
             if has_failed
             else press_key_wrapper.on_success_fn(key),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=press_key_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/stop_app.py

@@ -1,15 +1,14 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.prebuilt import InjectedState
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import stop_app as stop_app_controller
 from minitap.mobile_use.graph.state import State
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 
 
 def get_stop_app_tool(ctx: MobileUseContext):
@@ -18,8 +17,7 @@ def get_stop_app_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
-        package_name: Optional[str] = None,
+        package_name: str | None = None,
     ):
         """
         Stops current application if it is running.
@@ -33,18 +31,16 @@ def get_stop_app_tool(ctx: MobileUseContext):
             if has_failed
             else stop_app_wrapper.on_success_fn(package_name),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=stop_app_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )
 

minitap/mobile_use/tools/mobile/swipe.py

@@ -1,16 +1,15 @@
-from typing import Optional
-
 from langchain_core.messages import ToolMessage
 from langchain_core.tools import tool
 from langchain_core.tools.base import InjectedToolCallId
 from langgraph.prebuilt import InjectedState
 from langgraph.types import Command
+from minitap.mobile_use.constants import EXECUTOR_MESSAGES_KEY
 from minitap.mobile_use.context import MobileUseContext
 from minitap.mobile_use.controllers.mobile_command_controller import SwipeRequest
 from minitap.mobile_use.controllers.mobile_command_controller import swipe as swipe_controller
 from minitap.mobile_use.graph.state import State
-from minitap.mobile_use.tools.tool_wrapper import ExecutorMetadata, ToolWrapper
-from typing_extensions import Annotated
+from minitap.mobile_use.tools.tool_wrapper import ToolWrapper
+from typing import Annotated
 
 
 def get_swipe_tool(ctx: MobileUseContext):
@@ -19,7 +18,6 @@ def get_swipe_tool(ctx: MobileUseContext):
         tool_call_id: Annotated[str, InjectedToolCallId],
         state: Annotated[State, InjectedState],
         agent_thought: str,
-        executor_metadata: Optional[ExecutorMetadata],
         swipe_request: SwipeRequest,
     ):
         """
@@ -31,18 +29,16 @@ def get_swipe_tool(ctx: MobileUseContext):
             tool_call_id=tool_call_id,
             content=swipe_wrapper.on_failure_fn() if has_failed else swipe_wrapper.on_success_fn(),
             additional_kwargs={"error": output} if has_failed else {},
+            status="error" if has_failed else "success",
         )
         return Command(
-            update=swipe_wrapper.handle_executor_state_fields(
+            update=state.sanitize_update(
                 ctx=ctx,
-                state=state,
-                executor_metadata=executor_metadata,
-                tool_message=tool_message,
-                is_failure=has_failed,
-                updates={
+                update={
                     "agents_thoughts": [agent_thought],
-                    "messages": [tool_message],
+                    EXECUTOR_MESSAGES_KEY: [tool_message],
                 },
+                agent="executor",
             ),
         )