Update microagent documentation to clarify that type field is optional

Co-authored-by: Engel Nyst <enyst@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_template.yml

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

.github/dependabot.yml

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

docs/docs.json

@@ -42,7 +42,7 @@
             ]
           },
           {
-            "group": "Running OpenHands on Your Own",
+            "group": "Running OpenHands Locally",
             "pages": [
               "usage/local-setup",
               "usage/how-to/gui-mode",

docs/usage/cloud/cloud-api.mdx

@@ -1,11 +1,9 @@
 ---
 title: Cloud API
-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.
+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.
 ---
 
-For the available API endpoints, refer to the
-[OpenHands API Reference](https://docs.all-hands.dev/api-reference).
+For more detailed information about the API, refer to the [OpenHands API Reference](https://docs.all-hands.dev/swagger-ui/).
 
 ## Obtaining an API Key
 
@@ -18,7 +16,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/api-key-generation.png)
+![API Key Generation](/static/img/docs/api-key-generation.png)
 
 ## API Usage
 
@@ -35,81 +33,87 @@ To start a new conversation with OpenHands to perform a task, you'll need to mak
 
 #### Examples
 
+<details>
+<summary>cURL</summary>
 
-<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>
+```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="Python (with requests)">
-  ```python
-  import requests
+<details>
+<summary>Python (with requests)</summary>
 
-  api_key = "YOUR_API_KEY"
-  url = "https://app.all-hands.dev/api/conversations"
+```python
+import requests
 
-  headers = {
-      "Authorization": f"Bearer {api_key}",
-      "Content-Type": "application/json"
-  }
+api_key = "YOUR_API_KEY"
+url = "https://app.all-hands.dev/api/conversations"
 
-  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']}")
-  ```
-</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}`,
+headers = {
+    "Authorization": f"Bearer {api_key}",
     "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"
-  };
+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)
-      });
+response = requests.post(url, headers=headers, json=data)
+conversation = response.json()
 
-      const conversation = await response.json();
+print(f"Conversation Link: https://app.all-hands.dev/conversations/{conversation['conversation_id']}")
+print(f"Status: {conversation['status']}")
+```
+</details>
 
-      console.log(`Conversation Link: https://app.all-hands.dev/conversations/${conversation.id}`);
-      console.log(`Status: ${conversation.status}`);
+<details>
+<summary>TypeScript/JavaScript (with fetch)</summary>
 
-      return conversation;
-    } catch (error) {
-      console.error("Error starting conversation:", error);
-    }
+```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>
+startConversation();
+```
+
+</details>
 
 #### Response
 
@@ -141,12 +145,14 @@ GET https://app.all-hands.dev/api/conversations/{conversation_id}
 
 #### Example
 
-<Accordion title="cURL">
-  ```bash
-  curl -X GET "https://app.all-hands.dev/api/conversations/{conversation_id}" \
-    -H "Authorization: Bearer YOUR_API_KEY"
-  ```
-</Accordion>
+<details>
+<summary>cURL</summary>
+
+```bash
+curl -X GET "https://app.all-hands.dev/api/conversations/{conversation_id}" \
+  -H "Authorization: Bearer YOUR_API_KEY"
+```
+</details>
 
 #### Response
 

docs/usage/cloud/cloud-ui.mdx

@@ -26,7 +26,7 @@ The Settings page allows you to:
 
 ## Key Features
 
-For an overview of the key features available inside a conversation, please refer to the [Key Features](/usage/key-features)
+For an overview of the key features available inside a conversation, please refer to the [Key Features](../key-features)
 section of the documentation.
 
 ## Next Steps

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

@@ -1,39 +1,24 @@
 ---
-title: CLI
-description: The Command-Line Interface (CLI) provides a powerful interface that lets you engage with OpenHands
-  directly from your terminal.
+title: CLI Mode
+description: CLI mode provides a powerful interactive Command-Line Interface (CLI) that lets you engage with OpenHands directly from your terminal.
 ---
 
-This mode is different from the [headless mode](/usage/how-to/headless-mode), which is non-interactive and better
-for scripting.
+This mode is different from the [headless mode](./headless-mode), which is non-interactive and better for scripting.
 
 ## Getting Started
 
 ### Running with Python
 
-1. Install OpenHands using pip:
-
-```bash
-pip install openhands-ai
-```
-
+1. Ensure you have followed the [Development setup instructions](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md).
 2. Set your model, API key, and other preferences using environment variables or with the [`config.toml`](https://github.com/All-Hands-AI/OpenHands/blob/main/config.template.toml) file.
 3. Launch an interactive OpenHands conversation from the command line:
 
 ```bash
-openhands
+poetry run python -m openhands.cli.main
 ```
 
 This command opens an interactive prompt where you can type tasks or commands and get responses from OpenHands.
 
-#### For Developers
-
-If you have cloned the repository, you can run the CLI directly using Poetry:
-
-```bash
-poetry run python -m openhands.cli.main
-```
-
 ### Running with Docker
 
 1. Set the following environment variables in your terminal:

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

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

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

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

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

@@ -1,13 +1,14 @@
 ---
-title: GUI
-description: High level overview of the Graphical User Interface (GUI) in OpenHands.
+title: GUI Mode
+description: OpenHands provides a Graphical User Interface (GUI) mode for interacting with the AI assistant.
 ---
 
-## Prerequisites
+## Installation and Setup
 
-- [OpenHands is running](/usage/local-setup)
+1. Follow the installation instructions to install OpenHands.
+2. After running the command, access OpenHands at [http://localhost:3000](http://localhost:3000).
 
-## Overview
+## Interacting with the GUI
 
 ### Initial Setup
 
@@ -18,23 +19,16 @@ description: High level overview of the Graphical User Interface (GUI) in OpenHa
 3. Enter the corresponding `API Key` for your chosen provider.
 4. Click `Save Changes` to apply the settings.
 
-### Settings
+### Version Control Tokens
 
-You can use the Settings page at any time to:
+OpenHands supports multiple version control providers. You can configure tokens for multiple providers simultaneously.
 
-- 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
+#### GitHub Token Setup
 
 OpenHands automatically exports a `GITHUB_TOKEN` to the shell environment if provided:
 
-<AccordionGroup>
-<Accordion title="Setting Up a GitHub Token">
+<details>
+  <summary>Setting Up a GitHub Token</summary>
 
   1. **Generate a Personal Access Token (PAT)**:
    - On GitHub, go to Settings > Developer Settings > Personal Access Tokens > Tokens (classic).
@@ -43,11 +37,16 @@ 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**:
-   - In the Settings page, navigate to the `Git` tab.
+   - Click the Settings button (gear icon).
+   - 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:
 
@@ -60,12 +59,15 @@ 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.
-</Accordion>
+</details>
+
+<details>
+  <summary>Troubleshooting</summary>
 
-<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.
@@ -79,15 +81,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.
-</Accordion>
-</AccordionGroup>
+</details>
 
-#### GitLab Setup
+#### GitLab Token Setup
 
 OpenHands automatically exports a `GITLAB_TOKEN` to the shell environment if provided:
 
-<AccordionGroup>
-<Accordion title="Setting Up a GitLab Token">
+<details>
+  <summary>Setting Up a GitLab Token</summary>
+
   1. **Generate a Personal Access Token (PAT)**:
    - On GitLab, go to User Settings > Access Tokens.
    - Create a new token with the following scopes:
@@ -97,12 +99,15 @@ 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**:
-   - In the Settings page, navigate to the `Git` tab.
+   - Click the Settings button (gear icon).
+   - Navigate to the `Git` tab.
    - Paste your token in the `GitLab Token` field.
    - Click `Save Changes` to apply the changes.
-</Accordion>
+</details>
+
+<details>
+  <summary>Troubleshooting</summary>
 
-<Accordion title="Troubleshooting">
   Common issues and solutions:
 
   - **Token Not Recognized**:
@@ -114,30 +119,25 @@ 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.
-</Accordion>
-</AccordionGroup>
+</details>
 
-#### Advanced Settings
+### Advanced Settings
 
-The `Advanced` settings allows configuration of additional LLM settings. Inside the Settings page, under the `LLM` tab,
-toggle `Advanced` options to access additional 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.
 
-- 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.
+### Interacting with the AI
 
-### 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.
+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.
 
 ## 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).
 
-## 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)
+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.

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

@@ -1,10 +1,9 @@
 ---
-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.
+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.
 ---
 
-This is different from [the CLI](./cli-mode), which is interactive, and better for active development.
+This is different from [CLI Mode](./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 on Your Own
+## Running OpenHands Locally
 
 Run OpenHands on your local system and bring your own LLM and API key.
 
-For more information see [running OpenHands on your own.](/usage/local-setup)
+For more information see [running OpenHands locally.](/usage/local-setup)

docs/usage/llms/local-llms.mdx

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

docs/usage/local-setup.mdx

@@ -1,6 +1,6 @@
 ---
 title: Getting Started
-description: Getting started with running OpenHands on your own.
+description: Getting started with running OpenHands locally.
 ---
 
 ## 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.41-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.40-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.41-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.40-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.41
+    docker.all-hands.dev/all-hands-ai/openhands:0.40
 ```
 
 You'll find OpenHands running at http://localhost:3000!
@@ -132,6 +132,7 @@ 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-keyword.mdx

@@ -5,26 +5,111 @@ description: Keyword-triggered microagents provide OpenHands with specific instr
 
 ## Usage
 
-These microagents are only loaded when a prompt includes one of the trigger words.
+Keyword-triggered microagents are only loaded when a prompt includes one of the trigger words. There are two types of keyword-triggered microagents:
+
+1. **Standard Keyword Microagents**: Triggered by keywords embedded in text
+2. **Command-Style Microagents**: Triggered by command-style inputs (e.g., `/fix_test`) that can prompt for user input
+
+Additionally, there's a special type of microagent that's always active:
+
+3. **Repository Microagents**: Always active for a specific repository, providing repository-specific context and tools
 
 ## Frontmatter Syntax
 
 Frontmatter is required for keyword-triggered microagents. It must be placed at the top of the file,
-above the guidelines.
+above the guidelines. Enclose the frontmatter in triple dashes (---).
 
-Enclose the frontmatter in triple dashes (---) and include the following fields:
+### Standard Keyword Microagents
+
+For standard keyword microagents, include the following fields:
 
 | Field      | Description                                      | Required | Default          |
 |------------|--------------------------------------------------|----------|------------------|
+| `name`     | The name of the microagent                       | No       | Filename         |
+| `type`     | The type of microagent (`knowledge`)             | No       | Inferred         |
 | `triggers` | A list of keywords that activate the microagent. | Yes      | None             |
-| `agent`    | The agent this microagent applies to.            | No       | 'CodeActAgent'   |
 
+### Command-Style Microagents
 
-## Example
+For command-style microagents that require user input, include the following fields:
 
-Keyword-triggered microagent file example located at `.openhands/microagents/yummy.md`:
-```
+| Field      | Description                                                | Required | Default          |
+|------------|------------------------------------------------------------|----------|------------------|
+| `name`     | The name of the microagent                                 | No       | Filename         |
+| `type`     | The type of microagent (`task`)                            | No       | Inferred         |
+| `triggers` | A list of command triggers (e.g., `/fix_test`)             | No       | `/[name]`        |
+| `inputs`   | A list of input variables the microagent requires          | Yes      | None             |
+
+### Repository Microagents
+
+Repository microagents are always active for a specific repository. They provide repository-specific context and tools.
+
+| Field      | Description                                                | Required | Default          |
+|------------|------------------------------------------------------------|----------|------------------|
+| `name`     | The name of the microagent                                 | No       | Filename         |
+| `type`     | The type of microagent (`repo`)                            | No       | Inferred         |
+
+#### Repository Microagent Example
+
+Here's an example of a repository microagent:
+
+```yaml
 ---
+# The type field is optional and will be inferred as 'repo' when no triggers are present
+---
+
+# Repository Guidelines
+
+This repository follows these coding standards:
+1. Use PEP 8 for Python code
+2. Use ESLint for JavaScript code
+3. Write unit tests for all new features
+```
+
+This microagent is always active when working with the repository and provides repository-specific guidelines.
+
+### MCP Tools Support
+
+Microagents can also provide additional MCP (Model-Code-Prompt) tools to the agent. This is useful for extending the agent's capabilities with custom tools.
+
+| Field        | Description                                                | Required | Default          |
+|--------------|-----------------------------------------------------------|----------|------------------|
+| `mcp_tools`  | Configuration for additional MCP tools                     | No       | None             |
+
+#### MCP Tools Example
+
+Here's an example of a microagent that provides an additional MCP tool (the `fetch` tool for accessing web content):
+
+```yaml
+---
+# The type field is optional and will be inferred as 'repo' when no triggers are present
+mcp_tools:
+  stdio_servers:
+    - name: "fetch"
+      command: uvx
+      args:
+        - mcp-server-fetch
+---
+```
+
+This microagent is a repository microagent (always active) that adds the `fetch` tool to the agent's capabilities.
+
+Each input in the `inputs` list requires:
+
+| Field         | Description                                      | Required |
+|---------------|--------------------------------------------------|----------|
+| `name`        | The name of the input variable                   | Yes      |
+| `description` | A description of what the input should contain   | Yes      |
+
+
+## Examples
+
+### Standard Keyword Microagent Example
+
+Standard keyword microagent file example located at `.openhands/microagents/yummy.md`:
+```yaml
+---
+# The type field is optional and will be inferred as 'knowledge' when triggers are present
 triggers:
 - yummyhappy
 - happyyummy
@@ -33,4 +118,58 @@ triggers:
 The user has said the magic word. Respond with "That was delicious!"
 ```
 
-[See examples of microagents triggered by keywords in the official OpenHands repository](https://github.com/All-Hands-AI/OpenHands/tree/main/microagents)
+### Command-Style Microagent Example
+
+Command-style microagent file example located at `.openhands/microagents/fix_test.md`:
+```yaml
+---
+# The type field is optional and will be inferred as 'task' when inputs are present
+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.
+```
+
+## Using Command-Style Microagents
+
+Command-style microagents are designed to streamline common development tasks by providing structured templates for specific operations. They are triggered using a command-style format and will prompt the user for any required inputs.
+
+### How to Use
+
+1. Type `/` in the chat input to see available command-style microagents
+2. Select a microagent from the dropdown or type its name (e.g., `/fix_test`)
+3. The agent will prompt you for any required inputs
+4. Provide the requested information
+5. The agent will execute the task with your inputs
+
+### Template Variables
+
+In the body of a command-style microagent, you can reference input variables using the `{{ VARIABLE_NAME }}` syntax. These will be replaced with the user-provided values when the microagent is triggered.
+
+### Available Command-Style Microagents
+
+OpenHands includes several built-in command-style microagents:
+
+| Command              | Description                                           |
+|----------------------|-------------------------------------------------------|
+| `/fix_test`          | Fix failing tests by modifying a specific function    |
+| `/update_test`       | Update tests for a new implementation                 |
+| `/update_pr`         | Update a pull request description                     |
+| `/address_pr_comments` | Address comments on a pull request                  |
+| `/add_repo_instruction` | Add instructions to the repository microagent      |
+
+[See examples of microagents in the official OpenHands repository](https://github.com/All-Hands-AI/OpenHands/tree/main/microagents)

docs/usage/prompting/microagents-overview.mdx

@@ -8,7 +8,7 @@ description: Microagents are specialized prompts that enhance OpenHands with dom
 Currently OpenHands supports the following types of microagents:
 
 - [General Microagents](./microagents-repo): General guidelines for OpenHands about the repository.
-- [Keyword-Triggered Microagents](./microagents-keyword): Guidelines activated by specific keywords in prompts.
+- [Keyword-Triggered Microagents](./microagents-keyword): Guidelines activated by specific keywords in prompts, including command-style microagents that prompt for user inputs.
 
 To customize OpenHands' behavior, create a .openhands/microagents/ directory in the root of your repository and
 add `<microagent_name>.md` files inside. For repository-specific guidelines, you can ask OpenHands to analyze your repository and create a comprehensive `repo.md` file (see [General Microagents](./microagents-repo) for details).
@@ -34,7 +34,7 @@ some-repository/
 Each microagent file may include frontmatter that provides additional information. In some cases, this frontmatter
 is required:
 
-| Microagent Type                 | Required |
-|---------------------------------|----------|
-| `General Microagents`           | No       |
-| `Keyword-Triggered Microagents` | Yes      |
+| Microagent Type                                | Required |
+|------------------------------------------------|----------|
+| `General Microagents`                          | No       |
+| `Keyword-Triggered Microagents (all types)`    | Yes      |

evaluation/README.md

@@ -74,24 +74,6 @@ If no condenser configuration is specified, the 'noop' condenser will be used by
 
 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,7 +62,6 @@ 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']
 
 
@@ -255,19 +254,15 @@ 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=ENABLE_LLM_EDITOR,
+        enable_llm_editor=False,
         enable_mcp=False,
         condenser=metadata.condenser_config,
         enable_prompt_extensions=False,

frontend/__tests__/components/feedback-actions.test.tsx

@@ -0,0 +1,76 @@
+import { screen, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "test-utils";
+import { TrajectoryActions } from "#/components/features/trajectory/trajectory-actions";
+
+describe("TrajectoryActions", () => {
+  const user = userEvent.setup();
+  const onPositiveFeedback = vi.fn();
+  const onNegativeFeedback = vi.fn();
+  const onExportTrajectory = vi.fn();
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should render correctly", () => {
+    renderWithProviders(
+      <TrajectoryActions
+        onPositiveFeedback={onPositiveFeedback}
+        onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
+      />,
+    );
+
+    const actions = screen.getByTestId("feedback-actions");
+    within(actions).getByTestId("positive-feedback");
+    within(actions).getByTestId("negative-feedback");
+    within(actions).getByTestId("export-trajectory");
+  });
+
+  it("should call onPositiveFeedback when positive feedback is clicked", async () => {
+    renderWithProviders(
+      <TrajectoryActions
+        onPositiveFeedback={onPositiveFeedback}
+        onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
+      />,
+    );
+
+    const positiveFeedback = screen.getByTestId("positive-feedback");
+    await user.click(positiveFeedback);
+
+    expect(onPositiveFeedback).toHaveBeenCalled();
+  });
+
+  it("should call onNegativeFeedback when negative feedback is clicked", async () => {
+    renderWithProviders(
+      <TrajectoryActions
+        onPositiveFeedback={onPositiveFeedback}
+        onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
+      />,
+    );
+
+    const negativeFeedback = screen.getByTestId("negative-feedback");
+    await user.click(negativeFeedback);
+
+    expect(onNegativeFeedback).toHaveBeenCalled();
+  });
+
+  it("should call onExportTrajectory when export button is clicked", async () => {
+    renderWithProviders(
+      <TrajectoryActions
+        onPositiveFeedback={onPositiveFeedback}
+        onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
+      />,
+    );
+
+    const exportButton = screen.getByTestId("export-trajectory");
+    await user.click(exportButton);
+
+    expect(onExportTrajectory).toHaveBeenCalled();
+  });
+});

frontend/__tests__/components/feedback-form.test.tsx

@@ -0,0 +1,68 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+// Mock useParams before importing components
+vi.mock("react-router", async () => {
+  const actual = await vi.importActual("react-router");
+  return {
+    ...(actual as object),
+    useParams: () => ({ conversationId: "test-conversation-id" }),
+  };
+});
+
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { renderWithProviders } from "test-utils";
+import { FeedbackForm } from "#/components/features/feedback/feedback-form";
+import { I18nKey } from "#/i18n/declaration";
+
+describe("FeedbackForm", () => {
+  const user = userEvent.setup();
+  const onCloseMock = vi.fn();
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should render correctly", () => {
+    renderWithProviders(
+      <FeedbackForm polarity="positive" onClose={onCloseMock} />,
+    );
+
+    screen.getByLabelText(I18nKey.FEEDBACK$EMAIL_LABEL);
+    screen.getByLabelText(I18nKey.FEEDBACK$PRIVATE_LABEL);
+    screen.getByLabelText(I18nKey.FEEDBACK$PUBLIC_LABEL);
+
+    screen.getByRole("button", { name: I18nKey.FEEDBACK$SHARE_LABEL });
+    screen.getByRole("button", { name: I18nKey.FEEDBACK$CANCEL_LABEL });
+  });
+
+  it("should switch between private and public permissions", async () => {
+    renderWithProviders(
+      <FeedbackForm polarity="positive" onClose={onCloseMock} />,
+    );
+    const privateRadio = screen.getByLabelText(I18nKey.FEEDBACK$PRIVATE_LABEL);
+    const publicRadio = screen.getByLabelText(I18nKey.FEEDBACK$PUBLIC_LABEL);
+
+    expect(privateRadio).toBeChecked(); // private is the default value
+    expect(publicRadio).not.toBeChecked();
+
+    await user.click(publicRadio);
+    expect(publicRadio).toBeChecked();
+    expect(privateRadio).not.toBeChecked();
+
+    await user.click(privateRadio);
+    expect(privateRadio).toBeChecked();
+    expect(publicRadio).not.toBeChecked();
+  });
+
+  it("should call onClose when the close button is clicked", async () => {
+    renderWithProviders(
+      <FeedbackForm polarity="positive" onClose={onCloseMock} />,
+    );
+    await user.click(
+      screen.getByRole("button", { name: I18nKey.FEEDBACK$CANCEL_LABEL }),
+    );
+
+    expect(onCloseMock).toHaveBeenCalled();
+  });
+});

frontend/src/api/open-hands.ts

@@ -1,5 +1,7 @@
 import { AxiosHeaders } from "axios";
 import {
+  Feedback,
+  FeedbackResponse,
   GitHubAccessTokenResponse,
   GetConfigResponse,
   GetVSCodeUrlResponse,
@@ -93,6 +95,20 @@ class OpenHands {
     return headers;
   }
 
+  /**
+   * Send feedback to the server
+   * @param data Feedback data
+   * @returns The stored feedback data
+   */
+  static async submitFeedback(
+    conversationId: string,
+    feedback: Feedback,
+  ): Promise<FeedbackResponse> {
+    const url = `/api/conversations/${conversationId}/submit-feedback`;
+    const { data } = await openHands.post<FeedbackResponse>(url, feedback);
+    return data;
+  }
+
   /**
    * Authenticate with GitHub token
    * @returns Response with authentication status and user info if successful

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

@@ -14,6 +14,17 @@ export interface FileUploadSuccessResponse {
   skipped_files: { name: string; reason: string }[];
 }
 
+export interface FeedbackBodyResponse {
+  message: string;
+  feedback_id: string;
+  password: string;
+}
+
+export interface FeedbackResponse {
+  statusCode: number;
+  body: FeedbackBodyResponse;
+}
+
 export interface GitHubAccessTokenResponse {
   access_token: string;
 }
@@ -23,6 +34,15 @@ export interface AuthenticationResponse {
   login?: string; // Only present when allow list is enabled
 }
 
+export interface Feedback {
+  version: string;
+  email: string;
+  token: string;
+  polarity: "positive" | "negative";
+  permissions: "public" | "private";
+  trajectory: unknown[];
+}
+
 export interface GetConfigResponse {
   APP_MODE: "saas" | "oss";
   APP_SLUG?: string;

frontend/src/components/features/chat/chat-interface.tsx

@@ -11,6 +11,7 @@ import { InteractiveChatBox } from "./interactive-chat-box";
 import { RootState } from "#/store";
 import { AgentState } from "#/types/agent-state";
 import { generateAgentStateChangeEvent } from "#/services/agent-state-service";
+import { FeedbackModal } from "../feedback/feedback-modal";
 import { useScrollToBottom } from "#/hooks/use-scroll-to-bottom";
 import { TypingIndicator } from "./typing-indicator";
 import { useWsClient } from "#/context/ws-client-provider";
@@ -49,6 +50,10 @@ export function ChatInterface() {
 
   const { curAgentState } = useSelector((state: RootState) => state.agent);
 
+  const [feedbackPolarity, setFeedbackPolarity] = React.useState<
+    "positive" | "negative"
+  >("positive");
+  const [feedbackModalIsOpen, setFeedbackModalIsOpen] = React.useState(false);
   const [messageToSend, setMessageToSend] = React.useState<string | null>(null);
   const { selectedRepository, replayJson } = useSelector(
     (state: RootState) => state.initialQuery,
@@ -91,6 +96,13 @@ export function ChatInterface() {
     send(generateAgentStateChangeEvent(AgentState.STOPPED));
   };
 
+  const onClickShareFeedbackActionButton = async (
+    polarity: "positive" | "negative",
+  ) => {
+    setFeedbackModalIsOpen(true);
+    setFeedbackPolarity(polarity);
+  };
+
   const onClickExportTrajectoryButton = () => {
     if (!params.conversationId) {
       displayErrorToast(t(I18nKey.CONVERSATION$DOWNLOAD_ERROR));
@@ -152,6 +164,12 @@ export function ChatInterface() {
       <div className="flex flex-col gap-[6px] px-4 pb-4">
         <div className="flex justify-between relative">
           <TrajectoryActions
+            onPositiveFeedback={() =>
+              onClickShareFeedbackActionButton("positive")
+            }
+            onNegativeFeedback={() =>
+              onClickShareFeedbackActionButton("negative")
+            }
             onExportTrajectory={() => onClickExportTrajectoryButton()}
           />
 
@@ -176,6 +194,12 @@ export function ChatInterface() {
           onChange={setMessageToSend}
         />
       </div>
+
+      <FeedbackModal
+        isOpen={feedbackModalIsOpen}
+        onClose={() => setFeedbackModalIsOpen(false)}
+        polarity={feedbackPolarity}
+      />
     </div>
   );
 }

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

@@ -0,0 +1,152 @@
+import React from "react";
+import hotToast from "react-hot-toast";
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import { Feedback } from "#/api/open-hands.types";
+import { useSubmitFeedback } from "#/hooks/mutation/use-submit-feedback";
+import { BrandButton } from "../settings/brand-button";
+
+const FEEDBACK_VERSION = "1.0";
+const VIEWER_PAGE = "https://www.all-hands.dev/share";
+
+interface FeedbackFormProps {
+  onClose: () => void;
+  polarity: "positive" | "negative";
+}
+
+export function FeedbackForm({ onClose, polarity }: FeedbackFormProps) {
+  const { t } = useTranslation();
+
+  const copiedToClipboardToast = () => {
+    hotToast(t(I18nKey.FEEDBACK$PASSWORD_COPIED_MESSAGE), {
+      icon: "📋",
+      position: "bottom-right",
+    });
+  };
+
+  const onPressToast = (password: string) => {
+    navigator.clipboard.writeText(password);
+    copiedToClipboardToast();
+  };
+
+  const shareFeedbackToast = (
+    message: string,
+    link: string,
+    password: string,
+  ) => {
+    hotToast(
+      <div className="flex flex-col gap-1">
+        <span>{message}</span>
+        <a
+          data-testid="toast-share-url"
+          className="text-blue-500 underline"
+          onClick={() => onPressToast(password)}
+          href={link}
+          target="_blank"
+          rel="noreferrer"
+        >
+          {t(I18nKey.FEEDBACK$GO_TO_FEEDBACK)}
+        </a>
+        <span onClick={() => onPressToast(password)} className="cursor-pointer">
+          {t(I18nKey.FEEDBACK$PASSWORD)}: {password}{" "}
+          <span className="text-gray-500">
+            ({t(I18nKey.FEEDBACK$COPY_LABEL)})
+          </span>
+        </span>
+      </div>,
+      { duration: 10000 },
+    );
+  };
+
+  const { mutate: submitFeedback, isPending } = useSubmitFeedback();
+
+  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+    event?.preventDefault();
+    const formData = new FormData(event.currentTarget);
+
+    const email = formData.get("email")?.toString() || "";
+    const permissions = (formData.get("permissions")?.toString() ||
+      "private") as "private" | "public";
+
+    const feedback: Feedback = {
+      version: FEEDBACK_VERSION,
+      email,
+      polarity,
+      permissions,
+      trajectory: [],
+      token: "",
+    };
+
+    submitFeedback(
+      { feedback },
+      {
+        onSuccess: (data) => {
+          const { message, feedback_id, password } = data.body; // eslint-disable-line
+          const link = `${VIEWER_PAGE}?share_id=${feedback_id}`;
+          shareFeedbackToast(message, link, password);
+          onClose();
+        },
+      },
+    );
+  };
+
+  return (
+    <form onSubmit={handleSubmit} className="flex flex-col gap-6 w-full">
+      <label className="flex flex-col gap-2">
+        <span className="text-xs text-neutral-400">
+          {t(I18nKey.FEEDBACK$EMAIL_LABEL)}
+        </span>
+        <input
+          required
+          name="email"
+          type="email"
+          placeholder={t(I18nKey.FEEDBACK$EMAIL_PLACEHOLDER)}
+          className="bg-[#27272A] px-3 py-[10px] rounded"
+        />
+      </label>
+
+      <div className="flex gap-4 text-neutral-400">
+        <label className="flex gap-2 cursor-pointer">
+          <input
+            name="permissions"
+            value="private"
+            type="radio"
+            defaultChecked
+          />
+          {t(I18nKey.FEEDBACK$PRIVATE_LABEL)}
+        </label>
+        <label className="flex gap-2 cursor-pointer">
+          <input name="permissions" value="public" type="radio" />
+          {t(I18nKey.FEEDBACK$PUBLIC_LABEL)}
+        </label>
+      </div>
+
+      <div className="flex gap-2">
+        <BrandButton
+          type="submit"
+          variant="primary"
+          className="grow"
+          isDisabled={isPending}
+        >
+          {isPending
+            ? t(I18nKey.FEEDBACK$SUBMITTING_LABEL)
+            : t(I18nKey.FEEDBACK$SHARE_LABEL)}
+        </BrandButton>
+        <BrandButton
+          type="button"
+          variant="secondary"
+          className="grow"
+          onClick={onClose}
+          isDisabled={isPending}
+        >
+          {t(I18nKey.FEEDBACK$CANCEL_LABEL)}
+        </BrandButton>
+      </div>
+      {isPending && (
+        <p className="text-sm text-center text-neutral-400">
+          {t(I18nKey.FEEDBACK$SUBMITTING_MESSAGE)}
+        </p>
+      )}
+    </form>
+  );
+}

frontend/src/components/features/feedback/feedback-modal.tsx

@@ -0,0 +1,34 @@
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import {
+  BaseModalTitle,
+  BaseModalDescription,
+} from "#/components/shared/modals/confirmation-modals/base-modal";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { ModalBody } from "#/components/shared/modals/modal-body";
+import { FeedbackForm } from "./feedback-form";
+
+interface FeedbackModalProps {
+  onClose: () => void;
+  isOpen: boolean;
+  polarity: "positive" | "negative";
+}
+
+export function FeedbackModal({
+  onClose,
+  isOpen,
+  polarity,
+}: FeedbackModalProps) {
+  const { t } = useTranslation();
+  if (!isOpen) return null;
+
+  return (
+    <ModalBackdrop onClose={onClose}>
+      <ModalBody className="border border-tertiary">
+        <BaseModalTitle title={t(I18nKey.FEEDBACK$TITLE)} />
+        <BaseModalDescription description={t(I18nKey.FEEDBACK$DESCRIPTION)} />
+        <FeedbackForm onClose={onClose} polarity={polarity} />
+      </ModalBody>
+    </ModalBackdrop>
+  );
+}

frontend/src/components/features/trajectory/trajectory-actions.tsx

@@ -1,19 +1,37 @@
 import { useTranslation } from "react-i18next";
 import { I18nKey } from "#/i18n/declaration";
+import ThumbsUpIcon from "#/icons/thumbs-up.svg?react";
+import ThumbDownIcon from "#/icons/thumbs-down.svg?react";
 import ExportIcon from "#/icons/export.svg?react";
 import { TrajectoryActionButton } from "#/components/shared/buttons/trajectory-action-button";
 
 interface TrajectoryActionsProps {
+  onPositiveFeedback: () => void;
+  onNegativeFeedback: () => void;
   onExportTrajectory: () => void;
 }
 
 export function TrajectoryActions({
+  onPositiveFeedback,
+  onNegativeFeedback,
   onExportTrajectory,
 }: TrajectoryActionsProps) {
   const { t } = useTranslation();
 
   return (
-    <div data-testid="trajectory-actions" className="flex gap-1">
+    <div data-testid="feedback-actions" className="flex gap-1">
+      <TrajectoryActionButton
+        testId="positive-feedback"
+        onClick={onPositiveFeedback}
+        icon={<ThumbsUpIcon width={15} height={15} />}
+        tooltip={t(I18nKey.BUTTON$MARK_HELPFUL)}
+      />
+      <TrajectoryActionButton
+        testId="negative-feedback"
+        onClick={onNegativeFeedback}
+        icon={<ThumbDownIcon width={15} height={15} />}
+        tooltip={t(I18nKey.BUTTON$MARK_NOT_HELPFUL)}
+      />
       <TrajectoryActionButton
         testId="export-trajectory"
         onClick={onExportTrajectory}

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

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

frontend/src/hooks/mutation/use-submit-feedback.ts

@@ -0,0 +1,22 @@
+import { useMutation } from "@tanstack/react-query";
+import { Feedback } from "#/api/open-hands.types";
+import OpenHands from "#/api/open-hands";
+import { useConversationId } from "#/hooks/use-conversation-id";
+import { displayErrorToast } from "#/utils/custom-toast-handlers";
+
+type SubmitFeedbackArgs = {
+  feedback: Feedback;
+};
+
+export const useSubmitFeedback = () => {
+  const { conversationId } = useConversationId();
+  return useMutation({
+    mutationFn: ({ feedback }: SubmitFeedbackArgs) =>
+      OpenHands.submitFeedback(conversationId, feedback),
+    onError: (error) => {
+      displayErrorToast(error.message);
+    },
+    retry: 2,
+    retryDelay: 500,
+  });
+};

frontend/src/icons/thumbs-down.svg

@@ -0,0 +1,5 @@
+<svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M11.8749 1.75H3.91861C3.47998 1.75015 3.05528 1.90407 2.71841 2.18499C2.38154 2.4659 2.15382 2.85603 2.07486 3.2875L1.28111 7.6625C1.23166 7.93277 1.2422 8.21062 1.31201 8.47636C1.38182 8.74211 1.50917 8.98927 1.68507 9.20035C1.86097 9.41142 2.08111 9.58126 2.32991 9.69785C2.57872 9.81443 2.8501 9.87491 3.12486 9.875H5.97486L5.62486 10.7688C5.47928 11.1601 5.4308 11.5809 5.48357 11.995C5.53635 12.4092 5.68881 12.8044 5.92787 13.1467C6.16694 13.489 6.48547 13.7683 6.85615 13.9604C7.22683 14.1526 7.63859 14.2519 8.05611 14.25C8.17634 14.2497 8.29394 14.2148 8.39482 14.1494C8.4957 14.084 8.57557 13.9909 8.62486 13.8813L10.4061 9.875H11.8749C12.3721 9.875 12.8491 9.67746 13.2007 9.32583C13.5523 8.97419 13.7499 8.49728 13.7499 8V3.625C13.7499 3.12772 13.5523 2.65081 13.2007 2.29917C12.8491 1.94754 12.3721 1.75 11.8749 1.75ZM9.37486 9.11875L7.67486 12.9438C7.50092 12.8911 7.3396 12.8034 7.20083 12.6861C7.06206 12.5688 6.94878 12.4242 6.86798 12.2615C6.78717 12.0987 6.74055 11.9211 6.73099 11.7396C6.72143 11.5581 6.74912 11.3766 6.81236 11.2062L7.14361 10.3125C7.2142 10.1236 7.23803 9.92041 7.21307 9.72029C7.18811 9.52018 7.1151 9.32907 7.00028 9.16329C6.88546 8.9975 6.73223 8.86196 6.55367 8.76823C6.37511 8.67449 6.17653 8.62535 5.97486 8.625H3.12486C3.03304 8.62515 2.94232 8.60507 2.85914 8.56618C2.77597 8.52729 2.70238 8.47055 2.64361 8.4C2.58341 8.33042 2.5393 8.24841 2.51445 8.15982C2.4896 8.07123 2.48462 7.97824 2.49986 7.8875L3.29361 3.5125C3.32024 3.3669 3.39767 3.23548 3.51212 3.14162C3.62657 3.04777 3.77062 2.99759 3.91861 3H9.37486V9.11875ZM12.4999 8C12.4999 8.16576 12.434 8.32473 12.3168 8.44194C12.1996 8.55915 12.0406 8.625 11.8749 8.625H10.6249V3H11.8749C12.0406 3 12.1996 3.06585 12.3168 3.18306C12.434 3.30027 12.4999 3.45924 12.4999 3.625V8Z"
+    fill="white" />
+</svg>

frontend/src/icons/thumbs-up.svg

@@ -0,0 +1,5 @@
+<svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M13.3125 6.80003C13.1369 6.58918 12.9171 6.41945 12.6687 6.30282C12.4204 6.18619 12.1494 6.1255 11.875 6.12503H9.025L9.375 5.23128C9.52058 4.83995 9.56907 4.41916 9.51629 4.00498C9.46351 3.5908 9.31106 3.19561 9.07199 2.8533C8.83293 2.51099 8.51439 2.23178 8.14371 2.03962C7.77303 1.84746 7.36127 1.74809 6.94375 1.75003C6.82352 1.75028 6.70592 1.7852 6.60504 1.8506C6.50417 1.91601 6.42429 2.00912 6.375 2.11878L4.59375 6.12503H3.125C2.62772 6.12503 2.15081 6.32257 1.79917 6.6742C1.44754 7.02583 1.25 7.50275 1.25 8.00003V12.375C1.25 12.8723 1.44754 13.3492 1.79917 13.7009C2.15081 14.0525 2.62772 14.25 3.125 14.25H11.0812C11.5199 14.2499 11.9446 14.096 12.2815 13.815C12.6183 13.5341 12.846 13.144 12.925 12.7125L13.7188 8.33753C13.7678 8.06714 13.7569 7.78927 13.6867 7.52358C13.6165 7.25788 13.4887 7.01087 13.3125 6.80003ZM4.375 13H3.125C2.95924 13 2.80027 12.9342 2.68306 12.817C2.56585 12.6998 2.5 12.5408 2.5 12.375V8.00003C2.5 7.83427 2.56585 7.6753 2.68306 7.55809C2.80027 7.44088 2.95924 7.37503 3.125 7.37503H4.375V13ZM12.5 8.11253L11.7062 12.4875C11.6796 12.6331 11.6022 12.7646 11.4877 12.8584C11.3733 12.9523 11.2292 13.0024 11.0812 13H5.625V6.88128L7.325 3.05628C7.49999 3.10729 7.6625 3.19403 7.80229 3.31102C7.94207 3.428 8.05608 3.57269 8.13712 3.73596C8.21817 3.89923 8.26449 4.07752 8.27316 4.25959C8.28183 4.44166 8.25266 4.62355 8.1875 4.79378L7.85625 5.68753C7.78567 5.87644 7.76184 6.07962 7.7868 6.27973C7.81176 6.47985 7.88476 6.67095 7.99958 6.83674C8.11441 7.00253 8.26763 7.13807 8.44619 7.2318C8.62475 7.32554 8.82333 7.37468 9.025 7.37503H11.875C11.9668 7.37488 12.0575 7.39496 12.1407 7.43385C12.2239 7.47274 12.2975 7.52948 12.3563 7.60003C12.4165 7.66961 12.4606 7.75162 12.4854 7.84021C12.5103 7.9288 12.5152 8.02179 12.5 8.11253Z"
+    fill="white" />
+</svg>

frontend/src/routes/llm-settings.tsx

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

frontend/src/utils/tips.ts

@@ -12,7 +12,7 @@ export const TIPS: Tip[] = [
   },
   {
     key: I18nKey.TIPS$SETUP_SCRIPT,
-    link: "https://docs.all-hands.dev/usage/prompting/repository#setup-script",
+    link: "https://docs.all-hands.dev/usage/customization/repository",
   },
   { key: I18nKey.TIPS$VSCODE_INSTANCE },
   { key: I18nKey.TIPS$SAVE_WORK },
@@ -38,7 +38,7 @@ export const TIPS: Tip[] = [
   },
   {
     key: I18nKey.TIPS$API_USAGE,
-    link: "https://docs.all-hands.dev/api-reference/health-check",
+    link: "https://docs.all-hands.dev/swagger-ui/",
   },
 ];
 

microagents/add_agent.md

@@ -1,20 +1,17 @@
 ---
-name: add_agent
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
-  - new agent
-  - new microagent
-  - create agent
-  - create an agent
-  - create microagent
-  - create a microagent
-  - add agent
-  - add an agent
-  - add microagent
-  - add a microagent
-  - microagent template
+- new agent
+- new microagent
+- create agent
+- create an agent
+- create microagent
+- create a microagent
+- add agent
+- add an agent
+- add microagent
+- add a microagent
+- microagent template
+type: knowledge
 ---
 
 This agent helps create new microagents in the `.openhands/microagents` directory by providing guidance and templates.
@@ -37,4 +34,5 @@ When creating a new microagent:
 For detailed information, see:
 
 - [Microagents Overview](https://docs.all-hands.dev/usage/prompting/microagents-overview)
-- [Example GitHub Microagent](https://github.com/All-Hands-AI/OpenHands/blob/main/microagents/github.md)
+- [Microagents Syntax](https://docs.all-hands.dev/usage/prompting/microagents-syntax)
+- [Example GitHub Microagent](https://github.com/All-Hands-AI/OpenHands/blob/main/microagents/github.md)

microagents/add_repo_inst.md

@@ -1,13 +1,9 @@
 ---
-name: add_repo_inst
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
+inputs:
+- description: Branch for the agent to work on
+  name: REPO_FOLDER_NAME
 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.
@@ -62,4 +58,4 @@ Frontend:
 ```
 
 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.
+Read all the GitHub workflows under .github/ of the repository (if this folder exists) to understand the CI checks (e.g., linter, pre-commit), and include those in the repo.md file.

microagents/address_pr_comments.md

@@ -1,19 +1,15 @@
 ---
-name: address_pr_comments
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
+inputs:
+- description: URL of the pull request
+  name: PR_URL
+- description: Branch name corresponds to the pull request
+  name: BRANCH_NAME
 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.
+Next, you should use the GitHub API to read the reviews and comments on this PR and address them.

microagents/agent_memory.md

@@ -1,10 +1,7 @@
 ---
-name: agent_memory
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - /remember
+type: knowledge
 ---
 
 * Repository memory: Use .openhands/microagents/repo.md under each repository root to store and access important information.
@@ -29,4 +26,4 @@ triggers:
   - If you've only explored a portion of the codebase, clearly note this limitation in the repository structure documentation
   - If you don't know the essential commands for working with the repository, such as lint or typecheck, ask the user and suggest adding them to repo.md for future reference (with permission)
 
-When you receive this message, please review and summarize your recent actions and observations, then present a list of valuable information that should be saved in repo.md to the user.
+When you receive this message, please review and summarize your recent actions and observations, then present a list of valuable information that should be saved in repo.md to the user.

microagents/default-tools.md

@@ -1,15 +1,9 @@
 ---
-# This is a repo microagent that is always activated
-# to include necessary default tools implemented with MCP
-name: default-tools
-type: repo
-version: 1.0.0
-agent: CodeActAgent
 mcp_tools:
   stdio_servers:
-    - name: "fetch"
-      command: "uvx"
-      args: ["mcp-server-fetch"]
-# We leave the body empty because MCP tools will automatically add the
-# tool description for LLMs in tool calls, so there's no need to add extra descriptions.
----
+  - args:
+    - mcp-server-fetch
+    command: uvx
+    name: fetch
+type: repo
+---

microagents/docker.md

@@ -1,11 +1,8 @@
 ---
-name: docker
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - docker
 - container
+type: knowledge
 ---
 
 # Docker Installation and Usage Guide
@@ -52,4 +49,4 @@ To verify Docker is working correctly, run the hello-world container:
 
 ```bash
 sudo docker run hello-world
-```
+```

microagents/fix_test.md

@@ -1,23 +1,20 @@
 ---
-name: fix_test
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
+inputs:
+- description: Branch for the agent to work on
+  name: BRANCH_NAME
+- description: The test command you want the agent to work on. For example, `pytest
+    tests/unit/test_bash_parsing.py`
+  name: TEST_COMMAND_TO_RUN
+- description: The name of function to fix
+  name: FUNCTION_TO_FIX
+- description: The path of the file that contains the function
+  name: FILE_FOR_FUNCTION
 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.
+PLEASE DO NOT modify the tests by yourself -- Let me know if you think some of the tests are incorrect.

microagents/flarglebargle.md

@@ -1,11 +1,8 @@
 ---
-name: flarglebargle
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - flarglebargle
+type: knowledge
 ---
 
 IMPORTANT! The user has said the magic word "flarglebargle". You must
-only respond with a message telling them how smart they are
+only respond with a message telling them how smart they are

microagents/github.md

@@ -1,11 +1,8 @@
 ---
-name: github
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - github
 - git
+type: knowledge
 ---
 
 You have access to an environment variable, `GITHUB_TOKEN`, which allows you to interact with
@@ -32,4 +29,4 @@ Here are some instructions for pushing, but ONLY do this if the user asks you to
 ```bash
 git remote -v && git branch # to find the current org, repo and branch
 git checkout -b create-widget && git add . && git commit -m "Create widget" && git push -u origin create-widget
-```
+```

microagents/gitlab.md

@@ -1,11 +1,8 @@
 ---
-name: gitlab
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - gitlab
 - git
+type: knowledge
 ---
 
 You have access to an environment variable, `GITLAB_TOKEN`, which allows you to interact with
@@ -31,4 +28,4 @@ Here are some instructions for pushing, but ONLY do this if the user asks you to
 ```bash
 git remote -v && git branch # to find the current org, repo and branch
 git checkout -b create-widget && git add . && git commit -m "Create widget" && git push -u origin create-widget
-```
+```

microagents/kubernetes.md

@@ -1,12 +1,9 @@
 ---
-name: kubernetes
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - kubernetes
 - k8s
 - kube
+type: knowledge
 ---
 
 # Kubernetes Local Development with KIND
@@ -47,4 +44,4 @@ Create a basic KIND cluster:
 
 ```bash
 kind create cluster
-```
+```

microagents/npm.md

@@ -1,11 +1,8 @@
 ---
-name: npm
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - npm
+type: knowledge
 ---
 
 When using npm to install packages, you will not be able to use an interactive shell, and it may be hard to confirm your actions.
-As an alternative, you can pipe in the output of the unix "yes" command to confirm your actions.
+As an alternative, you can pipe in the output of the unix "yes" command to confirm your actions.

microagents/pdflatex.md

@@ -1,10 +1,7 @@
 ---
-name: pdflatex
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
 - pdflatex
+type: knowledge
 ---
 
 PdfLatex is a tool that converts Latex sources into PDF. This is specifically very important for researchers, as they use it to publish their findings. It could be installed very easily using Linux terminal, though this seems an annoying task on Windows. Installation commands are given below.
@@ -33,4 +30,4 @@ Once installed as above, you may be able to create PDF files from latex sources
 pdflatex latex_source_name.tex
 ```
 
-Ref: http://kkpradeeban.blogspot.com/2014/04/installing-latexpdflatex-on-ubuntu.html
+Ref: http://kkpradeeban.blogspot.com/2014/04/installing-latexpdflatex-on-ubuntu.html

microagents/security.md

@@ -1,15 +1,13 @@
 ---
-name: security
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
-  - security
-  - vulnerability
-  - authentication
-  - authorization
-  - permissions
+- security
+- vulnerability
+- authentication
+- authorization
+- permissions
+type: knowledge
 ---
+
 This document provides guidance on security best practices
 
 You should always be considering security implications when developing.
@@ -31,4 +29,4 @@ You should always complete the task requested. If there are security concerns pl
 - Never expose sensitive information in error messages
 - Log security events appropriately
 - Implement proper exception handling
-- Use secure error reporting mechanisms
+- Use secure error reporting mechanisms

microagents/ssh.md

@@ -1,16 +1,13 @@
 ---
-name: SSH Microagent
-type: knowledge
-version: 1.0.0
-agent: CodeActAgent
 triggers:
-  - ssh
-  - remote server
-  - remote machine
-  - remote host
-  - remote connection
-  - secure shell
-  - ssh keys
+- ssh
+- remote server
+- remote machine
+- remote host
+- remote connection
+- secure shell
+- ssh keys
+type: knowledge
 ---
 
 # SSH Microagent
@@ -134,4 +131,4 @@ chmod 600 ~/.ssh/id_ed25519
 chmod 644 ~/.ssh/id_ed25519.pub
 # Set correct permissions for SSH directory
 chmod 700 ~/.ssh
-```
+```

microagents/swift-linux.md

@@ -1,12 +1,9 @@
 ---
- name: swift-linux
- type: knowledge
- agent: CodeActAgent
- version: 1.0.0
- triggers:
- - swift-linux
- - swift-debian
- - swift-installation
+triggers:
+- swift-linux
+- swift-debian
+- swift-installation
+type: knowledge
 ---
 
 # Swift Installation Guide for Debian Linux
@@ -80,4 +77,4 @@ Verify that Swift is correctly installed by running:
 
 ```bash
 swift --version
-```
+```

microagents/update_pr_description.md

@@ -1,21 +1,17 @@
 ---
-name: update_pr_description
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
+inputs:
+- description: URL of the pull request
+  name: PR_URL
+  type: string
+  validation:
+    pattern: ^https://github.com/.+/.+/pull/[0-9]+$
+- description: Branch name corresponds to the pull request
+  name: BRANCH_NAME
+  type: string
 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.
+Once you understand the purpose of the diff, please use Github API to read the existing PR description, and update it to be more reflective of the changes we've made when necessary.

microagents/update_test.md

@@ -1,19 +1,16 @@
 ---
-name: update_test
-version: 1.0.0
-author: openhands
-agent: CodeActAgent
+inputs:
+- description: Branch for the agent to work on
+  name: BRANCH_NAME
+- description: The test command you want the agent to work on. For example, `pytest
+    tests/unit/test_bash_parsing.py`
+  name: TEST_COMMAND_TO_RUN
 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.
+Please update the test file so that they pass with the current version of the implementation.

openhands/agenthub/codeact_agent/function_calling.py

@@ -141,9 +141,6 @@ 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,18 +2,10 @@ 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 `# ... existing code ...` 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 `# unchanged` 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:
@@ -41,12 +33,13 @@ 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):
-        # ... existing code ...
+        # no changes before
         self.y = 2
+        # self.z is removed
 
+# MyClass().z is removed
 print(MyClass().y)
 ```
 
@@ -65,7 +58,6 @@ 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)
 ```
 
@@ -101,9 +93,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=1002 end=1008
+path="/path/to/file.txt" start=1001 end=1008
 content=```
-#EDIT: I want to change the value of y to 2
+class MyClass:
     def __init__(self):
         # no changes before
         self.y = 2

openhands/events/nested_event_store.py

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

openhands/events/stream.py

@@ -186,18 +186,9 @@ class EventStream(EventStore):
 
         if event.id is not None:
             # Write the event to the store - this can take some time
-            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)
+            self.file_store.write(
+                self._get_filename_for_id(event.id, self.user_id), json.dumps(data)
+            )
 
             # 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/llm/fn_call_converter.py

@@ -22,7 +22,6 @@ 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,
 )
 
@@ -252,58 +251,6 @@ 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': """
@@ -332,8 +279,6 @@ 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 ''
@@ -352,8 +297,6 @@ 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']
@@ -366,8 +309,6 @@ 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,4 +4,3 @@ 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/microagent/microagent.py

@@ -103,7 +103,9 @@ class BaseMicroagent(BaseModel):
         if metadata.inputs:
             inferred_type = MicroagentType.TASK
             # Add a trigger for the agent name if not already present
-            trigger = f'/{metadata.name}'
+            # Use derived_name if available, otherwise use metadata.name
+            agent_name = derived_name if derived_name is not None and (metadata.name == 'default' or not metadata.name) else metadata.name
+            trigger = f'/{agent_name}'
             if not metadata.triggers or trigger not in metadata.triggers:
                 if not metadata.triggers:
                     metadata.triggers = [trigger]
@@ -121,7 +123,11 @@ class BaseMicroagent(BaseModel):
             raise ValueError(f'Could not determine microagent type for: {path}')
 
         # Use derived_name if available (from relative path), otherwise fallback to metadata.name
-        agent_name = derived_name if derived_name is not None else metadata.name
+        # If metadata.name is still the default 'default', use the derived_name
+        if derived_name is not None and (metadata.name == 'default' or not metadata.name):
+            agent_name = derived_name
+        else:
+            agent_name = metadata.name
 
         agent_class = subclass_map[inferred_type]
         return agent_class(

openhands/microagent/types.py

@@ -27,8 +27,10 @@ class MicroagentMetadata(BaseModel):
 
     name: str = 'default'
     type: MicroagentType = Field(default=MicroagentType.REPO_KNOWLEDGE)
-    version: str = Field(default='1.0.0')
-    agent: str = Field(default='CodeActAgent')
+    # Keep these fields for backward compatibility but they're not used
+    version: str = Field(default='1.0.0', exclude=True)
+    agent: str = Field(default='CodeActAgent', exclude=True)
+    author: str = Field(default='', exclude=True)
     triggers: list[str] = []  # optional, only exists for knowledge microagents
     inputs: list[InputMetadata] = []  # optional, only exists for task microagents
     mcp_tools: MCPConfig | None = (

openhands/runtime/action_execution_server.py

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

openhands/runtime/impl/action_execution/action_execution_client.py

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

openhands/runtime/impl/local/local_runtime.py

@@ -307,10 +307,8 @@ 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 if not skipped
-            if os.getenv('SKIP_DEPENDENCY_CHECK', '') != '1':
-                check_dependencies(code_repo_path, env_root_path)
-
+            # Check dependencies using the derived env_root_path
+            check_dependencies(code_repo_path, env_root_path)
             self.server_process = subprocess.Popen(  # noqa: S603
                 cmd,
                 stdout=subprocess.PIPE,
@@ -408,8 +406,8 @@ class LocalRuntime(ActionExecutionClient):
         return port
 
     @tenacity.retry(
-        wait=tenacity.wait_fixed(2),
-        stop=tenacity.stop_after_delay(120) | stop_if_should_exit(),
+        wait=tenacity.wait_exponential(min=1, max=10),
+        stop=tenacity.stop_after_attempt(10) | 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,6 +1,3 @@
 {
-    "mcpServers": {
-        "default": {}
-    },
-    "tools": []
+    "default": []
 }

openhands/runtime/mcp/proxy/README.md

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

openhands/runtime/mcp/proxy/__init__.py

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

openhands/runtime/mcp/proxy/manager.py

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

openhands/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  # type: ignore
+from openhands_aci.utils.diff import get_diff
 
 from openhands.core.config import OpenHandsConfig
 from openhands.core.logger import openhands_logger as logger
@@ -26,31 +26,39 @@ 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 = """
-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 OLD VERSION OF THE FILE:
+```
+{old_contents}
+```
 
-Within the `<updated_code>` tag, include only the final code after updation. Do not include any explanations or other content within these tags.
+HERE IS THE DRAFT OF THE NEW VERSION OF THE FILE:
+```
+{draft_changes}
+```
 
-<original_code>{old_contents}</original_code>
-
-<update_snippet>{draft_changes}</update_snippet>
-    """
+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()
 
 
 def _extract_code(string: str) -> str | None:
-    pattern = r'<updated_code>(.*?)</updated_code>'
+    pattern = r'```(?:\w*\n)?(.*?)```'
     matches = re.findall(pattern, string, re.DOTALL)
     if not matches:
         return None
-
-    content = str(matches[0])
-    if content.startswith('#EDIT:'):
-        #Remove first line
-        content = content[content.find('\n') + 1:]
-    return content
+    return str(matches[0])
 
 
 def get_new_file_contents(
@@ -58,6 +66,7 @@ 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 = 60,
+    timeout: int = 10,
     **kwargs: Any,
 ) -> httpx.Response:
     response = session.request(method, url, timeout=timeout, **kwargs)

openhands/server/app.py

@@ -15,6 +15,7 @@ from fastapi import (
 import openhands.agenthub  # noqa F401 (we import this to get the agents registered)
 from openhands import __version__
 from openhands.server.routes.conversation import app as conversation_api_router
+from openhands.server.routes.feedback import app as feedback_api_router
 from openhands.server.routes.files import app as files_api_router
 from openhands.server.routes.git import app as git_api_router
 from openhands.server.routes.health import add_health_endpoints
@@ -62,6 +63,7 @@ app = FastAPI(
 app.include_router(public_api_router)
 app.include_router(files_api_router)
 app.include_router(security_api_router)
+app.include_router(feedback_api_router)
 app.include_router(conversation_api_router)
 app.include_router(manage_conversation_api_router)
 app.include_router(settings_router)

openhands/server/conversation_manager/docker_nested_conversation_manager.py

@@ -22,6 +22,7 @@ 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 (
@@ -89,7 +90,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-') :]
@@ -283,7 +284,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:
+        except docker.errors.NotFound as e:
             return
         try:
             nested_url = self.get_nested_url_for_container(container)
@@ -292,33 +293,17 @@ class DockerNestedConversationManager(ConversationManager):
                     'X-Session-API-Key': self._get_session_api_key_for_conversation(sid)
                 }
             ) as client:
-                # Stop conversation
-                response = await client.post(
-                    f'{nested_url}/api/conversations/{sid}/stop'
-                )
+                response = await client.post(f'{nested_url}/api/conversations/{sid}/stop')
                 response.raise_for_status()
-
-                # Check up to 3 times that client has closed
-                for _ in range(3):
-                    response = await client.get(f'{nested_url}/api/conversations/{sid}')
-                    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)})
+        except Exception:
+            logger.exception("error_stopping_container")
         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:
@@ -396,9 +381,7 @@ 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(
@@ -440,9 +423,7 @@ 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(
@@ -474,9 +455,8 @@ 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'] = '/workspace'
+        env_vars['WORKSPACE_BASE'] = f'/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
@@ -521,7 +501,7 @@ class DockerNestedConversationManager(ConversationManager):
                     await call_sync_from_async(container.start)
                 return True
             return False
-        except docker.errors.NotFound:
+        except docker.errors.NotFound as e:
             return False
 
 

openhands/server/data_models/feedback.py

@@ -0,0 +1,45 @@
+import json
+from typing import Any, Literal
+
+import httpx
+from pydantic import BaseModel
+
+from openhands.core.logger import openhands_logger as logger
+
+
+class FeedbackDataModel(BaseModel):
+    version: str
+    email: str
+    polarity: Literal['positive', 'negative']
+    feedback: Literal[
+        'positive', 'negative'
+    ]  # TODO: remove this, its here for backward compatibility
+    permissions: Literal['public', 'private']
+    trajectory: list[dict[str, Any]] | None
+
+
+FEEDBACK_URL = 'https://share-od-trajectory-3u9bw9tx.uc.gateway.dev/share_od_trajectory'
+
+
+def store_feedback(feedback: FeedbackDataModel) -> dict[str, str]:
+    # Start logging
+    feedback.feedback = feedback.polarity
+    display_feedback = feedback.model_dump()
+    if 'trajectory' in display_feedback:
+        display_feedback['trajectory'] = (
+            f'elided [length: {len(display_feedback["trajectory"])}'
+        )
+    if 'token' in display_feedback:
+        display_feedback['token'] = 'elided'
+    logger.debug(f'Got feedback: {display_feedback}')
+    # Start actual request
+    response = httpx.post(
+        FEEDBACK_URL,
+        headers={'Content-Type': 'application/json'},
+        json=feedback.model_dump(),
+    )
+    if response.status_code != 200:
+        raise ValueError(f'Failed to store feedback: {response.text}')
+    response_data: dict[str, str] = json.loads(response.text)
+    logger.debug(f'Stored feedback: {response.text}')
+    return response_data

openhands/server/routes/feedback.py

@@ -0,0 +1,62 @@
+from fastapi import APIRouter, Depends, Request, status
+from fastapi.responses import JSONResponse
+
+from openhands.core.logger import openhands_logger as logger
+from openhands.events.async_event_store_wrapper import AsyncEventStoreWrapper
+from openhands.events.serialization import event_to_dict
+from openhands.server.data_models.feedback import FeedbackDataModel, store_feedback
+from openhands.server.dependencies import get_dependencies
+from openhands.server.utils import get_conversation
+from openhands.utils.async_utils import call_sync_from_async
+from openhands.server.session.conversation import ServerConversation
+
+app = APIRouter(prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies())
+
+
+@app.post('/submit-feedback')
+async def submit_feedback(request: Request, conversation: ServerConversation = Depends(get_conversation)) -> JSONResponse:
+    """Submit user feedback.
+
+    This function stores the provided feedback data.
+
+    To submit feedback:
+    ```sh
+    curl -X POST -d '{"email": "test@example.com"}' -H "Authorization:"
+    ```
+
+    Args:
+        request (Request): The incoming request object.
+        feedback (FeedbackDataModel): The feedback data to be stored.
+
+    Returns:
+        dict: The stored feedback data.
+
+    Raises:
+        HTTPException: If there's an error submitting the feedback.
+    """
+    # Assuming the storage service is already configured in the backend
+    # and there is a function to handle the storage.
+    body = await request.json()
+    async_store = AsyncEventStoreWrapper(
+        conversation.event_stream, filter_hidden=True
+    )
+    trajectory = []
+    async for event in async_store:
+        trajectory.append(event_to_dict(event))
+    feedback = FeedbackDataModel(
+        email=body.get('email', ''),
+        version=body.get('version', ''),
+        permissions=body.get('permissions', 'private'),
+        polarity=body.get('polarity', ''),
+        feedback=body.get('polarity', ''),
+        trajectory=trajectory,
+    )
+    try:
+        feedback_data = await call_sync_from_async(store_feedback, feedback)
+        return JSONResponse(status_code=status.HTTP_200_OK, content=feedback_data)
+    except Exception as e:
+        logger.error(f'Error submitting feedback: {e}')
+        return JSONResponse(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            content={'error': 'Failed to submit feedback'},
+        )

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.6.0"
+e2b = ">=1.0.5,<1.4.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.39.0"
+runloop-api-client = "0.33.0"
 libtmux = ">=0.37,<0.40"
 pygithub = "^2.5.0"
 joblib = "*"
@@ -67,6 +67,7 @@ poetry = "^2.1.2"
 anyio = "4.9.0"
 pythonnet = "*"
 fastmcp = "^2.5.2"
+mcpm = "1.12.0"
 python-frontmatter = "^1.1.0"
 # TODO: Should these go into the runtime group?
 ipywidgets = "^8.1.5"
@@ -80,7 +81,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.20.0"
+daytona-sdk = "0.18.1"
 stripe = ">=11.5,<13.0"
 google-cloud-aiplatform = "*"
 anthropic = { extras = [ "vertex" ], version = "*" }
@@ -90,8 +91,8 @@ boto3 = "*"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-ruff = "0.11.13"
-mypy = "1.16.0"
+ruff = "0.11.11"
+mypy = "1.15.0"
 pre-commit = "4.2.0"
 build = "*"
 types-setuptools = "*"

tests/runtime/test_mcp_action.py

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

tests/runtime/test_microagent.py

@@ -373,9 +373,9 @@ def test_default_tools_microagent_exists():
     assert 'type: repo' in content, 'default-tools.md should be a repo microagent'
 
     # Verify it has the fetch tool configured
-    assert 'name: "fetch"' in content, 'default-tools.md should have a fetch tool'
-    assert 'command: "uvx"' in content, 'default-tools.md should use uvx command'
-    assert 'args: ["mcp-server-fetch"]' in content, (
+    assert 'name: "fetch"' in content or 'name: fetch' in content, 'default-tools.md should have a fetch tool'
+    assert 'command: uvx' in content, 'default-tools.md should use uvx command'
+    assert 'mcp-server-fetch' in content, (
         'default-tools.md should use mcp-server-fetch'
     )