Simplify setup script handling and remove session.py changes

- Add maybe_run_setup_script method to Runtime class
- Run setup script after cloning repository
- Support both workspace and repository setup scripts

.github/scripts/check_version_consistency.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+import os
+import re
+import sys
+from typing import Set, Tuple
+
+
+def find_version_references(directory: str) -> Tuple[Set[str], Set[str]]:
+    openhands_versions = set()
+    runtime_versions = set()
+
+    version_pattern_openhands = re.compile(r'openhands:(\d{1})\.(\d{2})')
+    version_pattern_runtime = re.compile(r'runtime:(\d{1})\.(\d{2})')
+
+    for root, _, files in os.walk(directory):
+        # Skip .git directory
+        if '.git' in root:
+            continue
+
+        for file in files:
+            if file.endswith(
+                ('.md', '.yml', '.yaml', '.txt', '.html', '.py', '.js', '.ts')
+            ):
+                file_path = os.path.join(root, file)
+                try:
+                    with open(file_path, 'r', encoding='utf-8') as f:
+                        content = f.read()
+
+                        # Find all openhands version references
+                        matches = version_pattern_openhands.findall(content)
+                        openhands_versions.update(matches)
+
+                        # Find all runtime version references
+                        matches = version_pattern_runtime.findall(content)
+                        runtime_versions.update(matches)
+                except Exception as e:
+                    print(f'Error reading {file_path}: {e}', file=sys.stderr)
+
+    return openhands_versions, runtime_versions
+
+
+def main():
+    repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+    openhands_versions, runtime_versions = find_version_references(repo_root)
+
+    exit_code = 0
+
+    if len(openhands_versions) > 1:
+        print('Error: Multiple openhands versions found:', file=sys.stderr)
+        print('Found versions:', sorted(openhands_versions), file=sys.stderr)
+        exit_code = 1
+    elif len(openhands_versions) == 0:
+        print('Warning: No openhands version references found', file=sys.stderr)
+
+    if len(runtime_versions) > 1:
+        print('Error: Multiple runtime versions found:', file=sys.stderr)
+        print('Found versions:', sorted(runtime_versions), file=sys.stderr)
+        exit_code = 1
+    elif len(runtime_versions) == 0:
+        print('Warning: No runtime version references found', file=sys.stderr)
+
+    sys.exit(exit_code)
+
+
+if __name__ == '__main__':
+    main()

.github/workflows/lint.yml

@@ -53,3 +53,16 @@ jobs:
         run: pip install pre-commit==3.7.0
       - name: Run pre-commit hooks
         run: pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --show-diff-on-failure --config ./dev_config/python/.pre-commit-config.yaml
+
+  # Check version consistency across documentation
+  check-version-consistency:
+    name: Check version consistency
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Run version consistency check
+        run: .github/scripts/check_version_consistency.py

.github/workflows/openhands-resolver.yml

@@ -185,12 +185,17 @@ jobs:
 
       - name: Install OpenHands
         uses: actions/github-script@v7
+        env:
+          COMMENT_BODY: ${{ github.event.comment.body || '' }}
+          REVIEW_BODY: ${{ github.event.review.body || '' }}
+          LABEL_NAME: ${{ github.event.label.name || '' }}
+          EVENT_NAME: ${{ github.event_name }}
         with:
           script: |
-            const commentBody = `${{ github.event.comment.body || '' }}`.trim();
-            const reviewBody = `${{ github.event.review.body || '' }}`.trim();
-            const labelName = `${{ github.event.label.name || '' }}`.trim();
-            const eventName = `${{ github.event_name }}`.trim();
+            const commentBody = process.env.COMMENT_BODY.trim();
+            const reviewBody = process.env.REVIEW_BODY.trim();
+            const labelName = process.env.LABEL_NAME.trim();
+            const eventName = process.env.EVENT_NAME.trim();
 
             // Check conditions
             const isExperimentalLabel = labelName === "fix-me-experimental";

Development.md

