use correct property

Co-authored-by: openhands <openhands@all-hands.dev>
Co-authored-by: Xingyao Wang <xingyao6@illinois.edu>

.github/ISSUE_TEMPLATE/bug_template.yml

@@ -30,6 +30,7 @@ body:
       description: How are you running OpenHands?
       options:
         - Docker command in README
+        - GitHub resolver
         - Development workflow
         - app.all-hands.dev
         - Other

.github/workflows/dummy-agent-test.yml

@@ -19,20 +19,6 @@ 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

.github/workflows/ghcr-build.yml

@@ -41,20 +41,6 @@ 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:
@@ -104,20 +90,6 @@ 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:
@@ -219,7 +191,7 @@ jobs:
             exit 1
           fi
 
-  # Run unit tests with the EventStream runtime Docker images as root
+  # Run unit tests with the Docker runtime Docker images as root
   test_runtime_root:
     name: RT Unit Tests (Root)
     needs: [ghcr_build_runtime]
@@ -230,20 +202,6 @@ 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
@@ -286,7 +244,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=eventstream \
+          TEST_RUNTIME=docker \
           SANDBOX_USER_ID=$(id -u) \
           SANDBOX_RUNTIME_CONTAINER_IMAGE=$image_name \
           TEST_IN_CI=true \
@@ -297,7 +255,7 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-  # Run unit tests with the EventStream runtime Docker images as openhands user
+  # Run unit tests with the Docker runtime Docker images as openhands user
   test_runtime_oh:
     name: RT Unit Tests (openhands)
     runs-on: ubuntu-latest
@@ -307,20 +265,6 @@ 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
@@ -363,7 +307,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=eventstream \
+          TEST_RUNTIME=docker \
           SANDBOX_USER_ID=$(id -u) \
           SANDBOX_RUNTIME_CONTAINER_IMAGE=$image_name \
           TEST_IN_CI=true \

.github/workflows/openhands-resolver.yml

@@ -20,6 +20,10 @@ 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
@@ -116,6 +120,7 @@ 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 }}
@@ -230,6 +235,7 @@ 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 \
@@ -265,6 +271,7 @@ 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

.github/workflows/py-unit-tests-mac.yml

@@ -1,98 +0,0 @@
-# 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 }}

.github/workflows/stale.yml

@@ -19,3 +19,4 @@ 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

Development.md

@@ -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.21-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.23-nikolaik`
 
 ## Develop inside Docker container
 

README.md

@@ -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-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://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://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.21-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21
+    docker.all-hands.dev/all-hands-ai/openhands:0.23
 ```
 
 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-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw) - Here we talk about research, architecture, and future development.
+- [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 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.
 

config.template.toml

@@ -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 = "your-api-key"
+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 = "your-api-key"
+api_key = ""
 model = "gpt-4o"
 
 

containers/dev/compose.yml

@@ -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.21-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.23-nikolaik}
       - SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
       - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
     ports:

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     image: openhands:latest
     container_name: openhands-app-${DATE:-}
     environment:
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.23-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:

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/architecture/runtime.md

@@ -1,8 +1,8 @@
 
 
-# 📦 Runtime EventStream
+# 📦 Runtime Docker
 
-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.
+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.
 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 ?

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/configuration-options.md

@@ -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 : `"eventstream"`
+  - Valeur par défaut : `"docker"`
   - Description : Environnement d'exécution
 
 - `default_agent`

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/custom_sandbox_guide.md

@@ -95,7 +95,3 @@ 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!

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/how-to/cli-mode.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.23 \
     python -m openhands.core.cli
 ```
 

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/how-to/evaluation-harness.md

@@ -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='eventstream',
+           runtime='docker',
            max_iterations=metadata.max_iterations,
            sandbox=SandboxConfig(
                base_container_image='your_container_image',

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/how-to/headless-mode.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.23 \
     python -m openhands.core.main -t "write a bash script that prints hi" --no-auto-continue
 ```

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/installation.mdx

@@ -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.21-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21
+    docker.all-hands.dev/all-hands-ai/openhands:0.23
 ```
 
 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).

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/intro.mdx

@@ -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-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw">
+<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"

docs/i18n/fr/docusaurus-plugin-content-docs/current/usage/runtimes.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
     -v /var/run/docker.sock:/var/run/docker.sock \
     # ...
 ```

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/architecture/runtime.md

@@ -1,8 +1,8 @@
 以下是翻译后的内容:
 
-# 📦 EventStream 运行时
+# 📦 Docker 运行时
 
-OpenHands EventStream 运行时是实现 AI 代理操作安全灵活执行的核心组件。
+OpenHands Docker 运行时是实现 AI 代理操作安全灵活执行的核心组件。
 它使用 Docker 创建一个沙盒环境,可以安全地运行任意代码而不会危及主机系统。
 
 ## 为什么我们需要沙盒运行时?

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/configuration-options.md

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

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/custom_sandbox_guide.md

@@ -96,7 +96,3 @@ 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) 提问！

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/how-to/cli-mode.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.23 \
     python -m openhands.core.cli
 ```
 

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/how-to/evaluation-harness.md

@@ -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='eventstream',
+           runtime='docker',
            max_iterations=metadata.max_iterations,
            sandbox=SandboxConfig(
                base_container_image='your_container_image',

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/how-to/headless-mode.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.23 \
     python -m openhands.core.main -t "write a bash script that prints hi" --no-auto-continue
 ```

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/installation.mdx

@@ -11,16 +11,16 @@
 在 Docker 中运行 OpenHands 是最简单的方式。
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21
+    docker.all-hands.dev/all-hands-ai/openhands:0.23
 ```
 
 你也可以在可脚本化的[无头模式](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)。

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/intro.mdx

@@ -42,7 +42,7 @@ OpenHands 是一个**自主 AI 软件工程师**，能够执行复杂的工程
   />
 </a>
 <br></br>
-<a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw">
+<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"

docs/i18n/zh-Hans/docusaurus-plugin-content-docs/current/usage/runtimes.md

@@ -11,7 +11,7 @@
 
 ```
 docker run # ...
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
     -v /var/run/docker.sock:/var/run/docker.sock \
     # ...
 ```

docs/modules/usage/architecture/runtime.md

@@ -1,6 +1,6 @@
-# 📦 EventStream Runtime
+# 📦 Docker Runtime
 
-The OpenHands EventStream Runtime is the core component that enables secure and flexible execution of AI agent's action.
+The OpenHands Docker 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?

docs/modules/usage/configuration-options.md

@@ -126,7 +126,7 @@ The core configuration options are defined in the `[core]` section of the `confi
 
 - `runtime`
   - Type: `str`
