Merge branch 'aws_fixes_min' into keycloak

Cleanup
2026-04-29 03:00:45 -04:00 · 2025-01-21 23:06:21 -05:00 · 2025-01-21 23:00:18 -05:00 · 2025-01-21 19:57:45 -05:00 · 2025-01-21 18:53:34 -05:00 · 2025-01-21 18:50:26 -05:00
288 changed files with 5796 additions and 11646 deletions
@@ -30,7 +30,6 @@ body:
      description: How are you running OpenHands?
      options:
        - Docker command in README
-        - GitHub resolver
        - Development workflow
        - app.all-hands.dev
        - Other
@@ -19,6 +19,20 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: true
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v3
@@ -41,6 +41,20 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: true
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3.3.0
        with:
@@ -90,6 +104,20 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: true
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3.3.0
        with:
@@ -191,7 +219,7 @@ jobs:
            exit 1
          fi

-  # Run unit tests with the Docker runtime Docker images as root
+  # Run unit tests with the EventStream runtime Docker images as root
  test_runtime_root:
    name: RT Unit Tests (Root)
    needs: [ghcr_build_runtime]
@@ -202,6 +230,20 @@ jobs:
        base_image: ['nikolaik']
    steps:
      - uses: actions/checkout@v4
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: true
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v3
@@ -244,7 +286,7 @@ jobs:
          image_name=ghcr.io/${{ github.repository_owner }}/runtime:${{ env.RELEVANT_SHA }}-${{ matrix.base_image }}
          image_name=$(echo $image_name | tr '[:upper:]' '[:lower:]')

-          TEST_RUNTIME=docker \
+          TEST_RUNTIME=eventstream \
          SANDBOX_USER_ID=$(id -u) \
          SANDBOX_RUNTIME_CONTAINER_IMAGE=$image_name \
          TEST_IN_CI=true \
@@ -255,7 +297,7 @@ jobs:
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

-  # Run unit tests with the Docker runtime Docker images as openhands user
+  # Run unit tests with the EventStream runtime Docker images as openhands user
  test_runtime_oh:
    name: RT Unit Tests (openhands)
    runs-on: ubuntu-latest
@@ -265,6 +307,20 @@ jobs:
        base_image: ['nikolaik']
    steps:
      - uses: actions/checkout@v4
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: true
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v3
@@ -307,7 +363,7 @@ jobs:
          image_name=ghcr.io/${{ github.repository_owner }}/runtime:${{ env.RELEVANT_SHA }}-${{ matrix.base_image }}
          image_name=$(echo $image_name | tr '[:upper:]' '[:lower:]')

-          TEST_RUNTIME=docker \
+          TEST_RUNTIME=eventstream \
          SANDBOX_USER_ID=$(id -u) \
          SANDBOX_RUNTIME_CONTAINER_IMAGE=$image_name \
          TEST_IN_CI=true \
@@ -160,6 +160,7 @@ jobs:
          echo "api_key = \"$LLM_API_KEY\"" >> config.toml
          echo "base_url = \"$LLM_BASE_URL\"" >> config.toml
          echo "temperature = 0.0" >> config.toml
+
      - name: Run integration test evaluation for DelegatorAgent (DeepSeek)
        env:
          SANDBOX_FORCE_REBUILD_RUNTIME: True
@@ -173,42 +174,12 @@ jobs:
          cat $REPORT_FILE_DELEGATOR_DEEPSEEK >> $GITHUB_ENV
          echo >> $GITHUB_ENV
          echo "EOF" >> $GITHUB_ENV
-      # -------------------------------------------------------------
-      # Run VisualBrowsingAgent tests for DeepSeek, limited to t05 and t06
-      - name: Wait a little bit (again)
-        run: sleep 5
-
-      - name: Configure config.toml for testing VisualBrowsingAgent (DeepSeek)
-        env:
-          LLM_MODEL: "litellm_proxy/deepseek-chat"
-          LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
-          LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
-          MAX_ITERATIONS: 15
-        run: |
-          echo "[llm.eval]" > config.toml
-          echo "model = \"$LLM_MODEL\"" >> config.toml
-          echo "api_key = \"$LLM_API_KEY\"" >> config.toml
-          echo "base_url = \"$LLM_BASE_URL\"" >> config.toml
-          echo "temperature = 0.0" >> config.toml
-      - name: Run integration test evaluation for VisualBrowsingAgent (DeepSeek)
-        env:
-          SANDBOX_FORCE_REBUILD_RUNTIME: True
-        run: |
-          poetry run ./evaluation/integration_tests/scripts/run_infer.sh llm.eval HEAD VisualBrowsingAgent '' 15 $N_PROCESSES "t05_simple_browsing,t06_github_pr_browsing.py" 'visualbrowsing_deepseek_run'
-
-          # Find and export the visual browsing agent test results
-          REPORT_FILE_VISUALBROWSING_DEEPSEEK=$(find evaluation/evaluation_outputs/outputs/integration_tests/VisualBrowsingAgent/deepseek*_maxiter_15_N* -name "report.md" -type f | head -n 1)
-          echo "REPORT_FILE_VISUALBROWSING_DEEPSEEK: $REPORT_FILE_VISUALBROWSING_DEEPSEEK"
-          echo "INTEGRATION_TEST_REPORT_VISUALBROWSING_DEEPSEEK<<EOF" >> $GITHUB_ENV
-          cat $REPORT_FILE_VISUALBROWSING_DEEPSEEK >> $GITHUB_ENV
-          echo >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV

      - name: Create archive of evaluation outputs
        run: |
          TIMESTAMP=$(date +'%y-%m-%d-%H-%M')
          cd evaluation/evaluation_outputs/outputs  # Change to the outputs directory
