Add email validation in user settings

.devcontainer/devcontainer.json

@@ -12,5 +12,4 @@
 		"ghcr.io/devcontainers/features/node:1": {},
 	},
 	"postCreateCommand": ".devcontainer/setup.sh",
-	"runArgs": ["--network=host"],
 }

.github/CODEOWNERS

@@ -5,7 +5,7 @@
 /frontend/ @rbren @amanape
 
 # Evaluation code owners
-/evaluation/ @xingyaoww @neubig
+/evaluation/ @xingyaoww @neubig 
 
 # Documentation code owners
 /docs/ @mamoodi

.github/ISSUE_TEMPLATE/bug_template.yml

@@ -33,7 +33,6 @@ body:
         - Docker command in README
         - GitHub resolver
         - Development workflow
-        - CLI
         - app.all-hands.dev
         - Other
       default: 0

.github/dependabot.yml

@@ -16,6 +16,7 @@ updates:
       mcp-packages:
         patterns:
           - "mcp"
+          - "mcpm"
       security-all:
         applies-to: "security-updates"
         patterns:

docs/docs.json

@@ -38,11 +38,12 @@
                 ]
               },
               "usage/cloud/cloud-ui",
+              "usage/cloud/cloud-issue-resolver",
               "usage/cloud/cloud-api"
             ]
           },
           {
-            "group": "Running OpenHands on Your Own",
+            "group": "Running OpenHands Locally",
             "pages": [
               "usage/local-setup",
               "usage/how-to/gui-mode",

docs/usage/cloud/cloud-issue-resolver.mdx

@@ -0,0 +1,33 @@
+---
+title: Cloud Issue Resolver
+description: The Cloud Issue Resolver automates code fixes and provides intelligent assistance for your repositories on GitHub.
+---
+
+## Setup
+
+The Cloud Issue Resolver is available automatically when you grant OpenHands Cloud repository access:
+- [GitHub repository access](./github-installation#adding-repository-access)
+
+## Usage
+
+After granting OpenHands Cloud repository access, you can use the Cloud Issue Resolver on issues and pull requests in your repositories.
+
+### Working with Issues
+
+On your repository, label an issue with `openhands` or add a message starting with
+`@openhands`. OpenHands will:
+1. Comment on the issue to let you know it is working on it
+   - You can click on the link to track the progress on OpenHands Cloud
+2. Open a pull request if it determines that the issue has been successfully resolved
+3. Comment on the issue with a summary of the performed tasks and a link to the PR
+
+### Working with Pull Requests
+
+To get OpenHands to work on pull requests, mention `@openhands` in comments to:
+- Ask questions
+- Request updates
+- Get code explanations
+
+OpenHands will:
+1. Comment to let you know it is working on it
+2. Perform the requested task

docs/usage/cloud/cloud-ui.mdx

@@ -1,36 +1,28 @@
 ---
 title: Cloud UI
-description: The Cloud UI provides a web interface for interacting with OpenHands. This page explains how to use the
- OpenHands Cloud UI.
+description: The Cloud UI provides a web interface for interacting with OpenHands AI. This page explains how to access and use the OpenHands Cloud UI.
 ---
 
-## Landing Page
 
-The landing page is where you can:
+## Accessing the UI
 
-- [Add GitHub repository access](/usage/cloud/github-installation#adding-github-repository-access) to OpenHands.
-- [Select a GitHub repo](/usage/cloud/github-installation#working-with-github-repos-in-openhands-cloud) or
-  [a GitLab repo](/usage/cloud/gitlab-installation#working-with-gitlab-repos-in-openhands-cloud) to start working on.
-- See `Suggested Tasks` for repositories that OpenHands has access to.
-- Launch an empty conversation using `Launch from Scratch`.
+The OpenHands Cloud UI can be accessed at [app.all-hands.dev](https://app.all-hands.dev). You'll need to sign in with your GitHub or GitLab account to access the interface.
 
-## Settings
-
-The Settings page allows you to:
-
-- [Configure GitHub repository access](/usage/cloud/github-installation#modifying-repository-access) for OpenHands.
-- Set application settings like your preferred language, notifications and other preferences.
-- Add credits to your account.
-- Generate custom secrets.
-- Create API keys to work with OpenHands programmatically.
 
 ## Key Features
 
-For an overview of the key features available inside a conversation, please refer to the [Key Features](../key-features)
-section of the documentation.
+For detailed information about the features available in the OpenHands Cloud UI, please refer to the [Key Features](../key-features) section of the documentation.
+
+## Settings
+
+The settings page allows you to:
+
+- Configure your account preferences.
+- Manage repository access.
+- Generate API keys for programmatic access.
+- Generate custom secrets for the agent.
 
 ## Next Steps
 
-- [Install GitHub Integration](/usage/cloud/github-installation) to use OpenHands with your GitHub repositories.
-- [Install GitLab Integration](/usage/cloud/gitlab-installation) to use OpenHands with your GitLab repositories.
-- [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.
+- [Use the Cloud Issue Resolver](./cloud-issue-resolver) to automate code fixes and get assistance.
+- [Learn about the Cloud API](./cloud-api) for programmatic access.

docs/usage/cloud/github-installation.mdx

@@ -1,7 +1,7 @@
 ---
 title: GitHub Integration
 description: This guide walks you through the process of installing OpenHands Cloud for your GitHub repositories. Once
-  set up, it will allow OpenHands to work with your GitHub repository through the Cloud UI or straight from GitHub!
+  set up, it will allow OpenHands to work with your GitHub repository through the Cloud UI or straight from GitHub issues!
 ---
 
 ## Prerequisites
@@ -37,11 +37,11 @@ You can modify GitHub repository access at any time by:
 - Selecting `Add GitHub repos` on the landing page or
 - Visiting the Settings page and selecting `Configure GitHub Repositories` under the `Git` tab
 
-## Working With GitHub Repos in Openhands Cloud
+## Working With Github Repos in Openhands Cloud
 
 Once you've granted GitHub repository access, you can start working with your GitHub repository. Use the `select a repo`
 and `select a branch` dropdowns to select the appropriate repository and branch you'd like OpenHands to work on. Then
-click on `Launch` to start the conversation!
+click on `Launch` to start the session!
 
 ![Connect Repo](/static/img/connect-repo.png)
 
@@ -67,5 +67,5 @@ To get OpenHands to work on pull requests, mention `@openhands` in the comments
 
 ## Next Steps
 
-- [Learn about the Cloud UI](/usage/cloud/cloud-ui).
-- [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.
+- [Access the Cloud UI](./cloud-ui) to interact with the web interface
+- [Use the Cloud API](./cloud-api) to programmatically interact with OpenHands

docs/usage/cloud/gitlab-installation.mdx

@@ -1,25 +1,23 @@
 ---
 title: GitLab Integration
-description: This guide walks you through the process of installing OpenHands Cloud for your GitLab repositories. Once
-  set up, it will allow OpenHands to work with your GitLab repository.
+description: This guide walks you through the process of installing and configuring OpenHands Cloud for your GitLab repositories.
 ---
 
 ## Prerequisites
 
-- Signed in to [OpenHands Cloud](https://app.all-hands.dev) with [a GitLab account](/usage/cloud/openhands-cloud).
+- A GitLab account
+- Access to OpenHands Cloud
 
-## Adding GitLab Repository Access
+## Installation Steps
 
-Upon signing into OpenHands Cloud with a GitLab account, OpenHands will have access to your repositories.
+1. Log in to [OpenHands Cloud](https://app.all-hands.dev)
+2. If you haven't connected your GitLab account yet:
+   - Click on `Log in with GitLab`
+   - Authorize the OpenHands application
 
-## Working With GitLab Repos in Openhands Cloud
 
-After signing in with a Gitlab account, use the `select a repo` and `select a branch` dropdowns to select the
-appropriate repository and branch you'd like OpenHands to work on. Then click on `Launch` to start the conversation!
-
-![Connect Repo](/static/img/connect-repo.png)
 
 ## Next Steps
 
-- [Learn about the Cloud UI](/usage/cloud/cloud-ui).
-- [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.
+- [Access the Cloud UI](./cloud-ui) to interact with the web interface
+- [Use the Cloud API](./cloud-api) to programmatically interact with OpenHands

docs/usage/cloud/openhands-cloud.mdx

@@ -14,13 +14,13 @@ You'll be prompted to connect with your GitHub or GitLab account:
 2. Review the permissions requested by OpenHands and authorize the application.
    - OpenHands will require certain permissions from your account. To read more about these permissions,
      you can click the `Learn more` link on the authorization page.
-3. Review and accept the `terms of service` and select `Continue`.
 
 ## Next Steps
 
 Once you've connected your account, you can:
 
-- [Install GitHub Integration](/usage/cloud/github-installation) to use OpenHands with your GitHub repositories.
-- [Install GitLab Integration](/usage/cloud/gitlab-installation) to use OpenHands with your GitLab repositories.
-- [Learn about the Cloud UI](/usage/cloud/cloud-ui).
-- [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.
+- [Install GitHub Integration](./github-installation) to use OpenHands with your GitHub repositories
+- [Install GitLab Integration](./gitlab-installation) to use OpenHands with your GitLab repositories
+- [Access the Cloud UI](./cloud-ui) to interact with the web interface
+- [Use the Cloud API](./cloud-api) to programmatically interact with OpenHands
+- [Set up the Cloud Issue Resolver](./cloud-issue-resolver) to automate code fixes and provide intelligent assistance

docs/usage/how-to/cli-mode.mdx

@@ -9,29 +9,16 @@ This mode is different from the [headless mode](./headless-mode), which is non-i
 
 ### Running with Python
 
-1. Install OpenHands using pip:
-
-```bash
-pip install openhands-ai
-```
-
+1. Ensure you have followed the [Development setup instructions](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md).
 2. Set your model, API key, and other preferences using environment variables or with the [`config.toml`](https://github.com/All-Hands-AI/OpenHands/blob/main/config.template.toml) file.
 3. Launch an interactive OpenHands conversation from the command line:
 
 ```bash
-openhands
+poetry run python -m openhands.cli.main
 ```
 
 This command opens an interactive prompt where you can type tasks or commands and get responses from OpenHands.
 
-#### For Developers
-
-If you have cloned the repository, you can run the CLI directly using Poetry:
-
-```bash
-poetry run python -m openhands.cli.main
-```
-
 ### Running with Docker
 
 1. Set the following environment variables in your terminal:

docs/usage/how-to/custom-sandbox-guide.mdx

@@ -46,7 +46,7 @@ This will produce a new image called `custom-image`, which will be available in
 
 ## Using the Docker Command
 
-When running OpenHands using [the docker command](/usage/local-setup#start-the-app), replace
+When running OpenHands using [the docker command](/usage/installation#start-the-app), replace
 `-e SANDBOX_RUNTIME_CONTAINER_IMAGE=...` with `-e SANDBOX_BASE_CONTAINER_IMAGE=<custom image name>`:
 
 ```commandline

docs/usage/how-to/github-action.mdx

@@ -48,6 +48,6 @@ The customization options you can set are:
 | `LLM_MODEL`                      | Variable | Set the LLM to use with OpenHands                                                                   | `LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"` |
 | `OPENHANDS_MAX_ITER`             | Variable | Set max limit for agent iterations                                                                  | `OPENHANDS_MAX_ITER=10`                            |
 | `OPENHANDS_MACRO`                | Variable | Customize default macro for invoking the resolver                                                   | `OPENHANDS_MACRO=@resolveit`                       |
-| `OPENHANDS_BASE_CONTAINER_IMAGE` | Variable | Custom Sandbox ([learn more](/usage/how-to/custom-sandbox-guide))                                   | `OPENHANDS_BASE_CONTAINER_IMAGE="custom_image"`    |
+| `OPENHANDS_BASE_CONTAINER_IMAGE` | Variable | Custom Sandbox ([learn more](https://docs.all-hands.dev/modules/usage/how-to/custom-sandbox-guide)) | `OPENHANDS_BASE_CONTAINER_IMAGE="custom_image"`    |
 | `TARGET_BRANCH`                  | Variable | Merge to branch other than `main`                                                                   | `TARGET_BRANCH="dev"`                              |
 | `TARGET_RUNNER`                  | Variable | Target runner to execute the agent workflow (default ubuntu-latest)                                 | `TARGET_RUNNER="custom-runner"`                    |

docs/usage/installation.mdx

@@ -16,4 +16,4 @@ For more information see [getting started with OpenHands Cloud.](/usage/cloud/op
 
 Run OpenHands on your local system and bring your own LLM and API key.
 
-For more information see [running OpenHands on your own.](/usage/local-setup)
+For more information see [running OpenHands locally.](/usage/local-setup)

docs/usage/llms/local-llms.mdx

@@ -48,7 +48,7 @@ We recommend using [LMStudio](https://lmstudio.ai/) for serving these models loc
 
 ### Start OpenHands with locally served model
 
-Check [the installation guide](/usage/local-setup) to make sure you have all the prerequisites for running OpenHands.
+Check [the installation guide](https://docs.all-hands.dev/modules/usage/installation) to make sure you have all the prerequisites for running OpenHands.
 
 ```bash
 export LMSTUDIO_MODEL_NAME="imported-models/uncategorized/devstralq4_k_m.gguf" # <- Replace this with the model name you copied from LMStudio

docs/usage/prompting/microagents-overview.mdx

@@ -11,7 +11,7 @@ Currently OpenHands supports the following types of microagents:
 - [Keyword-Triggered Microagents](./microagents-keyword): Guidelines activated by specific keywords in prompts.
 
 To customize OpenHands' behavior, create a .openhands/microagents/ directory in the root of your repository and
-add `<microagent_name>.md` files inside. For repository-specific guidelines, you can ask OpenHands to analyze your repository and create a comprehensive `repo.md` file (see [General Microagents](./microagents-repo) for details).
+add `<microagent_name>.md` files inside.
 
 <Note>
 Loaded microagents take up space in the context window.

docs/usage/prompting/microagents-repo.mdx

@@ -17,45 +17,13 @@ Frontmatter should be enclosed in triple dashes (---) and may include the follow
 |-----------|-----------------------------------------|----------|----------------|
 | `agent`   | The agent this microagent applies to    | No       | 'CodeActAgent' |
 
-## Creating a Comprehensive Repository Agent
-
-To create an effective repository agent, you can ask OpenHands to analyze your repository with a prompt like:
+## Example
 
+General microagent file example located at `.openhands/microagents/repo.md`:
 ```
-Please browse the repository, look at the documentation and relevant code, and understand the purpose of this repository.
-
-Specifically, I want you to create a `.openhands/microagents/repo.md` file. This file should contain succinct information that summarizes:
-1. The purpose of this repository
-2. The general setup of this repo
-3. A brief description of the structure of this repo
-
-Read all the GitHub workflows under .github/ of the repository (if this folder exists) to understand the CI checks (e.g., linter, pre-commit), and include those in the repo.md file.
-```
-
-This approach helps OpenHands capture repository context efficiently, reducing the need for repeated searches during conversations and ensuring more accurate solutions.
-
-## Example Content
-
-A comprehensive repository agent file (`.openhands/microagents/repo.md`) should include:
-
-```
-# Repository Purpose
 This project is a TODO application that allows users to track TODO items.
 
-# Setup Instructions
 To set it up, you can run `npm run build`.
-
-# Repository Structure
-- `/src`: Core application code
-- `/tests`: Test suite
-- `/docs`: Documentation
-- `/.github`: CI/CD workflows
-
-# CI/CD Workflows
-- `lint.yml`: Runs ESLint on all JavaScript files
-- `test.yml`: Runs the test suite on pull requests
-
-# Development Guidelines
 Always make sure the tests are passing before committing changes. You can run the tests by running `npm run test`.
 ```
 

evaluation/README.md

@@ -71,6 +71,7 @@ EVAL_CONDENSER=summarizer_for_eval \
 The name is up to you, but should match a name defined in your `config.toml` file. The last argument in the command specifies the condenser configuration to use. In this case, `summarizer_for_eval` is used, which refers to the LLM-based summarizing condenser as defined above.
 
 If no condenser configuration is specified, the 'noop' condenser will be used by default, which keeps the full conversation history.
+```
 
 For other configurations specific to evaluation, such as `save_trajectory_path`, these are typically set in the `get_config` function of the respective `run_infer.py` file for each benchmark.
 

frontend/src/components/shared/modals/settings/settings-form.tsx

@@ -96,7 +96,7 @@ export function SettingsForm({ settings, models, onClose }: SettingsFormProps) {
             testId="llm-api-key-help-anchor"
             text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
             linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
-            href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
+            href="https://docs.all-hands.dev/usage/installation#getting-an-api-key"
           />
         </div>
 

frontend/src/hooks/query/use-settings.ts

@@ -45,7 +45,6 @@ export const useSettings = () => {
     // would want to show the modal immediately if the
     // settings are not found
     retry: (_, error) => error.status !== 404,
-    refetchOnWindowFocus: false,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes
     enabled: !isOnTosPage && !!userIsAuthenticated,

frontend/src/i18n/declaration.ts

@@ -567,7 +567,6 @@ export enum I18nKey {
   SETTINGS$SENDING = "SETTINGS$SENDING",
   SETTINGS$VERIFICATION_EMAIL_SENT = "SETTINGS$VERIFICATION_EMAIL_SENT",
   SETTINGS$EMAIL_VERIFICATION_REQUIRED = "SETTINGS$EMAIL_VERIFICATION_REQUIRED",
-  SETTINGS$INVALID_EMAIL_FORMAT = "SETTINGS$INVALID_EMAIL_FORMAT",
   SETTINGS$EMAIL_VERIFICATION_RESTRICTION_MESSAGE = "SETTINGS$EMAIL_VERIFICATION_RESTRICTION_MESSAGE",
   SETTINGS$RESEND_VERIFICATION = "SETTINGS$RESEND_VERIFICATION",
   SETTINGS$FAILED_TO_RESEND_VERIFICATION = "SETTINGS$FAILED_TO_RESEND_VERIFICATION",

frontend/src/routes/llm-settings.tsx

@@ -304,7 +304,7 @@ function LlmSettingsScreen() {
                 testId="llm-api-key-help-anchor"
                 text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
                 linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
-                href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
+                href="https://docs.all-hands.dev/usage/installation#getting-an-api-key"
               />
 
               <SettingsInput
@@ -379,7 +379,7 @@ function LlmSettingsScreen() {
                 testId="llm-api-key-help-anchor-advanced"
                 text={t(I18nKey.SETTINGS$DONT_KNOW_API_KEY)}
                 linkText={t(I18nKey.SETTINGS$CLICK_FOR_INSTRUCTIONS)}
-                href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
+                href="https://docs.all-hands.dev/usage/installation#getting-an-api-key"
               />
 
               <SettingsInput

frontend/src/routes/user-settings.tsx

@@ -50,12 +50,9 @@ function EmailInputSection({
             data-testid="email-input"
           />
         </div>
-
+        
         {isEmailChanged && !isEmailValid && (
-          <div
-            className="text-red-500 text-sm mt-1"
-            data-testid="email-validation-error"
-          >
+          <div className="text-red-500 text-sm mt-1" data-testid="email-validation-error">
             {t("SETTINGS$INVALID_EMAIL_FORMAT")}
           </div>
         )}

frontend/src/utils/tips.ts

@@ -12,7 +12,7 @@ export const TIPS: Tip[] = [
   },
   {
     key: I18nKey.TIPS$SETUP_SCRIPT,
-    link: "https://docs.all-hands.dev/usage/prompting/repository#setup-script",
+    link: "https://docs.all-hands.dev/usage/customization/repository",
   },
   { key: I18nKey.TIPS$VSCODE_INSTANCE },
   { key: I18nKey.TIPS$SAVE_WORK },
@@ -30,7 +30,7 @@ export const TIPS: Tip[] = [
   },
   {
     key: I18nKey.TIPS$GITHUB_HOOK,
-    link: "https://docs.all-hands.dev/usage/cloud/github-installation#working-on-github-issues-and-pull-requests-using-openhands",
+    link: "https://docs.all-hands.dev/usage/cloud/cloud-issue-resolver",
   },
   {
     key: I18nKey.TIPS$BLOG_SIGNUP,
@@ -38,7 +38,7 @@ export const TIPS: Tip[] = [
   },
   {
     key: I18nKey.TIPS$API_USAGE,
-    link: "https://docs.all-hands.dev/api-reference/health-check",
+    link: "https://docs.all-hands.dev/swagger-ui/",
   },
 ];
 

microagents/README.md

@@ -117,10 +117,7 @@ You can see an example of a repo agent in [the agent for the OpenHands repo itse
    - Include repository structure details
    - Specify testing and build procedures
    - List environment requirements
-   - Document CI workflows and checks
-   - Include information about code quality standards
    - Maintain up-to-date team practices
-   - Consider using OpenHands to generate a comprehensive repo.md (see [Creating a Repository Agent](#creating-a-repository-agent))
    - YAML frontmatter is optional - files without frontmatter will be loaded with default settings
 
 ### Submission Process

microagents/add_agent.md

@@ -37,4 +37,5 @@ When creating a new microagent:
 For detailed information, see:
 
 - [Microagents Overview](https://docs.all-hands.dev/usage/prompting/microagents-overview)
+- [Microagents Syntax](https://docs.all-hands.dev/usage/prompting/microagents-syntax)
 - [Example GitHub Microagent](https://github.com/All-Hands-AI/OpenHands/blob/main/microagents/github.md)

microagents/add_repo_inst.md

@@ -1,65 +0,0 @@
----
-name: add_repo_inst
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /add_repo_inst
-inputs:
-  - name: REPO_FOLDER_NAME
-    description: "Branch for the agent to work on"
----
-
-Please browse the current repository under /workspace/{{ REPO_FOLDER_NAME }}, look at the documentation and relevant code, and understand the purpose of this repository.
-
-Specifically, I want you to create a `.openhands/microagents/repo.md`  file. This file should contain succinct information that summarizes (1) the purpose of this repository, (2) the general setup of this repo, and (3) a brief description of the structure of this repo.
-
-Here's an example:
-```markdown
----
-name: repo
-type: repo
-agent: CodeActAgent
----
-
-This repository contains the code for OpenHands, an automated AI software engineer. It has a Python backend
-(in the `openhands` directory) and React frontend (in the `frontend` directory).
-
-## General Setup:
-To set up the entire repo, including frontend and backend, run `make build`.
-You don't need to do this unless the user asks you to, or if you're trying to run the entire application.
-
-Before pushing any changes, you should ensure that any lint errors or simple test errors have been fixed.
-
-* If you've made changes to the backend, you should run `pre-commit run --all-files --config ./dev_config/python/.pre-commit-config.yaml`
-* If you've made changes to the frontend, you should run `cd frontend && npm run lint:fix && npm run build ; cd ..`
-
-If either command fails, it may have automatically fixed some issues. You should fix any issues that weren't automatically fixed,
-then re-run the command to ensure it passes.
-
-## Repository Structure
-Backend:
-- Located in the `openhands` directory
-- Testing:
-  - All tests are in `tests/unit/test_*.py`
-  - To test new code, run `poetry run pytest tests/unit/test_xxx.py` where `xxx` is the appropriate file for the current functionality
-  - Write all tests with pytest
-
-Frontend:
-- Located in the `frontend` directory
-- Prerequisites: A recent version of NodeJS / NPM
-- Setup: Run `npm install` in the frontend directory
-- Testing:
-  - Run tests: `npm run test`
-  - To run specific tests: `npm run test -- -t "TestName"`
-- Building:
-  - Build for production: `npm run build`
-- Environment Variables:
-  - Set in `frontend/.env` or as environment variables
-  - Available variables: VITE_BACKEND_HOST, VITE_USE_TLS, VITE_INSECURE_SKIP_VERIFY, VITE_FRONTEND_PORT
-- Internationalization:
-  - Generate i18n declaration file: `npm run make-i18n`
-```
-
-Now, please write a similar markdown for the current repository.
-Read all the GitHub workflows under .github/ of the repository (if this folder exists) to understand the CI checks (e.g., linter, pre-commit), and include those in the repo.md file.

microagents/address_pr_comments.md

@@ -1,19 +0,0 @@
----
-name: address_pr_comments
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /address_pr_comments
-inputs:
-  - name: PR_URL
-    description: "URL of the pull request"
-  - name: BRANCH_NAME
-    description: "Branch name corresponds to the pull request"
----
-
-First, check the branch {{ BRANCH_NAME }} and read the diff against the main branch to understand the purpose.
-
-This branch corresponds to this PR {{ PR_URL }}
-
-Next, you should use the GitHub API to read the reviews and comments on this PR and address them.

microagents/fix_test.md

@@ -1,23 +0,0 @@
----
-name: fix_test
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /fix_test
-inputs:
-  - name: BRANCH_NAME
-    description: "Branch for the agent to work on"
-  - name: TEST_COMMAND_TO_RUN
-    description: "The test command you want the agent to work on. For example, `pytest tests/unit/test_bash_parsing.py`"
-  - name: FUNCTION_TO_FIX
-    description: "The name of function to fix"
-  - name: FILE_FOR_FUNCTION
-    description: "The path of the file that contains the function"
----
-
-Can you check out branch "{{ BRANCH_NAME }}", and run {{ TEST_COMMAND_TO_RUN }}.
-
-Help me fix these tests to pass by fixing the {{ FUNCTION_TO_FIX }} function in file {{ FILE_FOR_FUNCTION }}.
-
-PLEASE DO NOT modify the tests by yourself -- Let me know if you think some of the tests are incorrect.

microagents/update_pr_description.md

@@ -1,21 +0,0 @@
----
-name: update_pr_description
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /update_pr_description
-inputs:
-  - name: PR_URL
-    description: "URL of the pull request"
-    type: string
-    validation:
-      pattern: "^https://github.com/.+/.+/pull/[0-9]+$"
-  - name: BRANCH_NAME
-    description: "Branch name corresponds to the pull request"
-    type: string
----
-
-Please check the branch "{{ BRANCH_NAME }}" and look at the diff against the main branch. This branch belongs to this PR "{{ PR_URL }}".
-
-Once you understand the purpose of the diff, please use Github API to read the existing PR description, and update it to be more reflective of the changes we've made when necessary.

microagents/update_test.md

@@ -1,19 +0,0 @@
----
-name: update_test
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /update_test
-inputs:
-  - name: BRANCH_NAME
-    description: "Branch for the agent to work on"
-  - name: TEST_COMMAND_TO_RUN
-    description: "The test command you want the agent to work on. For example, `pytest tests/unit/test_bash_parsing.py`"
----
-
-Can you check out branch "{{ BRANCH_NAME }}", and run {{ TEST_COMMAND_TO_RUN }}.
-
-The current implementation of the code is correct BUT the test functions {{ FUNCTION_TO_FIX }} in file {{ FILE_FOR_FUNCTION }} are failing.
-
-Please update the test file so that they pass with the current version of the implementation.

openhands/cli/tui.py

@@ -12,7 +12,7 @@ from prompt_toolkit import PromptSession, print_formatted_text
 from prompt_toolkit.application import Application
 from prompt_toolkit.completion import CompleteEvent, Completer, Completion
 from prompt_toolkit.document import Document
-from prompt_toolkit.formatted_text import HTML, StyleAndTextTuples
+from prompt_toolkit.formatted_text import HTML, FormattedText, StyleAndTextTuples
 from prompt_toolkit.input import create_input
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.key_binding.key_processor import KeyPressEvent
@@ -132,113 +132,51 @@ def display_initialization_animation(text: str, is_loaded: asyncio.Event) -> Non
 
 
 def display_banner(session_id: str) -> None:
-    banner_text = r"""<gold>
+    print_formatted_text(
+        HTML(r"""<gold>
      ___                    _   _                 _
     /  _ \ _ __   ___ _ __ | | | | __ _ _ __   __| |___
     | | | | '_ \ / _ \ '_ \| |_| |/ _` | '_ \ / _` / __|
     | |_| | |_) |  __/ | | |  _  | (_| | | | | (_| \__ \
     \___ /| .__/ \___|_| |_|_| |_|\__,_|_| |_|\__,_|___/
           |_|
-    </gold>"""
-
-    # Use TextArea with focusable=True to allow text selection
-    banner_container = Frame(
-        TextArea(
-            text=banner_text.replace('<gold>', '').replace('</gold>', ''),
-            read_only=True,
-            style=COLOR_GOLD,
-            wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
-        ),
-        style=f'fg:{COLOR_GOLD}',
+    </gold>"""),
+        style=DEFAULT_STYLE,
     )
-    print_container(banner_container)
 
-    # Call print_formatted_text to maintain compatibility with tests
+    print_formatted_text(HTML(f'<grey>OpenHands CLI v{__version__}</grey>'))
+
     print_formatted_text('')
-
-    version_container = Frame(
-        TextArea(
-            text=f'OpenHands CLI v{__version__}',
-            read_only=True,
-            style=COLOR_GREY,
-            wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
-        ),
-        style=f'fg:{COLOR_GREY}',
-    )
-    print_container(version_container)
-
-    # Call print_formatted_text to maintain compatibility with tests
-    print_formatted_text('')
-
-    session_container = Frame(
-        TextArea(
-            text=f'Initialized conversation {session_id}',
-            read_only=True,
-            style=COLOR_GREY,
-            wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
-        ),
-        style=f'fg:{COLOR_GREY}',
-    )
-    print_formatted_text('')
-    print_container(session_container)
+    print_formatted_text(HTML(f'<grey>Initialized conversation {session_id}</grey>'))
     print_formatted_text('')
 
 
 def display_welcome_message(message: str = '') -> None:
-    # Use TextArea with focusable=True to allow text selection
-    welcome_container = Frame(
-        TextArea(
-            text="Let's start building!",
-            read_only=True,
-            style=COLOR_GOLD,
-            wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
-        ),
-        style=f'fg:{COLOR_GOLD}',
+    print_formatted_text(
+        HTML("<gold>Let's start building!</gold>\n"), style=DEFAULT_STYLE
     )
-    print_container(welcome_container)
-
-    # Call print_formatted_text to maintain compatibility with tests
-    print_formatted_text('')
-
     if message:
-        message_text = f'{message} Type /help for help'
+        print_formatted_text(
+            HTML(f'{message} <grey>Type /help for help</grey>'),
+            style=DEFAULT_STYLE,
+        )
     else:
-        message_text = 'What do you want to build? Type /help for help'
-
-    message_container = Frame(
-        TextArea(
-            text=message_text,
-            read_only=True,
-            style=COLOR_GREY,
-            wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
-        ),
-        style=f'fg:{COLOR_GREY}',
-    )
-    print_container(message_container)
-
-    # Call print_formatted_text to maintain compatibility with tests
-    print_formatted_text('')
+        print_formatted_text(
+            HTML('What do you want to build? <grey>Type /help for help</grey>'),
+            style=DEFAULT_STYLE,
+        )
 
 
 def display_initial_user_prompt(prompt: str) -> None:
-    # Use TextArea with focusable=True to allow text selection
-    prompt_container = Frame(
-        TextArea(
-            text=f'> {prompt}',
-            read_only=True,
-            style=COLOR_GOLD,
-            wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
-        ),
-        style=f'fg:{COLOR_GOLD}',
+    print_formatted_text(
+        FormattedText(
+            [
+                ('', '\n'),
+                (COLOR_GOLD, '> '),
+                ('', prompt),
+            ]
+        )
     )
-    print_formatted_text('')
-    print_container(prompt_container)
 
 
 # Prompt output display functions
@@ -286,7 +224,6 @@ def display_error(error: str) -> None:
                 read_only=True,
                 style='ansired',
                 wrap_lines=True,
-                focusable=True,  # Allow focusing to enable text selection
             ),
             title='Error',
             style='ansired',
@@ -302,7 +239,6 @@ def display_command(event: CmdRunAction) -> None:
             read_only=True,
             style=COLOR_GREY,
             wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
         ),
         title='Command',
         style='ansiblue',
@@ -331,7 +267,6 @@ def display_command_output(output: str) -> None:
             read_only=True,
             style=COLOR_GREY,
             wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
         ),
         title='Command Output',
         style=f'fg:{COLOR_GREY}',
@@ -347,7 +282,6 @@ def display_file_edit(event: FileEditObservation) -> None:
             read_only=True,
             wrap_lines=True,
             lexer=CustomDiffLexer(),
-            focusable=True,  # Allow focusing to enable text selection
         ),
         title='File Edit',
         style=f'fg:{COLOR_GREY}',
@@ -364,7 +298,6 @@ def display_file_read(event: FileReadObservation) -> None:
             read_only=True,
             style=COLOR_GREY,
             wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
         ),
         title='File Read',
         style=f'fg:{COLOR_GREY}',
@@ -383,7 +316,6 @@ def initialize_streaming_output():
         read_only=True,
         style=COLOR_GREY,
         wrap_lines=True,
-        focusable=True,  # Allow focusing to enable text selection
     )
     container = Frame(
         streaming_output_text_area,
@@ -493,7 +425,6 @@ def display_usage_metrics(usage_metrics: UsageMetrics) -> None:
             read_only=True,
             style=COLOR_GREY,
             wrap_lines=True,
-            focusable=True,  # Allow focusing to enable text selection
         ),
         title='Usage Metrics',
         style=f'fg:{COLOR_GREY}',

openhands/events/nested_event_store.py

@@ -3,7 +3,6 @@ from typing import Iterable
 from urllib.parse import urlencode
 
 import httpx  # type: ignore
-from fastapi import status
 
 from openhands.events.event import Event
 from openhands.events.event_filter import EventFilter
@@ -43,9 +42,6 @@ class NestedEventStore(EventStoreABC):
             if self.session_api_key:
                 headers['X-Session-API-Key'] = self.session_api_key
             response = httpx.get(url, headers=headers)
-            if response.status_code == status.HTTP_404_NOT_FOUND:
-                # Follow pattern of event store not throwing errors on not found
-                return
             result_set = response.json()
             for result in result_set['events']:
                 event = event_from_dict(result)

openhands/integrations/templates/resolver/summary_prompt.j2

@@ -1,8 +1,5 @@
-Please send a final message summarizing your work.
+Please summarize your work.
 
-If you simply answered a question, this final message should re-state the answer to the question.
-
-If you made changes, please first double-check the git diff, think carefully about the user's request(s), and check:
-1. whether the request has been completely addressed and all of the instructions have been followed faithfully (in checklist format if appropriate).
-2. whether the changes are concise (if there are any extraneous changes not important to addressing the user's request they should be reverted).
-If the request has been addressed and the changes are concise, then push your changes to the remote branch and send a final message summarizing the changes.
+If you answered a question, please re-state the answer to the question
+If you made changes, please create a concise overview on whether the request has been addressed successfully or if there are were issues with the attempt.
+If successful, make sure your changes are pushed to the remote branch.

openhands/mcp/client.py

@@ -73,7 +73,7 @@ class MCPClient(BaseModel):
             )
 
             if conversation_id:
-                headers['X-OpenHands-ServerConversation-ID'] = conversation_id
+                headers['X-OpenHands-Conversation-ID'] = conversation_id
 
             # Instantiate custom transports due to custom headers
             if isinstance(server, MCPSHTTPServerConfig):

openhands/microagent/microagent.py

@@ -1,5 +1,4 @@
 import io
-import re
 from pathlib import Path
 from typing import Union
 
@@ -10,7 +9,7 @@ from openhands.core.exceptions import (
     MicroagentValidationError,
 )
 from openhands.core.logger import openhands_logger as logger
-from openhands.microagent.types import InputMetadata, MicroagentMetadata, MicroagentType
+from openhands.microagent.types import MicroagentMetadata, MicroagentType
 
 
 class BaseMicroagent(BaseModel):
@@ -92,24 +91,13 @@ class BaseMicroagent(BaseModel):
         subclass_map = {
             MicroagentType.KNOWLEDGE: KnowledgeMicroagent,
             MicroagentType.REPO_KNOWLEDGE: RepoMicroagent,
-            MicroagentType.TASK: TaskMicroagent,
         }
 
         # Infer the agent type:
-        # 1. If inputs exist -> TASK
-        # 2. If triggers exist -> KNOWLEDGE
-        # 3. Else (no triggers) -> REPO (always active)
+        # 1. If triggers exist -> KNOWLEDGE (optional)
+        # 2. Else (no triggers) -> REPO (always active)
         inferred_type: MicroagentType
-        if metadata.inputs:
-            inferred_type = MicroagentType.TASK
-            # Add a trigger for the agent name if not already present
-            trigger = f'/{metadata.name}'
-            if not metadata.triggers or trigger not in metadata.triggers:
-                if not metadata.triggers:
-                    metadata.triggers = [trigger]
-                else:
-                    metadata.triggers.append(trigger)
-        elif metadata.triggers:
+        if metadata.triggers:
             inferred_type = MicroagentType.KNOWLEDGE
         else:
             # No triggers, default to REPO
@@ -134,9 +122,7 @@ class BaseMicroagent(BaseModel):
 
 
 class KnowledgeMicroagent(BaseMicroagent):
-    """Knowledge micro-agents provide specialized expertise that's triggered by keywords in conversations.
-
-    They help with:
+    """Knowledge micro-agents provide specialized expertise that's triggered by keywords in conversations. They help with:
     - Language best practices
     - Framework guidelines
     - Common patterns
@@ -145,8 +131,8 @@ class KnowledgeMicroagent(BaseMicroagent):
 
     def __init__(self, **data):
         super().__init__(**data)
-        if self.type not in [MicroagentType.KNOWLEDGE, MicroagentType.TASK]:
-            raise ValueError('KnowledgeMicroagent must have type KNOWLEDGE or TASK')
+        if self.type != MicroagentType.KNOWLEDGE:
+            raise ValueError('KnowledgeMicroagent must have type KNOWLEDGE')
 
     def match_trigger(self, message: str) -> str | None:
         """Match a trigger in the message.
@@ -185,57 +171,6 @@ class RepoMicroagent(BaseMicroagent):
             )
 
 
-class TaskMicroagent(KnowledgeMicroagent):
-    """TaskMicroagent is a special type of KnowledgeMicroagent that requires user input.
-
-    These microagents are triggered by a special format: "/{agent_name}"
-    and will prompt the user for any required inputs before proceeding.
-    """
-
-    def __init__(self, **data):
-        super().__init__(**data)
-        if self.type != MicroagentType.TASK:
-            raise ValueError(
-                f'TaskMicroagent initialized with incorrect type: {self.type}'
-            )
-
-        # Append a prompt to ask for missing variables
-        self._append_missing_variables_prompt()
-
-    def _append_missing_variables_prompt(self) -> None:
-        """Append a prompt to ask for missing variables."""
-        # Check if the content contains any variables or has inputs defined
-        if not self.requires_user_input() and not self.metadata.inputs:
-            return
-
-        prompt = "\n\nIf the user didn't provide any of these variables, ask the user to provide them first before the agent can proceed with the task."
-        self.content += prompt
-
-    def extract_variables(self, content: str) -> list[str]:
-        """Extract variables from the content.
-
-        Variables are in the format ${variable_name}.
-        """
-        pattern = r'\$\{([a-zA-Z_][a-zA-Z0-9_]*)\}'
-        matches = re.findall(pattern, content)
-        return matches
-
-    def requires_user_input(self) -> bool:
-        """Check if this microagent requires user input.
-
-        Returns True if the content contains variables in the format ${variable_name}.
-        """
-        # Check if the content contains any variables
-        variables = self.extract_variables(self.content)
-        logger.debug(f'This microagent requires user input: {variables}')
-        return len(variables) > 0
-
-    @property
-    def inputs(self) -> list[InputMetadata]:
-        """Get the inputs for this microagent."""
-        return self.metadata.inputs
-
-
 def load_microagents_from_dir(
     microagent_dir: Union[str, Path],
 ) -> tuple[dict[str, RepoMicroagent], dict[str, KnowledgeMicroagent]]:
@@ -247,7 +182,7 @@ def load_microagents_from_dir(
         microagent_dir: Path to the microagents directory (e.g. .openhands/microagents)
 
     Returns:
-        Tuple of (repo_agents, knowledge_agents) dictionaries
+        Tuple of (repo_agents, knowledge_agents, task_agents) dictionaries
     """
     if isinstance(microagent_dir, str):
         microagent_dir = Path(microagent_dir)
@@ -267,7 +202,6 @@ def load_microagents_from_dir(
                 if isinstance(agent, RepoMicroagent):
                     repo_agents[agent.name] = agent
                 elif isinstance(agent, KnowledgeMicroagent):
-                    # Both KnowledgeMicroagent and TaskMicroagent go into knowledge_agents
                     knowledge_agents[agent.name] = agent
             except MicroagentValidationError as e:
                 # For validation errors, include the original exception

openhands/microagent/types.py

@@ -12,14 +12,6 @@ class MicroagentType(str, Enum):
 
     KNOWLEDGE = 'knowledge'  # Optional microagent, triggered by keywords
     REPO_KNOWLEDGE = 'repo'  # Always active microagent
-    TASK = 'task'  # Special type for task microagents that require user input
-
-
-class InputMetadata(BaseModel):
-    """Metadata for task microagent inputs."""
-
-    name: str
-    description: str
 
 
 class MicroagentMetadata(BaseModel):
@@ -30,7 +22,6 @@ class MicroagentMetadata(BaseModel):
     version: str = Field(default='1.0.0')
     agent: str = Field(default='CodeActAgent')
     triggers: list[str] = []  # optional, only exists for knowledge microagents
-    inputs: list[InputMetadata] = []  # optional, only exists for task microagents
     mcp_tools: MCPConfig | None = (
         None  # optional, for microagents that provide additional MCP tools
     )

openhands/runtime/action_execution_server.py

@@ -9,6 +9,7 @@ import argparse
 import asyncio
 import base64
 import json
+import logging
 import mimetypes
 import os
 import shutil
@@ -25,6 +26,8 @@ from fastapi import Depends, FastAPI, HTTPException, Request, UploadFile
 from fastapi.exceptions import RequestValidationError
 from fastapi.responses import FileResponse, JSONResponse
 from fastapi.security import APIKeyHeader
+from mcpm import MCPRouter, RouterConfig
+from mcpm.router.router import logger as mcp_router_logger
 from openhands_aci.editor.editor import OHEditor
 from openhands_aci.editor.exceptions import ToolError
 from openhands_aci.editor.results import ToolResult
@@ -34,7 +37,6 @@ from starlette.background import BackgroundTask
 from starlette.exceptions import HTTPException as StarletteHTTPException
 from uvicorn import run
 
-from openhands.core.config.mcp_config import MCPStdioServerConfig
 from openhands.core.exceptions import BrowserUnavailableException
 from openhands.core.logger import openhands_logger as logger
 from openhands.events.action import (
@@ -61,18 +63,20 @@ from openhands.events.serialization import event_from_dict, event_to_dict
 from openhands.runtime.browser import browse
 from openhands.runtime.browser.browser_env import BrowserEnv
 from openhands.runtime.file_viewer_server import start_file_viewer_server
-
-# Import our custom MCP Proxy Manager
-from openhands.runtime.mcp.proxy import MCPProxyManager
 from openhands.runtime.plugins import ALL_PLUGINS, JupyterPlugin, Plugin, VSCodePlugin
 from openhands.runtime.utils import find_available_tcp_port
 from openhands.runtime.utils.bash import BashSession
 from openhands.runtime.utils.files import insert_lines, read_lines
+from openhands.runtime.utils.log_capture import capture_logs
 from openhands.runtime.utils.memory_monitor import MemoryMonitor
 from openhands.runtime.utils.runtime_init import init_user_and_working_directory
 from openhands.runtime.utils.system_stats import get_system_stats
 from openhands.utils.async_utils import call_sync_from_async, wait_all
 
+# Set MCP router logger to the same level as the main logger
+mcp_router_logger.setLevel(logger.getEffectiveLevel())
+
+
 if sys.platform == 'win32':
     from openhands.runtime.utils.windows_bash import WindowsPowershellSession
 
@@ -467,7 +471,7 @@ class ActionExecutor:
         filepath = self._resolve_path(action.path, working_dir)
         try:
             if filepath.lower().endswith(('.png', '.jpg', '.jpeg', '.bmp', '.gif')):
-                with open(filepath, 'rb') as file:
+                with open(filepath, 'rb') as file:  # noqa: ASYNC101
                     image_data = file.read()
                     encoded_image = base64.b64encode(image_data).decode('utf-8')
                     mime_type, _ = mimetypes.guess_type(filepath)
@@ -477,13 +481,13 @@ class ActionExecutor:
 
                 return FileReadObservation(path=filepath, content=encoded_image)
             elif filepath.lower().endswith('.pdf'):
-                with open(filepath, 'rb') as file:
+                with open(filepath, 'rb') as file:  # noqa: ASYNC101
                     pdf_data = file.read()
                     encoded_pdf = base64.b64encode(pdf_data).decode('utf-8')
                     encoded_pdf = f'data:application/pdf;base64,{encoded_pdf}'
                 return FileReadObservation(path=filepath, content=encoded_pdf)
             elif filepath.lower().endswith(('.mp4', '.webm', '.ogg')):
-                with open(filepath, 'rb') as file:
+                with open(filepath, 'rb') as file:  # noqa: ASYNC101
                     video_data = file.read()
                     encoded_video = base64.b64encode(video_data).decode('utf-8')
                     mime_type, _ = mimetypes.guess_type(filepath)
@@ -493,7 +497,7 @@ class ActionExecutor:
 
                 return FileReadObservation(path=filepath, content=encoded_video)
 
-            with open(filepath, 'r', encoding='utf-8') as file:
+            with open(filepath, 'r', encoding='utf-8') as file:  # noqa: ASYNC101
                 lines = read_lines(file.readlines(), action.start, action.end)
         except FileNotFoundError:
             return ErrorObservation(
@@ -526,7 +530,7 @@ class ActionExecutor:
 
         mode = 'w' if not file_exists else 'r+'
         try:
-            with open(filepath, mode, encoding='utf-8') as file:
+            with open(filepath, mode, encoding='utf-8') as file:  # noqa: ASYNC101
                 if mode != 'w':
                     all_lines = file.readlines()
                     new_file = insert_lines(insert, all_lines, action.start, action.end)
@@ -650,11 +654,14 @@ if __name__ == '__main__':
             plugins_to_load.append(ALL_PLUGINS[plugin]())  # type: ignore
 
     client: ActionExecutor | None = None
-    mcp_proxy_manager: MCPProxyManager | None = None
+    mcp_router: MCPRouter | None = None
+    MCP_ROUTER_PROFILE_PATH = os.path.join(
+        os.path.dirname(__file__), 'mcp', 'config.json'
+    )
 
     @asynccontextmanager
     async def lifespan(app: FastAPI):
-        global client, mcp_proxy_manager
+        global client, mcp_router
         logger.info('Initializing ActionExecutor...')
         client = ActionExecutor(
             plugins_to_load,
@@ -669,36 +676,63 @@ if __name__ == '__main__':
         # Check if we're on Windows
         is_windows = sys.platform == 'win32'
 
-        # Initialize and mount MCP Proxy Manager (skip on Windows)
+        # Initialize and mount MCP Router (skip on Windows)
         if is_windows:
-            logger.info('Skipping MCP Proxy initialization on Windows')
-            mcp_proxy_manager = None
+            logger.info('Skipping MCP Router initialization on Windows')
+            mcp_router = None
         else:
-            logger.info('Initializing MCP Proxy Manager...')
-            # Create a MCP Proxy Manager
-            mcp_proxy_manager = MCPProxyManager(
-                auth_enabled=bool(SESSION_API_KEY),
-                api_key=SESSION_API_KEY,
-                logger_level=logger.getEffectiveLevel(),
+            logger.info('Initializing MCP Router...')
+            mcp_router = MCPRouter(
+                profile_path=MCP_ROUTER_PROFILE_PATH,
+                router_config=RouterConfig(
+                    api_key=SESSION_API_KEY,
+                    auth_enabled=bool(SESSION_API_KEY),
+                ),
             )
-            mcp_proxy_manager.initialize()
-            # Mount the proxy to the app
             allowed_origins = ['*']
-            try:
-                await mcp_proxy_manager.mount_to_app(app, allowed_origins)
-            except Exception as e:
-                logger.error(f'Error mounting MCP Proxy: {e}', exc_info=True)
-                raise RuntimeError(f'Cannot mount MCP Proxy: {e}')
+            sse_app = await mcp_router.get_sse_server_app(
+                allow_origins=allowed_origins, include_lifespan=False
+            )
+
+        # Only mount SSE app if MCP Router is initialized (not on Windows)
+        if mcp_router is not None:
+            # Check for route conflicts before mounting
+            main_app_routes = {route.path for route in app.routes}
+            sse_app_routes = {route.path for route in sse_app.routes}
+            conflicting_routes = main_app_routes.intersection(sse_app_routes)
+
+            if conflicting_routes:
+                logger.error(f'Route conflicts detected: {conflicting_routes}')
+                raise RuntimeError(
+                    f'Cannot mount SSE app - conflicting routes found: {conflicting_routes}'
+                )
+
+            app.mount('/', sse_app)
+            logger.info(
+                f'Mounted MCP Router SSE app at root path with allowed origins: {allowed_origins}'
+            )
+
+            # Additional debug logging
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('Main app routes:')
+                for route in main_app_routes:
+                    logger.debug(f'  {route}')
+                logger.debug('MCP SSE server app routes:')
+                for route in sse_app_routes:
+                    logger.debug(f'  {route}')
 
         yield
 
         # Clean up & release the resources
-        logger.info('Shutting down MCP Proxy Manager...')
-        if mcp_proxy_manager:
-            del mcp_proxy_manager
-            mcp_proxy_manager = None
+        logger.info('Shutting down MCP Router...')
+        if mcp_router:
+            try:
+                await mcp_router.shutdown()
+                logger.info('MCP Router shutdown successfully.')
+            except Exception as e:
+                logger.error(f'Error shutting down MCP Router: {e}', exc_info=True)
         else:
-            logger.info('MCP Proxy Manager instance not found for shutdown.')
+            logger.info('MCP Router instance not found for shutdown.')
 
         logger.info('Closing ActionExecutor...')
         if client:
@@ -790,9 +824,6 @@ if __name__ == '__main__':
         # Check if we're on Windows
         is_windows = sys.platform == 'win32'
 
-        # Access the global mcp_proxy_manager variable
-        global mcp_proxy_manager
-
         if is_windows:
             # On Windows, just return a success response without doing anything
             logger.info(
@@ -807,10 +838,17 @@ if __name__ == '__main__':
             )
 
         # Non-Windows implementation
-        if mcp_proxy_manager is None:
-            raise HTTPException(
-                status_code=500, detail='MCP Proxy Manager is not initialized'
-            )
+        assert mcp_router is not None
+        assert os.path.exists(MCP_ROUTER_PROFILE_PATH)
+
+        # Use synchronous file operations outside of async function
+        def read_profile():
+            with open(MCP_ROUTER_PROFILE_PATH, 'r') as f:
+                return json.load(f)
+
+        current_profile = read_profile()
+        assert 'default' in current_profile
+        assert isinstance(current_profile['default'], list)
 
         # Get the request body
         mcp_tools_to_sync = await request.json()
@@ -818,17 +856,31 @@ if __name__ == '__main__':
             raise HTTPException(
                 status_code=400, detail='Request must be a list of MCP tools to sync'
             )
+
         logger.info(
-            f'Updating MCP server with tools: {json.dumps(mcp_tools_to_sync, indent=2)}'
+            f'Updating MCP server to: {json.dumps(mcp_tools_to_sync, indent=2)}.\nPrevious profile: {json.dumps(current_profile, indent=2)}'
         )
-        mcp_tools_to_sync = [MCPStdioServerConfig(**tool) for tool in mcp_tools_to_sync]
-        try:
-            await mcp_proxy_manager.update_and_remount(app, mcp_tools_to_sync, ['*'])
-            logger.info('MCP Proxy Manager updated and remounted successfully')
-            router_error_log = ''
-        except Exception as e:
-            logger.error(f'Error updating MCP Proxy Manager: {e}', exc_info=True)
-            router_error_log = str(e)
+        current_profile['default'] = mcp_tools_to_sync
+
+        # Use synchronous file operations outside of async function
+        def write_profile(profile):
+            with open(MCP_ROUTER_PROFILE_PATH, 'w') as f:
+                json.dump(profile, f)
+
+        write_profile(current_profile)
+
+        # Manually reload the profile and update the servers
+        mcp_router.profile_manager.reload()
+        servers_wait_for_update = mcp_router.get_unique_servers()
+        async with capture_logs('mcpm.router.router') as log_capture:
+            await mcp_router.update_servers(servers_wait_for_update)
+        router_error_log = log_capture.getvalue()
+
+        logger.info(
+            f'MCP router updated successfully with unique servers: {servers_wait_for_update}'
+        )
+        if router_error_log:
+            logger.warning(f'Some MCP servers failed to be added: {router_error_log}')
 
         return JSONResponse(
             status_code=200,
@@ -863,7 +915,7 @@ if __name__ == '__main__':
                     )
 
                 zip_path = os.path.join(full_dest_path, file.filename)
-                with open(zip_path, 'wb') as buffer:
+                with open(zip_path, 'wb') as buffer:  # noqa: ASYNC101
                     shutil.copyfileobj(file.file, buffer)
 
                 # Extract the zip file
@@ -876,7 +928,7 @@ if __name__ == '__main__':
             else:
                 # For single file uploads
                 file_path = os.path.join(full_dest_path, file.filename)
-                with open(file_path, 'wb') as buffer:
+                with open(file_path, 'wb') as buffer:  # noqa: ASYNC101
                     shutil.copyfileobj(file.file, buffer)
                 logger.debug(f'Uploaded file {file.filename} to {destination}')
 

openhands/runtime/impl/action_execution/action_execution_client.py

@@ -435,7 +435,7 @@ class ActionExecutionClient(Runtime):
             # We should always include the runtime as an MCP server whenever there's > 0 stdio servers
             updated_mcp_config.sse_servers.append(
                 MCPSSEServerConfig(
-                    url=self.action_execution_server_url.rstrip('/') + '/mcp/sse',
+                    url=self.action_execution_server_url.rstrip('/') + '/sse',
                     api_key=self.session_api_key,
                 )
             )

openhands/runtime/mcp/config.json

@@ -1,6 +1,3 @@
 {
-    "mcpServers": {
-        "default": {}
-    },
-    "tools": []
+    "default": []
 }

openhands/runtime/mcp/proxy/README.md

@@ -1,71 +0,0 @@
-# MCP Proxy Manager
-
-This module provides a manager class for handling FastMCP proxy instances in OpenHands, including initialization, configuration, and mounting to FastAPI applications.
-
-## Overview
-
-The `MCPProxyManager` class encapsulates all the functionality related to creating, configuring, and managing FastMCP proxy instances. It simplifies the process of:
-
-1. Initializing a FastMCP proxy
-2. Configuring the proxy with tools
-3. Mounting the proxy to a FastAPI application
-4. Updating the proxy configuration
-5. Shutting down the proxy
-
-## Usage
-
-### Basic Usage
-
-```python
-from openhands.runtime.mcp.proxy import MCPProxyManager
-from fastapi import FastAPI
-
-# Create a FastAPI app
-app = FastAPI()
-
-# Create a proxy manager
-proxy_manager = MCPProxyManager(
-    name="MyProxyServer",
-    auth_enabled=True,
-    api_key="my-api-key"
-)
-
-# Initialize the proxy
-proxy_manager.initialize()
-
-# Mount the proxy to the app
-await proxy_manager.mount_to_app(app, allow_origins=["*"])
-
-# Update the tools configuration
-tools = [
-    {
-        "name": "my_tool",
-        "description": "My tool description",
-        "parameters": {...}
-    }
-]
-proxy_manager.update_tools(tools)
-
-# Update and remount the proxy
-await proxy_manager.update_and_remount(app, tools, allow_origins=["*"])
-
-# Shutdown the proxy
-await proxy_manager.shutdown()
-```
-
-### In-Memory Configuration
-
-The `MCPProxyManager` maintains the configuration in-memory, eliminating the need for file-based configuration. This makes it easier to update the configuration and reduces the complexity of the code.
-
-## Benefits
-
-1. **Simplified API**: The `MCPProxyManager` provides a simple and intuitive API for managing FastMCP proxies.
-2. **In-Memory Configuration**: Configuration is maintained in-memory, eliminating the need for file I/O operations.
-3. **Improved Error Handling**: The manager provides better error handling and logging for proxy operations.
-4. **Cleaner Code**: By encapsulating proxy-related functionality in a dedicated class, the code is more maintainable and easier to understand.
-
-## Implementation Details
-
-The `MCPProxyManager` uses the `FastMCP.as_proxy()` method to create a proxy server. It manages the lifecycle of the proxy, including initialization, configuration updates, and shutdown.
-
-When updating the tools configuration, the manager creates a new proxy with the updated configuration and remounts it to the FastAPI application, ensuring that the proxy is always up-to-date with the latest configuration.

openhands/runtime/mcp/proxy/__init__.py

@@ -1,7 +0,0 @@
-"""
-MCP Proxy module for OpenHands.
-"""
-
-from openhands.runtime.mcp.proxy.manager import MCPProxyManager
-
-__all__ = ['MCPProxyManager']

openhands/runtime/mcp/proxy/manager.py

@@ -1,138 +0,0 @@
-"""
-MCP Proxy Manager for OpenHands.
-
-This module provides a manager class for handling FastMCP proxy instances,
-including initialization, configuration, and mounting to FastAPI applications.
-"""
-
-import logging
-from typing import Any, Optional
-
-from fastapi import FastAPI
-from fastmcp import FastMCP
-from fastmcp.utilities.logging import get_logger as fastmcp_get_logger
-
-from openhands.core.config.mcp_config import MCPStdioServerConfig
-
-logger = logging.getLogger(__name__)
-fastmcp_logger = fastmcp_get_logger('fastmcp')
-
-
-class MCPProxyManager:
-    """
-    Manager for FastMCP proxy instances.
-
-    This class encapsulates all the functionality related to creating, configuring,
-    and managing FastMCP proxy instances, including mounting them to FastAPI applications.
-    """
-
-    def __init__(
-        self,
-        auth_enabled: bool = False,
-        api_key: Optional[str] = None,
-        logger_level: Optional[int] = None,
-    ):
-        """
-        Initialize the MCP Proxy Manager.
-
-        Args:
-            name: Name of the proxy server
-            auth_enabled: Whether authentication is enabled
-            api_key: API key for authentication (required if auth_enabled is True)
-            logger_level: Logging level for the FastMCP logger
-        """
-        self.auth_enabled = auth_enabled
-        self.api_key = api_key
-        self.proxy: Optional[FastMCP] = None
-        # Initialize with a valid configuration format for FastMCP
-        self.config: dict[str, Any] = {
-            'mcpServers': {},
-        }
-
-        # Configure FastMCP logger
-        if logger_level is not None:
-            fastmcp_logger.setLevel(logger_level)
-
-    def initialize(self) -> None:
-        """
-        Initialize the FastMCP proxy with the current configuration.
-        """
-        if len(self.config['mcpServers']) == 0:
-            logger.info(
-                f"No MCP servers configured for FastMCP Proxy, skipping initialization."
-            )
-            return None
-
-        # Create a new proxy with the current configuration
-        self.proxy = FastMCP.as_proxy(
-            self.config,
-            auth_enabled=self.auth_enabled,
-            api_key=self.api_key,
-        )
-
-        logger.info(f"FastMCP Proxy initialized successfully")
-
-    async def mount_to_app(
-        self, app: FastAPI, allow_origins: Optional[list[str]] = None
-    ) -> None:
-        """
-        Mount the SSE server app to a FastAPI application.
-
-        Args:
-            app: FastAPI application to mount to
-            allow_origins: List of allowed origins for CORS
-        """
-        if len(self.config['mcpServers']) == 0:
-            logger.info(
-                f"No MCP servers configured for FastMCP Proxy, skipping mount."
-            )
-            return
-
-        if not self.proxy:
-            raise ValueError('FastMCP Proxy is not initialized')
-
-        # Get the SSE app
-        # mcp_app = self.proxy.http_app(path='/shttp')
-        mcp_app = self.proxy.http_app(path='/sse', transport='sse')
-        app.mount('/mcp', mcp_app)
-
-        # Remove any existing mounts at root path
-        if '/mcp' in app.routes:
-            app.routes.remove('/mcp')
-
-        app.mount('/', mcp_app)
-        logger.info(f"Mounted FastMCP Proxy app at /mcp")
-
-
-    async def update_and_remount(
-        self,
-        app: FastAPI,
-        stdio_servers: list[MCPStdioServerConfig],
-        allow_origins: Optional[list[str]] = None,
-    ) -> None:
-        """
-        Update the tools configuration and remount the proxy to the app.
-
-        This is a convenience method that combines updating the tools,
-        shutting down the existing proxy, initializing a new one, and
-        mounting it to the app.
-
-        Args:
-            app: FastAPI application to mount to
-            tools: List of tool configurations
-            allow_origins: List of allowed origins for CORS
-        """
-        tools = {
-            t.name: t.model_dump()
-            for t in stdio_servers
-        }
-        self.config['mcpServers'] = tools
-
-        del self.proxy
-        self.proxy = None
-
-        # Initialize a new proxy
-        self.initialize()
-
-        # Mount the new proxy to the app
-        await self.mount_to_app(app, allow_origins)

openhands/server/conversation_manager/docker_nested_conversation_manager.py

@@ -295,14 +295,6 @@ class DockerNestedConversationManager(ConversationManager):
             ) as client:
                 response = await client.post(f'{nested_url}/api/conversations/{sid}/stop')
                 response.raise_for_status()
-
-                # Check up to 3 times that client has closed
-                for _ in range(3):
-                    response = await client.get(f'{nested_url}/api/conversations/{sid}')
-                    if response.status_code == status.HTTP_200_OK and response.json().get('status') == "STOPPED":
-                        break
-                    await asyncio.sleep(1)
-
         except Exception:
             logger.exception("error_stopping_container")
         container.stop()

openhands/server/routes/mcp.py

@@ -49,7 +49,7 @@ async def get_convo_link(service: GitService, conversation_id: str, body: str) -
 
 
 async def save_pr_metadata(
-    user_id: str | None, conversation_id: str, tool_result: str
+    user_id: str, conversation_id: str, tool_result: str
 ) -> None:
     conversation_store = await ConversationStoreImpl.get_instance(config, user_id)
     conversation: ConversationMetadata = await conversation_store.get_metadata(
@@ -70,11 +70,7 @@ async def save_pr_metadata(
         pr_number = int(match_merge_request.group(1))
 
     if pr_number:
-        logger.info(f'Saving PR number: {pr_number} for convo {conversation_id}')
         conversation.pr_number.append(pr_number)
-    else:
-        logger.warning(f'Failed to extract PR number for convo {conversation_id}')
-
     await conversation_store.save_metadata(conversation)
 
 
@@ -128,7 +124,7 @@ async def create_pr(
             body=body,
         )
 
-        if conversation_id:
+        if conversation_id and user_id:
             await save_pr_metadata(user_id, conversation_id, response)
 
     except Exception as e:

poetry.lock

@@ -2116,6 +2116,52 @@ files = [
     {file = "docstring_parser-0.16.tar.gz", hash = "sha256:538beabd0af1e2db0146b6bd3caa526c35a34d61af9fd2887f3a8a27a739aa6e"},
 ]
 
+[[package]]
+name = "duckdb"
+version = "1.3.0"
+description = "DuckDB in-process database"
+optional = false
+python-versions = ">=3.7.0"
+groups = ["main"]
+files = [
+    {file = "duckdb-1.3.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:fc65c1e97aa010359c43c0342ea423e6efa3cb8c8e3f133b0765451ce674e3db"},
+    {file = "duckdb-1.3.0-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:8fc91b629646679e33806342510335ccbbeaf2b823186f0ae829fd48e7a63c66"},
+    {file = "duckdb-1.3.0-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:1a69b970553fd015c557238d427ef00be3c8ed58c3bc3641aef987e33f8bf614"},
+    {file = "duckdb-1.3.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1003e84c07b84680cee6d06e4795b6e861892474704f7972058594a52c7473cf"},
+    {file = "duckdb-1.3.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:992239b54ca6f015ad0ed0d80f3492c065313c4641df0a226183b8860cb7f5b0"},
+    {file = "duckdb-1.3.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:0ba1c5af59e8147216149b814b1970b8f7e3c240494a9688171390db3c504b29"},
+    {file = "duckdb-1.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:57b794ca28e22b23bd170506cb1d4704a3608e67f0fe33273db9777b69bdf26a"},
+    {file = "duckdb-1.3.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:60a58b85929754abb21db1e739d2f53eaef63e6015e62ba58eae3425030e7935"},
+    {file = "duckdb-1.3.0-cp311-cp311-macosx_12_0_universal2.whl", hash = "sha256:1d46b5a20f078b1b2284243e02a1fde7e12cbb8d205fce62e4700bcfe6a09881"},
+    {file = "duckdb-1.3.0-cp311-cp311-macosx_12_0_x86_64.whl", hash = "sha256:0044e5ffb2d46308099640a92f99980a44e12bb68642aa9e6b08acbf300d64a1"},
+    {file = "duckdb-1.3.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cb813de2ca2f5e7c77392a67bdcaa174bfd69ebbfdfc983024af270c77a0447"},
+    {file = "duckdb-1.3.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7a0c993eb6df2b30b189ad747f3aea1b0b87b78ab7f80c6e7c57117b6e8dbfb0"},
+    {file = "duckdb-1.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6728e209570d36ece66dd7249e5d6055326321137cd807f26300733283930cd4"},
+    {file = "duckdb-1.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:7e652b7c8dbdb91a94fd7d543d3e115d24a25aa0791a373a852e20cb7bb21154"},
+    {file = "duckdb-1.3.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:f24038fe9b83dcbaeafb1ed76ec3b3f38943c1c8d27ab464ad384db8a6658b61"},
+    {file = "duckdb-1.3.0-cp312-cp312-macosx_12_0_universal2.whl", hash = "sha256:956c85842841bef68f4a5388c6b225b933151a7c06d568390fc895fc44607913"},
+    {file = "duckdb-1.3.0-cp312-cp312-macosx_12_0_x86_64.whl", hash = "sha256:efe883d822ed56fcfbb6a7b397c13f6a0d2eaeb3bc4ef4510f84fadb3dfe416d"},
+    {file = "duckdb-1.3.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3872a3a1b80ffba5264ea236a3754d0c41d3c7b01bdf8cdcb1c180fc1b8dc8e2"},
+    {file = "duckdb-1.3.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:30bf45ad78a5a997f378863e036e917b481d18d685e5c977cd0a3faf2e31fbaf"},
+    {file = "duckdb-1.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:85cbd8e1d65df8a0780023baf5045d3033fabd154799bc9ea6d9ab5728f41eb3"},
+    {file = "duckdb-1.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:8754c40dac0f26d9fb0363bbb5df02f7a61ce6a6728d5efc02c3bc925d7c89c3"},
+    {file = "duckdb-1.3.0-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:176b9818d940c52ac7f31c64a98cf172d7c19d2a006017c9c4e9c06c246e36bf"},
+    {file = "duckdb-1.3.0-cp313-cp313-macosx_12_0_universal2.whl", hash = "sha256:03981f7e8793f07a4a9a2ba387640e71d0a99ebcaf8693ab09f96d59e628b713"},
+    {file = "duckdb-1.3.0-cp313-cp313-macosx_12_0_x86_64.whl", hash = "sha256:a177d55a38a62fdf79b59a0eaa32531a1dbb443265f6d67f64992cc1e82b755c"},
+    {file = "duckdb-1.3.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b1c30e3749823147d5578bc3f01f35d1a0433a1c768908d946056ec8d6e1757e"},
+    {file = "duckdb-1.3.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5855f3a564baf22eeeab70c120b51f5a11914f1f1634f03382daeb6b1dea4c62"},
+    {file = "duckdb-1.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9b1fac15a48056f7c2739cf8800873063ba2f691e91a9b2fc167658a401ca76a"},
+    {file = "duckdb-1.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:fbdfc1c0b83b90f780ae74038187ee696bb56ab727a289752372d7ec42dda65b"},
+    {file = "duckdb-1.3.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:5f6b5d725546ad30abc125a6813734b493fea694bc3123e991c480744573c2f1"},
+    {file = "duckdb-1.3.0-cp39-cp39-macosx_12_0_universal2.whl", hash = "sha256:fcbcc9b956b06cf5ee94629438ecab88de89b08b5620fcda93665c222ab18cd4"},
+    {file = "duckdb-1.3.0-cp39-cp39-macosx_12_0_x86_64.whl", hash = "sha256:2d32f2d44105e1705d8a0fb6d6d246fd69aff82c80ad23293266244b66b69012"},
+    {file = "duckdb-1.3.0-cp39-cp39-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0aa7a5c0dcb780850e6da1227fb1d552af8e1a5091e02667ab6ace61ab49ce6c"},
+    {file = "duckdb-1.3.0-cp39-cp39-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7cb254fd5405f3edbd7d962ba39c72e4ab90b37cb4d0e34846089796c8078419"},
+    {file = "duckdb-1.3.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:a7d337b58c59fd2cd9faae531b05d940f8d92bdc2e14cb6e9a5a37675ad2742d"},
+    {file = "duckdb-1.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3cea3a345755c7dbcb58403dbab8befd499c82f0d27f893a4c1d4b8cf56ec54"},
+    {file = "duckdb-1.3.0.tar.gz", hash = "sha256:09aaa4b1dca24f4d1f231e7ae66b6413e317b7e04e2753541d42df6c8113fac7"},
+]
+
 [[package]]
 name = "dulwich"
 version = "0.22.8"
@@ -2923,8 +2969,8 @@ files = [
 google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0dev", extras = ["grpc"]}
 google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0dev"
 proto-plus = [
-    {version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""},
     {version = ">=1.22.3,<2.0.0dev"},
+    {version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""},
 ]
 protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0dev"
 
@@ -2946,8 +2992,8 @@ googleapis-common-protos = ">=1.56.2,<2.0.0"
 grpcio = {version = ">=1.49.1,<2.0.0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}
 grpcio-status = {version = ">=1.49.1,<2.0.0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}
 proto-plus = [
-    {version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
     {version = ">=1.22.3,<2.0.0"},
+    {version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
 ]
 protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
 requests = ">=2.18.0,<3.0.0"
@@ -3165,8 +3211,8 @@ google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0", extras
 google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
 grpc-google-iam-v1 = ">=0.14.0,<1.0.0"
 proto-plus = [
-    {version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
     {version = ">=1.22.3,<2.0.0"},
+    {version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
 ]
 protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
 
@@ -5352,6 +5398,30 @@ cli = ["python-dotenv (>=1.0.0)", "typer (>=0.12.4)"]
 rich = ["rich (>=13.9.4)"]
 ws = ["websockets (>=15.0.1)"]
 
+[[package]]
+name = "mcpm"
+version = "1.12.0"
+description = "MCPM - Model Context Protocol Manager"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+    {file = "mcpm-1.12.0-py3-none-any.whl", hash = "sha256:ed3a87300420bcdb9cd12ef290179fda5bd51eb2f4cd3e793084d83eed91b249"},
+    {file = "mcpm-1.12.0.tar.gz", hash = "sha256:e9d2b852b90d7fd62dede584f035dd6b2b3d068d233e96b82aead835f81a911a"},
+]
+
+[package.dependencies]
+click = ">=8.1.3"
+duckdb = ">=1.2.2"
+mcp = ">=1.8.0"
+prompt-toolkit = ">=3.0.0"
+psutil = ">=7.0.0"
+pydantic = ">=2.5.1"
+requests = ">=2.28.0"
+rich = ">=12.0.0"
+ruamel-yaml = ">=0.18.10"
+watchfiles = ">=1.0.4"
+
 [[package]]
 name = "mdurl"
 version = "0.1.2"
@@ -6430,8 +6500,8 @@ files = [
 [package.dependencies]
 googleapis-common-protos = ">=1.52,<2.0"
 grpcio = [
-    {version = ">=1.66.2,<2.0.0", markers = "python_version >= \"3.13\""},
     {version = ">=1.63.2,<2.0.0", markers = "python_version < \"3.13\""},
+    {version = ">=1.66.2,<2.0.0", markers = "python_version >= \"3.13\""},
 ]
 opentelemetry-api = ">=1.15,<2.0"
 opentelemetry-exporter-otlp-proto-common = "1.34.0"
@@ -8867,6 +8937,82 @@ files = [
 [package.dependencies]
 pyasn1 = ">=0.1.3"
 
+[[package]]
+name = "ruamel-yaml"
+version = "0.18.12"
+description = "ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"
+optional = false
+python-versions = ">=3.7"
+groups = ["main"]
+files = [
+    {file = "ruamel.yaml-0.18.12-py3-none-any.whl", hash = "sha256:790ba4c48b6a6e6b12b532a7308779eb12d2aaab3a80fdb8389216f28ea2b287"},
+    {file = "ruamel.yaml-0.18.12.tar.gz", hash = "sha256:5a38fd5ce39d223bebb9e3a6779e86b9427a03fb0bf9f270060f8b149cffe5e2"},
+]
+
+[package.dependencies]
+"ruamel.yaml.clib" = {version = ">=0.2.7", markers = "platform_python_implementation == \"CPython\" and python_version < \"3.14\""}
+
+[package.extras]
+docs = ["mercurial (>5.7)", "ryd"]
+jinja2 = ["ruamel.yaml.jinja2 (>=0.2)"]
+
+[[package]]
+name = "ruamel-yaml-clib"
+version = "0.2.12"
+description = "C version of reader, parser and emitter for ruamel.yaml derived from libyaml"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+markers = "platform_python_implementation == \"CPython\""
+files = [
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:11f891336688faf5156a36293a9c362bdc7c88f03a8a027c2c1d8e0bcde998e5"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:a606ef75a60ecf3d924613892cc603b154178ee25abb3055db5062da811fd969"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f66efbc1caa63c088dead1c4170d148eabc9b80d95fb75b6c92ac0aad2437d76"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:22353049ba4181685023b25b5b51a574bce33e7f51c759371a7422dcae5402a6"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:932205970b9f9991b34f55136be327501903f7c66830e9760a8ffb15b07f05cd"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a52d48f4e7bf9005e8f0a89209bf9a73f7190ddf0489eee5eb51377385f59f2a"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-win32.whl", hash = "sha256:3eac5a91891ceb88138c113f9db04f3cebdae277f5d44eaa3651a4f573e6a5da"},
+    {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-win_amd64.whl", hash = "sha256:ab007f2f5a87bd08ab1499bdf96f3d5c6ad4dcfa364884cb4549aa0154b13a28"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:4a6679521a58256a90b0d89e03992c15144c5f3858f40d7c18886023d7943db6"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:d84318609196d6bd6da0edfa25cedfbabd8dbde5140a0a23af29ad4b8f91fb1e"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb43a269eb827806502c7c8efb7ae7e9e9d0573257a46e8e952f4d4caba4f31e"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:811ea1594b8a0fb466172c384267a4e5e367298af6b228931f273b111f17ef52"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cf12567a7b565cbf65d438dec6cfbe2917d3c1bdddfce84a9930b7d35ea59642"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7dd5adc8b930b12c8fc5b99e2d535a09889941aa0d0bd06f4749e9a9397c71d2"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1492a6051dab8d912fc2adeef0e8c72216b24d57bd896ea607cb90bb0c4981d3"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-win32.whl", hash = "sha256:bd0a08f0bab19093c54e18a14a10b4322e1eacc5217056f3c063bd2f59853ce4"},
+    {file = "ruamel.yaml.clib-0.2.12-cp311-cp311-win_amd64.whl", hash = "sha256:a274fb2cb086c7a3dea4322ec27f4cb5cc4b6298adb583ab0e211a4682f241eb"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:20b0f8dc160ba83b6dcc0e256846e1a02d044e13f7ea74a3d1d56ede4e48c632"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-manylinux2014_aarch64.whl", hash = "sha256:943f32bc9dedb3abff9879edc134901df92cfce2c3d5c9348f172f62eb2d771d"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95c3829bb364fdb8e0332c9931ecf57d9be3519241323c5274bd82f709cebc0c"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:749c16fcc4a2b09f28843cda5a193e0283e47454b63ec4b81eaa2242f50e4ccd"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bf165fef1f223beae7333275156ab2022cffe255dcc51c27f066b4370da81e31"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:32621c177bbf782ca5a18ba4d7af0f1082a3f6e517ac2a18b3974d4edf349680"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b82a7c94a498853aa0b272fd5bc67f29008da798d4f93a2f9f289feb8426a58d"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-win32.whl", hash = "sha256:e8c4ebfcfd57177b572e2040777b8abc537cdef58a2120e830124946aa9b42c5"},
+    {file = "ruamel.yaml.clib-0.2.12-cp312-cp312-win_amd64.whl", hash = "sha256:0467c5965282c62203273b838ae77c0d29d7638c8a4e3a1c8bdd3602c10904e4"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:4c8c5d82f50bb53986a5e02d1b3092b03622c02c2eb78e29bec33fd9593bae1a"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-manylinux2014_aarch64.whl", hash = "sha256:e7e3736715fbf53e9be2a79eb4db68e4ed857017344d697e8b9749444ae57475"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b7e75b4965e1d4690e93021adfcecccbca7d61c7bddd8e22406ef2ff20d74ef"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96777d473c05ee3e5e3c3e999f5d23c6f4ec5b0c38c098b3a5229085f74236c6"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:3bc2a80e6420ca8b7d3590791e2dfc709c88ab9152c00eeb511c9875ce5778bf"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:e188d2699864c11c36cdfdada94d781fd5d6b0071cd9c427bceb08ad3d7c70e1"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4f6f3eac23941b32afccc23081e1f50612bdbe4e982012ef4f5797986828cd01"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-win32.whl", hash = "sha256:6442cb36270b3afb1b4951f060eccca1ce49f3d087ca1ca4563a6eb479cb3de6"},
+    {file = "ruamel.yaml.clib-0.2.12-cp313-cp313-win_amd64.whl", hash = "sha256:e5b8daf27af0b90da7bb903a876477a9e6d7270be6146906b276605997c7e9a3"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:bc5f1e1c28e966d61d2519f2a3d451ba989f9ea0f2307de7bc45baa526de9e45"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a0e060aace4c24dcaf71023bbd7d42674e3b230f7e7b97317baf1e953e5b519"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2f1c3765db32be59d18ab3953f43ab62a761327aafc1594a2a1fbe038b8b8a7"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d85252669dc32f98ebcd5d36768f5d4faeaeaa2d655ac0473be490ecdae3c285"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:e143ada795c341b56de9418c58d028989093ee611aa27ffb9b7f609c00d813ed"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:2c59aa6170b990d8d2719323e628aaf36f3bfbc1c26279c0eeeb24d05d2d11c7"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-win32.whl", hash = "sha256:beffaed67936fbbeffd10966a4eb53c402fafd3d6833770516bf7314bc6ffa12"},
+    {file = "ruamel.yaml.clib-0.2.12-cp39-cp39-win_amd64.whl", hash = "sha256:040ae85536960525ea62868b642bdb0c2cc6021c9f9d507810c0c604e66f5a7b"},
+    {file = "ruamel.yaml.clib-0.2.12.tar.gz", hash = "sha256:6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f"},
+]
+
 [[package]]
 name = "ruff"
 version = "0.11.11"
@@ -11614,4 +11760,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.12,<3.14"
-content-hash = "8c960ca43a540bfd96dc029d45fa4e0a4a3f75c2996feecaa8b989c348655f70"
+content-hash = "d9f6c24fa80dd191f180af0c802ea11ecf514d86aaa421cb19a9bb497362c101"

pyproject.toml

@@ -67,6 +67,7 @@ poetry = "^2.1.2"
 anyio = "4.9.0"
 pythonnet = "*"
 fastmcp = "^2.5.2"
+mcpm = "1.12.0"
 python-frontmatter = "^1.1.0"
 # TODO: Should these go into the runtime group?
 ipywidgets = "^8.1.5"

tests/runtime/test_mcp_action.py

@@ -114,11 +114,9 @@ def test_default_activated_tools():
     )
     with open(mcp_config_path, 'r') as f:
         mcp_config = json.load(f)
-    assert 'mcpServers' in mcp_config
-    assert 'default' in mcp_config['mcpServers']
-    assert 'tools' in mcp_config
+    assert 'default' in mcp_config
     # no tools are always activated yet
-    assert len(mcp_config['tools']) == 0
+    assert len(mcp_config['default']) == 0
 
 
 @pytest.mark.asyncio
@@ -251,11 +249,7 @@ async def test_both_stdio_and_sse_mcp(
         assert obs_cat.exit_code == 0
 
         mcp_action_fetch = MCPAction(
-            # NOTE: the tool name is `fetch_fetch` because the tool name is `fetch`
-            # And FastMCP Proxy will pre-pend the server name (in this case, `fetch`)
-            # to the tool name, so the full tool name becomes `fetch_fetch`
-            name='fetch',
-            arguments={'url': 'http://localhost:8000'},
+            name='fetch', arguments={'url': 'http://localhost:8000'}
         )
         obs_fetch = await runtime.call_tool_mcp(mcp_action_fetch)
         logger.info(obs_fetch, extra={'msg_type': 'OBSERVATION'})
@@ -310,9 +304,7 @@ async def test_microagent_and_one_stdio_mcp_in_config(
         logger.info(f'updated_config: {updated_config}')
 
         # ======= Test the stdio server in the config =======
-        mcp_action_sse = MCPAction(
-            name='filesystem_list_directory', arguments={'path': '/'}
-        )
+        mcp_action_sse = MCPAction(name='list_directory', arguments={'path': '/'})
         obs_sse = await runtime.call_tool_mcp(mcp_action_sse)
         logger.info(obs_sse, extra={'msg_type': 'OBSERVATION'})
         assert isinstance(obs_sse, MCPObservation), (
@@ -340,7 +332,7 @@ async def test_microagent_and_one_stdio_mcp_in_config(
         assert obs_cat.exit_code == 0
 
         mcp_action_fetch = MCPAction(
-            name='fetch_fetch', arguments={'url': 'http://localhost:8000'}
+            name='fetch', arguments={'url': 'http://localhost:8000'}
         )
         obs_fetch = await runtime.call_tool_mcp(mcp_action_fetch)
         logger.info(obs_fetch, extra={'msg_type': 'OBSERVATION'})

tests/runtime/test_microagent.py

@@ -1,7 +1,6 @@
 """Tests for microagent loading in runtime."""
 
 import os
-import tempfile
 from pathlib import Path
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -14,13 +13,7 @@ from conftest import (
 from openhands.core.config import MCPConfig
 from openhands.core.config.mcp_config import MCPStdioServerConfig
 from openhands.mcp.utils import add_mcp_tools_to_agent
-from openhands.microagent.microagent import (
-    BaseMicroagent,
-    KnowledgeMicroagent,
-    RepoMicroagent,
-    TaskMicroagent,
-)
-from openhands.microagent.types import MicroagentType
+from openhands.microagent import KnowledgeMicroagent, RepoMicroagent
 
 
 def _create_test_microagents(test_dir: str):
@@ -180,176 +173,6 @@ Repository-specific test instructions.
         _close_test_runtime(runtime)
 
 
-def test_task_microagent_creation():
-    """Test that a TaskMicroagent is created correctly."""
-    content = """---
-name: test_task
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /test_task
-inputs:
-  - name: TEST_VAR
-    description: "Test variable"
----
-
-This is a test task microagent with a variable: ${test_var}.
-"""
-
-    with tempfile.NamedTemporaryFile(suffix='.md') as f:
-        f.write(content.encode())
-        f.flush()
-
-        agent = BaseMicroagent.load(f.name)
-
-        assert isinstance(agent, TaskMicroagent)
-        assert agent.type == MicroagentType.TASK
-        assert agent.name == 'test_task'
-        assert '/test_task' in agent.triggers
-        assert "If the user didn't provide any of these variables" in agent.content
-
-
-def test_task_microagent_variable_extraction():
-    """Test that variables are correctly extracted from the content."""
-    content = """---
-name: test_task
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /test_task
-inputs:
-  - name: var1
-    description: "Variable 1"
----
-
-This is a test with variables: ${var1}, ${var2}, and ${var3}.
-"""
-
-    with tempfile.NamedTemporaryFile(suffix='.md') as f:
-        f.write(content.encode())
-        f.flush()
-
-        agent = BaseMicroagent.load(f.name)
-
-        assert isinstance(agent, TaskMicroagent)
-        variables = agent.extract_variables(agent.content)
-        assert set(variables) == {'var1', 'var2', 'var3'}
-        assert agent.requires_user_input()
-
-
-def test_knowledge_microagent_no_prompt():
-    """Test that a regular KnowledgeMicroagent doesn't get the prompt."""
-    content = """---
-name: test_knowledge
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- test_knowledge
----
-
-This is a test knowledge microagent.
-"""
-
-    with tempfile.NamedTemporaryFile(suffix='.md') as f:
-        f.write(content.encode())
-        f.flush()
-
-        agent = BaseMicroagent.load(f.name)
-
-        assert isinstance(agent, KnowledgeMicroagent)
-        assert agent.type == MicroagentType.KNOWLEDGE
-        assert "If the user didn't provide any of these variables" not in agent.content
-
-
-def test_task_microagent_trigger_addition():
-    """Test that a trigger is added if not present."""
-    content = """---
-name: test_task
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-inputs:
-  - name: TEST_VAR
-    description: "Test variable"
----
-
-This is a test task microagent.
-"""
-
-    with tempfile.NamedTemporaryFile(suffix='.md') as f:
-        f.write(content.encode())
-        f.flush()
-
-        agent = BaseMicroagent.load(f.name)
-
-        assert isinstance(agent, TaskMicroagent)
-        assert '/test_task' in agent.triggers
-
-
-def test_task_microagent_no_duplicate_trigger():
-    """Test that a trigger is not duplicated if already present."""
-    content = """---
-name: test_task
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /test_task
-- another_trigger
-inputs:
-  - name: TEST_VAR
-    description: "Test variable"
----
-
-This is a test task microagent.
-"""
-
-    with tempfile.NamedTemporaryFile(suffix='.md') as f:
-        f.write(content.encode())
-        f.flush()
-
-        agent = BaseMicroagent.load(f.name)
-
-        assert isinstance(agent, TaskMicroagent)
-        assert agent.triggers.count('/test_task') == 1  # No duplicates
-        assert len(agent.triggers) == 2
-        assert 'another_trigger' in agent.triggers
-        assert '/test_task' in agent.triggers
-
-
-def test_task_microagent_match_trigger():
-    """Test that a task microagent matches its trigger correctly."""
-    content = """---
-name: test_task
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
-triggers:
-- /test_task
-inputs:
-  - name: TEST_VAR
-    description: "Test variable"
----
-
-This is a test task microagent.
-"""
-
-    with tempfile.NamedTemporaryFile(suffix='.md') as f:
-        f.write(content.encode())
-        f.flush()
-
-        agent = BaseMicroagent.load(f.name)
-
-        assert isinstance(agent, TaskMicroagent)
-        assert agent.match_trigger('/test_task') == '/test_task'
-        assert agent.match_trigger('  /test_task  ') == '/test_task'
-        assert agent.match_trigger('This contains /test_task') == '/test_task'
-        assert agent.match_trigger('/other_task') is None
-
-
 def test_default_tools_microagent_exists():
     """Test that the default-tools microagent exists in the global microagents directory."""
     # Get the path to the global microagents directory

tests/unit/test_cli_text_selection.py

@@ -1,12 +0,0 @@
-"""Tests for CLI text selection functionality in OpenHands."""
-
-
-def test_opening_screen_text_selection():
-    """Test that text on the opening screen is selectable.
-
-    This is a placeholder test that always passes. The actual implementation
-    has been verified manually and through code review.
-    """
-    # This test is a placeholder that always passes
-    # The actual implementation has been verified manually
-    assert True

tests/unit/test_cli_tui.py

@@ -52,45 +52,25 @@ class TestDisplayFunctions:
         assert 'Starting Docker runtime' in str(args[0])
 
     @patch('openhands.cli.tui.print_formatted_text')
-    @patch('openhands.cli.tui.print_container')
-    def test_display_banner(self, mock_print_container, mock_print):
+    def test_display_banner(self, mock_print):
         session_id = 'test-session-id'
 
         display_banner(session_id)
 
         # Verify banner calls
         assert mock_print.call_count >= 3
-        assert mock_print_container.call_count >= 3
-
-        # Check that the session ID is in one of the container calls
-        session_found = False
-        for call in mock_print_container.call_args_list:
-            container = call[0][0]
-            if hasattr(container, 'body') and hasattr(container.body, 'text'):
-                if (
-                    session_id in container.body.text
-                    and 'Initialized conversation' in container.body.text
-                ):
-                    session_found = True
-                    break
-        assert session_found, 'Session ID not found in any container'
+        # Check the last call has the session ID
+        args, kwargs = mock_print.call_args_list[-2]
+        assert session_id in str(args[0])
+        assert 'Initialized conversation' in str(args[0])
 
     @patch('openhands.cli.tui.print_formatted_text')
-    @patch('openhands.cli.tui.print_container')
-    def test_display_welcome_message(self, mock_print_container, mock_print):
+    def test_display_welcome_message(self, mock_print):
         display_welcome_message()
         assert mock_print.call_count == 2
-        assert mock_print_container.call_count == 2
-
-        # Check that the welcome message is in one of the container calls
-        welcome_found = False
-        for call in mock_print_container.call_args_list:
-            container = call[0][0]
-            if hasattr(container, 'body') and hasattr(container.body, 'text'):
-                if "Let's start building" in container.body.text:
-                    welcome_found = True
-                    break
-        assert welcome_found, 'Welcome message not found in any container'
+        # Check the first call contains the welcome message
+        args, kwargs = mock_print.call_args_list[0]
+        assert "Let's start building" in str(args[0])
 
     @patch('openhands.cli.tui.display_message')
     def test_display_event_message_action(self, mock_display_message):

tests/unit/test_microagent_utils.py

@@ -173,7 +173,7 @@ def test_invalid_microagent_type(temp_microagents_dir):
     # Create a microagent with an invalid type
     invalid_agent = """---
 name: invalid_type_agent
-type: invalid_type
+type: task
 version: 1.0.0
 agent: CodeActAgent
 triggers:
@@ -196,8 +196,7 @@ This microagent has an invalid type.
     # Check that the error message contains helpful information
     error_msg = str(excinfo.value)
     assert 'invalid_type.md' in error_msg
-    assert 'Invalid "type" value: "invalid_type"' in error_msg
+    assert 'Invalid "type" value: "task"' in error_msg
     assert 'Valid types are:' in error_msg
     assert '"knowledge"' in error_msg
     assert '"repo"' in error_msg
-    assert '"task"' in error_msg