-  - Default: `"eventstream"`
+  - Default: `"docker"`
   - Description: Runtime environment
 
 - `default_agent`

docs/modules/usage/how-to/cli-mode.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.23 \
     python -m openhands.core.cli
 ```
 

docs/modules/usage/how-to/custom-sandbox-guide.md

@@ -41,8 +41,16 @@ docker build -t custom-image .
 
 This will produce a new image called `custom-image`, which will be available in Docker.
 
-> 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 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 \
+    ...
+```
 
 ## Using the Development Workflow
 

docs/modules/usage/how-to/evaluation-harness.md

@@ -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='eventstream',
+           runtime='docker',
            max_iterations=metadata.max_iterations,
            sandbox=SandboxConfig(
                base_container_image='your_container_image',

docs/modules/usage/how-to/headless-mode.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.23 \
     python -m openhands.core.main -t "write a bash script that prints hi"
 ```
 

docs/modules/usage/installation.mdx

@@ -43,6 +43,10 @@
   - 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
@@ -50,17 +54,17 @@
 The easiest way to run OpenHands is in Docker.
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-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.21
+    docker.all-hands.dev/all-hands-ai/openhands:0.23
 ```
 
 You'll find OpenHands running at http://localhost:3000!

docs/modules/usage/runtimes.md

@@ -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.21-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.23-nikolaik \
     -v /var/run/docker.sock:/var/run/docker.sock \
     # ...
 ```

docs/package.json

@@ -22,8 +22,8 @@
     "@mdx-js/react": "^3.1.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.4.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "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.2"
+    "typescript": "~5.7.3"
   },
   "browserslist": {
     "production": [

docs/src/components/CustomFooter.tsx

@@ -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-2wkh4pklz-w~h_DVDtEe9H5kyQlcNxVw" target="_blank" rel="noopener noreferrer">
+          <a href="https://join.slack.com/t/openhands-ai/shared_invite/zt-2ypg5jweb-d~6hObZDbXi_HEL8PDrbHg" target="_blank" rel="noopener noreferrer">
             <FaSlack />
           </a>
           <a href="https://discord.gg/ESHStjSjD4" target="_blank" rel="noopener noreferrer">

docs/src/components/HomepageHeader/HomepageHeader.tsx

@@ -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-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://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://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/>

evaluation/benchmarks/EDA/run_infer.py

@@ -69,6 +69,7 @@ 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,

evaluation/benchmarks/agent_bench/run_infer.py

@@ -53,6 +53,7 @@ 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,

evaluation/benchmarks/aider_bench/run_infer.py

@@ -61,6 +61,7 @@ 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,

evaluation/benchmarks/biocoder/run_infer.py

@@ -67,6 +67,7 @@ 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,

evaluation/benchmarks/bird/run_infer.py

@@ -80,6 +80,7 @@ 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,

evaluation/benchmarks/browsing_delegation/run_infer.py

@@ -45,6 +45,7 @@ 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,

evaluation/benchmarks/commit0_bench/run_infer.py

@@ -135,6 +135,7 @@ 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,

evaluation/benchmarks/discoverybench/run_infer.py

@@ -71,6 +71,7 @@ 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,

evaluation/benchmarks/gaia/run_infer.py

@@ -56,6 +56,7 @@ 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,

evaluation/benchmarks/gorilla/run_infer.py

@@ -49,6 +49,7 @@ 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,

evaluation/benchmarks/gpqa/run_infer.py

@@ -70,6 +70,7 @@ 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,

evaluation/benchmarks/humanevalfix/run_infer.py

@@ -91,6 +91,7 @@ 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,

evaluation/benchmarks/logic_reasoning/run_infer.py

@@ -55,6 +55,7 @@ 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,

evaluation/benchmarks/miniwob/run_infer.py

@@ -70,6 +70,7 @@ 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,

evaluation/benchmarks/mint/run_infer.py

@@ -113,6 +113,7 @@ 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,

evaluation/benchmarks/scienceagentbench/run_infer.py

@@ -73,6 +73,7 @@ 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,

evaluation/benchmarks/swe_bench/eval_infer.py

@@ -412,6 +412,17 @@ 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.

evaluation/benchmarks/swe_bench/run_infer.py

@@ -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 PR description:\n\n"
-        f'<pr_description>\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'{instance.problem_statement}\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'
+        '</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'
         "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,10 +139,12 @@ 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,

evaluation/benchmarks/swe_bench/scripts/eval/compare_outputs.py

@@ -15,11 +15,25 @@ 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')
@@ -86,7 +100,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 = abs(x_count - y_count)
+    diff = y_count - x_count
     repo_diffs.append((repo, diff))
 
 # Sort by diff (descending) and then by repo name
@@ -106,7 +120,13 @@ 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!', repo_color, attrs=['bold']))
+    print(
+        colored(
+            f'Difference: {diff} instances! (Larger diff = Y better)',
+            repo_color,
+            attrs=['bold'],
+        )
+    )
     print(colored(f'X resolved but Y failed: ({len(x_instances)} instances)', 'green'))
     if x_instances:
         print('  ' + str(x_instances))

evaluation/benchmarks/swe_bench/scripts/eval/convert_oh_output_to_md.py

@@ -4,6 +4,7 @@
 import argparse
 import json
 import os
+from glob import glob
 
 import pandas as pd
 from tqdm import tqdm
@@ -20,6 +21,7 @@ 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):
@@ -57,22 +59,172 @@ 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:
-        raise ValueError(f'Row {row} does not have a git_patch')
+        print(f'Row {row} does not have a git_patch')
+        return
 
     test_output = 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:
+    # Use result from output.jsonl FIRST if available.
+    if 'report' in row and row['report'] is not None:
         if not isinstance(row['report'], dict):
             resolved = None
             print(
@@ -80,6 +232,12 @@ 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
 
@@ -88,6 +246,8 @@ 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')
 
@@ -97,7 +257,12 @@ def write_row_to_md_file(row, instance_id_to_test_result):
         f.write(json.dumps(row['metadata'], indent=2))
         f.write('\n```\n')
 
-        # Trajectory
+        # Completion
+        if completions is not None:
+            f.write('## Completion\n')
+            traj = completions['messages']
+            f.write(format_traj(traj))
+
         f.write('## History\n')
         f.write(convert_history_to_str(row['history']))
 

evaluation/benchmarks/swe_bench/scripts/eval/update_output_with_eval.py

@@ -207,12 +207,13 @@ 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']
-        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
+        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 not needs_update:
     print('No updates detected. Skipping file update.')
@@ -234,6 +235,5 @@ 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']
-        if instance_id in instance_id_to_status:
-            data['report'] = instance_id_to_status[instance_id]
+        data['report'] = instance_id_to_status[instance_id]
         outfile.write(json.dumps(data) + '\n')

evaluation/benchmarks/swe_bench/scripts/eval_infer.sh

@@ -76,7 +76,7 @@ echo "Running SWE-bench evaluation"
 echo "=============================================================="
 
 RUN_ID=$(date +"%Y%m%d_%H%M%S")
-N_PROCESS=16
+N_PROCESS=4
 
 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 1800 \
+        --timeout 3600 \
         --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 1800 \
+        --timeout 3600 \
         --instance_ids $INSTANCE_ID \
         --cache_level instance \
         --max_workers $N_PROCESS \

evaluation/benchmarks/the_agent_company/README.md

@@ -17,11 +17,14 @@ 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>  \
-  --env-llm-config <env-llm-config> \
-  --outputs-path <outputs-path> \
-  --server-hostname <server-hostname> \
-  --version <version>
+  --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>
+
 
 # Example
 ./evaluation/benchmarks/the_agent_company/scripts/run_infer.sh \
@@ -29,7 +32,9 @@ 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
+  --version 1.0.0 \
+  --start-percentile 10 \
+  --end-percentile 20
 ```
 
 - `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).