-          tar -czvf ../../../integration_tests_${TIMESTAMP}.tar.gz integration_tests/CodeActAgent/* integration_tests/DelegatorAgent/* integration_tests/VisualBrowsingAgent/* # Only include the actual result directories
+          tar -czvf ../../../integration_tests_${TIMESTAMP}.tar.gz integration_tests/CodeActAgent/* integration_tests/DelegatorAgent/*  # Only include the actual result directories

      - name: Upload evaluation results as artifact
        uses: actions/upload-artifact@v4
@@ -256,7 +227,4 @@ jobs:
              **Integration Tests Report Delegator (DeepSeek)**
              ${{ env.INTEGRATION_TEST_REPORT_DELEGATOR_DEEPSEEK }}
              ---
-              **Integration Tests Report VisualBrowsing (DeepSeek)**
-              ${{ env.INTEGRATION_TEST_REPORT_VISUALBROWSING_DEEPSEEK }}
-              ---
              Download testing outputs (includes both Haiku and DeepSeek results): [Download](${{ steps.upload_results_artifact.outputs.artifact-url }})
@@ -20,10 +20,6 @@ on:
        required: false
        type: string
        default: "anthropic/claude-3-5-sonnet-20241022"
-      LLM_API_VERSION:
-        required: false
-        type: string
-        default: ""
      base_container_image:
        required: false
        type: string
@@ -88,10 +84,6 @@ jobs:
        run: |
          python -m pip index versions openhands-ai > openhands_versions.txt
          OPENHANDS_VERSION=$(head -n 1 openhands_versions.txt | awk '{print $2}' | tr -d '()')
-          # Ensure requirements.txt ends with newline before appending
-          if [ -f requirements.txt ] && [ -s requirements.txt ]; then
-            sed -i -e '$a\' requirements.txt
-          fi
          echo "openhands-ai==${OPENHANDS_VERSION}" >> requirements.txt
          cat requirements.txt

@@ -120,7 +112,6 @@ jobs:
          LLM_MODEL: ${{ secrets.LLM_MODEL || inputs.LLM_MODEL }}
          LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
          LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
-          LLM_API_VERSION: ${{ inputs.LLM_API_VERSION }}
          PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
          PAT_USERNAME: ${{ secrets.PAT_USERNAME }}
          GITHUB_TOKEN: ${{ github.token }}
@@ -235,7 +226,6 @@ jobs:
          LLM_MODEL: ${{ secrets.LLM_MODEL || inputs.LLM_MODEL }}
          LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
          LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
-          LLM_API_VERSION: ${{ inputs.LLM_API_VERSION }}
          PYTHONPATH: ""
        run: |
          cd /tmp && python -m openhands.resolver.resolve_issue \
@@ -271,7 +261,6 @@ jobs:
          LLM_MODEL: ${{ secrets.LLM_MODEL || inputs.LLM_MODEL }}
          LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
          LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
-          LLM_API_VERSION: ${{ inputs.LLM_API_VERSION }}
          PYTHONPATH: ""
        run: |
          if [ "${{ steps.check_result.outputs.RESOLUTION_SUCCESS }}" == "true" ]; then
@@ -0,0 +1,98 @@
+# Workflow that runs python unit tests on mac
+name: Run Python Unit Tests Mac
+
+# This job is flaky so only run it nightly
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  # Run python unit tests on macOS
+  test-on-macos:
+    name: Python Unit Tests on macOS
+    runs-on: macos-14
+    env:
+      INSTALL_DOCKER: '1' # Set to '0' to skip Docker installation
+    strategy:
+      matrix:
+        python-version: ['3.12']
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Cache Poetry dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/pypoetry
+            ~/.virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+      - name: Install tmux
+        run: brew install tmux
+      - name: Install poetry via pipx
+        run: pipx install poetry
+      - name: Install Python dependencies using Poetry
+        run: poetry install --without evaluation,llama-index
+      - name: Install & Start Docker
+        if: env.INSTALL_DOCKER == '1'
+        run: |
+          INSTANCE_NAME="colima-${GITHUB_RUN_ID}"
+
+          # Uninstall colima to upgrade to the latest version
+          if brew list colima &>/dev/null; then
+            brew uninstall colima
+            # unlinking colima dependency: go
+            brew uninstall go@1.21
+          fi
+          rm -rf ~/.colima ~/.lima
+          brew install --HEAD colima
+          brew install docker
+
+          start_colima() {
+            # Find a free port in the range 10000-20000
+            RANDOM_PORT=$((RANDOM % 10001 + 10000))
+
+            # Original line:
+            if ! colima start --network-address --arch x86_64 --cpu=1 --memory=1 --verbose --ssh-port $RANDOM_PORT; then
+              echo "Failed to start Colima."
+              return 1
+            fi
+            return 0
+          }
+
+          # Attempt to start Colima for 5 total attempts:
+          ATTEMPT_LIMIT=5
+          for ((i=1; i<=ATTEMPT_LIMIT; i++)); do
+
+            if start_colima; then
+              echo "Colima started successfully."
+              break
+            else
+              colima stop -f
+              sleep 10
+              colima delete -f
+              if [ $i -eq $ATTEMPT_LIMIT ]; then
+                exit 1
+              fi
+              sleep 10
+            fi
+          done
+
+          # For testcontainers to find the Colima socket
+          # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
+          sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
+      - name: Build Environment
+        run: make build
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Run Tests
+        run: poetry run pytest --forked --cov=openhands --cov-report=xml ./tests/unit --ignore=tests/unit/test_memory.py
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -19,4 +19,3 @@ jobs:
          close-issue-message: 'This issue was closed because it has been stalled for over 30 days with no activity.'
          close-pr-message: 'This PR was closed because it has been stalled for over 30 days with no activity.'
          days-before-close: 7
-          operations-per-run: 150
@@ -100,7 +100,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.23-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.20-nikolaik`

 ## Develop inside Docker container

@@ -12,7 +12,7 @@
  <a href="https://codecov.io/github/All-Hands-AI/OpenHands?branch=main"><img alt="CodeCov" src="https://img.shields.io/codecov/c/github/All-Hands-AI/OpenHands?style=for-the-badge&color=blue"></a>
  <a href="https://github.com/All-Hands-AI/OpenHands/blob/main/LICENSE"><img src="https://img.shields.io/github/license/All-Hands-AI/OpenHands?style=for-the-badge&color=blue" alt="MIT License"></a>
  <br/>
-  <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg"><img src="https://img.shields.io/badge/Slack-Join%20Us-red?logo=slack&logoColor=white&style=for-the-badge" alt="Join our Slack community"></a>
+  <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw"><img src="https://img.shields.io/badge/Slack-Join%20Us-red?logo=slack&logoColor=white&style=for-the-badge" alt="Join our Slack community"></a>
  <a href="https://discord.gg/ESHStjSjD4"><img src="https://img.shields.io/badge/Discord-Join%20Us-purple?logo=discord&logoColor=white&style=for-the-badge" alt="Join our Discord community"></a>
  <a href="https://github.com/All-Hands-AI/OpenHands/blob/main/CREDITS.md"><img src="https://img.shields.io/badge/Project-Credits-blue?style=for-the-badge&color=FFE165&logo=github&logoColor=white" alt="Credits"></a>
  <br/>
@@ -43,17 +43,17 @@ See the [Running OpenHands](https://docs.all-hands.dev/modules/usage/installatio
 system requirements and more information.

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik

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

 You'll find OpenHands running at [http://localhost:3000](http://localhost:3000)!
@@ -96,7 +96,7 @@ troubleshooting resources, and advanced configuration options.
 OpenHands is a community-driven project, and we welcome contributions from everyone. We do most of our communication
 through Slack, so this is the best place to start, but we also are happy to have you contact us on Discord or Github:

- [Join our Slack workspace](https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg) - Here we talk about research, architecture, and future development.
+- [Join our Slack workspace](https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw) - Here we talk about research, architecture, and future development.
 - [Join our Discord server](https://discord.gg/ESHStjSjD4) - This is a community-run server for general discussion, questions, and feedback.
 - [Read or post Github Issues](https://github.com/All-Hands-AI/OpenHands/issues) - Check out the issues we're working on, or add your own ideas.

@@ -75,7 +75,7 @@ workspace_base = "./workspace"
 #run_as_openhands = true

 # Runtime environment
-#runtime = "docker"
+#runtime = "eventstream"

 # Name of the default agent
 #default_agent = "CodeActAgent"
@@ -104,7 +104,7 @@ workspace_base = "./workspace"
 #aws_secret_access_key = ""

 # API key to use (For Headless / CLI only -  In Web this is overridden by Session Init)
-api_key = ""
+api_key = "your-api-key"

 # API base URL (For Headless / CLI only -  In Web this is overridden by Session Init)
 #base_url = ""
@@ -195,7 +195,7 @@ model = "gpt-4o"
 #native_tool_calling = None

 [llm.gpt4o-mini]
-api_key = ""
+api_key = "your-api-key"
 model = "gpt-4o"


@@ -11,7 +11,7 @@ services:
      - BACKEND_HOST=${BACKEND_HOST:-"0.0.0.0"}
      - SANDBOX_API_HOSTNAME=host.docker.internal
      #
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.23-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.20-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.23-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.20-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-state for this user
      - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
    ports:
@@ -1,8 +1,8 @@


-# 📦 Runtime Docker
+# 📦 Runtime EventStream

-Le Runtime Docker d'OpenHands est le composant principal qui permet l'exécution sécurisée et flexible des actions des agents d'IA.
+Le Runtime EventStream d'OpenHands est le composant principal qui permet l'exécution sécurisée et flexible des actions des agents d'IA.
 Il crée un environnement en bac à sable (sandbox) en utilisant Docker, où du code arbitraire peut être exécuté en toute sécurité sans risquer le système hôte.

 ## Pourquoi avons-nous besoin d'un runtime en bac à sable ?
@@ -163,7 +163,7 @@ Les options de configuration de base sont définies dans la section `[core]` du

 - `runtime`
  - Type : `str`
-  - Valeur par défaut : `"docker"`
+  - Valeur par défaut : `"eventstream"`
  - Description : Environnement d'exécution

 - `default_agent`
@@ -95,3 +95,7 @@ sandbox_user_id="1001"
 ### Erreurs de port d'utilisation

 Si vous voyez un message d'erreur indiquant que le port est utilisé ou indisponible, essayez de supprimer toutes les containers docker en cours d'exécution (exécutez `docker ps` et `docker rm` des containers concernés) puis ré-exécutez ```make run```
+
+## Discuter
+
+Pour d'autres problèmes ou questions rejoignez le [Slack](https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw) ou le [Discord](https://discord.gg/ESHStjSjD4) et demandez!
@@ -52,7 +52,7 @@ LLM_API_KEY="sk_test_12345"
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -61,7 +61,7 @@ docker run -it \
    -v /var/run/docker.sock:/var/run/docker.sock \
    --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.23 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.20 \
    python -m openhands.core.cli
 ```

@@ -114,7 +114,7 @@ Pour créer un workflow d'évaluation pour votre benchmark, suivez ces étapes :
   def get_config(instance: pd.Series, metadata: EvalMetadata) -> AppConfig:
       config = AppConfig(
           default_agent=metadata.agent_class,
-           runtime='docker',
+           runtime='eventstream',
           max_iterations=metadata.max_iterations,
           sandbox=SandboxConfig(
               base_container_image='your_container_image',
@@ -46,7 +46,7 @@ LLM_API_KEY="sk_test_12345"
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -56,6 +56,6 @@ docker run -it \
    -v /var/run/docker.sock:/var/run/docker.sock \
    --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.23 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.20 \
    python -m openhands.core.main -t "write a bash script that prints hi" --no-auto-continue
 ```
@@ -13,16 +13,16 @@
 La façon la plus simple d'exécuter OpenHands est avec Docker.

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik

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

 Vous pouvez également exécuter OpenHands en mode [headless scriptable](https://docs.all-hands.dev/modules/usage/how-to/headless-mode), en tant que [CLI interactive](https://docs.all-hands.dev/modules/usage/how-to/cli-mode), ou en utilisant l'[Action GitHub OpenHands](https://docs.all-hands.dev/modules/usage/how-to/github-action).
@@ -42,7 +42,7 @@ Explorez le code source d'OpenHands sur [GitHub](https://github.com/All-Hands-AI
  />
 </a>
 <br></br>
-<a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg">
+<a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw">
  <img
    src="https://img.shields.io/badge/Slack-Join%20Us-red?logo=slack&logoColor=white&style=for-the-badge"
    alt="Join our Slack community"
@@ -13,7 +13,7 @@ C'est le Runtime par défaut qui est utilisé lorsque vous démarrez OpenHands.

 ```
 docker run # ...
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -v /var/run/docker.sock:/var/run/docker.sock \
    # ...
 ```
@@ -1,8 +1,8 @@
 以下是翻译后的内容:

-# 📦 Docker 运行时
+# 📦 EventStream 运行时

-OpenHands Docker 运行时是实现 AI 代理操作安全灵活执行的核心组件。
+OpenHands EventStream 运行时是实现 AI 代理操作安全灵活执行的核心组件。
 它使用 Docker 创建一个沙盒环境,可以安全地运行任意代码而不会危及主机系统。

 ## 为什么我们需要沙盒运行时?
@@ -162,7 +162,7 @@

 - `runtime`
  - 类型: `str`
-  - 默认值: `"docker"`
+  - 默认值: `"eventstream"`
  - 描述: 运行时环境

 - `default_agent`
@@ -96,3 +96,7 @@ sandbox_user_id="1001"
 ### 端口使用错误

 如果您遇到端口被占用或不可用的错误提示，可以尝试先用`docker ps`命令列出所有运行中的 Docker 容器，然后使用`docker rm`命令删除相关容器，最后再重新执行```make run```命令。
+
+## 讨论
+
+对于其他问题或疑问，请加入 [Slack](https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw) 或 [Discord](https://discord.gg/ESHStjSjD4) 提问！
@@ -50,7 +50,7 @@ LLM_API_KEY="sk_test_12345"
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -59,7 +59,7 @@ docker run -it \
    -v /var/run/docker.sock:/var/run/docker.sock \
    --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.23 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.20 \
    python -m openhands.core.cli
 ```

@@ -112,7 +112,7 @@ OpenHands 的主要入口点在 `openhands/core/main.py` 中。以下是它的
   def get_config(instance: pd.Series, metadata: EvalMetadata) -> AppConfig:
       config = AppConfig(
           default_agent=metadata.agent_class,
-           runtime='docker',
+           runtime='eventstream',
           max_iterations=metadata.max_iterations,
           sandbox=SandboxConfig(
               base_container_image='your_container_image',
@@ -47,7 +47,7 @@ LLM_API_KEY="sk_test_12345"
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -57,6 +57,6 @@ docker run -it \
    -v /var/run/docker.sock:/var/run/docker.sock \
    --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.23 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.20 \
    python -m openhands.core.main -t "write a bash script that prints hi" --no-auto-continue
 ```
@@ -11,16 +11,16 @@
 在 Docker 中运行 OpenHands 是最简单的方式。

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik

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

 你也可以在可脚本化的[无头模式](https://docs.all-hands.dev/modules/usage/how-to/headless-mode)下运行 OpenHands，作为[交互式 CLI](https://docs.all-hands.dev/modules/usage/how-to/cli-mode)，或使用 [OpenHands GitHub Action](https://docs.all-hands.dev/modules/usage/how-to/github-action)。
@@ -42,7 +42,7 @@ OpenHands 是一个**自主 AI 软件工程师**，能够执行复杂的工程
  />
 </a>
 <br></br>
-<a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg">
+<a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw">
  <img
    src="https://img.shields.io/badge/Slack-Join%20Us-red?logo=slack&logoColor=white&style=for-the-badge"
    alt="Join our Slack community"
@@ -11,7 +11,7 @@

 ```
 docker run # ...
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -v /var/run/docker.sock:/var/run/docker.sock \
    # ...
 ```
@@ -1,6 +1,6 @@
-# 📦 Docker Runtime
+# 📦 EventStream Runtime

-The OpenHands Docker Runtime is the core component that enables secure and flexible execution of AI agent's action.
+The OpenHands EventStream Runtime is the core component that enables secure and flexible execution of AI agent's action.
 It creates a sandboxed environment using Docker, where arbitrary code can be run safely without risking the host system.

 ## Why do we need a sandboxed runtime?
@@ -126,7 +126,7 @@ The core configuration options are defined in the `[core]` section of the `confi

 - `runtime`
  - Type: `str`
-  - Default: `"docker"`
+  - Default: `"eventstream"`
  - Description: Runtime environment

 - `default_agent`
@@ -35,7 +35,7 @@ To run OpenHands in CLI mode with Docker:
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -45,7 +45,7 @@ docker run -it \
    -v ~/.openhands-state:/.openhands-state \
    --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.23 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.20 \
    python -m openhands.core.cli
 ```

@@ -41,16 +41,8 @@ docker build -t custom-image .

 This will produce a new image called `custom-image`, which will be available in Docker.

-## Using the Docker Command
-
-When running OpenHands using [the docker command](/modules/usage/installation#start-the-app), replace
-`-e SANDBOX_RUNTIME_CONTAINER_IMAGE=...` with `-e SANDBOX_BASE_CONTAINER_IMAGE=<custom image name>`:
-
-```commandline
-docker run -it --rm --pull=always \
-    -e SANDBOX_BASE_CONTAINER_IMAGE=custom-image \
-    ...
-```
+> Note that in the configuration described in this document, OpenHands will run as user "openhands" inside the
+> sandbox and thus all packages installed via the docker file should be available to all users on the system, not just root.

 ## Using the Development Workflow

@@ -112,7 +112,7 @@ To create an evaluation workflow for your benchmark, follow these steps:
   def get_config(instance: pd.Series, metadata: EvalMetadata) -> AppConfig:
       config = AppConfig(
           default_agent=metadata.agent_class,
-           runtime='docker',
+           runtime='eventstream',
           max_iterations=metadata.max_iterations,
           sandbox=SandboxConfig(
               base_container_image='your_container_image',
@@ -32,7 +32,7 @@ To run OpenHands in Headless mode with Docker:
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -e SANDBOX_USER_ID=$(id -u) \
    -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
    -e LLM_API_KEY=$LLM_API_KEY \
@@ -43,7 +43,7 @@ docker run -it \
    -v ~/.openhands-state:/.openhands-state \
    --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.23 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.20 \
    python -m openhands.core.main -t "write a bash script that prints hi"
 ```

@@ -43,10 +43,6 @@
  - General: `Use the WSL 2 based engine` is enabled.
  - Resources > WSL Integration: `Enable integration with my default WSL distro` is enabled.

-  :::note
-  The docker command below to start the app must be run inside the WSL terminal.
-  :::
-
 </details>

 ## Start the App
@@ -54,17 +50,17 @@
 The easiest way to run OpenHands is in Docker.

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik

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

 You'll find OpenHands running at http://localhost:3000!
@@ -16,7 +16,7 @@ some flags being passed to `docker run` that make this possible:

 ```
 docker run # ...
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.20-nikolaik \
    -v /var/run/docker.sock:/var/run/docker.sock \
    # ...
 ```
@@ -22,8 +22,8 @@
    "@mdx-js/react": "^3.1.0",
    "clsx": "^2.0.0",
    "prism-react-renderer": "^2.4.1",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
    "react-icons": "^5.4.0",
    "react-use": "^17.6.0"
  },
@@ -31,7 +31,7 @@
    "@docusaurus/module-type-aliases": "^3.5.1",
    "@docusaurus/tsconfig": "^3.7.0",
    "@docusaurus/types": "^3.5.1",
-    "typescript": "~5.7.3"
+    "typescript": "~5.7.2"
  },
  "browserslist": {
    "production": [
@@ -8,7 +8,7 @@ function CustomFooter() {
    <footer className="custom-footer">
      <div className="footer-content">
        <div className="footer-icons">
-          <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg" target="_blank" rel="noopener noreferrer">
+          <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw" target="_blank" rel="noopener noreferrer">
            <FaSlack />
          </a>
          <a href="https://discord.gg/ESHStjSjD4" target="_blank" rel="noopener noreferrer">
@@ -23,7 +23,7 @@ export function HomepageHeader() {
          <a href="https://codecov.io/github/All-Hands-AI/OpenHands?branch=main"><img alt="CodeCov" src="https://img.shields.io/codecov/c/github/All-Hands-AI/OpenHands?style=for-the-badge&color=blue" /></a>
          <a href="https://github.com/All-Hands-AI/OpenHands/blob/main/LICENSE"><img src="https://img.shields.io/github/license/All-Hands-AI/OpenHands?style=for-the-badge&color=blue" alt="MIT License" /></a>
          <br/>
-          <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg"><img src="https://img.shields.io/badge/Slack-Join%20Us-red?logo=slack&logoColor=white&style=for-the-badge" alt="Join our Slack community" /></a>
+          <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw"><img src="https://img.shields.io/badge/Slack-Join%20Us-red?logo=slack&logoColor=white&style=for-the-badge" alt="Join our Slack community" /></a>
          <a href="https://discord.gg/ESHStjSjD4"><img src="https://img.shields.io/badge/Discord-Join%20Us-purple?logo=discord&logoColor=white&style=for-the-badge" alt="Join our Discord community" /></a>
          <a href="https://github.com/All-Hands-AI/OpenHands/blob/main/CREDITS.md"><img src="https://img.shields.io/badge/Project-Credits-blue?style=for-the-badge&color=FFE165&logo=github&logoColor=white" alt="Credits" /></a>
          <br/>
@@ -69,7 +69,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=False,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -53,7 +53,6 @@ def get_config(
            remote_runtime_api_url=os.environ.get('SANDBOX_REMOTE_RUNTIME_API_URL'),
            keep_runtime_alive=False,
            remote_runtime_init_timeout=3600,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -61,7 +61,6 @@ def get_config(
            remote_runtime_api_url=os.environ.get('SANDBOX_REMOTE_RUNTIME_API_URL'),
            keep_runtime_alive=False,
            remote_runtime_init_timeout=1800,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -67,7 +67,6 @@ def get_config(
            base_container_image=BIOCODER_BENCH_CONTAINER_IMAGE,
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -80,7 +80,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -45,7 +45,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=False,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        workspace_base=None,
        workspace_mount_path=None,
@@ -135,7 +135,6 @@ def get_config(
            remote_runtime_api_url=os.environ.get('SANDBOX_REMOTE_RUNTIME_API_URL'),
            keep_runtime_alive=False,
            remote_runtime_init_timeout=3600,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -71,7 +71,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -56,7 +56,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -49,7 +49,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -70,7 +70,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -91,7 +91,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -55,7 +55,6 @@ def get_config(
            enable_auto_lint=True,
            use_host_network=False,
            runtime_extra_deps='$OH_INTERPRETER_PATH -m pip install scitools-pyke',
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -70,7 +70,6 @@ def get_config(
            remote_runtime_init_timeout=1800,
            keep_runtime_alive=False,
            timeout=120,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -113,7 +113,6 @@ def get_config(
            enable_auto_lint=True,
            use_host_network=False,
            runtime_extra_deps=f'$OH_INTERPRETER_PATH -m pip install {" ".join(MINT_DEPENDENCIES)}',
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -73,7 +73,6 @@ def get_config(
            api_key=os.environ.get('ALLHANDS_API_KEY', None),
            remote_runtime_api_url=os.environ.get('SANDBOX_REMOTE_RUNTIME_API_URL'),
            keep_runtime_alive=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -412,17 +412,6 @@ if __name__ == '__main__':
        with open(metadata_filepath, 'r') as metadata_file:
            data = metadata_file.read()
            metadata = EvalMetadata.model_validate_json(data)
-    else:
-        # Initialize with a dummy metadata when file doesn't exist
-        metadata = EvalMetadata(
-            agent_class="dummy_agent",  # Placeholder agent class
-            llm_config=LLMConfig(model="dummy_model"),  # Minimal LLM config
-            max_iterations=1,  # Minimal iterations
-            eval_output_dir=os.path.dirname(args.input_file),  # Use input file dir as output dir
-            start_time=time.strftime('%Y-%m-%d %H:%M:%S'),  # Current time
-            git_commit=subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8').strip(),  # Current commit
-            dataset=args.dataset  # Dataset name from args
-        )

    # The evaluation harness constrains the signature of `process_instance_func` but we need to
    # pass extra information. Build a new function object to avoid issues with multiprocessing.
@@ -67,11 +67,11 @@ def get_instruction(instance: pd.Series, metadata: EvalMetadata):
        '<uploaded_files>\n'
        f'/workspace/{workspace_dir_name}\n'
        '</uploaded_files>\n'
-        f"I've uploaded a python code repository in the directory {workspace_dir_name}. Consider the following issue description:\n\n"
-        f'<issue_description>\n'
+        f"I've uploaded a python code repository in the directory {workspace_dir_name}. Consider the following PR description:\n\n"
+        f'<pr_description>\n'
        f'{instance.problem_statement}\n'
-        '</issue_description>\n\n'
-        'Can you help me implement the necessary changes to the repository so that the requirements specified in the <issue_description> are met?\n'
+        '</pr_description>\n\n'
+        'Can you help me implement the necessary changes to the repository so that the requirements specified in the <pr_description> are met?\n'
        "I've already taken care of all changes to any of the test files described in the <pr_description>. This means you DON'T have to modify the testing logic or any of the tests in any way!\n"
        'Your task is to make the minimal changes to non-tests files in the /workspace directory to ensure the <pr_description> is satisfied.\n'
        'Follow these steps to resolve the issue:\n'
@@ -139,12 +139,10 @@ def get_config(
            remote_runtime_api_url=os.environ.get('SANDBOX_REMOTE_RUNTIME_API_URL'),
            keep_runtime_alive=False,
            remote_runtime_init_timeout=3600,
-            remote_runtime_api_timeout=120,
            remote_runtime_resource_factor=get_instance_resource_factor(
                dataset_name=metadata.dataset,
                instance_id=instance['instance_id'],
            ),
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -15,25 +15,11 @@ parser.add_argument(
    action='store_true',
    help='Show visualization paths for failed instances',
 )
-parser.add_argument(
-    '--only-x-instances',
-    action='store_true',
-    help='Only show instances that are ran by X',
-)
 args = parser.parse_args()

 df1 = pd.read_json(args.input_file_1, orient='records', lines=True)
 df2 = pd.read_json(args.input_file_2, orient='records', lines=True)

-if args.only_x_instances:
-    instance_ids_1 = set(df1['instance_id'].tolist())
-    print(
-        f'Before removing instances not in X={args.input_file_1}: Y={df2.shape[0]} instances'
-    )
-    df2 = df2[df2['instance_id'].isin(instance_ids_1)]
-    print(
-        f'After removing instances not in X={args.input_file_1}: Y={df2.shape[0]} instances'
-    )

 # Get the intersection of the instance_ids
 df = pd.merge(df1, df2, on='instance_id', how='inner')
@@ -100,7 +86,7 @@ repo_diffs = []
 for repo in all_repos:
    x_count = len(x_only_by_repo.get(repo, []))
    y_count = len(y_only_by_repo.get(repo, []))
-    diff = y_count - x_count
+    diff = abs(x_count - y_count)
    repo_diffs.append((repo, diff))

 # Sort by diff (descending) and then by repo name
@@ -120,13 +106,7 @@ for repo, diff in repo_diffs:
    repo_color = 'red' if is_significant else 'yellow'

    print(f"\n{colored(repo, repo_color, attrs=['bold'])}:")
-    print(
-        colored(
-            f'Difference: {diff} instances! (Larger diff = Y better)',
-            repo_color,
-            attrs=['bold'],
-        )
-    )
+    print(colored(f'Difference: {diff} instances!', repo_color, attrs=['bold']))
    print(colored(f'X resolved but Y failed: ({len(x_instances)} instances)', 'green'))
    if x_instances:
        print('  ' + str(x_instances))
@@ -4,7 +4,6 @@
 import argparse
 import json
 import os
-from glob import glob

 import pandas as pd
 from tqdm import tqdm
@@ -21,7 +20,6 @@ output_md_folder = args.oh_output_file.replace('.jsonl', '.viz')
 print(f'Converting {args.oh_output_file} to markdown files in {output_md_folder}')

 oh_format = pd.read_json(args.oh_output_file, orient='records', lines=True)
-output_dir = os.path.dirname(args.oh_output_file)

 swebench_eval_file = args.oh_output_file.replace('.jsonl', '.swebench_eval.jsonl')
 if os.path.exists(swebench_eval_file):
@@ -59,172 +57,22 @@ def convert_history_to_str(history):
    return ret


-# Load trajectories for resolved instances
-def load_completions(instance_id: str):
-    global output_dir
-    glob_path = os.path.join(output_dir, 'llm_completions', instance_id, '*.json')
-    files = sorted(glob(glob_path))  # this is ascending order
-    # pick the last file (last turn)
-    try:
-        file_path = files[-1]
-    except IndexError:
-        # print(f'No files found for instance {instance_id}: files={files}')
-        return None
-    with open(file_path, 'r') as f:
-        result = json.load(f)
-    # create messages
-    messages = result['messages']
-    messages.append(result['response']['choices'][0]['message'])
-    tools = result['kwargs']['tools']
-    return {
-        'messages': messages,
-        'tools': tools,
-    }
-
-
-def _convert_content(content) -> str:
-    ret = ''
-    if isinstance(content, list):
-        for item in content:
-            assert item['type'] == 'text', 'Only text is supported for now'
-            ret += f'{item["text"]}\n'
-    else:
-        assert isinstance(content, str), 'Only str is supported for now'
-        ret = content
-    return ret
-
-
-def convert_tool_call_to_string(tool_call: dict) -> str:
-    """Convert tool call to content in string format."""
-    if 'function' not in tool_call:
-        raise ValueError("Tool call must contain 'function' key.")
-    if 'id' not in tool_call:
-        raise ValueError("Tool call must contain 'id' key.")
-    if 'type' not in tool_call:
-        raise ValueError("Tool call must contain 'type' key.")
-    if tool_call['type'] != 'function':
-        raise ValueError("Tool call type must be 'function'.")
-
-    ret = f"<function={tool_call['function']['name']}>\n"
-    try:
-        args = json.loads(tool_call['function']['arguments'])
-    except json.JSONDecodeError as e:
-        raise ValueError(
-            f"Failed to parse arguments as JSON. Arguments: {tool_call['function']['arguments']}"
-        ) from e
-    for param_name, param_value in args.items():
-        is_multiline = isinstance(param_value, str) and '\n' in param_value
-        ret += f'<parameter={param_name}>'
-        if is_multiline:
-            ret += '\n'
-        ret += f'{param_value}'
-        if is_multiline:
-            ret += '\n'
-        ret += '</parameter>\n'
-    ret += '</function>'
-    return ret
-
-
-def format_traj(traj, first_n_turns=None, last_n_turns=None) -> str:
-    output = ''
-    system_message = None
-
-    # Handle system message if present
-    if traj[0]['role'] == 'system':
-        system_message = traj[0]
-        traj = traj[1:]
-        content = _convert_content(system_message['content'])
-        output += "*** System Message that describes the assistant's behavior ***\n"
-        output += f'{content}\n'
-
-    # Merge consecutive user messages first
-    merged_traj = []
-    current_messages = []
-
-    n_turns = len(traj)
-    for i, message in enumerate(traj):
-        # Skip this message if...
-        if (
-            # Case 1: first_n_turns specified and we're past it
-            (first_n_turns is not None and i >= first_n_turns and last_n_turns is None)
-            or
-            # Case 2: last_n_turns specified and we're before it
-            (
-                last_n_turns is not None
-                and i < n_turns - last_n_turns
-                and first_n_turns is None
-            )
-            or
-            # Case 3: both specified and we're in the middle section
-            (
-                first_n_turns is not None
-                and last_n_turns is not None
-                and i >= first_n_turns
-                and i < n_turns - last_n_turns
-            )
-        ):
-            continue
-
-        if message['role'] == 'user':
-            current_messages.append(message)
-        else:
-            if current_messages:
-                # Merge all accumulated user messages into one
-                merged_content = '\n'.join(
-                    _convert_content(msg['content']) for msg in current_messages
-                )
-                merged_traj.append({'role': 'user', 'content': merged_content})
-                current_messages = []
-            merged_traj.append(message)
-
-    # Don't forget to handle any remaining user messages
-    if current_messages:
-        merged_content = '\n'.join(
-            _convert_content(msg['content']) for msg in current_messages
-        )
-        merged_traj.append({'role': 'user', 'content': merged_content})
-
-    # Now process the merged trajectory
-    for i, message in enumerate(merged_traj):
-        role, content = message['role'], message['content']
-        content = _convert_content(content) if isinstance(content, list) else content
-        turn_id = i // 2 + 1
-        output += '-' * 100 + '\n'
-        output += f'*** Turn {turn_id} - {role.upper() if role != "tool" else "TOOL EXECUTION RESULT"} ***\n'
-
-        if role == 'user':
-            output += f'{content}\n'
-        elif role == 'tool':
-            output += f'{content}\n'
-        elif role == 'assistant':
-            output += f'{content}\n'
-            if (
-                'tool_calls' in message
-                and message['tool_calls'] is not None
-                and len(message['tool_calls']) > 0
-            ):
-                for toolcall_id, tool_call in enumerate(message['tool_calls']):
-                    output += f'### Tool Call {toolcall_id}\n'
-                    output += f'{convert_tool_call_to_string(tool_call)}\n'
-        else:
-            raise ValueError(f'Unexpected role: {role}')
-
-    output += '-' * 100 + '\n'
-    return output
-
-
 def write_row_to_md_file(row, instance_id_to_test_result):
    if 'git_patch' in row:
        model_patch = row['git_patch']
    elif 'test_result' in row and 'git_patch' in row['test_result']:
        model_patch = row['test_result']['git_patch']
    else:
-        print(f'Row {row} does not have a git_patch')
-        return
+        raise ValueError(f'Row {row} does not have a git_patch')

    test_output = None
-    # Use result from output.jsonl FIRST if available.
-    if 'report' in row and row['report'] is not None:
+    if row['instance_id'] in instance_id_to_test_result:
+        report = instance_id_to_test_result[row['instance_id']].get('report', {})
+        resolved = report.get('resolved', False)
+        test_output = instance_id_to_test_result[row['instance_id']].get(
+            'test_output', None
+        )
+    elif 'report' in row and row['report'] is not None:
        if not isinstance(row['report'], dict):
            resolved = None
            print(
@@ -232,12 +80,6 @@ def write_row_to_md_file(row, instance_id_to_test_result):
            )
        else:
            resolved = row['report'].get('resolved', False)
-    elif row['instance_id'] in instance_id_to_test_result:
-        report = instance_id_to_test_result[row['instance_id']].get('report', {})
-        resolved = report.get('resolved', False)
-        test_output = instance_id_to_test_result[row['instance_id']].get(
-            'test_output', None
-        )
    else:
        resolved = None

@@ -246,8 +88,6 @@ def write_row_to_md_file(row, instance_id_to_test_result):
    os.makedirs(output_md_folder, exist_ok=True)
    filepath = os.path.join(output_md_folder, filename)

-    completions = load_completions(instance_id)
-
    with open(filepath, 'w') as f:
        f.write(f'# {instance_id} (resolved: {resolved})\n')

@@ -257,12 +97,7 @@ def write_row_to_md_file(row, instance_id_to_test_result):
        f.write(json.dumps(row['metadata'], indent=2))
        f.write('\n```\n')

-        # Completion
-        if completions is not None:
-            f.write('## Completion\n')
-            traj = completions['messages']
-            f.write(format_traj(traj))
-
+        # Trajectory
        f.write('## History\n')
        f.write(convert_history_to_str(row['history']))

@@ -207,13 +207,12 @@ with open(args.input_file, 'r') as infile:
    for line in tqdm(infile, desc='Checking for changes'):
        data = json.loads(line)
        instance_id = data['instance_id']
-        current_report = data.get('report', {})
-        new_report = instance_id_to_status[
-            instance_id
-        ]  # if no report, it's not resolved
-        if current_report != new_report:
-            needs_update = True
-            break
+        if instance_id in instance_id_to_status:
+            current_report = data.get('report', {})
+            new_report = instance_id_to_status[instance_id]
+            if current_report != new_report:
+                needs_update = True
+                break

 if not needs_update:
    print('No updates detected. Skipping file update.')
@@ -235,5 +234,6 @@ with open(args.input_file + '.bak', 'r') as infile, open(
    for line in tqdm(infile, desc='Updating output file'):
        data = json.loads(line)
        instance_id = data['instance_id']
-        data['report'] = instance_id_to_status[instance_id]
+        if instance_id in instance_id_to_status:
+            data['report'] = instance_id_to_status[instance_id]
        outfile.write(json.dumps(data) + '\n')
@@ -76,7 +76,7 @@ echo "Running SWE-bench evaluation"
 echo "=============================================================="

 RUN_ID=$(date +"%Y%m%d_%H%M%S")
-N_PROCESS=4
+N_PROCESS=16

 if [ -z "$INSTANCE_ID" ]; then
    echo "Running SWE-bench evaluation on the whole input file..."
@@ -87,7 +87,7 @@ if [ -z "$INSTANCE_ID" ]; then
        --dataset_name "$DATASET_NAME" \
        --split "$SPLIT" \
        --predictions_path $SWEBENCH_FORMAT_JSONL \
-        --timeout 3600 \
+        --timeout 1800 \
        --cache_level instance \
        --max_workers $N_PROCESS \
        --run_id $RUN_ID
@@ -133,7 +133,7 @@ else
        --dataset_name "$DATASET_NAME" \
        --split "$SPLIT" \
        --predictions_path $SWEBENCH_FORMAT_JSONL \
-        --timeout 3600 \
+        --timeout 1800 \
        --instance_ids $INSTANCE_ID \
        --cache_level instance \
        --max_workers $N_PROCESS \
@@ -17,14 +17,11 @@ When the `run_infer.sh` script is started, it will automatically pull all task i

 ```bash
 ./evaluation/benchmarks/the_agent_company/scripts/run_infer.sh \
-  --agent-llm-config <agent-llm-config, default to 'agent'>  \
-  --env-llm-config <env-llm-config, default to 'env'> \
-  --outputs-path <outputs-path, default to outputs> \
-  --server-hostname <server-hostname, default to localhost> \
-  --version <version, default to 1.0.0> \
-  --start-percentile <integer from 0 to 99, default to 0> \
-  --end-percentile <integer from 1 to 100, default to 100>
-
+  --agent-llm-config <agent-llm-config>  \
+  --env-llm-config <env-llm-config> \
+  --outputs-path <outputs-path> \
+  --server-hostname <server-hostname> \
+  --version <version>

 # Example
 ./evaluation/benchmarks/the_agent_company/scripts/run_infer.sh \
@@ -32,9 +29,7 @@ When the `run_infer.sh` script is started, it will automatically pull all task i
  --env-llm-config claude-3-5-sonnet-20240620 \
  --outputs-path outputs \
  --server-hostname localhost \
-  --version 1.0.0 \
-  --start-percentile 10 \
-  --end-percentile 20
+  --version 1.0.0
 ```

 - `agent-llm-config`: the config name for the agent LLM. This should match the config name in config.toml. This is the LLM used by the agent (e.g. CodeActAgent).
@@ -42,11 +37,7 @@ When the `run_infer.sh` script is started, it will automatically pull all task i
 - `outputs-path`: the path to save trajectories and evaluation results.
 - `server-hostname`: the hostname of the server that hosts all the web services. It could be localhost if you are running the evaluation and services on the same machine. If the services are hosted on a remote machine, you must use the hostname of the remote machine rather than IP address.
 - `version`: the version of the task images to use. Currently, the only supported version is 1.0.0.
- `start-percentile`: the start percentile of the task split, must be an integer between 0 to 99.
- `end-percentile`: the end percentile of the task split, must be an integer between 1 to 100 and larger than start-percentile.

-The script is idempotent. If you run it again, it will resume from the last checkpoint. It would usually take 2 days to finish evaluation if you run the whole task set.
-To speed up evaluation, you can use `start-percentile` and `end-percentile` to split the tasks for higher parallelism,
-provided concurrent runs are **targeting different servers**.
+The script is idempotent. If you run it again, it will resume from the last checkpoint. It would usually take a few days to finish evaluation.

 Note: the script will automatically skip a task if it encounters an error. This usually happens when the OpenHands runtime dies due to some unexpected errors. This means even if the script finishes, it might not have evaluated all tasks. You can manually resume the evaluation by running the script again.
@@ -50,7 +50,6 @@ def get_config(
            # large enough timeout, since some testcases take very long to run
            timeout=300,
            api_key=os.environ.get('ALLHANDS_API_KEY', None),
-            remote_runtime_enable_retries=True,
        ),
        # we mount trajectories path so that trajectories, generated by OpenHands
        # controller, can be accessible to the evaluator file in the runtime container
@@ -56,14 +56,6 @@ while [[ $# -gt 0 ]]; do
            VERSION="$2"
            shift 2
            ;;
-        --start-percentile)
-            START_PERCENTILE="$2"
-            shift 2
-            ;;
-        --end-percentile)
-            END_PERCENTILE="$2"
-            shift 2
-            ;;
        *)
            echo "Unknown argument: $1"
            exit 1
@@ -77,53 +69,16 @@ if [[ ! "$OUTPUTS_PATH" = /* ]]; then
    OUTPUTS_PATH="$(cd "$(dirname "$OUTPUTS_PATH")" 2>/dev/null && pwd)/$(basename "$OUTPUTS_PATH")"
 fi

-: "${START_PERCENTILE:=0}"  # Default to 0 percentile (first line)
-: "${END_PERCENTILE:=100}"  # Default to 100 percentile (last line)
-
-# Validate percentile ranges if provided
-if ! [[ "$START_PERCENTILE" =~ ^[0-9]+$ ]] || ! [[ "$END_PERCENTILE" =~ ^[0-9]+$ ]]; then
-    echo "Error: Percentiles must be integers"
-    exit 1
-fi
-
-if [ "$START_PERCENTILE" -ge "$END_PERCENTILE" ]; then
-    echo "Error: Start percentile must be less than end percentile"
-    exit 1
-fi
-
-if [ "$START_PERCENTILE" -lt 0 ] || [ "$END_PERCENTILE" -gt 100 ]; then
-    echo "Error: Percentiles must be between 0 and 100"
-    exit 1
-fi
-
 echo "Using agent LLM config: $AGENT_LLM_CONFIG"
 echo "Using environment LLM config: $ENV_LLM_CONFIG"
 echo "Outputs path: $OUTPUTS_PATH"
 echo "Server hostname: $SERVER_HOSTNAME"
 echo "Version: $VERSION"
-echo "Start Percentile: $START_PERCENTILE"
-echo "End Percentile: $END_PERCENTILE"

 echo "Downloading tasks.md..."
 rm -f tasks.md
 wget https://github.com/TheAgentCompany/TheAgentCompany/releases/download/${VERSION}/tasks.md

-total_lines=$(cat tasks.md | grep "ghcr.io/theagentcompany" | wc -l)
-if [ "$total_lines" -ne 175 ]; then
-    echo "Error: Expected 175 tasks in tasks.md but found $total_lines lines"
-    exit 1
-fi
-
-# Calculate line numbers based on percentiles
-start_line=$(echo "scale=0; ($total_lines * $START_PERCENTILE / 100) + 1" | bc)
-end_line=$(echo "scale=0; $total_lines * $END_PERCENTILE / 100" | bc)
-
-echo "Using tasks No. $start_line to $end_line (inclusive) out of 1-175 tasks"
-
-# Create a temporary file with just the desired range
-temp_file="tasks_${START_PERCENTILE}_${END_PERCENTILE}.md"
-sed -n "${start_line},${end_line}p" tasks.md > "$temp_file"
-
 while IFS= read -r task_image; do
    docker pull $task_image

@@ -153,8 +108,8 @@ while IFS= read -r task_image; do
    docker images "ghcr.io/all-hands-ai/runtime" -q | xargs -r docker rmi -f
    docker volume prune -f
    docker system prune -f
-done < "$temp_file"
+done < tasks.md

-rm tasks.md "$temp_file"
+rm tasks.md

 echo "All evaluation completed successfully!"
@@ -50,7 +50,6 @@ def get_config(
            base_container_image='python:3.12-bookworm',
            enable_auto_lint=True,
            use_host_network=False,
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -1,50 +0,0 @@
-# VisualWebArena Evaluation with OpenHands Browsing Agents
-
-This folder contains evaluation for [VisualWebArena](https://github.com/web-arena-x/visualwebarena) benchmark, powered by [BrowserGym](https://github.com/ServiceNow/BrowserGym) for easy evaluation of how well an agent capable of browsing can perform on realistic web browsing tasks.
-
-## Setup Environment and LLM Configuration
-
-Please follow instruction [here](../../README.md#setup) to setup your local development environment and LLM.
-
-## Setup VisualWebArena Environment
-
-VisualWebArena requires you to set up websites containing pre-populated content that is accessible via URL to the machine running the OpenHands agents.
-Follow [this document](https://github.com/web-arena-x/visualwebarena/blob/main/environment_docker/README.md) to set up your own VisualWebArena environment through local servers or AWS EC2 instances.
-Take note of the base URL (`$VISUALWEBARENA_BASE_URL`) of the machine where the environment is installed.
-
-## Test if your environment works
-
-Access with browser the above VisualWebArena website URLs and see if they load correctly.
-If you cannot access the website, make sure the firewall allows public access of the aforementioned ports on your server
-Check the network security policy if you are using an AWS machine.
-Follow the VisualWebArena environment setup guide carefully, and make sure the URL fields are populated with the correct base URL of your server.
-
-## Run Evaluation
-
-```bash
-export VISUALWEBARENA_BASE_URL=<YOUR_SERVER_URL_HERE>
-export OPENAI_API_KEY="yourkey" # this OpenAI API key is required for some visualWebArena validators that utilize LLMs
-export OPENAI_BASE_URL="https://api.openai.com/v1/" # base URL for OpenAI model used for VisualWebArena evaluation
-bash evaluation/benchmarks/visualwebarena/scripts/run_infer.sh llm.claude HEAD VisualBrowsingAgent
-```
-
-Results will be in `evaluation/evaluation_outputs/outputs/visualwebarena/`
-
-To calculate the success rate, run:
-
-```sh
-poetry run python evaluation/benchmarks/visualwebarena/get_success_rate.py evaluation/evaluation_outputs/outputs/visualwebarena/SOME_AGENT/EXP_NAME/output.jsonl
-```
-
-## Submit your evaluation results
-
-You can start your own fork of [our huggingface evaluation outputs](https://huggingface.co/spaces/OpenHands/evaluation) and submit a PR of your evaluation results following the guide [here](https://huggingface.co/docs/hub/en/repositories-pull-requests-discussions#pull-requests-and-discussions).
-
-## VisualBrowsingAgent V1.0 result
-
-Tested on VisualBrowsingAgent V1.0
-
-VisualWebArena, 910 tasks (high cost, single run due to fixed task), max step 15. Resolve rates are:
-
- GPT4o: 26.15%
- Claude-3.5 Sonnet: 25.27%
@@ -1,40 +0,0 @@
-import argparse
-import json
-
-import browsergym.visualwebarena  # noqa F401 register visualwebarena tasks as gym environments
-import gymnasium as gym
-
-parser = argparse.ArgumentParser(description='Calculate average reward.')
-parser.add_argument('output_path', type=str, help='path to output.jsonl')
-
-args = parser.parse_args()
-
-if __name__ == '__main__':
-    env_ids = [
-        id
-        for id in gym.envs.registry.keys()
-        if id.startswith('browsergym/visualwebarena')
-    ]
-    total_num = len(env_ids)
-    print('Total number of tasks: ', total_num)
-    total_reward = 0
-    total_cost = 0
-    actual_num = 0
-    with open(args.output_path, 'r') as f:
-        for line in f:
-            data = json.loads(line)
-            actual_num += 1
-            total_cost += data['metrics']['accumulated_cost']
-            reward = data['test_result']['reward']
-            if reward >= 0:
-                total_reward += data['test_result']['reward']
-            else:
-                actual_num -= 1
-    avg_reward = total_reward / total_num
-    print('Total reward: ', total_reward)
-    print('Success Rate: ', avg_reward)
-
-    avg_cost = total_cost / actual_num
-    print('Avg Cost: ', avg_cost)
-    print('Total Cost: ', total_cost)
-    print('Actual number of tasks finished: ', actual_num)
@@ -1,255 +0,0 @@
-import asyncio
-import json
-import os
-from typing import Any
-
-import browsergym.visualwebarena  # noqa F401 register visualwebarena tasks as gym environments
-import gymnasium as gym
-import pandas as pd
-
-from evaluation.utils.shared import (
-    EvalMetadata,
-    EvalOutput,
-    compatibility_for_eval_history_pairs,
-    make_metadata,
-    prepare_dataset,
-    reset_logger_for_multiprocessing,
-    run_evaluation,
-    update_llm_config_for_completions_logging,
-)
-from openhands.controller.state.state import State
-from openhands.core.config import (
-    AppConfig,
-    SandboxConfig,
-    get_llm_config_arg,
-    parse_arguments,
-)
-from openhands.core.logger import openhands_logger as logger
-from openhands.core.main import create_runtime, run_controller
-from openhands.events.action import (
-    BrowseInteractiveAction,
-    CmdRunAction,
-    MessageAction,
-)
-from openhands.events.observation import CmdOutputObservation
-from openhands.runtime.base import Runtime
-from openhands.runtime.browser.browser_env import (
-    BROWSER_EVAL_GET_GOAL_ACTION,
-    BROWSER_EVAL_GET_REWARDS_ACTION,
-)
-from openhands.utils.async_utils import call_async_from_sync
-
-SUPPORTED_AGENT_CLS = {'VisualBrowsingAgent'}
-AGENT_CLS_TO_FAKE_USER_RESPONSE_FN = {
-    'VisualBrowsingAgent': 'Continue the task. IMPORTANT: do not talk to the user until you have finished the task',
-}
-
-
-def get_config(
-    metadata: EvalMetadata,
-    env_id: str,
-) -> AppConfig:
-    base_url = os.environ.get('VISUALWEBARENA_BASE_URL', None)
-    openai_api_key = os.environ.get('OPENAI_API_KEY', None)
-    openai_base_url = os.environ.get('OPENAI_BASE_URL', None)
-    assert base_url is not None, 'VISUALWEBARENA_BASE_URL must be set'
-    assert openai_api_key is not None, 'OPENAI_API_KEY must be set'
-    assert openai_base_url is not None, 'OPENAI_BASE_URL must be set'
-    config = AppConfig(
-        default_agent=metadata.agent_class,
-        run_as_openhands=False,
-        runtime='docker',
-        max_iterations=metadata.max_iterations,
-        sandbox=SandboxConfig(
-            base_container_image='python:3.12-bookworm',
-            enable_auto_lint=True,
-            use_host_network=False,
-            browsergym_eval_env=env_id,
-            runtime_startup_env_vars={
-                'BASE_URL': base_url,
-                'OPENAI_API_KEY': openai_api_key,
-                'OPENAI_BASE_URL': openai_base_url,
-                'VWA_CLASSIFIEDS': f'{base_url}:9980',
-                'VWA_CLASSIFIEDS_RESET_TOKEN': '4b61655535e7ed388f0d40a93600254c',
-                'VWA_SHOPPING': f'{base_url}:7770',
-                'VWA_SHOPPING_ADMIN': f'{base_url}:7780/admin',
-                'VWA_REDDIT': f'{base_url}:9999',
-                'VWA_GITLAB': f'{base_url}:8023',
-                'VWA_WIKIPEDIA': f'{base_url}:8888',
-                'VWA_HOMEPAGE': f'{base_url}:4399',
-            },
-            timeout=300,
-            remote_runtime_enable_retries=True,
-        ),
-        # do not mount workspace
-        workspace_base=None,
-        workspace_mount_path=None,
-        attach_to_existing=True,
-    )
-    config.set_llm_config(
-        update_llm_config_for_completions_logging(
-            metadata.llm_config,
-            metadata.eval_output_dir,
-            env_id,
-        )
-    )
-    return config
-
-
-def initialize_runtime(
-    runtime: Runtime,
-) -> tuple[str, list]:
-    """Initialize the runtime for the agent.
-
-    This function is called before the runtime is used to run the agent.
-    """
-    logger.info(f"{'-' * 50} BEGIN Runtime Initialization Fn {'-' * 50}")
-    obs: CmdOutputObservation
-
-    # Set instance id
-    action = CmdRunAction(command='mkdir -p /workspace')
-    logger.info(action, extra={'msg_type': 'ACTION'})
-    obs = runtime.run_action(action)
-    assert obs.exit_code == 0
-    action = BrowseInteractiveAction(browser_actions=BROWSER_EVAL_GET_GOAL_ACTION)
-    logger.info(action, extra={'msg_type': 'ACTION'})
-    obs = runtime.run_action(action)
-    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
-    goal = obs.content
-    goal_image_urls = []
-    if hasattr(obs, 'goal_image_urls'):
-        goal_image_urls = obs.goal_image_urls
-    logger.info(f"{'-' * 50} END Runtime Initialization Fn {'-' * 50}")
-    return goal, goal_image_urls
-
-
-def complete_runtime(
-    runtime: Runtime,
-) -> dict[str, Any]:
-    """Complete the runtime for the agent.
-
-    This function is called before the runtime is used to run the agent.
-    If you need to do something in the sandbox to get the correctness metric after
-    the agent has run, modify this function.
-    """
-    logger.info(f"{'-' * 50} BEGIN Runtime Completion Fn {'-' * 50}")
-    obs: CmdOutputObservation
-
-    action = BrowseInteractiveAction(browser_actions=BROWSER_EVAL_GET_REWARDS_ACTION)
-    logger.info(action, extra={'msg_type': 'ACTION'})
-    obs = runtime.run_action(action)
-    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
-
-    logger.info(f"{'-' * 50} END Runtime Completion Fn {'-' * 50}")
-    return {
-        'rewards': json.loads(obs.content),
-    }
-
-
-def process_instance(
-    instance: pd.Series,
-    metadata: EvalMetadata,
-    reset_logger: bool = True,
-):
-    env_id = instance.instance_id
-
-    config = get_config(metadata, env_id)
-
-    # Setup the logger properly, so you can run multi-processing to parallelize the evaluation
-    if reset_logger:
-        log_dir = os.path.join(metadata.eval_output_dir, 'infer_logs')
-        reset_logger_for_multiprocessing(logger, env_id, log_dir)
-    else:
-        logger.info(f'Starting evaluation for instance {env_id}.')
-
-    runtime = create_runtime(config)
-    call_async_from_sync(runtime.connect)
-    task_str, goal_image_urls = initialize_runtime(runtime)
-    initial_user_action = MessageAction(content=task_str, image_urls=goal_image_urls)
-    state: State | None = asyncio.run(
-        run_controller(
-            config=config,
-            initial_user_action=initial_user_action,
-            runtime=runtime,
-        )
-    )
-    # ======= Attempt to evaluate the agent's environment impact =======
-
-    # If you are working on some simpler benchmark that only evaluates the final model output (e.g., in a MessageAction)
-    # You can simply get the LAST `MessageAction` from the returned `state.history` and parse it for evaluation.
-
-    if state is None:
-        raise ValueError('State should not be None.')
-
-    metrics = state.metrics.get() if state.metrics else None
-
-    # Instruction obtained from the first message from the USER
-    instruction = ''
-    for event in state.history:
-        if isinstance(event, MessageAction):
-            instruction = event.content
-            break
-
-    try:
-        return_val = complete_runtime(runtime)
-        logger.info(f'Return value from complete_runtime: {return_val}')
-        reward = max(return_val['rewards'])
-    except Exception:
-        reward = -1.0  # kept -1 to identify instances for which evaluation failed.
-
-    # history is now available as a stream of events, rather than list of pairs of (Action, Observation)
-    # for compatibility with the existing output format, we can remake the pairs here
-    # remove when it becomes unnecessary
-    histories = compatibility_for_eval_history_pairs(state.history)
-
-    # Save the output
-    output = EvalOutput(
-        instance_id=env_id,
-        instruction=instruction,
-        metadata=metadata,
-        history=histories,
-        metrics=metrics,
-        error=state.last_error if state and state.last_error else None,
-        test_result={
-            'reward': reward,
-        },
-    )
-    runtime.close()
-    return output
-
-
-if __name__ == '__main__':
-    args = parse_arguments()
-
-    dataset = pd.DataFrame(
-        {
-            'instance_id': [
-                id
-                for id in gym.envs.registry.keys()
-                if id.startswith('browsergym/visualwebarena')
-            ]
-        }
-    )
-    llm_config = None
-    if args.llm_config:
-        llm_config = get_llm_config_arg(args.llm_config)
-    if llm_config is None:
-        raise ValueError(f'Could not find LLM config: --llm_config {args.llm_config}')
-    metadata = make_metadata(
-        llm_config,
-        'visualwebarena',
-        args.agent_cls,
-        args.max_iterations,
-        args.eval_note,
-        args.eval_output_dir,
-    )
-    output_file = os.path.join(metadata.eval_output_dir, 'output.jsonl')
-    instances = prepare_dataset(dataset, output_file, args.eval_n_limit)
-
-    run_evaluation(
-        instances,
-        metadata,
-        output_file,
-        args.eval_num_workers,
-        process_instance,
-    )
@@ -1,48 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-source "evaluation/utils/version_control.sh"
-
-# configure browsing agent
-export USE_NAV="true"
-export USE_CONCISE_ANSWER="true"
-
-MODEL_CONFIG=$1
-COMMIT_HASH=$2
-AGENT=$3
-EVAL_LIMIT=$4
-NUM_WORKERS=$5
-
-if [ -z "$NUM_WORKERS" ]; then
-  NUM_WORKERS=1
-  echo "Number of workers not specified, use default $NUM_WORKERS"
-fi
-checkout_eval_branch
-
-if [ -z "$AGENT" ]; then
-  echo "Agent not specified, use default VisualBrowsingAgent"
-  AGENT="VisualBrowsingAgent"
-fi
-
-get_openhands_version
-
-echo "AGENT: $AGENT"
-echo "AGENT_VERSION: $OPENHANDS_VERSION"
-echo "MODEL_CONFIG: $MODEL_CONFIG"
-
-EVAL_NOTE="${OPENHANDS_VERSION}"
-
-COMMAND="poetry run python evaluation/benchmarks/visualwebarena/run_infer.py \
-  --agent-cls $AGENT \
-  --llm-config $MODEL_CONFIG \
-  --max-iterations 15 \
-  --eval-num-workers $NUM_WORKERS \
-  --eval-note $EVAL_NOTE"
-
-if [ -n "$EVAL_LIMIT" ]; then
-  echo "EVAL_LIMIT: $EVAL_LIMIT"
-  COMMAND="$COMMAND --eval-n-limit $EVAL_LIMIT"
-fi
-
-# Run the command
-eval $COMMAND
@@ -71,7 +71,6 @@ def get_config(
                'MAP': f'{base_url}:3000',
                'HOMEPAGE': f'{base_url}:4399',
            },
-            remote_runtime_enable_retries=True,
        ),
        # do not mount workspace
        workspace_base=None,
@@ -35,7 +35,6 @@ from openhands.utils.async_utils import call_async_from_sync
 FAKE_RESPONSES = {
    'CodeActAgent': fake_user_response,
    'DelegatorAgent': fake_user_response,
-    'VisualBrowsingAgent': fake_user_response,
 }


@@ -1,6 +1,6 @@
-import { render, screen, waitFor } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, test } from "vitest";
 import { ChatMessage } from "#/components/features/chat/chat-message";

 describe("ChatMessage", () => {
@@ -45,9 +45,7 @@ describe("ChatMessage", () => {

    await user.click(copyToClipboardButton);

-    await waitFor(() =>
-      expect(navigator.clipboard.readText()).resolves.toBe("Hello, World!"),
-    );
+    expect(navigator.clipboard.readText()).resolves.toBe("Hello, World!");
  });

  it("should display an error toast if copying content to clipboard fails", async () => {});
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 import { screen } from "@testing-library/react";
 import { renderWithProviders } from "test-utils";
 import { ExpandableMessage } from "#/components/features/chat/expandable-message";
-import { vi } from "vitest"
+import { vi } from "vitest";

 vi.mock("react-i18next", async () => {
  const actual = await vi.importActual("react-i18next");
@@ -1,45 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { describe, expect, it, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { AnalyticsConsentFormModal } from "#/components/features/analytics/analytics-consent-form-modal";
-import OpenHands from "#/api/open-hands";
-import { SettingsProvider } from "#/context/settings-context";
-import { AuthProvider } from "#/context/auth-context";
-
-describe("AnalyticsConsentFormModal", () => {
-  it("should call saveUserSettings with default settings on confirm reset settings", async () => {
-    const user = userEvent.setup();
-    const onCloseMock = vi.fn();
-    const saveUserSettingsSpy = vi.spyOn(OpenHands, "saveSettings");
-
-    render(<AnalyticsConsentFormModal onClose={onCloseMock} />, {
-      wrapper: ({ children }) => (
-        <AuthProvider>
-          <QueryClientProvider client={new QueryClient()}>
-            <SettingsProvider>{children}</SettingsProvider>
-          </QueryClientProvider>
-        </AuthProvider>
-      ),
-    });
-
-    const confirmButton = screen.getByTestId("confirm-preferences");
-    await user.click(confirmButton);
-
-    expect(saveUserSettingsSpy).toHaveBeenCalledWith({
-      user_consents_to_analytics: true,
-      agent: "CodeActAgent",
-      confirmation_mode: false,
-      enable_default_condenser: false,
-      github_token: undefined,
-      language: "en",
-      llm_api_key: undefined,
-      llm_base_url: "",
-      llm_model: "anthropic/claude-3-5-sonnet-20241022",
-      remote_runtime_resource_factor: 1,
-      security_analyzer: "",
-      unset_github_token: undefined,
-    });
-    expect(onCloseMock).toHaveBeenCalled();
-  });
-});
@@ -1,14 +1,5 @@
 import { render, screen, within } from "@testing-library/react";
-import {
-  afterAll,
-  afterEach,
-  beforeAll,
-  describe,
-  expect,
-  it,
-  test,
-  vi,
-} from "vitest";
+import { afterEach, describe, expect, it, test, vi } from "vitest";
 import userEvent from "@testing-library/user-event";
 import { formatTimeDelta } from "#/utils/format-time-delta";
 import { ConversationCard } from "#/components/features/conversation-panel/conversation-card";
@@ -20,18 +11,10 @@ describe("ConversationCard", () => {
  const onChangeTitle = vi.fn();
  const onDownloadWorkspace = vi.fn();

-  beforeAll(() => {
-    vi.stubGlobal("window", { open: vi.fn() });
-  });
-
  afterEach(() => {
    vi.clearAllMocks();
  });

-  afterAll(() => {
-    vi.unstubAllGlobals();
-  });
-
  it("should render the conversation card", () => {
    render(
      <ConversationCard
@@ -46,8 +29,9 @@ describe("ConversationCard", () => {
    const expectedDate = `${formatTimeDelta(new Date("2021-10-01T12:00:00Z"))} ago`;

    const card = screen.getByTestId("conversation-card");
+    const title = within(card).getByTestId("conversation-card-title");

-    within(card).getByText("Conversation 1");
+    expect(title).toHaveValue("Conversation 1");
    within(card).getByText(expectedDate);
  });

@@ -164,8 +148,10 @@ describe("ConversationCard", () => {
      />,
    );

-    await clickOnEditButton(user);
    const title = screen.getByTestId("conversation-card-title");
+    expect(title).toBeDisabled();
+
+    await clickOnEditButton(user);

    expect(title).toBeEnabled();
    expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
@@ -178,6 +164,7 @@ describe("ConversationCard", () => {

    expect(onChangeTitle).toHaveBeenCalledWith("New Conversation Name");
    expect(title).toHaveValue("New Conversation Name");
+    expect(title).toBeDisabled();
  });

  it("should reset title and not call onChangeTitle when the title is empty", async () => {
@@ -204,27 +191,7 @@ describe("ConversationCard", () => {
    expect(title).toHaveValue("Conversation 1");
  });

-  test("clicking the title should trigger the onClick handler", async () => {
-    const user = userEvent.setup();
-    render(
-      <ConversationCard
-        onClick={onClick}
-        onDelete={onDelete}
-        isActive
-        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
-      />,
-    );
-
-    const title = screen.getByTestId("conversation-card-title");
-    await user.click(title);
-
-    expect(onClick).toHaveBeenCalled();
-  });
-
-  test("clicking the title should not trigger the onClick handler if edit mode", async () => {
+  test("clicking the title should not trigger the onClick handler", async () => {
    const user = userEvent.setup();
    render(
      <ConversationCard
@@ -237,8 +204,6 @@ describe("ConversationCard", () => {
      />,
    );

-    await clickOnEditButton(user);
-
    const title = screen.getByTestId("conversation-card-title");
    await user.click(title);

@@ -1,4 +1,4 @@
-import { render, screen, waitFor, within } from "@testing-library/react";
+import { render, screen, within } from "@testing-library/react";
 import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
  QueryClientProvider,
@@ -7,12 +7,10 @@ import {
 } from "@tanstack/react-query";
 import userEvent from "@testing-library/user-event";
 import { createRoutesStub } from "react-router";
-import React from "react";
 import { ConversationPanel } from "#/components/features/conversation-panel/conversation-panel";
 import OpenHands from "#/api/open-hands";
 import { AuthProvider } from "#/context/auth-context";
 import { clickOnEditButton } from "./utils";
-import { queryClientConfig } from "#/query-client-config";

 describe("ConversationPanel", () => {
  const onCloseMock = vi.fn();
@@ -179,10 +177,9 @@ describe("ConversationPanel", () => {
    const user = userEvent.setup();
    renderConversationPanel();
    const cards = await screen.findAllByTestId("conversation-card");
+    const title = within(cards[0]).getByTestId("conversation-card-title");

-    const card = cards[0];
-    await clickOnEditButton(user, card);
-    const title = within(card).getByTestId("conversation-card-title");
+    await clickOnEditButton(user);

    await user.clear(title);
    await user.type(title, "Conversation 1 Renamed");
@@ -203,10 +200,7 @@ describe("ConversationPanel", () => {
    const user = userEvent.setup();
    renderConversationPanel();
    const cards = await screen.findAllByTestId("conversation-card");
-
-    const card = cards[0];
-    await clickOnEditButton(user, card);
-    const title = within(card).getByTestId("conversation-card-title");
+    const title = within(cards[0]).getByTestId("conversation-card-title");

    await user.click(title);
    await user.tab();
@@ -231,53 +225,10 @@ describe("ConversationPanel", () => {
  it("should call onClose after clicking a card", async () => {
    renderConversationPanel();
    const cards = await screen.findAllByTestId("conversation-card");
-    const firstCard = cards[1];
+    const firstCard = cards[0];

    await userEvent.click(firstCard);

    expect(onCloseMock).toHaveBeenCalledOnce();
  });
-
-  it("should refetch data on rerenders", async () => {
-    // We need to simulate the toggling of the component to test the refetching
-    function PanelWithToggle() {
-      const [isOpen, setIsOpen] = React.useState(true);
-      return (
-        <>
-          <button type="button" onClick={() => setIsOpen((prev) => !prev)}>
-            Toggle
-          </button>
-          {isOpen && <ConversationPanel onClose={onCloseMock} />}
-        </>
-      );
-    }
-
-    const MyRouterStub = createRoutesStub([
-      {
-        Component: PanelWithToggle,
-        path: "/",
-      },
-    ]);
-
-    const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
-    render(<MyRouterStub />, {
-      wrapper: ({ children }) => (
-        <AuthProvider>
-          <QueryClientProvider client={new QueryClient(queryClientConfig)}>
-            {children}
-          </QueryClientProvider>
-        </AuthProvider>
-      ),
-    });
-
-    await waitFor(() => expect(getUserConversationsSpy).toHaveBeenCalledOnce());
-
-    const button = screen.getByText("Toggle");
-    await userEvent.click(button);
-    await userEvent.click(button);
-
-    await waitFor(() =>
-      expect(getUserConversationsSpy).toHaveBeenCalledTimes(2),
-    );
-  });
 });
@@ -1,16 +1,11 @@
 import { screen, within } from "@testing-library/react";
 import { UserEvent } from "@testing-library/user-event";

-export const clickOnEditButton = async (
-  user: UserEvent,
-  container?: HTMLElement,
-) => {
-  const wrapper = container ? within(container) : screen;
-
-  const ellipsisButton = wrapper.getByTestId("ellipsis-button");
+export const clickOnEditButton = async (user: UserEvent) => {
+  const ellipsisButton = screen.getByTestId("ellipsis-button");
  await user.click(ellipsisButton);

-  const menu = wrapper.getByTestId("context-menu");
+  const menu = screen.getByTestId("context-menu");
  const editButton = within(menu).getByTestId("edit-button");

  await user.click(editButton);
@@ -1,26 +1,50 @@
-import { screen, within } from "@testing-library/react";
+import { screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { renderWithProviders } from "test-utils";
 import { createRoutesStub } from "react-router";
-import { AxiosError } from "axios";
 import { Sidebar } from "#/components/features/sidebar/sidebar";
+import { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
 import OpenHands from "#/api/open-hands";
-
-// These tests will now fail because the conversation panel is rendered through a portal
-// and technically not a child of the Sidebar component.
-
-const RouterStub = createRoutesStub([
-  {
-    path: "/conversation/:conversationId",
-    Component: () => <Sidebar />,
-  },
-]);
-
-const renderSidebar = () =>
-  renderWithProviders(<RouterStub initialEntries={["/conversation/123"]} />);
+import { MOCK_USER_PREFERENCES } from "#/mocks/handlers";

 describe("Sidebar", () => {
+  const RouterStub = createRoutesStub([
+    {
+      path: "/conversation/:conversationId",
+      Component: Sidebar,
+    },
+  ]);
+
+  const renderSidebar = () =>
+    renderWithProviders(<RouterStub initialEntries={["/conversation/123"]} />);
+
+  it.skipIf(!MULTI_CONVERSATION_UI)(
+    "should have the conversation panel open by default",
+    () => {
+      renderSidebar();
+      expect(screen.getByTestId("conversation-panel")).toBeInTheDocument();
+    },
+  );
+
+  it.skipIf(!MULTI_CONVERSATION_UI)(
+    "should toggle the conversation panel",
+    async () => {
+      const user = userEvent.setup();
+      renderSidebar();
+
+      const projectPanelButton = screen.getByTestId(
+        "toggle-conversation-panel",
+      );
+
+      await user.click(projectPanelButton);
+
+      expect(
+        screen.queryByTestId("conversation-panel"),
+      ).not.toBeInTheDocument();
+    },
+  );
+
  describe("Settings", () => {
    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
    const saveSettingsSpy = vi.spyOn(OpenHands, "saveSettings");
@@ -29,9 +53,16 @@ describe("Sidebar", () => {
      vi.clearAllMocks();
    });

-    it("should fetch settings data on mount", () => {
-      renderSidebar();
-      expect(getSettingsSpy).toHaveBeenCalledOnce();
+    it("should fetch settings data on mount and if the user is authenticated", async () => {
+      const authenticateSpy = vi.spyOn(OpenHands, "authenticate");
+
+      const { rerender } = renderSidebar();
+      expect(getSettingsSpy).not.toHaveBeenCalled();
+
+      authenticateSpy.mockResolvedValueOnce(true);
+      rerender(<RouterStub initialEntries={["/conversation/123"]} />);
+
+      await waitFor(() => expect(getSettingsSpy).toHaveBeenCalledOnce());
    });

    it("should send all settings data when saving AI configuration", async () => {
@@ -48,12 +79,35 @@ describe("Sidebar", () => {
      await user.click(saveButton);

      expect(saveSettingsSpy).toHaveBeenCalledWith({
-        agent: "CodeActAgent",
-        confirmation_mode: false,
-        enable_default_condenser: false,
-        language: "en",
-        llm_model: "anthropic/claude-3-5-sonnet-20241022",
-        remote_runtime_resource_factor: 1,
+        ...MOCK_USER_PREFERENCES.settings,
+        // the actual values are falsey (null or "") but we're checking for undefined
+        llm_api_key: undefined,
+        llm_base_url: undefined,
+        security_analyzer: undefined,
+      });
+    });
+
+    it("should send all settings data when saving account settings", async () => {
+      const user = userEvent.setup();
+      renderSidebar();
+
+      const userAvatar = screen.getByTestId("user-avatar");
+      await user.click(userAvatar);
+
+      const menu = screen.getByTestId("account-settings-context-menu");
+      const accountSettingsButton = within(menu).getByTestId(
+        "account-settings-button",
+      );
+      await user.click(accountSettingsButton);
+
+      const accountSettingsModal = screen.getByTestId("account-settings-form");
+      const saveButton =
+        within(accountSettingsModal).getByTestId("save-settings");
+      await user.click(saveButton);
+
+      expect(saveSettingsSpy).toHaveBeenCalledWith({
+        ...MOCK_USER_PREFERENCES.settings,
+        llm_api_key: undefined, // null or undefined
      });
    });

@@ -83,25 +137,14 @@ describe("Sidebar", () => {
        within(accountSettingsModal).getByLabelText(/GITHUB\$TOKEN_LABEL/i);
      await user.type(tokenInput, "new-token");

-      const analyticsConsentInput =
-        within(accountSettingsModal).getByTestId("analytics-consent");
-      await user.click(analyticsConsentInput);
-
      const saveButton =
        within(accountSettingsModal).getByTestId("save-settings");
      await user.click(saveButton);

      expect(saveSettingsSpy).toHaveBeenCalledWith({
-        agent: "CodeActAgent",
-        confirmation_mode: false,
-        enable_default_condenser: false,
-        github_token: "new-token",
+        ...MOCK_USER_PREFERENCES.settings,
        language: "no",
-        llm_base_url: "",
-        llm_model: "anthropic/claude-3-5-sonnet-20241022",
-        remote_runtime_resource_factor: 1,
-        security_analyzer: "",
-        user_consents_to_analytics: true,
+        llm_api_key: undefined, // null or undefined
      });
    });

@@ -115,9 +158,7 @@ describe("Sidebar", () => {
      const settingsModal = screen.getByTestId("ai-config-modal");

      // Click the advanced options switch to show the API key input
-      const advancedOptionsSwitch = within(settingsModal).getByTestId(
-        "advanced-option-switch",
-      );
+      const advancedOptionsSwitch = within(settingsModal).getByTestId("advanced-option-switch");
      await user.click(advancedOptionsSwitch);

      const apiKeyInput = within(settingsModal).getByLabelText(/API\$KEY/i);
@@ -129,53 +170,11 @@ describe("Sidebar", () => {
      await user.click(saveButton);

      expect(saveSettingsSpy).toHaveBeenCalledWith({
-        agent: "CodeActAgent",
-        confirmation_mode: false,
-        enable_default_condenser: false,
-        language: "en",
+        ...MOCK_USER_PREFERENCES.settings,
+        llm_api_key: undefined,
        llm_base_url: "",
-        llm_model: "anthropic/claude-3-5-sonnet-20241022",
-        remote_runtime_resource_factor: 1,
+        security_analyzer: undefined,
      });
    });
  });
-
-  describe("Settings Modal", () => {
-    it("should open the settings modal if the user clicks the settings button", async () => {
-      const user = userEvent.setup();
-      renderSidebar();
-
-      expect(screen.queryByTestId("ai-config-modal")).not.toBeInTheDocument();
-
-      const settingsButton = screen.getByTestId("settings-button");
-      await user.click(settingsButton);
-
-      const settingsModal = screen.getByTestId("ai-config-modal");
-      expect(settingsModal).toBeInTheDocument();
-    });
-
-    it("should open the settings modal if GET /settings fails with a 404", async () => {
-      const error = new AxiosError(
-        "Request failed with status code 404",
-        "ERR_BAD_REQUEST",
-        undefined,
-        undefined,
-        {
-          status: 404,
-          statusText: "Not Found",
-          data: { message: "Settings not found" },
-          headers: {},
-          // @ts-expect-error - we only need the response object for this test
-          config: {},
-        },
-      );
-
-      vi.spyOn(OpenHands, "getSettings").mockRejectedValue(error);
-
-      renderSidebar();
-
-      const settingsModal = await screen.findByTestId("ai-config-modal");
-      expect(settingsModal).toBeInTheDocument();
-    });
-  });
 });
@@ -14,7 +14,7 @@ describe("WaitlistModal", () => {
  });

  it("should render a tos checkbox that is unchecked by default", () => {
-    render(<WaitlistModal ghTokenIsSet={false} githubAuthUrl={null} />);
+    render(<WaitlistModal ghToken={null} githubAuthUrl={null} />);
    const checkbox = screen.getByRole("checkbox");

    expect(checkbox).not.toBeChecked();
@@ -22,7 +22,7 @@ describe("WaitlistModal", () => {

  it("should only enable the GitHub button if the tos checkbox is checked", async () => {
    const user = userEvent.setup();
-    render(<WaitlistModal ghTokenIsSet={false} githubAuthUrl={null} />);
+    render(<WaitlistModal ghToken={null} githubAuthUrl={null} />);
    const checkbox = screen.getByRole("checkbox");
    const button = screen.getByRole("button", { name: "Connect to GitHub" });

@@ -40,7 +40,7 @@ describe("WaitlistModal", () => {
    );

    const user = userEvent.setup();
-    render(<WaitlistModal ghTokenIsSet={false} githubAuthUrl="mock-url" />);
+    render(<WaitlistModal ghToken={null} githubAuthUrl="mock-url" />);

    const checkbox = screen.getByRole("checkbox");
    await user.click(checkbox);
@@ -1,13 +1,12 @@
 import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { TrajectoryActions } from "#/components/features/trajectory/trajectory-actions";
+import { FeedbackActions } from "#/components/features/feedback/feedback-actions";

-describe("TrajectoryActions", () => {
+describe("FeedbackActions", () => {
  const user = userEvent.setup();
  const onPositiveFeedback = vi.fn();
  const onNegativeFeedback = vi.fn();
-  const onExportTrajectory = vi.fn();

  afterEach(() => {
    vi.clearAllMocks();
@@ -15,10 +14,9 @@ describe("TrajectoryActions", () => {

  it("should render correctly", () => {
    render(
-      <TrajectoryActions
+      <FeedbackActions
        onPositiveFeedback={onPositiveFeedback}
        onNegativeFeedback={onNegativeFeedback}
-        onExportTrajectory={onExportTrajectory}
      />,
    );

@@ -29,10 +27,9 @@ describe("TrajectoryActions", () => {

  it("should call onPositiveFeedback when positive feedback is clicked", async () => {
    render(
-      <TrajectoryActions
+      <FeedbackActions
        onPositiveFeedback={onPositiveFeedback}
        onNegativeFeedback={onNegativeFeedback}
-        onExportTrajectory={onExportTrajectory}
      />,
    );

@@ -44,10 +41,9 @@ describe("TrajectoryActions", () => {

  it("should call onNegativeFeedback when negative feedback is clicked", async () => {
    render(
-      <TrajectoryActions
+      <FeedbackActions
        onPositiveFeedback={onPositiveFeedback}
        onNegativeFeedback={onNegativeFeedback}
-        onExportTrajectory={onExportTrajectory}
      />,
    );

@@ -56,19 +52,4 @@ describe("TrajectoryActions", () => {

    expect(onNegativeFeedback).toHaveBeenCalled();
  });
-
-  it("should call onExportTrajectory when negative feedback is clicked", async () => {
-    render(
-      <TrajectoryActions
-        onPositiveFeedback={onPositiveFeedback}
-        onNegativeFeedback={onNegativeFeedback}
-        onExportTrajectory={onExportTrajectory}
-      />,
-    );
-
-    const exportButton = screen.getByTestId("export-trajectory");
-    await user.click(exportButton);
-
-    expect(onExportTrajectory).toHaveBeenCalled();
-  });
 });
@@ -32,7 +32,7 @@ describe("FeedbackForm", () => {
    screen.getByLabelText(I18nKey.FEEDBACK$PRIVATE_LABEL);
    screen.getByLabelText(I18nKey.FEEDBACK$PUBLIC_LABEL);

-    screen.getByRole("button", { name: I18nKey.FEEDBACK$SHARE_LABEL });
+    screen.getByRole("button", { name: I18nKey.FEEDBACK$CONTRIBUTE_LABEL });
    screen.getByRole("button", { name: I18nKey.FEEDBACK$CANCEL_LABEL });
  });

@@ -1,173 +0,0 @@
-import { screen, waitFor } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import userEvent from "@testing-library/user-event";
-import { renderWithProviders } from "test-utils";
-import { AccountSettingsModal } from "#/components/shared/modals/account-settings/account-settings-modal";
-import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
-import OpenHands from "#/api/open-hands";
-import * as ConsentHandlers from "#/utils/handle-capture-consent";
-
-describe("AccountSettingsModal", () => {
-  const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
-  const saveSettingsSpy = vi.spyOn(OpenHands, "saveSettings");
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it.skip("should set the appropriate user analytics consent default", async () => {
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      user_consents_to_analytics: true,
-    });
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    const analyticsConsentInput = screen.getByTestId("analytics-consent");
-    await waitFor(() => expect(analyticsConsentInput).toBeChecked());
-  });
-
-  it("should save the users consent to analytics when saving account settings", async () => {
-    const user = userEvent.setup();
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    const analyticsConsentInput = screen.getByTestId("analytics-consent");
-    await user.click(analyticsConsentInput);
-
-    const saveButton = screen.getByTestId("save-settings");
-    await user.click(saveButton);
-
-    expect(saveSettingsSpy).toHaveBeenCalledWith({
-      agent: "CodeActAgent",
-      confirmation_mode: false,
-      enable_default_condenser: false,
-      language: "en",
-      llm_base_url: "",
-      llm_model: "anthropic/claude-3-5-sonnet-20241022",
-      remote_runtime_resource_factor: 1,
-      security_analyzer: "",
-      user_consents_to_analytics: true,
-    });
-  });
-
-  it("should call handleCaptureConsent with the analytics consent value if the save is successful", async () => {
-    const user = userEvent.setup();
-    const handleCaptureConsentSpy = vi.spyOn(
-      ConsentHandlers,
-      "handleCaptureConsent",
-    );
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    const analyticsConsentInput = screen.getByTestId("analytics-consent");
-    await user.click(analyticsConsentInput);
-
-    const saveButton = screen.getByTestId("save-settings");
-    await user.click(saveButton);
-
-    expect(handleCaptureConsentSpy).toHaveBeenCalledWith(true);
-
-    await user.click(analyticsConsentInput);
-    await user.click(saveButton);
-
-    expect(handleCaptureConsentSpy).toHaveBeenCalledWith(false);
-  });
-
-  it("should send all settings data when saving account settings", async () => {
-    const user = userEvent.setup();
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    const languageInput = screen.getByLabelText(/language/i);
-    await user.click(languageInput);
-
-    const norskOption = screen.getByText(/norsk/i);
-    await user.click(norskOption);
-
-    const tokenInput = screen.getByTestId("github-token-input");
-    await user.type(tokenInput, "new-token");
-
-    const saveButton = screen.getByTestId("save-settings");
-    await user.click(saveButton);
-
-    expect(saveSettingsSpy).toHaveBeenCalledWith({
-      agent: "CodeActAgent",
-      confirmation_mode: false,
-      enable_default_condenser: false,
-      language: "no",
-      github_token: "new-token",
-      llm_base_url: "",
-      llm_model: "anthropic/claude-3-5-sonnet-20241022",
-      remote_runtime_resource_factor: 1,
-      security_analyzer: "",
-      user_consents_to_analytics: false,
-    });
-  });
-
-  it("should render a checkmark and not the input if the github token is set", async () => {
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      github_token_is_set: true,
-    });
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    await waitFor(() => {
-      const checkmark = screen.queryByTestId("github-token-set-checkmark");
-      const input = screen.queryByTestId("github-token-input");
-
-      expect(checkmark).toBeInTheDocument();
-      expect(input).not.toBeInTheDocument();
-    });
-  });
-
-  it("should send an unset github token property when pressing disconnect", async () => {
-    const user = userEvent.setup();
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      github_token_is_set: true,
-    });
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    const disconnectButton = await screen.findByTestId("disconnect-github");
-    await user.click(disconnectButton);
-
-    expect(saveSettingsSpy).toHaveBeenCalledWith({
-      agent: "CodeActAgent",
-      confirmation_mode: false,
-      enable_default_condenser: false,
-      language: "en",
-      llm_base_url: "",
-      llm_model: "anthropic/claude-3-5-sonnet-20241022",
-      remote_runtime_resource_factor: 1,
-      security_analyzer: "",
-      unset_github_token: true,
-    });
-  });
-
-  it("should not unset the github token when changing the language", async () => {
-    const user = userEvent.setup();
-    getSettingsSpy.mockResolvedValue({
-      ...MOCK_DEFAULT_USER_SETTINGS,
-      github_token_is_set: true,
-    });
-    renderWithProviders(<AccountSettingsModal onClose={() => {}} />);
-
-    const languageInput = screen.getByLabelText(/language/i);
-    await user.click(languageInput);
-
-    const norskOption = screen.getByText(/norsk/i);
-    await user.click(norskOption);
-
-    const saveButton = screen.getByTestId("save-settings");
-    await user.click(saveButton);
-
-    expect(saveSettingsSpy).toHaveBeenCalledWith({
-      agent: "CodeActAgent",
-      confirmation_mode: false,
-      enable_default_condenser: false,
-      language: "no",
-      llm_base_url: "",
-      llm_model: "anthropic/claude-3-5-sonnet-20241022",
-      remote_runtime_resource_factor: 1,
-      security_analyzer: "",
-      user_consents_to_analytics: false,
-    });
-  });
-});
@@ -8,10 +8,9 @@ vi.mock("react-i18next", () => ({
  useTranslation: () => ({
    t: (key: string) => {
      const translations: Record<string, string> = {
-        SUGGESTIONS$TODO_APP: "ToDoリストアプリを開発する",
-        LANDING$BUILD_APP_BUTTON: "プルリクエストを表示するアプリを開発する",
-        SUGGESTIONS$HACKER_NEWS:
-          "Hacker Newsのトップ記事を表示するbashスクリプトを作成する",
+        "SUGGESTIONS$TODO_APP": "ToDoリストアプリを開発する",
+        "LANDING$BUILD_APP_BUTTON": "プルリクエストを表示するアプリを開発する",
+        "SUGGESTIONS$HACKER_NEWS": "Hacker Newsのトップ記事を表示するbashスクリプトを作成する",
      };
      return translations[key] || key;
    },
@@ -39,9 +38,9 @@ describe("SuggestionItem", () => {
      value: "todo app value",
    };

-    render(
-      <SuggestionItem suggestion={translatedSuggestion} onClick={onClick} />,
-    );
+    const { container } = render(<SuggestionItem suggestion={translatedSuggestion} onClick={onClick} />);
+    console.log('Rendered HTML:', container.innerHTML);
+

    expect(screen.getByText("ToDoリストアプリを開発する")).toBeInTheDocument();
  });
@@ -1,20 +1,20 @@
 import { describe, it, expect } from "vitest";
 import store from "../src/store";
 import {
-  setInitialPrompt,
-  clearInitialPrompt,
+  setInitialQuery,
+  clearInitialQuery,
 } from "../src/state/initial-query-slice";

 describe("Initial Query Behavior", () => {
-  it("should clear initial query when clearInitialPrompt is dispatched", () => {
+  it("should clear initial query when clearInitialQuery is dispatched", () => {
    // Set up initial query in the store
-    store.dispatch(setInitialPrompt("test query"));
-    expect(store.getState().initialQuery.initialPrompt).toBe("test query");
+    store.dispatch(setInitialQuery("test query"));
+    expect(store.getState().initialQuery.initialQuery).toBe("test query");

    // Clear the initial query
-    store.dispatch(clearInitialPrompt());
+    store.dispatch(clearInitialQuery());

    // Verify initial query is cleared
-    expect(store.getState().initialQuery.initialPrompt).toBeNull();
+    expect(store.getState().initialQuery.initialQuery).toBeNull();
  });
 });
@@ -58,7 +58,6 @@ describe("frontend/routes/_oh", () => {
  it("should render and capture the user's consent if oss mode", async () => {
    const user = userEvent.setup();
    const getConfigSpy = vi.spyOn(OpenHands, "getConfig");
-    const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
    const handleCaptureConsentSpy = vi.spyOn(
      CaptureConsent,
      "handleCaptureConsent",
@@ -70,16 +69,12 @@ describe("frontend/routes/_oh", () => {
      POSTHOG_CLIENT_KEY: "test-key",
    });

-    // @ts-expect-error - We only care about the user_consents_to_analytics field
-    getSettingsSpy.mockResolvedValue({
-      user_consents_to_analytics: null,
-    });
-
    renderWithProviders(<RouteStub />);

    // The user has not consented to tracking
    const consentForm = await screen.findByTestId("user-capture-consent-form");
    expect(handleCaptureConsentSpy).not.toHaveBeenCalled();
+    expect(localStorage.getItem("analytics-consent")).toBeNull();

    const submitButton = within(consentForm).getByRole("button", {
      name: /confirm preferences/i,
@@ -88,6 +83,7 @@ describe("frontend/routes/_oh", () => {

    // The user has now consented to tracking
    expect(handleCaptureConsentSpy).toHaveBeenCalledWith(true);
+    expect(localStorage.getItem("analytics-consent")).toBe("true");
    expect(
      screen.queryByTestId("user-capture-consent-form"),
    ).not.toBeInTheDocument();
@@ -110,6 +106,17 @@ describe("frontend/routes/_oh", () => {
    });
  });

+  it("should not render the user consent form if the user has already made a decision", async () => {
+    localStorage.setItem("analytics-consent", "true");
+    renderWithProviders(<RouteStub />);
+
+    await waitFor(() => {
+      expect(
+        screen.queryByTestId("user-capture-consent-form"),
+      ).not.toBeInTheDocument();
+    });
+  });
+
  // TODO: Likely failing due to how tokens are now handled in context. Move to e2e tests
  it.skip("should render a new project button if a token is set", async () => {
    localStorage.setItem("token", "test-token");
@@ -0,0 +1,28 @@
+import { beforeEach, describe, expect, it, vi, type Mock } from "vitest";
+import { getCachedConfig } from "../../src/utils/storage";
+
+describe("getCachedConfig", () => {
+  beforeEach(() => {
+    // Clear all instances and calls to constructor and all methods
+    Storage.prototype.getItem = vi.fn();
+  });
+
+  it("should return an empty object when local storage is null or undefined", () => {
+    (Storage.prototype.getItem as Mock).mockReturnValue(null);
+    expect(getCachedConfig()).toEqual({});
+
+    (Storage.prototype.getItem as Mock).mockReturnValue(undefined);
+    expect(getCachedConfig()).toEqual({});
+  });
+
+  it("should return an empty object when local storage has invalid JSON", () => {
+    (Storage.prototype.getItem as Mock).mockReturnValue("invalid JSON");
+    expect(getCachedConfig()).toEqual({});
+  });
+
+  it("should return parsed object when local storage has valid JSON", () => {
+    const validJSON = '{"key":"value"}';
+    (Storage.prototype.getItem as Mock).mockReturnValue(validJSON);
+    expect(getCachedConfig()).toEqual({ key: "value" });
+  });
+});
@@ -1,6 +1,6 @@
 {
  "name": "openhands-frontend",
-  "version": "0.23.0",
+  "version": "0.20.0",
  "private": true,
  "type": "module",
  "engines": {
@@ -9,25 +9,24 @@
  "dependencies": {
    "@monaco-editor/react": "^4.7.0-rc.0",
    "@nextui-org/react": "^2.6.11",
-    "@react-router/node": "^7.1.3",
-    "@react-router/serve": "^7.1.3",
+    "@react-router/node": "^7.1.2",
+    "@react-router/serve": "^7.1.2",
    "@react-types/shared": "^3.27.0",
-    "@reduxjs/toolkit": "^2.5.1",
-    "@tanstack/react-query": "^5.65.1",
+    "@reduxjs/toolkit": "^2.5.0",
+    "@tanstack/react-query": "^5.64.1",
    "@vitejs/plugin-react": "^4.3.2",
    "@xterm/addon-fit": "^0.10.0",
    "@xterm/xterm": "^5.4.0",
    "axios": "^1.7.9",
    "clsx": "^2.1.1",
    "eslint-config-airbnb-typescript": "^18.0.0",
-    "framer-motion": "^12.0.6",
-    "i18next": "^24.2.2",
+    "i18next": "^24.2.1",
    "i18next-browser-languagedetector": "^8.0.2",
-    "i18next-http-backend": "^3.0.2",
-    "isbot": "^5.1.22",
+    "i18next-http-backend": "^3.0.1",
+    "isbot": "^5.1.21",
    "jose": "^5.9.4",
    "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.211.3",
+    "posthog-js": "^1.207.0",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
    "react-highlight": "^0.15.0",
@@ -36,14 +35,14 @@
    "react-icons": "^5.4.0",
    "react-markdown": "^9.0.3",
    "react-redux": "^9.2.0",
-    "react-router": "^7.1.3",
+    "react-router": "^7.1.2",
    "react-syntax-highlighter": "^15.6.1",
    "react-textarea-autosize": "^8.5.7",
    "remark-gfm": "^4.0.0",
    "sirv-cli": "^3.0.0",
    "socket.io-client": "^4.8.1",
    "tailwind-merge": "^2.6.0",
-    "vite": "^6.0.11",
+    "vite": "^5.4.11",
    "web-vitals": "^3.5.2",
    "ws": "^8.18.0"
  },
@@ -77,23 +76,22 @@
  },
  "devDependencies": {
    "@mswjs/socket.io-binding": "^0.1.1",
-    "@playwright/test": "^1.50.0",
-    "@react-router/dev": "^7.1.3",
+    "@playwright/test": "^1.49.1",
+    "@react-router/dev": "^7.1.2",
    "@tailwindcss/typography": "^0.5.16",
-    "@tanstack/eslint-plugin-query": "^5.65.0",
-    "@testing-library/dom": "^10.4.0",
+    "@tanstack/eslint-plugin-query": "^5.64.2",
    "@testing-library/jest-dom": "^6.6.1",
    "@testing-library/react": "^16.2.0",
-    "@testing-library/user-event": "^14.6.1",
-    "@types/node": "^22.12.0",
-    "@types/react": "^19.0.8",
+    "@testing-library/user-event": "^14.6.0",
+    "@types/node": "^22.10.7",
+    "@types/react": "^19.0.7",
    "@types/react-dom": "^19.0.3",
    "@types/react-highlight": "^0.12.8",
    "@types/react-syntax-highlighter": "^15.5.13",
-    "@types/ws": "^8.5.14",
+    "@types/ws": "^8.5.12",
    "@typescript-eslint/eslint-plugin": "^7.18.0",
    "@typescript-eslint/parser": "^7.18.0",
-    "@vitest/coverage-v8": "^3.0.4",
+    "@vitest/coverage-v8": "^3.0.2",
    "autoprefixer": "^10.4.20",
    "cross-env": "^7.0.3",
    "eslint": "^8.57.0",
@@ -107,7 +105,7 @@
    "eslint-plugin-react-hooks": "^4.6.2",
    "husky": "^9.1.6",
    "jsdom": "^26.0.0",
-    "lint-staged": "^15.4.3",
+    "lint-staged": "^15.4.1",
    "msw": "^2.6.6",
    "postcss": "^8.5.1",
    "prettier": "^3.4.2",
@@ -0,0 +1,107 @@
+import axios, { AxiosError } from "axios";
+
+const github = axios.create({
+  baseURL: "https://api.github.com",
+  headers: {
+    Accept: "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28",
+  },
+});
+
+const setAuthTokenHeader = (token: string) => {
+  github.defaults.headers.common.Authorization = `Bearer ${token}`;
+};
+
+const removeAuthTokenHeader = () => {
+  if (github.defaults.headers.common.Authorization) {
+    delete github.defaults.headers.common.Authorization;
+  }
+};
+
+/**
+ * Checks if response has attributes to perform refresh
+ */
+const canRefresh = (error: unknown): boolean =>
+  !!(
+    error instanceof AxiosError &&
+    error.config &&
+    error.response &&
+    error.response.status
+  );
+
+/**
+ * Checks if the data is a GitHub error response
+ * @param data The data to check
+ * @returns Boolean indicating if the data is a GitHub error response
+ */
+export const isGitHubErrorReponse = <T extends object | Array<unknown>>(
+  data: T | GitHubErrorReponse | null,
+): data is GitHubErrorReponse =>
+  !!data && "message" in data && data.message !== undefined;
+
+// Axios interceptor to handle token refresh
+const setupAxiosInterceptors = (
+  appMode: string,
+  refreshToken: () => Promise<boolean>,
+  logout: () => void,
+) => {
+  github.interceptors.response.use(
+    // Pass successful responses through
+    (response) => {
+      const parsedData = response.data;
+      if (isGitHubErrorReponse(parsedData)) {
+        const error = new AxiosError(
+          "Failed",
+          "",
+          response.config,
+          response.request,
+          response,
+        );
+        throw error;
+      }
+      return response;
+    },
+    // Retry request exactly once if token is expired
+    async (error) => {
+      if (!canRefresh(error)) {
+        return Promise.reject(new Error("Failed to refresh token"));
+      }
+
+      const originalRequest = error.config;
+
+      // Check if the error is due to an expired token
+      if (
+        error.response.status === 401 &&
+        !originalRequest._retry // Prevent infinite retry loops
+      ) {
+        originalRequest._retry = true;
+
+        if (appMode === "saas") {
+          try {
+            const refreshed = await refreshToken();
+            if (refreshed) {
+              return await github(originalRequest);
+            }
+
+            logout();
+            return await Promise.reject(new Error("Failed to refresh token"));
+          } catch (refreshError) {
+            // If token refresh fails, evict the user
+            logout();
+            return Promise.reject(refreshError);
+          }
+        }
+      }
+
+      // If the error is not due to an expired token, propagate the error
+      return Promise.reject(error);
+    },
+  );
+};
+
+export {
+  github,
+  setAuthTokenHeader,
+  removeAuthTokenHeader,
+  setupAxiosInterceptors,
+};
@@ -14,7 +14,7 @@ export const retrieveGitHubAppRepositories = async (
  per_page = 30,
 ) => {
  const installationId = installations[installationIndex];
-  const response = await openHands.get<GitHubRepository[]>(
+  const response = await openHands.get<GitHubAppRepository>(
    "/api/github/repositories",
    {
      params: {
@@ -26,11 +26,7 @@ export const retrieveGitHubAppRepositories = async (
    },
  );

-  const link =
-    response.data.length > 0 && response.data[0].link_header
-      ? response.data[0].link_header
-      : "";
-
+  const link = response.headers.link ?? "";
  const nextPage = extractNextPageFromLink(link);
  let nextInstallation: number | null;

@@ -43,7 +39,7 @@ export const retrieveGitHubAppRepositories = async (
  }

  return {
-    data: response.data,
+    data: response.data.repositories,
    nextPage,
    installationIndex: nextInstallation,
  };
@@ -68,10 +64,7 @@ export const retrieveGitHubUserRepositories = async (
    },
  );

-  const link =
-    response.data.length > 0 && response.data[0].link_header
-      ? response.data[0].link_header
-      : "";
+  const link = response.headers.link ?? "";
  const nextPage = extractNextPageFromLink(link);

  return { data: response.data, nextPage };
@@ -1,23 +1,111 @@
-import axios from "axios";
+import axios, { AxiosError } from "axios";
+import { KeycloakErrorResponse } from "./open-hands.types";

 export const openHands = axios.create();

 export const setAuthTokenHeader = (token: string) => {
+  console.debug(`setAuthTokenHeader to ${token}`);
  openHands.defaults.headers.common.Authorization = `Bearer ${token}`;
 };

 export const setGitHubTokenHeader = (token: string) => {
+  console.debug(`setGitHubTokenHeader to ${token}`);
  openHands.defaults.headers.common["X-GitHub-Token"] = token;
 };

 export const removeAuthTokenHeader = () => {
+  console.debug("removeAuthTokenHeader");
  if (openHands.defaults.headers.common.Authorization) {
    delete openHands.defaults.headers.common.Authorization;
  }
 };

 export const removeGitHubTokenHeader = () => {
+  console.debug("removeGitHubTokenHeader");
  if (openHands.defaults.headers.common["X-GitHub-Token"]) {
    delete openHands.defaults.headers.common["X-GitHub-Token"];
  }
 };
+
+/**
+ * Checks if response has attributes to perform refresh
+ */
+const canRefresh = (error: unknown): boolean =>
+  !!(
+    error instanceof AxiosError &&
+    error.config &&
+    error.response &&
+    error.response.status &&
+    error.response.data.keycloak_error
+  );
+/**
+ * Checks if the data is a Keycloak error response
+ * @param data The data to check
+ * @returns Boolean indicating if the data is a Keycloak error response
+ */
+export const isKeycloakErrorResponse = <T extends object | Array<unknown>>(
+  data: T | KeycloakErrorResponse | null,
+): data is KeycloakErrorResponse =>
+  !!data && typeof data === "object" && "keycloak_error" in data;
+
+// Axios interceptor to handle token refresh
+export const setupOpenhandsAxiosInterceptors = (
+  appMode: string,
+  refreshToken: () => Promise<boolean>,
+  logout: () => void,
+) => {
+  openHands.interceptors.response.use(
+    // Pass successful responses through
+    (response) => {
+      const parsedData = response.data;
+      console.debug(
+        `Openhands·API·call·response·to·${response.request.responseURL}\n·${JSON.stringify(parsedData)}`,
+      );
+      if (isKeycloakErrorResponse(parsedData)) {
+        const error = new AxiosError(
+          "Failed",
+          "",
+          response.config,
+          response.request,
+          response,
+        );
+        throw error;
+      }
+      return response;
+    },
+    // Retry request exactly once if token is expired
+    async (error) => {
+      if (!canRefresh(error)) {
+        return Promise.reject(new Error("Failed to refresh token"));
+      }
+
+      const originalRequest = error.config;
+
+      // Check if the error is due to an expired token
+      if (
+        error.response.status === 401 &&
+        !originalRequest._retry // Prevent infinite retry loops
+      ) {
+        originalRequest._retry = true;
+        try {
+          const refreshed = await refreshToken();
+          if (refreshed) {
+            originalRequest.headers["X-GitHub-Token"] =
+              openHands.defaults.headers.common["X-GitHub-Token"];
+            return await openHands(originalRequest);
+          }
+
+          logout();
+          return await Promise.reject(new Error("Failed to refresh token"));
+        } catch (refreshError) {
+          // If token refresh fails, evict the user
+          logout();
+          return Promise.reject(refreshError);
+        }
+      }
+
+      // If the error is not due to an expired token, propagate the error
+      return Promise.reject(error);
+    },
+  );
+};
@@ -13,7 +13,7 @@ import {
  GetTrajectoryResponse,
 } from "./open-hands.types";
 import { openHands } from "./open-hands-axios";
-import { ApiSettings } from "#/types/settings";
+import { ApiSettings } from "#/services/settings";

 class OpenHands {
  /**
@@ -148,12 +148,43 @@ class OpenHands {
    appMode: GetConfigResponse["APP_MODE"],
  ): Promise<boolean> {
    if (appMode === "oss") return true;
-
    const response =
      await openHands.post<AuthenticateResponse>("/api/authenticate");
    return response.status === 200;
  }

+  /**
+   * Refresh Github Token
+   * @returns Refreshed Github access token
+   */
+  static async refreshToken(
+    appMode: GetConfigResponse["APP_MODE"],
+    userId: string,
+  ): Promise<{
+    keycloakAccessToken: string;
+    providerAccessToken: string;
+    keycloakUserId: string;
+  }> {
+    if (appMode === "oss")
+      return {
+        keycloakAccessToken: "",
+        providerAccessToken: "",
+        keycloakUserId: "",
+      };
+
+    const response = await openHands.post<GitHubAccessTokenResponse>(
+      "/api/refresh-token",
+      {
+        userId,
+      },
+    );
+    return {
+      keycloakAccessToken: response.data.keycloakAccessToken,
+      providerAccessToken: response.data.providerAccessToken,
+      keycloakUserId: response.data.keycloakUserId,
+    };
+  }
+
  /**
   * Get the blob of the workspace zip
   * @returns Blob of the workspace zip
@@ -172,13 +203,20 @@ class OpenHands {
   */
  static async getGitHubAccessToken(
    code: string,
+    redirectUri: string,
  ): Promise<GitHubAccessTokenResponse> {
-    const { data } = await openHands.post<GitHubAccessTokenResponse>(
+    const { data } = await openHands.get<GitHubAccessTokenResponse>(
      "/api/github/callback",
      {
-        code,
+        params: {
+          code,
+          redirectUri,
+        },
      },
    );
+    console.debug(
+      `/api/github/callback response data: ${JSON.stringify(data)}`,
+    );
    return data;
  }

@@ -223,14 +261,12 @@ class OpenHands {
  }

  static async createConversation(
+    githubToken?: string,
    selectedRepository?: string,
-    initialUserMsg?: string,
-    imageUrls?: string[],
  ): Promise<Conversation> {
    const body = {
+      github_token: githubToken,
      selected_repository: selectedRepository,
-      initial_user_msg: initialUserMsg,
-      image_urls: imageUrls,
    };

    const { data } = await openHands.post<Conversation>(
@@ -254,6 +290,35 @@ class OpenHands {
    return data;
  }

+  static async searchEvents(
+    conversationId: string,
+    params: {
+      query?: string;
+      startId?: number;
+      limit?: number;
+      eventType?: string;
+      source?: string;
+      startDate?: string;
+      endDate?: string;
+    },
+  ): Promise<{ events: Record<string, unknown>[]; has_more: boolean }> {
+    const { data } = await openHands.get<{
+      events: Record<string, unknown>[];
+      has_more: boolean;
+    }>(`/api/conversations/${conversationId}/events/search`, {
+      params: {
+        query: params.query,
+        start_id: params.startId,
+        limit: params.limit,
+        event_type: params.eventType,
+        source: params.source,
+        start_date: params.startDate,
+        end_date: params.endDate,
+      },
+    });
+    return data;
+  }
+
  /**
   * Get the settings from the server or use the default settings if not found
   */
@@ -297,7 +362,7 @@ class OpenHands {
    query: string,
    per_page = 5,
  ): Promise<GitHubRepository[]> {
-    const response = await openHands.get<GitHubRepository[]>(
+    const response = await openHands.get<{ items: GitHubRepository[] }>(
      "/api/github/search/repositories",
      {
        params: {
@@ -307,7 +372,7 @@ class OpenHands {
      },
    );

-    return response.data;
+    return response.data.items;
  }

  static async getTrajectory(
@@ -318,10 +383,6 @@ class OpenHands {
    );
    return data;
  }
-
-  static async logout(): Promise<void> {
-    await openHands.post("/api/logout");
-  }
 }

 export default OpenHands;
@@ -26,7 +26,9 @@ export interface FeedbackResponse {
 }

 export interface GitHubAccessTokenResponse {
-  access_token: string;
+  keycloakAccessToken: string;
+  providerAccessToken: string;
+  keycloakUserId: string;
 }

 export interface AuthenticationResponse {
@@ -65,6 +67,10 @@ export interface AuthenticateResponse {
  error?: string;
 }

+export interface KeycloakErrorResponse {
+  keycloak_error: string;
+}
+
 export interface Conversation {
  conversation_id: string;
  title: string;
@@ -23,7 +23,7 @@ export const AGENT_STATUS_MAP: {
  },
  [AgentState.AWAITING_USER_INPUT]: {
    message: I18nKey.CHAT_INTERFACE$AGENT_AWAITING_USER_INPUT_MESSAGE,
-    indicator: IndicatorColor.BLUE,
+    indicator: IndicatorColor.ORANGE,
  },
  [AgentState.PAUSED]: {
    message: I18nKey.CHAT_INTERFACE$AGENT_PAUSED_MESSAGE,
@@ -5,7 +5,6 @@ import {
 } from "#/components/shared/modals/confirmation-modals/base-modal";
 import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
 import { ModalBody } from "#/components/shared/modals/modal-body";
-import { useCurrentSettings } from "#/context/settings-context";
 import { handleCaptureConsent } from "#/utils/handle-capture-consent";

 interface AnalyticsConsentFormModalProps {
@@ -15,21 +14,13 @@ interface AnalyticsConsentFormModalProps {
 export function AnalyticsConsentFormModal({
  onClose,
 }: AnalyticsConsentFormModalProps) {
-  const { saveUserSettings } = useCurrentSettings();
-
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
    e.preventDefault();
    const formData = new FormData(e.currentTarget);
    const analytics = formData.get("analytics") === "on";

-    await saveUserSettings(
-      { user_consents_to_analytics: analytics },
-      {
-        onSuccess: () => {
-          handleCaptureConsent(analytics);
-        },
-      },
-    );
+    handleCaptureConsent(analytics);
+    localStorage.setItem("analytics-consent", analytics.toString());

    onClose();
  };
@@ -55,7 +46,6 @@ export function AnalyticsConsentFormModal({
          </label>

          <ModalButton
-            testId="confirm-preferences"
            type="submit"
            text="Confirm Preferences"
            className="bg-primary text-white w-full hover:opacity-80"
@@ -2,9 +2,9 @@ import posthog from "posthog-js";
 import React from "react";
 import { useSelector } from "react-redux";
 import { SuggestionItem } from "#/components/features/suggestions/suggestion-item";
+import { useAuth } from "#/context/auth-context";
 import { DownloadModal } from "#/components/shared/download-modal";
 import type { RootState } from "#/store";
-import { useAuth } from "#/context/auth-context";

 interface ActionSuggestionsProps {
  onSuggestionsClick: (value: string) => void;
@@ -13,7 +13,7 @@ interface ActionSuggestionsProps {
 export function ActionSuggestions({
  onSuggestionsClick,
 }: ActionSuggestionsProps) {
-  const { githubTokenIsSet } = useAuth();
+  const { gitHubToken } = useAuth();
  const { selectedRepository } = useSelector(
    (state: RootState) => state.initialQuery,
  );
@@ -32,7 +32,7 @@ export function ActionSuggestions({
        onClose={handleDownloadClose}
        isOpen={isDownloading}
      />
-      {githubTokenIsSet && selectedRepository ? (
+      {gitHubToken && selectedRepository ? (
        <div className="flex flex-row gap-2 justify-center w-full">
          {!hasPullRequest ? (
            <>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chuck Butkus	1786db475c	Merge branch 'aws_fixes_min' into keycloak	2025-01-21 23:06:21 -05:00
Chuck Butkus	b25477179e	Merge branch 'aws_fixes_min' into keycloak	2025-01-21 23:00:18 -05:00
Chuck Butkus	0e33601ffe	Cleanup	2025-01-21 19:57:45 -05:00
Chuck Butkus	3a047de788	boto3 needs a full URL for the endpoint	2025-01-21 18:53:34 -05:00
Chuck Butkus	cf4b2946a8	boto3 needs a full URL for the endpoint	2025-01-21 18:50:26 -05:00
Chuck Butkus	cd8cb25426	Merge branch 'aws_fixes_min' into keycloak	2025-01-21 16:51:12 -05:00
Chuck Butkus	20e8ff8e73	Merge branch 'main' into keycloak	2025-01-21 16:49:19 -05:00
Chuck Butkus	f30d1178f6	Consolidate minio into S3FileStore	2025-01-21 16:43:01 -05:00
chuckbutkus	53228643f9	Apply suggestions from code review Co-authored-by: Engel Nyst <enyst@users.noreply.github.com>	2025-01-21 00:11:31 -05:00
chuckbutkus	7d6900c281	Merge branch 'main' into aws_fixes_min	2025-01-20 22:57:17 -05:00
Chuck Butkus	0bf05937b9	Revert file_store_location change	2025-01-20 22:27:11 -05:00
Chuck Butkus	8f42db630d	Merge branch 'main' into aws_fixes	2025-01-20 22:05:58 -05:00
Chuck Butkus	ae18002373	Fix lint errors	2025-01-19 23:11:38 -05:00
Chuck Butkus	0f2584ebb0	Change console logging to debug	2025-01-19 21:42:59 -05:00
Chuck Butkus	cff81640af	Fix some logging	2025-01-19 21:32:22 -05:00
Chuck Butkus	b777662c2e	Merge branch 'main' into keycloak	2025-01-19 18:09:56 -05:00
Chuck Butkus	928870bc6c	Update	2025-01-19 15:58:33 -05:00
Chuck Butkus	dfc32287a1	Merge branch 'main' into aws_fixes	2025-01-19 00:21:22 -05:00
Chuck Butkus	d94c65623b	Update	2025-01-18 17:10:04 -05:00
Chuck Butkus	4b9545cb5b	More logging	2025-01-18 01:54:35 -05:00
Chuck Butkus	7d3dc563a1	Add some logging	2025-01-18 01:23:18 -05:00
Chuck Butkus	13a602f467	Merge main into branch	2025-01-17 15:11:36 -05:00
Chuck Butkus	9146010931	Changes for AWS support	2025-01-15 23:33:12 -05:00
Chuck Butkus	ab22f0ec89	Fix settings modal on default	2025-01-15 22:16:19 -05:00
Chuck Butkus	14218421c4	Fix for settings	2025-01-13 15:08:42 -05:00
Chuck Butkus	0d0d132171	Fixes	2025-01-13 00:17:11 -05:00
Chuck Butkus	c28c323b49	Merge branch 'main' into keycloak	2025-01-12 20:53:54 -05:00
Chuck Butkus	5f2860f78e	Remove extra logging	2025-01-12 18:46:38 -05:00
Chuck Butkus	cce1e53434	Initial commit	2025-01-12 18:22:20 -05:00