Resolve merge conflict in MCP Proxy Manager

Co-authored-by: Xingyao Wang <xingyaoww@gmail.com>

.devcontainer/devcontainer.json

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

.dockerignore

@@ -1,5 +1,23 @@
+# NodeJS
 frontend/node_modules
-config.toml
-.envrc
-.env
-.git
+
+# Configuration (except pyproject.toml)
+*.ini
+*.toml
+!pyproject.toml
+*.yml
+
+# Documentation (except README.md)
+*.md
+!README.md
+
+# Hidden files and directories
+.*
+__pycache__
+
+# Unneded files and directories
+/dev_config/
+/docs/
+/evaluation/
+/tests/
+CITATION.cff

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

.github/dependabot.yml

@@ -16,7 +16,6 @@ updates:
       mcp-packages:
         patterns:
           - "mcp"
-          - "mcpm"
       security-all:
         applies-to: "security-updates"
         patterns:
@@ -73,3 +72,9 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directories:
+      - "containers/*"
+    schedule:
+      interval: "weekly"

.openhands/microagents/repo.md

@@ -2,8 +2,6 @@ This repository contains the code for OpenHands, an automated AI software engine
 (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.
 
 IMPORTANT: Before making any changes to the codebase, ALWAYS run `make install-pre-commit-hooks` to ensure pre-commit hooks are properly installed.
 
@@ -21,13 +19,91 @@ then re-run the command to ensure it passes. Common issues include:
 - Trailing whitespace
 - Missing newlines at end of files
 
+## Testing and Debugging
+
+### Environment Setup for Testing
+- Run `make build` to install all dependencies (only necessary for running tests):
+  ```bash
+  make build
+  ```
+  **IMPORTANT**: When using `execute_bash` to run `make build` or similar long-running commands, set the `timeout` parameter to a high value (e.g., 600 seconds):
+  ```
+  execute_bash(command="make build", timeout=600)
+  ```
+
+#### Docker Installation
+**NOTE: Docker installation is ONLY required for running runtime tests with the Docker runtime.**
+
+- Install Docker on Debian-based systems:
+  ```bash
+  sudo apt-get update
+  sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release
+  curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+  echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+  sudo apt-get update
+  sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+  ```
+- Start Docker daemon (in container environments without systemd):
+  ```bash
+  sudo dockerd > /tmp/docker.log 2>&1 & sleep 5
+  ```
+- Verify Docker installation:
+  ```bash
+  sudo docker run hello-world
+  ```
+
+#### Development Environment Setup
+- Before running `make run`, ensure netcat is installed:
+  ```bash
+  sudo apt-get install -y netcat-openbsd
+  ```
+
+### Unit Tests
+- All unit 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
+
+### Runtime Tests
+- Runtime tests are in `tests/runtime/test_*.py`
+- Run tests with different runtime implementations by setting the `TEST_RUNTIME` environment variable:
+  ```bash
+  # Use Docker runtime (default)
+  DEBUG=1 poetry run pytest -vvxss tests/runtime/test_bash.py
+  
+  # Use CLI runtime (more reliable in some environments)
+  DEBUG=1 TEST_RUNTIME=cli poetry run pytest -vvxss tests/runtime/test_bash.py
+  
+  # Run a specific test
+  DEBUG=1 TEST_RUNTIME=cli poetry run pytest -vvxss tests/runtime/test_bash.py::test_bash_server
+  ```
+- **IMPORTANT**: Runtime tests can take a long time to run, especially when building Docker images. Set a high timeout value:
+  ```
+  execute_bash(command="DEBUG=1 poetry run pytest -vvxss tests/runtime/test_bash.py", timeout=600)
+  ```
+- The `DEBUG=1` flag enables more verbose logging
+- The `-vvxss` flags make the test output more verbose and stop after the first failure
+
+### Debugging Docker Issues
+- Check Docker container status:
+  ```bash
+  sudo docker ps -a
+  ```
+- View Docker logs:
+  ```bash
+  sudo docker logs <container_id>
+  ```
+- Check Docker daemon logs:
+  ```bash
+  sudo cat /tmp/docker.log | tail -n 100
+  ```
+- Check OpenHands logs:
+  ```bash
+  cat logs/openhands_*.log | grep -i error | tail -n 20
+  ```
+
 ## 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
@@ -50,6 +126,13 @@ Frontend:
 
 If you are starting a pull request (PR), please follow the template in `.github/pull_request_template.md`.
 
+## Runtime Architecture
+- OpenHands uses a Docker-based runtime for secure execution of agent actions
+- The runtime builds a custom Docker image based on a specified base image
+- The image includes OpenHands-specific code and the runtime client
+- The runtime client executes actions in the sandboxed environment and returns observations
+- More details in the [runtime architecture documentation](https://docs.all-hands.dev/usage/architecture/runtime)
+
 ## Implementation Details
 
 These details may or may not be useful for your current task.
@@ -80,4 +163,4 @@ These details may or may not be useful for your current task.
      - Add the translation key to `frontend/src/i18n/declaration.ts`
   2. Add the setting to the backend:
      - Add the setting to the `Settings` model in `openhands/storage/data_models/settings.py`
-     - Update any relevant backend code to apply the setting (e.g., in session creation)
+     - Update any relevant backend code to apply the setting (e.g., in session creation)

containers/app/Dockerfile

@@ -1,16 +1,16 @@
 ARG OPENHANDS_BUILD_VERSION=dev
-FROM node:21.7.2-bookworm-slim AS frontend-builder
+FROM node:22.16.0-bookworm-slim AS frontend-builder
 
 WORKDIR /app
 
-COPY ./frontend/package.json frontend/package-lock.json ./
-RUN npm install -g npm@10.5.1
+COPY frontend/package.json frontend/package-lock.json ./
 RUN npm ci
 
-COPY ./frontend ./
+COPY frontend ./
 RUN npm run build
 
-FROM python:3.12.3-slim AS backend-builder
+FROM python:3.12.10-slim AS base
+FROM base AS backend-builder
 
 WORKDIR /app
 ENV PYTHONPATH='/app'
@@ -22,17 +22,18 @@ ENV POETRY_NO_INTERACTION=1 \
 
 RUN apt-get update -y \
     && apt-get install -y curl make git build-essential \
-    && python3 -m pip install poetry==1.8.2  --break-system-packages
+    && python3 -m pip install poetry --break-system-packages
 
-COPY ./pyproject.toml ./poetry.lock ./
+COPY pyproject.toml poetry.lock ./
 RUN touch README.md
 RUN export POETRY_CACHE_DIR && poetry install --no-root && rm -rf $POETRY_CACHE_DIR
 
-FROM python:3.12.3-slim AS openhands-app
+FROM base AS openhands-app
 
 WORKDIR /app
 
-ARG OPENHANDS_BUILD_VERSION #re-declare for this section
+# re-declare for this section
+ARG OPENHANDS_BUILD_VERSION
 
 ENV RUN_AS_OPENHANDS=true
 # A random number--we need this to be different from the user's UID on the host machine
@@ -74,12 +75,7 @@ COPY --chown=openhands:app --chmod=770 --from=backend-builder ${VIRTUAL_ENV} ${V
 COPY --chown=openhands:app --chmod=770 ./microagents ./microagents
 COPY --chown=openhands:app --chmod=770 ./openhands ./openhands
 COPY --chown=openhands:app --chmod=777 ./openhands/runtime/plugins ./openhands/runtime/plugins
-COPY --chown=openhands:app --chmod=770 ./openhands/agenthub ./openhands/agenthub
-COPY --chown=openhands:app ./pyproject.toml ./pyproject.toml
-COPY --chown=openhands:app ./poetry.lock ./poetry.lock
-COPY --chown=openhands:app ./README.md ./README.md
-COPY --chown=openhands:app ./MANIFEST.in ./MANIFEST.in
-COPY --chown=openhands:app ./LICENSE ./LICENSE
+COPY --chown=openhands:app pyproject.toml poetry.lock README.md MANIFEST.in LICENSE ./
 
 # This is run as "openhands" user, and will create __pycache__ with openhands:openhands ownership
 RUN python openhands/core/download.py # No-op to download assets

docs/docs.json

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

docs/usage/cloud/cloud-api.mdx

@@ -1,9 +1,11 @@
 ---
 title: Cloud API
-description: OpenHands Cloud provides a REST API that allows you to programmatically interact with the service. This guide explains how to obtain an API key and use the API to start conversations.
+description: OpenHands Cloud provides a REST API that allows you to programmatically interact with OpenHands.
+  This guide explains how to obtain an API key and use the API to start conversations and retrieve their status.
 ---
 
-For more detailed information about the API, refer to the [OpenHands API Reference](https://docs.all-hands.dev/swagger-ui/).
+For the available API endpoints, refer to the
+[OpenHands API Reference](https://docs.all-hands.dev/api-reference).
 
 ## Obtaining an API Key
 
@@ -16,7 +18,7 @@ To use the OpenHands Cloud API, you'll need to generate an API key:
 5. Give your key a descriptive name (Example: "Development" or "Production") and select `Create`.
 6. Copy the generated API key and store it securely. It will only be shown once.
 
-![API Key Generation](/static/img/docs/api-key-generation.png)
+![API Key Generation](/static/img/api-key-generation.png)
 
 ## API Usage
 
@@ -33,87 +35,81 @@ To start a new conversation with OpenHands to perform a task, you'll need to mak
 
 #### Examples
 
-<details>
-<summary>cURL</summary>
 
-```bash
-curl -X POST "https://app.all-hands.dev/api/conversations" \
-  -H "Authorization: Bearer YOUR_API_KEY" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "initial_user_msg": "Check whether there is any incorrect information in the README.md file and send a PR to fix it if so.",
-    "repository": "yourusername/your-repo"
-  }'
-```
-</details>
+<Accordion title="cURL">
+  ```bash
+  curl -X POST "https://app.all-hands.dev/api/conversations" \
+    -H "Authorization: Bearer YOUR_API_KEY" \
+    -H "Content-Type: application/json" \
+    -d '{
+      "initial_user_msg": "Check whether there is any incorrect information in the README.md file and send a PR to fix it if so.",
+      "repository": "yourusername/your-repo"
+    }'
+  ```
+</Accordion>
 
-<details>
-<summary>Python (with requests)</summary>
+<Accordion title="Python (with requests)">
+  ```python
+  import requests
 
-```python
-import requests
+  api_key = "YOUR_API_KEY"
+  url = "https://app.all-hands.dev/api/conversations"
 
-api_key = "YOUR_API_KEY"
-url = "https://app.all-hands.dev/api/conversations"
-
-headers = {
-    "Authorization": f"Bearer {api_key}",
-    "Content-Type": "application/json"
-}
-
-data = {
-    "initial_user_msg": "Check whether there is any incorrect information in the README.md file and send a PR to fix it if so.",
-    "repository": "yourusername/your-repo"
-}
-
-response = requests.post(url, headers=headers, json=data)
-conversation = response.json()
-
-print(f"Conversation Link: https://app.all-hands.dev/conversations/{conversation['conversation_id']}")
-print(f"Status: {conversation['status']}")
-```
-</details>
-
-<details>
-<summary>TypeScript/JavaScript (with fetch)</summary>
-
-```typescript
-const apiKey = "YOUR_API_KEY";
-const url = "https://app.all-hands.dev/api/conversations";
-
-const headers = {
-  "Authorization": `Bearer ${apiKey}`,
-  "Content-Type": "application/json"
-};
-
-const data = {
-  initial_user_msg: "Check whether there is any incorrect information in the README.md file and send a PR to fix it if so.",
-  repository: "yourusername/your-repo"
-};
-
-async function startConversation() {
-  try {
-    const response = await fetch(url, {
-      method: "POST",
-      headers: headers,
-      body: JSON.stringify(data)
-    });
-
-    const conversation = await response.json();
-
-    console.log(`Conversation Link: https://app.all-hands.dev/conversations/${conversation.id}`);
-    console.log(`Status: ${conversation.status}`);
-
-    return conversation;
-  } catch (error) {
-    console.error("Error starting conversation:", error);
+  headers = {
+      "Authorization": f"Bearer {api_key}",
+      "Content-Type": "application/json"
   }
-}
 
-startConversation();
-```
+  data = {
+      "initial_user_msg": "Check whether there is any incorrect information in the README.md file and send a PR to fix it if so.",
+      "repository": "yourusername/your-repo"
+  }
 
-</details>
+  response = requests.post(url, headers=headers, json=data)
+  conversation = response.json()
+
+  print(f"Conversation Link: https://app.all-hands.dev/conversations/{conversation['conversation_id']}")
+  print(f"Status: {conversation['status']}")
+  ```
+</Accordion>
+
+<Accordion title="TypeScript/JavaScript (with fetch)">
+  ```typescript
+  const apiKey = "YOUR_API_KEY";
+  const url = "https://app.all-hands.dev/api/conversations";
+
+  const headers = {
+    "Authorization": `Bearer ${apiKey}`,
+    "Content-Type": "application/json"
+  };
+
+  const data = {
+    initial_user_msg: "Check whether there is any incorrect information in the README.md file and send a PR to fix it if so.",
+    repository: "yourusername/your-repo"
+  };
+
+  async function startConversation() {
+    try {
+      const response = await fetch(url, {
+        method: "POST",
+        headers: headers,
+        body: JSON.stringify(data)
+      });
+
+      const conversation = await response.json();
+
+      console.log(`Conversation Link: https://app.all-hands.dev/conversations/${conversation.id}`);
+      console.log(`Status: ${conversation.status}`);
+
+      return conversation;
+    } catch (error) {
+      console.error("Error starting conversation:", error);
+    }
+  }
+
+  startConversation();
+  ```
+</Accordion>
 
 #### Response
 
@@ -145,14 +141,12 @@ GET https://app.all-hands.dev/api/conversations/{conversation_id}
 
 #### Example
 
-<details>
-<summary>cURL</summary>
-
-```bash
-curl -X GET "https://app.all-hands.dev/api/conversations/{conversation_id}" \
-  -H "Authorization: Bearer YOUR_API_KEY"
-```
-</details>
+<Accordion title="cURL">
+  ```bash
+  curl -X GET "https://app.all-hands.dev/api/conversations/{conversation_id}" \
+    -H "Authorization: Bearer YOUR_API_KEY"
+  ```
+</Accordion>
 
 #### Response
 

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

@@ -1,33 +0,0 @@
----
-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,28 +1,36 @@
 ---
 title: 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.
+description: The Cloud UI provides a web interface for interacting with OpenHands. This page explains how to use the
+ OpenHands Cloud UI.
 ---
 
+## Landing Page
 
-## Accessing the UI
+The landing page is where you can:
 
-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.
-
-
-## Key Features
-
-For detailed information about the features available in the OpenHands Cloud UI, please refer to the [Key Features](../key-features) section of the documentation.
+- [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`.
 
 ## Settings
 
-The settings page allows you to:
+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.
+- [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](/usage/key-features)
+section of the documentation.
 
 ## Next Steps
 
-- [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.
+- [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.

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 issues!
+  set up, it will allow OpenHands to work with your GitHub repository through the Cloud UI or straight from GitHub!
 ---
 
 ## 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 session!
+click on `Launch` to start the conversation!
 
 ![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
 
-- [Access the Cloud UI](./cloud-ui) to interact with the web interface
-- [Use the Cloud API](./cloud-api) to programmatically interact with OpenHands
+- [Learn about the Cloud UI](/usage/cloud/cloud-ui).
+- [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.

docs/usage/cloud/gitlab-installation.mdx

@@ -1,23 +1,25 @@
 ---
 title: GitLab Integration
-description: This guide walks you through the process of installing and configuring OpenHands Cloud for your GitLab repositories.
+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.
 ---
 
 ## Prerequisites
 
-- A GitLab account
-- Access to OpenHands Cloud
+- Signed in to [OpenHands Cloud](https://app.all-hands.dev) with [a GitLab account](/usage/cloud/openhands-cloud).
 
-## Installation Steps
+## Adding GitLab Repository Access
 
-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
+Upon signing into OpenHands Cloud with a GitLab account, OpenHands will have access to your repositories.
 
+## 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
 
-- [Access the Cloud UI](./cloud-ui) to interact with the web interface
-- [Use the Cloud API](./cloud-api) to programmatically interact with OpenHands
+- [Learn about the Cloud UI](/usage/cloud/cloud-ui).
+- [Use the Cloud API](/usage/cloud/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](./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
+- [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.

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

@@ -1,24 +1,39 @@
 ---
-title: CLI Mode
-description: CLI mode provides a powerful interactive Command-Line Interface (CLI) that lets you engage with OpenHands directly from your terminal.
+title: CLI
+description: The Command-Line Interface (CLI) provides a powerful interface that lets you engage with OpenHands
+  directly from your terminal.
 ---
 
-This mode is different from the [headless mode](./headless-mode), which is non-interactive and better for scripting.
+This mode is different from the [headless mode](/usage/how-to/headless-mode), which is non-interactive and better
+for scripting.
 
 ## Getting Started
 
 ### Running with Python
 
-1. Ensure you have followed the [Development setup instructions](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md).
+1. Install OpenHands using pip:
+
+```bash
+pip install openhands-ai
+```
+
 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
-poetry run python -m openhands.cli.main
+openhands
 ```
 
 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/installation#start-the-app), replace
+When running OpenHands using [the docker command](/usage/local-setup#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](https://docs.all-hands.dev/modules/usage/how-to/custom-sandbox-guide)) | `OPENHANDS_BASE_CONTAINER_IMAGE="custom_image"`    |
+| `OPENHANDS_BASE_CONTAINER_IMAGE` | Variable | Custom Sandbox ([learn more](/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/how-to/gui-mode.mdx

@@ -1,14 +1,13 @@
 ---
-title: GUI Mode
-description: OpenHands provides a Graphical User Interface (GUI) mode for interacting with the AI assistant.
+title: GUI
+description: High level overview of the Graphical User Interface (GUI) in OpenHands.
 ---
 
-## Installation and Setup
+## Prerequisites
 
-1. Follow the installation instructions to install OpenHands.
-2. After running the command, access OpenHands at [http://localhost:3000](http://localhost:3000).
+- [OpenHands is running](/usage/local-setup)
 
-## Interacting with the GUI
+## Overview
 
 ### Initial Setup
 
@@ -19,16 +18,23 @@ description: OpenHands provides a Graphical User Interface (GUI) mode for intera
 3. Enter the corresponding `API Key` for your chosen provider.
 4. Click `Save Changes` to apply the settings.
 
-### Version Control Tokens
+### Settings
 
-OpenHands supports multiple version control providers. You can configure tokens for multiple providers simultaneously.
+You can use the Settings page at any time to:
 
-#### GitHub Token Setup
+- Setup the LLM provider and model for OpenHands.
+- [Setup the search engine](/usage/search-engine-setup).
+- [Configure MCP servers](/usage/mcp).
+- [Connect to GitHub](/usage/how-to/gui-mode#github-setup) and [connect to GitLab](/usage/how-to/gui-mode#gitlab-setup)
+- Set application settings like your preferred language, notifications and other preferences.
+- Generate custom secrets.
+
+#### GitHub Setup
 
 OpenHands automatically exports a `GITHUB_TOKEN` to the shell environment if provided:
 
-<details>
-  <summary>Setting Up a GitHub Token</summary>
+<AccordionGroup>
+<Accordion title="Setting Up a GitHub Token">
 
   1. **Generate a Personal Access Token (PAT)**:
    - On GitHub, go to Settings > Developer Settings > Personal Access Tokens > Tokens (classic).
@@ -37,16 +43,11 @@ OpenHands automatically exports a `GITHUB_TOKEN` to the shell environment if pro
      - `repo` (Full control of private repositories)
    - **Fine-Grained Tokens**
      - All Repositories (You can select specific repositories, but this will impact what returns in repo search)
-     - Minimal Permissions ( Select `Meta Data = Read-only` read for search, `Pull Requests = Read and Write` and `Content = Read and Write` for branch creation)
+     - Minimal Permissions (Select `Meta Data = Read-only` read for search, `Pull Requests = Read and Write` and `Content = Read and Write` for branch creation)
   2. **Enter Token in OpenHands**:
-   - Click the Settings button (gear icon).
-   - Navigate to the `Git` tab.
+   - In the Settings page, navigate to the `Git` tab.
    - Paste your token in the `GitHub Token` field.
    - Click `Save Changes` to apply the changes.
-</details>
-
-<details>
-  <summary>Organizational Token Policies</summary>
 
   If you're working with organizational repositories, additional setup may be required:
 
@@ -59,15 +60,12 @@ OpenHands automatically exports a `GITHUB_TOKEN` to the shell environment if pro
    - Look for the organization under `Organization access`.
    - If required, click `Enable SSO` next to your organization.
    - Complete the SSO authorization process.
-</details>
-
-<details>
-  <summary>Troubleshooting</summary>
+</Accordion>
 
+<Accordion title="Troubleshooting">
   Common issues and solutions:
 
   - **Token Not Recognized**:
-     - Ensure the token is properly saved in settings.
      - Check that the token hasn't expired.
      - Verify the token has the required scopes.
      - Try regenerating the token.
@@ -81,15 +79,15 @@ OpenHands automatically exports a `GITHUB_TOKEN` to the shell environment if pro
      - The app will show a green checkmark if the token is valid.
      - Try accessing a repository to confirm permissions.
      - Check the browser console for any error messages.
-</details>
+</Accordion>
+</AccordionGroup>
 
-#### GitLab Token Setup
+#### GitLab Setup
 
 OpenHands automatically exports a `GITLAB_TOKEN` to the shell environment if provided:
 
-<details>
-  <summary>Setting Up a GitLab Token</summary>
-
+<AccordionGroup>
+<Accordion title="Setting Up a GitLab Token">
   1. **Generate a Personal Access Token (PAT)**:
    - On GitLab, go to User Settings > Access Tokens.
    - Create a new token with the following scopes:
@@ -99,15 +97,12 @@ OpenHands automatically exports a `GITLAB_TOKEN` to the shell environment if pro
      - `write_repository` (Write repository)
    - Set an expiration date or leave it blank for a non-expiring token.
   2. **Enter Token in OpenHands**:
-   - Click the Settings button (gear icon).
-   - Navigate to the `Git` tab.
+   - In the Settings page, navigate to the `Git` tab.
    - Paste your token in the `GitLab Token` field.
    - Click `Save Changes` to apply the changes.
-</details>
-
-<details>
-  <summary>Troubleshooting</summary>
+</Accordion>
 
+<Accordion title="Troubleshooting">
   Common issues and solutions:
 
   - **Token Not Recognized**:
@@ -119,25 +114,30 @@ OpenHands automatically exports a `GITLAB_TOKEN` to the shell environment if pro
      - Verify project access permissions.
      - Check if the token has the necessary scopes.
      - For group/organization repositories, ensure you have proper access.
-</details>
+</Accordion>
+</AccordionGroup>
 
-### Advanced Settings
+#### Advanced Settings
 
-1. Inside the Settings page, under the `LLM` tab, toggle `Advanced` options to access additional settings.
-2. Use the `Custom Model` text box to manually enter a model if it's not in the list.
-3. Specify a `Base URL` if required by your LLM provider.
+The `Advanced` settings allows configuration of additional LLM settings. Inside the Settings page, under the `LLM` tab,
+toggle `Advanced` options to access additional settings.
 
-### Interacting with the AI
+- Custom Model: Use the `Custom Model` text box to manually enter a model. Make sure to use the correct prefix based on litellm docs.
+- Base URL: Specify a `Base URL` if required by your LLM provider.
+- Memory Condensation: The memory condenser manages the LLM's context by ensuring only the most important and relevant information is presented.
+- Confirmation Mode: Enabling this mode will cause OpenHands to confirm an action with the user before performing it.
 
-1. Type your prompt in the input box.
-2. Click the send button or press Enter to submit your message.
-3. The AI will process your input and provide a response in the chat window.
-4. You can continue the conversation by asking follow-up questions or providing additional information.
+### Key Features
+
+For an overview of the key features available inside a conversation, please refer to the [Key Features](/usage/key-features)
+section of the documentation.
 
 ## Tips for Effective Use
 
 - Be specific in your requests to get the most accurate and helpful responses, as described in the [prompting best practices](../prompting/prompting-best-practices).
 - Use one of the recommended models, as described in the [LLMs section](usage/llms/llms.md).
 
-Remember, the GUI mode of OpenHands is designed to make your interaction with the AI assistant as smooth and intuitive
-as possible. Don't hesitate to explore its features to maximize your productivity.
+## Other Ways to Run Openhands
+- [Run OpenHands in a scriptable headless mode.](/usage/how-to/headless-mode)
+- [Run OpenHands with a friendly CLI.](/usage/how-to/cli-mode)
+- [Run OpenHands on GitHub issues with a GitHub action.](/usage/how-to/github-action)

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

@@ -1,9 +1,10 @@
 ---
-title: Headless Mode
-description: You can run OpenHands with a single command, without starting the web application. This makes it easy to write scripts and automate tasks with OpenHands.
+title: Headless
+description: You can run OpenHands with a single command, without starting the web application. This makes it easy to
+  write scripts and automate tasks with OpenHands.
 ---
 
-This is different from [CLI Mode](./cli-mode), which is interactive, and better for active development.
+This is different from [the CLI](./cli-mode), which is interactive, and better for active development.
 
 ## With Python
 

docs/usage/installation.mdx

@@ -12,8 +12,8 @@ To get started with OpenHands Cloud, visit [app.all-hands.dev](https://app.all-h
 
 For more information see [getting started with OpenHands Cloud.](/usage/cloud/openhands-cloud)
 
-## Running OpenHands Locally
+## Running OpenHands on Your Own
 
 Run OpenHands on your local system and bring your own LLM and API key.
 
-For more information see [running OpenHands locally.](/usage/local-setup)
+For more information see [running OpenHands on your own.](/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](https://docs.all-hands.dev/modules/usage/installation) to make sure you have all the prerequisites for running OpenHands.
+Check [the installation guide](/usage/local-setup) 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/local-setup.mdx

@@ -1,6 +1,6 @@
 ---
 title: Getting Started
-description: Getting started with running OpenHands locally.
+description: Getting started with running OpenHands on your own.
 ---
 
 ## Recommended Methods for Running Openhands on Your Local System
@@ -62,17 +62,17 @@ A system with a modern processor and a minimum of **4GB RAM** is recommended to
 ### Start the App
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.40-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.41-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.40-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.41-nikolaik \
     -e LOG_ALL_EVENTS=true \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v ~/.openhands-state:/.openhands-state \
     -p 3000:3000 \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.40
+    docker.all-hands.dev/all-hands-ai/openhands:0.41
 ```
 
 You'll find OpenHands running at http://localhost:3000!
@@ -109,6 +109,14 @@ OpenHands requires an API key to access most language models. Here's how to get
 
 </Accordion>
 
+<Accordion title="Google (Gemini)">
+
+1. Create a Google account if you don't already have one.
+2. [Generate an API key](https://aistudio.google.com/apikey).
+3. [Set up billing](https://aistudio.google.com/usage?tab=billing).
+
+</Accordion>
+
 </AccordionGroup>
 
 Consider setting usage limits to control costs.
@@ -124,7 +132,6 @@ To enable search functionality in OpenHands:
 
 For more details, see the [Search Engine Setup](/usage/search-engine-setup) guide.
 
-
 Now you're ready to [get started with OpenHands](/usage/getting-started).
 
 ### Versions

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.
+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).
 
 <Note>
 Loaded microagents take up space in the context window.

docs/usage/prompting/microagents-repo.mdx

@@ -17,13 +17,45 @@ Frontmatter should be enclosed in triple dashes (---) and may include the follow
 |-----------|-----------------------------------------|----------|----------------|
 | `agent`   | The agent this microagent applies to    | No       | 'CodeActAgent' |
 
-## Example
+## Creating a Comprehensive Repository Agent
+
+To create an effective repository agent, you can ask OpenHands to analyze your repository with a prompt like:
 
-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,10 +71,27 @@ 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.
 
+### Enabling LLM-Based Editor Tools
+
+The LLM-Based Editor tool (currently supported only for SWE-Bench) can be enabled by setting:
+```bash
+export ENABLE_LLM_EDITOR=true
+```
+
+You can set the config for the Editor LLM as:
+```toml
+[llm.draft_editor]
+base_url = "http://localhost:9002/v1"
+model = "hosted_vllm/lite_coder_qwen_editor_3B"
+api_key = ""
+temperature = 0.7
+max_input_tokens = 10500
+max_output_tokens = 10500
+```
+
 ## Supported Benchmarks
 
 The OpenHands evaluation harness supports a wide variety of benchmarks across [software engineering](#software-engineering), [web browsing](#web-browsing), [miscellaneous assistance](#misc-assistance), and [real-world](#real-world) tasks.

evaluation/benchmarks/swe_bench/run_infer.py

@@ -42,7 +42,7 @@ from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
     get_llm_config_arg,
-    get_parser,
+    get_parser
 )
 from openhands.core.config.condenser_config import NoOpCondenserConfig
 from openhands.core.config.utils import get_condenser_config_arg
@@ -62,6 +62,7 @@ from openhands.utils.shutdown_listener import sleep_if_should_continue
 
 USE_HINT_TEXT = os.environ.get('USE_HINT_TEXT', 'false').lower() == 'true'
 RUN_WITH_BROWSING = os.environ.get('RUN_WITH_BROWSING', 'false').lower() == 'true'
+ENABLE_LLM_EDITOR = os.environ.get('ENABLE_LLM_EDITOR', 'false').lower() == 'true'
 BenchMode = Literal['swe', 'swt', 'swt-ci']
 
 
@@ -254,15 +255,19 @@ def get_config(
         workspace_base=None,
         workspace_mount_path=None,
     )
+
     config.set_llm_config(
         update_llm_config_for_completions_logging(
             metadata.llm_config, metadata.eval_output_dir, instance['instance_id']
         )
     )
+    # get 'draft_editor' config if exists
+    config.set_llm_config(get_llm_config_arg('draft_editor'), 'draft_editor')
+
     agent_config = AgentConfig(
         enable_jupyter=False,
         enable_browsing=RUN_WITH_BROWSING,
-        enable_llm_editor=False,
+        enable_llm_editor=ENABLE_LLM_EDITOR,
         enable_mcp=False,
         condenser=metadata.condenser_config,
         enable_prompt_extensions=False,

frontend/__tests__/components/chat/chat-interface.test.tsx

@@ -4,7 +4,6 @@ import userEvent from "@testing-library/user-event";
 import { renderWithProviders } from "test-utils";
 import type { Message } from "#/message";
 import { SUGGESTIONS } from "#/utils/suggestions";
-import { WsClientProviderStatus } from "#/context/ws-client-provider";
 import { ChatInterface } from "#/components/features/chat/chat-interface";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -19,7 +18,7 @@ describe("Empty state", () => {
   const { useWsClient: useWsClientMock } = vi.hoisted(() => ({
     useWsClient: vi.fn(() => ({
       send: sendMock,
-      status: WsClientProviderStatus.CONNECTED,
+      status: "CONNECTED",
       isLoadingMessages: false,
     })),
   }));
@@ -64,7 +63,7 @@ describe("Empty state", () => {
       // this is to test that the message is in the UI before the socket is called
       useWsClientMock.mockImplementation(() => ({
         send: sendMock,
-        status: WsClientProviderStatus.CONNECTED,
+        status: "CONNECTED",
         isLoadingMessages: false,
       }));
       const user = userEvent.setup();
@@ -87,7 +86,7 @@ describe("Empty state", () => {
     async () => {
       useWsClientMock.mockImplementation(() => ({
         send: sendMock,
-        status: WsClientProviderStatus.CONNECTED,
+        status: "CONNECTED",
         isLoadingMessages: false,
       }));
       const user = userEvent.setup();
@@ -101,7 +100,7 @@ describe("Empty state", () => {
 
       useWsClientMock.mockImplementation(() => ({
         send: sendMock,
-        status: WsClientProviderStatus.CONNECTED,
+        status: "CONNECTED",
         isLoadingMessages: false,
       }));
       rerender(<ChatInterface />);

frontend/__tests__/routes/settings-with-payment.test.tsx

@@ -6,6 +6,21 @@ import { renderWithProviders } from "test-utils";
 import OpenHands from "#/api/open-hands";
 import SettingsScreen from "#/routes/settings";
 import { PaymentForm } from "#/components/features/payment/payment-form";
+import * as useSettingsModule from "#/hooks/query/use-settings";
+
+// Mock the useSettings hook
+vi.mock("#/hooks/query/use-settings", async () => {
+  const actual = await vi.importActual<typeof import("#/hooks/query/use-settings")>("#/hooks/query/use-settings");
+  return {
+    ...actual,
+    useSettings: vi.fn().mockReturnValue({
+      data: {
+        EMAIL_VERIFIED: true, // Mock email as verified to prevent redirection
+      },
+      isLoading: false,
+    }),
+  };
+});
 
 // Mock the i18next hook
 vi.mock("react-i18next", async () => {
@@ -20,6 +35,7 @@ vi.mock("react-i18next", async () => {
           "SETTINGS$NAV_CREDITS": "Credits",
           "SETTINGS$NAV_API_KEYS": "API Keys",
           "SETTINGS$NAV_LLM": "LLM",
+          "SETTINGS$NAV_USER": "User",
           "SETTINGS$TITLE": "Settings"
         };
         return translations[key] || key;
@@ -47,6 +63,10 @@ describe("Settings Billing", () => {
           Component: () => <div data-testid="git-settings-screen" />,
           path: "/settings/git",
         },
+        {
+          Component: () => <div data-testid="user-settings-screen" />,
+          path: "/settings/user",
+        },
       ],
     },
   ]);

frontend/src/api/open-hands-axios.ts

@@ -1,5 +1,60 @@
-import axios from "axios";
+import axios, { AxiosError, AxiosResponse } from "axios";
 
 export const openHands = axios.create({
   baseURL: `${window.location.protocol}//${import.meta.env.VITE_BACKEND_BASE_URL || window?.location.host}`,
 });
+
+// Helper function to check if a response contains an email verification error
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const checkForEmailVerificationError = (data: any): boolean => {
+  const EMAIL_NOT_VERIFIED = "EmailNotVerifiedError";
+
+  if (typeof data === "string") {
+    return data.includes(EMAIL_NOT_VERIFIED);
+  }
+
+  if (typeof data === "object" && data !== null) {
+    if ("message" in data) {
+      const { message } = data;
+      if (typeof message === "string") {
+        return message.includes(EMAIL_NOT_VERIFIED);
+      }
+      if (Array.isArray(message)) {
+        return message.some(
+          (msg) => typeof msg === "string" && msg.includes(EMAIL_NOT_VERIFIED),
+        );
+      }
+    }
+
+    // Search any values in object in case message key is different
+    return Object.values(data).some(
+      (value) =>
+        (typeof value === "string" && value.includes(EMAIL_NOT_VERIFIED)) ||
+        (Array.isArray(value) &&
+          value.some(
+            (v) => typeof v === "string" && v.includes(EMAIL_NOT_VERIFIED),
+          )),
+    );
+  }
+
+  return false;
+};
+
+// Set up the global interceptor
+openHands.interceptors.response.use(
+  (response: AxiosResponse) => response,
+  (error: AxiosError) => {
+    // Check if it's a 403 error with the email verification message
+    if (
+      error.response?.status === 403 &&
+      checkForEmailVerificationError(error.response?.data)
+    ) {
+      if (window.location.pathname !== "/settings/user") {
+        window.location.reload();
+      }
+    }
+
+    // Continue with the error for other error handlers
+    return Promise.reject(error);
+  },
+);

frontend/src/assets/stripe.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" style="enable-background:new 0 0 468 222.5" version="1.1" viewBox="0 0 468 222.5">
+  <style>
+    .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635bff}
+  </style>
+  <path d="M414 113.4c0-25.6-12.4-45.8-36.1-45.8-23.8 0-38.2 20.2-38.2 45.6 0 30.1 17 45.3 41.4 45.3 11.9 0 20.9-2.7 27.7-6.5v-20c-6.8 3.4-14.6 5.5-24.5 5.5-9.7 0-18.3-3.4-19.4-15.2h48.9c0-1.3.2-6.5.2-8.9zm-49.4-9.5c0-11.3 6.9-16 13.2-16 6.1 0 12.6 4.7 12.6 16h-25.8zM301.1 67.6c-9.8 0-16.1 4.6-19.6 7.8l-1.3-6.2h-22v116.6l25-5.3.1-28.3c3.6 2.6 8.9 6.3 17.7 6.3 17.9 0 34.2-14.4 34.2-46.1-.1-29-16.6-44.8-34.1-44.8zm-6 68.9c-5.9 0-9.4-2.1-11.8-4.7l-.1-37.1c2.6-2.9 6.2-4.9 11.9-4.9 9.1 0 15.4 10.2 15.4 23.3 0 13.4-6.2 23.4-15.4 23.4zM223.8 61.7l25.1-5.4V36l-25.1 5.3zM223.8 69.3h25.1v87.5h-25.1zM196.9 76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7 15.9-6.3 19-5.2v-23c-3.2-1.2-14.9-3.4-20.8 7.4zM146.9 47.6l-24.4 5.2-.1 80.1c0 14.8 11.1 25.7 25.9 25.7 8.2 0 14.2-1.5 17.5-3.3V135c-3.2 1.3-19 5.9-19-8.9V90.6h19V69.3h-19l.1-21.7zM79.3 94.7c0-3.9 3.2-5.4 8.5-5.4 7.6 0 17.2 2.3 24.8 6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6C67.5 67.6 54 78.2 54 95.9c0 27.6 38 23.2 38 35.1 0 4.6-4 6.1-9.6 6.1-8.3 0-18.9-3.4-27.3-8v23.8c9.3 4 18.7 5.7 27.3 5.7 20.8 0 35.1-10.3 35.1-28.2-.1-29.8-38.2-24.5-38.2-35.7z" class="st0"/>
+</svg>

frontend/src/components/features/controls/agent-status-bar.tsx

@@ -9,10 +9,7 @@ import {
   AGENT_STATUS_MAP,
   IndicatorColor,
 } from "../../agent-status-map.constant";
-import {
-  useWsClient,
-  WsClientProviderStatus,
-} from "#/context/ws-client-provider";
+import { useWsClient } from "#/context/ws-client-provider";
 import { useNotification } from "#/hooks/useNotification";
 import { browserTab } from "#/utils/browser-tab";
 import { useActiveConversation } from "#/hooks/query/use-active-conversation";
@@ -80,10 +77,13 @@ export function AgentStatusBar() {
   );
 
   React.useEffect(() => {
-    if (conversation?.status === "STARTING") {
+    if (conversation?.status === "CONNECTING") {
+      setStatusMessage(t(I18nKey.STATUS$CONNECTING_TO_RUNTIME));
+      setIndicatorColor(IndicatorColor.YELLOW);
+    } else if (conversation?.status === "STARTING") {
       setStatusMessage(t(I18nKey.STATUS$STARTING_RUNTIME));
       setIndicatorColor(IndicatorColor.RED);
-    } else if (status === WsClientProviderStatus.DISCONNECTED) {
+    } else if (status === "DISCONNECTED") {
       setStatusMessage(t(I18nKey.STATUS$WEBSOCKET_CLOSED));
       setIndicatorColor(IndicatorColor.RED);
     } else {

frontend/src/components/features/conversation-panel/conversation-state-indicator.tsx

@@ -2,9 +2,20 @@ import ColdIcon from "./state-indicators/cold.svg?react";
 import RunningIcon from "./state-indicators/running.svg?react";
 
 type SVGIcon = React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
-export type ProjectStatus = "RUNNING" | "STOPPED" | "STARTING";
+export type ProjectStatus =
+  | "RUNNING"
+  | "STOPPED"
+  | "STARTING"
+  | "CONNECTING"
+  | "CONNECTED"
+  | "DISCONNECTED";
 
-const INDICATORS: Record<ProjectStatus, SVGIcon> = {
+type ProjectStatusWithIcon = Exclude<
+  ProjectStatus,
+  "CONNECTING" | "CONNECTED" | "DISCONNECTED"
+>;
+
+const INDICATORS: Record<ProjectStatusWithIcon, SVGIcon> = {
   STOPPED: ColdIcon,
   RUNNING: RunningIcon,
   STARTING: ColdIcon,
@@ -17,6 +28,7 @@ interface ConversationStateIndicatorProps {
 export function ConversationStateIndicator({
   status,
 }: ConversationStateIndicatorProps) {
+  // @ts-expect-error - Type 'ProjectStatus' is not assignable to type 'ProjectStatusWithIcon'.
   const StateIcon = INDICATORS[status];
 
   return (

frontend/src/components/features/guards/email-verification-guard.tsx

@@ -0,0 +1,32 @@
+import React from "react";
+import { useLocation, useNavigate } from "react-router";
+import { useSettings } from "#/hooks/query/use-settings";
+
+/**
+ * A component that restricts access to routes based on email verification status.
+ * If EMAIL_VERIFIED is false, only allows access to the /settings/user page.
+ */
+export function EmailVerificationGuard({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const { data: settings, isLoading } = useSettings();
+  const navigate = useNavigate();
+  const { pathname } = useLocation();
+
+  React.useEffect(() => {
+    // If settings are still loading, don't do anything yet
+    if (isLoading) return;
+
+    // If EMAIL_VERIFIED is explicitly false (not undefined or null)
+    if (settings?.EMAIL_VERIFIED === false) {
+      // Allow access to /settings/user but redirect from any other page
+      if (pathname !== "/settings/user") {
+        navigate("/settings/user", { replace: true });
+      }
+    }
+  }, [settings?.EMAIL_VERIFIED, pathname, navigate, isLoading]);
+
+  return children;
+}

frontend/src/components/features/payment/payment-form.tsx

@@ -9,6 +9,7 @@ import { BrandButton } from "../settings/brand-button";
 import { LoadingSpinner } from "#/components/shared/loading-spinner";
 import { amountIsValid } from "#/utils/amount-is-valid";
 import { I18nKey } from "#/i18n/declaration";
+import { PoweredByStripeTag } from "./powered-by-stripe-tag";
 
 export function PaymentForm() {
   const { t } = useTranslation();
@@ -79,6 +80,7 @@ export function PaymentForm() {
             {t(I18nKey.PAYMENT$ADD_CREDIT)}
           </BrandButton>
           {isPending && <LoadingSpinner size="small" />}
+          <PoweredByStripeTag />
         </div>
       </div>
     </form>

frontend/src/components/features/payment/powered-by-stripe-tag.tsx

@@ -0,0 +1,16 @@
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import stripeLogo from "#/assets/stripe.svg";
+
+export function PoweredByStripeTag() {
+  const { t } = useTranslation();
+
+  return (
+    <div className="flex flex-row items-center">
+      <span className="text-medium font-semi-bold">
+        {t(I18nKey.BILLING$POWERED_BY)}
+      </span>
+      <img src={stripeLogo} alt="Stripe" className="h-8" />
+    </div>
+  );
+}

frontend/src/components/features/sidebar/sidebar.tsx

@@ -69,16 +69,21 @@ export function Sidebar() {
             <div className="flex items-center justify-center">
               <AllHandsLogoButton />
             </div>
-            <NewProjectButton />
+            <NewProjectButton disabled={settings?.EMAIL_VERIFIED === false} />
             <ConversationPanelButton
               isOpen={conversationPanelIsOpen}
-              onClick={() => setConversationPanelIsOpen((prev) => !prev)}
+              onClick={() =>
+                settings?.EMAIL_VERIFIED === false
+                  ? null
+                  : setConversationPanelIsOpen((prev) => !prev)
+              }
+              disabled={settings?.EMAIL_VERIFIED === false}
             />
           </div>
 
           <div className="flex flex-row md:flex-col md:items-center gap-[26px] md:mb-4">
-            <DocsButton />
-            <SettingsButton />
+            <DocsButton disabled={settings?.EMAIL_VERIFIED === false} />
+            <SettingsButton disabled={settings?.EMAIL_VERIFIED === false} />
             <UserActions
               user={
                 user.data ? { avatar_url: user.data.avatar_url } : undefined

frontend/src/components/shared/buttons/conversation-panel-button.tsx

@@ -8,11 +8,13 @@ import { cn } from "#/utils/utils";
 interface ConversationPanelButtonProps {
   isOpen: boolean;
   onClick: () => void;
+  disabled?: boolean;
 }
 
 export function ConversationPanelButton({
   isOpen,
   onClick,
+  disabled = false,
 }: ConversationPanelButtonProps) {
   const { t } = useTranslation();
 
@@ -22,10 +24,14 @@ export function ConversationPanelButton({
       tooltip={t(I18nKey.SIDEBAR$CONVERSATIONS)}
       ariaLabel={t(I18nKey.SIDEBAR$CONVERSATIONS)}
       onClick={onClick}
+      disabled={disabled}
     >
       <FaListUl
         size={22}
-        className={cn(isOpen ? "text-white" : "text-[#9099AC]")}
+        className={cn(
+          isOpen ? "text-white" : "text-[#9099AC]",
+          disabled && "opacity-50",
+        )}
       />
     </TooltipButton>
   );

frontend/src/components/shared/buttons/docs-button.tsx

@@ -3,15 +3,24 @@ import DocsIcon from "#/icons/academy.svg?react";
 import { I18nKey } from "#/i18n/declaration";
 import { TooltipButton } from "./tooltip-button";
 
-export function DocsButton() {
+interface DocsButtonProps {
+  disabled?: boolean;
+}
+
+export function DocsButton({ disabled = false }: DocsButtonProps) {
   const { t } = useTranslation();
   return (
     <TooltipButton
       tooltip={t(I18nKey.SIDEBAR$DOCS)}
       ariaLabel={t(I18nKey.SIDEBAR$DOCS)}
       href="https://docs.all-hands.dev"
+      disabled={disabled}
     >
-      <DocsIcon width={28} height={28} className="text-[#9099AC]" />
+      <DocsIcon
+        width={28}
+        height={28}
+        className={`text-[#9099AC] ${disabled ? "opacity-50" : ""}`}
+      />
     </TooltipButton>
   );
 }

frontend/src/components/shared/buttons/new-project-button.tsx

@@ -3,7 +3,11 @@ import { I18nKey } from "#/i18n/declaration";
 import PlusIcon from "#/icons/plus.svg?react";
 import { TooltipButton } from "./tooltip-button";
 
-export function NewProjectButton() {
+interface NewProjectButtonProps {
+  disabled?: boolean;
+}
+
+export function NewProjectButton({ disabled = false }: NewProjectButtonProps) {
   const { t } = useTranslation();
   const startNewProject = t(I18nKey.CONVERSATION$START_NEW);
   return (
@@ -12,6 +16,7 @@ export function NewProjectButton() {
       ariaLabel={startNewProject}
       navLinkTo="/"
       testId="new-project-button"
+      disabled={disabled}
     >
       <PlusIcon width={28} height={28} />
     </TooltipButton>

frontend/src/components/shared/buttons/settings-button.tsx

@@ -5,9 +5,13 @@ import { I18nKey } from "#/i18n/declaration";
 
 interface SettingsButtonProps {
   onClick?: () => void;
+  disabled?: boolean;
 }
 
-export function SettingsButton({ onClick }: SettingsButtonProps) {
+export function SettingsButton({
+  onClick,
+  disabled = false,
+}: SettingsButtonProps) {
   const { t } = useTranslation();
 
   return (
@@ -17,6 +21,7 @@ export function SettingsButton({ onClick }: SettingsButtonProps) {
       ariaLabel={t(I18nKey.SETTINGS$TITLE)}
       onClick={onClick}
       navLinkTo="/settings"
+      disabled={disabled}
     >
       <SettingsIcon width={28} height={28} />
     </TooltipButton>

frontend/src/components/shared/buttons/tooltip-button.tsx

@@ -12,6 +12,7 @@ export interface TooltipButtonProps {
   ariaLabel: string;
   testId?: string;
   className?: React.HTMLAttributes<HTMLButtonElement>["className"];
+  disabled?: boolean;
 }
 
 export function TooltipButton({
@@ -23,9 +24,10 @@ export function TooltipButton({
   ariaLabel,
   testId,
   className,
+  disabled = false,
 }: TooltipButtonProps) {
   const handleClick = (e: React.MouseEvent) => {
-    if (onClick) {
+    if (onClick && !disabled) {
       onClick();
       e.preventDefault();
     }
@@ -37,7 +39,12 @@ export function TooltipButton({
       aria-label={ariaLabel}
       data-testid={testId}
       onClick={handleClick}
-      className={cn("hover:opacity-80", className)}
+      className={cn(
+        "hover:opacity-80",
+        disabled && "opacity-50 cursor-not-allowed",
+        className,
+      )}
+      disabled={disabled}
     >
       {children}
     </button>
@@ -45,7 +52,7 @@ export function TooltipButton({
 
   let content;
 
-  if (navLinkTo) {
+  if (navLinkTo && !disabled) {
     content = (
       <NavLink
         to={navLinkTo}
@@ -63,7 +70,24 @@ export function TooltipButton({
         {children}
       </NavLink>
     );
-  } else if (href) {
+  } else if (navLinkTo && disabled) {
+    // If disabled and has navLinkTo, render a button that looks like a NavLink but doesn't navigate
+    content = (
+      <button
+        type="button"
+        aria-label={ariaLabel}
+        data-testid={testId}
+        className={cn(
+          "text-[#9099AC]",
+          "opacity-50 cursor-not-allowed",
+          className,
+        )}
+        disabled
+      >
+        {children}
+      </button>
+    );
+  } else if (href && !disabled) {
     content = (
       <a
         href={href}
@@ -76,6 +100,19 @@ export function TooltipButton({
         {children}
       </a>
     );
+  } else if (href && disabled) {
+    // If disabled and has href, render a button that looks like a link but doesn't navigate
+    content = (
+      <button
+        type="button"
+        aria-label={ariaLabel}
+        data-testid={testId}
+        className={cn("opacity-50 cursor-not-allowed", className)}
+        disabled
+      >
+        {children}
+      </button>
+    );
   } else {
     content = buttonContent;
   }

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/installation#getting-an-api-key"
+            href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
           />
         </div>
 

frontend/src/context/ws-client-provider.tsx

@@ -28,6 +28,7 @@ import {
 } from "#/types/core/guards";
 import { useOptimisticUserMessage } from "#/hooks/use-optimistic-user-message";
 import { useWSErrorMessage } from "#/hooks/use-ws-error-message";
+import { ProjectStatus } from "#/components/features/conversation-panel/conversation-state-indicator";
 
 const hasValidMessageProperty = (obj: unknown): obj is { message: string } =>
   typeof obj === "object" &&
@@ -67,14 +68,8 @@ const isMessageAction = (
 ): event is UserMessageAction | AssistantMessageAction =>
   isUserMessage(event) || isAssistantMessage(event);
 
-export enum WsClientProviderStatus {
-  CONNECTED,
-  DISCONNECTED,
-  CONNECTING,
-}
-
 interface UseWsClient {
-  status: WsClientProviderStatus;
+  status: ProjectStatus;
   isLoadingMessages: boolean;
   events: Record<string, unknown>[];
   parsedEvents: (OpenHandsAction | OpenHandsObservation)[];
@@ -82,7 +77,7 @@ interface UseWsClient {
 }
 
 const WsClientContext = React.createContext<UseWsClient>({
-  status: WsClientProviderStatus.DISCONNECTED,
+  status: "DISCONNECTED",
   isLoadingMessages: true,
   events: [],
   parsedEvents: [],
@@ -139,9 +134,7 @@ export function WsClientProvider({
   const { setErrorMessage, removeErrorMessage } = useWSErrorMessage();
   const queryClient = useQueryClient();
   const sioRef = React.useRef<Socket | null>(null);
-  const [status, setStatus] = React.useState(
-    WsClientProviderStatus.DISCONNECTED,
-  );
+  const [status, setStatus] = React.useState<ProjectStatus>("CONNECTING");
   const [events, setEvents] = React.useState<Record<string, unknown>[]>([]);
   const [parsedEvents, setParsedEvents] = React.useState<
     (OpenHandsAction | OpenHandsObservation)[]
@@ -162,7 +155,7 @@ export function WsClientProvider({
   }
 
   function handleConnect() {
-    setStatus(WsClientProviderStatus.CONNECTED);
+    setStatus("CONNECTED");
     removeErrorMessage();
   }
 
@@ -261,7 +254,7 @@ export function WsClientProvider({
   }
 
   function handleDisconnect(data: unknown) {
-    setStatus(WsClientProviderStatus.DISCONNECTED);
+    setStatus("DISCONNECTED");
     const sio = sioRef.current;
     if (!sio) {
       return;
@@ -275,7 +268,7 @@ export function WsClientProvider({
 
   function handleError(data: unknown) {
     // set status
-    setStatus(WsClientProviderStatus.DISCONNECTED);
+    setStatus("DISCONNECTED");
     updateStatusWhenErrorMessagePresent(data);
 
     setErrorMessage(
@@ -294,7 +287,7 @@ export function WsClientProvider({
     // reset events when conversationId changes
     setEvents([]);
     setParsedEvents([]);
-    setStatus(WsClientProviderStatus.DISCONNECTED);
+    setStatus("CONNECTING");
   }, [conversationId]);
 
   React.useEffect(() => {

frontend/src/hooks/query/use-active-conversation.ts

@@ -17,6 +17,10 @@ export const useActiveConversation = () => {
   useEffect(() => {
     const conversation = userConversation.data;
     OpenHands.setCurrentConversation(conversation || null);
-  }, [conversationId, userConversation.isFetched]);
+  }, [
+    conversationId,
+    userConversation.isFetched,
+    userConversation?.data?.status,
+  ]);
   return userConversation;
 };

frontend/src/hooks/query/use-conversation-config.ts

@@ -1,9 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import React from "react";
-import {
-  useWsClient,
-  WsClientProviderStatus,
-} from "#/context/ws-client-provider";
+import { useWsClient } from "#/context/ws-client-provider";
 import { useConversationId } from "#/hooks/use-conversation-id";
 import OpenHands from "#/api/open-hands";
 
@@ -17,7 +14,7 @@ export const useConversationConfig = () => {
       if (!conversationId) throw new Error("No conversation ID");
       return OpenHands.getRuntimeId(conversationId);
     },
-    enabled: status !== WsClientProviderStatus.DISCONNECTED && !!conversationId,
+    enabled: status !== "DISCONNECTED" && !!conversationId,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes
   });

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

@@ -27,7 +27,8 @@ const getSettingsQueryFn = async (): Promise<Settings> => {
       apiSettings.enable_proactive_conversation_starters,
     USER_CONSENTS_TO_ANALYTICS: apiSettings.user_consents_to_analytics,
     SEARCH_API_KEY: apiSettings.search_api_key || "",
-
+    EMAIL: apiSettings.email || "",
+    EMAIL_VERIFIED: apiSettings.email_verified,
     MCP_CONFIG: apiSettings.mcp_config,
     IS_NEW_USER: false,
   };
@@ -44,6 +45,7 @@ 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

@@ -1,5 +1,15 @@
 // this file generate by script, don't modify it manually!!!
 export enum I18nKey {
+  MICROAGENT$NO_REPOSITORY_FOUND = "MICROAGENT$NO_REPOSITORY_FOUND",
+  MICROAGENT$ADD_TO_MICROAGENT = "MICROAGENT$ADD_TO_MICROAGENT",
+  MICROAGENT$WHAT_TO_ADD = "MICROAGENT$WHAT_TO_ADD",
+  MICROAGENT$WHERE_TO_PUT = "MICROAGENT$WHERE_TO_PUT",
+  MICROAGENT$ADD_TRIGGER = "MICROAGENT$ADD_TRIGGER",
+  MICROAGENT$WAIT_FOR_RUNTIME = "MICROAGENT$WAIT_FOR_RUNTIME",
+  MICROAGENT$ADDING_CONTEXT = "MICROAGENT$ADDING_CONTEXT",
+  MICROAGENT$VIEW_CONVERSATION = "MICROAGENT$VIEW_CONVERSATION",
+  MICROAGENT$SUCCESS_PR_READY = "MICROAGENT$SUCCESS_PR_READY",
+  STATUS$CONNECTING_TO_RUNTIME = "STATUS$CONNECTING_TO_RUNTIME",
   STATUS$WEBSOCKET_CLOSED = "STATUS$WEBSOCKET_CLOSED",
   HOME$LAUNCH_FROM_SCRATCH = "HOME$LAUNCH_FROM_SCRATCH",
   HOME$READ_THIS = "HOME$READ_THIS",
@@ -470,6 +480,7 @@ export enum I18nKey {
   BILLING$YOUVE_GOT_50 = "BILLING$YOUVE_GOT_50",
   BILLING$ERROR_WHILE_CREATING_SESSION = "BILLING$ERROR_WHILE_CREATING_SESSION",
   BILLING$CLAIM_YOUR_50 = "BILLING$CLAIM_YOUR_50",
+  BILLING$POWERED_BY = "BILLING$POWERED_BY",
   BILLING$PROCEED_TO_STRIPE = "BILLING$PROCEED_TO_STRIPE",
   BILLING$YOURE_IN = "BILLING$YOURE_IN",
   PAYMENT$ADD_FUNDS = "PAYMENT$ADD_FUNDS",
@@ -556,4 +567,19 @@ export enum I18nKey {
   TIPS$PROTIP = "TIPS$PROTIP",
   FEEDBACK$SUBMITTING_LABEL = "FEEDBACK$SUBMITTING_LABEL",
   FEEDBACK$SUBMITTING_MESSAGE = "FEEDBACK$SUBMITTING_MESSAGE",
+  SETTINGS$NAV_USER = "SETTINGS$NAV_USER",
+  SETTINGS$USER_TITLE = "SETTINGS$USER_TITLE",
+  SETTINGS$USER_EMAIL = "SETTINGS$USER_EMAIL",
+  SETTINGS$USER_EMAIL_LOADING = "SETTINGS$USER_EMAIL_LOADING",
+  SETTINGS$SAVE = "SETTINGS$SAVE",
+  SETTINGS$EMAIL_SAVED_SUCCESSFULLY = "SETTINGS$EMAIL_SAVED_SUCCESSFULLY",
+  SETTINGS$EMAIL_VERIFIED_SUCCESSFULLY = "SETTINGS$EMAIL_VERIFIED_SUCCESSFULLY",
+  SETTINGS$FAILED_TO_SAVE_EMAIL = "SETTINGS$FAILED_TO_SAVE_EMAIL",
+  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/i18n/translation.json

@@ -5855,6 +5855,22 @@
         "tr": "Konuşmalar",
         "uk": "Розмови"
     },
+    "STATUS$CONNECTING_TO_RUNTIME": {
+        "en": "Connecting to runtime...",
+        "zh-CN": "正在连接到运行时...",
+        "zh-TW": "正在連接到執行時...",
+        "de": "Verbinde mit der Laufzeitumgebung...",
+        "ko-KR": "런타임에 연결 중...",
+        "no": "Kobler til kjøretidsmiljø...",
+        "it": "Connessione all'ambiente di esecuzione in corso...",
+        "pt": "Conectando ao ambiente de execução...",
+        "es": "Conectando al entorno de ejecución...",
+        "ar": "جارٍ الاتصال ببيئة التشغيل...",
+        "fr": "Connexion à l'environnement d'exécution en cours...",
+        "tr": "Çalışma zamanı ortamına bağlanılıyor...",
+        "ja": "ランタイムに接続中",
+        "uk": "Підключення до середовища виконання..."
+    },
     "STATUS$STARTING_RUNTIME": {
         "en": "Starting runtime...",
         "zh-CN": "启动运行时...",
@@ -7519,6 +7535,22 @@
         "de": "Fügen Sie eine Kreditkarte mit Stripe hinzu, um $50 zu erhalten. <b>Wir belasten Sie nicht ohne vorherige Zustimmung!</b>",
         "uk": "Додайте кредитну картку до Stripe, щоб отримати свої 50 доларів. <b>Ми не стягуватимемо з вас плату без попереднього запиту!</b>"
     },
+    "BILLING$POWERED_BY": {
+        "en": "Powered by",
+        "ja": "提供：",
+        "zh-CN": "技术支持：",
+        "zh-TW": "技術支援：",
+        "ko-KR": "제공: ",
+        "no": "Drevet av",
+        "it": "Offerto da",
+        "pt": "Oferecido por",
+        "es": "Ofrecido por",
+        "ar": "مشغل بواسطة",
+        "fr": "Propulsé par",
+        "tr": "Tarafından desteklenmektedir",
+        "de": "Bereitgestellt von",
+        "uk": "Працює на базі"
+    },
     "BILLING$PROCEED_TO_STRIPE": {
         "en": "Add Billing Info",
         "ja": "請求情報を追加",
@@ -8894,5 +8926,245 @@
         "tr": "Geri bildirim gönderiliyor, lütfen bekleyin...",
         "de": "Feedback senden, bitte warten...",
         "uk": "Відправляємо відгук, будь ласка, почекайте..."
+    },
+    "SETTINGS$NAV_USER": {
+        "en": "User",
+        "ja": "ユーザー",
+        "zh-CN": "用户",
+        "zh-TW": "用戶",
+        "ko-KR": "사용자",
+        "no": "Bruker",
+        "it": "Utente",
+        "pt": "Usuário",
+        "es": "Usuario",
+        "ar": "المستخدم",
+        "fr": "Utilisateur",
+        "tr": "Kullanıcı",
+        "de": "Benutzer",
+        "uk": "Користувач"
+    },
+    "SETTINGS$USER_TITLE": {
+        "en": "User Information",
+        "ja": "ユーザー情報",
+        "zh-CN": "用户信息",
+        "zh-TW": "用戶信息",
+        "ko-KR": "사용자 정보",
+        "no": "Brukerinformasjon",
+        "it": "Informazioni utente",
+        "pt": "Informações do usuário",
+        "es": "Información del usuario",
+        "ar": "معلومات المستخدم",
+        "fr": "Informations utilisateur",
+        "tr": "Kullanıcı Bilgileri",
+        "de": "Benutzerinformationen",
+        "uk": "Інформація про користувача"
+    },
+    "SETTINGS$USER_EMAIL": {
+        "en": "Email",
+        "ja": "メール",
+        "zh-CN": "邮箱",
+        "zh-TW": "郵箱",
+        "ko-KR": "이메일",
+        "no": "E-post",
+        "it": "Email",
+        "pt": "Email",
+        "es": "Correo electrónico",
+        "ar": "البريد الإلكتروني",
+        "fr": "Email",
+        "tr": "E-posta",
+        "de": "E-Mail",
+        "uk": "Електронна пошта"
+    },
+    "SETTINGS$USER_EMAIL_LOADING": {
+        "en": "Loading...",
+        "ja": "読み込み中...",
+        "zh-CN": "加载中...",
+        "zh-TW": "加載中...",
+        "ko-KR": "로딩 중...",
+        "no": "Laster...",
+        "it": "Caricamento...",
+        "pt": "Carregando...",
+        "es": "Cargando...",
+        "ar": "جار التحميل...",
+        "fr": "Chargement...",
+        "tr": "Yükleniyor...",
+        "de": "Wird geladen...",
+        "uk": "Завантаження..."
+    },
+    "SETTINGS$SAVE": {
+        "en": "Save",
+        "ja": "保存",
+        "zh-CN": "保存",
+        "zh-TW": "儲存",
+        "ko-KR": "저장",
+        "no": "Lagre",
+        "it": "Salva",
+        "pt": "Salvar",
+        "es": "Guardar",
+        "ar": "حفظ",
+        "fr": "Enregistrer",
+        "tr": "Kaydet",
+        "de": "Speichern",
+        "uk": "Зберегти"
+    },
+    "SETTINGS$EMAIL_SAVED_SUCCESSFULLY": {
+        "en": "Email saved successfully",
+        "ja": "メールが正常に保存されました",
+        "zh-CN": "邮箱保存成功",
+        "zh-TW": "郵箱儲存成功",
+        "ko-KR": "이메일이 성공적으로 저장되었습니다",
+        "no": "E-post lagret",
+        "it": "Email salvata con successo",
+        "pt": "Email salvo com sucesso",
+        "es": "Correo electrónico guardado con éxito",
+        "ar": "تم حفظ البريد الإلكتروني بنجاح",
+        "fr": "Email enregistré avec succès",
+        "tr": "E-posta başarıyla kaydedildi",
+        "de": "E-Mail erfolgreich gespeichert",
+        "uk": "Електронну пошту успішно збережено"
+    },
+    "SETTINGS$EMAIL_VERIFIED_SUCCESSFULLY": {
+        "en": "Your email has been verified successfully!",
+        "ja": "メールアドレスの確認が完了しました！",
+        "zh-CN": "您的邮箱已成功验证！",
+        "zh-TW": "您的郵箱已成功驗證！",
+        "ko-KR": "이메일이 성공적으로 인증되었습니다!",
+        "no": "E-posten din er bekreftet!",
+        "it": "La tua email è stata verificata con successo!",
+        "pt": "Seu email foi verificado com sucesso!",
+        "es": "¡Tu correo electrónico ha sido verificado con éxito!",
+        "ar": "تم التحقق من بريدك الإلكتروني بنجاح!",
+        "fr": "Votre email a été vérifié avec succès !",
+        "tr": "E-postanız başarıyla doğrulandı!",
+        "de": "Ihre E-Mail wurde erfolgreich verifiziert!",
+        "uk": "Вашу електронну пошту успішно підтверджено!"
+    },
+    "SETTINGS$FAILED_TO_SAVE_EMAIL": {
+        "en": "Failed to save email",
+        "ja": "メールの保存に失敗しました",
+        "zh-CN": "保存邮箱失败",
+        "zh-TW": "儲存郵箱失敗",
+        "ko-KR": "이메일 저장 실패",
+        "no": "Kunne ikke lagre e-post",
+        "it": "Impossibile salvare l'email",
+        "pt": "Falha ao salvar email",
+        "es": "Error al guardar el correo electrónico",
+        "ar": "فشل في حفظ البريد الإلكتروني",
+        "fr": "Échec de l'enregistrement de l'email",
+        "tr": "E-posta kaydedilemedi",
+        "de": "E-Mail konnte nicht gespeichert werden",
+        "uk": "Не вдалося зберегти електронну пошту"
+    },
+    "SETTINGS$SENDING": {
+        "en": "Sending",
+        "ja": "送信中",
+        "zh-CN": "发送中",
+        "zh-TW": "發送中",
+        "ko-KR": "전송 중",
+        "no": "Sender",
+        "it": "Invio in corso",
+        "pt": "Enviando",
+        "es": "Enviando",
+        "ar": "جاري الإرسال",
+        "fr": "Envoi en cours",
+        "tr": "Gönderiliyor",
+        "de": "Wird gesendet",
+        "uk": "Надсилання"
+    },
+    "SETTINGS$VERIFICATION_EMAIL_SENT": {
+        "en": "Verification email sent",
+        "ja": "確認メールを送信しました",
+        "zh-CN": "验证邮件已发送",
+        "zh-TW": "驗證郵件已發送",
+        "ko-KR": "인증 이메일이 전송되었습니다",
+        "no": "Bekreftelsese-post sendt",
+        "it": "Email di verifica inviata",
+        "pt": "Email de verificação enviado",
+        "es": "Correo de verificación enviado",
+        "ar": "تم إرسال بريد التحقق",
+        "fr": "Email de vérification envoyé",
+        "tr": "Doğrulama e-postası gönderildi",
+        "de": "Bestätigungs-E-Mail gesendet",
+        "uk": "Лист підтвердження надіслано"
+    },
+    "SETTINGS$EMAIL_VERIFICATION_REQUIRED": {
+        "en": "You must verify your email address before using All Hands",
+        "ja": "All Handsを使用する前にメールアドレスを確認する必要があります",
+        "zh-CN": "使用All Hands前，您必须验证您的电子邮件地址",
+        "zh-TW": "使用All Hands前，您必須驗證您的電子郵件地址",
+        "ko-KR": "All Hands를 사용하기 전에 이메일 주소를 확인해야 합니다",
+        "no": "Du må bekrefte e-postadressen din før du bruker All Hands",
+        "it": "Devi verificare il tuo indirizzo email prima di utilizzare All Hands",
+        "pt": "Você deve verificar seu endereço de e-mail antes de usar o All Hands",
+        "es": "Debe verificar su dirección de correo electrónico antes de usar All Hands",
+        "ar": "يجب عليك التحقق من عنوان بريدك الإلكتروني قبل استخدام All Hands",
+        "fr": "Vous devez vérifier votre adresse e-mail avant d'utiliser All Hands",
+        "tr": "All Hands'i kullanmadan önce e-posta adresinizi doğrulamanız gerekiyor",
+        "de": "Sie müssen Ihre E-Mail-Adresse bestätigen, bevor Sie All Hands verwenden können",
+        "uk": "Ви повинні підтвердити свою електронну адресу перед використанням All Hands"
+    },
+    "SETTINGS$INVALID_EMAIL_FORMAT": {
+        "en": "Please enter a valid email address",
+        "ja": "有効なメールアドレスを入力してください",
+        "zh-CN": "请输入有效的电子邮件地址",
+        "zh-TW": "請輸入有效的電子郵件地址",
+        "ko-KR": "유효한 이메일 주소를 입력하세요",
+        "no": "Vennligst skriv inn en gyldig e-postadresse",
+        "it": "Inserisci un indirizzo email valido",
+        "pt": "Por favor, insira um endereço de e-mail válido",
+        "es": "Por favor, introduzca una dirección de correo electrónico válida",
+        "ar": "الرجاء إدخال عنوان بريد إلكتروني صالح",
+        "fr": "Veuillez entrer une adresse e-mail valide",
+        "tr": "Lütfen geçerli bir e-posta adresi girin",
+        "de": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
+        "uk": "Будь ласка, введіть дійсну електронну адресу"
+    },
+    "SETTINGS$EMAIL_VERIFICATION_RESTRICTION_MESSAGE": {
+        "en": "Your access is limited until your email is verified. You can only access this settings page.",
+        "ja": "メールが確認されるまでアクセスが制限されています。この設定ページにのみアクセスできます。",
+        "zh-CN": "在验证您的电子邮件之前，您的访问权限受到限制。您只能访问此设置页面。",
+        "zh-TW": "在驗證您的電子郵件之前，您的訪問權限受到限制。您只能訪問此設置頁面。",
+        "ko-KR": "이메일이 확인될 때까지 액세스가 제한됩니다. 이 설정 페이지만 액세스할 수 있습니다.",
+        "no": "Din tilgang er begrenset til e-posten din er bekreftet. Du kan bare få tilgang til denne innstillingssiden.",
+        "it": "Il tuo accesso è limitato fino a quando la tua email non viene verificata. Puoi accedere solo a questa pagina delle impostazioni.",
+        "pt": "Seu acesso é limitado até que seu e-mail seja verificado. Você só pode acessar esta página de configurações.",
+        "es": "Su acceso es limitado hasta que se verifique su correo electrónico. Solo puede acceder a esta página de configuración.",
+        "ar": "وصولك محدود حتى يتم التحقق من بريدك الإلكتروني. يمكنك فقط الوصول إلى صفحة الإعدادات هذه.",
+        "fr": "Votre accès est limité jusqu'à ce que votre e-mail soit vérifié. Vous ne pouvez accéder qu'à cette page de paramètres.",
+        "tr": "E-postanız doğrulanana kadar erişiminiz sınırlıdır. Yalnızca bu ayarlar sayfasına erişebilirsiniz.",
+        "de": "Ihr Zugriff ist eingeschränkt, bis Ihre E-Mail-Adresse bestätigt wurde. Sie können nur auf diese Einstellungsseite zugreifen.",
+        "uk": "Ваш доступ обмежений, доки ваша електронна пошта не буде підтверджена. Ви можете отримати доступ лише до цієї сторінки налаштувань."
+    },
+    "SETTINGS$RESEND_VERIFICATION": {
+        "en": "Resend verification",
+        "ja": "確認メールを再送信",
+        "zh-CN": "重新发送验证",
+        "zh-TW": "重新發送驗證",
+        "ko-KR": "인증 재전송",
+        "no": "Send bekreftelse på nytt",
+        "it": "Rinvia verifica",
+        "pt": "Reenviar verificação",
+        "es": "Reenviar verificación",
+        "ar": "إعادة إرسال التحقق",
+        "fr": "Renvoyer la vérification",
+        "tr": "Doğrulamayı yeniden gönder",
+        "de": "Bestätigung erneut senden",
+        "uk": "Надіслати підтвердження повторно"
+    },
+    "SETTINGS$FAILED_TO_RESEND_VERIFICATION": {
+        "en": "Failed to resend verification email",
+        "ja": "確認メールの再送信に失敗しました",
+        "zh-CN": "重新发送验证邮件失败",
+        "zh-TW": "重新發送驗證郵件失敗",
+        "ko-KR": "인증 이메일 재전송 실패",
+        "no": "Kunne ikke sende bekreftelsese-post på nytt",
+        "it": "Impossibile rinviare l'email di verifica",
+        "pt": "Falha ao reenviar email de verificação",
+        "es": "Error al reenviar el correo de verificación",
+        "ar": "فشل في إعادة إرسال بريد التحقق",
+        "fr": "Échec du renvoi de l'email de vérification",
+        "tr": "Doğrulama e-postası yeniden gönderilemedi",
+        "de": "Bestätigungs-E-Mail konnte nicht erneut gesendet werden",
+        "uk": "Не вдалося повторно надіслати лист підтвердження"
     }
 }

frontend/src/routes.ts

@@ -12,6 +12,7 @@ export default [
     route("settings", "routes/settings.tsx", [
       index("routes/llm-settings.tsx"),
       route("mcp", "routes/mcp-settings.tsx"),
+      route("user", "routes/user-settings.tsx"),
       route("git", "routes/git-settings.tsx"),
       route("app", "routes/app-settings.tsx"),
       route("billing", "routes/billing.tsx"),

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/installation#getting-an-api-key"
+                href="https://docs.all-hands.dev/usage/local-setup#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/installation#getting-an-api-key"
+                href="https://docs.all-hands.dev/usage/local-setup#getting-an-api-key"
               />
 
               <SettingsInput

frontend/src/routes/root-layout.tsx

@@ -25,6 +25,7 @@ import { useIsOnTosPage } from "#/hooks/use-is-on-tos-page";
 import { useAutoLogin } from "#/hooks/use-auto-login";
 import { useAuthCallback } from "#/hooks/use-auth-callback";
 import { LOCAL_STORAGE_KEYS } from "#/utils/local-storage";
+import { EmailVerificationGuard } from "#/components/features/guards/email-verification-guard";
 
 export function ErrorBoundary() {
   const error = useRouteError();
@@ -204,7 +205,9 @@ export default function MainApp() {
         id="root-outlet"
         className="h-[calc(100%-50px)] md:h-full w-full relative overflow-auto"
       >
-        <Outlet />
+        <EmailVerificationGuard>
+          <Outlet />
+        </EmailVerificationGuard>
       </div>
 
       {renderAuthModal && (

frontend/src/routes/settings.tsx

@@ -15,6 +15,7 @@ function SettingsScreen() {
   const isSaas = config?.APP_MODE === "saas";
 
   const saasNavItems = [
+    { to: "/settings/user", text: t("SETTINGS$NAV_USER") },
     { to: "/settings/git", text: t("SETTINGS$NAV_GIT") },
     { to: "/settings/app", text: t("SETTINGS$NAV_APPLICATION") },
     { to: "/settings/billing", text: t("SETTINGS$NAV_CREDITS") },
@@ -33,10 +34,11 @@ function SettingsScreen() {
   React.useEffect(() => {
     if (isSaas) {
       if (pathname === "/settings") {
-        navigate("/settings/git");
+        navigate("/settings/user");
       }
     } else {
       const noEnteringPaths = [
+        "/settings/user",
         "/settings/billing",
         "/settings/credits",
         "/settings/api-keys",

frontend/src/routes/user-settings.tsx

@@ -0,0 +1,229 @@
+import React, { useState, useEffect, useRef } from "react";
+import { useTranslation } from "react-i18next";
+import { useQueryClient } from "@tanstack/react-query";
+import { useSettings } from "#/hooks/query/use-settings";
+import { openHands } from "#/api/open-hands-axios";
+import { displaySuccessToast } from "#/utils/custom-toast-handlers";
+
+// Email validation regex pattern
+const EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+
+function EmailInputSection({
+  email,
+  onEmailChange,
+  onSaveEmail,
+  onResendVerification,
+  isSaving,
+  isResendingVerification,
+  isEmailChanged,
+  emailVerified,
+  isEmailValid,
+  children,
+}: {
+  email: string;
+  onEmailChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  onSaveEmail: () => void;
+  onResendVerification: () => void;
+  isSaving: boolean;
+  isResendingVerification: boolean;
+  isEmailChanged: boolean;
+  emailVerified?: boolean;
+  isEmailValid: boolean;
+  children: React.ReactNode;
+}) {
+  const { t } = useTranslation();
+  return (
+    <div className="flex flex-col gap-4">
+      <div className="flex flex-col gap-2">
+        <label className="text-sm">{t("SETTINGS$USER_EMAIL")}</label>
+        <div className="flex items-center gap-3">
+          <input
+            type="email"
+            value={email}
+            onChange={onEmailChange}
+            className={`text-base text-white p-2 bg-base-tertiary rounded border ${
+              isEmailChanged && !isEmailValid
+                ? "border-red-500"
+                : "border-tertiary"
+            } flex-grow focus:outline-none focus:border-transparent focus:ring-0`}
+            placeholder={t("SETTINGS$USER_EMAIL_LOADING")}
+            data-testid="email-input"
+          />
+        </div>
+
+        {isEmailChanged && !isEmailValid && (
+          <div
+            className="text-red-500 text-sm mt-1"
+            data-testid="email-validation-error"
+          >
+            {t("SETTINGS$INVALID_EMAIL_FORMAT")}
+          </div>
+        )}
+
+        <div className="flex items-center gap-3 mt-2">
+          <button
+            type="button"
+            onClick={onSaveEmail}
+            disabled={!isEmailChanged || isSaving || !isEmailValid}
+            className="px-4 py-2 rounded bg-primary text-white hover:opacity-80 disabled:opacity-30 disabled:cursor-not-allowed disabled:text-[#0D0F11]"
+            data-testid="save-email-button"
+          >
+            {isSaving ? t("SETTINGS$SAVING") : t("SETTINGS$SAVE")}
+          </button>
+
+          {emailVerified === false && (
+            <button
+              type="button"
+              onClick={onResendVerification}
+              disabled={isResendingVerification}
+              className="px-4 py-2 rounded bg-primary text-white hover:opacity-80 disabled:opacity-30 disabled:cursor-not-allowed disabled:text-[#0D0F11]"
+              data-testid="resend-verification-button"
+            >
+              {isResendingVerification
+                ? t("SETTINGS$SENDING")
+                : t("SETTINGS$RESEND_VERIFICATION")}
+            </button>
+          )}
+        </div>
+
+        {children}
+      </div>
+    </div>
+  );
+}
+
+function VerificationAlert() {
+  const { t } = useTranslation();
+  return (
+    <div
+      className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded mt-4"
+      role="alert"
+    >
+      <p className="font-bold">{t("SETTINGS$EMAIL_VERIFICATION_REQUIRED")}</p>
+      <p className="text-sm">
+        {t("SETTINGS$EMAIL_VERIFICATION_RESTRICTION_MESSAGE")}
+      </p>
+    </div>
+  );
+}
+
+// These components have been replaced with toast notifications
+
+function UserSettingsScreen() {
+  const { t } = useTranslation();
+  const { data: settings, isLoading, refetch } = useSettings();
+  const [email, setEmail] = useState("");
+  const [originalEmail, setOriginalEmail] = useState("");
+  const [isSaving, setIsSaving] = useState(false);
+  const [isResendingVerification, setIsResendingVerification] = useState(false);
+  const [isEmailValid, setIsEmailValid] = useState(true);
+  const queryClient = useQueryClient();
+  const pollingIntervalRef = useRef<number | null>(null);
+  const prevVerificationStatusRef = useRef<boolean | undefined>(undefined);
+
+  useEffect(() => {
+    if (settings?.EMAIL) {
+      setEmail(settings.EMAIL);
+      setOriginalEmail(settings.EMAIL);
+      setIsEmailValid(EMAIL_REGEX.test(settings.EMAIL));
+    }
+  }, [settings?.EMAIL]);
+
+  useEffect(() => {
+    if (pollingIntervalRef.current) {
+      window.clearInterval(pollingIntervalRef.current);
+      pollingIntervalRef.current = null;
+    }
+
+    if (
+      prevVerificationStatusRef.current === false &&
+      settings?.EMAIL_VERIFIED === true
+    ) {
+      // Display toast notification instead of setting state
+      displaySuccessToast(t("SETTINGS$EMAIL_VERIFIED_SUCCESSFULLY"));
+      setTimeout(() => {
+        queryClient.invalidateQueries({ queryKey: ["settings"] });
+      }, 2000);
+    }
+
+    prevVerificationStatusRef.current = settings?.EMAIL_VERIFIED;
+
+    if (settings?.EMAIL_VERIFIED === false) {
+      pollingIntervalRef.current = window.setInterval(() => {
+        refetch();
+      }, 5000);
+    }
+
+    return () => {
+      if (pollingIntervalRef.current) {
+        window.clearInterval(pollingIntervalRef.current);
+        pollingIntervalRef.current = null;
+      }
+    };
+  }, [settings?.EMAIL_VERIFIED, refetch, queryClient, t]);
+
+  const handleEmailChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const newEmail = e.target.value;
+    setEmail(newEmail);
+    setIsEmailValid(EMAIL_REGEX.test(newEmail));
+  };
+
+  const handleSaveEmail = async () => {
+    if (email === originalEmail || !isEmailValid) return;
+    try {
+      setIsSaving(true);
+      await openHands.post("/api/email", { email }, { withCredentials: true });
+      setOriginalEmail(email);
+      // Display toast notification instead of setting state
+      displaySuccessToast(t("SETTINGS$EMAIL_SAVED_SUCCESSFULLY"));
+      queryClient.invalidateQueries({ queryKey: ["settings"] });
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(t("SETTINGS$FAILED_TO_SAVE_EMAIL"), error);
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  const handleResendVerification = async () => {
+    try {
+      setIsResendingVerification(true);
+      await openHands.put("/api/email/verify", {}, { withCredentials: true });
+      // Display toast notification instead of setting state
+      displaySuccessToast(t("SETTINGS$VERIFICATION_EMAIL_SENT"));
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(t("SETTINGS$FAILED_TO_RESEND_VERIFICATION"), error);
+    } finally {
+      setIsResendingVerification(false);
+    }
+  };
+
+  const isEmailChanged = email !== originalEmail;
+
+  return (
+    <div data-testid="user-settings-screen" className="flex flex-col h-full">
+      <div className="p-9 flex flex-col gap-6">
+        {isLoading ? (
+          <div className="animate-pulse h-8 w-64 bg-tertiary rounded" />
+        ) : (
+          <EmailInputSection
+            email={email}
+            onEmailChange={handleEmailChange}
+            onSaveEmail={handleSaveEmail}
+            onResendVerification={handleResendVerification}
+            isSaving={isSaving}
+            isResendingVerification={isResendingVerification}
+            isEmailChanged={isEmailChanged}
+            emailVerified={settings?.EMAIL_VERIFIED}
+            isEmailValid={isEmailValid}
+          >
+            {settings?.EMAIL_VERIFIED === false && <VerificationAlert />}
+          </EmailInputSection>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default UserSettingsScreen;

frontend/src/services/settings.ts

@@ -19,6 +19,8 @@ export const DEFAULT_SETTINGS: Settings = {
   ENABLE_PROACTIVE_CONVERSATION_STARTERS: false,
   SEARCH_API_KEY: "",
   IS_NEW_USER: true,
+  EMAIL: "",
+  EMAIL_VERIFIED: true, // Default to true to avoid restricting access unnecessarily
   MCP_CONFIG: {
     sse_servers: [],
     stdio_servers: [],

frontend/src/types/settings.ts

@@ -45,6 +45,8 @@ export type Settings = {
   SEARCH_API_KEY?: string;
   IS_NEW_USER?: boolean;
   MCP_CONFIG?: MCPConfig;
+  EMAIL?: string;
+  EMAIL_VERIFIED?: boolean;
 };
 
 export type ApiSettings = {
@@ -68,6 +70,8 @@ export type ApiSettings = {
     sse_servers: (string | MCPSSEServer)[];
     stdio_servers: MCPStdioServer[];
   };
+  email?: string;
+  email_verified?: boolean;
 };
 
 export type PostSettings = Settings & {

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

microagents/README.md

@@ -117,7 +117,10 @@ 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,5 +37,4 @@ 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

@@ -0,0 +1,65 @@
+---
+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

@@ -0,0 +1,19 @@
+---
+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

@@ -0,0 +1,23 @@
+---
+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

@@ -0,0 +1,21 @@
+---
+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

@@ -0,0 +1,19 @@
+---
+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/agenthub/codeact_agent/function_calling.py

@@ -141,6 +141,9 @@ def response_to_actions(
                     content=arguments['content'],
                     start=arguments.get('start', 1),
                     end=arguments.get('end', -1),
+                    impl_source=arguments.get(
+                        'impl_source', FileEditSource.LLM_BASED_EDIT
+                    ),
                 )
             elif (
                 tool_call.function.name

openhands/agenthub/codeact_agent/tools/llm_based_edit.py

@@ -2,10 +2,18 @@ from litellm import ChatCompletionToolParam, ChatCompletionToolParamFunctionChun
 
 _FILE_EDIT_DESCRIPTION = """Edit a file in plain-text format.
 * The assistant can edit files by specifying the file path and providing a draft of the new file content.
-* The draft content doesn't need to be exactly the same as the existing file; the assistant may skip unchanged lines using comments like `# unchanged` to indicate unchanged sections.
+* The draft content doesn't need to be exactly the same as the existing file; the assistant may skip unchanged lines using comments like `# ... existing code ...` to indicate unchanged sections.
 * IMPORTANT: For large files (e.g., > 300 lines), specify the range of lines to edit using `start` and `end` (1-indexed, inclusive). The range should be smaller than 300 lines.
+* -1 indicates the last line of the file when used as the `start` or `end` value.
+* Keep at least one unchanged line before the changed section and after the changed section wherever possible.
+* Make sure to set the `start` and `end` to include all the lines in the original file referred to in the draft of the new file content. Failure to do so will result in bad edits.
 * To append to a file, set both `start` and `end` to `-1`.
 * If the file doesn't exist, a new file will be created with the provided content.
+* IMPORTANT: Make sure you include all the required indentations for each line of code in the draft, otherwise the edited code will be incorrectly indented.
+* IMPORTANT: Make sure that the first line of the draft is also properly indented and has the required whitespaces.
+* IMPORTANT: NEVER include or make references to lines from outside the `start` and `end` range in the draft.
+* IMPORTANT: Start the content with a comment in the format: #EDIT: Reason for edit
+* IMPORTANT: If you are not appending to the file, avoid setting `start` and `end` to the same value.
 
 **Example 1: general edit for short files**
 For example, given an existing file `/path/to/file.py` that looks like this:
@@ -33,13 +41,12 @@ The assistant wants to edit the file to look like this:
 The assistant may produce an edit action like this:
 path="/path/to/file.txt" start=1 end=-1
 content=```
+#EDIT: I want to change the value of y to 2
 class MyClass:
     def __init__(self):
-        # no changes before
+        # ... existing code ...
         self.y = 2
-        # self.z is removed
 
-# MyClass().z is removed
 print(MyClass().y)
 ```
 
@@ -58,6 +65,7 @@ For example, given an existing file `/path/to/file.py` that looks like this:
 
 To append the following lines to the file:
 ```python
+#EDIT: I want to print the value of y
 print(MyClass().y)
 ```
 
@@ -93,9 +101,9 @@ The assistant wants to edit the file to look like this:
 (2000 more lines below)
 
 The assistant may produce an edit action like this:
-path="/path/to/file.txt" start=1001 end=1008
+path="/path/to/file.txt" start=1002 end=1008
 content=```
-class MyClass:
+#EDIT: I want to change the value of y to 2
     def __init__(self):
         # no changes before
         self.y = 2

openhands/events/nested_event_store.py

@@ -3,6 +3,7 @@ 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
@@ -42,6 +43,9 @@ 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/events/stream.py

@@ -186,9 +186,18 @@ class EventStream(EventStore):
 
         if event.id is not None:
             # Write the event to the store - this can take some time
-            self.file_store.write(
-                self._get_filename_for_id(event.id, self.user_id), json.dumps(data)
-            )
+            event_json = json.dumps(data)
+            filename = self._get_filename_for_id(event.id, self.user_id)
+            if len(event_json) > 1_000_000:  # Roughly 1MB in bytes, ignoring encoding
+                logger.warning(
+                    f'Saving event JSON over 1MB: {len(event_json):,} bytes, filename: {filename}',
+                    extra={
+                        'user_id': self.user_id,
+                        'session_id': self.sid,
+                        'size': len(event_json),
+                    },
+                )
+            self.file_store.write(filename, event_json)
 
             # Store the cache page last - if it is not present during reads then it will simply be bypassed.
             self._store_cache_page(current_write_page)

openhands/integrations/templates/resolver/summary_prompt.j2

@@ -1,5 +1,8 @@
-Please summarize your work.
+Please send a final message summarizing your work.
 
-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.
+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.

openhands/llm/fn_call_converter.py

@@ -22,6 +22,7 @@ from openhands.llm.tool_names import (
     BROWSER_TOOL_NAME,
     EXECUTE_BASH_TOOL_NAME,
     FINISH_TOOL_NAME,
+    LLM_BASED_EDIT_TOOL_NAME,
     STR_REPLACE_EDITOR_TOOL_NAME,
 )
 
@@ -251,6 +252,58 @@ noop(1000)  # Wait for page to load
 USER: EXECUTION RESULT of [browser]:
 [Browser shows the numbers in a table format]
 """
+    },
+    'edit_file': {
+        'create_file': """
+ASSISTANT: There is no `app.py` file in the current directory. Let me create a Python file `app.py`:
+<function=edit_file>
+<parameter=path>/workspace/app.py</parameter>
+<parameter=start>1</parameter>
+<parameter=end>-1</parameter>
+<parameter=content>
+from flask import Flask
+app = Flask(__name__)
+
+@app.route('/')
+def index():
+    numbers = list(range(1, 11))
+    return str(numbers)
+
+if __name__ == '__main__':
+    app.run(port=5000)
+</parameter>
+</function>
+
+USER: EXECUTION RESULT of [edit_file]:
+File created successfully at: /workspace/app.py
+""",
+        'edit_file': """
+ASSISTANT:
+Now let me display the numbers in a table format:
+<function=edit_file>
+<parameter=path>/workspace/app.py</parameter>
+<parameter=start>6</parameter>
+<parameter=end>9</parameter>
+<parameter=content>
+    numbers = list(range(1, 11))
+    return '<table>' + ''.join([f'<tr><td>{i}</td></tr>' for i in numbers]) + '</table>'
+    # ... existing code ...
+if __name__ == '__main__':
+</parameter>
+</function>
+
+USER: EXECUTION RESULT of [edit_file]:
+The file /workspace/app.py has been edited. Here's the result of running `cat -n` on a snippet of /workspace/app.py:
+     3
+     4  @app.route('/')
+     5  def index():
+     6      numbers = list(range(1, 11))
+     7      return '<table>' + ''.join([f'<tr><td>{i}</td></tr>' for i in numbers]) + '</table>'
+     8
+     9  if __name__ == '__main__':
+    10      app.run(port=5000)
+Review the changes and make sure they are as expected. Edit the file again if necessary.
+""",
     },
     'finish': {
         'task_completed': """
@@ -279,6 +332,8 @@ def get_example_for_tools(tools: list[dict]) -> str:
                 available_tools.add('browser')
             elif name == FINISH_TOOL_NAME:
                 available_tools.add('finish')
+            elif name == LLM_BASED_EDIT_TOOL_NAME:
+                available_tools.add('edit_file')
 
     if not available_tools:
         return ''
@@ -297,6 +352,8 @@ USER: Create a list of numbers from 1 to 10, and display them in a web page at p
 
     if 'str_replace_editor' in available_tools:
         example += TOOL_EXAMPLES['str_replace_editor']['create_file']
+    elif 'edit_file' in available_tools:
+        example += TOOL_EXAMPLES['edit_file']['create_file']
 
     if 'execute_bash' in available_tools:
         example += TOOL_EXAMPLES['execute_bash']['run_server']
@@ -309,6 +366,8 @@ USER: Create a list of numbers from 1 to 10, and display them in a web page at p
 
     if 'str_replace_editor' in available_tools:
         example += TOOL_EXAMPLES['str_replace_editor']['edit_file']
+    elif 'edit_file' in available_tools:
+        example += TOOL_EXAMPLES['edit_file']['edit_file']
 
     if 'execute_bash' in available_tools:
         example += TOOL_EXAMPLES['execute_bash']['run_server_again']

openhands/llm/tool_names.py

@@ -4,3 +4,4 @@ EXECUTE_BASH_TOOL_NAME = 'execute_bash'
 STR_REPLACE_EDITOR_TOOL_NAME = 'str_replace_editor'
 BROWSER_TOOL_NAME = 'browser'
 FINISH_TOOL_NAME = 'finish'
+LLM_BASED_EDIT_TOOL_NAME = 'edit_file'

openhands/mcp/client.py

@@ -1,13 +1,12 @@
-import asyncio
-import datetime
-from contextlib import AsyncExitStack
 from typing import Optional
 
-from mcp import ClientSession
-from mcp.client.sse import sse_client
-from mcp.client.streamable_http import streamablehttp_client
+from fastmcp import Client
+from fastmcp.client.transports import SSETransport, StreamableHttpTransport
+from mcp import McpError
+from mcp.types import CallToolResult
 from pydantic import BaseModel, Field
 
+from openhands.core.config.mcp_config import MCPSHTTPServerConfig, MCPSSEServerConfig
 from openhands.core.logger import openhands_logger as logger
 from openhands.mcp.tool import MCPClientTool
 
@@ -17,8 +16,7 @@ class MCPClient(BaseModel):
     A collection of tools that connects to an MCP server and manages available tools through the Model Context Protocol.
     """
 
-    session: Optional[ClientSession] = None
-    exit_stack: AsyncExitStack = AsyncExitStack()
+    client: Optional[Client] = None
     description: str = 'MCP client tools for server interaction'
     tools: list[MCPClientTool] = Field(default_factory=list)
     tool_map: dict[str, MCPClientTool] = Field(default_factory=dict)
@@ -26,189 +24,87 @@ class MCPClient(BaseModel):
     class Config:
         arbitrary_types_allowed = True
 
-    async def connect_sse(
-        self,
-        server_url: str,
-        api_key: str | None = None,
-        conversation_id: str | None = None,
-        timeout: float = 30.0,
-    ) -> None:
-        """Connect to an MCP server using SSE transport.
-
-        Args:
-            server_url: The URL of the SSE server to connect to.
-            timeout: Connection timeout in seconds. Default is 30 seconds.
-        """
-        if not server_url:
-            raise ValueError('Server URL is required.')
-        if self.session:
-            await self.disconnect()
-
-        try:
-            # Use asyncio.wait_for to enforce the timeout
-            async def connect_with_timeout():
-                headers = (
-                    {
-                        'Authorization': f'Bearer {api_key}',
-                        's': api_key,  # We need this for action execution server's MCP Router
-                        'X-Session-API-Key': api_key,  # We need this for Remote Runtime
-                    }
-                    if api_key
-                    else {}
-                )
-
-                if conversation_id:
-                    headers['X-OpenHands-Conversation-ID'] = conversation_id
-
-                # Convert float timeout to datetime.timedelta for consistency
-                timeout_delta = datetime.timedelta(seconds=timeout)
-
-                streams_context = sse_client(
-                    url=server_url,
-                    headers=headers if headers else None,
-                    timeout=timeout,
-                )
-                streams = await self.exit_stack.enter_async_context(streams_context)
-                # For SSE client, we only get read_stream and write_stream (2 values)
-                read_stream, write_stream = streams
-                self.session = await self.exit_stack.enter_async_context(
-                    ClientSession(
-                        read_stream, write_stream, read_timeout_seconds=timeout_delta
-                    )
-                )
-                await self._initialize_and_list_tools()
-
-            # Apply timeout to the entire connection process
-            await asyncio.wait_for(connect_with_timeout(), timeout=timeout)
-        except asyncio.TimeoutError:
-            logger.error(
-                f'Connection to {server_url} timed out after {timeout} seconds'
-            )
-            await self.disconnect()  # Clean up resources
-            raise  # Re-raise the TimeoutError
-        except Exception as e:
-            logger.error(f'Error connecting to {server_url}: {str(e)}')
-            await self.disconnect()  # Clean up resources
-            raise
-
     async def _initialize_and_list_tools(self) -> None:
         """Initialize session and populate tool map."""
-        if not self.session:
+        if not self.client:
             raise RuntimeError('Session not initialized.')
 
-        await self.session.initialize()
-        response = await self.session.list_tools()
+        async with self.client:
+            tools = await self.client.list_tools()
 
         # Clear existing tools
         self.tools = []
 
         # Create proper tool objects for each server tool
-        for tool in response.tools:
+        for tool in tools:
             server_tool = MCPClientTool(
                 name=tool.name,
                 description=tool.description,
                 inputSchema=tool.inputSchema,
-                session=self.session,
+                session=self.client,
             )
             self.tool_map[tool.name] = server_tool
             self.tools.append(server_tool)
 
-        logger.info(
-            f'Connected to server with tools: {[tool.name for tool in response.tools]}'
-        )
+        logger.info(f'Connected to server with tools: {[tool.name for tool in tools]}')
 
-    async def call_tool(self, tool_name: str, args: dict):
+    async def connect_http(
+        self,
+        server: MCPSSEServerConfig | MCPSHTTPServerConfig,
+        conversation_id: str | None = None,
+        timeout: float = 30.0,
+    ):
+        """Connect to MCP server using SHTTP or SSE transport"""
+        server_url = server.url
+        api_key = server.api_key
+
+        if not server_url:
+            raise ValueError('Server URL is required.')
+
+        try:
+            headers = (
+                {
+                    'Authorization': f'Bearer {api_key}',
+                    's': api_key,  # We need this for action execution server's MCP Router
+                    'X-Session-API-Key': api_key,  # We need this for Remote Runtime
+                }
+                if api_key
+                else {}
+            )
+
+            if conversation_id:
+                headers['X-OpenHands-ServerConversation-ID'] = conversation_id
+
+            # Instantiate custom transports due to custom headers
+            if isinstance(server, MCPSHTTPServerConfig):
+                transport = StreamableHttpTransport(
+                    url=server_url,
+                    headers=headers if headers else None,
+                )
+            else:
+                transport = SSETransport(
+                    url=server_url,
+                    headers=headers if headers else None,
+                )
+
+            self.client = Client(transport, timeout=timeout)
+
+            await self._initialize_and_list_tools()
+        except McpError as e:
+            logger.error(f'McpError connecting to {server_url}: {e}')
+            raise  # Re-raise the error
+
+        except Exception as e:
+            logger.error(f'Error connecting to {server_url}: {e}')
+            raise
+
+    async def call_tool(self, tool_name: str, args: dict) -> CallToolResult:
         """Call a tool on the MCP server."""
         if tool_name not in self.tool_map:
             raise ValueError(f'Tool {tool_name} not found.')
         # The MCPClientTool is primarily for metadata; use the session to call the actual tool.
-        if not self.session:
+        if not self.client:
             raise RuntimeError('Client session is not available.')
-        return await self.session.call_tool(name=tool_name, arguments=args)
 
-    async def connect_shttp(
-        self,
-        server_url: str,
-        api_key: str | None = None,
-        conversation_id: str | None = None,
-        timeout: float = 30.0,
-    ) -> None:
-        """Connect to an MCP server using StreamableHTTP transport.
-
-        Args:
-            server_url: The URL of the StreamableHTTP server to connect to.
-            api_key: Optional API key for authentication.
-            conversation_id: Optional conversation ID for session tracking.
-            timeout: Connection timeout in seconds. Default is 30 seconds.
-        """
-        if not server_url:
-            raise ValueError('Server URL is required.')
-        if self.session:
-            await self.disconnect()
-
-        try:
-            # Use asyncio.wait_for to enforce the timeout
-            async def connect_with_timeout():
-                headers = (
-                    {
-                        'Authorization': f'Bearer {api_key}',
-                        's': api_key,  # We need this for action execution server's MCP Router
-                        'X-Session-API-Key': api_key,  # We need this for Remote Runtime
-                    }
-                    if api_key
-                    else {}
-                )
-
-                if conversation_id:
-                    headers['X-OpenHands-Conversation-ID'] = conversation_id
-
-                # Convert float timeout to datetime.timedelta
-                timeout_delta = datetime.timedelta(seconds=timeout)
-                sse_read_timeout_delta = datetime.timedelta(
-                    seconds=timeout * 10
-                )  # 10x longer for read timeout
-
-                streams_context = streamablehttp_client(
-                    url=server_url,
-                    headers=headers if headers else None,
-                    timeout=timeout_delta,
-                    sse_read_timeout=sse_read_timeout_delta,
-                )
-                streams = await self.exit_stack.enter_async_context(streams_context)
-                # For StreamableHTTP client, we get read_stream, write_stream, and get_session_id (3 values)
-                read_stream, write_stream, _ = streams
-                self.session = await self.exit_stack.enter_async_context(
-                    ClientSession(
-                        read_stream, write_stream, read_timeout_seconds=timeout_delta
-                    )
-                )
-                await self._initialize_and_list_tools()
-
-            # Apply timeout to the entire connection process
-            await asyncio.wait_for(connect_with_timeout(), timeout=timeout)
-        except asyncio.TimeoutError:
-            logger.error(
-                f'Connection to {server_url} timed out after {timeout} seconds'
-            )
-            await self.disconnect()  # Clean up resources
-            raise  # Re-raise the TimeoutError
-        except Exception as e:
-            logger.error(f'Error connecting to {server_url}: {str(e)}')
-            await self.disconnect()  # Clean up resources
-            raise
-
-    async def disconnect(self) -> None:
-        """Disconnect from the MCP server and clean up resources."""
-        if self.session:
-            try:
-                # Close the session first
-                if hasattr(self.session, 'close'):
-                    await self.session.close()
-                # Then close the exit stack
-                await self.exit_stack.aclose()
-            except Exception as e:
-                logger.error(f'Error during disconnect: {str(e)}')
-            finally:
-                self.session = None
-                self.tools = []
-                logger.info('Disconnected from MCP server')
+        async with self.client:
+            return await self.client.call_tool_mcp(name=tool_name, arguments=args)

openhands/mcp/utils.py

@@ -72,38 +72,22 @@ async def create_mcp_clients(
     mcp_clients = []
 
     for server in servers:
-        is_sse = isinstance(server, MCPSSEServerConfig)
-        connection_type = 'SSE' if is_sse else 'SHTTP'
+        is_shttp = isinstance(server, MCPSHTTPServerConfig)
+        connection_type = 'SHTTP' if is_shttp else 'SSE'
         logger.info(
             f'Initializing MCP agent for {server} with {connection_type} connection...'
         )
         client = MCPClient()
 
         try:
-            if is_sse:
-                await client.connect_sse(
-                    server.url,
-                    api_key=server.api_key,
-                    conversation_id=conversation_id,
-                )
-            else:
-                await client.connect_shttp(
-                    server.url,
-                    api_key=server.api_key,
-                    conversation_id=conversation_id,
-                )
+            await client.connect_http(server, conversation_id=conversation_id)
 
             # Only add the client to the list after a successful connection
             mcp_clients.append(client)
 
         except Exception as e:
             logger.error(f'Failed to connect to {server}: {str(e)}', exc_info=True)
-            try:
-                await client.disconnect()
-            except Exception as disconnect_error:
-                logger.error(
-                    f'Error during disconnect after failed connection: {str(disconnect_error)}'
-                )
+
     return mcp_clients
 
 
@@ -143,13 +127,6 @@ async def fetch_mcp_tools_from_config(
         # Convert tools to the format expected by the agent
         mcp_tools = convert_mcp_clients_to_tools(mcp_clients)
 
-        # Always disconnect clients to clean up resources
-        for mcp_client in mcp_clients:
-            try:
-                await mcp_client.disconnect()
-            except Exception as disconnect_error:
-                logger.error(f'Error disconnecting MCP client: {str(disconnect_error)}')
-
     except Exception as e:
         logger.error(f'Error fetching MCP tools: {str(e)}')
         return []

openhands/microagent/microagent.py

@@ -1,4 +1,5 @@
 import io
+import re
 from pathlib import Path
 from typing import Union
 
@@ -9,7 +10,7 @@ from openhands.core.exceptions import (
     MicroagentValidationError,
 )
 from openhands.core.logger import openhands_logger as logger
-from openhands.microagent.types import MicroagentMetadata, MicroagentType
+from openhands.microagent.types import InputMetadata, MicroagentMetadata, MicroagentType
 
 
 class BaseMicroagent(BaseModel):
@@ -91,13 +92,24 @@ class BaseMicroagent(BaseModel):
         subclass_map = {
             MicroagentType.KNOWLEDGE: KnowledgeMicroagent,
             MicroagentType.REPO_KNOWLEDGE: RepoMicroagent,
+            MicroagentType.TASK: TaskMicroagent,
         }
 
         # Infer the agent type:
-        # 1. If triggers exist -> KNOWLEDGE (optional)
-        # 2. Else (no triggers) -> REPO (always active)
+        # 1. If inputs exist -> TASK
+        # 2. If triggers exist -> KNOWLEDGE
+        # 3. Else (no triggers) -> REPO (always active)
         inferred_type: MicroagentType
-        if metadata.triggers:
+        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:
             inferred_type = MicroagentType.KNOWLEDGE
         else:
             # No triggers, default to REPO
@@ -122,7 +134,9 @@ 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
@@ -131,8 +145,8 @@ class KnowledgeMicroagent(BaseMicroagent):
 
     def __init__(self, **data):
         super().__init__(**data)
-        if self.type != MicroagentType.KNOWLEDGE:
-            raise ValueError('KnowledgeMicroagent must have type KNOWLEDGE')
+        if self.type not in [MicroagentType.KNOWLEDGE, MicroagentType.TASK]:
+            raise ValueError('KnowledgeMicroagent must have type KNOWLEDGE or TASK')
 
     def match_trigger(self, message: str) -> str | None:
         """Match a trigger in the message.
@@ -171,6 +185,57 @@ 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]]:
@@ -182,7 +247,7 @@ def load_microagents_from_dir(
         microagent_dir: Path to the microagents directory (e.g. .openhands/microagents)
 
     Returns:
-        Tuple of (repo_agents, knowledge_agents, task_agents) dictionaries
+        Tuple of (repo_agents, knowledge_agents) dictionaries
     """
     if isinstance(microagent_dir, str):
         microagent_dir = Path(microagent_dir)
@@ -202,6 +267,7 @@ 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,6 +12,14 @@ 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):
@@ -22,6 +30,7 @@ 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,7 +9,6 @@ import argparse
 import asyncio
 import base64
 import json
-import logging
 import mimetypes
 import os
 import shutil
@@ -26,8 +25,6 @@ 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
@@ -37,6 +34,7 @@ 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 (
@@ -63,20 +61,18 @@ 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
 
@@ -471,7 +467,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:  # noqa: ASYNC101
+                with open(filepath, 'rb') as file:
                     image_data = file.read()
                     encoded_image = base64.b64encode(image_data).decode('utf-8')
                     mime_type, _ = mimetypes.guess_type(filepath)
@@ -481,13 +477,13 @@ class ActionExecutor:
 
                 return FileReadObservation(path=filepath, content=encoded_image)
             elif filepath.lower().endswith('.pdf'):
-                with open(filepath, 'rb') as file:  # noqa: ASYNC101
+                with open(filepath, 'rb') as file:
                     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:  # noqa: ASYNC101
+                with open(filepath, 'rb') as file:
                     video_data = file.read()
                     encoded_video = base64.b64encode(video_data).decode('utf-8')
                     mime_type, _ = mimetypes.guess_type(filepath)
@@ -497,7 +493,7 @@ class ActionExecutor:
 
                 return FileReadObservation(path=filepath, content=encoded_video)
 
-            with open(filepath, 'r', encoding='utf-8') as file:  # noqa: ASYNC101
+            with open(filepath, 'r', encoding='utf-8') as file:
                 lines = read_lines(file.readlines(), action.start, action.end)
         except FileNotFoundError:
             return ErrorObservation(
@@ -530,7 +526,7 @@ class ActionExecutor:
 
         mode = 'w' if not file_exists else 'r+'
         try:
-            with open(filepath, mode, encoding='utf-8') as file:  # noqa: ASYNC101
+            with open(filepath, mode, encoding='utf-8') as file:
                 if mode != 'w':
                     all_lines = file.readlines()
                     new_file = insert_lines(insert, all_lines, action.start, action.end)
@@ -654,14 +650,11 @@ if __name__ == '__main__':
             plugins_to_load.append(ALL_PLUGINS[plugin]())  # type: ignore
 
     client: ActionExecutor | None = None
-    mcp_router: MCPRouter | None = None
-    MCP_ROUTER_PROFILE_PATH = os.path.join(
-        os.path.dirname(__file__), 'mcp', 'config.json'
-    )
+    mcp_proxy_manager: MCPProxyManager | None = None
 
     @asynccontextmanager
     async def lifespan(app: FastAPI):
-        global client, mcp_router
+        global client, mcp_proxy_manager
         logger.info('Initializing ActionExecutor...')
         client = ActionExecutor(
             plugins_to_load,
@@ -676,63 +669,36 @@ if __name__ == '__main__':
         # Check if we're on Windows
         is_windows = sys.platform == 'win32'
 
-        # Initialize and mount MCP Router (skip on Windows)
+        # Initialize and mount MCP Proxy Manager (skip on Windows)
         if is_windows:
-            logger.info('Skipping MCP Router initialization on Windows')
-            mcp_router = None
+            logger.info('Skipping MCP Proxy initialization on Windows')
+            mcp_proxy_manager = None
         else:
-            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),
-                ),
+            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(),
             )
+            mcp_proxy_manager.initialize()
+            # Mount the proxy to the app
             allowed_origins = ['*']
-            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}')
+            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}')
 
         yield
 
         # Clean up & release the resources
-        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)
+        logger.info('Shutting down MCP Proxy Manager...')
+        if mcp_proxy_manager:
+            del mcp_proxy_manager
+            mcp_proxy_manager = None
         else:
-            logger.info('MCP Router instance not found for shutdown.')
+            logger.info('MCP Proxy Manager instance not found for shutdown.')
 
         logger.info('Closing ActionExecutor...')
         if client:
@@ -824,6 +790,9 @@ 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(
@@ -838,17 +807,10 @@ if __name__ == '__main__':
             )
 
         # Non-Windows implementation
-        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)
+        if mcp_proxy_manager is None:
+            raise HTTPException(
+                status_code=500, detail='MCP Proxy Manager is not initialized'
+            )
 
         # Get the request body
         mcp_tools_to_sync = await request.json()
@@ -856,31 +818,17 @@ 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 to: {json.dumps(mcp_tools_to_sync, indent=2)}.\nPrevious profile: {json.dumps(current_profile, indent=2)}'
+            f'Updating MCP server with tools: {json.dumps(mcp_tools_to_sync, indent=2)}'
         )
-        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}')
+        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)
 
         return JSONResponse(
             status_code=200,
@@ -915,7 +863,7 @@ if __name__ == '__main__':
                     )
 
                 zip_path = os.path.join(full_dest_path, file.filename)
-                with open(zip_path, 'wb') as buffer:  # noqa: ASYNC101
+                with open(zip_path, 'wb') as buffer:
                     shutil.copyfileobj(file.file, buffer)
 
                 # Extract the zip file
@@ -928,7 +876,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:  # noqa: ASYNC101
+                with open(file_path, 'wb') as buffer:
                     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('/') + '/sse',
+                    url=self.action_execution_server_url.rstrip('/') + '/mcp/sse',
                     api_key=self.session_api_key,
                 )
             )
@@ -471,11 +471,6 @@ class ActionExecutionClient(Runtime):
         # Call the tool and return the result
         # No need for try/finally since disconnect() is now just resetting state
         result = await call_tool_mcp_handler(mcp_clients, action)
-
-        # Reset client state (no active connections to worry about)
-        for client in mcp_clients:
-            await client.disconnect()
-
         return result
 
     def close(self) -> None:

openhands/runtime/impl/local/local_runtime.py

@@ -307,8 +307,10 @@ class LocalRuntime(ActionExecutionClient):
             env['PATH'] = f'{python_bin_path}{os.pathsep}{env.get("PATH", "")}'
             logger.debug(f'Updated PATH for subprocesses: {env["PATH"]}')
 
-            # Check dependencies using the derived env_root_path
-            check_dependencies(code_repo_path, env_root_path)
+            # Check dependencies using the derived env_root_path if not skipped
+            if os.getenv('SKIP_DEPENDENCY_CHECK', '') != '1':
+                check_dependencies(code_repo_path, env_root_path)
+
             self.server_process = subprocess.Popen(  # noqa: S603
                 cmd,
                 stdout=subprocess.PIPE,
@@ -406,8 +408,8 @@ class LocalRuntime(ActionExecutionClient):
         return port
 
     @tenacity.retry(
-        wait=tenacity.wait_exponential(min=1, max=10),
-        stop=tenacity.stop_after_attempt(10) | stop_if_should_exit(),
+        wait=tenacity.wait_fixed(2),
+        stop=tenacity.stop_after_delay(120) | stop_if_should_exit(),
         before_sleep=lambda retry_state: logger.debug(
             f'Waiting for server to be ready... (attempt {retry_state.attempt_number})'
         ),

openhands/runtime/mcp/config.json

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

openhands/runtime/mcp/proxy/README.md

@@ -0,0 +1,71 @@
+# 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

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

openhands/runtime/mcp/proxy/manager.py

@@ -0,0 +1,131 @@
+"""
+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:
+            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(
+                '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('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('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('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
+            stdio_servers: List of stdio server 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/runtime/utils/bash.py

@@ -17,6 +17,7 @@ from openhands.events.observation.commands import (
     CmdOutputMetadata,
     CmdOutputObservation,
 )
+from openhands.runtime.utils.bash_constants import TIMEOUT_MESSAGE_TEMPLATE
 from openhands.utils.shutdown_listener import should_continue
 
 
@@ -379,9 +380,7 @@ class BashSession:
         metadata = CmdOutputMetadata()  # No metadata available
         metadata.suffix = (
             f'\n[The command has no new output after {self.NO_CHANGE_TIMEOUT_SECONDS} seconds. '
-            "You may wait longer to see additional output by sending empty command '', "
-            'send other commands to interact with the current process, '
-            'or send keys to interrupt/kill the command.]'
+            f'{TIMEOUT_MESSAGE_TEMPLATE}]'
         )
         command_output = self._get_command_output(
             command,
@@ -414,9 +413,7 @@ class BashSession:
         metadata = CmdOutputMetadata()  # No metadata available
         metadata.suffix = (
             f'\n[The command timed out after {timeout} seconds. '
-            "You may wait longer to see additional output by sending empty command '', "
-            'send other commands to interact with the current process, '
-            'or send keys to interrupt/kill the command.]'
+            f'{TIMEOUT_MESSAGE_TEMPLATE}]'
         )
         command_output = self._get_command_output(
             command,

openhands/runtime/utils/bash_constants.py

@@ -0,0 +1,7 @@
+# Common timeout message that can be used across different timeout scenarios
+TIMEOUT_MESSAGE_TEMPLATE = (
+    "You may wait longer to see additional output by sending empty command '', "
+    'send other commands to interact with the current process, '
+    'send keys to interrupt/kill the command, '
+    'or use the timeout parameter in execute_bash for future commands.'
+)

openhands/runtime/utils/edit.py

@@ -4,7 +4,7 @@ import tempfile
 from abc import ABC, abstractmethod
 from typing import Any
 
-from openhands_aci.utils.diff import get_diff
+from openhands_aci.utils.diff import get_diff  # type: ignore
 
 from openhands.core.config import OpenHandsConfig
 from openhands.core.logger import openhands_logger as logger
@@ -26,39 +26,31 @@ from openhands.llm.llm import LLM
 from openhands.llm.metrics import Metrics
 from openhands.utils.chunk_localizer import Chunk, get_top_k_chunk_matches
 
-SYS_MSG = """Your job is to produce a new version of the file based on the old version and the
-provided draft of the new version. The provided draft may be incomplete (it may skip lines) and/or incorrectly indented. You should try to apply the changes present in the draft to the old version, and output a new version of the file.
-NOTE:
-- The output file should be COMPLETE and CORRECTLY INDENTED. Do not omit any lines, and do not change any lines that are not part of the changes.
-- You should output the new version of the file by wrapping the new version of the file content in a ``` block.
-- If there's no explicit comment to remove the existing code, we should keep them and append the new code to the end of the file.
-- If there's placeholder comments like `# no changes before` or `# no changes here`, we should replace these comments with the original code near the placeholder comments.
-"""
-
 USER_MSG = """
-HERE IS THE OLD VERSION OF THE FILE:
-```
-{old_contents}
-```
+Code changes will be provided in the form of a draft. You will need to apply the draft to the original code. 
+The original code will be enclosed within `<original_code>` tags.
+The draft will be enclosed within `<update_snippet>` tags.
+You need to output the update code within `<updated_code>` tags.
 
-HERE IS THE DRAFT OF THE NEW VERSION OF THE FILE:
-```
-{draft_changes}
-```
+Within the `<updated_code>` tag, include only the final code after updation. Do not include any explanations or other content within these tags.
 
-GIVE ME THE NEW VERSION OF THE FILE.
-IMPORTANT:
-- There should be NO placeholder comments like `# no changes before` or `# no changes here`. They should be replaced with the original code near the placeholder comments.
-- The output file should be COMPLETE and CORRECTLY INDENTED. Do not omit any lines, and do not change any lines that are not part of the changes.
-""".strip()
+<original_code>{old_contents}</original_code>
+
+<update_snippet>{draft_changes}</update_snippet>
+    """
 
 
 def _extract_code(string: str) -> str | None:
-    pattern = r'```(?:\w*\n)?(.*?)```'
+    pattern = r'<updated_code>(.*?)</updated_code>'
     matches = re.findall(pattern, string, re.DOTALL)
     if not matches:
         return None
-    return str(matches[0])
+
+    content = str(matches[0])
+    if content.startswith('#EDIT:'):
+        #Remove first line
+        content = content[content.find('\n') + 1:]
+    return content
 
 
 def get_new_file_contents(
@@ -66,7 +58,6 @@ def get_new_file_contents(
 ) -> str | None:
     while num_retries > 0:
         messages = [
-            {'role': 'system', 'content': SYS_MSG},
             {
                 'role': 'user',
                 'content': USER_MSG.format(

openhands/runtime/utils/request.py

@@ -38,7 +38,7 @@ def send_request(
     session: HttpSession,
     method: str,
     url: str,
-    timeout: int = 10,
+    timeout: int = 60,
     **kwargs: Any,
 ) -> httpx.Response:
     response = session.request(method, url, timeout=timeout, **kwargs)

openhands/runtime/utils/windows_bash.py

@@ -20,6 +20,7 @@ from openhands.events.observation.commands import (
     CmdOutputMetadata,
     CmdOutputObservation,
 )
+from openhands.runtime.utils.bash_constants import TIMEOUT_MESSAGE_TEMPLATE
 from openhands.utils.shutdown_listener import should_continue
 
 pythonnet.load('coreclr')
@@ -559,9 +560,7 @@ class WindowsPowershellSession:
             else:
                 metadata.suffix = (
                     f'\n[The command timed out after {timeout_seconds} seconds. '
-                    "You may wait longer to see additional output by sending empty command '', "
-                    'send other commands to interact with the current process, '
-                    'or send keys to interrupt/kill the command.]'
+                    f'{TIMEOUT_MESSAGE_TEMPLATE}]'
                 )
 
             return CmdOutputObservation(
@@ -1331,9 +1330,7 @@ class WindowsPowershellSession:
             # Align suffix with bash.py timeout message
             suffix = (
                 f'\n[The command timed out after {timeout_seconds} seconds. '
-                "You may wait longer to see additional output by sending empty command '', "
-                'send other commands to interact with the current process, '
-                'or send keys to interrupt/kill the command.]'
+                f'{TIMEOUT_MESSAGE_TEMPLATE}]'
             )
         elif shutdown_requested:
             # Align suffix with bash.py equivalent (though bash.py might not have specific shutdown message)

openhands/server/conversation_manager/docker_nested_conversation_manager.py

@@ -22,7 +22,6 @@ from openhands.events.nested_event_store import NestedEventStore
 from openhands.events.stream import EventStream
 from openhands.integrations.provider import PROVIDER_TOKEN_TYPE, ProviderHandler
 from openhands.llm.llm import LLM
-from openhands.runtime.impl.docker.containers import stop_all_containers
 from openhands.runtime.impl.docker.docker_runtime import DockerRuntime
 from openhands.server.config.server_config import ServerConfig
 from openhands.server.conversation_manager.conversation_manager import (
@@ -90,7 +89,7 @@ class DockerNestedConversationManager(ConversationManager):
         """
         Get the running agent loops directly from docker.
         """
-        containers : list[Container]  = self.docker_client.containers.list()
+        containers: list[Container] = self.docker_client.containers.list()
         names = (container.name or '' for container in containers)
         conversation_ids = {
             name[len('openhands-runtime-') :]
@@ -284,7 +283,7 @@ class DockerNestedConversationManager(ConversationManager):
         # First try to graceful stop server.
         try:
             container = self.docker_client.containers.get(f'openhands-runtime-{sid}')
-        except docker.errors.NotFound as e:
+        except docker.errors.NotFound:
             return
         try:
             nested_url = self.get_nested_url_for_container(container)
@@ -293,17 +292,33 @@ class DockerNestedConversationManager(ConversationManager):
                     'X-Session-API-Key': self._get_session_api_key_for_conversation(sid)
                 }
             ) as client:
-                response = await client.post(f'{nested_url}/api/conversations/{sid}/stop')
+                # Stop conversation
+                response = await client.post(
+                    f'{nested_url}/api/conversations/{sid}/stop'
+                )
                 response.raise_for_status()
-        except Exception:
-            logger.exception("error_stopping_container")
+
+                # Check up to 3 times that client has closed
+                for _ in range(3):
+                    response = await client.get(f'{nested_url}/api/conversations/{sid}')
+                    response.raise_for_status()
+                    if response.json().get('status') == 'STOPPED':
+                        break
+                    await asyncio.sleep(1)
+
+        except Exception as e:
+            logger.warning('error_stopping_container', extra={"sid": sid, "error": str(e)})
         container.stop()
 
-    async def get_agent_loop_info(self, user_id: str | None = None, filter_to_sids: set[str] | None = None) -> list[AgentLoopInfo]:
+    async def get_agent_loop_info(
+        self, user_id: str | None = None, filter_to_sids: set[str] | None = None
+    ) -> list[AgentLoopInfo]:
         results = []
-        containers : list[Container] = self.docker_client.containers.list()
+        containers: list[Container] = self.docker_client.containers.list()
         for container in containers:
-            if not container.name or not container.name.startswith('openhands-runtime-'):
+            if not container.name or not container.name.startswith(
+                'openhands-runtime-'
+            ):
                 continue
             conversation_id = container.name[len('openhands-runtime-') :]
             if filter_to_sids is not None and conversation_id not in filter_to_sids:
@@ -381,7 +396,9 @@ class DockerNestedConversationManager(ConversationManager):
         )
         return session_api_key
 
-    async def ensure_num_conversations_below_limit(self, sid: str, user_id: str | None) -> None:
+    async def ensure_num_conversations_below_limit(
+        self, sid: str, user_id: str | None
+    ) -> None:
         response_ids = await self.get_running_agent_loops(user_id)
         if len(response_ids) >= self.config.max_concurrent_conversations:
             logger.info(
@@ -423,7 +440,9 @@ class DockerNestedConversationManager(ConversationManager):
         )
         return provider_handler
 
-    async def _create_runtime(self, sid: str, user_id: str | None, settings: Settings) -> DockerRuntime:
+    async def _create_runtime(
+        self, sid: str, user_id: str | None, settings: Settings
+    ) -> DockerRuntime:
         # This session is created here only because it is the easiest way to get a runtime, which
         # is the easiest way to create the needed docker container
         session = Session(
@@ -455,8 +474,9 @@ class DockerNestedConversationManager(ConversationManager):
         env_vars['SESSION_API_KEY'] = self._get_session_api_key_for_conversation(sid)
         # We need to be able to specify the nested conversation id within the nested runtime
         env_vars['ALLOW_SET_CONVERSATION_ID'] = '1'
-        env_vars['WORKSPACE_BASE'] = f'/workspace'
+        env_vars['WORKSPACE_BASE'] = '/workspace'
         env_vars['SANDBOX_CLOSE_DELAY'] = '0'
+        env_vars['SKIP_DEPENDENCY_CHECK'] = '1'
 
         # Set up mounted volume for conversation directory within workspace
         # TODO: Check if we are using the standard event store and file store
@@ -501,7 +521,7 @@ class DockerNestedConversationManager(ConversationManager):
                     await call_sync_from_async(container.start)
                 return True
             return False
-        except docker.errors.NotFound as e:
+        except docker.errors.NotFound:
             return False
 
 

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, conversation_id: str, tool_result: str
+    user_id: str | None, conversation_id: str, tool_result: str
 ) -> None:
     conversation_store = await ConversationStoreImpl.get_instance(config, user_id)
     conversation: ConversationMetadata = await conversation_store.get_metadata(
@@ -70,7 +70,11 @@ 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)
 
 
@@ -124,7 +128,7 @@ async def create_pr(
             body=body,
         )
 
-        if conversation_id and user_id:
+        if conversation_id:
             await save_pr_metadata(user_id, conversation_id, response)
 
     except Exception as e:

openhands/server/routes/settings.py

@@ -15,6 +15,7 @@ from openhands.server.shared import config
 from openhands.server.user_auth import (
     get_provider_tokens,
     get_secrets_store,
+    get_user_settings,
     get_user_settings_store,
 )
 from openhands.storage.data_models.settings import Settings
@@ -35,10 +36,9 @@ app = APIRouter(prefix='/api', dependencies=get_dependencies())
 async def load_settings(
     provider_tokens: PROVIDER_TOKEN_TYPE | None = Depends(get_provider_tokens),
     settings_store: SettingsStore = Depends(get_user_settings_store),
+    settings: Settings = Depends(get_user_settings),
     secrets_store: SecretsStore = Depends(get_secrets_store),
 ) -> GETSettingsModel | JSONResponse:
-    settings = await settings_store.load()
-
     try:
         if not settings:
             return JSONResponse(

openhands/server/user_auth/default_user_auth.py

@@ -25,6 +25,10 @@ class DefaultUserAuth(UserAuth):
         """The default implementation does not support multi tenancy, so user_id is always None"""
         return None
 
+    async def get_user_email(self) -> str | None:
+        """The default implementation does not support multi tenancy, so email is always None"""
+        return None
+
     async def get_access_token(self) -> SecretStr | None:
         """The default implementation does not support multi tenancy, so access_token is always None"""
         return None

openhands/server/user_auth/user_auth.py

@@ -38,6 +38,10 @@ class UserAuth(ABC):
     async def get_user_id(self) -> str | None:
         """Get the unique identifier for the current user"""
 
+    @abstractmethod
+    async def get_user_email(self) -> str | None:
+        """Get the email for the current user"""
+
     @abstractmethod
     async def get_access_token(self) -> SecretStr | None:
         """Get the access token for the current user"""

openhands/server/utils.py

@@ -26,7 +26,7 @@ async def get_conversation(
         conversation_id, user_id
     )
     if not conversation:
-        logger.warn(
+        logger.warning(
             f'get_conversation: conversation {conversation_id} not found, attach_to_conversation returned None',
             extra={'session_id': conversation_id, 'user_id': user_id},
         )

openhands/storage/data_models/settings.py

@@ -40,6 +40,8 @@ class Settings(BaseModel):
     sandbox_runtime_container_image: str | None = None
     mcp_config: MCPConfig | None = None
     search_api_key: SecretStr | None = None
+    email: str | None = None
+    email_verified: bool | None = None
 
     model_config = {
         'validate_assignment': True,

pyproject.toml

@@ -36,7 +36,7 @@ numpy = "*"
 json-repair = "*"
 browsergym-core = "0.13.3"                         # integrate browsergym-core as the browsing interface
 html2text = "*"
-e2b = ">=1.0.5,<1.4.0"
+e2b = ">=1.0.5,<1.6.0"
 pexpect = "*"
 jinja2 = "^3.1.3"
 python-multipart = "*"
@@ -53,7 +53,7 @@ protobuf = "^5.0.0,<6.0.0"                         # Updated to support newer op
 opentelemetry-api = "^1.33.1"
 opentelemetry-exporter-otlp-proto-grpc = "^1.33.1"
 modal = ">=0.66.26,<0.78.0"
-runloop-api-client = "0.33.0"
+runloop-api-client = "0.39.0"
 libtmux = ">=0.37,<0.40"
 pygithub = "^2.5.0"
 joblib = "*"
@@ -67,7 +67,6 @@ 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"
@@ -81,7 +80,7 @@ bashlex = "^0.18"
 # TODO: These are integrations that should probably be optional
 redis = ">=5.2,<7.0"
 minio = "^7.2.8"
-daytona-sdk = "0.18.1"
+daytona-sdk = "0.20.0"
 stripe = ">=11.5,<13.0"
 google-cloud-aiplatform = "*"
 anthropic = { extras = [ "vertex" ], version = "*" }
@@ -91,8 +90,8 @@ boto3 = "*"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-ruff = "0.11.11"
-mypy = "1.15.0"
+ruff = "0.11.13"
+mypy = "1.16.0"
 pre-commit = "4.2.0"
 build = "*"
 types-setuptools = "*"

tests/runtime/test_bash.py

@@ -16,6 +16,16 @@ from openhands.events.action import CmdRunAction
 from openhands.events.observation import CmdOutputObservation, ErrorObservation
 from openhands.runtime.impl.cli.cli_runtime import CLIRuntime
 from openhands.runtime.impl.local.local_runtime import LocalRuntime
+from openhands.runtime.utils.bash_constants import TIMEOUT_MESSAGE_TEMPLATE
+
+
+def get_timeout_suffix(timeout_seconds):
+    """Helper function to generate the expected timeout suffix."""
+    return (
+        f'[The command timed out after {timeout_seconds} seconds. '
+        f'{TIMEOUT_MESSAGE_TEMPLATE}]'
+    )
+
 
 # ============================================================================================================================
 # Bash-specific tests
@@ -56,10 +66,7 @@ def test_bash_server(temp_dir, runtime_cls, run_as_openhands):
         if runtime_cls == CLIRuntime:
             assert '[The command timed out after 1.0 seconds.]' in obs.metadata.suffix
         else:
-            assert (
-                "[The command timed out after 1.0 seconds. You may wait longer to see additional output by sending empty command '', send other commands to interact with the current process, or send keys to interrupt/kill the command.]"
-                in obs.metadata.suffix
-            )
+            assert get_timeout_suffix(1.0) in obs.metadata.suffix
 
         action = CmdRunAction(command='C-c', is_input=True)
         action.set_hard_timeout(30)

tests/runtime/test_mcp_action.py

@@ -114,9 +114,11 @@ def test_default_activated_tools():
     )
     with open(mcp_config_path, 'r') as f:
         mcp_config = json.load(f)
-    assert 'default' in mcp_config
+    assert 'mcpServers' in mcp_config
+    assert 'default' in mcp_config['mcpServers']
+    assert 'tools' in mcp_config
     # no tools are always activated yet
-    assert len(mcp_config['default']) == 0
+    assert len(mcp_config['tools']) == 0
 
 
 @pytest.mark.asyncio
@@ -249,7 +251,11 @@ async def test_both_stdio_and_sse_mcp(
         assert obs_cat.exit_code == 0
 
         mcp_action_fetch = MCPAction(
-            name='fetch', arguments={'url': 'http://localhost:8000'}
+            # 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'},
         )
         obs_fetch = await runtime.call_tool_mcp(mcp_action_fetch)
         logger.info(obs_fetch, extra={'msg_type': 'OBSERVATION'})
@@ -304,7 +310,9 @@ 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='list_directory', arguments={'path': '/'})
+        mcp_action_sse = MCPAction(
+            name='filesystem_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), (
@@ -332,7 +340,7 @@ async def test_microagent_and_one_stdio_mcp_in_config(
         assert obs_cat.exit_code == 0
 
         mcp_action_fetch = MCPAction(
-            name='fetch', arguments={'url': 'http://localhost:8000'}
+            name='fetch_fetch', arguments={'url': 'http://localhost:8000'}
         )
         obs_fetch = await runtime.call_tool_mcp(mcp_action_fetch)
         logger.info(obs_fetch, extra={'msg_type': 'OBSERVATION'})