codex-agent-framework 0.1.13__tar.gz → 0.1.14__tar.gz

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 
 This project loosely follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and uses semantic versioning where practical.
 
+## [0.1.14] - 2026-05-07
+### Added
+- Add a general `HookManager` with compatibility helpers and hook sites around message submission, commands, context/provider calls, runtime module loading, tool calls, shell execution, and file write/edit operations.
+- Add planner and scheduler built-in plugins with atomic JSON persistence safeguards.
+- Add `dependencies.txt` documenting non-Python system dependencies for browser, desktop, tray, service, TUI terminal, and audio features.
+- Add packaged system dependency installation via `codex-agent install-system-deps` and a higher-level `codex-agent bootstrap` command that can install system dependencies then install/start the user services.
+
+### Changed
+- Improve TUI SSE replay/reconnect handling so replayed deltas are rendered as a compact catch-up while live deltas continue streaming normally.
+- Keep the TUI reconnection status concise by reporting one offline message per outage and a connected message on recovery.
+
+### Fixed
+- Fix SSE cursor tracking so client replay state advances only from real sequenced events, avoiding missed events after reconnects.
+- Surface asynchronous memory archive failures through `MemoryArchiveErrorEvent` instead of swallowing them silently.
+- Clarify scheduler wakeup trigger event data around `turn_id` while preserving backward compatibility.
+
+### Tests
+- Expand regression coverage for hooks, planner schema/loading, scheduler persistence, TUI reconnect/replay behavior, CLI bootstrap/system dependency commands, and memory archive errors.
+- Validate the full suite at 412 passing tests.
+
 ## [0.1.13] - 2026-05-07
 ### Changed
 - Reorganize built-in tools into a `codex_agent.builtin_tools` package with separate modules for file, shell, vision, system, and server-tool responsibilities.

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/MANIFEST.in

@@ -3,5 +3,7 @@ include LICENSE
 include CHANGELOG.md
 recursive-include codex_agent/prompts *.txt
 include codex_agent/get_text/default_gitignore
+recursive-include codex_agent/scripts *.sh
+include dependencies.txt
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