@@ -37,7 +42,11 @@ 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 a few days to finish evaluation.
+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**.
 
 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.

evaluation/benchmarks/the_agent_company/run_infer.py

@@ -50,6 +50,7 @@ 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

evaluation/benchmarks/the_agent_company/scripts/run_infer.sh

@@ -56,6 +56,14 @@ 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
@@ -69,16 +77,53 @@ 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
 
@@ -108,8 +153,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 < tasks.md
+done < "$temp_file"
 
-rm tasks.md
+rm tasks.md "$temp_file"
 
 echo "All evaluation completed successfully!"

evaluation/benchmarks/toolqa/run_infer.py

@@ -50,6 +50,7 @@ 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,

evaluation/benchmarks/visualwebarena/run_infer.py

@@ -79,6 +79,7 @@ def get_config(
                 'VWA_HOMEPAGE': f'{base_url}:4399',
             },
             timeout=300,
+            remote_runtime_enable_retries=True,
         ),
         # do not mount workspace
         workspace_base=None,

evaluation/benchmarks/webarena/run_infer.py

@@ -71,6 +71,7 @@ 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,

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

@@ -1,6 +1,6 @@
-import { render, screen } from "@testing-library/react";
+import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { describe, it, expect, test } from "vitest";
+import { describe, it, expect } from "vitest";
 import { ChatMessage } from "#/components/features/chat/chat-message";
 
 describe("ChatMessage", () => {
@@ -45,7 +45,9 @@ describe("ChatMessage", () => {
 
     await user.click(copyToClipboardButton);
 
-    expect(navigator.clipboard.readText()).resolves.toBe("Hello, World!");
+    await waitFor(() =>
+      expect(navigator.clipboard.readText()).resolves.toBe("Hello, World!"),
+    );
   });
 
   it("should display an error toast if copying content to clipboard fails", async () => {});

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

@@ -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");

frontend/__tests__/components/features/analytics/analytics-consent-form-modal.test.tsx

@@ -0,0 +1,45 @@
+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();
+  });
+});

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

@@ -1,5 +1,14 @@
 import { render, screen, within } from "@testing-library/react";
-import { afterEach, describe, expect, it, test, vi } from "vitest";
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  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";
@@ -11,10 +20,18 @@ 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
@@ -29,9 +46,8 @@ 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");
 
-    expect(title).toHaveValue("Conversation 1");
+    within(card).getByText("Conversation 1");
     within(card).getByText(expectedDate);
   });
 
