[pull] main from FoundationAgents:main

.github/dependabot.yml

@@ -16,8 +16,8 @@ updates:
       browsergym-related:
         patterns:
           - "browsergym*"
-          - "browser-use"
           - "playwright"
+          - "uv"
       search-tools:
         patterns:
           - "googlesearch-python"
@@ -40,8 +40,8 @@ updates:
           - "fastapi"
           - "tiktoken"
           - "browsergym*"
-          - "browser-use"
           - "playwright"
+          - "uv"
           - "googlesearch-python"
           - "baidusearch"
           - "duckduckgo_search"

README.md

@@ -15,7 +15,7 @@ English | [中文](README_zh.md) | [한국어](README_ko.md) | [日本語](READM
 
 Manus is incredible, but OpenManus can achieve any idea without an *Invite Code* 🛫!
 
-Our team members [@Xinbin Liang](https://github.com/mannaandpoem) and [@Jinyu Xiang](https://github.com/XiangJinyu) (core authors), along with [@Zhaoyang Yu](https://github.com/MoshiQAQ), [@Jiayi Zhang](https://github.com/didiforgithub), and [@Sirui Hong](https://github.com/stellaHSR), we are from [@MetaGPT](https://github.com/geekan/MetaGPT). The prototype is launched within 3 hours and we are keeping building!
+Our team members [@Xinbing Liang](https://github.com/mannaandpoem) and [@Jinyu Xiang](https://github.com/XiangJinyu) (core authors), along with [@Zhaoyang Yu](https://github.com/MoshiQAQ), [@Jiayi Zhang](https://github.com/didiforgithub), and [@Sirui Hong](https://github.com/stellaHSR), we are from [@MetaGPT](https://github.com/geekan/MetaGPT). The prototype is launched within 3 hours and we are keeping building!
 
 It's a simple implementation, so we welcome any suggestions, contributions, and feedback!
 
@@ -83,7 +83,39 @@ source .venv/bin/activate  # On Unix/macOS
 uv pip install -r requirements.txt
 ```
 
-### Browser Automation Tool (Optional)
+### Browser automation
+
+OpenManus starts Browser Use CLI 3.0 as a default MCP server:
+
+```bash
+uvx browser-use --cli-mcp
+```
+
+`uvx` keeps Browser Use and its fast-moving dependencies isolated from the
+OpenManus environment. The agent receives the canonical Browser Use skill and
+the native `browser_exec` and `browser_screenshot` tools.
+
+Local mode attaches to Chrome or Chromium automatically and needs no API key.
+For diagnostics or to install Chromium, run:
+
+```bash
+uvx browser-use --doctor
+uvx browser-use install
+```
+
+For an isolated Browser Use Cloud browser, authenticate before starting
+OpenManus. The agent can then start and select a named remote browser:
+
+```bash
+export BROWSER_USE_API_KEY="bu_..."
+```
+
+Existing browsers can be selected with `BU_CDP_URL`, `BU_CDP_WS`, or `BU_NAME`.
+Set `OPENMANUS_DISABLE_BROWSER_USE=1` to disable the default Browser Use MCP
+server.
+
+BrowserGym still requires its Playwright browser:
+
 ```bash
 playwright install
 ```
@@ -185,7 +217,7 @@ OpenManus is built by contributors from MetaGPT. Huge thanks to this agent commu
 ## Cite
 ```bibtex
 @misc{openmanus2025,
-  author = {Xinbin Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang and Bang Liu and Yuyu Luo and Chenglin Wu},
+  author = {Xinbing Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang and Bang Liu and Yuyu Luo and Chenglin Wu},
   title = {OpenManus: An open-source framework for building general AI agents},
   year = {2025},
   publisher = {Zenodo},

README_ja.md

@@ -15,7 +15,7 @@
 
 Manusは素晴らしいですが、OpenManusは*招待コード*なしでどんなアイデアも実現できます！🛫
 
-私たちのチームメンバー [@Xinbin Liang](https://github.com/mannaandpoem) と [@Jinyu Xiang](https://github.com/XiangJinyu)（主要開発者）、そして [@Zhaoyang Yu](https://github.com/MoshiQAQ)、[@Jiayi Zhang](https://github.com/didiforgithub)、[@Sirui Hong](https://github.com/stellaHSR) は [@MetaGPT](https://github.com/geekan/MetaGPT) から来ました。プロトタイプは3時間以内に立ち上げられ、継続的に開発を進めています！
+私たちのチームメンバー [@Xinbing Liang](https://github.com/mannaandpoem) と [@Jinyu Xiang](https://github.com/XiangJinyu)（主要開発者）、そして [@Zhaoyang Yu](https://github.com/MoshiQAQ)、[@Jiayi Zhang](https://github.com/didiforgithub)、[@Sirui Hong](https://github.com/stellaHSR) は [@MetaGPT](https://github.com/geekan/MetaGPT) から来ました。プロトタイプは3時間以内に立ち上げられ、継続的に開発を進めています！
 
 これはシンプルな実装ですので、どんな提案、貢献、フィードバックも歓迎します！
 
@@ -183,7 +183,7 @@ OpenManusはMetaGPTのコントリビューターによって構築されまし
 ## 引用
 ```bibtex
 @misc{openmanus2025,
-  author = {Xinbin Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang},
+  author = {Xinbing Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang},
   title = {OpenManus: An open-source framework for building general AI agents},
   year = {2025},
   publisher = {Zenodo},

README_ko.md

@@ -15,7 +15,7 @@
 
 Manus는 놀라운 도구지만, OpenManus는 *초대 코드* 없이도 모든 아이디어를 실현할 수 있습니다! 🛫
 
-우리 팀의 멤버인 [@Xinbin Liang](https://github.com/mannaandpoem)와 [@Jinyu Xiang](https://github.com/XiangJinyu) (핵심 작성자), 그리고 [@Zhaoyang Yu](https://github.com/MoshiQAQ), [@Jiayi Zhang](https://github.com/didiforgithub), [@Sirui Hong](https://github.com/stellaHSR)이 함께 했습니다. 우리는 [@MetaGPT](https://github.com/geekan/MetaGPT)로부터 왔습니다. 프로토타입은 단 3시간 만에 출시되었으며, 계속해서 발전하고 있습니다!
+우리 팀의 멤버인 [@Xinbing Liang](https://github.com/mannaandpoem)와 [@Jinyu Xiang](https://github.com/XiangJinyu) (핵심 작성자), 그리고 [@Zhaoyang Yu](https://github.com/MoshiQAQ), [@Jiayi Zhang](https://github.com/didiforgithub), [@Sirui Hong](https://github.com/stellaHSR)이 함께 했습니다. 우리는 [@MetaGPT](https://github.com/geekan/MetaGPT)로부터 왔습니다. 프로토타입은 단 3시간 만에 출시되었으며, 계속해서 발전하고 있습니다!
 
 이 프로젝트는 간단한 구현에서 시작되었으며, 여러분의 제안, 기여 및 피드백을 환영합니다!
 
@@ -182,7 +182,7 @@ OpenManus는 MetaGPT 기여자들에 의해 개발되었습니다. 이 에이전
 ## 인용
 ```bibtex
 @misc{openmanus2025,
-  author = {Xinbin Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang},
+  author = {Xinbing Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang},
   title = {OpenManus: An open-source framework for building general AI agents},
   year = {2025},
   publisher = {Zenodo},

README_zh.md

@@ -15,7 +15,7 @@
 
 Manus 非常棒，但 OpenManus 无需邀请码即可实现任何创意 🛫！
 
-我们的团队成员 [@Xinbin Liang](https://github.com/mannaandpoem) 和 [@Jinyu Xiang](https://github.com/XiangJinyu)（核心作者），以及 [@Zhaoyang Yu](https://github.com/MoshiQAQ)、[@Jiayi Zhang](https://github.com/didiforgithub) 和 [@Sirui Hong](https://github.com/stellaHSR)，来自 [@MetaGPT](https://github.com/geekan/MetaGPT)团队。我们在 3
+我们的团队成员 [@Xinbing Liang](https://github.com/mannaandpoem) 和 [@Jinyu Xiang](https://github.com/XiangJinyu)（核心作者），以及 [@Zhaoyang Yu](https://github.com/MoshiQAQ)、[@Jiayi Zhang](https://github.com/didiforgithub) 和 [@Sirui Hong](https://github.com/stellaHSR)，来自 [@MetaGPT](https://github.com/geekan/MetaGPT)团队。我们在 3
 小时内完成了开发并持续迭代中！
 
 这是一个简洁的实现方案，欢迎任何建议、贡献和反馈！
@@ -188,7 +188,7 @@ OpenManus 由 MetaGPT 社区的贡献者共同构建，感谢这个充满活力
 ## 引用
 ```bibtex
 @misc{openmanus2025,
-  author = {Xinbin Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang},
+  author = {Xinbing Liang and Jinyu Xiang and Zhaoyang Yu and Jiayi Zhang and Sirui Hong and Sheng Fan and Xiao Tang},
   title = {OpenManus: An open-source framework for building general AI agents},
   year = {2025},
   publisher = {Zenodo},

app/agent/browser.py

@@ -1,34 +1,30 @@
 import json
 from typing import TYPE_CHECKING, Optional
 
-from pydantic import Field, model_validator
-
-from app.agent.toolcall import ToolCallAgent
+from app.agent.mcp import MCPAgent
 from app.logger import logger
-from app.prompt.browser import NEXT_STEP_PROMPT, SYSTEM_PROMPT
-from app.schema import Message, ToolChoice
-from app.tool import BrowserUseTool, Terminate, ToolCollection
-from app.tool.sandbox.sb_browser_tool import SandboxBrowserTool
+from app.prompt.browser import NEXT_STEP_PROMPT
+from app.schema import Message
+from app.tool.terminate import Terminate
 
 
 # Avoid circular import if BrowserAgent needs BrowserContextHelper
 if TYPE_CHECKING:
     from app.agent.base import BaseAgent  # Or wherever memory is defined
 
 
+_SANDBOX_BROWSER_TOOL_NAME = "sandbox_browser"
+
+
 class BrowserContextHelper:
     def __init__(self, agent: "BaseAgent"):
         self.agent = agent
         self._current_base64_image: Optional[str] = None
 
     async def get_browser_state(self) -> Optional[dict]:
-        browser_tool = self.agent.available_tools.get_tool(BrowserUseTool().name)
-        if not browser_tool:
-            browser_tool = self.agent.available_tools.get_tool(
-                SandboxBrowserTool().name
-            )
+        browser_tool = self.agent.available_tools.get_tool(_SANDBOX_BROWSER_TOOL_NAME)
         if not browser_tool or not hasattr(browser_tool, "get_current_state"):
-            logger.warning("BrowserUseTool not found or doesn't have get_current_state")
+            logger.warning("SandboxBrowserTool not found or has no current state")
             return None
         try:
             result = await browser_tool.get_current_state()
@@ -79,51 +75,40 @@ async def format_next_step_prompt(self) -> str:
         )
 
     async def cleanup_browser(self):
-        browser_tool = self.agent.available_tools.get_tool(BrowserUseTool().name)
+        browser_tool = self.agent.available_tools.get_tool(_SANDBOX_BROWSER_TOOL_NAME)
         if browser_tool and hasattr(browser_tool, "cleanup"):
             await browser_tool.cleanup()
 
 
-class BrowserAgent(ToolCallAgent):
-    """
-    A browser agent that uses the browser_use library to control a browser.
-
-    This agent can navigate web pages, interact with elements, fill forms,
-    extract content, and perform other browser-based actions to accomplish tasks.
-    """
+class BrowserAgent(MCPAgent):
+    """Browser-only agent backed by the Browser Use CLI 3.0 MCP server."""
 
     name: str = "browser"
     description: str = "A browser agent that can control a browser to accomplish tasks"
-
-    system_prompt: str = SYSTEM_PROMPT
-    next_step_prompt: str = NEXT_STEP_PROMPT
-
-    max_observe: int = 10000
-    max_steps: int = 20
-
-    # Configure the available tools
-    available_tools: ToolCollection = Field(
-        default_factory=lambda: ToolCollection(BrowserUseTool(), Terminate())
-    )
-
-    # Use Auto for tool choice to allow both tool usage and free-form responses
-    tool_choices: ToolChoice = ToolChoice.AUTO
-    special_tool_names: list[str] = Field(default_factory=lambda: [Terminate().name])
-
-    browser_context_helper: Optional[BrowserContextHelper] = None
-
-    @model_validator(mode="after")
-    def initialize_helper(self) -> "BrowserAgent":
-        self.browser_context_helper = BrowserContextHelper(self)
-        return self
-
-    async def think(self) -> bool:
-        """Process current state and decide next actions using tools, with browser state info added"""
-        self.next_step_prompt = (
-            await self.browser_context_helper.format_next_step_prompt()
+    system_prompt: str = """\
+Use Browser Use CLI 3.0 through `browser_exec`. Pass the Python body from CLI
+examples as the `code` argument. Use `browser_screenshot` when visual context
+is needed. The browser-harness session persists across calls. Use `terminate`
+when the task is complete.
+"""
+
+    async def initialize(self) -> None:
+        await super().initialize(
+            connection_type="stdio",
+            command="uvx",
+            args=["browser-use", "--cli-mcp"],
+            server_id="browser_use",
+            tool_name_prefix=False,
         )
-        return await super().think()
-
-    async def cleanup(self):
-        """Clean up browser agent resources by calling parent cleanup."""
-        await self.browser_context_helper.cleanup_browser()
+        self.available_tools.add_tool(Terminate())
+
+    @classmethod
+    async def create(cls, **kwargs) -> "BrowserAgent":
+        instance = cls(**kwargs)
+        await instance.initialize()
+        return instance
+
+    async def run(self, request: Optional[str] = None) -> str:
+        if not self.mcp_clients.sessions:
+            await self.initialize()
+        return await super().run(request)