Merge main into feature/runtime-manager

only destroy runtime if no one is active
move close
2026-04-29 03:00:45 -04:00 · 2025-01-03 20:37:08 +00:00 · 2024-12-24 16:13:45 -05:00 · 2024-12-24 16:12:24 -05:00 · 2024-12-24 16:08:16 -05:00 · 2024-12-24 15:54:40 -05:00
225 changed files with 5218 additions and 8627 deletions
@@ -36,8 +36,6 @@ jobs:
      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v3
-      - name: Install tmux
-        run: sudo apt-get update && sudo apt-get install -y tmux
      - name: Install poetry via pipx
        run: pipx install poetry
      - name: Set up Python
@@ -29,8 +29,6 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Install tmux
-        run: sudo apt-get update && sudo apt-get install -y tmux
      - name: Install poetry via pipx
        run: pipx install poetry

@@ -56,7 +56,7 @@ jobs:
          docker-images: false
          swap-storage: true
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.0.0
        with:
          image: tonistiigi/binfmt:latest
      - name: Login to GHCR
@@ -119,7 +119,7 @@ jobs:
          docker-images: false
          swap-storage: true
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.0.0
        with:
          image: tonistiigi/binfmt:latest
      - name: Login to GHCR
@@ -31,8 +31,6 @@ jobs:
          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
          restore-keys: |
            ${{ runner.os }}-poetry-
-      - name: Install tmux
-        run: brew install tmux
      - name: Install poetry via pipx
        run: pipx install poetry
      - name: Install Python dependencies using Poetry
@@ -30,8 +30,6 @@ jobs:
      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v3
-      - name: Install tmux
-        run: sudo apt-get update && sudo apt-get install -y tmux
      - name: Install poetry via pipx
        run: pipx install poetry
      - name: Set up Python
@@ -18,24 +18,24 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:

-* Demonstrating empathy and kindness toward other people.
-* Being respectful of differing opinions, viewpoints, and experiences.
-* Giving and gracefully accepting constructive feedback.
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
 * Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience.
+  and learning from the experience
 * Focusing on what is best not just for us as individuals, but for the overall
-  community.
+  community

 Examples of unacceptable behavior include:

 * The use of sexualized language or imagery, and sexual attention or advances of
-  any kind.
-* Trolling, insulting or derogatory comments, and personal or political attacks.
-* Public or private harassment.
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
 * Publishing others' private information, such as a physical or email address,
-  without their explicit permission.
+  without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
-  professional setting.
+  professional setting

 ## Enforcement Responsibilities

@@ -61,7 +61,7 @@ representative at an online or offline event.

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@all-hands.dev.
+contact@all-hands.dev
 All complaints will be reviewed and investigated promptly and fairly.

 All community leaders are obligated to respect the privacy and security of the
@@ -11,11 +11,11 @@ To understand the codebase, please refer to the README in each module:
   - [agenthub](./openhands/agenthub/README.md)
   - [server](./openhands/server/README.md)

-## Setting up Your Development Environment
+## Setting up your development environment

 We have a separate doc [Development.md](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md) that tells you how to set up a development workflow.

-## How Can I Contribute?
+## How can I contribute?

 There are many ways that you can contribute:

@@ -23,7 +23,7 @@ There are many ways that you can contribute:
 2. **Send feedback** after each session by [clicking the thumbs-up thumbs-down buttons](https://docs.all-hands.dev/modules/usage/feedback), so we can see where things are working and failing, and also build an open dataset for training code agents.
 3. **Improve the Codebase** by sending [PRs](#sending-pull-requests-to-openhands) (see details below). In particular, we have some [good first issues](https://github.com/All-Hands-AI/OpenHands/labels/good%20first%20issue) that may be ones to start on.

-## What Can I Build?
+## What can I build?
 Here are a few ways you can help improve the codebase.

 #### UI/UX
@@ -35,7 +35,7 @@ of the application, please open an issue first, or better, join the #frontend ch
 to gather consensus from our design team first.

 #### Improving the agent
-Our main agent is the CodeAct agent. You can [see its prompts here](https://github.com/All-Hands-AI/OpenHands/tree/main/openhands/agenthub/codeact_agent).
+Our main agent is the CodeAct agent. You can [see its prompts here](https://github.com/All-Hands-AI/OpenHands/tree/main/openhands/agenthub/codeact_agent)

 Changes to these prompts, and to the underlying behavior in Python, can have a huge impact on user experience.
 You can try modifying the prompts to see how they change the behavior of the agent as you use the app
@@ -63,7 +63,7 @@ At the moment, we have two kinds of tests: [`unit`](./tests/unit) and [`integrat
 ## Sending Pull Requests to OpenHands

 You'll need to fork our repository to send us a Pull Request. You can learn more
-about how to fork a GitHub repo and open a PR with your changes in [this article](https://medium.com/swlh/forks-and-pull-requests-how-to-contribute-to-github-repos-8843fac34ce8).
+about how to fork a GitHub repo and open a PR with your changes in [this article](https://medium.com/swlh/forks-and-pull-requests-how-to-contribute-to-github-repos-8843fac34ce8)

 ### Pull Request title
 As described [here](https://github.com/commitizen/conventional-commit-types/blob/master/index.json), a valid PR title should begin with one of the following prefixes:
@@ -103,7 +103,7 @@ Further, if you see an issue you like, please leave a "thumbs-up" or a comment,

 ### Making Pull Requests

-We're generally happy to consider all pull requests with the evaluation process varying based on the type of change:
+We're generally happy to consider all [PRs](https://github.com/All-Hands-AI/OpenHands/pulls), with the evaluation process varying based on the type of change:

 #### For Small Improvements

@@ -3,7 +3,7 @@ This guide is for people working on OpenHands and editing the source code.
 If you wish to contribute your changes, check out the [CONTRIBUTING.md](https://github.com/All-Hands-AI/OpenHands/blob/main/CONTRIBUTING.md) on how to clone and setup the project initially before moving on.
 Otherwise, you can clone the OpenHands project directly.

-## Start the Server for Development
+## Start the server for development
 ### 1. Requirements
 * 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!)
@@ -58,7 +58,7 @@ See [our documentation](https://docs.all-hands.dev/modules/usage/llms) for recom

 ### 4. Running the application
 #### Option A: Run the Full Application
-Once the setup is complete, this command starts both the backend and frontend servers, allowing you to interact with OpenHands:
+Once the setup is complete, launching OpenHands is as simple as running a single command. This command starts both the backend and frontend servers seamlessly, allowing you to interact with OpenHands:
 ```bash
 make run
 ```
@@ -75,11 +75,11 @@ make run
    ```

 ### 6. LLM Debugging
-If you encounter any issues with the Language Model (LM) or you're simply curious, export DEBUG=1 in the environment and restart the backend.
-OpenHands will log the prompts and responses in the logs/llm/CURRENT_DATE directory, allowing you to identify the causes.
+If you encounter any issues with the Language Model (LM) or you're simply curious, you can inspect the actual LLM prompts and responses. To do so, export DEBUG=1 in the environment and restart the backend.
+OpenHands will then log the prompts and responses in the logs/llm/CURRENT_DATE directory, allowing you to identify the causes.

 ### 7. Help
-Need help or info on available targets and commands? Use the help command for all the guidance you need with OpenHands.
+Need assistance or information on available targets and commands? The help command provides all the necessary guidance to ensure a smooth experience with OpenHands.
 ```bash
 make help
 ```
@@ -93,14 +93,14 @@ poetry run pytest ./tests/unit/test_*.py
 ```

 ### 9. Add or update dependency
-1. Add your dependency in `pyproject.toml` or use `poetry add xxx`.
-2. Update the poetry.lock file via `poetry lock --no-update`.
+1. Add your dependency in `pyproject.toml` or use `poetry add xxx`
+2. Update the poetry.lock file via `poetry lock --no-update`

 ### 9. Use existing Docker image
 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.19-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.18-nikolaik`

 ## Develop inside Docker container

@@ -110,7 +110,7 @@ TL;DR
 make docker-dev
 ```

-See more details [here](./containers/dev/README.md).
+See more details [here](./containers/dev/README.md)

 If you are just interested in running `OpenHands` without installing all the required tools on your host.

@@ -2,8 +2,8 @@
 These are the procedures and guidelines on how issues are triaged in this repo by the maintainers.

 ## General
-* Most issues must be tagged with **enhancement** or **bug**.
-* Issues may be tagged with what it relates to (**backend**, **frontend**, **agent quality**, etc.).
+* Most issues must be tagged with **enhancement** or **bug**
+* Issues may be tagged with what it relates to (**backend**, **frontend**, **agent quality**, etc.)

 ## Severity
 * **Low**: Minor issues or affecting single user.
@@ -11,10 +11,10 @@ These are the procedures and guidelines on how issues are triaged in this repo b
 * **Critical**: Affecting all users or potential security issues.

 ## Effort
-* Issues may be estimated with effort required (**small effort**, **medium effort**, **large effort**).
+* Issues may be estimated with effort required (**small effort**, **medium effort**, **large effort**)

 ## Difficulty
-* Issues with low implementation difficulty may be tagged with **good first issue**.
+* Issues with low implementation difficulty may be tagged with **good first issue**

 ## Not Enough Information
 * User is asked to provide more information (logs, how to reproduce, etc.) when the issue is not clear.
@@ -106,7 +106,7 @@ check-poetry:
 	@if command -v poetry > /dev/null; then \
 		POETRY_VERSION=$(shell poetry --version 2>&1 | sed -E 's/Poetry \(version ([0-9]+\.[0-9]+\.[0-9]+)\)/\1/'); \
 		IFS='.' read -r -a POETRY_VERSION_ARRAY <<< "$$POETRY_VERSION"; \
-		if [ $${POETRY_VERSION_ARRAY[0]} -gt 1 ] || ([ $${POETRY_VERSION_ARRAY[0]} -eq 1 ] && [ $${POETRY_VERSION_ARRAY[1]} -ge 8 ]); then \
+		if [ $${POETRY_VERSION_ARRAY[0]} -ge 1 ] && [ $${POETRY_VERSION_ARRAY[1]} -ge 8 ]; then \
 			echo "$(BLUE)$(shell poetry --version) is already installed.$(RESET)"; \
 		else \
 			echo "$(RED)Poetry 1.8 or later is required. You can install poetry by running the following command, then adding Poetry to your PATH:"; \
@@ -190,7 +190,7 @@ build-frontend:
 # Start backend
 start-backend:
 	@echo "$(YELLOW)Starting backend...$(RESET)"
-	@poetry run uvicorn openhands.server.listen:app --host $(BACKEND_HOST) --port $(BACKEND_PORT) --reload --reload-exclude "./workspace"
+	@poetry run uvicorn openhands.server.listen:app --host $(BACKEND_HOST) --port $(BACKEND_PORT) --reload --reload-exclude "$(shell pwd)/workspace"

 # Start frontend
 start-frontend:
@@ -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.19-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.19-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.19
+    docker.all-hands.dev/all-hands-ai/openhands:0.18
 ```

 You'll find OpenHands running at [http://localhost:3000](http://localhost:3000)!
@@ -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.19-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:
@@ -198,16 +198,6 @@ model = "gpt-4o"
 # agent.CodeActAgent
 ##############################################################################
 [agent]
-
-# whether the browsing tool is enabled
-codeact_enable_browsing = true
-
-# whether the LLM draft editor is enabled
-codeact_enable_llm_editor = false
-
-# whether the IPython tool is enabled
-codeact_enable_jupyter = true
-
 # Name of the micro agent to use for this agent
 #micro_agent_name = ""

@@ -220,12 +210,6 @@ codeact_enable_jupyter = true
 # LLM config group to use
 #llm_config = 'your-llm-config-group'

-# Whether to use microagents at all
-#use_microagents = true
-
-# List of microagents to disable
-#disabled_microagents = []
-
 [agent.RepoExplorerAgent]
 # Example: use a cheaper model for RepoExplorerAgent to reduce cost, especially
 # useful when an agent doesn't demand high quality but uses a lot of tokens
@@ -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.19-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:
@@ -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.19-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.19 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
    python -m openhands.core.cli
 ```

@@ -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.19-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.19 \
+    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
 ```
@@ -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.19-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.19-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.19
+    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).
@@ -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.19-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 \
    # ...
 ```
@@ -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.19-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.19 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
    python -m openhands.core.cli
 ```

@@ -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.19-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.19 \
+    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
 ```
@@ -11,16 +11,16 @@
 在 Docker 中运行 OpenHands 是最简单的方式。

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.19-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.19-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.19
+    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)。
@@ -11,7 +11,7 @@

 ```
 docker run # ...
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.19-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 \
    # ...
 ```
@@ -35,7 +35,7 @@ To run OpenHands in CLI mode with Docker:
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.19-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 \
@@ -45,7 +45,7 @@ docker run -it \
    -v ~/.openhands-state:/.openhands-state \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app-$(date +%Y%m%d%H%M%S) \
-    docker.all-hands.dev/all-hands-ai/openhands:0.19 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
    python -m openhands.core.cli
 ```

@@ -32,7 +32,7 @@ To run OpenHands in Headless mode with Docker:
 ```bash
 docker run -it \
    --pull=always \
-    -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.19-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 \
@@ -43,7 +43,7 @@ docker run -it \
    -v ~/.openhands-state:/.openhands-state \
    --add-host host.docker.internal:host-gateway \
    --name openhands-app-$(date +%Y%m%d%H%M%S) \
-    docker.all-hands.dev/all-hands-ai/openhands:0.19 \
+    docker.all-hands.dev/all-hands-ai/openhands:0.18 \
    python -m openhands.core.main -t "write a bash script that prints hi"
 ```

@@ -11,17 +11,17 @@
 The easiest way to run OpenHands is in Docker.

 ```bash
-docker pull docker.all-hands.dev/all-hands-ai/runtime:0.19-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.19-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.19
+    docker.all-hands.dev/all-hands-ai/openhands:0.18
 ```

 You'll find OpenHands running at http://localhost:3000!
@@ -1,12 +1,10 @@
-# Repository Micro-Agents
+# Customizing Agent Behavior

-OpenHands can be customized to work more effectively with specific repositories by providing repository-specific context
-and guidelines. This section explains how to optimize OpenHands for your project.
+OpenHands can be customized to work more effectively with specific repositories by providing repository-specific context and guidelines. This section explains how to optimize OpenHands for your project.

 ## Repository Configuration

-You can customize OpenHands' behavior for your repository by creating a `.openhands/microagents/` directory in your repository's root.
-At minimum, it should contain the file
+You can customize OpenHands' behavior for your repository by creating a `.openhands` directory in your repository's root. At minimum, it should contain the file
 `.openhands/microagents/repo.md`, which includes instructions that will
 be given to the agent every time it works with this repository.

@@ -41,8 +39,7 @@ Guidelines:

 ### Customizing Prompts

-You may also add customized prompts to the `.openhands/microagents/repo.md` file when working with a repository.
-These could:
+When working with a repository:

 - **Reference Project Standards**: Mention specific coding standards or patterns used in your project.
 - **Include Context**: Reference relevant documentation or existing implementations.
@@ -57,10 +54,14 @@ The component should use our shared styling from src/styles/components.

 ### Best Practices for Repository Customization

- **Keep Instructions Updated**: Regularly update your `.openhands/microagents/` directory as your project evolves.
+- **Keep Instructions Updated**: Regularly update your `.openhands` directory as your project evolves.
 - **Be Specific**: Include specific paths, patterns, and requirements unique to your project.
 - **Document Dependencies**: List all tools and dependencies required for development.
 - **Include Examples**: Provide examples of good code patterns from your project.
 - **Specify Conventions**: Document naming conventions, file organization, and code style preferences.

 By customizing OpenHands for your repository, you'll get more accurate and consistent results that align with your project's standards and requirements.
+
+## Other Microagents
+You can create other instructions in the `.openhands/microagents/` directory
+that will be sent to the agent if a particular keyword is found, like `test`, `frontend`, or `migration`. See [Micro-Agents](microagents.md) for more information.
@@ -1,31 +1,17 @@
-# Public Micro-Agents
+# Micro-Agents

-OpenHands uses specialized micro-agents to handle specific tasks and contexts efficiently. These micro-agents are small,
-focused components that provide specialized behavior and knowledge for particular scenarios.
+OpenHands uses specialized micro-agents to handle specific tasks and contexts efficiently. These micro-agents are small, focused components that provide specialized behavior and knowledge for particular scenarios.

 ## Overview

-Public micro-agents are defined in markdown files under the
-[`microagents/knowledge/`](https://github.com/All-Hands-AI/OpenHands/tree/main/microagents/knowledge) directory.
-Each micro-agent is configured with:
+Micro-agents are defined in markdown files under the `openhands/agenthub/codeact_agent/micro/` directory. Each micro-agent is configured with:

 - A unique name.
 - The agent type (typically CodeActAgent).
 - Trigger keywords that activate the agent.
 - Specific instructions and capabilities.

-### Integration
-
-Public micro-agents are automatically integrated into OpenHands' workflow. They:
- Monitor incoming commands for their trigger words.
- Activate when relevant triggers are detected.
- Apply their specialized knowledge and capabilities.
- Follow their specific guidelines and restrictions.
-
-## Available Public Micro-Agents
-
-For more information about specific micro-agents, refer to their individual documentation files in
-the [`micro-agents`](https://github.com/All-Hands-AI/OpenHands/tree/main/microagents) directory.
+## Available Micro-Agents

 ### GitHub Agent
 **File**: `github.md`
@@ -43,14 +29,6 @@ Key features:
 - Git configuration management
 - API-first approach for GitHub operations

-Usage Example:
-
-```bash
-git checkout -b feature-branch
-git commit -m "Add new feature"
-git push origin feature-branch
-```
-
 ### NPM Agent
 **File**: `npm.md`
 **Triggers**: `npm`
@@ -60,15 +38,9 @@ Specializes in handling npm package management with specific focus on:
 - Automated confirmation handling using Unix 'yes' command.
 - Package installation automation.

-Usage Example:
+### Custom Micro-Agents

-```bash
-yes | npm install package-name
-```
-
-### Custom Public Micro-Agents
-
-You can create your own public micro-agents by adding new markdown files to the `microagents/knowledge/` directory.
+You can create your own micro-agents by adding new markdown files to the micro-agents directory.
 Each file should follow this structure:

 ```markdown
@@ -83,29 +55,43 @@ triggers:
 Instructions and capabilities for the micro-agent...
 ```

-## Working With Public Micro-Agents
+## Best Practices

-When working with public micro-agents:
+When working with micro-agents:
 - **Use Appropriate Triggers**: Ensure your commands include the relevant trigger words to activate the correct micro-agent.
 - **Follow Agent Guidelines**: Each agent has specific instructions and limitations. Respect these for optimal results.
 - **API-First Approach**: When available, use API endpoints rather than web interfaces.
 - **Automation Friendly**: Design commands that work well in non-interactive environments.

-## Contributing a Public Micro-Agent
+## Integration

-Best practices for creating public micro-agents:
+Micro-agents are automatically integrated into OpenHands' workflow. They:
+- Monitor incoming commands for their trigger words.
+- Activate when relevant triggers are detected.
+- Apply their specialized knowledge and capabilities.
+- Follow their specific guidelines and restrictions.

- **Clear Scope**: Keep the micro-agent focused on a specific domain or task.
- **Explicit Instructions**: Provide clear, unambiguous guidelines.
- **Useful Examples**: Include practical examples of common use cases.
- **Safety First**: Include necessary warnings and constraints.
- **Integration Awareness**: Consider how the micro-agent interacts with other components.
+## Example Usage

-To contribute a new micro-agent to OpenHands:
+```bash
+# GitHub agent example
+git checkout -b feature-branch
+git commit -m "Add new feature"
+git push origin feature-branch

-### 1. Plan the Public Micro-Agent
+# NPM agent example
+yes | npm install package-name
+```

-Before creating a public micro-agent, consider:
+For more information about specific agents, refer to their individual documentation files in the micro-agents directory.
+
+## Contributing a Micro-Agent
+
+To contribute a new micro-agent to OpenHands, follow these guidelines:
+
+### 1. Planning Your Micro-Agent
+
+Before creating a micro-agent, consider:
 - What specific problem or use case will it address?
 - What unique capabilities or knowledge should it have?
 - What trigger words make sense for activating it?
@@ -113,11 +99,11 @@ Before creating a public micro-agent, consider:

 ### 2. File Structure

-Create a new markdown file in `microagents/knowledge/` with a descriptive name (e.g., `docker.md` for a Docker-focused agent).
+Create a new markdown file in `openhands/agenthub/codeact_agent/micro/` with a descriptive name (e.g., `docker.md` for a Docker-focused agent).

 ### 3. Required Components

-The micro-agent file must include:
+Your micro-agent file must include:

 - **Front Matter**: YAML metadata at the start of the file:
 ```markdown
@@ -147,7 +133,15 @@ Examples of usage:
 [Example 2]
 ```

-### 4. Testing the Public Micro-Agent
+### 4. Best Practices for Micro-Agent Development
+
+- **Clear Scope**: Keep the agent focused on a specific domain or task.
+- **Explicit Instructions**: Provide clear, unambiguous guidelines.
+- **Useful Examples**: Include practical examples of common use cases.
+- **Safety First**: Include necessary warnings and constraints.
+- **Integration Awareness**: Consider how the agent interacts with other components.
+
+### 5. Testing Your Micro-Agent

 Before submitting:
 - Test the agent with various prompts.
@@ -155,14 +149,7 @@ Before submitting:
 - Ensure instructions are clear and comprehensive.
 - Check for potential conflicts with existing agents.

-### 5. Submission Process
-
-Submit a pull request with:
- The new micro-agent file.
- Updated documentation if needed.
- Description of the agent's purpose and capabilities.
-
-### Example Public Micro-Agent Implementation
+### 6. Example Implementation

 Here's a template for a new micro-agent:

@@ -210,5 +197,14 @@ Remember to:
 - Optimize for build time and image size
 ```

+### 7. Submission Process
+
+1. Create your micro-agent file in the correct directory.
+2. Test thoroughly.
+3. Submit a pull request with:
+   - The new micro-agent file.
+   - Updated documentation if needed.
+   - Description of the agent's purpose and capabilities.
+
 Remember that micro-agents are a powerful way to extend OpenHands' capabilities in specific domains. Well-designed
 agents can significantly improve the system's ability to handle specialized tasks.
@@ -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.19-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 \
    # ...
 ```
@@ -15,10 +15,10 @@
    "typecheck": "tsc"
  },
  "dependencies": {
-    "@docusaurus/core": "^3.7.0",
-    "@docusaurus/plugin-content-pages": "^3.7.0",
-    "@docusaurus/preset-classic": "^3.7.0",
-    "@docusaurus/theme-mermaid": "^3.7.0",
+    "@docusaurus/core": "^3.6.3",
+    "@docusaurus/plugin-content-pages": "^3.6.3",
+    "@docusaurus/preset-classic": "^3.6.3",
+    "@docusaurus/theme-mermaid": "^3.6.3",
    "@mdx-js/react": "^3.1.0",
    "clsx": "^2.0.0",
    "prism-react-renderer": "^2.4.1",
@@ -29,7 +29,7 @@
  },
  "devDependencies": {
    "@docusaurus/module-type-aliases": "^3.5.1",
-    "@docusaurus/tsconfig": "^3.7.0",
+    "@docusaurus/tsconfig": "^3.6.3",
    "@docusaurus/types": "^3.5.1",
    "typescript": "~5.7.2"
  },
@@ -23,21 +23,15 @@ const sidebars: SidebarsConfig = {
          id: 'usage/prompting/prompting-best-practices',
        },
        {
-          type: 'category',
-          label: 'Micro-Agents',
-          items: [
-            {
-              type: 'doc',
-              label: 'Public',
-              id: 'usage/prompting/microagents-public',
-            },
-            {
-              type: 'doc',
-              label: 'Repository',
-              id: 'usage/prompting/microagents-repo',
-            },
-          ],
-        }
+          type: 'doc',
+          label: 'Customization',
+          id: 'usage/prompting/customization',
+        },
+        {
+          type: 'doc',
+          label: 'Microagents',
+          id: 'usage/prompting/microagents',
+        },
      ],
    },
    {
@@ -123,6 +123,7 @@ class openhands.state.State {
  updated_info: List[Tuple[Action, Observation]]
 }
 class openhands.observation.CmdOutputObservation {
+  command_id: int
  command: str
  exit_code: int
  observation: str
@@ -137,6 +137,7 @@ def complete_runtime(

        action = CmdRunAction(
            command=f'chmod +x ./{script_name} && ./{script_name}',
+            keep_prompt=False,
        )
        logger.info(action, extra={'msg_type': 'ACTION'})
        obs = runtime.run_action(action)
@@ -163,7 +164,8 @@ def complete_runtime(
            logger.info(f'Running get ground truth cmd: {script_name}')

            action = CmdRunAction(
-                command=f'chmod +x ./{script_name} && ./{script_name}'
+                command=f'chmod +x ./{script_name} && ./{script_name}',
+                keep_prompt=False,
            )
            logger.info(action, extra={'msg_type': 'ACTION'})
            obs = runtime.run_action(action)
@@ -145,7 +145,10 @@ def complete_runtime(
        )
        logger.info(f'Running test file: {script_name}')

-    action = CmdRunAction(command=f'python3 -m unittest {script_name}')
+    action = CmdRunAction(
+        command=f'python3 -m unittest {script_name}',
+        keep_prompt=False,
+    )
    logger.info(action, extra={'msg_type': 'ACTION'})
    obs = runtime.run_action(action)
    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
@@ -199,7 +199,7 @@ def complete_runtime(
    if obs.exit_code == 0:
        test_result['metadata']['1_copy_change_success'] = True

-        action = CmdRunAction(command=f'cat {generated_path}')
+        action = CmdRunAction(command=f'cat {generated_path}', keep_prompt=False)
        logger.info(action, extra={'msg_type': 'ACTION'})
        obs = runtime.run_action(action)
        assert obs.exit_code == 0
@@ -223,7 +223,9 @@ def complete_runtime(
    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
    assert obs.exit_code == 0

-    action = CmdRunAction(command='cat /testing_files/results_biocoder.json')
+    action = CmdRunAction(
+        command='cat /testing_files/results_biocoder.json', keep_prompt=False
+    )
    logger.info(action, extra={'msg_type': 'ACTION'})
    obs = runtime.run_action(action)
    if obs.exit_code == 0:
@@ -127,6 +127,7 @@ For each problem, OpenHands is given a set number of iterations to fix the faili
        "observation": "run",
        "content": "california_schools/california_schools.sqlite\r\n[(1.0,)]",
        "extras": {
+          "command_id": -1,
          "command": "python3 0.py",
          "exit_code": 0
        }
@@ -268,7 +268,10 @@ def initialize_runtime(
    runtime.copy_to(db_file, '/workspace')

    # Check the database is copied
-    action = CmdRunAction(command='cd /workspace && ls -l')
+    action = CmdRunAction(
+        command='cd /workspace && ls -l',
+        keep_prompt=False,
+    )
    obs = runtime.run_action(action)
    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
    assert obs.exit_code == 0
@@ -297,7 +300,10 @@ def complete_runtime(
    instance_id = instance.instance_id.replace('/', '__')
    path = os.path.join('/workspace', f'{instance_id}.py')

-    action = CmdRunAction(command=f'cat {path}')
+    action = CmdRunAction(
+        command=f'cat {path}',
+        keep_prompt=False,
+    )
    obs = runtime.run_action(action)
    logger.info(obs, extra={'msg_type': 'OBSERVATION'})

@@ -71,6 +71,7 @@ For each problem, OpenHands is given a set number of iterations to fix the faili
                "observation": "run",
                "content": "[File: /workspace/Python__2.py (14 lines total)]\r\n1:def truncate_number(number: float) -> float:\r\n2:    return number % 1.0 + 1.0\r\n3:\r\n4:\r\n5:\r\n6:\r\n7:\r\n8:\r\n9:def check(truncate_number):\r\n10:    assert truncate_number(3.5) == 0.5\r\n11:    assert abs(truncate_number(1.33) - 0.33) < 1e-6\r\n12:    assert abs(truncate_number(123.456) - 0.456) < 1e-6\r\n13:\r\n14:check(truncate_number)",
                "extras": {
+                    "command_id": -1,
                    "command": "open Python__2.py",
                    "exit_code": 0
                }
@@ -97,6 +98,7 @@ For each problem, OpenHands is given a set number of iterations to fix the faili
                "observation": "run",
                "content": "> > [File: /workspace/Python__2.py (14 lines total)]\r\n1:def truncate_number(number: float) -> float:\r\n2:    return number % 1.0\r\n3:\r\n4:\r\n5:\r\n6:\r\n7:\r\n8:\r\n9:def check(truncate_number):\r\n10:    assert truncate_number(3.5) == 0.5\r\n11:    assert abs(truncate_number(1.33) - 0.33) < 1e-6\r\n12:    assert abs(truncate_number(123.456) - 0.456) < 1e-6\r\n13:\r\n14:check(truncate_number)\r\nFile updated. Please review the changes and make sure they are correct (correct indentation, no duplicate lines, etc). Edit the file again if necessary.",
                "extras": {
+                    "command_id": -1,
                    "command": "edit 2:2 <<EOF\n    return number % 1.0\nEOF",
                    "exit_code": 0
                }
@@ -123,6 +125,7 @@ For each problem, OpenHands is given a set number of iterations to fix the faili
                "observation": "run",
                "content": "",
                "extras": {
+                    "command_id": -1,
                    "command": "python3 Python__2.py",
                    "exit_code": 0
                }
@@ -171,7 +171,9 @@ def complete_runtime(
    num_workers = LANGUAGE_TO_NUM_WORKERS[language]
    python_imports = '\n'.join(IMPORT_HELPER[language])

-    action = CmdRunAction(command=f'cat /workspace/{_get_instance_id(instance)}.py')
+    action = CmdRunAction(
+        command=f'cat /workspace/{_get_instance_id(instance)}.py', keep_prompt=False
+    )
    obs = runtime.run_action(action)
    assert obs.exit_code == 0

@@ -163,7 +163,7 @@ def complete_runtime(
    eval_script = os.path.join(task_path, 'run.sh')
    logger.info(f'Running evaluation script: {eval_script}')

-    action = CmdRunAction(command=f'cat {eval_script}')
+    action = CmdRunAction(command=f'cat {eval_script}', keep_prompt=False)
    logger.info(action, extra={'msg_type': 'ACTION'})
    obs = runtime.run_action(action)
    if obs.exit_code == 0:
@@ -121,7 +121,10 @@ def initialize_runtime(
    runtime.copy_to(dataset_dir, '/workspace/benchmark/datasets', recursive=True)

    # Check the dataset exists
-    action = CmdRunAction(command='cd /workspace/benchmark/datasets && ls')
+    action = CmdRunAction(
+        command='cd /workspace/benchmark/datasets && ls',
+        keep_prompt=False,
+    )
    obs = runtime.run_action(action)
    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
    assert obs.exit_code == 0
@@ -151,7 +154,10 @@ def complete_runtime(

    assert obs.exit_code == 0

-    action = CmdRunAction(command=f'cat pred_programs/{instance.pred_program_name}')
+    action = CmdRunAction(
+        command=f'cat pred_programs/{instance.pred_program_name}',
+        keep_prompt=False,
+    )
    logger.info(action, extra={'msg_type': 'ACTION'})
    obs = runtime.run_action(action)

@@ -204,7 +204,7 @@ Then, in a separate Python environment with `streamlit` library, you can run the
 ```bash
 # Make sure you are inside the cloned `evaluation` repo
 conda activate streamlit # if you follow the optional conda env setup above
-streamlit run app.py --server.port 8501 --server.address 0.0.0.0
+streamlit app.py --server.port 8501 --server.address 0.0.0.0
 ```

 Then you can access the SWE-Bench trajectory visualizer at `localhost:8501`.
@@ -98,7 +98,6 @@ def process_instance(
    metadata: EvalMetadata,
    reset_logger: bool = True,
    log_dir: str | None = None,
-    runtime_failure_count: int = 0,
 ) -> EvalOutput:
    """
    Evaluate agent performance on a SWE-bench problem instance.
@@ -147,16 +146,6 @@ def process_instance(
            metadata=metadata,
        )

-    # Increase resource_factor with increasing attempt_id
-    if runtime_failure_count > 0:
-        config.sandbox.remote_runtime_resource_factor = min(
-            config.sandbox.remote_runtime_resource_factor * (2**runtime_failure_count),
-            4,  # hardcode maximum resource factor to 4
-        )
-        logger.warning(
-            f'This is the second attempt for instance {instance.instance_id}, setting resource factor to {config.sandbox.remote_runtime_resource_factor}'
-        )
-
    runtime = create_runtime(config)
    call_async_from_sync(runtime.connect)
    # Get patch and save it to /tmp/patch.diff
@@ -188,7 +177,7 @@ def process_instance(
        "(patch --batch --fuzz=5 -p1 -i /tmp/patch.diff && echo 'APPLY_PATCH_PASS' || "
        "echo 'APPLY_PATCH_FAIL')))"
    )
-    action = CmdRunAction(command=exec_command)
+    action = CmdRunAction(command=exec_command, keep_prompt=False)
    action.timeout = 600
    obs = runtime.run_action(action)
    assert isinstance(obs, CmdOutputObservation)
@@ -211,7 +200,9 @@ def process_instance(

            # Run eval script in background and save output to log file
            log_file = '/tmp/eval_output.log'
-            action = CmdRunAction(command=f'/tmp/eval.sh > {log_file} 2>&1 & echo $!')
+            action = CmdRunAction(
+                command=f'/tmp/eval.sh > {log_file} 2>&1 & echo $!', keep_prompt=False
+            )
            action.timeout = 60  # Short timeout just to get the process ID
            obs = runtime.run_action(action)

@@ -233,7 +224,7 @@ def process_instance(
                        instance['test_result']['report']['test_timeout'] = True
                        break
                    check_action = CmdRunAction(
-                        command=f'ps -p {pid} > /dev/null; echo $?'
+                        command=f'ps -p {pid} > /dev/null; echo $?', keep_prompt=False
                    )
                    check_action.timeout = 60
                    check_obs = runtime.run_action(check_action)
@@ -251,7 +242,7 @@ def process_instance(
                    time.sleep(30)  # Wait for 30 seconds before checking again

                # Read the log file
-                cat_action = CmdRunAction(command=f'cat {log_file}')
+                cat_action = CmdRunAction(command=f'cat {log_file}', keep_prompt=False)
                cat_action.timeout = 300
                cat_obs = runtime.run_action(cat_action)

@@ -15,7 +15,6 @@ from evaluation.utils.shared import (
    EvalOutput,
    assert_and_raise,
    codeact_user_response,
-    get_metrics,
    is_fatal_evaluation_error,
    make_metadata,
    prepare_dataset,
@@ -149,7 +148,6 @@ def get_config(
        codeact_enable_jupyter=False,
        codeact_enable_browsing=RUN_WITH_BROWSING,
        codeact_enable_llm_editor=False,
-        condenser=metadata.condenser_config,
    )
    config.set_agent_config(agent_config)
    return config
@@ -284,16 +282,6 @@ def initialize_runtime(
    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
    assert_and_raise(obs.exit_code == 0, f'Failed to remove git remotes: {str(obs)}')

-    action = CmdRunAction(command='which python')
-    action.timeout = 600
-    logger.info(action, extra={'msg_type': 'ACTION'})
-    obs = runtime.run_action(action)
-    logger.info(obs, extra={'msg_type': 'OBSERVATION'})
-    assert_and_raise(
-        obs.exit_code == 0 and 'testbed' in obs.content,
-        f'Expected to find python interpreter from testbed, but got: {str(obs)}',
-    )
-
    logger.info('-' * 30)
    logger.info('END Runtime Initialization Fn')
    logger.info('-' * 30)
@@ -349,7 +337,8 @@ def complete_runtime(
    git_patch = None
    while n_retries < 5:
        action = CmdRunAction(
-            command=f'git diff --no-color --cached {instance["base_commit"]}'
+            command=f'git diff --no-color --cached {instance["base_commit"]}',
+            keep_prompt=False,
        )
        action.timeout = 600 + 100 * n_retries
        logger.info(action, extra={'msg_type': 'ACTION'})
@@ -396,7 +385,7 @@ def process_instance(
    if runtime_failure_count > 0:
        config.sandbox.remote_runtime_resource_factor = min(
            config.sandbox.remote_runtime_resource_factor * (2**runtime_failure_count),
-            8,
+            2,  # hardcode maximum resource factor to 2
        )
        logger.warning(
            f'This is the second attempt for instance {instance.instance_id}, setting resource factor to {config.sandbox.remote_runtime_resource_factor}'
@@ -450,7 +439,7 @@ def process_instance(

    # NOTE: this is NO LONGER the event stream, but an agent history that includes delegate agent's events
    histories = [event_to_dict(event) for event in state.history]
-    metrics = get_metrics(state)
+    metrics = state.metrics.get() if state.metrics else None

    # Save the output
    output = EvalOutput(
@@ -546,5 +535,4 @@ if __name__ == '__main__':
        args.eval_num_workers,
        process_instance,
        timeout_seconds=120 * 60,  # 2 hour PER instance should be more than enough
-        max_retries=5,
    )
@@ -104,9 +104,9 @@ for repo, diff in repo_diffs:
    # Determine if this repo has a significant diff
    is_significant = diff >= threshold
    repo_color = 'red' if is_significant else 'yellow'
+    print(colored(f'Difference: {diff} instances!', repo_color, attrs=['bold']))

    print(f"\n{colored(repo, repo_color, attrs=['bold'])}:")
-    print(colored(f'Difference: {diff} instances!', repo_color, attrs=['bold']))
    print(colored(f'X resolved but Y failed: ({len(x_instances)} instances)', 'green'))
    if x_instances:
        print('  ' + str(x_instances))
@@ -20,13 +20,6 @@ output_md_folder = args.oh_output_file.replace('.jsonl', '.viz')
 print(f'Converting {args.oh_output_file} to markdown files in {output_md_folder}')

 oh_format = pd.read_json(args.oh_output_file, orient='records', lines=True)
-
-swebench_eval_file = args.oh_output_file.replace('.jsonl', '.swebench_eval.jsonl')
-if os.path.exists(swebench_eval_file):
-    eval_output_df = pd.read_json(swebench_eval_file, orient='records', lines=True)
-else:
-    eval_output_df = None
-
 # model name is the folder name of oh_output_file
 model_name = os.path.basename(os.path.dirname(args.oh_output_file))

@@ -57,7 +50,7 @@ def convert_history_to_str(history):
    return ret


-def write_row_to_md_file(row, instance_id_to_test_result):
+def write_row_to_md_file(row):
    if 'git_patch' in row:
        model_patch = row['git_patch']
    elif 'test_result' in row and 'git_patch' in row['test_result']:
@@ -65,21 +58,8 @@ def write_row_to_md_file(row, instance_id_to_test_result):
    else:
        raise ValueError(f'Row {row} does not have a git_patch')

-    test_output = None
-    if row['instance_id'] in instance_id_to_test_result:
-        report = instance_id_to_test_result[row['instance_id']].get('report', {})
-        resolved = report.get('resolved', False)
-        test_output = instance_id_to_test_result[row['instance_id']].get(
-            'test_output', None
-        )
-    elif 'report' in row and row['report'] is not None:
-        if not isinstance(row['report'], dict):
-            resolved = None
-            print(
-                f'ERROR: Report is not a dict, but a {type(row["report"])}. Row: {row}'
-            )
-        else:
-            resolved = row['report'].get('resolved', False)
+    if 'report' in row:
+        resolved = row['report'].get('resolved', False)
    else:
        resolved = None

@@ -104,18 +84,5 @@ def write_row_to_md_file(row, instance_id_to_test_result):
        f.write('## Model Patch\n')
        f.write(f'{process_git_patch(model_patch)}\n')

-        f.write('## Test Output\n')
-        f.write(str(test_output))

-
-instance_id_to_test_result = {}
-if eval_output_df is not None:
-    instance_id_to_test_result = (
-        eval_output_df[['instance_id', 'test_result']]
-        .set_index('instance_id')['test_result']
-        .to_dict()
-    )
-
-oh_format.progress_apply(
-    write_row_to_md_file, axis=1, instance_id_to_test_result=instance_id_to_test_result
-)
+oh_format.progress_apply(write_row_to_md_file, axis=1)
@@ -111,11 +111,6 @@ elif os.path.exists(openhands_remote_report_jsonl):
        instance_id_to_status[row['instance_id']] = row['test_result']['report']
    df['report'] = df.apply(apply_report, axis=1)

-    report_is_dict = df['report'].apply(lambda x: isinstance(x, dict))
-    if not report_is_dict.all():
-        print(df[~report_is_dict])
-        raise ValueError(f'Report is not a dict, but a {type(row["report"])}')
-
    _n_instances = len(df)
    _n_resolved = len(df[df['report'].apply(lambda x: x.get('resolved', False))])
    _n_unresolved = _n_instances - _n_resolved
@@ -24,7 +24,7 @@ class Test(BaseIntegrationTest):
    @classmethod
    def verify_result(cls, runtime: Runtime, histories: list[Event]) -> TestResult:
        # check if the file /workspace/bad.txt has been fixed
-        action = CmdRunAction(command='cat /workspace/bad.txt')
+        action = CmdRunAction(command='cat /workspace/bad.txt', keep_prompt=False)
        obs = runtime.run_action(action)
        if obs.exit_code != 0:
            return TestResult(
@@ -10,14 +10,14 @@ class Test(BaseIntegrationTest):

    @classmethod
    def initialize_runtime(cls, runtime: Runtime) -> None:
-        action = CmdRunAction(command='mkdir -p /workspace')
+        action = CmdRunAction(command='mkdir -p /workspace', keep_prompt=False)
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

    @classmethod
    def verify_result(cls, runtime: Runtime, histories: list[Event]) -> TestResult:
        # check if the file /workspace/hello.sh exists
-        action = CmdRunAction(command='cat /workspace/hello.sh')
+        action = CmdRunAction(command='cat /workspace/hello.sh', keep_prompt=False)
        obs = runtime.run_action(action)
        if obs.exit_code != 0:
            return TestResult(
@@ -26,7 +26,7 @@ class Test(BaseIntegrationTest):
            )

        # execute the script
-        action = CmdRunAction(command='bash /workspace/hello.sh')
+        action = CmdRunAction(command='bash /workspace/hello.sh', keep_prompt=False)
        obs = runtime.run_action(action)
        if obs.exit_code != 0:
            return TestResult(
@@ -10,14 +10,14 @@ class Test(BaseIntegrationTest):

    @classmethod
    def initialize_runtime(cls, runtime: Runtime) -> None:
-        action = CmdRunAction(command='mkdir -p /workspace')
+        action = CmdRunAction(command='mkdir -p /workspace', keep_prompt=False)
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

    @classmethod
    def verify_result(cls, runtime: Runtime, histories: list[Event]) -> TestResult:
        # check if the file /workspace/hello.sh exists
-        action = CmdRunAction(command='cat /workspace/test.txt')
+        action = CmdRunAction(command='cat /workspace/test.txt', keep_prompt=False)
        obs = runtime.run_action(action)
        if obs.exit_code != 0:
            return TestResult(
@@ -26,7 +26,7 @@ class Test(BaseIntegrationTest):
            )

        # execute the script
-        action = CmdRunAction(command='cat /workspace/test.txt')
+        action = CmdRunAction(command='cat /workspace/test.txt', keep_prompt=False)
        obs = runtime.run_action(action)

        if obs.exit_code != 0:
@@ -10,29 +10,31 @@ class Test(BaseIntegrationTest):

    @classmethod
    def initialize_runtime(cls, runtime: Runtime) -> None:
-        action = CmdRunAction(command='mkdir -p /workspace')
+        action = CmdRunAction(command='mkdir -p /workspace', keep_prompt=False)
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

        # git init
-        action = CmdRunAction(command='git init')
+        action = CmdRunAction(command='git init', keep_prompt=False)
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

        # create README.md
-        action = CmdRunAction(command='echo \'print("hello world")\' > hello.py')
+        action = CmdRunAction(
+            command='echo \'print("hello world")\' > hello.py', keep_prompt=False
+        )
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

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

    @classmethod
    def verify_result(cls, runtime: Runtime, histories: list[Event]) -> TestResult:
        # check if the file /workspace/hello.py exists
-        action = CmdRunAction(command='cat /workspace/hello.py')
+        action = CmdRunAction(command='cat /workspace/hello.py', keep_prompt=False)
        obs = runtime.run_action(action)
        if obs.exit_code != 0:
            return TestResult(
@@ -41,7 +43,7 @@ class Test(BaseIntegrationTest):
            )

        # check if the staging area is empty
-        action = CmdRunAction(command='git status')
+        action = CmdRunAction(command='git status', keep_prompt=False)
        obs = runtime.run_action(action)
        if obs.exit_code != 0:
            return TestResult(
@@ -83,11 +83,11 @@ class Test(BaseIntegrationTest):

    @classmethod
    def initialize_runtime(cls, runtime: Runtime) -> None:
-        action = CmdRunAction(command='mkdir -p /workspace')
+        action = CmdRunAction(command='mkdir -p /workspace', keep_prompt=False)
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

-        action = CmdRunAction(command='mkdir -p /tmp/server')
+        action = CmdRunAction(command='mkdir -p /tmp/server', keep_prompt=False)
        obs = runtime.run_action(action)
        assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}')

@@ -101,7 +101,8 @@ class Test(BaseIntegrationTest):

        # create README.md
        action = CmdRunAction(
-            command='cd /tmp/server && nohup python3 -m http.server 8000 &'
+            command='cd /tmp/server && nohup python3 -m http.server 8000 &',
+            keep_prompt=False,
        )
        obs = runtime.run_action(action)

@@ -17,10 +17,6 @@ from tqdm import tqdm

 from openhands.controller.state.state import State
 from openhands.core.config import LLMConfig
-from openhands.core.config.condenser_config import (
-    CondenserConfig,
-    NoOpCondenserConfig,
-)
 from openhands.core.exceptions import (
    AgentRuntimeBuildError,
    AgentRuntimeDisconnectedError,
@@ -37,7 +33,6 @@ from openhands.events.action.message import MessageAction
 from openhands.events.event import Event
 from openhands.events.serialization.event import event_to_dict
 from openhands.events.utils import get_pairs_from_events
-from openhands.memory.condenser import get_condensation_metadata


 class EvalMetadata(BaseModel):
@@ -50,17 +45,11 @@ class EvalMetadata(BaseModel):
    dataset: str | None = None
    data_split: str | None = None
    details: dict[str, Any] | None = None
-    condenser_config: CondenserConfig | None = None

    def model_dump(self, *args, **kwargs):
        dumped_dict = super().model_dump(*args, **kwargs)
        # avoid leaking sensitive information
        dumped_dict['llm_config'] = self.llm_config.to_safe_dict()
-        if hasattr(self.condenser_config, 'llm_config'):
-            dumped_dict['condenser_config']['llm_config'] = (
-                self.condenser_config.llm_config.to_safe_dict()
-            )
-
        return dumped_dict

    def model_dump_json(self, *args, **kwargs):
@@ -68,11 +57,6 @@ class EvalMetadata(BaseModel):
        dumped_dict = json.loads(dumped)
        # avoid leaking sensitive information
        dumped_dict['llm_config'] = self.llm_config.to_safe_dict()
-        if hasattr(self.condenser_config, 'llm_config'):
-            dumped_dict['condenser_config']['llm_config'] = (
-                self.condenser_config.llm_config.to_safe_dict()
-            )
-
        logger.debug(f'Dumped metadata: {dumped_dict}')
        return json.dumps(dumped_dict)

@@ -208,7 +192,6 @@ def make_metadata(
    eval_output_dir: str,
    data_split: str | None = None,
    details: dict[str, Any] | None = None,
-    condenser_config: CondenserConfig | None = None,
 ) -> EvalMetadata:
    model_name = llm_config.model.split('/')[-1]
    model_path = model_name.replace(':', '_').replace('@', '-')
@@ -239,9 +222,6 @@ def make_metadata(
        dataset=dataset_name,
        data_split=data_split,
        details=details,
-        condenser_config=condenser_config
-        if condenser_config
-        else NoOpCondenserConfig(),
    )
    metadata_json = metadata.model_dump_json()
    logger.info(f'Metadata: {metadata_json}')
@@ -571,10 +551,3 @@ def is_fatal_evaluation_error(error: str | None) -> bool:
        return True

    return False
-
-
-def get_metrics(state: State) -> dict[str, Any]:
-    """Extract metrics from the state."""
-    metrics = state.metrics.get() if state.metrics else {}
-    metrics['condenser'] = get_condensation_metadata(state)
-    return metrics
@@ -2,13 +2,13 @@ import { describe, expect, it, vi } from "vitest";
 import { retrieveLatestGitHubCommit } from "../../src/api/github";

 describe("retrieveLatestGitHubCommit", () => {
-  const { openHandsGetMock } = vi.hoisted(() => ({
-    openHandsGetMock: vi.fn(),
+  const { githubGetMock } = vi.hoisted(() => ({
+    githubGetMock: vi.fn(),
  }));

-  vi.mock("../../src/api/open-hands-axios", () => ({
-    openHands: {
-      get: openHandsGetMock,
+  vi.mock("../../src/api/github-axios-instance", () => ({
+    github: {
+      get: githubGetMock,
    },
  }));

@@ -20,7 +20,7 @@ describe("retrieveLatestGitHubCommit", () => {
      },
    };

-    openHandsGetMock.mockResolvedValueOnce({
+    githubGetMock.mockResolvedValueOnce({
      data: [mockCommit],
    });

@@ -31,7 +31,7 @@ describe("retrieveLatestGitHubCommit", () => {
  it("should return null when repository is empty", async () => {
    const error = new Error("Repository is empty");
    (error as any).response = { status: 409 };
-    openHandsGetMock.mockRejectedValueOnce(error);
+    githubGetMock.mockRejectedValueOnce(error);

    const result = await retrieveLatestGitHubCommit("user/empty-repo");
    expect(result).toBeNull();
@@ -40,7 +40,7 @@ describe("retrieveLatestGitHubCommit", () => {
  it("should throw error for other error cases", async () => {
    const error = new Error("Network error");
    (error as any).response = { status: 500 };
-    openHandsGetMock.mockRejectedValueOnce(error);
+    githubGetMock.mockRejectedValueOnce(error);

    await expect(retrieveLatestGitHubCommit("user/repo")).rejects.toThrow();
  });
@@ -218,30 +218,4 @@ describe("ChatInput", () => {
    // Verify image paste was handled
    expect(onImagePaste).toHaveBeenCalledWith([file]);
  });
-
-  it("should not submit when Enter is pressed during IME composition", async () => {
-    const user = userEvent.setup();
-    render(<ChatInput onSubmit={onSubmitMock} />);
-    const textarea = screen.getByRole("textbox");
-
-    await user.type(textarea, "こんにちは");
-
-    // Simulate Enter during IME composition
-    fireEvent.keyDown(textarea, {
-      key: "Enter",
-      isComposing: true,
-      nativeEvent: { isComposing: true },
-    });
-
-    expect(onSubmitMock).not.toHaveBeenCalled();
-
-    // Simulate normal Enter after composition is done
-    fireEvent.keyDown(textarea, {
-      key: "Enter",
-      isComposing: false,
-      nativeEvent: { isComposing: false },
-    });
-
-    expect(onSubmitMock).toHaveBeenCalledWith("こんにちは");
-  });
 });
@@ -3,7 +3,6 @@ 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";
-import { clickOnEditButton } from "./utils";

 describe("ConversationCard", () => {
  const onClick = vi.fn();
@@ -20,9 +19,9 @@ describe("ConversationCard", () => {
        onDelete={onDelete}
        onClick={onClick}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );
    const expectedDate = `${formatTimeDelta(new Date("2021-10-01T12:00:00Z"))} ago`;
@@ -34,20 +33,20 @@ describe("ConversationCard", () => {
    within(card).getByText(expectedDate);
  });

-  it("should render the selectedRepository if available", () => {
+  it("should render the repo if available", () => {
    const { rerender } = render(
      <ConversationCard
        onDelete={onDelete}
        onClick={onClick}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

    expect(
-      screen.queryByTestId("conversation-card-selected-repository"),
+      screen.queryByTestId("conversation-card-repo"),
    ).not.toBeInTheDocument();

    rerender(
@@ -55,13 +54,13 @@ describe("ConversationCard", () => {
        onDelete={onDelete}
        onClick={onClick}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository="org/selectedRepository"
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo="org/repo"
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

-    screen.getByTestId("conversation-card-selected-repository");
+    screen.getByTestId("conversation-card-repo");
  });

  it("should call onClick when the card is clicked", async () => {
@@ -71,9 +70,9 @@ describe("ConversationCard", () => {
        onDelete={onDelete}
        onClick={onClick}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

@@ -90,9 +89,9 @@ describe("ConversationCard", () => {
        onDelete={onDelete}
        onClick={onClick}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

@@ -115,9 +114,9 @@ describe("ConversationCard", () => {
        onClick={onClick}
        onDelete={onDelete}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

@@ -132,23 +131,21 @@ describe("ConversationCard", () => {
    expect(onDelete).toHaveBeenCalled();
  });

-  test("clicking the selectedRepository should not trigger the onClick handler", async () => {
+  test("clicking the repo should not trigger the onClick handler", async () => {
    const user = userEvent.setup();
    render(
      <ConversationCard
        onClick={onClick}
        onDelete={onDelete}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository="org/selectedRepository"
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo="org/repo"
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

-    const selectedRepository = screen.getByTestId(
-      "conversation-card-selected-repository",
-    );
-    await user.click(selectedRepository);
+    const repo = screen.getByTestId("conversation-card-repo");
+    await user.click(repo);

    expect(onClick).not.toHaveBeenCalled();
  });
@@ -159,22 +156,14 @@ describe("ConversationCard", () => {
      <ConversationCard
        onClick={onClick}
        onDelete={onDelete}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
        onChangeTitle={onChangeTitle}
      />,
    );

    const title = screen.getByTestId("conversation-card-title");
-    expect(title).toBeDisabled();
-
-    await clickOnEditButton(user);
-
-    expect(title).toBeEnabled();
-    expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();
-    // expect to be focused
-    expect(document.activeElement).toBe(title);

    await user.clear(title);
    await user.type(title, "New Conversation Name   ");
@@ -182,7 +171,6 @@ describe("ConversationCard", () => {

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

  it("should reset title and not call onChangeTitle when the title is empty", async () => {
@@ -192,14 +180,12 @@ describe("ConversationCard", () => {
        onClick={onClick}
        onDelete={onDelete}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

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

    await user.clear(title);
@@ -216,9 +202,9 @@ describe("ConversationCard", () => {
        onClick={onClick}
        onDelete={onDelete}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

@@ -235,9 +221,9 @@ describe("ConversationCard", () => {
        onClick={onClick}
        onDelete={onDelete}
        onChangeTitle={onChangeTitle}
-        title="Conversation 1"
-        selectedRepository={null}
-        lastUpdatedAt="2021-10-01T12:00:00Z"
+        name="Conversation 1"
+        repo={null}
+        lastUpdated="2021-10-01T12:00:00Z"
      />,
    );

@@ -253,19 +239,19 @@ describe("ConversationCard", () => {
  });

  describe("state indicator", () => {
-    it("should render the 'STOPPED' indicator by default", () => {
+    it("should render the 'cold' indicator by default", () => {
      render(
        <ConversationCard
          onClick={onClick}
          onDelete={onDelete}
          onChangeTitle={onChangeTitle}
-          title="Conversation 1"
-          selectedRepository={null}
-          lastUpdatedAt="2021-10-01T12:00:00Z"
+          name="Conversation 1"
+          repo={null}
+          lastUpdated="2021-10-01T12:00:00Z"
        />,
      );

-      screen.getByTestId("STOPPED-indicator");
+      screen.getByTestId("cold-indicator");
    });

    it("should render the other indicators when provided", () => {
@@ -274,15 +260,15 @@ describe("ConversationCard", () => {
          onClick={onClick}
          onDelete={onDelete}
          onChangeTitle={onChangeTitle}
-          title="Conversation 1"
-          selectedRepository={null}
-          lastUpdatedAt="2021-10-01T12:00:00Z"
-          status="RUNNING"
+          name="Conversation 1"
+          repo={null}
+          lastUpdated="2021-10-01T12:00:00Z"
+          state="warm"
        />,
      );

-      expect(screen.queryByTestId("STOPPED-indicator")).not.toBeInTheDocument();
-      screen.getByTestId("RUNNING-indicator");
+      expect(screen.queryByTestId("cold-indicator")).not.toBeInTheDocument();
+      screen.getByTestId("warm-indicator");
    });
  });
 });
@@ -9,7 +9,6 @@ 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";
-import { clickOnEditButton } from "./utils";

 describe("ConversationPanel", () => {
  const onCloseMock = vi.fn();
@@ -53,8 +52,6 @@ describe("ConversationPanel", () => {
    renderConversationPanel();
    const cards = await screen.findAllByTestId("conversation-card");

-    // NOTE that we filter out conversations that don't have a created_at property
-    // (mock data has 4 conversations, but only 3 have a created_at property)
    expect(cards).toHaveLength(3);
  });

@@ -172,15 +169,13 @@ describe("ConversationPanel", () => {
    const cards = await screen.findAllByTestId("conversation-card");
    const title = within(cards[0]).getByTestId("conversation-card-title");

-    await clickOnEditButton(user);
-
    await user.clear(title);
    await user.type(title, "Conversation 1 Renamed");
    await user.tab();

    // Ensure the conversation is renamed
    expect(updateUserConversationSpy).toHaveBeenCalledWith("3", {
-      title: "Conversation 1 Renamed",
+      name: "Conversation 1 Renamed",
    });
  });

@@ -201,8 +196,6 @@ describe("ConversationPanel", () => {
    // Ensure the conversation is not renamed
    expect(updateUserConversationSpy).not.toHaveBeenCalled();

-    await clickOnEditButton(user);
-
    await user.type(title, "Conversation 1");
    await user.click(title);
    await user.tab();
@@ -224,4 +217,51 @@ describe("ConversationPanel", () => {

    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();
+    });
+  });
 });
@@ -1,12 +0,0 @@
-import { screen, within } from "@testing-library/react";
-import { UserEvent } from "@testing-library/user-event";
-
-export const clickOnEditButton = async (user: UserEvent) => {
-  const ellipsisButton = screen.getByTestId("ellipsis-button");
-  await user.click(ellipsisButton);
-
-  const menu = screen.getByTestId("context-menu");
-  const editButton = within(menu).getByTestId("edit-button");
-
-  await user.click(editButton);
-};
@@ -14,8 +14,7 @@ describe("GitHubRepositorySelector", () => {
      <GitHubRepositorySelector
        onInputChange={onInputChangeMock}
        onSelect={onSelectMock}
-        publicRepositories={[]}
-        userRepositories={[]}
+        repositories={[]}
      />,
    );

@@ -37,8 +36,7 @@ describe("GitHubRepositorySelector", () => {
      <GitHubRepositorySelector
        onInputChange={onInputChangeMock}
        onSelect={onSelectMock}
-        publicRepositories={[]}
-        userRepositories={[]}
+        repositories={[]}
      />,
    );

@@ -69,8 +67,7 @@ describe("GitHubRepositorySelector", () => {
      <GitHubRepositorySelector
        onInputChange={onInputChangeMock}
        onSelect={onSelectMock}
-        publicRepositories={[]}
-        userRepositories={[]}
+        repositories={[]}
      />,
    );

@@ -4,7 +4,7 @@ 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_CONVERSATION_UI } from "#/utils/feature-flags";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";

 const renderSidebar = () => {
  const RouterStub = createRoutesStub([
@@ -18,7 +18,7 @@ const renderSidebar = () => {
 };

 describe("Sidebar", () => {
-  it.skipIf(!MULTI_CONVERSATION_UI)(
+  it.skipIf(!MULTI_CONVO_UI_IS_ENABLED)(
    "should have the conversation panel open by default",
    () => {
      renderSidebar();
@@ -26,7 +26,7 @@ describe("Sidebar", () => {
    },
  );

-  it.skipIf(!MULTI_CONVERSATION_UI)(
+  it.skipIf(!MULTI_CONVO_UI_IS_ENABLED)(
    "should toggle the conversation panel",
    async () => {
      const user = userEvent.setup();
@@ -1,35 +0,0 @@
-import { screen } from "@testing-library/react";
-import { describe, it, expect } from "vitest";
-import { renderWithProviders } from "test-utils";
-import { RuntimeSizeSelector } from "#/components/shared/modals/settings/runtime-size-selector";
-
-const renderRuntimeSizeSelector = () =>
-  renderWithProviders(<RuntimeSizeSelector isDisabled={false} />);
-
-describe("RuntimeSizeSelector", () => {
-  it("should show both runtime size options", () => {
-    renderRuntimeSizeSelector();
-    // The options are in the hidden select element
-    const select = screen.getByRole("combobox", { hidden: true });
-    expect(select).toHaveValue("1");
-    expect(select).toHaveDisplayValue("1x (2 core, 8G)");
-    expect(select.children).toHaveLength(3); // Empty option + 2 size options
-  });
-
-  it("should show the full description text for disabled options", async () => {
-    renderRuntimeSizeSelector();
-
-    // Click the button to open the dropdown
-    const button = screen.getByRole("button", {
-      name: "1x (2 core, 8G) SETTINGS_FORM$RUNTIME_SIZE_LABEL",
-    });
-    button.click();
-
-    // Wait for the dropdown to open and find the description text
-    const description = await screen.findByText(
-      "Runtime sizes over 1 are disabled by default, please contact contact@all-hands.dev to get access to larger runtimes.",
-    );
-    expect(description).toBeInTheDocument();
-    expect(description).toHaveClass("whitespace-normal", "break-words");
-  });
-});
@@ -1,45 +0,0 @@
-import { screen, fireEvent } from "@testing-library/react";
-import { describe, it, expect, vi } from "vitest";
-import { renderWithProviders } from "test-utils";
-import { createRoutesStub } from "react-router";
-import { DEFAULT_SETTINGS } from "#/services/settings";
-import { SettingsForm } from "#/components/shared/modals/settings/settings-form";
-import OpenHands from "#/api/open-hands";
-
-describe("SettingsForm", () => {
-  const getConfigSpy = vi.spyOn(OpenHands, "getConfig");
-  getConfigSpy.mockResolvedValue({
-    APP_MODE: "saas",
-    GITHUB_CLIENT_ID: "123",
-    POSTHOG_CLIENT_KEY: "123",
-  });
-
-  const RouterStub = createRoutesStub([
-    {
-      Component: () => (
-        <SettingsForm
-          settings={DEFAULT_SETTINGS}
-          models={[]}
-          agents={[]}
-          securityAnalyzers={[]}
-          onClose={() => {}}
-        />
-      ),
-      path: "/",
-    },
-  ]);
-
-  it("should not show runtime size selector by default", () => {
-    renderWithProviders(<RouterStub />);
-    expect(screen.queryByText("Runtime Size")).not.toBeInTheDocument();
-  });
-
-  it("should show runtime size selector when advanced options are enabled", async () => {
-    renderWithProviders(<RouterStub />);
-    const advancedSwitch = screen.getByRole("switch", {
-      name: "SETTINGS_FORM$ADVANCED_OPTIONS_LABEL",
-    });
-    fireEvent.click(advancedSwitch);
-    await screen.findByText("SETTINGS_FORM$RUNTIME_SIZE_LABEL");
-  });
-});
@@ -1,30 +0,0 @@
-import { describe, it, expect, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import * as ChatSlice from "#/state/chat-slice";
-import {
-  updateStatusWhenErrorMessagePresent,
-} from "#/context/ws-client-provider";
-
-describe("Propagate error message", () => {
-  it("should do nothing when no message was passed from server", () => {
-    const addErrorMessageSpy = vi.spyOn(ChatSlice, "addErrorMessage");
-    updateStatusWhenErrorMessagePresent(null)
-    updateStatusWhenErrorMessagePresent(undefined)
-    updateStatusWhenErrorMessagePresent({})
-    updateStatusWhenErrorMessagePresent({message: null})
-
-    expect(addErrorMessageSpy).not.toHaveBeenCalled();
-  });
-
-  it("should display error to user when present", () => {
-    const message = "We have a problem!"
-    const addErrorMessageSpy = vi.spyOn(ChatSlice, "addErrorMessage")
-    updateStatusWhenErrorMessagePresent({message})
-
-    expect(addErrorMessageSpy).toHaveBeenCalledWith({
-      message,
-      status_update: true,
-      type: 'error'
-     });
-  });
-});
@@ -5,7 +5,7 @@ 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_CONVERSATION_UI } from "#/utils/feature-flags";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";

 describe("App", () => {
  const RouteStub = createRoutesStub([
@@ -35,7 +35,7 @@ describe("App", () => {
    await screen.findByTestId("app-route");
  });

-  it.skipIf(!MULTI_CONVERSATION_UI)(
+  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");
@@ -59,11 +59,10 @@ describe("App", () => {

    getConversationSpy.mockResolvedValue({
      conversation_id: "9999",
-      last_updated_at: "",
-      created_at: "",
-      title: "",
-      selected_repository: "",
-      status: "STOPPED",
+      lastUpdated: "",
+      name: "",
+      repo: "",
+      state: "cold",
    });
    const { rerender } = renderWithProviders(
      <RouteStub initialEntries={["/conversation/9999"]} />,
@@ -1,6 +1,6 @@
 {
  "name": "openhands-frontend",
-  "version": "0.19.0",
+  "version": "0.18.0",
  "private": true,
  "type": "module",
  "engines": {
@@ -8,32 +8,32 @@
  },
  "dependencies": {
    "@monaco-editor/react": "^4.7.0-rc.0",
-    "@nextui-org/react": "^2.6.11",
+    "@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.63.0",
+    "@tanstack/react-query": "^5.62.12",
    "@vitejs/plugin-react": "^4.3.2",
    "@xterm/addon-fit": "^0.10.0",
    "@xterm/xterm": "^5.4.0",
    "axios": "^1.7.9",
    "clsx": "^2.1.1",
    "eslint-config-airbnb-typescript": "^18.0.0",
-    "i18next": "^24.2.1",
+    "i18next": "^24.2.0",
    "i18next-browser-languagedetector": "^8.0.2",
    "i18next-http-backend": "^3.0.1",
-    "isbot": "^5.1.20",
+    "isbot": "^5.1.19",
    "jose": "^5.9.4",
    "monaco-editor": "^0.52.2",
-    "posthog-js": "^1.205.0",
+    "posthog-js": "^1.203.3",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
    "react-highlight": "^0.15.0",
    "react-hot-toast": "^2.5.1",
    "react-i18next": "^15.4.0",
    "react-icons": "^5.4.0",
-    "react-markdown": "^9.0.3",
+    "react-markdown": "^9.0.1",
    "react-redux": "^9.2.0",
    "react-router": "^7.1.1",
    "react-syntax-highlighter": "^15.6.1",
@@ -78,13 +78,13 @@
    "@mswjs/socket.io-binding": "^0.1.1",
    "@playwright/test": "^1.49.1",
    "@react-router/dev": "^7.1.1",
-    "@tailwindcss/typography": "^0.5.16",
-    "@tanstack/eslint-plugin-query": "^5.62.16",
+    "@tailwindcss/typography": "^0.5.15",
+    "@tanstack/eslint-plugin-query": "^5.62.9",
    "@testing-library/jest-dom": "^6.6.1",
    "@testing-library/react": "^16.1.0",
    "@testing-library/user-event": "^14.5.2",
    "@types/node": "^22.10.5",
-    "@types/react": "^19.0.3",
+    "@types/react": "^19.0.2",
    "@types/react-dom": "^19.0.2",
    "@types/react-highlight": "^0.12.8",
    "@types/react-syntax-highlighter": "^15.5.13",
@@ -0,0 +1,103 @@
+import axios, { AxiosError } from "axios";
+
+const github = axios.create({
+  baseURL: "https://api.github.com",
+  headers: {
+    Accept: "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28",
+  },
+});
+
+const setAuthTokenHeader = (token: string) => {
+  github.defaults.headers.common.Authorization = `Bearer ${token}`;
+};
+
+const removeAuthTokenHeader = () => {
+  if (github.defaults.headers.common.Authorization) {
+    delete github.defaults.headers.common.Authorization;
+  }
+};
+
+/**
+ * Checks if response has attributes to perform refresh
+ */
+const canRefresh = (error: unknown): boolean =>
+  !!(
+    error instanceof AxiosError &&
+    error.config &&
+    error.response &&
+    error.response.status
+  );
+
+/**
+ * Checks if the data is a GitHub error response
+ * @param data The data to check
+ * @returns Boolean indicating if the data is a GitHub error response
+ */
+export const isGitHubErrorReponse = <T extends object | Array<unknown>>(
+  data: T | GitHubErrorReponse | null,
+): data is GitHubErrorReponse =>
+  !!data && "message" in data && data.message !== undefined;
+
+// Axios interceptor to handle token refresh
+const setupAxiosInterceptors = (
+  refreshToken: () => Promise<boolean>,
+  logout: () => void,
+) => {
+  github.interceptors.response.use(
+    // Pass successful responses through
+    (response) => {
+      const parsedData = response.data;
+      if (isGitHubErrorReponse(parsedData)) {
+        const error = new AxiosError(
+          "Failed",
+          "",
+          response.config,
+          response.request,
+          response,
+        );
+        throw error;
+      }
+      return response;
+    },
+    // Retry request exactly once if token is expired
+    async (error) => {
+      if (!canRefresh(error)) {
+        return Promise.reject(new Error("Failed to refresh token"));
+      }
+
+      const originalRequest = error.config;
+
+      // Check if the error is due to an expired token
+      if (
+        error.response.status === 401 &&
+        !originalRequest._retry // Prevent infinite retry loops
+      ) {
+        originalRequest._retry = true;
+        try {
+          const refreshed = await refreshToken();
+          if (refreshed) {
+            return await github(originalRequest);
+          }
+
+          logout();
+          return await Promise.reject(new Error("Failed to refresh token"));
+        } catch (refreshError) {
+          // If token refresh fails, evict the user
+          logout();
+          return Promise.reject(refreshError);
+        }
+      }
+
+      // If the error is not due to an expired token, propagate the error
+      return Promise.reject(error);
+    },
+  );
+};
+
+export {
+  github,
+  setAuthTokenHeader,
+  removeAuthTokenHeader,
+  setupAxiosInterceptors,
+};
@@ -1,18 +1,14 @@
 import { extractNextPageFromLink } from "#/utils/extract-next-page-from-link";
+import { github } from "./github-axios-instance";
 import { openHands } from "./open-hands-axios";

-export const isGitHubErrorReponse = <T extends object | Array<unknown>>(
-  data: T | GitHubErrorReponse | null,
-): data is GitHubErrorReponse =>
-  !!data && "message" in data && data.message !== undefined;
-
 /**
 * Given the user, retrieves app installations IDs for OpenHands Github App
 * Uses user access token for Github App
 */
 export const retrieveGitHubAppInstallations = async (): Promise<number[]> => {
-  const response = await openHands.get<GithubAppInstallation>(
-    "/api/github/installations",
+  const response = await github.get<GithubAppInstallation>(
+    "/user/installations",
  );

  return response.data.installations.map((installation) => installation.id);
@@ -92,8 +88,20 @@ export const retrieveGitHubUserRepositories = async (
 * @returns The authenticated user or an error response
 */
 export const retrieveGitHubUser = async () => {
-  const response = await openHands.get<GitHubUser>("/api/github/user");
-  return response.data;
+  const response = await github.get<GitHubUser>("/user");
+
+  const { data } = response;
+
+  const user: GitHubUser = {
+    id: data.id,
+    login: data.login,
+    avatar_url: data.avatar_url,
+    company: data.company,
+    name: data.name,
+    email: data.email,
+  };
+
+  return user;
 };

 export const searchPublicRepositories = async (
@@ -102,11 +110,16 @@ export const searchPublicRepositories = async (
  sort: "" | "updated" | "stars" | "forks" = "stars",
  order: "desc" | "asc" = "desc",
 ): Promise<GitHubRepository[]> => {
-  const response = await openHands.get<{ items: GitHubRepository[] }>(
-    "/api/github/search/repositories",
+  const sanitizedQuery = query.trim();
+  if (!sanitizedQuery) {
+    return [];
+  }
+
+  const response = await github.get<{ items: GitHubRepository[] }>(
+    "/search/repositories",
    {
      params: {
-        query,
+        q: sanitizedQuery,
        per_page,
        sort,
        order,
@@ -120,9 +133,8 @@ export const retrieveLatestGitHubCommit = async (
  repository: string,
 ): Promise<GitHubCommit | null> => {
  try {
-    const [owner, repo] = repository.split("/");
-    const response = await openHands.get<GitHubCommit[]>(
-      `/api/github/repos/${owner}/${repo}/commits`,
+    const response = await github.get<GitHubCommit[]>(
+      `/repos/${repository}/commits`,
      {
        params: {
          per_page: 1,
@@ -9,7 +9,6 @@ import {
  GetVSCodeUrlResponse,
  AuthenticateResponse,
  Conversation,
-  ResultSet,
 } from "./open-hands.types";
 import { openHands } from "./open-hands-axios";
 import { ApiSettings } from "#/services/settings";
@@ -223,10 +222,8 @@ class OpenHands {
  }

  static async getUserConversations(): Promise<Conversation[]> {
-    const { data } = await openHands.get<ResultSet<Conversation>>(
-      "/api/conversations?limit=9",
-    );
-    return data.results;
+    const { data } = await openHands.get<Conversation[]>("/api/conversations");
+    return data;
  }

  static async deleteUserConversation(conversationId: string): Promise<void> {
@@ -235,9 +232,9 @@ class OpenHands {

  static async updateUserConversation(
    conversationId: string,
-    conversation: Partial<Omit<Conversation, "conversation_id">>,
+    conversation: Partial<Omit<Conversation, "id">>,
  ): Promise<void> {
-    await openHands.patch(`/api/conversations/${conversationId}`, conversation);
+    await openHands.put(`/api/conversations/${conversationId}`, conversation);
  }

  static async createConversation(
@@ -1,4 +1,4 @@
-import { ProjectStatus } from "#/components/features/conversation-panel/conversation-state-indicator";
+import { ProjectState } from "#/components/features/conversation-panel/conversation-state-indicator";

 export interface ErrorResponse {
  error: string;
@@ -62,14 +62,8 @@ export interface AuthenticateResponse {

 export interface Conversation {
  conversation_id: string;
-  title: string;
-  selected_repository: string | null;
-  last_updated_at: string;
-  created_at: string;
-  status: ProjectStatus;
-}
-
-export interface ResultSet<T> {
-  results: T[];
-  next_page_id: string | null;
+  name: string;
+  repo: string | null;
+  lastUpdated: string;
+  state: ProjectState;
 }
@@ -61,8 +61,4 @@ export const AGENT_STATUS_MAP: {
    message: I18nKey.CHAT_INTERFACE$AGENT_ACTION_USER_REJECTED_MESSAGE,
    indicator: IndicatorColor.RED,
  },
-  [AgentState.RATE_LIMITED]: {
-    message: I18nKey.CHAT_INTERFACE$AGENT_RATE_LIMITED_MESSAGE,
-    indicator: IndicatorColor.YELLOW,
-  },
 };
@@ -94,12 +94,7 @@ export function ChatInput({
  };

  const handleKeyPress = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
-    if (
-      event.key === "Enter" &&
-      !event.shiftKey &&
-      !disabled &&
-      !event.nativeEvent.isComposing
-    ) {
+    if (event.key === "Enter" && !event.shiftKey && !disabled) {
      event.preventDefault();
      handleSubmitMessage();
    }
@@ -154,8 +154,7 @@ export function ChatInterface() {
          onStop={handleStop}
          isDisabled={
            curAgentState === AgentState.LOADING ||
-            curAgentState === AgentState.AWAITING_USER_CONFIRMATION ||
-            curAgentState === AgentState.RATE_LIMITED
+            curAgentState === AgentState.AWAITING_USER_CONFIRMATION
          }
          mode={curAgentState === AgentState.RUNNING ? "stop" : "submit"}
          value={messageToSend ?? undefined}
@@ -18,7 +18,7 @@ export function ContextMenu({
    <ul
      data-testid={testId}
      ref={ref}
-      className={cn("bg-[#404040] rounded-md w-[140px]", className)}
+      className={cn("bg-[#404040] rounded-md w-[224px]", className)}
    >
      {children}
    </ul>
@@ -25,14 +25,10 @@ export function ConfirmDeleteModal({
        <div className="flex flex-col gap-2 w-full">
          <ModalButton
            onClick={onConfirm}
-            className="bg-danger font-bold"
+            className="bg-[#4465DB]"
            text="Confirm"
          />
-          <ModalButton
-            onClick={onCancel}
-            className="bg-neutral-500 font-bold"
-            text="Cancel"
-          />
+          <ModalButton onClick={onCancel} className="bg-danger" text="Cancel" />
        </div>
      </ModalBody>
    </ModalBackdrop>
@@ -1,32 +0,0 @@
-import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
-import { ContextMenu } from "../context-menu/context-menu";
-import { ContextMenuListItem } from "../context-menu/context-menu-list-item";
-
-interface ConversationCardContextMenuProps {
-  onClose: () => void;
-  onDelete: (event: React.MouseEvent<HTMLButtonElement>) => void;
-  onEdit: (event: React.MouseEvent<HTMLButtonElement>) => void;
-}
-
-export function ConversationCardContextMenu({
-  onClose,
-  onDelete,
-  onEdit,
-}: ConversationCardContextMenuProps) {
-  const ref = useClickOutsideElement<HTMLUListElement>(onClose);
-
-  return (
-    <ContextMenu
-      ref={ref}
-      testId="context-menu"
-      className="left-full float-right"
-    >
-      <ContextMenuListItem testId="delete-button" onClick={onDelete}>
-        Delete
-      </ContextMenuListItem>
-      <ContextMenuListItem testId="edit-button" onClick={onEdit}>
-        Edit Title
-      </ContextMenuListItem>
-    </ContextMenu>
-  );
-}
@@ -2,33 +2,33 @@ import React from "react";
 import { formatTimeDelta } from "#/utils/format-time-delta";
 import { ConversationRepoLink } from "./conversation-repo-link";
 import {
-  ProjectStatus,
+  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";
-import { ConversationCardContextMenu } from "./conversation-card-context-menu";

-interface ConversationCardProps {
+interface ProjectCardProps {
  onClick: () => void;
  onDelete: () => void;
  onChangeTitle: (title: string) => void;
-  title: string;
-  selectedRepository: string | null;
-  lastUpdatedAt: string; // ISO 8601
-  status?: ProjectStatus;
+  name: string;
+  repo: string | null;
+  lastUpdated: string; // ISO 8601
+  state?: ProjectState;
 }

 export function ConversationCard({
  onClick,
  onDelete,
  onChangeTitle,
-  title,
-  selectedRepository,
-  lastUpdatedAt,
-  status = "STOPPED",
-}: ConversationCardProps) {
+  name,
+  repo,
+  lastUpdated,
+  state = "cold",
+}: ProjectCardProps) {
  const [contextMenuVisible, setContextMenuVisible] = React.useState(false);
-  const [titleMode, setTitleMode] = React.useState<"view" | "edit">("view");
  const inputRef = React.useRef<HTMLInputElement>(null);

  const handleBlur = () => {
@@ -38,15 +38,7 @@ export function ConversationCard({
      inputRef.current!.value = trimmed;
    } else {
      // reset the value if it's empty
-      inputRef.current!.value = title;
-    }
-
-    setTitleMode("view");
-  };
-
-  const handleKeyUp = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === "Enter") {
-      event.currentTarget.blur();
+      inputRef.current!.value = name;
    }
  };

@@ -59,62 +51,51 @@ export function ConversationCard({
    onDelete();
  };

-  const handleEdit = (event: React.MouseEvent<HTMLButtonElement>) => {
-    event.stopPropagation();
-    setTitleMode("edit");
-    setContextMenuVisible(false);
-  };
-
-  React.useEffect(() => {
-    if (titleMode === "edit") {
-      inputRef.current?.focus();
-    }
-  }, [titleMode]);
-
  return (
    <div
      data-testid="conversation-card"
      onClick={onClick}
-      className="h-[100px] w-full px-[18px] py-4 border-b border-neutral-600 cursor-pointer"
+      className="h-[100px] w-full px-[18px] py-4 border-b border-neutral-600"
    >
-      <div className="flex items-center justify-between space-x-1">
+      <div className="flex items-center justify-between">
        <input
-          data-testid="conversation-card-title"
          ref={inputRef}
-          disabled={titleMode === "view"}
+          data-testid="conversation-card-title"
          onClick={handleInputClick}
          onBlur={handleBlur}
-          onKeyUp={handleKeyUp}
          type="text"
-          defaultValue={title}
-          className="text-sm leading-6 font-semibold bg-transparent w-full"
+          defaultValue={name}
+          className="text-sm leading-6 font-semibold bg-transparent"
        />

        <div className="flex items-center gap-2 relative">
-          <ConversationStateIndicator status={status} />
+          <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>
-      {contextMenuVisible && (
-        <ConversationCardContextMenu
-          onClose={() => setContextMenuVisible(false)}
-          onDelete={handleDelete}
-          onEdit={handleEdit}
-        />
-      )}
-      {selectedRepository && (
+      {repo && (
        <ConversationRepoLink
-          selectedRepository={selectedRepository}
+          repo={repo}
          onClick={(e) => e.stopPropagation()}
        />
      )}
      <p className="text-xs text-neutral-400">
-        <time>{formatTimeDelta(new Date(lastUpdatedAt))} ago</time>
+        <time>{formatTimeDelta(new Date(lastUpdated))} ago</time>
      </p>
    </div>
  );
@@ -1,22 +0,0 @@
-import ReactDOM from "react-dom";
-
-interface ConversationPanelWrapperProps {
-  isOpen: boolean;
-}
-
-export function ConversationPanelWrapper({
-  isOpen,
-  children,
-}: React.PropsWithChildren<ConversationPanelWrapperProps>) {
-  if (!isOpen) return null;
-
-  const portalTarget = document.getElementById("root-outlet");
-  if (!portalTarget) return null;
-
-  return ReactDOM.createPortal(
-    <div className="absolute h-full w-full left-0 top-0 z-20 bg-black/80 rounded-xl">
-      {children}
-    </div>,
-    portalTarget,
-  );
-}
@@ -1,14 +1,14 @@
 import React from "react";
-import { useNavigate, useParams } from "react-router";
+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";
-import { useClickOutsideElement } from "#/hooks/use-click-outside-element";

 interface ConversationPanelProps {
  onClose: () => void;
@@ -17,8 +17,9 @@ interface ConversationPanelProps {
 export function ConversationPanel({ onClose }: ConversationPanelProps) {
  const { conversationId: cid } = useParams();
  const navigate = useNavigate();
+  const location = useLocation();
+
  const endSession = useEndSession();
-  const ref = useClickOutsideElement<HTMLDivElement>(onClose);

  const [confirmDeleteModalVisible, setConfirmDeleteModalVisible] =
    React.useState(false);
@@ -59,7 +60,7 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
    if (oldTitle !== newTitle)
      updateConversation({
        id: conversationId,
-        conversation: { title: newTitle },
+        conversation: { name: newTitle },
      });
  };

@@ -70,11 +71,15 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {

  return (
    <div
-      ref={ref}
      data-testid="conversation-panel"
-      className="w-[350px] h-full border border-neutral-700 bg-neutral-800 rounded-xl overflow-y-auto"
+      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 && (
@@ -93,12 +98,12 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {
          onClick={() => handleClickCard(project.conversation_id)}
          onDelete={() => handleDeleteProject(project.conversation_id)}
          onChangeTitle={(title) =>
-            handleChangeTitle(project.conversation_id, project.title, title)
+            handleChangeTitle(project.conversation_id, project.name, title)
          }
-          title={project.title}
-          selectedRepository={project.selected_repository}
-          lastUpdatedAt={project.last_updated_at}
-          status={project.status}
+          name={project.name}
+          repo={project.repo}
+          lastUpdated={project.lastUpdated}
+          state={project.state}
        />
      ))}

@@ -1,21 +1,21 @@
 interface ConversationRepoLinkProps {
-  selectedRepository: string;
+  repo: string;
  onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
 }

 export function ConversationRepoLink({
-  selectedRepository,
+  repo,
  onClick,
 }: ConversationRepoLinkProps) {
  return (
    <a
-      data-testid="conversation-card-selected-repository"
-      href={`https://github.com/${selectedRepository}`}
+      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"
    >
-      {selectedRepository}
+      {repo}
    </a>
  );
 }
@@ -1,25 +1,39 @@
 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 ProjectStatus = "RUNNING" | "STOPPED";
+export type ProjectState =
+  | "cold"
+  | "cooling"
+  | "finished"
+  | "running"
+  | "waiting"
+  | "warm";

-const INDICATORS: Record<ProjectStatus, SVGIcon> = {
-  STOPPED: ColdIcon,
-  RUNNING: RunningIcon,
+const INDICATORS: Record<ProjectState, SVGIcon> = {
+  cold: ColdIcon,
+  cooling: CoolingIcon,
+  finished: FinishedIcon,
+  running: RunningIcon,
+  waiting: WaitingIcon,
+  warm: WarmIcon,
 };

 interface ConversationStateIndicatorProps {
-  status: ProjectStatus;
+  state: ProjectState;
 }

 export function ConversationStateIndicator({
-  status,
+  state,
 }: ConversationStateIndicatorProps) {
-  const StateIcon = INDICATORS[status];
+  const StateIcon = INDICATORS[state];

  return (
-    <div data-testid={`${status}-indicator`}>
+    <div data-testid={`${state}-indicator`}>
      <StateIcon />
    </div>
  );
@@ -1,48 +1,46 @@
 import React from "react";
-import {
-  Autocomplete,
-  AutocompleteItem,
-  AutocompleteSection,
-} from "@nextui-org/react";
+import { Autocomplete, AutocompleteItem } from "@nextui-org/react";
 import { useDispatch } from "react-redux";
 import posthog from "posthog-js";
 import { setSelectedRepository } from "#/state/initial-query-slice";
 import { useConfig } from "#/hooks/query/use-config";
-import { sanitizeQuery } from "#/utils/sanitize-query";
+
+interface GitHubRepositoryWithPublic extends GitHubRepository {
+  is_public?: boolean;
+}

 interface GitHubRepositorySelectorProps {
  onInputChange: (value: string) => void;
  onSelect: () => void;
-  userRepositories: GitHubRepository[];
-  publicRepositories: GitHubRepository[];
+  repositories: GitHubRepositoryWithPublic[];
 }

 export function GitHubRepositorySelector({
  onInputChange,
  onSelect,
-  userRepositories,
-  publicRepositories,
+  repositories,
 }: GitHubRepositorySelectorProps) {
  const { data: config } = useConfig();
  const [selectedKey, setSelectedKey] = React.useState<string | null>(null);

-  const allRepositories: GitHubRepository[] = [
-    ...publicRepositories.filter(
-      (repo) => !publicRepositories.find((r) => r.id === repo.id),
-    ),
-    ...userRepositories,
-  ];
-
  const dispatch = useDispatch();

  const handleRepoSelection = (id: string | null) => {
-    const repo = allRepositories.find((r) => r.id.toString() === id);
-    if (repo) {
-      dispatch(setSelectedRepository(repo.full_name));
-      posthog.capture("repository_selected");
-      onSelect();
-      setSelectedKey(id);
+    const repo = repositories.find((r) => r.id.toString() === id);
+    if (!repo) return;
+
+    if (repo.id === -1000) {
+      window.open(
+        `https://github.com/apps/${config?.APP_SLUG}/installations/new`,
+        "_blank",
+      );
+      return;
    }
+
+    dispatch(setSelectedRepository(repo.full_name));
+    posthog.capture("repository_selected");
+    onSelect();
+    setSelectedKey(id);
  };

  const handleClearSelection = () => {
@@ -57,8 +55,8 @@ export function GitHubRepositorySelector({
      name="repo"
      aria-label="GitHub Repository"
      placeholder="Select a GitHub project"
-      isVirtualized={false}
      selectedKey={selectedKey}
+      items={repositories}
      inputProps={{
        classNames: {
          inputWrapper:
@@ -67,61 +65,27 @@ export function GitHubRepositorySelector({
      }}
      onSelectionChange={(id) => handleRepoSelection(id?.toString() ?? null)}
      onInputChange={onInputChange}
-      clearButtonProps={{ onClick: handleClearSelection }}
+      clearButtonProps={{ onPress: handleClearSelection }}
      listboxProps={{
        emptyContent,
      }}
-      defaultFilter={(textValue, inputValue) =>
-        !inputValue ||
-        sanitizeQuery(textValue).includes(sanitizeQuery(inputValue))
-      }
    >
-      {config?.APP_MODE === "saas" &&
-        config?.APP_SLUG &&
-        ((
-          <AutocompleteItem key="install">
-            <a
-              href={`https://github.com/apps/${config.APP_SLUG}/installations/new`}
-              target="_blank"
-              rel="noreferrer noopener"
-              onClick={(e) => e.stopPropagation()}
-            >
-              Add more repositories...
-            </a>
-          </AutocompleteItem> // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ) as any)}
-      {userRepositories.length > 0 && (
-        <AutocompleteSection showDivider title="Your Repos">
-          {userRepositories.map((repo) => (
-            <AutocompleteItem
-              data-testid="github-repo-item"
-              key={repo.id}
-              value={repo.id}
-              className="data-[selected=true]:bg-default-100"
-              textValue={repo.full_name}
-            >
-              {repo.full_name}
-            </AutocompleteItem>
-          ))}
-        </AutocompleteSection>
-      )}
-      {publicRepositories.length > 0 && (
-        <AutocompleteSection showDivider title="Public Repos">
-          {publicRepositories.map((repo) => (
-            <AutocompleteItem
-              data-testid="github-repo-item"
-              key={repo.id}
-              value={repo.id}
-              className="data-[selected=true]:bg-default-100"
-              textValue={repo.full_name}
-            >
-              {repo.full_name}
-              <span className="ml-1 text-gray-400">
-                ({repo.stargazers_count || 0}⭐)
+      {(item) => (
+        <AutocompleteItem
+          data-testid="github-repo-item"
+          key={item.id}
+          value={item.id}
+          textValue={item.full_name}
+        >
+          <div className="flex items-center justify-between">
+            {item.full_name}
+            {item.is_public && !!item.stargazers_count && (
+              <span className="text-xs text-gray-400">
+                ({item.stargazers_count}⭐)
              </span>
-            </AutocompleteItem>
-          ))}
-        </AutocompleteSection>
+            )}
+          </div>
+        </AutocompleteItem>
      )}
    </Autocomplete>
  );
@@ -5,12 +5,13 @@ import { GitHubRepositorySelector } from "./github-repo-selector";
 import { ModalButton } from "#/components/shared/buttons/modal-button";
 import { ConnectToGitHubModal } from "#/components/shared/modals/connect-to-github-modal";
 import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
-import { isGitHubErrorReponse } from "#/api/github";
+import { isGitHubErrorReponse } from "#/api/github-axios-instance";
 import { useAppRepositories } from "#/hooks/query/use-app-repositories";
 import { useSearchRepositories } from "#/hooks/query/use-search-repositories";
 import { useUserRepositories } from "#/hooks/query/use-user-repositories";
 import { sanitizeQuery } from "#/utils/sanitize-query";
 import { useDebounce } from "#/hooks/use-debounce";
+import { useConfig } from "#/hooks/query/use-config";

 interface GitHubRepositoriesSuggestionBoxProps {
  handleSubmit: () => void;
@@ -28,6 +29,7 @@ export function GitHubRepositoriesSuggestionBox({
  const [searchQuery, setSearchQuery] = React.useState<string>("");
  const debouncedSearchQuery = useDebounce(searchQuery, 300);

+  const { data: config } = useConfig();
  // TODO: Use `useQueries` to fetch all repositories in parallel
  const { data: appRepositories } = useAppRepositories();
  const { data: userRepositories } = useUserRepositories();
@@ -35,6 +37,19 @@ export function GitHubRepositoriesSuggestionBox({
    sanitizeQuery(debouncedSearchQuery),
  );

+  const saasPlaceholderRepository = React.useMemo(() => {
+    if (config?.APP_MODE === "saas" && config?.APP_SLUG) {
+      return [
+        {
+          id: -1000,
+          full_name: "Add more repositories...",
+        },
+      ];
+    }
+
+    return [];
+  }, [config]);
+
  const repositories =
    userRepositories?.pages.flatMap((page) => page.data) ||
    appRepositories?.pages.flatMap((page) => page.data) ||
@@ -59,8 +74,11 @@ export function GitHubRepositoriesSuggestionBox({
            <GitHubRepositorySelector
              onInputChange={setSearchQuery}
              onSelect={handleSubmit}
-              publicRepositories={searchedRepos}
-              userRepositories={repositories}
+              repositories={[
+                ...saasPlaceholderRepository,
+                ...searchedRepos,
+                ...repositories,
+              ]}
            />
          ) : (
            <ModalButton
@@ -16,24 +16,16 @@ export function ProjectMenuDetails({
 }: ProjectMenuDetailsProps) {
  const { t } = useTranslation();
  return (
-    <div className="flex flex-col min-w-0">
+    <div className="flex flex-col">
      <a
        href={`https://github.com/${repoName}`}
        target="_blank"
        rel="noreferrer noopener"
-        className="flex items-center gap-2 min-w-0"
+        className="flex items-center gap-2"
      >
-        {avatar && (
-          <img
-            src={avatar}
-            alt=""
-            className="w-4 h-4 rounded-full flex-shrink-0"
-          />
-        )}
-        <span className="text-sm leading-6 font-semibold truncate flex-1">
-          {repoName}
-        </span>
-        <ExternalLinkIcon width={16} height={16} className="flex-shrink-0" />
+        {avatar && <img src={avatar} alt="" className="w-4 h-4 rounded-full" />}
+        <span className="text-sm leading-6 font-semibold">{repoName}</span>
+        <ExternalLinkIcon width={16} height={16} />
      </a>
      <a
        href={lastCommit.html_url}
@@ -1,6 +1,6 @@
 import React from "react";
-import { FaListUl } from "react-icons/fa";
-import { useDispatch } from "react-redux";
+import { useLocation } from "react-router";
+import FolderIcon from "#/icons/docs.svg?react";
 import { useAuth } from "#/context/auth-context";
 import { useGitHubUser } from "#/hooks/query/use-github-user";
 import { useIsAuthed } from "#/hooks/query/use-is-authed";
@@ -11,20 +11,16 @@ import { ExitProjectButton } from "#/components/shared/buttons/exit-project-butt
 import { SettingsButton } from "#/components/shared/buttons/settings-button";
 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 { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
-import { useEndSession } from "#/hooks/use-end-session";
-import { setCurrentAgentState } from "#/state/agent-slice";
-import { AgentState } from "#/types/agent-state";
-import { TooltipButton } from "#/components/shared/buttons/tooltip-button";
-import { ConversationPanelWrapper } from "../conversation-panel/conversation-panel-wrapper";
+import { cn } from "#/utils/utils";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";

 export function Sidebar() {
-  const dispatch = useDispatch();
-  const endSession = useEndSession();
+  const location = useLocation();
  const user = useGitHubUser();
  const { data: isAuthed } = useIsAuthed();
  const { logout } = useAuth();
@@ -34,9 +30,11 @@ export function Sidebar() {
  const [accountSettingsModalOpen, setAccountSettingsModalOpen] =
    React.useState(false);
  const [settingsModalIsOpen, setSettingsModalIsOpen] = React.useState(false);
-
-  const [conversationPanelIsOpen, setConversationPanelIsOpen] =
+  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
@@ -45,11 +43,6 @@ export function Sidebar() {
    }
  }, [user.isError]);

-  const handleEndSession = () => {
-    dispatch(setCurrentAgentState(AgentState.LOADING));
-    endSession();
-  };
-
  const handleAccountSettingsModalClose = () => {
    // If the user closes the modal without connecting to GitHub,
    // we need to log them out to clear the invalid token from the
@@ -58,30 +51,22 @@ export function Sidebar() {
    setAccountSettingsModalOpen(false);
  };

+  const handleClickLogo = () => {
+    if (location.pathname.startsWith("/conversations/"))
+      setStartNewProjectModalIsOpen(true);
+  };
+
  const showSettingsModal =
    isAuthed && (!settingsAreUpToDate || settingsModalIsOpen);

  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 mb-7">
-            <AllHandsLogoButton onClick={handleEndSession} />
+          <div className="w-[34px] h-[34px] flex items-center justify-center">
+            <AllHandsLogoButton onClick={handleClickLogo} />
          </div>
          {user.isLoading && <LoadingSpinner size="small" />}
-          <ExitProjectButton onClick={handleEndSession} />
-          {MULTI_CONVERSATION_UI && (
-            <TooltipButton
-              data-testid="toggle-conversation-panel"
-              tooltip="Conversations"
-              ariaLabel="Conversations"
-              onClick={() => setConversationPanelIsOpen((prev) => !prev)}
-            >
-              <FaListUl size={22} />
-            </TooltipButton>
-          )}
-          <DocsButton />
-          <SettingsButton onClick={() => setSettingsModalIsOpen(true)} />
          {!user.isLoading && (
            <UserActions
              user={
@@ -91,14 +76,33 @@ export function Sidebar() {
              onClickAccountSettings={() => setAccountSettingsModalOpen(true)}
            />
          )}
+          <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 && (
-          <ConversationPanelWrapper isOpen={conversationPanelIsOpen}>
+          <div
+            className="absolute h-full left-[calc(100%+12px)] top-0 z-20" // 12px padding (sidebar parent)
+          >
            <ConversationPanel
              onClose={() => setConversationPanelIsOpen(false)}
            />
-          </ConversationPanelWrapper>
+          </div>
        )}
      </aside>

@@ -112,6 +116,11 @@ export function Sidebar() {
            onClose={() => setSettingsModalIsOpen(false)}
          />
        ))}
+      {startNewProjectModalIsOpen && (
+        <ExitProjectConfirmationModal
+          onClose={() => setStartNewProjectModalIsOpen(false)}
+        />
+      )}
    </>
  );
 }
@@ -1,8 +1,8 @@
+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";
 import { Avatar } from "./avatar";
-import { TooltipButton } from "#/components/shared/buttons/tooltip-button";

 interface UserAvatarProps {
  onClick: () => void;
@@ -11,11 +11,10 @@ interface UserAvatarProps {
 }

 export function UserAvatar({ onClick, avatarUrl, isLoading }: UserAvatarProps) {
-  return (
-    <TooltipButton
-      testId="user-avatar"
-      tooltip="Account settings"
-      ariaLabel="Account settings"
+  const buttonContent = (
+    <button
+      data-testid="user-avatar"
+      type="button"
      onClick={onClick}
      className={cn(
        "w-8 h-8 rounded-full flex items-center justify-center border-2 border-gray-200",
@@ -31,6 +30,12 @@ export function UserAvatar({ onClick, avatarUrl, isLoading }: UserAvatarProps) {
        />
      )}
      {isLoading && <LoadingSpinner size="small" />}
-    </TooltipButton>
+    </button>
+  );
+
+  return (
+    <Tooltip content="Account settings" closeDelay={100}>
+      {buttonContent}
+    </Tooltip>
  );
 }
@@ -12,7 +12,7 @@ export function AllHandsLogoButton({ onClick }: AllHandsLogoButtonProps) {
      ariaLabel="All Hands Logo"
      onClick={onClick}
    >
-      <AllHandsLogo width={44} height={30} />
+      <AllHandsLogo width={34} height={23} />
    </TooltipButton>
  );
 }
@@ -13,7 +13,7 @@ export function ExitProjectButton({ onClick }: ExitProjectButtonProps) {
      onClick={onClick}
      testId="new-project-button"
    >
-      <NewProjectIcon width={26} height={26} />
+      <NewProjectIcon width={28} height={28} />
    </TooltipButton>
  );
 }
@@ -1,4 +1,4 @@
-import { FaCog } from "react-icons/fa";
+import CogTooth from "#/assets/cog-tooth";
 import { TooltipButton } from "./tooltip-button";

 interface SettingsButtonProps {
@@ -13,7 +13,7 @@ export function SettingsButton({ onClick }: SettingsButtonProps) {
      ariaLabel="Settings"
      onClick={onClick}
    >
-      <FaCog size={24} />
+      <CogTooth />
    </TooltipButton>
  );
 }
@@ -1,6 +1,5 @@
 import { Tooltip } from "@nextui-org/react";
-import React, { ReactNode } from "react";
-import { cn } from "#/utils/utils";
+import { ReactNode } from "react";

 interface TooltipButtonProps {
  children: ReactNode;
@@ -9,7 +8,6 @@ interface TooltipButtonProps {
  href?: string;
  ariaLabel: string;
  testId?: string;
-  className?: React.HTMLAttributes<HTMLButtonElement>["className"];
 }

 export function TooltipButton({
@@ -19,7 +17,6 @@ export function TooltipButton({
  href,
  ariaLabel,
  testId,
-  className,
 }: TooltipButtonProps) {
  const buttonContent = (
    <button
@@ -27,7 +24,7 @@ export function TooltipButton({
      aria-label={ariaLabel}
      data-testid={testId}
      onClick={onClick}
-      className={cn("hover:opacity-80", className)}
+      className="w-8 h-8 rounded-full hover:opacity-80 flex items-center justify-center"
    >
      {children}
    </button>
@@ -38,7 +35,7 @@ export function TooltipButton({
      href={href}
      target="_blank"
      rel="noreferrer noopener"
-      className={cn("hover:opacity-80", className)}
+      className="w-8 h-8 rounded-full hover:opacity-80 flex items-center justify-center"
      aria-label={ariaLabel}
    >
      {children}
@@ -48,7 +45,7 @@ export function TooltipButton({
  );

  return (
-    <Tooltip content={tooltip} closeDelay={100} placement="right">
+    <Tooltip content={tooltip} closeDelay={100}>
      {content}
    </Tooltip>
  );
@@ -20,7 +20,7 @@ export function AdvancedOptionSwitch({
    <Switch
      isDisabled={isDisabled}
      name="use-advanced-options"
-      defaultSelected={showAdvancedOptions}
+      isSelected={showAdvancedOptions}
      onValueChange={setShowAdvancedOptions}
      classNames={{
        thumb: cn(
@@ -1,52 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { Select, SelectItem } from "@nextui-org/react";
-
-interface RuntimeSizeSelectorProps {
-  isDisabled: boolean;
-  defaultValue?: number;
-}
-
-export function RuntimeSizeSelector({
-  isDisabled,
-  defaultValue,
-}: RuntimeSizeSelectorProps) {
-  const { t } = useTranslation();
-
-  return (
-    <fieldset className="flex flex-col gap-2">
-      <label
-        htmlFor="runtime-size"
-        className="font-[500] text-[#A3A3A3] text-xs"
-      >
-        {t("SETTINGS_FORM$RUNTIME_SIZE_LABEL")}
-      </label>
-      <Select
-        id="runtime-size"
-        name="runtime-size"
-        defaultSelectedKeys={[String(defaultValue || 1)]}
-        isDisabled={isDisabled}
-        aria-label={t("SETTINGS_FORM$RUNTIME_SIZE_LABEL")}
-        classNames={{
-          trigger: "bg-[#27272A] rounded-md text-sm px-3 py-[10px]",
-        }}
-      >
-        <SelectItem key="1" value={1}>
-          1x (2 core, 8G)
-        </SelectItem>
-        <SelectItem
-          key="2"
-          value={2}
-          isDisabled
-          classNames={{
-            description:
-              "whitespace-normal break-words min-w-[300px] max-w-[300px]",
-            base: "min-w-[300px] max-w-[300px]",
-          }}
-          description="Runtime sizes over 1 are disabled by default, please contact contact@all-hands.dev to get access to larger runtimes."
-        >
-          2x (4 core, 16G)
-        </SelectItem>
-      </Select>
-    </fieldset>
-  );
-}
@@ -21,9 +21,6 @@ import { ModalBackdrop } from "../modal-backdrop";
 import { ModelSelector } from "./model-selector";
 import { useSaveSettings } from "#/hooks/mutation/use-save-settings";

-import { RuntimeSizeSelector } from "./runtime-size-selector";
-import { useConfig } from "#/hooks/query/use-config";
-
 interface SettingsFormProps {
  disabled?: boolean;
  settings: Settings;
@@ -43,7 +40,6 @@ export function SettingsForm({
 }: SettingsFormProps) {
  const { mutateAsync: saveSettings } = useSaveSettings();
  const endSession = useEndSession();
-  const { data: config } = useConfig();

  const location = useLocation();
  const { t } = useTranslation();
@@ -101,8 +97,6 @@ export function SettingsForm({
    posthog.capture("settings_saved", {
      LLM_MODEL: newSettings.LLM_MODEL,
      LLM_API_KEY: newSettings.LLM_API_KEY ? "SET" : "UNSET",
-      REMOTE_RUNTIME_RESOURCE_FACTOR:
-        newSettings.REMOTE_RUNTIME_RESOURCE_FACTOR,
    });
  };

@@ -128,8 +122,6 @@ export function SettingsForm({
    }
  };

-  const isSaasMode = config?.APP_MODE === "saas";
-
  return (
    <div>
      <form
@@ -172,21 +164,16 @@ export function SettingsForm({
            isSet={settings.LLM_API_KEY === "SET"}
          />

+          {showAdvancedOptions && (
+            <AgentInput
+              isDisabled={!!disabled}
+              defaultValue={settings.AGENT}
+              agents={agents}
+            />
+          )}
+
          {showAdvancedOptions && (
            <>
-              <AgentInput
-                isDisabled={!!disabled}
-                defaultValue={settings.AGENT}
-                agents={agents}
-              />
-
-              {isSaasMode && (
-                <RuntimeSizeSelector
-                  isDisabled={!!disabled}
-                  defaultValue={settings.REMOTE_RUNTIME_RESOURCE_FACTOR}
-                />
-              )}
-
              <SecurityAnalyzerInput
                isDisabled={!!disabled}
                defaultValue={settings.SECURITY_ANALYZER}
@@ -16,7 +16,7 @@ export function SettingsModal({ onClose, settings }: SettingsModalProps) {
    <ModalBackdrop onClose={onClose}>
      <div
        data-testid="ai-config-modal"
-        className="bg-root-primary min-w-[384px] max-w-[700px] p-6 rounded-xl flex flex-col gap-2"
+        className="bg-root-primary w-[384px] p-6 rounded-xl flex flex-col gap-2"
      >
        {aiConfigOptions.error && (
          <p className="text-danger text-xs">{aiConfigOptions.error.message}</p>
@@ -2,9 +2,14 @@ import posthog from "posthog-js";
 import React from "react";
 import OpenHands from "#/api/open-hands";
 import {
-  removeGitHubTokenHeader,
-  setGitHubTokenHeader,
+  removeGitHubTokenHeader as removeOpenHandsGitHubTokenHeader,
+  setGitHubTokenHeader as setOpenHandsGitHubTokenHeader,
 } from "#/api/open-hands-axios";
+import {
+  setAuthTokenHeader as setGitHubAuthTokenHeader,
+  removeAuthTokenHeader as removeGitHubAuthTokenHeader,
+  setupAxiosInterceptors as setupGithubAxiosInterceptors,
+} from "#/api/github-axios-instance";

 interface AuthContextType {
  gitHubToken: string | null;
@@ -32,7 +37,8 @@ function AuthProvider({ children }: React.PropsWithChildren) {
    localStorage.removeItem("ghToken");
    localStorage.removeItem("userId");

-    removeGitHubTokenHeader();
+    removeOpenHandsGitHubTokenHeader();
+    removeGitHubAuthTokenHeader();
  };

  const setGitHubToken = (token: string | null) => {
@@ -40,7 +46,8 @@ function AuthProvider({ children }: React.PropsWithChildren) {

    if (token) {
      localStorage.setItem("ghToken", token);
-      setGitHubTokenHeader(token);
+      setOpenHandsGitHubTokenHeader(token);
+      setGitHubAuthTokenHeader(token);
    } else {
      clearGitHubToken();
    }
@@ -80,6 +87,7 @@ function AuthProvider({ children }: React.PropsWithChildren) {

    setGitHubToken(storedGitHubToken);
    setUserId(userId);
+    setupGithubAxiosInterceptors(refreshToken, logout);
  }, []);

  const value = React.useMemo(
@@ -2,18 +2,12 @@ import posthog from "posthog-js";
 import React from "react";
 import { io, Socket } from "socket.io-client";
 import EventLogger from "#/utils/event-logger";
-import {
-  handleAssistantMessage,
-  handleStatusMessage,
-} from "#/services/actions";
+import { handleAssistantMessage } from "#/services/actions";
 import { useRate } from "#/hooks/use-rate";
 import { OpenHandsParsedEvent } from "#/types/core";
-import {
-  AssistantMessageAction,
-  UserMessageAction,
-} from "#/types/core/actions";
+import { AgentStateChangeObservation } from "#/types/core/observations";

-const isOpenHandsEvent = (event: unknown): event is OpenHandsParsedEvent =>
+const isOpenHandsMessage = (event: unknown): event is OpenHandsParsedEvent =>
  typeof event === "object" &&
  event !== null &&
  "id" in event &&
@@ -21,26 +15,10 @@ const isOpenHandsEvent = (event: unknown): event is OpenHandsParsedEvent =>
  "message" in event &&
  "timestamp" in event;

-const isUserMessage = (
+const isAgentStateChangeObservation = (
  event: OpenHandsParsedEvent,
-): event is UserMessageAction =>
-  "source" in event &&
-  "type" in event &&
-  event.source === "user" &&
-  event.type === "message";
-
-const isAssistantMessage = (
-  event: OpenHandsParsedEvent,
-): event is AssistantMessageAction =>
-  "source" in event &&
-  "type" in event &&
-  event.source === "agent" &&
-  event.type === "message";
-
-const isMessageAction = (
-  event: OpenHandsParsedEvent,
-): event is UserMessageAction | AssistantMessageAction =>
-  isUserMessage(event) || isAssistantMessage(event);
+): event is AgentStateChangeObservation =>
+  "observation" in event && event.observation === "agent_state_changed";

 export enum WsClientProviderStatus {
  CONNECTED,
@@ -65,28 +43,16 @@ const WsClientContext = React.createContext<UseWsClient>({

 interface WsClientProviderProps {
  conversationId: string;
-}
-
-export function updateStatusWhenErrorMessagePresent(data: unknown) {
-  if (
-    data &&
-    typeof data === "object" &&
-    "message" in data &&
-    typeof data.message === "string"
-  ) {
-    handleStatusMessage({
-      type: "error",
-      message: data.message,
-      status_update: true,
-    });
-  }
+  ghToken: string | null;
 }

 export function WsClientProvider({
+  ghToken,
  conversationId,
  children,
 }: React.PropsWithChildren<WsClientProviderProps>) {
  const sioRef = React.useRef<Socket | null>(null);
+  const ghTokenRef = React.useRef<string | null>(ghToken);
  const [status, setStatus] = React.useState(
    WsClientProviderStatus.DISCONNECTED,
  );
@@ -108,7 +74,7 @@ export function WsClientProvider({
  }

  function handleMessage(event: Record<string, unknown>) {
-    if (isOpenHandsEvent(event) && isMessageAction(event)) {
+    if (isOpenHandsMessage(event) && !isAgentStateChangeObservation(event)) {
      messageRateHandler.record(new Date().getTime());
    }
    setEvents((prevEvents) => [...prevEvents, event]);
@@ -119,7 +85,7 @@ export function WsClientProvider({
    handleAssistantMessage(event);
  }

-  function handleDisconnect(data: unknown) {
+  function handleDisconnect() {
    setStatus(WsClientProviderStatus.DISCONNECTED);
    const sio = sioRef.current;
    if (!sio) {
@@ -127,19 +93,13 @@ export function WsClientProvider({
    }
    sio.io.opts.query = sio.io.opts.query || {};
    sio.io.opts.query.latest_event_id = lastEventRef.current?.id;
-    updateStatusWhenErrorMessagePresent(data);
  }

-  function handleError(data: unknown) {
-    setStatus(WsClientProviderStatus.DISCONNECTED);
-    updateStatusWhenErrorMessagePresent(data);
+  function handleError() {
    posthog.capture("socket_error");
+    setStatus(WsClientProviderStatus.DISCONNECTED);
  }

-  React.useEffect(() => {
-    lastEventRef.current = null;
-  }, [conversationId]);
-
  React.useEffect(() => {
    if (!conversationId) {
      throw new Error("No conversation ID provided");
@@ -158,6 +118,9 @@ export function WsClientProvider({

    sio = io(baseUrl, {
      transports: ["websocket"],
+      auth: {
+        github_token: ghToken || undefined,
+      },
      query,
    });
    sio.on("connect", handleConnect);
@@ -167,6 +130,7 @@ export function WsClientProvider({
    sio.on("disconnect", handleDisconnect);

    sioRef.current = sio;
+    ghTokenRef.current = ghToken;

    return () => {
      sio.off("connect", handleConnect);
@@ -175,7 +139,7 @@ export function WsClientProvider({
      sio.off("connect_failed", handleError);
      sio.off("disconnect", handleDisconnect);
    };
-  }, [conversationId]);
+  }, [ghToken, conversationId]);

  React.useEffect(
    () => () => {
@@ -13,18 +13,13 @@ export const useCreateConversation = () => {
  const { gitHubToken } = useAuth();
  const queryClient = useQueryClient();

-  const { selectedRepository, files, importedProjectZip } = useSelector(
+  const { selectedRepository, files } = useSelector(
    (state: RootState) => state.initialQuery,
  );

  return useMutation({
    mutationFn: (variables: { q?: string }) => {
-      if (
-        !variables.q?.trim() &&
-        !selectedRepository &&
-        files.length === 0 &&
-        !importedProjectZip
-      ) {
+      if (!variables.q?.trim() && !selectedRepository && files.length === 0) {
        throw new Error("No query provided");
      }

@@ -1,16 +0,0 @@
-import { useMutation } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
-import { useConversation } from "#/context/conversation-context";
-
-type UploadFilesArgs = {
-  files: File[];
-};
-
-export const useUploadFiles = () => {
-  const { conversationId } = useConversation();
-
-  return useMutation({
-    mutationFn: ({ files }: UploadFilesArgs) =>
-      OpenHands.uploadFiles(conversationId, files),
-  });
-};
@@ -1,11 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import OpenHands from "#/api/open-hands";
-import { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
+import { MULTI_CONVO_UI_IS_ENABLED } from "#/utils/constants";

 export const useUserConversation = (cid: string | null) =>
  useQuery({
    queryKey: ["user", "conversation", cid],
    queryFn: () => OpenHands.getConversation(cid!),
-    enabled: MULTI_CONVERSATION_UI && !!cid,
+    enabled: MULTI_CONVO_UI_IS_ENABLED && !!cid,
    retry: false,
  });
@@ -18,8 +18,6 @@ const getSettingsQueryFn = async () => {
        CONFIRMATION_MODE: apiSettings.confirmation_mode,
        SECURITY_ANALYZER: apiSettings.security_analyzer,
        LLM_API_KEY: apiSettings.llm_api_key,
-        REMOTE_RUNTIME_RESOURCE_FACTOR:
-          apiSettings.remote_runtime_resource_factor,
      };
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
openhands	c377f9e9ae	Merge main into feature/runtime-manager	2025-01-03 20:37:08 +00:00
Robert Brennan	9a6084c6d5	only destroy runtime if no one is active	2024-12-24 16:13:45 -05:00
Robert Brennan	30c1d032e3	move close	2024-12-24 16:12:24 -05:00
Robert Brennan	615eabe5ed	add log statement	2024-12-24 16:08:16 -05:00
Robert Brennan	3ecd214d69	Merge branch 'main' into feature/runtime-manager	2024-12-24 15:54:40 -05:00
Robert Brennan	c9a6402103	add cleanup logic	2024-12-24 15:52:58 -05:00
Robert Brennan	33a1dd89e7	remove conversation logic	2024-12-24 15:48:11 -05:00
Robert Brennan	d3f726df51	change connect logic	2024-12-24 15:33:04 -05:00
Robert Brennan	333f9a5bdf	fix tests	2024-12-24 15:27:57 -05:00
Robert Brennan	0d454d46f2	Revert "refactor: move runtime creation logic to RuntimeManager.get_runtime()" This reverts commit `42730014d5`.	2024-12-24 15:16:32 -05:00
Robert Brennan	e7685f185c	fix cli	2024-12-24 15:15:08 -05:00
Robert Brennan	749da6367e	update cli	2024-12-24 15:14:18 -05:00
Robert Brennan	4b497c8e64	fix runtime_manager plumbing	2024-12-24 15:12:15 -05:00
openhands	42730014d5	refactor: move runtime creation logic to RuntimeManager.get_runtime()	2024-12-24 19:58:14 +00:00
openhands	81110671b2	refactor: use singleton RuntimeManager from shared.py	2024-12-24 19:57:06 +00:00
openhands	25f3349e1a	refactor: use RuntimeManager to get existing runtime in Conversation	2024-12-24 19:52:35 +00:00
openhands	30f6166bf6	fix: Fix async mock in test_process_issue	2024-12-24 17:55:26 +00:00
Robert Brennan	1f706fe2f2	fix test	2024-12-24 12:32:02 -05:00
Robert Brennan	4123c65317	Merge branch 'main' into feature/runtime-manager	2024-12-24 12:04:33 -05:00
Robert Brennan	6dfd54be9f	fix plumbing	2024-12-24 11:53:17 -05:00
openhands	8eef9b2563	Use server's shared config for RuntimeManager	2024-12-24 16:39:27 +00:00
openhands	5d5978c6cb	Move runtime class resolution to RuntimeManager and remove redundant error callback	2024-12-24 16:35:14 +00:00
openhands	1a17972b4e	Move RuntimeManager to module level and simplify config handling	2024-12-24 16:30:14 +00:00
openhands	4de7a4f85d	Simplify RuntimeManager config handling and fix type issues	2024-12-24 16:25:24 +00:00
openhands	8befeca41d	Fix linting issues and add missing await for create_runtime	2024-12-24 16:16:16 +00:00
openhands	918139e886	Move AppConfig to RuntimeManager class level and update initialization flow	2024-12-24 16:13:09 +00:00
openhands	6374174095	Update main.py to use RuntimeManager for runtime creation	2024-12-24 16:02:47 +00:00
Robert Brennan	138f6932eb	move import	2024-12-24 10:08:13 -05:00
Robert Brennan	7181efd26d	move import	2024-12-24 10:07:24 -05:00
Robert Brennan	3a52360ab0	remove exit	2024-12-24 10:05:07 -05:00
openhands	cd9eb1d85c	Fix singleton import and add tests for RuntimeManager	2024-12-24 15:03:10 +00:00
openhands	ada657b476	Fix linting issues in runtime_manager.py	2024-12-24 14:54:11 +00:00
openhands	b630d65626	Add RuntimeManager for centralized runtime management	2024-12-24 14:52:19 +00:00