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

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 # See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 # Frontend code owners
-/frontend/ @amanape
+/frontend/ @rbren @amanape
 /openhands-ui/ @amanape
 
 # Evaluation code owners

.github/scripts/update_pr_description.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-# This script updates the PR description with commands to run the PR locally
-# It adds both Docker and uvx commands
-
-# Get the branch name for the PR
-BRANCH_NAME=$(gh pr view "$PR_NUMBER" --json headRefName --jq .headRefName)
-
-# Define the Docker command
-DOCKER_RUN_COMMAND="docker run -it --rm \
-  -p 3000:3000 \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  --add-host host.docker.internal:host-gateway \
-  -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:${SHORT_SHA}-nikolaik \
-  --name openhands-app-${SHORT_SHA} \
-  docker.all-hands.dev/all-hands-ai/openhands:${SHORT_SHA}"
-
-# Define the uvx command
-UVX_RUN_COMMAND="uvx --python 3.12 --from git+https://github.com/All-Hands-AI/OpenHands@${BRANCH_NAME} openhands"
-
-# Get the current PR body
-PR_BODY=$(gh pr view "$PR_NUMBER" --json body --jq .body)
-
-# Prepare the new PR body with both commands
-if echo "$PR_BODY" | grep -q "To run this PR locally, use the following command:"; then
-  # For existing PR descriptions, use a more robust approach
-  # Split the PR body at the "To run this PR locally" section and replace everything after it
-  BEFORE_SECTION=$(echo "$PR_BODY" | sed '/To run this PR locally, use the following command:/,$d')
-  NEW_PR_BODY=$(cat <<EOF
-${BEFORE_SECTION}
-
-To run this PR locally, use the following command:
-
-GUI with Docker:
-\`\`\`
-${DOCKER_RUN_COMMAND}
-\`\`\`
-
-CLI with uvx:
-\`\`\`
-${UVX_RUN_COMMAND}
-\`\`\`
-EOF
-)
-else
-  # For new PR descriptions: use heredoc safely without indentation
-  NEW_PR_BODY=$(cat <<EOF
-$PR_BODY
-
----
-
-To run this PR locally, use the following command:
-
-GUI with Docker:
-\`\`\`
-${DOCKER_RUN_COMMAND}
-\`\`\`
-
-CLI with uvx:
-\`\`\`
-${UVX_RUN_COMMAND}
-\`\`\`
-EOF
-)
-fi
-
-# Update the PR description
-echo "Updating PR description with Docker and uvx commands"
-gh pr edit "$PR_NUMBER" --body "$NEW_PR_BODY"

.github/workflows/ghcr-build.yml

@@ -332,5 +332,29 @@ jobs:
           SHORT_SHA: ${{ steps.short_sha.outputs.SHORT_SHA }}
         shell: bash
         run: |
-          echo "Updating PR description with Docker and uvx commands"
-          bash ${GITHUB_WORKSPACE}/.github/scripts/update_pr_description.sh
+          echo "updating PR description"
+          DOCKER_RUN_COMMAND="docker run -it --rm \
+            -p 3000:3000 \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            --add-host host.docker.internal:host-gateway \
+            -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:$SHORT_SHA-nikolaik \
+            --name openhands-app-$SHORT_SHA \
+            docker.all-hands.dev/all-hands-ai/openhands:$SHORT_SHA"
+
+          PR_BODY=$(gh pr view $PR_NUMBER --json body --jq .body)
+
+          if echo "$PR_BODY" | grep -q "To run this PR locally, use the following command:"; then
+            UPDATED_PR_BODY=$(echo "${PR_BODY}" | sed -E "s|docker run -it --rm.*|$DOCKER_RUN_COMMAND|")
+          else
+            UPDATED_PR_BODY="${PR_BODY}
+
+          ---
+
+          To run this PR locally, use the following command:
+          \`\`\`
+          $DOCKER_RUN_COMMAND
+          \`\`\`"
+          fi
+
+          echo "updated body: $UPDATED_PR_BODY"
+          gh pr edit $PR_NUMBER --body "$UPDATED_PR_BODY"

.github/workflows/py-tests.yml

@@ -48,11 +48,11 @@ jobs:
       - name: Build Environment
         run: make build
       - name: Run Unit Tests
-        run: PYTHONPATH=".:$PYTHONPATH" poetry run pytest --forked -n auto -svv ./tests/unit
+        run: poetry run pytest --forked -n auto -svv ./tests/unit
       - name: Run Runtime Tests with CLIRuntime
-        run: PYTHONPATH=".:$PYTHONPATH" TEST_RUNTIME=cli poetry run pytest -svv tests/runtime/test_bash.py
+        run: TEST_RUNTIME=cli poetry run pytest -svv tests/runtime/test_bash.py
       - name: Run E2E Tests
-        run: PYTHONPATH=".:$PYTHONPATH" poetry run pytest -svv tests/e2e
+        run: poetry run pytest -svv tests/e2e
 
   # Run specific Windows python tests
   test-on-windows:
@@ -77,11 +77,9 @@ jobs:
       - name: Run Windows unit tests
         run: poetry run pytest -svv tests/unit/test_windows_bash.py
         env:
-          PYTHONPATH: ".;$env:PYTHONPATH"
           DEBUG: "1"
       - name: Run Windows runtime tests with LocalRuntime
         run: $env:TEST_RUNTIME="local"; poetry run pytest -svv tests/runtime/test_bash.py
         env:
-          PYTHONPATH: ".;$env:PYTHONPATH"
           TEST_RUNTIME: local
           DEBUG: "1"

.github/workflows/stale.yml

@@ -12,11 +12,11 @@ jobs:
     steps:
       - uses: actions/stale@v9
         with:
-          stale-issue-message: 'This issue is stale because it has been open for 40 days with no activity. Remove the stale label or leave a comment, otherwise it will be closed in 10 days.'
-          stale-pr-message: 'This PR is stale because it has been open for 40 days with no activity. Remove the stale label or leave a comment, otherwise it will be closed in 10 days.'
-          days-before-stale: 40
+          stale-issue-message: 'This issue is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          days-before-stale: 30
           exempt-issue-labels: 'roadmap'
-          close-issue-message: 'This issue was automatically closed due to 50 days of inactivity. We do this to help keep the issues somewhat manageable and focus on active issues.'
-          close-pr-message: 'This PR was closed because it had no activity for 50 days. If you feel this was closed in error, and you would like to continue the PR, please resubmit or let us know.'
-          days-before-close: 10
+          close-issue-message: 'This issue was closed because it has been stalled for over 30 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stalled for over 30 days with no activity.'
+          days-before-close: 7
           operations-per-run: 150

dev_config/python/.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
     hooks:
       - id: mypy
         additional_dependencies:
-          [types-requests, types-setuptools, types-pyyaml, types-toml, types-docker, types-Markdown, pydantic, lxml]
+          [types-requests, types-setuptools, types-pyyaml, types-toml, types-docker, pydantic, lxml]
         # To see gaps add `--html-report mypy-report/`
         entry: mypy --config-file dev_config/python/mypy.ini openhands/
         always_run: true

docs/docs.json

@@ -71,7 +71,6 @@
                     {
                       "group": "Providers",
                       "pages": [
-                        "usage/llms/openhands-llms",
                         "usage/llms/azure-llms",
                         "usage/llms/google-llms",
                         "usage/llms/groq",
@@ -79,6 +78,7 @@
                         "usage/llms/litellm-proxy",
                         "usage/llms/moonshot",
                         "usage/llms/openai-llms",
+                        "usage/llms/openhands-llms",
                         "usage/llms/openrouter"
                       ]
                     }

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

@@ -7,67 +7,6 @@ description: High level overview of the Graphical User Interface (GUI) in OpenHa
 
 - [OpenHands is running](/usage/local-setup)
 
-## Launching the GUI Server
-
-### Using the CLI Command
-
-You can launch the OpenHands GUI server directly from the command line using the `serve` command:
-
-<Callout type="info">
-**Prerequisites**: You need to have the [OpenHands CLI installed](/usage/how-to/cli-mode) first, OR have `uv` installed and run `uvx --python 3.12 --from openhands-ai openhands serve`. Otherwise, you'll need to use Docker directly (see the [Docker section](#using-docker-directly) below).
-</Callout>
-
-```bash
-openhands serve
-```
-
-This command will:
-- Check that Docker is installed and running
-- Pull the required Docker images
-- Launch the OpenHands GUI server at http://localhost:3000
-- Use the same configuration directory (`~/.openhands`) as the CLI mode
-
-#### Mounting Your Current Directory
-
-To mount your current working directory into the GUI server container, use the `--mount-cwd` flag:
-
-```bash
-openhands serve --mount-cwd
-```
-
-This is useful when you want to work on files in your current directory through the GUI. The directory will be mounted at `/workspace` inside the container.
-
-#### Using GPU Support
-
-If you have NVIDIA GPUs and want to make them available to the OpenHands container, use the `--gpu` flag:
-
-```bash
-openhands serve --gpu
-```
-
-This will enable GPU support via nvidia-docker, mounting all available GPUs into the container. You can combine this with other flags:
-
-```bash
-openhands serve --gpu --mount-cwd
-```
-
-**Prerequisites for GPU support:**
-- NVIDIA GPU drivers must be installed on your host system
-- [NVIDIA Container Toolkit (nvidia-docker2)](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/install-guide.html) must be installed and configured
-
-#### Requirements
-
-Before using the `openhands serve` command, ensure that:
-- Docker is installed and running on your system
-- You have internet access to pull the required Docker images
-- Port 3000 is available on your system
-
-The CLI will automatically check these requirements and provide helpful error messages if anything is missing.
-
-### Using Docker Directly
-
-Alternatively, you can run the GUI server using Docker directly. See the [local setup guide](/usage/local-setup) for detailed Docker instructions.
-
 ## Overview
 
 ### Initial Setup

docs/usage/llms/llms.mdx

@@ -18,7 +18,7 @@ Based on these findings and community feedback, these are the latest models that
 ### Cloud / API-Based Models
 
 - [anthropic/claude-sonnet-4-20250514](https://www.anthropic.com/api) (recommended)
-- [openai/gpt-5-2025-08-07](https://openai.com/api/) (recommended)
+- [openai/o4-mini](https://openai.com/index/introducing-o3-and-o4-mini/)
 - [gemini/gemini-2.5-pro](https://blog.google/technology/google-deepmind/gemini-model-thinking-updates-march-2025/)
 - [deepseek/deepseek-chat](https://api-docs.deepseek.com/)
 - [moonshot/kimi-k2-0711-preview](https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2)

docs/usage/llms/openhands-llms.mdx

@@ -32,4 +32,4 @@ When running OpenHands, you'll need to set the following in the OpenHands UI thr
 
 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.
+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

@@ -66,30 +66,6 @@ A system with a modern processor and a minimum of **4GB RAM** is recommended to
 
 ### Start the App
 
-#### Option 1: Using the CLI Launcher (Recommended)
-
-If you have Python 3.12+ installed, you can use the CLI launcher for a simpler experience:
-
-```bash
-# Install OpenHands
-pip install openhands-ai
-
-# Launch the GUI server
-openhands serve
-
-# Or with GPU support (requires nvidia-docker)
-openhands serve --gpu
-
-# Or with current directory mounted
-openhands serve --mount-cwd
-```
-
-Or using `uvx --python 3.12 --from openhands-ai openhands serve` if you have [uv](https://docs.astral.sh/uv/) installed.
-
-This will automatically handle Docker requirements checking, image pulling, and launching the GUI server. The `--gpu` flag enables GPU support via nvidia-docker, and `--mount-cwd` mounts your current directory into the container.
-
-#### Option 2: Using Docker Directly
-
 ```bash
 docker pull docker.all-hands.dev/all-hands-ai/runtime:0.51-nikolaik
 
@@ -124,16 +100,6 @@ OpenHands requires an API key to access most language models. Here's how to get
 
 <AccordionGroup>
 
-<Accordion title="OpenHands (Recommended)">
-
-1. [Log in to OpenHands Cloud](https://app.all-hands.dev).
-2. Go to the Settings page and navigate to the `API Keys` tab.
-3. Copy your `LLM API Key`.
-
-OpenHands provides access to state-of-the-art agentic coding models with competitive pricing. [Learn more about OpenHands LLM provider](/usage/llms/openhands-llms).
-
-</Accordion>
-
 <Accordion title="Anthropic (Claude)">
 
 1. [Create an Anthropic account](https://console.anthropic.com/).

evaluation/benchmarks/EDA/run_infer.py

@@ -18,8 +18,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -172,7 +172,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--answerer_model', '-a', default='gpt-3.5-turbo', help='answerer model'
     )

evaluation/benchmarks/commit0/run_infer.py

@@ -26,8 +26,8 @@ from openhands.controller.state.state import State
 from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -525,7 +525,7 @@ def commit0_setup(dataset: pd.DataFrame, repo_split: str) -> pd.DataFrame:
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/gaia/run_infer.py

@@ -10,6 +10,7 @@ import huggingface_hub
 import pandas as pd
 from datasets import load_dataset
 from PIL import Image
+from pydantic import SecretStr
 
 from evaluation.benchmarks.gaia.scorer import question_scorer
 from evaluation.benchmarks.gaia.utils import (
@@ -30,8 +31,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
     load_from_toml,
 )
 from openhands.core.config.utils import get_agent_config_arg
@@ -79,7 +80,8 @@ def get_config(
 
     config_copy = copy.deepcopy(config)
     load_from_toml(config_copy)
-    config.search_api_key = config_copy.search_api_key
+    if config_copy.search_api_key:
+        config.search_api_key = SecretStr(config_copy.search_api_key)
     return config
 
 
@@ -292,7 +294,7 @@ Here is the task:
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--level',
         type=str,

evaluation/benchmarks/gorilla/run_infer.py

@@ -20,8 +20,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -134,7 +134,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--hubs',
         type=str,

evaluation/benchmarks/gpqa/run_infer.py

@@ -38,8 +38,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -312,7 +312,7 @@ Ok now its time to start solving the question. Good luck!
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     # data split must be one of 'gpqa_main', 'gqpa_diamond', 'gpqa_experts', 'gpqa_extended'
     parser.add_argument(
         '--data-split',

evaluation/benchmarks/lca_ci_build_repair/eval_infer.py

@@ -21,7 +21,7 @@ from evaluation.utils.shared import (
 from openhands.core.config import (
     LLMConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
+    get_parser,
     load_openhands_config,
 )
 from openhands.core.logger import openhands_logger as logger
@@ -167,7 +167,7 @@ def process_predictions(predictions_path: str):
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '-s',
         '--eval-split',

evaluation/benchmarks/lca_ci_build_repair/run_infer.py

@@ -30,8 +30,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
     load_openhands_config,
 )
 from openhands.core.logger import openhands_logger as logger
@@ -358,7 +358,7 @@ Be thorough in your exploration, testing, and reasoning. It's fine if your think
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '-s',
         '--eval-split',

evaluation/benchmarks/logic_reasoning/run_infer.py

@@ -18,8 +18,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -267,7 +267,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/mint/run_infer.py

@@ -23,8 +23,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -229,7 +229,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
 
     SUBSETS = [
         # Eurus subset: https://arxiv.org/abs/2404.02078

evaluation/benchmarks/ml_bench/run_analysis.py

@@ -4,11 +4,7 @@ import pprint
 
 import tqdm
 
-from openhands.core.config import (
-    get_evaluation_parser,
-    get_llm_config_arg,
-    load_openhands_config,
-)
+from openhands.core.config import get_llm_config_arg, get_parser, load_openhands_config
 from openhands.core.logger import openhands_logger as logger
 from openhands.llm.llm import LLM
 
@@ -115,7 +111,7 @@ def classify_error(llm: LLM, failed_case: dict) -> str:
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--json_file_path',
         type=str,

evaluation/benchmarks/ml_bench/run_infer.py

@@ -34,8 +34,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
     load_openhands_config,
 )
 from openhands.core.logger import openhands_logger as logger
@@ -273,7 +273,7 @@ def process_instance(instance: Any, metadata: EvalMetadata, reset_logger: bool =
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '-s',
         '--eval-split',

evaluation/benchmarks/multi_swe_bench/eval_infer.py

@@ -30,7 +30,7 @@ from evaluation.utils.shared import (
 from openhands.core.config import (
     LLMConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime
@@ -323,7 +323,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--input-file',
         type=str,

evaluation/benchmarks/multi_swe_bench/run_infer.py

@@ -32,8 +32,8 @@ from openhands.controller.state.state import State
 from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -772,7 +772,7 @@ def filter_dataset(dataset: pd.DataFrame, filter_column: str) -> pd.DataFrame:
 
 if __name__ == '__main__':
     # pdb.set_trace()
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/scienceagentbench/run_infer.py

@@ -21,8 +21,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -239,7 +239,7 @@ If the program uses some packages that are incompatible, please figure out alter
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--use-knowledge',
         type=str,

evaluation/benchmarks/swe_bench/README.md

@@ -2,8 +2,6 @@
 
 This folder contains the evaluation harness that we built on top of the original [SWE-Bench benchmark](https://www.swebench.com/) ([paper](https://arxiv.org/abs/2310.06770)).
 
-**UPDATE (8/12/2025): We now support running SWE-rebench evaluation (see the paper [here](https://arxiv.org/abs/2505.20411))! For how to run it, checkout [this README](./SWE-rebench.md).**
-
 **UPDATE (6/15/2025): We now support running SWE-bench-Live evaluation (see the paper [here](https://arxiv.org/abs/2505.23419))! For how to run it, checkout [this README](./SWE-bench-Live.md).**
 
 **UPDATE (5/26/2025): We now support running interactive SWE-Bench evaluation (see the paper [here](https://arxiv.org/abs/2502.13069))! For how to run it, checkout [this README](./SWE-Interact.md).**
@@ -185,7 +183,24 @@ The final results will be saved to `evaluation/evaluation_outputs/outputs/swe_be
 - `report.json`: a JSON file that contains keys like `"resolved_ids"` pointing to instance IDs that are resolved by the agent.
 - `logs/`: a directory of test logs
 
+### Run evaluation with `RemoteRuntime`
 
+OpenHands Remote Runtime is currently in beta (read [here](https://runtime.all-hands.dev/) for more details), it allows you to run rollout in parallel in the cloud, so you don't need a powerful machine to run evaluation.
+Fill out [this form](https://docs.google.com/forms/d/e/1FAIpQLSckVz_JFwg2_mOxNZjCtr7aoBFI2Mwdan3f75J_TrdMS1JV2g/viewform) to apply if you want to try this out!
+
+```bash
+./evaluation/benchmarks/swe_bench/scripts/eval_infer_remote.sh [output.jsonl filepath] [num_workers]
+
+# Example - This evaluates patches generated by CodeActAgent on Llama-3.1-70B-Instruct-Turbo on "princeton-nlp/SWE-bench_Lite"'s test set, with 16 number of workers running in parallel
+ALLHANDS_API_KEY="YOUR-API-KEY" RUNTIME=remote SANDBOX_REMOTE_RUNTIME_API_URL="https://runtime.eval.all-hands.dev" EVAL_DOCKER_IMAGE_PREFIX="us-central1-docker.pkg.dev/evaluation-092424/swe-bench-images" \
+evaluation/benchmarks/swe_bench/scripts/eval_infer_remote.sh evaluation/evaluation_outputs/outputs/swe-bench-lite/CodeActAgent/Llama-3.1-70B-Instruct-Turbo_maxiter_100_N_v1.9-no-hint/output.jsonl 16 "princeton-nlp/SWE-bench_Lite" "test"
+```
+
+To clean-up all existing runtimes that you've already started, run:
+
+```bash
+ALLHANDS_API_KEY="YOUR-API-KEY" ./evaluation/utils/scripts/cleanup_remote_runtime.sh
+```
 
 ## SWT-Bench Evaluation
 

evaluation/benchmarks/swe_bench/SWE-rebench.md

@@ -1,84 +0,0 @@
-# SWE-rebench
-
-<p align="center">
-<a href="https://arxiv.org/abs/2505.20411">📃 Paper</a>
-•
-<a href="https://huggingface.co/datasets/nebius/SWE-rebench">🤗 HuggingFace</a>
-•
-<a href="https://swe-rebench.com/leaderboard">📊 Leaderboard</a>
-</p>
-
-SWE-rebench is a large-scale dataset for verifiable software engineering tasks.
-It comes in **two datasets**:
-
-* **[`nebius/SWE-rebench-leaderboard`](https://huggingface.co/datasets/nebius/SWE-rebench-leaderboard)** – updatable benchmark used for [leaderboard evaluation](https://swe-rebench.com/leaderboard).
-* **[`nebius/SWE-rebench`](https://huggingface.co/datasets/nebius/SWE-rebench)** – full dataset with **21,302 tasks**, suitable for training or large-scale offline evaluation.
-
-This document explains how to run OpenHands on SWE-rebench, using the leaderboard split as the main example.
-To run on the full dataset, simply replace the dataset name.
-
-
-## Setting Up
-
-Set up your development environment and configure your LLM provider by following the [SWE-bench README](README.md) in this directory.
-
-
-## Running Inference
-
-Use the existing SWE-bench inference script, changing the dataset to `nebius/SWE-rebench-leaderboard` and selecting the split (`test` for leaderboard submission):
-
-```bash
-./evaluation/benchmarks/swe_bench/scripts/run_infer.sh \
-    llm.your_llm HEAD CodeActAgent 30 50 1 nebius/SWE-rebench-leaderboard test
-```
-
-Arguments:
-
-* `llm.your_llm` – your model configuration key
-* `HEAD` – commit reference for reproducibility
-* `CodeActAgent` – agent type
-* `10` – number of examples to evaluate
-* `50` – maximum iterations per task (increase if needed)
-* `1` – number of workers
-* `nebius/SWE-rebench-leaderboard` – Hugging Face dataset name
-* `test` – dataset split
-
-**Tip:** To run on the **full 21k dataset**, replace `nebius/SWE-rebench-leaderboard` with `nebius/SWE-rebench`.
-
-
-## Evaluating Results
-
-After inference completes, evaluate using the [SWE-bench-fork evaluation harness](https://github.com/SWE-rebench/SWE-bench-fork).
-
-1. Convert the OpenHands output to SWE-bench evaluation format:
-
-```bash
-python evaluation/benchmarks/swe_bench/scripts/live/convert.py \
-  --output_jsonl path/to/evaluation/output.jsonl > preds.jsonl
-```
-
-2. Clone the SWE-bench-fork repo (https://github.com/SWE-rebench/SWE-bench-fork) and follow its README to install dependencies.
-
-
-3. Run the evaluation using the fork:
-
-```bash
-python -m swebench.harness.run_evaluation \
-    --dataset_name nebius/SWE-rebench-leaderboard \
-    --split test \
-    --predictions_path preds.jsonl \
-    --max_workers 10 \
-    --run_id openhands
-```
-
-
-## Citation
-
-```bibtex
-@article{badertdinov2025swerebench,
-  title={SWE-rebench: An Automated Pipeline for Task Collection and Decontaminated Evaluation of Software Engineering Agents},
-  author={Badertdinov, Ibragim and Golubev, Alexander and Nekrashevich, Maksim and Shevtsov, Anton and Karasik, Simon and Andriushchenko, Andrei and Trofimova, Maria and Litvintseva, Daria and Yangel, Boris},
-  journal={arXiv preprint arXiv:2505.20411},
-  year={2025}
-}
-```

evaluation/benchmarks/swe_bench/eval_infer.py

@@ -26,7 +26,7 @@ from evaluation.utils.shared import (
 from openhands.core.config import (
     LLMConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime
@@ -353,7 +353,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--input-file',
         type=str,

evaluation/benchmarks/swe_bench/prompts/swe_claude.j2

@@ -0,0 +1,65 @@
+<uploaded_files>
+/workspace/{{ workspace_dir_name }}
+</uploaded_files>
+
+I've uploaded a python code repository in the directory {{ workspace_dir_name }}. Consider the following issue description:
+
+<issue_description>
+{{ instance.problem_statement }}
+</issue_description>
+
+Can you help me implement the necessary changes to the repository so that the requirements specified in the <issue_description> are met?
+I've already taken care of all changes to any of the test files described in the <issue_description>. This means you DON'T have to modify the testing logic or any of the tests in any way!
+Also the development Python environment is already set up for you (i.e., all dependencies already installed), so you don't need to install other packages.
+Your task is to make the minimal changes to non-test files in the /workspace/{{ workspace_dir_name }} directory to ensure the <issue_description> is satisfied.
+
+Follow these phases to resolve the issue:
+
+Phase 1. READING: read the problem and reword it in clearer terms
+   1.1 If there are code or config snippets. Express in words any best practices or conventions in them.
+   1.2 Hightlight message errors, method names, variables, file names, stack traces, and technical details.
+   1.3 Explain the problem in clear terms.
+   1.4 Enumerate the steps to reproduce the problem.
+   1.5 Hightlight any best practices to take into account when testing and fixing the issue
+
+Phase 2. RUNNING: install and run the tests on the repository
+   2.1 Follow the readme
+   2.2 Install the environment and anything needed
+   2.2 Iterate and figure out how to run the tests
+
+Phase 3. EXPLORATION: find the files that are related to the problem and possible solutions
+   3.1 Use `grep` to search for relevant methods, classes, keywords and error messages.
+   3.2 Identify all files related to the problem statement.
+   3.3 Propose the methods and files to fix the issue and explain why.
+   3.4 From the possible file locations, select the most likely location to fix the issue.
+
+Phase 4. TEST CREATION: before implementing any fix, create a script to reproduce and verify the issue.
+   4.1 Look at existing test files in the repository to understand the test format/structure.
+   4.2 Create a minimal reproduction script that reproduces the located issue.
+   4.3 Run the reproduction script to confirm you are reproducing the issue.
+   4.4 Adjust the reproduction script as necessary.
+
+Phase 5. FIX ANALYSIS: state clearly the problem and how to fix it
+   5.1 State clearly what the problem is.
+   5.2 State clearly where the problem is located.
+   5.3 State clearly how the test reproduces the issue.
+   5.4 State clearly the best practices to take into account in the fix.
+   5.5 State clearly how to fix the problem.
+
+Phase 6. FIX IMPLEMENTATION: Edit the source code to implement your chosen solution.
+   6.1 Make minimal, focused changes to fix the issue.
+
+Phase 7. VERIFICATION: Test your implementation thoroughly.
+   7.1 Run your reproduction script to verify the fix works.
+   7.2 Add edge cases to your test script to ensure comprehensive coverage.
+   7.3 Run existing tests related to the modified code to ensure you haven't broken anything.
+
+8. FINAL REVIEW: Carefully re-read the problem description and compare your changes with the base commit {{ instance.base_commit }}.
+   8.1 Ensure you've fully addressed all requirements.
+   8.2 Run any tests in the repository related to:
+     8.2.1 The issue you are fixing
+     8.2.2 The files you modified
+     8.2.3 The functions you changed
+   8.3 If any tests fail, revise your implementation until all tests pass
+
+Be thorough in your exploration, testing, and reasoning. It's fine if your thinking process is lengthy - quality and completeness are more important than brevity.

evaluation/benchmarks/swe_bench/prompts/swe_gemini.j2

@@ -0,0 +1,45 @@
+# Task: Fix Issue in Python Repository
+
+## Repository Context
+You are provided with a Python code repository that contains an issue requiring your attention. The repository is located in a sandboxed environment, and you have access to the codebase to implement the necessary changes.
+The code repository is located at: `/workspace/{{ workspace_dir_name }}`
+(This path is provided for context; use file system tools to confirm paths before access).
+
+## Goal
+Your goal is to fix the issue described in the **Issue Description** section below. Implement the necessary changes to **non-test files only** within the repository, ensuring that **all relevant tests pass** after your changes.
+
+## Key Requirements & Constraints
+
+1.  **Understand the problem** very well: it is a bug report, and you know humans don't always write good descriptions. Explore the codebase to understand the related code and the problem in depth. It is possible that the solution needs to be a bit more extensive than just the stated text. Don't exagerate though: don't do unrelated refactoring, but also don't interpret the description too strictly.
+2.  **Focus on the issues:** Implement the fix focusing on non-test files related to the issue.
+2.  **Environment Ready:** The Python environment is pre-configured with all dependencies. Do not install packages.
+3.  **Mandatory Testing Procedure:**
+    *   **Create Test to Reproduce the Issue:** *Before* implementing any fix, you MUST create a *new test* (separate from existing tests) that specifically reproduces the issue.
+            * Take existing tests as example to understand the testing format/structure.
+            * Enhance this test with edge cases.
+            * Run this test to confirm reproduction.
+    *   **Verify Fix:** After implementing the fix, run your test again to verify the issue is resolved.
+    *   **Identify ALL Relevant Tests:** You MUST perform a **dedicated search and analysis** to identify **all** existing unit tests potentially affected by your changes. This includes:
+        *   Tests in the same module/directory as the changed files (e.g., `tests/` subdirectories).
+        *   Tests explicitly importing or using the modified code/classes/functions.
+        *   Tests mentioned in the issue description or related documentation.
+        *   Tests covering functionalities that *depend on* the modified code (analyze callers/dependencies if necessary).
+        **If you cannot confidently identify a specific subset, you MUST identify and plan to run the entire test suite for the modified application or module(s). State your identified test scope clearly.**
+    *   **Run Identified Relevant Tests:** You MUST execute the **complete set** of relevant existing unit tests you identified in the previous step. Ensure you are running the *correct and comprehensive set* of tests. You MUST NOT modify these existing tests.
+    *   **Final Check & Verification:** Before finishing, ensure **all** identified relevant existing tests pass. **Explicitly confirm that you have considered potential omissions in your test selection and believe the executed tests comprehensively cover the impact of your changes.** Failing to identify and run the *complete* relevant set constitutes a failure. If any identified tests fail, revise your fix. Passing all relevant tests is the primary measure of success.
+4.  **Defensive Programming:** Actively practice defensive programming: anticipate and handle potential edge cases, unexpected inputs, and different ways the affected code might be called **to ensure the fix works reliably and allows relevant tests to pass.** Analyze the potential impact on other parts of the codebase.
+5.  **Final Review:** Compare your solution against the original issue and the base commit ({{ instance.base_commit }}) to ensure completeness and test passage.
+
+## General Workflow Guidance
+
+*   Prioritize understanding the problem, exploring the code, planning your fix, implementing it carefully using the required diff format, and **thoroughly testing** according to the **Mandatory Testing Procedure**.
+*   Consider trade-offs between different solutions. The goal is a **robust change that makes the relevant tests pass.** Quality, correctness, and reliability are key.
+*   Actively practice defensive programming: anticipate and handle potential edge cases, unexpected inputs, and different ways the affected code might be called **to ensure the fix works reliably and allows relevant tests to pass.** Analyze the potential impact on other parts of the codebase.
+
+*   IMPORTANT: Your solution will be tested by additional hidden tests, so do not assume the task is complete just because visible tests pass! Refine the solution until you are confident that it is robust and comprehensive according to the **Defensive Programming** requirement.
+
+## Final Note
+Be thorough in your exploration, testing, and reasoning. It's fine if your thinking process is lengthy - quality and completeness are more important than brevity.
+
+## Issue Description
+{{ instance.problem_statement }}

evaluation/benchmarks/swe_bench/run_infer.py

@@ -43,8 +43,8 @@ from openhands.controller.state.state import State
 from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.config.condenser_config import NoOpCondenserConfig
 from openhands.core.config.utils import get_condenser_config_arg
@@ -80,8 +80,6 @@ def set_dataset_type(dataset_name: str) -> str:
         DATASET_TYPE = 'SWE-Gym'
     elif 'swe-bench-live' in name_lower:
         DATASET_TYPE = 'SWE-bench-Live'
-    elif 'swe-rebench' in name_lower:
-        DATASET_TYPE = 'SWE-rebench'
     elif 'multimodal' in name_lower:
         DATASET_TYPE = 'Multimodal'
     else:
@@ -111,7 +109,9 @@ def get_instruction(instance: pd.Series, metadata: EvalMetadata) -> MessageActio
     if mode.startswith('swt'):
         template_name = 'swt.j2'
     elif mode == 'swe':
-        if 'gpt-4.1' in llm_model:
+        if 'claude' in llm_model:
+            template_name = 'swe_default.j2'
+        elif 'gpt-4.1' in llm_model:
             template_name = 'swe_gpt4.j2'
         else:
             template_name = (
@@ -180,8 +180,6 @@ def get_instance_docker_image(
             docker_image_prefix = 'docker.io/starryzhang/'
         elif DATASET_TYPE == 'SWE-bench':
             docker_image_prefix = 'docker.io/swebench/'
-        elif DATASET_TYPE == 'SWE-rebench':
-            docker_image_prefix = 'docker.io/swerebench/'
         repo, name = instance_id.split('__')
         image_name = f'{docker_image_prefix.rstrip("/")}/sweb.eval.x86_64.{repo}_1776_{name}:latest'.lower()
         logger.debug(f'Using official SWE-Bench image: {image_name}')
@@ -322,8 +320,6 @@ def initialize_runtime(
         # inject the instance swe entry
         if DATASET_TYPE == 'SWE-bench-Live':
             entry_script_path = 'instance_swe_entry_live.sh'
-        elif DATASET_TYPE == 'SWE-rebench':
-            entry_script_path = 'instance_swe_entry_rebench.sh'
         else:
             entry_script_path = 'instance_swe_entry.sh'
         runtime.copy_to(
@@ -736,7 +732,7 @@ def filter_dataset(dataset: pd.DataFrame, filter_column: str) -> pd.DataFrame:
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/swe_bench/run_infer_interact.py

@@ -28,8 +28,8 @@ from evaluation.utils.shared import (
 )
 from openhands.controller.state.state import State
 from openhands.core.config import (
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.config.condenser_config import NoOpCondenserConfig
 from openhands.core.config.utils import get_condenser_config_arg
@@ -201,7 +201,7 @@ def process_instance(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/swe_bench/run_localize.py

@@ -31,8 +31,8 @@ from openhands.controller.state.state import State
 from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -644,7 +644,7 @@ SWEGYM_EXCLUDE_IDS = [
 ]
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/swe_bench/scripts/eval_infer_remote.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+INPUT_FILE=$1
+NUM_WORKERS=$2
+DATASET=$3
+SPLIT=$4
+
+if [ -z "$INPUT_FILE" ]; then
+  echo "INPUT_FILE not specified (should be a path to a jsonl file)"
+  exit 1
+fi
+
+if [ -z "$DATASET" ]; then
+  echo "DATASET not specified, use default princeton-nlp/SWE-bench_Lite"
+  DATASET="princeton-nlp/SWE-bench_Lite"
+fi
+
+if [ -z "$SPLIT" ]; then
+  echo "SPLIT not specified, use default test"
+  SPLIT="test"
+fi
+
+if [ -z "$NUM_WORKERS" ]; then
+  echo "NUM_WORKERS not specified, use default 1"
+  NUM_WORKERS=1
+fi
+
+echo "... Evaluating on $INPUT_FILE ..."
+
+COMMAND="poetry run python evaluation/benchmarks/swe_bench/eval_infer.py \
+  --eval-num-workers $NUM_WORKERS \
+  --input-file $INPUT_FILE \
+  --dataset $DATASET \
+  --split $SPLIT"
+
+if [ -n "$EVAL_LIMIT" ]; then
+  echo "EVAL_LIMIT: $EVAL_LIMIT"
+  COMMAND="$COMMAND --eval-n-limit $EVAL_LIMIT"
+fi
+
+# Run the command
+eval $COMMAND
+
+# update the output with evaluation results
+poetry run python evaluation/benchmarks/swe_bench/scripts/eval/update_output_with_eval.py $INPUT_FILE

evaluation/benchmarks/swe_bench/scripts/setup/instance_swe_entry_rebench.sh

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-source ~/.bashrc
-SWEUTIL_DIR=/swe_util
-
-# FIXME: Cannot read SWE_INSTANCE_ID from the environment variable
-# SWE_INSTANCE_ID=django__django-11099
-if [ -z "$SWE_INSTANCE_ID" ]; then
-    echo "Error: SWE_INSTANCE_ID is not set." >&2
-    exit 1
-fi
-
-# Read the swe-bench-test-lite.json file and extract the required item based on instance_id
-item=$(jq --arg INSTANCE_ID "$SWE_INSTANCE_ID" '.[] | select(.instance_id == $INSTANCE_ID)' $SWEUTIL_DIR/eval_data/instances/swe-bench-instance.json)
-
-if [[ -z "$item" ]]; then
-  echo "No item found for the provided instance ID."
-  exit 1
-fi
-
-
-WORKSPACE_NAME=$(echo "$item" | jq -r '(.repo | tostring) + "__" + (.version | tostring) | gsub("/"; "__")')
-
-echo "WORKSPACE_NAME: $WORKSPACE_NAME"
-
-# Clear the workspace
-if [ -d /workspace ]; then
-    rm -rf /workspace/*
-else
-    mkdir /workspace
-fi
-# Copy repo to workspace
-if [ -d /workspace/$WORKSPACE_NAME ]; then
-    rm -rf /workspace/$WORKSPACE_NAME
-fi
-mkdir -p /workspace
-cp -r /testbed /workspace/$WORKSPACE_NAME
-
-# Activate instance-specific environment
-if [ -d /opt/miniconda3 ]; then
-    . /opt/miniconda3/etc/profile.d/conda.sh
-    conda activate testbed
-fi
-
-export PATH=/opt/conda/envs/testbed/bin:$PATH

evaluation/benchmarks/testgeneval/NOTES.md

@@ -5,7 +5,8 @@ pynguin_ids = ['pydata__xarray-6548-16541', 'pydata__xarray-7003-16557', 'pydata
 ids = ['pydata__xarray-3114-16452', 'pydata__xarray-3151-16453', 'pydata__xarray-3156-16454', 'pydata__xarray-3239-16456', 'pydata__xarray-3239-16457', 'pydata__xarray-3239-16458', 'pydata__xarray-3302-16459', 'pydata__xarray-3364-16461', 'pydata__xarray-3677-16471', 'pydata__xarray-3905-16478', 'pydata__xarray-4182-16484', 'pydata__xarray-4248-16486', 'pydata__xarray-4339-16487', 'pydata__xarray-4419-16488', 'pydata__xarray-4629-16492', 'pydata__xarray-4750-16496', 'pydata__xarray-4802-16505', 'pydata__xarray-4966-16515', 'pydata__xarray-4994-16516', 'pydata__xarray-5033-16517', 'pydata__xarray-5126-16518', 'pydata__xarray-5126-16519', 'pydata__xarray-5131-16520', 'pydata__xarray-5365-16529', 'pydata__xarray-5455-16530', 'pydata__xarray-5662-16532', 'pydata__xarray-5731-16534', 'pydata__xarray-6135-16535', 'pydata__xarray-6135-16536', 'pydata__xarray-6386-16537', 'pydata__xarray-6394-16538', 'pydata__xarray-6400-16539', 'pydata__xarray-6461-16540', 'pydata__xarray-6548-16541', 'pydata__xarray-6599-16543', 'pydata__xarray-6601-16544', 'pydata__xarray-6882-16548', 'pydata__xarray-6889-16549', 'pydata__xarray-7003-16557', 'pydata__xarray-7147-16571', 'pydata__xarray-7150-16572', 'pydata__xarray-7203-16577', 'pydata__xarray-7229-16578', 'pydata__xarray-7393-16581', 'pydata__xarray-7400-16582']
 
 
-
+Command eval (our approach):
+poetry run ./evaluation/benchmarks/testgeneval/scripts/eval_infer_remote.sh evaluation/evaluation_outputs/outputs/kjain14__testgeneval-test/CodeActAgent/gpt-4o_maxiter_25_N_v0.20.0-no-hint-run_1/output.jsonl 10 kjain14/testgeneval test true
 
 Command run (our approach):
 ./evaluation/benchmarks/testgeneval/scripts/run_infer.sh llm.eval_gpt HEAD CodeActAgent -1 25 10 kjain14/testgeneval test 1 ../TestGenEval/results/testgeneval/preds/gpt-4o-2024-08-06__testgeneval__0.2__test.jsonl

evaluation/benchmarks/testgeneval/eval_infer.py

@@ -41,7 +41,7 @@ from evaluation.utils.shared import (
     reset_logger_for_multiprocessing,
     run_evaluation,
 )
-from openhands.core.config import OpenHandsConfig, SandboxConfig, get_evaluation_parser
+from openhands.core.config import OpenHandsConfig, SandboxConfig, get_parser
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime
 from openhands.events.action import CmdRunAction
@@ -484,7 +484,7 @@ def count_and_log_fields(evaluated_predictions, fields, key):
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--input-file', type=str, required=True, help='Path to input predictions file'
     )

evaluation/benchmarks/testgeneval/run_infer.py

@@ -37,8 +37,8 @@ from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
     SandboxConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -491,7 +491,7 @@ def prepare_dataset_pre(dataset: pd.DataFrame, filter_column: str) -> pd.DataFra
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/the_agent_company/run_infer.py

@@ -18,8 +18,8 @@ from openhands.core.config import (
     LLMConfig,
     OpenHandsConfig,
     get_agent_config_arg,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.config.agent_config import AgentConfig
 from openhands.core.logger import openhands_logger as logger
@@ -197,7 +197,7 @@ def run_evaluator(
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--task-image-name',
         type=str,

evaluation/benchmarks/toolqa/run_infer.py

@@ -19,8 +19,8 @@ from evaluation.utils.shared import (
 from openhands.controller.state.state import State
 from openhands.core.config import (
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -157,7 +157,7 @@ def process_instance(instance: Any, metadata: EvalMetadata, reset_logger: bool =
 
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/benchmarks/visual_swe_bench/run_infer.py

@@ -31,8 +31,8 @@ from openhands.controller.state.state import State
 from openhands.core.config import (
     AgentConfig,
     OpenHandsConfig,
-    get_evaluation_parser,
     get_llm_config_arg,
+    get_parser,
 )
 from openhands.core.logger import openhands_logger as logger
 from openhands.core.main import create_runtime, run_controller
@@ -565,7 +565,7 @@ SWEGYM_EXCLUDE_IDS = [
 ]
 
 if __name__ == '__main__':
-    parser = get_evaluation_parser()
+    parser = get_parser()
     parser.add_argument(
         '--dataset',
         type=str,

evaluation/utils/shared.py

@@ -263,20 +263,19 @@ def prepare_dataset(
             f'Randomly sampling {eval_n_limit} unique instances with random seed 42.'
         )
 
-    def make_serializable(instance_dict: dict) -> dict:
+    def make_serializable(instance: pd.Series) -> dict:
         import numpy as np
 
+        instance_dict = instance.to_dict()
         for k, v in instance_dict.items():
             if isinstance(v, np.ndarray):
                 instance_dict[k] = v.tolist()
             elif isinstance(v, pd.Timestamp):
                 instance_dict[k] = str(v)
-            elif isinstance(v, dict):
-                instance_dict[k] = make_serializable(v)
         return instance_dict
 
     new_dataset = [
-        make_serializable(instance.to_dict())
+        make_serializable(instance)
         for _, instance in dataset.iterrows()
         if str(instance[id_column]) not in finished_ids
     ]

frontend/__tests__/api/file-service/file-service.api.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import OpenHands from "#/api/open-hands";
+import { FileService } from "#/api/file-service/file-service.api";
 import {
   FILE_VARIANTS_1,
   FILE_VARIANTS_2,
@@ -10,20 +10,20 @@ import {
  * You can find the mock handlers in `frontend/src/mocks/file-service-handlers.ts`.
  */
 
-describe("OpenHands File API", () => {
+describe("FileService", () => {
   it("should get a list of files", async () => {
-    await expect(OpenHands.getFiles("test-conversation-id")).resolves.toEqual(
+    await expect(FileService.getFiles("test-conversation-id")).resolves.toEqual(
       FILE_VARIANTS_1,
     );
 
     await expect(
-      OpenHands.getFiles("test-conversation-id-2"),
+      FileService.getFiles("test-conversation-id-2"),
     ).resolves.toEqual(FILE_VARIANTS_2);
   });
 
   it("should get content of a file", async () => {
     await expect(
-      OpenHands.getFile("test-conversation-id", "file1.txt"),
+      FileService.getFile("test-conversation-id", "file1.txt"),
     ).resolves.toEqual("Content of file1.txt");
   });
 });

frontend/__tests__/components/features/chat/launch-microagent-modal.test.tsx

@@ -3,6 +3,8 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import userEvent from "@testing-library/user-event";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { LaunchMicroagentModal } from "#/components/features/chat/microagent/launch-microagent-modal";
+import { MemoryService } from "#/api/memory-service/memory-service.api";
+import { FileService } from "#/api/file-service/file-service.api";
 import { I18nKey } from "#/i18n/declaration";
 
 vi.mock("react-router", async () => ({

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

@@ -85,10 +85,9 @@ describe("ConversationPanel", () => {
     vi.clearAllMocks();
     vi.restoreAllMocks();
     // Setup default mock for getUserConversations
-    vi.spyOn(OpenHands, "getUserConversations").mockResolvedValue({
-      results: [...mockConversations],
-      next_page_id: null,
-    });
+    vi.spyOn(OpenHands, "getUserConversations").mockResolvedValue([
+      ...mockConversations,
+    ]);
   });
 
   it("should render the conversations", async () => {
@@ -102,10 +101,7 @@ describe("ConversationPanel", () => {
 
   it("should display an empty state when there are no conversations", async () => {
     const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    getUserConversationsSpy.mockResolvedValue({
-      results: [],
-      next_page_id: null,
-    });
+    getUserConversationsSpy.mockResolvedValue([]);
 
     renderConversationPanel();
 
@@ -199,10 +195,7 @@ describe("ConversationPanel", () => {
     ];
 
     const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    getUserConversationsSpy.mockImplementation(async () => ({
-      results: mockData,
-      next_page_id: null,
-    }));
+    getUserConversationsSpy.mockImplementation(async () => mockData);
 
     const deleteUserConversationSpy = vi.spyOn(
       OpenHands,
@@ -256,10 +249,7 @@ describe("ConversationPanel", () => {
   it("should refetch data on rerenders", async () => {
     const user = userEvent.setup();
     const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    getUserConversationsSpy.mockResolvedValue({
-      results: [...mockConversations],
-      next_page_id: null,
-    });
+    getUserConversationsSpy.mockResolvedValue([...mockConversations]);
 
     function PanelWithToggle() {
       const [isOpen, setIsOpen] = React.useState(true);
@@ -353,10 +343,7 @@ describe("ConversationPanel", () => {
     ];
 
     const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    getUserConversationsSpy.mockResolvedValue({
-      results: mockRunningConversations,
-      next_page_id: null,
-    });
+    getUserConversationsSpy.mockResolvedValue(mockRunningConversations);
 
     renderConversationPanel();
 
@@ -420,10 +407,7 @@ describe("ConversationPanel", () => {
     ];
 
     const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    getUserConversationsSpy.mockImplementation(async () => ({
-      results: mockData,
-      next_page_id: null,
-    }));
+    getUserConversationsSpy.mockImplementation(async () => mockData);
 
     const stopConversationSpy = vi.spyOn(OpenHands, "stopConversation");
     stopConversationSpy.mockImplementation(async (id: string) => {
@@ -508,10 +492,7 @@ describe("ConversationPanel", () => {
     ];
 
     const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    getUserConversationsSpy.mockResolvedValue({
-      results: mockMixedStatusConversations,
-      next_page_id: null,
-    });
+    getUserConversationsSpy.mockResolvedValue(mockMixedStatusConversations);
 
     renderConversationPanel();
 

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

@@ -85,36 +85,17 @@ describe("RepoConnector", () => {
       OpenHands,
       "retrieveUserGitRepositories",
     );
-    retrieveUserGitRepositoriesSpy.mockResolvedValue({
-      data: MOCK_RESPOSITORIES,
-      nextPage: null,
-    });
-
-    // Mock the search function that's used by the dropdown
-    vi.spyOn(OpenHands, "searchGitRepositories").mockResolvedValue(
-      MOCK_RESPOSITORIES,
-    );
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
 
     renderRepoConnector();
 
-    // First select the provider
-    const providerDropdown = await waitFor(() =>
-      screen.getByText("Select Provider"),
-    );
-    await userEvent.click(providerDropdown);
-    await userEvent.click(screen.getByText("Github"));
+    // Wait for the loading state to be replaced with the dropdown
+    const dropdown = await waitFor(() => screen.getByTestId("repo-dropdown"));
+    await userEvent.click(dropdown);
 
-    // Then interact with the repository dropdown
-    const repoDropdown = await waitFor(() =>
-      screen.getByTestId("repo-dropdown"),
-    );
-    const repoInput = within(repoDropdown).getByRole("combobox");
-    await userEvent.click(repoInput);
-
-    // Wait for the options to be loaded and displayed
     await waitFor(() => {
-      expect(screen.getByText("rbren/polaris")).toBeInTheDocument();
-      expect(screen.getByText("All-Hands-AI/OpenHands")).toBeInTheDocument();
+      screen.getByText("rbren/polaris");
+      screen.getByText("All-Hands-AI/OpenHands");
     });
   });
 
@@ -123,47 +104,18 @@ describe("RepoConnector", () => {
       OpenHands,
       "retrieveUserGitRepositories",
     );
-    retrieveUserGitRepositoriesSpy.mockResolvedValue({
-      data: MOCK_RESPOSITORIES,
-      nextPage: null,
-    });
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
 
     renderRepoConnector();
 
     const launchButton = await screen.findByTestId("repo-launch-button");
     expect(launchButton).toBeDisabled();
 
-    // Mock the repository branches API call
-    vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue([
-      { name: "main", commit_sha: "123", protected: false },
-      { name: "develop", commit_sha: "456", protected: false },
-    ]);
-
-    // First select the provider
-    const providerDropdown = await waitFor(() =>
-      screen.getByText("Select Provider"),
-    );
-    await userEvent.click(providerDropdown);
-    await userEvent.click(screen.getByText("Github"));
-
-    // Then select the repository
-    const repoDropdown = await waitFor(() =>
-      screen.getByTestId("repo-dropdown"),
-    );
-    const repoInput = within(repoDropdown).getByRole("combobox");
-    await userEvent.click(repoInput);
-
-    // Wait for the options to be loaded and displayed
-    await waitFor(() => {
-      expect(screen.getByText("rbren/polaris")).toBeInTheDocument();
-    });
+    // Wait for the loading state to be replaced with the dropdown
+    const dropdown = await waitFor(() => screen.getByTestId("repo-dropdown"));
+    await userEvent.click(dropdown);
     await userEvent.click(screen.getByText("rbren/polaris"));
 
-    // Wait for the branch to be auto-selected
-    await waitFor(() => {
-      expect(screen.getByText("main")).toBeInTheDocument();
-    });
-
     expect(launchButton).toBeEnabled();
   });
 
@@ -228,10 +180,7 @@ describe("RepoConnector", () => {
       OpenHands,
       "retrieveUserGitRepositories",
     );
-    retrieveUserGitRepositoriesSpy.mockResolvedValue({
-      data: MOCK_RESPOSITORIES,
-      nextPage: null,
-    });
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
 
     renderRepoConnector();
 
@@ -243,37 +192,14 @@ describe("RepoConnector", () => {
     // repo not selected yet
     expect(createConversationSpy).not.toHaveBeenCalled();
 
-    // Mock the repository branches API call
-    vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue([
-      { name: "main", commit_sha: "123", protected: false },
-      { name: "develop", commit_sha: "456", protected: false },
-    ]);
-
-    // First select the provider
-    const providerDropdown = await waitFor(() =>
-      screen.getByText("Select Provider"),
-    );
-    await userEvent.click(providerDropdown);
-    await userEvent.click(screen.getByText("Github"));
-
-    // Then select the repository
-    const repoDropdown = await waitFor(() =>
+    // select a repository from the dropdown
+    const dropdown = await waitFor(() =>
       within(repoConnector).getByTestId("repo-dropdown"),
     );
-    const repoInput = within(repoDropdown).getByRole("combobox");
-    await userEvent.click(repoInput);
-
-    // Wait for the options to be loaded and displayed
-    await waitFor(() => {
-      expect(screen.getByText("rbren/polaris")).toBeInTheDocument();
-    });
-    await userEvent.click(screen.getByText("rbren/polaris"));
-
-    // Wait for the branch to be auto-selected
-    await waitFor(() => {
-      expect(screen.getByText("main")).toBeInTheDocument();
-    });
+    await userEvent.click(dropdown);
 
+    const repoOption = screen.getByText("rbren/polaris");
+    await userEvent.click(repoOption);
     await userEvent.click(launchButton);
 
     expect(createConversationSpy).toHaveBeenCalledExactlyOnceWith(
@@ -292,46 +218,17 @@ describe("RepoConnector", () => {
       OpenHands,
       "retrieveUserGitRepositories",
     );
-    retrieveUserGitRepositoriesSpy.mockResolvedValue({
-      data: MOCK_RESPOSITORIES,
-      nextPage: null,
-    });
-
-    // Mock the repository branches API call
-    vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue([
-      { name: "main", commit_sha: "123", protected: false },
-      { name: "develop", commit_sha: "456", protected: false },
-    ]);
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
 
     renderRepoConnector();
 
     const launchButton = await screen.findByTestId("repo-launch-button");
 
-    // First select the provider
-    const providerDropdown = await waitFor(() =>
-      screen.getByText("Select Provider"),
-    );
-    await userEvent.click(providerDropdown);
-    await userEvent.click(screen.getByText("Github"));
-
-    // Then select the repository
-    const repoDropdown = await waitFor(() =>
-      screen.getByTestId("repo-dropdown"),
-    );
-    const repoInput = within(repoDropdown).getByRole("combobox");
-    await userEvent.click(repoInput);
-
-    // Wait for the options to be loaded and displayed
-    await waitFor(() => {
-      expect(screen.getByText("rbren/polaris")).toBeInTheDocument();
-    });
+    // Wait for the loading state to be replaced with the dropdown
+    const dropdown = await waitFor(() => screen.getByTestId("repo-dropdown"));
+    await userEvent.click(dropdown);
     await userEvent.click(screen.getByText("rbren/polaris"));
 
-    // Wait for the branch to be auto-selected
-    await waitFor(() => {
-      expect(screen.getByText("main")).toBeInTheDocument();
-    });
-
     await userEvent.click(launchButton);
     expect(launchButton).toBeDisabled();
     expect(launchButton).toHaveTextContent(/Loading/i);

frontend/__tests__/components/features/home/repo-selection-form.test.tsx

@@ -12,8 +12,6 @@ const mockUseCreateConversation = vi.fn();
 const mockUseIsCreatingConversation = vi.fn();
 const mockUseTranslation = vi.fn();
 const mockUseAuth = vi.fn();
-const mockUseGitRepositories = vi.fn();
-const mockUseUserProviders = vi.fn();
 
 // Setup default mock returns
 mockUseUserRepositories.mockReturnValue({
@@ -32,29 +30,6 @@ mockUseIsCreatingConversation.mockReturnValue(false);
 
 mockUseTranslation.mockReturnValue({ t: (key: string) => key });
 
-// Default mock for useGitRepositories
-mockUseGitRepositories.mockReturnValue({
-  data: { pages: [] },
-  isLoading: false,
-  isError: false,
-  hasNextPage: false,
-  isFetchingNextPage: false,
-  fetchNextPage: vi.fn(),
-  onLoadMore: vi.fn(),
-});
-
-vi.mock("react-i18next", () => ({
-  useTranslation: () => mockUseTranslation(),
-}));
-
-vi.mock("#/hooks/use-user-providers", () => ({
-  useUserProviders: () => mockUseUserProviders(),
-}));
-
-mockUseUserProviders.mockReturnValue({
-  providers: ["github"],
-});
-
 mockUseAuth.mockReturnValue({
   isAuthenticated: true,
   isLoading: false,
@@ -96,10 +71,6 @@ vi.mock("react-router", async (importActual) => ({
   useNavigate: vi.fn(),
 }));
 
-vi.mock("#/hooks/query/use-git-repositories", () => ({
-  useGitRepositories: () => mockUseGitRepositories(),
-}));
-
 const mockOnRepoSelection = vi.fn();
 const renderForm = () =>
   render(<RepositorySelectionForm onRepoSelection={mockOnRepoSelection} />, {
@@ -125,6 +96,34 @@ describe("RepositorySelectionForm", () => {
     vi.clearAllMocks();
   });
 
+  it("shows loading indicator when repositories are being fetched", () => {
+    const MOCK_REPOS: GitRepository[] = [
+      {
+        id: "1",
+        full_name: "user/repo1",
+        git_provider: "github",
+        is_public: true,
+      },
+      {
+        id: "2",
+        full_name: "user/repo2",
+        git_provider: "github",
+        is_public: true,
+      },
+    ];
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_REPOS);
+
+    renderForm();
+
+    // Check if loading indicator is displayed
+    expect(screen.getByTestId("repo-dropdown-loading")).toBeInTheDocument();
+    expect(screen.getByText("HOME$LOADING_REPOSITORIES")).toBeInTheDocument();
+  });
+
   it("shows dropdown when repositories are loaded", async () => {
     const MOCK_REPOS: GitRepository[] = [
       {
@@ -140,30 +139,24 @@ describe("RepositorySelectionForm", () => {
         is_public: true,
       },
     ];
-    mockUseGitRepositories.mockReturnValue({
-      data: { pages: [{ data: MOCK_REPOS }] },
-      isLoading: false,
-      isError: false,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      fetchNextPage: vi.fn(),
-      onLoadMore: vi.fn(),
-    });
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_REPOS);
 
     renderForm();
     expect(await screen.findByTestId("repo-dropdown")).toBeInTheDocument();
   });
 
   it("shows error message when repository fetch fails", async () => {
-    mockUseGitRepositories.mockReturnValue({
-      data: undefined,
-      isLoading: false,
-      isError: true,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      fetchNextPage: vi.fn(),
-      onLoadMore: vi.fn(),
-    });
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockRejectedValue(
+      new Error("Failed to load"),
+    );
 
     renderForm();
 
@@ -201,45 +194,40 @@ describe("RepositorySelectionForm", () => {
     ];
 
     const searchGitReposSpy = vi.spyOn(OpenHands, "searchGitRepositories");
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+
     searchGitReposSpy.mockResolvedValue(MOCK_SEARCH_REPOS);
-
-    mockUseGitRepositories.mockReturnValue({
-      data: { pages: [{ data: MOCK_REPOS }] },
-      isLoading: false,
-      isError: false,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      fetchNextPage: vi.fn(),
-      onLoadMore: vi.fn(),
-    });
-
-    mockUseAuth.mockReturnValue({
-      isAuthenticated: true,
-      isLoading: false,
-      providersAreSet: true,
-      user: {
-        id: 1,
-        login: "testuser",
-        avatar_url: "https://example.com/avatar.png",
-        name: "Test User",
-        email: "test@example.com",
-        company: "Test Company",
-      },
-      login: vi.fn(),
-      logout: vi.fn(),
-    });
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_REPOS);
 
     renderForm();
 
-    const dropdown = await screen.findByTestId("repo-dropdown");
-    const input = dropdown.querySelector('input[type="text"]') as HTMLInputElement;
-    expect(input).toBeInTheDocument();
+    const input = await screen.findByTestId("repo-dropdown");
+    await userEvent.click(input);
+
+    for (const repo of MOCK_REPOS) {
+      expect(screen.getByText(repo.full_name)).toBeInTheDocument();
+    }
+    expect(
+      screen.queryByText(MOCK_SEARCH_REPOS[0].full_name),
+    ).not.toBeInTheDocument();
+
+    expect(searchGitReposSpy).not.toHaveBeenCalled();
 
     await userEvent.type(input, "https://github.com/kubernetes/kubernetes");
     expect(searchGitReposSpy).toHaveBeenLastCalledWith(
       "kubernetes/kubernetes",
       3,
     );
+
+    expect(
+      screen.getByText(MOCK_SEARCH_REPOS[0].full_name),
+    ).toBeInTheDocument();
+    for (const repo of MOCK_REPOS) {
+      expect(screen.queryByText(repo.full_name)).not.toBeInTheDocument();
+    }
   });
 
   it("should call onRepoSelection when a searched repository is selected", async () => {
@@ -255,26 +243,20 @@ describe("RepositorySelectionForm", () => {
     const searchGitReposSpy = vi.spyOn(OpenHands, "searchGitRepositories");
     searchGitReposSpy.mockResolvedValue(MOCK_SEARCH_REPOS);
 
-    mockUseGitRepositories.mockReturnValue({
-      data: { pages: [{ data: MOCK_SEARCH_REPOS }] },
-      isLoading: false,
-      isError: false,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      fetchNextPage: vi.fn(),
-      onLoadMore: vi.fn(),
-    });
-
     renderForm();
 
-    const dropdown = await screen.findByTestId("repo-dropdown");
-    const input = dropdown.querySelector('input[type="text"]') as HTMLInputElement;
-    expect(input).toBeInTheDocument();
+    const input = await screen.findByTestId("repo-dropdown");
 
     await userEvent.type(input, "https://github.com/kubernetes/kubernetes");
     expect(searchGitReposSpy).toHaveBeenLastCalledWith(
       "kubernetes/kubernetes",
       3,
     );
+
+    const searchedRepo = screen.getByText(MOCK_SEARCH_REPOS[0].full_name);
+    expect(searchedRepo).toBeInTheDocument();
+
+    await userEvent.click(searchedRepo);
+    expect(mockOnRepoSelection).toHaveBeenCalledWith(MOCK_SEARCH_REPOS[0]);
   });
 });

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

@@ -73,7 +73,7 @@ describe("TaskCard", () => {
         OpenHands,
         "retrieveUserGitRepositories",
       );
-      retrieveUserGitRepositoriesSpy.mockResolvedValue({ data: MOCK_RESPOSITORIES, nextPage: null });
+      retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
     });
 
     it("should call create conversation with suggest task trigger and selected suggested task", async () => {

frontend/__tests__/components/features/microagent-management/microagent-management.test.tsx

@@ -12,23 +12,6 @@ import { GitRepository } from "#/types/git";
 import { RepositoryMicroagent } from "#/types/microagent-management";
 import { Conversation } from "#/api/open-hands.types";
 
-// Mock hooks
-const mockUseUserProviders = vi.fn();
-const mockUseUserRepositories = vi.fn();
-const mockUseConfig = vi.fn();
-
-vi.mock("#/hooks/use-user-providers", () => ({
-  useUserProviders: () => mockUseUserProviders(),
-}));
-
-vi.mock("#/hooks/query/use-user-repositories", () => ({
-  useUserRepositories: () => mockUseUserRepositories(),
-}));
-
-vi.mock("#/hooks/query/use-config", () => ({
-  useConfig: () => mockUseConfig(),
-}));
-
 describe("MicroagentManagement", () => {
   const RouterStub = createRoutesStub([
     {
@@ -168,39 +151,10 @@ describe("MicroagentManagement", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.restoreAllMocks();
-
-    // Setup default hook mocks
-    mockUseUserProviders.mockReturnValue({
-      providers: ["github"],
-    });
-
-    mockUseUserRepositories.mockReturnValue({
-      data: {
-        pages: [
-          {
-            data: mockRepositories,
-            nextPage: null,
-          },
-        ],
-      },
-      isLoading: false,
-      isError: false,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      onLoadMore: vi.fn(),
-    });
-
-    mockUseConfig.mockReturnValue({
-      data: {
-        APP_MODE: "oss",
-      },
-    });
-
     // Setup default mock for retrieveUserGitRepositories
-    vi.spyOn(OpenHands, "retrieveUserGitRepositories").mockResolvedValue({
-      data: [...mockRepositories],
-      nextPage: null,
-    });
+    vi.spyOn(OpenHands, "retrieveUserGitRepositories").mockResolvedValue([
+      ...mockRepositories,
+    ]);
     // Setup default mock for getRepositoryMicroagents
     vi.spyOn(OpenHands, "getRepositoryMicroagents").mockResolvedValue([
       ...mockMicroagents,
@@ -226,15 +180,13 @@ describe("MicroagentManagement", () => {
   });
 
   it("should display loading state when fetching repositories", async () => {
-    // Mock loading state
-    mockUseUserRepositories.mockReturnValue({
-      data: undefined,
-      isLoading: true,
-      isError: false,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      onLoadMore: vi.fn(),
-    });
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockImplementation(
+      () => new Promise(() => {}), // Never resolves
+    );
 
     renderMicroagentManagement();
 
@@ -244,21 +196,19 @@ describe("MicroagentManagement", () => {
   });
 
   it("should handle error when fetching repositories", async () => {
-    // Mock error state
-    mockUseUserRepositories.mockReturnValue({
-      data: undefined,
-      isLoading: false,
-      isError: true,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      onLoadMore: vi.fn(),
-    });
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockRejectedValue(
+      new Error("Failed to fetch repositories"),
+    );
 
     renderMicroagentManagement();
 
     // Wait for the error to be handled
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(retrieveUserGitRepositoriesSpy).toHaveBeenCalled();
     });
   });
 
@@ -267,7 +217,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Check that tabs are rendered
@@ -285,7 +235,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded and rendered
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Check that repository names are displayed
@@ -300,7 +250,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click on the first repository accordion
@@ -337,7 +287,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click on the first repository accordion
@@ -362,7 +312,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click on the first repository accordion
@@ -387,7 +337,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click on the first repository accordion
@@ -410,7 +360,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click on the first repository accordion
@@ -449,7 +399,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Check that add microagent buttons are present
@@ -463,7 +413,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click the first add microagent button
@@ -482,7 +432,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click the first add microagent button
@@ -502,28 +452,17 @@ describe("MicroagentManagement", () => {
   });
 
   it("should display empty state when no repositories are found", async () => {
-    // Mock empty repositories
-    mockUseUserRepositories.mockReturnValue({
-      data: {
-        pages: [
-          {
-            data: [],
-            nextPage: null,
-          },
-        ],
-      },
-      isLoading: false,
-      isError: false,
-      hasNextPage: false,
-      isFetchingNextPage: false,
-      onLoadMore: vi.fn(),
-    });
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockResolvedValue([]);
 
     renderMicroagentManagement();
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(retrieveUserGitRepositoriesSpy).toHaveBeenCalled();
     });
 
     // Check that empty state messages are displayed
@@ -540,7 +479,7 @@ describe("MicroagentManagement", () => {
 
     // Wait for repositories to be loaded
     await waitFor(() => {
-      expect(mockUseUserRepositories).toHaveBeenCalled();
+      expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
     });
 
     // Find and click on the first repository accordion
@@ -581,7 +520,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Check that search input is rendered
@@ -601,7 +540,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Initially only repositories with .openhands should be visible
@@ -632,7 +571,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Type in search input with uppercase
@@ -655,7 +594,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Type in search input with partial match
@@ -681,7 +620,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Type in search input
@@ -714,7 +653,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Type in search input with non-existent repository name
@@ -742,7 +681,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Type in search input with special characters
@@ -763,7 +702,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Filter to show only repo2
@@ -798,7 +737,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Type in search input with leading/trailing whitespace
@@ -818,7 +757,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       const searchInput = screen.getByRole("textbox", {
@@ -850,7 +789,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -877,7 +816,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -923,7 +862,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -940,7 +879,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -965,7 +904,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1014,7 +953,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1050,7 +989,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1092,7 +1031,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1129,7 +1068,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1173,7 +1112,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1203,7 +1142,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1226,7 +1165,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1253,7 +1192,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion
@@ -1294,7 +1233,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Check that add microagent buttons are present
@@ -1308,7 +1247,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1363,7 +1302,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1387,7 +1326,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1410,7 +1349,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1443,7 +1382,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1470,7 +1409,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1496,7 +1435,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click the first add microagent button
@@ -1575,8 +1514,8 @@ describe("MicroagentManagement", () => {
       pr_number: null,
     };
 
-    const renderMicroagentManagementMain = (selectedMicroagentItem: any) =>
-      renderWithProviders(<MicroagentManagementMain />, {
+    const renderMicroagentManagementMain = (selectedMicroagentItem: any) => {
+      return renderWithProviders(<MicroagentManagementMain />, {
         preloadedState: {
           metrics: {
             cost: null,
@@ -1602,6 +1541,7 @@ describe("MicroagentManagement", () => {
           },
         },
       });
+    };
 
     it("should render MicroagentManagementDefault when no microagent or conversation is selected", async () => {
       renderMicroagentManagementMain(null);
@@ -2355,7 +2295,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories to be loaded
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       // Find and click on the first repository accordion to expand it
@@ -2397,7 +2337,7 @@ describe("MicroagentManagement", () => {
 
       // Wait for repositories and expand accordion
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       const repoAccordion = screen.getByTestId("repository-name-tooltip");
@@ -2450,7 +2390,7 @@ describe("MicroagentManagement", () => {
       renderMicroagentManagement();
 
       await waitFor(() => {
-        expect(mockUseUserRepositories).toHaveBeenCalled();
+        expect(OpenHands.retrieveUserGitRepositories).toHaveBeenCalled();
       });
 
       const repoAccordion = screen.getByTestId("repository-name-tooltip");

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

@@ -5,32 +5,16 @@ import { UserActions } from "#/components/features/sidebar/user-actions";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactElement } from "react";
 
-// Create mocks for all the hooks we need
+// Create a mock for useIsAuthed that we can control per test
 const useIsAuthedMock = vi
   .fn()
   .mockReturnValue({ data: true, isLoading: false });
 
-const useConfigMock = vi
-  .fn()
-  .mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-
-const useUserProvidersMock = vi
-  .fn()
-  .mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
-
-// Mock the hooks
+// Mock the useIsAuthed hook
 vi.mock("#/hooks/query/use-is-authed", () => ({
   useIsAuthed: () => useIsAuthedMock(),
 }));
 
-vi.mock("#/hooks/query/use-config", () => ({
-  useConfig: () => useConfigMock(),
-}));
-
-vi.mock("#/hooks/use-user-providers", () => ({
-  useUserProviders: () => useUserProvidersMock(),
-}));
-
 describe("UserActions", () => {
   const user = userEvent.setup();
   const onClickAccountSettingsMock = vi.fn();
@@ -56,10 +40,8 @@ describe("UserActions", () => {
   };
 
   beforeEach(() => {
-    // Reset all mocks to default values before each test
+    // Reset the mock to default value before each test
     useIsAuthedMock.mockReturnValue({ data: true, isLoading: false });
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
   });
 
   afterEach(() => {
@@ -120,9 +102,6 @@ describe("UserActions", () => {
   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 });
-    // Keep other mocks with default values
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
 
     renderWithQueryClient(<UserActions onLogout={onLogoutMock} />);
 
@@ -152,9 +131,6 @@ describe("UserActions", () => {
   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 });
-    // Keep other mocks with default values
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
 
     renderWithQueryClient(<UserActions onLogout={onLogoutMock} />);
 
@@ -173,9 +149,6 @@ describe("UserActions", () => {
   it("should handle user prop changing from undefined to defined", async () => {
     // Start with no authentication
     useIsAuthedMock.mockReturnValue({ data: false, isLoading: false });
-    // Keep other mocks with default values
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
 
     const { rerender } = renderWithQueryClient(
       <UserActions onLogout={onLogoutMock} />,
@@ -190,9 +163,6 @@ describe("UserActions", () => {
 
     // Set authentication to true for the rerender
     useIsAuthedMock.mockReturnValue({ data: true, isLoading: false });
-    // Ensure config and providers are set correctly
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
 
     // Add user prop and create a new QueryClient to ensure fresh state
     const queryClient = new QueryClient({
@@ -225,11 +195,6 @@ describe("UserActions", () => {
   });
 
   it("should handle user prop changing from defined to undefined", async () => {
-    // Start with authentication and providers
-    useIsAuthedMock.mockReturnValue({ data: true, isLoading: false });
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
-
     const { rerender } = renderWithQueryClient(
       <UserActions
         onLogout={onLogoutMock}
@@ -246,9 +211,6 @@ describe("UserActions", () => {
 
     // Set authentication to false for the rerender
     useIsAuthedMock.mockReturnValue({ data: false, isLoading: false });
-    // Keep other mocks with default values
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
 
     // Remove user prop - menu should disappear because user is no longer authenticated
     rerender(
@@ -267,11 +229,6 @@ describe("UserActions", () => {
   });
 
   it("should work with loading state and user provided", async () => {
-    // Ensure authentication and providers are set correctly
-    useIsAuthedMock.mockReturnValue({ data: true, isLoading: false });
-    useConfigMock.mockReturnValue({ data: { APP_MODE: "saas" }, isLoading: false });
-    useUserProvidersMock.mockReturnValue({ providers: [{ id: "github", name: "GitHub" }] });
-
     renderWithQueryClient(
       <UserActions
         onLogout={onLogoutMock}

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

@@ -3,8 +3,6 @@ import { createRoutesStub } from "react-router";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import userEvent from "@testing-library/user-event";
-import i18next from "i18next";
-import { I18nextProvider } from "react-i18next";
 import GitSettingsScreen from "#/routes/git-settings";
 import OpenHands from "#/api/open-hands";
 import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
@@ -48,44 +46,22 @@ const GitSettingsRouterStub = createRoutesStub([
 ]);
 
 const renderGitSettingsScreen = () => {
-  // Initialize i18next instance
-  i18next.init({
-    lng: "en",
-    resources: {
-      en: {
-        translation: {
-          GITHUB$TOKEN_HELP_TEXT: "Help text",
-          GITHUB$TOKEN_LABEL: "GitHub Token",
-          GITHUB$HOST_LABEL: "GitHub Host",
-          GITLAB$TOKEN_LABEL: "GitLab Token",
-          GITLAB$HOST_LABEL: "GitLab Host",
-          BITBUCKET$TOKEN_LABEL: "Bitbucket Token",
-          BITBUCKET$HOST_LABEL: "Bitbucket Host",
-        },
-      },
-    },
-  });
-
   const { rerender, ...rest } = render(
     <GitSettingsRouterStub initialEntries={["/settings/integrations"]} />,
     {
       wrapper: ({ children }) => (
-        <I18nextProvider i18n={i18next}>
-          <QueryClientProvider client={queryClient}>
-            {children}
-          </QueryClientProvider>
-        </I18nextProvider>
+        <QueryClientProvider client={queryClient}>
+          {children}
+        </QueryClientProvider>
       ),
     },
   );
 
   const rerenderGitSettingsScreen = () =>
     rerender(
-      <I18nextProvider i18n={i18next}>
-        <QueryClientProvider client={queryClient}>
-          <GitSettingsRouterStub initialEntries={["/settings/integrations"]} />
-        </QueryClientProvider>
-      </I18nextProvider>,
+      <QueryClientProvider client={queryClient}>
+        <GitSettingsRouterStub initialEntries={["/settings/integrations"]} />
+      </QueryClientProvider>,
     );
 
   return {
@@ -375,18 +351,14 @@ describe("Form submission", () => {
     let disconnectButton = await screen.findByTestId(
       "disconnect-tokens-button",
     );
-    // When tokens are set (github and gitlab are not null), the button should be enabled
     await waitFor(() => expect(disconnectButton).not.toBeDisabled());
 
-    // Mock settings with no tokens set
     getSettingsSpy.mockResolvedValue({
       ...MOCK_DEFAULT_USER_SETTINGS,
-      provider_tokens_set: {},
     });
     queryClient.invalidateQueries();
 
     disconnectButton = await screen.findByTestId("disconnect-tokens-button");
-    // When no tokens are set, the button should be disabled
     await waitFor(() => expect(disconnectButton).toBeDisabled());
   });
 

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

@@ -32,42 +32,6 @@ const RouterStub = createRoutesStub([
   },
 ]);
 
-const selectRepository = async (repoName: string) => {
-  const repoConnector = screen.getByTestId("repo-connector");
-
-  // First select the provider
-  const providerDropdown = await waitFor(() =>
-    screen.getByText("Select Provider"),
-  );
-  await userEvent.click(providerDropdown);
-  await userEvent.click(screen.getByText("Github"));
-
-  // Then select the repository
-  const dropdown = within(repoConnector).getByTestId("repo-dropdown");
-  const repoInput = within(dropdown).getByRole("combobox");
-  await userEvent.click(repoInput);
-
-  // Wait for the options to be loaded and displayed
-  await waitFor(() => {
-    const options = screen.getAllByText(repoName);
-    // Find the option in the dropdown (it will have role="option")
-    const dropdownOption = options.find(
-      (el) => el.getAttribute("role") === "option",
-    );
-    expect(dropdownOption).toBeInTheDocument();
-  });
-  const options = screen.getAllByText(repoName);
-  const dropdownOption = options.find(
-    (el) => el.getAttribute("role") === "option",
-  );
-  await userEvent.click(dropdownOption!);
-
-  // Wait for the branch to be auto-selected
-  await waitFor(() => {
-    expect(screen.getByText("main")).toBeInTheDocument();
-  });
-};
-
 const renderHomeScreen = () =>
   render(<RouterStub />, {
     wrapper: ({ children }) => (
@@ -129,8 +93,84 @@ describe("HomeScreen", () => {
     expect(mainContainer).toHaveClass("flex", "flex-col", "lg:flex-row");
   });
 
-  // TODO: Fix this test
-  it.skip("should filter and reset the suggested tasks based on repository selection", async () => {});
+  it("should filter the suggested tasks based on the selected repository", async () => {
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
+
+    renderHomeScreen();
+
+    const taskSuggestions = await screen.findByTestId("task-suggestions");
+
+    // Initially, all tasks should be visible
+    await waitFor(() => {
+      within(taskSuggestions).getByText("octocat/hello-world");
+      within(taskSuggestions).getByText("octocat/earth");
+    });
+
+    // Select a repository from the dropdown
+    const repoConnector = screen.getByTestId("repo-connector");
+
+    const dropdown = within(repoConnector).getByTestId("repo-dropdown");
+    await userEvent.click(dropdown);
+
+    const repoOption = screen.getAllByText("octocat/hello-world")[1];
+    await userEvent.click(repoOption);
+
+    // After selecting a repository, only tasks related to that repository should be visible
+    await waitFor(() => {
+      within(taskSuggestions).getByText("octocat/hello-world");
+      expect(
+        within(taskSuggestions).queryByText("octocat/earth"),
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  it("should reset the filtered tasks when the selected repository is cleared", async () => {
+    const retrieveUserGitRepositoriesSpy = vi.spyOn(
+      OpenHands,
+      "retrieveUserGitRepositories",
+    );
+    retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
+
+    renderHomeScreen();
+
+    const taskSuggestions = await screen.findByTestId("task-suggestions");
+
+    // Initially, all tasks should be visible
+    await waitFor(() => {
+      within(taskSuggestions).getByText("octocat/hello-world");
+      within(taskSuggestions).getByText("octocat/earth");
+    });
+
+    // Select a repository from the dropdown
+    const repoConnector = screen.getByTestId("repo-connector");
+
+    const dropdown = within(repoConnector).getByTestId("repo-dropdown");
+    await userEvent.click(dropdown);
+
+    const repoOption = screen.getAllByText("octocat/hello-world")[1];
+    await userEvent.click(repoOption);
+
+    // After selecting a repository, only tasks related to that repository should be visible
+    await waitFor(() => {
+      within(taskSuggestions).getByText("octocat/hello-world");
+      expect(
+        within(taskSuggestions).queryByText("octocat/earth"),
+      ).not.toBeInTheDocument();
+    });
+
+    // Clear the selected repository
+    await userEvent.clear(dropdown);
+
+    // All tasks should be visible again
+    await waitFor(() => {
+      within(taskSuggestions).getByText("octocat/hello-world");
+      within(taskSuggestions).getByText("octocat/earth");
+    });
+  });
 
   describe("launch buttons", () => {
     const setupLaunchButtons = async () => {
@@ -139,25 +179,19 @@ describe("HomeScreen", () => {
       let tasksLaunchButtons =
         await screen.findAllByTestId("task-launch-button");
 
-      // Mock the repository branches API call
-      vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue([
-        { name: "main", commit_sha: "123", protected: false },
-        { name: "develop", commit_sha: "456", protected: false },
-      ]);
+      // Select a repository from the dropdown to enable the repo launch button
+      const repoConnector = screen.getByTestId("repo-connector");
+      const dropdown = within(repoConnector).getByTestId("repo-dropdown");
+      await userEvent.click(dropdown);
+      const repoOption = screen.getAllByText("octocat/hello-world")[1];
+      await userEvent.click(repoOption);
 
-      // Select a repository to enable the repo launch button
-      await selectRepository("octocat/hello-world");
-
-      // Wait for all buttons to be enabled
-      await waitFor(() => {
-        expect(headerLaunchButton).not.toBeDisabled();
-        expect(repoLaunchButton).not.toBeDisabled();
-        tasksLaunchButtons.forEach((button) => {
-          expect(button).not.toBeDisabled();
-        });
+      expect(headerLaunchButton).not.toBeDisabled();
+      expect(repoLaunchButton).not.toBeDisabled();
+      tasksLaunchButtons.forEach((button) => {
+        expect(button).not.toBeDisabled();
       });
 
-      // Get fresh references to the buttons
       headerLaunchButton = screen.getByTestId("header-launch-button");
       repoLaunchButton = screen.getByTestId("repo-launch-button");
       tasksLaunchButtons = await screen.findAllByTestId("task-launch-button");
@@ -174,10 +208,7 @@ describe("HomeScreen", () => {
         OpenHands,
         "retrieveUserGitRepositories",
       );
-      retrieveUserGitRepositoriesSpy.mockResolvedValue({
-        data: MOCK_RESPOSITORIES,
-        nextPage: null,
-      });
+      retrieveUserGitRepositoriesSpy.mockResolvedValue(MOCK_RESPOSITORIES);
     });
 
     it("should disable the other launch buttons when the header launch button is clicked", async () => {

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

@@ -47,7 +47,7 @@ describe("Content", () => {
       const apiKey = screen.getByTestId("llm-api-key-input");
 
       await waitFor(() => {
-        expect(provider).toHaveValue("OpenHands");
+        expect(provider).toHaveValue("Anthropic");
         expect(model).toHaveValue("claude-sonnet-4-20250514");
 
         expect(apiKey).toHaveValue("");
@@ -135,7 +135,7 @@ describe("Content", () => {
       );
       const condensor = screen.getByTestId("enable-memory-condenser-switch");
 
-      expect(model).toHaveValue("openhands/claude-sonnet-4-20250514");
+      expect(model).toHaveValue("anthropic/claude-sonnet-4-20250514");
       expect(baseUrl).toHaveValue("");
       expect(apiKey).toHaveValue("");
       expect(apiKey).toHaveProperty("placeholder", "");
@@ -537,7 +537,7 @@ describe("Form submission", () => {
 
     // select provider
     await userEvent.click(provider);
-    const providerOption = screen.getByText("OpenHands");
+    const providerOption = screen.getByText("Anthropic");
     await userEvent.click(providerOption);
 
     // select model
@@ -550,7 +550,7 @@ describe("Form submission", () => {
 
     expect(saveSettingsSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        llm_model: "openhands/claude-sonnet-4-20250514",
+        llm_model: "anthropic/claude-sonnet-4-20250514",
         llm_base_url: "",
         confirmation_mode: false,
       }),

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

@@ -112,21 +112,12 @@ describe("Content", () => {
     screen.getByTestId("git-settings-screen");
   });
 
-  it("should render an empty table when there are no existing secrets", async () => {
+  it("should render a message if there are no existing secrets", async () => {
     const getSecretsSpy = vi.spyOn(SecretsService, "getSecrets");
     getSecretsSpy.mockResolvedValue([]);
     renderSecretsSettings();
 
-    // Should show the add secret button
-    await screen.findByTestId("add-secret-button");
-
-    // Should show an empty table with headers but no secret items
-    expect(screen.queryAllByTestId("secret-item")).toHaveLength(0);
-
-    // Should still show the table headers
-    expect(screen.getByText("SETTINGS$NAME")).toBeInTheDocument();
-    expect(screen.getByText("SECRETS$DESCRIPTION")).toBeInTheDocument();
-    expect(screen.getByText("SETTINGS$ACTIONS")).toBeInTheDocument();
+    await screen.findByTestId("no-secrets-message");
   });
 
   it("should render existing secrets", async () => {
@@ -136,6 +127,7 @@ describe("Content", () => {
 
     const secrets = await screen.findAllByTestId("secret-item");
     expect(secrets).toHaveLength(2);
+    expect(screen.queryByTestId("no-secrets-message")).not.toBeInTheDocument();
   });
 });
 
@@ -407,22 +399,19 @@ describe("Secret actions", () => {
     expect(screen.queryByText("My_Secret_2")).toBeInTheDocument();
   });
 
-  it("should hide the table and add button when in form view", async () => {
+  it("should hide the no items message when in form view", async () => {
     const getSecretsSpy = vi.spyOn(SecretsService, "getSecrets");
     getSecretsSpy.mockResolvedValue([]);
     renderSecretsSettings();
 
-    // Initially should show the add button and table
+    // render form & hide items
+    expect(screen.queryByTestId("no-secrets-message")).not.toBeInTheDocument();
     const button = await screen.findByTestId("add-secret-button");
-    expect(screen.getByText("SETTINGS$NAME")).toBeInTheDocument(); // table header
-
     await userEvent.click(button);
 
-    // When in form view, should hide the add button and table
     const secretForm = screen.getByTestId("add-secret-form");
     expect(secretForm).toBeInTheDocument();
-    expect(screen.queryByTestId("add-secret-button")).not.toBeInTheDocument();
-    expect(screen.queryByText("SETTINGS$NAME")).not.toBeInTheDocument(); // table header should be hidden
+    expect(screen.queryByTestId("no-secrets-message")).not.toBeInTheDocument();
   });
 
   it("should not allow spaces in secret names", async () => {

frontend/__tests__/utils/extract-model-and-provider.test.ts

@@ -82,11 +82,5 @@ describe("extractModelAndProvider", () => {
       model: "claude-opus-4-20250514",
       separator: "/",
     });
-
-    expect(extractModelAndProvider("claude-opus-4-1-20250805")).toEqual({
-      provider: "anthropic",
-      model: "claude-opus-4-1-20250805",
-      separator: "/",
-    });
   });
 });

frontend/index.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="theme-color" content="#ffffff">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="OpenHands: Code Less, Make More"
+    />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>OpenHands</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>

frontend/package.json

@@ -8,19 +8,18 @@
   },
   "dependencies": {
     "@heroui/react": "^2.8.2",
-    "@heroui/use-infinite-scroll": "^2.2.10",
     "@microlink/react-json-view": "^1.26.2",
     "@monaco-editor/react": "^4.7.0-rc.0",
-    "@react-router/node": "^7.8.0",
-    "@react-router/serve": "^7.8.0",
+    "@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.9.0",
-    "@stripe/stripe-js": "^7.8.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.84.2",
-    "@vitejs/plugin-react": "^5.0.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.11.0",
@@ -32,9 +31,9 @@
     "i18next-http-backend": "^3.0.2",
     "isbot": "^5.1.29",
     "jose": "^6.0.12",
-    "lucide-react": "^0.539.0",
+    "lucide-react": "^0.536.0",
     "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.259.0",
+    "posthog-js": "^1.258.5",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-highlight": "^0.15.0",
@@ -43,8 +42,7 @@
     "react-icons": "^5.5.0",
     "react-markdown": "^10.1.0",
     "react-redux": "^9.2.0",
-    "react-router": "^7.8.0",
-    "react-select": "^5.10.2",
+    "react-router": "^7.7.1",
     "react-syntax-highlighter": "^15.6.1",
     "react-textarea-autosize": "^8.5.9",
     "remark-breaks": "^4.0.0",
@@ -52,7 +50,7 @@
     "sirv-cli": "^3.0.1",
     "socket.io-client": "^4.8.1",
     "tailwind-merge": "^3.3.1",
-    "vite": "^7.1.1",
+    "vite": "^7.0.6",
     "web-vitals": "^5.1.0",
     "ws": "^8.18.2"
   },
@@ -87,14 +85,14 @@
     "@babel/types": "^7.28.2",
     "@mswjs/socket.io-binding": "^0.2.0",
     "@playwright/test": "^1.54.2",
-    "@react-router/dev": "^7.8.0",
+    "@react-router/dev": "^7.7.1",
     "@tailwindcss/typography": "^0.5.16",
     "@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.2.0",
+    "@types/node": "^24.1.0",
     "@types/react": "^19.1.9",
     "@types/react-dom": "^19.1.7",
     "@types/react-highlight": "^0.12.8",
@@ -112,13 +110,13 @@
     "eslint-plugin-i18next": "^6.1.3",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-prettier": "^5.5.4",
+    "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",
     "husky": "^9.1.7",
     "jsdom": "^26.1.0",
-    "lint-staged": "^16.1.4",
+    "lint-staged": "^16.1.2",
     "msw": "^2.6.6",
     "prettier": "^3.6.2",
     "stripe": "^18.4.0",

frontend/public/mockServiceWorker.js

@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.10.4'
+const PACKAGE_VERSION = '2.10.3'
 const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

frontend/src/api/file-service/file-service.api.ts

@@ -0,0 +1,66 @@
+import { openHands } from "../open-hands-axios";
+import { GetFilesResponse, GetFileResponse } from "./file-service.types";
+import { getConversationUrl } from "../conversation.utils";
+import { FileUploadSuccessResponse } from "../open-hands.types";
+
+export class FileService {
+  /**
+   * Retrieve the list of files available in the workspace
+   * @param conversationId ID of the conversation
+   * @param path Path to list files from. If provided, it lists all the files in the given path
+   * @returns List of files available in the given path. If path is not provided, it lists all the files in the workspace
+   */
+  static async getFiles(
+    conversationId: string,
+    path?: string,
+  ): Promise<GetFilesResponse> {
+    const url = `${getConversationUrl(conversationId)}/list-files`;
+    const { data } = await openHands.get<GetFilesResponse>(url, {
+      params: { path },
+    });
+
+    return data;
+  }
+
+  /**
+   * Retrieve the content of a file
+   * @param conversationId ID of the conversation
+   * @param path Full path of the file to retrieve
+   * @returns Code content of the file
+   */
+  static async getFile(conversationId: string, path: string): Promise<string> {
+    const url = `${getConversationUrl(conversationId)}/select-file`;
+    const { data } = await openHands.get<GetFileResponse>(url, {
+      params: { file: path },
+    });
+
+    return data.code;
+  }
+
+  /**
+   * Upload multiple files to the workspace
+   * @param conversationId ID of the conversation
+   * @param files List of files.
+   * @returns list of uploaded files, list of skipped files
+   */
+  static async uploadFiles(
+    conversationId: string,
+    files: File[],
+  ): Promise<FileUploadSuccessResponse> {
+    const formData = new FormData();
+    for (const file of files) {
+      formData.append("files", file);
+    }
+    const url = `${getConversationUrl(conversationId)}/upload-files`;
+    const response = await openHands.post<FileUploadSuccessResponse>(
+      url,
+      formData,
+      {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+      },
+    );
+    return response.data;
+  }
+}

frontend/src/api/file-service/file-service.types.ts

@@ -0,0 +1,5 @@
+export type GetFilesResponse = string[];
+
+export interface GetFileResponse {
+  code: string;
+}

frontend/src/api/memory-service/memory-service.api.ts

@@ -0,0 +1,21 @@
+import { openHands } from "../open-hands-axios";
+
+interface GetPromptResponse {
+  status: string;
+  prompt: string;
+}
+
+export class MemoryService {
+  static async getPrompt(
+    conversationId: string,
+    eventId: number,
+  ): Promise<string> {
+    const { data } = await openHands.get<GetPromptResponse>(
+      `/api/conversations/${conversationId}/remember_prompt`,
+      {
+        params: { event_id: eventId },
+      },
+    );
+    return data.prompt;
+  }
+}

frontend/src/api/open-hands.ts

@@ -15,15 +15,11 @@ import {
   GetMicroagentPromptResponse,
   CreateMicroagent,
   MicroagentContentResponse,
-  FileUploadSuccessResponse,
-  GetFilesResponse,
-  GetFileResponse,
 } 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 { extractNextPageFromLink } from "#/utils/extract-next-page-from-link";
 import { RepositoryMicroagent } from "#/types/microagent-management";
 import { BatchFeedbackData } from "#/hooks/query/use-batch-feedback";
 
@@ -283,27 +279,17 @@ class OpenHands {
     return data;
   }
 
-  static async getUserConversations(
-    limit: number = 20,
-    pageId?: string,
-  ): Promise<ResultSet<Conversation>> {
-    const params = new URLSearchParams();
-    params.append("limit", limit.toString());
-
-    if (pageId) {
-      params.append("page_id", pageId);
-    }
-
+  static async getUserConversations(): Promise<Conversation[]> {
     const { data } = await openHands.get<ResultSet<Conversation>>(
-      `/api/conversations?${params.toString()}`,
+      "/api/conversations?limit=20",
     );
-    return data;
+    return data.results;
   }
 
   static async searchConversations(
     selectedRepository?: string,
     conversationTrigger?: string,
-    limit: number = 100,
+    limit: number = 20,
   ): Promise<Conversation[]> {
     const params = new URLSearchParams();
     params.append("limit", limit.toString());
@@ -448,7 +434,6 @@ class OpenHands {
   static async searchGitRepositories(
     query: string,
     per_page = 5,
-    selected_provider?: Provider,
   ): Promise<GitRepository[]> {
     const response = await openHands.get<GitRepository[]>(
       "/api/user/search/repositories",
@@ -456,7 +441,6 @@ class OpenHands {
         params: {
           query,
           per_page,
-          selected_provider,
         },
       },
     );
@@ -501,70 +485,20 @@ class OpenHands {
   }
 
   /**
+   * Given a PAT, retrieves the repositories of the user
    * @returns A list of repositories
    */
-  static async retrieveUserGitRepositories(
-    selected_provider: Provider,
-    page = 1,
-    per_page = 30,
-  ) {
+  static async retrieveUserGitRepositories() {
     const { data } = await openHands.get<GitRepository[]>(
       "/api/user/repositories",
       {
         params: {
-          selected_provider,
           sort: "pushed",
-          page,
-          per_page,
         },
       },
     );
 
-    const link =
-      data.length > 0 && data[0].link_header ? data[0].link_header : "";
-    const nextPage = extractNextPageFromLink(link);
-
-    return { data, nextPage };
-  }
-
-  static async retrieveInstallationRepositories(
-    selected_provider: Provider,
-    installationIndex: number,
-    installations: string[],
-    page = 1,
-    per_page = 30,
-  ) {
-    const installationId = installations[installationIndex];
-    const response = await openHands.get<GitRepository[]>(
-      "/api/user/repositories",
-      {
-        params: {
-          selected_provider,
-          sort: "pushed",
-          page,
-          per_page,
-          installation_id: installationId,
-        },
-      },
-    );
-    const link =
-      response.data.length > 0 && response.data[0].link_header
-        ? response.data[0].link_header
-        : "";
-    const nextPage = extractNextPageFromLink(link);
-    let nextInstallation: number | null;
-    if (nextPage) {
-      nextInstallation = installationIndex;
-    } else if (installationIndex + 1 < installations.length) {
-      nextInstallation = installationIndex + 1;
-    } else {
-      nextInstallation = null;
-    }
-    return {
-      data: response.data,
-      nextPage,
-      installationIndex: nextInstallation,
-    };
+    return data;
   }
 
   static async getRepositoryBranches(repository: string): Promise<Branch[]> {
@@ -631,11 +565,12 @@ class OpenHands {
     conversationId: string,
     eventId: number,
   ): Promise<string> {
-    const url = `${this.getConversationUrl(conversationId)}/remember-prompt`;
-    const { data } = await openHands.get<GetMicroagentPromptResponse>(url, {
-      params: { event_id: eventId },
-      headers: this.getConversationHeaders(),
-    });
+    const { data } = await openHands.get<GetMicroagentPromptResponse>(
+      `/api/conversations/${conversationId}/remember_prompt`,
+      {
+        params: { event_id: eventId },
+      },
+    );
 
     return data.prompt;
   }
@@ -651,81 +586,6 @@ class OpenHands {
 
     return data;
   }
-
-  /**
-   * Retrieve the list of files available in the workspace
-   * @param conversationId ID of the conversation
-   * @param path Path to list files from. If provided, it lists all the files in the given path
-   * @returns List of files available in the given path. If path is not provided, it lists all the files in the workspace
-   */
-  static async getFiles(
-    conversationId: string,
-    path?: string,
-  ): Promise<GetFilesResponse> {
-    const url = `${this.getConversationUrl(conversationId)}/list-files`;
-    const { data } = await openHands.get<GetFilesResponse>(url, {
-      params: { path },
-      headers: this.getConversationHeaders(),
-    });
-
-    return data;
-  }
-
-  /**
-   * Retrieve the content of a file
-   * @param conversationId ID of the conversation
-   * @param path Full path of the file to retrieve
-   * @returns Code content of the file
-   */
-  static async getFile(conversationId: string, path: string): Promise<string> {
-    const url = `${this.getConversationUrl(conversationId)}/select-file`;
-    const { data } = await openHands.get<GetFileResponse>(url, {
-      params: { file: path },
-      headers: this.getConversationHeaders(),
-    });
-
-    return data.code;
-  }
-
-  /**
-   * Upload multiple files to the workspace
-   * @param conversationId ID of the conversation
-   * @param files List of files.
-   * @returns list of uploaded files, list of skipped files
-   */
-  static async uploadFiles(
-    conversationId: string,
-    files: File[],
-  ): Promise<FileUploadSuccessResponse> {
-    const formData = new FormData();
-    for (const file of files) {
-      formData.append("files", file);
-    }
-    const url = `${this.getConversationUrl(conversationId)}/upload-files`;
-    const response = await openHands.post<FileUploadSuccessResponse>(
-      url,
-      formData,
-      {
-        headers: {
-          "Content-Type": "multipart/form-data",
-          ...this.getConversationHeaders(),
-        },
-      },
-    );
-    return response.data;
-  }
-
-  /**
-   * Get the user installation IDs
-   * @param provider The provider to get installation IDs for (github, bitbucket, etc.)
-   * @returns List of installation IDs
-   */
-  static async getUserInstallationIds(provider: Provider): Promise<string[]> {
-    const { data } = await openHands.get<string[]>(
-      `/api/user/installations?provider=${provider}`,
-    );
-    return data;
-  }
 }
 
 export default OpenHands;

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

@@ -51,7 +51,6 @@ export interface GetConfigResponse {
   POSTHOG_CLIENT_KEY: string;
   STRIPE_PUBLISHABLE_KEY?: string;
   PROVIDERS_CONFIGURED?: Provider[];
-  AUTH_URL?: string;
   FEATURE_FLAGS: {
     ENABLE_BILLING: boolean;
     HIDE_LLM_SETTINGS: boolean;
@@ -158,9 +157,3 @@ export interface MicroagentContentResponse {
   git_provider: Provider;
   triggers: string[];
 }
-
-export type GetFilesResponse = string[];
-
-export interface GetFileResponse {
-  code: string;
-}

frontend/src/components/common/git-branch-dropdown.tsx

@@ -1,69 +0,0 @@
-import { useMemo } from "react";
-import { useRepositoryBranches } from "../../hooks/query/use-repository-branches";
-import { ReactSelectDropdown, SelectOption } from "./react-select-dropdown";
-
-export interface GitBranchDropdownProps {
-  repositoryName?: string | null;
-  value?: string | null;
-  placeholder?: string;
-  className?: string;
-  errorMessage?: string;
-  disabled?: boolean;
-  onChange?: (branchName: string | null) => void;
-}
-
-export function GitBranchDropdown({
-  repositoryName,
-  value,
-  placeholder = "Select branch...",
-  className,
-  errorMessage,
-  disabled = false,
-  onChange,
-}: GitBranchDropdownProps) {
-  const { data: branches, isLoading } = useRepositoryBranches(
-    repositoryName || null,
-  );
-
-  const options: SelectOption[] = useMemo(
-    () =>
-      branches?.map((branch) => ({
-        value: branch.name,
-        label: branch.name,
-      })) || [],
-    [branches],
-  );
-
-  const hasNoBranches = !isLoading && branches && branches.length === 0;
-
-  const selectedOption = useMemo(
-    () => options.find((option) => option.value === value) || null,
-    [options, value],
-  );
-
-  const handleChange = (option: SelectOption | null) => {
-    onChange?.(option?.value || null);
-  };
-
-  const isDisabled = disabled || !repositoryName || isLoading || hasNoBranches;
-
-  const displayPlaceholder = hasNoBranches ? "No branches found" : placeholder;
-  const displayErrorMessage = hasNoBranches
-    ? "This repository has no branches"
-    : errorMessage;
-
-  return (
-    <ReactSelectDropdown
-      options={options}
-      value={selectedOption}
-      placeholder={displayPlaceholder}
-      className={className}
-      errorMessage={displayErrorMessage}
-      disabled={isDisabled}
-      isClearable={false}
-      isSearchable
-      isLoading={isLoading}
-      onChange={handleChange}
-    />
-  );
-}

frontend/src/components/common/git-provider-dropdown.tsx

@@ -1,58 +0,0 @@
-import { useMemo } from "react";
-import { Provider } from "../../types/settings";
-import { ReactSelectDropdown, SelectOption } from "./react-select-dropdown";
-
-export interface GitProviderDropdownProps {
-  providers: Provider[];
-  value?: Provider | null;
-  placeholder?: string;
-  className?: string;
-  errorMessage?: string;
-  disabled?: boolean;
-  isLoading?: boolean;
-  onChange?: (provider: Provider | null) => void;
-}
-
-export function GitProviderDropdown({
-  providers,
-  value,
-  placeholder = "Select Provider",
-  className,
-  errorMessage,
-  disabled = false,
-  isLoading = false,
-  onChange,
-}: GitProviderDropdownProps) {
-  const options: SelectOption[] = useMemo(
-    () =>
-      providers.map((provider) => ({
-        value: provider,
-        label: provider.charAt(0).toUpperCase() + provider.slice(1),
-      })),
-    [providers],
-  );
-
-  const selectedOption = useMemo(
-    () => options.find((option) => option.value === value) || null,
-    [options, value],
-  );
-
-  const handleChange = (option: SelectOption | null) => {
-    onChange?.(option?.value as Provider | null);
-  };
-
-  return (
-    <ReactSelectDropdown
-      options={options}
-      value={selectedOption}
-      placeholder={placeholder}
-      className={className}
-      errorMessage={errorMessage}
-      disabled={disabled}
-      isClearable={false}
-      isSearchable={false}
-      isLoading={isLoading}
-      onChange={handleChange}
-    />
-  );
-}

frontend/src/components/common/git-repository-dropdown.tsx

@@ -1,186 +0,0 @@
-import { useCallback, useMemo, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { Provider } from "../../types/settings";
-import { useGitRepositories } from "../../hooks/query/use-git-repositories";
-import OpenHands from "../../api/open-hands";
-import { GitRepository } from "../../types/git";
-import {
-  ReactSelectAsyncDropdown,
-  AsyncSelectOption,
-} from "./react-select-async-dropdown";
-
-export interface GitRepositoryDropdownProps {
-  provider: Provider;
-  value?: string | null;
-  placeholder?: string;
-  className?: string;
-  errorMessage?: string;
-  disabled?: boolean;
-  onChange?: (repository?: GitRepository) => void;
-}
-
-interface SearchCache {
-  [key: string]: GitRepository[];
-}
-
-export function GitRepositoryDropdown({
-  provider,
-  value,
-  placeholder = "Search repositories...",
-  className,
-  errorMessage,
-  disabled = false,
-  onChange,
-}: GitRepositoryDropdownProps) {
-  const { t } = useTranslation();
-  const {
-    data,
-    fetchNextPage,
-    hasNextPage,
-    isLoading,
-    isFetchingNextPage,
-    isError,
-  } = useGitRepositories({
-    provider,
-    enabled: !disabled,
-  });
-
-  const allOptions: AsyncSelectOption[] = useMemo(
-    () =>
-      data?.pages
-        ? data.pages.flatMap((page) =>
-            page.data.map((repo) => ({
-              value: repo.id,
-              label: repo.full_name,
-            })),
-          )
-        : [],
-    [data],
-  );
-
-  // Keep track of search results
-  const searchCache = useRef<SearchCache>({});
-
-  const selectedOption = useMemo(() => {
-    // First check in loaded pages
-    const option = allOptions.find((opt) => opt.value === value);
-    if (option) return option;
-
-    // If not found, check in search cache
-    const repo = Object.values(searchCache.current)
-      .flat()
-      .find((r) => r.id === value);
-
-    if (repo) {
-      return {
-        value: repo.id,
-        label: repo.full_name,
-      };
-    }
-
-    return null;
-  }, [allOptions, value]);
-
-  const loadOptions = useCallback(
-    async (inputValue: string): Promise<AsyncSelectOption[]> => {
-      // If empty input, show all loaded options
-      if (!inputValue.trim()) {
-        return allOptions;
-      }
-
-      // If it looks like a URL, extract the repo name and search
-      if (inputValue.startsWith("https://")) {
-        const match = inputValue.match(/https:\/\/[^/]+\/([^/]+\/[^/]+)/);
-        if (match) {
-          const repoName = match[1];
-          const searchResults = await OpenHands.searchGitRepositories(
-            repoName,
-            3,
-          );
-          // Cache the search results
-          searchCache.current[repoName] = searchResults;
-          return searchResults.map((repo) => ({
-            value: repo.id,
-            label: repo.full_name,
-          }));
-        }
-      }
-
-      // For any other input, search via API
-      if (inputValue.length >= 2) {
-        // Only search if at least 2 characters
-        const searchResults = await OpenHands.searchGitRepositories(
-          inputValue,
-          10,
-        );
-        // Cache the search results
-        searchCache.current[inputValue] = searchResults;
-        return searchResults.map((repo) => ({
-          value: repo.id,
-          label: repo.full_name,
-        }));
-      }
-
-      // For very short inputs, do local filtering
-      return allOptions.filter((option) =>
-        option.label.toLowerCase().includes(inputValue.toLowerCase()),
-      );
-    },
-    [allOptions],
-  );
-
-  const handleChange = (option: AsyncSelectOption | null) => {
-    if (!option) {
-      onChange?.(undefined);
-      return;
-    }
-
-    // First check in loaded pages
-    let repo = data?.pages
-      ?.flatMap((p) => p.data)
-      .find((r) => r.id === option.value);
-
-    // If not found, check in search results
-    if (!repo) {
-      repo = Object.values(searchCache.current)
-        .flat()
-        .find((r) => r.id === option.value);
-    }
-
-    onChange?.(repo);
-  };
-
-  const handleMenuScrollToBottom = useCallback(() => {
-    if (hasNextPage && !isFetchingNextPage && !isLoading) {
-      fetchNextPage();
-    }
-  }, [hasNextPage, isFetchingNextPage, isLoading, fetchNextPage]);
-
-  return (
-    <>
-      <ReactSelectAsyncDropdown
-        testId="repo-dropdown"
-        loadOptions={loadOptions}
-        value={selectedOption}
-        placeholder={placeholder}
-        className={className}
-        errorMessage={errorMessage}
-        disabled={disabled}
-        isClearable={false}
-        isLoading={isLoading || isLoading || isFetchingNextPage}
-        cacheOptions
-        defaultOptions={allOptions}
-        onChange={handleChange}
-        onMenuScrollToBottom={handleMenuScrollToBottom}
-      />
-      {isError && (
-        <div
-          data-testid="repo-dropdown-error"
-          className="text-red-500 text-sm mt-1"
-        >
-          {t("HOME$FAILED_TO_LOAD_REPOSITORIES")}
-        </div>
-      )}
-    </>
-  );
-}

frontend/src/components/common/react-select-async-dropdown.tsx

@@ -1,79 +0,0 @@
-import { useCallback, useMemo } from "react";
-import AsyncSelect from "react-select/async";
-import { cn } from "#/utils/utils";
-import { SelectOptionBase, getCustomStyles } from "./react-select-styles";
-
-export type AsyncSelectOption = SelectOptionBase;
-
-export interface ReactSelectAsyncDropdownProps {
-  loadOptions: (inputValue: string) => Promise<AsyncSelectOption[]>;
-  testId?: string;
-  placeholder?: string;
-  value?: AsyncSelectOption | null;
-  defaultValue?: AsyncSelectOption | null;
-  className?: string;
-  errorMessage?: string;
-  disabled?: boolean;
-  isClearable?: boolean;
-  isLoading?: boolean;
-  cacheOptions?: boolean;
-  defaultOptions?: boolean | AsyncSelectOption[];
-  onChange?: (option: AsyncSelectOption | null) => void;
-  onMenuScrollToBottom?: () => void;
-}
-
-export function ReactSelectAsyncDropdown({
-  loadOptions,
-  testId,
-  placeholder = "Search...",
-  value,
-  defaultValue,
-  className,
-  errorMessage,
-  disabled = false,
-  isClearable = false,
-  isLoading = false,
-  cacheOptions = true,
-  defaultOptions = true,
-  onChange,
-  onMenuScrollToBottom,
-}: ReactSelectAsyncDropdownProps) {
-  const customStyles = useMemo(() => getCustomStyles<AsyncSelectOption>(), []);
-
-  const handleLoadOptions = useCallback(
-    (inputValue: string, callback: (options: AsyncSelectOption[]) => void) => {
-      loadOptions(inputValue)
-        .then((options) => callback(options))
-        .catch(() => callback([]));
-    },
-    [loadOptions],
-  );
-
-  return (
-    <div data-testid={testId} className={cn("w-full", className)}>
-      <AsyncSelect
-        loadOptions={handleLoadOptions}
-        value={value}
-        defaultValue={defaultValue}
-        placeholder={placeholder}
-        isDisabled={disabled}
-        isClearable={isClearable}
-        isLoading={isLoading}
-        cacheOptions={cacheOptions}
-        defaultOptions={defaultOptions}
-        onChange={onChange}
-        onMenuScrollToBottom={onMenuScrollToBottom}
-        styles={customStyles}
-        className="w-full"
-      />
-      {errorMessage && (
-        <p
-          data-testid="repo-dropdown-error"
-          className="text-red-500 text-sm mt-1"
-        >
-          {errorMessage}
-        </p>
-      )}
-    </div>
-  );
-}

frontend/src/components/common/react-select-dropdown.tsx

@@ -1,57 +0,0 @@
-import { useMemo } from "react";
-import Select from "react-select";
-import { cn } from "#/utils/utils";
-import { SelectOptionBase, getCustomStyles } from "./react-select-styles";
-
-export type SelectOption = SelectOptionBase;
-
-export interface ReactSelectDropdownProps {
-  options: SelectOption[];
-  placeholder?: string;
-  value?: SelectOption | null;
-  defaultValue?: SelectOption | null;
-  className?: string;
-  errorMessage?: string;
-  disabled?: boolean;
-  isClearable?: boolean;
-  isSearchable?: boolean;
-  isLoading?: boolean;
-  onChange?: (option: SelectOption | null) => void;
-}
-
-export function ReactSelectDropdown({
-  options,
-  placeholder = "Select option...",
-  value,
-  defaultValue,
-  className,
-  errorMessage,
-  disabled = false,
-  isClearable = false,
-  isSearchable = true,
-  isLoading = false,
-  onChange,
-}: ReactSelectDropdownProps) {
-  const customStyles = useMemo(() => getCustomStyles<SelectOption>(), []);
-
-  return (
-    <div className={cn("w-full", className)}>
-      <Select
-        options={options}
-        value={value}
-        defaultValue={defaultValue}
-        placeholder={placeholder}
-        isDisabled={disabled}
-        isClearable={isClearable}
-        isSearchable={isSearchable}
-        isLoading={isLoading}
-        onChange={onChange}
-        styles={customStyles}
-        className="w-full"
-      />
-      {errorMessage && (
-        <p className="text-red-500 text-sm mt-1">{errorMessage}</p>
-      )}
-    </div>
-  );
-}

frontend/src/components/common/react-select-styles.ts

@@ -1,92 +0,0 @@
-import { StylesConfig } from "react-select";
-
-export interface SelectOptionBase {
-  value: string;
-  label: string;
-}
-
-export const getCustomStyles = <T extends SelectOptionBase>(): StylesConfig<
-  T,
-  false
-> => ({
-  control: (provided, state) => ({
-    ...provided,
-    backgroundColor: state.isDisabled ? "#363636" : "#454545", // darker tertiary when disabled
-    border: "1px solid #717888",
-    borderRadius: "0.125rem",
-    minHeight: "2.5rem",
-    padding: "0 0.5rem",
-    boxShadow: state.isFocused ? "0 0 0 1px #717888" : "none",
-    opacity: state.isDisabled ? 0.6 : 1,
-    cursor: state.isDisabled ? "not-allowed" : "pointer",
-    "&:hover": {
-      borderColor: "#717888",
-    },
-  }),
-  input: (provided) => ({
-    ...provided,
-    color: "#ECEDEE", // content
-  }),
-  placeholder: (provided) => ({
-    ...provided,
-    fontStyle: "italic",
-    color: "#B7BDC2", // tertiary-light
-  }),
-  singleValue: (provided, state) => ({
-    ...provided,
-    color: state.isDisabled ? "#B7BDC2" : "#ECEDEE", // tertiary-light when disabled, content otherwise
-  }),
-  menu: (provided) => ({
-    ...provided,
-    backgroundColor: "#454545", // tertiary
-    border: "1px solid #717888",
-    borderRadius: "0.75rem",
-    overflow: "hidden", // ensure menu items don't overflow rounded corners
-  }),
-  menuList: (provided) => ({
-    ...provided,
-    padding: "0.25rem", // add some padding around menu items
-  }),
-  option: (provided, state) => {
-    let backgroundColor = "transparent";
-    if (state.isSelected) {
-      backgroundColor = "#C9B974"; // primary for selected
-    } else if (state.isFocused) {
-      backgroundColor = "#24272E"; // base-secondary for hover/focus
-    }
-
-    return {
-      ...provided,
-      backgroundColor,
-      color: state.isSelected ? "#000000" : "#ECEDEE", // black text on yellow, white on gray
-      borderRadius: "0.5rem", // rounded menu items
-      margin: "0.125rem 0", // small gap between items
-      "&:hover": {
-        backgroundColor: state.isSelected ? "#C9B974" : "#24272E", // keep yellow if selected, else gray
-        color: state.isSelected ? "#000000" : "#ECEDEE", // maintain text color on hover
-      },
-      "&:active": {
-        backgroundColor: state.isSelected ? "#C9B974" : "#24272E",
-        color: state.isSelected ? "#000000" : "#ECEDEE",
-      },
-    };
-  },
-  clearIndicator: (provided) => ({
-    ...provided,
-    color: "#B7BDC2", // tertiary-light
-    "&:hover": {
-      color: "#ECEDEE", // content
-    },
-  }),
-  dropdownIndicator: (provided) => ({
-    ...provided,
-    color: "#B7BDC2", // tertiary-light
-    "&:hover": {
-      color: "#ECEDEE", // content
-    },
-  }),
-  loadingIndicator: (provided) => ({
-    ...provided,
-    color: "#B7BDC2", // tertiary-light
-  }),
-});

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

@@ -55,7 +55,7 @@ export function ChatMessage({
       className={cn(
         "rounded-xl relative w-fit",
         "flex flex-col gap-2",
-        type === "user" && " p-4 bg-tertiary self-end",
+        type === "user" && " max-w-[305px] p-4 bg-tertiary self-end",
         type === "agent" && "mt-6 max-w-full bg-transparent",
       )}
     >
@@ -86,13 +86,7 @@ export function ChatMessage({
         />
       </div>
 
-      <div
-        className="text-sm"
-        style={{
-          whiteSpace: "normal",
-          wordBreak: "break-word",
-        }}
-      >
+      <div className="text-sm break-words">
         <Markdown
           components={{
             code,

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

@@ -3,8 +3,7 @@ import { NavLink, useParams, useNavigate } from "react-router";
 import { useTranslation } from "react-i18next";
 import { I18nKey } from "#/i18n/declaration";
 import { ConversationCard } from "./conversation-card";
-import { usePaginatedConversations } from "#/hooks/query/use-paginated-conversations";
-import { useInfiniteScroll } from "#/hooks/use-infinite-scroll";
+import { useUserConversations } from "#/hooks/query/use-user-conversations";
 import { useDeleteConversation } from "#/hooks/mutation/use-delete-conversation";
 import { useStopConversation } from "#/hooks/mutation/use-stop-conversation";
 import { ConfirmDeleteModal } from "./confirm-delete-modal";
@@ -41,30 +40,12 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
     string | null
   >(null);
 
-  const {
-    data,
-    isFetching,
-    error,
-    hasNextPage,
-    isFetchingNextPage,
-    fetchNextPage,
-  } = usePaginatedConversations();
-
-  // Flatten all pages into a single array of conversations
-  const conversations = data?.pages.flatMap((page) => page.results) ?? [];
+  const { data: conversations, isFetching, error } = useUserConversations();
 
   const { mutate: deleteConversation } = useDeleteConversation();
   const { mutate: stopConversation } = useStopConversation();
   const { mutate: updateConversation } = useUpdateConversation();
 
-  // Set up infinite scroll
-  const scrollContainerRef = useInfiniteScroll({
-    hasNextPage: !!hasNextPage,
-    isFetchingNextPage,
-    fetchNextPage,
-    threshold: 200, // Load more when 200px from bottom
-  });
-
   const handleDeleteProject = (conversationId: string) => {
     setConfirmDeleteModalVisible(true);
     setSelectedConversationId(conversationId);
@@ -121,16 +102,11 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
 
   return (
     <div
-      ref={(node) => {
-        // TODO: Combine both refs somehow
-        if (ref.current !== node) ref.current = node;
-        if (scrollContainerRef.current !== node)
-          scrollContainerRef.current = node;
-      }}
+      ref={ref}
       data-testid="conversation-panel"
       className="w-[350px] h-full border border-neutral-700 bg-base-secondary rounded-xl overflow-y-auto absolute"
     >
-      {isFetching && conversations.length === 0 && (
+      {isFetching && (
         <div className="w-full h-full absolute flex justify-center items-center">
           <LoadingSpinner size="small" />
         </div>
@@ -180,13 +156,6 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
         </NavLink>
       ))}
 
-      {/* Loading indicator for fetching more conversations */}
-      {isFetchingNextPage && (
-        <div className="flex justify-center py-4">
-          <LoadingSpinner size="small" />
-        </div>
-      )}
-
       {confirmDeleteModalVisible && (
         <ConfirmDeleteModal
           onConfirm={() => {

frontend/src/components/features/home/repo-connector.tsx

@@ -1,12 +1,10 @@
 import { useTranslation } from "react-i18next";
-import { FaInfoCircle } from "react-icons/fa";
 import { ConnectToProviderMessage } from "./connect-to-provider-message";
 import { RepositorySelectionForm } from "./repo-selection-form";
 import { useConfig } from "#/hooks/query/use-config";
 import { RepoProviderLinks } from "./repo-provider-links";
 import { useUserProviders } from "#/hooks/use-user-providers";
 import { GitRepository } from "#/types/git";
-import { TooltipButton } from "#/components/shared/buttons/tooltip-button";
 
 interface RepoConnectorProps {
   onRepoSelection: (repo: GitRepository | null) => void;
@@ -25,19 +23,7 @@ export function RepoConnector({ onRepoSelection }: RepoConnectorProps) {
       data-testid="repo-connector"
       className="w-full flex flex-col gap-6"
     >
-      <div className="flex items-center gap-2">
-        <h2 className="heading">{t("HOME$CONNECT_TO_REPOSITORY")}</h2>
-        <TooltipButton
-          testId="repo-connector-info"
-          tooltip={t("HOME$CONNECT_TO_REPOSITORY_TOOLTIP")}
-          ariaLabel={t("HOME$CONNECT_TO_REPOSITORY_TOOLTIP")}
-          className="text-[#9099AC] hover:text-white"
-          placement="bottom"
-          tooltipClassName="max-w-[348px]"
-        >
-          <FaInfoCircle size={16} />
-        </TooltipButton>
-      </div>
+      <h2 className="heading">{t("HOME$CONNECT_TO_REPOSITORY")}</h2>
 
       {!providersAreSet && <ConnectToProviderMessage />}
       {providersAreSet && (

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

@@ -2,15 +2,22 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router";
 import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
+import { useUserRepositories } from "#/hooks/query/use-user-repositories";
 import { useRepositoryBranches } from "#/hooks/query/use-repository-branches";
 import { useIsCreatingConversation } from "#/hooks/use-is-creating-conversation";
 import { Branch, GitRepository } from "#/types/git";
 import { BrandButton } from "../settings/brand-button";
-import { useUserProviders } from "#/hooks/use-user-providers";
-import { Provider } from "#/types/settings";
-import { GitProviderDropdown } from "../../common/git-provider-dropdown";
-import { GitRepositoryDropdown } from "../../common/git-repository-dropdown";
-import { GitBranchDropdown } from "../../common/git-branch-dropdown";
+import { useSearchRepositories } from "#/hooks/query/use-search-repositories";
+import { useDebounce } from "#/hooks/use-debounce";
+import { sanitizeQuery } from "#/utils/sanitize-query";
+import {
+  RepositoryDropdown,
+  RepositoryLoadingState,
+  RepositoryErrorState,
+  BranchDropdown,
+  BranchLoadingState,
+  BranchErrorState,
+} from "./repository-selection";
 
 interface RepositorySelectionFormProps {
   onRepoSelection: (repo: GitRepository | null) => void;
@@ -25,11 +32,18 @@ export function RepositorySelectionForm({
   const [selectedBranch, setSelectedBranch] = React.useState<Branch | null>(
     null,
   );
-  const [selectedProvider, setSelectedProvider] =
-    React.useState<Provider | null>(null);
-  const { providers } = useUserProviders();
-  const { data: branches, isLoading: isLoadingBranches } =
-    useRepositoryBranches(selectedRepository?.full_name || null);
+  // Add a ref to track if the branch was manually cleared by the user
+  const branchManuallyClearedRef = React.useRef<boolean>(false);
+  const {
+    data: repositories,
+    isLoading: isLoadingRepositories,
+    isError: isRepositoriesError,
+  } = useUserRepositories();
+  const {
+    data: branches,
+    isLoading: isLoadingBranches,
+    isError: isBranchesError,
+  } = useRepositoryBranches(selectedRepository?.full_name || null);
   const {
     mutate: createConversation,
     isPending,
@@ -38,108 +52,151 @@ export function RepositorySelectionForm({
   const isCreatingConversationElsewhere = useIsCreatingConversation();
   const { t } = useTranslation();
 
-  // Auto-select provider if there's only one
+  const [searchQuery, setSearchQuery] = React.useState("");
+  const debouncedSearchQuery = useDebounce(searchQuery, 300);
+  const { data: searchedRepos } = useSearchRepositories(debouncedSearchQuery);
+
+  // Auto-select main or master branch if it exists, but only if the branch wasn't manually cleared
   React.useEffect(() => {
-    if (providers.length === 1 && !selectedProvider) {
-      setSelectedProvider(providers[0]);
+    if (
+      branches &&
+      branches.length > 0 &&
+      !selectedBranch &&
+      !isLoadingBranches &&
+      !branchManuallyClearedRef.current // Only auto-select if not manually cleared
+    ) {
+      // 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);
+      }
     }
-  }, [providers, selectedProvider]);
+  }, [branches, isLoadingBranches, selectedBranch]);
 
   // We check for isSuccess because the app might require time to render
   // into the new conversation screen after the conversation is created.
   const isCreatingConversation =
     isPending || isSuccess || isCreatingConversationElsewhere;
 
-  // Check if repository has no branches (empty array after loading completes)
-  const hasNoBranches = !isLoadingBranches && branches && branches.length === 0;
+  const allRepositories = repositories?.concat(searchedRepos || []);
+  const repositoriesItems = allRepositories?.map((repo) => ({
+    key: repo.id,
+    label: decodeURIComponent(repo.full_name),
+  }));
 
-  const handleProviderSelection = (provider: 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 branchesItems = branches?.map((branch) => ({
+    key: branch.name,
+    label: branch.name,
+  }));
+
+  const handleRepoSelection = (key: React.Key | null) => {
+    const selectedRepo = allRepositories?.find((repo) => repo.id === key);
+    if (selectedRepo) onRepoSelection(selectedRepo);
+    setSelectedRepository(selectedRepo || null);
+    setSelectedBranch(null); // Reset branch selection when repo changes
+    branchManuallyClearedRef.current = false; // Reset the flag when repo changes
   };
 
-  const handleBranchSelection = (branchName: string | null) => {
-    const selectedBranchObj = branches?.find(
-      (branch) => branch.name === branchName,
-    );
-    if (selectedBranchObj) {
-      setSelectedBranch(selectedBranchObj);
+  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 handleRepoInputChange = (value: string) => {
+    if (value === "") {
+      setSelectedRepository(null);
+      setSelectedBranch(null);
+      onRepoSelection(null);
+    } else if (value.startsWith("https://")) {
+      const repoName = sanitizeQuery(value);
+      setSearchQuery(repoName);
     }
   };
 
-  // Render the provider dropdown
-  const renderProviderSelector = () => {
-    // Only render if there are multiple providers
-    if (providers.length <= 1) {
-      return null;
+  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;
     }
-
-    return (
-      <GitProviderDropdown
-        providers={providers}
-        value={selectedProvider}
-        placeholder="Select Provider"
-        className="max-w-[500px]"
-        onChange={handleProviderSelection}
-      />
-    );
   };
 
-  // Effect to auto-select main/master branch when branches are loaded
-  React.useEffect(() => {
-    if (branches?.length) {
-      // Look for main or master branch
-      const defaultBranch = branches.find(
-        (branch) => branch.name === "main" || branch.name === "master",
-      );
-
-      // If found, select it, otherwise select the first branch
-      setSelectedBranch(defaultBranch || branches[0]);
-    }
-  }, [branches]);
-
-  // Render the repository selector using our new component
+  // Render the appropriate UI based on the loading/error state
   const renderRepositorySelector = () => {
-    const handleRepoSelection = (repository?: GitRepository) => {
-      if (repository) {
-        onRepoSelection(repository);
-        setSelectedRepository(repository);
-      } else {
-        setSelectedRepository(null);
-        setSelectedBranch(null);
-      }
-    };
+    if (isLoadingRepositories) {
+      return <RepositoryLoadingState />;
+    }
+
+    if (isRepositoriesError) {
+      return <RepositoryErrorState />;
+    }
 
     return (
-      <GitRepositoryDropdown
-        provider={selectedProvider || providers[0]}
-        value={selectedRepository?.id || null}
-        placeholder="Search repositories..."
-        disabled={!selectedProvider}
-        onChange={handleRepoSelection}
-        className="max-w-[500px]"
+      <RepositoryDropdown
+        items={repositoriesItems || []}
+        onSelectionChange={handleRepoSelection}
+        onInputChange={handleRepoInputChange}
+        defaultFilter={(textValue, inputValue) => {
+          if (!inputValue) return true;
+
+          const repo = allRepositories?.find((r) => r.full_name === textValue);
+          if (!repo) return false;
+
+          const sanitizedInput = sanitizeQuery(inputValue);
+          return sanitizeQuery(textValue).includes(sanitizedInput);
+        }}
       />
     );
   };
 
-  // Render the branch selector
-  const renderBranchSelector = () => (
-    <GitBranchDropdown
-      repositoryName={selectedRepository?.full_name}
-      value={selectedBranch?.name || null}
-      placeholder="Select branch..."
-      className="max-w-[500px]"
-      disabled={!selectedRepository}
-      onChange={handleBranchSelection}
-    />
-  );
+  // Render the appropriate UI for branch selector based on the loading/error state
+  const renderBranchSelector = () => {
+    if (!selectedRepository) {
+      return (
+        <BranchDropdown
+          items={[]}
+          onSelectionChange={() => {}}
+          onInputChange={() => {}}
+          isDisabled
+        />
+      );
+    }
+
+    if (isLoadingBranches) {
+      return <BranchLoadingState />;
+    }
+
+    if (isBranchesError) {
+      return <BranchErrorState />;
+    }
+
+    return (
+      <BranchDropdown
+        items={branchesItems || []}
+        onSelectionChange={handleBranchSelection}
+        onInputChange={handleBranchInputChange}
+        isDisabled={false}
+        selectedKey={selectedBranch?.name}
+      />
+    );
+  };
 
   return (
     <div className="flex flex-col gap-4">
-      {renderProviderSelector()}
       {renderRepositorySelector()}
+
       {renderBranchSelector()}
 
       <BrandButton
@@ -148,10 +205,9 @@ export function RepositorySelectionForm({
         type="button"
         isDisabled={
           !selectedRepository ||
-          (!selectedBranch && !hasNoBranches) ||
-          isLoadingBranches ||
           isCreatingConversation ||
-          (providers.length > 1 && !selectedProvider)
+          isLoadingRepositories ||
+          isRepositoriesError
         }
         onClick={() =>
           createConversation(
@@ -159,7 +215,7 @@ export function RepositorySelectionForm({
               repository: {
                 name: selectedRepository?.full_name || "",
                 gitProvider: selectedRepository?.git_provider || "github",
-                branch: selectedBranch?.name || (hasNoBranches ? "" : "main"),
+                branch: selectedBranch?.name || "main",
               },
             },
             {

frontend/src/components/features/home/repository-selection/index.ts

@@ -1,3 +1,6 @@
+export { RepositoryDropdown } from "#/components/features/home/repository-selection/repository-dropdown";
+export { RepositoryLoadingState } from "#/components/features/home/repository-selection/repository-loading-state";
+export { RepositoryErrorState } from "#/components/features/home/repository-selection/repository-error-state";
 export { BranchDropdown } from "#/components/features/home/repository-selection/branch-dropdown";
 export { BranchLoadingState } from "#/components/features/home/repository-selection/branch-loading-state";
 export { BranchErrorState } from "#/components/features/home/repository-selection/branch-error-state";

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

@@ -0,0 +1,33 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { SettingsDropdownInput } from "../../settings/settings-dropdown-input";
+import { I18nKey } from "#/i18n/declaration";
+
+export interface RepositoryDropdownProps {
+  items: { key: React.Key; label: string }[];
+  onSelectionChange: (key: React.Key | null) => void;
+  onInputChange: (value: string) => void;
+  defaultFilter?: (textValue: string, inputValue: string) => boolean;
+}
+
+export function RepositoryDropdown({
+  items,
+  onSelectionChange,
+  onInputChange,
+  defaultFilter,
+}: RepositoryDropdownProps) {
+  const { t } = useTranslation();
+
+  return (
+    <SettingsDropdownInput
+      testId="repo-dropdown"
+      name="repo-dropdown"
+      placeholder={t(I18nKey.REPOSITORY$SELECT_REPO)}
+      items={items}
+      wrapperClassName="max-w-[500px]"
+      onSelectionChange={onSelectionChange}
+      onInputChange={onInputChange}
+      defaultFilter={defaultFilter}
+    />
+  );
+}

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

@@ -0,0 +1,14 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+export function RepositoryErrorState() {
+  const { t } = useTranslation();
+  return (
+    <div
+      data-testid="repo-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"
+    >
+      <span className="text-sm">{t("HOME$FAILED_TO_LOAD_REPOSITORIES")}</span>
+    </div>
+  );
+}

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

@@ -0,0 +1,16 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Spinner } from "@heroui/react";
+
+export function RepositoryLoadingState() {
+  const { t } = useTranslation();
+  return (
+    <div
+      data-testid="repo-dropdown-loading"
+      className="flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm"
+    >
+      <Spinner size="sm" />
+      <span className="text-sm">{t("HOME$LOADING_REPOSITORIES")}</span>
+    </div>
+  );
+}

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

@@ -5,7 +5,6 @@ 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 { useUserProviders } from "#/hooks/use-user-providers";
 import {
   setPersonalRepositories,
   setOrganizationRepositories,
@@ -23,21 +22,15 @@ export function MicroagentManagementSidebar({
 }: MicroagentManagementSidebarProps) {
   const dispatch = useDispatch();
   const { t } = useTranslation();
-  const { providers } = useUserProviders();
-  const selectedProvider = providers.length > 0 ? providers[0] : null;
-  const { data: repositories, isLoading } =
-    useUserRepositories(selectedProvider);
+  const { data: repositories, isLoading } = useUserRepositories();
 
   useEffect(() => {
-    if (repositories?.pages) {
+    if (repositories) {
       const personalRepos: GitRepository[] = [];
       const organizationRepos: GitRepository[] = [];
       const otherRepos: GitRepository[] = [];
 
-      // Flatten all pages to get all repositories
-      const allRepositories = repositories.pages.flatMap((page) => page.data);
-
-      allRepositories.forEach((repo: GitRepository) => {
+      repositories.forEach((repo: GitRepository) => {
         const hasOpenHandsSuffix = repo.full_name.endsWith("/.openhands");
 
         if (repo.owner_type === "user" && hasOpenHandsSuffix) {

frontend/src/components/features/settings/settings-dropdown-input.tsx

@@ -1,5 +1,5 @@
 import { Autocomplete, AutocompleteItem } from "@heroui/react";
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { OptionalTag } from "./optional-tag";
 import { cn } from "#/utils/utils";
@@ -44,7 +44,6 @@ export function SettingsDropdownInput({
   defaultFilter,
 }: SettingsDropdownInputProps) {
   const { t } = useTranslation();
-
   return (
     <label className={cn("flex flex-col gap-2.5", wrapperClassName)}>
       {label && (

frontend/src/components/features/sidebar/user-actions.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { UserAvatar } from "./user-avatar";
 import { AccountSettingsContextMenu } from "../context-menu/account-settings-context-menu";
-import { useShouldShowUserFeatures } from "#/hooks/use-should-show-user-features";
+import { useIsAuthed } from "#/hooks/query/use-is-authed";
 
 interface UserActionsProps {
   onLogout: () => void;
@@ -10,12 +10,10 @@ interface UserActionsProps {
 }
 
 export function UserActions({ onLogout, user, isLoading }: UserActionsProps) {
+  const { data: isAuthed } = useIsAuthed();
   const [accountContextMenuIsVisible, setAccountContextMenuIsVisible] =
     React.useState(false);
 
-  // Use the shared hook to determine if user actions should be shown
-  const shouldShowUserActions = useShouldShowUserFeatures();
-
   const toggleAccountMenu = () => {
     // Always toggle the menu, even if user is undefined
     setAccountContextMenuIsVisible((prev) => !prev);
@@ -30,8 +28,8 @@ export function UserActions({ onLogout, user, isLoading }: UserActionsProps) {
     closeAccountMenu();
   };
 
-  // Show the menu based on the new logic
-  const showMenu = accountContextMenuIsVisible && shouldShowUserActions;
+  // Always show the menu for authenticated users, even without user data
+  const showMenu = accountContextMenuIsVisible && isAuthed;
 
   return (
     <div data-testid="user-actions" className="w-8 h-8 relative cursor-pointer">

frontend/src/components/features/waitlist/auth-modal.tsx

@@ -15,14 +15,12 @@ import { Provider } from "#/types/settings";
 interface AuthModalProps {
   githubAuthUrl: string | null;
   appMode?: GetConfigResponse["APP_MODE"] | null;
-  authUrl?: GetConfigResponse["AUTH_URL"];
   providersConfigured?: Provider[];
 }
 
 export function AuthModal({
   githubAuthUrl,
   appMode,
-  authUrl,
   providersConfigured,
 }: AuthModalProps) {
   const { t } = useTranslation();
@@ -30,19 +28,16 @@ export function AuthModal({
   const gitlabAuthUrl = useAuthUrl({
     appMode: appMode || null,
     identityProvider: "gitlab",
-    authUrl,
   });
 
   const bitbucketAuthUrl = useAuthUrl({
     appMode: appMode || null,
     identityProvider: "bitbucket",
-    authUrl,
   });
 
   const enterpriseSsoUrl = useAuthUrl({
     appMode: appMode || null,
     identityProvider: "enterprise_sso",
-    authUrl,
   });
 
   const handleGitHubAuth = () => {

frontend/src/entry.client.tsx

@@ -67,9 +67,9 @@ prepareApp().then(() =>
           <QueryClientProvider client={queryClient}>
             <HydratedRouter />
             <PosthogInit />
+            <div id="modal-portal-exit" />
           </QueryClientProvider>
         </Provider>
-        <div id="modal-portal-exit" />
       </StrictMode>,
     );
   }),

frontend/src/hooks/mutation/use-save-settings.ts

@@ -25,13 +25,8 @@ const saveSettingsMutationFn = async (settings: Partial<PostSettings>) => {
     mcp_config: settings.MCP_CONFIG,
     enable_proactive_conversation_starters:
       settings.ENABLE_PROACTIVE_CONVERSATION_STARTERS,
-    enable_solvability_analysis: settings.ENABLE_SOLVABILITY_ANALYSIS,
     search_api_key: settings.SEARCH_API_KEY?.trim() || "",
     max_budget_per_task: settings.MAX_BUDGET_PER_TASK,
-    git_user_name:
-      settings.GIT_USER_NAME?.trim() || DEFAULT_SETTINGS.GIT_USER_NAME,
-    git_user_email:
-      settings.GIT_USER_EMAIL?.trim() || DEFAULT_SETTINGS.GIT_USER_EMAIL,
   };
 
   await OpenHands.saveSettings(apiSettings);

frontend/src/hooks/mutation/use-upload-files.ts

@@ -1,11 +1,11 @@
 import { useMutation } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import { FileService } from "#/api/file-service/file-service.api";
 
 export const useUploadFiles = () =>
   useMutation({
     mutationKey: ["upload-files"],
     mutationFn: (variables: { conversationId: string; files: File[] }) =>
-      OpenHands.uploadFiles(variables.conversationId!, variables.files),
+      FileService.uploadFiles(variables.conversationId!, variables.files),
     onSuccess: async () => {},
     meta: {
       disableToast: true,

frontend/src/hooks/query/use-app-installations.ts

@@ -1,24 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useConfig } from "./use-config";
-import { useIsAuthed } from "./use-is-authed";
-import OpenHands from "#/api/open-hands";
-import { useUserProviders } from "../use-user-providers";
-import { Provider } from "#/types/settings";
-import { shouldUseInstallationRepos } from "#/utils/utils";
-
-export const useAppInstallations = (selectedProvider: Provider | null) => {
-  const { data: config } = useConfig();
-  const { data: userIsAuthenticated } = useIsAuthed();
-  const { providers } = useUserProviders();
-
-  return useQuery({
-    queryKey: ["installations", providers || [], selectedProvider],
-    queryFn: () => OpenHands.getUserInstallationIds(selectedProvider!),
-    enabled:
-      userIsAuthenticated &&
-      !!selectedProvider &&
-      shouldUseInstallationRepos(selectedProvider, config?.APP_MODE),
-    staleTime: 1000 * 60 * 5, // 5 minutes
-    gcTime: 1000 * 60 * 15, // 15 minutes
-  });
-};

frontend/src/hooks/query/use-get-microagents.ts

@@ -1,13 +1,13 @@
 import { useQuery } from "@tanstack/react-query";
 import { useConversationId } from "../use-conversation-id";
-import OpenHands from "#/api/open-hands";
+import { FileService } from "#/api/file-service/file-service.api";
 
 export const useGetMicroagents = (microagentDirectory: string) => {
   const { conversationId } = useConversationId();
 
   return useQuery({
     queryKey: ["files", "microagents", conversationId, microagentDirectory],
-    queryFn: () => OpenHands.getFiles(conversationId!, microagentDirectory),
+    queryFn: () => FileService.getFiles(conversationId!, microagentDirectory),
     enabled: !!conversationId,
     select: (data) =>
       data.map((fileName) => fileName.replace(microagentDirectory, "")),

frontend/src/hooks/query/use-git-repositories.ts

@@ -1,130 +0,0 @@
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { useConfig } from "./use-config";
-import { useUserProviders } from "../use-user-providers";
-import { useAppInstallations } from "./use-app-installations";
-import { GitRepository } from "../../types/git";
-import { Provider } from "../../types/settings";
-import OpenHands from "#/api/open-hands";
-import { shouldUseInstallationRepos } from "#/utils/utils";
-
-interface UseGitRepositoriesOptions {
-  provider: Provider | null;
-  pageSize?: number;
-  enabled?: boolean;
-}
-
-interface UserRepositoriesResponse {
-  data: GitRepository[];
-  nextPage: number | null;
-}
-
-interface InstallationRepositoriesResponse {
-  data: GitRepository[];
-  nextPage: number | null;
-  installationIndex: number | null;
-}
-
-export function useGitRepositories(options: UseGitRepositoriesOptions) {
-  const { provider, pageSize = 30, enabled = true } = options;
-  const { providers } = useUserProviders();
-  const { data: config } = useConfig();
-  const { data: installations } = useAppInstallations(provider);
-
-  const useInstallationRepos = provider
-    ? shouldUseInstallationRepos(provider, config?.APP_MODE)
-    : false;
-
-  const repos = useInfiniteQuery<
-    UserRepositoriesResponse | InstallationRepositoriesResponse
-  >({
-    queryKey: [
-      "repositories",
-      providers || [],
-      provider,
-      useInstallationRepos,
-      pageSize,
-      ...(useInstallationRepos ? [installations || []] : []),
-    ],
-    queryFn: async ({ pageParam }) => {
-      if (!provider) {
-        throw new Error("Provider is required");
-      }
-
-      if (useInstallationRepos) {
-        const { repoPage, installationIndex } = pageParam as {
-          installationIndex: number | null;
-          repoPage: number | null;
-        };
-
-        if (!installations) {
-          throw new Error("Missing installation list");
-        }
-
-        return OpenHands.retrieveInstallationRepositories(
-          provider,
-          installationIndex || 0,
-          installations,
-          repoPage || 1,
-          pageSize,
-        );
-      }
-
-      return OpenHands.retrieveUserGitRepositories(
-        provider,
-        pageParam as number,
-        pageSize,
-      );
-    },
-    getNextPageParam: (lastPage) => {
-      if (useInstallationRepos) {
-        const installationPage = lastPage as InstallationRepositoriesResponse;
-        if (installationPage.nextPage) {
-          return {
-            installationIndex: installationPage.installationIndex,
-            repoPage: installationPage.nextPage,
-          };
-        }
-
-        if (installationPage.installationIndex !== null) {
-          return {
-            installationIndex: installationPage.installationIndex,
-            repoPage: 1,
-          };
-        }
-
-        return null;
-      }
-
-      const userPage = lastPage as UserRepositoriesResponse;
-      return userPage.nextPage;
-    },
-    initialPageParam: useInstallationRepos
-      ? { installationIndex: 0, repoPage: 1 }
-      : 1,
-    enabled:
-      enabled &&
-      (providers || []).length > 0 &&
-      !!provider &&
-      (!useInstallationRepos ||
-        (Array.isArray(installations) && installations.length > 0)),
-    staleTime: 1000 * 60 * 5, // 5 minutes
-    gcTime: 1000 * 60 * 15, // 15 minutes
-    refetchOnWindowFocus: false,
-  });
-
-  const onLoadMore = () => {
-    if (repos.hasNextPage && !repos.isFetchingNextPage) {
-      repos.fetchNextPage();
-    }
-  };
-
-  return {
-    data: repos.data,
-    isLoading: repos.isLoading,
-    isError: repos.isError,
-    hasNextPage: repos.hasNextPage,
-    isFetchingNextPage: repos.isFetchingNextPage,
-    fetchNextPage: repos.fetchNextPage,
-    onLoadMore,
-  };
-}

frontend/src/hooks/query/use-git-user.ts

@@ -3,18 +3,16 @@ import React from "react";
 import posthog from "posthog-js";
 import { useConfig } from "./use-config";
 import OpenHands from "#/api/open-hands";
-import { useShouldShowUserFeatures } from "#/hooks/use-should-show-user-features";
+import { useIsAuthed } from "#/hooks/query/use-is-authed";
 
 export const useGitUser = () => {
   const { data: config } = useConfig();
-
-  // Use the shared hook to determine if we should fetch user data
-  const shouldFetchUser = useShouldShowUserFeatures();
+  const { data: isAuthed } = useIsAuthed();
 
   const user = useQuery({
     queryKey: ["user"],
     queryFn: OpenHands.getGitUser,
-    enabled: shouldFetchUser,
+    enabled: !!config?.APP_MODE && isAuthed, // Enable regardless of providers
     retry: false,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes

frontend/src/hooks/query/use-installation-repositories.ts

@@ -1,82 +0,0 @@
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { useAppInstallations } from "./use-app-installations";
-import { useConfig } from "./use-config";
-import { useUserProviders } from "../use-user-providers";
-import { Provider } from "#/types/settings";
-import OpenHands from "#/api/open-hands";
-import { shouldUseInstallationRepos } from "#/utils/utils";
-
-export const useInstallationRepositories = (
-  selectedProvider: Provider | null,
-) => {
-  const { providers } = useUserProviders();
-  const { data: config } = useConfig();
-  const { data: installations } = useAppInstallations(selectedProvider);
-
-  const repos = useInfiniteQuery({
-    queryKey: [
-      "repositories",
-      providers || [],
-      selectedProvider,
-      installations || [],
-    ],
-    queryFn: async ({
-      pageParam,
-    }: {
-      pageParam: { installationIndex: number | null; repoPage: number | null };
-    }) => {
-      const { repoPage, installationIndex } = pageParam;
-
-      if (!installations) {
-        throw new Error("Missing installation list");
-      }
-
-      return OpenHands.retrieveInstallationRepositories(
-        selectedProvider!,
-        installationIndex || 0,
-        installations,
-        repoPage || 1,
-        30,
-      );
-    },
-    initialPageParam: { installationIndex: 0, repoPage: 1 },
-    getNextPageParam: (lastPage) => {
-      if (lastPage.nextPage) {
-        return {
-          installationIndex: lastPage.installationIndex,
-          repoPage: lastPage.nextPage,
-        };
-      }
-
-      if (lastPage.installationIndex !== null) {
-        return { installationIndex: lastPage.installationIndex, repoPage: 1 };
-      }
-
-      return null;
-    },
-    enabled:
-      (providers || []).length > 0 &&
-      !!selectedProvider &&
-      shouldUseInstallationRepos(selectedProvider, config?.APP_MODE) &&
-      Array.isArray(installations) &&
-      installations.length > 0,
-    staleTime: 1000 * 60 * 5, // 5 minutes
-    gcTime: 1000 * 60 * 15, // 15 minutes
-  });
-
-  const onLoadMore = () => {
-    if (repos.hasNextPage && !repos.isFetchingNextPage) {
-      repos.fetchNextPage();
-    }
-  };
-
-  // Return the query result with the scroll ref
-  return {
-    data: repos.data,
-    isLoading: repos.isLoading,
-    isError: repos.isError,
-    hasNextPage: repos.hasNextPage,
-    isFetchingNextPage: repos.isFetchingNextPage,
-    onLoadMore,
-  };
-};

frontend/src/hooks/query/use-microagent-prompt.ts

@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import { MemoryService } from "#/api/memory-service/memory-service.api";
 import { useConversationId } from "../use-conversation-id";
 
 export const useMicroagentPrompt = (eventId: number) => {
@@ -7,7 +7,7 @@ export const useMicroagentPrompt = (eventId: number) => {
 
   return useQuery({
     queryKey: ["memory", "prompt", conversationId, eventId],
-    queryFn: () => OpenHands.getMicroagentPrompt(conversationId!, eventId),
+    queryFn: () => MemoryService.getPrompt(conversationId!, eventId),
     enabled: !!conversationId,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes

frontend/src/hooks/query/use-paginated-conversations.ts

@@ -1,16 +0,0 @@
-import { useInfiniteQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
-import { useIsAuthed } from "./use-is-authed";
-
-export const usePaginatedConversations = (limit: number = 20) => {
-  const { data: userIsAuthenticated } = useIsAuthed();
-
-  return useInfiniteQuery({
-    queryKey: ["user", "conversations", "paginated", limit],
-    queryFn: ({ pageParam }) =>
-      OpenHands.getUserConversations(limit, pageParam),
-    enabled: !!userIsAuthenticated,
-    getNextPageParam: (lastPage) => lastPage.next_page_id,
-    initialPageParam: undefined as string | undefined,
-  });
-};

frontend/src/hooks/query/use-search-conversations.ts

@@ -4,7 +4,7 @@ import OpenHands from "#/api/open-hands";
 export const useSearchConversations = (
   selectedRepository?: string,
   conversationTrigger?: string,
-  limit: number = 100,
+  limit: number = 20,
   cacheDisabled: boolean = false,
 ) =>
   useQuery({

frontend/src/hooks/query/use-search-repositories.ts

@@ -1,16 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import OpenHands from "#/api/open-hands";
-import { Provider } from "#/types/settings";
 
-export function useSearchRepositories(
-  query: string,
-  selectedProvider?: Provider | null,
-) {
+export function useSearchRepositories(query: string) {
   return useQuery({
-    queryKey: ["repositories", "search", query, selectedProvider],
-    queryFn: () =>
-      OpenHands.searchGitRepositories(query, 3, selectedProvider || undefined),
-    enabled: !!query && !!selectedProvider,
+    queryKey: ["repositories", query],
+    queryFn: () => OpenHands.searchGitRepositories(query, 3),
+    enabled: !!query,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes
   });

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

@@ -25,16 +25,12 @@ const getSettingsQueryFn = async (): Promise<Settings> => {
     ENABLE_SOUND_NOTIFICATIONS: apiSettings.enable_sound_notifications,
     ENABLE_PROACTIVE_CONVERSATION_STARTERS:
       apiSettings.enable_proactive_conversation_starters,
-    ENABLE_SOLVABILITY_ANALYSIS: apiSettings.enable_solvability_analysis,
     USER_CONSENTS_TO_ANALYTICS: apiSettings.user_consents_to_analytics,
     SEARCH_API_KEY: apiSettings.search_api_key || "",
     MAX_BUDGET_PER_TASK: apiSettings.max_budget_per_task,
     EMAIL: apiSettings.email || "",
     EMAIL_VERIFIED: apiSettings.email_verified,
     MCP_CONFIG: apiSettings.mcp_config,
-    GIT_USER_NAME: apiSettings.git_user_name || DEFAULT_SETTINGS.GIT_USER_NAME,
-    GIT_USER_EMAIL:
-      apiSettings.git_user_email || DEFAULT_SETTINGS.GIT_USER_EMAIL,
     IS_NEW_USER: false,
   };
 };

frontend/src/hooks/query/use-user-conversations.ts

@@ -0,0 +1,13 @@
+import { useQuery } from "@tanstack/react-query";
+import OpenHands from "#/api/open-hands";
+import { useIsAuthed } from "./use-is-authed";
+
+export const useUserConversations = () => {
+  const { data: userIsAuthenticated } = useIsAuthed();
+
+  return useQuery({
+    queryKey: ["user", "conversations"],
+    queryFn: OpenHands.getUserConversations,
+    enabled: !!userIsAuthenticated,
+  });
+};

frontend/src/hooks/query/use-user-repositories.ts

@@ -1,41 +1,10 @@
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { useConfig } from "./use-config";
-import { useUserProviders } from "../use-user-providers";
-import { Provider } from "#/types/settings";
+import { useQuery } from "@tanstack/react-query";
 import OpenHands from "#/api/open-hands";
-import { shouldUseInstallationRepos } from "#/utils/utils";
 
-export const useUserRepositories = (selectedProvider: Provider | null) => {
-  const { providers } = useUserProviders();
-  const { data: config } = useConfig();
-
-  const repos = useInfiniteQuery({
-    queryKey: ["repositories", providers || [], selectedProvider],
-    queryFn: async ({ pageParam }) =>
-      OpenHands.retrieveUserGitRepositories(selectedProvider!, pageParam, 30),
-    initialPageParam: 1,
-    getNextPageParam: (lastPage) => lastPage.nextPage,
-    enabled:
-      (providers || []).length > 0 &&
-      !!selectedProvider &&
-      !shouldUseInstallationRepos(selectedProvider, config?.APP_MODE),
+export const useUserRepositories = () =>
+  useQuery({
+    queryKey: ["repositories"],
+    queryFn: OpenHands.retrieveUserGitRepositories,
     staleTime: 1000 * 60 * 5, // 5 minutes
     gcTime: 1000 * 60 * 15, // 15 minutes
   });
-
-  const onLoadMore = () => {
-    if (repos.hasNextPage && !repos.isFetchingNextPage) {
-      repos.fetchNextPage();
-    }
-  };
-
-  // Return the query result with the scroll ref
-  return {
-    data: repos.data,
-    isLoading: repos.isLoading,
-    isError: repos.isError,
-    hasNextPage: repos.hasNextPage,
-    isFetchingNextPage: repos.isFetchingNextPage,
-    onLoadMore,
-  };
-};

frontend/src/hooks/use-auth-url.ts

@@ -4,7 +4,6 @@ import { GetConfigResponse } from "#/api/open-hands.types";
 interface UseAuthUrlConfig {
   appMode: GetConfigResponse["APP_MODE"] | null;
   identityProvider: string;
-  authUrl?: GetConfigResponse["AUTH_URL"];
 }
 
 export const useAuthUrl = (config: UseAuthUrlConfig) => {
@@ -12,7 +11,6 @@ export const useAuthUrl = (config: UseAuthUrlConfig) => {
     return generateAuthUrl(
       config.identityProvider,
       new URL(window.location.href),
-      config.authUrl,
     );
   }
 

frontend/src/hooks/use-auto-login.ts

@@ -19,25 +19,21 @@ export const useAutoLogin = () => {
   const githubAuthUrl = useAuthUrl({
     appMode: config?.APP_MODE || null,
     identityProvider: "github",
-    authUrl: config?.AUTH_URL,
   });
 
   const gitlabAuthUrl = useAuthUrl({
     appMode: config?.APP_MODE || null,
     identityProvider: "gitlab",
-    authUrl: config?.AUTH_URL,
   });
 
   const bitbucketAuthUrl = useAuthUrl({
     appMode: config?.APP_MODE || null,
     identityProvider: "bitbucket",
-    authUrl: config?.AUTH_URL,
   });
 
   const enterpriseSsoUrl = useAuthUrl({
     appMode: config?.APP_MODE || null,
     identityProvider: "enterprise_sso",
-    authUrl: config?.AUTH_URL,
   });
 
   useEffect(() => {

frontend/src/hooks/use-github-auth-url.ts

@@ -4,12 +4,10 @@ import { GetConfigResponse } from "#/api/open-hands.types";
 interface UseGitHubAuthUrlConfig {
   appMode: GetConfigResponse["APP_MODE"] | null;
   gitHubClientId: GetConfigResponse["GITHUB_CLIENT_ID"] | null;
-  authUrl?: GetConfigResponse["AUTH_URL"];
 }
 
 export const useGitHubAuthUrl = (config: UseGitHubAuthUrlConfig) =>
   useAuthUrl({
     appMode: config.appMode,
     identityProvider: "github",
-    authUrl: config.authUrl,
   });