Merge branch 'main' into feature/org-microagents-blocking-timeout

Co-authored-by: openhands <openhands@all-hands.dev>
Co-authored-by: Rohit Malhotra <rohitvinodmalhotra@gmail.com>

.github/workflows/fe-unit-tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: blacksmith-4vcpu-ubuntu-2204
     strategy:
       matrix:
-        node-version: 22
+        node-version: [22]
       fail-fast: true
     steps:
       - name: Checkout

.github/workflows/run-eval.yml

@@ -1,56 +1,135 @@
-# Run evaluation on a PR
+# Run evaluation on a PR, after releases, or manually
 name: Run Eval
 
-# Runs when a PR is labeled with one of the "run-eval-" labels
+# Runs when a PR is labeled with one of the "run-eval-" labels, after releases, or manually triggered
 on:
   pull_request:
     types: [labeled]
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to evaluate'
+        required: true
+        default: 'main'
+      eval_instances:
+        description: 'Number of evaluation instances'
+        required: true
+        default: '50'
+        type: choice
+        options:
+          - '1'
+          - '2'
+          - '50'
+          - '100'
+      reason:
+        description: 'Reason for manual trigger'
+        required: false
+        default: ''
+
+env:
+  # Environment variable for the master GitHub issue number where all evaluation results will be commented
+  # This should be set to the issue number where you want all evaluation results to be posted
+  MASTER_EVAL_ISSUE_NUMBER: ${{ vars.MASTER_EVAL_ISSUE_NUMBER || '0' }}
 
 jobs:
   trigger-job:
     name: Trigger remote eval job
-    if: ${{ github.event.label.name == 'run-eval-1' || github.event.label.name == 'run-eval-2' || github.event.label.name == 'run-eval-50' || github.event.label.name == 'run-eval-100' }}
+    if: ${{ (github.event_name == 'pull_request' && (github.event.label.name == 'run-eval-1' || github.event.label.name == 'run-eval-2' || github.event.label.name == 'run-eval-50' || github.event.label.name == 'run-eval-100')) || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
     runs-on: blacksmith-4vcpu-ubuntu-2204
 
     steps:
-      - name: Checkout PR branch
+      - name: Checkout branch
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.head_ref }}
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || (github.event_name == 'workflow_dispatch' && github.event.inputs.branch) || github.ref }}
 
-      - name: Trigger remote job
-        env:
-          PR_BRANCH: ${{ github.head_ref }}
+      - name: Set evaluation parameters
+        id: eval_params
         run: |
           REPO_URL="https://github.com/${{ github.repository }}"
           echo "Repository URL: $REPO_URL"
-          echo "PR Branch: $PR_BRANCH"
 
-          if [[ "${{ github.event.label.name }}" == "run-eval-1" ]]; then
-            EVAL_INSTANCES="1"
-          elif [[ "${{ github.event.label.name }}" == "run-eval-2" ]]; then
-            EVAL_INSTANCES="2"
-          elif [[ "${{ github.event.label.name }}" == "run-eval-50" ]]; then
+          # Determine branch based on trigger type
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            EVAL_BRANCH="${{ github.head_ref }}"
+            echo "PR Branch: $EVAL_BRANCH"
+          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            EVAL_BRANCH="${{ github.event.inputs.branch }}"
+            echo "Manual Branch: $EVAL_BRANCH"
+          else
+            # For release events, use the tag name or main branch
+            EVAL_BRANCH="${{ github.ref_name }}"
+            echo "Release Branch/Tag: $EVAL_BRANCH"
+          fi
+
+          # Determine evaluation instances based on trigger type
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            if [[ "${{ github.event.label.name }}" == "run-eval-1" ]]; then
+              EVAL_INSTANCES="1"
+            elif [[ "${{ github.event.label.name }}" == "run-eval-2" ]]; then
+              EVAL_INSTANCES="2"
+            elif [[ "${{ github.event.label.name }}" == "run-eval-50" ]]; then
+              EVAL_INSTANCES="50"
+            elif [[ "${{ github.event.label.name }}" == "run-eval-100" ]]; then
+              EVAL_INSTANCES="100"
+            fi
+          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            EVAL_INSTANCES="${{ github.event.inputs.eval_instances }}"
+          else
+            # For release events, default to 50 instances
             EVAL_INSTANCES="50"
-          elif [[ "${{ github.event.label.name }}" == "run-eval-100" ]]; then
-            EVAL_INSTANCES="100"
+          fi
+
+          echo "Evaluation instances: $EVAL_INSTANCES"
+          echo "repo_url=$REPO_URL" >> $GITHUB_OUTPUT
+          echo "eval_branch=$EVAL_BRANCH" >> $GITHUB_OUTPUT
+          echo "eval_instances=$EVAL_INSTANCES" >> $GITHUB_OUTPUT
+
+      - name: Trigger remote job
+        run: |
+          # Determine PR number for the remote evaluation system
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            PR_NUMBER="${{ github.event.pull_request.number }}"
+          else
+            # For non-PR triggers, use the master issue number as PR number
+            PR_NUMBER="${{ env.MASTER_EVAL_ISSUE_NUMBER }}"
           fi
 
           curl -X POST \
             -H "Authorization: Bearer ${{ secrets.PAT_TOKEN }}" \
             -H "Accept: application/vnd.github+json" \
-            -d "{\"ref\": \"main\", \"inputs\": {\"github-repo\": \"${REPO_URL}\", \"github-branch\": \"${PR_BRANCH}\", \"pr-number\": \"${{ github.event.pull_request.number }}\", \"eval-instances\": \"${EVAL_INSTANCES}\"}}" \
+            -d "{\"ref\": \"main\", \"inputs\": {\"github-repo\": \"${{ steps.eval_params.outputs.repo_url }}\", \"github-branch\": \"${{ steps.eval_params.outputs.eval_branch }}\", \"pr-number\": \"${PR_NUMBER}\", \"eval-instances\": \"${{ steps.eval_params.outputs.eval_instances }}\"}}" \
             https://api.github.com/repos/All-Hands-AI/evaluation/actions/workflows/create-branch.yml/dispatches
 
           # Send Slack message
-          PR_URL="https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}"
-          slack_text="PR $PR_URL has triggered evaluation on $EVAL_INSTANCES instances..."
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            TRIGGER_URL="https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}"
+            slack_text="PR $TRIGGER_URL has triggered evaluation on ${{ steps.eval_params.outputs.eval_instances }} instances..."
+          elif [[ "${{ github.event_name }}" == "release" ]]; then
+            TRIGGER_URL="https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}"
+            slack_text="Release $TRIGGER_URL has triggered evaluation on ${{ steps.eval_params.outputs.eval_instances }} instances..."
+          else
+            TRIGGER_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            slack_text="Manual trigger (${{ github.event.inputs.reason || 'No reason provided' }}) has triggered evaluation on ${{ steps.eval_params.outputs.eval_instances }} instances for branch ${{ steps.eval_params.outputs.eval_branch }}..."
+          fi
+
           curl -X POST -H 'Content-type: application/json' --data '{"text":"'"$slack_text"'"}' \
             https://hooks.slack.com/services/${{ secrets.SLACK_TOKEN }}
 
-      - name: Comment on PR
+      - name: Comment on issue/PR
         uses: KeisukeYamashita/create-comment@v1
         with:
+          # For PR triggers, comment on the PR. For other triggers, comment on the master issue
+          number: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || env.MASTER_EVAL_ISSUE_NUMBER }}
           unique: false
           comment: |
-            Running evaluation on the PR. Once eval is done, the results will be posted.
+            **Evaluation Triggered**
+
+            **Trigger:** ${{ github.event_name == 'pull_request' && format('Pull Request #{0}', github.event.pull_request.number) || (github.event_name == 'release' && 'Release') || format('Manual Trigger: {0}', github.event.inputs.reason || 'No reason provided') }}
+            **Branch:** ${{ steps.eval_params.outputs.eval_branch }}
+            **Instances:** ${{ steps.eval_params.outputs.eval_instances }}
+            **Commit:** ${{ github.sha }}
+
+            Running evaluation on the specified branch. Once eval is done, the results will be posted here.

.openhands/microagents/repo.md

@@ -15,8 +15,6 @@ make build && make run FRONTEND_PORT=12000 FRONTEND_HOST=0.0.0.0 BACKEND_HOST=0.
 
 IMPORTANT: Before making any changes to the codebase, ALWAYS run `make install-pre-commit-hooks` to ensure pre-commit hooks are properly installed.
 
-
-
 Before pushing any changes, you MUST ensure that any lint errors or simple test errors have been fixed.
 
 * If you've made changes to the backend, you should run `pre-commit run --config ./dev_config/python/.pre-commit-config.yaml` (this will run on staged files).
@@ -32,6 +30,12 @@ then re-run the command to ensure it passes. Common issues include:
 - Trailing whitespace
 - Missing newlines at end of files
 
+## Git Best Practices
+
+- Prefer specific `git add <filename>` instead of `git add .` to avoid accidentally staging unintended files
+- Be especially careful with `git reset --hard` after staging files, as it will remove accidentally staged files
+- When remote has new changes, use `git fetch upstream && git rebase upstream/<branch>` on the same branch
+
 ## Repository Structure
 Backend:
 - Located in the `openhands` directory

.openhands/pre-commit.sh

@@ -1,56 +1,158 @@
 #!/bin/bash
 
 echo "Running OpenHands pre-commit hook..."
+echo "This hook runs selective linting based on changed files."
 
 # Store the exit code to return at the end
 # This allows us to be additive to existing pre-commit hooks
 EXIT_CODE=0
 
-# Check if frontend directory has changed
-frontend_changes=$(git diff --cached --name-only | grep "^frontend/")
-if [ -n "$frontend_changes" ]; then
-    echo "Frontend changes detected. Running frontend checks..."
+# Get the list of staged files
+STAGED_FILES=$(git diff --cached --name-only)
 
-    # Check if frontend directory exists
-    if [ -d "frontend" ]; then
-        # Change to frontend directory
-        cd frontend || exit 1
+# Check if any files match specific patterns
+has_frontend_changes=false
+has_backend_changes=false
+has_vscode_changes=false
 
-        # Run lint:fix
-        echo "Running npm lint:fix..."
-        npm run lint:fix
+# Check each file individually to avoid issues with grep
+for file in $STAGED_FILES; do
+    if [[ $file == frontend/* ]]; then
+        has_frontend_changes=true
+    elif [[ $file == openhands/* || $file == evaluation/* || $file == tests/* ]]; then
+        has_backend_changes=true
+        # Check for VSCode extension changes (subset of backend changes)
+        if [[ $file == openhands/integrations/vscode/* ]]; then
+            has_vscode_changes=true
+        fi
+    fi
+done
+
+echo "Analyzing changes..."
+echo "- Frontend changes: $has_frontend_changes"
+echo "- Backend changes: $has_backend_changes"
+echo "- VSCode extension changes: $has_vscode_changes"
+
+# Run frontend linting if needed
+if [ "$has_frontend_changes" = true ]; then
+    # Check if we're in a CI environment or if frontend dependencies are missing
+    if [ -n "$CI" ] || ! command -v react-router &> /dev/null || ! command -v vitest &> /dev/null; then
+        echo "Skipping frontend checks (CI environment or missing dependencies detected)."
+        echo "WARNING: Frontend files have changed but frontend checks are being skipped."
+        echo "Please run 'make lint-frontend' manually before submitting your PR."
+    else
+        echo "Running frontend linting..."
+        make lint-frontend
         if [ $? -ne 0 ]; then
             echo "Frontend linting failed. Please fix the issues before committing."
             EXIT_CODE=1
+        else
+            echo "Frontend linting checks passed!"
         fi
 
-        # Run build
-        echo "Running npm build..."
-        npm run build
-        if [ $? -ne 0 ]; then
-            echo "Frontend build failed. Please fix the issues before committing."
-            EXIT_CODE=1
-        fi
+        # Run additional frontend checks
+        if [ -d "frontend" ]; then
+            echo "Running additional frontend checks..."
+            cd frontend || exit 1
 
-        # Run tests
-        echo "Running npm test..."
-        npm test
-        if [ $? -ne 0 ]; then
-            echo "Frontend tests failed. Please fix the failing tests before committing."
-            EXIT_CODE=1
-        fi
+            # Run build
+            echo "Running npm build..."
+            npm run build
+            if [ $? -ne 0 ]; then
+                echo "Frontend build failed. Please fix the issues before committing."
+                EXIT_CODE=1
+            fi
 
-        # Return to the original directory
-        cd ..
+            # Run tests
+            echo "Running npm test..."
+            npm test
+            if [ $? -ne 0 ]; then
+                echo "Frontend tests failed. Please fix the failing tests before committing."
+                EXIT_CODE=1
+            fi
 
-        if [ $EXIT_CODE -eq 0 ]; then
-            echo "Frontend checks passed!"
+            cd ..
         fi
-    else
-        echo "Frontend directory not found. Skipping frontend checks."
     fi
 else
-    echo "No frontend changes detected. Skipping frontend checks."
+    echo "Skipping frontend checks (no frontend changes detected)."
+fi
+
+# Run backend linting if needed
+if [ "$has_backend_changes" = true ]; then
+    echo "Running backend linting..."
+    make lint-backend
+    if [ $? -ne 0 ]; then
+        echo "Backend linting failed. Please fix the issues before committing."
+        EXIT_CODE=1
+    else
+        echo "Backend linting checks passed!"
+    fi
+else
+    echo "Skipping backend checks (no backend changes detected)."
+fi
+
+# Run VSCode extension checks if needed
+if [ "$has_vscode_changes" = true ]; then
+    # Check if we're in a CI environment
+    if [ -n "$CI" ]; then
+        echo "Skipping VSCode extension checks (CI environment detected)."
+        echo "WARNING: VSCode extension files have changed but checks are being skipped."
+        echo "Please run VSCode extension checks manually before submitting your PR."
+    else
+        echo "Running VSCode extension checks..."
+        if [ -d "openhands/integrations/vscode" ]; then
+            cd openhands/integrations/vscode || exit 1
+
+            echo "Running npm lint:fix..."
+            npm run lint:fix
+            if [ $? -ne 0 ]; then
+                echo "VSCode extension linting failed. Please fix the issues before committing."
+                EXIT_CODE=1
+            else
+                echo "VSCode extension linting passed!"
+            fi
+
+            echo "Running npm typecheck..."
+            npm run typecheck
+            if [ $? -ne 0 ]; then
+                echo "VSCode extension type checking failed. Please fix the issues before committing."
+                EXIT_CODE=1
+            else
+                echo "VSCode extension type checking passed!"
+            fi
+
+            echo "Running npm compile..."
+            npm run compile
+            if [ $? -ne 0 ]; then
+                echo "VSCode extension compilation failed. Please fix the issues before committing."
+                EXIT_CODE=1
+            else
+                echo "VSCode extension compilation passed!"
+            fi
+
+            cd ../../..
+        fi
+    fi
+else
+    echo "Skipping VSCode extension checks (no VSCode extension changes detected)."
+fi
+
+# If no specific code changes detected, run basic checks
+if [ "$has_frontend_changes" = false ] && [ "$has_backend_changes" = false ]; then
+    echo "No specific code changes detected. Running basic checks..."
+    if [ -n "$STAGED_FILES" ]; then
+        # Run only basic pre-commit hooks for non-code files
+        poetry run pre-commit run --files $(echo "$STAGED_FILES" | tr '\n' ' ') --hook-stage commit --config ./dev_config/python/.pre-commit-config.yaml
+        if [ $? -ne 0 ]; then
+            echo "Basic checks failed. Please fix the issues before committing."
+            EXIT_CODE=1
+        else
+            echo "Basic checks passed!"
+        fi
+    else
+        echo "No files changed. Skipping basic checks."
+    fi
 fi
 
 # Run any existing pre-commit hooks that might have been installed by the user

Development.md

@@ -34,7 +34,7 @@ _Dev Container: Reopen in Container_ command from the Command Palette
 
 #### Develop without sudo access
 
-If you want to develop without system admin/sudo access to upgrade/install `Python` and/or `NodeJs`, you can use
+If you want to develop without system admin/sudo access to upgrade/install `Python` and/or `NodeJS`, you can use
 `conda` or `mamba` to manage the packages for you:
 
 ```bash
@@ -71,7 +71,7 @@ This command will prompt you to enter the LLM API key, model name, and other var
 tailored to your specific needs. Note that the model name will apply only when you run headless. If you use the UI,
 please set the model in the UI.
 
-Note: If you have previously run OpenHands using the docker command, you may have already set some environmental
+Note: If you have previously run OpenHands using the docker command, you may have already set some environment
 variables in your terminal. The final configurations are set from highest to lowest priority:
 Environment variables > config.toml variables > default variables
 
@@ -154,12 +154,12 @@ poetry run pytest ./tests/unit/test_*.py
 1. Add your dependency in `pyproject.toml` or use `poetry add xxx`.
 2. Update the poetry.lock file via `poetry lock --no-update`.
 
-### 9. Use existing Docker image
+### 10. Use existing Docker image
 
 To reduce build time (e.g., if no changes were made to the client-runtime component), you can use an existing Docker
 container image by setting the SANDBOX_RUNTIME_CONTAINER_IMAGE environment variable to the desired Docker image.
 
-Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.49-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.51-nikolaik`
 
 ## Develop inside Docker container
 

Makefile

@@ -3,10 +3,10 @@ SHELL=/usr/bin/env bash
 
 # Variables
 BACKEND_HOST ?= "127.0.0.1"
-BACKEND_PORT = 3000
+BACKEND_PORT ?= 3000
 BACKEND_HOST_PORT = "$(BACKEND_HOST):$(BACKEND_PORT)"
 FRONTEND_HOST ?= "127.0.0.1"
-FRONTEND_PORT = 3001
+FRONTEND_PORT ?= 3001
 DEFAULT_WORKSPACE_DIR = "./workspace"
 DEFAULT_MODEL = "gpt-4o"
 CONFIG_FILE = config.toml
@@ -174,7 +174,7 @@ install-python-dependencies:
 	fi
 	@echo "$(GREEN)Python dependencies installed successfully.$(RESET)"
 
-install-frontend-dependencies:
+install-frontend-dependencies: check-npm check-nodejs
 	@echo "$(YELLOW)Setting up frontend environment...$(RESET)"
 	@echo "$(YELLOW)Detect Node.js version...$(RESET)"
 	@cd frontend && node ./scripts/detect-node-version.js
@@ -182,17 +182,17 @@ install-frontend-dependencies:
 	@cd frontend && npm install
 	@echo "$(GREEN)Frontend dependencies installed successfully.$(RESET)"
 
-install-pre-commit-hooks:
+install-pre-commit-hooks: check-python check-poetry install-python-dependencies
 	@echo "$(YELLOW)Installing pre-commit hooks...$(RESET)"
 	@git config --unset-all core.hooksPath || true
 	@poetry run pre-commit install --config $(PRE_COMMIT_CONFIG_PATH)
 	@echo "$(GREEN)Pre-commit hooks installed successfully.$(RESET)"
 
-lint-backend:
+lint-backend: install-pre-commit-hooks
 	@echo "$(YELLOW)Running linters...$(RESET)"
 	@poetry run pre-commit run --all-files --show-diff-on-failure --config $(PRE_COMMIT_CONFIG_PATH)
 
-lint-frontend:
+lint-frontend: install-frontend-dependencies
 	@echo "$(YELLOW)Running linters for frontend...$(RESET)"
 	@cd frontend && npm run lint
 

README.md

@@ -62,17 +62,17 @@ system requirements and more information.
 
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e LOG_ALL_EVENTS=true \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v ~/.openhands:/.openhands \
     -p 3000:3000 \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.51
 ```
 
 > **Note**: If you used OpenHands before version 0.44, you may want to run `mv ~/.openhands-state ~/.openhands` to migrate your conversation history to the new location.

README_CN.md

@@ -51,17 +51,17 @@ OpenHands也可以使用Docker在本地系统上运行。
 
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e LOG_ALL_EVENTS=true \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v ~/.openhands:/.openhands \
     -p 3000:3000 \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.51
 ```
 
 > **注意**: 如果您在0.44版本之前使用过OpenHands，您可能需要运行 `mv ~/.openhands-state ~/.openhands` 来将对话历史迁移到新位置。

README_JA.md

@@ -42,17 +42,17 @@ OpenHandsはDockerを利用してローカル環境でも実行できます。
 > 公共ネットワークで実行していますか？[Hardened Docker Installation Guide](https://docs.all-hands.dev/usage/runtimes/docker#hardened-docker-installation)を参照して、ネットワークバインディングの制限や追加のセキュリティ対策を実施してください。
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e LOG_ALL_EVENTS=true \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v ~/.openhands:/.openhands \
     -p 3000:3000 \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.51
 ```
 
 **注**: バージョン0.44以前のOpenHandsを使用していた場合は、会話履歴を移行するために `mv ~/.openhands-state ~/.openhands` を実行してください。

containers/app/Dockerfile

@@ -58,8 +58,8 @@ RUN sed -i 's/^UID_MIN.*/UID_MIN 499/' /etc/login.defs
 # Default is 60000, but we've seen up to 200000
 RUN sed -i 's/^UID_MAX.*/UID_MAX 1000000/' /etc/login.defs
 
-RUN groupadd app
-RUN useradd -l -m -u $OPENHANDS_USER_ID -s /bin/bash openhands && \
+RUN groupadd --gid $OPENHANDS_USER_ID app
+RUN useradd -l -m -u $OPENHANDS_USER_ID --gid $OPENHANDS_USER_ID -s /bin/bash openhands && \
     usermod -aG app openhands && \
     usermod -aG sudo openhands && \
     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

containers/app/entrypoint.sh

@@ -23,6 +23,18 @@ if [ -z "$WORKSPACE_MOUNT_PATH" ]; then
   unset WORKSPACE_BASE
 fi
 
+if [[ "$INSTALL_THIRD_PARTY_RUNTIMES" == "true" ]]; then
+  echo "Downloading and installing third_party_runtimes..."
+  echo "Warning: Third-party runtimes are provided as-is, not actively supported and may be removed in future releases."
+
+  if pip install 'openhands-ai[third_party_runtimes]' -qqq 2> >(tee /dev/stderr); then
+    echo "third_party_runtimes installed successfully."
+  else
+    echo "Failed to install third_party_runtimes." >&2
+    exit 1
+  fi
+fi
+
 if [[ "$SANDBOX_USER_ID" -eq 0 ]]; then
   echo "Running OpenHands as root"
   export RUN_AS_OPENHANDS=false

containers/dev/compose.yml

@@ -12,7 +12,7 @@ services:
       - SANDBOX_API_HOSTNAME=host.docker.internal
       - DOCKER_HOST_ADDR=host.docker.internal
       #
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.49-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.51-nikolaik}
       - SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
       - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
     ports:

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     image: openhands:latest
     container_name: openhands-app-${DATE:-}
     environment:
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik}
       #- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234} # enable this only if you want a specific non-root sandbox user but you will have to manually adjust permissions of ~/.openhands for this user
       - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
     ports:

docs/docs.json

@@ -37,7 +37,16 @@
                   "usage/cloud/bitbucket-installation",
                   "usage/cloud/github-installation",
                   "usage/cloud/gitlab-installation",
-                  "usage/cloud/slack-installation"
+                  "usage/cloud/slack-installation",
+                  {
+                    "group": "Project Management Tools",
+                    "pages": [
+                      "usage/cloud/project-management/overview",
+                      "usage/cloud/project-management/jira-integration",
+                      "usage/cloud/project-management/jira-dc-integration",
+                      "usage/cloud/project-management/linear-integration"
+                    ]
+                  }
                 ]
               },
               "usage/cloud/cloud-ui",

docs/usage/cloud/bitbucket-installation.mdx