@@ -148,10 +164,8 @@ describe("ConversationCard", () => {
       />,
     );
 
-    const title = screen.getByTestId("conversation-card-title");
-    expect(title).toBeDisabled();
-
     await clickOnEditButton(user);
+    const title = screen.getByTestId("conversation-card-title");
 
     expect(title).toBeEnabled();
     expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
@@ -164,7 +178,6 @@ 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 () => {
@@ -191,7 +204,27 @@ describe("ConversationCard", () => {
     expect(title).toHaveValue("Conversation 1");
   });
 
-  test("clicking the title should not trigger the onClick handler", async () => {
+  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 () => {
     const user = userEvent.setup();
     render(
       <ConversationCard
@@ -204,6 +237,8 @@ describe("ConversationCard", () => {
       />,
     );
 
+    await clickOnEditButton(user);
+
     const title = screen.getByTestId("conversation-card-title");
     await user.click(title);
 

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

@@ -179,9 +179,10 @@ describe("ConversationPanel", () => {
     const user = userEvent.setup();
     renderConversationPanel();
     const cards = await screen.findAllByTestId("conversation-card");
-    const title = within(cards[0]).getByTestId("conversation-card-title");
 
-    await clickOnEditButton(user);
+    const card = cards[0];
+    await clickOnEditButton(user, card);
+    const title = within(card).getByTestId("conversation-card-title");
 
     await user.clear(title);
     await user.type(title, "Conversation 1 Renamed");
@@ -202,7 +203,10 @@ 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 user.click(title);
     await user.tab();
@@ -227,7 +231,7 @@ describe("ConversationPanel", () => {
   it("should call onClose after clicking a card", async () => {
     renderConversationPanel();
     const cards = await screen.findAllByTestId("conversation-card");
-    const firstCard = cards[0];
+    const firstCard = cards[1];
 
     await userEvent.click(firstCard);
 

frontend/__tests__/components/features/conversation-panel/utils.ts

@@ -1,11 +1,16 @@
 import { screen, within } from "@testing-library/react";
 import { UserEvent } from "@testing-library/user-event";
 
-export const clickOnEditButton = async (user: UserEvent) => {
-  const ellipsisButton = screen.getByTestId("ellipsis-button");
+export const clickOnEditButton = async (
+  user: UserEvent,
+  container?: HTMLElement,
+) => {
+  const wrapper = container ? within(container) : screen;
+
+  const ellipsisButton = wrapper.getByTestId("ellipsis-button");
   await user.click(ellipsisButton);
 
-  const menu = screen.getByTestId("context-menu");
+  const menu = wrapper.getByTestId("context-menu");
   const editButton = within(menu).getByTestId("edit-button");
 
   await user.click(editButton);

frontend/__tests__/components/features/sidebar/sidebar.test.tsx

@@ -3,52 +3,24 @@ 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";
-import { MOCK_USER_PREFERENCES } from "#/mocks/handlers";
 
 // These tests will now fail because the conversation panel is rendered through a portal
 // and technically not a child of the Sidebar component.
 
-const renderSidebar = () => {
-  const RouterStub = createRoutesStub([
-    {
-      path: "/conversation/:conversationId",
-      Component: Sidebar,
-    },
-  ]);
+const RouterStub = createRoutesStub([
+  {
+    path: "/conversation/:conversationId",
+    Component: () => <Sidebar />,
+  },
+]);
 
+const renderSidebar = () =>
   renderWithProviders(<RouterStub initialEntries={["/conversation/123"]} />);
-};
 
 describe("Sidebar", () => {
-  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");
@@ -76,35 +48,12 @@ describe("Sidebar", () => {
       await user.click(saveButton);
 
       expect(saveSettingsSpy).toHaveBeenCalledWith({
-        ...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
+        agent: "CodeActAgent",
+        confirmation_mode: false,
+        enable_default_condenser: false,
+        language: "en",
+        llm_model: "anthropic/claude-3-5-sonnet-20241022",
+        remote_runtime_resource_factor: 1,
       });
     });
 
@@ -134,14 +83,25 @@ 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({
-        ...MOCK_USER_PREFERENCES.settings,
+        agent: "CodeActAgent",
+        confirmation_mode: false,
+        enable_default_condenser: false,
+        github_token: "new-token",
         language: "no",
-        llm_api_key: undefined, // null or undefined
+        llm_base_url: "",
+        llm_model: "anthropic/claude-3-5-sonnet-20241022",
+        remote_runtime_resource_factor: 1,
+        security_analyzer: "",
+        user_consents_to_analytics: true,
       });
     });
 
@@ -169,11 +129,53 @@ describe("Sidebar", () => {
       await user.click(saveButton);
 
       expect(saveSettingsSpy).toHaveBeenCalledWith({
-        ...MOCK_USER_PREFERENCES.settings,
-        llm_api_key: undefined,
+        agent: "CodeActAgent",
+        confirmation_mode: false,
+        enable_default_condenser: false,
+        language: "en",
         llm_base_url: "",
-        security_analyzer: undefined,
+        llm_model: "anthropic/claude-3-5-sonnet-20241022",
+        remote_runtime_resource_factor: 1,
       });
     });
   });
+
+  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();
+    });
+  });
 });

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

@@ -14,7 +14,7 @@ describe("WaitlistModal", () => {
   });
 
   it("should render a tos checkbox that is unchecked by default", () => {
-    render(<WaitlistModal ghToken={null} githubAuthUrl={null} />);
+    render(<WaitlistModal ghTokenIsSet={false} 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 ghToken={null} githubAuthUrl={null} />);
+    render(<WaitlistModal ghTokenIsSet={false} 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 ghToken={null} githubAuthUrl="mock-url" />);
+    render(<WaitlistModal ghTokenIsSet={false} githubAuthUrl="mock-url" />);
 
     const checkbox = screen.getByRole("checkbox");
     await user.click(checkbox);

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

@@ -32,7 +32,7 @@ describe("FeedbackForm", () => {
     screen.getByLabelText(I18nKey.FEEDBACK$PRIVATE_LABEL);
     screen.getByLabelText(I18nKey.FEEDBACK$PUBLIC_LABEL);
 
-    screen.getByRole("button", { name: I18nKey.FEEDBACK$CONTRIBUTE_LABEL });
+    screen.getByRole("button", { name: I18nKey.FEEDBACK$SHARE_LABEL });
     screen.getByRole("button", { name: I18nKey.FEEDBACK$CANCEL_LABEL });
   });
 

frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx

@@ -0,0 +1,173 @@
+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,
+    });
+  });
+});

frontend/__tests__/components/suggestion-item.test.tsx

@@ -8,9 +8,10 @@ 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;
     },
@@ -38,9 +39,9 @@ describe("SuggestionItem", () => {
       value: "todo app value",
     };
 
-    const { container } = render(<SuggestionItem suggestion={translatedSuggestion} onClick={onClick} />);
-    console.log('Rendered HTML:', container.innerHTML);
-
+    render(
+      <SuggestionItem suggestion={translatedSuggestion} onClick={onClick} />,
+    );
 
     expect(screen.getByText("ToDoリストアプリを開発する")).toBeInTheDocument();
   });

frontend/__tests__/routes/_oh.test.tsx

@@ -58,6 +58,7 @@ 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",
@@ -69,12 +70,16 @@ 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,
@@ -83,7 +88,6 @@ 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();
@@ -106,17 +110,6 @@ 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");

frontend/__tests__/utils/storage.test.ts

@@ -1,28 +0,0 @@
-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" });
-  });
-});

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openhands-frontend",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "private": true,
   "type": "module",
   "engines": {
@@ -9,25 +9,25 @@
   "dependencies": {
     "@monaco-editor/react": "^4.7.0-rc.0",
     "@nextui-org/react": "^2.6.11",
-    "@react-router/node": "^7.1.2",
-    "@react-router/serve": "^7.1.2",
+    "@react-router/node": "^7.1.3",
+    "@react-router/serve": "^7.1.3",
     "@react-types/shared": "^3.27.0",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@tanstack/react-query": "^5.64.1",
+    "@reduxjs/toolkit": "^2.5.1",
+    "@tanstack/react-query": "^5.65.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.1",
-    "i18next": "^24.2.1",
+    "framer-motion": "^12.0.6",
+    "i18next": "^24.2.2",
     "i18next-browser-languagedetector": "^8.0.2",
-    "i18next-http-backend": "^3.0.1",
-    "isbot": "^5.1.21",
+    "i18next-http-backend": "^3.0.2",
+    "isbot": "^5.1.22",
     "jose": "^5.9.4",
     "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.207.0",
+    "posthog-js": "^1.211.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-highlight": "^0.15.0",
@@ -36,14 +36,14 @@
     "react-icons": "^5.4.0",
     "react-markdown": "^9.0.3",
     "react-redux": "^9.2.0",
-    "react-router": "^7.1.2",
+    "react-router": "^7.1.3",
     "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": "^5.4.11",
+    "vite": "^6.0.11",
     "web-vitals": "^3.5.2",
     "ws": "^8.18.0"
   },
@@ -77,23 +77,23 @@
   },
   "devDependencies": {
     "@mswjs/socket.io-binding": "^0.1.1",
-    "@playwright/test": "^1.49.1",
-    "@react-router/dev": "^7.1.2",
+    "@playwright/test": "^1.50.0",
+    "@react-router/dev": "^7.1.3",
     "@tailwindcss/typography": "^0.5.16",
-    "@tanstack/eslint-plugin-query": "^5.64.2",
+    "@tanstack/eslint-plugin-query": "^5.65.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.1",
     "@testing-library/react": "^16.2.0",
-    "@testing-library/user-event": "^14.6.0",
-    "@types/node": "^22.10.7",
-    "@types/react": "^19.0.7",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/node": "^22.12.0",
+    "@types/react": "^19.0.8",
     "@types/react-dom": "^19.0.3",
     "@types/react-highlight": "^0.12.8",
     "@types/react-syntax-highlighter": "^15.5.13",
-    "@types/ws": "^8.5.12",
+    "@types/ws": "^8.5.14",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "@vitest/coverage-v8": "^3.0.2",
+    "@vitest/coverage-v8": "^3.0.4",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",
     "eslint": "^8.57.0",
@@ -107,7 +107,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "husky": "^9.1.6",
     "jsdom": "^26.0.0",
-    "lint-staged": "^15.4.1",
+    "lint-staged": "^15.4.3",
     "msw": "^2.6.6",
     "postcss": "^8.5.1",
     "prettier": "^3.4.2",

frontend/src/api/github-axios-instance.ts

@@ -1,107 +0,0 @@
-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,
-};