{codex_agent_framework-0.1.13/codex_agent_framework.egg-info → codex_agent_framework-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-agent-framework
-Version: 0.1.13
+Version: 0.1.14
 Summary: A lightweight event-driven Codex agent runtime.
 Author: Baptiste
 License-Expression: MIT
@@ -74,7 +74,9 @@ It provides a reusable `Agent` abstraction with persistent sessions, local tools
 - Python 3.10 or newer.
 - A working model backend configuration compatible with `codex-backend-sdk` / OpenAI usage.
 - GTK 3 plus Ayatana AppIndicator or AppIndicator bindings are needed for the tray controller on Linux.
-- Playwright's managed Chromium browser is used for rendered web extraction when static fetching is insufficient. Install it with `python -m playwright install chromium` if needed.
+- Desktop automation on Linux/X11 uses explicit system tools: `wmctrl`, `xdotool`, and `xclip`.
+- Playwright's managed Chromium browser is used for rendered web extraction when static fetching is insufficient.
+- See `dependencies.txt` for the full list of optional non-Python system dependencies.
 
 ## Installation
 
@@ -90,6 +92,26 @@ For development:
 python -m pip install -e '.[dev]'
 ```
 
+Install optional Linux system dependencies for browser, desktop, tray, service, terminal, and audio features:
+
+```bash
+codex-agent install-system-deps -- -y
+```
+
+Or bootstrap a local desktop setup by installing system dependencies and then installing/starting the user services:
+
+```bash
+codex-agent bootstrap -- -y
+```
+
+Useful bootstrap variants:
+
+```bash
+codex-agent bootstrap --no-system-deps
+codex-agent bootstrap --no-start-service -- -y
+codex-agent install-system-deps -- --dry-run --no-tray --no-audio
+```
+
 ## Quick start
 
 Run the local server plus terminal TUI:
@@ -122,6 +144,8 @@ Install the user services for the server and tray controller:
 codex-agent install-service
 ```
 
+For a first-time Linux desktop setup, `codex-agent bootstrap -- -y` combines optional system dependency installation with service installation/startup. The command forwards arguments after `--` to the system dependency installer.
+
 Or use the agent from Python:
 
 ```python
@@ -388,7 +412,7 @@ The tests isolate `AGENT_RUNTIME_DIR` automatically, so they should not create o
 Current baseline:
 
 ```text
-376 passed
+412 passed
 ```
 
 ## Packaging
@@ -400,9 +424,10 @@ python -m pip install build
 python -m build
 ```
 
-The distribution includes prompt text files and `codex_agent/get_text/default_gitignore` through package data and `MANIFEST.in`.
+The distribution includes prompt text files, `codex_agent/get_text/default_gitignore`, and the packaged Linux system dependency installer through package data and `MANIFEST.in`.
 
 ## Recent changes
+- `0.1.14`: add HookManager infrastructure, planner/scheduler robustness fixes, documented system dependencies, `codex-agent install-system-deps`, `codex-agent bootstrap`, and improved TUI SSE reconnect/replay handling.
 - `0.1.13`: reorganize built-in tools into a `codex_agent.builtin_tools` package, keeping the public import surface compatible while separating file, shell, vision, system, and server-tool modules.
 - `0.1.12`: add a persistent Playwright/Chromium browser controller with tab navigation, DOM/action snapshots, screenshots, form/click/key tools, and `browser_goto(url)` for active-tab navigation.
 - `0.1.11`: split strict line-numbered UTF-8 `read` from unnumbered extracted `view`, preserve blank lines in read snippets, and show persistent+temporary message counts in the TUI status bar.

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/README.md

@@ -25,7 +25,9 @@ It provides a reusable `Agent` abstraction with persistent sessions, local tools
 - Python 3.10 or newer.
 - A working model backend configuration compatible with `codex-backend-sdk` / OpenAI usage.
 - GTK 3 plus Ayatana AppIndicator or AppIndicator bindings are needed for the tray controller on Linux.
-- Playwright's managed Chromium browser is used for rendered web extraction when static fetching is insufficient. Install it with `python -m playwright install chromium` if needed.
+- Desktop automation on Linux/X11 uses explicit system tools: `wmctrl`, `xdotool`, and `xclip`.
+- Playwright's managed Chromium browser is used for rendered web extraction when static fetching is insufficient.
+- See `dependencies.txt` for the full list of optional non-Python system dependencies.
 
 ## Installation
 
@@ -41,6 +43,26 @@ For development:
 python -m pip install -e '.[dev]'
 ```
 
+Install optional Linux system dependencies for browser, desktop, tray, service, terminal, and audio features:
+
+```bash
+codex-agent install-system-deps -- -y
+```
+
+Or bootstrap a local desktop setup by installing system dependencies and then installing/starting the user services:
+
+```bash
+codex-agent bootstrap -- -y
+```
+
+Useful bootstrap variants:
+
+```bash
+codex-agent bootstrap --no-system-deps
+codex-agent bootstrap --no-start-service -- -y
+codex-agent install-system-deps -- --dry-run --no-tray --no-audio
+```
+
 ## Quick start
 
 Run the local server plus terminal TUI:
@@ -73,6 +95,8 @@ Install the user services for the server and tray controller:
 codex-agent install-service
 ```
 
+For a first-time Linux desktop setup, `codex-agent bootstrap -- -y` combines optional system dependency installation with service installation/startup. The command forwards arguments after `--` to the system dependency installer.
+
 Or use the agent from Python:
 
 ```python
@@ -339,7 +363,7 @@ The tests isolate `AGENT_RUNTIME_DIR` automatically, so they should not create o
 Current baseline:
 
 ```text
-376 passed
+412 passed
 ```
 
 ## Packaging
@@ -351,9 +375,10 @@ python -m pip install build
 python -m build
 ```
 
-The distribution includes prompt text files and `codex_agent/get_text/default_gitignore` through package data and `MANIFEST.in`.
+The distribution includes prompt text files, `codex_agent/get_text/default_gitignore`, and the packaged Linux system dependency installer through package data and `MANIFEST.in`.
 
 ## Recent changes
+- `0.1.14`: add HookManager infrastructure, planner/scheduler robustness fixes, documented system dependencies, `codex-agent install-system-deps`, `codex-agent bootstrap`, and improved TUI SSE reconnect/replay handling.
 - `0.1.13`: reorganize built-in tools into a `codex_agent.builtin_tools` package, keeping the public import surface compatible while separating file, shell, vision, system, and server-tool modules.
 - `0.1.12`: add a persistent Playwright/Chromium browser controller with tab navigation, DOM/action snapshots, screenshots, form/click/key tools, and `browser_goto(url)` for active-tab navigation.
 - `0.1.11`: split strict line-numbered UTF-8 `read` from unnumbered extracted `view`, preserve blank lines in read snippets, and show persistent+temporary message counts in the TUI status bar.

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/codex_agent/__init__.py

@@ -37,6 +37,7 @@ from .message import (
     AssistantMessage,
     CompactionMessage,
     DeveloperMessage,
+    InterruptMessage,
     Message,
     MessageChunk,
     ProviderMessage,
@@ -98,6 +99,7 @@ __all__ = [
     "AssistantMessage",
     "CompactionMessage",
     "DeveloperMessage",
+    "InterruptMessage",
     "Message",
     "MessageChunk",
     "ProviderMessage",

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/codex_agent/__main__.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+import subprocess
 
 from . import Agent
 from .chat import Chat
@@ -47,6 +48,33 @@ def run_tray_mode(base_url="http://127.0.0.1:8765"):
     run_tray(base_url=base_url)
 
 
+def run_system_deps_installer(extra_args=None):
+    script = Path(__file__).parent / "scripts" / "install-system-dependencies.sh"
+    if not script.is_file():
+        raise RuntimeError(f"System dependency installer not found: {script}")
+    return subprocess.call([str(script), *(extra_args or [])])
+
+
+def run_bootstrap(
+    host="127.0.0.1",
+    port=8765,
+    *,
+    system_deps_args=None,
+    install_system_deps=True,
+    install_service=True,
+    start_service=True,
+):
+    if install_system_deps:
+        code = run_system_deps_installer(system_deps_args or [])
+        if code:
+            return code
+    if install_service:
+        path = install_user_service(host=host, port=port, enable=True, start=start_service)
+        action = "Installed and started" if start_service else "Installed"
+        print(f"{action} user services: {path}")
+    return 0
+
+
 def run_local(host="127.0.0.1", port=8765):
     import threading
     import time
@@ -77,14 +105,19 @@ def main(argv=None):
     parser.add_argument(
         "mode",
         nargs="?",
-        choices=["local", "server", "chat", "tray", "install-service", "uninstall-service"],
+        choices=["local", "server", "chat", "tray", "install-service", "uninstall-service", "install-system-deps", "bootstrap"],
         default="local",
-        help="local starts an embedded server then the TUI client; server runs only the API; chat connects to an existing API; tray starts the desktop tray controller; install-service installs a user systemd service.",
+        help="local starts an embedded server then the TUI client; server runs only the API; chat connects to an existing API; tray starts the desktop tray controller; install-service installs a user systemd service; install-system-deps installs optional OS packages; bootstrap installs system deps then user services.",
     )
     parser.add_argument("--host", default="127.0.0.1")
     parser.add_argument("--port", type=int, default=8765)
     parser.add_argument("--url", default=None, help="Base URL for chat mode, e.g. http://127.0.0.1:8765")
-    args = parser.parse_args(argv)
+    parser.add_argument("--no-system-deps", action="store_true", help="With bootstrap, skip OS dependency installation.")
+    parser.add_argument("--no-service", action="store_true", help="With bootstrap, skip user service installation.")
+    parser.add_argument("--no-start-service", action="store_true", help="With bootstrap, install services but do not start them.")
+    args, extra_args = parser.parse_known_args(argv)
+    if args.mode not in {"install-system-deps", "bootstrap"} and extra_args:
+        parser.error(f"unrecognized arguments: {' '.join(extra_args)}")
 
     if args.mode == "server":
         run_server(args.host, args.port)
@@ -98,6 +131,23 @@ def main(argv=None):
     elif args.mode == "uninstall-service":
         path = uninstall_user_service(disable=True, stop=True)
         print(f"Uninstalled user service: {path}")
+    elif args.mode == "install-system-deps":
+        installer_args = extra_args
+        if installer_args and installer_args[0] == "--":
+            installer_args = installer_args[1:]
+        raise SystemExit(run_system_deps_installer(installer_args))
+    elif args.mode == "bootstrap":
+        installer_args = extra_args
+        if installer_args and installer_args[0] == "--":
+            installer_args = installer_args[1:]
+        raise SystemExit(run_bootstrap(
+            host=args.host,
+            port=args.port,
+            system_deps_args=installer_args,
+            install_system_deps=not args.no_system_deps,
+            install_service=not args.no_service,
+            start_service=not args.no_start_service,
+        ))
     else:
         run_local(args.host, args.port)
 

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/codex_agent/agent.py

@@ -7,6 +7,7 @@ from .image import ImageMessage
 from .command import CommandManager
 from .config import ConfigManager
 from .context import ContextManager
+from .hooks import HookManager
 from .mainloop import MainLoopManager
 from .plugin import PluginsManager
 from .registry import RegistryManager
@@ -14,7 +15,7 @@ from .runtime import RuntimeManager
 from .sessions import SessionsManager
 from .status import StatusManager
 from .tool import ImageGenerationTool, reset_current_agent, set_current_agent
-from .ai import AIClient
+from .ai import AIBadRequestError, AIClient
 from .voice import VoiceProcessor
 from .latex import LaTeXProcessor
 from .event import AgentInterruptRequestedEvent, AgentInterrupted, AgentInterruptedEvent, AudioPlaybackEvent, EventBus
@@ -49,7 +50,7 @@ class Agent:
         self.plugins=self.plugins_manager.plugins
         self.sessions_manager=SessionsManager(self)
         self.runtime=RuntimeManager(self)
-        self.hooks=modict()
+        self.hooks=HookManager(self)
         self.on(AudioPlaybackEvent, self.handle_audio_playback)
         self.mainloop_manager=MainLoopManager(self)
         self._interrupt_requested=ThreadEvent()
@@ -126,7 +127,7 @@ class Agent:
             self.emit(AgentInterruptedEvent, reason=reason)
         self.emit(AgentInterruptRequestedEvent, reason=reason, interrupted=True, error=str(abort_error) if abort_error else "")
         return True
-    
+
     def clear_interrupt(self):
         self._interrupt_requested.clear()
 
@@ -189,7 +190,6 @@ class Agent:
         if self.mainloop_manager.dumping_pending:
             return self.sessions_manager.append_message(msg)
         return self.mainloop_manager.add_pending_message(msg)
-    
 
     def new_message(self,pending=False,**kwargs):
         """Helper to create and add a message based on provided keyword arguments.
@@ -203,7 +203,7 @@ class Agent:
         """
         msg=message_from_data(kwargs)
         return self.add_message(msg,pending=pending)
-    
+
     def add_image(self,source,pending=False,**kwargs):
         if source:
             img=ImageMessage(
@@ -247,21 +247,24 @@ class Agent:
         if hasattr(self, "mainloop_manager") and self.mainloop_manager.should_queue_state_command():
             return self.submit("add_hook", key=key, func=func).wait()
 
-        self.hooks.setdefault(key, []).append(func)
-        return func
+        return self.hooks.add(key, func)
 
     def has_hook(self, key):
-        return bool(self.hooks.get(key))
+        return self.hooks.has(key)
+
+    def run_hook(self, key, **payload):
+        agent_context = set_current_agent(self)
+        try:
+            return self.hooks.run(key, **payload)
+        finally:
+            reset_current_agent(agent_context)
 
     def run_hooks(self, key, *args):
-        results = []
-        for hook in list(self.hooks.get(key, ())):
-            agent_context = set_current_agent(self)
-            try:
-                results.append(hook(*args))
-            finally:
-                reset_current_agent(agent_context)
-        return results
+        agent_context = set_current_agent(self)
+        try:
+            return self.hooks.run_legacy(key, *args)
+        finally:
+            reset_current_agent(agent_context)
 
     def get_messages(self,filter=None):
         return self.sessions_manager.messages(filter=filter)
@@ -321,16 +324,21 @@ class Agent:
             )
             messages = self.context_manager.get_context()
 
-        message=self.ai.run(
-            messages=messages,
-            tools=self.registry.get_response_tools(),
-            prompt_cache_key=self.current_session_id,
-            **self.config.extract('model','reasoning_effort','verbosity','parallel_tool_calls')
-        )
+        try:
+            message=self.ai.run(
+                messages=messages,
+                tools=self.registry.get_response_tools(),
+                prompt_cache_key=self.current_session_id,
+                **self.config.extract('model','reasoning_effort','verbosity','parallel_tool_calls')
+            )
+        except AIBadRequestError:
+            self.sessions_manager.restore_api_success_backup()
+            raise
         self.sessions_manager.append_message(message)
         for item in message.output_items:
             if self.registry.server_tool_for_item(item):
                 self.sessions_manager.append_message(ServerToolResponseMessage(item=item))
+        self.sessions_manager.save_api_success_backup()
         return message
 
     def speak(self,text,**kwargs):
@@ -381,7 +389,7 @@ class Agent:
         """
         if source is None:
             raise ValueError("An audio source must be provided")
-        
+
         # Transcribe audio to text
         transcribed_text = self.ai.audio_to_text(
             source=source,

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/codex_agent/ai.py

@@ -51,6 +51,12 @@ class AIClientError(Exception):
     """Base exception for AI client errors."""
     pass
 
+
+class AIBadRequestError(AIClientError):
+    """Raised when the backend rejects the request as malformed."""
+    pass
+
+
 class APIAuthenticationError(AIClientError):
     """Exception raised for OpenAI API authentication failures."""
     pass
@@ -237,6 +243,8 @@ class AIClient:
                 **stream_params
             )
         except Exception as e:
+            if self.is_bad_request_error(e):
+                raise AIBadRequestError(str(e)) from e
             import traceback
             import sys
             print("\n[ERROR in ai.run setup]:", file=sys.stderr)
@@ -262,8 +270,20 @@ class AIClient:
         except ResponseAborted:
             raise AgentInterrupted()
         except Exception as e:
+            if self.is_bad_request_error(e):
+                raise AIBadRequestError(str(e)) from e
             yield MessageChunk(content=f"Hmmm, sorry! There was an error while reading the Codex backend stream. Here is the error message I got:\n\n ```\n{str(e)}\n```")
 
+    def is_bad_request_error(self, exc):
+        response = getattr(exc, "response", None)
+        status_code = getattr(response, "status_code", None)
+        if status_code == 400:
+            return True
+        status_code = getattr(exc, "status_code", None)
+        if status_code == 400:
+            return True
+        return "400" in str(exc) and "Bad Request" in str(exc)
+
     def get_quota_usage(self):
         try:
             return self.codex_client.usage()
@@ -346,6 +366,8 @@ class AIClient:
                 return MessageChunk(tool_calls=[tool_call])
             return MessageChunk(output_items=[item])
         if isinstance(event, ResponseFailed):
+            if getattr(event, "code", None) == 400 or "bad_request" in str(getattr(event, "code", "")).lower():
+                raise AIBadRequestError(str(getattr(event, "message", "") or event))
             return MessageChunk(content=f"Hmmm, sorry! The Codex backend returned an error:\n\n```\n[{event.code}] {event.message}\n```")
         return None
 

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/codex_agent/builtin_commands.py

@@ -11,6 +11,7 @@ MODEL_CONFIG_KEYS = (
     "input_token_limit",
     "max_input_tokens",
     "auto_compact",
+    "auto_archive_memory",
 )
 
 

{codex_agent_framework-0.1.13 → codex_agent_framework-0.1.14}/codex_agent/builtin_plugins/browser/__init__.py

@@ -30,19 +30,27 @@ def _format_browser_status(status: dict) -> str:
 class BrowserPlugin(Plugin):
     name = "browser"
     description = "Persistent Chromium browser tools and active-tab context provider."
+    system_prompt = """
+# Browser
+
+Use browser tools for interactive web pages, logged-in sessions, and workflows that require navigation, clicks, forms, or keyboard input in Chromium.
+When the browser is open, the browser_state provider gives the current active tab snapshot and screenshot; treat that provider context as the source of truth.
+Use the element ids from the latest browser_state snapshot with browser_click, browser_fill, browser_select, and browser_press.
+Prefer browser_goto to navigate the current tab, browser_open when you need to start the browser or open a new tab, and browser_select_tab when the user explicitly wants another tab.
+"""
 
     @property
     def controller(self):
         return get_browser_controller()
 
-    def browser_tool_result(self, call):
+    def tool_result(self, call):
         try:
             return call()
         except BrowserError as exc:
             return f"Browser error: {exc}"
 
     @tool
-    def browser_open(self, url: str = None, headless: bool = False, profile_name: str = "default", new_tab: bool = None):
+    def open(self, url: str = None, headless: bool = False, profile_name: str = "default", new_tab: bool = None):
         """
         description: |
             Open the persistent Playwright/Chromium browser. If the browser is closed, this starts it.
@@ -61,17 +69,17 @@ class BrowserPlugin(Plugin):
                 description: Force opening a new tab. Defaults to true when browser is already open, false for a fresh session.
                 type: boolean
         """
-        return self.browser_tool_result(lambda: _format_browser_status(self.controller.open(url=url, headless=headless, profile_name=profile_name, new_tab=new_tab)))
+        return self.tool_result(lambda: _format_browser_status(self.controller.open(url=url, headless=headless, profile_name=profile_name, new_tab=new_tab)))
 
     @tool
-    def browser_close(self):
+    def close(self):
         """
         description: Close the persistent Playwright/Chromium browser session.
         """
-        return self.browser_tool_result(lambda: self.controller.close())
+        return self.tool_result(lambda: self.controller.close())
 
     @tool
-    def browser_select_tab(self, index: int):
+    def select_tab(self, index: int):
         """
         description: Select an open browser tab by zero-based index.
         parameters:
@@ -81,17 +89,17 @@ class BrowserPlugin(Plugin):
         required:
             - index
         """
-        return self.browser_tool_result(lambda: _format_browser_status(self.controller.select_tab(index)))
+        return self.tool_result(lambda: _format_browser_status(self.controller.select_tab(index)))
 
     @tool
-    def browser_previous_page(self):
+    def previous_page(self):
         """
         description: Navigate the active browser tab back in history.
         """
-        return self.browser_tool_result(lambda: self.controller.previous_page())
+        return self.tool_result(lambda: self.controller.previous_page())
 
     @tool
-    def browser_goto(self, url: str):
+    def goto(self, url: str):
         """
         description: Navigate the active browser tab to a URL, without opening or switching tabs.
         parameters:
@@ -101,9 +109,9 @@ class BrowserPlugin(Plugin):
         required:
             - url
         """
-        return self.browser_tool_result(lambda: self.controller.goto(url))
+        return self.tool_result(lambda: self.controller.goto(url))
 
-    def browser_snapshot(self, max_elements: int = 120, include_json: bool = False):
+    def snapshot(self, max_elements: int = 120, include_json: bool = False):
         """
         description: |
             Return a compact, action-oriented snapshot of the active web browser page.
@@ -116,10 +124,10 @@ class BrowserPlugin(Plugin):
                 description: Include structured JSON snapshot data after the readable snapshot.
                 type: boolean
         """
-        return self.browser_tool_result(lambda: self.controller.snapshot(max_elements=max_elements, include_json=include_json))
+        return self.tool_result(lambda: self.controller.snapshot(max_elements=max_elements, include_json=include_json))
 
     @tool
-    def browser_click(self, element_id: str):
+    def click(self, element_id: str):
         """
         description: Click an element from the latest browser provider snapshot by ID.
         parameters:
@@ -129,10 +137,10 @@ class BrowserPlugin(Plugin):
         required:
             - element_id
         """
-        return self.browser_tool_result(lambda: self.controller.click(element_id))
+        return self.tool_result(lambda: self.controller.click(element_id))
 
     @tool
-    def browser_fill(self, element_id: str, text: str):
+    def fill(self, element_id: str, text: str):
         """
         description: Fill an input/textarea/contenteditable element from the latest browser provider snapshot by ID.
         parameters:
@@ -146,10 +154,10 @@ class BrowserPlugin(Plugin):
             - element_id
             - text
         """
-        return self.browser_tool_result(lambda: self.controller.fill(element_id, text))
+        return self.tool_result(lambda: self.controller.fill(element_id, text))
 
     @tool
-    def browser_select(self, element_id: str, value):
+    def select(self, element_id: str, value):
         """
         description: Select an option value on a select element from the latest browser provider snapshot by ID.
         parameters:
@@ -162,10 +170,10 @@ class BrowserPlugin(Plugin):
             - element_id
             - value
         """
-        return self.browser_tool_result(lambda: self.controller.select(element_id, value))
+        return self.tool_result(lambda: self.controller.select(element_id, value))
 
     @tool
-    def browser_press(self, key: str, element_id: str = None):
+    def press(self, key: str, element_id: str = None):
         """
         description: Press a keyboard key globally or on a browser provider snapshot element ID.
         parameters:
@@ -178,7 +186,7 @@ class BrowserPlugin(Plugin):
         required:
             - key
         """
-        return self.browser_tool_result(lambda: self.controller.press(key, element_id=element_id))
+        return self.tool_result(lambda: self.controller.press(key, element_id=element_id))
 
     @provider
     def browser_state(self):