@@ -8,6 +8,29 @@ description: This guide walks you through the process of installing OpenHands Cl
 
 - Signed in to [OpenHands Cloud](https://app.all-hands.dev) with [a Bitbucket account](/usage/cloud/openhands-cloud).
 
+## IP Whitelisting
+
+If your Bitbucket Cloud instance has IP restrictions, you'll need to whitelist the following IP addresses to allow OpenHands to access your repositories:
+
+### Core App IP
+```
+34.68.58.200
+```
+
+### Runtime IPs
+```
+34.10.175.217
+34.136.162.246
+34.45.0.142
+34.28.69.126
+35.224.240.213
+34.70.174.52
+34.42.4.87
+35.222.133.153
+34.29.175.97
+34.60.55.59
+```
+
 ## Adding Bitbucket Repository Access
 
 Upon signing into OpenHands Cloud with a Bitbucket account, OpenHands will have access to your repositories.

docs/usage/cloud/project-management/jira-dc-integration.mdx

@@ -0,0 +1,118 @@
+---
+title: Jira Data Center Integration (Beta)
+description: Complete guide for setting up Jira Data Center integration with OpenHands Cloud, including service account creation, personal access token generation, webhook configuration, and workspace integration setup.
+---
+
+# Jira Data Center Integration
+
+## Platform Configuration
+
+### Step 1: Create Service Account
+
+1. **Access User Management**
+   - Log in to Jira Data Center as administrator
+   - Go to **Administration** > **User Management**
+
+2. **Create User**
+   - Click **Create User**
+   - Username: `openhands-agent`
+   - Full Name: `OpenHands Agent`
+   - Email: `openhands@yourcompany.com` (replace with your preferred service account email)
+   - Password: Set a secure password
+   - Click **Create**
+
+3. **Assign Permissions**
+   - Add user to appropriate groups
+   - Ensure access to relevant projects
+   - Grant necessary project permissions
+
+### Step 2: Generate API Token
+
+1. **Personal Access Tokens**
+   - Log in as the service account
+   - Go to **Profile** > **Personal Access Tokens**
+   - Click **Create token**
+   - Name: `OpenHands Cloud Integration`
+   - Expiry: Set appropriate expiration (recommend 1 year)
+   - Click **Create**
+   - **Important**: Copy and store the token securely
+
+### Step 3: Configure Webhook
+
+1. **Create Webhook**
+   - Go to **Administration** > **System** > **WebHooks**
+   - Click **Create a WebHook**
+   - **Name**: `OpenHands Cloud Integration`
+   - **URL**: `https://app.all-hands.dev/integration/jira-dc/events`
+   - Set a suitable webhook secret
+   - **Issue related events**: Select the following:
+     - Issue updated
+     - Comment created
+   - **JQL Filter**: Leave empty (or customize as needed)
+   - Click **Create**
+   - **Important**: Copy and store the webhook secret securely (you'll need this for workspace integration)
+
+---
+
+## Workspace Integration
+
+### Step 1: Log in to OpenHands Cloud
+
+1. **Navigate and Authenticate**
+   - Go to [OpenHands Cloud](https://app.all-hands.dev/)
+   - Sign in with your Git provider (GitHub, GitLab, or BitBucket)
+   - **Important:** Make sure you're signing in with the same Git provider account that contains the repositories you want the OpenHands agent to work on.
+
+### Step 2: Configure Jira Data Center Integration
+
+1. **Access Integration Settings**
+   - Navigate to **Settings** > **Integrations**
+   - Locate **Jira Data Center** section
+
+2. **Configure Workspace**
+   - Click **Configure** button
+   - Enter your workspace name and click **Connect**
+      - If no integration exists, you'll be prompted to enter additional credentials required for the workspace integration:
+         - **Webhook Secret**: The webhook secret from Step 3 above
+         - **Service Account Email**: The service account email from Step 1 above
+         - **Service Account API Key**: The personal access token from Step 2 above
+         - Ensure **Active** toggle is enabled
+
+3. **Complete OAuth Flow**
+   - You'll be redirected to Jira Data Center to complete OAuth verification
+   - Grant the necessary permissions to verify your workspace access. If you have access to multiple workspaces, select the correct one that you initially provided
+   - If successful, you will be redirected back to the **Integrations** settings in the OpenHands Cloud UI
+
+### Managing Your Integration
+
+**Edit Configuration:**
+- Click the **Edit** button next to your configured platform
+- Update any necessary credentials or settings
+- Click **Update** to apply changes
+- You will need to repeat the OAuth flow as before
+- **Important:** Only the original user who created the integration can see the edit view
+
+**Unlink Workspace:**
+- In the edit view, click **Unlink** next to the workspace name
+- This will deactivate your workspace link
+- **Important:** If the original user who configured the integration chooses to unlink their integration, any users currently linked to that integration will also be unlinked, and the workspace integration will be deactivated. The integration can only be reactivated by the original user.
+
+### Screenshots
+
+<AccordionGroup>
+<Accordion title="Workspace link flow">
+![workspace-link.png](/static/img/workspace-link.png)
+</Accordion>
+
+<Accordion title="Workspace Configure flow">
+![workspace-link.png](/static/img/workspace-configure.png)
+</Accordion>
+
+<Accordion title="Edit view as a user">
+![workspace-link.png](/static/img/workspace-user-edit.png)
+</Accordion>
+
+<Accordion title="Edit view as the workspace creator">
+![workspace-link.png](/static/img/workspace-admin-edit.png)
+</Accordion>
+</AccordionGroup>

docs/usage/cloud/project-management/jira-integration.mdx

@@ -0,0 +1,123 @@
+---
+title: Jira Cloud Integration
+description: Complete guide for setting up Jira Cloud integration with OpenHands Cloud, including service account creation, API token generation, webhook configuration, and workspace integration setup.
+---
+
+# Jira Cloud Integration
+
+## Platform Configuration
+
+### Step 1: Create Service Account
+
+1. **Navigate to User Management**
+   - Go to [Atlassian Admin](https://admin.atlassian.com/)
+   - Select your organization
+   - Go to **Directory** > **Users**
+
+2. **Create OpenHands Service Account**
+   - Click **Add user**
+   - Email: `openhands@yourcompany.com` (replace with your preferred service account email)
+   - Display name: `OpenHands Agent`
+   - Send invitation: **No** (you'll set password manually)
+   - Click **Add user**
+
+3. **Configure Account**
+   - Locate the created user and click on it
+   - Set a secure password
+   - Add to relevant Jira projects with appropriate permissions
+
+### Step 2: Generate API Token
+
+1. **Access API Token Management**
+   - Log in as the OpenHands service account
+   - Go to [API Tokens](https://id.atlassian.com/manage-profile/security/api-tokens)
+
+2. **Create API Token**
+   - Click **Create API token**
+   - Label: `OpenHands Cloud Integration`
+   - Expiry: Set appropriate expiration (recommend 1 year)
+   - Click **Create**
+   - **Important**: Copy and securely store the token immediately
+
+### Step 3: Configure Webhook
+
+1. **Navigate to Webhook Settings**
+   - Go to **Jira Settings** > **System** > **WebHooks**
+   - Click **Create a WebHook**
+
+2. **Configure Webhook**
+   - **Name**: `OpenHands Cloud Integration`
+   - **Status**: Enabled
+   - **URL**: `https://app.all-hands.dev/integration/jira/events`
+   - **Issue related events**: Select the following:
+     - Issue updated
+     - Comment created
+   - **JQL Filter**: Leave empty (or customize as needed)
+   - Click **Create**
+   - **Important**: Copy and store the webhook secret securely (you'll need this for workspace integration)
+
+---
+
+## Workspace Integration
+
+### Step 1: Log in to OpenHands Cloud
+
+1. **Navigate and Authenticate**
+   - Go to [OpenHands Cloud](https://app.all-hands.dev/)
+   - Sign in with your Git provider (GitHub, GitLab, or BitBucket)
+   - **Important:** Make sure you're signing in with the same Git provider account that contains the repositories you want the OpenHands agent to work on.
+
+### Step 2: Configure Jira Integration
+
+1. **Access Integration Settings**
+   - Navigate to **Settings** > **Integrations**
+   - Locate **Jira Cloud** section
+
+2. **Configure Workspace**
+   - Click **Configure** button
+   - Enter your workspace name and click **Connect**
+   - **Important:** Make sure you enter the full workspace name, eg: **yourcompany.atlassian.net**
+      - If no integration exists, you'll be prompted to enter additional credentials required for the workspace integration:
+         - **Webhook Secret**: The webhook secret from Step 3 above
+         - **Service Account Email**: The service account email from Step 1 above
+         - **Service Account API Key**: The API token from Step 2 above
+         - Ensure **Active** toggle is enabled
+
+3. **Complete OAuth Flow**
+   - You'll be redirected to Jira Cloud to complete OAuth verification
+   - Grant the necessary permissions to verify your workspace access.
+   - If successful, you will be redirected back to the **Integrations** settings in the OpenHands Cloud UI
+
+### Managing Your Integration
+
+**Edit Configuration:**
+- Click the **Edit** button next to your configured platform
+- Update any necessary credentials or settings
+- Click **Update** to apply changes
+- You will need to repeat the OAuth flow as before
+- **Important:** Only the original user who created the integration can see the edit view
+
+**Unlink Workspace:**
+- In the edit view, click **Unlink** next to the workspace name
+- This will deactivate your workspace link
+- **Important:** If the original user who configured the integration chooses to unlink their integration, any users currently linked to that workspace integration will also be unlinked, and the workspace integration will be deactivated. The integration can only be reactivated by the original user.
+
+### Screenshots
+
+<AccordionGroup>
+<Accordion title="Workspace link flow">
+![workspace-link.png](/static/img/workspace-link.png)
+</Accordion>
+
+<Accordion title="Workspace Configure flow">
+![workspace-link.png](/static/img/workspace-configure.png)
+</Accordion>
+
+<Accordion title="Edit view as a user">
+![workspace-link.png](/static/img/workspace-user-edit.png)
+</Accordion>
+
+<Accordion title="Edit view as the workspace creator">
+![workspace-link.png](/static/img/workspace-admin-edit.png)
+</Accordion>
+</AccordionGroup>

docs/usage/cloud/project-management/linear-integration.mdx

@@ -0,0 +1,122 @@
+---
+title: Linear Integration
+description: Complete guide for setting up Linear integration with OpenHands Cloud, including service account creation, API key generation, webhook configuration, and workspace integration setup.
+---
+
+# Linear Integration
+
+## Platform Configuration
+
+### Step 1: Create Service Account
+
+1. **Access Team Settings**
+   - Log in to Linear as a team admin
+   - Go to **Settings** > **Members**
+
+2. **Invite Service Account**
+   - Click **Invite members**
+   - Email: `openhands@yourcompany.com` (replace with your preferred service account email)
+   - Role: **Member** (with appropriate team access)
+   - Send invitation
+
+3. **Complete Setup**
+   - Accept invitation from the service account email
+   - Complete profile setup
+   - Ensure access to relevant teams/workspaces
+
+### Step 2: Generate API Key
+
+1. **Access API Settings**
+   - Log in as the service account
+   - Go to **Settings** > **API**
+
+2. **Create Personal API Key**
+   - Click **Create new key**
+   - Name: `OpenHands Cloud Integration`
+   - Scopes: Select the following:
+     - `Read` - Read access to issues and comments
+     - `Create comments` - Ability to create or update comments
+   - Select the teams you want to provide access to, or allow access for all teams you have permissions for
+   - Click **Create**
+   - **Important**: Copy and store the API key securely
+
+### Step 3: Configure Webhook
+
+1. **Access Webhook Settings**
+   - Go to **Settings** > **API** > **Webhooks**
+   - Click **New webhook**
+
+2. **Configure Webhook**
+   - **Label**: `OpenHands Cloud Integration`
+   - **URL**: `https://app.all-hands.dev/integration/linear/events`
+   - **Resource types**: Select:
+     - `Comment` - For comment events
+     - `Issue` - For issue updates (label changes)
+   - Select the teams you want to provide access to, or allow access for all public teams
+   - Click **Create webhook**
+   - **Important**: Copy and store the webhook secret securely (you'll need this for workspace integration)
+
+---
+
+## Workspace Integration
+
+### Step 1: Log in to OpenHands Cloud
+
+1. **Navigate and Authenticate**
+   - Go to [OpenHands Cloud](https://app.all-hands.dev/)
+   - Sign in with your Git provider (GitHub, GitLab, or BitBucket)
+   - **Important:** Make sure you're signing in with the same Git provider account that contains the repositories you want the OpenHands agent to work on.
+
+### Step 2: Configure Linear Integration
+
+1. **Access Integration Settings**
+   - Navigate to **Settings** > **Integrations**
+   - Locate **Linear** section
+
+2. **Configure Workspace**
+   - Click **Configure** button
+   - Enter your workspace name and click **Connect**
+      - If no integration exists, you'll be prompted to enter additional credentials required for the workspace integration:
+         - **Webhook Secret**: The webhook secret from Step 3 above
+         - **Service Account Email**: The service account email from Step 1 above
+         - **Service Account API Key**: The API key from Step 2 above
+         - Ensure **Active** toggle is enabled
+
+3. **Complete OAuth Flow**
+   - You'll be redirected to Linear to complete OAuth verification
+   - Grant the necessary permissions to verify your workspace access. If you have access to multiple workspaces, select the correct one that you initially provided
+   - If successful, you will be redirected back to the **Integrations** settings in the OpenHands Cloud UI
+
+### Managing Your Integration
+
+**Edit Configuration:**
+- Click the **Edit** button next to your configured platform
+- Update any necessary credentials or settings
+- Click **Update** to apply changes
+- You will need to repeat the OAuth flow as before
+- **Important:** Only the original user who created the integration can see the edit view
+
+**Unlink Workspace:**
+- In the edit view, click **Unlink** next to the workspace name
+- This will deactivate your workspace link
+- **Important:** If the original user who configured the integration chooses to unlink their integration, any users currently linked to that integration will also be unlinked, and the workspace integration will be deactivated. The integration can only be reactivated by the original user.
+
+### Screenshots
+
+<AccordionGroup>
+<Accordion title="Workspace link flow">
+![workspace-link.png](/static/img/workspace-link.png)
+</Accordion>
+
+<Accordion title="Workspace Configure flow">
+![workspace-link.png](/static/img/workspace-configure.png)
+</Accordion>
+
+<Accordion title="Edit view as a user">
+![workspace-link.png](/static/img/workspace-user-edit.png)
+</Accordion>
+
+<Accordion title="Edit view as the workspace creator">
+![workspace-link.png](/static/img/workspace-admin-edit.png)
+</Accordion>
+</AccordionGroup>

docs/usage/cloud/project-management/overview.mdx

@@ -0,0 +1,79 @@
+---
+title: Project Management Tool Integrations
+description: Overview of OpenHands Cloud integrations with project management platforms including Jira Cloud, Jira Data Center, and Linear. Learn about setup requirements, usage methods, and troubleshooting.
+---
+
+# Project Management Tool Integrations
+
+## Overview
+
+OpenHands Cloud integrates with project management platforms (Jira Cloud, Jira Data Center, and Linear) to enable AI-powered task delegation. Users can invoke the OpenHands agent by:
+- Adding `@openhands` in ticket comments
+- Adding the `openhands` label to tickets
+
+## Prerequisites
+
+Integration requires two levels of setup:
+1. **Platform Configuration** - Administrative setup of service accounts and webhooks on your project management platform (see individual platform documentation below)
+2. **Workspace Integration** - Self-service configuration through the OpenHands Cloud UI to link your OpenHands account to the target workspace
+
+### Platform-Specific Setup Guides:
+- [Jira Cloud Integration](./jira-integration.md)
+- [Jira Data Center Integration](./jira-dc-integration.md)
+- [Linear Integration](./linear-integration.md)
+
+## Usage
+
+Once both the platform configuration and workspace integration are completed, users can trigger the OpenHands agent within their project management platforms using two methods:
+
+### Method 1: Comment Mention
+Add a comment to any issue with `@openhands` followed by your task description:
+```
+@openhands Please implement the user authentication feature described in this ticket
+```
+
+### Method 2: Label-based Delegation
+Add the label `openhands` to any issue. The OpenHands agent will automatically process the issue based on its description and requirements.
+
+### Git Repository Detection
+
+The OpenHands agent needs to identify which Git repository to work with when processing your issues. Here's how to ensure proper repository detection:
+
+#### Specifying the Target Repository
+
+**Required:** Include the target Git repository in your issue description or comment to ensure the agent works with the correct codebase.
+
+**Supported Repository Formats:**
+- Full HTTPS URL: `https://github.com/owner/repository.git`
+- GitHub URL without .git: `https://github.com/owner/repository`
+- Owner/repository format: `owner/repository`
+
+#### Platform-Specific Behavior
+
+**Linear Integration:** When GitHub integration is enabled for your Linear workspace with issue sync activated, the target repository is automatically detected from the linked GitHub issue. Manual specification is not required in this configuration.
+
+**Jira Integrations:** Always include the repository information in your issue description or `@openhands` comment to ensure proper repository detection.
+
+## Troubleshooting
+
+### Platform Configuration Issues
+- **Webhook not triggering**: Verify the webhook URL is correct and the proper event types are selected (Comment, Issue updated)
+- **API authentication failing**: Check API key/token validity and ensure required scopes are granted
+- **Permission errors**: Ensure the service account has access to relevant projects/teams and appropriate permissions
+
+### Workspace Integration Issues
+- **Workspace linking requests credentials**: If there are no active workspace integrations for the workspace you specified, you need to configure it first. Contact your platform administrator that you want to integrate with (eg: Jira, Linear)
+- **OAuth flow fails**: Ensure you're signing in with the same Git provider account that contains the repositories you want OpenHands to work on
+- **Integration not found**: Verify the workspace name matches exactly and that platform configuration was completed first
+
+### General Issues
+- **Agent not responding**: Check webhook logs in your platform settings and verify service account status
+- **Authentication errors**: Verify Git provider permissions and OpenHands Cloud access
+- **Partial functionality**: Ensure both platform configuration and workspace integration are properly completed
+
+### Getting Help
+For additional support, contact OpenHands Cloud support with:
+- Your integration platform (Linear, Jira Cloud, or Jira Data Center)
+- Workspace name
+- Error logs from webhook/integration attempts
+- Screenshots of configuration settings (without sensitive credentials)

docs/usage/cloud/slack-installation.mdx

@@ -12,6 +12,10 @@ description: This guide walks you through installing the OpenHands Slack app.
   allowFullScreen>
 </iframe>
 
+<Info>
+OpenHands utilizes a large language model (LLM), which may generate responses that are inaccurate or incomplete. While we strive for accuracy, OpenHands' outputs are not guaranteed to be correct, and we encourage users to validate critical information independently.
+</Info>
+
 ## Prerequisites
 
 - Access to OpenHands Cloud.
@@ -24,7 +28,7 @@ description: This guide walks you through installing the OpenHands Slack app.
   **This step is for Slack admins/owners**
 
   1. Make sure you have permissions to install Apps to your workspace.
-  2. Click the button below to install OpenHands Slack App <a target="_blank" href="https://slack.com/oauth/v2/authorize?client_id=7477886716822.8729519890534&scope=app_mentions:read,chat:write,users:read,channels:history,groups:history,mpim:history,im:history&user_scope=channels:history,groups:history,im:history,mpim:history"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcSet="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" /></a>
+  2. Click the button below to install OpenHands Slack App <a target="_blank" href="https://slack.com/oauth/v2/authorize?client_id=7477886716822.8729519890534&scope=app_mentions:read,channels:history,chat:write,groups:history,im:history,mpim:history,users:read&user_scope="><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcSet="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" /></a>
   3. In the top right corner, select the workspace to install the OpenHands Slack app.
   4. Review permissions and click allow.
 

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

@@ -20,7 +20,7 @@ for scripting.
 
 ### Running with Python
 
-**Note** - OpenHands requires Python version 3.12 or higher (Python 3.14 is not currently supported)
+**Note** - OpenHands requires Python version 3.12 or higher (Python 3.14 is not currently supported) and `uvx` for the default `fetch` MCP server (more details below).
 
 1. Install OpenHands using pip:
 ```bash
@@ -103,7 +103,7 @@ The conversation history will be saved in `~/.openhands/sessions`.
 ```bash
 docker run -it \
     --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e SANDBOX_USER_ID=$(id -u) \
     -e SANDBOX_VOLUMES=$SANDBOX_VOLUMES \
     -e LLM_API_KEY=$LLM_API_KEY \
@@ -112,7 +112,7 @@ docker run -it \
     -v ~/.openhands:/.openhands \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app-$(date +%Y%m%d%H%M%S) \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.51 \
     python -m openhands.cli.main --override-cli-mode true
 ```
 
@@ -153,6 +153,7 @@ You can use the following commands whenever the prompt (`>`) is displayed:
 | `/new`       | Start a new conversation                                       |
 | `/settings`  | View and modify current LLM/agent settings                     |
 | `/resume`    | Resume the agent if paused                                     |
+| `/mcp`       | Manage MCP server configuration and view connection errors    |
 
 #### Settings and Configuration
 
@@ -162,7 +163,7 @@ follow the prompts:
 - **Basic settings**: Choose a model/provider and enter your API key.
 - **Advanced settings**: Set custom endpoints, enable or disable confirmation mode, and configure memory condensation.
 
-Settings can also be managed via the `config.toml` file.
+Settings can also be managed via the `config.toml` file in the current directory or `~/.openhands/config.toml`.
 
 #### Repository Initialization
 
@@ -174,6 +175,41 @@ project details and structure. Use this when onboarding the agent to a new codeb
 You can pause the agent while it is running by pressing `Ctrl-P`. To continue the conversation after pausing, simply
 type `/resume` at the prompt.
 
+#### MCP Server Management
+
+To configure Model Context Protocol (MCP) servers, you can refer to the documentation on [MCP servers](../mcp) and use the `/mcp` command in the CLI. This command provides an interactive interface for managing Model Context Protocol (MCP) servers:
+
+- **List configured servers**: View all currently configured MCP servers (SSE, Stdio, and SHTTP)
+- **Add new server**: Interactively add a new MCP server with guided prompts
+- **Remove server**: Remove an existing MCP server from your configuration
+- **View errors**: Display any connection errors that occurred during MCP server startup
+
+This command modifies your `~/.openhands/config.toml` file and will prompt you to restart OpenHands for changes to take effect.
+
+By default, the [Fetch MCP server](https://github.com/modelcontextprotocol/servers/tree/main/src/fetch) will be automatically configured for OpenHands. You can also [enable search engine](../search-engine-setup) via the [Tavily MCP server](https://github.com/tavily-ai/tavily-mcp) by setting the `search_api_key` under the `[core]` section in the `~/.openhands/config.toml` file.
+
+##### Example of the `config.toml` file with MCP server configuration:
+
+```toml
+[core]
+search_api_key = "tvly-your-api-key-here"
+
+[mcp]
+stdio_servers = [
+    {name="fetch", command="uvx", args=["mcp-server-fetch"]},
+]
+
+sse_servers = [
+    # Basic SSE server with just a URL
+    "http://example.com:8080/sse",
+]
+
+shttp_servers = [
+    # Streamable HTTP server with API key authentication
+    {url="https://secure-example.com/mcp", api_key="your-api-key"}
+]
+```
+
 ## Tips and Troubleshooting
 
 - Use `/help` at any time to see the list of available commands.

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

@@ -61,7 +61,7 @@ export GITHUB_TOKEN="your-token"  # Required for repository operations
 # Run OpenHands
 docker run -it \
     --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e SANDBOX_USER_ID=$(id -u) \
     -e SANDBOX_VOLUMES=$SANDBOX_VOLUMES \
     -e LLM_API_KEY=$LLM_API_KEY \
@@ -73,7 +73,7 @@ docker run -it \
     -v ~/.openhands:/.openhands \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app-$(date +%Y%m%d%H%M%S) \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.51 \
     python -m openhands.core.main -t "write a bash script that prints hi"
 ```
 

docs/usage/llms/llms.mdx

@@ -39,6 +39,12 @@ limits and monitor usage.
 - [mistralai/devstral-small](https://www.all-hands.dev/blog/devstral-a-new-state-of-the-art-open-model-for-coding-agents) (20 May 2025) -- also available through [OpenRouter](https://openrouter.ai/mistralai/devstral-small:free)
 - [all-hands/openhands-lm-32b-v0.1](https://www.all-hands.dev/blog/introducing-openhands-lm-32b----a-strong-open-coding-agent-model) (31 March 2025) -- also available through [OpenRouter](https://openrouter.ai/all-hands/openhands-lm-32b-v0.1)
 
+### Known Issues
+
+<Warning>
+As of July 2025, there are known issues with Gemini 2.5 Pro conversations taking longer than normal with OpenHands. We are continuing to investigate.
+</Warning>
+
 <Note>
 Most current local and open source models are not as powerful. When using such models, you may see long
 wait times between messages, poor responses, or errors about malformed JSON. OpenHands can only be as powerful as the

docs/usage/llms/local-llms.mdx

@@ -68,23 +68,23 @@ Download and install the LM Studio desktop app from [lmstudio.ai](https://lmstud
 1. Check [the installation guide](/usage/local-setup) and ensure all prerequisites are met before running OpenHands, then run:
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e LOG_ALL_EVENTS=true \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v ~/.openhands:/.openhands \
     -p 3000:3000 \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.51
 ```
 
 2. Wait until the server is running (see log below):
 ```
 Digest: sha256:e72f9baecb458aedb9afc2cd5bc935118d1868719e55d50da73190d3a85c674f
-Status: Image is up to date for docker.all-hands.dev/all-hands-ai/openhands:0.49
+Status: Image is up to date for docker.all-hands.dev/all-hands-ai/openhands:0.51
 Starting OpenHands...
 Running OpenHands as root
 14:22:13 - openhands:INFO: server_config.py:50 - Using config class None

docs/usage/llms/openhands-llms.mdx

@@ -30,5 +30,6 @@ When running OpenHands, you'll need to set the following in the OpenHands UI thr
 
 ## Pricing
 
-Pricing follows official API provider rates.
-[You can view model prices here.](https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json)
+Pricing follows official API provider rates. [You can view model prices here.](https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json)
+
+For `qwen3-coder-480b`, we charge the cheapest FP8 rate available on openrouter: $0.4 per million input tokens and $1.6 per million output tokens.

docs/usage/local-setup.mdx

@@ -67,17 +67,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.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik \
     -e LOG_ALL_EVENTS=true \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v ~/.openhands:/.openhands \
     -p 3000:3000 \
     --add-host host.docker.internal:host-gateway \
     --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.51
 ```
 
 > **Note**: If you used OpenHands before version 0.44, you may want to run `mv ~/.openhands-state ~/.openhands` to migrate your conversation history to the new location.

docs/usage/mcp.mdx

@@ -10,47 +10,83 @@ Model Context Protocol (MCP) is a mechanism that allows OpenHands to communicate
 servers can provide additional functionality to the agent, such as specialized data processing, external API access,
 or custom tools. MCP is based on the open standard defined at [modelcontextprotocol.io](https://modelcontextprotocol.io).
 
+
+<Note>
+MCP is currently not available on OpenHands Cloud. This feature is only available when running OpenHands locally.
+</Note>
+
+### How MCP Works
+
+When OpenHands starts, it:
+
+1. Reads the MCP configuration.
+2. Connects to any configured SSE and SHTTP servers.
+3. Starts any configured stdio servers.
+4. Registers the tools provided by these servers with the agent.
+
+The agent can then use these tools just like any built-in tool. When the agent calls an MCP tool:
+
+1. OpenHands routes the call to the appropriate MCP server.
+2. The server processes the request and returns a response.
+3. OpenHands converts the response to an observation and presents it to the agent.
+
 ## Configuration
 
 MCP configuration can be defined in:
 * The OpenHands UI through the Settings under the `MCP` tab.
 * The `config.toml` file under the `[mcp]` section if not using the UI.
 
-### Configuration Example via config.toml
+### Configuration Examples
+
+#### Recommended: Using Proxy Servers (SSE/HTTP)
+
+For stdio-based MCP servers, we recommend using MCP proxy tools like [`supergateway`](https://github.com/supercorp-ai/supergateway) instead of direct stdio connections.
+[SuperGateway](https://github.com/supercorp-ai/supergateway) is a popular MCP proxy that converts stdio MCP servers to HTTP/SSE endpoints:
+
+Start the proxy servers separately:
+```bash
+# Terminal 1: Filesystem server proxy
+supergateway --stdio "npx @modelcontextprotocol/server-filesystem /" --port 8080
+
+# Terminal 2: Fetch server proxy
+supergateway --stdio "uvx mcp-server-fetch" --port 8081
+```
+
+Then configure OpenHands to use the HTTP endpoint:
 
 ```toml
 [mcp]
-# SSE Servers - External servers that communicate via Server-Sent Events
+# SSE Servers - Recommended approach using proxy tools
 sse_servers = [
     # Basic SSE server with just a URL
     "http://example.com:8080/mcp",
 
-    # SSE server with API key authentication
-    {url="https://secure-example.com/mcp", api_key="your-api-key"}
+    # SuperGateway proxy for fetch server
+    "http://localhost:8081/sse",
+
+    # External MCP service with authentication
+    {url="https://api.example.com/mcp/sse", api_key="your-api-key"}
 ]
+```
 
-# SHTTP Servers - External servers that communicate via Streamable HTTP
-shttp_servers = [
-    # Basic SHTTP server with just a URL
-    "http://example.com:8080/mcp",
 
-    # SHTTP server with API key authentication
-    {url="https://secure-example.com/mcp", api_key="your-api-key"}
-]
 
-# Stdio Servers - Local processes that communicate via standard input/output
+#### Alternative: Direct Stdio Servers (Not Recommended for Production)
+
+```toml
+[mcp]
+# Direct stdio servers - use only for development/testing
 stdio_servers = [
     # Basic stdio server
     {name="fetch", command="uvx", args=["mcp-server-fetch"]},
 
     # Stdio server with environment variables
     {
-        name="data-processor",
-        command="python",
-        args=["-m", "my_mcp_server"],
+        name="filesystem",
+        command="npx",
+        args=["@modelcontextprotocol/server-filesystem", "/"],
         env={
-            "DEBUG": "true",
-            "PORT": "8080"
+            "DEBUG": "true"
         }
     }
 ]
@@ -84,6 +120,8 @@ SHTTP (Streamable HTTP) servers are configured using either a string URL or an o
 
 ### Stdio Servers
 
+**Note**: While stdio servers are supported, we recommend using MCP proxies (see above) for better reliability and performance.
+
 Stdio servers are configured using an object with the following properties:
 
 - `name` (required)
@@ -104,20 +142,38 @@ Stdio servers are configured using an object with the following properties:
   - Default: `{}`
   - Description: Environment variables to set for the server process
 
-## How MCP Works
 
-When OpenHands starts, it:
+#### When to Use Direct Stdio
 
-1. Reads the MCP configuration.
-2. Connects to any configured SSE and SHTTP servers.
-3. Starts any configured stdio servers.
-4. Registers the tools provided by these servers with the agent.
+Direct stdio connections may still be appropriate in these scenarios:
+- **Development and testing**: Quick prototyping of MCP servers
+- **Simple, single-use tools**: Tools that don't require high reliability or concurrent access
+- **Local-only environments**: When you don't want to manage additional proxy processes
 
-The agent can then use these tools just like any built-in tool. When the agent calls an MCP tool:
+For production use, we recommend using proxy tools like SuperGateway.
 
-1. OpenHands routes the call to the appropriate MCP server.
-2. The server processes the request and returns a response.
-3. OpenHands converts the response to an observation and presents it to the agent.
+### Other Proxy Tools
+
+Other options include:
+
+- **Custom FastAPI/Express servers**: Build your own HTTP wrapper around stdio MCP servers
+- **Docker-based proxies**: Containerized solutions for better isolation
+- **Cloud-hosted MCP services**: Third-party services that provide MCP endpoints
+
+### Troubleshooting MCP Connections
+
+#### Common Issues with Stdio Servers
+- **Process crashes**: Stdio processes may crash without proper error handling
+- **Deadlocks**: Stdio communication can deadlock under high load
+- **Resource leaks**: Zombie processes if not properly managed
+- **Debugging difficulty**: Hard to inspect stdio communication
+
+#### Benefits of Using Proxies
+- **HTTP status codes**: Clear error reporting via standard HTTP responses
+- **Request logging**: Easy to log and monitor HTTP requests
+- **Load balancing**: Can distribute requests across multiple server instances
+- **Health checks**: HTTP endpoints can provide health status
+- **CORS support**: Better integration with web-based tools
 
 ## Transport Protocols
 

evaluation/benchmarks/commit0/run_infer.py

@@ -117,6 +117,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
+        enable_browser=RUN_WITH_BROWSING,
         runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=sandbox_config,
         # do not mount workspace

evaluation/benchmarks/multi_swe_bench/run_infer.py

@@ -345,6 +345,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
+        enable_browser=RUN_WITH_BROWSING,
         runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=sandbox_config,
         # do not mount workspace

evaluation/benchmarks/swe_bench/run_infer.py

@@ -226,6 +226,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
+        enable_browser=RUN_WITH_BROWSING,
         runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=sandbox_config,
         # do not mount workspace

evaluation/benchmarks/swe_bench/run_localize.py

@@ -203,6 +203,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
+        enable_browser=RUN_WITH_BROWSING,
         runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=sandbox_config,
         # do not mount workspace

evaluation/benchmarks/visual_swe_bench/run_infer.py

@@ -164,6 +164,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
+        enable_browser=RUN_WITH_BROWSING,
         runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=sandbox_config,
         # do not mount workspace

frontend/.husky/pre-commit

@@ -8,4 +8,4 @@ npx lint-staged
 # Run backend pre-commit
 echo "Running backend pre-commit..."
 cd ..
-pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --show-diff-on-failure --config ./dev_config/python/.pre-commit-config.yaml
+poetry run pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --show-diff-on-failure --config ./dev_config/python/.pre-commit-config.yaml

frontend/__tests__/components/chat/expandable-message.test.tsx

@@ -120,6 +120,9 @@ describe("ExpandableMessage", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: true,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
     const RouterStub = createRoutesStub([

frontend/__tests__/components/event-message.test.tsx

@@ -28,7 +28,6 @@ describe("EventMessage", () => {
       action: "finish" as const,
       args: {
         final_thought: "Task completed successfully",
-        task_completed: "success" as const,
         outputs: {},
         thought: "Task completed successfully",
       },
@@ -114,7 +113,6 @@ describe("EventMessage", () => {
       action: "finish" as const,
       args: {
         final_thought: "Task completed successfully",
-        task_completed: "success" as const,
         outputs: {},
         thought: "Task completed successfully",
       },

frontend/__tests__/components/features/auth-modal.test.tsx

@@ -19,7 +19,13 @@ describe("AuthModal", () => {
   });
 
   it("should render the GitHub and GitLab buttons", () => {
-    render(<AuthModal githubAuthUrl="mock-url" appMode="saas" />);
+    render(
+      <AuthModal
+        githubAuthUrl="mock-url"
+        appMode="saas"
+        providersConfigured={["github", "gitlab"]}
+      />,
+    );
 
     const githubButton = screen.getByRole("button", {
       name: "GITHUB$CONNECT_TO_GITHUB",
@@ -35,7 +41,13 @@ describe("AuthModal", () => {
   it("should redirect to GitHub auth URL when GitHub button is clicked", async () => {
     const user = userEvent.setup();
     const mockUrl = "https://github.com/login/oauth/authorize";
-    render(<AuthModal githubAuthUrl={mockUrl} appMode="saas" />);
+    render(
+      <AuthModal
+        githubAuthUrl={mockUrl}
+        appMode="saas"
+        providersConfigured={["github"]}
+      />,
+    );
 
     const githubButton = screen.getByRole("button", {
       name: "GITHUB$CONNECT_TO_GITHUB",
@@ -52,7 +64,6 @@ describe("AuthModal", () => {
     const termsSection = screen.getByTestId("auth-modal-terms-of-service");
     expect(termsSection).toBeInTheDocument();
 
-
     // Check that all text content is present in the paragraph
     expect(termsSection).toHaveTextContent(
       "AUTH$BY_SIGNING_UP_YOU_AGREE_TO_OUR",

frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx

@@ -16,8 +16,6 @@ import { ConversationCard } from "#/components/features/conversation-panel/conve
 import { clickOnEditButton } from "./utils";
 
 // We'll use the actual i18next implementation but override the translation function
-import { I18nextProvider } from "react-i18next";
-import i18n from "i18next";
 
 // Mock the t function to return our custom translations
 vi.mock("react-i18next", async () => {
@@ -124,7 +122,8 @@ describe("ConversationCard", () => {
 
   it("should toggle a context menu when clicking the ellipsis button", async () => {
     const user = userEvent.setup();
-    renderWithProviders(
+    const onContextMenuToggle = vi.fn();
+    const { rerender } = renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
         onChangeTitle={onChangeTitle}
@@ -132,6 +131,8 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen={false}
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
@@ -140,15 +141,32 @@ describe("ConversationCard", () => {
     const ellipsisButton = screen.getByTestId("ellipsis-button");
     await user.click(ellipsisButton);
 
+    expect(onContextMenuToggle).toHaveBeenCalledWith(true);
+
+    // Simulate context menu being opened by parent
+    rerender(
+      <ConversationCard
+        onDelete={onDelete}
+        onChangeTitle={onChangeTitle}
+        isActive
+        title="Conversation 1"
+        selectedRepository={null}
+        lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
+      />,
+    );
+
     screen.getByTestId("context-menu");
 
     await user.click(ellipsisButton);
 
-    expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
+    expect(onContextMenuToggle).toHaveBeenCalledWith(false);
   });
 
   it("should call onDelete when the delete button is clicked", async () => {
     const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
@@ -157,18 +175,18 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    const ellipsisButton = screen.getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
     const menu = screen.getByTestId("context-menu");
     const deleteButton = within(menu).getByTestId("delete-button");
 
     await user.click(deleteButton);
 
     expect(onDelete).toHaveBeenCalled();
+    expect(onContextMenuToggle).toHaveBeenCalledWith(false);
   });
 
   test("clicking the selectedRepository should not trigger the onClick handler", async () => {
@@ -198,7 +216,11 @@ describe("ConversationCard", () => {
 
   test("conversation title should call onChangeTitle when changed and blurred", async () => {
     const user = userEvent.setup();
-    renderWithProviders(
+    let menuOpen = true;
+    const onContextMenuToggle = vi.fn((isOpen: boolean) => {
+      menuOpen = isOpen;
+    });
+    const { rerender } = renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
         isActive
@@ -206,10 +228,27 @@ describe("ConversationCard", () => {
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
         onChangeTitle={onChangeTitle}
+        contextMenuOpen={menuOpen}
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
     await clickOnEditButton(user);
+
+    // Re-render with updated state
+    rerender(
+      <ConversationCard
+        onDelete={onDelete}
+        isActive
+        title="Conversation 1"
+        selectedRepository={null}
+        lastUpdatedAt="2021-10-01T12:00:00Z"
+        onChangeTitle={onChangeTitle}
+        contextMenuOpen={menuOpen}
+        onContextMenuToggle={onContextMenuToggle}
+      />,
+    );
+
     const title = screen.getByTestId("conversation-card-title");
 
     expect(title).toBeEnabled();
@@ -227,6 +266,7 @@ describe("ConversationCard", () => {
 
   it("should reset title and not call onChangeTitle when the title is empty", async () => {
     const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
@@ -235,6 +275,8 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
@@ -271,6 +313,7 @@ describe("ConversationCard", () => {
 
   test("clicking the title should not trigger the onClick handler if edit mode", async () => {
     const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
@@ -279,6 +322,8 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
@@ -292,6 +337,7 @@ describe("ConversationCard", () => {
 
   test("clicking the delete button should not trigger the onClick handler", async () => {
     const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
@@ -300,12 +346,11 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    const ellipsisButton = screen.getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
     const menu = screen.getByTestId("context-menu");
     const deleteButton = within(menu).getByTestId("delete-button");
 
@@ -315,7 +360,7 @@ describe("ConversationCard", () => {
   });
 
   it("should show display cost button only when showOptions is true", async () => {
-    const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     const { rerender } = renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
@@ -324,21 +369,17 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    const ellipsisButton = screen.getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
     // Wait for context menu to appear
     const menu = await screen.findByTestId("context-menu");
     expect(
       within(menu).queryByTestId("display-cost-button"),
     ).not.toBeInTheDocument();
 
-    // Close menu
-    await user.click(ellipsisButton);
-
     rerender(
       <ConversationCard
         onDelete={onDelete}
@@ -348,12 +389,11 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    // Open menu again
-    await user.click(ellipsisButton);
-
     // Wait for context menu to appear and check for display cost button
     const newMenu = await screen.findByTestId("context-menu");
     within(newMenu).getByTestId("display-cost-button");
@@ -361,6 +401,7 @@ describe("ConversationCard", () => {
 
   it("should show metrics modal when clicking the display cost button", async () => {
     const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     renderWithProviders(
       <ConversationCard
         onDelete={onDelete}
@@ -370,12 +411,11 @@ describe("ConversationCard", () => {
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
         showOptions
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    const ellipsisButton = screen.getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
     const menu = screen.getByTestId("context-menu");
     const displayCostButton = within(menu).getByTestId("display-cost-button");
 
@@ -386,7 +426,7 @@ describe("ConversationCard", () => {
   });
 
   it("should not display the edit or delete options if the handler is not provided", async () => {
-    const user = userEvent.setup();
+    const onContextMenuToggle = vi.fn();
     const { rerender } = renderWithProviders(
       <ConversationCard
         onClick={onClick}
@@ -394,19 +434,15 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    const ellipsisButton = screen.getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
     const menu = await screen.findByTestId("context-menu");
     expect(within(menu).queryByTestId("edit-button")).toBeInTheDocument();
     expect(within(menu).queryByTestId("delete-button")).not.toBeInTheDocument();
 
-    // toggle to hide the context menu
-    await user.click(ellipsisButton);
-
     rerender(
       <ConversationCard
         onClick={onClick}
@@ -414,10 +450,11 @@ describe("ConversationCard", () => {
         title="Conversation 1"
         selectedRepository={null}
         lastUpdatedAt="2021-10-01T12:00:00Z"
+        contextMenuOpen
+        onContextMenuToggle={onContextMenuToggle}
       />,
     );
 
-    await user.click(ellipsisButton);
     const newMenu = await screen.findByTestId("context-menu");
     expect(
       within(newMenu).queryByTestId("edit-button"),

frontend/__tests__/components/features/home/home-header.test.tsx

@@ -72,6 +72,7 @@ describe("HomeHeader", () => {
       undefined,
       undefined,
       undefined,
+      undefined,
     );
 
     // expect to be redirected to /conversations/:conversationId

frontend/__tests__/components/features/home/repo-connector.test.tsx

@@ -209,6 +209,7 @@ describe("RepoConnector", () => {
       undefined,
       "main",
       undefined,
+      undefined,
     );
   });
 

frontend/__tests__/components/features/home/task-card.test.tsx

@@ -97,6 +97,7 @@ describe("TaskCard", () => {
         },
         undefined,
         undefined,
+        undefined,
       );
     });
   });

frontend/__tests__/components/features/maintenance/maintenance-banner.test.tsx

@@ -0,0 +1,52 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { MaintenanceBanner } from "#/components/features/maintenance/maintenance-banner";
+
+// Mock react-i18next
+vi.mock("react-i18next", async () => {
+  const actual = await vi.importActual<typeof import("react-i18next")>("react-i18next");
+  return {
+    ...actual,
+    useTranslation: () => ({
+      t: (key: string, options?: { time?: string }) => {
+        const translations: Record<string, string> = {
+          "MAINTENANCE$SCHEDULED_MESSAGE": `Scheduled maintenance will begin at ${options?.time || "{{time}}"}`,
+        };
+        return translations[key] || key;
+      },
+    }),
+  };
+});
+
+describe("MaintenanceBanner", () => {
+  it("renders maintenance banner with formatted time", () => {
+    const startTime = "2024-01-15T10:00:00-05:00"; // EST timestamp
+
+    const { container } = render(<MaintenanceBanner startTime={startTime} />);
+
+    // Check if the banner is rendered
+    expect(screen.getByText(/Scheduled maintenance will begin at/)).toBeInTheDocument();
+
+    // Check if the warning icon (SVG) is present
+    const svgIcon = container.querySelector('svg');
+    expect(svgIcon).toBeInTheDocument();
+  });
+
+  it("handles invalid date gracefully", () => {
+    const invalidTime = "invalid-date";
+
+    render(<MaintenanceBanner startTime={invalidTime} />);
+
+    // Should still render the banner with the original string
+    expect(screen.getByText(/Scheduled maintenance will begin at invalid-date/)).toBeInTheDocument();
+  });
+
+  it("formats ISO date string correctly", () => {
+    const isoTime = "2024-01-15T15:30:00.000Z";
+
+    render(<MaintenanceBanner startTime={isoTime} />);
+
+    // Should render the banner (exact time format will depend on user's timezone)
+    expect(screen.getByText(/Scheduled maintenance will begin at/)).toBeInTheDocument();
+  });
+});

frontend/__tests__/components/features/payment/payment-form.test.tsx

@@ -28,6 +28,9 @@ describe("PaymentForm", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: true,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
   });

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

@@ -73,4 +73,73 @@ describe("TrajectoryActions", () => {
 
     expect(onExportTrajectory).toHaveBeenCalled();
   });
+
+  describe("SaaS mode", () => {
+    it("should only render export button when isSaasMode is true", () => {
+      renderWithProviders(
+        <TrajectoryActions
+          onPositiveFeedback={onPositiveFeedback}
+          onNegativeFeedback={onNegativeFeedback}
+          onExportTrajectory={onExportTrajectory}
+          isSaasMode={true}
+        />,
+      );
+
+      const actions = screen.getByTestId("feedback-actions");
+
+      // Should not render feedback buttons in SaaS mode
+      expect(within(actions).queryByTestId("positive-feedback")).toBeNull();
+      expect(within(actions).queryByTestId("negative-feedback")).toBeNull();
+
+      // Should still render export button
+      within(actions).getByTestId("export-trajectory");
+    });
+
+    it("should render all buttons when isSaasMode is false", () => {
+      renderWithProviders(
+        <TrajectoryActions
+          onPositiveFeedback={onPositiveFeedback}
+          onNegativeFeedback={onNegativeFeedback}
+          onExportTrajectory={onExportTrajectory}
+          isSaasMode={false}
+        />,
+      );
+
+      const actions = screen.getByTestId("feedback-actions");
+      within(actions).getByTestId("positive-feedback");
+      within(actions).getByTestId("negative-feedback");
+      within(actions).getByTestId("export-trajectory");
+    });
+
+    it("should render all buttons when isSaasMode is undefined (default behavior)", () => {
+      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 onExportTrajectory when export button is clicked in SaaS mode", async () => {
+      renderWithProviders(
+        <TrajectoryActions
+          onPositiveFeedback={onPositiveFeedback}
+          onNegativeFeedback={onNegativeFeedback}
+          onExportTrajectory={onExportTrajectory}
+          isSaasMode={true}
+        />,
+      );
+
+      const exportButton = screen.getByTestId("export-trajectory");
+      await user.click(exportButton);
+
+      expect(onExportTrajectory).toHaveBeenCalled();
+    });
+  });
 });

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

@@ -1,27 +1,64 @@
 import { render, screen } from "@testing-library/react";
-import { describe, expect, it, test, vi, afterEach } from "vitest";
+import { describe, expect, it, test, vi, afterEach, beforeEach } from "vitest";
 import userEvent from "@testing-library/user-event";
 import { UserActions } from "#/components/features/sidebar/user-actions";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ReactElement } from "react";
+
+// Create a mock for useIsAuthed that we can control per test
+const useIsAuthedMock = vi
+  .fn()
+  .mockReturnValue({ data: true, isLoading: false });
+
+// Mock the useIsAuthed hook
+vi.mock("#/hooks/query/use-is-authed", () => ({
+  useIsAuthed: () => useIsAuthedMock(),
+}));
 
 describe("UserActions", () => {
   const user = userEvent.setup();
   const onClickAccountSettingsMock = vi.fn();
   const onLogoutMock = vi.fn();
 
+  // Create a wrapper with QueryClientProvider
+  const renderWithQueryClient = (ui: ReactElement) => {
+    const queryClient = new QueryClient({
+      defaultOptions: {
+        queries: {
+          retry: false,
+        },
+      },
+    });
+
+    return render(ui, {
+      wrapper: ({ children }) => (
+        <QueryClientProvider client={queryClient}>
+          {children}
+        </QueryClientProvider>
+      ),
+    });
+  };
+
+  beforeEach(() => {
+    // Reset the mock to default value before each test
+    useIsAuthedMock.mockReturnValue({ data: true, isLoading: false });
+  });
+
   afterEach(() => {
     onClickAccountSettingsMock.mockClear();
     onLogoutMock.mockClear();
+    vi.clearAllMocks();
   });
 
   it("should render", () => {
-    render(<UserActions onLogout={onLogoutMock} />);
+    renderWithQueryClient(<UserActions onLogout={onLogoutMock} />);
 
     expect(screen.getByTestId("user-actions")).toBeInTheDocument();
     expect(screen.getByTestId("user-avatar")).toBeInTheDocument();
   });
 
   it("should toggle the user menu when the user avatar is clicked", async () => {
-    render(
+    renderWithQueryClient(
       <UserActions
         onLogout={onLogoutMock}
         user={{ avatar_url: "https://example.com/avatar.png" }}
@@ -43,7 +80,7 @@ describe("UserActions", () => {
   });
 
   it("should call onLogout and close the menu when the logout option is clicked", async () => {
-    render(
+    renderWithQueryClient(
       <UserActions
         onLogout={onLogoutMock}
         user={{ avatar_url: "https://example.com/avatar.png" }}
@@ -62,20 +99,25 @@ describe("UserActions", () => {
     ).not.toBeInTheDocument();
   });
 
-  it("should NOT show context menu when user is undefined and avatar is clicked", async () => {
-    render(<UserActions onLogout={onLogoutMock} />);
+  it("should NOT show context menu when user is not authenticated and avatar is clicked", async () => {
+    // Set isAuthed to false for this test
+    useIsAuthedMock.mockReturnValue({ data: false, isLoading: false });
+
+    renderWithQueryClient(<UserActions onLogout={onLogoutMock} />);
 
     const userAvatar = screen.getByTestId("user-avatar");
     await user.click(userAvatar);
 
-    // Context menu should NOT appear because user is undefined
+    // Context menu should NOT appear because user is not authenticated
     expect(
       screen.queryByTestId("account-settings-context-menu"),
     ).not.toBeInTheDocument();
   });
 
   it("should show context menu even when user has no avatar_url", async () => {
-    render(<UserActions onLogout={onLogoutMock} user={{ avatar_url: "" }} />);
+    renderWithQueryClient(
+      <UserActions onLogout={onLogoutMock} user={{ avatar_url: "" }} />,
+    );
 
     const userAvatar = screen.getByTestId("user-avatar");
     await user.click(userAvatar);
@@ -86,42 +128,74 @@ describe("UserActions", () => {
     ).toBeInTheDocument();
   });
 
-  it("should NOT be able to access logout when no user is provided", async () => {
-    render(<UserActions onLogout={onLogoutMock} />);
+  it("should NOT be able to access logout when user is not authenticated", async () => {
+    // Set isAuthed to false for this test
+    useIsAuthedMock.mockReturnValue({ data: false, isLoading: false });
+
+    renderWithQueryClient(<UserActions onLogout={onLogoutMock} />);
 
     const userAvatar = screen.getByTestId("user-avatar");
     await user.click(userAvatar);
 
-    // Logout option should not be accessible because context menu doesn't appear
-    expect(
-      screen.queryByText("ACCOUNT_SETTINGS$LOGOUT"),
-    ).not.toBeInTheDocument();
-    expect(onLogoutMock).not.toHaveBeenCalled();
-  });
-
-  it("should handle user prop changing from undefined to defined", () => {
-    const { rerender } = render(<UserActions onLogout={onLogoutMock} />);
-
-    // Initially no user - context menu shouldn't work
+    // Context menu should NOT appear because user is not authenticated
     expect(
       screen.queryByTestId("account-settings-context-menu"),
     ).not.toBeInTheDocument();
 
-    // Add user prop
+    // Logout option should NOT be accessible when user is not authenticated
+    expect(screen.queryByText("ACCOUNT_SETTINGS$LOGOUT")).not.toBeInTheDocument();
+  });
+
+  it("should handle user prop changing from undefined to defined", async () => {
+    // Start with no authentication
+    useIsAuthedMock.mockReturnValue({ data: false, isLoading: false });
+
+    const { rerender } = renderWithQueryClient(
+      <UserActions onLogout={onLogoutMock} />,
+    );
+
+    // Initially no user and not authenticated - menu should not appear
+    let userAvatar = screen.getByTestId("user-avatar");
+    await user.click(userAvatar);
+    expect(
+      screen.queryByTestId("account-settings-context-menu"),
+    ).not.toBeInTheDocument();
+
+    // Set authentication to true for the rerender
+    useIsAuthedMock.mockReturnValue({ data: true, isLoading: false });
+
+    // Add user prop and create a new QueryClient to ensure fresh state
+    const queryClient = new QueryClient({
+      defaultOptions: {
+        queries: {
+          retry: false,
+        },
+      },
+    });
+
     rerender(
-      <UserActions
-        onLogout={onLogoutMock}
-        user={{ avatar_url: "https://example.com/avatar.png" }}
-      />,
+      <QueryClientProvider client={queryClient}>
+        <UserActions
+          onLogout={onLogoutMock}
+          user={{ avatar_url: "https://example.com/avatar.png" }}
+        />
+      </QueryClientProvider>,
     );
 
     // Component should still render correctly
     expect(screen.getByTestId("user-actions")).toBeInTheDocument();
     expect(screen.getByTestId("user-avatar")).toBeInTheDocument();
+
+    // Menu should now work with user defined and authenticated
+    userAvatar = screen.getByTestId("user-avatar");
+    await user.click(userAvatar);
+    expect(
+      screen.getByTestId("account-settings-context-menu"),
+    ).toBeInTheDocument();
   });
 
   it("should handle user prop changing from defined to undefined", async () => {
-    const { rerender } = render(
+    const { rerender } = renderWithQueryClient(
       <UserActions
         onLogout={onLogoutMock}
         user={{ avatar_url: "https://example.com/avatar.png" }}
@@ -135,16 +209,27 @@ describe("UserActions", () => {
       screen.getByTestId("account-settings-context-menu"),
     ).toBeInTheDocument();
 
-    // Remove user prop - menu should disappear
-    rerender(<UserActions onLogout={onLogoutMock} />);
+    // Set authentication to false for the rerender
+    useIsAuthedMock.mockReturnValue({ data: false, isLoading: false });
 
+    // Remove user prop - menu should disappear because user is no longer authenticated
+    rerender(
+      <QueryClientProvider client={new QueryClient()}>
+        <UserActions onLogout={onLogoutMock} />
+      </QueryClientProvider>,
+    );
+
+    // Context menu should NOT be visible when user becomes unauthenticated
     expect(
       screen.queryByTestId("account-settings-context-menu"),
     ).not.toBeInTheDocument();
+
+    // Logout option should not be accessible
+    expect(screen.queryByText("ACCOUNT_SETTINGS$LOGOUT")).not.toBeInTheDocument();
   });
 
   it("should work with loading state and user provided", async () => {
-    render(
+    renderWithQueryClient(
       <UserActions
         onLogout={onLogoutMock}
         user={{ avatar_url: "https://example.com/avatar.png" }}

frontend/__tests__/hooks/query/use-feedback-exists.test.tsx

@@ -1,140 +0,0 @@
-import { renderHook, waitFor } from "@testing-library/react";
-import { describe, expect, it, vi, beforeEach } from "vitest";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
-import { useFeedbackExists } from "#/hooks/query/use-feedback-exists";
-
-// Mock the useConfig hook
-vi.mock("#/hooks/query/use-config", () => ({
-  useConfig: vi.fn(),
-}));
-
-// Mock the useConversationId hook
-vi.mock("#/hooks/use-conversation-id", () => ({
-  useConversationId: () => ({ conversationId: "test-conversation-id" }),
-}));
-
-describe("useFeedbackExists", () => {
-  let queryClient: QueryClient;
-  const mockCheckFeedbackExists = vi.spyOn(OpenHands, "checkFeedbackExists");
-
-  beforeEach(() => {
-    queryClient = new QueryClient({
-      defaultOptions: { queries: { retry: false } },
-    });
-    mockCheckFeedbackExists.mockClear();
-  });
-
-  const wrapper = ({ children }: { children: React.ReactNode }) => (
-    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-  );
-
-  it("should not call API when APP_MODE is not saas", async () => {
-    const { useConfig } = await import("#/hooks/query/use-config");
-    vi.mocked(useConfig).mockReturnValue({
-      data: { APP_MODE: "oss" },
-      isLoading: false,
-      error: null,
-    } as ReturnType<typeof useConfig>);
-
-    const { result } = renderHook(() => useFeedbackExists(123), {
-      wrapper,
-    });
-
-    // Wait for any potential async operations
-    await waitFor(() => {
-      expect(result.current.isLoading).toBe(false);
-    });
-
-    // Verify that the API was not called
-    expect(mockCheckFeedbackExists).not.toHaveBeenCalled();
-
-    // Verify that the query is disabled
-    expect(result.current.data).toBeUndefined();
-  });
-
-  it("should call API when APP_MODE is saas", async () => {
-    const { useConfig } = await import("#/hooks/query/use-config");
-    vi.mocked(useConfig).mockReturnValue({
-      data: { APP_MODE: "saas" },
-      isLoading: false,
-      error: null,
-    } as ReturnType<typeof useConfig>);
-
-    mockCheckFeedbackExists.mockResolvedValue({
-      exists: true,
-      rating: 5,
-      reason: "Great job!",
-    });
-
-    const { result } = renderHook(() => useFeedbackExists(123), {
-      wrapper,
-    });
-
-    // Wait for the query to complete
-    await waitFor(() => {
-      expect(result.current.isLoading).toBe(false);
-    });
-
-    // Verify that the API was called
-    expect(mockCheckFeedbackExists).toHaveBeenCalledWith(
-      "test-conversation-id",
-      123,
-    );
-
-    // Verify that the data is returned
-    expect(result.current.data).toEqual({
-      exists: true,
-      rating: 5,
-      reason: "Great job!",
-    });
-  });
-
-  it("should not call API when eventId is not provided", async () => {
-    const { useConfig } = await import("#/hooks/query/use-config");
-    vi.mocked(useConfig).mockReturnValue({
-      data: { APP_MODE: "saas" },
-      isLoading: false,
-      error: null,
-    } as ReturnType<typeof useConfig>);
-
-    const { result } = renderHook(() => useFeedbackExists(undefined), {
-      wrapper,
-    });
-
-    // Wait for any potential async operations
-    await waitFor(() => {
-      expect(result.current.isLoading).toBe(false);
-    });
-
-    // Verify that the API was not called
-    expect(mockCheckFeedbackExists).not.toHaveBeenCalled();
-
-    // Verify that the query is disabled
-    expect(result.current.data).toBeUndefined();
-  });
-
-  it("should not call API when config is not loaded yet", async () => {
-    const { useConfig } = await import("#/hooks/query/use-config");
-    vi.mocked(useConfig).mockReturnValue({
-      data: undefined,
-      isLoading: true,
-      error: null,
-    } as ReturnType<typeof useConfig>);
-
-    const { result } = renderHook(() => useFeedbackExists(123), {
-      wrapper,
-    });
-
-    // Wait for any potential async operations
-    await waitFor(() => {
-      expect(result.current.isLoading).toBe(false);
-    });
-
-    // Verify that the API was not called
-    expect(mockCheckFeedbackExists).not.toHaveBeenCalled();
-
-    // Verify that the query is disabled
-    expect(result.current.data).toBeUndefined();
-  });
-});

frontend/__tests__/routes/_oh.test.tsx

@@ -76,6 +76,9 @@ describe("frontend/routes/_oh", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: false,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
 
@@ -111,6 +114,9 @@ describe("frontend/routes/_oh", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: false,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
 
@@ -192,6 +198,9 @@ describe("frontend/routes/_oh", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: false,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
 

frontend/__tests__/routes/git-settings.test.tsx

@@ -17,6 +17,9 @@ const VALID_OSS_CONFIG: GetConfigResponse = {
   FEATURE_FLAGS: {
     ENABLE_BILLING: false,
     HIDE_LLM_SETTINGS: false,
+    ENABLE_JIRA: false,
+    ENABLE_JIRA_DC: false,
+    ENABLE_LINEAR: false,
   },
 };
 
@@ -27,6 +30,9 @@ const VALID_SAAS_CONFIG: GetConfigResponse = {
   FEATURE_FLAGS: {
     ENABLE_BILLING: false,
     HIDE_LLM_SETTINGS: false,
+    ENABLE_JIRA: false,
+    ENABLE_JIRA_DC: false,
+    ENABLE_LINEAR: false,
   },
 };
 

frontend/__tests__/routes/home-screen.test.tsx

@@ -222,10 +222,12 @@ describe("HomeScreen", () => {
       // All other buttons should be disabled when the header button is clicked
       await userEvent.click(headerLaunchButton);
 
-      expect(headerLaunchButton).toBeDisabled();
-      expect(repoLaunchButton).toBeDisabled();
-      tasksLaunchButtonsAfter.forEach((button) => {
-        expect(button).toBeDisabled();
+      await waitFor(() => {
+        expect(headerLaunchButton).toBeDisabled();
+        expect(repoLaunchButton).toBeDisabled();
+        tasksLaunchButtonsAfter.forEach((button) => {
+          expect(button).toBeDisabled();
+        });
       });
     });
 
@@ -240,10 +242,12 @@ describe("HomeScreen", () => {
       // All other buttons should be disabled when the repo button is clicked
       await userEvent.click(repoLaunchButton);
 
-      expect(headerLaunchButton).toBeDisabled();
-      expect(repoLaunchButton).toBeDisabled();
-      tasksLaunchButtonsAfter.forEach((button) => {
-        expect(button).toBeDisabled();
+      await waitFor(() => {
+        expect(headerLaunchButton).toBeDisabled();
+        expect(repoLaunchButton).toBeDisabled();
+        tasksLaunchButtonsAfter.forEach((button) => {
+          expect(button).toBeDisabled();
+        });
       });
     });
 
@@ -258,10 +262,12 @@ describe("HomeScreen", () => {
       // All other buttons should be disabled when the task button is clicked
       await userEvent.click(tasksLaunchButtons[0]);
 
-      expect(headerLaunchButton).toBeDisabled();
-      expect(repoLaunchButton).toBeDisabled();
-      tasksLaunchButtonsAfter.forEach((button) => {
-        expect(button).toBeDisabled();
+      await waitFor(() => {
+        expect(headerLaunchButton).toBeDisabled();
+        expect(repoLaunchButton).toBeDisabled();
+        tasksLaunchButtonsAfter.forEach((button) => {
+          expect(button).toBeDisabled();
+        });
       });
     });
   });
@@ -327,6 +333,9 @@ describe("Settings 404", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: false,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
     const error = createAxiosNotFoundErrorObject();
@@ -349,6 +358,9 @@ describe("Setup Payment modal", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: true,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
     const error = createAxiosNotFoundErrorObject();

frontend/__tests__/routes/llm-settings.test.tsx

@@ -366,17 +366,17 @@ describe("Form submission", () => {
 
     renderLlmSettingsScreen();
     await screen.findByTestId("llm-settings-screen");
-    screen.getByTestId("llm-settings-form-advanced");
+    await screen.findByTestId("llm-settings-form-advanced");
 
-    const submitButton = screen.getByTestId("submit-button");
+    const submitButton = await screen.findByTestId("submit-button");
     expect(submitButton).toBeDisabled();
 
-    const model = screen.getByTestId("llm-custom-model-input");
-    const baseUrl = screen.getByTestId("base-url-input");
-    const apiKey = screen.getByTestId("llm-api-key-input");
-    const agent = screen.getByTestId("agent-input");
-    const confirmation = screen.getByTestId("enable-confirmation-mode-switch");
-    const condensor = screen.getByTestId("enable-memory-condenser-switch");
+    const model = await screen.findByTestId("llm-custom-model-input");
+    const baseUrl = await screen.findByTestId("base-url-input");
+    const apiKey = await screen.findByTestId("llm-api-key-input");
+    const agent = await screen.findByTestId("agent-input");
+    const confirmation = await screen.findByTestId("enable-confirmation-mode-switch");
+    const condensor = await screen.findByTestId("enable-memory-condenser-switch");
 
     // enter custom model
     await userEvent.type(model, "-mini");
@@ -449,7 +449,7 @@ describe("Form submission", () => {
     expect(submitButton).toBeDisabled();
 
     // select security analyzer
-    const securityAnalyzer = screen.getByTestId("security-analyzer-input");
+    const securityAnalyzer = await screen.findByTestId("security-analyzer-input");
     await userEvent.click(securityAnalyzer);
     const securityAnalyzerOption = screen.getByText("mock-invariant");
     await userEvent.click(securityAnalyzerOption);

frontend/__tests__/routes/secrets-settings.test.tsx

@@ -101,7 +101,8 @@ describe("Content", () => {
 
     renderSecretsSettings();
 
-    expect(getSecretsSpy).not.toHaveBeenCalled();
+    // In SAAS mode, getSecrets is still called because the user is authenticated
+    await waitFor(() => expect(getSecretsSpy).toHaveBeenCalled());
     await waitFor(() =>
       expect(screen.queryByTestId("add-secret-button")).not.toBeInTheDocument(),
     );

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

@@ -86,6 +86,9 @@ describe("Settings Billing", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: false,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
 
@@ -104,6 +107,9 @@ describe("Settings Billing", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: true,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
 
@@ -122,6 +128,9 @@ describe("Settings Billing", () => {
       FEATURE_FLAGS: {
         ENABLE_BILLING: true,
         HIDE_LLM_SETTINGS: false,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
       },
     });
 

frontend/package.json

@@ -1,48 +1,48 @@
 {
   "name": "openhands-frontend",
-  "version": "0.49.0",
+  "version": "0.51.1",
   "private": true,
   "type": "module",
   "engines": {
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@heroui/react": "^2.8.1",
+    "@heroui/react": "^2.8.2",
     "@microlink/react-json-view": "^1.26.2",
     "@monaco-editor/react": "^4.7.0-rc.0",
-    "@react-router/node": "^7.7.0",
-    "@react-router/serve": "^7.7.0",
-    "@react-types/shared": "^3.29.1",
+    "@react-router/node": "^7.7.1",
+    "@react-router/serve": "^7.7.1",
+    "@react-types/shared": "^3.31.0",
     "@reduxjs/toolkit": "^2.8.2",
-    "@stripe/react-stripe-js": "^3.7.0",
-    "@stripe/stripe-js": "^7.5.0",
+    "@stripe/react-stripe-js": "^3.8.1",
+    "@stripe/stripe-js": "^7.7.0",
     "@tailwindcss/postcss": "^4.1.11",
     "@tailwindcss/vite": "^4.1.11",
-    "@tanstack/react-query": "^5.83.0",
+    "@tanstack/react-query": "^5.84.1",
     "@vitejs/plugin-react": "^4.7.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.4.0",
-    "axios": "^1.10.0",
+    "axios": "^1.11.0",
     "clsx": "^2.1.1",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "framer-motion": "^12.23.6",
+    "framer-motion": "^12.23.12",
     "i18next": "^25.3.2",
     "i18next-browser-languagedetector": "^8.2.0",
     "i18next-http-backend": "^3.0.2",
-    "isbot": "^5.1.28",
+    "isbot": "^5.1.29",
     "jose": "^6.0.12",
-    "lucide-react": "^0.525.0",
+    "lucide-react": "^0.536.0",
     "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.257.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
+    "posthog-js": "^1.258.5",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
     "react-highlight": "^0.15.0",
     "react-hot-toast": "^2.5.1",
-    "react-i18next": "^15.6.0",
+    "react-i18next": "^15.6.1",
     "react-icons": "^5.5.0",
     "react-markdown": "^10.1.0",
     "react-redux": "^9.2.0",
-    "react-router": "^7.7.0",
+    "react-router": "^7.7.1",
     "react-syntax-highlighter": "^15.6.1",
     "react-textarea-autosize": "^8.5.9",
     "remark-breaks": "^4.0.0",
@@ -50,8 +50,8 @@
     "sirv-cli": "^3.0.1",
     "socket.io-client": "^4.8.1",
     "tailwind-merge": "^3.3.1",
-    "vite": "^7.0.5",
-    "web-vitals": "^5.0.3",
+    "vite": "^7.0.6",
+    "web-vitals": "^5.1.0",
     "ws": "^8.18.2"
   },
   "scripts": {
@@ -82,19 +82,19 @@
   "devDependencies": {
     "@babel/parser": "^7.28.0",
     "@babel/traverse": "^7.28.0",
-    "@babel/types": "^7.28.1",
+    "@babel/types": "^7.28.2",
     "@mswjs/socket.io-binding": "^0.2.0",
-    "@playwright/test": "^1.54.1",
-    "@react-router/dev": "^7.7.0",
+    "@playwright/test": "^1.54.2",
+    "@react-router/dev": "^7.7.1",
     "@tailwindcss/typography": "^0.5.16",
-    "@tanstack/eslint-plugin-query": "^5.81.2",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.1",
+    "@tanstack/eslint-plugin-query": "^5.83.1",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.6.4",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@types/node": "^24.0.14",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
+    "@types/node": "^24.1.0",
+    "@types/react": "^19.1.9",
+    "@types/react-dom": "^19.1.7",
     "@types/react-highlight": "^0.12.8",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/ws": "^8.18.1",
@@ -102,15 +102,15 @@
     "@typescript-eslint/parser": "^7.18.0",
     "@vitest/coverage-v8": "^3.2.3",
     "autoprefixer": "^10.4.21",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.0.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-i18next": "^6.1.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-i18next": "^6.1.3",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-prettier": "^5.5.1",
+    "eslint-plugin-prettier": "^5.5.3",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-unused-imports": "^4.1.4",
@@ -119,9 +119,9 @@
     "lint-staged": "^16.1.2",
     "msw": "^2.6.6",
     "prettier": "^3.6.2",
-    "stripe": "^18.3.0",
+    "stripe": "^18.4.0",
     "tailwindcss": "^4.1.8",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.0.2"

frontend/src/api/open-hands.ts

@@ -13,11 +13,15 @@ import {
   GitChange,
   GetMicroagentsResponse,
   GetMicroagentPromptResponse,
+  CreateMicroagent,
+  MicroagentContentResponse,
 } from "./open-hands.types";
 import { openHands } from "./open-hands-axios";
 import { ApiSettings, PostApiSettings, Provider } from "#/types/settings";
 import { GitUser, GitRepository, Branch } from "#/types/git";
 import { SuggestedTask } from "#/components/features/home/tasks/task.types";
+import { RepositoryMicroagent } from "#/types/microagent-management";
+import { BatchFeedbackData } from "#/hooks/query/use-batch-feedback";
 
 class OpenHands {
   private static currentConversation: Conversation | null = null;
@@ -164,6 +168,38 @@ class OpenHands {
     }
   }
 
+  /**
+   * Get feedback for multiple events in a conversation
+   * @param conversationId The conversation ID
+   * @returns Map of event IDs to feedback data including existence, rating, reason and metadata
+   */
+  static async getBatchFeedback(conversationId: string): Promise<
+    Record<
+      string,
+      {
+        exists: boolean;
+        rating?: number;
+        reason?: string;
+        metadata?: Record<string, BatchFeedbackData>;
+      }
+    >
+  > {
+    const url = `/feedback/conversation/${conversationId}/batch`;
+    const { data } = await openHands.get<
+      Record<
+        string,
+        {
+          exists: boolean;
+          rating?: number;
+          reason?: string;
+          metadata?: Record<string, BatchFeedbackData>;
+        }
+      >
+    >(url);
+
+    return data;
+  }
+
   /**
    * Authenticate with GitHub token
    * @returns Response with authentication status and user info if successful
@@ -250,6 +286,28 @@ class OpenHands {
     return data.results;
   }
 
+  static async searchConversations(
+    selectedRepository?: string,
+    conversationTrigger?: string,
+    limit: number = 20,
+  ): Promise<Conversation[]> {
+    const params = new URLSearchParams();
+    params.append("limit", limit.toString());
+
+    if (selectedRepository) {
+      params.append("selected_repository", selectedRepository);
+    }
+
+    if (conversationTrigger) {
+      params.append("conversation_trigger", conversationTrigger);
+    }
+
+    const { data } = await openHands.get<ResultSet<Conversation>>(
+      `/api/conversations?${params.toString()}`,
+    );
+    return data.results;
+  }
+
   static async deleteUserConversation(conversationId: string): Promise<void> {
     await openHands.delete(`/api/conversations/${conversationId}`);
   }
@@ -261,6 +319,7 @@ class OpenHands {
     suggested_task?: SuggestedTask,
     selected_branch?: string,
     conversationInstructions?: string,
+    createMicroagent?: CreateMicroagent,
   ): Promise<Conversation> {
     const body = {
       repository: selectedRepository,
@@ -269,6 +328,7 @@ class OpenHands {
       initial_user_msg: initialUserMsg,
       suggested_task,
       conversation_instructions: conversationInstructions,
+      create_microagent: createMicroagent,
     };
 
     const { data } = await openHands.post<Conversation>(
@@ -464,6 +524,43 @@ class OpenHands {
     return data;
   }
 
+  /**
+   * Get the available microagents for a repository
+   * @param owner The repository owner
+   * @param repo The repository name
+   * @returns The available microagents for the repository
+   */
+  static async getRepositoryMicroagents(
+    owner: string,
+    repo: string,
+  ): Promise<RepositoryMicroagent[]> {
+    const { data } = await openHands.get<RepositoryMicroagent[]>(
+      `/api/user/repository/${owner}/${repo}/microagents`,
+    );
+    return data;
+  }
+
+  /**
+   * Get the content of a specific microagent from a repository
+   * @param owner The repository owner
+   * @param repo The repository name
+   * @param filePath The path to the microagent file within the repository
+   * @returns The microagent content and metadata
+   */
+  static async getRepositoryMicroagentContent(
+    owner: string,
+    repo: string,
+    filePath: string,
+  ): Promise<MicroagentContentResponse> {
+    const { data } = await openHands.get<MicroagentContentResponse>(
+      `/api/user/repository/${owner}/${repo}/microagents/content`,
+      {
+        params: { file_path: filePath },
+      },
+    );
+    return data;
+  }
+
   static async getMicroagentPrompt(
     conversationId: string,
     eventId: number,
@@ -489,24 +586,6 @@ class OpenHands {
 
     return data;
   }
-
-  /**
-   * Get the GitHub user installation IDs
-   * @returns List of GitHub installation IDs
-   */
-  static async getGitHubUserInstallationIds(): Promise<string[]> {
-    const { data } = await openHands.get<string[]>("/github/installations");
-    return data;
-  }
-
-  /**
-   * Get the BitBucket workspaces
-   * @returns List of BitBucket workspaces
-   */
-  static async getBitBucketWorkspaces(): Promise<string[]> {
-    const { data } = await openHands.get<string[]>("/bitbucket/installations");
-    return data;
-  }
 }
 
 export default OpenHands;

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

@@ -55,6 +55,12 @@ export interface GetConfigResponse {
     ENABLE_BILLING: boolean;
     HIDE_LLM_SETTINGS: boolean;
     HIDE_MICROAGENT_MANAGEMENT?: boolean;
+    ENABLE_JIRA: boolean;
+    ENABLE_JIRA_DC: boolean;
+    ENABLE_LINEAR: boolean;
+  };
+  MAINTENANCE?: {
+    startTime: string;
   };
 }
 
@@ -79,7 +85,11 @@ export interface RepositorySelection {
   git_provider: Provider | null;
 }
 
-export type ConversationTrigger = "resolver" | "gui" | "suggested_task";
+export type ConversationTrigger =
+  | "resolver"
+  | "gui"
+  | "suggested_task"
+  | "microagent_management";
 
 export interface Conversation {
   conversation_id: string;
@@ -94,6 +104,7 @@ export interface Conversation {
   trigger?: ConversationTrigger;
   url: string | null;
   session_api_key: string | null;
+  pr_number?: number[] | null;
 }
 
 export interface ResultSet<T> {
@@ -133,3 +144,16 @@ export interface GetMicroagentPromptResponse {
   status: string;
   prompt: string;
 }
+
+export interface CreateMicroagent {
+  repo: string;
+  git_provider?: Provider;
+  title?: string;
+}
+
+export interface MicroagentContentResponse {
+  content: string;
+  path: string;
+  git_provider: Provider;
+  triggers: string[];
+}

frontend/src/components/features/chat/action-suggestions.tsx

@@ -38,7 +38,7 @@ export function ActionSuggestions({
     pr,
     prShort,
     pushToBranch: `Please push the changes to a remote branch on ${getProviderName()}, but do NOT create a ${pr}. Check your current branch name first - if it's main, master, deploy, or another common default branch name, create a new branch with a descriptive name related to your changes. Otherwise, use the exact SAME branch name as the one you are currently on.`,
-    createPR: `Please push the changes to ${getProviderName()} and open a ${pr}. Please create a meaningful branch name that describes the changes. If a ${pr} template exists in the repository, please follow it when creating the ${prShort} description.`,
+    createPR: `Please push the changes to ${getProviderName()} and open a ${pr}. If you're on a default branch (e.g., main, master, deploy), create a new branch with a descriptive name otherwise use the current branch. If a ${pr} template exists in the repository, please follow it when creating the ${prShort} description.`,
     pushToPR: `Please push the latest changes to the existing ${pr}.`,
   };
 

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

@@ -232,17 +232,16 @@ export function ChatInterface() {
 
         <div className="flex flex-col gap-[6px] px-4 pb-4">
           <div className="flex justify-between relative">
-            {config?.APP_MODE !== "saas" && (
-              <TrajectoryActions
-                onPositiveFeedback={() =>
-                  onClickShareFeedbackActionButton("positive")
-                }
-                onNegativeFeedback={() =>
-                  onClickShareFeedbackActionButton("negative")
-                }
-                onExportTrajectory={() => onClickExportTrajectoryButton()}
-              />
-            )}
+            <TrajectoryActions
+              onPositiveFeedback={() =>
+                onClickShareFeedbackActionButton("positive")
+              }
+              onNegativeFeedback={() =>
+                onClickShareFeedbackActionButton("negative")
+              }
+              onExportTrajectory={() => onClickExportTrajectoryButton()}
+              isSaasMode={config?.APP_MODE === "saas"}
+            />
 
             <div className="absolute left-1/2 transform -translate-x-1/2 bottom-0">
               {curAgentState === AgentState.RUNNING && <TypingIndicator />}

frontend/src/components/features/chat/event-content-helpers/get-action-content.ts

@@ -77,25 +77,8 @@ const getMcpActionContent = (event: MCPAction): string => {
 const getThinkActionContent = (event: ThinkAction): string =>
   event.args.thought;
 
-const getFinishActionContent = (event: FinishAction): string => {
-  let content = event.args.final_thought;
-
-  switch (event.args.task_completed) {
-    case "success":
-      content += `\n\n\n${i18n.t("FINISH$TASK_COMPLETED_SUCCESSFULLY")}`;
-      break;
-    case "failure":
-      content += `\n\n\n${i18n.t("FINISH$TASK_NOT_COMPLETED")}`;
-      break;
-    case "partial":
-    default:
-      content += `\n\n\n${i18n.t("FINISH$TASK_COMPLETED_PARTIALLY")}`;
-      break;
-  }
-
-  return content.trim();
-};
-
+const getFinishActionContent = (event: FinishAction): string =>
+  event.args.final_thought.trim();
 const getNoContentActionContent = (): string => "";
 
 export const getActionContent = (event: OpenHandsAction): string => {

frontend/src/components/features/context-menu/account-settings-context-menu.tsx

@@ -22,7 +22,7 @@ export function AccountSettingsContextMenu({
       ref={ref}
       className="absolute right-full md:left-full -top-1 z-10 w-fit"
     >
-      <ContextMenuListItem onClick={onLogout}>
+      <ContextMenuListItem onClick={onLogout} data-testid="logout-button">
         {t(I18nKey.ACCOUNT_SETTINGS$LOGOUT)}
       </ContextMenuListItem>
     </ContextMenu>

frontend/src/components/features/context-menu/context-menu-icon-text.tsx

@@ -0,0 +1,22 @@
+import { cn } from "#/utils/utils";
+
+interface ContextMenuIconTextProps {
+  icon: React.ComponentType<{ className?: string }>;
+  text: string;
+  className?: string;
+  iconClassName?: string;
+}
+
+export function ContextMenuIconText({
+  icon: Icon,
+  text,
+  className,
+  iconClassName,
+}: ContextMenuIconTextProps) {
+  return (
+    <div className={cn("flex items-center gap-3 px-1", className)}>
+      <Icon className={cn("w-4 h-4 shrink-0", iconClassName)} />
+      {text}
+    </div>
+  );
+}

frontend/src/components/features/context-menu/context-menu-list-item.tsx

@@ -19,7 +19,7 @@ export function ContextMenuListItem({
       onClick={onClick}
       disabled={isDisabled}
       className={cn(
-        "text-sm px-4 py-2 w-full text-start hover:bg-white/10 first-of-type:rounded-t-md last-of-type:rounded-b-md",
+        "text-sm px-4 h-10 w-full text-start hover:bg-white/10 cursor-pointer",
         "disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-transparent text-nowrap",
       )}
     >

frontend/src/components/features/context-menu/context-menu.tsx

@@ -18,7 +18,7 @@ export function ContextMenu({
     <ul
       data-testid={testId}
       ref={ref}
-      className={cn("bg-tertiary rounded-md", className)}
+      className={cn("bg-tertiary rounded-md overflow-hidden", className)}
     >
       {children}
     </ul>

frontend/src/components/features/controls/controls.tsx

@@ -13,6 +13,7 @@ interface ControlsProps {
 
 export function Controls({ setSecurityOpen, showSecurityLock }: ControlsProps) {
   const { data: conversation } = useActiveConversation();
+  const [contextMenuOpen, setContextMenuOpen] = React.useState(false);
 
   return (
     <div className="flex flex-col gap-2 md:items-center md:justify-between md:flex-row">
@@ -37,6 +38,8 @@ export function Controls({ setSecurityOpen, showSecurityLock }: ControlsProps) {
         }}
         conversationStatus={conversation?.status}
         conversationId={conversation?.conversation_id}
+        contextMenuOpen={contextMenuOpen}
+        onContextMenuToggle={setContextMenuOpen}
       />
     </div>
   );

frontend/src/components/features/conversation-panel/conversation-card-context-menu.tsx

@@ -1,9 +1,20 @@
+import {
+  Trash,
+  Power,
+  Pencil,
+  Download,
+  Wallet,
+  Wrench,
+  Bot,
+} from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
 import { cn } from "#/utils/utils";
 import { ContextMenu } from "../context-menu/context-menu";
 import { ContextMenuListItem } from "../context-menu/context-menu-list-item";
+import { ContextMenuSeparator } from "../context-menu/context-menu-separator";
 import { I18nKey } from "#/i18n/declaration";
+import { ContextMenuIconText } from "../context-menu/context-menu-icon-text";
 
 interface ConversationCardContextMenuProps {
   onClose: () => void;
@@ -31,6 +42,12 @@ export function ConversationCardContextMenu({
   const { t } = useTranslation();
   const ref = useClickOutsideElement<HTMLUListElement>(onClose);
 
+  const hasEdit = Boolean(onEdit);
+  const hasDownload = Boolean(onDownloadViaVSCode);
+  const hasTools = Boolean(onShowAgentTools || onShowMicroagents);
+  const hasInfo = Boolean(onDisplayCost);
+  const hasControl = Boolean(onStop || onDelete);
+
   return (
     <ContextMenu
       ref={ref}
@@ -41,51 +58,84 @@ export function ConversationCardContextMenu({
         position === "bottom" && "top-full",
       )}
     >
-      {onDelete && (
-        <ContextMenuListItem testId="delete-button" onClick={onDelete}>
-          {t(I18nKey.BUTTON$DELETE)}
-        </ContextMenuListItem>
-      )}
-      {onStop && (
-        <ContextMenuListItem testId="stop-button" onClick={onStop}>
-          {t(I18nKey.BUTTON$STOP)}
-        </ContextMenuListItem>
-      )}
       {onEdit && (
         <ContextMenuListItem testId="edit-button" onClick={onEdit}>
-          {t(I18nKey.BUTTON$EDIT_TITLE)}
+          <ContextMenuIconText
+            icon={Pencil}
+            text={t(I18nKey.BUTTON$EDIT_TITLE)}
+          />
         </ContextMenuListItem>
       )}
+
+      {hasEdit && (hasDownload || hasTools || hasInfo || hasControl) && (
+        <ContextMenuSeparator />
+      )}
+
       {onDownloadViaVSCode && (
         <ContextMenuListItem
           testId="download-vscode-button"
           onClick={onDownloadViaVSCode}
         >
-          {t(I18nKey.BUTTON$DOWNLOAD_VIA_VSCODE)}
+          <ContextMenuIconText
+            icon={Download}
+            text={t(I18nKey.BUTTON$DOWNLOAD_VIA_VSCODE)}
+          />
         </ContextMenuListItem>
       )}
-      {onDisplayCost && (
-        <ContextMenuListItem
-          testId="display-cost-button"
-          onClick={onDisplayCost}
-        >
-          {t(I18nKey.BUTTON$DISPLAY_COST)}
-        </ContextMenuListItem>
+
+      {hasDownload && (hasTools || hasInfo || hasControl) && (
+        <ContextMenuSeparator />
       )}
+
       {onShowAgentTools && (
         <ContextMenuListItem
           testId="show-agent-tools-button"
           onClick={onShowAgentTools}
         >
-          {t(I18nKey.BUTTON$SHOW_AGENT_TOOLS_AND_METADATA)}
+          <ContextMenuIconText
+            icon={Wrench}
+            text={t(I18nKey.BUTTON$SHOW_AGENT_TOOLS_AND_METADATA)}
+          />
         </ContextMenuListItem>
       )}
+
       {onShowMicroagents && (
         <ContextMenuListItem
           testId="show-microagents-button"
           onClick={onShowMicroagents}
         >
-          {t(I18nKey.CONVERSATION$SHOW_MICROAGENTS)}
+          <ContextMenuIconText
+            icon={Bot}
+            text={t(I18nKey.CONVERSATION$SHOW_MICROAGENTS)}
+          />
+        </ContextMenuListItem>
+      )}
+
+      {hasTools && (hasInfo || hasControl) && <ContextMenuSeparator />}
+
+      {onDisplayCost && (
+        <ContextMenuListItem
+          testId="display-cost-button"
+          onClick={onDisplayCost}
+        >
+          <ContextMenuIconText
+            icon={Wallet}
+            text={t(I18nKey.BUTTON$DISPLAY_COST)}
+          />
+        </ContextMenuListItem>
+      )}
+
+      {hasInfo && hasControl && <ContextMenuSeparator />}
+
+      {onStop && (
+        <ContextMenuListItem testId="stop-button" onClick={onStop}>
+          <ContextMenuIconText icon={Power} text={t(I18nKey.BUTTON$STOP)} />
+        </ContextMenuListItem>
+      )}
+
+      {onDelete && (
+        <ContextMenuListItem testId="delete-button" onClick={onDelete}>
+          <ContextMenuIconText icon={Trash} text={t(I18nKey.BUTTON$DELETE)} />
         </ContextMenuListItem>
       )}
     </ContextMenu>

frontend/src/components/features/conversation-panel/conversation-card.tsx

@@ -35,6 +35,8 @@ interface ConversationCardProps {
   conversationStatus?: ConversationStatus;
   variant?: "compact" | "default";
   conversationId?: string; // Optional conversation ID for VS Code URL
+  contextMenuOpen?: boolean;
+  onContextMenuToggle?: (isOpen: boolean) => void;
 }
 
 const MAX_TIME_BETWEEN_CREATION_AND_UPDATE = 1000 * 60 * 30; // 30 minutes
@@ -55,10 +57,11 @@ export function ConversationCard({
   conversationStatus = "STOPPED",
   variant = "default",
   conversationId,
+  contextMenuOpen = false,
+  onContextMenuToggle,
 }: ConversationCardProps) {
   const { t } = useTranslation();
   const { parsedEvents } = useWsClient();
-  const [contextMenuVisible, setContextMenuVisible] = React.useState(false);
   const [titleMode, setTitleMode] = React.useState<"view" | "edit">("view");
   const [metricsModalVisible, setMetricsModalVisible] = React.useState(false);
   const [systemModalVisible, setSystemModalVisible] = React.useState(false);
@@ -101,21 +104,21 @@ export function ConversationCard({
     event.preventDefault();
     event.stopPropagation();
     onDelete?.();
-    setContextMenuVisible(false);
+    onContextMenuToggle?.(false);
   };
 
   const handleStop = (event: React.MouseEvent<HTMLButtonElement>) => {
     event.preventDefault();
     event.stopPropagation();
     onStop?.();
-    setContextMenuVisible(false);
+    onContextMenuToggle?.(false);
   };
 
   const handleEdit = (event: React.MouseEvent<HTMLButtonElement>) => {
     event.preventDefault();
     event.stopPropagation();
     setTitleMode("edit");
-    setContextMenuVisible(false);
+    onContextMenuToggle?.(false);
   };
 
   const handleDownloadViaVSCode = async (
@@ -141,7 +144,7 @@ export function ConversationCard({
       }
     }
 
-    setContextMenuVisible(false);
+    onContextMenuToggle?.(false);
   };
 
   const handleDisplayCost = (event: React.MouseEvent<HTMLButtonElement>) => {
@@ -224,15 +227,15 @@ export function ConversationCard({
                   onClick={(event) => {
                     event.preventDefault();
                     event.stopPropagation();
-                    setContextMenuVisible((prev) => !prev);
+                    onContextMenuToggle?.(!contextMenuOpen);
                   }}
                 />
               </div>
             )}
             <div className="relative">
-              {contextMenuVisible && (
+              {contextMenuOpen && (
                 <ConversationCardContextMenu
-                  onClose={() => setContextMenuVisible(false)}
+                  onClose={() => onContextMenuToggle?.(false)}
                   onDelete={onDelete && handleDelete}
                   onStop={
                     conversationStatus !== "STOPPED"

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

@@ -36,6 +36,9 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
   const [selectedConversationId, setSelectedConversationId] = React.useState<
     string | null
   >(null);
+  const [openContextMenuId, setOpenContextMenuId] = React.useState<
+    string | null
+  >(null);
 
   const { data: conversations, isFetching, error } = useUserConversations();
 
@@ -144,6 +147,10 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
               createdAt={project.created_at}
               conversationStatus={project.status}
               conversationId={project.conversation_id}
+              contextMenuOpen={openContextMenuId === project.conversation_id}
+              onContextMenuToggle={(isOpen) =>
+                setOpenContextMenuId(isOpen ? project.conversation_id : null)
+              }
             />
           )}
         </NavLink>

frontend/src/components/features/home/repo-selection-form.tsx

@@ -10,9 +10,6 @@ import { BrandButton } from "../settings/brand-button";
 import { useSearchRepositories } from "#/hooks/query/use-search-repositories";
 import { useDebounce } from "#/hooks/use-debounce";
 import { sanitizeQuery } from "#/utils/sanitize-query";
-import { useUserProviders } from "#/hooks/use-user-providers";
-import { Provider } from "#/types/settings";
-import { SettingsDropdownInput } from "../settings/settings-dropdown-input";
 import {
   RepositoryDropdown,
   RepositoryLoadingState,
@@ -35,10 +32,8 @@ export function RepositorySelectionForm({
   const [selectedBranch, setSelectedBranch] = React.useState<Branch | null>(
     null,
   );
-  const [selectedProvider, setSelectedProvider] = React.useState<Provider | null>(null);
   // Add a ref to track if the branch was manually cleared by the user
   const branchManuallyClearedRef = React.useRef<boolean>(false);
-  const { providers } = useUserProviders();
   const {
     data: repositories,
     isLoading: isLoadingRepositories,
@@ -61,13 +56,6 @@ export function RepositorySelectionForm({
   const debouncedSearchQuery = useDebounce(searchQuery, 300);
   const { data: searchedRepos } = useSearchRepositories(debouncedSearchQuery);
 
-  // Auto-select provider if there's only one
-  React.useEffect(() => {
-    if (providers.length === 1 && !selectedProvider) {
-      setSelectedProvider(providers[0]);
-    }
-  }, [providers, selectedProvider]);
-
   // Auto-select main or master branch if it exists, but only if the branch wasn't manually cleared
   React.useEffect(() => {
     if (
@@ -95,10 +83,8 @@ export function RepositorySelectionForm({
   const isCreatingConversation =
     isPending || isSuccess || isCreatingConversationElsewhere;
 
-  // Use all repositories without filtering by provider for now
   const allRepositories = repositories?.concat(searchedRepos || []);
-
-  const repositoriesItems = (allRepositories || []).map((repo) => ({
+  const repositoriesItems = allRepositories?.map((repo) => ({
     key: repo.id,
     label: decodeURIComponent(repo.full_name),
   }));
@@ -108,14 +94,6 @@ export function RepositorySelectionForm({
     label: branch.name,
   }));
 
-  // Create provider dropdown items
-  const providerItems = React.useMemo(() => {
-    return providers.map(provider => ({
-      key: provider,
-      label: provider.charAt(0).toUpperCase() + provider.slice(1), // Capitalize first letter
-    }));
-  }, [providers]);
-
   const handleRepoSelection = (key: React.Key | null) => {
     const selectedRepo = allRepositories?.find((repo) => repo.id === key);
     if (selectedRepo) onRepoSelection(selectedRepo);
@@ -124,14 +102,6 @@ export function RepositorySelectionForm({
     branchManuallyClearedRef.current = false; // Reset the flag when repo changes
   };
 
-  const handleProviderSelection = (key: React.Key | null) => {
-    const provider = key as Provider | null;
-    setSelectedProvider(provider);
-    setSelectedRepository(null); // Reset repository selection when provider changes
-    setSelectedBranch(null); // Reset branch selection when provider changes
-    onRepoSelection(null); // Reset parent component's selected repo
-  };
-
   const handleBranchSelection = (key: React.Key | null) => {
     const selectedBranchObj = branches?.find((branch) => branch.name === key);
     setSelectedBranch(selectedBranchObj || null);
@@ -163,26 +133,6 @@ export function RepositorySelectionForm({
     }
   };
 
-  // Render the provider dropdown
-  const renderProviderSelector = () => {
-    // Only render if there are multiple providers
-    if (providers.length <= 1) {
-      return null;
-    }
-
-    return (
-      <SettingsDropdownInput
-        testId="provider-dropdown"
-        name="provider-dropdown"
-        placeholder="Select Provider"
-        items={providerItems}
-        wrapperClassName="max-w-[500px]"
-        onSelectionChange={handleProviderSelection}
-        selectedKey={selectedProvider || undefined}
-      />
-    );
-  };
-
   // Render the appropriate UI based on the loading/error state
   const renderRepositorySelector = () => {
     if (isLoadingRepositories) {
@@ -193,15 +143,11 @@ export function RepositorySelectionForm({
       return <RepositoryErrorState />;
     }
 
-    // For now, don't disable the repo dropdown based on provider selection
-    const isDisabled = false;
-
     return (
       <RepositoryDropdown
         items={repositoriesItems || []}
         onSelectionChange={handleRepoSelection}
         onInputChange={handleRepoInputChange}
-        isDisabled={isDisabled}
         defaultFilter={(textValue, inputValue) => {
           if (!inputValue) return true;
 
@@ -249,8 +195,8 @@ export function RepositorySelectionForm({
 
   return (
     <div className="flex flex-col gap-4">
-      {renderProviderSelector()}
       {renderRepositorySelector()}
+
       {renderBranchSelector()}
 
       <BrandButton

frontend/src/components/features/home/repository-selection/branch-dropdown.tsx

@@ -1,7 +1,8 @@
-import React from "react";
+import React, { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { SettingsDropdownInput } from "../../settings/settings-dropdown-input";
 import { I18nKey } from "#/i18n/declaration";
+import { cn } from "#/utils/utils";
 
 export interface BranchDropdownProps {
   items: { key: React.Key; label: string }[];
@@ -9,6 +10,8 @@ export interface BranchDropdownProps {
   onInputChange: (value: string) => void;
   isDisabled: boolean;
   selectedKey?: string;
+  wrapperClassName?: string;
+  label?: ReactNode;
 }
 
 export function BranchDropdown({
@@ -17,6 +20,8 @@ export function BranchDropdown({
   onInputChange,
   isDisabled,
   selectedKey,
+  wrapperClassName,
+  label,
 }: BranchDropdownProps) {
   const { t } = useTranslation();
 
@@ -26,11 +31,12 @@ export function BranchDropdown({
       name="branch-dropdown"
       placeholder={t(I18nKey.REPOSITORY$SELECT_BRANCH)}
       items={items}
-      wrapperClassName="max-w-[500px]"
+      wrapperClassName={cn("max-w-[500px]", wrapperClassName)}
       onSelectionChange={onSelectionChange}
       onInputChange={onInputChange}
       isDisabled={isDisabled}
       selectedKey={selectedKey}
+      label={label}
     />
   );
 }

frontend/src/components/features/home/repository-selection/branch-error-state.tsx

@@ -1,12 +1,19 @@
-import React from "react";
 import { useTranslation } from "react-i18next";
+import { cn } from "#/utils/utils";
 
-export function BranchErrorState() {
+interface BranchErrorStateProps {
+  wrapperClassName?: string;
+}
+
+export function BranchErrorState({ wrapperClassName }: BranchErrorStateProps) {
   const { t } = useTranslation();
   return (
     <div
       data-testid="branch-dropdown-error"
-      className="flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm text-red-500"
+      className={cn(
+        "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm text-red-500",
+        wrapperClassName,
+      )}
     >
       <span className="text-sm">{t("HOME$FAILED_TO_LOAD_BRANCHES")}</span>
     </div>

frontend/src/components/features/home/repository-selection/branch-loading-state.tsx

@@ -1,13 +1,22 @@
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { Spinner } from "@heroui/react";
+import { cn } from "#/utils/utils";
 
-export function BranchLoadingState() {
+interface BranchLoadingStateProps {
+  wrapperClassName?: string;
+}
+
+export function BranchLoadingState({
+  wrapperClassName,
+}: BranchLoadingStateProps) {
   const { t } = useTranslation();
   return (
     <div
       data-testid="branch-dropdown-loading"
-      className="flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm"
+      className={cn(
+        "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm",
+        wrapperClassName,
+      )}
     >
       <Spinner size="sm" />
       <span className="text-sm">{t("HOME$LOADING_BRANCHES")}</span>

frontend/src/components/features/home/repository-selection/repository-dropdown.tsx

@@ -8,7 +8,6 @@ export interface RepositoryDropdownProps {
   onSelectionChange: (key: React.Key | null) => void;
   onInputChange: (value: string) => void;
   defaultFilter?: (textValue: string, inputValue: string) => boolean;
-  isDisabled?: boolean;
 }
 
 export function RepositoryDropdown({
@@ -16,7 +15,6 @@ export function RepositoryDropdown({
   onSelectionChange,
   onInputChange,
   defaultFilter,
-  isDisabled = false,
 }: RepositoryDropdownProps) {
   const { t } = useTranslation();
 
@@ -24,13 +22,12 @@ export function RepositoryDropdown({
     <SettingsDropdownInput
       testId="repo-dropdown"
       name="repo-dropdown"
-      placeholder={isDisabled ? t("Please select a provider first") : t(I18nKey.REPOSITORY$SELECT_REPO)}
+      placeholder={t(I18nKey.REPOSITORY$SELECT_REPO)}
       items={items}
       wrapperClassName="max-w-[500px]"
       onSelectionChange={onSelectionChange}
       onInputChange={onInputChange}
       defaultFilter={defaultFilter}
-      isDisabled={isDisabled}
     />
   );
 }

frontend/src/components/features/maintenance/maintenance-banner.tsx

@@ -0,0 +1,69 @@
+import { useTranslation } from "react-i18next";
+import { FaTriangleExclamation } from "react-icons/fa6";
+
+interface MaintenanceBannerProps {
+  startTime: string;
+}
+
+export function MaintenanceBanner({ startTime }: MaintenanceBannerProps) {
+  const { t } = useTranslation();
+  // Convert EST timestamp to user's local timezone
+  const formatMaintenanceTime = (estTimeString: string): string => {
+    try {
+      // Parse the EST timestamp
+      // If the string doesn't include timezone info, assume it's EST
+      let dateToFormat: Date;
+
+      if (
+        estTimeString.includes("T") &&
+        (estTimeString.includes("-05:00") ||
+          estTimeString.includes("-04:00") ||
+          estTimeString.includes("EST") ||
+          estTimeString.includes("EDT"))
+      ) {
+        // Already has timezone info
+        dateToFormat = new Date(estTimeString);
+      } else {
+        // Assume EST and convert to UTC for proper parsing
+        // EST is UTC-5, EDT is UTC-4, but we'll assume EST for simplicity
+        const estDate = new Date(estTimeString);
+        if (Number.isNaN(estDate.getTime())) {
+          throw new Error("Invalid date");
+        }
+        dateToFormat = estDate;
+      }
+
+      // Format to user's local timezone
+      return dateToFormat.toLocaleString(undefined, {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+        hour: "2-digit",
+        minute: "2-digit",
+        timeZoneName: "short",
+      });
+    } catch (error) {
+      // Fallback to original string if parsing fails
+      // eslint-disable-next-line no-console
+      console.warn("Failed to parse maintenance time:", error);
+      return estTimeString;
+    }
+  };
+
+  const localTime = formatMaintenanceTime(startTime);
+
+  return (
+    <div className="bg-primary text-[#0D0F11] p-4 rounded">
+      <div className="flex items-center">
+        <div className="flex-shrink-0">
+          <FaTriangleExclamation className="text-white align-middle" />
+        </div>
+        <div className="ml-3">
+          <p className="text-sm font-medium">
+            {t("MAINTENANCE$SCHEDULED_MESSAGE", { time: localTime })}
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-accordion-title.tsx

@@ -0,0 +1,30 @@
+import { GitProviderIcon } from "#/components/shared/git-provider-icon";
+import { GitRepository } from "#/types/git";
+import { MicroagentManagementAddMicroagentButton } from "./microagent-management-add-microagent-button";
+import { TooltipButton } from "#/components/shared/buttons/tooltip-button";
+
+interface MicroagentManagementAccordionTitleProps {
+  repository: GitRepository;
+}
+
+export function MicroagentManagementAccordionTitle({
+  repository,
+}: MicroagentManagementAccordionTitleProps) {
+  return (
+    <div className="flex items-center justify-between">
+      <div className="flex items-center gap-2">
+        <GitProviderIcon gitProvider={repository.git_provider} />
+        <TooltipButton
+          tooltip={repository.full_name}
+          ariaLabel={repository.full_name}
+          className="text-white text-base font-normal bg-transparent p-0 min-w-0 h-auto cursor-pointer truncate max-w-[232px]"
+          testId="repository-name-tooltip"
+          placement="bottom"
+        >
+          <span>{repository.full_name}</span>
+        </TooltipButton>
+      </div>
+      <MicroagentManagementAddMicroagentButton repository={repository} />
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-add-microagent-button.tsx

@@ -1,10 +1,22 @@
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 import { I18nKey } from "#/i18n/declaration";
-import { setAddMicroagentModalVisible } from "#/state/microagent-management-slice";
+import {
+  setAddMicroagentModalVisible,
+  setSelectedRepository,
+} from "#/state/microagent-management-slice";
 import { RootState } from "#/store";
+import { GitRepository } from "#/types/git";
+import PlusIcon from "#/icons/plus.svg?react";
+import { TooltipButton } from "#/components/shared/buttons/tooltip-button";
 
-export function MicroagentManagementAddMicroagentButton() {
+interface MicroagentManagementAddMicroagentButtonProps {
+  repository: GitRepository;
+}
+
+export function MicroagentManagementAddMicroagentButton({
+  repository,
+}: MicroagentManagementAddMicroagentButtonProps) {
   const { t } = useTranslation();
 
   const { addMicroagentModalVisible } = useSelector(
@@ -13,17 +25,23 @@ export function MicroagentManagementAddMicroagentButton() {
 
   const dispatch = useDispatch();
 
-  const handleClick = () => {
+  const handleClick = (e: React.MouseEvent<HTMLDivElement>) => {
+    e.stopPropagation();
     dispatch(setAddMicroagentModalVisible(!addMicroagentModalVisible));
+    dispatch(setSelectedRepository(repository));
   };
 
   return (
-    <button
-      type="button"
-      className="text-sm font-normal text-[#8480FF] cursor-pointer"
-      onClick={handleClick}
-    >
-      {t(I18nKey.COMMON$ADD_MICROAGENT)}
-    </button>
+    <div onClick={handleClick}>
+      <TooltipButton
+        tooltip={t(I18nKey.COMMON$ADD_MICROAGENT)}
+        ariaLabel={t(I18nKey.COMMON$ADD_MICROAGENT)}
+        className="p-0 min-w-0 h-6 w-6 flex items-center justify-center bg-transparent cursor-pointer"
+        testId="add-microagent-button"
+        placement="bottom"
+      >
+        <PlusIcon width={22} height={22} />
+      </TooltipButton>
+    </div>
   );
 }

frontend/src/components/features/microagent-management/microagent-management-add-microagent-modal.tsx

@@ -1,148 +0,0 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useSelector } from "react-redux";
-import { FaCircleInfo } from "react-icons/fa6";
-import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
-import { ModalBody } from "#/components/shared/modals/modal-body";
-import { BrandButton } from "../settings/brand-button";
-import { I18nKey } from "#/i18n/declaration";
-import { RootState } from "#/store";
-import XIcon from "#/icons/x.svg?react";
-import { cn } from "#/utils/utils";
-import { BadgeInput } from "#/components/shared/inputs/badge-input";
-
-interface MicroagentManagementAddMicroagentModalProps {
-  onConfirm: () => void;
-  onCancel: () => void;
-}
-
-export function MicroagentManagementAddMicroagentModal({
-  onConfirm,
-  onCancel,
-}: MicroagentManagementAddMicroagentModalProps) {
-  const { t } = useTranslation();
-
-  const [triggers, setTriggers] = useState<string[]>([]);
-
-  const { selectedRepository } = useSelector(
-    (state: RootState) => state.microagentManagement,
-  );
-
-  const modalTitle = selectedRepository
-    ? `${t(I18nKey.MICROAGENT_MANAGEMENT$ADD_A_MICROAGENT_TO)} ${selectedRepository}`
-    : t(I18nKey.MICROAGENT_MANAGEMENT$ADD_A_MICROAGENT);
-
-  const onSubmit = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-  };
-
-  return (
-    <ModalBackdrop>
-      <ModalBody className="items-start rounded-[12px] p-6 min-w-[611px]">
-        <div className="flex flex-col gap-2 w-full">
-          <div className="flex justify-between items-center">
-            <div className="flex items-center gap-2">
-              <h2 className="text-white text-xl font-medium">{modalTitle}</h2>
-              <a
-                href="https://docs.all-hands.dev/usage/prompting/microagents-overview#microagents-overview"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <FaCircleInfo className="text-primary" />
-              </a>
-            </div>
-            <button type="button" onClick={onCancel} className="cursor-pointer">
-              <XIcon width={24} height={24} color="#F9FBFE" />
-            </button>
-          </div>
-          <span className="text-white text-sm font-normal">
-            {t(I18nKey.MICROAGENT_MANAGEMENT$ADD_MICROAGENT_MODAL_DESCRIPTION)}
-          </span>
-        </div>
-        <form
-          data-testid="add-microagent-modal"
-          onSubmit={onSubmit}
-          className="flex flex-col gap-6 w-full"
-        >
-          <label
-            htmlFor="query-input"
-            className="flex flex-col gap-2 w-full text-sm font-normal"
-          >
-            {t(I18nKey.MICROAGENT_MANAGEMENT$WHAT_TO_DO)}
-            <textarea
-              required
-              data-testid="query-input"
-              name="query-input"
-              placeholder={t(I18nKey.MICROAGENT_MANAGEMENT$DESCRIBE_WHAT_TO_DO)}
-              rows={6}
-              className={cn(
-                "bg-tertiary border border-[#717888] bg-[#454545] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt resize-none",
-                "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
-              )}
-            />
-            <div className="flex items-center gap-2 text-[11px] font-normal text-white leading-[16px]">
-              <span className="font-semibold">
-                {t(I18nKey.COMMON$FOR_EXAMPLE)}:
-              </span>
-              <span className="underline">
-                {t(I18nKey.COMMON$TEST_DB_MIGRATION)}
-              </span>
-              <span className="underline">{t(I18nKey.COMMON$RUN_TEST)}</span>
-              <span className="underline">{t(I18nKey.COMMON$RUN_APP)}</span>
-              <span className="underline">
-                {t(I18nKey.COMMON$LEARN_FILE_STRUCTURE)}
-              </span>
-            </div>
-          </label>
-          <label
-            htmlFor="trigger-input"
-            className="flex flex-col gap-2.5 w-full text-sm"
-          >
-            <div className="flex items-center gap-2">
-              {t(I18nKey.MICROAGENT_MANAGEMENT$ADD_TRIGGERS)}
-              <a
-                href="https://docs.all-hands.dev/usage/prompting/microagents-keyword"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <FaCircleInfo className="text-primary" />
-              </a>
-            </div>
-            <BadgeInput
-              name="trigger-input"
-              value={triggers}
-              placeholder={t("MICROAGENT$TYPE_TRIGGER_SPACE")}
-              onChange={setTriggers}
-            />
-            <span className="text-xs text-[#ffffff80] font-normal">
-              {t(
-                I18nKey.MICROAGENT_MANAGEMENT$HELP_TEXT_DESCRIBING_VALID_TRIGGERS,
-              )}
-            </span>
-          </label>
-        </form>
-        <div
-          className="flex items-center justify-end gap-2 w-full"
-          onClick={(event) => event.stopPropagation()}
-        >
-          <BrandButton
-            type="button"
-            variant="secondary"
-            onClick={onCancel}
-            data-testid="cancel-button"
-          >
-            {t(I18nKey.BUTTON$CANCEL)}
-          </BrandButton>
-          <BrandButton
-            type="button"
-            variant="primary"
-            onClick={onConfirm}
-            data-testid="confirm-button"
-          >
-            {t(I18nKey.MICROAGENT$LAUNCH)}
-          </BrandButton>
-        </div>
-      </ModalBody>
-    </ModalBackdrop>
-  );
-}

frontend/src/components/features/microagent-management/microagent-management-content.tsx

@@ -0,0 +1,315 @@
+import React, { useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { MicroagentManagementSidebar } from "./microagent-management-sidebar";
+import { MicroagentManagementMain } from "./microagent-management-main";
+import { MicroagentManagementUpsertMicroagentModal } from "./microagent-management-upsert-microagent-modal";
+import { RootState } from "#/store";
+import {
+  setAddMicroagentModalVisible,
+  setUpdateMicroagentModalVisible,
+  setLearnThisRepoModalVisible,
+} from "#/state/microagent-management-slice";
+import { useCreateConversationAndSubscribeMultiple } from "#/hooks/use-create-conversation-and-subscribe-multiple";
+import {
+  LearnThisRepoFormData,
+  MicroagentFormData,
+} from "#/types/microagent-management";
+import { AgentState } from "#/types/agent-state";
+import { getPR, getProviderName, getPRShort } from "#/utils/utils";
+import {
+  isOpenHandsEvent,
+  isAgentStateChangeObservation,
+  isFinishAction,
+} from "#/types/core/guards";
+import { GitRepository } from "#/types/git";
+import { queryClient } from "#/query-client-config";
+import { Provider } from "#/types/settings";
+import { MicroagentManagementLearnThisRepoModal } from "./microagent-management-learn-this-repo-modal";
+
+// Handle error events
+const isErrorEvent = (evt: unknown): evt is { error: true; message: string } =>
+  typeof evt === "object" &&
+  evt !== null &&
+  "error" in evt &&
+  evt.error === true;
+
+const isAgentStatusError = (evt: unknown): boolean =>
+  isOpenHandsEvent(evt) &&
+  isAgentStateChangeObservation(evt) &&
+  evt.extras.agent_state === AgentState.ERROR;
+
+const shouldInvalidateConversationsList = (currentSocketEvent: unknown) => {
+  const hasError =
+    isErrorEvent(currentSocketEvent) || isAgentStatusError(currentSocketEvent);
+  const hasStateChanged =
+    isOpenHandsEvent(currentSocketEvent) &&
+    isAgentStateChangeObservation(currentSocketEvent);
+  const hasFinished =
+    isOpenHandsEvent(currentSocketEvent) && isFinishAction(currentSocketEvent);
+
+  return hasError || hasStateChanged || hasFinished;
+};
+
+const getConversationInstructions = (
+  repositoryName: string,
+  formData: MicroagentFormData,
+  pr: string,
+  prShort: string,
+  gitProvider: Provider,
+) => `Create a microagent for the repository ${repositoryName} by following the steps below:
+
+- Step 1: Create a markdown file inside the .openhands/microagents folder with the name of the microagent (The microagent must be created in the .openhands/microagents folder and should be able to perform the described task when triggered).
+
+- This is the instructions about what the microagent should do: ${formData.query}
+
+${
+  formData.triggers && formData.triggers.length > 0
+    ? `
+- This is the triggers of the microagent: ${formData.triggers.join(", ")}
+`
+    : "- Please be noted that the microagent doesn't have any triggers."
+}
+
+- Step 2: Create a new branch for the repository ${repositoryName}, must avoid duplicated branches.
+
+- Step 3: Please push the changes to your branch on ${getProviderName(gitProvider)} and create a ${pr}. Please create a meaningful branch name that describes the changes. If a ${pr} template exists in the repository, please follow it when creating the ${prShort} description.
+`;
+
+const getUpdateConversationInstructions = (
+  repositoryName: string,
+  formData: MicroagentFormData,
+  pr: string,
+  prShort: string,
+  gitProvider: Provider,
+) => `Update the microagent for the repository ${repositoryName} by following the steps below:
+
+
+- Step 1: Update the microagent. This is the path of the microagent: ${formData.microagentPath} (The updated microagent must be in the .openhands/microagents folder and should be able to perform the described task when triggered).
+
+- This is the updated instructions about what the microagent should do: ${formData.query}
+
+${
+  formData.triggers && formData.triggers.length > 0
+    ? `
+- This is the triggers of the microagent: ${formData.triggers.join(", ")}
+`
+    : "- Please be noted that the microagent doesn't have any triggers."
+}
+
+- Step 2: Create a new branch for the repository ${repositoryName}, must avoid duplicated branches.
+
+- Step 3: Please push the changes to your branch on ${getProviderName(gitProvider)} and create a ${pr}. Please create a meaningful branch name that describes the changes. If a ${pr} template exists in the repository, please follow it when creating the ${prShort} description.
+`;
+
+export function MicroagentManagementContent() {
+  // Responsive width state
+  const [width, setWidth] = useState(window.innerWidth);
+
+  const {
+    addMicroagentModalVisible,
+    updateMicroagentModalVisible,
+    selectedRepository,
+    learnThisRepoModalVisible,
+  } = useSelector((state: RootState) => state.microagentManagement);
+
+  const dispatch = useDispatch();
+
+  const { createConversationAndSubscribe, isPending } =
+    useCreateConversationAndSubscribeMultiple();
+
+  function handleResize() {
+    setWidth(window.innerWidth);
+  }
+
+  useEffect(() => {
+    window.addEventListener("resize", handleResize);
+    return () => {
+      window.removeEventListener("resize", handleResize);
+    };
+  }, []);
+
+  const hideUpsertMicroagentModal = (isUpdate: boolean = false) => {
+    if (isUpdate) {
+      dispatch(setUpdateMicroagentModalVisible(false));
+    } else {
+      dispatch(setAddMicroagentModalVisible(false));
+    }
+  };
+
+  // Reusable function to invalidate conversations list for a repository
+  const invalidateConversationsList = React.useCallback(
+    (repositoryName: string) => {
+      queryClient.invalidateQueries({
+        queryKey: [
+          "conversations",
+          "search",
+          repositoryName,
+          "microagent_management",
+        ],
+      });
+    },
+    [],
+  );
+
+  const handleMicroagentEvent = React.useCallback(
+    (socketEvent: unknown) => {
+      // Get repository name from selectedRepository for invalidation
+      const repositoryName =
+        selectedRepository && typeof selectedRepository === "object"
+          ? (selectedRepository as GitRepository).full_name
+          : "";
+
+      if (shouldInvalidateConversationsList(socketEvent)) {
+        invalidateConversationsList(repositoryName);
+      }
+    },
+    [invalidateConversationsList, selectedRepository],
+  );
+
+  const handleUpsertMicroagent = (
+    formData: MicroagentFormData,
+    isUpdate: boolean = false,
+  ) => {
+    if (!selectedRepository || typeof selectedRepository !== "object") {
+      return;
+    }
+
+    // Use the GitRepository properties
+    const repository = selectedRepository as GitRepository;
+    const repositoryName = repository.full_name;
+    const gitProvider = repository.git_provider;
+
+    const isGitLab = gitProvider === "gitlab";
+
+    const pr = getPR(isGitLab);
+    const prShort = getPRShort(isGitLab);
+
+    // Create conversation instructions for microagent generation or update
+    const conversationInstructions = isUpdate
+      ? getUpdateConversationInstructions(
+          repositoryName,
+          formData,
+          pr,
+          prShort,
+          gitProvider,
+        )
+      : getConversationInstructions(
+          repositoryName,
+          formData,
+          pr,
+          prShort,
+          gitProvider,
+        );
+
+    // Create the CreateMicroagent object
+    const createMicroagent = {
+      repo: repositoryName,
+      git_provider: gitProvider,
+      title: formData.query,
+    };
+
+    createConversationAndSubscribe({
+      query: conversationInstructions,
+      conversationInstructions,
+      repository: {
+        name: repositoryName,
+        branch: formData.selectedBranch,
+        gitProvider,
+      },
+      createMicroagent,
+      onSuccessCallback: () => {
+        // Invalidate conversations list to fetch the latest conversations for this repository
+        invalidateConversationsList(repositoryName);
+
+        // Also invalidate microagents list to fetch the latest microagents
+        // Extract owner and repo from full_name (format: "owner/repo")
+        const [owner, repo] = repositoryName.split("/");
+        queryClient.invalidateQueries({
+          queryKey: ["repository-microagents", owner, repo],
+        });
+
+        hideUpsertMicroagentModal(isUpdate);
+      },
+      onEventCallback: (event: unknown) => {
+        // Handle conversation events for real-time status updates
+        handleMicroagentEvent(event);
+      },
+    });
+  };
+
+  const hideLearnThisRepoModal = () => {
+    dispatch(setLearnThisRepoModalVisible(false));
+  };
+
+  const handleLearnThisRepoConfirm = (formData: LearnThisRepoFormData) => {
+    if (!selectedRepository || typeof selectedRepository !== "object") {
+      return;
+    }
+
+    const repository = selectedRepository as GitRepository;
+    const repositoryName = repository.full_name;
+    const gitProvider = repository.git_provider;
+
+    // Launch a new conversation to help the user understand the repo
+    createConversationAndSubscribe({
+      query: formData.query,
+      conversationInstructions: formData.query,
+      repository: {
+        name: repositoryName,
+        branch: formData.selectedBranch,
+        gitProvider,
+      },
+      onSuccessCallback: () => {
+        hideLearnThisRepoModal();
+      },
+    });
+  };
+
+  const renderModals = () => (
+    <>
+      {(addMicroagentModalVisible || updateMicroagentModalVisible) && (
+        <MicroagentManagementUpsertMicroagentModal
+          onConfirm={(formData) =>
+            handleUpsertMicroagent(formData, updateMicroagentModalVisible)
+          }
+          onCancel={() =>
+            hideUpsertMicroagentModal(updateMicroagentModalVisible)
+          }
+          isLoading={isPending}
+          isUpdate={updateMicroagentModalVisible}
+        />
+      )}
+      {learnThisRepoModalVisible && (
+        <MicroagentManagementLearnThisRepoModal
+          onCancel={hideLearnThisRepoModal}
+          onConfirm={handleLearnThisRepoConfirm}
+          isLoading={isPending}
+        />
+      )}
+    </>
+  );
+
+  if (width < 1024) {
+    return (
+      <div className="w-full h-full flex flex-col gap-6">
+        <div className="w-full rounded-lg border border-[#525252] bg-[#24272E] max-h-[494px] min-h-[494px]">
+          <MicroagentManagementSidebar isSmallerScreen />
+        </div>
+        <div className="w-full rounded-lg border border-[#525252] bg-[#24272E] flex-1 min-h-[494px]">
+          <MicroagentManagementMain />
+        </div>
+        {renderModals()}
+      </div>
+    );
+  }
+
+  return (
+    <div className="w-full h-full flex rounded-lg border border-[#525252] bg-[#24272E] overflow-hidden">
+      <MicroagentManagementSidebar />
+      <div className="flex-1">
+        <MicroagentManagementMain />
+      </div>
+      {renderModals()}
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-conversation-stopped.tsx

@@ -0,0 +1,44 @@
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+import { RootState } from "#/store";
+import { I18nKey } from "#/i18n/declaration";
+import { BrandButton } from "../settings/brand-button";
+import { Loader } from "#/components/shared/loader";
+
+export function MicroagentManagementConversationStopped() {
+  const { t } = useTranslation();
+
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { conversation } = selectedMicroagentItem ?? {};
+
+  const { conversation_id: conversationId } = conversation ?? {};
+
+  if (!conversationId) {
+    return null;
+  }
+
+  return (
+    <div className="flex-1 flex flex-col h-full items-center justify-center">
+      <div className="text-[#ffffff99] text-[22px] font-bold pb-[22px] text-center max-w-[455px]">
+        {t(I18nKey.MICROAGENT_MANAGEMENT$CONVERSATION_STOPPED)}
+      </div>
+      <Loader size="small" className="pb-[22px]" />
+      <a
+        href={`/conversations/${conversationId}`}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <BrandButton
+          type="button"
+          variant="secondary"
+          testId="view-conversation-button"
+        >
+          {t(I18nKey.MICROAGENT$VIEW_CONVERSATION)}
+        </BrandButton>
+      </a>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-default.tsx

@@ -0,0 +1,19 @@
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+
+export function MicroagentManagementDefault() {
+  const { t } = useTranslation();
+
+  return (
+    <div className="flex-1 flex flex-col h-full items-center justify-center">
+      <div className="text-[#F9FBFE] text-xl font-bold pb-4">
+        {t(I18nKey.MICROAGENT_MANAGEMENT$READY_TO_ADD_MICROAGENT)}
+      </div>
+      <div className="text-white text-sm font-normal text-center max-w-[455px]">
+        {t(
+          I18nKey.MICROAGENT_MANAGEMENT$OPENHANDS_CAN_LEARN_ABOUT_REPOSITORIES,
+        )}
+      </div>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-error.tsx

@@ -0,0 +1,44 @@
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+import { RootState } from "#/store";
+import { I18nKey } from "#/i18n/declaration";
+import { BrandButton } from "../settings/brand-button";
+import { Loader } from "#/components/shared/loader";
+
+export function MicroagentManagementError() {
+  const { t } = useTranslation();
+
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { conversation } = selectedMicroagentItem ?? {};
+
+  const { conversation_id: conversationId } = conversation ?? {};
+
+  if (!conversationId) {
+    return null;
+  }
+
+  return (
+    <div className="flex-1 flex flex-col h-full items-center justify-center">
+      <div className="text-[#ffffff99] text-[22px] font-bold pb-[22px] text-center max-w-[455px]">
+        {t(I18nKey.MICROAGENT_MANAGEMENT$ERROR)}
+      </div>
+      <Loader size="small" className="pb-[22px]" />
+      <a
+        href={`/conversations/${conversationId}`}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <BrandButton
+          type="button"
+          variant="secondary"
+          testId="view-conversation-button"
+        >
+          {t(I18nKey.MICROAGENT$VIEW_CONVERSATION)}
+        </BrandButton>
+      </a>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-learn-this-repo-modal.tsx

@@ -0,0 +1,262 @@
+import { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+import { FaCircleInfo } from "react-icons/fa6";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { ModalBody } from "#/components/shared/modals/modal-body";
+import { BrandButton } from "../settings/brand-button";
+import { I18nKey } from "#/i18n/declaration";
+import { RootState } from "#/store";
+import XIcon from "#/icons/x.svg?react";
+import { cn } from "#/utils/utils";
+import { LearnThisRepoFormData } from "#/types/microagent-management";
+import { Branch } from "#/types/git";
+import { useRepositoryBranches } from "#/hooks/query/use-repository-branches";
+import {
+  BranchDropdown,
+  BranchLoadingState,
+  BranchErrorState,
+} from "../home/repository-selection";
+
+interface MicroagentManagementLearnThisRepoModalProps {
+  onConfirm: (formData: LearnThisRepoFormData) => void;
+  onCancel: () => void;
+  isLoading: boolean;
+}
+
+export function MicroagentManagementLearnThisRepoModal({
+  onConfirm,
+  onCancel,
+  isLoading = false,
+}: MicroagentManagementLearnThisRepoModalProps) {
+  const { t } = useTranslation();
+
+  const [query, setQuery] = useState<string>("");
+  const [selectedBranch, setSelectedBranch] = useState<Branch | null>(null);
+
+  const { selectedRepository } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  // Add a ref to track if the branch was manually cleared by the user
+  const branchManuallyClearedRef = useRef<boolean>(false);
+
+  const {
+    data: branches,
+    isLoading: isLoadingBranches,
+    isError: isBranchesError,
+  } = useRepositoryBranches(selectedRepository?.full_name || null);
+
+  const branchesItems = branches?.map((branch) => ({
+    key: branch.name,
+    label: branch.name,
+  }));
+
+  // Auto-select main or master branch if it exists.
+  useEffect(() => {
+    if (
+      branches &&
+      branches.length > 0 &&
+      !selectedBranch &&
+      !isLoadingBranches
+    ) {
+      // Look for main or master branch
+      const mainBranch = branches.find((branch) => branch.name === "main");
+      const masterBranch = branches.find((branch) => branch.name === "master");
+
+      // Select main if it exists, otherwise select master if it exists
+      if (mainBranch) {
+        setSelectedBranch(mainBranch);
+      } else if (masterBranch) {
+        setSelectedBranch(masterBranch);
+      }
+    }
+  }, [branches, isLoadingBranches, selectedBranch]);
+
+  const onSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+
+    if (!query.trim()) {
+      return;
+    }
+
+    onConfirm({
+      query: query.trim(),
+      selectedBranch: selectedBranch?.name || "",
+    });
+  };
+
+  const handleConfirm = () => {
+    if (!query.trim()) {
+      return;
+    }
+
+    onConfirm({
+      query: query.trim(),
+      selectedBranch: selectedBranch?.name || "",
+    });
+  };
+
+  const handleBranchSelection = (key: React.Key | null) => {
+    const selectedBranchObj = branches?.find((branch) => branch.name === key);
+    setSelectedBranch(selectedBranchObj || null);
+    // Reset the manually cleared flag when a branch is explicitly selected
+    branchManuallyClearedRef.current = false;
+  };
+
+  const handleBranchInputChange = (value: string) => {
+    // Clear the selected branch if the input is empty or contains only whitespace
+    // This fixes the issue where users can't delete the entire default branch name
+    if (value === "" || value.trim() === "") {
+      setSelectedBranch(null);
+      // Set the flag to indicate that the branch was manually cleared
+      branchManuallyClearedRef.current = true;
+    } else {
+      // Reset the flag when the user starts typing again
+      branchManuallyClearedRef.current = false;
+    }
+  };
+
+  // Render the appropriate UI for branch selector based on the loading/error state
+  const renderBranchSelector = () => {
+    if (!selectedRepository) {
+      return (
+        <BranchDropdown
+          items={[]}
+          onSelectionChange={() => {}}
+          onInputChange={() => {}}
+          isDisabled
+          wrapperClassName="max-w-full w-full"
+          label={t(I18nKey.REPOSITORY$SELECT_BRANCH)}
+        />
+      );
+    }
+
+    if (isLoadingBranches) {
+      return <BranchLoadingState wrapperClassName="max-w-full w-full" />;
+    }
+
+    if (isBranchesError) {
+      return <BranchErrorState wrapperClassName="max-w-full w-full" />;
+    }
+
+    return (
+      <BranchDropdown
+        items={branchesItems || []}
+        onSelectionChange={handleBranchSelection}
+        onInputChange={handleBranchInputChange}
+        isDisabled={false}
+        selectedKey={selectedBranch?.name}
+        wrapperClassName="max-w-full w-full"
+        label={t(I18nKey.REPOSITORY$SELECT_BRANCH)}
+      />
+    );
+  };
+
+  return (
+    <ModalBackdrop onClose={onCancel}>
+      <ModalBody
+        className="items-start rounded-[12px] p-6 min-w-[611px]"
+        data-testid="learn-this-repo-modal"
+      >
+        <div className="flex flex-col gap-2 w-full">
+          <div className="flex justify-between items-center">
+            <div className="flex items-center gap-2">
+              <h2
+                className="text-white text-xl font-medium"
+                data-testid="modal-title"
+              >
+                {t(I18nKey.MICROAGENT_MANAGEMENT$LEARN_THIS_REPO_MODAL_TITLE)}
+              </h2>
+              <a
+                href="https://docs.all-hands.dev/usage/prompting/microagents-overview#microagents-overview"
+                target="_blank"
+                rel="noopener noreferrer"
+                data-testid="modal-info-link"
+              >
+                <FaCircleInfo className="text-primary" />
+              </a>
+            </div>
+            <button
+              type="button"
+              onClick={onCancel}
+              className="cursor-pointer"
+              data-testid="modal-close-button"
+            >
+              <XIcon width={24} height={24} color="#F9FBFE" />
+            </button>
+          </div>
+          <span
+            className="text-white text-sm font-normal"
+            data-testid="modal-description"
+          >
+            {t(I18nKey.MICROAGENT_MANAGEMENT$LEARN_THIS_REPO_MODAL_DESCRIPTION)}
+          </span>
+        </div>
+        <form
+          data-testid="learn-this-repo-form"
+          onSubmit={onSubmit}
+          className="flex flex-col gap-6 w-full"
+        >
+          <div data-testid="branch-selector-container">
+            {renderBranchSelector()}
+          </div>
+          <label
+            htmlFor="query-input"
+            className="flex flex-col gap-2 w-full text-sm font-normal"
+          >
+            {t(
+              I18nKey.MICROAGENT_MANAGEMENT$WHAT_YOU_WOULD_LIKE_TO_KNOW_ABOUT_THIS_REPO,
+            )}
+            <textarea
+              required
+              data-testid="query-input"
+              name="query-input"
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+              placeholder={t(
+                I18nKey.MICROAGENT_MANAGEMENT$DESCRIBE_WHAT_TO_KNOW_ABOUT_THIS_REPO,
+              )}
+              rows={6}
+              className={cn(
+                "bg-tertiary border border-[#717888] bg-[#454545] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt resize-none",
+                "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+              )}
+            />
+          </label>
+        </form>
+        <div
+          className="flex items-center justify-end gap-2 w-full"
+          onClick={(event) => event.stopPropagation()}
+          data-testid="modal-actions"
+        >
+          <BrandButton
+            type="button"
+            variant="secondary"
+            onClick={onCancel}
+            testId="cancel-button"
+          >
+            {t(I18nKey.BUTTON$CANCEL)}
+          </BrandButton>
+          <BrandButton
+            type="button"
+            variant="primary"
+            onClick={handleConfirm}
+            testId="confirm-button"
+            isDisabled={
+              !query.trim() ||
+              isLoading ||
+              isLoadingBranches ||
+              !selectedBranch ||
+              isBranchesError
+            }
+          >
+            {isLoading || isLoadingBranches
+              ? t(I18nKey.HOME$LOADING)
+              : t(I18nKey.MICROAGENT$LAUNCH)}
+          </BrandButton>
+        </div>
+      </ModalBody>
+    </ModalBackdrop>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-learn-this-repo.tsx

@@ -1,25 +1,36 @@
+import { useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { I18nKey } from "#/i18n/declaration";
+import {
+  setLearnThisRepoModalVisible,
+  setSelectedRepository,
+} from "#/state/microagent-management-slice";
+import { GitRepository } from "#/types/git";
 
 interface MicroagentManagementLearnThisRepoProps {
-  repositoryUrl: string;
+  repository: GitRepository;
 }
 
 export function MicroagentManagementLearnThisRepo({
-  repositoryUrl,
+  repository,
 }: MicroagentManagementLearnThisRepoProps) {
+  const dispatch = useDispatch();
   const { t } = useTranslation();
 
+  const handleClick = () => {
+    dispatch(setLearnThisRepoModalVisible(true));
+    dispatch(setSelectedRepository(repository));
+  };
+
   return (
-    <div className="flex items-center justify-center rounded-lg bg-[#ffffff0d] border border-dashed border-[#ffffff4d] p-4 hover:bg-[#ffffff33] hover:border-[#C9B974] transition-all duration-300 cursor-pointer">
-      <a
-        className="text-[16px] font-normal text-[#8480FF]"
-        href={repositoryUrl}
-        target="_blank"
-        rel="noopener noreferrer"
-      >
+    <div
+      className="flex items-center justify-center rounded-lg bg-[#ffffff0d] border border-dashed border-[#ffffff4d] p-4 hover:bg-[#ffffff33] hover:border-[#C9B974] transition-all duration-300 cursor-pointer"
+      onClick={handleClick}
+      data-testid="learn-this-repo-trigger"
+    >
+      <span className="text-[16px] font-normal text-[#8480FF]">
         {t(I18nKey.MICROAGENT_MANAGEMENT$LEARN_THIS_REPO)}
-      </a>
+      </span>
     </div>
   );
 }

frontend/src/components/features/microagent-management/microagent-management-main.tsx

@@ -1,29 +1,52 @@
 import { useSelector } from "react-redux";
-import { useTranslation } from "react-i18next";
 import { RootState } from "#/store";
-import { I18nKey } from "#/i18n/declaration";
+import { MicroagentManagementDefault } from "./microagent-management-default";
+import { MicroagentManagementOpeningPr } from "./microagent-management-opening-pr";
+import { MicroagentManagementReviewPr } from "./microagent-management-review-pr";
+import { MicroagentManagementViewMicroagent } from "./microagent-management-view-microagent";
+import { MicroagentManagementError } from "./microagent-management-error";
+import { MicroagentManagementConversationStopped } from "./microagent-management-conversation-stopped";
 
 export function MicroagentManagementMain() {
-  const { t } = useTranslation();
-
-  const { selectedMicroagent } = useSelector(
+  const { selectedMicroagentItem } = useSelector(
     (state: RootState) => state.microagentManagement,
   );
 
-  if (!selectedMicroagent) {
-    return (
-      <div className="flex-1 flex flex-col h-full items-center justify-center">
-        <div className="text-[#F9FBFE] text-xl font-bold pb-4">
-          {t(I18nKey.MICROAGENT_MANAGEMENT$READY_TO_ADD_MICROAGENT)}
-        </div>
-        <div className="text-white text-sm font-normal text-center max-w-[455px]">
-          {t(
-            I18nKey.MICROAGENT_MANAGEMENT$OPENHANDS_CAN_LEARN_ABOUT_REPOSITORIES,
-          )}
-        </div>
-      </div>
-    );
+  const { microagent, conversation } = selectedMicroagentItem ?? {};
+
+  if (microagent) {
+    return <MicroagentManagementViewMicroagent />;
   }
 
-  return null;
+  if (conversation) {
+    if (conversation.pr_number && conversation.pr_number.length > 0) {
+      return <MicroagentManagementReviewPr />;
+    }
+
+    const isConversationStarting =
+      conversation.status === "STARTING" ||
+      conversation.runtime_status === "STATUS$STARTING_RUNTIME";
+    const isConversationOpeningPr =
+      conversation.status === "RUNNING" &&
+      conversation.runtime_status === "STATUS$READY";
+
+    if (isConversationStarting || isConversationOpeningPr) {
+      return <MicroagentManagementOpeningPr />;
+    }
+
+    if (conversation.runtime_status === "STATUS$ERROR") {
+      return <MicroagentManagementError />;
+    }
+
+    if (
+      conversation.status === "STOPPED" ||
+      conversation.runtime_status === "STATUS$STOPPED"
+    ) {
+      return <MicroagentManagementConversationStopped />;
+    }
+
+    return <MicroagentManagementDefault />;
+  }
+
+  return <MicroagentManagementDefault />;
 }

frontend/src/components/features/microagent-management/microagent-management-microagent-card.tsx

@@ -1,32 +1,122 @@
+import { useMemo } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { I18nKey } from "#/i18n/declaration";
-
-export interface Microagent {
-  id: string;
-  name: string;
-  repositoryUrl: string;
-  createdAt: string;
-}
+import { RepositoryMicroagent } from "#/types/microagent-management";
+import { Conversation } from "#/api/open-hands.types";
+import {
+  setSelectedMicroagentItem,
+  setSelectedRepository,
+} from "#/state/microagent-management-slice";
+import { RootState } from "#/store";
+import { cn } from "#/utils/utils";
+import { GitRepository } from "#/types/git";
 
 interface MicroagentManagementMicroagentCardProps {
-  microagent: Microagent;
+  microagent?: RepositoryMicroagent;
+  conversation?: Conversation;
+  repository: GitRepository;
 }
 
 export function MicroagentManagementMicroagentCard({
   microagent,
+  conversation,
+  repository,
 }: MicroagentManagementMicroagentCardProps) {
   const { t } = useTranslation();
 
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const dispatch = useDispatch();
+
+  const {
+    status: conversationStatus,
+    runtime_status: runtimeStatus,
+    pr_number: prNumber,
+  } = conversation ?? {};
+
+  const hasPr = !!(prNumber && prNumber.length > 0);
+
+  // Helper function to get status text
+  const statusText = useMemo(() => {
+    if (hasPr) {
+      return t(I18nKey.COMMON$READY_FOR_REVIEW);
+    }
+    if (
+      conversationStatus === "STARTING" ||
+      runtimeStatus === "STATUS$STARTING_RUNTIME"
+    ) {
+      return t(I18nKey.COMMON$STARTING);
+    }
+    if (
+      conversationStatus === "STOPPED" ||
+      runtimeStatus === "STATUS$STOPPED"
+    ) {
+      return t(I18nKey.COMMON$STOPPED);
+    }
+    if (runtimeStatus === "STATUS$ERROR") {
+      return t(I18nKey.MICROAGENT$STATUS_ERROR);
+    }
+    if (conversationStatus === "RUNNING" && runtimeStatus === "STATUS$READY") {
+      return t(I18nKey.MICROAGENT$STATUS_OPENING_PR);
+    }
+    return "";
+  }, [conversationStatus, runtimeStatus, t, hasPr]);
+
+  const cardTitle = microagent?.name ?? conversation?.title;
+
+  const isCardSelected = useMemo(() => {
+    if (microagent && selectedMicroagentItem?.microagent) {
+      return selectedMicroagentItem.microagent.name === microagent.name;
+    }
+    if (conversation && selectedMicroagentItem?.conversation) {
+      return (
+        selectedMicroagentItem.conversation.conversation_id ===
+        conversation.conversation_id
+      );
+    }
+    return false;
+  }, [microagent, conversation, selectedMicroagentItem]);
+
+  const onMicroagentCardClicked = () => {
+    dispatch(
+      setSelectedMicroagentItem(
+        microagent
+          ? {
+              microagent,
+              conversation: null,
+            }
+          : {
+              microagent: null,
+              conversation,
+            },
+      ),
+    );
+    dispatch(setSelectedRepository(repository));
+  };
+
   return (
-    <div className="rounded-lg bg-[#ffffff0d] border border-[#ffffff33] p-4 cursor-pointer hover:bg-[#ffffff33] hover:border-[#C9B974] transition-all duration-300">
-      <div className="text-white text-[16px] font-semibold">
-        {microagent.name}
-      </div>
-      <div className="text-white text-sm font-normal">
-        {microagent.repositoryUrl}
-      </div>
-      <div className="text-white text-sm font-normal">
-        {t(I18nKey.COMMON$CREATED_ON)} {microagent.createdAt}
+    <div
+      className={cn(
+        "rounded-lg bg-[#ffffff0d] border border-[#ffffff33] p-4 cursor-pointer hover:bg-[#ffffff33] hover:border-[#C9B974] transition-all duration-300",
+        isCardSelected && "bg-[#ffffff33] border-[#C9B974]",
+      )}
+      onClick={onMicroagentCardClicked}
+    >
+      <div className="flex flex-col items-start gap-2">
+        {statusText && (
+          <div className="px-[6px] py-[2px] text-[11px] font-medium bg-[#C9B97433] text-white rounded-2xl">
+            {statusText}
+          </div>
+        )}
+        <div className="text-white text-[16px] font-semibold">{cardTitle}</div>
+        {!!microagent && (
+          <div className="text-white text-sm font-normal">
+            {microagent.path}
+          </div>
+        )}
       </div>
     </div>
   );

frontend/src/components/features/microagent-management/microagent-management-microagents.tsx

@@ -1,38 +0,0 @@
-import { MicroagentManagementMicroagentCard } from "./microagent-management-microagent-card";
-import { MicroagentManagementAddMicroagentButton } from "./microagent-management-add-microagent-button";
-
-export function MicroagentManagementMicroagents() {
-  const microagents = [
-    {
-      id: "no-comments",
-      name: "No comments",
-      repositoryUrl: "fairwinds/polaris/Repo Overview",
-      createdAt: "05/30/2025",
-    },
-    {
-      id: "tell-me-a-joke",
-      name: "Tell me a joke",
-      repositoryUrl: ".openhands/microagents/Repo Overview",
-      createdAt: "05/30/2025",
-    },
-  ];
-
-  const numberOfMicroagents = microagents.length;
-
-  if (numberOfMicroagents === 0) {
-    return null;
-  }
-
-  return (
-    <div>
-      <div className="flex items-center justify-end pb-4">
-        <MicroagentManagementAddMicroagentButton />
-      </div>
-      {microagents.map((microagent) => (
-        <div key={microagent.id} className="pb-4">
-          <MicroagentManagementMicroagentCard microagent={microagent} />
-        </div>
-      ))}
-    </div>
-  );
-}

frontend/src/components/features/microagent-management/microagent-management-no-repositories.tsx

@@ -0,0 +1,22 @@
+import { FaCircleInfo } from "react-icons/fa6";
+
+interface MicroagentManagementNoRepositoriesProps {
+  title: string;
+  documentationUrl: string;
+}
+
+export function MicroagentManagementNoRepositories({
+  title,
+  documentationUrl,
+}: MicroagentManagementNoRepositoriesProps) {
+  return (
+    <div className="flex items-center justify-center pt-10">
+      <div className="flex items-center gap-2">
+        <h2 className="text-white text-sm font-medium">{title}</h2>
+        <a href={documentationUrl} target="_blank" rel="noopener noreferrer">
+          <FaCircleInfo className="text-primary" />
+        </a>
+      </div>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-opening-pr.tsx

@@ -0,0 +1,47 @@
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+import { RootState } from "#/store";
+import { I18nKey } from "#/i18n/declaration";
+import { BrandButton } from "../settings/brand-button";
+import { Loader } from "#/components/shared/loader";
+
+export function MicroagentManagementOpeningPr() {
+  const { t } = useTranslation();
+
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { conversation } = selectedMicroagentItem ?? {};
+
+  const { conversation_id: conversationId } = conversation ?? {};
+
+  if (!conversationId) {
+    return null;
+  }
+
+  return (
+    <div className="flex-1 flex flex-col h-full items-center justify-center">
+      <div className="text-[#ffffff99] text-[22px] font-semibold pb-2">
+        {t(I18nKey.COMMON$WORKING_ON_IT)}!
+      </div>
+      <div className="text-[#ffffff99] text-[18px] font-normal text-center max-w-[518px] pb-[22px]">
+        {t(I18nKey.MICROAGENT_MANAGEMENT$WE_ARE_WORKING_ON_IT)}
+      </div>
+      <Loader size="small" className="pb-[22px]" />
+      <a
+        href={`/conversations/${conversationId}`}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <BrandButton
+          type="button"
+          variant="secondary"
+          testId="view-conversation-button"
+        >
+          {t(I18nKey.MICROAGENT$VIEW_CONVERSATION)}
+        </BrandButton>
+      </a>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-repo-microagent.tsx

@@ -1,49 +0,0 @@
-import {
-  Microagent,
-  MicroagentManagementMicroagentCard,
-} from "./microagent-management-microagent-card";
-import { MicroagentManagementLearnThisRepo } from "./microagent-management-learn-this-repo";
-import { MicroagentManagementAddMicroagentButton } from "./microagent-management-add-microagent-button";
-
-export interface RepoMicroagent {
-  id: string;
-  repositoryName: string;
-  repositoryUrl: string;
-  microagents: Microagent[];
-}
-
-interface MicroagentManagementRepoMicroagentProps {
-  repoMicroagent: RepoMicroagent;
-}
-
-export function MicroagentManagementRepoMicroagent({
-  repoMicroagent,
-}: MicroagentManagementRepoMicroagentProps) {
-  const { microagents } = repoMicroagent;
-  const numberOfMicroagents = microagents.length;
-
-  return (
-    <div className="pb-12">
-      <div className="flex items-center justify-between pb-4">
-        <div className="text-white text-base font-normal">
-          {repoMicroagent.repositoryName}
-        </div>
-        <MicroagentManagementAddMicroagentButton />
-      </div>
-      {numberOfMicroagents === 0 && (
-        <MicroagentManagementLearnThisRepo
-          repositoryUrl={repoMicroagent.repositoryUrl}
-        />
-      )}
-      {numberOfMicroagents > 0 && (
-        <>
-          {microagents.map((microagent) => (
-            <div key={microagent.id} className="pb-4 last:pb-0">
-              <MicroagentManagementMicroagentCard microagent={microagent} />
-            </div>
-          ))}
-        </>
-      )}
-    </div>
-  );
-}

frontend/src/components/features/microagent-management/microagent-management-repo-microagents.tsx

@@ -1,42 +1,124 @@
-import { MicroagentManagementRepoMicroagent } from "./microagent-management-repo-microagent";
+import { useEffect } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { Spinner } from "@heroui/react";
+import { MicroagentManagementMicroagentCard } from "./microagent-management-microagent-card";
+import { MicroagentManagementLearnThisRepo } from "./microagent-management-learn-this-repo";
+import { useRepositoryMicroagents } from "#/hooks/query/use-repository-microagents";
+import { useSearchConversations } from "#/hooks/query/use-search-conversations";
+import { GitRepository } from "#/types/git";
+import { RootState } from "#/store";
+import { setSelectedMicroagentItem } from "#/state/microagent-management-slice";
 
-export function MicroagentManagementRepoMicroagents() {
-  const repoMicroagents = [
-    {
-      id: "rbren/rss-parser",
-      repositoryName: "rbren/rss-parser",
-      repositoryUrl: "https://github.com/rbren/rss-parser",
-      microagents: [],
-    },
-    {
-      id: "fairwinds/polaris",
-      repositoryName: "fairwinds/polaris",
-      repositoryUrl: "https://github.com/fairwinds/polaris",
-      microagents: [
-        {
-          id: "no-comments",
-          name: "No comments",
-          repositoryUrl: "fairwinds/polaris/Repo Overview",
-          createdAt: "05/30/2025",
-        },
-      ],
-    },
-  ];
+interface MicroagentManagementRepoMicroagentsProps {
+  repository: GitRepository;
+}
 
-  const numberOfRepoMicroagents = repoMicroagents.length;
+export function MicroagentManagementRepoMicroagents({
+  repository,
+}: MicroagentManagementRepoMicroagentsProps) {
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
 
-  if (numberOfRepoMicroagents === 0) {
-    return null;
+  const dispatch = useDispatch();
+
+  const { full_name: repositoryName } = repository;
+
+  // Extract owner and repo from repositoryName (format: "owner/repo")
+  const [owner, repo] = repositoryName.split("/");
+
+  const {
+    data: microagents,
+    isLoading: isLoadingMicroagents,
+    isError: isErrorMicroagents,
+  } = useRepositoryMicroagents(owner, repo, true);
+
+  const {
+    data: conversations,
+    isLoading: isLoadingConversations,
+    isError: isErrorConversations,
+  } = useSearchConversations(
+    repositoryName,
+    "microagent_management",
+    1000,
+    true,
+  );
+
+  useEffect(() => {
+    const hasConversations = conversations && conversations.length > 0;
+    const selectedConversation = selectedMicroagentItem?.conversation;
+
+    if (hasConversations && selectedConversation) {
+      // get the latest selected conversation.
+      const latestSelectedConversation = conversations.find(
+        (conversation) =>
+          conversation.conversation_id === selectedConversation.conversation_id,
+      );
+      if (latestSelectedConversation) {
+        dispatch(
+          setSelectedMicroagentItem({
+            microagent: null,
+            conversation: latestSelectedConversation,
+          }),
+        );
+      }
+    }
+  }, [conversations]);
+
+  // Show loading only when both queries are loading
+  const isLoading = isLoadingMicroagents || isLoadingConversations;
+
+  // Show error UI.
+  const isError = isErrorMicroagents || isErrorConversations;
+
+  if (isLoading) {
+    return (
+      <div className="pb-4 flex justify-center">
+        <Spinner size="sm" data-testid="loading-spinner" />
+      </div>
+    );
   }
 
+  // If there's an error with microagents, show the learn this repo component
+  if (isError) {
+    return (
+      <div className="pb-4">
+        <MicroagentManagementLearnThisRepo repository={repository} />
+      </div>
+    );
+  }
+
+  const numberOfMicroagents = microagents?.length || 0;
+  const numberOfConversations = conversations?.length || 0;
+  const totalItems = numberOfMicroagents + numberOfConversations;
+
   return (
-    <div>
-      {repoMicroagents.map((repoMicroagent) => (
-        <MicroagentManagementRepoMicroagent
-          key={repoMicroagent.id}
-          repoMicroagent={repoMicroagent}
-        />
-      ))}
+    <div className="pb-4">
+      {totalItems === 0 && (
+        <MicroagentManagementLearnThisRepo repository={repository} />
+      )}
+
+      {/* Render microagents */}
+      {numberOfMicroagents > 0 &&
+        microagents?.map((microagent) => (
+          <div key={microagent.name} className="pb-4 last:pb-0">
+            <MicroagentManagementMicroagentCard
+              microagent={microagent}
+              repository={repository}
+            />
+          </div>
+        ))}
+
+      {/* Render conversations */}
+      {numberOfConversations > 0 &&
+        conversations?.map((conversation) => (
+          <div key={conversation.conversation_id} className="pb-4 last:pb-0">
+            <MicroagentManagementMicroagentCard
+              conversation={conversation}
+              repository={repository}
+            />
+          </div>
+        ))}
     </div>
   );
 }

frontend/src/components/features/microagent-management/microagent-management-repositories.tsx

@@ -0,0 +1,119 @@
+import { useState, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { Accordion, AccordionItem } from "@heroui/react";
+import { MicroagentManagementRepoMicroagents } from "./microagent-management-repo-microagents";
+import { GitRepository } from "#/types/git";
+import { cn } from "#/utils/utils";
+import { TabType } from "#/types/microagent-management";
+import { MicroagentManagementNoRepositories } from "./microagent-management-no-repositories";
+import { I18nKey } from "#/i18n/declaration";
+import { DOCUMENTATION_URL } from "#/utils/constants";
+import { MicroagentManagementAccordionTitle } from "./microagent-management-accordion-title";
+import { sanitizeQuery } from "#/utils/sanitize-query";
+
+type MicroagentManagementRepositoriesProps = {
+  repositories: GitRepository[];
+  tabType: TabType;
+};
+
+export function MicroagentManagementRepositories({
+  repositories,
+  tabType,
+}: MicroagentManagementRepositoriesProps) {
+  const { t } = useTranslation();
+  const [searchQuery, setSearchQuery] = useState("");
+
+  const numberOfRepoMicroagents = repositories.length;
+
+  // Filter repositories based on search query
+  const filteredRepositories = useMemo(() => {
+    if (!searchQuery.trim()) {
+      return repositories;
+    }
+
+    const sanitizedQuery = sanitizeQuery(searchQuery);
+    return repositories.filter((repository) => {
+      const sanitizedRepoName = sanitizeQuery(repository.full_name);
+      return sanitizedRepoName.includes(sanitizedQuery);
+    });
+  }, [repositories, searchQuery]);
+
+  if (numberOfRepoMicroagents === 0) {
+    if (tabType === "personal") {
+      return (
+        <MicroagentManagementNoRepositories
+          title={t(
+            I18nKey.MICROAGENT_MANAGEMENT$YOU_DO_NOT_HAVE_USER_LEVEL_MICROAGENTS,
+          )}
+          documentationUrl={DOCUMENTATION_URL.MICROAGENTS.MICROAGENTS_OVERVIEW}
+        />
+      );
+    }
+    if (tabType === "repositories") {
+      return (
+        <MicroagentManagementNoRepositories
+          title={t(I18nKey.MICROAGENT_MANAGEMENT$YOU_DO_NOT_HAVE_MICROAGENTS)}
+          documentationUrl={DOCUMENTATION_URL.MICROAGENTS.MICROAGENTS_OVERVIEW}
+        />
+      );
+    }
+    if (tabType === "organizations") {
+      return (
+        <MicroagentManagementNoRepositories
+          title={t(
+            I18nKey.MICROAGENT_MANAGEMENT$YOU_DO_NOT_HAVE_ORGANIZATION_LEVEL_MICROAGENTS,
+          )}
+          documentationUrl={
+            DOCUMENTATION_URL.MICROAGENTS.ORGANIZATION_AND_USER_MICROAGENTS
+          }
+        />
+      );
+    }
+  }
+
+  return (
+    <div className="flex flex-col gap-4 w-full">
+      {/* Search Input */}
+      <div className="flex flex-col gap-2 w-full">
+        <label htmlFor="repository-search" className="sr-only">
+          {t(I18nKey.COMMON$SEARCH_REPOSITORIES)}
+        </label>
+        <input
+          id="repository-search"
+          name="repository-search"
+          type="text"
+          placeholder={`${t(I18nKey.COMMON$SEARCH_REPOSITORIES)}...`}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          className={cn(
+            "bg-tertiary border border-[#717888] bg-[#454545] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
+            "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+          )}
+        />
+      </div>
+
+      {/* Repositories Accordion */}
+      <Accordion
+        variant="splitted"
+        className="w-full px-0 gap-3"
+        itemClasses={{
+          base: "shadow-none bg-transparent border border-[#ffffff40] rounded-[6px] cursor-pointer",
+          trigger: "cursor-pointer gap-1",
+        }}
+        selectionMode="multiple"
+      >
+        {filteredRepositories.map((repository) => (
+          <AccordionItem
+            key={repository.id}
+            aria-label={repository.full_name}
+            title={
+              <MicroagentManagementAccordionTitle repository={repository} />
+            }
+          >
+            <MicroagentManagementRepoMicroagents repository={repository} />
+          </AccordionItem>
+        ))}
+      </Accordion>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-review-pr.tsx

@@ -0,0 +1,74 @@
+import { useSelector } from "react-redux";
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import { BrandButton } from "../settings/brand-button";
+import { getProviderName, constructPullRequestUrl } from "#/utils/utils";
+import { Provider } from "#/types/settings";
+import { RootState } from "#/store";
+
+export function MicroagentManagementReviewPr() {
+  const { t } = useTranslation();
+
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { conversation } = selectedMicroagentItem ?? {};
+
+  const {
+    conversation_id: conversationId,
+    selected_repository: selectedRepository,
+    git_provider: gitProvider,
+    pr_number: prNumber,
+  } = conversation ?? {};
+
+  if (!conversationId) {
+    return null;
+  }
+
+  return (
+    <div className="flex-1 flex flex-col h-full items-center justify-center">
+      <div className="text-[#ffffff99] text-[22px] font-bold pb-[22px] text-center max-w-[455px]">
+        {t(I18nKey.MICROAGENT_MANAGEMENT$YOUR_MICROAGENT_IS_READY)}
+      </div>
+      <div className="flex gap-[22px]">
+        <a
+          href={`/conversations/${conversationId}`}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <BrandButton
+            type="button"
+            variant="secondary"
+            testId="view-conversation-button"
+          >
+            {t(I18nKey.MICROAGENT$VIEW_CONVERSATION)}
+          </BrandButton>
+        </a>
+        <a
+          href={
+            selectedRepository && gitProvider && prNumber && prNumber.length > 0
+              ? constructPullRequestUrl(
+                  prNumber[0],
+                  gitProvider,
+                  selectedRepository,
+                )
+              : "/#"
+          }
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <BrandButton
+            type="button"
+            variant="primary"
+            testId="view-conversation-button"
+          >
+            {`${t(I18nKey.COMMON$REVIEW_PR_IN)} ${getProviderName(
+              gitProvider as Provider,
+            )}`}
+          </BrandButton>
+        </a>
+      </div>
+    </div>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-sidebar-header.tsx

@@ -1,6 +1,7 @@
 import { useTranslation } from "react-i18next";
 import { I18nKey } from "#/i18n/declaration";
 import QuestionCircleIcon from "#/icons/question-circle.svg?react";
+import { DOCUMENTATION_URL } from "#/utils/constants";
 
 export function MicroagentManagementSidebarHeader() {
   const { t } = useTranslation();
@@ -12,7 +13,13 @@ export function MicroagentManagementSidebarHeader() {
       </h1>
       <p className="text-white text-sm font-normal leading-[20px] pt-2">
         {t(I18nKey.MICROAGENT_MANAGEMENT$USE_MICROAGENTS)}
-        <QuestionCircleIcon className="inline-block ml-1" />
+        <a
+          href={DOCUMENTATION_URL.MICROAGENTS.MICROAGENTS_OVERVIEW}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <QuestionCircleIcon className="inline-block ml-1" />
+        </a>
       </p>
     </div>
   );

frontend/src/components/features/microagent-management/microagent-management-sidebar-tabs.tsx

@@ -1,12 +1,16 @@
 import { Tab, Tabs } from "@heroui/react";
 import { useTranslation } from "react-i18next";
-import { MicroagentManagementMicroagents } from "./microagent-management-microagents";
-import { MicroagentManagementRepoMicroagents } from "./microagent-management-repo-microagents";
+import { useSelector } from "react-redux";
+import { MicroagentManagementRepositories } from "./microagent-management-repositories";
 import { I18nKey } from "#/i18n/declaration";
+import { RootState } from "#/store";
 
 export function MicroagentManagementSidebarTabs() {
   const { t } = useTranslation();
 
+  const { repositories, personalRepositories, organizationRepositories } =
+    useSelector((state: RootState) => state.microagentManagement);
+
   return (
     <div className="flex w-full flex-col">
       <Tabs
@@ -17,18 +21,27 @@ export function MicroagentManagementSidebarTabs() {
             "w-full bg-transparent border border-[#ffffff40] rounded-[6px]",
           tab: "px-2 h-[22px]",
           tabContent: "text-white text-[12px] font-normal",
-          panel: "py-0",
+          panel: "p-0",
           cursor: "bg-[#C9B97480] rounded-sm",
         }}
       >
         <Tab key="personal" title={t(I18nKey.COMMON$PERSONAL)}>
-          <MicroagentManagementMicroagents />
+          <MicroagentManagementRepositories
+            repositories={personalRepositories}
+            tabType="personal"
+          />
         </Tab>
         <Tab key="repositories" title={t(I18nKey.COMMON$REPOSITORIES)}>
-          <MicroagentManagementRepoMicroagents />
+          <MicroagentManagementRepositories
+            repositories={repositories}
+            tabType="repositories"
+          />
         </Tab>
         <Tab key="organizations" title={t(I18nKey.COMMON$ORGANIZATIONS)}>
-          <MicroagentManagementMicroagents />
+          <MicroagentManagementRepositories
+            repositories={organizationRepositories}
+            tabType="organizations"
+          />
         </Tab>
       </Tabs>
     </div>

frontend/src/components/features/microagent-management/microagent-management-sidebar.tsx

@@ -1,11 +1,71 @@
+import { useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { useTranslation } from "react-i18next";
+import { Spinner } from "@heroui/react";
 import { MicroagentManagementSidebarHeader } from "./microagent-management-sidebar-header";
 import { MicroagentManagementSidebarTabs } from "./microagent-management-sidebar-tabs";
+import { useUserRepositories } from "#/hooks/query/use-user-repositories";
+import {
+  setPersonalRepositories,
+  setOrganizationRepositories,
+  setRepositories,
+} from "#/state/microagent-management-slice";
+import { GitRepository } from "#/types/git";
+import { cn } from "#/utils/utils";
+
+interface MicroagentManagementSidebarProps {
+  isSmallerScreen?: boolean;
+}
+
+export function MicroagentManagementSidebar({
+  isSmallerScreen = false,
+}: MicroagentManagementSidebarProps) {
+  const dispatch = useDispatch();
+  const { t } = useTranslation();
+  const { data: repositories, isLoading } = useUserRepositories();
+
+  useEffect(() => {
+    if (repositories) {
+      const personalRepos: GitRepository[] = [];
+      const organizationRepos: GitRepository[] = [];
+      const otherRepos: GitRepository[] = [];
+
+      repositories.forEach((repo: GitRepository) => {
+        const hasOpenHandsSuffix = repo.full_name.endsWith("/.openhands");
+
+        if (repo.owner_type === "user" && hasOpenHandsSuffix) {
+          personalRepos.push(repo);
+        } else if (repo.owner_type === "organization" && hasOpenHandsSuffix) {
+          organizationRepos.push(repo);
+        } else {
+          otherRepos.push(repo);
+        }
+      });
+
+      dispatch(setPersonalRepositories(personalRepos));
+      dispatch(setOrganizationRepositories(organizationRepos));
+      dispatch(setRepositories(otherRepos));
+    }
+  }, [repositories, dispatch]);
 
-export function MicroagentManagementSidebar() {
   return (
-    <div className="w-[418px] h-full border-r border-[#525252] bg-[#24272E] rounded-tl-lg rounded-bl-lg py-10 px-6">
+    <div
+      className={cn(
+        "w-[418px] h-full max-h-full overflow-y-auto overflow-x-hidden border-r border-[#525252] bg-[#24272E] rounded-tl-lg rounded-bl-lg py-10 px-6 flex flex-col",
+        isSmallerScreen && "w-full border-none",
+      )}
+    >
       <MicroagentManagementSidebarHeader />
-      <MicroagentManagementSidebarTabs />
+      {isLoading ? (
+        <div className="flex flex-col items-center justify-center gap-4 flex-1">
+          <Spinner size="sm" />
+          <span className="text-sm text-white">
+            {t("HOME$LOADING_REPOSITORIES")}
+          </span>
+        </div>
+      ) : (
+        <MicroagentManagementSidebarTabs />
+      )}
     </div>
   );
 }

frontend/src/components/features/microagent-management/microagent-management-upsert-microagent-modal.tsx

@@ -0,0 +1,320 @@
+import { useEffect, useRef, useState, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+import { FaCircleInfo } from "react-icons/fa6";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { ModalBody } from "#/components/shared/modals/modal-body";
+import { BrandButton } from "../settings/brand-button";
+import { I18nKey } from "#/i18n/declaration";
+import { RootState } from "#/store";
+import XIcon from "#/icons/x.svg?react";
+import { cn, extractRepositoryInfo } from "#/utils/utils";
+import { BadgeInput } from "#/components/shared/inputs/badge-input";
+import { MicroagentFormData } from "#/types/microagent-management";
+import { Branch, GitRepository } from "#/types/git";
+import { useRepositoryBranches } from "#/hooks/query/use-repository-branches";
+import { useRepositoryMicroagentContent } from "#/hooks/query/use-repository-microagent-content";
+import {
+  BranchDropdown,
+  BranchLoadingState,
+  BranchErrorState,
+} from "../home/repository-selection";
+
+interface MicroagentManagementUpsertMicroagentModalProps {
+  onConfirm: (formData: MicroagentFormData) => void;
+  onCancel: () => void;
+  isLoading: boolean;
+  isUpdate?: boolean;
+}
+
+export function MicroagentManagementUpsertMicroagentModal({
+  onConfirm,
+  onCancel,
+  isLoading = false,
+  isUpdate = false,
+}: MicroagentManagementUpsertMicroagentModalProps) {
+  const { t } = useTranslation();
+
+  const [triggers, setTriggers] = useState<string[]>([]);
+  const [query, setQuery] = useState<string>("");
+  const [selectedBranch, setSelectedBranch] = useState<Branch | null>(null);
+
+  const { selectedRepository } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { microagent } = selectedMicroagentItem ?? {};
+
+  // Add a ref to track if the branch was manually cleared by the user
+  const branchManuallyClearedRef = useRef<boolean>(false);
+
+  // Extract owner and repo from full_name for content API
+  const { owner, repo, filePath } = extractRepositoryInfo(
+    selectedRepository,
+    microagent,
+  );
+
+  // Fetch microagent content when updating
+  const { data: microagentContentData, isLoading: isLoadingContent } =
+    useRepositoryMicroagentContent(owner, repo, filePath, true);
+
+  // Populate form fields with existing microagent data when updating
+  useEffect(() => {
+    if (isUpdate && microagentContentData) {
+      setQuery(microagentContentData.content);
+      setTriggers(microagentContentData.triggers || []);
+    }
+  }, [isUpdate, microagentContentData]);
+
+  const {
+    data: branches,
+    isLoading: isLoadingBranches,
+    isError: isBranchesError,
+  } = useRepositoryBranches(selectedRepository?.full_name || null);
+
+  const branchesItems = branches?.map((branch) => ({
+    key: branch.name,
+    label: branch.name,
+  }));
+
+  // Auto-select main or master branch if it exists.
+  useEffect(() => {
+    if (
+      branches &&
+      branches.length > 0 &&
+      !selectedBranch &&
+      !isLoadingBranches
+    ) {
+      // Look for main or master branch
+      const mainBranch = branches.find((branch) => branch.name === "main");
+      const masterBranch = branches.find((branch) => branch.name === "master");
+
+      // Select main if it exists, otherwise select master if it exists
+      if (mainBranch) {
+        setSelectedBranch(mainBranch);
+      } else if (masterBranch) {
+        setSelectedBranch(masterBranch);
+      }
+    }
+  }, [branches, isLoadingBranches, selectedBranch]);
+
+  const modalTitle = useMemo(() => {
+    if (isUpdate) {
+      return t(I18nKey.MICROAGENT_MANAGEMENT$UPDATE_MICROAGENT);
+    }
+
+    if (selectedRepository) {
+      return `${t(I18nKey.MICROAGENT_MANAGEMENT$ADD_A_MICROAGENT_TO)} ${(selectedRepository as GitRepository).full_name}`;
+    }
+
+    return t(I18nKey.MICROAGENT_MANAGEMENT$ADD_A_MICROAGENT);
+  }, [isUpdate, selectedRepository, t]);
+
+  const modalDescription = useMemo(() => {
+    if (isUpdate) {
+      return t(
+        I18nKey.MICROAGENT_MANAGEMENT$UPDATE_MICROAGENT_MODAL_DESCRIPTION,
+      );
+    }
+
+    return t(I18nKey.MICROAGENT_MANAGEMENT$ADD_MICROAGENT_MODAL_DESCRIPTION);
+  }, [isUpdate, t]);
+
+  const onSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+
+    if (!query.trim()) {
+      return;
+    }
+
+    onConfirm({
+      query: query.trim(),
+      triggers,
+      selectedBranch: selectedBranch?.name || "",
+      microagentPath: microagent?.path || "",
+    });
+  };
+
+  const handleConfirm = () => {
+    if (!query.trim()) {
+      return;
+    }
+
+    onConfirm({
+      query: query.trim(),
+      triggers,
+      selectedBranch: selectedBranch?.name || "",
+      microagentPath: microagent?.path || "",
+    });
+  };
+
+  const handleBranchSelection = (key: React.Key | null) => {
+    const selectedBranchObj = branches?.find((branch) => branch.name === key);
+    setSelectedBranch(selectedBranchObj || null);
+    // Reset the manually cleared flag when a branch is explicitly selected
+    branchManuallyClearedRef.current = false;
+  };
+
+  const handleBranchInputChange = (value: string) => {
+    // Clear the selected branch if the input is empty or contains only whitespace
+    // This fixes the issue where users can't delete the entire default branch name
+    if (value === "" || value.trim() === "") {
+      setSelectedBranch(null);
+      // Set the flag to indicate that the branch was manually cleared
+      branchManuallyClearedRef.current = true;
+    } else {
+      // Reset the flag when the user starts typing again
+      branchManuallyClearedRef.current = false;
+    }
+  };
+
+  // Render the appropriate UI for branch selector based on the loading/error state
+  const renderBranchSelector = () => {
+    if (!selectedRepository) {
+      return (
+        <BranchDropdown
+          items={[]}
+          onSelectionChange={() => {}}
+          onInputChange={() => {}}
+          isDisabled
+          wrapperClassName="max-w-full w-full"
+          label={t(I18nKey.REPOSITORY$SELECT_BRANCH)}
+        />
+      );
+    }
+
+    if (isLoadingBranches) {
+      return <BranchLoadingState wrapperClassName="max-w-full w-full" />;
+    }
+
+    if (isBranchesError) {
+      return <BranchErrorState wrapperClassName="max-w-full w-full" />;
+    }
+
+    return (
+      <BranchDropdown
+        items={branchesItems || []}
+        onSelectionChange={handleBranchSelection}
+        onInputChange={handleBranchInputChange}
+        isDisabled={false}
+        selectedKey={selectedBranch?.name}
+        wrapperClassName="max-w-full w-full"
+        label={t(I18nKey.REPOSITORY$SELECT_BRANCH)}
+      />
+    );
+  };
+
+  return (
+    <ModalBackdrop onClose={onCancel}>
+      <ModalBody className="items-start rounded-[12px] p-6 min-w-[611px]">
+        <div className="flex flex-col gap-2 w-full">
+          <div className="flex justify-between items-center">
+            <div className="flex items-center gap-2">
+              <h2 className="text-white text-xl font-medium">{modalTitle}</h2>
+              <a
+                href="https://docs.all-hands.dev/usage/prompting/microagents-overview#microagents-overview"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <FaCircleInfo className="text-primary" />
+              </a>
+            </div>
+            <button type="button" onClick={onCancel} className="cursor-pointer">
+              <XIcon width={24} height={24} color="#F9FBFE" />
+            </button>
+          </div>
+          <span className="text-white text-sm font-normal">
+            {modalDescription}
+          </span>
+        </div>
+        <form
+          data-testid="add-microagent-modal"
+          onSubmit={onSubmit}
+          className="flex flex-col gap-6 w-full"
+        >
+          {renderBranchSelector()}
+          <label
+            htmlFor="query-input"
+            className="flex flex-col gap-2 w-full text-sm font-normal"
+          >
+            {t(I18nKey.MICROAGENT_MANAGEMENT$WHAT_TO_DO)}
+            <textarea
+              required
+              data-testid="query-input"
+              name="query-input"
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+              placeholder={t(I18nKey.MICROAGENT_MANAGEMENT$DESCRIBE_WHAT_TO_DO)}
+              rows={6}
+              className={cn(
+                "bg-tertiary border border-[#717888] bg-[#454545] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt resize-none",
+                "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+              )}
+            />
+          </label>
+          <label
+            htmlFor="trigger-input"
+            className="flex flex-col gap-2.5 w-full text-sm"
+          >
+            <div className="flex items-center gap-2">
+              {t(I18nKey.MICROAGENT_MANAGEMENT$ADD_TRIGGERS)}
+              <a
+                href="https://docs.all-hands.dev/usage/prompting/microagents-keyword"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <FaCircleInfo className="text-primary" />
+              </a>
+            </div>
+            <BadgeInput
+              name="trigger-input"
+              value={triggers}
+              placeholder={t("MICROAGENT$TYPE_TRIGGER_SPACE")}
+              onChange={setTriggers}
+            />
+            <span className="text-xs text-[#ffffff80] font-normal">
+              {t(
+                I18nKey.MICROAGENT_MANAGEMENT$HELP_TEXT_DESCRIBING_VALID_TRIGGERS,
+              )}
+            </span>
+          </label>
+        </form>
+        <div
+          className="flex items-center justify-end gap-2 w-full"
+          onClick={(event) => event.stopPropagation()}
+        >
+          <BrandButton
+            type="button"
+            variant="secondary"
+            onClick={onCancel}
+            testId="cancel-button"
+          >
+            {t(I18nKey.BUTTON$CANCEL)}
+          </BrandButton>
+          <BrandButton
+            type="button"
+            variant="primary"
+            onClick={handleConfirm}
+            testId="confirm-button"
+            isDisabled={
+              !query.trim() ||
+              isLoading ||
+              isLoadingBranches ||
+              !selectedBranch ||
+              isBranchesError ||
+              (isUpdate && isLoadingContent) // Disable while loading content for updates
+            }
+          >
+            {isLoading || isLoadingBranches || (isUpdate && isLoadingContent)
+              ? t(I18nKey.HOME$LOADING)
+              : t(I18nKey.MICROAGENT$LAUNCH)}
+          </BrandButton>
+        </div>
+      </ModalBody>
+    </ModalBackdrop>
+  );
+}

frontend/src/components/features/microagent-management/microagent-management-view-microagent-content.tsx

@@ -0,0 +1,73 @@
+import { useTranslation } from "react-i18next";
+import { Spinner } from "@heroui/react";
+import { useSelector } from "react-redux";
+import Markdown from "react-markdown";
+import remarkGfm from "remark-gfm";
+import remarkBreaks from "remark-breaks";
+import { code } from "../markdown/code";
+import { ul, ol } from "../markdown/list";
+import { paragraph } from "../markdown/paragraph";
+import { anchor } from "../markdown/anchor";
+import { RootState } from "#/store";
+import { useRepositoryMicroagentContent } from "#/hooks/query/use-repository-microagent-content";
+import { I18nKey } from "#/i18n/declaration";
+import { extractRepositoryInfo } from "#/utils/utils";
+
+export function MicroagentManagementViewMicroagentContent() {
+  const { t } = useTranslation();
+  const { selectedMicroagentItem } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { selectedRepository } = useSelector(
+    (state: RootState) => state.microagentManagement,
+  );
+
+  const { microagent } = selectedMicroagentItem ?? {};
+
+  // Extract owner and repo from full_name (e.g., "owner/repo")
+  const { owner, repo, filePath } = extractRepositoryInfo(
+    selectedRepository,
+    microagent,
+  );
+
+  // Fetch microagent content using the new API
+  const {
+    data: microagentData,
+    isLoading,
+    error,
+  } = useRepositoryMicroagentContent(owner, repo, filePath, true);
+
+  if (!microagent || !selectedRepository) {
+    return null;
+  }
+
+  return (
+    <div className="w-full h-full p-6 bg-[#ffffff1a] rounded-2xl text-white text-sm">
+      {isLoading && (
+        <div className="flex items-center justify-center w-full h-full">
+          <Spinner size="lg" data-testid="loading-microagent-content-spinner" />
+        </div>
+      )}
+      {error && (
+        <div className="flex items-center justify-center w-full h-full">
+          {t(I18nKey.MICROAGENT_MANAGEMENT$ERROR_LOADING_MICROAGENT_CONTENT)}
+        </div>
+      )}
+      {microagentData && !isLoading && !error && (
+        <Markdown
+          components={{
+            code,
+            ul,
+            ol,
+            a: anchor,
+            p: paragraph,
+          }}
+          remarkPlugins={[remarkGfm, remarkBreaks]}
+        >
+          {microagentData.content}
+        </Markdown>
+      )}
+    </div>
+  );
+}