@@ -8,7 +8,7 @@ Otherwise, you can clone the OpenHands project directly.
 * Linux, Mac OS, or [WSL on Windows](https://learn.microsoft.com/en-us/windows/wsl/install)  [Ubuntu <= 22.04]
 * [Docker](https://docs.docker.com/engine/install/) (For those on MacOS, make sure to allow the default Docker socket to be used from advanced settings!)
 * [Python](https://www.python.org/downloads/) = 3.12
-* [NodeJS](https://nodejs.org/en/download/package-manager) >= 18.17.1
+* [NodeJS](https://nodejs.org/en/download/package-manager) >= 20.x
 * [Poetry](https://python-poetry.org/docs/#installing-with-the-official-installer) >= 1.8
 * OS-specific dependencies:
   - Ubuntu: build-essential => `sudo apt-get install build-essential`
@@ -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.17-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.18-nikolaik`
 
 ## Develop inside Docker container
 

Makefile

@@ -81,10 +81,10 @@ check-nodejs:
 	@if command -v node > /dev/null; then \
 		NODE_VERSION=$(shell node --version | sed -E 's/v//g'); \
 		IFS='.' read -r -a NODE_VERSION_ARRAY <<< "$$NODE_VERSION"; \
-		if [ "$${NODE_VERSION_ARRAY[0]}" -gt 18 ] || ([ "$${NODE_VERSION_ARRAY[0]}" -eq 18 ] && [ "$${NODE_VERSION_ARRAY[1]}" -gt 17 ]) || ([ "$${NODE_VERSION_ARRAY[0]}" -eq 18 ] && [ "$${NODE_VERSION_ARRAY[1]}" -eq 17 ] && [ "$${NODE_VERSION_ARRAY[2]}" -ge 1 ]); then \
+		if [ "$${NODE_VERSION_ARRAY[0]}" -ge 20 ]; then \
 			echo "$(BLUE)Node.js $$NODE_VERSION is already installed.$(RESET)"; \
 		else \
-			echo "$(RED)Node.js 18.17.1 or later is required. Please install Node.js 18.17.1 or later to continue.$(RESET)"; \
+			echo "$(RED)Node.js 20.x or later is required. Please install Node.js 20.x or later to continue.$(RESET)"; \
 			exit 1; \
 		fi; \
 	else \

README.md

@@ -43,17 +43,17 @@ See the [Installation](https://docs.all-hands.dev/modules/usage/installation) gu
 system requirements and more information.
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.17-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.17-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-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.17
+    docker.all-hands.dev/all-hands-ai/openhands:0.18
 ```
 
 You'll find OpenHands running at [http://localhost:3000](http://localhost:3000)!
@@ -64,16 +64,16 @@ works best, but you have [many options](https://docs.all-hands.dev/modules/usage
 
 ---
 
-You can also [connect OpenHands to your local filesystem](https://docs.all-hands.dev/modules/usage/runtimes),
+You can also [connect OpenHands to your local filesystem](https://docs.all-hands.dev/modules/usage/runtimes#connecting-to-your-filesystem),
 run OpenHands in a scriptable [headless mode](https://docs.all-hands.dev/modules/usage/how-to/headless-mode),
 interact with it via a [friendly CLI](https://docs.all-hands.dev/modules/usage/how-to/cli-mode),
-or run it on tagged issues with [a github action](https://github.com/All-Hands-AI/OpenHands/blob/main/openhands/resolver/README.md).
+or run it on tagged issues with [a github action](https://docs.all-hands.dev/modules/usage/how-to/github-action).
 
 Visit [Installation](https://docs.all-hands.dev/modules/usage/installation) for more information and setup instructions.
 
 > [!CAUTION]
 > OpenHands is meant to be run by a single user on their local workstation.
-> It is not appropriate for multi-tenant deployments, where multiple users share the same instance--there is no built-in isolation or scalability.
+> It is not appropriate for multi-tenant deployments where multiple users share the same instance. There is no built-in isolation or scalability.
 >
 > If you're interested in running OpenHands in a multi-tenant environment, please
 > [get in touch with us](https://docs.google.com/forms/d/e/1FAIpQLSet3VbGaz8z32gW9Wm-Grl4jpt5WgMXPgJ4EDPVmCETCBpJtQ/viewform)
@@ -86,7 +86,7 @@ Having issues? The [Troubleshooting Guide](https://docs.all-hands.dev/modules/us
 ## 📖 Documentation
 
 To learn more about the project, and for tips on using OpenHands,
-**check out our [documentation](https://docs.all-hands.dev/modules/usage/getting-started)**.
+check out our [documentation](https://docs.all-hands.dev/modules/usage/getting-started).
 
 There you'll find resources on how to use different LLM providers,
 troubleshooting resources, and advanced configuration options.

compose.yml

@@ -7,7 +7,7 @@ services:
     image: openhands:latest
     container_name: openhands-app-${DATE:-}
     environment:
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.17-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.18-nikolaik}
       - SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
       - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
     ports:

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

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

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.16-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-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.16 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
     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.16-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.16-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-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.16
+    docker.all-hands.dev/all-hands-ai/openhands:0.18
 ```
 
 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/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.16-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik \
     -v /var/run/docker.sock:/var/run/docker.sock \
     # ...
 ```

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

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.16-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-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.16 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
     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.16-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.16-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-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.16
+    docker.all-hands.dev/all-hands-ai/openhands:0.18
 ```
 
 你也可以在可脚本化的[无头模式](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/runtimes.md

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

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

@@ -6,10 +6,9 @@ This mode is different from the [headless mode](headless-mode), which is non-int
 
 ## With Python
 
-To start an interactive OpenHands session via the command line, follow these steps:
+To start an interactive OpenHands session via the command line:
 
 1. Ensure you have followed the [Development setup instructions](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md).
-
 2. Run the following command:
 
 ```bash
@@ -21,45 +20,32 @@ This command will start an interactive session where you can input tasks and rec
 You'll need to be sure to set your model, API key, and other settings via environment variables
 [or the `config.toml` file](https://github.com/All-Hands-AI/OpenHands/blob/main/config.template.toml).
 
-
 ## With Docker
 
-To run OpenHands in CLI mode with Docker, follow these steps:
+To run OpenHands in CLI mode with Docker:
 
-1. Set `WORKSPACE_BASE` to the directory you want OpenHands to edit:
+1. Set the following environmental variables in your terminal:
 
-```bash
-WORKSPACE_BASE=$(pwd)/workspace
-```
+* `WORKSPACE_BASE` to the directory you want OpenHands to edit (Ex: `export WORKSPACE_BASE=$(pwd)/workspace`).
+* `LLM_MODEL` to the model to use (Ex: `export LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"`).
+* `LLM_API_KEY` to the API key (Ex: `export LLM_API_KEY="sk_test_12345"`).
 
-2. Set `LLM_MODEL` to the model you want to use:
-
-```bash
-LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"
-
-```
-
-3. Set `LLM_API_KEY` to your API key:
-
-```bash
-LLM_API_KEY="sk_test_12345"
-```
-
-4. Run the following Docker command:
+2. Run the following Docker command:
 
 ```bash
 docker run -it \
     --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.17-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik \
     -e SANDBOX_USER_ID=$(id -u) \
     -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
     -e LLM_API_KEY=$LLM_API_KEY \
     -e LLM_MODEL=$LLM_MODEL \
     -v $WORKSPACE_BASE:/opt/workspace_base \
     -v /var/run/docker.sock:/var/run/docker.sock \
+    -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.17 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
     python -m openhands.core.cli
 ```
 

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

@@ -7,10 +7,9 @@ This is different from [CLI Mode](cli-mode), which is interactive, and better fo
 
 ## With Python
 
-To run OpenHands in headless mode with Python,
-[follow the Development setup instructions](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md),
-and then run:
-
+To run OpenHands in headless mode with Python:
+1. Ensure you have followed the [Development setup instructions](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md).
+2. Run the following command:
 ```bash
 poetry run python -m openhands.core.main -t "write a bash script that prints hi"
 ```
@@ -20,31 +19,20 @@ You'll need to be sure to set your model, API key, and other settings via enviro
 
 ## With Docker
 
-1. Set `WORKSPACE_BASE` to the directory you want OpenHands to edit:
+To run OpenHands in Headless mode with Docker:
 
-```bash
-WORKSPACE_BASE=$(pwd)/workspace
-```
+1. Set the following environmental variables in your terminal:
 
-2. Set `LLM_MODEL` to the model you want to use:
+* `WORKSPACE_BASE` to the directory you want OpenHands to edit (Ex: `export WORKSPACE_BASE=$(pwd)/workspace`).
+* `LLM_MODEL` to the model to use (Ex: `export LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"`).
+* `LLM_API_KEY` to the API key (Ex: `export LLM_API_KEY="sk_test_12345"`).
 
-```bash
-LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"
-
-```
-
-3. Set `LLM_API_KEY` to your API key:
-
-```bash
-LLM_API_KEY="sk_test_12345"
-```
-
-4. Run the following Docker command:
+2. Run the following Docker command:
 
 ```bash
 docker run -it \
     --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.17-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik \
     -e SANDBOX_USER_ID=$(id -u) \
     -e WORKSPACE_MOUNT_PATH=$WORKSPACE_BASE \
     -e LLM_API_KEY=$LLM_API_KEY \
@@ -52,8 +40,17 @@ docker run -it \
     -e LOG_ALL_EVENTS=true \
     -v $WORKSPACE_BASE:/opt/workspace_base \
     -v /var/run/docker.sock:/var/run/docker.sock \
+    -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.17 \
-    python -m openhands.core.main -t "write a bash script that prints hi" --no-auto-continue
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
+    python -m openhands.core.main -t "write a bash script that prints hi"
 ```
+
+## Advanced Headless Configurations
+
+To view all available configuration options for headless mode, run the Python command with the `--help` flag.
+
+### Additional Logs
+
+For the headless mode to log all the agent actions, in your terminal run: `export LOG_ALL_EVENTS=true`

docs/modules/usage/installation.mdx

@@ -11,20 +11,25 @@
 The easiest way to run OpenHands is in Docker.
 
 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.17-nikolaik
+docker pull docker.all-hands.dev/all-hands-ai/runtime:0.18-nikolaik
 
 docker run -it --rm --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.17-nikolaik \
+    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.18-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.17
+    docker.all-hands.dev/all-hands-ai/openhands:0.18
 ```
 
-You can also run OpenHands in a scriptable [headless mode](https://docs.all-hands.dev/modules/usage/how-to/headless-mode), as an [interactive CLI](https://docs.all-hands.dev/modules/usage/how-to/cli-mode), or using the [OpenHands GitHub Action](https://docs.all-hands.dev/modules/usage/how-to/github-action).
+You'll find OpenHands running at http://localhost:3000!
+
+You can also [connect OpenHands to your local filesystem](https://docs.all-hands.dev/modules/usage/runtimes#connecting-to-your-filesystem),
+run OpenHands in a scriptable [headless mode](https://docs.all-hands.dev/modules/usage/how-to/headless-mode),
+interact with it via a [friendly CLI](https://docs.all-hands.dev/modules/usage/how-to/cli-mode),
+or run it on tagged issues with [a github action](https://docs.all-hands.dev/modules/usage/how-to/github-action).
 
 ## Setup
 

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

docs/src/pages/index.tsx

@@ -1,14 +1,13 @@
-import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
-import Layout from "@theme/Layout";
-import { HomepageHeader } from "../components/HomepageHeader/HomepageHeader";
-import { Welcome } from "../components/Welcome/Welcome";
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import Layout from '@theme/Layout';
+import { HomepageHeader } from '../components/HomepageHeader/HomepageHeader';
 import { translate } from '@docusaurus/Translate';
 
 export function Header({ title, summary }): JSX.Element {
   return (
     <div>
       <h1>{title}</h1>
-      <h2 style={{ fontSize: "3rem" }}>{summary}</h2>
+      <h2 style={{ fontSize: '3rem' }}>{summary}</h2>
     </div>
   );
 }
@@ -23,7 +22,7 @@ export default function Home(): JSX.Element {
         message: 'Code Less, Make More',
       })}
     >
-    <HomepageHeader />
+      <HomepageHeader />
     </Layout>
   );
 }

evaluation/benchmarks/EDA/run_infer.py

@@ -63,7 +63,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/agent_bench/run_infer.py

@@ -43,7 +43,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-slim',

evaluation/benchmarks/aider_bench/run_infer.py

@@ -50,7 +50,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.11-bookworm',

evaluation/benchmarks/biocoder/run_infer.py

@@ -61,7 +61,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image=BIOCODER_BENCH_CONTAINER_IMAGE,

evaluation/benchmarks/bird/run_infer.py

@@ -74,7 +74,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/browsing_delegation/run_infer.py

@@ -39,7 +39,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/commit0_bench/run_infer.py

@@ -124,7 +124,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=SandboxConfig(
             base_container_image=base_container_image,
             enable_auto_lint=True,

evaluation/benchmarks/discoverybench/run_infer.py

@@ -65,7 +65,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/gaia/run_infer.py

@@ -50,7 +50,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/gorilla/run_infer.py

@@ -43,7 +43,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/gpqa/run_infer.py

@@ -64,7 +64,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/humanevalfix/run_infer.py

@@ -85,7 +85,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/logic_reasoning/run_infer.py

@@ -48,7 +48,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='xingyaoww/od-eval-logic-reasoning:v1.0',

evaluation/benchmarks/miniwob/run_infer.py

@@ -58,7 +58,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='xingyaoww/od-eval-miniwob:v1.0',

evaluation/benchmarks/mint/run_infer.py

@@ -106,7 +106,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='xingyaoww/od-eval-mint:v1.0',

evaluation/benchmarks/ml_bench/run_infer.py

@@ -80,7 +80,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='public.ecr.aws/i5g0m1f6/ml-bench',

evaluation/benchmarks/scienceagentbench/run_infer.py

@@ -62,7 +62,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         max_budget_per_task=4,
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(

evaluation/benchmarks/swe_bench/eval_infer.py

@@ -76,7 +76,7 @@ def get_config(instance: pd.Series) -> AppConfig:
     )
     config = AppConfig(
         run_as_openhands=False,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=SandboxConfig(
             base_container_image=base_container_image,
             use_host_network=False,

evaluation/benchmarks/swe_bench/run_infer.py

@@ -121,7 +121,7 @@ def get_config(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
         max_iterations=metadata.max_iterations,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         sandbox=SandboxConfig(
             base_container_image=base_container_image,
             enable_auto_lint=True,

evaluation/benchmarks/the_agent_company/README.md

@@ -5,7 +5,7 @@ This folder contains the evaluation harness that we built on top of the original
 The evaluation consists of three steps:
 
 1. Environment setup: [install python environment](../../README.md#development-environment), [configure LLM config](../../README.md#configure-openhands-and-your-llm), [launch services](https://github.com/TheAgentCompany/TheAgentCompany/blob/main/docs/SETUP.md).
-2. [Run Evaluation](#run-inference-on-the-agent-company-instances): Run all tasks and get the evaluation results.
+2. [Run Evaluation](#run-inference-on-the-agent-company-tasks): Run all tasks and get the evaluation results.
 
 ## Setup Environment and LLM Configuration
 

evaluation/benchmarks/the_agent_company/scripts/summarise_results.py

@@ -0,0 +1,316 @@
+###########################################################################################################
+# Adapted from https://github.com/TheAgentCompany/TheAgentCompany/blob/main/evaluation/summarise_results.py
+###########################################################################################################
+
+
+import glob
+import json
+import os
+import re
+import sys
+from typing import Dict, Tuple
+
+
+def calculate_cost(model: str, prompt_tokens: int, completion_tokens: int) -> float:
+    """
+    Calculate the cost of the model call.
+    """
+    if 'claude-3-5-sonnet' in model.lower():
+        # https://www.anthropic.com/pricing#anthropic-api, accessed 12/11/2024
+        return 0.000003 * prompt_tokens + 0.000015 * completion_tokens
+    elif 'gpt-4o' in model.lower():
+        # https://openai.com/api/pricing/, accessed 12/11/2024
+        return 0.0000025 * prompt_tokens + 0.00001 * completion_tokens
+    elif 'gemini-1.5-pro' in model.lower():
+        # https://ai.google.dev/pricing#1_5pro, accessed 12/11/2024
+        # assuming prompts up to 128k tokens
+        cost = 0.00000125 * prompt_tokens + 0.000005 * completion_tokens
+        if prompt_tokens > 128000:
+            cost *= 2
+        return cost
+    elif 'gemini-2.0-flash-exp' in model.lower():
+        # price unknown for gemini-2.0-flash-exp, assuming same price as gemini-1.5-flash
+        cost = 0.000000075 * prompt_tokens + 0.0000003 * completion_tokens
+        if prompt_tokens > 128000:
+            cost *= 2
+        return cost
+    elif 'qwen2-72b' in model.lower():
+        # assuming hosted on Together
+        # https://www.together.ai/pricing, accessed 12/11/2024
+        return 0.0000009 * (prompt_tokens + completion_tokens)
+    elif 'qwen2p5-72b' in model.lower():
+        # assuming hosted on Together
+        # https://www.together.ai/pricing, accessed 12/14/2024
+        return 0.0000012 * (prompt_tokens + completion_tokens)
+    elif 'llama-v3p1-405b-instruct' in model.lower():
+        # assuming hosted on Fireworks AI
+        # https://fireworks.ai/pricing, accessed 12/11/2024
+        return 0.000003 * (prompt_tokens + completion_tokens)
+    elif 'llama-v3p1-70b-instruct' in model.lower():
+        # assuming hosted on Fireworks AI
+        return 0.0000009 * (prompt_tokens + completion_tokens)
+    elif 'llama-v3p3-70b-instruct' in model.lower():
+        # assuming hosted on Fireworks AI
+        return 0.0000009 * (prompt_tokens + completion_tokens)
+    elif 'amazon.nova-pro-v1:0' in model.lower():
+        # assuming hosted on Amazon Bedrock
+        # https://aws.amazon.com/bedrock/pricing/, accessed 12/11/2024
+        return 0.0000008 * prompt_tokens + 0.0000032 * completion_tokens
+    else:
+        raise ValueError(f'Unknown model: {model}')
+
+
+def analyze_eval_json_file(filepath: str) -> Tuple[int, int]:
+    """
+    Analyze a single eval JSON file and extract the total and result from final_score.
+
+    Args:
+        filepath: Path to the JSON file
+
+    Returns:
+        Tuple containing (total, result) from final_score
+    """
+    try:
+        with open(filepath, 'r') as f:
+            data = json.load(f)
+
+        final_score = data.get('final_score', {})
+        return (final_score.get('total', 0), final_score.get('result', 0))
+    except json.JSONDecodeError as e:
+        print(f'Error decoding JSON in {filepath}: {e}')
+        return (0, 0)
+    except Exception as e:
+        print(f'Error processing {filepath}: {e}')
+        return (0, 0)
+
+
+def analyze_traj_json_file(filepath: str) -> Tuple[int, float]:
+    """
+    Analyze a single trajectory JSON file and extract the steps and tokens
+    for each step. Then estimate the cost based on the tokens and the model type.
+    Note: this is assuming there's no prompt caching at all.
+    """
+    steps: int = 0
+    cost: float = 0.0
+    with open(filepath, 'r') as f:
+        data = json.load(f)
+        response_id = None
+        for action in data:
+            if 'tool_call_metadata' in action:
+                if action['tool_call_metadata']['model_response']['id'] != response_id:
+                    response_id = action['tool_call_metadata']['model_response']['id']
+                else:
+                    # openhands displays the same model response meta data multiple times, when
+                    # a single LLM call leads to multiple actions and observations.
+                    continue
+                steps += 1
+                usage = action['tool_call_metadata']['model_response']['usage']
+                model: str = action['tool_call_metadata']['model_response']['model']
+                prompt_tokens = usage['prompt_tokens']
+                completion_tokens = usage['completion_tokens']
+                cost += calculate_cost(model, prompt_tokens, completion_tokens)
+
+    return (steps, cost)
+
+
+def analyze_folder(
+    folder_path: str,
+) -> Tuple[Dict[str, Tuple[int, int]], Dict[str, Tuple[int, float]]]:
+    """
+    Analyze all eval_*.json & traj_*.json files in the specified folder.
+
+    Args:
+        folder_path: Path to the folder containing JSON files
+
+    Returns:
+        dictionaries:
+        - eval_results: Dictionary with filename as key and (total, result) tuple as value
+        - traj_results: Dictionary with filename as key and (steps, cost) tuple as value
+    """
+    eval_results = {}
+    traj_results = {}
+
+    eval_pattern = os.path.join(folder_path, 'eval_*.json')
+    traj_pattern = os.path.join(folder_path, 'traj_*.json')
+
+    for filepath in glob.glob(eval_pattern):
+        filename = os.path.basename(filepath)
+        total, result = analyze_eval_json_file(filepath)
+        key = re.search(r'eval_(.+)\.json', filename).group(1)
+        eval_results[key] = (total, result)
+
+    for filepath in glob.glob(traj_pattern):
+        filename = os.path.basename(filepath)
+        steps, cost = analyze_traj_json_file(filepath)
+        key = re.search(r'traj_(.+)\.json', filename).group(1)
+        traj_results[key] = (steps, cost)
+
+    return eval_results, traj_results
+
+
+def get_task_nature_category(task_name: str) -> str:
+    """
+    Get the nature category of the task.
+    """
+    task_nature = task_name.split('-')[0]
+    if task_nature.lower() in ['sde', 'pm', 'ds', 'admin', 'hr', 'finance']:
+        return task_nature
+    else:
+        return 'other'
+
+
+def calculate_score(total: int, result: int) -> float:
+    """
+    Calculate the score as a number between 0 and 1.
+
+    Formula: score = (result / total) * 0.5 + (result // total) * 0.5
+    Explanation:
+    - (result / total) * 0.5: This is the completion ratio, scaled down to a 0-0.5 range.
+    - (result // total) * 0.5: This is a binary score indicating whether the task was completed or not.
+
+    Args:
+        total: Total possible points
+        result: Actual points achieved
+
+    Returns:
+        Score as a number between 0 and 1
+    """
+    return (result / total * 0.5) + (result // total * 0.5)
+
+
+def is_perfect_completion(total: int, result: int) -> bool:
+    """
+    Check if the task achieved perfect completion.
+
+    Args:
+        total: Total possible points
+        result: Actual points achieved
+
+    Returns:
+        True if result equals total, False otherwise
+    """
+    return total > 0 and total == result
+
+
+def main():
+    if len(sys.argv) != 2:
+        print('Usage: poetry run python summarise_results.py <folder_path>')
+        sys.exit(1)
+
+    folder_path = sys.argv[1]
+
+    if not os.path.isdir(folder_path):
+        print(f"Error: '{folder_path}' is not a valid directory")
+        sys.exit(1)
+
+    eval_results, traj_results = analyze_folder(folder_path)
+
+    if not eval_results:
+        print(f'No eval_*.json files found in {folder_path}')
+        return
+
+    # Create list of results with completion ratios for sorting
+    detailed_results = [
+        (
+            task_name,
+            total,
+            result,
+            calculate_score(total, result),
+            is_perfect_completion(total, result),
+            get_task_nature_category(task_name),
+        )
+        for task_name, (total, result) in eval_results.items()
+    ]
+
+    # Sort by score in descending order
+    detailed_results.sort(key=lambda x: (-x[3], x[0]))
+
+    # Calculate perfect completion stats
+    perfect_completions = sum(
+        1 for _, _, _, _, is_perfect, _ in detailed_results if is_perfect
+    )
+
+    # Print header
+    print('\n# Evaluation Results Report')
+    print('\n## Results per File')
+    print('\n*Sorted by score (⭐ indicates perfect completion)*\n')
+
+    # Print table header
+    print(
+        '| Filename | Total | Result | Score | Steps | Cost (assuming no prompt caching)|'
+    )
+    print('|----------|--------|---------|-------|-------|------|')
+
+    # Print individual file results
+    for task_name, total, result, score, is_perfect, task_nature in detailed_results:
+        perfect_marker = ' ⭐' if is_perfect else ''
+        print(
+            f'| {task_name} | {total:,} | {result:,} | {score:.2f}{perfect_marker} | {traj_results[task_name][0]} | {traj_results[task_name][1]:.2f} |'
+        )
+
+    # Print summary section
+    print('\n## Summary\n')
+    print(f'**Tasks Evaluated:** {len(eval_results)}\n')
+    print(
+        f'**Perfect Completions:** {perfect_completions}/{len(eval_results)} ({(perfect_completions/len(eval_results)*100):.2f}%)\n'
+    )
+
+    overall_score = (
+        sum(score for _, _, _, score, _, _ in detailed_results)
+        / len(detailed_results)
+        * 100
+    )
+    avg_steps = sum(steps for steps, _ in traj_results.values()) / len(traj_results)
+    avg_cost = sum(cost for _, cost in traj_results.values()) / len(traj_results)
+    print(f'**Overall Score:** {overall_score:.2f}%\n')
+    print(f'**Average Steps:** {avg_steps:.2f}\n')
+    print(f'**Average Cost (USD):** {avg_cost:.2f}\n')
+
+    # Additional statistics
+    if detailed_results:
+        highest_score = max(score for _, _, _, score, _, _ in detailed_results)
+        lowest_score = min(score for _, _, _, score, _, _ in detailed_results)
+        median_score = detailed_results[len(detailed_results) // 2][3]
+        avg_score = sum(score for _, _, _, score, _, _ in detailed_results) / len(
+            detailed_results
+        )
+
+        print('\n## Statistics\n')
+        print('| Metric | Value |')
+        print('|---------|--------|')
+        print(f'| Highest Task Score | {highest_score*100:.2f}% |')
+        print(f'| Lowest Task Score | {lowest_score*100:.2f}% |')
+        print(f'| Median Task Score | {median_score*100:.2f}% |')
+        print(f'| Average Task Score | {avg_score*100:.2f}% |')
+
+        # compute avg score per nature category
+        print('\n## Statistics per Nature Category\n')
+        print('| Metric | Value |')
+        print('|---------|--------|')
+        for task_nature in ['sde', 'pm', 'ds', 'admin', 'hr', 'finance', 'other']:
+            num_of_tasks = sum(
+                1
+                for _, _, _, _, _, nature_category in detailed_results
+                if nature_category == task_nature
+            )
+            task_nature_score = (
+                sum(
+                    score
+                    for _, _, _, score, _, nature_category in detailed_results
+                    if nature_category == task_nature
+                )
+                / num_of_tasks
+            )
+            perfect_completions = sum(
+                1
+                for _, _, _, _, is_perfect, nature_category in detailed_results
+                if nature_category == task_nature and is_perfect
+            )
+            print(
+                f'| Perfect Completions for {task_nature} | {perfect_completions}/{num_of_tasks} ({perfect_completions/num_of_tasks*100:.2f}%) |'
+            )
+            print(f'| Average Score for {task_nature} | {task_nature_score*100:.2f}% |')
+
+
+if __name__ == '__main__':
+    main()

evaluation/benchmarks/toolqa/run_infer.py

@@ -44,7 +44,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/benchmarks/webarena/run_infer.py

@@ -53,7 +53,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime='eventstream',
+        runtime='docker',
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             base_container_image='python:3.12-bookworm',

evaluation/integration_tests/run_infer.py

@@ -42,7 +42,7 @@ def get_config(
     config = AppConfig(
         default_agent=metadata.agent_class,
         run_as_openhands=False,
-        runtime=os.environ.get('RUNTIME', 'eventstream'),
+        runtime=os.environ.get('RUNTIME', 'docker'),
         max_iterations=metadata.max_iterations,
         sandbox=SandboxConfig(
             # use default base_container_image

frontend/__tests__/api/github.test.ts

@@ -0,0 +1,47 @@
+import { describe, expect, it, vi } from "vitest";
+import { retrieveLatestGitHubCommit } from "../../src/api/github";
+
+describe("retrieveLatestGitHubCommit", () => {
+  const { githubGetMock } = vi.hoisted(() => ({
+    githubGetMock: vi.fn(),
+  }));
+
+  vi.mock("../../src/api/github-axios-instance", () => ({
+    github: {
+      get: githubGetMock,
+    },
+  }));
+
+  it("should return the latest commit when repository has commits", async () => {
+    const mockCommit = {
+      sha: "123abc",
+      commit: {
+        message: "Initial commit",
+      },
+    };
+
+    githubGetMock.mockResolvedValueOnce({
+      data: [mockCommit],
+    });
+
+    const result = await retrieveLatestGitHubCommit("user/repo");
+    expect(result).toEqual(mockCommit);
+  });
+
+  it("should return null when repository is empty", async () => {
+    const error = new Error("Repository is empty");
+    (error as any).response = { status: 409 };
+    githubGetMock.mockRejectedValueOnce(error);
+
+    const result = await retrieveLatestGitHubCommit("user/empty-repo");
+    expect(result).toBeNull();
+  });
+
+  it("should throw error for other error cases", async () => {
+    const error = new Error("Network error");
+    (error as any).response = { status: 500 };
+    githubGetMock.mockRejectedValueOnce(error);
+
+    await expect(retrieveLatestGitHubCommit("user/repo")).rejects.toThrow();
+  });
+});

frontend/__tests__/components/context-menu/account-settings-context-menu.test.tsx

@@ -28,8 +28,8 @@ describe("AccountSettingsContextMenu", () => {
     expect(
       screen.getByTestId("account-settings-context-menu"),
     ).toBeInTheDocument();
-    expect(screen.getByText("Account Settings")).toBeInTheDocument();
-    expect(screen.getByText("Logout")).toBeInTheDocument();
+    expect(screen.getByText("ACCOUNT_SETTINGS$SETTINGS")).toBeInTheDocument();
+    expect(screen.getByText("ACCOUNT_SETTINGS$LOGOUT")).toBeInTheDocument();
   });
 
   it("should call onClickAccountSettings when the account settings option is clicked", async () => {
@@ -42,7 +42,7 @@ describe("AccountSettingsContextMenu", () => {
       />,
     );
 
-    const accountSettingsOption = screen.getByText("Account Settings");
+    const accountSettingsOption = screen.getByText("ACCOUNT_SETTINGS$SETTINGS");
     await user.click(accountSettingsOption);
 
     expect(onClickAccountSettingsMock).toHaveBeenCalledOnce();
@@ -58,7 +58,7 @@ describe("AccountSettingsContextMenu", () => {
       />,
     );
 
-    const logoutOption = screen.getByText("Logout");
+    const logoutOption = screen.getByText("ACCOUNT_SETTINGS$LOGOUT");
     await user.click(logoutOption);
 
     expect(onLogoutMock).toHaveBeenCalledOnce();
@@ -74,7 +74,7 @@ describe("AccountSettingsContextMenu", () => {
       />,
     );
 
-    const logoutOption = screen.getByText("Logout");
+    const logoutOption = screen.getByText("ACCOUNT_SETTINGS$LOGOUT");
     await user.click(logoutOption);
 
     expect(onLogoutMock).not.toHaveBeenCalled();
@@ -90,7 +90,7 @@ describe("AccountSettingsContextMenu", () => {
       />,
     );
 
-    const accountSettingsButton = screen.getByText("Account Settings");
+    const accountSettingsButton = screen.getByText("ACCOUNT_SETTINGS$SETTINGS");
     await user.click(accountSettingsButton);
     await user.click(document.body);
 

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

@@ -0,0 +1,274 @@
+import { render, screen, within } from "@testing-library/react";
+import { afterEach, describe, expect, it, test, vi } from "vitest";
+import userEvent from "@testing-library/user-event";
+import { formatTimeDelta } from "#/utils/format-time-delta";
+import { ConversationCard } from "#/components/features/conversation-panel/conversation-card";
+
+describe("ConversationCard", () => {
+  const onClick = vi.fn();
+  const onDelete = vi.fn();
+  const onChangeTitle = vi.fn();
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should render the conversation card", () => {
+    render(
+      <ConversationCard
+        onDelete={onDelete}
+        onClick={onClick}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+    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(expectedDate);
+  });
+
+  it("should render the repo if available", () => {
+    const { rerender } = render(
+      <ConversationCard
+        onDelete={onDelete}
+        onClick={onClick}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    expect(
+      screen.queryByTestId("conversation-card-repo"),
+    ).not.toBeInTheDocument();
+
+    rerender(
+      <ConversationCard
+        onDelete={onDelete}
+        onClick={onClick}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo="org/repo"
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    screen.getByTestId("conversation-card-repo");
+  });
+
+  it("should call onClick when the card is clicked", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onDelete={onDelete}
+        onClick={onClick}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    const card = screen.getByTestId("conversation-card");
+    await user.click(card);
+
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it("should toggle a context menu when clicking the ellipsis button", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onDelete={onDelete}
+        onClick={onClick}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
+
+    const ellipsisButton = screen.getByTestId("ellipsis-button");
+    await user.click(ellipsisButton);
+
+    screen.getByTestId("context-menu");
+
+    await user.click(ellipsisButton);
+
+    expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
+  });
+
+  it("should call onDelete when the delete button is clicked", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onClick={onClick}
+        onDelete={onDelete}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    const ellipsisButton = screen.getByTestId("ellipsis-button");
+    await user.click(ellipsisButton);
+
+    const menu = screen.getByTestId("context-menu");
+    const deleteButton = within(menu).getByTestId("delete-button");
+
+    await user.click(deleteButton);
+
+    expect(onDelete).toHaveBeenCalled();
+  });
+
+  test("clicking the repo should not trigger the onClick handler", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onClick={onClick}
+        onDelete={onDelete}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo="org/repo"
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    const repo = screen.getByTestId("conversation-card-repo");
+    await user.click(repo);
+
+    expect(onClick).not.toHaveBeenCalled();
+  });
+
+  test("conversation title should call onChangeTitle when changed and blurred", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onClick={onClick}
+        onDelete={onDelete}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+        onChangeTitle={onChangeTitle}
+      />,
+    );
+
+    const title = screen.getByTestId("conversation-card-title");
+
+    await user.clear(title);
+    await user.type(title, "New Conversation Name   ");
+    await user.tab();
+
+    expect(onChangeTitle).toHaveBeenCalledWith("New Conversation Name");
+    expect(title).toHaveValue("New Conversation Name");
+  });
+
+  it("should reset title and not call onChangeTitle when the title is empty", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onClick={onClick}
+        onDelete={onDelete}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    const title = screen.getByTestId("conversation-card-title");
+
+    await user.clear(title);
+    await user.tab();
+
+    expect(onChangeTitle).not.toHaveBeenCalled();
+    expect(title).toHaveValue("Conversation 1");
+  });
+
+  test("clicking the title should not trigger the onClick handler", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onClick={onClick}
+        onDelete={onDelete}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    const title = screen.getByTestId("conversation-card-title");
+    await user.click(title);
+
+    expect(onClick).not.toHaveBeenCalled();
+  });
+
+  test("clicking the delete button should not trigger the onClick handler", async () => {
+    const user = userEvent.setup();
+    render(
+      <ConversationCard
+        onClick={onClick}
+        onDelete={onDelete}
+        onChangeTitle={onChangeTitle}
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
+      />,
+    );
+
+    const ellipsisButton = screen.getByTestId("ellipsis-button");
+    await user.click(ellipsisButton);
+
+    const menu = screen.getByTestId("context-menu");
+    const deleteButton = within(menu).getByTestId("delete-button");
+
+    await user.click(deleteButton);
+
+    expect(onClick).not.toHaveBeenCalled();
+  });
+
+  describe("state indicator", () => {
+    it("should render the 'cold' indicator by default", () => {
+      render(
+        <ConversationCard
+          onClick={onClick}
+          onDelete={onDelete}
+          onChangeTitle={onChangeTitle}
+          name="Conversation 1"
+          repo={null}
+          lastUpdated="2021-10-01T12:00:00Z"
+        />,
+      );
+
+      screen.getByTestId("cold-indicator");
+    });
+
+    it("should render the other indicators when provided", () => {
+      render(
+        <ConversationCard
+          onClick={onClick}
+          onDelete={onDelete}
+          onChangeTitle={onChangeTitle}
+          name="Conversation 1"
+          repo={null}
+          lastUpdated="2021-10-01T12:00:00Z"
+          state="warm"
+        />,
+      );
+
+      expect(screen.queryByTestId("cold-indicator")).not.toBeInTheDocument();
+      screen.getByTestId("warm-indicator");
+    });
+  });
+});

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

@@ -0,0 +1,267 @@
+import { render, screen, within } from "@testing-library/react";
+import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  QueryClientProvider,
+  QueryClient,
+  QueryClientConfig,
+} from "@tanstack/react-query";
+import userEvent from "@testing-library/user-event";
+import { ConversationPanel } from "#/components/features/conversation-panel/conversation-panel";
+import OpenHands from "#/api/open-hands";
+import { AuthProvider } from "#/context/auth-context";
+
+describe("ConversationPanel", () => {
+  const onCloseMock = vi.fn();
+
+  const renderConversationPanel = (config?: QueryClientConfig) =>
+    render(<ConversationPanel onClose={onCloseMock} />, {
+      wrapper: ({ children }) => (
+        <AuthProvider>
+          <QueryClientProvider client={new QueryClient(config)}>
+            {children}
+          </QueryClientProvider>
+        </AuthProvider>
+      ),
+    });
+
+  const { endSessionMock } = vi.hoisted(() => ({
+    endSessionMock: vi.fn(),
+  }));
+
+  beforeAll(() => {
+    vi.mock("react-router", async (importOriginal) => ({
+      ...(await importOriginal<typeof import("react-router")>()),
+      Link: ({ children }: React.PropsWithChildren) => children,
+      useNavigate: vi.fn(() => vi.fn()),
+      useLocation: vi.fn(() => ({ pathname: "/conversation" })),
+      useParams: vi.fn(() => ({ conversationId: "2" })),
+    }));
+
+    vi.mock("#/hooks/use-end-session", async (importOriginal) => ({
+      ...(await importOriginal<typeof import("#/hooks/use-end-session")>()),
+      useEndSession: vi.fn(() => endSessionMock),
+    }));
+  });
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.restoreAllMocks();
+  });
+
+  it("should render the conversations", async () => {
+    renderConversationPanel();
+    const cards = await screen.findAllByTestId("conversation-card");
+
+    expect(cards).toHaveLength(3);
+  });
+
+  it("should display an empty state when there are no conversations", async () => {
+    const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
+    getUserConversationsSpy.mockResolvedValue([]);
+
+    renderConversationPanel();
+
+    const emptyState = await screen.findByText("No conversations found");
+    expect(emptyState).toBeInTheDocument();
+  });
+
+  it("should handle an error when fetching conversations", async () => {
+    const getUserConversationsSpy = vi.spyOn(OpenHands, "getUserConversations");
+    getUserConversationsSpy.mockRejectedValue(
+      new Error("Failed to fetch conversations"),
+    );
+
+    renderConversationPanel({
+      defaultOptions: {
+        queries: {
+          retry: false,
+        },
+      },
+    });
+
+    const error = await screen.findByText("Failed to fetch conversations");
+    expect(error).toBeInTheDocument();
+  });
+
+  it("should cancel deleting a conversation", async () => {
+    const user = userEvent.setup();
+    renderConversationPanel();
+
+    let cards = await screen.findAllByTestId("conversation-card");
+    expect(
+      within(cards[0]).queryByTestId("delete-button"),
+    ).not.toBeInTheDocument();
+
+    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
+    await user.click(ellipsisButton);
+    const deleteButton = screen.getByTestId("delete-button");
+
+    // Click the first delete button
+    await user.click(deleteButton);
+
+    // Cancel the deletion
+    const cancelButton = screen.getByText("Cancel");
+    await user.click(cancelButton);
+
+    expect(screen.queryByText("Cancel")).not.toBeInTheDocument();
+
+    // Ensure the conversation is not deleted
+    cards = await screen.findAllByTestId("conversation-card");
+    expect(cards).toHaveLength(3);
+  });
+
+  it("should call endSession after deleting a conversation that is the current session", async () => {
+    const user = userEvent.setup();
+    renderConversationPanel();
+
+    let cards = await screen.findAllByTestId("conversation-card");
+    const ellipsisButton = within(cards[1]).getByTestId("ellipsis-button");
+    await user.click(ellipsisButton);
+    const deleteButton = screen.getByTestId("delete-button");
+
+    // Click the second delete button
+    await user.click(deleteButton);
+
+    // Confirm the deletion
+    const confirmButton = screen.getByText("Confirm");
+    await user.click(confirmButton);
+
+    expect(screen.queryByText("Confirm")).not.toBeInTheDocument();
+
+    // Ensure the conversation is deleted
+    cards = await screen.findAllByTestId("conversation-card");
+    expect(cards).toHaveLength(2);
+
+    expect(endSessionMock).toHaveBeenCalledOnce();
+  });
+
+  it("should delete a conversation", async () => {
+    const user = userEvent.setup();
+    renderConversationPanel();
+
+    let cards = await screen.findAllByTestId("conversation-card");
+    const ellipsisButton = within(cards[0]).getByTestId("ellipsis-button");
+    await user.click(ellipsisButton);
+    const deleteButton = screen.getByTestId("delete-button");
+
+    // Click the first delete button
+    await user.click(deleteButton);
+
+    // Confirm the deletion
+    const confirmButton = screen.getByText("Confirm");
+    await user.click(confirmButton);
+
+    expect(screen.queryByText("Confirm")).not.toBeInTheDocument();
+
+    // Ensure the conversation is deleted
+    cards = await screen.findAllByTestId("conversation-card");
+    expect(cards).toHaveLength(1);
+  });
+
+  it("should rename a conversation", async () => {
+    const updateUserConversationSpy = vi.spyOn(
+      OpenHands,
+      "updateUserConversation",
+    );
+
+    const user = userEvent.setup();
+    renderConversationPanel();
+    const cards = await screen.findAllByTestId("conversation-card");
+    const title = within(cards[0]).getByTestId("conversation-card-title");
+
+    await user.clear(title);
+    await user.type(title, "Conversation 1 Renamed");
+    await user.tab();
+
+    // Ensure the conversation is renamed
+    expect(updateUserConversationSpy).toHaveBeenCalledWith("3", {
+      name: "Conversation 1 Renamed",
+    });
+  });
+
+  it("should not rename a conversation when the name is unchanged", async () => {
+    const updateUserConversationSpy = vi.spyOn(
+      OpenHands,
+      "updateUserConversation",
+    );
+
+    const user = userEvent.setup();
+    renderConversationPanel();
+    const cards = await screen.findAllByTestId("conversation-card");
+    const title = within(cards[0]).getByTestId("conversation-card-title");
+
+    await user.click(title);
+    await user.tab();
+
+    // Ensure the conversation is not renamed
+    expect(updateUserConversationSpy).not.toHaveBeenCalled();
+
+    await user.type(title, "Conversation 1");
+    await user.click(title);
+    await user.tab();
+
+    expect(updateUserConversationSpy).toHaveBeenCalledTimes(1);
+
+    await user.click(title);
+    await user.tab();
+
+    expect(updateUserConversationSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it("should call onClose after clicking a card", async () => {
+    renderConversationPanel();
+    const cards = await screen.findAllByTestId("conversation-card");
+    const firstCard = cards[0];
+
+    await userEvent.click(firstCard);
+
+    expect(onCloseMock).toHaveBeenCalledOnce();
+  });
+
+  describe("New Conversation Button", () => {
+    it("should display a confirmation modal when clicking", async () => {
+      const user = userEvent.setup();
+      renderConversationPanel();
+
+      expect(
+        screen.queryByTestId("confirm-new-conversation-modal"),
+      ).not.toBeInTheDocument();
+
+      const newProjectButton = screen.getByTestId("new-conversation-button");
+      await user.click(newProjectButton);
+
+      const modal = screen.getByTestId("confirm-new-conversation-modal");
+      expect(modal).toBeInTheDocument();
+    });
+
+    it("should call endSession and close panel after confirming", async () => {
+      const user = userEvent.setup();
+      renderConversationPanel();
+
+      const newProjectButton = screen.getByTestId("new-conversation-button");
+      await user.click(newProjectButton);
+
+      const confirmButton = screen.getByText("Confirm");
+      await user.click(confirmButton);
+
+      expect(endSessionMock).toHaveBeenCalledOnce();
+      expect(onCloseMock).toHaveBeenCalledOnce();
+    });
+
+    it("should close the modal when cancelling", async () => {
+      const user = userEvent.setup();
+      renderConversationPanel();
+
+      const newProjectButton = screen.getByTestId("new-conversation-button");
+      await user.click(newProjectButton);
+
+      const cancelButton = screen.getByText("Cancel");
+      await user.click(cancelButton);
+
+      expect(endSessionMock).not.toHaveBeenCalled();
+      expect(
+        screen.queryByTestId("confirm-new-conversation-modal"),
+      ).not.toBeInTheDocument();
+    });
+  });
+});

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

@@ -0,0 +1,46 @@
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, expect, it } from "vitest";
+import { renderWithProviders } from "test-utils";
+import { createRoutesStub } from "react-router";
+import { Sidebar } from "#/components/features/sidebar/sidebar";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";
+
+const renderSidebar = () => {
+  const RouterStub = createRoutesStub([
+    {
+      path: "/conversation/:conversationId",
+      Component: Sidebar,
+    },
+  ]);
+
+  renderWithProviders(<RouterStub initialEntries={["/conversation/123"]} />);
+};
+
+describe("Sidebar", () => {
+  it.skipIf(!MULTI_CONVO_UI_IS_ENABLED)(
+    "should have the conversation panel open by default",
+    () => {
+      renderSidebar();
+      expect(screen.getByTestId("conversation-panel")).toBeInTheDocument();
+    },
+  );
+
+  it.skipIf(!MULTI_CONVO_UI_IS_ENABLED)(
+    "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();
+    },
+  );
+});

frontend/__tests__/components/modals/base-modal/base-modal.test.tsx

@@ -52,14 +52,10 @@ describe("BaseModal", () => {
     expect(screen.getByText("Save")).toBeInTheDocument();
     expect(screen.getByText("Cancel")).toBeInTheDocument();
 
-    await act(async () => {
-      await userEvent.click(screen.getByText("Save"));
-    });
+    await userEvent.click(screen.getByText("Save"));
     expect(onPrimaryClickMock).toHaveBeenCalledTimes(1);
 
-    await act(async () => {
-      await userEvent.click(screen.getByText("Cancel"));
-    });
+    await userEvent.click(screen.getByText("Cancel"));
     expect(onSecondaryClickMock).toHaveBeenCalledTimes(1);
   });
 
@@ -80,9 +76,7 @@ describe("BaseModal", () => {
       />,
     );
 
-    await act(async () => {
-      await userEvent.click(screen.getByText("Save"));
-    });
+    await userEvent.click(screen.getByText("Save"));
     expect(onOpenChangeMock).toHaveBeenCalledTimes(1);
   });
 

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

@@ -58,7 +58,7 @@ describe("UserActions", () => {
     const userAvatar = screen.getByTestId("user-avatar");
     await user.click(userAvatar);
 
-    const accountSettingsOption = screen.getByText("Account Settings");
+    const accountSettingsOption = screen.getByText("ACCOUNT_SETTINGS$SETTINGS");
     await user.click(accountSettingsOption);
 
     expect(onClickAccountSettingsMock).toHaveBeenCalledOnce();
@@ -79,7 +79,7 @@ describe("UserActions", () => {
     const userAvatar = screen.getByTestId("user-avatar");
     await user.click(userAvatar);
 
-    const logoutOption = screen.getByText("Logout");
+    const logoutOption = screen.getByText("ACCOUNT_SETTINGS$LOGOUT");
     await user.click(logoutOption);
 
     expect(onLogoutMock).toHaveBeenCalledOnce();
@@ -99,7 +99,7 @@ describe("UserActions", () => {
     const userAvatar = screen.getByTestId("user-avatar");
     await user.click(userAvatar);
 
-    const logoutOption = screen.getByText("Logout");
+    const logoutOption = screen.getByText("ACCOUNT_SETTINGS$LOGOUT");
     await user.click(logoutOption);
 
     expect(onLogoutMock).not.toHaveBeenCalled();

frontend/__tests__/routes/_oh.app.test.tsx

@@ -0,0 +1,83 @@
+import { createRoutesStub } from "react-router";
+import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "test-utils";
+import { screen, waitFor } from "@testing-library/react";
+import toast from "react-hot-toast";
+import App from "#/routes/_oh.app/route";
+import OpenHands from "#/api/open-hands";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";
+
+describe("App", () => {
+  const RouteStub = createRoutesStub([
+    { Component: App, path: "/conversation/:conversationId" },
+  ]);
+
+  const { endSessionMock } = vi.hoisted(() => ({
+    endSessionMock: vi.fn(),
+  }));
+
+  beforeAll(() => {
+    vi.mock("#/hooks/use-end-session", () => ({
+      useEndSession: vi.fn(() => endSessionMock),
+    }));
+
+    vi.mock("#/hooks/use-terminal", () => ({
+      useTerminal: vi.fn(),
+    }));
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should render", async () => {
+    renderWithProviders(<RouteStub initialEntries={["/conversation/123"]} />);
+    await screen.findByTestId("app-route");
+  });
+
+  it.skipIf(!MULTI_CONVO_UI_IS_ENABLED)(
+    "should call endSession if the user does not have permission to view conversation",
+    async () => {
+      const errorToastSpy = vi.spyOn(toast, "error");
+      const getConversationSpy = vi.spyOn(OpenHands, "getConversation");
+
+      getConversationSpy.mockResolvedValue(null);
+      renderWithProviders(
+        <RouteStub initialEntries={["/conversation/9999"]} />,
+      );
+
+      await waitFor(() => {
+        expect(endSessionMock).toHaveBeenCalledOnce();
+        expect(errorToastSpy).toHaveBeenCalledOnce();
+      });
+    },
+  );
+
+  it("should not call endSession if the user has permission", async () => {
+    const errorToastSpy = vi.spyOn(toast, "error");
+    const getConversationSpy = vi.spyOn(OpenHands, "getConversation");
+
+    getConversationSpy.mockResolvedValue({
+      conversation_id: "9999",
+      lastUpdated: "",
+      name: "",
+      repo: "",
+      state: "cold",
+    });
+    const { rerender } = renderWithProviders(
+      <RouteStub initialEntries={["/conversation/9999"]} />,
+    );
+
+    await waitFor(() => {
+      expect(endSessionMock).not.toHaveBeenCalled();
+      expect(errorToastSpy).not.toHaveBeenCalled();
+    });
+
+    rerender(<RouteStub initialEntries={["/conversation"]} />);
+
+    await waitFor(() => {
+      expect(endSessionMock).not.toHaveBeenCalled();
+      expect(errorToastSpy).not.toHaveBeenCalled();
+    });
+  });
+});

frontend/package-lock.json

@@ -1,20 +1,20 @@
 {
   "name": "openhands-frontend",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "openhands-frontend",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "dependencies": {
-        "@monaco-editor/react": "^4.6.0",
+        "@monaco-editor/react": "^4.7.0-rc.0",
         "@nextui-org/react": "^2.6.10",
         "@react-router/node": "^7.1.1",
         "@react-router/serve": "^7.1.1",
         "@react-types/shared": "^3.25.0",
         "@reduxjs/toolkit": "^2.5.0",
-        "@tanstack/react-query": "^5.62.10",
+        "@tanstack/react-query": "^5.62.11",
         "@vitejs/plugin-react": "^4.3.2",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/xterm": "^5.4.0",
@@ -27,12 +27,12 @@
         "isbot": "^5.1.19",
         "jose": "^5.9.4",
         "monaco-editor": "^0.52.2",
-        "posthog-js": "^1.203.1",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
+        "posthog-js": "^1.203.2",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
         "react-highlight": "^0.15.0",
         "react-hot-toast": "^2.4.1",
-        "react-i18next": "^15.2.0",
+        "react-i18next": "^15.4.0",
         "react-icons": "^5.4.0",
         "react-markdown": "^9.0.1",
         "react-redux": "^9.2.0",
@@ -43,11 +43,12 @@
         "sirv-cli": "^3.0.0",
         "socket.io-client": "^4.8.1",
         "tailwind-merge": "^2.6.0",
-        "vite": "^5.4.9",
+        "vite": "^5.4.11",
         "web-vitals": "^3.5.2",
         "ws": "^8.18.0"
       },
       "devDependencies": {
+        "@mswjs/socket.io-binding": "^0.1.1",
         "@playwright/test": "^1.49.1",
         "@react-router/dev": "^7.1.1",
         "@tailwindcss/typography": "^0.5.15",
@@ -56,8 +57,8 @@
         "@testing-library/react": "^16.1.0",
         "@testing-library/user-event": "^14.5.2",
         "@types/node": "^22.10.2",
-        "@types/react": "^18.3.11",
-        "@types/react-dom": "^18.3.0",
+        "@types/react": "^19.0.2",
+        "@types/react-dom": "^19.0.2",
         "@types/react-highlight": "^0.12.8",
         "@types/react-syntax-highlighter": "^15.5.13",
         "@types/ws": "^8.5.12",
@@ -77,7 +78,7 @@
         "eslint-plugin-react-hooks": "^4.6.2",
         "husky": "^9.1.6",
         "jsdom": "^25.0.1",
-        "lint-staged": "^15.2.11",
+        "lint-staged": "^15.3.0",
         "msw": "^2.6.6",
         "postcss": "^8.4.47",
         "prettier": "^3.4.2",
@@ -1595,17 +1596,17 @@
       }
     },
     "node_modules/@monaco-editor/react": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.6.0.tgz",
-      "integrity": "sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw==",
+      "version": "4.7.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.7.0-rc.0.tgz",
+      "integrity": "sha512-YfjXkDK0bcwS0zo8PXptvQdCQfOPPtzGsAzmIv7PnoUGFdIohsR+NVDyjbajMddF+3cWUm/3q9NzP/DUke9a+w==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/loader": "^1.4.0"
       },
       "peerDependencies": {
         "monaco-editor": ">= 0.25.0 < 1",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/@mswjs/interceptors": {
@@ -1626,6 +1627,21 @@
         "node": ">=18"
       }
     },
+    "node_modules/@mswjs/socket.io-binding": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@mswjs/socket.io-binding/-/socket.io-binding-0.1.1.tgz",
+      "integrity": "sha512-mtFDHC5XMeti43toe3HBynD4uBxvUA2GfJVC6TDfhOQlH+G2hf5znNTSa75A30XdWL0P6aNqUKpcNo6L0Wop+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@mswjs/interceptors": "^0.37.1",
+        "engine.io-parser": "^5.2.3",
+        "socket.io-parser": "^4.2.4"
+      },
+      "peerDependencies": {
+        "@mswjs/interceptors": "*"
+      }
+    },
     "node_modules/@nextui-org/accordion": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/@nextui-org/accordion/-/accordion-2.2.6.tgz",
@@ -2241,6 +2257,23 @@
         "react-dom": ">=18 || >=19.0.0-rc.0"
       }
     },
+    "node_modules/@nextui-org/listbox/node_modules/@tanstack/react-virtual": {
+      "version": "3.10.9",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz",
+      "integrity": "sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/virtual-core": "3.10.9"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/@nextui-org/menu": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/@nextui-org/menu/-/menu-2.2.8.tgz",
@@ -2579,6 +2612,23 @@
         "react-dom": ">=18 || >=19.0.0-rc.0"
       }
     },
+    "node_modules/@nextui-org/select/node_modules/@tanstack/react-virtual": {
+      "version": "3.10.9",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz",
+      "integrity": "sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/virtual-core": "3.10.9"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/@nextui-org/shared-icons": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/@nextui-org/shared-icons/-/shared-icons-2.1.1.tgz",
@@ -5321,9 +5371,9 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.62.10",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.62.10.tgz",
-      "integrity": "sha512-1e1WpHM5oGf27nWM/NWLY62/X9pbMBWa6ErWYmeuK0OqB9/g9UzA59ogiWbxCmS2wtAFQRhOdHhfSofrkhPl2g==",
+      "version": "5.62.11",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.62.11.tgz",
+      "integrity": "sha512-Xb1nw0cYMdtFmwkvH9+y5yYFhXvLRCnXoqlzSw7UkqtCVFq3cG8q+rHZ2Yz1XrC+/ysUaTqbLKJqk95mCgC1oQ==",
       "license": "MIT",
       "dependencies": {
         "@tanstack/query-core": "5.62.9"
@@ -5336,23 +5386,6 @@
         "react": "^18 || ^19"
       }
     },
-    "node_modules/@tanstack/react-virtual": {
-      "version": "3.10.9",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz",
-      "integrity": "sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g==",
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/virtual-core": "3.10.9"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/@tanstack/virtual-core": {
       "version": "3.10.9",
       "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.9.tgz",
@@ -5603,30 +5636,23 @@
         "undici-types": "~6.20.0"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.14",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
-      "license": "MIT"
-    },
     "node_modules/@types/react": {
-      "version": "18.3.18",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
-      "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.2.tgz",
+      "integrity": "sha512-USU8ZI/xyKJwFTpjSVIrSeHBVAGagkHQKPNbxeWwql/vDmnTIBgx+TJnhFnj1NXgz8XfprU0egV2dROLGpsBEg==",
       "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
-      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.2.tgz",
+      "integrity": "sha512-c1s+7TKFaDRRxr1TxccIX2u7sfCnc3RxkVyBIUA2lCpyqCF+QoAwQ/CBg7bsMdVwP120HEH143VQezKtef5nCg==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@types/react": "^18.0.0"
+        "@types/react": "^19.0.0"
       }
     },
     "node_modules/@types/react-highlight": {
@@ -8124,9 +8150,9 @@
       "license": "MIT"
     },
     "node_modules/es-abstract": {
-      "version": "1.23.7",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.7.tgz",
-      "integrity": "sha512-OygGC8kIcDhXX+6yAZRGLqwi2CmEXCbLQixeGUgYeR+Qwlppqmo7DIDr8XibtEBZp+fJcoYpoatp5qwLMEdcqQ==",
+      "version": "1.23.8",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.8.tgz",
+      "integrity": "sha512-lfab8IzDn6EpI1ibZakcgS6WsfEBiB+43cuJo+wgylx1xKXf+Sp+YR3vFuQwC/u3sxYwV8Cxe3B0DpVUu/WiJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8165,8 +8191,10 @@
         "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
+        "own-keys": "^1.0.0",
         "regexp.prototype.flags": "^1.5.3",
         "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
@@ -11179,13 +11207,13 @@
       "license": "MIT"
     },
     "node_modules/lint-staged": {
-      "version": "15.2.11",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.11.tgz",
-      "integrity": "sha512-Ev6ivCTYRTGs9ychvpVw35m/bcNDuBN+mnTeObCL5h+boS5WzBEC6LHI4I9F/++sZm1m+J2LEiy0gxL/R9TBqQ==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.3.0.tgz",
+      "integrity": "sha512-vHFahytLoF2enJklgtOtCtIjZrKD/LoxlaUusd5nh7dWv/dkKQJY74ndFSzxCdv7g0ueGg1ORgTSt4Y9LPZn9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "~5.3.0",
+        "chalk": "~5.4.1",
         "commander": "~12.1.0",
         "debug": "~4.4.0",
         "execa": "~8.0.1",
@@ -11207,9 +11235,9 @@
       }
     },
     "node_modules/lint-staged/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11544,6 +11572,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
@@ -13269,6 +13298,24 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -13552,14 +13599,14 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz",
-      "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.0.tgz",
+      "integrity": "sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "confbox": "^0.1.8",
-        "mlly": "^1.7.2",
+        "mlly": "^1.7.3",
         "pathe": "^1.1.2"
       }
     },
@@ -13763,9 +13810,9 @@
       "license": "MIT"
     },
     "node_modules/posthog-js": {
-      "version": "1.203.1",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.203.1.tgz",
-      "integrity": "sha512-r/WiSyz6VNbIKEV/30+aD5gdrYkFtmZwvqNa6h9frl8hG638v098FrXaq3EYzMcCdkQf3phaZTDIAFKegpiTjw==",
+      "version": "1.203.2",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.203.2.tgz",
+      "integrity": "sha512-3aLpEhM4i9sQQtobRmDttJ3rTW1+gwQ9HL7QiOeDueE2T7CguYibYS7weY1UhXMerx5lh1A7+szlOJTTibifLQ==",
       "license": "MIT",
       "dependencies": {
         "core-js": "^3.38.1",
@@ -13781,9 +13828,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/preact": {
-      "version": "10.25.3",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.3.tgz",
-      "integrity": "sha512-dzQmIFtM970z+fP9ziQ3yG4e3ULIbwZzJ734vaMVUTaKQ2+Ru1Ou/gjshOYVHCcd1rpAelC6ngjvjDXph98unQ==",
+      "version": "10.25.4",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.4.tgz",
+      "integrity": "sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -14067,28 +14114,24 @@
       }
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
+      "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
       "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
+      "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.25.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.0.0"
       }
     },
     "node_modules/react-highlight": {
@@ -14117,9 +14160,9 @@
       }
     },
     "node_modules/react-i18next": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.2.0.tgz",
-      "integrity": "sha512-iJNc8111EaDtVTVMKigvBtPHyrJV+KblWG73cUxqp+WmJCcwkzhWNFXmkAD5pwP2Z4woeDj/oXDdbjDsb3Gutg==",
+      "version": "15.4.0",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.0.tgz",
+      "integrity": "sha512-Py6UkX3zV08RTvL6ZANRoBh9sL/ne6rQq79XlkHEdd82cZr2H9usbWpUNVadJntIZP2pu3M2rL1CN+5rQYfYFw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.25.0",
@@ -14888,6 +14931,30 @@
       ],
       "license": "MIT"
     },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-push-apply/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/safe-regex-test": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
@@ -14926,13 +14993,10 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
+      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==",
+      "license": "MIT"
     },
     "node_modules/scroll-into-view-if-needed": {
       "version": "3.0.10",

frontend/package.json

@@ -1,19 +1,19 @@
 {
   "name": "openhands-frontend",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "private": true,
   "type": "module",
   "engines": {
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@monaco-editor/react": "^4.6.0",
+    "@monaco-editor/react": "^4.7.0-rc.0",
     "@nextui-org/react": "^2.6.10",
     "@react-router/node": "^7.1.1",
     "@react-router/serve": "^7.1.1",
     "@react-types/shared": "^3.25.0",
     "@reduxjs/toolkit": "^2.5.0",
-    "@tanstack/react-query": "^5.62.10",
+    "@tanstack/react-query": "^5.62.11",
     "@vitejs/plugin-react": "^4.3.2",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.4.0",
@@ -26,12 +26,12 @@
     "isbot": "^5.1.19",
     "jose": "^5.9.4",
     "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.203.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "posthog-js": "^1.203.2",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-highlight": "^0.15.0",
     "react-hot-toast": "^2.4.1",
-    "react-i18next": "^15.2.0",
+    "react-i18next": "^15.4.0",
     "react-icons": "^5.4.0",
     "react-markdown": "^9.0.1",
     "react-redux": "^9.2.0",
@@ -42,7 +42,7 @@
     "sirv-cli": "^3.0.0",
     "socket.io-client": "^4.8.1",
     "tailwind-merge": "^2.6.0",
-    "vite": "^5.4.9",
+    "vite": "^5.4.11",
     "web-vitals": "^3.5.2",
     "ws": "^8.18.0"
   },
@@ -75,6 +75,7 @@
     ]
   },
   "devDependencies": {
+    "@mswjs/socket.io-binding": "^0.1.1",
     "@playwright/test": "^1.49.1",
     "@react-router/dev": "^7.1.1",
     "@tailwindcss/typography": "^0.5.15",
@@ -83,8 +84,8 @@
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/node": "^22.10.2",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^19.0.2",
+    "@types/react-dom": "^19.0.2",
     "@types/react-highlight": "^0.12.8",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/ws": "^8.5.12",
@@ -104,7 +105,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "husky": "^9.1.6",
     "jsdom": "^25.0.1",
-    "lint-staged": "^15.2.11",
+    "lint-staged": "^15.3.0",
     "msw": "^2.6.6",
     "postcss": "^8.4.47",
     "prettier": "^3.4.2",

frontend/public/mockServiceWorker.js

@@ -8,8 +8,8 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.6.6'
-const INTEGRITY_CHECKSUM = 'ca7800994cc8bfb5eb961e037c877074'
+const PACKAGE_VERSION = '2.7.0'
+const INTEGRITY_CHECKSUM = '00729d72e3b82faf54ca8b9621dbb96f'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -199,7 +199,19 @@ async function getResponse(event, client, requestId) {
     // Remove the "accept" header value that marked this request as passthrough.
     // This prevents request alteration and also keeps it compliant with the
     // user-defined CORS policies.
-    headers.delete('accept', 'msw/passthrough')
+    const acceptHeader = headers.get('accept')
+    if (acceptHeader) {
+      const values = acceptHeader.split(',').map((value) => value.trim())
+      const filteredValues = values.filter(
+        (value) => value !== 'msw/passthrough',
+      )
+
+      if (filteredValues.length > 0) {
+        headers.set('accept', filteredValues.join(', '))
+      } else {
+        headers.delete('accept')
+      }
+    }
 
     return fetch(requestClone, { headers })
   }

frontend/src/api/github.ts

@@ -106,15 +106,28 @@ export const retrieveGitHubUser = async () => {
 
 export const retrieveLatestGitHubCommit = async (
   repository: string,
-): Promise<GitHubCommit> => {
-  const response = await github.get<GitHubCommit[]>(
-    `/repos/${repository}/commits`,
-    {
-      params: {
-        per_page: 1,
+): Promise<GitHubCommit | null> => {
+  try {
+    const response = await github.get<GitHubCommit[]>(
+      `/repos/${repository}/commits`,
+      {
+        params: {
+          per_page: 1,
+        },
       },
-    },
-  );
-
-  return response.data[0];
+    );
+    return response.data[0] || null;
+  } catch (error) {
+    if (!error || typeof error !== "object") {
+      throw new Error("Unknown error occurred");
+    }
+    const axiosError = error as { response?: { status: number } };
+    if (axiosError.response?.status === 409) {
+      // Repository is empty, no commits yet
+      return null;
+    }
+    throw new Error(
+      error instanceof Error ? error.message : "Unknown error occurred",
+    );
+  }
 };

frontend/src/api/open-hands.ts

@@ -8,8 +8,10 @@ import {
   GetConfigResponse,
   GetVSCodeUrlResponse,
   AuthenticateResponse,
+  Conversation,
 } from "./open-hands.types";
 import { openHands } from "./open-hands-axios";
+import { ApiSettings } from "#/services/settings";
 
 class OpenHands {
   /**
@@ -219,6 +221,52 @@ class OpenHands {
     return data;
   }
 
+  static async getUserConversations(): Promise<Conversation[]> {
+    const { data } = await openHands.get<Conversation[]>("/api/conversations");
+    return data;
+  }
+
+  static async deleteUserConversation(conversationId: string): Promise<void> {
+    await openHands.delete(`/api/conversations/${conversationId}`);
+  }
+
+  static async updateUserConversation(
+    conversationId: string,
+    conversation: Partial<Omit<Conversation, "id">>,
+  ): Promise<void> {
+    await openHands.put(`/api/conversations/${conversationId}`, conversation);
+  }
+
+  static async createConversation(
+    githubToken?: string,
+    selectedRepository?: string,
+  ): Promise<Conversation> {
+    const body = {
+      github_token: githubToken,
+      selected_repository: selectedRepository,
+    };
+
+    const { data } = await openHands.post<Conversation>(
+      "/api/conversations",
+      body,
+    );
+
+    // TODO: remove this once we have a multi-conversation UI
+    localStorage.setItem("latest_conversation_id", data.conversation_id);
+
+    return data;
+  }
+
+  static async getConversation(
+    conversationId: string,
+  ): Promise<Conversation | null> {
+    const { data } = await openHands.get<Conversation | null>(
+      `/api/conversations/${conversationId}`,
+    );
+
+    return data;
+  }
+
   static async searchEvents(
     conversationId: string,
     params: {
@@ -248,22 +296,22 @@ class OpenHands {
     return data;
   }
 
-  static async newConversation(params: {
-    githubToken?: string;
-    args?: Record<string, unknown>;
-    selectedRepository?: string;
-  }): Promise<{ conversation_id: string }> {
-    const { data } = await openHands.post<{
-      conversation_id: string;
-    }>("/api/conversations", {
-      github_token: params.githubToken,
-      args: params.args,
-      selected_repository: params.selectedRepository,
-    });
-    // TODO: remove this once we have a multi-conversation UI
-    localStorage.setItem("latest_conversation_id", data.conversation_id);
+  /**
+   * Get the settings from the server or use the default settings if not found
+   */
+  static async getSettings(): Promise<ApiSettings> {
+    const { data } = await openHands.get<ApiSettings>("/api/settings");
     return data;
   }
+
+  /**
+   * Save the settings to the server. Only valid settings are saved.
+   * @param settings - the settings to save
+   */
+  static async saveSettings(settings: Partial<ApiSettings>): Promise<boolean> {
+    const data = await openHands.post("/api/settings", settings);
+    return data.status === 200;
+  }
 }
 
 export default OpenHands;

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

@@ -1,3 +1,5 @@
+import { ProjectState } from "#/components/features/conversation-panel/conversation-state-indicator";
+
 export interface ErrorResponse {
   error: string;
 }
@@ -57,3 +59,11 @@ export interface AuthenticateResponse {
   message?: string;
   error?: string;
 }
+
+export interface Conversation {
+  conversation_id: string;
+  name: string;
+  repo: string | null;
+  lastUpdated: string;
+  state: ProjectState;
+}

frontend/src/assets/arrow.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function ArrowIcon(): JSX.Element {
+function ArrowIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/assets/cog-tooth.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function CogTooth(): JSX.Element {
+function CogTooth() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/assets/confirm.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function ConfirmIcon(): JSX.Element {
+function ConfirmIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/assets/pause.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function PauseIcon(): JSX.Element {
+function PauseIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/assets/play.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function PlayIcon(): JSX.Element {
+function PlayIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/assets/reject.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function RejectIcon(): JSX.Element {
+function RejectIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/assets/stop.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-function StopIcon(): JSX.Element {
+function StopIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

frontend/src/components/extension-icon-map.constant.tsx

@@ -8,7 +8,7 @@ import {
   FaPython,
 } from "react-icons/fa";
 
-export const EXTENSION_ICON_MAP: Record<string, JSX.Element> = {
+export const EXTENSION_ICON_MAP: Record<string, React.ReactNode> = {
   js: <DiJavascript />,
   ts: <DiJavascript />,
   py: <FaPython />,

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

@@ -1,7 +1,9 @@
+import { useTranslation } from "react-i18next";
 import { ContextMenu } from "./context-menu";
 import { ContextMenuListItem } from "./context-menu-list-item";
 import { ContextMenuSeparator } from "./context-menu-separator";
 import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
+import { I18nKey } from "#/i18n/declaration";
 
 interface AccountSettingsContextMenuProps {
   onClickAccountSettings: () => void;
@@ -17,6 +19,7 @@ export function AccountSettingsContextMenu({
   isLoggedIn,
 }: AccountSettingsContextMenuProps) {
   const ref = useClickOutsideElement<HTMLUListElement>(onClose);
+  const { t } = useTranslation();
 
   return (
     <ContextMenu
@@ -25,11 +28,11 @@ export function AccountSettingsContextMenu({
       className="absolute left-full -top-1 z-10"
     >
       <ContextMenuListItem onClick={onClickAccountSettings}>
-        Account Settings
+        {t(I18nKey.ACCOUNT_SETTINGS$SETTINGS)}
       </ContextMenuListItem>
       <ContextMenuSeparator />
       <ContextMenuListItem onClick={onLogout} isDisabled={!isLoggedIn}>
-        Logout
+        {t(I18nKey.ACCOUNT_SETTINGS$LOGOUT)}
       </ContextMenuListItem>
     </ContextMenu>
   );

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

@@ -1,18 +1,20 @@
 import { cn } from "#/utils/utils";
 
 interface ContextMenuListItemProps {
-  onClick: () => void;
+  testId?: string;
+  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
   isDisabled?: boolean;
 }
 
 export function ContextMenuListItem({
   children,
+  testId,
   onClick,
   isDisabled,
 }: React.PropsWithChildren<ContextMenuListItemProps>) {
   return (
     <button
-      data-testid="context-menu-list-item"
+      data-testid={testId || "context-menu-list-item"}
       type="button"
       onClick={onClick}
       disabled={isDisabled}

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

@@ -2,13 +2,19 @@ import React from "react";
 import { cn } from "#/utils/utils";
 
 interface ContextMenuProps {
+  ref?: React.RefObject<HTMLUListElement | null>;
   testId?: string;
   children: React.ReactNode;
   className?: React.HTMLAttributes<HTMLUListElement>["className"];
 }
 
-export const ContextMenu = React.forwardRef<HTMLUListElement, ContextMenuProps>(
-  ({ testId, children, className }, ref) => (
+export function ContextMenu({
+  testId,
+  children,
+  className,
+  ref,
+}: ContextMenuProps) {
+  return (
     <ul
       data-testid={testId}
       ref={ref}
@@ -16,7 +22,5 @@ export const ContextMenu = React.forwardRef<HTMLUListElement, ContextMenuProps>(
     >
       {children}
     </ul>
-  ),
-);
-
-ContextMenu.displayName = "ContextMenu";
+  );
+}

frontend/src/components/features/conversation-panel/confirm-delete-modal.tsx

@@ -0,0 +1,36 @@
+import { ModalButton } from "#/components/shared/buttons/modal-button";
+import {
+  BaseModalDescription,
+  BaseModalTitle,
+} from "#/components/shared/modals/confirmation-modals/base-modal";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { ModalBody } from "#/components/shared/modals/modal-body";
+
+interface ConfirmDeleteModalProps {
+  onConfirm: () => void;
+  onCancel: () => void;
+}
+
+export function ConfirmDeleteModal({
+  onConfirm,
+  onCancel,
+}: ConfirmDeleteModalProps) {
+  return (
+    <ModalBackdrop>
+      <ModalBody className="items-start">
+        <div className="flex flex-col gap-2">
+          <BaseModalTitle title="Are you sure you want to delete this project?" />
+          <BaseModalDescription description="All data associated with this project will be lost." />
+        </div>
+        <div className="flex flex-col gap-2 w-full">
+          <ModalButton
+            onClick={onConfirm}
+            className="bg-[#4465DB]"
+            text="Confirm"
+          />
+          <ModalButton onClick={onCancel} className="bg-danger" text="Cancel" />
+        </div>
+      </ModalBody>
+    </ModalBackdrop>
+  );
+}

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

@@ -0,0 +1,102 @@
+import React from "react";
+import { formatTimeDelta } from "#/utils/format-time-delta";
+import { ConversationRepoLink } from "./conversation-repo-link";
+import {
+  ProjectState,
+  ConversationStateIndicator,
+} from "./conversation-state-indicator";
+import { ContextMenu } from "../context-menu/context-menu";
+import { ContextMenuListItem } from "../context-menu/context-menu-list-item";
+import { EllipsisButton } from "./ellipsis-button";
+
+interface ProjectCardProps {
+  onClick: () => void;
+  onDelete: () => void;
+  onChangeTitle: (title: string) => void;
+  name: string;
+  repo: string | null;
+  lastUpdated: string; // ISO 8601
+  state?: ProjectState;
+}
+
+export function ConversationCard({
+  onClick,
+  onDelete,
+  onChangeTitle,
+  name,
+  repo,
+  lastUpdated,
+  state = "cold",
+}: ProjectCardProps) {
+  const [contextMenuVisible, setContextMenuVisible] = React.useState(false);
+  const inputRef = React.useRef<HTMLInputElement>(null);
+
+  const handleBlur = () => {
+    if (inputRef.current?.value) {
+      const trimmed = inputRef.current.value.trim();
+      onChangeTitle(trimmed);
+      inputRef.current!.value = trimmed;
+    } else {
+      // reset the value if it's empty
+      inputRef.current!.value = name;
+    }
+  };
+
+  const handleInputClick = (event: React.MouseEvent<HTMLInputElement>) => {
+    event.stopPropagation();
+  };
+
+  const handleDelete = (event: React.MouseEvent<HTMLButtonElement>) => {
+    event.stopPropagation();
+    onDelete();
+  };
+
+  return (
+    <div
+      data-testid="conversation-card"
+      onClick={onClick}
+      className="h-[100px] w-full px-[18px] py-4 border-b border-neutral-600"
+    >
+      <div className="flex items-center justify-between">
+        <input
+          ref={inputRef}
+          data-testid="conversation-card-title"
+          onClick={handleInputClick}
+          onBlur={handleBlur}
+          type="text"
+          defaultValue={name}
+          className="text-sm leading-6 font-semibold bg-transparent"
+        />
+
+        <div className="flex items-center gap-2 relative">
+          <ConversationStateIndicator state={state} />
+          <EllipsisButton
+            onClick={(event) => {
+              event.stopPropagation();
+              setContextMenuVisible((prev) => !prev);
+            }}
+          />
+          {contextMenuVisible && (
+            <ContextMenu testId="context-menu" className="absolute left-full">
+              <ContextMenuListItem
+                testId="delete-button"
+                onClick={handleDelete}
+              >
+                Delete
+              </ContextMenuListItem>
+            </ContextMenu>
+          )}
+        </div>
+      </div>
+      {repo && (
+        <ConversationRepoLink
+          repo={repo}
+          onClick={(e) => e.stopPropagation()}
+        />
+      )}
+      <p className="text-xs text-neutral-400">
+        <time>{formatTimeDelta(new Date(lastUpdated))} ago</time>
+      </p>
+    </div>
+  );
+}

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

@@ -0,0 +1,128 @@
+import React from "react";
+import { useLocation, useNavigate, useParams } from "react-router";
+import { ConversationCard } from "./conversation-card";
+import { useUserConversations } from "#/hooks/query/use-user-conversations";
+import { useDeleteConversation } from "#/hooks/mutation/use-delete-conversation";
+import { ConfirmDeleteModal } from "./confirm-delete-modal";
+import { NewConversationButton } from "./new-conversation-button";
+import { LoadingSpinner } from "#/components/shared/loading-spinner";
+import { useUpdateConversation } from "#/hooks/mutation/use-update-conversation";
+import { useEndSession } from "#/hooks/use-end-session";
+import { ExitConversationModal } from "./exit-conversation-modal";
+
+interface ConversationPanelProps {
+  onClose: () => void;
+}
+
+export function ConversationPanel({ onClose }: ConversationPanelProps) {
+  const { conversationId: cid } = useParams();
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  const endSession = useEndSession();
+
+  const [confirmDeleteModalVisible, setConfirmDeleteModalVisible] =
+    React.useState(false);
+  const [
+    confirmExitConversationModalVisible,
+    setConfirmExitConversationModalVisible,
+  ] = React.useState(false);
+  const [selectedConversationId, setSelectedConversationId] = React.useState<
+    string | null
+  >(null);
+
+  const { data: conversations, isFetching, error } = useUserConversations();
+
+  const { mutate: deleteConversation } = useDeleteConversation();
+  const { mutate: updateConversation } = useUpdateConversation();
+
+  const handleDeleteProject = (conversationId: string) => {
+    setConfirmDeleteModalVisible(true);
+    setSelectedConversationId(conversationId);
+  };
+
+  const handleConfirmDelete = () => {
+    if (selectedConversationId) {
+      deleteConversation({ conversationId: selectedConversationId });
+      setConfirmDeleteModalVisible(false);
+
+      if (cid === selectedConversationId) {
+        endSession();
+      }
+    }
+  };
+
+  const handleChangeTitle = (
+    conversationId: string,
+    oldTitle: string,
+    newTitle: string,
+  ) => {
+    if (oldTitle !== newTitle)
+      updateConversation({
+        id: conversationId,
+        conversation: { name: newTitle },
+      });
+  };
+
+  const handleClickCard = (conversationId: string) => {
+    navigate(`/conversations/${conversationId}`);
+    onClose();
+  };
+
+  return (
+    <div
+      data-testid="conversation-panel"
+      className="w-[350px] h-full border border-neutral-700 bg-neutral-800 rounded-xl"
+    >
+      <div className="pt-4 px-4 flex items-center justify-between">
+        {location.pathname.startsWith("/conversation") && (
+          <NewConversationButton
+            onClick={() => setConfirmExitConversationModalVisible(true)}
+          />
+        )}
+        {isFetching && <LoadingSpinner size="small" />}
+      </div>
+      {error && (
+        <div className="flex flex-col items-center justify-center h-full">
+          <p className="text-danger">{error.message}</p>
+        </div>
+      )}
+      {conversations?.length === 0 && (
+        <div className="flex flex-col items-center justify-center h-full">
+          <p className="text-neutral-400">No conversations found</p>
+        </div>
+      )}
+      {conversations?.map((project) => (
+        <ConversationCard
+          key={project.conversation_id}
+          onClick={() => handleClickCard(project.conversation_id)}
+          onDelete={() => handleDeleteProject(project.conversation_id)}
+          onChangeTitle={(title) =>
+            handleChangeTitle(project.conversation_id, project.name, title)
+          }
+          name={project.name}
+          repo={project.repo}
+          lastUpdated={project.lastUpdated}
+          state={project.state}
+        />
+      ))}
+
+      {confirmDeleteModalVisible && (
+        <ConfirmDeleteModal
+          onConfirm={handleConfirmDelete}
+          onCancel={() => setConfirmDeleteModalVisible(false)}
+        />
+      )}
+
+      {confirmExitConversationModalVisible && (
+        <ExitConversationModal
+          onConfirm={() => {
+            endSession();
+            onClose();
+          }}
+          onClose={() => setConfirmExitConversationModalVisible(false)}
+        />
+      )}
+    </div>
+  );
+}

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

@@ -0,0 +1,21 @@
+interface ConversationRepoLinkProps {
+  repo: string;
+  onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
+}
+
+export function ConversationRepoLink({
+  repo,
+  onClick,
+}: ConversationRepoLinkProps) {
+  return (
+    <a
+      data-testid="conversation-card-repo"
+      href={`https://github.com/${repo}`}
+      target="_blank noopener noreferrer"
+      onClick={onClick}
+      className="text-xs text-neutral-400 hover:text-neutral-200"
+    >
+      {repo}
+    </a>
+  );
+}

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

@@ -0,0 +1,40 @@
+import ColdIcon from "./state-indicators/cold.svg?react";
+import CoolingIcon from "./state-indicators/cooling.svg?react";
+import FinishedIcon from "./state-indicators/finished.svg?react";
+import RunningIcon from "./state-indicators/running.svg?react";
+import WaitingIcon from "./state-indicators/waiting.svg?react";
+import WarmIcon from "./state-indicators/warm.svg?react";
+
+type SVGIcon = React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+export type ProjectState =
+  | "cold"
+  | "cooling"
+  | "finished"
+  | "running"
+  | "waiting"
+  | "warm";
+
+const INDICATORS: Record<ProjectState, SVGIcon> = {
+  cold: ColdIcon,
+  cooling: CoolingIcon,
+  finished: FinishedIcon,
+  running: RunningIcon,
+  waiting: WaitingIcon,
+  warm: WarmIcon,
+};
+
+interface ConversationStateIndicatorProps {
+  state: ProjectState;
+}
+
+export function ConversationStateIndicator({
+  state,
+}: ConversationStateIndicatorProps) {
+  const StateIcon = INDICATORS[state];
+
+  return (
+    <div data-testid={`${state}-indicator`}>
+      <StateIcon />
+    </div>
+  );
+}

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

@@ -0,0 +1,13 @@
+import { FaEllipsisV } from "react-icons/fa";
+
+interface EllipsisButtonProps {
+  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+}
+
+export function EllipsisButton({ onClick }: EllipsisButtonProps) {
+  return (
+    <button data-testid="ellipsis-button" type="button" onClick={onClick}>
+      <FaEllipsisV fill="#a3a3a3" />
+    </button>
+  );
+}

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

@@ -0,0 +1,34 @@
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { ModalBody } from "#/components/shared/modals/modal-body";
+import { ModalButton } from "#/components/shared/buttons/modal-button";
+import { BaseModalTitle } from "#/components/shared/modals/confirmation-modals/base-modal";
+
+interface ExitConversationModalProps {
+  onConfirm: () => void;
+  onClose: () => void;
+}
+
+export function ExitConversationModal({
+  onConfirm,
+  onClose,
+}: ExitConversationModalProps) {
+  return (
+    <ModalBackdrop>
+      <ModalBody testID="confirm-new-conversation-modal">
+        <BaseModalTitle title="Creating a new conversation will replace your active conversation" />
+        <div className="flex w-full gap-2">
+          <ModalButton
+            text="Confirm"
+            onClick={onConfirm}
+            className="bg-[#C63143] flex-1"
+          />
+          <ModalButton
+            text="Cancel"
+            onClick={onClose}
+            className="bg-neutral-700 flex-1"
+          />
+        </div>
+      </ModalBody>
+    </ModalBackdrop>
+  );
+}

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

@@ -0,0 +1,16 @@
+interface NewConversationButtonProps {
+  onClick: () => void;
+}
+
+export function NewConversationButton({ onClick }: NewConversationButtonProps) {
+  return (
+    <button
+      data-testid="new-conversation-button"
+      type="button"
+      onClick={onClick}
+      className="font-bold bg-[#4465DB] px-2 py-1 rounded"
+    >
+      + New Project
+    </button>
+  );
+}

frontend/src/components/features/conversation-panel/state-indicators/cold.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.87012 2C9.87012 1.44772 9.4224 1 8.87012 1C8.31783 1 7.87012 1.44772 7.87012 2V8C7.87012 8.55228 8.31783 9 8.87012 9C9.4224 9 9.87012 8.55228 9.87012 8V2Z" fill="#A7A9AC"/>
+<path d="M10.8698 2.42001V2.56001C10.8698 2.93001 11.0698 3.28001 11.4098 3.43001C13.6798 4.43001 15.2198 6.80001 14.9698 9.48001C14.6998 12.47 12.0998 14.87 9.08979 14.92C5.73979 14.97 2.98979 12.26 2.98979 8.92001C2.98979 6.57001 4.34979 4.54001 6.30979 3.56001C6.63979 3.40001 6.85979 3.08001 6.85979 2.72001V2.55001C6.85979 1.86001 6.13979 1.43001 5.50979 1.73001C2.43979 3.20001 0.449793 6.62001 1.13979 10.41C1.70979 13.57 4.23979 16.14 7.38979 16.76C12.5098 17.76 16.9998 13.86 16.9998 8.92001C16.9998 5.61001 14.9898 2.78001 12.1198 1.56001C11.5298 1.31001 10.8698 1.78001 10.8698 2.42001Z" fill="#A7A9AC"/>
+</svg>

frontend/src/components/features/conversation-panel/state-indicators/cooling.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.87012 2.02002C9.87012 1.46773 9.4224 1.02002 8.87012 1.02002C8.31783 1.02002 7.87012 1.46773 7.87012 2.02002V8.02002C7.87012 8.5723 8.31783 9.02002 8.87012 9.02002C9.4224 9.02002 9.87012 8.5723 9.87012 8.02002V2.02002Z" fill="#EFC818"/>
+<path d="M10.8698 2.44003V2.58003C10.8698 2.95003 11.0698 3.30003 11.4098 3.45003C13.6798 4.45003 15.2198 6.82003 14.9698 9.50003C14.6998 12.49 12.0998 14.89 9.08979 14.94C5.73979 14.99 2.98979 12.28 2.98979 8.94003C2.98979 6.59003 4.34979 4.56003 6.30979 3.58003C6.63979 3.42003 6.85979 3.10003 6.85979 2.74003V2.57003C6.85979 1.88003 6.13979 1.45003 5.50979 1.75003C2.43979 3.23003 0.449793 6.64003 1.13979 10.43C1.70979 13.59 4.23979 16.16 7.38979 16.78C12.5098 17.78 16.9998 13.88 16.9998 8.94003C16.9998 5.63003 14.9898 2.80003 12.1198 1.58003C11.5298 1.33003 10.8698 1.80003 10.8698 2.44003Z" fill="#EFC818"/>
+</svg>

frontend/src/components/features/conversation-panel/state-indicators/finished.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 16.8599C13.4183 16.8599 17 13.2781 17 8.85986C17 4.44159 13.4183 0.859863 9 0.859863C4.58172 0.859863 1 4.44159 1 8.85986C1 13.2781 4.58172 16.8599 9 16.8599Z" fill="#779FD4"/>
+<path d="M4.61035 8.43014L7.86035 12.0301L13.3904 6.64014" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>

frontend/src/components/features/conversation-panel/state-indicators/running.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.04004 3.10986C12.06 3.10986 14.57 5.34986 14.98 8.25986C15.05 8.74986 15.47 9.10986 15.96 9.10986C16.57 9.10986 17.04 8.56986 16.96 7.96986C16.41 4.08986 13.07 1.10986 9.04004 1.10986C4.62004 1.10986 1.04004 4.68986 1.04004 9.10986C1.04004 13.1399 4.02004 16.4799 7.90004 17.0299C8.50004 17.1199 9.04004 16.6399 9.04004 16.0299C9.04004 15.5399 8.68004 15.1199 8.19004 15.0499C5.28004 14.6399 3.04004 12.1299 3.04004 9.10986C3.04004 5.79986 5.73004 3.10986 9.04004 3.10986Z" fill="#60BB46"/>
+<path d="M12.3504 9.11L7.40039 6.25V11.96L12.3504 9.11Z" fill="#60BB46"/>
+</svg>

frontend/src/components/features/conversation-panel/state-indicators/waiting.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.76039 6.99002C8.478 6.99002 9.87039 5.59763 9.87039 3.88002C9.87039 2.16241 8.478 0.77002 6.76039 0.77002C5.04279 0.77002 3.65039 2.16241 3.65039 3.88002C3.65039 5.59763 5.04279 6.99002 6.76039 6.99002Z" fill="#FFE165"/>
+<path d="M1.0802 17.0799C1.0802 17.0799 0.610196 11.5499 3.0102 9.67992C4.7902 8.29992 7.3302 9.44992 9.7802 7.95992C11.5802 6.86992 13.6102 4.10992 14.5202 2.49992C14.9302 1.77992 15.9102 1.62992 16.6102 2.05992C17.3802 2.51992 17.6102 3.53992 17.1102 4.28992C16.2302 5.58992 14.1802 8.85992 13.1202 10.3699C10.7602 13.7599 11.4302 17.0799 11.4302 17.0799H1.0702H1.0802Z" fill="#FFE165"/>
+</svg>

frontend/src/components/features/conversation-panel/state-indicators/warm.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.87012 2.08984C9.87012 1.53756 9.4224 1.08984 8.87012 1.08984C8.31783 1.08984 7.87012 1.53756 7.87012 2.08984V8.08984C7.87012 8.64213 8.31783 9.08984 8.87012 9.08984C9.4224 9.08984 9.87012 8.64213 9.87012 8.08984V2.08984Z" fill="#60BB46"/>
+<path d="M10.8702 2.50988V2.64988C10.8702 3.01988 11.0702 3.36988 11.4102 3.51988C13.6802 4.51988 15.2202 6.88988 14.9702 9.56988C14.7002 12.5599 12.1002 14.9599 9.09021 15.0099C5.74021 15.0599 2.99021 12.3499 2.99021 9.00988C2.99021 6.65988 4.35021 4.62988 6.31021 3.64988C6.64021 3.48988 6.86021 3.16988 6.86021 2.80988V2.63988C6.86021 1.94988 6.14021 1.51988 5.51021 1.81988C2.42021 3.30988 0.430214 6.71988 1.12021 10.5199C1.69021 13.6799 4.22021 16.2499 7.37021 16.8699C12.4902 17.8699 16.9802 13.9699 16.9802 9.02988C16.9802 5.71988 14.9702 2.88988 12.1002 1.66988C11.5102 1.41988 10.8502 1.88988 10.8502 2.52988L10.8702 2.50988Z" fill="#60BB46"/>
+</svg>

frontend/src/components/features/file-explorer/folder-icon.tsx

@@ -4,7 +4,7 @@ interface FolderIconProps {
   isOpen: boolean;
 }
 
-export function FolderIcon({ isOpen }: FolderIconProps): JSX.Element {
+export function FolderIcon({ isOpen }: FolderIconProps) {
   return isOpen ? (
     <FaFolderOpen color="D9D3D0" className="icon" />
   ) : (

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

@@ -31,17 +31,6 @@ export function GitHubRepositoriesSuggestionBox({
     }
   };
 
-  if (isGitHubErrorReponse(repositories)) {
-    return (
-      <SuggestionBox
-        title="Error Fetching Repositories"
-        content={
-          <p className="text-danger text-center">{repositories.message}</p>
-        }
-      />
-    );
-  }
-
   const isLoggedIn = !!user && !isGitHubErrorReponse(user);
 
   return (

frontend/src/components/features/project-menu/ProjectMenuCard.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import posthog from "posthog-js";
+import { useTranslation } from "react-i18next";
 import EllipsisH from "#/icons/ellipsis-h.svg?react";
 import { ProjectMenuCardContextMenu } from "./project.menu-card-context-menu";
 import { ProjectMenuDetailsPlaceholder } from "./project-menu-details-placeholder";
@@ -7,6 +8,7 @@ import { ProjectMenuDetails } from "./project-menu-details";
 import { ConnectToGitHubModal } from "#/components/shared/modals/connect-to-github-modal";
 import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
 import { DownloadModal } from "#/components/shared/download-modal";
+import { I18nKey } from "#/i18n/declaration";
 
 interface ProjectMenuCardProps {
   isConnectedToGitHub: boolean;
@@ -21,6 +23,8 @@ export function ProjectMenuCard({
   isConnectedToGitHub,
   githubData,
 }: ProjectMenuCardProps) {
+  const { t } = useTranslation();
+
   const [contextMenuIsOpen, setContextMenuIsOpen] = React.useState(false);
   const [connectToGitHubModalOpen, setConnectToGitHubModalOpen] =
     React.useState(false);
@@ -71,7 +75,7 @@ export function ProjectMenuCard({
         <button
           type="button"
           onClick={toggleMenuVisibility}
-          aria-label="Open project menu"
+          aria-label={t(I18nKey.PROJECT_MENU_CARD$OPEN)}
         >
           <EllipsisH width={36} height={36} />
         </button>

frontend/src/components/features/project-menu/project-menu-details-placeholder.tsx

@@ -30,7 +30,9 @@ export function ProjectMenuDetailsPlaceholder({
             "hover:underline hover:underline-offset-2",
           )}
         >
-          {!isConnectedToGitHub ? "Connect to GitHub" : "Connected"}
+          {!isConnectedToGitHub
+            ? t(I18nKey.PROJECT_MENU_DETAILS_PLACEHOLDER$CONNECT_TO_GITHUB)
+            : t(I18nKey.PROJECT_MENU_DETAILS_PLACEHOLDER$CONNECTED)}
           <CloudConnection width={12} height={12} />
         </span>
       </button>

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { useLocation } from "react-router";
+import FolderIcon from "#/icons/docs.svg?react";
 import { useAuth } from "#/context/auth-context";
-import { useSettings } from "#/context/settings-context";
 import { useGitHubUser } from "#/hooks/query/use-github-user";
 import { useIsAuthed } from "#/hooks/query/use-is-authed";
 import { UserActions } from "./user-actions";
@@ -13,21 +13,28 @@ import { LoadingSpinner } from "#/components/shared/loading-spinner";
 import { AccountSettingsModal } from "#/components/shared/modals/account-settings/account-settings-modal";
 import { ExitProjectConfirmationModal } from "#/components/shared/modals/exit-project-confirmation-modal";
 import { SettingsModal } from "#/components/shared/modals/settings/settings-modal";
+import { useSettingsUpToDate } from "#/context/settings-up-to-date-context";
+import { useSettings } from "#/hooks/query/use-settings";
+import { ConversationPanel } from "../conversation-panel/conversation-panel";
+import { cn } from "#/utils/utils";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";
 
 export function Sidebar() {
   const location = useLocation();
-
   const user = useGitHubUser();
   const { data: isAuthed } = useIsAuthed();
-
   const { logout } = useAuth();
-  const { settingsAreUpToDate } = useSettings();
+  const { data: settings, isError: settingsIsError } = useSettings();
+  const { isUpToDate: settingsAreUpToDate } = useSettingsUpToDate();
 
   const [accountSettingsModalOpen, setAccountSettingsModalOpen] =
     React.useState(false);
   const [settingsModalIsOpen, setSettingsModalIsOpen] = React.useState(false);
   const [startNewProjectModalIsOpen, setStartNewProjectModalIsOpen] =
     React.useState(false);
+  const [conversationPanelIsOpen, setConversationPanelIsOpen] = React.useState(
+    MULTI_CONVO_UI_IS_ENABLED,
+  );
 
   React.useEffect(() => {
     // If the github token is invalid, open the account settings modal again
@@ -54,7 +61,7 @@ export function Sidebar() {
 
   return (
     <>
-      <aside className="h-[40px] md:h-auto px-1 flex flex-row md:flex-col gap-1">
+      <aside className="h-[40px] md:h-auto px-1 flex flex-row md:flex-col gap-1 relative">
         <nav className="flex flex-row md:flex-col items-center gap-[18px]">
           <div className="w-[34px] h-[34px] flex items-center justify-center">
             <AllHandsLogoButton onClick={handleClickLogo} />
@@ -70,18 +77,45 @@ export function Sidebar() {
             />
           )}
           <SettingsButton onClick={() => setSettingsModalIsOpen(true)} />
+          {MULTI_CONVO_UI_IS_ENABLED && (
+            <button
+              data-testid="toggle-conversation-panel"
+              type="button"
+              onClick={() => setConversationPanelIsOpen((prev) => !prev)}
+              className={cn(
+                conversationPanelIsOpen ? "border-b-2 border-[#FFE165]" : "",
+              )}
+            >
+              <FolderIcon width={28} height={28} />
+            </button>
+          )}
           <DocsButton />
           <ExitProjectButton
             onClick={() => setStartNewProjectModalIsOpen(true)}
           />
         </nav>
+
+        {conversationPanelIsOpen && (
+          <div
+            className="absolute h-full left-[calc(100%+12px)] top-0 z-20" // 12px padding (sidebar parent)
+          >
+            <ConversationPanel
+              onClose={() => setConversationPanelIsOpen(false)}
+            />
+          </div>
+        )}
       </aside>
+
       {accountSettingsModalOpen && (
         <AccountSettingsModal onClose={handleAccountSettingsModalClose} />
       )}
-      {showSettingsModal && (
-        <SettingsModal onClose={() => setSettingsModalIsOpen(false)} />
-      )}
+      {settingsIsError ||
+        (showSettingsModal && (
+          <SettingsModal
+            settings={settings}
+            onClose={() => setSettingsModalIsOpen(false)}
+          />
+        ))}
       {startNewProjectModalIsOpen && (
         <ExitProjectConfirmationModal
           onClose={() => setStartNewProjectModalIsOpen(false)}

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

@@ -1,3 +1,4 @@
+import { Tooltip } from "@nextui-org/react";
 import { LoadingSpinner } from "#/components/shared/loading-spinner";
 import DefaultUserAvatar from "#/icons/default-user.svg?react";
 import { cn } from "#/utils/utils";
@@ -10,7 +11,7 @@ interface UserAvatarProps {
 }
 
 export function UserAvatar({ onClick, avatarUrl, isLoading }: UserAvatarProps) {
-  return (
+  const buttonContent = (
     <button
       data-testid="user-avatar"
       type="button"
@@ -31,4 +32,10 @@ export function UserAvatar({ onClick, avatarUrl, isLoading }: UserAvatarProps) {
       {isLoading && <LoadingSpinner size="small" />}
     </button>
   );
+
+  return (
+    <Tooltip content="Account settings" closeDelay={100}>
+      {buttonContent}
+    </Tooltip>
+  );
 }

frontend/src/components/layout/resizable-panel.tsx

@@ -0,0 +1,191 @@
+import React, { CSSProperties, JSX, useEffect, useRef, useState } from "react";
+import {
+  VscChevronDown,
+  VscChevronLeft,
+  VscChevronRight,
+  VscChevronUp,
+} from "react-icons/vsc";
+import { twMerge } from "tailwind-merge";
+import { IconButton } from "../shared/buttons/icon-button";
+
+export enum Orientation {
+  HORIZONTAL = "horizontal",
+  VERTICAL = "vertical",
+}
+
+enum Collapse {
+  COLLAPSED = "collapsed",
+  SPLIT = "split",
+  FILLED = "filled",
+}
+
+type ResizablePanelProps = {
+  firstChild: React.ReactNode;
+  firstClassName: string | undefined;
+  secondChild: React.ReactNode;
+  secondClassName: string | undefined;
+  className: string | undefined;
+  orientation: Orientation;
+  initialSize: number;
+};
+
+export function ResizablePanel({
+  firstChild,
+  firstClassName,
+  secondChild,
+  secondClassName,
+  className,
+  orientation,
+  initialSize,
+}: ResizablePanelProps): JSX.Element {
+  const [firstSize, setFirstSize] = useState<number>(initialSize);
+  const [dividerPosition, setDividerPosition] = useState<number | null>(null);
+  const firstRef = useRef<HTMLDivElement>(null);
+  const secondRef = useRef<HTMLDivElement>(null);
+  const [collapse, setCollapse] = useState<Collapse>(Collapse.SPLIT);
+  const isHorizontal = orientation === Orientation.HORIZONTAL;
+
+  useEffect(() => {
+    if (dividerPosition == null || !firstRef.current) {
+      return undefined;
+    }
+    const getFirstSizeFromEvent = (e: MouseEvent) => {
+      const position = isHorizontal ? e.clientX : e.clientY;
+      return firstSize + position - dividerPosition;
+    };
+    const onMouseMove = (e: MouseEvent) => {
+      e.preventDefault();
+      const newFirstSize = `${getFirstSizeFromEvent(e)}px`;
+      const { current } = firstRef;
+      if (current) {
+        if (isHorizontal) {
+          current.style.width = newFirstSize;
+          current.style.minWidth = newFirstSize;
+        } else {
+          current.style.height = newFirstSize;
+          current.style.minHeight = newFirstSize;
+        }
+      }
+    };
+    const onMouseUp = (e: MouseEvent) => {
+      e.preventDefault();
+      if (firstRef.current) {
+        firstRef.current.style.transition = "";
+      }
+      if (secondRef.current) {
+        secondRef.current.style.transition = "";
+      }
+      setFirstSize(getFirstSizeFromEvent(e));
+      setDividerPosition(null);
+      document.removeEventListener("mousemove", onMouseMove);
+      document.removeEventListener("mouseup", onMouseUp);
+    };
+    document.addEventListener("mousemove", onMouseMove);
+    document.addEventListener("mouseup", onMouseUp);
+    return () => {
+      document.removeEventListener("mousemove", onMouseMove);
+      document.removeEventListener("mouseup", onMouseUp);
+    };
+  }, [dividerPosition, firstSize, orientation]);
+
+  const onMouseDown = (e: React.MouseEvent) => {
+    e.preventDefault();
+    if (firstRef.current) {
+      firstRef.current.style.transition = "none";
+    }
+    if (secondRef.current) {
+      secondRef.current.style.transition = "none";
+    }
+    const position = isHorizontal ? e.clientX : e.clientY;
+    setDividerPosition(position);
+  };
+
+  const getStyleForFirst = () => {
+    const style: CSSProperties = { overflow: "hidden" };
+    if (collapse === Collapse.COLLAPSED) {
+      style.opacity = 0;
+      style.width = 0;
+      style.minWidth = 0;
+      style.height = 0;
+      style.minHeight = 0;
+    } else if (collapse === Collapse.SPLIT) {
+      const firstSizePx = `${firstSize}px`;
+      if (isHorizontal) {
+        style.width = firstSizePx;
+        style.minWidth = firstSizePx;
+      } else {
+        style.height = firstSizePx;
+        style.minHeight = firstSizePx;
+      }
+    } else {
+      style.flexGrow = 1;
+    }
+    return style;
+  };
+
+  const getStyleForSecond = () => {
+    const style: CSSProperties = { overflow: "hidden" };
+    if (collapse === Collapse.FILLED) {
+      style.opacity = 0;
+      style.width = 0;
+      style.minWidth = 0;
+      style.height = 0;
+      style.minHeight = 0;
+    } else if (collapse === Collapse.SPLIT) {
+      style.flexGrow = 1;
+    } else {
+      style.flexGrow = 1;
+    }
+    return style;
+  };
+
+  const onCollapse = () => {
+    if (collapse === Collapse.SPLIT) {
+      setCollapse(Collapse.COLLAPSED);
+    } else {
+      setCollapse(Collapse.SPLIT);
+    }
+  };
+
+  const onExpand = () => {
+    if (collapse === Collapse.SPLIT) {
+      setCollapse(Collapse.FILLED);
+    } else {
+      setCollapse(Collapse.SPLIT);
+    }
+  };
+
+  return (
+    <div className={twMerge("flex", !isHorizontal && "flex-col", className)}>
+      <div
+        ref={firstRef}
+        className={twMerge(firstClassName, "transition-all ease-soft-spring")}
+        style={getStyleForFirst()}
+      >
+        {firstChild}
+      </div>
+      <div
+        className={`${isHorizontal ? "cursor-ew-resize w-3 flex-col" : "cursor-ns-resize h-3 flex-row"} shrink-0 flex justify-center items-center`}
+        onMouseDown={collapse === Collapse.SPLIT ? onMouseDown : undefined}
+      >
+        <IconButton
+          icon={isHorizontal ? <VscChevronLeft /> : <VscChevronUp />}
+          ariaLabel="Collapse"
+          onClick={onCollapse}
+        />
+        <IconButton
+          icon={isHorizontal ? <VscChevronRight /> : <VscChevronDown />}
+          ariaLabel="Expand"
+          onClick={onExpand}
+        />
+      </div>
+      <div
+        ref={secondRef}
+        className={twMerge(secondClassName, "transition-all ease-soft-spring")}
+        style={getStyleForSecond()}
+      >
+        {secondChild}
+      </div>
+    </div>
+  );
+}

frontend/src/components/shared/buttons/all-hands-logo-button.tsx

@@ -1,4 +1,5 @@
 import AllHandsLogo from "#/assets/branding/all-hands-logo.svg?react";
+import { TooltipButton } from "./tooltip-button";
 
 interface AllHandsLogoButtonProps {
   onClick: () => void;
@@ -6,8 +7,12 @@ interface AllHandsLogoButtonProps {
 
 export function AllHandsLogoButton({ onClick }: AllHandsLogoButtonProps) {
   return (
-    <button type="button" aria-label="All Hands Logo" onClick={onClick}>
+    <TooltipButton
+      tooltip="All Hands AI"
+      ariaLabel="All Hands Logo"
+      onClick={onClick}
+    >
       <AllHandsLogo width={34} height={23} />
-    </button>
+    </TooltipButton>
   );
 }

frontend/src/components/shared/buttons/docs-button.tsx

@@ -1,15 +1,14 @@
 import DocsIcon from "#/icons/docs.svg?react";
+import { TooltipButton } from "./tooltip-button";
 
 export function DocsButton() {
   return (
-    <a
+    <TooltipButton
+      tooltip="Documentation"
+      ariaLabel="Documentation"
       href="https://docs.all-hands.dev"
-      aria-label="Documentation"
-      target="_blank"
-      rel="noreferrer noopener"
-      className="w-8 h-8 rounded-full hover:opacity-80 flex items-center justify-center"
     >
       <DocsIcon width={28} height={28} />
-    </a>
+    </TooltipButton>
   );
 }

frontend/src/components/shared/buttons/exit-project-button.tsx

@@ -1,4 +1,5 @@
 import NewProjectIcon from "#/icons/new-project.svg?react";
+import { TooltipButton } from "./tooltip-button";
 
 interface ExitProjectButtonProps {
   onClick: () => void;
@@ -6,13 +7,13 @@ interface ExitProjectButtonProps {
 
 export function ExitProjectButton({ onClick }: ExitProjectButtonProps) {
   return (
-    <button
-      data-testid="new-project-button"
-      type="button"
-      aria-label="Start new project"
+    <TooltipButton
+      tooltip="Start new project"
+      ariaLabel="Start new project"
       onClick={onClick}
+      testId="new-project-button"
     >
       <NewProjectIcon width={28} height={28} />
-    </button>
+    </TooltipButton>
   );
 }

frontend/src/components/shared/buttons/icon-button.tsx

@@ -1,9 +1,9 @@
 import { Button } from "@nextui-org/react";
-import React, { MouseEventHandler, ReactElement } from "react";
+import React, { ReactElement } from "react";
 
 export interface IconButtonProps {
   icon: ReactElement;
-  onClick: MouseEventHandler<HTMLButtonElement>;
+  onClick: () => void;
   ariaLabel: string;
   testId?: string;
 }
@@ -18,7 +18,7 @@ export function IconButton({
     <Button
       type="button"
       variant="flat"
-      onClick={onClick}
+      onPress={onClick}
       className="cursor-pointer text-[12px] bg-transparent aspect-square px-0 min-w-[20px] h-[20px]"
       aria-label={ariaLabel}
       data-testid={testId}

frontend/src/components/shared/buttons/settings-button.tsx

@@ -1,4 +1,5 @@
 import CogTooth from "#/assets/cog-tooth";
+import { TooltipButton } from "./tooltip-button";
 
 interface SettingsButtonProps {
   onClick: () => void;
@@ -6,13 +7,13 @@ interface SettingsButtonProps {
 
 export function SettingsButton({ onClick }: SettingsButtonProps) {
   return (
-    <button
-      type="button"
-      aria-label="Settings"
-      className="w-8 h-8 rounded-full hover:opacity-80 flex items-center justify-center"
+    <TooltipButton
+      testId="settings-button"
+      tooltip="Settings"
+      ariaLabel="Settings"
       onClick={onClick}
     >
       <CogTooth />
-    </button>
+    </TooltipButton>
   );
 }

frontend/src/components/shared/buttons/tooltip-button.tsx

@@ -0,0 +1,52 @@
+import { Tooltip } from "@nextui-org/react";
+import { ReactNode } from "react";
+
+interface TooltipButtonProps {
+  children: ReactNode;
+  tooltip: string;
+  onClick?: () => void;
+  href?: string;
+  ariaLabel: string;
+  testId?: string;
+}
+
+export function TooltipButton({
+  children,
+  tooltip,
+  onClick,
+  href,
+  ariaLabel,
+  testId,
+}: TooltipButtonProps) {
+  const buttonContent = (
+    <button
+      type="button"
+      aria-label={ariaLabel}
+      data-testid={testId}
+      onClick={onClick}
+      className="w-8 h-8 rounded-full hover:opacity-80 flex items-center justify-center"
+    >
+      {children}
+    </button>
+  );
+
+  const content = href ? (
+    <a
+      href={href}
+      target="_blank"
+      rel="noreferrer noopener"
+      className="w-8 h-8 rounded-full hover:opacity-80 flex items-center justify-center"
+      aria-label={ariaLabel}
+    >
+      {children}
+    </a>
+  ) : (
+    buttonContent
+  );
+
+  return (
+    <Tooltip content={tooltip} closeDelay={100}>
+      {content}
+    </Tooltip>
+  );
+}

frontend/src/components/shared/error-toast.tsx

@@ -1,4 +1,6 @@
 import toast, { Toast } from "react-hot-toast";
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
 
 interface ErrorToastProps {
   id: Toast["id"];
@@ -6,6 +8,8 @@ interface ErrorToastProps {
 }
 
 export function ErrorToast({ id, error }: ErrorToastProps) {
+  const { t } = useTranslation();
+
   return (
     <div className="flex items-center justify-between w-full h-full">
       <span>{error}</span>
@@ -14,7 +18,7 @@ export function ErrorToast({ id, error }: ErrorToastProps) {
         onClick={() => toast.dismiss(id)}
         className="bg-neutral-500 px-1 rounded h-full"
       >
-        Close
+        {t(I18nKey.ERROR_TOAST$CLOSE_BUTTON_LABEL)}
       </button>
     </div>
   );

frontend/src/components/shared/inputs/api-key-input.tsx

@@ -1,27 +1,37 @@
-import { Input } from "@nextui-org/react";
+import { Input, Tooltip } from "@nextui-org/react";
 import { useTranslation } from "react-i18next";
+import { FaCheckCircle, FaExclamationCircle } from "react-icons/fa";
 import { I18nKey } from "#/i18n/declaration";
 
 interface APIKeyInputProps {
   isDisabled: boolean;
-  defaultValue: string;
+  isSet: boolean;
 }
 
-export function APIKeyInput({ isDisabled, defaultValue }: APIKeyInputProps) {
+export function APIKeyInput({ isDisabled, isSet }: APIKeyInputProps) {
   const { t } = useTranslation();
 
   return (
     <fieldset data-testid="api-key-input" className="flex flex-col gap-2">
-      <label htmlFor="api-key" className="font-[500] text-[#A3A3A3] text-xs">
-        {t(I18nKey.SETTINGS_FORM$API_KEY_LABEL)}
-      </label>
+      <Tooltip content={isSet ? "API Key is set" : "API Key is not set"}>
+        <label
+          htmlFor="api-key"
+          className="font-[500] text-[#A3A3A3] text-xs flex items-center gap-1 self-start"
+        >
+          {isSet && <FaCheckCircle className="text-[#00D1B2] inline-block" />}
+          {!isSet && (
+            <FaExclamationCircle className="text-[#FF3860] inline-block" />
+          )}
+          {t(I18nKey.SETTINGS_FORM$API_KEY_LABEL)}
+        </label>
+      </Tooltip>
       <Input
         isDisabled={isDisabled}
         id="api-key"
         name="api-key"
         aria-label="API Key"
         type="password"
-        defaultValue={defaultValue}
+        defaultValue=""
         classNames={{
           inputWrapper: "bg-[#27272A] rounded-md text-sm px-3 py-[10px]",
         }}

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

@@ -8,12 +8,12 @@ import { ModalBody } from "../modal-body";
 import { AvailableLanguages } from "#/i18n";
 import { I18nKey } from "#/i18n/declaration";
 import { useAuth } from "#/context/auth-context";
-import { useSettings } from "#/context/settings-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 { useSaveSettings } from "#/hooks/mutation/use-save-settings";
 
 interface AccountSettingsFormProps {
   onClose: () => void;
@@ -30,7 +30,7 @@ export function AccountSettingsForm({
 }: AccountSettingsFormProps) {
   const { gitHubToken, setGitHubToken, logout } = useAuth();
   const { data: config } = useConfig();
-  const { saveSettings } = useSettings();
+  const { mutate: saveSettings } = useSaveSettings();
   const { t } = useTranslation();
 
   const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {