fix: separate rotation and arc length animations for dynamic spinner

feat: add dynamic variant to Spinner component
Merge branch 'main' into feature/spinner
2026-04-29 03:00:45 -04:00 · 2025-07-09 14:25:47 +00:00 · 2025-07-09 14:21:58 +00:00 · 2025-07-09 15:09:17 +02:00 · 2025-07-07 19:21:17 +02:00
253 changed files with 3753 additions and 14775 deletions
@@ -9,8 +9,8 @@ on:
      - main
  pull_request:
    paths:
-      - "frontend/**"
-      - ".github/workflows/fe-unit-tests.yml"
+      - 'frontend/**'
+      -  '.github/workflows/fe-unit-tests.yml'

 # If triggered by a PR, it will be in the same group. However, each commit on main will be in its own unique group
 concurrency:
@@ -24,7 +24,7 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2204
    strategy:
      matrix:
-        node-version: 22
+        node-version: [20, 22]
      fail-fast: true
    steps:
      - name: Checkout
@@ -38,7 +38,7 @@ jobs:
        run: npm ci
      - name: Run TypeScript compilation
        working-directory: ./frontend
-        run: npm run build
+        run: npm run make-i18n && tsc
      - name: Run tests and collect coverage
        working-directory: ./frontend
        run: npm run test:coverage
@@ -40,8 +40,7 @@ jobs:
          # Only build nikolaik on PRs, otherwise build both nikolaik and ubuntu.
          if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
            json=$(jq -n -c '[
-                { image: "nikolaik/python-nodejs:python3.12-nodejs22", tag: "nikolaik" },
-                { image: "ubuntu:24.04", tag: "ubuntu" }
+                { image: "nikolaik/python-nodejs:python3.12-nodejs22", tag: "nikolaik" }
              ]')
          else
            json=$(jq -n -c '[
@@ -59,6 +58,9 @@ jobs:
    permissions:
      contents: read
      packages: write
+    outputs:
+      # Since this job uses outputs it cannot use matrix
+      hash_from_app_image: ${{ steps.get_hash_in_app_image.outputs.hash_from_app_image }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -84,11 +86,24 @@ jobs:
        if: "!github.event.pull_request.head.repo.fork"
        run: |
          ./containers/build.sh -i openhands -o ${{ env.REPO_OWNER }} --push
+      - name: Build app image
+        if: "github.event.pull_request.head.repo.fork"
+        run: |
+          ./containers/build.sh -i openhands -o ${{ env.REPO_OWNER }} --load
+      - name: Get hash in App Image
+        id: get_hash_in_app_image
+        run: |
+          # Run the build script in the app image
+          docker run -e SANDBOX_USER_ID=0 -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/${{ env.REPO_OWNER }}/openhands:${{ env.RELEVANT_SHA }} /bin/bash -c "mkdir -p containers/runtime; python3 openhands/runtime/utils/runtime_build.py --base_image ${{ env.BASE_IMAGE_FOR_HASH_EQUIVALENCE_TEST }} --build_folder containers/runtime --force_rebuild" 2>&1 | tee docker-outputs.txt
+          # Get the hash from the build script
+          hash_from_app_image=$(cat docker-outputs.txt | grep "Hash for docker build directory" | awk -F "): " '{print $2}' | uniq | head -n1)
+          echo "hash_from_app_image=$hash_from_app_image" >> $GITHUB_OUTPUT
+          echo "Hash from app image: $hash_from_app_image"

  # Builds the runtime Docker images
  ghcr_build_runtime:
    name: Build Image
-    runs-on: blacksmith-8vcpu-ubuntu-2204
+    runs-on: blacksmith-4vcpu-ubuntu-2204
    if: "!(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/ext-v'))"
    permissions:
      contents: read
@@ -115,13 +130,22 @@ jobs:
      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v3
-      - name: Install poetry via pipx
-        run: pipx install poetry
      - name: Set up Python
        uses: useblacksmith/setup-python@v6
        with:
          python-version: '3.12'
-          cache: poetry
+      - name: Cache Poetry dependencies
+        uses: useblacksmith/cache@v5
+        with:
+          path: |
+            ~/.cache/pypoetry
+            ~/.virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          # This is the one that saves the cache, the others set 'lookup-only: true'
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+      - name: Install poetry via pipx
+        run: pipx install poetry
      - name: Install Python dependencies using Poetry
        run: make install-python-dependencies POETRY_GROUP=main INSTALL_PLAYWRIGHT=0
      - name: Create source distribution and Dockerfile
@@ -166,6 +190,61 @@ jobs:
          name: runtime-src-${{ matrix.base_image.tag }}
          path: containers/runtime

+  verify_hash_equivalence_in_runtime_and_app:
+    name: Verify Hash Equivalence in Runtime and Docker images
+    runs-on: blacksmith-4vcpu-ubuntu-2204
+    needs: [ghcr_build_runtime, ghcr_build_app]
+    strategy:
+      fail-fast: false
+      matrix:
+        base_image: ['nikolaik']
+    env:
+      BASE_IMAGE_FOR_HASH_EQUIVALENCE_TEST: nikolaik/python-nodejs:python3.12-nodejs22
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Cache Poetry dependencies
+        uses: useblacksmith/cache@v5
+        with:
+          path: |
+            ~/.cache/pypoetry
+            ~/.virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          lookup-only: true
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+      - name: Set up Python
+        uses: useblacksmith/setup-python@v6
+        with:
+          python-version: '3.12'
+      - name: Install poetry via pipx
+        run: pipx install poetry
+      - name: Install Python dependencies using Poetry
+        run: make install-python-dependencies POETRY_GROUP=main INSTALL_PLAYWRIGHT=0
+      - name: Get hash in App Image
+        run: |
+          echo "Hash from app image: ${{ needs.ghcr_build_app.outputs.hash_from_app_image }}"
+          echo "hash_from_app_image=${{ needs.ghcr_build_app.outputs.hash_from_app_image }}" >> $GITHUB_ENV
+
+      - name: Get hash using code (development mode)
+        run: |
+          mkdir -p containers/runtime
+          poetry run python3 openhands/runtime/utils/runtime_build.py --base_image ${{ env.BASE_IMAGE_FOR_HASH_EQUIVALENCE_TEST }} --build_folder containers/runtime --force_rebuild > output.txt 2>&1
+          hash_from_code=$(cat output.txt | grep "Hash for docker build directory" | awk -F "): " '{print $2}' | uniq | head -n1)
+          echo "hash_from_code=$hash_from_code" >> $GITHUB_ENV
+
+      - name: Compare hashes
+        run: |
+          echo "Hash from App Image: ${{ env.hash_from_app_image }}"
+          echo "Hash from Code: ${{ env.hash_from_code }}"
+          if [ "${{ env.hash_from_app_image }}" = "${{ env.hash_from_code }}" ]; then
+            echo "Hashes match!"
+          else
+            echo "Hashes do not match!"
+            exit 1
+          fi
+
  # Run unit tests with the Docker runtime Docker images as root
  test_runtime_root:
    name: RT Unit Tests (Root)
@@ -197,17 +276,25 @@ jobs:
          load: true
          tags: ghcr.io/${{ env.REPO_OWNER }}/runtime:${{ env.RELEVANT_SHA }}-${{ matrix.base_image.tag }}
          context: containers/runtime
-      - name: Install poetry via pipx
-        run: pipx install poetry
+      - name: Cache Poetry dependencies
+        uses: useblacksmith/cache@v5
+        with:
+          path: |
+            ~/.cache/pypoetry
+            ~/.virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          lookup-only: true
+          restore-keys: |
+            ${{ runner.os }}-poetry-
      - name: Set up Python
        uses: useblacksmith/setup-python@v6
        with:
          python-version: '3.12'
-          cache: poetry
+      - name: Install poetry via pipx
+        run: pipx install poetry
      - name: Install Python dependencies using Poetry
        run: make install-python-dependencies INSTALL_PLAYWRIGHT=0
      - name: Run docker runtime tests
-        shell: bash
        run: |
          # We install pytest-xdist in order to run tests across CPUs
          poetry run pip install pytest-xdist
@@ -259,17 +346,25 @@ jobs:
          load: true
          tags: ghcr.io/${{ env.REPO_OWNER }}/runtime:${{ env.RELEVANT_SHA }}-${{ matrix.base_image.tag }}
          context: containers/runtime
-      - name: Install poetry via pipx
-        run: pipx install poetry
+      - name: Cache Poetry dependencies
+        uses: useblacksmith/cache@v5
+        with:
+          path: |
+            ~/.cache/pypoetry
+            ~/.virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          lookup-only: true
+          restore-keys: |
+            ${{ runner.os }}-poetry-
      - name: Set up Python
        uses: useblacksmith/setup-python@v6
        with:
          python-version: '3.12'
-          cache: poetry
+      - name: Install poetry via pipx
+        run: pipx install poetry
      - name: Install Python dependencies using Poetry
        run: make install-python-dependencies POETRY_GROUP=main,test,runtime INSTALL_PLAYWRIGHT=0
      - name: Run runtime tests
-        shell: bash
        run: |
          # We install pytest-xdist in order to run tests across CPUs
          poetry run pip install pytest-xdist
@@ -296,7 +391,7 @@ jobs:
    name: All Runtime Tests Passed
    if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
    runs-on: blacksmith-4vcpu-ubuntu-2204
-    needs: [test_runtime_root, test_runtime_oh]
+    needs: [test_runtime_root, test_runtime_oh, verify_hash_equivalence_in_runtime_and_app]
    steps:
      - name: All tests passed
        run: echo "All runtime tests have passed successfully!"
@@ -305,7 +400,7 @@ jobs:
    name: All Runtime Tests Passed
    if: ${{ cancelled() || contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
    runs-on: blacksmith-4vcpu-ubuntu-2204
-    needs: [test_runtime_root, test_runtime_oh]
+    needs: [test_runtime_root, test_runtime_oh, verify_hash_equivalence_in_runtime_and_app]
    steps:
      - name: Some tests failed
        run: |
@@ -330,7 +425,6 @@ jobs:
          PR_NUMBER: ${{ github.event.pull_request.number }}
          REPO: ${{ github.repository }}
          SHORT_SHA: ${{ steps.short_sha.outputs.SHORT_SHA }}
-        shell: bash
        run: |
          echo "updating PR description"
          DOCKER_RUN_COMMAND="docker run -it --rm \
@@ -54,7 +54,7 @@ jobs:
            Hi! I started running the integration tests on your PR. You will receive a comment with the results shortly.

      - name: Install Python dependencies using Poetry
-        run: poetry install --with dev,test,runtime,evaluation
+        run: poetry install --with dev,test,runtime

      - name: Configure config.toml for testing with Haiku
        env:
@@ -179,8 +179,8 @@ jobs:
        id: create_comment
        uses: KeisukeYamashita/create-comment@v1
        with:
-          # if triggered by PR, use PR number, otherwise use 9745 as fallback issue number for manual triggers
-          number: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || 9745 }}
+          # if triggered by PR, use PR number, otherwise use 5318 as fallback issue number for manual triggers
+          number: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || 5318 }}
          unique: false
          comment: |
              Trigger by: ${{ github.event_name == 'pull_request' && format('Pull Request (integration-test label on PR #{0})', github.event.pull_request.number) || (github.event_name == 'workflow_dispatch' && format('Manual Trigger: {0}', github.event.inputs.reason)) || 'Nightly Scheduled Run' }}
@@ -21,10 +21,10 @@ jobs:
          fetch-depth: 0
          token: ${{ secrets.GITHUB_TOKEN }}

-      - name: Install Node.js 22
+      - name: Install Node.js 20
        uses: useblacksmith/setup-node@v5
        with:
-          node-version: 22
+          node-version: 20
      - name: Install frontend dependencies
        run: |
          cd frontend
@@ -68,7 +68,7 @@ jobs:
        uses: useblacksmith/setup-python@v6
        with:
          python-version: 3.12
-          cache: "pip"
+          cache: 'pip'
      - name: Install pre-commit
        run: pip install pre-commit==3.7.0
      - name: Fix python lint issues
@@ -7,7 +7,7 @@ name: Lint
 on:
  push:
    branches:
-      - main
+    - main
  pull_request:

 # If triggered by a PR, it will be in the same group. However, each commit on main will be in its own unique group
@@ -22,10 +22,10 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2204
    steps:
      - uses: actions/checkout@v4
-      - name: Install Node.js 22
+      - name: Install Node.js 20
        uses: useblacksmith/setup-node@v5
        with:
-          node-version: 22
+          node-version: 20
      - name: Install dependencies
        run: |
          cd frontend
@@ -49,7 +49,7 @@ jobs:
        uses: useblacksmith/setup-python@v6
        with:
          python-version: 3.12
-          cache: "pip"
+          cache: 'pip'
      - name: Install pre-commit
        run: pip install pre-commit==3.7.0
      - name: Run pre-commit hooks
@@ -1,108 +0,0 @@
-name: Publish OpenHands UI Package
-
-# * Always run on "main"
-# * Run on PRs that have changes in the "openhands-ui" folder or this workflow
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "openhands-ui/**"
-      - ".github/workflows/npm-publish-ui.yml"
-
-# If triggered by a PR, it will be in the same group. However, each commit on main will be in its own unique group
-concurrency:
-  group: npm-publish-ui
-  cancel-in-progress: false
-
-jobs:
-  check-version:
-    name: Check if version has changed
-    runs-on: blacksmith-4vcpu-ubuntu-2204
-    defaults:
-      run:
-        shell: bash
-    outputs:
-      should-publish: ${{ steps.version-check.outputs.should-publish }}
-      current-version: ${{ steps.version-check.outputs.current-version }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2 # Need previous commit to compare
-
-      - name: Check if version changed
-        id: version-check
-        run: |
-          # Get current version from package.json
-          CURRENT_VERSION=$(jq -r .version openhands-ui/package.json)
-          echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-
-          # Check if package.json version changed in this commit
-          if git diff HEAD~1 HEAD --name-only | grep -q "openhands-ui/package.json"; then
-            # Check if the version field specifically changed
-            if git diff HEAD~1 HEAD openhands-ui/package.json | grep -q '"version"'; then
-              echo "Version changed in package.json, will publish"
-              echo "should-publish=true" >> $GITHUB_OUTPUT
-            else
-              echo "package.json changed but version did not change, skipping publish"
-              echo "should-publish=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "package.json did not change, skipping publish"
-            echo "should-publish=false" >> $GITHUB_OUTPUT
-          fi
-
-  publish:
-    name: Publish to npm
-    runs-on: blacksmith-4vcpu-ubuntu-2204
-    needs: check-version
-    if: needs.check-version.outputs.should-publish == 'true'
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version-file: "openhands-ui/.bun-version"
-
-      - name: Install dependencies
-        working-directory: ./openhands-ui
-        run: bun install --frozen-lockfile
-
-      - name: Build package
-        working-directory: ./openhands-ui
-        run: bun run build
-
-      - name: Check if package already exists on npm
-        id: npm-check
-        working-directory: ./openhands-ui
-        run: |
-          PACKAGE_NAME=$(jq -r .name package.json)
-          VERSION="${{ needs.check-version.outputs.current-version }}"
-
-          # Check if this version already exists on npm
-          if npm view "$PACKAGE_NAME@$VERSION" version 2>/dev/null; then
-            echo "Version $VERSION already exists on npm, skipping publish"
-            echo "already-exists=true" >> $GITHUB_OUTPUT
-          else
-            echo "Version $VERSION does not exist on npm, proceeding with publish"
-            echo "already-exists=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Setup npm authentication
-        if: steps.npm-check.outputs.already-exists == 'false'
-        run: |
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-
-      - name: Publish to npm
-        if: steps.npm-check.outputs.already-exists == 'false'
-        working-directory: ./openhands-ui
-        run: |
-          # The prepublishOnly script will run automatically and build the package
-          npm publish
-          echo "✅ Successfully published @openhands/ui@${{ needs.check-version.outputs.current-version }} to npm"
@@ -1,5 +1,5 @@
-# Workflow that runs python tests
-name: Run Python Tests
+# Workflow that runs python unit tests
+name: Run Python Unit Tests

 # The jobs in this workflow are required, so they must run at all times
 # * Always run on "main"
@@ -16,9 +16,9 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  # Run python tests on Linux
+  # Run python unit tests on Linux
  test-on-linux:
-    name: Python Tests on Linux
+    name: Python Unit Tests on Linux
    runs-on: blacksmith-4vcpu-ubuntu-2204
    env:
      INSTALL_DOCKER: '0' # Set to '0' to skip Docker installation
@@ -51,8 +51,6 @@ jobs:
        run: poetry run pytest --forked -n auto -svv ./tests/unit
      - name: Run Runtime Tests with CLIRuntime
        run: TEST_RUNTIME=cli poetry run pytest -svv tests/runtime/test_bash.py
-      - name: Run E2E Tests
-        run: poetry run pytest -svv tests/e2e

  # Run specific Windows python tests
  test-on-windows:
@@ -1,34 +0,0 @@
-name: Run UI Component Build
-
-# * Always run on "main"
-# * Run on PRs that have changes in the "openhands-ui" folder or this workflow
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    paths:
-      - 'openhands-ui/**'
-      -  '.github/workflows/ui-build.yml'
-
-# If triggered by a PR, it will be in the same group. However, each commit on main will be in its own unique group
-concurrency:
-  group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  ui-build:
-    name: Build openhands-ui
-    runs-on: blacksmith-4vcpu-ubuntu-2204
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version-file: "openhands-ui/.bun-version"
-      - name: Install dependencies
-        working-directory: ./openhands-ui
-        run: bun install --frozen-lockfile
-      - name: Build package
-        working-directory:  ./openhands-ui
-        run: bun run build
@@ -182,8 +182,6 @@ cython_debug/
 .roo/rules
 .cline/rules
 .windsurf/rules
-.repomix
-repomix-output.txt

 # evaluation
 evaluation/evaluation_outputs
@@ -137,65 +137,3 @@ Your specialized knowledge and instructions here...
  2. Add the setting to the backend:
     - Add the setting to the `Settings` model in `openhands/storage/data_models/settings.py`
     - Update any relevant backend code to apply the setting (e.g., in session creation)
-
-### Adding New LLM Models
-
-To add a new LLM model to OpenHands, you need to update multiple files across both frontend and backend:
-
-#### Model Configuration Procedure:
-
-1. **Frontend Model Arrays** (`frontend/src/utils/verified-models.ts`):
-   - Add the model to `VERIFIED_MODELS` array (main list of all verified models)
-   - Add to provider-specific arrays based on the model's provider:
-     - `VERIFIED_OPENAI_MODELS` for OpenAI models
-     - `VERIFIED_ANTHROPIC_MODELS` for Anthropic models
-     - `VERIFIED_MISTRAL_MODELS` for Mistral models
-     - `VERIFIED_OPENHANDS_MODELS` for models available through OpenHands provider
-
-2. **Backend CLI Integration** (`openhands/cli/utils.py`):
-   - Add the model to the appropriate `VERIFIED_*_MODELS` arrays
-   - This ensures the model appears in CLI model selection
-
-3. **Backend Model List** (`openhands/utils/llm.py`):
-   - **CRITICAL**: Add the model to the `openhands_models` list (lines 57-66) if using OpenHands provider
-   - This is required for the model to appear in the frontend model selector
-   - Format: `'openhands/model-name'` (e.g., `'openhands/o3'`)
-
-4. **Backend LLM Configuration** (`openhands/llm/llm.py`):
-   - Add to feature-specific arrays based on model capabilities:
-     - `FUNCTION_CALLING_SUPPORTED_MODELS` if the model supports function calling
-     - `REASONING_EFFORT_SUPPORTED_MODELS` if the model supports reasoning effort parameters
-     - `CACHE_PROMPT_SUPPORTED_MODELS` if the model supports prompt caching
-     - `MODELS_WITHOUT_STOP_WORDS` if the model doesn't support stop words
-
-5. **Validation**:
-   - Run backend linting: `pre-commit run --config ./dev_config/python/.pre-commit-config.yaml`
-   - Run frontend linting: `cd frontend && npm run lint:fix`
-   - Run frontend build: `cd frontend && npm run build`
-
-#### Model Verification Arrays:
-
- **VERIFIED_MODELS**: Main array of all verified models shown in the UI
- **VERIFIED_OPENAI_MODELS**: OpenAI models (LiteLLM doesn't return provider prefix)
- **VERIFIED_ANTHROPIC_MODELS**: Anthropic models (LiteLLM doesn't return provider prefix)
- **VERIFIED_MISTRAL_MODELS**: Mistral models (LiteLLM doesn't return provider prefix)
- **VERIFIED_OPENHANDS_MODELS**: Models available through OpenHands managed provider
-
-#### Model Feature Support Arrays:
-
- **FUNCTION_CALLING_SUPPORTED_MODELS**: Models that support structured function calling
- **REASONING_EFFORT_SUPPORTED_MODELS**: Models that support reasoning effort parameters (like o1, o3)
- **CACHE_PROMPT_SUPPORTED_MODELS**: Models that support prompt caching for efficiency
- **MODELS_WITHOUT_STOP_WORDS**: Models that don't support stop word parameters
-
-#### Frontend Model Integration:
-
- Models are automatically available in the model selector UI once added to verified arrays
- The `extractModelAndProvider` utility automatically detects provider from model arrays
- Provider-specific models are grouped and prioritized in the UI selection
-
-#### CLI Model Integration:
-
- Models appear in CLI provider selection based on the verified arrays
- The `organize_models_and_providers` function groups models by provider
- Default model selection prioritizes verified models for each provider
@@ -159,7 +159,7 @@ poetry run pytest ./tests/unit/test_*.py
 To reduce build time (e.g., if no changes were made to the client-runtime component), you can use an existing Docker
 container image by setting the SANDBOX_RUNTIME_CONTAINER_IMAGE environment variable to the desired Docker image.

-Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.49-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.48-nikolaik`

 ## Develop inside Docker container

@@ -62,17 +62,17 @@ system requirements and more information.


 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik

 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik \
    -e LOG_ALL_EVENTS=true \
    -v /var/run/docker.sock:/var/run/docker.sock \
    -v ~/.openhands:/.openhands \
    -p 3000:3000 \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.48
 ```

 > **Note**: If you used OpenHands before version 0.44, you may want to run `mv ~/.openhands-state ~/.openhands` to migrate your conversation history to the new location.
@@ -51,17 +51,17 @@ OpenHands也可以使用Docker在本地系统上运行。


 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik

 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik \
    -e LOG_ALL_EVENTS=true \
    -v /var/run/docker.sock:/var/run/docker.sock \
    -v ~/.openhands:/.openhands \
    -p 3000:3000 \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.48
 ```

 > **注意**: 如果您在0.44版本之前使用过OpenHands，您可能需要运行 `mv ~/.openhands-state ~/.openhands` 来将对话历史迁移到新位置。
@@ -42,17 +42,17 @@ OpenHandsはDockerを利用してローカル環境でも実行できます。
 > 公共ネットワークで実行していますか？[Hardened Docker Installation Guide](https://docs.all-hands.dev/usage/runtimes/docker#hardened-docker-installation)を参照して、ネットワークバインディングの制限や追加のセキュリティ対策を実施してください。

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik

 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik \
    -e LOG_ALL_EVENTS=true \
    -v /var/run/docker.sock:/var/run/docker.sock \
    -v ~/.openhands:/.openhands \
    -p 3000:3000 \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.48
 ```

 **注**: バージョン0.44以前のOpenHandsを使用していた場合は、会話履歴を移行するために `mv ~/.openhands-state ~/.openhands` を実行してください。
@@ -45,7 +45,6 @@ ENV OPENHANDS_BUILD_VERSION=$OPENHANDS_BUILD_VERSION
 ENV SANDBOX_USER_ID=0
 ENV FILE_STORE=local
 ENV FILE_STORE_PATH=/.openhands
-ENV INIT_GIT_IN_EMPTY_WORKSPACE=1
 RUN mkdir -p $FILE_STORE_PATH
 RUN mkdir -p $WORKSPACE_BASE

@@ -12,7 +12,7 @@ services:
      - SANDBOX_API_HOSTNAME=host.docker.internal
      - DOCKER_HOST_ADDR=host.docker.internal
      #
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.49-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.48-nikolaik}
      - SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
      - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
    ports:
@@ -7,7 +7,7 @@ services:
    image: openhands:latest
    container_name: openhands-app-${DATE:-}
    environment:
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik}
      #- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234} # enable this only if you want a specific non-root sandbox user but you will have to manually adjust permissions of ~/.openhands for this user
      - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
    ports:
@@ -34,7 +34,6 @@
              {
                "group": "Integrations",
                "pages": [
-                  "usage/cloud/bitbucket-installation",
                  "usage/cloud/github-installation",
                  "usage/cloud/gitlab-installation",
                  "usage/cloud/slack-installation"
@@ -67,9 +66,7 @@
                        "usage/llms/groq",
                        "usage/llms/local-llms",
                        "usage/llms/litellm-proxy",
-                        "usage/llms/moonshot",
                        "usage/llms/openai-llms",
-                        "usage/llms/openhands-llms",
                        "usage/llms/openrouter"
                      ]
                    }
@@ -1827,11 +1827,6 @@
          "updated_at": {
            "type": "string",
            "format": "date-time"
-          },
-          "owner_type": {
-            "type": "string",
-            "enum": ["user", "organization"],
-            "nullable": true
          }
        }
      },
@@ -1,25 +0,0 @@
---
-title: Bitbucket Integration
-description: This guide walks you through the process of installing OpenHands Cloud for your Bitbucket repositories. Once
-  set up, it will allow OpenHands to work with your Bitbucket repository.
---
-
-## Prerequisites
-
- Signed in to [OpenHands Cloud](https://app.all-hands.dev) with [a Bitbucket account](/usage/cloud/openhands-cloud).
-
-## Adding Bitbucket Repository Access
-
-Upon signing into OpenHands Cloud with a Bitbucket account, OpenHands will have access to your repositories.
-
-## Working With Bitbucket Repos in Openhands Cloud
-
-After signing in with a Bitbucket account, use the `select a repo` and `select a branch` dropdowns to select the
-appropriate repository and branch you'd like OpenHands to work on. Then click on `Launch` to start the conversation!
-
-![Connect Repo](/static/img/connect-repo-no-github.png)
-
-## Next Steps
-
- [Learn about the Cloud UI](/usage/cloud/cloud-ui).
- [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.
@@ -9,9 +9,8 @@ description: The Cloud UI provides a web interface for interacting with OpenHand
 The landing page is where you can:

 - [Add GitHub repository access](/usage/cloud/github-installation#adding-github-repository-access) to OpenHands.
- [Select a GitHub repo](/usage/cloud/github-installation#working-with-github-repos-in-openhands-cloud),
-  [a GitLab repo](/usage/cloud/gitlab-installation#working-with-gitlab-repos-in-openhands-cloud) or
-  [a Bitbucket repo](/usage/cloud/bitbucket-installation#working-with-bitbucket-repos-in-openhands-cloud) to start working on.
+- [Select a GitHub repo](/usage/cloud/github-installation#working-with-github-repos-in-openhands-cloud) or
+  [a GitLab repo](/usage/cloud/gitlab-installation#working-with-gitlab-repos-in-openhands-cloud) to start working on.
 - See `Suggested Tasks` for repositories that OpenHands has access to.
 - Launch an empty conversation using `Launch from Scratch`.

@@ -51,7 +51,8 @@ Giving GitHub repository access to OpenHands also allows you to work on GitHub i

 ### Working with Issues

-On your repository, label an issue with `openhands` or add a message starting with `@openhands`. OpenHands will:
+On your repository, label an issue with `openhands` or add a message starting with
+`@openhands`. OpenHands will:
 1. Comment on the issue to let you know it is working on it.
   - You can click on the link to track the progress on OpenHands Cloud.
 2. Open a pull request if it determines that the issue has been successfully resolved.
@@ -64,8 +65,6 @@ To get OpenHands to work on pull requests, mention `@openhands` in the comments
 - Request updates
 - Get code explanations

-**Important Note**: The `@openhands` mention functionality in pull requests only works if the pull request is both *to* and *from* a repository that you have added through the interface. This is because OpenHands needs appropriate permissions to access both repositories.
-
 ## Next Steps

 - [Learn about the Cloud UI](/usage/cloud/cloud-ui).
@@ -1,7 +1,7 @@
 ---
 title: GitLab Integration
 description: This guide walks you through the process of installing OpenHands Cloud for your GitLab repositories. Once
-  set up, it will allow OpenHands to work with your GitLab repository through the Cloud UI or straight from GitLab!.
+  set up, it will allow OpenHands to work with your GitLab repository.
 ---

 ## Prerequisites
@@ -17,7 +17,7 @@ Upon signing into OpenHands Cloud with a GitLab account, OpenHands will have acc
 After signing in with a Gitlab account, use the `select a repo` and `select a branch` dropdowns to select the
 appropriate repository and branch you'd like OpenHands to work on. Then click on `Launch` to start the conversation!

-![Connect Repo](/static/img/connect-repo-no-github.png)
+![Connect Repo](/static/img/connect-repo.png)

 ## Using Tokens with Reduced Scopes

@@ -25,33 +25,6 @@ OpenHands requests an API-scoped token during OAuth authentication. By default,
 To restrict the agent's permissions, you can define a custom secret `GITLAB_TOKEN`, which will override the default token assigned to the agent.
 While the high-permission API token is still requested and used for other components of the application (e.g. opening merge requests), the agent will not have access to it.

-## Working on GitLab Issues and Merge Requests Using Openhands
-
-<Note>
-This feature works for personal projects and is available for group projects with a
-[Premium or Ultimate tier subscription](https://docs.gitlab.com/user/project/integrations/webhooks/#group-webhooks).
-
-A webhook is automatically installed within a few minutes after the owner/maintainer of the project or group logs into
-OpenHands Cloud. If you decide to delete the webhook, then re-installing will require the support of All Hands AI but we are planning to improve this in a future release.
-</Note>
-
-Giving GitLab repository access to OpenHands also allows you to work on GitLab issues and merge requests directly.
-
-### Working with Issues
-
-On your repository, label an issue with `openhands` or add a message starting with `@openhands`. OpenHands will:
-1. Comment on the issue to let you know it is working on it.
-   - You can click on the link to track the progress on OpenHands Cloud.
-2. Open a merge request if it determines that the issue has been successfully resolved.
-3. Comment on the issue with a summary of the performed tasks and a link to the PR.
-
-### Working with Merge Requests
-
-To get OpenHands to work on merge requests, mention `@openhands` in the comments to:
- Ask questions
- Request updates
- Get code explanations
-
 ## Next Steps

 - [Learn about the Cloud UI](/usage/cloud/cloud-ui).
@@ -8,9 +8,9 @@ description: Getting started with OpenHands Cloud.
 OpenHands Cloud is the hosted cloud version of All Hands AI's OpenHands. To get started with OpenHands Cloud,
 visit [app.all-hands.dev](https://app.all-hands.dev).

-You'll be prompted to connect with your GitHub, GitLab or Bitbucket account:
+You'll be prompted to connect with your GitHub or GitLab account:

-1. Click `Log in with GitHub`, `Log in with GitLab` or `Log in with Bitbucket`.
+1. Click `Log in with GitHub` or `Log in with GitLab`.
 2. Review the permissions requested by OpenHands and authorize the application.
   - OpenHands will require certain permissions from your account. To read more about these permissions,
     you can click the `Learn more` link on the authorization page.
@@ -22,6 +22,5 @@ Once you've connected your account, you can:

 - [Install GitHub Integration](/usage/cloud/github-installation) to use OpenHands with your GitHub repositories.
 - [Install GitLab Integration](/usage/cloud/gitlab-installation) to use OpenHands with your GitLab repositories.
- [Install Bitbucket Integration](/usage/cloud/bitbucket-installation) to use OpenHands with your Bitbucket repositories.
 - [Learn about the Cloud UI](/usage/cloud/cloud-ui).
 - [Use the Cloud API](/usage/cloud/cloud-api) to programmatically interact with OpenHands.
@@ -12,8 +12,7 @@ icon: question
  [GitHub](/usage/cloud/github-installation), [GitLab](/usage/cloud/gitlab-installation),
  and [Slack](/usage/cloud/slack-installation) integrations.
 2. **Run on your own**: If you prefer to run it on your own hardware, follow our [Getting Started guide](/usage/local-setup).
-3. **First steps**: Read over the [start building guidelines](/usage/getting-started) and
-  [prompting best practices](/usage/prompting/prompting-best-practices) to learn the basics.
+3. **First steps**: Complete the [start building tutorial](/usage/getting-started) to learn the basics.

 ### Can I use OpenHands for production workloads?

@@ -103,7 +103,7 @@ The conversation history will be saved in `~/.openhands/sessions`.
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e SANDBOX_VOLUMES=$SANDBOX_VOLUMES \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -112,7 +112,7 @@ docker run -it \
    -v ~/.openhands:/.openhands \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app-$(date +%Y%m%d%H%M%S) \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.48 \
    python -m openhands.cli.main --override-cli-mode true
 ```

@@ -123,8 +123,7 @@ docker run -it \

 This launches the CLI in Docker, allowing you to interact with OpenHands.

-The `-e SANDBOX_USER_ID=$(id -u)` is passed to the Docker command to ensure the sandbox user matches the host user’s
-permissions. This prevents the agent from creating root-owned files in the mounted workspace.
+The `-e SANDBOX_USER_ID=$(id -u)` ensures files created by the agent in your workspace have the correct permissions.

 The conversation history will be saved in `~/.openhands/sessions`.

@@ -25,8 +25,7 @@ You can use the Settings page at any time to:
 - Setup the LLM provider and model for OpenHands.
 - [Setup the search engine](/usage/search-engine-setup).
 - [Configure MCP servers](/usage/mcp).
- [Connect to GitHub](/usage/how-to/gui-mode#github-setup), [connect to GitLab](/usage/how-to/gui-mode#gitlab-setup)
-  and [connect to Bitbucket](/usage/how-to/gui-mode#bitbucket-setup).
+- [Connect to GitHub](/usage/how-to/gui-mode#github-setup) and [connect to GitLab](/usage/how-to/gui-mode#gitlab-setup).
 - Set application settings like your preferred language, notifications and other preferences.
 - [Manage custom secrets](/usage/common-settings#secrets-management).

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

 > **Note**: If you used OpenHands before version 0.44, run `mv ~/.openhands-state ~/.openhands` to migrate your conversation history.

 The `-e SANDBOX_USER_ID=$(id -u)` is passed to the Docker command to ensure the sandbox user matches the host user’s
-permissions. This prevents the agent from creating root-owned files in the mounted workspace.

 ## Additional Options

@@ -91,6 +90,6 @@ Common command-line options:
 - `-b 10.0` - Set budget limit (USD)
 - `--no-auto-continue` - Interactive mode

-Run `poetry run python -m openhands.core.main --help` for all options.
+Run `poetry run python -m openhands.core.main --help` for all options, or use a [`config.toml` file](https://github.com/All-Hands-AI/OpenHands/blob/main/config.template.toml) for more flexibility.

 Set `export LOG_ALL_EVENTS=true` to log all agent actions.
@@ -10,8 +10,7 @@ This section is for users who want to connect OpenHands to different LLMs.
 ## Model Recommendations

 Based on our evaluations of language models for coding tasks (using the SWE-bench dataset), we can provide some
-recommendations for model selection. Our latest benchmarking results can be found in
-[this spreadsheet](https://docs.google.com/spreadsheets/d/1wOUdFCMyY6Nt0AIqF705KN4JKOWgeI4wUGUP60krXXs/edit?gid=0).
+recommendations for model selection. Our latest benchmarking results can be found in [this spreadsheet](https://docs.google.com/spreadsheets/d/1wOUdFCMyY6Nt0AIqF705KN4JKOWgeI4wUGUP60krXXs/edit?gid=0).

 Based on these findings and community feedback, these are the latest models that have been verified to work reasonably well with OpenHands:

@@ -21,7 +20,6 @@ Based on these findings and community feedback, these are the latest models that
 - [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)

 If you have successfully run OpenHands with specific providers, we encourage you to open a PR to share your setup process
 to help others using the same provider!
@@ -72,20 +70,17 @@ We have a few guides for running OpenHands with specific model providers:
 - [Groq](/usage/llms/groq)
 - [Local LLMs with SGLang or vLLM](/usage/llms/local-llms)
 - [LiteLLM Proxy](/usage/llms/litellm-proxy)
- [Moonshot AI](/usage/llms/moonshot)
 - [OpenAI](/usage/llms/openai-llms)
- [OpenHands](/usage/llms/openhands-llms)
 - [OpenRouter](/usage/llms/openrouter)

 ## Model Customization

 LLM providers have specific settings that can be customized to optimize their performance with OpenHands, such as:

- **Custom Tokenizers**: For specialized models, you can add a suitable tokenizer.
- **Native Tool Calling**: Toggle native function/tool calling capabilities.
+- **Custom Tokenizers**: For specialized models, you can add a suitable tokenizer
+- **Native Tool Calling**: Toggle native function/tool calling capabilities

-For detailed information about model customization, see
-[LLM Configuration Options](/usage/configuration-options#llm-configuration).
+For detailed information about model customization, see [LLM Configuration Options](configuration-options#llm-customization).

 ### API retries and rate limits

@@ -68,23 +68,23 @@ Download and install the LM Studio desktop app from [lmstudio.ai](https://lmstud
 1. Check [the installation guide](/usage/local-setup) and ensure all prerequisites are met before running OpenHands, then run:

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik

 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik \
    -e LOG_ALL_EVENTS=true \
    -v /var/run/docker.sock:/var/run/docker.sock \
    -v ~/.openhands:/.openhands \
    -p 3000:3000 \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.48
 ```

 2. Wait until the server is running (see log below):
 ```
 Digest: sha256:e72f9baecb458aedb9afc2cd5bc935118d1868719e55d50da73190d3a85c674f
-Status: Image is up to date for docker.all-hands.dev/all-hands-ai/openhands:0.49
+Status: Image is up to date for docker.all-hands.dev/all-hands-ai/openhands:0.48
 Starting OpenHands...
 Running OpenHands as root
 14:22:13 - openhands:INFO: server_config.py:50 - Using config class None
@@ -1,25 +0,0 @@
---
-title: Moonshot AI
-description: How to use Moonshot AI models with OpenHands
---
-
-## Using Moonshot AI with OpenHands
-
-[Moonshot AI](https://platform.moonshot.ai/) offers several powerful models, including Kimi-K2, which has been verified to work well with OpenHands.
-
-### Setup
-
-1. Sign up for an account at [Moonshot AI Platform](https://platform.moonshot.ai/)
-2. Generate an API key from your account settings
-3. Configure OpenHands to use Moonshot AI:
-
-| Setting | Value |
-| --- | --- |
-| LLM Provider | `moonshot` |
-| LLM Model | `kimi-k2-0711-preview` |
-| API Key | Your Moonshot API key |
-
-### Recommended Models
-
- `moonshot/kimi-k2-0711-preview` - Kimi-K2 is Moonshot's most powerful model with a 131K context window, function calling support, and web search capabilities.
-
@@ -1,34 +0,0 @@
---
-title: OpenHands
-description: OpenHands LLM provider with access to state-of-the-art (SOTA) agentic coding models.
---
-
-## Obtain Your OpenHands LLM API Key
-
-1. [Log in to OpenHands Cloud](/usage/cloud/openhands-cloud).
-2. Go to the Settings page and navigate to the `API Keys` tab.
-3. Copy your `LLM API Key`.
-
-![OpenHands LLM API Key](/static/img/openhands-llm-api-key.png)
-
-## Configuration
-
-When running OpenHands, you'll need to set the following in the OpenHands UI through the Settings under the `LLM` tab:
- `LLM Provider` to `OpenHands`
- `LLM Model` to the model you will be using (e.g. claude-sonnet-4-20250514)
- `API Key` to your OpenHands LLM API key copied from above
-
-## Using OpenHands LLM Provider in the CLI
-
-1. [Run OpenHands CLI](/usage/how-to/cli-mode).
-2. To select OpenHands as the LLM provider:
-  - If this is your first time running the CLI, choose `openhands` and then select the model that you would like to use.
-  - If you have previously run the CLI, run the `/settings` command and select to modify the `Basic` settings. Then
-    choose `openhands` and finally the model.
-
-![OpenHands Provider in CLI](/static/img/openhands-provider-cli.png)
-
-## Pricing
-
-Pricing follows official API provider rates.
-[You can view model prices here.](https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json)
@@ -67,17 +67,17 @@ A system with a modern processor and a minimum of **4GB RAM** is recommended to
 ### Start the App

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik

 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.49-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.48-nikolaik \
    -e LOG_ALL_EVENTS=true \
    -v /var/run/docker.sock:/var/run/docker.sock \
    -v ~/.openhands:/.openhands \
    -p 3000:3000 \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app \
-    docker.all-hands.dev/all-hands-ai/openhands:0.49
+    docker.all-hands.dev/all-hands-ai/openhands:0.48
 ```

 > **Note**: If you used OpenHands before version 0.44, you may want to run `mv ~/.openhands-state ~/.openhands` to migrate your conversation history to the new location.
@@ -29,15 +29,6 @@ sse_servers = [
    {url="https://secure-example.com/mcp", api_key="your-api-key"}
 ]

-# SHTTP Servers - External servers that communicate via Streamable HTTP
-shttp_servers = [
-    # Basic SHTTP server with just a URL
-    "http://example.com:8080/mcp",
-
-    # SHTTP server with API key authentication
-    {url="https://secure-example.com/mcp", api_key="your-api-key"}
-]
-
 # Stdio Servers - Local processes that communicate via standard input/output
 stdio_servers = [
    # Basic stdio server
@@ -66,22 +57,6 @@ SSE servers are configured using either a string URL or an object with the follo
  - Type: `str`
  - Description: The URL of the SSE server

- `api_key` (optional)
-  - Type: `str`
-  - Description: API key for authentication
-
-### SHTTP Servers
-
-SHTTP (Streamable HTTP) servers are configured using either a string URL or an object with the following properties:
-
- `url` (required)
-  - Type: `str`
-  - Description: The URL of the SHTTP server
-
- `api_key` (optional)
-  - Type: `str`
-  - Description: API key for authentication
-
 ### Stdio Servers

 Stdio servers are configured using an object with the following properties:
@@ -109,7 +84,7 @@ Stdio servers are configured using an object with the following properties:
 When OpenHands starts, it:

 1. Reads the MCP configuration.
-2. Connects to any configured SSE and SHTTP servers.
+2. Connects to any configured SSE servers.
 3. Starts any configured stdio servers.
 4. Registers the tools provided by these servers with the agent.

@@ -118,23 +93,3 @@ The agent can then use these tools just like any built-in tool. When the agent c
 1. OpenHands routes the call to the appropriate MCP server.
 2. The server processes the request and returns a response.
 3. OpenHands converts the response to an observation and presents it to the agent.
-
-## Transport Protocols
-
-OpenHands supports three different MCP transport protocols:
-
-### Server-Sent Events (SSE)
-SSE is a legacy HTTP-based transport that uses Server-Sent Events for server-to-client communication and HTTP POST requests for client-to-server communication. This transport is suitable for basic streaming scenarios but has limitations in session management and connection resumability.
-
-### Streamable HTTP (SHTTP)
-SHTTP is the modern HTTP-based transport protocol that provides enhanced features over SSE:
-
- **Improved Session Management**: Supports stateful sessions with session IDs for maintaining context across requests
- **Connection Resumability**: Can resume broken connections and replay missed messages using event IDs
- **Bidirectional Communication**: Uses HTTP POST for client-to-server and optional SSE streams for server-to-client communication
- **Better Error Handling**: Enhanced error reporting and recovery mechanisms
-
-SHTTP is the recommended transport for HTTP-based MCP servers as it provides better reliability and features compared to the legacy SSE transport.
-
-### Standard Input/Output (stdio)
-Stdio transport enables communication through standard input and output streams, making it ideal for local integrations and command-line tools. This transport is used for locally executed MCP servers that run as separate processes.
@@ -101,14 +101,13 @@ The OpenHands evaluation harness supports a wide variety of benchmarks across [s
 - SWE-Bench: [`evaluation/benchmarks/swe_bench`](./benchmarks/swe_bench)
 - HumanEvalFix: [`evaluation/benchmarks/humanevalfix`](./benchmarks/humanevalfix)
 - BIRD: [`evaluation/benchmarks/bird`](./benchmarks/bird)
- BioCoder: [`evaluation/benchmarks/biocoder`](./benchmarks/biocoder)
+- BioCoder: [`evaluation/benchmarks/ml_bench`](./benchmarks/ml_bench)
 - ML-Bench: [`evaluation/benchmarks/ml_bench`](./benchmarks/ml_bench)
 - APIBench: [`evaluation/benchmarks/gorilla`](./benchmarks/gorilla/)
 - ToolQA: [`evaluation/benchmarks/toolqa`](./benchmarks/toolqa/)
 - AiderBench: [`evaluation/benchmarks/aider_bench`](./benchmarks/aider_bench/)
 - Commit0: [`evaluation/benchmarks/commit0_bench`](./benchmarks/commit0_bench/)
 - DiscoveryBench: [`evaluation/benchmarks/discoverybench`](./benchmarks/discoverybench/)
- TerminalBench: [`evaluation/benchmarks/terminal_bench`](./benchmarks/terminal_bench)

 ### Web Browsing

@@ -41,10 +41,6 @@ default, it is set to 1.
 - `language`, the language of your evaluating dataset.
 - `dataset`, the absolute position of the dataset jsonl.

-**Skipping errors on build**
-
-For debugging purposes, you can set `export EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED=true` to continue evaluation even when instances reach maximum retries. After evaluation completes, check `maximum_retries_exceeded.jsonl` for a list of failed instances, fix those issues, and then run the evaluation again with `export EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED=false`.
-
 The results will be generated in evaluation/evaluation_outputs/outputs/XXX/CodeActAgent/YYY/output.jsonl, you can refer to the [example](examples/output.jsonl).

 ## Runing evaluation
@@ -17,7 +17,6 @@ from evaluation.utils.shared import (
    EvalMetadata,
    EvalOutput,
    assert_and_raise,
-    check_maximum_retries_exceeded,
    codeact_user_response,
    get_default_sandbox_config_for_eval,
    get_metrics,
@@ -844,5 +843,3 @@ if __name__ == '__main__':
        timeout_seconds=120 * 60,  # 2 hour PER instance should be more than enough
        max_retries=5,
    )
-    # Check if any instances reached maximum retries
-    check_maximum_retries_exceeded(metadata.eval_output_dir)
@@ -38,10 +38,6 @@ Please follow instruction [here](../../README.md#setup) to setup your local deve
 > - If your LLM config has temperature=0, we will automatically use temperature=0.1 for the 2nd and 3rd attempts
 >
 > To enable this iterative protocol, set `export ITERATIVE_EVAL_MODE=true`
->
-> **Skipping errors on build**
->
-> For debugging purposes, you can set `export EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED=true` to continue evaluation even when instances reach maximum retries. After evaluation completes, check `maximum_retries_exceeded.jsonl` for a list of failed instances, fix those issues, and then run the evaluation again with `export EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED=false`.


 ### Running Locally with Docker
@@ -1,45 +0,0 @@
-# **Localization Evaluation for SWE-Bench**
-
-This folder implements localization evaluation at both file and function levels to complementing the assessment of agent inference on [SWE-Bench](https://www.swebench.com/).
-
-## **1. Environment Setup**
- Python env: [Install python environment](../../../README.md#development-environment)
- LLM config: [Configure LLM config](../../../README.md#configure-openhands-and-your-llm)
-
-## **2. Inference & Evaluation**
- Inference and evaluation follow the original `run_infer.sh` and `run_eval.sh` implementation
-    - You may refer to instructions at [README.md](../README.md) for running inference and evaluation on SWE-Bench
-
-## **3. Localization Evaluation**
- Localization evaluation computes two-level localization accuracy, while also considers task success as an additional metric for overall evaluation:
-    - **File Localization Accuracy:** Accuracy of correctly localizing the target file
-    - **Function Localization Accuracy:** Accuracy of correctly localizing the target function
-    - **Resolve Rate** (will be auto-skipped if missing): Success rate of whether tasks are successfully resolved
-    - **File Localization Efficiency:** Average number of iterations taken to successfully localize the target file
-    - **Function Localization Efficiency:** Average number of iterations taken to successfully localize the target file
-    - **Task success efficiency:** Average number of iterations taken to resolve the task
-    - **Resource efficiency:** the API expenditure of the agent running inference on SWE-Bench instances
-
- Run localization evaluation
-    - Format:
-        ```bash
-        ./evaluation/benchmarks/swe_bench/scripts/eval_localization.sh [infer-dir] [split] [dataset] [max-infer-turn] [align-with-max]
-        ```
-        - `infer-dir`: inference directory containing inference outputs
-        - `split`: SWE-Bench dataset split to use
-        - `dataset`: SWE-Bench dataset name
-        - `max-infer-turn`: the maximum number of iterations the agent took to run inference
-        - `align-with-max`: whether to align failure indices (e.g., incorrect localization, unresolved tasks) with `max_iter`
-
-    - Example:
-        ```bash
-        # Example
-        ./evaluation/benchmarks/swe_bench/scripts/eval_localization.sh \
-            --infer-dir ./evaluation/evaluation_outputs/outputs/princeton-nlp__SWE-bench_Verified-test/CodeActAgent/gpt_4o_100_N \
-            --split test \
-            --dataset princeton-nlp/SWE-bench_Verified \
-            --max-infer-turn 100 \
-            --align-with-max true
-        ```
-
- Localization evaluation results will be automatically saved to `[infer-dir]/loc_eval`
@@ -28,7 +28,6 @@ from evaluation.utils.shared import (
    EvalMetadata,
    EvalOutput,
    assert_and_raise,
-    check_maximum_retries_exceeded,
    codeact_user_response,
    get_default_sandbox_config_for_eval,
    get_metrics,
@@ -969,5 +968,3 @@ if __name__ == '__main__':
        logger.info(
            f'Done! Total {len(added_instance_ids)} instances added to {output_file}'
        )
-        # Check if any instances reached maximum retries
-        check_maximum_retries_exceeded(metadata.eval_output_dir)
@@ -1,227 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-source "evaluation/utils/version_control.sh"
-
-# Function to display usage information
-usage() {
-    echo "Usage: $0 [OPTIONS]"
-    echo "Options:"
-    echo "  --infer-dir DIR         Directory containing model inference outputs"
-    echo "  --split SPLIT           SWE-Bench dataset split selection"
-    echo "  --dataset DATASET       Dataset name"
-    echo "  --max-infer-turn NUM    Max number of turns for coding agent"
-    echo "  --align-with-max BOOL   Align failed instance indices with max iteration (true/false)"
-    echo "  -h, --help              Display this help message"
-    echo ""
-    echo "Example:"
-    echo "  $0 --infer-dir ./inference_outputs --split test --align-with-max false"
-}
-
-# Check if no arguments were provided
-if [ $# -eq 0 ]; then
-    usage
-    exit 1
-fi
-
-# Parse command line arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --infer-dir)
-            INFER_DIR="$2"
-            shift 2
-            ;;
-        --split)
-            SPLIT="$2"
-            shift 2
-            ;;
-        --dataset)
-            DATASET="$2"
-            shift 2
-            ;;
-        --max-infer-turn)
-            MAX_TURN="$2"
-            shift 2
-            ;;
-        --align-with-max)
-            ALIGN_WITH_MAX="$2"
-            shift 2
-            ;;
-        -h|--help)
-            usage
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-# Check for required arguments (only INFER_DIR is required)
-if [ -z "$INFER_DIR" ]; then
-    echo "Error: Missing required arguments (--infer-dir is required)"
-    usage
-    exit 1
-fi
-
-# Set defaults for optional arguments if not provided
-if [ -z "$SPLIT" ]; then
-    SPLIT="test"
-    echo "Split not specified, using default: $SPLIT"
-fi
-
-if [ -z "$DATASET" ]; then
-    DATASET="princeton-nlp/SWE-bench_Verified"
-    echo "Dataset not specified, using default: $DATASET"
-fi
-
-if [ -z "$MAX_TURN" ]; then
-    MAX_TURN=20
-    echo "Max inference turn not specified, using default: $MAX_TURN"
-fi
-
-if [ -z "$ALIGN_WITH_MAX" ]; then
-    ALIGN_WITH_MAX="true"
-    echo "Align with max not specified, using default: $ALIGN_WITH_MAX"
-fi
-
-# Validate align-with-max value
-if [ "$ALIGN_WITH_MAX" != "true" ] && [ "$ALIGN_WITH_MAX" != "false" ]; then
-    print_error "Invalid value for --align-with-max: $ALIGN_WITH_MAX. Must be 'true' or 'false'"
-    exit 1
-fi
-
-# Color codes for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Function to print colored output
-print_status() {
-    echo -e "${GREEN}[INFO]${NC} $1"
-}
-
-print_error() {
-    echo -e "${RED}[ERROR]${NC} $1"
-}
-
-print_warning() {
-    echo -e "${YELLOW}[WARNING]${NC} $1"
-}
-
-print_header() {
-    echo -e "${BLUE}[TASK]${NC} $1"
-}
-
-# Check if Python is available
-print_header "Checking Python installation..."
-if ! command -v python3 &> /dev/null; then
-    if ! command -v python &> /dev/null; then
-        print_error "Python is not installed or not in PATH"
-        exit 1
-    else
-        PYTHON_CMD="python"
-        print_status "Using python command"
-    fi
-else
-    PYTHON_CMD="python3"
-    print_status "Using python3 command"
-fi
-
-# Check if the Python script exists
-SCRIPT_NAME="./evaluation/benchmarks/swe_bench/loc_eval/loc_evaluator.py"
-if [ ! -f "$SCRIPT_NAME" ]; then
-    print_error "Python script '$SCRIPT_NAME' not found in current directory"
-    print_warning "Make sure the Python script is in the same directory as this bash script"
-    exit 1
-fi
-
-# Check if required directories exist
-print_header "Validating directories..."
-if [ ! -d "$INFER_DIR" ]; then
-    print_error "Inference directory not found: $INFER_DIR"
-    exit 1
-fi
-
-# Evaluation outputs
-EVAL_DIR="$INFER_DIR/eval_outputs"
-
-# Display configuration
-print_header "Starting Localization Evaluation with the following configuration:"
-echo "  Inference Directory:  $INFER_DIR"
-if [ -d "$EVAL_DIR" ]; then
-    echo "  Evaluation Directory:  $EVAL_DIR"
-else
-    echo "  Evaluation Directory:  None (evaluation outputs doesn't exist)"
-fi
-echo "  Output Directory:      $INFER_DIR/loc_eval"
-echo "  Split:                 $SPLIT"
-echo "  Dataset:               $DATASET"
-echo "  Max Turns:             $MAX_TURN"
-echo "  Align with Max:        $ALIGN_WITH_MAX"
-echo "  Python Command:        $PYTHON_CMD"
-echo ""
-
-# Check Python dependencies (optional check)
-print_header "Checking Python dependencies..."
-$PYTHON_CMD -c "
-import sys
-required_modules = ['pandas', 'json', 'os', 'argparse', 'collections']
-missing_modules = []
-
-for module in required_modules:
-    try:
-        __import__(module)
-    except ImportError:
-        missing_modules.append(module)
-
-if missing_modules:
-    print(f'Missing required modules: {missing_modules}')
-    sys.exit(1)
-else:
-    print('All basic dependencies are available')
-" || {
-    print_error "Some Python dependencies are missing"
-    print_warning "Please install required packages: pip install pandas"
-    exit 1
-}
-
-# Create log directory if doesn't exists
-mkdir -p "$INFER_DIR/loc_eval"
-
-# Set up logging
-LOG_FILE="$INFER_DIR/loc_eval/loc_evaluation_$(date +%Y%m%d_%H%M%S).log"
-print_status "Logging output to: $LOG_FILE"
-
-# Build the command
-CMD_ARGS="\"$SCRIPT_NAME\" \
-    --infer-dir \"$INFER_DIR\" \
-    --split \"$SPLIT\" \
-    --dataset \"$DATASET\" \
-    --max-infer-turn \"$MAX_TURN\" \
-    --align-with-max \"$ALIGN_WITH_MAX\""
-
-# Run the Python script
-print_header "Running localization evaluation..."
-eval "$PYTHON_CMD $CMD_ARGS" 2>&1 | tee "$LOG_FILE"
-
-# Check if the script ran successfully
-if [ ${PIPESTATUS[0]} -eq 0 ]; then
-    print_status "Localization evaluation completed successfully!"
-    print_status "Results saved to: $INFER_DIR/loc_eval"
-    print_status "Log file: $LOG_FILE"
-
-    # Display summary if results exist
-    if [ -f "$INFER_DIR/loc_eval/loc_eval_results/loc_acc/overall_eval.json" ]; then
-        print_header "Evaluation Summary:"
-        cat "$INFER_DIR/loc_eval/loc_eval_results/loc_acc/overall_eval.json"
-        echo
-    fi
-else
-    print_error "Localization evaluation failed!"
-    print_warning "Check the log file for details: $LOG_FILE"
-    exit 1
-fi
@@ -1,31 +0,0 @@
-# Terminal-Bench Evaluation on OpenHands
-
-Terminal-Bench has its own evaluation harness that is very different from OpenHands'. We
-implemented [OpenHands agent](https://github.com/laude-institute/terminal-bench/tree/main/terminal_bench/agents/installed_agents/openhands) using OpenHands local runtime
-inside terminal-bench framework. Hereby we introduce how to use the terminal-bench
-harness to evaluate OpenHands.
-
-## Installation
-
-Terminal-bench ships a CLI tool to manage tasks and run evaluation.
-Please follow official [Installation Doc](https://www.tbench.ai/docs/installation). You could also clone terminal-bench [source code](https://github.com/laude-institute/terminal-bench) and use `uv run tb` CLI.
-
-## Evaluation
-
-Please see [Terminal-Bench Leaderboard](https://www.tbench.ai/leaderboard) for the latest
-instruction on benchmarking guidance. The dataset might evolve.
-
-Sample command:
-
-```bash
-export LLM_BASE_URL=<optional base url>
-export LLM_API_KEY=<llm key>
-tb run \
-    --dataset-name terminal-bench-core \
-    --dataset-version 0.1.1 \
-    --agent openhands \
-    --model <model> \
-    --cleanup
-```
-
-You could run `tb --help` or `tb run --help` to learn more about their CLI.
@@ -25,8 +25,7 @@ class Test(BaseIntegrationTest):
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

        # git add
-        cmd_str = 'git add hello.py'
-        action = CmdRunAction(command=cmd_str)
+        action = CmdRunAction(command='git add hello.py .vscode/')
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

@@ -41,6 +40,15 @@ class Test(BaseIntegrationTest):
                reason=f'Failed to cat /workspace/hello.py: {obs.content}.',
            )

+        # check if the file /workspace/.vscode/settings.json exists
+        action = CmdRunAction(command='cat /workspace/.vscode/settings.json')
+        obs = runtime.run_action(action)
+        if obs.exit_code != 0:
+            return TestResult(
+                success=False,
+                reason=f'Failed to cat /workspace/.vscode/settings.json: {obs.content}.',
+            )
+
        # check if the staging area is empty
        action = CmdRunAction(command='git status')
        obs = runtime.run_action(action)
@@ -311,76 +311,6 @@ def assert_and_raise(condition: bool, msg: str):
        raise EvalException(msg)


-def log_skipped_maximum_retries_exceeded(instance, metadata, error, max_retries=5):
-    """Log and skip the instance when maximum retries are exceeded.
-
-    Args:
-        instance: The instance that failed
-        metadata: The evaluation metadata
-        error: The error that occurred
-        max_retries: The maximum number of retries that were attempted
-
-    Returns:
-        EvalOutput with the error information
-    """
-    from openhands.core.logger import openhands_logger as logger
-
-    # Log the error
-    logger.exception(error)
-    logger.error(
-        f'Maximum error retries reached for instance {instance.instance_id}. '
-        f'Check maximum_retries_exceeded.jsonl, fix the issue and run evaluation again. '
-        f'Skipping this instance and continuing with others.'
-    )
-
-    # Add the instance name to maximum_retries_exceeded.jsonl in the same folder as output.jsonl
-    if metadata and metadata.eval_output_dir:
-        retries_file_path = os.path.join(
-            metadata.eval_output_dir,
-            'maximum_retries_exceeded.jsonl',
-        )
-        try:
-            # Write the instance info as a JSON line
-            with open(retries_file_path, 'a') as f:
-                import json
-
-                # No need to get Docker image as we're not including it in the error entry
-
-                error_entry = {
-                    'instance_id': instance.instance_id,
-                    'error': str(error),
-                    'timestamp': time.strftime('%Y-%m-%d %H:%M:%S'),
-                }
-                f.write(json.dumps(error_entry) + '\n')
-            logger.info(f'Added instance {instance.instance_id} to {retries_file_path}')
-        except Exception as write_error:
-            logger.error(
-                f'Failed to write to maximum_retries_exceeded.jsonl: {write_error}'
-            )
-
-    return EvalOutput(
-        instance_id=instance.instance_id,
-        test_result={},
-        error=f'Maximum retries ({max_retries}) reached: {str(error)}',
-        status='error',
-    )
-
-
-def check_maximum_retries_exceeded(eval_output_dir):
-    """Check if maximum_retries_exceeded.jsonl exists and output a message."""
-    from openhands.core.logger import openhands_logger as logger
-
-    retries_file_path = os.path.join(eval_output_dir, 'maximum_retries_exceeded.jsonl')
-    if os.path.exists(retries_file_path):
-        logger.info(
-            'ATTENTION: Some instances reached maximum error retries and were skipped.'
-        )
-        logger.info(f'These instances are listed in: {retries_file_path}')
-        logger.info(
-            'Fix these instances and run evaluation again with EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED=false'
-        )
-
-
 def _process_instance_wrapper(
    process_instance_func: Callable[[pd.Series, EvalMetadata, bool], EvalOutput],
    instance: pd.Series,
@@ -433,26 +363,11 @@ def _process_instance_wrapper(
                    + f'[Encountered after {max_retries} retries. Please check the logs and report the issue.]'
                    + '-' * 10
                )
-
-                # Check if EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED is set to true
-                skip_errors = (
-                    os.environ.get(
-                        'EVAL_SKIP_MAXIMUM_RETRIES_EXCEEDED', 'false'
-                    ).lower()
-                    == 'true'
-                )
-
-                if skip_errors:
-                    # Use the dedicated function to log and skip maximum retries exceeded
-                    return log_skipped_maximum_retries_exceeded(
-                        instance, metadata, e, max_retries
-                    )
-                else:
-                    # Raise an error after all retries & stop the evaluation
-                    logger.exception(e)
-                    raise RuntimeError(
-                        f'Maximum error retries reached for instance {instance.instance_id}'
-                    ) from e
+                # Raise an error after all retries & stop the evaluation
+                logger.exception(e)
+                raise RuntimeError(
+                    f'Maximum error retries reached for instance {instance.instance_id}'
+                ) from e
            msg = (
                '-' * 10
                + '\n'
@@ -541,10 +456,6 @@ def run_evaluation(
    output_fp.close()
    logger.info('\nEvaluation finished.\n')

-    # Check if any instances reached maximum retries
-    if metadata and metadata.eval_output_dir:
-        check_maximum_retries_exceeded(metadata.eval_output_dir)
-

 def reset_logger_for_multiprocessing(
    logger: logging.Logger, instance_id: str, log_dir: str
@@ -13,9 +13,8 @@
    "plugin:react-hooks/recommended",
    "plugin:@tanstack/query/recommended",
  ],
-  "plugins": ["prettier", "unused-imports", "i18next"],
+  "plugins": ["prettier", "unused-imports"],
  "rules": {
-    "i18next/no-literal-string": "error",
    "unused-imports/no-unused-imports": "error",
    "prettier/prettier": ["error"],
    // Resolves https://stackoverflow.com/questions/59265981/typescript-eslint-missing-file-extension-ts-import-extensions/59268871#59268871
@@ -1,7 +1,7 @@
 # Run frontend checks
 echo "Running frontend checks..."
 cd frontend
-npm run lint
+npm run check-unlocalized-strings
 npm run check-translation-completeness
 npx lint-staged

@@ -129,159 +129,4 @@ describe("ActionSuggestions", () => {
    expect(createPRPrompt).toContain("meaningful branch name");
    expect(createPRPrompt).not.toContain("SAME branch name");
  });
-
-  it("should use correct provider name based on conversation git_provider, not user authenticated providers", async () => {
-    // Test case for GitHub repository
-    const getConversationSpy = vi.spyOn(OpenHands, "getConversation");
-    getConversationSpy.mockResolvedValue({
-      conversation_id: "test-github",
-      title: "GitHub Test",
-      selected_repository: "test-repo",
-      git_provider: "github",
-      selected_branch: "main",
-      last_updated_at: new Date().toISOString(),
-      created_at: new Date().toISOString(),
-      status: "RUNNING",
-      runtime_status: "STATUS$READY",
-      url: null,
-      session_api_key: null,
-    });
-
-    // Mock user having both GitHub and Bitbucket tokens
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      provider_tokens_set: {
-        github: "github-token",
-        bitbucket: "bitbucket-token",
-      },
-    });
-
-    const onSuggestionsClick = vi.fn();
-    render(<ActionSuggestions onSuggestionsClick={onSuggestionsClick} />, {
-      wrapper: ({ children }) => (
-        <QueryClientProvider client={new QueryClient()}>
-          {children}
-        </QueryClientProvider>
-      ),
-    });
-
-    const buttons = await screen.findAllByTestId("suggestion");
-    const prButton = buttons.find((button) =>
-      button.textContent?.includes("Push & Create PR"),
-    );
-
-    expect(prButton).toBeInTheDocument();
-
-    if (prButton) {
-      prButton.click();
-    }
-
-    // The suggestion should mention GitHub, not Bitbucket
-    expect(onSuggestionsClick).toHaveBeenCalledWith(
-      expect.stringContaining("GitHub")
-    );
-    expect(onSuggestionsClick).not.toHaveBeenCalledWith(
-      expect.stringContaining("Bitbucket")
-    );
-  });
-
-  it("should use GitLab terminology when git_provider is gitlab", async () => {
-    const getConversationSpy = vi.spyOn(OpenHands, "getConversation");
-    getConversationSpy.mockResolvedValue({
-      conversation_id: "test-gitlab",
-      title: "GitLab Test",
-      selected_repository: "test-repo",
-      git_provider: "gitlab",
-      selected_branch: "main",
-      last_updated_at: new Date().toISOString(),
-      created_at: new Date().toISOString(),
-      status: "RUNNING",
-      runtime_status: "STATUS$READY",
-      url: null,
-      session_api_key: null,
-    });
-
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      provider_tokens_set: {
-        gitlab: "gitlab-token",
-      },
-    });
-
-    const onSuggestionsClick = vi.fn();
-    render(<ActionSuggestions onSuggestionsClick={onSuggestionsClick} />, {
-      wrapper: ({ children }) => (
-        <QueryClientProvider client={new QueryClient()}>
-          {children}
-        </QueryClientProvider>
-      ),
-    });
-
-    const buttons = await screen.findAllByTestId("suggestion");
-    const prButton = buttons.find((button) =>
-      button.textContent?.includes("Push & Create PR"),
-    );
-
-    if (prButton) {
-      prButton.click();
-    }
-
-    // Should mention GitLab and "merge request" instead of "pull request"
-    expect(onSuggestionsClick).toHaveBeenCalledWith(
-      expect.stringContaining("GitLab")
-    );
-    expect(onSuggestionsClick).toHaveBeenCalledWith(
-      expect.stringContaining("merge request")
-    );
-  });
-
-  it("should use Bitbucket terminology when git_provider is bitbucket", async () => {
-    const getConversationSpy = vi.spyOn(OpenHands, "getConversation");
-    getConversationSpy.mockResolvedValue({
-      conversation_id: "test-bitbucket",
-      title: "Bitbucket Test",
-      selected_repository: "test-repo",
-      git_provider: "bitbucket",
-      selected_branch: "main",
-      last_updated_at: new Date().toISOString(),
-      created_at: new Date().toISOString(),
-      status: "RUNNING",
-      runtime_status: "STATUS$READY",
-      url: null,
-      session_api_key: null,
-    });
-
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      provider_tokens_set: {
-        bitbucket: "bitbucket-token",
-      },
-    });
-
-    const onSuggestionsClick = vi.fn();
-    render(<ActionSuggestions onSuggestionsClick={onSuggestionsClick} />, {
-      wrapper: ({ children }) => (
-        <QueryClientProvider client={new QueryClient()}>
-          {children}
-        </QueryClientProvider>
-      ),
-    });
-
-    const buttons = await screen.findAllByTestId("suggestion");
-    const prButton = buttons.find((button) =>
-      button.textContent?.includes("Push & Create PR"),
-    );
-
-    if (prButton) {
-      prButton.click();
-    }
-
-    // Should mention Bitbucket
-    expect(onSuggestionsClick).toHaveBeenCalledWith(
-      expect.stringContaining("Bitbucket")
-    );
-  });
 });
@@ -44,64 +44,4 @@ describe("AuthModal", () => {

    expect(window.location.href).toBe(mockUrl);
  });
-
-  it("should render Terms of Service and Privacy Policy text with correct links", () => {
-    render(<AuthModal githubAuthUrl="mock-url" appMode="saas" />);
-
-    // Find the terms of service section using data-testid
-    const termsSection = screen.getByTestId("auth-modal-terms-of-service");
-    expect(termsSection).toBeInTheDocument();
-
-
-    // Check that all text content is present in the paragraph
-    expect(termsSection).toHaveTextContent(
-      "AUTH$BY_SIGNING_UP_YOU_AGREE_TO_OUR",
-    );
-    expect(termsSection).toHaveTextContent("COMMON$TERMS_OF_SERVICE");
-    expect(termsSection).toHaveTextContent("COMMON$AND");
-    expect(termsSection).toHaveTextContent("COMMON$PRIVACY_POLICY");
-
-    // Check Terms of Service link
-    const tosLink = screen.getByRole("link", {
-      name: "COMMON$TERMS_OF_SERVICE",
-    });
-    expect(tosLink).toBeInTheDocument();
-    expect(tosLink).toHaveAttribute("href", "https://www.all-hands.dev/tos");
-    expect(tosLink).toHaveAttribute("target", "_blank");
-    expect(tosLink).toHaveClass("underline", "hover:text-primary");
-
-    // Check Privacy Policy link
-    const privacyLink = screen.getByRole("link", {
-      name: "COMMON$PRIVACY_POLICY",
-    });
-    expect(privacyLink).toBeInTheDocument();
-    expect(privacyLink).toHaveAttribute(
-      "href",
-      "https://www.all-hands.dev/privacy",
-    );
-    expect(privacyLink).toHaveAttribute("target", "_blank");
-    expect(privacyLink).toHaveClass("underline", "hover:text-primary");
-
-    // Verify that both links are within the terms section
-    expect(termsSection).toContainElement(tosLink);
-    expect(termsSection).toContainElement(privacyLink);
-  });
-
-  it("should open Terms of Service link in new tab", () => {
-    render(<AuthModal githubAuthUrl="mock-url" appMode="saas" />);
-
-    const tosLink = screen.getByRole("link", {
-      name: "COMMON$TERMS_OF_SERVICE",
-    });
-    expect(tosLink).toHaveAttribute("target", "_blank");
-  });
-
-  it("should open Privacy Policy link in new tab", () => {
-    render(<AuthModal githubAuthUrl="mock-url" appMode="saas" />);
-
-    const privacyLink = screen.getByRole("link", {
-      name: "COMMON$PRIVACY_POLICY",
-    });
-    expect(privacyLink).toHaveAttribute("target", "_blank");
-  });
 });
@@ -529,287 +529,4 @@ describe("ConversationPanel", () => {

    expect(screen.queryByTestId("stop-button")).not.toBeInTheDocument();
  });
-
-  it("should show edit button in context menu", async () => {
-    const user = userEvent.setup();
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-    expect(cards).toHaveLength(3);
-
-    // Click ellipsis to open context menu
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    // Edit button should be visible
-    const editButton = screen.getByTestId("edit-button");
-    expect(editButton).toBeInTheDocument();
-    expect(editButton).toHaveTextContent("BUTTON$EDIT_TITLE");
-  });
-
-  it("should enter edit mode when edit button is clicked", async () => {
-    const user = userEvent.setup();
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Click ellipsis to open context menu
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    // Click edit button
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Should find input field instead of title text
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    expect(titleInput).toBeInTheDocument();
-    expect(titleInput.tagName).toBe("INPUT");
-    expect(titleInput).toHaveValue("Conversation 1");
-    expect(titleInput).toHaveFocus();
-  });
-
-  it("should successfully update conversation title", async () => {
-    const user = userEvent.setup();
-
-    // Mock the updateConversation API call
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockResolvedValue(true);
-
-    // Mock the toast function
-    const mockToast = vi.fn();
-    vi.mock("#/utils/custom-toast-handlers", () => ({
-      displaySuccessToast: mockToast,
-    }));
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Edit the title
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.clear(titleInput);
-    await user.type(titleInput, "Updated Title");
-
-    // Blur the input to save
-    await user.tab();
-
-    // Verify API call was made with correct parameters
-    expect(updateConversationSpy).toHaveBeenCalledWith("1", {
-      title: "Updated Title",
-    });
-  });
-
-  it("should save title when Enter key is pressed", async () => {
-    const user = userEvent.setup();
-
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockResolvedValue(true);
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Edit the title and press Enter
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.clear(titleInput);
-    await user.type(titleInput, "Title Updated via Enter");
-    await user.keyboard("{Enter}");
-
-    // Verify API call was made
-    expect(updateConversationSpy).toHaveBeenCalledWith("1", {
-      title: "Title Updated via Enter",
-    });
-  });
-
-  it("should trim whitespace from title", async () => {
-    const user = userEvent.setup();
-
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockResolvedValue(true);
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Edit the title with extra whitespace
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.clear(titleInput);
-    await user.type(titleInput, "   Trimmed Title   ");
-    await user.tab();
-
-    // Verify API call was made with trimmed title
-    expect(updateConversationSpy).toHaveBeenCalledWith("1", {
-      title: "Trimmed Title",
-    });
-
-    // Verify input shows trimmed value
-    expect(titleInput).toHaveValue("Trimmed Title");
-  });
-
-  it("should revert to original title when empty", async () => {
-    const user = userEvent.setup();
-
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockResolvedValue(true);
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Clear the title completely
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.clear(titleInput);
-    await user.tab();
-
-    // Verify API was not called
-    expect(updateConversationSpy).not.toHaveBeenCalled();
-
-    // Verify input reverted to original value
-    expect(titleInput).toHaveValue("Conversation 1");
-  });
-
-  it("should handle API error when updating title", async () => {
-    const user = userEvent.setup();
-
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockRejectedValue(new Error("API Error"));
-
-    vi.mock("#/utils/custom-toast-handlers", () => ({
-      displayErrorToast: vi.fn(),
-    }));
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Edit the title
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.clear(titleInput);
-    await user.type(titleInput, "Failed Update");
-    await user.tab();
-
-    // Verify API call was made
-    expect(updateConversationSpy).toHaveBeenCalledWith("1", {
-      title: "Failed Update",
-    });
-
-    // Wait for error handling
-    await waitFor(() => {
-      expect(updateConversationSpy).toHaveBeenCalled();
-    });
-  });
-
-  it("should close context menu when edit button is clicked", async () => {
-    const user = userEvent.setup();
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Click ellipsis to open context menu
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    // Verify context menu is open
-    const contextMenu = screen.getByTestId("context-menu");
-    expect(contextMenu).toBeInTheDocument();
-
-    // Click edit button
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Verify context menu is closed
-    expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
-  });
-
-  it("should not call API when title is unchanged", async () => {
-    const user = userEvent.setup();
-
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockResolvedValue(true);
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Don't change the title, just blur
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.tab();
-
-    // Verify API was called with the same title (since handleConversationTitleChange will always be called)
-    expect(updateConversationSpy).toHaveBeenCalledWith("1", {
-      title: "Conversation 1",
-    });
-  });
-
-  it("should handle special characters in title", async () => {
-    const user = userEvent.setup();
-
-    const updateConversationSpy = vi.spyOn(OpenHands, "updateConversation");
-    updateConversationSpy.mockResolvedValue(true);
-
-    renderConversationPanel();
-
-    const cards = await screen.findAllByTestId("conversation-card");
-
-    // Enter edit mode
-    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
-    await user.click(ellipsisButton);
-
-    const editButton = screen.getByTestId("edit-button");
-    await user.click(editButton);
-
-    // Edit the title with special characters
-    const titleInput = within(cards[0]).getByTestId("conversation-card-title");
-    await user.clear(titleInput);
-    await user.type(titleInput, "Special @#$%^&*()_+ Characters");
-    await user.tab();
-
-    // Verify API call was made with special characters
-    expect(updateConversationSpy).toHaveBeenCalledWith("1", {
-      title: "Special @#$%^&*()_+ Characters",
-    });
-  });
 });
@@ -110,29 +110,4 @@ describe("TaskCard", () => {
    expect(launchButton).toHaveTextContent(/Loading/i);
    expect(launchButton).toBeDisabled();
  });
-
-  it("should navigate to the conversation page after creating a conversation", async () => {
-    const createConversationSpy = vi.spyOn(OpenHands, "createConversation");
-    createConversationSpy.mockResolvedValue({
-      conversation_id: "test-conversation-id",
-      title: "Test Conversation",
-      selected_repository: "repo1",
-      selected_branch: "main",
-      git_provider: "github",
-      last_updated_at: "2023-01-01T00:00:00Z",
-      created_at: "2023-01-01T00:00:00Z",
-      status: "RUNNING",
-      runtime_status: "STATUS$READY",
-      url: null,
-      session_api_key: null
-    });
-
-    renderTaskCard();
-
-    const launchButton = screen.getByTestId("task-launch-button");
-    await userEvent.click(launchButton);
-
-    // Wait for navigation to the conversation page
-    await screen.findByTestId("conversation-screen");
-  });
 });
@@ -1,8 +1,8 @@
 import { render, screen, within } from "@testing-library/react";
 import { createRoutesStub } from "react-router";
 import { describe, expect, it, vi } from "vitest";
-import { QueryClientProvider } from "@tanstack/react-query";
-import SettingsScreen, { clientLoader } from "#/routes/settings";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import SettingsScreen from "#/routes/settings";
 import OpenHands from "#/api/open-hands";

 // Mock the i18next hook
@@ -31,27 +31,16 @@ vi.mock("react-i18next", async () => {
 });

 describe("Settings Screen", () => {
-  const { handleLogoutMock, mockQueryClient } = vi.hoisted(() => ({
+  const { handleLogoutMock } = vi.hoisted(() => ({
    handleLogoutMock: vi.fn(),
-    mockQueryClient: (() => {
-      const { QueryClient } = require("@tanstack/react-query");
-      return new QueryClient();
-    })(),
  }));
-
  vi.mock("#/hooks/use-app-logout", () => ({
    useAppLogout: vi.fn().mockReturnValue({ handleLogout: handleLogoutMock }),
  }));

-  vi.mock("#/query-client-config", () => ({
-    queryClient: mockQueryClient,
-  }));
-
  const RouterStub = createRoutesStub([
    {
      Component: SettingsScreen,
-      // @ts-expect-error - custom loader
-      clientLoader,
      path: "/settings",
      children: [
        {
@@ -67,8 +56,8 @@ describe("Settings Screen", () => {
          path: "/settings/app",
        },
        {
-          Component: () => <div data-testid="billing-settings-screen" />,
-          path: "/settings/billing",
+          Component: () => <div data-testid="credits-settings-screen" />,
+          path: "/settings/credits",
        },
        {
          Component: () => <div data-testid="api-keys-settings-screen" />,
@@ -78,27 +67,26 @@ describe("Settings Screen", () => {
    },
  ]);

-  const renderSettingsScreen = (path = "/settings") =>
-    render(<RouterStub initialEntries={[path]} />, {
+  const renderSettingsScreen = (path = "/settings") => {
+    const queryClient = new QueryClient();
+    return render(<RouterStub initialEntries={[path]} />, {
      wrapper: ({ children }) => (
-        <QueryClientProvider client={mockQueryClient}>
+        <QueryClientProvider client={queryClient}>
          {children}
        </QueryClientProvider>
      ),
    });
+  };

  it("should render the navbar", async () => {
    const sectionsToInclude = ["llm", "integrations", "application", "secrets"];
-    const sectionsToExclude = ["api keys", "credits", "billing"];
+    const sectionsToExclude = ["api keys", "credits"];
    const getConfigSpy = vi.spyOn(OpenHands, "getConfig");
    // @ts-expect-error - only return app mode
    getConfigSpy.mockResolvedValue({
      APP_MODE: "oss",
    });

-    // Clear any existing query data
-    mockQueryClient.clear();
-
    renderSettingsScreen();

    const navbar = await screen.findByTestId("settings-navbar");
@@ -114,8 +102,6 @@ describe("Settings Screen", () => {
      });
      expect(sectionElement).not.toBeInTheDocument();
    });
-
-    getConfigSpy.mockRestore();
  });

  it("should render the saas navbar", async () => {
@@ -127,15 +113,12 @@ describe("Settings Screen", () => {
    const sectionsToInclude = [
      "integrations",
      "application",
-      "credits", // The nav item shows "credits" text but routes to /billing
+      "credits",
      "secrets",
      "api keys",
    ];
    const sectionsToExclude = ["llm"];

-    // Clear any existing query data
-    mockQueryClient.clear();
-
    renderSettingsScreen();

    const navbar = await screen.findByTestId("settings-navbar");
@@ -151,44 +134,30 @@ describe("Settings Screen", () => {
      });
      expect(sectionElement).not.toBeInTheDocument();
    });
-
-    getConfigSpy.mockRestore();
  });

-  it("should not be able to access saas-only routes in oss mode", async () => {
+  it("should not be able to access oss-restricted routes in oss", async () => {
    const getConfigSpy = vi.spyOn(OpenHands, "getConfig");
    // @ts-expect-error - only return app mode
    getConfigSpy.mockResolvedValue({
      APP_MODE: "oss",
    });

-    // Clear any existing query data
-    mockQueryClient.clear();
-
-    // In OSS mode, accessing restricted routes should redirect to /settings
-    // Since createRoutesStub doesn't handle clientLoader redirects properly,
-    // we test that the correct navbar is shown (OSS navbar) and that
-    // the restricted route components are not rendered when accessing /settings
-    renderSettingsScreen("/settings");
-
-    // Verify we're in OSS mode by checking the navbar
-    const navbar = await screen.findByTestId("settings-navbar");
-    expect(within(navbar).getByText("LLM")).toBeInTheDocument();
+    const { rerender } = renderSettingsScreen("/settings/credits");
    expect(
-      within(navbar).queryByText("credits", { exact: false }),
+      screen.queryByTestId("credits-settings-screen"),
    ).not.toBeInTheDocument();

-    // Verify the LLM settings screen is shown
-    expect(screen.getByTestId("llm-settings-screen")).toBeInTheDocument();
-    expect(
-      screen.queryByTestId("billing-settings-screen"),
-    ).not.toBeInTheDocument();
+    rerender(<RouterStub initialEntries={["/settings/api-keys"]} />);
    expect(
      screen.queryByTestId("api-keys-settings-screen"),
    ).not.toBeInTheDocument();
-
-    getConfigSpy.mockRestore();
+    rerender(<RouterStub initialEntries={["/settings/billing"]} />);
+    expect(
+      screen.queryByTestId("billing-settings-screen"),
+    ).not.toBeInTheDocument();
+    rerender(<RouterStub initialEntries={["/settings"]} />);
  });

-  it.todo("should not be able to access oss-only routes in saas mode");
+  it.todo("should not be able to access saas-restricted routes in saas");
 });
@@ -82,5 +82,17 @@ describe("extractModelAndProvider", () => {
      model: "claude-opus-4-20250514",
      separator: "/",
    });
+
+    expect(extractModelAndProvider("claude-3-haiku-20240307")).toEqual({
+      provider: "anthropic",
+      model: "claude-3-haiku-20240307",
+      separator: "/",
+    });
+
+    expect(extractModelAndProvider("claude-2.1")).toEqual({
+      provider: "anthropic",
+      model: "claude-2.1",
+      separator: "/",
+    });
  });
 });
@@ -52,16 +52,14 @@ test("organizeModelsAndProviders", () => {
      separator: "/",
      models: [
        "claude-3-5-sonnet-20241022",
-      ],
-    },
-    other: {
-      separator: "",
-      models: [
-        "together-ai-21.1b-41b",
        "claude-3-haiku-20240307",
        "claude-2",
        "claude-2.1",
      ],
    },
+    other: {
+      separator: "",
+      models: ["together-ai-21.1b-41b"],
+    },
  });
 });
@@ -1,39 +1,39 @@
 {
  "name": "openhands-frontend",
-  "version": "0.49.0",
+  "version": "0.48.0",
  "private": true,
  "type": "module",
  "engines": {
-    "node": ">=22.0.0"
+    "node": ">=20.0.0"
  },
  "dependencies": {
-    "@heroui/react": "^2.8.1",
+    "@heroui/react": "^2.8.0-beta.13",
    "@microlink/react-json-view": "^1.26.2",
    "@monaco-editor/react": "^4.7.0-rc.0",
-    "@react-router/node": "^7.7.0",
-    "@react-router/serve": "^7.7.0",
+    "@react-router/node": "^7.6.3",
+    "@react-router/serve": "^7.6.3",
    "@react-types/shared": "^3.29.1",
    "@reduxjs/toolkit": "^2.8.2",
    "@stripe/react-stripe-js": "^3.7.0",
-    "@stripe/stripe-js": "^7.5.0",
+    "@stripe/stripe-js": "^7.4.0",
    "@tailwindcss/postcss": "^4.1.11",
    "@tailwindcss/vite": "^4.1.11",
-    "@tanstack/react-query": "^5.83.0",
-    "@vitejs/plugin-react": "^4.7.0",
+    "@tanstack/react-query": "^5.81.4",
+    "@vitejs/plugin-react": "^4.6.0",
    "@xterm/addon-fit": "^0.10.0",
    "@xterm/xterm": "^5.4.0",
    "axios": "^1.10.0",
    "clsx": "^2.1.1",
    "eslint-config-airbnb-typescript": "^18.0.0",
-    "framer-motion": "^12.23.6",
-    "i18next": "^25.3.2",
+    "framer-motion": "^12.23.0",
+    "i18next": "^25.3.1",
    "i18next-browser-languagedetector": "^8.2.0",
    "i18next-http-backend": "^3.0.2",
    "isbot": "^5.1.28",
-    "jose": "^6.0.12",
+    "jose": "^6.0.11",
    "lucide-react": "^0.525.0",
    "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.257.0",
+    "posthog-js": "^1.256.2",
    "react": "^19.1.0",
    "react-dom": "^19.1.0",
    "react-highlight": "^0.15.0",
@@ -42,15 +42,14 @@
    "react-icons": "^5.5.0",
    "react-markdown": "^10.1.0",
    "react-redux": "^9.2.0",
-    "react-router": "^7.7.0",
+    "react-router": "^7.6.3",
    "react-syntax-highlighter": "^15.6.1",
    "react-textarea-autosize": "^8.5.9",
-    "remark-breaks": "^4.0.0",
    "remark-gfm": "^4.0.1",
    "sirv-cli": "^3.0.1",
    "socket.io-client": "^4.8.1",
    "tailwind-merge": "^3.3.1",
-    "vite": "^7.0.5",
+    "vite": "^7.0.3",
    "web-vitals": "^5.0.3",
    "ws": "^8.18.2"
  },
@@ -71,6 +70,7 @@
    "lint:fix": "eslint src --ext .ts,.tsx,.js --fix && prettier --write src/**/*.{ts,tsx}",
    "prepare": "cd .. && husky frontend/.husky",
    "typecheck": "react-router typegen && tsc",
+    "check-unlocalized-strings": "node scripts/check-unlocalized-strings.cjs",
    "check-translation-completeness": "node scripts/check-translation-completeness.cjs"
  },
  "lint-staged": {
@@ -82,17 +82,17 @@
  "devDependencies": {
    "@babel/parser": "^7.28.0",
    "@babel/traverse": "^7.28.0",
-    "@babel/types": "^7.28.1",
+    "@babel/types": "^7.27.0",
    "@mswjs/socket.io-binding": "^0.2.0",
-    "@playwright/test": "^1.54.1",
-    "@react-router/dev": "^7.7.0",
+    "@playwright/test": "^1.53.2",
+    "@react-router/dev": "^7.6.3",
    "@tailwindcss/typography": "^0.5.16",
    "@tanstack/eslint-plugin-query": "^5.81.2",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.1",
    "@testing-library/react": "^16.3.0",
    "@testing-library/user-event": "^14.6.1",
-    "@types/node": "^24.0.14",
+    "@types/node": "^24.0.10",
    "@types/react": "^19.1.8",
    "@types/react-dom": "^19.1.6",
    "@types/react-highlight": "^0.12.8",
@@ -107,7 +107,6 @@
    "eslint-config-airbnb": "^19.0.4",
    "eslint-config-airbnb-typescript": "^18.0.0",
    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-i18next": "^6.1.2",
    "eslint-plugin-import": "^2.32.0",
    "eslint-plugin-jsx-a11y": "^6.10.2",
    "eslint-plugin-prettier": "^5.5.1",
@@ -7,7 +7,7 @@
 * - Please do NOT modify this file.
 */

-const PACKAGE_VERSION = '2.10.3'
+const PACKAGE_VERSION = '2.10.2'
 const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
@@ -0,0 +1,740 @@
+#!/usr/bin/env node
+
+/**
+ * Pre-commit hook script to check for unlocalized strings in the frontend code
+ * This script is based on the test in __tests__/utils/check-hardcoded-strings.test.tsx
+ */
+
+const path = require('path');
+const fs = require('fs');
+const parser = require('@babel/parser');
+const traverse = require('@babel/traverse').default;
+
+// Files/directories to ignore
+const IGNORE_PATHS = [
+  // Build and dependency files
+  "node_modules",
+  "dist",
+  ".git",
+  "test",
+  "__tests__",
+  ".d.ts",
+  "i18n",
+  "package.json",
+  "package-lock.json",
+  "tsconfig.json",
+
+  // Internal code that doesn't need localization
+  "mocks", // Mock data
+  "assets", // SVG paths and CSS classes
+  "types", // Type definitions and constants
+  "state", // Redux state management
+  "api", // API endpoints
+  "services", // Internal services
+  "hooks", // React hooks
+  "context", // React context
+  "store", // Redux store
+  "routes.ts", // Route definitions
+  "root.tsx", // Root component
+  "entry.client.tsx", // Client entry point
+  "utils/scan-unlocalized-strings.ts", // Original scanner
+  "utils/scan-unlocalized-strings-ast.ts", // This file itself
+  "frontend/src/components/features/home/tasks/get-prompt-for-query.ts", // Only contains agent prompts
+];
+
+// Extensions to scan
+const SCAN_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx"];
+
+// Attributes that typically don't contain user-facing text
+const NON_TEXT_ATTRIBUTES = [
+  "allow",
+  "className",
+  "i18nKey",
+  "testId",
+  "id",
+  "name",
+  "type",
+  "href",
+  "src",
+  "rel",
+  "target",
+  "style",
+  "onClick",
+  "onChange",
+  "onSubmit",
+  "data-testid",
+  "aria-labelledby",
+  "aria-describedby",
+  "aria-hidden",
+  "role",
+  "sandbox",
+];
+
+function shouldIgnorePath(filePath) {
+  return IGNORE_PATHS.some((ignore) => filePath.includes(ignore));
+}
+
+// Check if a string looks like a translation key
+// Translation keys typically use dots, underscores, or are all caps
+// Also check for the pattern with $ which is used in our translation keys
+function isLikelyTranslationKey(str) {
+  return (
+    /^[A-Z0-9_$.]+$/.test(str) ||
+    str.includes(".") ||
+    /[A-Z0-9_]+\$[A-Z0-9_]+/.test(str)
+  );
+}
+
+// Check if a string is a raw translation key that should be wrapped in t()
+function isRawTranslationKey(str) {
+  // Check for our specific translation key pattern (e.g., "SETTINGS$GITHUB_SETTINGS")
+  // Exclude specific keys that are already properly used with i18next.t() in the code
+  const excludedKeys = [
+    "STATUS$ERROR_LLM_OUT_OF_CREDITS",
+    "ERROR$GENERIC",
+    "GITHUB$AUTH_SCOPE",
+  ];
+
+  if (excludedKeys.includes(str)) {
+    return false;
+  }
+
+  return /^[A-Z0-9_]+\$[A-Z0-9_]+$/.test(str);
+}
+
+// Specific technical strings that should be excluded from localization
+const EXCLUDED_TECHNICAL_STRINGS = [
+  "openid email profile", // OAuth scope string - not user-facing
+  "OPEN_ISSUE", // Task type identifier, not a UI string
+  "Merge Request", // Git provider specific terminology
+  "GitLab API", // Git provider specific terminology
+  "Pull Request", // Git provider specific terminology
+  "GitHub API", // Git provider specific terminology
+  "add-secret-form", // Test ID for secret form
+  "edit-secret-form", // Test ID for secret form
+  "search-api-key-input", // Input name for search API key
+  "noopener,noreferrer", // Options for window.open
+  ".openhands/microagents/", // Path to microagents directory
+  "STATUS$READY",
+  "STATUS$STOPPED",
+  "STATUS$ERROR",
+];
+
+function isExcludedTechnicalString(str) {
+  return EXCLUDED_TECHNICAL_STRINGS.includes(str);
+}
+
+function isLikelyCode(str) {
+  // A string with no spaces and at least one underscore or colon is likely a code.
+  // (e.g.: "browser_interactive" or "error:")
+  if (str.includes(" ")) {
+    return false
+  }
+  if (str.includes(":") || str.includes("_")){
+    return true
+  }
+  return false
+}
+
+function isCommonDevelopmentString(str) {
+
+  // Technical patterns that are definitely not UI strings
+  const technicalPatterns = [
+    // URLs and paths
+    /^https?:\/\//, // URLs
+    /^\/[a-zA-Z0-9_\-./]*$/, // File paths
+    /^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+$/, // File extensions, class names
+    /^@[a-zA-Z0-9/-]+$/, // Import paths
+    /^#\/[a-zA-Z0-9/-]+$/, // Alias imports
+    /^[a-zA-Z0-9/-]+\/[a-zA-Z0-9/-]+$/, // Module paths
+    /^data:image\/[a-zA-Z0-9;,]+$/, // Data URLs
+    /^application\/[a-zA-Z0-9-]+$/, // MIME types
+    /^!\[image]\(data:image\/png;base64,$/, // Markdown image with base64 data
+
+    // Numbers, IDs, and technical values
+    /^\d+(\.\d+)?$/, // Numbers
+    /^#[0-9a-fA-F]{3,8}$/, // Color codes
+    /^[a-zA-Z0-9_-]+=[a-zA-Z0-9_-]+$/, // Key-value pairs
+    /^mm:ss$/, // Time format
+    /^[a-zA-Z0-9]+\/[a-zA-Z0-9-]+$/, // Provider/model format
+    /^\?[a-zA-Z0-9_-]+$/, // URL parameters
+    /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i, // UUID
+    /^[A-Za-z0-9+/=]+$/, // Base64
+
+    // HTML and CSS selectors
+    /^[a-z]+(\[[^\]]+\])+$/, // CSS attribute selectors
+    /^[a-z]+:[a-z-]+$/, // CSS pseudo-selectors
+    /^[a-z]+\.[a-z0-9_-]+$/, // CSS class selectors
+    /^[a-z]+#[a-z0-9_-]+$/, // CSS ID selectors
+    /^[a-z]+\s*>\s*[a-z]+$/, // CSS child selectors
+    /^[a-z]+\s+[a-z]+$/, // CSS descendant selectors
+
+    // CSS and styling patterns
+    /^[a-z0-9-]+:[a-z0-9-]+$/, // CSS property:value
+    /^[a-z0-9-]+:[a-z0-9-]+;[a-z0-9-]+:[a-z0-9-]+$/, // Multiple CSS properties
+  ];
+
+  // File extensions and media types
+  const fileExtensionPattern =
+    /^\.(png|jpg|jpeg|gif|svg|webp|bmp|ico|pdf|mp4|webm|ogg|mp3|wav|json|xml|csv|txt|md|html|css|js|jsx|ts|tsx)$/i;
+  if (fileExtensionPattern.test(str)) {
+    return true;
+  }
+
+  // AI model and provider patterns
+  const aiRelatedPattern =
+    /^(AI|OpenAI|VertexAI|PaLM|Gemini|Anthropic|Anyscale|Databricks|Ollama|FriendliAI|Groq|DeepInfra|AI21|Replicate|OpenRouter|Azure|AWS|SageMaker|Bedrock|Mistral|Perplexity|Fireworks|Cloudflare|Workers|Voyage|claude-|gpt-|o1-|o3-)/i;
+  if (aiRelatedPattern.test(str)) {
+    return true;
+  }
+
+  // CSS units and values
+  const cssUnitsPattern =
+    /\b\d+(px|rem|em|vh|vw|vmin|vmax|ch|ex|fr|deg|rad|turn|grad|ms|s)$|^(px|rem|em|vh|vw|vmin|vmax|ch|ex|fr|deg|rad|turn|grad|ms|s)$/;
+  const cssValuesPattern =
+    /(rgb|rgba|hsl|hsla|#[0-9a-fA-F]+|solid|absolute|relative|sticky|fixed|static|block|inline|flex|grid|none|auto|hidden|visible)/;
+
+  if (cssUnitsPattern.test(str) || cssValuesPattern.test(str)) {
+    return true;
+  }
+
+  // Check for CSS class strings with brackets (common in the codebase)
+  if (
+    str.includes("[") &&
+    str.includes("]") &&
+    (str.includes("px") ||
+      str.includes("rem") ||
+      str.includes("em") ||
+      str.includes("w-") ||
+      str.includes("h-") ||
+      str.includes("p-") ||
+      str.includes("m-"))
+  ) {
+    return true;
+  }
+
+  // Check for CSS class strings with specific patterns
+  if (
+    str.includes("border-") ||
+    str.includes("rounded-") ||
+    str.includes("cursor-") ||
+    str.includes("opacity-") ||
+    str.includes("disabled:") ||
+    str.includes("hover:") ||
+    str.includes("focus-within:") ||
+    str.includes("first-of-type:") ||
+    str.includes("last-of-type:") ||
+    str.includes("group-data-")
+  ) {
+    return true;
+  }
+
+  // Check if it looks like a Tailwind class string
+  if (/^[a-z0-9-]+(\s+[a-z0-9-]+)*$/.test(str)) {
+    // Common Tailwind prefixes and patterns
+    const tailwindPrefixes = [
+      "bg-", "text-", "border-", "rounded-", "p-", "m-", "px-", "py-", "mx-", "my-",
+      "w-", "h-", "min-w-", "min-h-", "max-w-", "max-h-", "flex-", "grid-", "gap-",
+      "space-", "items-", "justify-", "self-", "col-", "row-", "order-", "object-",
+      "overflow-", "opacity-", "z-", "top-", "right-", "bottom-", "left-", "inset-",
+      "font-", "tracking-", "leading-", "list-", "placeholder-", "shadow-", "ring-",
+      "transition-", "duration-", "ease-", "delay-", "animate-", "scale-", "rotate-",
+      "translate-", "skew-", "origin-", "cursor-", "select-", "resize-", "fill-", "stroke-",
+    ];
+
+    // Check if any word in the string starts with a Tailwind prefix
+    const words = str.split(/\s+/);
+    for (const word of words) {
+      for (const prefix of tailwindPrefixes) {
+        if (word.startsWith(prefix)) {
+          return true;
+        }
+      }
+    }
+
+    // Check for Tailwind modifiers
+    const tailwindModifiers = [
+      "hover:", "focus:", "active:", "disabled:", "visited:", "first:", "last:",
+      "odd:", "even:", "group-hover:", "focus-within:", "focus-visible:", "motion-safe:",
+      "motion-reduce:", "dark:", "light:", "sm:", "md:", "lg:", "xl:", "2xl:",
+    ];
+
+    for (const word of words) {
+      for (const modifier of tailwindModifiers) {
+        if (word.includes(modifier)) {
+          return true;
+        }
+      }
+    }
+
+    // Check for CSS property combinations
+    const cssProperties = [
+      "border", "rounded", "px", "py", "mx", "my", "p", "m", "w", "h", "flex",
+      "grid", "gap", "transition", "duration", "font", "leading", "tracking",
+    ];
+
+    // If the string contains multiple CSS properties, it's likely a CSS class string
+    let cssPropertyCount = 0;
+    for (const word of words) {
+      if (
+        cssProperties.some(
+          (prop) => word === prop || word.startsWith(`${prop}-`),
+        )
+      ) {
+        cssPropertyCount += 1;
+      }
+    }
+
+    if (cssPropertyCount >= 2) {
+      return true;
+    }
+  }
+
+  // Check for specific CSS class patterns that appear in the test failures
+  if (
+    str.match(
+      /^(border|rounded|flex|grid|transition|duration|ease|hover:|focus:|active:|disabled:|placeholder:|text-|bg-|w-|h-|p-|m-|gap-|items-|justify-|self-|overflow-|cursor-|opacity-|z-|top-|right-|bottom-|left-|inset-|font-|tracking-|leading-|whitespace-|break-|truncate|shadow-|ring-|outline-|animate-|transform|rotate-|scale-|skew-|translate-|origin-|first-of-type:|last-of-type:|group-data-|max-|min-|px-|py-|mx-|my-|grow|shrink|resize-|underline|italic|normal)/,
+    )
+  ) {
+    return true;
+  }
+
+  // HTML tags and attributes
+  if (
+    /^<[a-z0-9]+(?:\s[^>]*)?>.*<\/[a-z0-9]+>$/i.test(str) ||
+    /^<[a-z0-9]+ [^>]+\/>$/i.test(str)
+  ) {
+    return true;
+  }
+
+  // Check for specific patterns in suggestions and examples
+  if (
+    str.includes("* ") &&
+    (str.includes("create a") ||
+      str.includes("build a") ||
+      str.includes("make a"))
+  ) {
+    // This is likely a suggestion or example, not a UI string
+    return false;
+  }
+
+  // Check for specific technical identifiers from the test failures
+  if (
+    /^(download_via_vscode_button_clicked|open-vscode-error-|set-indicator|settings_saved|openhands-trace-|provider-item-|last_browser_action_error)$/.test(
+      str,
+    )
+  ) {
+    return true;
+  }
+
+  // Check for URL paths and query parameters
+  if (
+    str.startsWith("?") ||
+    str.startsWith("/") ||
+    str.includes("auth.") ||
+    str.includes("$1auth.")
+  ) {
+    return true;
+  }
+
+  // Check for specific strings that should be excluded
+  if (
+    str === "Cache Hit:" ||
+    str === "Cache Write:" ||
+    str === "ADD_DOCS" ||
+    str === "ADD_DOCKERFILE" ||
+    str === "Verified" ||
+    str === "Others" ||
+    str === "Feedback" ||
+    str === "JSON File" ||
+    str === "mt-0.5 md:mt-0"
+  ) {
+    return true;
+  }
+
+  // Check for long suggestion texts
+  if (
+    str.length > 100 &&
+    (str.includes("Please write a bash script") ||
+      str.includes("Please investigate the repo") ||
+      str.includes("Please push the changes") ||
+      str.includes("Examine the dependencies") ||
+      str.includes("Investigate the documentation") ||
+      str.includes("Investigate the current repo") ||
+      str.includes("I want to create a Hello World app") ||
+      str.includes("I want to create a VueJS app") ||
+      str.includes("This should be a client-only app"))
+  ) {
+    return true;
+  }
+
+  // Check for specific error messages and UI text
+  if (
+    str === "All data associated with this project will be lost." ||
+    str === "You will lose any unsaved information." ||
+    str ===
+      "This conversation does not exist, or you do not have permission to access it." ||
+    str === "Failed to fetch settings. Please try reloading." ||
+    str ===
+      "If you tell OpenHands to start a web server, the app will appear here." ||
+    str ===
+      "Your browser doesn't support downloading files. Please use Chrome, Edge, or another browser that supports the File System Access API." ||
+    str ===
+      "Something went wrong while fetching settings. Please reload the page." ||
+    str ===
+      "To help us improve, we collect feedback from your interactions to improve our prompts. By submitting this form, you consent to us collecting this data." ||
+    str === "Please push the latest changes to the existing pull request."
+  ) {
+    return true;
+  }
+
+  // Check against all technical patterns
+  return technicalPatterns.some((pattern) => pattern.test(str));
+}
+
+function isLikelyUserFacingText(str) {
+
+  // Basic validation - skip very short strings or strings without letters
+  if (!str || str.length <= 2 || !/[a-zA-Z]/.test(str)) {
+    return false;
+  }
+
+  // Check if it's a specifically excluded technical string
+  if (isExcludedTechnicalString(str)) {
+    return false;
+  }
+
+  // Check if it looks like a code rather than a key
+  if (isLikelyCode(str)) {
+    return false
+  }
+
+  // Check if it's a raw translation key that should be wrapped in t()
+  if (isRawTranslationKey(str)) {
+    return true;
+  }
+
+  // Check if it's a translation key pattern (e.g., "SETTINGS$BASE_URL")
+  // These should be wrapped in t() or use I18nKey enum
+  if (isLikelyTranslationKey(str) && /^[A-Z0-9_]+\$[A-Z0-9_]+$/.test(str)) {
+    return true;
+  }
+
+  // First, check if it's a common development string (not user-facing)
+  if (isCommonDevelopmentString(str)) {
+    return false;
+  }
+
+  // Multi-word phrases are likely UI text
+  const hasMultipleWords = /\s+/.test(str) && str.split(/\s+/).length > 1;
+
+  // Sentences and questions are likely UI text
+  const hasPunctuation = /[?!.,:]/.test(str);
+  const isCapitalizedPhrase = /^[A-Z]/.test(str) && hasMultipleWords;
+  const isTitleCase = hasMultipleWords && /\s[A-Z]/.test(str);
+  const hasSentenceStructure = /^[A-Z].*[.!?]$/.test(str); // Starts with capital, ends with punctuation
+  const hasQuestionForm =
+    /^(What|How|Why|When|Where|Who|Can|Could|Would|Will|Is|Are|Do|Does|Did|Should|May|Might)/.test(
+      str,
+    );
+
+  // Product names and camelCase identifiers are likely UI text
+  const hasInternalCapitals = /[a-z][A-Z]/.test(str); // CamelCase product names
+
+  // Instruction text patterns are likely UI text
+  const looksLikeInstruction =
+    /^(Enter|Type|Select|Choose|Provide|Specify|Search|Find|Input|Add|Write|Describe|Set|Pick|Browse|Upload|Download|Click|Tap|Press|Go to|Visit|Open|Close)/i.test(
+      str,
+    );
+
+  // Error and status messages are likely UI text
+  const looksLikeErrorOrStatus =
+    /(failed|error|invalid|required|missing|incorrect|wrong|unavailable|not found|not available|try again|success|completed|finished|done|saved|updated|created|deleted|removed|added)/i.test(
+      str,
+    );
+
+  // Single word check - assume it's UI text unless proven otherwise
+  const isSingleWord =
+    !str.includes(" ") && str.length > 1 && /^[a-zA-Z]+$/.test(str);
+
+  // For single words, we need to be more careful
+  if (isSingleWord) {
+    // Skip common programming terms and variable names
+    const isCommonProgrammingTerm =
+      /^(null|undefined|true|false|function|class|interface|type|enum|const|let|var|return|import|export|default|async|await|try|catch|finally|throw|new|this|super|extends|implements|instanceof|typeof|void|delete|in|of|for|while|do|if|else|switch|case|break|continue|yield|static|get|set|public|private|protected|readonly|abstract|implements|namespace|module|declare|as|from|with)$/i.test(
+        str,
+      );
+
+    if (isCommonProgrammingTerm) {
+      return false;
+    }
+
+    // Skip common variable name patterns
+    const looksLikeVariableName =
+      /^[a-z][a-zA-Z0-9]*$/.test(str) && str.length <= 20;
+
+    if (looksLikeVariableName) {
+      return false;
+    }
+
+    // Skip common CSS values
+    const isCommonCssValue =
+      /^(auto|none|hidden|visible|block|inline|flex|grid|row|column|wrap|nowrap|center|start|end|stretch|cover|contain|fixed|absolute|relative|static|sticky|pointer|default|inherit|initial|unset)$/i.test(
+        str,
+      );
+
+    if (isCommonCssValue) {
+      return false;
+    }
+
+    // Skip common file extensions
+    const isFileExtension = /^\.[a-z0-9]+$/i.test(str);
+    if (isFileExtension) {
+      return false;
+    }
+
+    // Skip common abbreviations
+    const isCommonAbbreviation =
+      /^(id|src|href|url|alt|img|btn|nav|div|span|ul|li|ol|dl|dt|dd|svg|png|jpg|gif|pdf|doc|txt|md|js|ts|jsx|tsx|css|scss|less|html|xml|json|yaml|yml|toml|csv|mp3|mp4|wav|avi|mov|mpeg|webm|webp|ttf|woff|eot|otf)$/i.test(
+        str,
+      );
+
+    if (isCommonAbbreviation) {
+      return false;
+    }
+
+    // If it's a single word that's not a programming term, variable name, CSS value, file extension, or abbreviation,
+    // it might be UI text, but we'll be conservative and return false
+    return false;
+  }
+
+  // If it has multiple words, punctuation, or looks like a sentence, it's likely UI text
+  return (
+    hasMultipleWords ||
+    hasPunctuation ||
+    isCapitalizedPhrase ||
+    isTitleCase ||
+    hasSentenceStructure ||
+    hasQuestionForm ||
+    hasInternalCapitals ||
+    looksLikeInstruction ||
+    looksLikeErrorOrStatus
+  );
+}
+
+function isInTranslationContext(path) {
+  // Check if the JSX text is inside a <Trans> component
+  let current = path;
+  while (current.parentPath) {
+    if (
+      current.isJSXElement() &&
+      current.node.openingElement &&
+      current.node.openingElement.name &&
+      current.node.openingElement.name.name === "Trans"
+    ) {
+      return true;
+    }
+    current = current.parentPath;
+  }
+  return false;
+}
+
+function scanFileForUnlocalizedStrings(filePath) {
+  // Skip suggestion content files as they contain special strings that are already properly localized
+  if (filePath.includes("utils/suggestions/") || filePath.includes("mocks/task-suggestions-handlers.ts")) {
+    return [];
+  }
+
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    const unlocalizedStrings = [];
+
+    // Skip files that are too large
+    if (content.length > 1000000) {
+      console.warn(`Skipping large file: ${filePath}`);
+      return [];
+    }
+
+    try {
+      // Parse the file
+      const ast = parser.parse(content, {
+        sourceType: "module",
+        plugins: ["jsx", "typescript", "classProperties", "decorators-legacy"],
+      });
+
+      // Traverse the AST
+      traverse(ast, {
+        // Find JSX text content
+        JSXText(jsxTextPath) {
+          const text = jsxTextPath.node.value.trim();
+          if (
+            text &&
+            isLikelyUserFacingText(text) &&
+            !isInTranslationContext(jsxTextPath)
+          ) {
+            unlocalizedStrings.push(text);
+          }
+        },
+
+        // Find string literals in JSX attributes
+        JSXAttribute(jsxAttrPath) {
+          const attrName = jsxAttrPath.node.name.name.toString();
+
+          // Skip technical attributes that don't contain user-facing text
+          if (NON_TEXT_ATTRIBUTES.includes(attrName)) {
+            return;
+          }
+
+          // Skip styling attributes
+          if (
+            attrName === "className" ||
+            attrName === "class" ||
+            attrName === "style"
+          ) {
+            return;
+          }
+
+          // Skip data attributes and event handlers
+          if (attrName.startsWith("data-") || attrName.startsWith("on")) {
+            return;
+          }
+
+          // Check the attribute value
+          const value = jsxAttrPath.node.value;
+          if (value && value.type === "StringLiteral") {
+            const text = value.value.trim();
+            if (text && isLikelyUserFacingText(text)) {
+              unlocalizedStrings.push(text);
+            }
+          }
+        },
+
+        // Find string literals in code
+        StringLiteral(stringPath) {
+          // Skip if parent is JSX attribute (already handled above)
+          if (stringPath.parent.type === "JSXAttribute") {
+            return;
+          }
+
+          // Skip if parent is import/export declaration
+          if (
+            stringPath.parent.type === "ImportDeclaration" ||
+            stringPath.parent.type === "ExportDeclaration"
+          ) {
+            return;
+          }
+
+          // Skip if parent is object property key
+          if (
+            stringPath.parent.type === "ObjectProperty" &&
+            stringPath.parent.key === stringPath.node
+          ) {
+            return;
+          }
+
+          // Skip if inside a t() call or Trans component
+          let isInsideTranslation = false;
+          let current = stringPath;
+
+          while (current.parentPath && !isInsideTranslation) {
+            // Check for t() function call
+            if (
+              current.parent.type === "CallExpression" &&
+              current.parent.callee &&
+              ((current.parent.callee.type === "Identifier" &&
+                current.parent.callee.name === "t") ||
+                (current.parent.callee.type === "MemberExpression" &&
+                  current.parent.callee.property &&
+                  current.parent.callee.property.name === "t"))
+            ) {
+              isInsideTranslation = true;
+              break;
+            }
+
+            // Check for <Trans> component
+            if (
+              current.parent.type === "JSXElement" &&
+              current.parent.openingElement &&
+              current.parent.openingElement.name &&
+              current.parent.openingElement.name.name === "Trans"
+            ) {
+              isInsideTranslation = true;
+              break;
+            }
+
+            current = current.parentPath;
+          }
+
+          if (!isInsideTranslation) {
+            const text = stringPath.node.value.trim();
+            if (text && isLikelyUserFacingText(text)) {
+              unlocalizedStrings.push(text);
+            }
+          }
+        },
+      });
+
+      return unlocalizedStrings;
+    } catch (error) {
+      console.error(`Error parsing file ${filePath}:`, error);
+      return [];
+    }
+  } catch (error) {
+    console.error(`Error reading file ${filePath}:`, error);
+    return [];
+  }
+}
+
+function scanDirectoryForUnlocalizedStrings(dirPath) {
+  const results = new Map();
+
+  function scanDir(currentPath) {
+    const entries = fs.readdirSync(currentPath, { withFileTypes: true });
+
+    for (const entry of entries) {
+      const fullPath = path.join(currentPath, entry.name);
+
+      if (!shouldIgnorePath(fullPath)) {
+        if (entry.isDirectory()) {
+          scanDir(fullPath);
+        } else if (
+          entry.isFile() &&
+          SCAN_EXTENSIONS.includes(path.extname(fullPath))
+        ) {
+          const unlocalized = scanFileForUnlocalizedStrings(fullPath);
+          if (unlocalized.length > 0) {
+            results.set(fullPath, unlocalized);
+          }
+        }
+      }
+    }
+  }
+
+  scanDir(dirPath);
+  return results;
+}
+
+// Run the check
+try {
+  const srcPath = path.resolve(__dirname, '../src');
+  console.log('Checking for unlocalized strings in frontend code...');
+
+  // Get unlocalized strings using the AST scanner
+  const results = scanDirectoryForUnlocalizedStrings(srcPath);
+
+  // If we found any unlocalized strings, format them for output and exit with error
+  if (results.size > 0) {
+    const formattedResults = Array.from(results.entries())
+      .map(([file, strings]) => `\n${file}:\n  ${strings.join('\n  ')}`)
+      .join('\n');
+
+    console.error(`Error: Found unlocalized strings in the following files:${formattedResults}`);
+    process.exit(1);
+  }
+
+  console.log('✅ No unlocalized strings found in frontend code.');
+  process.exit(0);
+} catch (error) {
+  console.error('Error running unlocalized strings check:', error);
+  process.exit(1);
+}
@@ -477,36 +477,6 @@ class OpenHands {

    return data.prompt;
  }
-
-  static async updateConversation(
-    conversationId: string,
-    updates: { title: string },
-  ): Promise<boolean> {
-    const { data } = await openHands.patch<boolean>(
-      `/api/conversations/${conversationId}`,
-      updates,
-    );
-
-    return data;
-  }
-
-  /**
-   * Get the GitHub user installation IDs
-   * @returns List of GitHub installation IDs
-   */
-  static async getGitHubUserInstallationIds(): Promise<string[]> {
-    const { data } = await openHands.get<string[]>("/github/installations");
-    return data;
-  }
-
-  /**
-   * Get the BitBucket workspaces
-   * @returns List of BitBucket workspaces
-   */
-  static async getBitBucketWorkspaces(): Promise<string[]> {
-    const { data } = await openHands.get<string[]>("/bitbucket/installations");
-    return data;
-  }
 }

 export default OpenHands;
@@ -50,11 +50,9 @@ export interface GetConfigResponse {
  GITHUB_CLIENT_ID: string;
  POSTHOG_CLIENT_KEY: string;
  STRIPE_PUBLISHABLE_KEY?: string;
-  PROVIDERS_CONFIGURED?: Provider[];
  FEATURE_FLAGS: {
    ENABLE_BILLING: boolean;
    HIDE_LLM_SETTINGS: boolean;
-    HIDE_MICROAGENT_MANAGEMENT?: boolean;
  };
 }

@@ -19,11 +19,8 @@ export function ActionSuggestions({
  const [hasPullRequest, setHasPullRequest] = React.useState(false);

  const providersAreSet = providers.length > 0;
-
-  // Use the git_provider from the conversation, not the user's authenticated providers
-  const currentGitProvider = conversation?.git_provider;
-  const isGitLab = currentGitProvider === "gitlab";
-  const isBitbucket = currentGitProvider === "bitbucket";
+  const isGitLab = providers.includes("gitlab");
+  const isBitbucket = providers.includes("bitbucket");

  const pr = isGitLab ? "merge request" : "pull request";
  const prShort = isGitLab ? "MR" : "PR";
@@ -1,7 +1,6 @@
 import React from "react";
 import Markdown from "react-markdown";
 import remarkGfm from "remark-gfm";
-import remarkBreaks from "remark-breaks";
 import { code } from "../markdown/code";
 import { cn } from "#/utils/utils";
 import { ul, ol } from "../markdown/list";
@@ -86,19 +85,21 @@ export function ChatMessage({
        />
      </div>

-      <div className="text-sm break-words">
-        <Markdown
-          components={{
-            code,
-            ul,
-            ol,
-            a: anchor,
-            p: paragraph,
-          }}
-          remarkPlugins={[remarkGfm, remarkBreaks]}
-        >
-          {message}
-        </Markdown>
+      <div className="text-sm break-words flex">
+        <div>
+          <Markdown
+            components={{
+              code,
+              ul,
+              ol,
+              a: anchor,
+              p: paragraph,
+            }}
+            remarkPlugins={[remarkGfm]}
+          >
+            {message}
+          </Markdown>
+        </div>
      </div>
      {children}
    </article>
@@ -1,7 +1,6 @@
 import React from "react";
 import Markdown from "react-markdown";
 import remarkGfm from "remark-gfm";
-import remarkBreaks from "remark-breaks";
 import { useTranslation } from "react-i18next";
 import { code } from "../markdown/code";
 import { ol, ul } from "../markdown/list";
@@ -47,7 +46,7 @@ export function ErrorMessage({ errorId, defaultMessage }: ErrorMessageProps) {
            ul,
            ol,
          }}
-          remarkPlugins={[remarkGfm, remarkBreaks]}
+          remarkPlugins={[remarkGfm]}
        >
          {defaultMessage}
        </Markdown>
@@ -164,7 +164,7 @@ export function EventMessage({
    const message = parseMessageFromEvent(event);

    return (
-      <>
+      <div className="flex flex-col self-end">
        <ChatMessage type={event.source} message={message} actions={actions}>
          {event.args.image_urls && event.args.image_urls.length > 0 && (
            <ImageCarousel size="small" images={event.args.image_urls} />
@@ -184,7 +184,7 @@ export function EventMessage({
        {isAssistantMessage(event) &&
          event.action === "message" &&
          renderLikertScale()}
-      </>
+      </div>
    );
  }

@@ -4,7 +4,6 @@ import { Trans, useTranslation } from "react-i18next";
 import Markdown from "react-markdown";
 import { Link } from "react-router";
 import remarkGfm from "remark-gfm";
-import remarkBreaks from "remark-breaks";
 import { useConfig } from "#/hooks/query/use-config";
 import { I18nKey } from "#/i18n/declaration";
 import ArrowDown from "#/icons/angle-down-solid.svg?react";
@@ -200,7 +199,7 @@ export function ExpandableMessage({
                ol,
                p: paragraph,
              }}
-              remarkPlugins={[remarkGfm, remarkBreaks]}
+              remarkPlugins={[remarkGfm]}
            >
              {details}
            </Markdown>
@@ -1,7 +1,6 @@
 import React from "react";
 import Markdown from "react-markdown";
 import remarkGfm from "remark-gfm";
-import remarkBreaks from "remark-breaks";
 import { code } from "../markdown/code";
 import { ol, ul } from "../markdown/list";
 import ArrowDown from "#/icons/angle-down-solid.svg?react";
@@ -53,7 +52,7 @@ export function GenericEventMessage({
              ul,
              ol,
            }}
-            remarkPlugins={[remarkGfm, remarkBreaks]}
+            remarkPlugins={[remarkGfm]}
          >
            {details}
          </Markdown>
@@ -17,12 +17,8 @@ export function BudgetUsageText({
  return (
    <div className="flex justify-end">
      <span className="text-xs text-neutral-400">
-        {t(I18nKey.CONVERSATION$BUDGET_USAGE_FORMAT, {
-          currentCost: `$${currentCost.toFixed(4)}`,
-          maxBudget: `$${maxBudget.toFixed(4)}`,
-          usagePercentage: usagePercentage.toFixed(2),
-          used: t(I18nKey.CONVERSATION$USED),
-        })}
+        ${currentCost.toFixed(4)} / ${maxBudget.toFixed(4)} (
+        {usagePercentage.toFixed(2)}% {t(I18nKey.CONVERSATION$USED)})
      </span>
    </div>
  );
@@ -330,15 +330,11 @@ export function ConversationCard({
                    </div>

                    <div className="grid grid-cols-2 gap-2 pl-4 text-sm">
-                      <span className="text-neutral-400">
-                        {t(I18nKey.CONVERSATION$CACHE_HIT)}
-                      </span>
+                      <span className="text-neutral-400">Cache Hit:</span>
                      <span className="text-right">
                        {metrics.usage.cache_read_tokens.toLocaleString()}
                      </span>
-                      <span className="text-neutral-400">
-                        {t(I18nKey.CONVERSATION$CACHE_WRITE)}
-                      </span>
+                      <span className="text-neutral-400">Cache Write:</span>
                      <span className="text-right">
                        {metrics.usage.cache_write_tokens.toLocaleString()}
                      </span>
@@ -12,8 +12,6 @@ import { LoadingSpinner } from "#/components/shared/loading-spinner";
 import { ExitConversationModal } from "./exit-conversation-modal";
 import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
 import { Provider } from "#/types/settings";
-import { useUpdateConversation } from "#/hooks/mutation/use-update-conversation";
-import { displaySuccessToast } from "#/utils/custom-toast-handlers";

 interface ConversationPanelProps {
  onClose: () => void;
@@ -41,7 +39,6 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {

  const { mutate: deleteConversation } = useDeleteConversation();
  const { mutate: stopConversation } = useStopConversation();
-  const { mutate: updateConversation } = useUpdateConversation();

  const handleDeleteProject = (conversationId: string) => {
    setConfirmDeleteModalVisible(true);
@@ -53,20 +50,6 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
    setSelectedConversationId(conversationId);
  };

-  const handleConversationTitleChange = async (
-    conversationId: string,
-    newTitle: string,
-  ) => {
-    updateConversation(
-      { conversationId, newTitle },
-      {
-        onSuccess: () => {
-          displaySuccessToast(t(I18nKey.CONVERSATION$TITLE_UPDATED));
-        },
-      },
-    );
-  };
-
  const handleConfirmDelete = () => {
    if (selectedConversationId) {
      deleteConversation(
@@ -131,9 +114,6 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
              isActive={isActive}
              onDelete={() => handleDeleteProject(project.conversation_id)}
              onStop={() => handleStopConversation(project.conversation_id)}
-              onChangeTitle={(title) =>
-                handleConversationTitleChange(project.conversation_id, title)
-              }
              title={project.title}
              selectedRepository={{
                selected_repository: project.selected_repository,
@@ -1,98 +0,0 @@
-import { DiGit } from "react-icons/di";
-import { FaServer, FaExternalLinkAlt } from "react-icons/fa";
-import { useSelector } from "react-redux";
-import { useTranslation } from "react-i18next";
-import { VscCode } from "react-icons/vsc";
-import { Container } from "#/components/layout/container";
-import { I18nKey } from "#/i18n/declaration";
-import { RootState } from "#/store";
-import { RUNTIME_INACTIVE_STATES } from "#/types/agent-state";
-import { ServedAppLabel } from "#/components/layout/served-app-label";
-import { TabContent } from "#/components/layout/tab-content";
-import { transformVSCodeUrl } from "#/utils/vscode-url-helper";
-import { useConversationId } from "#/hooks/use-conversation-id";
-import GlobeIcon from "#/icons/globe.svg?react";
-import JupyterIcon from "#/icons/jupyter.svg?react";
-import OpenHands from "#/api/open-hands";
-import TerminalIcon from "#/icons/terminal.svg?react";
-
-export function ConversationTabs() {
-  const { curAgentState } = useSelector((state: RootState) => state.agent);
-
-  const { conversationId } = useConversationId();
-
-  const { t } = useTranslation();
-
-  const basePath = `/conversations/${conversationId}`;
-
-  return (
-    <Container
-      className="h-full w-full"
-      labels={[
-        {
-          label: "Changes",
-          to: "",
-          icon: <DiGit className="w-6 h-6" />,
-        },
-        {
-          label: (
-            <div className="flex items-center gap-1">
-              {t(I18nKey.VSCODE$TITLE)}
-            </div>
-          ),
-          to: "vscode",
-          icon: <VscCode className="w-5 h-5" />,
-          rightContent: !RUNTIME_INACTIVE_STATES.includes(curAgentState) ? (
-            <FaExternalLinkAlt
-              className="w-3 h-3 text-neutral-400 cursor-pointer"
-              onClick={async (e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                if (conversationId) {
-                  try {
-                    const data = await OpenHands.getVSCodeUrl(conversationId);
-                    if (data.vscode_url) {
-                      const transformedUrl = transformVSCodeUrl(
-                        data.vscode_url,
-                      );
-                      if (transformedUrl) {
-                        window.open(transformedUrl, "_blank");
-                      }
-                    }
-                  } catch (err) {
-                    // Silently handle the error
-                  }
-                }
-              }}
-            />
-          ) : null,
-        },
-        {
-          label: t(I18nKey.WORKSPACE$TERMINAL_TAB_LABEL),
-          to: "terminal",
-          icon: <TerminalIcon />,
-        },
-        { label: "Jupyter", to: "jupyter", icon: <JupyterIcon /> },
-        {
-          label: <ServedAppLabel />,
-          to: "served",
-          icon: <FaServer />,
-        },
-        {
-          label: (
-            <div className="flex items-center gap-1">
-              {t(I18nKey.BROWSER$TITLE)}
-            </div>
-          ),
-          to: "browser",
-          icon: <GlobeIcon />,
-        },
-      ]}
-    >
-      {/* Use both Outlet and TabContent */}
-      <div className="h-full w-full">
-        <TabContent conversationPath={basePath} />
-      </div>
-    </Container>
-  );
-}
@@ -1,6 +1,5 @@
 import React, { useState, useEffect, useContext } from "react";
 import { useTranslation } from "react-i18next";
-import { FaStar } from "react-icons/fa";
 import { cn } from "#/utils/utils";
 import { I18nKey } from "#/i18n/declaration";
 import { useSubmitConversationFeedback } from "#/hooks/mutation/use-submit-conversation-feedback";
@@ -208,7 +207,7 @@ export function LikertScale({
              className={cn("text-xl transition-all", getButtonClass(rating))}
              aria-label={`Rate ${rating} stars`}
            >
-              <FaStar />
+              ★
            </button>
          ))}
          {/* Show selected reason inline with stars when submitted (only for ratings <= 3) */}
@@ -10,9 +10,6 @@ import { BrandButton } from "../settings/brand-button";
 import { useSearchRepositories } from "#/hooks/query/use-search-repositories";
 import { useDebounce } from "#/hooks/use-debounce";
 import { sanitizeQuery } from "#/utils/sanitize-query";
-import { useUserProviders } from "#/hooks/use-user-providers";
-import { Provider } from "#/types/settings";
-import { SettingsDropdownInput } from "../settings/settings-dropdown-input";
 import {
  RepositoryDropdown,
  RepositoryLoadingState,
@@ -35,10 +32,8 @@ export function RepositorySelectionForm({
  const [selectedBranch, setSelectedBranch] = React.useState<Branch | null>(
    null,
  );
-  const [selectedProvider, setSelectedProvider] = React.useState<Provider | null>(null);
  // Add a ref to track if the branch was manually cleared by the user
  const branchManuallyClearedRef = React.useRef<boolean>(false);
-  const { providers } = useUserProviders();
  const {
    data: repositories,
    isLoading: isLoadingRepositories,
@@ -61,13 +56,6 @@ export function RepositorySelectionForm({
  const debouncedSearchQuery = useDebounce(searchQuery, 300);
  const { data: searchedRepos } = useSearchRepositories(debouncedSearchQuery);

-  // Auto-select provider if there's only one
-  React.useEffect(() => {
-    if (providers.length === 1 && !selectedProvider) {
-      setSelectedProvider(providers[0]);
-    }
-  }, [providers, selectedProvider]);
-
  // Auto-select main or master branch if it exists, but only if the branch wasn't manually cleared
  React.useEffect(() => {
    if (
@@ -95,10 +83,8 @@ export function RepositorySelectionForm({
  const isCreatingConversation =
    isPending || isSuccess || isCreatingConversationElsewhere;

-  // Use all repositories without filtering by provider for now
  const allRepositories = repositories?.concat(searchedRepos || []);
-
-  const repositoriesItems = (allRepositories || []).map((repo) => ({
+  const repositoriesItems = allRepositories?.map((repo) => ({
    key: repo.id,
    label: decodeURIComponent(repo.full_name),
  }));
@@ -108,14 +94,6 @@ export function RepositorySelectionForm({
    label: branch.name,
  }));

-  // Create provider dropdown items
-  const providerItems = React.useMemo(() => {
-    return providers.map(provider => ({
-      key: provider,
-      label: provider.charAt(0).toUpperCase() + provider.slice(1), // Capitalize first letter
-    }));
-  }, [providers]);
-
  const handleRepoSelection = (key: React.Key | null) => {
    const selectedRepo = allRepositories?.find((repo) => repo.id === key);
    if (selectedRepo) onRepoSelection(selectedRepo);
@@ -124,14 +102,6 @@ export function RepositorySelectionForm({
    branchManuallyClearedRef.current = false; // Reset the flag when repo changes
  };

-  const handleProviderSelection = (key: React.Key | null) => {
-    const provider = key as Provider | null;
-    setSelectedProvider(provider);
-    setSelectedRepository(null); // Reset repository selection when provider changes
-    setSelectedBranch(null); // Reset branch selection when provider changes
-    onRepoSelection(null); // Reset parent component's selected repo
-  };
-
  const handleBranchSelection = (key: React.Key | null) => {
    const selectedBranchObj = branches?.find((branch) => branch.name === key);
    setSelectedBranch(selectedBranchObj || null);
@@ -163,26 +133,6 @@ export function RepositorySelectionForm({
    }
  };

-  // Render the provider dropdown
-  const renderProviderSelector = () => {
-    // Only render if there are multiple providers
-    if (providers.length <= 1) {
-      return null;
-    }
-
-    return (
-      <SettingsDropdownInput
-        testId="provider-dropdown"
-        name="provider-dropdown"
-        placeholder="Select Provider"
-        items={providerItems}
-        wrapperClassName="max-w-[500px]"
-        onSelectionChange={handleProviderSelection}
-        selectedKey={selectedProvider || undefined}
-      />
-    );
-  };
-
  // Render the appropriate UI based on the loading/error state
  const renderRepositorySelector = () => {
    if (isLoadingRepositories) {
@@ -193,15 +143,11 @@ export function RepositorySelectionForm({
      return <RepositoryErrorState />;
    }

-    // For now, don't disable the repo dropdown based on provider selection
-    const isDisabled = false;
-
    return (
      <RepositoryDropdown
        items={repositoriesItems || []}
        onSelectionChange={handleRepoSelection}
        onInputChange={handleRepoInputChange}
-        isDisabled={isDisabled}
        defaultFilter={(textValue, inputValue) => {
          if (!inputValue) return true;

@@ -249,8 +195,8 @@ export function RepositorySelectionForm({

  return (
    <div className="flex flex-col gap-4">
-      {renderProviderSelector()}
      {renderRepositorySelector()}
+
      {renderBranchSelector()}

      <BrandButton
@@ -8,7 +8,6 @@ export interface RepositoryDropdownProps {
  onSelectionChange: (key: React.Key | null) => void;
  onInputChange: (value: string) => void;
  defaultFilter?: (textValue: string, inputValue: string) => boolean;
-  isDisabled?: boolean;
 }

 export function RepositoryDropdown({
@@ -16,7 +15,6 @@ export function RepositoryDropdown({
  onSelectionChange,
  onInputChange,
  defaultFilter,
-  isDisabled = false,
 }: RepositoryDropdownProps) {
  const { t } = useTranslation();

@@ -24,13 +22,12 @@ export function RepositoryDropdown({
    <SettingsDropdownInput
      testId="repo-dropdown"
      name="repo-dropdown"
-      placeholder={isDisabled ? t("Please select a provider first") : t(I18nKey.REPOSITORY$SELECT_REPO)}
+      placeholder={t(I18nKey.REPOSITORY$SELECT_REPO)}
      items={items}
      wrapperClassName="max-w-[500px]"
      onSelectionChange={onSelectionChange}
      onInputChange={onInputChange}
      defaultFilter={defaultFilter}
-      isDisabled={isDisabled}
    />
  );
 }
@@ -1,5 +1,4 @@
 import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router";
 import { SuggestedTask } from "./task.types";
 import { useIsCreatingConversation } from "#/hooks/use-is-creating-conversation";
 import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
@@ -25,25 +24,17 @@ export function TaskCard({ task }: TaskCardProps) {
  const { mutate: createConversation, isPending } = useCreateConversation();
  const isCreatingConversation = useIsCreatingConversation();
  const { t } = useTranslation();
-  const navigate = useNavigate();

  const handleLaunchConversation = () => {
    setOptimisticUserMessage(t("TASK$ADDRESSING_TASK"));

-    return createConversation(
-      {
-        repository: {
-          name: task.repo,
-          gitProvider: task.git_provider,
-        },
-        suggestedTask: task,
+    return createConversation({
+      repository: {
+        name: task.repo,
+        gitProvider: task.git_provider,
      },
-      {
-        onSuccess: (data) => {
-          navigate(`/conversations/${data.conversation_id}`);
-        },
-      },
-    );
+      suggestedTask: task,
+    });
  };

  // Determine the correct URL format based on git provider
@@ -1,11 +1,9 @@
 import React from "react";
 import { useSelector } from "react-redux";
-import { useTranslation } from "react-i18next";
 import { RootState } from "#/store";
 import { useScrollToBottom } from "#/hooks/use-scroll-to-bottom";
 import { JupyterCell } from "./jupyter-cell";
 import { ScrollToBottomButton } from "#/components/shared/buttons/scroll-to-bottom-button";
-import { RUNTIME_INACTIVE_STATES } from "#/types/agent-state";

 interface JupyterEditorProps {
  maxWidth: number;
@@ -13,43 +11,28 @@ interface JupyterEditorProps {

 export function JupyterEditor({ maxWidth }: JupyterEditorProps) {
  const cells = useSelector((state: RootState) => state.jupyter?.cells ?? []);
-  const { curAgentState } = useSelector((state: RootState) => state.agent);
-
  const jupyterRef = React.useRef<HTMLDivElement>(null);

-  const { t } = useTranslation();
-
-  const isRuntimeInactive = RUNTIME_INACTIVE_STATES.includes(curAgentState);
-
  const { hitBottom, scrollDomToBottom, onChatBodyScroll } =
    useScrollToBottom(jupyterRef);

  return (
-    <>
-      {isRuntimeInactive && (
-        <div className="w-full h-full flex items-center text-center justify-center text-2xl text-tertiary-light">
-          {t("DIFF_VIEWER$WAITING_FOR_RUNTIME")}
+    <div className="flex-1 h-full flex flex-col" style={{ maxWidth }}>
+      <div
+        data-testid="jupyter-container"
+        className="flex-1 overflow-y-auto fast-smooth-scroll"
+        ref={jupyterRef}
+        onScroll={(e) => onChatBodyScroll(e.currentTarget)}
+      >
+        {cells.map((cell, index) => (
+          <JupyterCell key={index} cell={cell} />
+        ))}
+      </div>
+      {!hitBottom && (
+        <div className="sticky bottom-2 flex items-center justify-center">
+          <ScrollToBottomButton onClick={scrollDomToBottom} />
        </div>
      )}
-      {!isRuntimeInactive && (
-        <div className="flex-1 h-full flex flex-col" style={{ maxWidth }}>
-          <div
-            data-testid="jupyter-container"
-            className="flex-1 overflow-y-auto fast-smooth-scroll"
-            ref={jupyterRef}
-            onScroll={(e) => onChatBodyScroll(e.currentTarget)}
-          >
-            {cells.map((cell, index) => (
-              <JupyterCell key={index} cell={cell} />
-            ))}
-          </div>
-          {!hitBottom && (
-            <div className="sticky bottom-2 flex items-center justify-center">
-              <ScrollToBottomButton onClick={scrollDomToBottom} />
-            </div>
-          )}
-        </div>
-      )}
-    </>
+    </div>
  );
 }
@@ -1,29 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { useDispatch, useSelector } from "react-redux";
-import { I18nKey } from "#/i18n/declaration";
-import { setAddMicroagentModalVisible } from "#/state/microagent-management-slice";
-import { RootState } from "#/store";
-
-export function MicroagentManagementAddMicroagentButton() {
-  const { t } = useTranslation();
-
-  const { addMicroagentModalVisible } = useSelector(
-    (state: RootState) => state.microagentManagement,
-  );
-
-  const dispatch = useDispatch();
-
-  const handleClick = () => {
-    dispatch(setAddMicroagentModalVisible(!addMicroagentModalVisible));
-  };
-
-  return (
-    <button
-      type="button"
-      className="text-sm font-normal text-[#8480FF] cursor-pointer"
-      onClick={handleClick}
-    >
-      {t(I18nKey.COMMON$ADD_MICROAGENT)}
-    </button>
-  );
-}
@@ -1,148 +0,0 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useSelector } from "react-redux";
-import { FaCircleInfo } from "react-icons/fa6";
-import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
-import { ModalBody } from "#/components/shared/modals/modal-body";
-import { BrandButton } from "../settings/brand-button";
-import { I18nKey } from "#/i18n/declaration";
-import { RootState } from "#/store";
-import XIcon from "#/icons/x.svg?react";
-import { cn } from "#/utils/utils";
-import { BadgeInput } from "#/components/shared/inputs/badge-input";
-
-interface MicroagentManagementAddMicroagentModalProps {
-  onConfirm: () => void;
-  onCancel: () => void;
-}
-
-export function MicroagentManagementAddMicroagentModal({
-  onConfirm,
-  onCancel,
-}: MicroagentManagementAddMicroagentModalProps) {
-  const { t } = useTranslation();
-
-  const [triggers, setTriggers] = useState<string[]>([]);
-
-  const { selectedRepository } = useSelector(
-    (state: RootState) => state.microagentManagement,
-  );
-
-  const modalTitle = selectedRepository
-    ? `${t(I18nKey.MICROAGENT_MANAGEMENT$ADD_A_MICROAGENT_TO)} ${selectedRepository}`
-    : t(I18nKey.MICROAGENT_MANAGEMENT$ADD_A_MICROAGENT);
-
-  const onSubmit = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-  };
-
-  return (
-    <ModalBackdrop>
-      <ModalBody className="items-start rounded-[12px] p-6 min-w-[611px]">
-        <div className="flex flex-col gap-2 w-full">
-          <div className="flex justify-between items-center">
-            <div className="flex items-center gap-2">
-              <h2 className="text-white text-xl font-medium">{modalTitle}</h2>
-              <a
-                href="https://docs.all-hands.dev/usage/prompting/microagents-overview#microagents-overview"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <FaCircleInfo className="text-primary" />
-              </a>
-            </div>
-            <button type="button" onClick={onCancel} className="cursor-pointer">
-              <XIcon width={24} height={24} color="#F9FBFE" />
-            </button>
-          </div>
-          <span className="text-white text-sm font-normal">
-            {t(I18nKey.MICROAGENT_MANAGEMENT$ADD_MICROAGENT_MODAL_DESCRIPTION)}
-          </span>
-        </div>
-        <form
-          data-testid="add-microagent-modal"
-          onSubmit={onSubmit}
-          className="flex flex-col gap-6 w-full"
-        >
-          <label
-            htmlFor="query-input"
-            className="flex flex-col gap-2 w-full text-sm font-normal"
-          >
-            {t(I18nKey.MICROAGENT_MANAGEMENT$WHAT_TO_DO)}
-            <textarea
-              required
-              data-testid="query-input"
-              name="query-input"
-              placeholder={t(I18nKey.MICROAGENT_MANAGEMENT$DESCRIBE_WHAT_TO_DO)}
-              rows={6}
-              className={cn(
-                "bg-tertiary border border-[#717888] bg-[#454545] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt resize-none",
-                "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
-              )}
-            />
-            <div className="flex items-center gap-2 text-[11px] font-normal text-white leading-[16px]">
-              <span className="font-semibold">
-                {t(I18nKey.COMMON$FOR_EXAMPLE)}:
-              </span>
-              <span className="underline">
-                {t(I18nKey.COMMON$TEST_DB_MIGRATION)}
-              </span>
-              <span className="underline">{t(I18nKey.COMMON$RUN_TEST)}</span>
-              <span className="underline">{t(I18nKey.COMMON$RUN_APP)}</span>
-              <span className="underline">
-                {t(I18nKey.COMMON$LEARN_FILE_STRUCTURE)}
-              </span>
-            </div>
-          </label>
-          <label
-            htmlFor="trigger-input"
-            className="flex flex-col gap-2.5 w-full text-sm"
-          >
-            <div className="flex items-center gap-2">
-              {t(I18nKey.MICROAGENT_MANAGEMENT$ADD_TRIGGERS)}
-              <a
-                href="https://docs.all-hands.dev/usage/prompting/microagents-keyword"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <FaCircleInfo className="text-primary" />
-              </a>
-            </div>
-            <BadgeInput
-              name="trigger-input"
-              value={triggers}
-              placeholder={t("MICROAGENT$TYPE_TRIGGER_SPACE")}
-              onChange={setTriggers}
-            />
-            <span className="text-xs text-[#ffffff80] font-normal">
-              {t(
-                I18nKey.MICROAGENT_MANAGEMENT$HELP_TEXT_DESCRIBING_VALID_TRIGGERS,
-              )}
-            </span>
-          </label>
-        </form>
-        <div
-          className="flex items-center justify-end gap-2 w-full"
-          onClick={(event) => event.stopPropagation()}
-        >
-          <BrandButton
-            type="button"
-            variant="secondary"
-            onClick={onCancel}
-            data-testid="cancel-button"
-          >
-            {t(I18nKey.BUTTON$CANCEL)}
-          </BrandButton>
-          <BrandButton
-            type="button"
-            variant="primary"
-            onClick={onConfirm}
-            data-testid="confirm-button"
-          >
-            {t(I18nKey.MICROAGENT$LAUNCH)}
-          </BrandButton>
-        </div>
-      </ModalBody>
-    </ModalBackdrop>
-  );
-}
@@ -1,25 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
-interface MicroagentManagementLearnThisRepoProps {
-  repositoryUrl: string;
-}
-
-export function MicroagentManagementLearnThisRepo({
-  repositoryUrl,
-}: MicroagentManagementLearnThisRepoProps) {
-  const { t } = useTranslation();
-
-  return (
-    <div className="flex items-center justify-center rounded-lg bg-[#ffffff0d] border border-dashed border-[#ffffff4d] p-4 hover:bg-[#ffffff33] hover:border-[#C9B974] transition-all duration-300 cursor-pointer">
-      <a
-        className="text-[16px] font-normal text-[#8480FF]"
-        href={repositoryUrl}
-        target="_blank"
-        rel="noopener noreferrer"
-      >
-        {t(I18nKey.MICROAGENT_MANAGEMENT$LEARN_THIS_REPO)}
-      </a>
-    </div>
-  );
-}
@@ -1,29 +0,0 @@
-import { useSelector } from "react-redux";
-import { useTranslation } from "react-i18next";
-import { RootState } from "#/store";
-import { I18nKey } from "#/i18n/declaration";
-
-export function MicroagentManagementMain() {
-  const { t } = useTranslation();
-
-  const { selectedMicroagent } = useSelector(
-    (state: RootState) => state.microagentManagement,
-  );
-
-  if (!selectedMicroagent) {
-    return (
-      <div className="flex-1 flex flex-col h-full items-center justify-center">
-        <div className="text-[#F9FBFE] text-xl font-bold pb-4">
-          {t(I18nKey.MICROAGENT_MANAGEMENT$READY_TO_ADD_MICROAGENT)}
-        </div>
-        <div className="text-white text-sm font-normal text-center max-w-[455px]">
-          {t(
-            I18nKey.MICROAGENT_MANAGEMENT$OPENHANDS_CAN_LEARN_ABOUT_REPOSITORIES,
-          )}
-        </div>
-      </div>
-    );
-  }
-
-  return null;
-}
@@ -1,33 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
-export interface Microagent {
-  id: string;
-  name: string;
-  repositoryUrl: string;
-  createdAt: string;
-}
-
-interface MicroagentManagementMicroagentCardProps {
-  microagent: Microagent;
-}
-
-export function MicroagentManagementMicroagentCard({
-  microagent,
-}: MicroagentManagementMicroagentCardProps) {
-  const { t } = useTranslation();
-
-  return (
-    <div className="rounded-lg bg-[#ffffff0d] border border-[#ffffff33] p-4 cursor-pointer hover:bg-[#ffffff33] hover:border-[#C9B974] transition-all duration-300">
-      <div className="text-white text-[16px] font-semibold">
-        {microagent.name}
-      </div>
-      <div className="text-white text-sm font-normal">
-        {microagent.repositoryUrl}
-      </div>
-      <div className="text-white text-sm font-normal">
-        {t(I18nKey.COMMON$CREATED_ON)} {microagent.createdAt}
-      </div>
-    </div>
-  );
-}
@@ -1,38 +0,0 @@
-import { MicroagentManagementMicroagentCard } from "./microagent-management-microagent-card";
-import { MicroagentManagementAddMicroagentButton } from "./microagent-management-add-microagent-button";
-
-export function MicroagentManagementMicroagents() {
-  const microagents = [
-    {
-      id: "no-comments",
-      name: "No comments",
-      repositoryUrl: "fairwinds/polaris/Repo Overview",
-      createdAt: "05/30/2025",
-    },
-    {
-      id: "tell-me-a-joke",
-      name: "Tell me a joke",
-      repositoryUrl: ".openhands/microagents/Repo Overview",
-      createdAt: "05/30/2025",
-    },
-  ];
-
-  const numberOfMicroagents = microagents.length;
-
-  if (numberOfMicroagents === 0) {
-    return null;
-  }
-
-  return (
-    <div>
-      <div className="flex items-center justify-end pb-4">
-        <MicroagentManagementAddMicroagentButton />
-      </div>
-      {microagents.map((microagent) => (
-        <div key={microagent.id} className="pb-4">
-          <MicroagentManagementMicroagentCard microagent={microagent} />
-        </div>
-      ))}
-    </div>
-  );
-}
@@ -1,49 +0,0 @@
-import {
-  Microagent,
-  MicroagentManagementMicroagentCard,
-} from "./microagent-management-microagent-card";
-import { MicroagentManagementLearnThisRepo } from "./microagent-management-learn-this-repo";
-import { MicroagentManagementAddMicroagentButton } from "./microagent-management-add-microagent-button";
-
-export interface RepoMicroagent {
-  id: string;
-  repositoryName: string;
-  repositoryUrl: string;
-  microagents: Microagent[];
-}
-
-interface MicroagentManagementRepoMicroagentProps {
-  repoMicroagent: RepoMicroagent;
-}
-
-export function MicroagentManagementRepoMicroagent({
-  repoMicroagent,
-}: MicroagentManagementRepoMicroagentProps) {
-  const { microagents } = repoMicroagent;
-  const numberOfMicroagents = microagents.length;
-
-  return (
-    <div className="pb-12">
-      <div className="flex items-center justify-between pb-4">
-        <div className="text-white text-base font-normal">
-          {repoMicroagent.repositoryName}
-        </div>
-        <MicroagentManagementAddMicroagentButton />
-      </div>
-      {numberOfMicroagents === 0 && (
-        <MicroagentManagementLearnThisRepo
-          repositoryUrl={repoMicroagent.repositoryUrl}
-        />
-      )}
-      {numberOfMicroagents > 0 && (
-        <>
-          {microagents.map((microagent) => (
-            <div key={microagent.id} className="pb-4 last:pb-0">
-              <MicroagentManagementMicroagentCard microagent={microagent} />
-            </div>
-          ))}
-        </>
-      )}
-    </div>
-  );
-}
@@ -1,42 +0,0 @@
-import { MicroagentManagementRepoMicroagent } from "./microagent-management-repo-microagent";
-
-export function MicroagentManagementRepoMicroagents() {
-  const repoMicroagents = [
-    {
-      id: "rbren/rss-parser",
-      repositoryName: "rbren/rss-parser",
-      repositoryUrl: "https://github.com/rbren/rss-parser",
-      microagents: [],
-    },
-    {
-      id: "fairwinds/polaris",
-      repositoryName: "fairwinds/polaris",
-      repositoryUrl: "https://github.com/fairwinds/polaris",
-      microagents: [
-        {
-          id: "no-comments",
-          name: "No comments",
-          repositoryUrl: "fairwinds/polaris/Repo Overview",
-          createdAt: "05/30/2025",
-        },
-      ],
-    },
-  ];
-
-  const numberOfRepoMicroagents = repoMicroagents.length;
-
-  if (numberOfRepoMicroagents === 0) {
-    return null;
-  }
-
-  return (
-    <div>
-      {repoMicroagents.map((repoMicroagent) => (
-        <MicroagentManagementRepoMicroagent
-          key={repoMicroagent.id}
-          repoMicroagent={repoMicroagent}
-        />
-      ))}
-    </div>
-  );
-}
@@ -1,19 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import QuestionCircleIcon from "#/icons/question-circle.svg?react";
-
-export function MicroagentManagementSidebarHeader() {
-  const { t } = useTranslation();
-
-  return (
-    <div>
-      <h1 className="text-white text-[28px] font-bold">
-        {t(I18nKey.MICROAGENT_MANAGEMENT$DESCRIPTION)}
-      </h1>
-      <p className="text-white text-sm font-normal leading-[20px] pt-2">
-        {t(I18nKey.MICROAGENT_MANAGEMENT$USE_MICROAGENTS)}
-        <QuestionCircleIcon className="inline-block ml-1" />
-      </p>
-    </div>
-  );
-}
@@ -1,36 +0,0 @@
-import { Tab, Tabs } from "@heroui/react";
-import { useTranslation } from "react-i18next";
-import { MicroagentManagementMicroagents } from "./microagent-management-microagents";
-import { MicroagentManagementRepoMicroagents } from "./microagent-management-repo-microagents";
-import { I18nKey } from "#/i18n/declaration";
-
-export function MicroagentManagementSidebarTabs() {
-  const { t } = useTranslation();
-
-  return (
-    <div className="flex w-full flex-col">
-      <Tabs
-        aria-label="Options"
-        classNames={{
-          base: "py-6",
-          tabList:
-            "w-full bg-transparent border border-[#ffffff40] rounded-[6px]",
-          tab: "px-2 h-[22px]",
-          tabContent: "text-white text-[12px] font-normal",
-          panel: "py-0",
-          cursor: "bg-[#C9B97480] rounded-sm",
-        }}
-      >
-        <Tab key="personal" title={t(I18nKey.COMMON$PERSONAL)}>
-          <MicroagentManagementMicroagents />
-        </Tab>
-        <Tab key="repositories" title={t(I18nKey.COMMON$REPOSITORIES)}>
-          <MicroagentManagementRepoMicroagents />
-        </Tab>
-        <Tab key="organizations" title={t(I18nKey.COMMON$ORGANIZATIONS)}>
-          <MicroagentManagementMicroagents />
-        </Tab>
-      </Tabs>
-    </div>
-  );
-}
@@ -1,11 +0,0 @@
-import { MicroagentManagementSidebarHeader } from "./microagent-management-sidebar-header";
-import { MicroagentManagementSidebarTabs } from "./microagent-management-sidebar-tabs";
-
-export function MicroagentManagementSidebar() {
-  return (
-    <div className="w-[418px] h-full border-r border-[#525252] bg-[#24272E] rounded-tl-lg rounded-bl-lg py-10 px-6">
-      <MicroagentManagementSidebarHeader />
-      <MicroagentManagementSidebarTabs />
-    </div>
-  );
-}
@@ -1,215 +1,18 @@
 import React, { useState } from "react";
 import { useTranslation, Trans } from "react-i18next";
-import { FaTrash, FaEye, FaEyeSlash, FaCopy } from "react-icons/fa6";
 import { I18nKey } from "#/i18n/declaration";
 import { BrandButton } from "#/components/features/settings/brand-button";
 import { LoadingSpinner } from "#/components/shared/loading-spinner";
 import { ApiKey, CreateApiKeyResponse } from "#/api/api-keys";
-import {
-  displayErrorToast,
-  displaySuccessToast,
-} from "#/utils/custom-toast-handlers";
+import { displayErrorToast } from "#/utils/custom-toast-handlers";
 import { CreateApiKeyModal } from "./create-api-key-modal";
 import { DeleteApiKeyModal } from "./delete-api-key-modal";
 import { NewApiKeyModal } from "./new-api-key-modal";
 import { useApiKeys } from "#/hooks/query/use-api-keys";
-import {
-  useLlmApiKey,
-  useRefreshLlmApiKey,
-} from "#/hooks/query/use-llm-api-key";
-
-interface LlmApiKeyManagerProps {
-  llmApiKey: { key: string | null } | undefined;
-  isLoadingLlmKey: boolean;
-  refreshLlmApiKey: ReturnType<typeof useRefreshLlmApiKey>;
-}
-
-function LlmApiKeyManager({
-  llmApiKey,
-  isLoadingLlmKey,
-  refreshLlmApiKey,
-}: LlmApiKeyManagerProps) {
-  const { t } = useTranslation();
-  const [showLlmApiKey, setShowLlmApiKey] = useState(false);
-
-  const handleRefreshLlmApiKey = () => {
-    refreshLlmApiKey.mutate(undefined, {
-      onSuccess: () => {
-        displaySuccessToast(
-          t(I18nKey.SETTINGS$API_KEY_REFRESHED, {
-            defaultValue: "API key refreshed successfully",
-          }),
-        );
-      },
-      onError: () => {
-        displayErrorToast(t(I18nKey.ERROR$GENERIC));
-      },
-    });
-  };
-
-  if (isLoadingLlmKey || !llmApiKey) {
-    return null;
-  }
-
-  return (
-    <div className="border-b border-gray-200 pb-6 mb-6 flex flex-col gap-6">
-      <h3 className="text-xl font-medium text-white">
-        {t(I18nKey.SETTINGS$LLM_API_KEY)}
-      </h3>
-      <div className="flex items-center justify-between">
-        <BrandButton
-          type="button"
-          variant="primary"
-          onClick={handleRefreshLlmApiKey}
-          isDisabled={refreshLlmApiKey.isPending}
-        >
-          {refreshLlmApiKey.isPending ? (
-            <LoadingSpinner size="small" />
-          ) : (
-            t(I18nKey.SETTINGS$REFRESH_LLM_API_KEY)
-          )}
-        </BrandButton>
-      </div>
-      <div>
-        <p className="text-sm text-gray-300 mb-2">
-          {t(I18nKey.SETTINGS$LLM_API_KEY_DESCRIPTION)}
-        </p>
-        <div className="flex items-center gap-2">
-          <div className="flex-1 bg-base-tertiary rounded-md py-2 flex items-center">
-            <div className="flex-1">
-              {llmApiKey.key ? (
-                <div className="flex items-center">
-                  {showLlmApiKey ? (
-                    <span className="text-white font-mono">
-                      {llmApiKey.key}
-                    </span>
-                  ) : (
-                    <span className="text-white">{"•".repeat(20)}</span>
-                  )}
-                </div>
-              ) : (
-                <span className="text-white">
-                  {t(I18nKey.API$NO_KEY_AVAILABLE)}
-                </span>
-              )}
-            </div>
-            <div className="flex items-center">
-              {llmApiKey.key && (
-                <button
-                  type="button"
-                  className="text-white hover:text-gray-300 mr-2"
-                  aria-label={showLlmApiKey ? "Hide API key" : "Show API key"}
-                  title={showLlmApiKey ? "Hide API key" : "Show API key"}
-                  onClick={() => setShowLlmApiKey(!showLlmApiKey)}
-                >
-                  {showLlmApiKey ? (
-                    <FaEyeSlash size={20} />
-                  ) : (
-                    <FaEye size={20} />
-                  )}
-                </button>
-              )}
-              <button
-                type="button"
-                className="text-white hover:text-gray-300 mr-2"
-                aria-label="Copy API key"
-                title="Copy API key"
-                onClick={() => {
-                  if (llmApiKey.key) {
-                    navigator.clipboard.writeText(llmApiKey.key);
-                    displaySuccessToast(t(I18nKey.SETTINGS$API_KEY_COPIED));
-                  }
-                }}
-              >
-                <FaCopy size={20} />
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-interface ApiKeysTableProps {
-  apiKeys: ApiKey[];
-  isLoading: boolean;
-  onDeleteKey: (key: ApiKey) => void;
-}
-
-function ApiKeysTable({ apiKeys, isLoading, onDeleteKey }: ApiKeysTableProps) {
-  const { t } = useTranslation();
-
-  const formatDate = (dateString: string | null) => {
-    if (!dateString) return "Never";
-    return new Date(dateString).toLocaleString();
-  };
-
-  if (isLoading) {
-    return (
-      <div className="flex justify-center p-4">
-        <LoadingSpinner size="large" />
-      </div>
-    );
-  }
-
-  if (!Array.isArray(apiKeys) || apiKeys.length === 0) {
-    return null;
-  }
-
-  return (
-    <div className="border border-tertiary rounded-md overflow-hidden">
-      <table className="w-full">
-        <thead className="bg-base-tertiary">
-          <tr>
-            <th className="text-left p-3 text-sm font-medium">
-              {t(I18nKey.SETTINGS$NAME)}
-            </th>
-            <th className="text-left p-3 text-sm font-medium">
-              {t(I18nKey.SETTINGS$CREATED_AT)}
-            </th>
-            <th className="text-left p-3 text-sm font-medium">
-              {t(I18nKey.SETTINGS$LAST_USED)}
-            </th>
-            <th className="text-right p-3 text-sm font-medium">
-              {t(I18nKey.SETTINGS$ACTIONS)}
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          {apiKeys.map((key) => (
-            <tr key={key.id} className="border-t border-tertiary">
-              <td
-                className="p-3 text-sm truncate max-w-[160px]"
-                title={key.name}
-              >
-                {key.name}
-              </td>
-              <td className="p-3 text-sm">{formatDate(key.created_at)}</td>
-              <td className="p-3 text-sm">{formatDate(key.last_used_at)}</td>
-              <td className="p-3 text-right">
-                <button
-                  type="button"
-                  onClick={() => onDeleteKey(key)}
-                  aria-label={`Delete ${key.name}`}
-                  className="cursor-pointer"
-                >
-                  <FaTrash size={16} />
-                </button>
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </div>
-  );
-}

 export function ApiKeysManager() {
  const { t } = useTranslation();
  const { data: apiKeys = [], isLoading, error } = useApiKeys();
-  const { data: llmApiKey, isLoading: isLoadingLlmKey } = useLlmApiKey();
-  const refreshLlmApiKey = useRefreshLlmApiKey();
  const [createModalOpen, setCreateModalOpen] = useState(false);
  const [deleteModalOpen, setDeleteModalOpen] = useState(false);
  const [keyToDelete, setKeyToDelete] = useState<ApiKey | null>(null);
@@ -242,24 +45,14 @@ export function ApiKeysManager() {
    setNewlyCreatedKey(null);
  };

-  const handleDeleteKey = (key: ApiKey) => {
-    setKeyToDelete(key);
-    setDeleteModalOpen(true);
+  const formatDate = (dateString: string | null) => {
+    if (!dateString) return "Never";
+    return new Date(dateString).toLocaleString();
  };

  return (
    <>
      <div className="flex flex-col gap-6">
-        <LlmApiKeyManager
-          llmApiKey={llmApiKey}
-          isLoadingLlmKey={isLoadingLlmKey}
-          refreshLlmApiKey={refreshLlmApiKey}
-        />
-
-        <h3 className="text-xl font-medium text-white">
-          {t(I18nKey.SETTINGS$OPENHANDS_API_KEYS)}
-        </h3>
-
        <div className="flex items-center justify-between">
          <BrandButton
            type="button"
@@ -288,11 +81,63 @@ export function ApiKeysManager() {
          />
        </p>

-        <ApiKeysTable
-          apiKeys={apiKeys}
-          isLoading={isLoading}
-          onDeleteKey={handleDeleteKey}
-        />
+        {isLoading && (
+          <div className="flex justify-center p-4">
+            <LoadingSpinner size="large" />
+          </div>
+        )}
+        {!isLoading && Array.isArray(apiKeys) && apiKeys.length > 0 && (
+          <div className="border border-tertiary rounded-md overflow-hidden">
+            <table className="w-full">
+              <thead className="bg-base-tertiary">
+                <tr>
+                  <th className="text-left p-3 text-sm font-medium">
+                    {t(I18nKey.SETTINGS$NAME)}
+                  </th>
+                  <th className="text-left p-3 text-sm font-medium">
+                    {t(I18nKey.SETTINGS$CREATED_AT)}
+                  </th>
+                  <th className="text-left p-3 text-sm font-medium">
+                    {t(I18nKey.SETTINGS$LAST_USED)}
+                  </th>
+                  <th className="text-right p-3 text-sm font-medium">
+                    {t(I18nKey.SETTINGS$ACTIONS)}
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {apiKeys.map((key) => (
+                  <tr key={key.id} className="border-t border-tertiary">
+                    <td
+                      className="p-3 text-sm truncate max-w-[160px]"
+                      title={key.name}
+                    >
+                      {key.name}
+                    </td>
+                    <td className="p-3 text-sm">
+                      {formatDate(key.created_at)}
+                    </td>
+                    <td className="p-3 text-sm">
+                      {formatDate(key.last_used_at)}
+                    </td>
+                    <td className="p-3 text-right">
+                      <button
+                        type="button"
+                        className="underline"
+                        onClick={() => {
+                          setKeyToDelete(key);
+                          setDeleteModalOpen(true);
+                        }}
+                      >
+                        {t(I18nKey.BUTTON$DELETE)}
+                      </button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
      </div>

      {/* Create API Key Modal */}
@@ -3,16 +3,9 @@ interface HelpLinkProps {
  text: string;
  linkText: string;
  href: string;
-  suffix?: string;
 }

-export function HelpLink({
-  testId,
-  text,
-  linkText,
-  href,
-  suffix,
-}: HelpLinkProps) {
+export function HelpLink({ testId, text, linkText, href }: HelpLinkProps) {
  return (
    <p data-testid={testId} className="text-xs">
      {text}{" "}
@@ -24,7 +17,6 @@ export function HelpLink({
      >
        {linkText}
      </a>
-      {suffix && ` ${suffix}`}
    </p>
  );
 }
@@ -0,0 +1,41 @@
+import { useTranslation } from "react-i18next";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { I18nKey } from "#/i18n/declaration";
+import { BrandButton } from "../brand-button";
+
+interface ResetSettingsModalProps {
+  onReset: () => void;
+}
+
+export function ResetSettingsModal({ onReset }: ResetSettingsModalProps) {
+  const { t } = useTranslation();
+
+  return (
+    <ModalBackdrop>
+      <div className="bg-base-secondary p-4 rounded-xl flex flex-col gap-4 border border-tertiary">
+        <p>{t(I18nKey.SETTINGS$RESET_CONFIRMATION)}</p>
+        <div className="w-full flex gap-2" data-testid="reset-settings-modal">
+          <BrandButton
+            testId="confirm-button"
+            type="submit"
+            name="reset-settings"
+            variant="primary"
+            className="grow"
+          >
+            Reset
+          </BrandButton>
+
+          <BrandButton
+            testId="cancel-button"
+            type="button"
+            variant="secondary"
+            className="grow"
+            onClick={onReset}
+          >
+            Cancel
+          </BrandButton>
+        </div>
+      </div>
+    </ModalBackdrop>
+  );
+}
@@ -32,26 +32,32 @@ export function MCPConfigEditor({ mcpConfig, onChange }: MCPConfigEditorProps) {
          {t(I18nKey.SETTINGS$MCP_DESCRIPTION)}
        </p>
      </div>
-      {!isEditing && (
-        <div className="flex justify-between items-center mb-4">
-          <div className="flex items-center">
-            <BrandButton
-              type="button"
-              variant="primary"
-              onClick={() => setIsEditing(true)}
-            >
-              {t(I18nKey.SETTINGS$MCP_EDIT_CONFIGURATION)}
-            </BrandButton>
-          </div>
+      <div className="flex justify-between items-center mb-4">
+        <div className="flex items-center">
+          <a
+            href="https://docs.all-hands.dev/usage/mcp"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-sm text-blue-400 hover:underline mr-3"
+            onClick={(e) => e.stopPropagation()}
+          >
+            Documentation
+          </a>
+          <BrandButton
+            type="button"
+            variant="primary"
+            onClick={() => setIsEditing(!isEditing)}
+          >
+            {isEditing
+              ? t(I18nKey.SETTINGS$MCP_CANCEL)
+              : t(I18nKey.SETTINGS$MCP_EDIT_CONFIGURATION)}
+          </BrandButton>
        </div>
-      )}
+      </div>
+
      <div>
        {isEditing ? (
-          <MCPJsonEditor
-            mcpConfig={mcpConfig}
-            onChange={handleConfigChange}
-            onCancel={() => setIsEditing(false)}
-          />
+          <MCPJsonEditor mcpConfig={mcpConfig} onChange={handleConfigChange} />
        ) : (
          <>
            <div className="flex flex-col gap-6">
@@ -1,21 +1,15 @@
 import React, { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { useTranslation } from "react-i18next";
 import { MCPConfig } from "#/types/settings";
 import { I18nKey } from "#/i18n/declaration";
 import { BrandButton } from "../brand-button";
-import { cn } from "#/utils/utils";

 interface MCPJsonEditorProps {
  mcpConfig?: MCPConfig;
  onChange: (config: MCPConfig) => void;
-  onCancel: () => void;
 }

-export function MCPJsonEditor({
-  mcpConfig,
-  onChange,
-  onCancel,
-}: MCPJsonEditorProps) {
+export function MCPJsonEditor({ mcpConfig, onChange }: MCPJsonEditorProps) {
  const { t } = useTranslation();
  const [configText, setConfigText] = useState(() =>
    mcpConfig
@@ -71,31 +65,11 @@ export function MCPJsonEditor({

  return (
    <div>
-      <p className="mb-2 text-sm text-gray-400">
-        <Trans
-          i18nKey={I18nKey.SETTINGS$MCP_CONFIG_DESCRIPTION}
-          components={{
-            a: (
-              <a
-                href="https://docs.all-hands.dev/usage/mcp"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-blue-400 hover:underline"
-              >
-                documentation
-              </a>
-            ),
-          }}
-        />
-      </p>
+      <div className="mb-2 text-sm text-gray-400">
+        {t(I18nKey.SETTINGS$MCP_CONFIG_DESCRIPTION)}
+      </div>
      <textarea
-        className={cn(
-          "w-full h-64 resize-y p-2 rounded-sm text-sm font-mono",
-          "bg-tertiary border border-[#717888]",
-          "placeholder:italic placeholder:text-tertiary-alt",
-          "focus:outline-none focus:ring-1 focus:ring-primary",
-          "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
-        )}
+        className="w-full h-64 p-2 text-sm font-mono bg-base-tertiary rounded-md focus:border-blue-500 focus:outline-hidden"
        value={configText}
        onChange={handleTextChange}
        spellCheck="false"
@@ -113,12 +87,9 @@ export function MCPJsonEditor({
          }
        </code>
      </div>
-      <div className="mt-4 flex justify-end gap-3">
-        <BrandButton type="button" variant="secondary" onClick={onCancel}>
-          {t(I18nKey.BUTTON$CANCEL)}
-        </BrandButton>
+      <div className="mt-4 flex justify-end">
        <BrandButton type="button" variant="primary" onClick={handleSave}>
-          {t(I18nKey.SETTINGS$MCP_CONFIRM_CHANGES)}
+          {t(I18nKey.SETTINGS$MCP_APPLY_CHANGES)}
        </BrandButton>
      </div>
    </div>
@@ -1,11 +1,3 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
 export function OptionalTag() {
-  const { t } = useTranslation();
-  return (
-    <span className="text-xs text-tertiary-alt">
-      {t(I18nKey.COMMON$OPTIONAL)}
-    </span>
-  );
+  return <span className="text-xs text-tertiary-alt">(Optional)</span>;
 }
@@ -1,7 +1,6 @@
 import { useQueryClient } from "@tanstack/react-query";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
 import { useCreateSecret } from "#/hooks/mutation/use-create-secret";
 import { useUpdateSecret } from "#/hooks/mutation/use-update-secret";
 import { SettingsInput } from "../settings-input";
@@ -152,7 +151,7 @@ export function SecretForm({

      {mode === "add" && (
        <label className="flex flex-col gap-2.5 w-full max-w-[680px]">
-          <span className="text-sm">{t(I18nKey.FORM$VALUE)}</span>
+          <span className="text-sm">Value</span>
          <textarea
            data-testid="value-input"
            name="secret-value"
@@ -169,7 +168,7 @@ export function SecretForm({

      <label className="flex flex-col gap-2.5 w-full max-w-[680px]">
        <div className="flex items-center gap-2">
-          <span className="text-sm">{t(I18nKey.FORM$DESCRIPTION)}</span>
+          <span className="text-sm">Description</span>
          <OptionalTag />
        </div>
        <input
@@ -191,7 +190,7 @@ export function SecretForm({
          variant="secondary"
          onClick={onCancel}
        >
-          {t(I18nKey.BUTTON$CANCEL)}
+          Cancel
        </BrandButton>
        <BrandButton testId="submit-button" type="submit" variant="primary">
          {mode === "add" && t("SECRETS$ADD_SECRET")}
@@ -32,26 +32,25 @@ export function SecretListItem({
  return (
    <tr
      data-testid="secret-item"
-      className="flex w-full items-center border-t border-tertiary"
+      className="border-t border-[#717888] last-of-type:border-b max-w-[830px] py-[13px] flex w-full items-center"
    >
-      <td className="p-3 w-1/4 text-sm text-content-2 truncate" title={title}>
+      <td className="w-1/4 text-sm text-content-2 truncate" title={title}>
        {title}
      </td>

      <td
-        className="p-3 w-1/2 truncate overflow-hidden whitespace-nowrap text-sm text-content-2 opacity-80 italic"
+        className="w-1/2 truncate overflow-hidden whitespace-nowrap text-sm text-content-2 opacity-80 italic"
        title={description || ""}
      >
        {description || ""}
      </td>

-      <td className="p-3 w-1/4 flex items-center justify-end gap-4">
+      <td className="w-1/4 flex items-center justify-end gap-4">
        <button
          data-testid="edit-secret-button"
          type="button"
          onClick={onEdit}
          aria-label={`Edit ${title}`}
-          className="cursor-pointer"
        >
          <FaPencil size={16} />
        </button>
@@ -60,7 +59,6 @@ export function SecretListItem({
          type="button"
          onClick={onDelete}
          aria-label={`Delete ${title}`}
-          className="cursor-pointer"
        >
          <FaTrash size={16} />
        </button>
@@ -1,6 +1,4 @@
 import React from "react";
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
 import { StyledSwitchComponent } from "./styled-switch-component";

 interface SettingsSwitchProps {
@@ -21,7 +19,6 @@ export function SettingsSwitch({
  isToggled: controlledIsToggled,
  isBeta,
 }: React.PropsWithChildren<SettingsSwitchProps>) {
-  const { t } = useTranslation();
  const [isToggled, setIsToggled] = React.useState(defaultIsToggled ?? false);

  const handleToggle = (value: boolean) => {
@@ -38,6 +35,7 @@ export function SettingsSwitch({
        type="checkbox"
        onChange={(e) => handleToggle(e.target.checked)}
        checked={controlledIsToggled ?? isToggled}
+        defaultChecked={defaultIsToggled}
      />

      <StyledSwitchComponent isToggled={controlledIsToggled ?? isToggled} />
@@ -46,7 +44,7 @@ export function SettingsSwitch({
        <span className="text-sm">{children}</span>
        {isBeta && (
          <span className="text-[11px] leading-4 text-[#0D0F11] font-[500] tracking-tighter bg-primary px-1 rounded-full">
-            {t(I18nKey.BADGE$BETA)}
+            Beta
          </span>
        )}
      </div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
openhands	2c55829a39	fix: separate rotation and arc length animations for dynamic spinner	2025-07-09 14:25:47 +00:00
openhands	2c3494c71e	feat: add dynamic variant to Spinner component	2025-07-09 14:21:58 +00:00
Mislav Lukach	fe059e7fc7	Merge branch 'main' into feature/spinner	2025-07-09 15:09:17 +02:00
mislavlukach	62c948fc91	feat(ui): spinner component	2025-07-07 19:21:17 +02:00