frontend/src/api/github.ts

@@ -14,7 +14,7 @@ export const retrieveGitHubAppRepositories = async (
   per_page = 30,
 ) => {
   const installationId = installations[installationIndex];
-  const response = await openHands.get<GitHubAppRepository>(
+  const response = await openHands.get<GitHubRepository[]>(
     "/api/github/repositories",
     {
       params: {
@@ -26,7 +26,11 @@ export const retrieveGitHubAppRepositories = async (
     },
   );
 
-  const link = response.headers.link ?? "";
+  const link =
+    response.data.length > 0 && response.data[0].link_header
+      ? response.data[0].link_header
+      : "";
+
   const nextPage = extractNextPageFromLink(link);
   let nextInstallation: number | null;
 
@@ -39,7 +43,7 @@ export const retrieveGitHubAppRepositories = async (
   }
 
   return {
-    data: response.data.repositories,
+    data: response.data,
     nextPage,
     installationIndex: nextInstallation,
   };
@@ -64,7 +68,10 @@ export const retrieveGitHubUserRepositories = async (
     },
   );
 
-  const link = response.headers.link ?? "";
+  const link =
+    response.data.length > 0 && response.data[0].link_header
+      ? response.data[0].link_header
+      : "";
   const nextPage = extractNextPageFromLink(link);
 
   return { data: response.data, nextPage };

frontend/src/api/open-hands.ts

@@ -13,7 +13,7 @@ import {
   GetTrajectoryResponse,
 } from "./open-hands.types";
 import { openHands } from "./open-hands-axios";
-import { ApiSettings } from "#/services/settings";
+import { ApiSettings } from "#/types/settings";
 
 class OpenHands {
   /**
@@ -154,25 +154,6 @@ class OpenHands {
     return response.status === 200;
   }
 
-  /**
-   * Refresh Github Token
-   * @returns Refreshed Github access token
-   */
-  static async refreshToken(
-    appMode: GetConfigResponse["APP_MODE"],
-    userId: string,
-  ): Promise<string> {
-    if (appMode === "oss") return "";
-
-    const response = await openHands.post<GitHubAccessTokenResponse>(
-      "/api/refresh-token",
-      {
-        userId,
-      },
-    );
-    return response.data.access_token;
-  }
-
   /**
    * Get the blob of the workspace zip
    * @returns Blob of the workspace zip
@@ -242,13 +223,11 @@ 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,
@@ -275,35 +254,6 @@ 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
    */
@@ -347,7 +297,7 @@ class OpenHands {
     query: string,
     per_page = 5,
   ): Promise<GitHubRepository[]> {
-    const response = await openHands.get<{ items: GitHubRepository[] }>(
+    const response = await openHands.get<GitHubRepository[]>(
       "/api/github/search/repositories",
       {
         params: {
@@ -357,7 +307,7 @@ class OpenHands {
       },
     );
 
-    return response.data.items;
+    return response.data;
   }
 
   static async getTrajectory(
@@ -368,6 +318,10 @@ class OpenHands {
     );
     return data;
   }
+
+  static async logout(): Promise<void> {
+    await openHands.post("/api/logout");
+  }
 }
 
 export default OpenHands;

frontend/src/components/features/analytics/analytics-consent-form-modal.tsx

@@ -5,6 +5,7 @@ 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 {
@@ -14,13 +15,21 @@ interface AnalyticsConsentFormModalProps {
 export function AnalyticsConsentFormModal({
   onClose,
 }: AnalyticsConsentFormModalProps) {
-  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+  const { saveUserSettings } = useCurrentSettings();
+
+  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     const formData = new FormData(e.currentTarget);
     const analytics = formData.get("analytics") === "on";
 
-    handleCaptureConsent(analytics);
-    localStorage.setItem("analytics-consent", analytics.toString());
+    await saveUserSettings(
+      { user_consents_to_analytics: analytics },
+      {
+        onSuccess: () => {
+          handleCaptureConsent(analytics);
+        },
+      },
+    );
 
     onClose();
   };
@@ -46,6 +55,7 @@ export function AnalyticsConsentFormModal({
           </label>
 
           <ModalButton
+            testId="confirm-preferences"
             type="submit"
             text="Confirm Preferences"
             className="bg-primary text-white w-full hover:opacity-80"

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

@@ -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 { gitHubToken } = useAuth();
+  const { githubTokenIsSet } = useAuth();
   const { selectedRepository } = useSelector(
     (state: RootState) => state.initialQuery,
   );
@@ -32,7 +32,7 @@ export function ActionSuggestions({
         onClose={handleDownloadClose}
         isOpen={isDownloading}
       />
-      {gitHubToken && selectedRepository ? (
+      {githubTokenIsSet && selectedRepository ? (
         <div className="flex flex-row gap-2 justify-center w-full">
           {!hasPullRequest ? (
             <>

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

@@ -180,8 +180,7 @@ export function ChatInterface() {
           onStop={handleStop}
           isDisabled={
             curAgentState === AgentState.LOADING ||
-            curAgentState === AgentState.AWAITING_USER_CONFIRMATION ||
-            curAgentState === AgentState.RATE_LIMITED
+            curAgentState === AgentState.AWAITING_USER_CONFIRMATION
           }
           mode={curAgentState === AgentState.RUNNING ? "stop" : "submit"}
           value={messageToSend ?? undefined}

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

@@ -58,7 +58,7 @@ export function ChatMessage({
         mode={isCopy ? "copied" : "copy"}
       />
       <Markdown
-        className="text-sm overflow-auto"
+        className="text-sm overflow-auto break-words"
         components={{
           code,
           ul,

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

@@ -58,8 +58,10 @@ export function ConversationCard({
   };
 
   const handleInputClick = (event: React.MouseEvent<HTMLInputElement>) => {
-    event.preventDefault();
-    event.stopPropagation();
+    if (titleMode === "edit") {
+      event.preventDefault();
+      event.stopPropagation();
+    }
   };
 
   const handleDelete = (event: React.MouseEvent<HTMLButtonElement>) => {
@@ -101,17 +103,26 @@ export function ConversationCard({
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-2 w-full">
           {isActive && <span className="w-2 h-2 bg-blue-500 rounded-full" />}
-          <input
-            ref={inputRef}
-            disabled={titleMode === "view"}
-            data-testid="conversation-card-title"
-            onClick={handleInputClick}
-            onBlur={handleBlur}
-            onKeyUp={handleKeyUp}
-            type="text"
-            defaultValue={title}
-            className="text-sm leading-6 font-semibold bg-transparent w-full"
-          />
+          {titleMode === "edit" && (
+            <input
+              ref={inputRef}
+              data-testid="conversation-card-title"
+              onClick={handleInputClick}
+              onBlur={handleBlur}
+              onKeyUp={handleKeyUp}
+              type="text"
+              defaultValue={title}
+              className="text-sm leading-6 font-semibold bg-transparent w-full"
+            />
+          )}
+          {titleMode === "view" && (
+            <p
+              data-testid="conversation-card-title"
+              className="text-sm leading-6 font-semibold bg-transparent w-full"
+            >
+              {title}
+            </p>
+          )}
         </div>
 
         <div className="flex items-center gap-2 relative">
@@ -143,10 +154,7 @@ export function ConversationCard({
         )}
       >
         {selectedRepository && (
-          <ConversationRepoLink
-            selectedRepository={selectedRepository}
-            onClick={(e) => e.stopPropagation()}
-          />
+          <ConversationRepoLink selectedRepository={selectedRepository} />
         )}
         <p className="text-xs text-neutral-400">
           <time>{formatTimeDelta(new Date(lastUpdatedAt))} ago</time>

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

@@ -1,21 +1,27 @@
 interface ConversationRepoLinkProps {
   selectedRepository: string;
-  onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
 }
 
 export function ConversationRepoLink({
   selectedRepository,
-  onClick,
 }: ConversationRepoLinkProps) {
+  const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+    event.preventDefault();
+    window.open(
+      `https://github.com/${selectedRepository}`,
+      "_blank",
+      "noopener,noreferrer",
+    );
+  };
+
   return (
-    <a
+    <button
+      type="button"
       data-testid="conversation-card-selected-repository"
-      href={`https://github.com/${selectedRepository}`}
-      target="_blank noopener noreferrer"
-      onClick={onClick}
+      onClick={handleClick}
       className="text-xs text-neutral-400 hover:text-neutral-200"
     >
       {selectedRepository}
-    </a>
+    </button>
   );
 }

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

@@ -124,7 +124,7 @@ export function FeedbackForm({ onClose, polarity }: FeedbackFormProps) {
         <ModalButton
           disabled={isPending}
           type="submit"
-          text={t(I18nKey.FEEDBACK$CONTRIBUTE_LABEL)}
+          text={t(I18nKey.FEEDBACK$SHARE_LABEL)}
           className="bg-[#4465DB] grow"
         />
         <ModalButton

frontend/src/components/features/github/github-repo-selector.tsx

@@ -70,7 +70,7 @@ export function GitHubRepositorySelector({
       }}
       onSelectionChange={(id) => handleRepoSelection(id?.toString() ?? null)}
       onInputChange={onInputChange}
-      clearButtonProps={{ onClick: handleClearSelection }}
+      clearButtonProps={{ onPress: handleClearSelection }}
       listboxProps={{
         emptyContent,
       }}

frontend/src/components/features/github/github-repositories-suggestion-box.tsx

@@ -5,14 +5,12 @@ import { SuggestionBox } from "#/components/features/suggestions/suggestion-box"
 import GitHubLogo from "#/assets/branding/github-logo.svg?react";
 import { GitHubRepositorySelector } from "./github-repo-selector";
 import { ModalButton } from "#/components/shared/buttons/modal-button";
-import { ConnectToGitHubModal } from "#/components/shared/modals/connect-to-github-modal";
-import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
-import { isGitHubErrorReponse } from "#/api/github-axios-instance";
 import { useAppRepositories } from "#/hooks/query/use-app-repositories";
 import { useSearchRepositories } from "#/hooks/query/use-search-repositories";
 import { useUserRepositories } from "#/hooks/query/use-user-repositories";
 import { sanitizeQuery } from "#/utils/sanitize-query";
 import { useDebounce } from "#/hooks/use-debounce";
+import { AccountSettingsModal } from "#/components/shared/modals/account-settings/account-settings-modal";
 
 interface GitHubRepositoriesSuggestionBoxProps {
   handleSubmit: () => void;
@@ -51,7 +49,7 @@ export function GitHubRepositoriesSuggestionBox({
     }
   };
 
-  const isLoggedIn = !!user && !isGitHubErrorReponse(user);
+  const isLoggedIn = !!user;
 
   return (
     <>
@@ -76,11 +74,9 @@ export function GitHubRepositoriesSuggestionBox({
         }
       />
       {connectToGitHubModalOpen && (
-        <ModalBackdrop onClose={() => setConnectToGitHubModalOpen(false)}>
-          <ConnectToGitHubModal
-            onClose={() => setConnectToGitHubModalOpen(false)}
-          />
-        </ModalBackdrop>
+        <AccountSettingsModal
+          onClose={() => setConnectToGitHubModalOpen(false)}
+        />
       )}
     </>
   );

frontend/src/components/features/sidebar/sidebar.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import { FaListUl } from "react-icons/fa";
 import { useDispatch } from "react-redux";
-import { useAuth } from "#/context/auth-context";
+import posthog from "posthog-js";
+import toast from "react-hot-toast";
 import { useGitHubUser } from "#/hooks/query/use-github-user";
-import { useIsAuthed } from "#/hooks/query/use-is-authed";
 import { UserActions } from "./user-actions";
 import { AllHandsLogoButton } from "#/components/shared/buttons/all-hands-logo-button";
 import { DocsButton } from "#/components/shared/buttons/docs-button";
@@ -21,20 +21,22 @@ import { setCurrentAgentState } from "#/state/agent-slice";
 import { AgentState } from "#/types/agent-state";
 import { TooltipButton } from "#/components/shared/buttons/tooltip-button";
 import { ConversationPanelWrapper } from "../conversation-panel/conversation-panel-wrapper";
+import { useLogout } from "#/hooks/mutation/use-logout";
+import { useConfig } from "#/hooks/query/use-config";
 
 export function Sidebar() {
   const dispatch = useDispatch();
   const endSession = useEndSession();
   const user = useGitHubUser();
-  const { data: isAuthed } = useIsAuthed();
-  const { logout } = useAuth();
+  const { data: config } = useConfig();
   const {
     data: settings,
+    error: settingsError,
     isError: settingsIsError,
-    isSuccess: settingsSuccessfulyFetched,
+    isFetching: isFetchingSettings,
   } = useSettings();
-
-  const { isUpToDate: settingsAreUpToDate } = useCurrentSettings();
+  const { mutateAsync: logout } = useLogout();
+  const { saveUserSettings } = useCurrentSettings();
 
   const [accountSettingsModalOpen, setAccountSettingsModalOpen] =
     React.useState(false);
@@ -50,21 +52,34 @@ export function Sidebar() {
     }
   }, [user.isError]);
 
+  React.useEffect(() => {
+    // We don't show toast errors for settings in the global error handler
+    // because we have a special case for 404 errors
+    if (
+      !isFetchingSettings &&
+      settingsIsError &&
+      settingsError?.status !== 404
+    ) {
+      toast.error(
+        "Something went wrong while fetching settings. Please reload the page.",
+      );
+    }
+  }, [settingsError?.status, settingsError, isFetchingSettings]);
+
   const handleEndSession = () => {
     dispatch(setCurrentAgentState(AgentState.LOADING));
     endSession();
   };
 
   const handleAccountSettingsModalClose = () => {
-    // If the user closes the modal without connecting to GitHub,
-    // we need to log them out to clear the invalid token from the
-    // local storage
-    if (user.isError) logout();
     setAccountSettingsModalOpen(false);
   };
 
-  const showSettingsModal =
-    isAuthed && (!settingsAreUpToDate || settingsModalIsOpen);
+  const handleLogout = async () => {
+    if (config?.APP_MODE === "saas") await logout();
+    else await saveUserSettings({ unset_github_token: true });
+    posthog.reset();
+  };
 
   return (
     <>
@@ -92,7 +107,7 @@ export function Sidebar() {
               user={
                 user.data ? { avatar_url: user.data.avatar_url } : undefined
               }
-              onLogout={logout}
+              onLogout={handleLogout}
               onClickAccountSettings={() => setAccountSettingsModalOpen(true)}
             />
           )}
@@ -110,13 +125,12 @@ export function Sidebar() {
       {accountSettingsModalOpen && (
         <AccountSettingsModal onClose={handleAccountSettingsModalClose} />
       )}
-      {settingsIsError ||
-        (showSettingsModal && settingsSuccessfulyFetched && (
-          <SettingsModal
-            settings={settings}
-            onClose={() => setSettingsModalIsOpen(false)}
-          />
-        ))}
+      {(settingsError?.status === 404 || settingsModalIsOpen) && (
+        <SettingsModal
+          settings={settings}
+          onClose={() => setSettingsModalIsOpen(false)}
+        />
+      )}
     </>
   );
 }

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

@@ -10,11 +10,14 @@ import { TOSCheckbox } from "./tos-checkbox";
 import { handleCaptureConsent } from "#/utils/handle-capture-consent";
 
 interface WaitlistModalProps {
-  ghToken: string | null;
+  ghTokenIsSet: boolean;
   githubAuthUrl: string | null;
 }
 
-export function WaitlistModal({ ghToken, githubAuthUrl }: WaitlistModalProps) {
+export function WaitlistModal({
+  ghTokenIsSet,
+  githubAuthUrl,
+}: WaitlistModalProps) {
   const [isTosAccepted, setIsTosAccepted] = React.useState(false);
 
   const handleGitHubAuth = () => {
@@ -28,11 +31,11 @@ export function WaitlistModal({ ghToken, githubAuthUrl }: WaitlistModalProps) {
     <ModalBackdrop>
       <ModalBody>
         <AllHandsLogo width={68} height={46} />
-        <WaitlistMessage content={ghToken ? "waitlist" : "sign-in"} />
+        <WaitlistMessage content={ghTokenIsSet ? "waitlist" : "sign-in"} />
 
         <TOSCheckbox onChange={() => setIsTosAccepted((prev) => !prev)} />
 
-        {!ghToken && (
+        {!ghTokenIsSet && (
           <ModalButton
             disabled={!isTosAccepted}
             text="Connect to GitHub"
@@ -41,7 +44,7 @@ export function WaitlistModal({ ghToken, githubAuthUrl }: WaitlistModalProps) {
             onClick={handleGitHubAuth}
           />
         )}
-        {ghToken && <JoinWaitlistAnchor />}
+        {ghTokenIsSet && <JoinWaitlistAnchor />}
       </ModalBody>
     </ModalBackdrop>
   );

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

@@ -1,5 +1,6 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
+import posthog from "posthog-js";
 import {
   BaseModalDescription,
   BaseModalTitle,
@@ -7,32 +8,29 @@ import {
 import { ModalBody } from "../modal-body";
 import { AvailableLanguages } from "#/i18n";
 import { I18nKey } from "#/i18n/declaration";
-import { useAuth } from "#/context/auth-context";
 import { handleCaptureConsent } from "#/utils/handle-capture-consent";
 import { ModalButton } from "../../buttons/modal-button";
-import { CustomInput } from "../../custom-input";
 import { FormFieldset } from "../../form-fieldset";
 import { useConfig } from "#/hooks/query/use-config";
 import { useCurrentSettings } from "#/context/settings-context";
+import { GitHubTokenInput } from "./github-token-input";
+import { PostSettings } from "#/types/settings";
+import { useGitHubUser } from "#/hooks/query/use-github-user";
 
 interface AccountSettingsFormProps {
   onClose: () => void;
-  selectedLanguage: string;
-  gitHubError: boolean;
-  analyticsConsent: string | null;
 }
 
-export function AccountSettingsForm({
-  onClose,
-  selectedLanguage,
-  gitHubError,
-  analyticsConsent,
-}: AccountSettingsFormProps) {
-  const { gitHubToken, setGitHubToken, logout } = useAuth();
+export function AccountSettingsForm({ onClose }: AccountSettingsFormProps) {
+  const { isError: isGitHubError } = useGitHubUser();
   const { data: config } = useConfig();
-  const { saveUserSettings } = useCurrentSettings();
+  const { saveUserSettings, settings } = useCurrentSettings();
   const { t } = useTranslation();
 
+  const githubTokenIsSet = !!settings?.GITHUB_TOKEN_IS_SET;
+  const analyticsConsentValue = !!settings?.USER_CONSENTS_TO_ANALYTICS;
+  const selectedLanguage = settings?.LANGUAGE || "en";
+
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
     const formData = new FormData(event.currentTarget);
@@ -41,7 +39,10 @@ export function AccountSettingsForm({
     const language = formData.get("language")?.toString();
     const analytics = formData.get("analytics")?.toString() === "on";
 
-    if (ghToken) setGitHubToken(ghToken);
+    const newSettings: Partial<PostSettings> = {};
+    newSettings.user_consents_to_analytics = analytics;
+
+    if (ghToken) newSettings.github_token = ghToken;
 
     // The form returns the language label, so we need to find the corresponding
     // language key to save it in the settings
@@ -50,16 +51,24 @@ export function AccountSettingsForm({
         ({ label }) => label === language,
       )?.value;
 
-      if (languageKey) await saveUserSettings({ LANGUAGE: languageKey });
+      if (languageKey) newSettings.LANGUAGE = languageKey;
     }
 
-    handleCaptureConsent(analytics);
-    const ANALYTICS = analytics.toString();
-    localStorage.setItem("analytics-consent", ANALYTICS);
+    await saveUserSettings(newSettings, {
+      onSuccess: () => {
+        handleCaptureConsent(analytics);
+      },
+    });
 
     onClose();
   };
 
+  const onDisconnect = async () => {
+    await saveUserSettings({ unset_github_token: true });
+    posthog.reset();
+    onClose();
+  };
+
   return (
     <ModalBody testID="account-settings-form">
       <form className="flex flex-col w-full gap-6" onSubmit={handleSubmit}>
@@ -89,38 +98,33 @@ export function AccountSettingsForm({
 
           {config?.APP_MODE !== "saas" && (
             <>
-              <CustomInput
-                name="ghToken"
-                label={t(I18nKey.GITHUB$TOKEN_LABEL)}
-                type="password"
-                defaultValue={gitHubToken ?? ""}
-              />
-              <BaseModalDescription>
-                {t(I18nKey.GITHUB$GET_TOKEN)}{" "}
-                <a
-                  href="https://github.com/settings/tokens/new?description=openhands-app&scopes=repo,user,workflow"
-                  target="_blank"
-                  rel="noreferrer noopener"
-                  className="text-[#791B80] underline"
-                >
-                  {t(I18nKey.COMMON$HERE)}
-                </a>
-              </BaseModalDescription>
+              <GitHubTokenInput githubTokenIsSet={githubTokenIsSet} />
+              {!githubTokenIsSet && (
+                <BaseModalDescription>
+                  {t(I18nKey.GITHUB$GET_TOKEN)}{" "}
+                  <a
+                    href="https://github.com/settings/tokens/new?description=openhands-app&scopes=repo,user,workflow"
+                    target="_blank"
+                    rel="noreferrer noopener"
+                    className="text-[#791B80] underline"
+                  >
+                    {t(I18nKey.COMMON$HERE)}
+                  </a>
+                </BaseModalDescription>
+              )}
             </>
           )}
-          {gitHubError && (
+          {isGitHubError && (
             <p className="text-danger text-xs">
               {t(I18nKey.GITHUB$TOKEN_INVALID)}
             </p>
           )}
-          {gitHubToken && !gitHubError && (
+          {githubTokenIsSet && !isGitHubError && (
             <ModalButton
+              testId="disconnect-github"
               variant="text-like"
               text={t(I18nKey.BUTTON$DISCONNECT)}
-              onClick={() => {
-                logout();
-                onClose();
-              }}
+              onClick={onDisconnect}
               className="text-danger self-start"
             />
           )}
@@ -128,9 +132,10 @@ export function AccountSettingsForm({
 
         <label className="flex gap-2 items-center self-start">
           <input
+            data-testid="analytics-consent"
             name="analytics"
             type="checkbox"
-            defaultChecked={analyticsConsent === "true"}
+            defaultChecked={analyticsConsentValue}
           />
           {t(I18nKey.ANALYTICS$ENABLE)}
         </label>

frontend/src/components/shared/modals/account-settings/account-settings-modal.tsx

@@ -1,5 +1,3 @@
-import { useGitHubUser } from "#/hooks/query/use-github-user";
-import { useSettings } from "#/hooks/query/use-settings";
 import { ModalBackdrop } from "../modal-backdrop";
 import { AccountSettingsForm } from "./account-settings-form";
 
@@ -8,20 +6,9 @@ interface AccountSettingsModalProps {
 }
 
 export function AccountSettingsModal({ onClose }: AccountSettingsModalProps) {
-  const user = useGitHubUser();
-  const { data: settings } = useSettings();
-
-  // FIXME: Bad practice to use localStorage directly
-  const analyticsConsent = localStorage.getItem("analytics-consent");
-
   return (
     <ModalBackdrop onClose={onClose}>
-      <AccountSettingsForm
-        onClose={onClose}
-        selectedLanguage={settings?.LANGUAGE || "en"}
-        gitHubError={user.isError}
-        analyticsConsent={analyticsConsent}
-      />
+      <AccountSettingsForm onClose={onClose} />
     </ModalBackdrop>
   );
 }