Increase action timeout buffer from 5 to 100 seconds for debugging

This change increases the HTTP client timeout buffer from 5 to 100 seconds
when executing actions. The HTTP client waits for action.timeout + buffer
seconds before timing out, to allow the action execution server to timeout
first and return a proper error message.

With the increased buffer, we can better observe and debug timeout behavior
on the server side without the client timing out prematurely.

Co-authored-by: openhands <openhands@all-hands.dev>

.github/workflows/fe-e2e-tests.yml

@@ -1,47 +0,0 @@
-# Workflow that runs frontend e2e tests with Playwright
-name: Run Frontend E2E Tests
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    paths:
-      - "frontend/**"
-      - ".github/workflows/fe-e2e-tests.yml"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  fe-e2e-test:
-    name: FE E2E Tests
-    runs-on: blacksmith-4vcpu-ubuntu-2204
-    strategy:
-      matrix:
-        node-version: [22]
-      fail-fast: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: useblacksmith/setup-node@v5
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Install dependencies
-        working-directory: ./frontend
-        run: npm ci
-      - name: Install Playwright browsers
-        working-directory: ./frontend
-        run: npx playwright install --with-deps chromium
-      - name: Run Playwright tests
-        working-directory: ./frontend
-        run: npx playwright test --project=chromium
-      - name: Upload Playwright report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: playwright-report
-          path: frontend/playwright-report/
-          retention-days: 30

Development.md

@@ -161,7 +161,7 @@ poetry run pytest ./tests/unit/test_*.py
 To reduce build time (e.g., if no changes were made to the client-runtime component), you can use an existing Docker
 container image by setting the SANDBOX_RUNTIME_CONTAINER_IMAGE environment variable to the desired Docker image.
 
-Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/openhands/runtime:1.0-nikolaik`
+Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/openhands/runtime:0.62-nikolaik`
 
 ## Develop inside Docker container
 

README.md

@@ -8,7 +8,7 @@
 
 <div align="center">
   <a href="https://github.com/OpenHands/OpenHands/blob/main/LICENSE"><img src="https://img.shields.io/badge/LICENSE-MIT-20B2AA?style=for-the-badge" alt="MIT License"></a>
-  <a href="https://docs.google.com/spreadsheets/d/1wOUdFCMyY6Nt0AIqF705KN4JKOWgeI4wUGUP60krXXs/edit?gid=811504672#gid=811504672"><img src="https://img.shields.io/badge/SWEBench-77.6-00cc00?logoColor=FFE165&style=for-the-badge" alt="Benchmark Score"></a>
+  <a href="https://docs.google.com/spreadsheets/d/1wOUdFCMyY6Nt0AIqF705KN4JKOWgeI4wUGUP60krXXs/edit?gid=811504672#gid=811504672"><img src="https://img.shields.io/badge/SWEBench-72.8-00cc00?logoColor=FFE165&style=for-the-badge" alt="Benchmark Score"></a>
   <br/>
   <a href="https://docs.openhands.dev/sdk"><img src="https://img.shields.io/badge/Documentation-000?logo=googledocs&logoColor=FFE165&style=for-the-badge" alt="Check out the documentation"></a>
   <a href="https://arxiv.org/abs/2511.03690"><img src="https://img.shields.io/badge/Paper-000?logoColor=FFE165&logo=arxiv&style=for-the-badge" alt="Tech Report"></a>

containers/dev/compose.yml

@@ -12,7 +12,7 @@ services:
       - SANDBOX_API_HOSTNAME=host.docker.internal
       - DOCKER_HOST_ADDR=host.docker.internal
       #
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/openhands/runtime:1.0-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/openhands/runtime:0.62-nikolaik}
       - SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
       - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
     ports:

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     image: openhands:latest
     container_name: openhands-app-${DATE:-}
     environment:
-      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.openhands.dev/openhands/runtime:1.0-nikolaik}
+      - SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.openhands.dev/openhands/runtime:0.62-nikolaik}
       #- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234} # enable this only if you want a specific non-root sandbox user but you will have to manually adjust permissions of ~/.openhands for this user
       - WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
     ports:

enterprise/integrations/github/github_manager.py

@@ -22,7 +22,6 @@ from integrations.utils import (
     HOST_URL,
     OPENHANDS_RESOLVER_TEMPLATES_DIR,
 )
-from integrations.v1_utils import get_saas_user_auth
 from jinja2 import Environment, FileSystemLoader
 from pydantic import SecretStr
 from server.auth.constants import GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_KEY
@@ -165,13 +164,8 @@ class GithubManager(Manager):
             )
 
         if await self.is_job_requested(message):
-            payload = message.message.get('payload', {})
-            user_id = payload['sender']['id']
-            keycloak_user_id = await self.token_manager.get_user_id_from_idp_user_id(
-                user_id, ProviderType.GITHUB
-            )
             github_view = await GithubFactory.create_github_view_from_payload(
-                message, keycloak_user_id
+                message, self.token_manager
             )
             logger.info(
                 f'[GitHub] Creating job for {github_view.user_info.username} in {github_view.full_repo_name}#{github_view.issue_number}'
@@ -288,15 +282,8 @@ class GithubManager(Manager):
                         f'[Github]: Error summarizing issue solvability: {str(e)}'
                     )
 
-                saas_user_auth = await get_saas_user_auth(
-                    github_view.user_info.keycloak_user_id, self.token_manager
-                )
-
                 await github_view.create_new_conversation(
-                    self.jinja_env,
-                    secret_store.provider_tokens,
-                    convo_metadata,
-                    saas_user_auth,
+                    self.jinja_env, secret_store.provider_tokens, convo_metadata
                 )
 
                 conversation_id = github_view.conversation_id
@@ -305,7 +292,14 @@ class GithubManager(Manager):
                     f'[GitHub] Created conversation {conversation_id} for user {user_info.username}'
                 )
 
-                if not github_view.v1:
+                from openhands.server.shared import ConversationStoreImpl, config
+
+                conversation_store = await ConversationStoreImpl.get_instance(
+                    config, github_view.user_info.keycloak_user_id
+                )
+                metadata = await conversation_store.get_metadata(conversation_id)
+
+                if metadata.conversation_version != 'v1':
                     # Create a GithubCallbackProcessor
                     processor = GithubCallbackProcessor(
                         github_view=github_view,

enterprise/integrations/github/github_view.py

@@ -1,4 +1,3 @@
-from dataclasses import dataclass
 from uuid import UUID, uuid4
 
 from github import Github, GithubIntegration
@@ -9,17 +8,16 @@ from integrations.github.github_types import (
     WorkflowRunStatus,
 )
 from integrations.models import Message
-from integrations.resolver_context import ResolverUserContext
 from integrations.types import ResolverViewInterface, UserData
 from integrations.utils import (
     ENABLE_PROACTIVE_CONVERSATION_STARTERS,
-    ENABLE_V1_GITHUB_RESOLVER,
     HOST,
     HOST_URL,
     get_oh_labels,
     has_exact_mention,
 )
 from jinja2 import Environment
+from pydantic.dataclasses import dataclass
 from server.auth.constants import GITHUB_APP_CLIENT_ID, GITHUB_APP_PRIVATE_KEY
 from server.auth.token_manager import TokenManager
 from server.config import get_config
@@ -36,16 +34,18 @@ from openhands.app_server.app_conversation.app_conversation_models import (
 from openhands.app_server.config import get_app_conversation_service
 from openhands.app_server.services.injector import InjectorState
 from openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR
+from openhands.app_server.user.user_context import UserContext
+from openhands.app_server.user.user_models import UserInfo
 from openhands.core.logger import openhands_logger as logger
 from openhands.integrations.github.github_service import GithubServiceImpl
 from openhands.integrations.provider import PROVIDER_TOKEN_TYPE, ProviderType
 from openhands.integrations.service_types import Comment
 from openhands.sdk import TextContent
+from openhands.sdk.conversation.secret_source import SecretSource
 from openhands.server.services.conversation_service import (
     initialize_conversation,
     start_conversation,
 )
-from openhands.server.user_auth.user_auth import UserAuth
 from openhands.storage.data_models.conversation_metadata import (
     ConversationMetadata,
     ConversationTrigger,
@@ -55,6 +55,52 @@ from openhands.utils.async_utils import call_sync_from_async
 OH_LABEL, INLINE_OH_LABEL = get_oh_labels(HOST)
 
 
+class GithubUserContext(UserContext):
+    """User context for GitHub integration that provides user info without web request."""
+
+    def __init__(self, keycloak_user_id: str, git_provider_tokens: PROVIDER_TOKEN_TYPE):
+        self.keycloak_user_id = keycloak_user_id
+        self.git_provider_tokens = git_provider_tokens
+        self.settings_store = SaasSettingsStore(
+            user_id=self.keycloak_user_id,
+            session_maker=session_maker,
+            config=get_config(),
+        )
+
+        self.secrets_store = SaasSecretsStore(
+            self.keycloak_user_id, session_maker, get_config()
+        )
+
+    async def get_user_id(self) -> str | None:
+        return self.keycloak_user_id
+
+    async def get_user_info(self) -> UserInfo:
+        user_settings = await self.settings_store.load()
+        return UserInfo(
+            id=self.keycloak_user_id,
+            **user_settings.model_dump(context={'expose_secrets': True}),
+        )
+
+    async def get_authenticated_git_url(self, repository: str) -> str:
+        # This would need to be implemented based on the git provider tokens
+        # For now, return a basic HTTPS URL
+        return f'https://github.com/{repository}.git'
+
+    async def get_latest_token(self, provider_type: ProviderType) -> str | None:
+        # Return the appropriate token from git_provider_tokens
+        if provider_type == ProviderType.GITHUB and self.git_provider_tokens:
+            return self.git_provider_tokens.get(ProviderType.GITHUB)
+        return None
+
+    async def get_secrets(self) -> dict[str, SecretSource]:
+        # Return empty dict for now - GitHub integration handles secrets separately
+        user_secrets = await self.secrets_store.load()
+        return dict(user_secrets.custom_secrets) if user_secrets else {}
+
+    async def get_mcp_api_key(self) -> str | None:
+        raise NotImplementedError()
+
+
 async def get_user_proactive_conversation_setting(user_id: str | None) -> bool:
     """Get the user's proactive conversation setting.
 
@@ -88,7 +134,7 @@ async def get_user_proactive_conversation_setting(user_id: str | None) -> bool:
     return settings.enable_proactive_conversation_starters
 
 
-async def get_user_v1_enabled_setting(user_id: str) -> bool:
+async def get_user_v1_enabled_setting(user_id: str | None) -> bool:
     """Get the user's V1 conversation API setting.
 
     Args:
@@ -96,13 +142,10 @@ async def get_user_v1_enabled_setting(user_id: str) -> bool:
 
     Returns:
         True if V1 conversations are enabled for this user, False otherwise
-
-    Note:
-        This function checks both the global environment variable kill switch AND
-        the user's individual setting. Both must be true for the function to return true.
     """
-    # Check the global environment variable first
-    if not ENABLE_V1_GITHUB_RESOLVER:
+
+    # If no user ID is provided, we can't check user settings
+    if not user_id:
         return False
 
     config = get_config()
@@ -140,7 +183,6 @@ class GithubIssue(ResolverViewInterface):
     title: str
     description: str
     previous_comments: list[Comment]
-    v1: bool
 
     async def _load_resolver_context(self):
         github_service = GithubServiceImpl(
@@ -187,19 +229,6 @@ class GithubIssue(ResolverViewInterface):
 
     async def initialize_new_conversation(self) -> ConversationMetadata:
         # FIXME: Handle if initialize_conversation returns None
-
-        v1_enabled = await get_user_v1_enabled_setting(self.user_info.keycloak_user_id)
-        logger.info(
-            f'[GitHub V1]: User flag found for {self.user_info.keycloak_user_id} is {v1_enabled}'
-        )
-        if v1_enabled:
-            # Create dummy conversationm metadata
-            # Don't save to conversation store
-            # V1 conversations are stored in a separate table
-            return ConversationMetadata(
-                conversation_id=uuid4().hex, selected_repository=self.full_repo_name
-            )
-
         conversation_metadata: ConversationMetadata = await initialize_conversation(  # type: ignore[assignment]
             user_id=self.user_info.keycloak_user_id,
             conversation_id=None,
@@ -216,17 +245,14 @@ class GithubIssue(ResolverViewInterface):
         jinja_env: Environment,
         git_provider_tokens: PROVIDER_TOKEN_TYPE,
         conversation_metadata: ConversationMetadata,
-        saas_user_auth: UserAuth,
     ):
         v1_enabled = await get_user_v1_enabled_setting(self.user_info.keycloak_user_id)
-        logger.info(
-            f'[GitHub V1]: User flag found for {self.user_info.keycloak_user_id} is {v1_enabled}'
-        )
+
         if v1_enabled:
             try:
                 # Use V1 app conversation service
                 await self._create_v1_conversation(
-                    jinja_env, saas_user_auth, conversation_metadata
+                    jinja_env, git_provider_tokens, conversation_metadata
                 )
                 return
 
@@ -245,7 +271,6 @@ class GithubIssue(ResolverViewInterface):
         conversation_metadata: ConversationMetadata,
     ):
         """Create conversation using the legacy V0 system."""
-        logger.info('[GitHub]: Creating V0 conversation')
         custom_secrets = await self._get_user_secrets()
 
         user_instructions, conversation_instructions = await self._get_instructions(
@@ -267,12 +292,10 @@ class GithubIssue(ResolverViewInterface):
     async def _create_v1_conversation(
         self,
         jinja_env: Environment,
-        saas_user_auth: UserAuth,
+        git_provider_tokens: PROVIDER_TOKEN_TYPE,
         conversation_metadata: ConversationMetadata,
     ):
         """Create conversation using the new V1 app conversation system."""
-        logger.info('[GitHub V1]: Creating V1 conversation')
-
         user_instructions, conversation_instructions = await self._get_instructions(
             jinja_env
         )
@@ -303,7 +326,10 @@ class GithubIssue(ResolverViewInterface):
         )
 
         # Set up the GitHub user context for the V1 system
-        github_user_context = ResolverUserContext(saas_user_auth=saas_user_auth)
+        github_user_context = GithubUserContext(
+            keycloak_user_id=self.user_info.keycloak_user_id,
+            git_provider_tokens=git_provider_tokens,
+        )
         setattr(injector_state, USER_CONTEXT_ATTR, github_user_context)
 
         async with get_app_conversation_service(
@@ -318,8 +344,6 @@ class GithubIssue(ResolverViewInterface):
                         f'Failed to start V1 conversation: {task.detail}'
                     )
 
-        self.v1 = True
-
     def _create_github_v1_callback_processor(self):
         """Create a V1 callback processor for GitHub integration."""
         from openhands.app_server.event_callback.github_v1_callback_processor import (
@@ -391,18 +415,7 @@ class GithubPRComment(GithubIssueComment):
         return user_instructions, conversation_instructions
 
     async def initialize_new_conversation(self) -> ConversationMetadata:
-        v1_enabled = await get_user_v1_enabled_setting(self.user_info.keycloak_user_id)
-        logger.info(
-            f'[GitHub V1]: User flag found for {self.user_info.keycloak_user_id} is {v1_enabled}'
-        )
-        if v1_enabled:
-            # Create dummy conversationm metadata
-            # Don't save to conversation store
-            # V1 conversations are stored in a separate table
-            return ConversationMetadata(
-                conversation_id=uuid4().hex, selected_repository=self.full_repo_name
-            )
-
+        # FIXME: Handle if initialize_conversation returns None
         conversation_metadata: ConversationMetadata = await initialize_conversation(  # type: ignore[assignment]
             user_id=self.user_info.keycloak_user_id,
             conversation_id=None,
@@ -793,7 +806,7 @@ class GithubFactory:
 
     @staticmethod
     async def create_github_view_from_payload(
-        message: Message, keycloak_user_id: str
+        message: Message, token_manager: TokenManager
     ) -> ResolverViewInterface:
         """Create the appropriate class (GithubIssue or GithubPRComment) based on the payload.
         Also return metadata about the event (e.g., action type).
@@ -803,10 +816,17 @@ class GithubFactory:
         user_id = payload['sender']['id']
         username = payload['sender']['login']
 
+        keyloak_user_id = await token_manager.get_user_id_from_idp_user_id(
+            user_id, ProviderType.GITHUB
+        )
+
+        if keyloak_user_id is None:
+            logger.warning(f'Got invalid keyloak user id for GitHub User {user_id} ')
+
         selected_repo = GithubFactory.get_full_repo_name(repo_obj)
         is_public_repo = not repo_obj.get('private', True)
         user_info = UserData(
-            user_id=user_id, username=username, keycloak_user_id=keycloak_user_id
+            user_id=user_id, username=username, keycloak_user_id=keyloak_user_id
         )
 
         installation_id = message.message['installation']
@@ -830,7 +850,6 @@ class GithubFactory:
                 title='',
                 description='',
                 previous_comments=[],
-                v1=False,
             )
 
         elif GithubFactory.is_issue_comment(message):
@@ -856,7 +875,6 @@ class GithubFactory:
                 title='',
                 description='',
                 previous_comments=[],
-                v1=False,
             )
 
         elif GithubFactory.is_pr_comment(message):
@@ -898,7 +916,6 @@ class GithubFactory:
                 title='',
                 description='',
                 previous_comments=[],
-                v1=False,
             )
 
         elif GithubFactory.is_inline_pr_comment(message):
@@ -932,7 +949,6 @@ class GithubFactory:
                 title='',
                 description='',
                 previous_comments=[],
-                v1=False,
             )
 
         else:

enterprise/integrations/resolver_context.py

@@ -1,63 +0,0 @@
-from openhands.app_server.user.user_context import UserContext
-from openhands.app_server.user.user_models import UserInfo
-from openhands.integrations.provider import PROVIDER_TOKEN_TYPE
-from openhands.integrations.service_types import ProviderType
-from openhands.sdk.secret import SecretSource, StaticSecret
-from openhands.server.user_auth.user_auth import UserAuth
-
-
-class ResolverUserContext(UserContext):
-    """User context for resolver operations that inherits from UserContext."""
-
-    def __init__(
-        self,
-        saas_user_auth: UserAuth,
-    ):
-        self.saas_user_auth = saas_user_auth
-
-    async def get_user_id(self) -> str | None:
-        return await self.saas_user_auth.get_user_id()
-
-    async def get_user_info(self) -> UserInfo:
-        user_settings = await self.saas_user_auth.get_user_settings()
-        user_id = await self.saas_user_auth.get_user_id()
-        if user_settings:
-            return UserInfo(
-                id=user_id,
-                **user_settings.model_dump(context={'expose_secrets': True}),
-            )
-
-        return UserInfo(id=user_id)
-
-    async def get_authenticated_git_url(self, repository: str) -> str:
-        # This would need to be implemented based on the git provider tokens
-        # For now, return a basic HTTPS URL
-        return f'https://github.com/{repository}.git'
-
-    async def get_latest_token(self, provider_type: ProviderType) -> str | None:
-        # Return the appropriate token from git_provider_tokens
-
-        provider_tokens = await self.saas_user_auth.get_provider_tokens()
-        if provider_tokens:
-            return provider_tokens.get(provider_type)
-        return None
-
-    async def get_provider_tokens(self) -> PROVIDER_TOKEN_TYPE | None:
-        return await self.saas_user_auth.get_provider_tokens()
-
-    async def get_secrets(self) -> dict[str, SecretSource]:
-        """Get secrets for the user, including custom secrets."""
-        secrets = await self.saas_user_auth.get_secrets()
-        if secrets:
-            # Convert custom secrets to StaticSecret objects for SDK compatibility
-            # secrets.custom_secrets is of type Mapping[str, CustomSecret]
-            converted_secrets = {}
-            for key, custom_secret in secrets.custom_secrets.items():
-                # Extract the secret value from CustomSecret and convert to StaticSecret
-                secret_value = custom_secret.secret.get_secret_value()
-                converted_secrets[key] = StaticSecret(value=secret_value)
-            return converted_secrets
-        return {}
-
-    async def get_mcp_api_key(self) -> str | None:
-        return await self.saas_user_auth.get_mcp_api_key()

enterprise/integrations/types.py

@@ -19,7 +19,7 @@ class PRStatus(Enum):
 class UserData(BaseModel):
     user_id: int
     username: str
-    keycloak_user_id: str
+    keycloak_user_id: str | None
 
 
 @dataclass

enterprise/integrations/utils.py

@@ -51,11 +51,6 @@ ENABLE_SOLVABILITY_ANALYSIS = (
     os.getenv('ENABLE_SOLVABILITY_ANALYSIS', 'false').lower() == 'true'
 )
 
-# Toggle for V1 GitHub resolver feature
-ENABLE_V1_GITHUB_RESOLVER = (
-    os.getenv('ENABLE_V1_GITHUB_RESOLVER', 'false').lower() == 'true'
-)
-
 
 OPENHANDS_RESOLVER_TEMPLATES_DIR = 'openhands/integrations/templates/resolver/'
 jinja_env = Environment(loader=FileSystemLoader(OPENHANDS_RESOLVER_TEMPLATES_DIR))

enterprise/integrations/v1_utils.py

@@ -1,20 +0,0 @@
-from pydantic import SecretStr
-from server.auth.saas_user_auth import SaasUserAuth
-from server.auth.token_manager import TokenManager
-
-from openhands.core.logger import openhands_logger as logger
-from openhands.server.user_auth.user_auth import UserAuth
-
-
-async def get_saas_user_auth(
-    keycloak_user_id: str, token_manager: TokenManager
-) -> UserAuth:
-    offline_token = await token_manager.load_offline_token(keycloak_user_id)
-    if offline_token is None:
-        logger.info('no_offline_token_found')
-
-    user_auth = SaasUserAuth(
-        user_id=keycloak_user_id,
-        refresh_token=SecretStr(offline_token),
-    )
-    return user_auth

enterprise/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.
 
 [[package]]
 name = "aiofiles"
@@ -201,14 +201,14 @@ files = [
 
 [[package]]
 name = "anthropic"
-version = "0.75.0"
+version = "0.72.0"
 description = "The official Python library for the anthropic API"
 optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.8"
 groups = ["main"]
 files = [
-    {file = "anthropic-0.75.0-py3-none-any.whl", hash = "sha256:ea8317271b6c15d80225a9f3c670152746e88805a7a61e14d4a374577164965b"},
-    {file = "anthropic-0.75.0.tar.gz", hash = "sha256:e8607422f4ab616db2ea5baacc215dd5f028da99ce2f022e33c7c535b29f3dfb"},
+    {file = "anthropic-0.72.0-py3-none-any.whl", hash = "sha256:0e9f5a7582f038cab8efbb4c959e49ef654a56bfc7ba2da51b5a7b8a84de2e4d"},
+    {file = "anthropic-0.72.0.tar.gz", hash = "sha256:8971fe76dcffc644f74ac3883069beb1527641115ae0d6eb8fa21c1ce4082f7a"},
 ]
 
 [package.dependencies]
@@ -682,37 +682,37 @@ crt = ["awscrt (==0.27.6)"]
 
 [[package]]
 name = "browser-use"
-version = "0.10.1"
+version = "0.9.5"
 description = "Make websites accessible for AI agents"
 optional = false
 python-versions = "<4.0,>=3.11"
 groups = ["main"]
 files = [
-    {file = "browser_use-0.10.1-py3-none-any.whl", hash = "sha256:96e603bfc71098175342cdcb0592519e6f244412e740f0254e4389fdd82a977f"},
-    {file = "browser_use-0.10.1.tar.gz", hash = "sha256:5f211ecfdf1f9fd186160f10df70dedd661821231e30f1bce40939787abab223"},
+    {file = "browser_use-0.9.5-py3-none-any.whl", hash = "sha256:4a2e92847204d1ded269026a99cb0cc0e60e38bd2751fa3f58aedd78f00b4e67"},
+    {file = "browser_use-0.9.5.tar.gz", hash = "sha256:f8285fe253b149d01769a7084883b4cf4db351e2f38e26302c157bcbf14a703f"},
 ]
 
 [package.dependencies]
 aiohttp = "3.12.15"
-anthropic = ">=0.72.1,<1.0.0"
+anthropic = ">=0.68.1,<1.0.0"
 anyio = ">=4.9.0"
 authlib = ">=1.6.0"
 bubus = ">=1.5.6"
-cdp-use = ">=1.4.4"
+cdp-use = ">=1.4.0"
 click = ">=8.1.8"
 cloudpickle = ">=3.1.1"
 google-api-core = ">=2.25.0"
 google-api-python-client = ">=2.174.0"
 google-auth = ">=2.40.3"
 google-auth-oauthlib = ">=1.2.2"
-google-genai = ">=1.50.0,<2.0.0"
+google-genai = ">=1.29.0,<2.0.0"
 groq = ">=0.30.0"
 httpx = ">=0.28.1"
 inquirerpy = ">=0.3.4"
 markdownify = ">=1.2.0"
 mcp = ">=1.10.1"
 ollama = ">=0.5.1"
-openai = ">=2.7.2,<3.0.0"
+openai = ">=1.99.2,<2.0.0"
 pillow = ">=11.2.1"
 portalocker = ">=2.7.0,<3.0.0"
 posthog = ">=3.7.0"
@@ -721,7 +721,6 @@ pydantic = ">=2.11.5"
 pyobjc = {version = ">=11.0", markers = "platform_system == \"darwin\""}
 pyotp = ">=2.9.0"
 pypdf = ">=5.7.0"
-python-docx = ">=1.2.0"
 python-dotenv = ">=1.0.1"
 reportlab = ">=4.0.0"
 requests = ">=2.32.3"
@@ -851,14 +850,14 @@ files = [
 
 [[package]]
 name = "cdp-use"
-version = "1.4.4"
+version = "1.4.3"
 description = "Type safe generator/client library for CDP"
 optional = false
 python-versions = ">=3.11"
 groups = ["main"]
 files = [
-    {file = "cdp_use-1.4.4-py3-none-any.whl", hash = "sha256:e37e80e067db2653d6fdf953d4ff9e5d80d75daa27b7c6d48c0261cccbef73e1"},
-    {file = "cdp_use-1.4.4.tar.gz", hash = "sha256:330a848b517006eb9ad1dc468aa6434d913cf0c6918610760c36c3fdfdba0fab"},
+    {file = "cdp_use-1.4.3-py3-none-any.whl", hash = "sha256:c48664604470c2579aa1e677c3e3e7e24c4f300c54804c093d935abb50479ecd"},
+    {file = "cdp_use-1.4.3.tar.gz", hash = "sha256:9029c04bdc49fbd3939d2bf1988ad8d88e260729c7d5e35c2f6c87591f5a10e9"},
 ]
 
 [package.dependencies]
@@ -2979,29 +2978,28 @@ testing = ["pytest"]
 
 [[package]]
 name = "google-genai"
-version = "1.53.0"
+version = "1.32.0"
 description = "GenAI Python SDK"
 optional = false
-python-versions = ">=3.10"
+python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "google_genai-1.53.0-py3-none-any.whl", hash = "sha256:65a3f99e5c03c372d872cda7419f5940e723374bb12a2f3ffd5e3e56e8eb2094"},
-    {file = "google_genai-1.53.0.tar.gz", hash = "sha256:938a26d22f3fd32c6eeeb4276ef204ef82884e63af9842ce3eac05ceb39cbd8d"},
+    {file = "google_genai-1.32.0-py3-none-any.whl", hash = "sha256:c0c4b1d45adf3aa99501050dd73da2f0dea09374002231052d81a6765d15e7f6"},
+    {file = "google_genai-1.32.0.tar.gz", hash = "sha256:349da3f5ff0e981066bd508585fcdd308d28fc4646f318c8f6d1aa6041f4c7e3"},
 ]
 
 [package.dependencies]
 anyio = ">=4.8.0,<5.0.0"
-google-auth = {version = ">=2.14.1,<3.0.0", extras = ["requests"]}
+google-auth = ">=2.14.1,<3.0.0"
 httpx = ">=0.28.1,<1.0.0"
-pydantic = ">=2.9.0,<3.0.0"
+pydantic = ">=2.0.0,<3.0.0"
 requests = ">=2.28.1,<3.0.0"
 tenacity = ">=8.2.3,<9.2.0"
 typing-extensions = ">=4.11.0,<5.0.0"
 websockets = ">=13.0.0,<15.1.0"
 
 [package.extras]
-aiohttp = ["aiohttp (<3.13.3)"]
-local-tokenizer = ["protobuf", "sentencepiece (>=0.2.0)"]
+aiohttp = ["aiohttp (<4.0.0)"]
 
 [[package]]
 name = "google-resumable-media"
@@ -3057,8 +3055,6 @@ files = [
     {file = "greenlet-3.2.4-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c2ca18a03a8cfb5b25bc1cbe20f3d9a4c80d8c3b13ba3df49ac3961af0b1018d"},
     {file = "greenlet-3.2.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:9fe0a28a7b952a21e2c062cd5756d34354117796c6d9215a87f55e38d15402c5"},
     {file = "greenlet-3.2.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8854167e06950ca75b898b104b63cc646573aa5fef1353d4508ecdd1ee76254f"},
-    {file = "greenlet-3.2.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f47617f698838ba98f4ff4189aef02e7343952df3a615f847bb575c3feb177a7"},
-    {file = "greenlet-3.2.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:af41be48a4f60429d5cad9d22175217805098a9ef7c40bfef44f7669fb9d74d8"},
     {file = "greenlet-3.2.4-cp310-cp310-win_amd64.whl", hash = "sha256:73f49b5368b5359d04e18d15828eecc1806033db5233397748f4ca813ff1056c"},
     {file = "greenlet-3.2.4-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:96378df1de302bc38e99c3a9aa311967b7dc80ced1dcc6f171e99842987882a2"},
     {file = "greenlet-3.2.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:1ee8fae0519a337f2329cb78bd7a8e128ec0f881073d43f023c7b8d4831d5246"},
@@ -3068,8 +3064,6 @@ files = [
     {file = "greenlet-3.2.4-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2523e5246274f54fdadbce8494458a2ebdcdbc7b802318466ac5606d3cded1f8"},
     {file = "greenlet-3.2.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1987de92fec508535687fb807a5cea1560f6196285a4cde35c100b8cd632cc52"},
     {file = "greenlet-3.2.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:55e9c5affaa6775e2c6b67659f3a71684de4c549b3dd9afca3bc773533d284fa"},
-    {file = "greenlet-3.2.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c9c6de1940a7d828635fbd254d69db79e54619f165ee7ce32fda763a9cb6a58c"},
-    {file = "greenlet-3.2.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03c5136e7be905045160b1b9fdca93dd6727b180feeafda6818e6496434ed8c5"},
     {file = "greenlet-3.2.4-cp311-cp311-win_amd64.whl", hash = "sha256:9c40adce87eaa9ddb593ccb0fa6a07caf34015a29bf8d344811665b573138db9"},
     {file = "greenlet-3.2.4-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:3b67ca49f54cede0186854a008109d6ee71f66bd57bb36abd6d0a0267b540cdd"},
     {file = "greenlet-3.2.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ddf9164e7a5b08e9d22511526865780a576f19ddd00d62f8a665949327fde8bb"},
@@ -3079,8 +3073,6 @@ files = [
     {file = "greenlet-3.2.4-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3b3812d8d0c9579967815af437d96623f45c0f2ae5f04e366de62a12d83a8fb0"},
     {file = "greenlet-3.2.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:abbf57b5a870d30c4675928c37278493044d7c14378350b3aa5d484fa65575f0"},
     {file = "greenlet-3.2.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:20fb936b4652b6e307b8f347665e2c615540d4b42b3b4c8a321d8286da7e520f"},
-    {file = "greenlet-3.2.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ee7a6ec486883397d70eec05059353b8e83eca9168b9f3f9a361971e77e0bcd0"},
-    {file = "greenlet-3.2.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:326d234cbf337c9c3def0676412eb7040a35a768efc92504b947b3e9cfc7543d"},
     {file = "greenlet-3.2.4-cp312-cp312-win_amd64.whl", hash = "sha256:a7d4e128405eea3814a12cc2605e0e6aedb4035bf32697f72deca74de4105e02"},
     {file = "greenlet-3.2.4-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:1a921e542453fe531144e91e1feedf12e07351b1cf6c9e8a3325ea600a715a31"},
     {file = "greenlet-3.2.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cd3c8e693bff0fff6ba55f140bf390fa92c994083f838fece0f63be121334945"},
@@ -3090,8 +3082,6 @@ files = [
     {file = "greenlet-3.2.4-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:23768528f2911bcd7e475210822ffb5254ed10d71f4028387e5a99b4c6699671"},
     {file = "greenlet-3.2.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:00fadb3fedccc447f517ee0d3fd8fe49eae949e1cd0f6a611818f4f6fb7dc83b"},
     {file = "greenlet-3.2.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:d25c5091190f2dc0eaa3f950252122edbbadbb682aa7b1ef2f8af0f8c0afefae"},
-    {file = "greenlet-3.2.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6e343822feb58ac4d0a1211bd9399de2b3a04963ddeec21530fc426cc121f19b"},
-    {file = "greenlet-3.2.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ca7f6f1f2649b89ce02f6f229d7c19f680a6238af656f61e0115b24857917929"},
     {file = "greenlet-3.2.4-cp313-cp313-win_amd64.whl", hash = "sha256:554b03b6e73aaabec3745364d6239e9e012d64c68ccd0b8430c64ccc14939a8b"},
     {file = "greenlet-3.2.4-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:49a30d5fda2507ae77be16479bdb62a660fa51b1eb4928b524975b3bde77b3c0"},
     {file = "greenlet-3.2.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:299fd615cd8fc86267b47597123e3f43ad79c9d8a22bebdce535e53550763e2f"},
@@ -3099,8 +3089,6 @@ files = [
     {file = "greenlet-3.2.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b4a1870c51720687af7fa3e7cda6d08d801dae660f75a76f3845b642b4da6ee1"},
     {file = "greenlet-3.2.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:061dc4cf2c34852b052a8620d40f36324554bc192be474b9e9770e8c042fd735"},
     {file = "greenlet-3.2.4-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44358b9bf66c8576a9f57a590d5f5d6e72fa4228b763d0e43fee6d3b06d3a337"},
-    {file = "greenlet-3.2.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:2917bdf657f5859fbf3386b12d68ede4cf1f04c90c3a6bc1f013dd68a22e2269"},
-    {file = "greenlet-3.2.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:015d48959d4add5d6c9f6c5210ee3803a830dce46356e3bc326d6776bde54681"},
     {file = "greenlet-3.2.4-cp314-cp314-win_amd64.whl", hash = "sha256:e37ab26028f12dbb0ff65f29a8d3d44a765c61e729647bf2ddfbbed621726f01"},
     {file = "greenlet-3.2.4-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:b6a7c19cf0d2742d0809a4c05975db036fdff50cd294a93632d6a310bf9ac02c"},
     {file = "greenlet-3.2.4-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:27890167f55d2387576d1f41d9487ef171849ea0359ce1510ca6e06c8bece11d"},
@@ -3110,8 +3098,6 @@ files = [
     {file = "greenlet-3.2.4-cp39-cp39-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c9913f1a30e4526f432991f89ae263459b1c64d1608c0d22a5c79c287b3c70df"},
     {file = "greenlet-3.2.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b90654e092f928f110e0007f572007c9727b5265f7632c2fa7415b4689351594"},
     {file = "greenlet-3.2.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:81701fd84f26330f0d5f4944d4e92e61afe6319dcd9775e39396e39d7c3e5f98"},
-    {file = "greenlet-3.2.4-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:28a3c6b7cd72a96f61b0e4b2a36f681025b60ae4779cc73c1535eb5f29560b10"},
-    {file = "greenlet-3.2.4-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:52206cd642670b0b320a1fd1cbfd95bca0e043179c1d8a045f2c6109dfe973be"},
     {file = "greenlet-3.2.4-cp39-cp39-win32.whl", hash = "sha256:65458b409c1ed459ea899e939f0e1cdb14f58dbc803f2f93c5eab5694d32671b"},
     {file = "greenlet-3.2.4-cp39-cp39-win_amd64.whl", hash = "sha256:d2e685ade4dafd447ede19c31277a224a239a0a1a4eca4e6390efedf20260cfb"},
     {file = "greenlet-3.2.4.tar.gz", hash = "sha256:0dca0d95ff849f9a364385f36ab49f50065d76964944638be9691e1832e9f86d"},
@@ -3180,87 +3166,83 @@ protobuf = ">=3.20.2,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4
 
 [[package]]
 name = "grpcio"
-version = "1.67.1"
+version = "1.74.0"
 description = "HTTP/2-based RPC framework"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "grpcio-1.67.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:8b0341d66a57f8a3119b77ab32207072be60c9bf79760fa609c5609f2deb1f3f"},
-    {file = "grpcio-1.67.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:f5a27dddefe0e2357d3e617b9079b4bfdc91341a91565111a21ed6ebbc51b22d"},
-    {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:43112046864317498a33bdc4797ae6a268c36345a910de9b9c17159d8346602f"},
-    {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9b929f13677b10f63124c1a410994a401cdd85214ad83ab67cc077fc7e480f0"},
-    {file = "grpcio-1.67.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7d1797a8a3845437d327145959a2c0c47c05947c9eef5ff1a4c80e499dcc6fa"},
-    {file = "grpcio-1.67.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0489063974d1452436139501bf6b180f63d4977223ee87488fe36858c5725292"},
-    {file = "grpcio-1.67.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9fd042de4a82e3e7aca44008ee2fb5da01b3e5adb316348c21980f7f58adc311"},
-    {file = "grpcio-1.67.1-cp310-cp310-win32.whl", hash = "sha256:638354e698fd0c6c76b04540a850bf1db27b4d2515a19fcd5cf645c48d3eb1ed"},
-    {file = "grpcio-1.67.1-cp310-cp310-win_amd64.whl", hash = "sha256:608d87d1bdabf9e2868b12338cd38a79969eaf920c89d698ead08f48de9c0f9e"},
-    {file = "grpcio-1.67.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:7818c0454027ae3384235a65210bbf5464bd715450e30a3d40385453a85a70cb"},
-    {file = "grpcio-1.67.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ea33986b70f83844cd00814cee4451055cd8cab36f00ac64a31f5bb09b31919e"},
-    {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:c7a01337407dd89005527623a4a72c5c8e2894d22bead0895306b23c6695698f"},
-    {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80b866f73224b0634f4312a4674c1be21b2b4afa73cb20953cbbb73a6b36c3cc"},
-    {file = "grpcio-1.67.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9fff78ba10d4250bfc07a01bd6254a6d87dc67f9627adece85c0b2ed754fa96"},
-    {file = "grpcio-1.67.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8a23cbcc5bb11ea7dc6163078be36c065db68d915c24f5faa4f872c573bb400f"},
-    {file = "grpcio-1.67.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1a65b503d008f066e994f34f456e0647e5ceb34cfcec5ad180b1b44020ad4970"},
-    {file = "grpcio-1.67.1-cp311-cp311-win32.whl", hash = "sha256:e29ca27bec8e163dca0c98084040edec3bc49afd10f18b412f483cc68c712744"},
-    {file = "grpcio-1.67.1-cp311-cp311-win_amd64.whl", hash = "sha256:786a5b18544622bfb1e25cc08402bd44ea83edfb04b93798d85dca4d1a0b5be5"},
-    {file = "grpcio-1.67.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:267d1745894200e4c604958da5f856da6293f063327cb049a51fe67348e4f953"},
-    {file = "grpcio-1.67.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:85f69fdc1d28ce7cff8de3f9c67db2b0ca9ba4449644488c1e0303c146135ddb"},
-    {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f26b0b547eb8d00e195274cdfc63ce64c8fc2d3e2d00b12bf468ece41a0423a0"},
-    {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4422581cdc628f77302270ff839a44f4c24fdc57887dc2a45b7e53d8fc2376af"},
-    {file = "grpcio-1.67.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d7616d2ded471231c701489190379e0c311ee0a6c756f3c03e6a62b95a7146e"},
-    {file = "grpcio-1.67.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8a00efecde9d6fcc3ab00c13f816313c040a28450e5e25739c24f432fc6d3c75"},
-    {file = "grpcio-1.67.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:699e964923b70f3101393710793289e42845791ea07565654ada0969522d0a38"},
-    {file = "grpcio-1.67.1-cp312-cp312-win32.whl", hash = "sha256:4e7b904484a634a0fff132958dabdb10d63e0927398273917da3ee103e8d1f78"},
-    {file = "grpcio-1.67.1-cp312-cp312-win_amd64.whl", hash = "sha256:5721e66a594a6c4204458004852719b38f3d5522082be9061d6510b455c90afc"},
-    {file = "grpcio-1.67.1-cp313-cp313-linux_armv7l.whl", hash = "sha256:aa0162e56fd10a5547fac8774c4899fc3e18c1aa4a4759d0ce2cd00d3696ea6b"},
-    {file = "grpcio-1.67.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:beee96c8c0b1a75d556fe57b92b58b4347c77a65781ee2ac749d550f2a365dc1"},
-    {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:a93deda571a1bf94ec1f6fcda2872dad3ae538700d94dc283c672a3b508ba3af"},
-    {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e6f255980afef598a9e64a24efce87b625e3e3c80a45162d111a461a9f92955"},
-    {file = "grpcio-1.67.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e838cad2176ebd5d4a8bb03955138d6589ce9e2ce5d51c3ada34396dbd2dba8"},
-    {file = "grpcio-1.67.1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:a6703916c43b1d468d0756c8077b12017a9fcb6a1ef13faf49e67d20d7ebda62"},
-    {file = "grpcio-1.67.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:917e8d8994eed1d86b907ba2a61b9f0aef27a2155bca6cbb322430fc7135b7bb"},
-    {file = "grpcio-1.67.1-cp313-cp313-win32.whl", hash = "sha256:e279330bef1744040db8fc432becc8a727b84f456ab62b744d3fdb83f327e121"},
-    {file = "grpcio-1.67.1-cp313-cp313-win_amd64.whl", hash = "sha256:fa0c739ad8b1996bd24823950e3cb5152ae91fca1c09cc791190bf1627ffefba"},
-    {file = "grpcio-1.67.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:178f5db771c4f9a9facb2ab37a434c46cb9be1a75e820f187ee3d1e7805c4f65"},
-    {file = "grpcio-1.67.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0f3e49c738396e93b7ba9016e153eb09e0778e776df6090c1b8c91877cc1c426"},
-    {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:24e8a26dbfc5274d7474c27759b54486b8de23c709d76695237515bc8b5baeab"},
-    {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b6c16489326d79ead41689c4b84bc40d522c9a7617219f4ad94bc7f448c5085"},
-    {file = "grpcio-1.67.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60e6a4dcf5af7bbc36fd9f81c9f372e8ae580870a9e4b6eafe948cd334b81cf3"},
-    {file = "grpcio-1.67.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:95b5f2b857856ed78d72da93cd7d09b6db8ef30102e5e7fe0961fe4d9f7d48e8"},
-    {file = "grpcio-1.67.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b49359977c6ec9f5d0573ea4e0071ad278ef905aa74e420acc73fd28ce39e9ce"},
-    {file = "grpcio-1.67.1-cp38-cp38-win32.whl", hash = "sha256:f5b76ff64aaac53fede0cc93abf57894ab2a7362986ba22243d06218b93efe46"},
-    {file = "grpcio-1.67.1-cp38-cp38-win_amd64.whl", hash = "sha256:804c6457c3cd3ec04fe6006c739579b8d35c86ae3298ffca8de57b493524b771"},
-    {file = "grpcio-1.67.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:a25bdea92b13ff4d7790962190bf6bf5c4639876e01c0f3dda70fc2769616335"},
-    {file = "grpcio-1.67.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:cdc491ae35a13535fd9196acb5afe1af37c8237df2e54427be3eecda3653127e"},
-    {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:85f862069b86a305497e74d0dc43c02de3d1d184fc2c180993aa8aa86fbd19b8"},
-    {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ec74ef02010186185de82cc594058a3ccd8d86821842bbac9873fd4a2cf8be8d"},
-    {file = "grpcio-1.67.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01f616a964e540638af5130469451cf580ba8c7329f45ca998ab66e0c7dcdb04"},
-    {file = "grpcio-1.67.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:299b3d8c4f790c6bcca485f9963b4846dd92cf6f1b65d3697145d005c80f9fe8"},
-    {file = "grpcio-1.67.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:60336bff760fbb47d7e86165408126f1dded184448e9a4c892189eb7c9d3f90f"},
-    {file = "grpcio-1.67.1-cp39-cp39-win32.whl", hash = "sha256:5ed601c4c6008429e3d247ddb367fe8c7259c355757448d7c1ef7bd4a6739e8e"},
-    {file = "grpcio-1.67.1-cp39-cp39-win_amd64.whl", hash = "sha256:5db70d32d6703b89912af16d6d45d78406374a8b8ef0d28140351dd0ec610e98"},
-    {file = "grpcio-1.67.1.tar.gz", hash = "sha256:3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732"},
+    {file = "grpcio-1.74.0-cp310-cp310-linux_armv7l.whl", hash = "sha256:85bd5cdf4ed7b2d6438871adf6afff9af7096486fcf51818a81b77ef4dd30907"},
+    {file = "grpcio-1.74.0-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:68c8ebcca945efff9d86d8d6d7bfb0841cf0071024417e2d7f45c5e46b5b08eb"},
+    {file = "grpcio-1.74.0-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:e154d230dc1bbbd78ad2fdc3039fa50ad7ffcf438e4eb2fa30bce223a70c7486"},
+    {file = "grpcio-1.74.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8978003816c7b9eabe217f88c78bc26adc8f9304bf6a594b02e5a49b2ef9c11"},
+    {file = "grpcio-1.74.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c3d7bd6e3929fd2ea7fbc3f562e4987229ead70c9ae5f01501a46701e08f1ad9"},
+    {file = "grpcio-1.74.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:136b53c91ac1d02c8c24201bfdeb56f8b3ac3278668cbb8e0ba49c88069e1bdc"},
+    {file = "grpcio-1.74.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fe0f540750a13fd8e5da4b3eaba91a785eea8dca5ccd2bc2ffe978caa403090e"},
+    {file = "grpcio-1.74.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4e4181bfc24413d1e3a37a0b7889bea68d973d4b45dd2bc68bb766c140718f82"},
+    {file = "grpcio-1.74.0-cp310-cp310-win32.whl", hash = "sha256:1733969040989f7acc3d94c22f55b4a9501a30f6aaacdbccfaba0a3ffb255ab7"},
+    {file = "grpcio-1.74.0-cp310-cp310-win_amd64.whl", hash = "sha256:9e912d3c993a29df6c627459af58975b2e5c897d93287939b9d5065f000249b5"},
+    {file = "grpcio-1.74.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:69e1a8180868a2576f02356565f16635b99088da7df3d45aaa7e24e73a054e31"},
+    {file = "grpcio-1.74.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:8efe72fde5500f47aca1ef59495cb59c885afe04ac89dd11d810f2de87d935d4"},
+    {file = "grpcio-1.74.0-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a8f0302f9ac4e9923f98d8e243939a6fb627cd048f5cd38595c97e38020dffce"},
+    {file = "grpcio-1.74.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f609a39f62a6f6f05c7512746798282546358a37ea93c1fcbadf8b2fed162e3"},
+    {file = "grpcio-1.74.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c98e0b7434a7fa4e3e63f250456eaef52499fba5ae661c58cc5b5477d11e7182"},
+    {file = "grpcio-1.74.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:662456c4513e298db6d7bd9c3b8df6f75f8752f0ba01fb653e252ed4a59b5a5d"},
+    {file = "grpcio-1.74.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3d14e3c4d65e19d8430a4e28ceb71ace4728776fd6c3ce34016947474479683f"},
+    {file = "grpcio-1.74.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bf949792cee20d2078323a9b02bacbbae002b9e3b9e2433f2741c15bdeba1c4"},
+    {file = "grpcio-1.74.0-cp311-cp311-win32.whl", hash = "sha256:55b453812fa7c7ce2f5c88be3018fb4a490519b6ce80788d5913f3f9d7da8c7b"},
+    {file = "grpcio-1.74.0-cp311-cp311-win_amd64.whl", hash = "sha256:86ad489db097141a907c559988c29718719aa3e13370d40e20506f11b4de0d11"},
+    {file = "grpcio-1.74.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:8533e6e9c5bd630ca98062e3a1326249e6ada07d05acf191a77bc33f8948f3d8"},
+    {file = "grpcio-1.74.0-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:2918948864fec2a11721d91568effffbe0a02b23ecd57f281391d986847982f6"},
+    {file = "grpcio-1.74.0-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:60d2d48b0580e70d2e1954d0d19fa3c2e60dd7cbed826aca104fff518310d1c5"},
+    {file = "grpcio-1.74.0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3601274bc0523f6dc07666c0e01682c94472402ac2fd1226fd96e079863bfa49"},
+    {file = "grpcio-1.74.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:176d60a5168d7948539def20b2a3adcce67d72454d9ae05969a2e73f3a0feee7"},
+    {file = "grpcio-1.74.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:e759f9e8bc908aaae0412642afe5416c9f983a80499448fcc7fab8692ae044c3"},
+    {file = "grpcio-1.74.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:9e7c4389771855a92934b2846bd807fc25a3dfa820fd912fe6bd8136026b2707"},
+    {file = "grpcio-1.74.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cce634b10aeab37010449124814b05a62fb5f18928ca878f1bf4750d1f0c815b"},
+    {file = "grpcio-1.74.0-cp312-cp312-win32.whl", hash = "sha256:885912559974df35d92219e2dc98f51a16a48395f37b92865ad45186f294096c"},
+    {file = "grpcio-1.74.0-cp312-cp312-win_amd64.whl", hash = "sha256:42f8fee287427b94be63d916c90399ed310ed10aadbf9e2e5538b3e497d269bc"},
+    {file = "grpcio-1.74.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:2bc2d7d8d184e2362b53905cb1708c84cb16354771c04b490485fa07ce3a1d89"},
+    {file = "grpcio-1.74.0-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:c14e803037e572c177ba54a3e090d6eb12efd795d49327c5ee2b3bddb836bf01"},
+    {file = "grpcio-1.74.0-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:f6ec94f0e50eb8fa1744a731088b966427575e40c2944a980049798b127a687e"},
+    {file = "grpcio-1.74.0-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:566b9395b90cc3d0d0c6404bc8572c7c18786ede549cdb540ae27b58afe0fb91"},
+    {file = "grpcio-1.74.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e1ea6176d7dfd5b941ea01c2ec34de9531ba494d541fe2057c904e601879f249"},
+    {file = "grpcio-1.74.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:64229c1e9cea079420527fa8ac45d80fc1e8d3f94deaa35643c381fa8d98f362"},
+    {file = "grpcio-1.74.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:0f87bddd6e27fc776aacf7ebfec367b6d49cad0455123951e4488ea99d9b9b8f"},
+    {file = "grpcio-1.74.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:3b03d8f2a07f0fea8c8f74deb59f8352b770e3900d143b3d1475effcb08eec20"},
+    {file = "grpcio-1.74.0-cp313-cp313-win32.whl", hash = "sha256:b6a73b2ba83e663b2480a90b82fdae6a7aa6427f62bf43b29912c0cfd1aa2bfa"},
+    {file = "grpcio-1.74.0-cp313-cp313-win_amd64.whl", hash = "sha256:fd3c71aeee838299c5887230b8a1822795325ddfea635edd82954c1eaa831e24"},
+    {file = "grpcio-1.74.0-cp39-cp39-linux_armv7l.whl", hash = "sha256:4bc5fca10aaf74779081e16c2bcc3d5ec643ffd528d9e7b1c9039000ead73bae"},
+    {file = "grpcio-1.74.0-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:6bab67d15ad617aff094c382c882e0177637da73cbc5532d52c07b4ee887a87b"},
+    {file = "grpcio-1.74.0-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:655726919b75ab3c34cdad39da5c530ac6fa32696fb23119e36b64adcfca174a"},
+    {file = "grpcio-1.74.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a2b06afe2e50ebfd46247ac3ba60cac523f54ec7792ae9ba6073c12daf26f0a"},
+    {file = "grpcio-1.74.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f251c355167b2360537cf17bea2cf0197995e551ab9da6a0a59b3da5e8704f9"},
+    {file = "grpcio-1.74.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8f7b5882fb50632ab1e48cb3122d6df55b9afabc265582808036b6e51b9fd6b7"},
+    {file = "grpcio-1.74.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:834988b6c34515545b3edd13e902c1acdd9f2465d386ea5143fb558f153a7176"},
+    {file = "grpcio-1.74.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:22b834cef33429ca6cc28303c9c327ba9a3fafecbf62fae17e9a7b7163cc43ac"},
+    {file = "grpcio-1.74.0-cp39-cp39-win32.whl", hash = "sha256:7d95d71ff35291bab3f1c52f52f474c632db26ea12700c2ff0ea0532cb0b5854"},
+    {file = "grpcio-1.74.0-cp39-cp39-win_amd64.whl", hash = "sha256:ecde9ab49f58433abe02f9ed076c7b5be839cf0153883a6d23995937a82392fa"},
+    {file = "grpcio-1.74.0.tar.gz", hash = "sha256:80d1f4fbb35b0742d3e3d3bb654b7381cd5f015f8497279a1e9c21ba623e01b1"},
 ]
 
 [package.extras]
-protobuf = ["grpcio-tools (>=1.67.1)"]
+protobuf = ["grpcio-tools (>=1.74.0)"]
 
 [[package]]
 name = "grpcio-status"
-version = "1.67.1"
+version = "1.71.2"
 description = "Status proto mapping for gRPC"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "grpcio_status-1.67.1-py3-none-any.whl", hash = "sha256:16e6c085950bdacac97c779e6a502ea671232385e6e37f258884d6883392c2bd"},
-    {file = "grpcio_status-1.67.1.tar.gz", hash = "sha256:2bf38395e028ceeecfd8866b081f61628114b384da7d51ae064ddc8d766a5d11"},
+    {file = "grpcio_status-1.71.2-py3-none-any.whl", hash = "sha256:803c98cb6a8b7dc6dbb785b1111aed739f241ab5e9da0bba96888aa74704cfd3"},
+    {file = "grpcio_status-1.71.2.tar.gz", hash = "sha256:c7a97e176df71cdc2c179cd1847d7fc86cca5832ad12e9798d7fed6b7a1aab50"},
 ]
 
 [package.dependencies]
 googleapis-common-protos = ">=1.5.5"
-grpcio = ">=1.67.1"
+grpcio = ">=1.71.2"
 protobuf = ">=5.26.1,<6.0dev"
 
 [[package]]
@@ -4558,39 +4540,42 @@ valkey = ["valkey (>=6)"]
 
 [[package]]
 name = "litellm"
-version = "1.80.7"
+version = "1.77.7"
 description = "Library to easily interface with LLM API providers"
 optional = false
-python-versions = "<4.0,>=3.9"
+python-versions = ">=3.8.1,<4.0, !=3.9.7"
 groups = ["main"]
-files = [
-    {file = "litellm-1.80.7-py3-none-any.whl", hash = "sha256:f7d993f78c1e0e4e1202b2a925cc6540b55b6e5fb055dd342d88b145ab3102ed"},
-    {file = "litellm-1.80.7.tar.gz", hash = "sha256:3977a8d195aef842d01c18bf9e22984829363c6a4b54daf9a43c9dd9f190b42c"},
-]
+files = []
+develop = false
 
 [package.dependencies]
 aiohttp = ">=3.10"
 click = "*"
 fastuuid = ">=0.13.0"
-grpcio = ">=1.62.3,<1.68.0"
 httpx = ">=0.23.0"
 importlib-metadata = ">=6.8.0"
-jinja2 = ">=3.1.2,<4.0.0"
-jsonschema = ">=4.22.0,<5.0.0"
-openai = ">=2.8.0"
-pydantic = ">=2.5.0,<3.0.0"
+jinja2 = "^3.1.2"
+jsonschema = "^4.22.0"
+openai = ">=1.99.5"
+pydantic = "^2.5.0"
 python-dotenv = ">=0.2.0"
 tiktoken = ">=0.7.0"
 tokenizers = "*"
 
 [package.extras]
 caching = ["diskcache (>=5.6.1,<6.0.0)"]
-extra-proxy = ["azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0)"]
+extra-proxy = ["azure-identity (>=1.15.0,<2.0.0)", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-iam (>=2.19.1,<3.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "redisvl (>=0.4.1,<0.5.0) ; python_version >= \"3.9\" and python_version < \"3.14\"", "resend (>=0.8.0,<0.9.0)"]
 mlflow = ["mlflow (>3.1.4) ; python_version >= \"3.10\""]
-proxy = ["PyJWT (>=2.10.1,<3.0.0) ; python_version >= \"3.9\"", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0) ; python_version >= \"3.9\"", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.120.1)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.22)", "litellm-proxy-extras (==0.4.9)", "mcp (>=1.21.2,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "soundfile (>=0.12.1,<0.13.0)", "uvicorn (>=0.31.1,<0.32.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=15.0.1,<16.0.0)"]
-semantic-router = ["semantic-router (>=0.1.12) ; python_version >= \"3.9\" and python_version < \"3.14\""]
+proxy = ["PyJWT (>=2.8.0,<3.0.0)", "apscheduler (>=3.10.4,<4.0.0)", "azure-identity (>=1.15.0,<2.0.0)", "azure-storage-blob (>=12.25.1,<13.0.0)", "backoff", "boto3 (==1.36.0)", "cryptography", "fastapi (>=0.115.5,<0.116.0)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=23.0.0,<24.0.0)", "litellm-enterprise (==0.1.20)", "litellm-proxy-extras (==0.2.25)", "mcp (>=1.10.0,<2.0.0) ; python_version >= \"3.10\"", "orjson (>=3.9.7,<4.0.0)", "polars (>=1.31.0,<2.0.0) ; python_version >= \"3.10\"", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rich (==13.7.1)", "rq", "uvicorn (>=0.29.0,<0.30.0)", "uvloop (>=0.21.0,<0.22.0) ; sys_platform != \"win32\"", "websockets (>=13.1.0,<14.0.0)"]
+semantic-router = ["semantic-router ; python_version >= \"3.9\""]
 utils = ["numpydoc"]
 
+[package.source]
+type = "git"
+url = "https://github.com/BerriAI/litellm.git"
+reference = "v1.77.7.dev9"
+resolved_reference = "763d2f8ccdd8412dbe6d4ac0e136d9ac34dcd4c0"
+
 [[package]]
 name = "llvmlite"
 version = "0.44.0"
@@ -5659,28 +5644,28 @@ pydantic = ">=2.9"
 
 [[package]]
 name = "openai"
-version = "2.8.0"
+version = "1.99.9"
 description = "The official Python library for the openai API"
 optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.8"
 groups = ["main", "test"]
 files = [
-    {file = "openai-2.8.0-py3-none-any.whl", hash = "sha256:ba975e347f6add2fe13529ccb94d54a578280e960765e5224c34b08d7e029ddf"},
-    {file = "openai-2.8.0.tar.gz", hash = "sha256:4851908f6d6fcacbd47ba659c5ac084f7725b752b6bfa1e948b6fbfc111a6bad"},
+    {file = "openai-1.99.9-py3-none-any.whl", hash = "sha256:9dbcdb425553bae1ac5d947147bebbd630d91bbfc7788394d4c4f3a35682ab3a"},
+    {file = "openai-1.99.9.tar.gz", hash = "sha256:f2082d155b1ad22e83247c3de3958eb4255b20ccf4a1de2e6681b6957b554e92"},
 ]
 
 [package.dependencies]
 anyio = ">=3.5.0,<5"
 distro = ">=1.7.0,<2"
 httpx = ">=0.23.0,<1"
-jiter = ">=0.10.0,<1"
+jiter = ">=0.4.0,<1"
 pydantic = ">=1.9.0,<3"
 sniffio = "*"
 tqdm = ">4"
 typing-extensions = ">=4.11,<5"
 
 [package.extras]
-aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.9)"]
+aiohttp = ["aiohttp", "httpx-aiohttp (>=0.1.8)"]
 datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
 realtime = ["websockets (>=13,<16)"]
 voice-helpers = ["numpy (>=2.0.2)", "sounddevice (>=0.5.1)"]
@@ -5835,14 +5820,14 @@ llama = ["llama-index (>=0.12.29,<0.13.0)", "llama-index-core (>=0.12.29,<0.13.0
 
 [[package]]
 name = "openhands-agent-server"
-version = "1.5.2"
+version = "1.3.0"
 description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
 optional = false
 python-versions = ">=3.12"
 groups = ["main"]
 files = [
-    {file = "openhands_agent_server-1.5.2-py3-none-any.whl", hash = "sha256:7a368f61036f85446f566b9f6f9d6c7318684776cf2293daa5bce3ee19ac077d"},
-    {file = "openhands_agent_server-1.5.2.tar.gz", hash = "sha256:dfaf5583dd71dae933643a8f8160156ce6fa7ed20db5cc3c45465b079bc576cd"},
+    {file = "openhands_agent_server-1.3.0-py3-none-any.whl", hash = "sha256:2f87f790c740dc3fb81821c5f9fa375af875fbb937ebca3baa6dc5c035035b3c"},
+    {file = "openhands_agent_server-1.3.0.tar.gz", hash = "sha256:0a83ae77373f5c41d0ba0e22d8f0f6144d54d55784183a50b7c098c96cd5135c"},
 ]
 
 [package.dependencies]
@@ -5850,7 +5835,6 @@ aiosqlite = ">=0.19"
 alembic = ">=1.13"
 docker = ">=7.1,<8"
 fastapi = ">=0.104"
-openhands-sdk = "*"
 pydantic = ">=2"
 sqlalchemy = ">=2"
 uvicorn = ">=0.31.1"
@@ -5895,15 +5879,15 @@ json-repair = "*"
 jupyter_kernel_gateway = "*"
 kubernetes = "^33.1.0"
 libtmux = ">=0.46.2"
-litellm = ">=1.74.3, <=1.80.7, !=1.64.4, !=1.67.*"
+litellm = ">=1.74.3, <1.78.0, !=1.64.4, !=1.67.*"
 lmnr = "^0.7.20"
 memory-profiler = "^0.61.0"
 numpy = "*"
-openai = "2.8.0"
+openai = "1.99.9"
 openhands-aci = "0.3.2"
-openhands-agent-server = "1.5.2"
-openhands-sdk = "1.5.2"
-openhands-tools = "1.5.2"
+openhands-agent-server = "1.3.0"
+openhands-sdk = "1.3.0"
+openhands-tools = "1.3.0"
 opentelemetry-api = "^1.33.1"
 opentelemetry-exporter-otlp-proto-grpc = "^1.33.1"
 pathspec = "^0.12.1"
@@ -5959,21 +5943,21 @@ url = ".."
 
 [[package]]
 name = "openhands-sdk"
-version = "1.5.2"
+version = "1.3.0"
 description = "OpenHands SDK - Core functionality for building AI agents"
 optional = false
 python-versions = ">=3.12"
 groups = ["main"]
 files = [
-    {file = "openhands_sdk-1.5.2-py3-none-any.whl", hash = "sha256:593430e9c8729e345fce3fca7e9a9a7ef084a08222d6ba42113e6ba5f6e9f15d"},
-    {file = "openhands_sdk-1.5.2.tar.gz", hash = "sha256:798aa8f8ccd84b15deb418c4301d00f33da288bc1a8d41efa5cc47c10aaf3fd6"},
+    {file = "openhands_sdk-1.3.0-py3-none-any.whl", hash = "sha256:feee838346f8e60ea3e4d3391de7cb854314eb8b3c9e3dbbb56f98a784aadc56"},
+    {file = "openhands_sdk-1.3.0.tar.gz", hash = "sha256:2d060803a78de462121b56dea717a66356922deb02276f37b29fae8af66343fb"},
 ]
 
 [package.dependencies]
 deprecation = ">=2.1.0"
 fastmcp = ">=2.11.3"
 httpx = ">=0.27.0"
-litellm = ">=1.80.7"
+litellm = ">=1.77.7.dev9"
 lmnr = ">=0.7.20"
 pydantic = ">=2.11.7"
 python-frontmatter = ">=1.1.0"
@@ -5986,14 +5970,14 @@ boto3 = ["boto3 (>=1.35.0)"]
 
 [[package]]
 name = "openhands-tools"
-version = "1.5.2"
+version = "1.3.0"
 description = "OpenHands Tools - Runtime tools for AI agents"
 optional = false
 python-versions = ">=3.12"
 groups = ["main"]
 files = [
-    {file = "openhands_tools-1.5.2-py3-none-any.whl", hash = "sha256:33e9c2af65aaa7b6b9a10b42d2fb11137e6b35e7ac02a4b9269ef37b5c79cc01"},
-    {file = "openhands_tools-1.5.2.tar.gz", hash = "sha256:4644a24144fbdf630fb0edc303526b4add61b3fbe7a7434da73f231312c34846"},
+    {file = "openhands_tools-1.3.0-py3-none-any.whl", hash = "sha256:f31056d87c3058ac92709f9161c7c602daeee3ed0cb4439097b43cda105ed03e"},
+    {file = "openhands_tools-1.3.0.tar.gz", hash = "sha256:3da46f09e28593677d3e17252ce18584fcc13caab1a73213e66bd7edca2cebe0"},
 ]
 
 [package.dependencies]
@@ -6005,7 +5989,6 @@ func-timeout = ">=4.3.5"
 libtmux = ">=0.46.2"
 openhands-sdk = "*"
 pydantic = ">=2.11.7"
-tom-swe = ">=1.0.3"
 
 [[package]]
 name = "openpyxl"
@@ -13322,31 +13305,6 @@ dev = ["tokenizers[testing]"]
 docs = ["setuptools-rust", "sphinx", "sphinx-rtd-theme"]
 testing = ["black (==22.3)", "datasets", "numpy", "pytest", "pytest-asyncio", "requests", "ruff"]
 
-[[package]]
-name = "tom-swe"
-version = "1.0.3"
-description = "Theory of Mind modeling for Software Engineering assistants"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "tom_swe-1.0.3-py3-none-any.whl", hash = "sha256:7b1172b29eb5c8fb7f1975016e7b6a238511b9ac2a7a980bd400dcb4e29773f2"},
-    {file = "tom_swe-1.0.3.tar.gz", hash = "sha256:57c97d0104e563f15bd39edaf2aa6ac4c3e9444afd437fb92458700d22c6c0f5"},
-]
-
-[package.dependencies]
-jinja2 = ">=3.0.0"
-json-repair = ">=0.1.0"
-litellm = ">=1.0.0"
-pydantic = ">=2.0.0"
-python-dotenv = ">=1.0.0"
-tiktoken = ">=0.8.0"
-tqdm = ">=4.65.0"
-
-[package.extras]
-dev = ["aiofiles (>=23.0.0)", "black (>=22.0.0)", "datasets (>=2.0.0)", "fastapi (>=0.104.0)", "httpx (>=0.25.0)", "huggingface-hub (>=0.0.0)", "isort (>=5.0.0)", "mypy (>=1.0.0)", "numpy (>=1.24.0)", "pandas (>=2.0.0)", "pre-commit (>=3.6.0)", "pytest (>=7.0.0)", "pytest-cov (>=6.2.1)", "rich (>=13.0.0)", "ruff (>=0.3.0)", "typing-extensions (>=4.0.0)", "uvicorn (>=0.24.0)"]
-search = ["bm25s (>=0.2.0)", "pystemmer (>=2.2.0)"]
-
 [[package]]
 name = "toml"
 version = "0.10.2"

enterprise/server/auth/saas_user_auth.py

@@ -252,12 +252,7 @@ def get_api_key_from_header(request: Request):
     # This is a temp hack
     # Streamable HTTP MCP Client works via redirect requests, but drops the Authorization header for reason
     # We include `X-Session-API-Key` header by default due to nested runtimes, so it used as a drop in replacement here
-    session_api_key = request.headers.get('X-Session-API-Key')
-    if session_api_key:
-        return session_api_key
-
-    # Fallback to X-Access-Token header as an additional option
-    return request.headers.get('X-Access-Token')
+    return request.headers.get('X-Session-API-Key')
 
 
 async def saas_user_auth_from_bearer(request: Request) -> SaasUserAuth | None:

enterprise/server/routes/integration/github.py

@@ -1,4 +1,3 @@
-import asyncio
 import hashlib
 import hmac
 import os
@@ -59,8 +58,7 @@ async def github_events(
         )
 
     try:
-        # Add timeout to prevent hanging on slow/stalled clients
-        payload = await asyncio.wait_for(request.body(), timeout=15.0)
+        payload = await request.body()
         verify_github_signature(payload, x_hub_signature_256)
 
         payload_data = await request.json()
@@ -80,12 +78,6 @@ async def github_events(
             status_code=200,
             content={'message': 'GitHub events endpoint reached successfully.'},
         )
-    except asyncio.TimeoutError:
-        logger.warning('GitHub webhook request timed out waiting for request body')
-        return JSONResponse(
-            status_code=408,
-            content={'error': 'Request timeout - client took too long to send data.'},
-        )
     except Exception as e:
         logger.exception(f'Error processing GitHub event: {e}')
         return JSONResponse(status_code=400, content={'error': 'Invalid payload.'})

enterprise/server/saas_nested_conversation_manager.py

@@ -70,11 +70,6 @@ RUNTIME_CONVERSATION_URL = RUNTIME_URL_PATTERN + (
     else '/api/conversations/{conversation_id}'
 )
 
-RUNTIME_USERNAME = os.getenv('RUNTIME_USERNAME')
-SU_TO_USER = os.getenv('SU_TO_USER', 'false')
-truthy = {'1', 'true', 't', 'yes', 'y', 'on'}
-SU_TO_USER = str(SU_TO_USER.lower() in truthy).lower()
-
 # Time in seconds before a Redis entry is considered expired if not refreshed
 _REDIS_ENTRY_TIMEOUT_SECONDS = 300
 
@@ -777,11 +772,7 @@ class SaasNestedConversationManager(ConversationManager):
         env_vars['SERVE_FRONTEND'] = '0'
         env_vars['RUNTIME'] = 'local'
         # TODO: In the long term we may come up with a more secure strategy for user management within the nested runtime.
-        env_vars['USER'] = (
-            RUNTIME_USERNAME
-            if RUNTIME_USERNAME
-            else ('openhands' if config.run_as_openhands else 'root')
-        )
+        env_vars['USER'] = 'openhands' if config.run_as_openhands else 'root'
         env_vars['PERMITTED_CORS_ORIGINS'] = ','.join(PERMITTED_CORS_ORIGINS)
         env_vars['port'] = '60000'
         # TODO: These values are static in the runtime-api project, but do not get copied into the runtime ENV
@@ -798,7 +789,6 @@ class SaasNestedConversationManager(ConversationManager):
         env_vars['INITIAL_NUM_WARM_SERVERS'] = '1'
         env_vars['INIT_GIT_IN_EMPTY_WORKSPACE'] = '1'
         env_vars['ENABLE_V1'] = '0'
-        env_vars['SU_TO_USER'] = SU_TO_USER
 
         # We need this for LLM traces tracking to identify the source of the LLM calls
         env_vars['WEB_HOST'] = WEB_HOST

enterprise/tests/unit/integrations/test_resolver_context.py

@@ -1,133 +0,0 @@
-"""Test for ResolverUserContext get_secrets conversion logic.
-
-This test focuses on testing the actual ResolverUserContext implementation.
-"""
-
-from types import MappingProxyType
-from unittest.mock import AsyncMock
-
-import pytest
-from pydantic import SecretStr
-
-from enterprise.integrations.resolver_context import ResolverUserContext
-
-# Import the real classes we want to test
-from openhands.integrations.provider import CustomSecret
-
-# Import the SDK types we need for testing
-from openhands.sdk.secret import SecretSource, StaticSecret
-from openhands.storage.data_models.secrets import Secrets
-
-
-@pytest.fixture
-def mock_saas_user_auth():
-    """Mock SaasUserAuth for testing."""
-    return AsyncMock()
-
-
-@pytest.fixture
-def resolver_context(mock_saas_user_auth):
-    """Create a ResolverUserContext instance for testing."""
-    return ResolverUserContext(saas_user_auth=mock_saas_user_auth)
-
-
-def create_custom_secret(value: str, description: str = 'Test secret') -> CustomSecret:
-    """Helper to create CustomSecret instances."""
-    return CustomSecret(secret=SecretStr(value), description=description)
-
-
-def create_secrets(custom_secrets_dict: dict[str, CustomSecret]) -> Secrets:
-    """Helper to create Secrets instances."""
-    return Secrets(custom_secrets=MappingProxyType(custom_secrets_dict))
-
-
-@pytest.mark.asyncio
-async def test_get_secrets_converts_custom_to_static(
-    resolver_context, mock_saas_user_auth
-):
-    """Test that get_secrets correctly converts CustomSecret objects to StaticSecret objects."""
-    # Arrange
-    secrets = create_secrets(
-        {
-            'TEST_SECRET_1': create_custom_secret('secret_value_1'),
-            'TEST_SECRET_2': create_custom_secret('secret_value_2'),
-        }
-    )
-    mock_saas_user_auth.get_secrets.return_value = secrets
-
-    # Act
-    result = await resolver_context.get_secrets()
-
-    # Assert
-    assert len(result) == 2
-    assert all(isinstance(secret, StaticSecret) for secret in result.values())
-    assert result['TEST_SECRET_1'].value.get_secret_value() == 'secret_value_1'
-    assert result['TEST_SECRET_2'].value.get_secret_value() == 'secret_value_2'
-
-
-@pytest.mark.asyncio
-async def test_get_secrets_with_special_characters(
-    resolver_context, mock_saas_user_auth
-):
-    """Test that secret values with special characters are preserved during conversion."""
-    # Arrange
-    special_value = 'very_secret_password_123!@#$%^&*()'
-    secrets = create_secrets({'SPECIAL_SECRET': create_custom_secret(special_value)})
-    mock_saas_user_auth.get_secrets.return_value = secrets
-
-    # Act
-    result = await resolver_context.get_secrets()
-
-    # Assert
-    assert len(result) == 1
-    assert isinstance(result['SPECIAL_SECRET'], StaticSecret)
-    assert result['SPECIAL_SECRET'].value.get_secret_value() == special_value
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
-    'secrets_input,expected_result',
-    [
-        (None, {}),  # No secrets available
-        (create_secrets({}), {}),  # Empty custom secrets
-    ],
-)
-async def test_get_secrets_empty_cases(
-    resolver_context, mock_saas_user_auth, secrets_input, expected_result
-):
-    """Test that get_secrets handles empty cases correctly."""
-    # Arrange
-    mock_saas_user_auth.get_secrets.return_value = secrets_input
-
-    # Act
-    result = await resolver_context.get_secrets()
-
-    # Assert
-    assert result == expected_result
-
-
-def test_static_secret_is_valid_secret_source():
-    """Test that StaticSecret is a valid SecretSource for SDK validation."""
-    # Arrange & Act
-    static_secret = StaticSecret(value='test_secret_123')
-
-    # Assert
-    assert isinstance(static_secret, StaticSecret)
-    assert isinstance(static_secret, SecretSource)
-    assert static_secret.value.get_secret_value() == 'test_secret_123'
-
-
-def test_custom_to_static_conversion():
-    """Test the complete conversion flow from CustomSecret to StaticSecret."""
-    # Arrange
-    secret_value = 'conversion_test_secret'
-    custom_secret = create_custom_secret(secret_value, 'Conversion test')
-
-    # Act - simulate the conversion logic from the actual method
-    extracted_value = custom_secret.secret.get_secret_value()
-    static_secret = StaticSecret(value=extracted_value)
-
-    # Assert
-    assert isinstance(static_secret, StaticSecret)
-    assert isinstance(static_secret, SecretSource)
-    assert static_secret.value.get_secret_value() == secret_value

enterprise/tests/unit/test_get_user_v1_enabled_setting.py

@@ -1,132 +0,0 @@
-"""Unit tests for get_user_v1_enabled_setting function."""
-
-import os
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from integrations.github.github_view import get_user_v1_enabled_setting
-
-
-@pytest.fixture
-def mock_user_settings():
-    """Create a mock user settings object."""
-    settings = MagicMock()
-    settings.v1_enabled = True  # Default to True, can be overridden in tests
-    return settings
-
-
-@pytest.fixture
-def mock_settings_store(mock_user_settings):
-    """Create a mock settings store."""
-    store = MagicMock()
-    store.get_user_settings_by_keycloak_id = AsyncMock(return_value=mock_user_settings)
-    return store
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock config object."""
-    return MagicMock()
-
-
-@pytest.fixture
-def mock_session_maker():
-    """Create a mock session maker."""
-    return MagicMock()
-
-
-@pytest.fixture
-def mock_dependencies(
-    mock_settings_store, mock_config, mock_session_maker, mock_user_settings
-):
-    """Fixture that patches all the common dependencies."""
-    with patch(
-        'integrations.github.github_view.SaasSettingsStore',
-        return_value=mock_settings_store,
-    ) as mock_store_class, patch(
-        'integrations.github.github_view.get_config', return_value=mock_config
-    ) as mock_get_config, patch(
-        'integrations.github.github_view.session_maker', mock_session_maker
-    ), patch(
-        'integrations.github.github_view.call_sync_from_async',
-        return_value=mock_user_settings,
-    ) as mock_call_sync:
-        yield {
-            'store_class': mock_store_class,
-            'get_config': mock_get_config,
-            'session_maker': mock_session_maker,
-            'call_sync': mock_call_sync,
-            'settings_store': mock_settings_store,
-            'user_settings': mock_user_settings,
-        }
-
-
-class TestGetUserV1EnabledSetting:
-    """Test cases for get_user_v1_enabled_setting function."""
-
-    @pytest.mark.asyncio
-    @pytest.mark.parametrize(
-        'env_var_enabled,user_setting_enabled,expected_result',
-        [
-            (False, True, False),  # Env var disabled, user enabled -> False
-            (True, False, False),  # Env var enabled, user disabled -> False
-            (True, True, True),  # Both enabled -> True
-            (False, False, False),  # Both disabled -> False
-        ],
-    )
-    async def test_v1_enabled_combinations(
-        self, mock_dependencies, env_var_enabled, user_setting_enabled, expected_result
-    ):
-        """Test all combinations of environment variable and user setting values."""
-        mock_dependencies['user_settings'].v1_enabled = user_setting_enabled
-
-        with patch(
-            'integrations.github.github_view.ENABLE_V1_GITHUB_RESOLVER', env_var_enabled
-        ):
-            result = await get_user_v1_enabled_setting('test_user_id')
-            assert result is expected_result
-
-    @pytest.mark.asyncio
-    @pytest.mark.parametrize(
-        'env_var_value,env_var_bool,expected_result',
-        [
-            ('false', False, False),  # Environment variable 'false' -> False
-            ('true', True, True),  # Environment variable 'true' -> True
-        ],
-    )
-    async def test_environment_variable_integration(
-        self, mock_dependencies, env_var_value, env_var_bool, expected_result
-    ):
-        """Test that the function properly reads the ENABLE_V1_GITHUB_RESOLVER environment variable."""
-        mock_dependencies['user_settings'].v1_enabled = True
-
-        with patch.dict(
-            os.environ, {'ENABLE_V1_GITHUB_RESOLVER': env_var_value}
-        ), patch('integrations.utils.os.getenv', return_value=env_var_value), patch(
-            'integrations.github.github_view.ENABLE_V1_GITHUB_RESOLVER', env_var_bool
-        ):
-            result = await get_user_v1_enabled_setting('test_user_id')
-            assert result is expected_result
-
-    @pytest.mark.asyncio
-    async def test_function_calls_correct_methods(self, mock_dependencies):
-        """Test that the function calls the correct methods with correct parameters."""
-        mock_dependencies['user_settings'].v1_enabled = True
-
-        with patch('integrations.github.github_view.ENABLE_V1_GITHUB_RESOLVER', True):
-            result = await get_user_v1_enabled_setting('test_user_123')
-
-            # Verify the result
-            assert result is True
-
-            # Verify correct methods were called with correct parameters
-            mock_dependencies['get_config'].assert_called_once()
-            mock_dependencies['store_class'].assert_called_once_with(
-                user_id='test_user_123',
-                session_maker=mock_dependencies['session_maker'],
-                config=mock_dependencies['get_config'].return_value,
-            )
-            mock_dependencies['call_sync'].assert_called_once_with(
-                mock_dependencies['settings_store'].get_user_settings_by_keycloak_id,
-                'test_user_123',
-            )

enterprise/tests/unit/test_github_view.py

@@ -1,7 +1,6 @@
 from unittest import TestCase, mock
 from unittest.mock import MagicMock, patch
 
-import pytest
 from integrations.github.github_view import GithubFactory, GithubIssue, get_oh_labels
 from integrations.models import Message, SourceType
 from integrations.types import UserData
@@ -115,10 +114,8 @@ class TestGithubV1ConversationRouting(TestCase):
             title='Test Issue',
             description='Test issue description',
             previous_comments=[],
-            v1=False,
         )
 
-    @pytest.mark.asyncio
     @patch('integrations.github.github_view.get_user_v1_enabled_setting')
     @patch.object(GithubIssue, '_create_v0_conversation')
     @patch.object(GithubIssue, '_create_v1_conversation')
@@ -147,7 +144,6 @@ class TestGithubV1ConversationRouting(TestCase):
         )
         mock_create_v1.assert_not_called()
 
-    @pytest.mark.asyncio
     @patch('integrations.github.github_view.get_user_v1_enabled_setting')
     @patch.object(GithubIssue, '_create_v0_conversation')
     @patch.object(GithubIssue, '_create_v1_conversation')
@@ -176,7 +172,6 @@ class TestGithubV1ConversationRouting(TestCase):
         )
         mock_create_v0.assert_not_called()
 
-    @pytest.mark.asyncio
     @patch('integrations.github.github_view.get_user_v1_enabled_setting')
     @patch.object(GithubIssue, '_create_v0_conversation')
     @patch.object(GithubIssue, '_create_v1_conversation')

enterprise/tests/unit/test_saas_user_auth.py

@@ -535,115 +535,3 @@ def test_get_api_key_from_header_with_invalid_authorization_format():
 
     # Assert that None was returned
     assert api_key is None
-
-
-def test_get_api_key_from_header_with_x_access_token():
-    """Test that get_api_key_from_header extracts API key from X-Access-Token header."""
-    # Create a mock request with X-Access-Token header
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {'X-Access-Token': 'access_token_key'}
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that the API key was correctly extracted
-    assert api_key == 'access_token_key'
-
-
-def test_get_api_key_from_header_priority_authorization_over_x_access_token():
-    """Test that Authorization header takes priority over X-Access-Token header."""
-    # Create a mock request with both headers
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {
-        'Authorization': 'Bearer auth_api_key',
-        'X-Access-Token': 'access_token_key',
-    }
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that the API key from Authorization header was used
-    assert api_key == 'auth_api_key'
-
-
-def test_get_api_key_from_header_priority_x_session_over_x_access_token():
-    """Test that X-Session-API-Key header takes priority over X-Access-Token header."""
-    # Create a mock request with both headers
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {
-        'X-Session-API-Key': 'session_api_key',
-        'X-Access-Token': 'access_token_key',
-    }
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that the API key from X-Session-API-Key header was used
-    assert api_key == 'session_api_key'
-
-
-def test_get_api_key_from_header_all_three_headers():
-    """Test header priority when all three headers are present."""
-    # Create a mock request with all three headers
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {
-        'Authorization': 'Bearer auth_api_key',
-        'X-Session-API-Key': 'session_api_key',
-        'X-Access-Token': 'access_token_key',
-    }
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that the API key from Authorization header was used (highest priority)
-    assert api_key == 'auth_api_key'
-
-
-def test_get_api_key_from_header_invalid_authorization_fallback_to_x_access_token():
-    """Test that invalid Authorization header falls back to X-Access-Token."""
-    # Create a mock request with invalid Authorization header and X-Access-Token
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {
-        'Authorization': 'InvalidFormat api_key',
-        'X-Access-Token': 'access_token_key',
-    }
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that the API key from X-Access-Token header was used
-    assert api_key == 'access_token_key'
-
-
-def test_get_api_key_from_header_empty_headers():
-    """Test that empty header values are handled correctly."""
-    # Create a mock request with empty header values
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {
-        'Authorization': '',
-        'X-Session-API-Key': '',
-        'X-Access-Token': 'access_token_key',
-    }
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that the API key from X-Access-Token header was used
-    assert api_key == 'access_token_key'
-
-
-def test_get_api_key_from_header_bearer_with_empty_token():
-    """Test that Bearer header with empty token falls back to other headers."""
-    # Create a mock request with Bearer header with empty token
-    mock_request = MagicMock(spec=Request)
-    mock_request.headers = {
-        'Authorization': 'Bearer ',
-        'X-Access-Token': 'access_token_key',
-    }
-
-    # Call the function
-    api_key = get_api_key_from_header(mock_request)
-
-    # Assert that empty string from Bearer is returned (current behavior)
-    # This tests the current implementation behavior
-    assert api_key == ''

evaluation/README.md

@@ -1,10 +1,5 @@
 # Evaluation
 
-> [!WARNING]
-> **This directory is deprecated.** Our new benchmarks are located at [OpenHands/benchmarks](https://github.com/OpenHands/benchmarks).
->
-> If you have already implemented a benchmark in this directory and would like to contribute it, we are happy to have the contribution. However, if you are starting anew, please use the new location.
-
 This folder contains code and resources to run experiments and evaluations.
 
 ## For Benchmark Users

frontend/.npmrc

@@ -0,0 +1,2 @@
+public-hoist-pattern[]=*@nextui-org/*
+enable-pre-post-scripts=true

frontend/__tests__/components/browser.test.tsx

@@ -30,33 +30,61 @@ vi.mock("react-i18next", async () => {
   };
 });
 
+// Mock Zustand browser store
+let mockBrowserState = {
+  url: "https://example.com",
+  screenshotSrc: "",
+  setUrl: vi.fn(),
+  setScreenshotSrc: vi.fn(),
+  reset: vi.fn(),
+};
+
+vi.mock("#/stores/browser-store", () => ({
+  useBrowserStore: () => mockBrowserState,
+}));
+
+// Import the component after all mocks are set up
 import { BrowserPanel } from "#/components/features/browser/browser";
-import { useBrowserStore } from "#/stores/browser-store";
 
 describe("Browser", () => {
   afterEach(() => {
     vi.clearAllMocks();
+    // Reset the mock state
+    mockBrowserState = {
+      url: "https://example.com",
+      screenshotSrc: "",
+      setUrl: vi.fn(),
+      setScreenshotSrc: vi.fn(),
+      reset: vi.fn(),
+    };
   });
 
   it("renders a message if no screenshotSrc is provided", () => {
-    useBrowserStore.setState({
+    // Set the mock state for this test
+    mockBrowserState = {
       url: "https://example.com",
       screenshotSrc: "",
+      setUrl: vi.fn(),
+      setScreenshotSrc: vi.fn(),
       reset: vi.fn(),
-    });
+    };
 
     render(<BrowserPanel />);
 
+    // i18n empty message key
     expect(screen.getByText("BROWSER$NO_PAGE_LOADED")).toBeInTheDocument();
   });
 
   it("renders the url and a screenshot", () => {
-    useBrowserStore.setState({
+    // Set the mock state for this test
+    mockBrowserState = {
       url: "https://example.com",
       screenshotSrc:
         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mN0uGvyHwAFCAJS091fQwAAAABJRU5ErkJggg==",
+      setUrl: vi.fn(),
+      setScreenshotSrc: vi.fn(),
       reset: vi.fn(),
-    });
+    };
 
     render(<BrowserPanel />);
 

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

@@ -25,7 +25,10 @@ import { useUnifiedUploadFiles } from "#/hooks/mutation/use-unified-upload-files
 import { OpenHandsAction } from "#/types/core/actions";
 import { useEventStore } from "#/stores/use-event-store";
 
+// Mock the hooks
 vi.mock("#/context/ws-client-provider");
+vi.mock("#/stores/error-message-store");
+vi.mock("#/stores/optimistic-user-message-store");
 vi.mock("#/hooks/query/use-config");
 vi.mock("#/hooks/mutation/use-get-trajectory");
 vi.mock("#/hooks/mutation/use-unified-upload-files");
@@ -99,20 +102,24 @@ describe("ChatInterface - Chat Suggestions", () => {
       },
     });
 
+    // Default mock implementations
     (useWsClient as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       send: vi.fn(),
       isLoadingMessages: false,
       parsedEvents: [],
     });
-
-    useOptimisticUserMessageStore.setState({
-      optimisticUserMessage: null,
+    (
+      useOptimisticUserMessageStore as unknown as ReturnType<typeof vi.fn>
+    ).mockReturnValue({
+      setOptimisticUserMessage: vi.fn(),
+      getOptimisticUserMessage: vi.fn(() => null),
     });
-
-    useErrorMessageStore.setState({
-      errorMessage: null,
+    (
+      useErrorMessageStore as unknown as ReturnType<typeof vi.fn>
+    ).mockReturnValue({
+      setErrorMessage: vi.fn(),
+      removeErrorMessage: vi.fn(),
     });
-
     (useConfig as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       data: { APP_MODE: "local" },
     });
@@ -197,8 +204,11 @@ describe("ChatInterface - Chat Suggestions", () => {
   });
 
   test("should hide chat suggestions when there is an optimistic user message", () => {
-    useOptimisticUserMessageStore.setState({
-      optimisticUserMessage: "Optimistic message",
+    (
+      useOptimisticUserMessageStore as unknown as ReturnType<typeof vi.fn>
+    ).mockReturnValue({
+      setOptimisticUserMessage: vi.fn(),
+      getOptimisticUserMessage: vi.fn(() => "Optimistic message"),
     });
 
     renderWithQueryClient(<ChatInterface />, queryClient);
@@ -230,19 +240,24 @@ describe("ChatInterface - Empty state", () => {
   });
 
   beforeEach(() => {
+    // Reset mocks to ensure empty state
     (useWsClient as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       send: sendMock,
       status: "CONNECTED",
       isLoadingMessages: false,
       parsedEvents: [],
     });
-
-    useOptimisticUserMessageStore.setState({
-      optimisticUserMessage: null,
+    (
+      useOptimisticUserMessageStore as unknown as ReturnType<typeof vi.fn>
+    ).mockReturnValue({
+      setOptimisticUserMessage: vi.fn(),
+      getOptimisticUserMessage: vi.fn(() => null),
     });
-
-    useErrorMessageStore.setState({
-      errorMessage: null,
+    (
+      useErrorMessageStore as unknown as ReturnType<typeof vi.fn>
+    ).mockReturnValue({
+      setErrorMessage: vi.fn(),
+      removeErrorMessage: vi.fn(),
     });
     (useConfig as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       data: { APP_MODE: "local" },

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

@@ -61,7 +61,7 @@ describe("ExpandableMessage", () => {
     expect(icon).toHaveClass("fill-success");
   });
 
-  it("should render with no icon for failed action messages", () => {
+  it("should render with error icon for failed action messages", () => {
     renderWithProviders(
       <ExpandableMessage
         id="OBSERVATION_MESSAGE$RUN"
@@ -75,7 +75,8 @@ describe("ExpandableMessage", () => {
       "div.flex.gap-2.items-center.justify-start",
     );
     expect(container).toHaveClass("border-neutral-300");
-    expect(screen.queryByTestId("status-icon")).not.toBeInTheDocument();
+    const icon = screen.getByTestId("status-icon");
+    expect(icon).toHaveClass("fill-danger");
   });
 
   it("should render with neutral border and no icon for action messages without success prop", () => {

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

@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from "vitest";
 import { render, screen, waitFor } from "@testing-library/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { AnalyticsConsentFormModal } from "#/components/features/analytics/analytics-consent-form-modal";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 
 describe("AnalyticsConsentFormModal", () => {
   it("should call saveUserSettings with consent", async () => {

frontend/__tests__/components/features/home/recent-conversations.test.tsx

@@ -1,56 +0,0 @@
-import { render, screen, waitFor } from "@testing-library/react";
-import { describe, it, expect, vi } from "vitest";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { createRoutesStub } from "react-router";
-import { RecentConversations } from "#/components/features/home/recent-conversations/recent-conversations";
-import ConversationService from "#/api/conversation-service/conversation-service.api";
-
-const renderRecentConversations = () => {
-  const RouterStub = createRoutesStub([
-    {
-      Component: () => <RecentConversations />,
-      path: "/",
-    },
-  ]);
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        retry: false,
-      },
-    },
-  });
-
-  return render(<RouterStub />, {
-    wrapper: ({ children }) => (
-      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-    ),
-  });
-};
-
-describe("RecentConversations", () => {
-  const getUserConversationsSpy = vi.spyOn(
-    ConversationService,
-    "getUserConversations",
-  );
-
-  it("should not show empty state when there is an error", async () => {
-    getUserConversationsSpy.mockRejectedValue(
-      new Error("Failed to fetch conversations"),
-    );
-
-    renderRecentConversations();
-
-    // Wait for the error to be displayed
-    await waitFor(() => {
-      expect(
-        screen.getByText("Failed to fetch conversations"),
-      ).toBeInTheDocument();
-    });
-
-    // The empty state should NOT be displayed when there's an error
-    expect(
-      screen.queryByText("HOME$NO_RECENT_CONVERSATIONS"),
-    ).not.toBeInTheDocument();
-  });
-});

frontend/__tests__/components/features/home/repo-connector.test.tsx

@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import userEvent from "@testing-library/user-event";
 import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
 import { createRoutesStub, Outlet } from "react-router";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import ConversationService from "#/api/conversation-service/conversation-service.api";
 import GitService from "#/api/git-service/git-service.api";
 import OptionService from "#/api/option-service/option-service.api";
@@ -404,7 +404,7 @@ describe("RepoConnector", () => {
       ConversationService,
       "createConversation",
     );
-    createConversationSpy.mockImplementation(() => new Promise(() => { })); // Never resolves to keep loading state
+    createConversationSpy.mockImplementation(() => new Promise(() => {})); // Never resolves to keep loading state
     const retrieveUserGitRepositoriesSpy = vi.spyOn(
       GitService,
       "retrieveUserGitRepositories",

frontend/__tests__/components/features/home/repo-selection-form.test.tsx

@@ -2,9 +2,9 @@ import { render, screen } from "@testing-library/react";
 import { describe, expect, vi, beforeEach, it } from "vitest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { RepositorySelectionForm } from "../../../../src/components/features/home/repo-selection-form";
+import UserService from "#/api/user-service/user-service.api";
 import GitService from "#/api/git-service/git-service.api";
 import { GitRepository } from "#/types/git";
-import { useHomeStore } from "#/stores/home-store";
 
 // Create mock functions
 const mockUseUserRepositories = vi.fn();
@@ -97,7 +97,7 @@ vi.mock("#/context/auth-context", () => ({
 // Mock debounce to simulate proper debounced behavior
 let debouncedValue = "";
 vi.mock("#/hooks/use-debounce", () => ({
-  useDebounce: (value: string) => {
+  useDebounce: (value: string, _delay: number) => {
     // In real debouncing, only the final value after the delay should be returned
     // For testing, we'll return the full value once it's complete
     if (value && value.length > 20) {
@@ -124,51 +124,28 @@ vi.mock("#/hooks/query/use-search-repositories", () => ({
 }));
 
 const mockOnRepoSelection = vi.fn();
-
-// Helper function to render with custom store state
-const renderForm = (
-  storeOverrides: Partial<{
-    recentRepositories: GitRepository[];
-    lastSelectedProvider: 'gitlab' | null;
-  }> = {},
-) => {
-  // Set up the store state before rendering
-  useHomeStore.setState({
-    recentRepositories: [],
-    lastSelectedProvider: null,
-    ...storeOverrides,
-  });
-
-  return render(
-    <RepositorySelectionForm onRepoSelection={mockOnRepoSelection} />,
-    {
-      wrapper: ({ children }) => (
-        <QueryClientProvider
-          client={
-            new QueryClient({
-              defaultOptions: {
-                queries: {
-                  retry: false,
-                },
+const renderForm = () =>
+  render(<RepositorySelectionForm onRepoSelection={mockOnRepoSelection} />, {
+    wrapper: ({ children }) => (
+      <QueryClientProvider
+        client={
+          new QueryClient({
+            defaultOptions: {
+              queries: {
+                retry: false,
               },
-            })
-          }
-        >
-          {children}
-        </QueryClientProvider>
-      ),
-    },
-  );
-};
+            },
+          })
+        }
+      >
+        {children}
+      </QueryClientProvider>
+    ),
+  });
 
 describe("RepositorySelectionForm", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    // Reset the store to initial state
-    useHomeStore.setState({
-      recentRepositories: [],
-      lastSelectedProvider: null,
-    });
   });
 
   it("shows dropdown when repositories are loaded", async () => {
@@ -249,7 +226,7 @@ describe("RepositorySelectionForm", () => {
 
     renderForm();
 
-    await screen.findByTestId("git-repo-dropdown");
+    const input = await screen.findByTestId("git-repo-dropdown");
 
     // The test should verify that typing a URL triggers the search behavior
     // Since the component uses useSearchRepositories hook, just verify the hook is set up correctly
@@ -284,7 +261,7 @@ describe("RepositorySelectionForm", () => {
 
     renderForm();
 
-    await screen.findByTestId("git-repo-dropdown");
+    const input = await screen.findByTestId("git-repo-dropdown");
 
     // Verify that the onRepoSelection callback prop was provided
     expect(mockOnRepoSelection).toBeDefined();
@@ -293,38 +270,4 @@ describe("RepositorySelectionForm", () => {
     // we'll verify that the basic structure is in place and the callback is available
     expect(typeof mockOnRepoSelection).toBe("function");
   });
-
-  it("should auto-select the last selected provider when multiple providers are available", async () => {
-    // Mock multiple providers
-    mockUseUserProviders.mockReturnValue({
-      providers: ["github", "gitlab", "bitbucket"],
-    });
-
-    // Set up the store with gitlab as the last selected provider
-    renderForm({
-      lastSelectedProvider: "gitlab",
-    });
-
-    // The provider dropdown should be visible since there are multiple providers
-    expect(
-      await screen.findByTestId("git-provider-dropdown"),
-    ).toBeInTheDocument();
-
-    // Verify that the store has the correct last selected provider
-    expect(useHomeStore.getState().lastSelectedProvider).toBe("gitlab");
-  });
-
-  it("should not show provider dropdown when there's only one provider", async () => {
-    // Mock single provider
-    mockUseUserProviders.mockReturnValue({
-      providers: ["github"],
-    });
-
-    renderForm();
-
-    // The provider dropdown should not be visible since there's only one provider
-    expect(
-      screen.queryByTestId("git-provider-dropdown"),
-    ).not.toBeInTheDocument();
-  });
 });

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

@@ -3,7 +3,7 @@ import { renderWithProviders } from "test-utils";
 import { createRoutesStub } from "react-router";
 import { waitFor } from "@testing-library/react";
 import { Sidebar } from "#/components/features/sidebar/sidebar";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 
 // These tests will now fail because the conversation panel is rendered through a portal
 // and technically not a child of the Sidebar component.

frontend/__tests__/components/interactive-chat-box.test.tsx

@@ -8,10 +8,16 @@ import { AgentState } from "#/types/agent-state";
 import { useAgentState } from "#/hooks/use-agent-state";
 import { useConversationStore } from "#/state/conversation-store";
 
+// Mock the agent state hook
 vi.mock("#/hooks/use-agent-state", () => ({
   useAgentState: vi.fn(),
 }));
 
+// Mock the conversation store
+vi.mock("#/state/conversation-store", () => ({
+  useConversationStore: vi.fn(),
+}));
+
 // Mock React Router hooks
 vi.mock("react-router", async () => {
   const actual = await vi.importActual("react-router");
@@ -52,23 +58,44 @@ vi.mock("#/hooks/use-conversation-name-context-menu", () => ({
 describe("InteractiveChatBox", () => {
   const onSubmitMock = vi.fn();
 
+  // Helper function to mock stores
   const mockStores = (agentState: AgentState = AgentState.INIT) => {
     vi.mocked(useAgentState).mockReturnValue({
       curAgentState: agentState,
     });
 
-    useConversationStore.setState({
+    vi.mocked(useConversationStore).mockReturnValue({
       images: [],
       files: [],
+      addImages: vi.fn(),
+      addFiles: vi.fn(),
+      clearAllFiles: vi.fn(),
+      addFileLoading: vi.fn(),
+      removeFileLoading: vi.fn(),
+      addImageLoading: vi.fn(),
+      removeImageLoading: vi.fn(),
+      submittedMessage: null,
+      setShouldHideSuggestions: vi.fn(),
+      setSubmittedMessage: vi.fn(),
+      isRightPanelShown: true,
+      selectedTab: "editor" as const,
       loadingFiles: [],
       loadingImages: [],
-      submittedMessage: null,
       messageToSend: null,
       shouldShownAgentLoading: false,
       shouldHideSuggestions: false,
-      isRightPanelShown: true,
-      selectedTab: "editor" as const,
       hasRightPanelToggled: true,
+      setIsRightPanelShown: vi.fn(),
+      setSelectedTab: vi.fn(),
+      setShouldShownAgentLoading: vi.fn(),
+      removeImage: vi.fn(),
+      removeFile: vi.fn(),
+      clearImages: vi.fn(),
+      clearFiles: vi.fn(),
+      clearAllLoading: vi.fn(),
+      setMessageToSend: vi.fn(),
+      resetConversationState: vi.fn(),
+      setHasRightPanelToggled: vi.fn(),
     });
   };
 

frontend/__tests__/components/modals/microagents/microagent-modal.test.tsx

@@ -57,7 +57,7 @@ describe("MicroagentsModal - Refresh Button", () => {
   });
 
   afterEach(() => {
-    vi.restoreAllMocks();
+    vi.clearAllMocks();
   });
 
   describe("Refresh Button Rendering", () => {
@@ -74,15 +74,13 @@ describe("MicroagentsModal - Refresh Button", () => {
   describe("Refresh Button Functionality", () => {
     it("should call refetch when refresh button is clicked", async () => {
       const user = userEvent.setup();
-      const refreshSpy = vi.spyOn(ConversationService, "getMicroagents");
 
       renderWithProviders(<MicroagentsModal {...defaultProps} />);
 
+      const refreshSpy = vi.spyOn(ConversationService, "getMicroagents");
+
       // Wait for the component to load and render the refresh button
       const refreshButton = await screen.findByTestId("refresh-microagents");
-
-      refreshSpy.mockClear();
-
       await user.click(refreshButton);
 
       expect(refreshSpy).toHaveBeenCalledTimes(1);

frontend/__tests__/components/shared/modals/settings/settings-form.test.tsx

@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from "vitest";
 import { renderWithProviders } from "test-utils";
 import { createRoutesStub } from "react-router";
 import { screen } from "@testing-library/react";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { SettingsForm } from "#/components/shared/modals/settings/settings-form";
 import { DEFAULT_SETTINGS } from "#/services/settings";
 
@@ -16,7 +16,7 @@ describe("SettingsForm", () => {
       Component: () => (
         <SettingsForm
           settings={DEFAULT_SETTINGS}
-          models={[DEFAULT_SETTINGS.llm_model]}
+          models={[DEFAULT_SETTINGS.LLM_MODEL]}
           onClose={onCloseMock}
         />
       ),
@@ -33,7 +33,7 @@ describe("SettingsForm", () => {
 
     expect(saveSettingsSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        llm_model: DEFAULT_SETTINGS.llm_model,
+        llm_model: DEFAULT_SETTINGS.LLM_MODEL,
       }),
     );
   });

frontend/__tests__/components/v1/chat/event-content-helpers/get-observation-content.test.ts

@@ -1,92 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { getObservationContent } from "#/components/v1/chat/event-content-helpers/get-observation-content";
-import { ObservationEvent } from "#/types/v1/core";
-import { BrowserObservation } from "#/types/v1/core/base/observation";
-
-describe("getObservationContent - BrowserObservation", () => {
-  it("should return output content when available", () => {
-    const mockEvent: ObservationEvent<BrowserObservation> = {
-      id: "test-id",
-      timestamp: "2024-01-01T00:00:00Z",
-      source: "environment",
-      tool_name: "browser_navigate",
-      tool_call_id: "call-id",
-      action_id: "action-id",
-      observation: {
-        kind: "BrowserObservation",
-        output: "Browser action completed",
-        error: null,
-        screenshot_data: "base64data",
-      },
-    };
-
-    const result = getObservationContent(mockEvent);
-
-    expect(result).toContain("**Output:**");
-    expect(result).toContain("Browser action completed");
-  });
-
-  it("should handle error cases properly", () => {
-    const mockEvent: ObservationEvent<BrowserObservation> = {
-      id: "test-id",
-      timestamp: "2024-01-01T00:00:00Z",
-      source: "environment",
-      tool_name: "browser_navigate",
-      tool_call_id: "call-id",
-      action_id: "action-id",
-      observation: {
-        kind: "BrowserObservation",
-        output: "",
-        error: "Browser action failed",
-        screenshot_data: null,
-      },
-    };
-
-    const result = getObservationContent(mockEvent);
-
-    expect(result).toContain("**Error:**");
-    expect(result).toContain("Browser action failed");
-  });
-
-  it("should provide default message when no output or error", () => {
-    const mockEvent: ObservationEvent<BrowserObservation> = {
-      id: "test-id",
-      timestamp: "2024-01-01T00:00:00Z",
-      source: "environment",
-      tool_name: "browser_navigate",
-      tool_call_id: "call-id",
-      action_id: "action-id",
-      observation: {
-        kind: "BrowserObservation",
-        output: "",
-        error: null,
-        screenshot_data: "base64data",
-      },
-    };
-
-    const result = getObservationContent(mockEvent);
-
-    expect(result).toBe("Browser action completed successfully.");
-  });
-
-  it("should return output when screenshot_data is null", () => {
-    const mockEvent: ObservationEvent<BrowserObservation> = {
-      id: "test-id",
-      timestamp: "2024-01-01T00:00:00Z",
-      source: "environment",
-      tool_name: "browser_navigate",
-      tool_call_id: "call-id",
-      action_id: "action-id",
-      observation: {
-        kind: "BrowserObservation",
-        output: "Page loaded successfully",
-        error: null,
-        screenshot_data: null,
-      },
-    };
-
-    const result = getObservationContent(mockEvent);
-
-    expect(result).toBe("**Output:**\nPage loaded successfully");
-  });
-});

frontend/__tests__/conversation-websocket-handler.test.tsx

@@ -1,26 +1,12 @@
-import {
-  describe,
-  it,
-  expect,
-  beforeAll,
-  beforeEach,
-  afterAll,
-  afterEach,
-} from "vitest";
+import { describe, it, expect, beforeAll, afterAll, afterEach } from "vitest";
 import { screen, waitFor, render, cleanup } from "@testing-library/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { http, HttpResponse } from "msw";
 import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
-import { useBrowserStore } from "#/stores/browser-store";
-import { useCommandStore } from "#/state/command-store";
 import {
   createMockMessageEvent,
   createMockUserMessageEvent,
   createMockAgentErrorEvent,
-  createMockBrowserObservationEvent,
-  createMockBrowserNavigateActionEvent,
-  createMockExecuteBashActionEvent,
-  createMockExecuteBashObservationEvent,
 } from "#/mocks/mock-ws-helpers";
 import {
   ConnectionStatusComponent,
@@ -475,7 +461,7 @@ describe("Conversation WebSocket Handler", () => {
       );
 
       // Create a test component that displays loading state
-      function HistoryLoadingComponent() {
+      const HistoryLoadingComponent = () => {
         const context = useConversationWebSocket();
         const { events } = useEventStore();
 
@@ -488,7 +474,7 @@ describe("Conversation WebSocket Handler", () => {
             <div data-testid="expected-event-count">{expectedEventCount}</div>
           </div>
         );
-      }
+      };
 
       // Render with WebSocket context
       renderWithWebSocketContext(
@@ -498,9 +484,7 @@ describe("Conversation WebSocket Handler", () => {
       );
 
       // Initially should be loading history
-      expect(screen.getByTestId("is-loading-history")).toHaveTextContent(
-        "true",
-      );
+      expect(screen.getByTestId("is-loading-history")).toHaveTextContent("true");
 
       // Wait for all events to be received
       await waitFor(() => {
@@ -539,7 +523,7 @@ describe("Conversation WebSocket Handler", () => {
       );
 
       // Create a test component that displays loading state
-      function HistoryLoadingComponent() {
+      const HistoryLoadingComponent = () => {
         const context = useConversationWebSocket();
 
         return (
@@ -549,7 +533,7 @@ describe("Conversation WebSocket Handler", () => {
             </div>
           </div>
         );
-      }
+      };
 
       // Render with WebSocket context
       renderWithWebSocketContext(
@@ -599,7 +583,7 @@ describe("Conversation WebSocket Handler", () => {
       );
 
       // Create a test component that displays loading state
-      function HistoryLoadingComponent() {
+      const HistoryLoadingComponent = () => {
         const context = useConversationWebSocket();
         const { events } = useEventStore();
 
@@ -611,7 +595,7 @@ describe("Conversation WebSocket Handler", () => {
             <div data-testid="events-received">{events.length}</div>
           </div>
         );
-      }
+      };
 
       // Render with WebSocket context
       renderWithWebSocketContext(
@@ -621,9 +605,7 @@ describe("Conversation WebSocket Handler", () => {
       );
 
       // Initially should be loading history
-      expect(screen.getByTestId("is-loading-history")).toHaveTextContent(
-        "true",
-      );
+      expect(screen.getByTestId("is-loading-history")).toHaveTextContent("true");
 
       // Wait for all events to be received
       await waitFor(() => {
@@ -639,133 +621,17 @@ describe("Conversation WebSocket Handler", () => {
     });
   });
 
-  // 9. Browser State Tests (BrowserObservation)
-  describe("Browser State Integration", () => {
-    beforeEach(() => {
-      useBrowserStore.getState().reset();
-    });
-
-    it("should update browser store with screenshot when BrowserObservation event is received", async () => {
-      // Create a mock BrowserObservation event with screenshot data
-      const mockBrowserObsEvent = createMockBrowserObservationEvent(
-        "base64-screenshot-data",
-        "Page loaded successfully",
-      );
-
-      // Set up MSW to send the event when connection is established
-      mswServer.use(
-        wsLink.addEventListener("connection", ({ client, server }) => {
-          server.connect();
-          // Send the mock event after connection
-          client.send(JSON.stringify(mockBrowserObsEvent));
-        }),
-      );
-
-      // Render with WebSocket context
-      renderWithWebSocketContext(<ConnectionStatusComponent />);
-
-      // Wait for connection
-      await waitFor(() => {
-        expect(screen.getByTestId("connection-state")).toHaveTextContent(
-          "OPEN",
-        );
-      });
-
-      // Wait for the browser store to be updated with screenshot
-      await waitFor(() => {
-        const { screenshotSrc } = useBrowserStore.getState();
-        expect(screenshotSrc).toBe(
-          "data:image/png;base64,base64-screenshot-data",
-        );
-      });
-    });
-
-    it("should update browser store with URL when BrowserNavigateAction followed by BrowserObservation", async () => {
-      // Create mock events - action first, then observation
-      const mockBrowserActionEvent = createMockBrowserNavigateActionEvent(
-        "https://example.com/test-page",
-      );
-      const mockBrowserObsEvent = createMockBrowserObservationEvent(
-        "base64-screenshot-data",
-        "Page loaded successfully",
-      );
-
-      // Set up MSW to send both events when connection is established
-      mswServer.use(
-        wsLink.addEventListener("connection", ({ client, server }) => {
-          server.connect();
-          // Send action first, then observation
-          client.send(JSON.stringify(mockBrowserActionEvent));
-          client.send(JSON.stringify(mockBrowserObsEvent));
-        }),
-      );
-
-      // Render with WebSocket context
-      renderWithWebSocketContext(<ConnectionStatusComponent />);
-
-      // Wait for connection
-      await waitFor(() => {
-        expect(screen.getByTestId("connection-state")).toHaveTextContent(
-          "OPEN",
-        );
-      });
-
-      // Wait for the browser store to be updated with both screenshot and URL
-      await waitFor(() => {
-        const { screenshotSrc, url } = useBrowserStore.getState();
-        expect(screenshotSrc).toBe(
-          "data:image/png;base64,base64-screenshot-data",
-        );
-        expect(url).toBe("https://example.com/test-page");
-      });
-    });
-
-    it("should not update browser store when BrowserObservation has no screenshot data", async () => {
-      const initialScreenshot = useBrowserStore.getState().screenshotSrc;
-
-      // Create a mock BrowserObservation event WITHOUT screenshot data
-      const mockBrowserObsEvent = createMockBrowserObservationEvent(
-        null, // no screenshot
-        "Browser action completed",
-      );
-
-      // Set up MSW to send the event when connection is established
-      mswServer.use(
-        wsLink.addEventListener("connection", ({ client, server }) => {
-          server.connect();
-          // Send the mock event after connection
-          client.send(JSON.stringify(mockBrowserObsEvent));
-        }),
-      );
-
-      // Render with WebSocket context
-      renderWithWebSocketContext(<ConnectionStatusComponent />);
-
-      // Wait for connection
-      await waitFor(() => {
-        expect(screen.getByTestId("connection-state")).toHaveTextContent(
-          "OPEN",
-        );
-      });
-
-      // Give some time for any potential updates
-      await new Promise((resolve) => {
-        setTimeout(resolve, 100);
-      });
-
-      // Screenshot should remain unchanged (empty/initial value)
-      const { screenshotSrc } = useBrowserStore.getState();
-      expect(screenshotSrc).toBe(initialScreenshot);
-    });
-  });
-
-  // 10. Terminal I/O Tests (ExecuteBashAction and ExecuteBashObservation)
+  // 9. Terminal I/O Tests (ExecuteBashAction and ExecuteBashObservation)
   describe("Terminal I/O Integration", () => {
-    beforeEach(() => {
-      useCommandStore.getState().clearTerminal();
-    });
-
     it("should append command to store when ExecuteBashAction event is received", async () => {
+      const { createMockExecuteBashActionEvent } = await import(
+        "#/mocks/mock-ws-helpers"
+      );
+      const { useCommandStore } = await import("#/state/command-store");
+
+      // Clear the command store before test
+      useCommandStore.getState().clearTerminal();
+
       // Create a mock ExecuteBashAction event
       const mockBashActionEvent = createMockExecuteBashActionEvent("npm test");
 
@@ -801,6 +667,14 @@ describe("Conversation WebSocket Handler", () => {
     });
 
     it("should append output to store when ExecuteBashObservation event is received", async () => {
+      const { createMockExecuteBashObservationEvent } = await import(
+        "#/mocks/mock-ws-helpers"
+      );
+      const { useCommandStore } = await import("#/state/command-store");
+
+      // Clear the command store before test
+      useCommandStore.getState().clearTerminal();
+
       // Create a mock ExecuteBashObservation event
       const mockBashObservationEvent = createMockExecuteBashObservationEvent(
         "PASS  tests/example.test.js\n  ✓ should work (2 ms)",

frontend/__tests__/hooks/mutation/use-save-settings.test.tsx

@@ -1,7 +1,7 @@
 import { renderHook, waitFor } from "@testing-library/react";
 import { describe, expect, it, vi } from "vitest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { useSaveSettings } from "#/hooks/mutation/use-save-settings";
 
 describe("useSaveSettings", () => {

frontend/__tests__/hooks/use-settings-nav-items.test.tsx

@@ -1,53 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderHook, waitFor } from "@testing-library/react";
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { SAAS_NAV_ITEMS, OSS_NAV_ITEMS } from "#/constants/settings-nav";
-import OptionService from "#/api/option-service/option-service.api";
-import { useSettingsNavItems } from "#/hooks/use-settings-nav-items";
-
-const queryClient = new QueryClient();
-const wrapper = ({ children }: { children: React.ReactNode }) => (
-  <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-);
-
-const mockConfig = (appMode: "saas" | "oss", hideLlmSettings = false) => {
-  vi.spyOn(OptionService, "getConfig").mockResolvedValue({
-    APP_MODE: appMode,
-    FEATURE_FLAGS: { HIDE_LLM_SETTINGS: hideLlmSettings },
-  } as Awaited<ReturnType<typeof OptionService.getConfig>>);
-};
-
-describe("useSettingsNavItems", () => {
-  beforeEach(() => {
-    queryClient.clear();
-  });
-
-  it("should return SAAS_NAV_ITEMS when APP_MODE is 'saas'", async () => {
-    mockConfig("saas");
-    const { result } = renderHook(() => useSettingsNavItems(), { wrapper });
-
-    await waitFor(() => {
-      expect(result.current).toEqual(SAAS_NAV_ITEMS);
-    });
-  });
-
-  it("should return OSS_NAV_ITEMS when APP_MODE is 'oss'", async () => {
-    mockConfig("oss");
-    const { result } = renderHook(() => useSettingsNavItems(), { wrapper });
-
-    await waitFor(() => {
-      expect(result.current).toEqual(OSS_NAV_ITEMS);
-    });
-  });
-
-  it("should filter out '/settings' item when HIDE_LLM_SETTINGS feature flag is enabled", async () => {
-    mockConfig("saas", true);
-    const { result } = renderHook(() => useSettingsNavItems(), { wrapper });
-
-    await waitFor(() => {
-      expect(
-        result.current.find((item) => item.to === "/settings"),
-      ).toBeUndefined();
-    });
-  });
-});

frontend/__tests__/hooks/use-terminal.test.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { beforeAll, describe, expect, it, vi, afterEach } from "vitest";
 import { useTerminal } from "#/hooks/use-terminal";
 import { Command, useCommandStore } from "#/state/command-store";
@@ -46,29 +45,17 @@ describe("useTerminal", () => {
   }));
 
   beforeAll(() => {
-    // mock ResizeObserver - use class for Vitest 4 constructor support
-    window.ResizeObserver = class {
-      observe = vi.fn();
+    // mock ResizeObserver
+    window.ResizeObserver = vi.fn().mockImplementation(() => ({
+      observe: vi.fn(),
+      unobserve: vi.fn(),
+      disconnect: vi.fn(),
+    }));
 
-      unobserve = vi.fn();
-
-      disconnect = vi.fn();
-    } as unknown as typeof ResizeObserver;
-
-    // mock Terminal - use class for Vitest 4 constructor support
+    // mock Terminal
     vi.mock("@xterm/xterm", async (importOriginal) => ({
       ...(await importOriginal<typeof import("@xterm/xterm")>()),
-      Terminal: class {
-        loadAddon = mockTerminal.loadAddon;
-
-        open = mockTerminal.open;
-
-        write = mockTerminal.write;
-
-        writeln = mockTerminal.writeln;
-
-        dispose = mockTerminal.dispose;
-      },
+      Terminal: vi.fn().mockImplementation(() => mockTerminal),
     }));
   });
 

frontend/__tests__/hooks/use-websocket.test.ts

@@ -1,11 +1,3 @@
-/**
- * TODO: Fix flaky WebSocket tests (https://github.com/OpenHands/OpenHands/issues/11944)
- *
- * Several tests in this file are skipped because they fail intermittently in CI
- * but pass locally. The SUSPECTED root cause is that `wsLink.broadcast()` sends messages
- * to ALL connected clients across all tests, causing cross-test contamination
- * when tests run in parallel with Vitest v4.
- */
 import { renderHook, waitFor } from "@testing-library/react";
 import {
   describe,
@@ -59,7 +51,7 @@ describe("useWebSocket", () => {
     expect(result.current.socket).toBeTruthy();
   });
 
-  it.skip("should handle incoming messages correctly", async () => {
+  it("should handle incoming messages correctly", async () => {
     const { result } = renderHook(() => useWebSocket("ws://acme.com/ws"));
 
     // Wait for connection to be established
@@ -122,7 +114,7 @@ describe("useWebSocket", () => {
     expect(result.current.socket).toBeTruthy();
   });
 
-  it.skip("should close the WebSocket connection on unmount", async () => {
+  it("should close the WebSocket connection on unmount", async () => {
     const { result, unmount } = renderHook(() =>
       useWebSocket("ws://acme.com/ws"),
     );
@@ -212,7 +204,7 @@ describe("useWebSocket", () => {
     });
   });
 
-  it.skip("should call onMessage handler when WebSocket receives a message", async () => {
+  it("should call onMessage handler when WebSocket receives a message", async () => {
     const onMessageSpy = vi.fn();
     const options = { onMessage: onMessageSpy };
 
@@ -279,7 +271,7 @@ describe("useWebSocket", () => {
     expect(onErrorSpy).toHaveBeenCalled();
   });
 
-  it.skip("should provide sendMessage function to send messages to WebSocket", async () => {
+  it("should provide sendMessage function to send messages to WebSocket", async () => {
     const { result } = renderHook(() => useWebSocket("ws://acme.com/ws"));
 
     // Wait for connection to be established

frontend/__tests__/routes/_oh.test.tsx

@@ -10,7 +10,7 @@ import MainApp from "#/routes/root-layout";
 import i18n from "#/i18n";
 import OptionService from "#/api/option-service/option-service.api";
 import * as CaptureConsent from "#/utils/handle-capture-consent";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import * as ToastHandlers from "#/utils/custom-toast-handlers";
 
 describe("frontend/routes/_oh", () => {

frontend/__tests__/routes/app-settings.test.tsx

@@ -3,7 +3,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import userEvent from "@testing-library/user-event";
 import AppSettingsScreen from "#/routes/app-settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
 import { AvailableLanguages } from "#/i18n";
 import * as CaptureConsent from "#/utils/handle-capture-consent";

frontend/__tests__/routes/git-settings.test.tsx

@@ -6,7 +6,7 @@ import userEvent from "@testing-library/user-event";
 import i18next from "i18next";
 import { I18nextProvider } from "react-i18next";
 import GitSettingsScreen from "#/routes/git-settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import OptionService from "#/api/option-service/option-service.api";
 import AuthService from "#/api/auth-service/auth-service.api";
 import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";

frontend/__tests__/routes/home-screen.test.tsx

@@ -6,7 +6,7 @@ import { createRoutesStub } from "react-router";
 import { createAxiosNotFoundErrorObject } from "test-utils";
 import HomeScreen from "#/routes/home";
 import { GitRepository } from "#/types/git";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import GitService from "#/api/git-service/git-service.api";
 import OptionService from "#/api/option-service/option-service.api";
 import MainApp from "#/routes/root-layout";

frontend/__tests__/routes/llm-settings.test.tsx

@@ -3,14 +3,13 @@ import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
 import LlmSettingsScreen from "#/routes/llm-settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import {
   MOCK_DEFAULT_USER_SETTINGS,
   resetTestHandlersMockSettings,
 } from "#/mocks/handlers";
 import * as AdvancedSettingsUtlls from "#/utils/has-advanced-settings-set";
 import * as ToastHandlers from "#/utils/custom-toast-handlers";
-import OptionService from "#/api/option-service/option-service.api";
 
 // Mock react-router hooks
 const mockUseSearchParams = vi.fn();
@@ -253,290 +252,9 @@ describe("Content", () => {
         expect(securityAnalyzer).toHaveValue("SETTINGS$SECURITY_ANALYZER_NONE");
       });
     });
-
-    it("should omit invariant and custom analyzers when V1 is enabled", async () => {
-      const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
-      getSettingsSpy.mockResolvedValue({
-        ...MOCK_DEFAULT_USER_SETTINGS,
-        confirmation_mode: true,
-        security_analyzer: "llm",
-        v1_enabled: true,
-      });
-
-      const getSecurityAnalyzersSpy = vi.spyOn(
-        OptionService,
-        "getSecurityAnalyzers",
-      );
-      getSecurityAnalyzersSpy.mockResolvedValue([
-        "llm",
-        "none",
-        "invariant",
-        "custom",
-      ]);
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const advancedSwitch = screen.getByTestId("advanced-settings-switch");
-      await userEvent.click(advancedSwitch);
-
-      const securityAnalyzer = await screen.findByTestId(
-        "security-analyzer-input",
-      );
-      await userEvent.click(securityAnalyzer);
-
-      // Only llm + none should be available when V1 is enabled
-      screen.getByText("SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT");
-      screen.getByText("SETTINGS$SECURITY_ANALYZER_NONE");
-      expect(
-        screen.queryByText("SETTINGS$SECURITY_ANALYZER_INVARIANT"),
-      ).not.toBeInTheDocument();
-      expect(screen.queryByText("custom")).not.toBeInTheDocument();
-    });
-
-    it("should include invariant analyzer option when V1 is disabled", async () => {
-      const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
-      getSettingsSpy.mockResolvedValue({
-        ...MOCK_DEFAULT_USER_SETTINGS,
-        confirmation_mode: true,
-        security_analyzer: "llm",
-        v1_enabled: false,
-      });
-
-      const getSecurityAnalyzersSpy = vi.spyOn(
-        OptionService,
-        "getSecurityAnalyzers",
-      );
-      getSecurityAnalyzersSpy.mockResolvedValue(["llm", "none", "invariant"]);
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const advancedSwitch = screen.getByTestId("advanced-settings-switch");
-      await userEvent.click(advancedSwitch);
-
-      const securityAnalyzer = await screen.findByTestId(
-        "security-analyzer-input",
-      );
-      await userEvent.click(securityAnalyzer);
-
-      expect(
-        screen.getByText("SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT"),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByText("SETTINGS$SECURITY_ANALYZER_NONE"),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByText("SETTINGS$SECURITY_ANALYZER_INVARIANT"),
-      ).toBeInTheDocument();
-    });
   });
 
   it.todo("should render an indicator if the llm api key is set");
-
-  describe("API key visibility in Basic Settings", () => {
-    it("should hide API key input when SaaS mode is enabled and OpenHands provider is selected", async () => {
-      const getConfigSpy = vi.spyOn(OptionService, "getConfig");
-      // @ts-expect-error - only return APP_MODE for these tests
-      getConfigSpy.mockResolvedValue({
-        APP_MODE: "saas",
-      });
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const basicForm = screen.getByTestId("llm-settings-form-basic");
-      const provider = within(basicForm).getByTestId("llm-provider-input");
-
-      // Verify OpenHands is selected by default
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenHands");
-      });
-
-      // API key input should not be visible when OpenHands provider is selected in SaaS mode
-      expect(
-        within(basicForm).queryByTestId("llm-api-key-input"),
-      ).not.toBeInTheDocument();
-      expect(
-        within(basicForm).queryByTestId("llm-api-key-help-anchor"),
-      ).not.toBeInTheDocument();
-    });
-
-    it("should show API key input when SaaS mode is enabled and non-OpenHands provider is selected", async () => {
-      const getConfigSpy = vi.spyOn(OptionService, "getConfig");
-      // @ts-expect-error - only return APP_MODE for these tests
-      getConfigSpy.mockResolvedValue({
-        APP_MODE: "saas",
-      });
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const basicForm = screen.getByTestId("llm-settings-form-basic");
-      const provider = within(basicForm).getByTestId("llm-provider-input");
-
-      // Select OpenAI provider
-      await userEvent.click(provider);
-      const providerOption = screen.getByText("OpenAI");
-      await userEvent.click(providerOption);
-
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenAI");
-      });
-
-      // API key input should be visible when non-OpenHands provider is selected in SaaS mode
-      expect(
-        within(basicForm).getByTestId("llm-api-key-input"),
-      ).toBeInTheDocument();
-      expect(
-        within(basicForm).getByTestId("llm-api-key-help-anchor"),
-      ).toBeInTheDocument();
-    });
-
-    it("should show API key input when OSS mode is enabled and OpenHands provider is selected", async () => {
-      const getConfigSpy = vi.spyOn(OptionService, "getConfig");
-      // @ts-expect-error - only return APP_MODE for these tests
-      getConfigSpy.mockResolvedValue({
-        APP_MODE: "oss",
-      });
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const basicForm = screen.getByTestId("llm-settings-form-basic");
-      const provider = within(basicForm).getByTestId("llm-provider-input");
-
-      // Verify OpenHands is selected by default
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenHands");
-      });
-
-      // API key input should be visible when OSS mode is enabled (even with OpenHands provider)
-      expect(
-        within(basicForm).getByTestId("llm-api-key-input"),
-      ).toBeInTheDocument();
-      expect(
-        within(basicForm).getByTestId("llm-api-key-help-anchor"),
-      ).toBeInTheDocument();
-    });
-
-    it("should show API key input when OSS mode is enabled and non-OpenHands provider is selected", async () => {
-      const getConfigSpy = vi.spyOn(OptionService, "getConfig");
-      // @ts-expect-error - only return APP_MODE for these tests
-      getConfigSpy.mockResolvedValue({
-        APP_MODE: "oss",
-      });
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const basicForm = screen.getByTestId("llm-settings-form-basic");
-      const provider = within(basicForm).getByTestId("llm-provider-input");
-
-      // Select OpenAI provider
-      await userEvent.click(provider);
-      const providerOption = screen.getByText("OpenAI");
-      await userEvent.click(providerOption);
-
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenAI");
-      });
-
-      // API key input should be visible when OSS mode is enabled
-      expect(
-        within(basicForm).getByTestId("llm-api-key-input"),
-      ).toBeInTheDocument();
-      expect(
-        within(basicForm).getByTestId("llm-api-key-help-anchor"),
-      ).toBeInTheDocument();
-    });
-
-    it("should hide API key input when switching from non-OpenHands to OpenHands provider in SaaS mode", async () => {
-      const getConfigSpy = vi.spyOn(OptionService, "getConfig");
-      // @ts-expect-error - only return APP_MODE for these tests
-      getConfigSpy.mockResolvedValue({
-        APP_MODE: "saas",
-      });
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const basicForm = screen.getByTestId("llm-settings-form-basic");
-      const provider = within(basicForm).getByTestId("llm-provider-input");
-
-      // Start with OpenAI provider
-      await userEvent.click(provider);
-      const openAIOption = screen.getByText("OpenAI");
-      await userEvent.click(openAIOption);
-
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenAI");
-      });
-
-      // API key input should be visible with OpenAI
-      expect(
-        within(basicForm).getByTestId("llm-api-key-input"),
-      ).toBeInTheDocument();
-
-      // Switch to OpenHands provider
-      await userEvent.click(provider);
-      const openHandsOption = screen.getByText("OpenHands");
-      await userEvent.click(openHandsOption);
-
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenHands");
-      });
-
-      // API key input should now be hidden
-      expect(
-        within(basicForm).queryByTestId("llm-api-key-input"),
-      ).not.toBeInTheDocument();
-      expect(
-        within(basicForm).queryByTestId("llm-api-key-help-anchor"),
-      ).not.toBeInTheDocument();
-    });
-
-    it("should show API key input when switching from OpenHands to non-OpenHands provider in SaaS mode", async () => {
-      const getConfigSpy = vi.spyOn(OptionService, "getConfig");
-      // @ts-expect-error - only return APP_MODE for these tests
-      getConfigSpy.mockResolvedValue({
-        APP_MODE: "saas",
-      });
-
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const basicForm = screen.getByTestId("llm-settings-form-basic");
-      const provider = within(basicForm).getByTestId("llm-provider-input");
-
-      // Verify OpenHands is selected by default
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenHands");
-      });
-
-      // API key input should be hidden with OpenHands
-      expect(
-        within(basicForm).queryByTestId("llm-api-key-input"),
-      ).not.toBeInTheDocument();
-
-      // Switch to OpenAI provider
-      await userEvent.click(provider);
-      const openAIOption = screen.getByText("OpenAI");
-      await userEvent.click(openAIOption);
-
-      await waitFor(() => {
-        expect(provider).toHaveValue("OpenAI");
-      });
-
-      // API key input should now be visible
-      expect(
-        within(basicForm).getByTestId("llm-api-key-input"),
-      ).toBeInTheDocument();
-      expect(
-        within(basicForm).getByTestId("llm-api-key-help-anchor"),
-      ).toBeInTheDocument();
-    });
-  });
 });
 
 describe("Form submission", () => {

frontend/__tests__/routes/secrets-settings.test.tsx

@@ -1,12 +1,12 @@
 import { render, screen, waitFor, within } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import userEvent from "@testing-library/user-event";
 import { createRoutesStub, Outlet } from "react-router";
 import SecretsSettingsScreen from "#/routes/secrets-settings";
 import { SecretsService } from "#/api/secrets-service";
 import { GetSecretsResponse } from "#/api/secrets-service.types";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import OptionService from "#/api/option-service/option-service.api";
 import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
 
@@ -21,25 +21,25 @@ const MOCK_GET_SECRETS_RESPONSE: GetSecretsResponse["custom_secrets"] = [
   },
 ];
 
-const renderSecretsSettings = () => {
-  const RouterStub = createRoutesStub([
-    {
-      Component: () => <Outlet />,
-      path: "/settings",
-      children: [
-        {
-          Component: SecretsSettingsScreen,
-          path: "/settings/secrets",
-        },
-        {
-          Component: () => <div data-testid="git-settings-screen" />,
-          path: "/settings/integrations",
-        },
-      ],
-    },
-  ]);
+const RouterStub = createRoutesStub([
+  {
+    Component: () => <Outlet />,
+    path: "/settings",
+    children: [
+      {
+        Component: SecretsSettingsScreen,
+        path: "/settings/secrets",
+      },
+      {
+        Component: () => <div data-testid="git-settings-screen" />,
+        path: "/settings/integrations",
+      },
+    ],
+  },
+]);
 
-  return render(<RouterStub initialEntries={["/settings/secrets"]} />, {
+const renderSecretsSettings = () =>
+  render(<RouterStub initialEntries={["/settings/secrets"]} />, {
     wrapper: ({ children }) => (
       <QueryClientProvider
         client={
@@ -52,7 +52,6 @@ const renderSecretsSettings = () => {
       </QueryClientProvider>
     ),
   });
-};
 
 beforeEach(() => {
   const getConfigSpy = vi.spyOn(OptionService, "getConfig");
@@ -62,10 +61,6 @@ beforeEach(() => {
   });
 });
 
-afterEach(() => {
-  vi.restoreAllMocks();
-});
-
 describe("Content", () => {
   it("should render the secrets settings screen", () => {
     renderSecretsSettings();
@@ -506,8 +501,6 @@ describe("Secret actions", () => {
 
   it("should not submit whitespace secret names or values", async () => {
     const createSecretSpy = vi.spyOn(SecretsService, "createSecret");
-    const getSecretsSpy = vi.spyOn(SecretsService, "getSecrets");
-    getSecretsSpy.mockResolvedValue([]);
     renderSecretsSettings();
 
     // render form & hide items
@@ -539,11 +532,9 @@ describe("Secret actions", () => {
     await userEvent.click(submitButton);
 
     expect(createSecretSpy).not.toHaveBeenCalled();
-    await waitFor(() => {
-      expect(
-        screen.queryByText("SECRETS$SECRET_VALUE_REQUIRED"),
-      ).toBeInTheDocument();
-    });
+    expect(
+      screen.queryByText("SECRETS$SECRET_VALUE_REQUIRED"),
+    ).toBeInTheDocument();
   });
 
   it("should not reset ipout values on an invalid submit", async () => {

frontend/__tests__/services/actions.test.tsx

@@ -1,8 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import ActionType from "#/types/action-type";
 import { ActionMessage } from "#/types/message";
-import { useCommandStore } from "#/state/command-store";
 
+// Mock the store and actions
 const mockDispatch = vi.fn();
 const mockAppendInput = vi.fn();
 
@@ -12,12 +12,26 @@ vi.mock("#/store", () => ({
   },
 }));
 
+vi.mock("#/state/command-store", () => ({
+  useCommandStore: {
+    getState: () => ({
+      appendInput: mockAppendInput,
+    }),
+  },
+}));
+
+vi.mock("#/state/metrics-slice", () => ({
+  setMetrics: vi.fn(),
+}));
+
+vi.mock("#/state/security-analyzer-slice", () => ({
+  appendSecurityAnalyzerInput: vi.fn(),
+}));
+
 describe("handleActionMessage", () => {
   beforeEach(() => {
+    // Clear all mocks before each test
     vi.clearAllMocks();
-    useCommandStore.setState({
-      appendInput: mockAppendInput,
-    });
   });
 
   it("should handle RUN actions by adding input to terminal", async () => {

frontend/__tests__/utils/has-advanced-settings-set.test.ts

@@ -12,20 +12,20 @@ describe("hasAdvancedSettingsSet", () => {
   });
 
   describe("should be true if", () => {
-    test("llm_base_url is set", () => {
+    test("LLM_BASE_URL is set", () => {
       expect(
         hasAdvancedSettingsSet({
           ...DEFAULT_SETTINGS,
-          llm_base_url: "test",
+          LLM_BASE_URL: "test",
         }),
       ).toBe(true);
     });
 
-    test("agent is not default value", () => {
+    test("AGENT is not default value", () => {
       expect(
         hasAdvancedSettingsSet({
           ...DEFAULT_SETTINGS,
-          agent: "test",
+          AGENT: "test",
         }),
       ).toBe(true);
     });

frontend/__tests__/utils/model-name-case-preservation.test.tsx

@@ -13,7 +13,7 @@ describe("Model name case preservation", () => {
     const settings = extractSettings(formData);
 
     // Test that model names maintain their original casing
-    expect(settings.llm_model).toBe("SambaNova/Meta-Llama-3.1-8B-Instruct");
+    expect(settings.LLM_MODEL).toBe("SambaNova/Meta-Llama-3.1-8B-Instruct");
   });
 
   it("should preserve openai model case", () => {
@@ -24,7 +24,7 @@ describe("Model name case preservation", () => {
     formData.set("language", "en");
 
     const settings = extractSettings(formData);
-    expect(settings.llm_model).toBe("openai/gpt-4o");
+    expect(settings.LLM_MODEL).toBe("openai/gpt-4o");
   });
 
   it("should preserve anthropic model case", () => {
@@ -35,7 +35,7 @@ describe("Model name case preservation", () => {
     formData.set("language", "en");
 
     const settings = extractSettings(formData);
-    expect(settings.llm_model).toBe("anthropic/claude-sonnet-4-20250514");
+    expect(settings.LLM_MODEL).toBe("anthropic/claude-sonnet-4-20250514");
   });
 
   it("should not automatically lowercase model names", () => {
@@ -48,7 +48,7 @@ describe("Model name case preservation", () => {
     const settings = extractSettings(formData);
 
     // Test that camelCase and PascalCase are preserved
-    expect(settings.llm_model).not.toBe("sambanova/meta-llama-3.1-8b-instruct");
-    expect(settings.llm_model).toBe("SambaNova/Meta-Llama-3.1-8B-Instruct");
+    expect(settings.LLM_MODEL).not.toBe("sambanova/meta-llama-3.1-8b-instruct");
+    expect(settings.LLM_MODEL).toBe("SambaNova/Meta-Llama-3.1-8B-Instruct");
   });
 });

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openhands-frontend",
-  "version": "1.0.0",
+  "version": "0.62.0",
   "private": true,
   "type": "module",
   "engines": {
@@ -8,44 +8,56 @@
   },
   "dependencies": {
     "@heroui/react": "2.8.5",
+    "@heroui/use-infinite-scroll": "^2.2.11",
     "@microlink/react-json-view": "^1.26.2",
     "@monaco-editor/react": "^4.7.0-rc.0",
-    "@react-router/node": "^7.10.1",
-    "@react-router/serve": "^7.10.1",
-    "@tailwindcss/vite": "^4.1.18",
-    "@tanstack/react-query": "^5.90.12",
+    "@posthog/react": "^1.4.0",
+    "@react-router/node": "^7.9.3",
+    "@react-router/serve": "^7.9.3",
+    "@react-types/shared": "^3.32.0",
+    "@stripe/react-stripe-js": "^4.0.2",
+    "@stripe/stripe-js": "^7.9.0",
+    "@tailwindcss/postcss": "^4.1.13",
+    "@tailwindcss/vite": "^4.1.13",
+    "@tanstack/react-query": "^5.90.2",
     "@uidotdev/usehooks": "^2.4.1",
+    "@vitejs/plugin-react": "^5.0.4",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.4.0",
-    "axios": "^1.13.2",
+    "axios": "^1.12.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "downshift": "^9.0.13",
+    "date-fns": "^4.1.0",
+    "downshift": "^9.0.10",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "framer-motion": "^12.23.25",
-    "i18next": "^25.7.2",
+    "framer-motion": "^12.23.22",
+    "i18next": "^25.5.2",
     "i18next-browser-languagedetector": "^8.2.0",
     "i18next-http-backend": "^3.0.2",
-    "isbot": "^5.1.32",
-    "lucide-react": "^0.561.0",
-    "monaco-editor": "^0.55.1",
-    "posthog-js": "^1.306.0",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
+    "isbot": "^5.1.31",
+    "jose": "^6.1.0",
+    "lucide-react": "^0.544.0",
+    "monaco-editor": "^0.53.0",
+    "posthog-js": "^1.298.1",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
+    "react-highlight": "^0.15.0",
     "react-hot-toast": "^2.6.0",
-    "react-i18next": "^16.5.0",
+    "react-i18next": "^16.0.0",
     "react-icons": "^5.5.0",
     "react-markdown": "^10.1.0",
-    "react-router": "^7.10.1",
-    "react-syntax-highlighter": "^16.1.0",
+    "react-router": "^7.9.3",
+    "react-syntax-highlighter": "^15.6.6",
     "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
     "sirv-cli": "^3.0.1",
     "socket.io-client": "^4.8.1",
-    "tailwind-merge": "^3.4.0",
+    "tailwind-merge": "^3.3.1",
     "tailwind-scrollbar": "^4.0.2",
-    "vite": "^7.2.7",
-    "zustand": "^5.0.9"
+    "vite": "^7.1.7",
+    "web-vitals": "^5.1.0",
+    "ws": "^8.18.2",
+    "zustand": "^5.0.8"
   },
   "scripts": {
     "dev": "npm run make-i18n && cross-env VITE_MOCK_API=false react-router dev",
@@ -80,23 +92,29 @@
     ]
   },
   "devDependencies": {
+    "@babel/parser": "^7.28.3",
+    "@babel/traverse": "^7.28.3",
+    "@babel/types": "^7.28.2",
     "@mswjs/socket.io-binding": "^0.2.0",
-    "@playwright/test": "^1.57.0",
-    "@react-router/dev": "^7.10.1",
+    "@playwright/test": "^1.55.1",
+    "@react-router/dev": "^7.9.3",
     "@tailwindcss/typography": "^0.5.19",
     "@tanstack/eslint-plugin-query": "^5.91.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/jest-dom": "^6.8.0",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@types/node": "^25.0.1",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
+    "@types/node": "^24.5.2",
+    "@types/react": "^19.1.15",
+    "@types/react-dom": "^19.1.9",
+    "@types/react-highlight": "^0.12.8",
     "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "@vitest/coverage-v8": "^4.0.14",
-    "cross-env": "^10.1.0",
+    "@vitest/coverage-v8": "^3.2.3",
+    "autoprefixer": "^10.4.21",
+    "cross-env": "^10.0.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",
@@ -109,15 +127,16 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-unused-imports": "^4.2.0",
     "husky": "^9.1.7",
-    "jsdom": "^27.3.0",
-    "lint-staged": "^16.2.7",
+    "jsdom": "^27.0.0",
+    "lint-staged": "^16.2.3",
     "msw": "^2.6.6",
-    "prettier": "^3.7.3",
+    "prettier": "^3.6.2",
+    "stripe": "^18.5.0",
     "tailwindcss": "^4.1.8",
-    "typescript": "^5.9.3",
+    "typescript": "^5.9.2",
     "vite-plugin-svgr": "^4.5.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^4.0.14"
+    "vitest": "^3.0.2"
   },
   "packageManager": "npm@10.5.0",
   "volta": {

frontend/public/mockServiceWorker.js

@@ -7,8 +7,8 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.12.4'
-const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
+const PACKAGE_VERSION = '2.11.1'
+const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -71,6 +71,11 @@ addEventListener('message', async function (event) {
       break
     }
 
+    case 'MOCK_DEACTIVATE': {
+      activeClientIds.delete(clientId)
+      break
+    }
+
     case 'CLIENT_CLOSED': {
       activeClientIds.delete(clientId)
 
@@ -89,8 +94,6 @@ addEventListener('message', async function (event) {
 })
 
 addEventListener('fetch', function (event) {
-  const requestInterceptedAt = Date.now()
-
   // Bypass navigation requests.
   if (event.request.mode === 'navigate') {
     return
@@ -107,29 +110,23 @@ addEventListener('fetch', function (event) {
 
   // Bypass all requests when there are no active clients.
   // Prevents the self-unregistered worked from handling requests
-  // after it's been terminated (still remains active until the next reload).
+  // after it's been deleted (still remains active until the next reload).
   if (activeClientIds.size === 0) {
     return
   }
 
   const requestId = crypto.randomUUID()
-  event.respondWith(handleRequest(event, requestId, requestInterceptedAt))
+  event.respondWith(handleRequest(event, requestId))
 })
 
 /**
  * @param {FetchEvent} event
  * @param {string} requestId
- * @param {number} requestInterceptedAt
  */
-async function handleRequest(event, requestId, requestInterceptedAt) {
+async function handleRequest(event, requestId) {
   const client = await resolveMainClient(event)
   const requestCloneForEvents = event.request.clone()
-  const response = await getResponse(
-    event,
-    client,
-    requestId,
-    requestInterceptedAt,
-  )
+  const response = await getResponse(event, client, requestId)
 
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
@@ -205,10 +202,9 @@ async function resolveMainClient(event) {
  * @param {FetchEvent} event
  * @param {Client | undefined} client
  * @param {string} requestId
- * @param {number} requestInterceptedAt
  * @returns {Promise<Response>}
  */
-async function getResponse(event, client, requestId, requestInterceptedAt) {
+async function getResponse(event, client, requestId) {
   // Clone the request because it might've been already used
   // (i.e. its body has been read and sent to the client).
   const requestClone = event.request.clone()
@@ -259,7 +255,6 @@ async function getResponse(event, client, requestId, requestInterceptedAt) {
       type: 'REQUEST',
       payload: {
         id: requestId,
-        interceptedAt: requestInterceptedAt,
         ...serializedRequest,
       },
     },

frontend/src/api/conversation-service/v1-conversation-service.types.ts

@@ -3,19 +3,15 @@ import { Provider } from "#/types/settings";
 import { V1SandboxStatus } from "../sandbox-service/sandbox-service.types";
 
 // V1 API Types for requests
-// These types match the SDK's TextContent and ImageContent formats
-export interface V1TextContent {
-  type: "text";
-  text: string;
+// Note: This represents the serialized API format, not the internal TextContent/ImageContent types
+export interface V1MessageContent {
+  type: "text" | "image_url";
+  text?: string;
+  image_url?: {
+    url: string;
+  };
 }
 
-export interface V1ImageContent {
-  type: "image";
-  image_urls: string[];
-}
-
-export type V1MessageContent = V1TextContent | V1ImageContent;
-
 type V1Role = "user" | "system" | "assistant" | "tool";
 
 export interface V1SendMessageRequest {

frontend/src/api/event-service/event-service.api.ts

@@ -5,6 +5,7 @@ import type {
   ConfirmationResponseRequest,
   ConfirmationResponseResponse,
 } from "./event-service.types";
+import { openHands } from "../open-hands-axios";
 
 class EventService {
   /**
@@ -37,27 +38,11 @@ class EventService {
     return data;
   }
 
-  /**
-   * Get event count for a V1 conversation
-   * @param conversationId The conversation ID
-   * @param conversationUrl The conversation URL (e.g., "http://localhost:54928/api/conversations/...")
-   * @param sessionApiKey Session API key for authentication (required for V1)
-   * @returns The event count
-   */
-  static async getEventCount(
-    conversationId: string,
-    conversationUrl: string,
-    sessionApiKey?: string | null,
-  ): Promise<number> {
-    // Build the runtime URL using the conversation URL
-    const runtimeUrl = buildHttpBaseUrl(conversationUrl);
-
-    // Build session headers for authentication
-    const headers = buildSessionHeaders(sessionApiKey);
-
-    const { data } = await axios.get<number>(
-      `${runtimeUrl}/api/conversations/${conversationId}/events/count`,
-      { headers },
+  static async getEventCount(conversationId: string): Promise<number> {
+    const params = new URLSearchParams();
+    params.append("conversation_id__eq", conversationId);
+    const { data } = await openHands.get<number>(
+      `/api/v1/events/count?${params.toString()}`,
     );
     return data;
   }

frontend/src/components/features/chat/confirmation-mode-enabled.tsx

@@ -9,7 +9,7 @@ function ConfirmationModeEnabled() {
 
   const { data: settings } = useSettings();
 
-  if (!settings?.confirmation_mode) {
+  if (!settings?.CONFIRMATION_MODE) {
     return null;
   }
 

frontend/src/components/features/chat/event-content-helpers/get-observation-content.ts

@@ -22,13 +22,6 @@ const getCommandObservationContent = (
   if (content.length > MAX_CONTENT_LENGTH) {
     content = `${content.slice(0, MAX_CONTENT_LENGTH)}...`;
   }
-
-  const command = event.observation === "run" ? event.extras.command : null;
-
-  if (command) {
-    return `Command:\n\`\`\`sh\n${command}\n\`\`\`\n\nOutput:\n\`\`\`sh\n${content.trim() || i18n.t("OBSERVATION$COMMAND_NO_OUTPUT")}\n\`\`\``;
-  }
-
   return `Output:\n\`\`\`sh\n${content.trim() || i18n.t("OBSERVATION$COMMAND_NO_OUTPUT")}\n\`\`\``;
 };
 

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

@@ -6,6 +6,7 @@ import { I18nKey } from "#/i18n/declaration";
 import ArrowDown from "#/icons/angle-down-solid.svg?react";
 import ArrowUp from "#/icons/angle-up-solid.svg?react";
 import CheckCircle from "#/icons/check-circle-solid.svg?react";
+import XCircle from "#/icons/x-circle-solid.svg?react";
 import { OpenHandsAction } from "#/types/core/actions";
 import { OpenHandsObservation } from "#/types/core/observations";
 import { cn } from "#/utils/utils";
@@ -94,7 +95,7 @@ export function ExpandableMessage({
   const statusIconClasses = "h-4 w-4 ml-2 inline";
 
   if (
-    config?.FEATURE_FLAGS?.ENABLE_BILLING &&
+    config?.FEATURE_FLAGS.ENABLE_BILLING &&
     config?.APP_MODE === "saas" &&
     id === I18nKey.STATUS$ERROR_LLM_OUT_OF_CREDITS
   ) {
@@ -168,12 +169,19 @@ export function ExpandableMessage({
               )}
             </button>
           </span>
-          {type === "action" && success && (
+          {type === "action" && success !== undefined && (
             <span className="flex-shrink-0">
-              <CheckCircle
-                data-testid="status-icon"
-                className={cn(statusIconClasses, "fill-success")}
-              />
+              {success ? (
+                <CheckCircle
+                  data-testid="status-icon"
+                  className={cn(statusIconClasses, "fill-success")}
+                />
+              ) : (
+                <XCircle
+                  data-testid="status-icon"
+                  className={cn(statusIconClasses, "fill-danger")}
+                />
+              )}
             </span>
           )}
         </div>

frontend/src/components/features/chat/success-indicator.tsx

@@ -1,5 +1,6 @@
 import { FaClock } from "react-icons/fa";
 import CheckCircle from "#/icons/check-circle-solid.svg?react";
+import XCircle from "#/icons/x-circle-solid.svg?react";
 import { ObservationResultStatus } from "./event-content-helpers/get-observation-result";
 
 interface SuccessIndicatorProps {
@@ -16,6 +17,13 @@ export function SuccessIndicator({ status }: SuccessIndicatorProps) {
         />
       )}
 
+      {status === "error" && (
+        <XCircle
+          data-testid="status-icon"
+          className="h-4 w-4 ml-2 inline fill-danger"
+        />
+      )}
+
       {status === "timeout" && (
         <FaClock
           data-testid="status-icon"

frontend/src/components/features/chat/task-tracking/task-item.tsx

@@ -24,7 +24,7 @@ export function TaskItem({ task }: TaskItemProps) {
       case "todo":
         return <CircleIcon className="w-4 h-4 text-[#ffffff]" />;
       case "in_progress":
-        return <LoadingIcon className="w-4 h-4 text-[#ffffff] animate-spin" />;
+        return <LoadingIcon className="w-4 h-4 text-[#ffffff]" />;
       case "done":
         return <CheckCircleIcon className="w-4 h-4 text-[#A3A3A3]" />;
       default:

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

@@ -5,10 +5,11 @@ import { ContextMenu } from "#/ui/context-menu";
 import { ContextMenuListItem } from "./context-menu-list-item";
 import { Divider } from "#/ui/divider";
 import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
+import { useConfig } from "#/hooks/query/use-config";
 import { I18nKey } from "#/i18n/declaration";
 import LogOutIcon from "#/icons/log-out.svg?react";
 import DocumentIcon from "#/icons/document.svg?react";
-import { useSettingsNavItems } from "#/hooks/use-settings-nav-items";
+import { SAAS_NAV_ITEMS, OSS_NAV_ITEMS } from "#/constants/settings-nav";
 
 interface AccountSettingsContextMenuProps {
   onLogout: () => void;
@@ -21,17 +22,21 @@ export function AccountSettingsContextMenu({
 }: AccountSettingsContextMenuProps) {
   const ref = useClickOutsideElement<HTMLUListElement>(onClose);
   const { t } = useTranslation();
-  // Get navigation items and filter out LLM settings if the feature flag is enabled
-  const items = useSettingsNavItems();
+  const { data: config } = useConfig();
 
-  const navItems = items.map((item) => ({
+  const isSaas = config?.APP_MODE === "saas";
+  const navItems = (isSaas ? SAAS_NAV_ITEMS : OSS_NAV_ITEMS).map((item) => ({
     ...item,
     icon: React.cloneElement(item.icon, {
       width: 16,
       height: 16,
     } as React.SVGProps<SVGSVGElement>),
   }));
-  const handleNavigationClick = () => onClose();
+
+  const handleNavigationClick = () => {
+    onClose();
+    // The Link component will handle the actual navigation
+  };
 
   return (
     <ContextMenu
@@ -43,7 +48,7 @@ export function AccountSettingsContextMenu({
       {navItems.map(({ to, text, icon }) => (
         <Link key={to} to={to} className="text-decoration-none">
           <ContextMenuListItem
-            onClick={handleNavigationClick}
+            onClick={() => handleNavigationClick()}
             className="flex items-center gap-2 p-2 hover:bg-[#5C5D62] rounded h-[30px]"
           >
             {icon}

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

@@ -19,10 +19,8 @@ import {
 } from "#/state/conversation-store";
 import { ConversationTabsContextMenu } from "./conversation-tabs-context-menu";
 import { USE_PLANNING_AGENT } from "#/utils/feature-flags";
-import { useConversationId } from "#/hooks/use-conversation-id";
 
 export function ConversationTabs() {
-  const { conversationId } = useConversationId();
   const {
     selectedTab,
     isRightPanelShown,
@@ -32,21 +30,18 @@ export function ConversationTabs() {
 
   const [isMenuOpen, setIsMenuOpen] = useState(false);
 
-  // Persist selectedTab and isRightPanelShown in localStorage per conversation
+  // Persist selectedTab and isRightPanelShown in localStorage
   const [persistedSelectedTab, setPersistedSelectedTab] =
     useLocalStorage<ConversationTab | null>(
-      `conversation-selected-tab-${conversationId}`,
+      "conversation-selected-tab",
       "editor",
     );
 
   const [persistedIsRightPanelShown, setPersistedIsRightPanelShown] =
-    useLocalStorage<boolean>(
-      `conversation-right-panel-shown-${conversationId}`,
-      true,
-    );
+    useLocalStorage<boolean>("conversation-right-panel-shown", true);
 
   const [persistedUnpinnedTabs] = useLocalStorage<string[]>(
-    `conversation-unpinned-tabs-${conversationId}`,
+    "conversation-unpinned-tabs",
     [],
   );
 

frontend/src/components/features/guards/email-verification-guard.tsx

@@ -20,13 +20,13 @@ export function EmailVerificationGuard({
     if (isLoading) return;
 
     // If EMAIL_VERIFIED is explicitly false (not undefined or null)
-    if (settings?.email_verified === false) {
+    if (settings?.EMAIL_VERIFIED === false) {
       // Allow access to /settings/user but redirect from any other page
       if (pathname !== "/settings/user") {
         navigate("/settings/user", { replace: true });
       }
     }
-  }, [settings?.email_verified, pathname, navigate, isLoading]);
+  }, [settings?.EMAIL_VERIFIED, pathname, navigate, isLoading]);
 
   return children;
 }

frontend/src/components/features/home/recent-conversations/recent-conversations.tsx

@@ -78,7 +78,7 @@ export function RecentConversations() {
         )}
       </div>
 
-      {!isInitialLoading && !error && displayedConversations?.length === 0 && (
+      {!isInitialLoading && displayedConversations?.length === 0 && (
         <span className="text-xs leading-4 text-white font-medium pl-4">
           {t(I18nKey.HOME$NO_RECENT_CONVERSATIONS)}
         </span>

frontend/src/components/features/home/repo-selection-form.tsx

@@ -35,11 +35,7 @@ export function RepositorySelectionForm({
     React.useState<Provider | null>(null);
 
   const { providers } = useUserProviders();
-  const {
-    addRecentRepository,
-    setLastSelectedProvider,
-    getLastSelectedProvider,
-  } = useHomeStore();
+  const { addRecentRepository } = useHomeStore();
   const {
     mutate: createConversation,
     isPending,
@@ -50,24 +46,12 @@ export function RepositorySelectionForm({
 
   const { t } = useTranslation();
 
-  // Auto-select provider logic
+  // Auto-select provider if there's only one
   React.useEffect(() => {
-    if (providers.length === 0) return;
-
-    // If there's only one provider, auto-select it
     if (providers.length === 1 && !selectedProvider) {
       setSelectedProvider(providers[0]);
-      return;
     }
-
-    // If there are multiple providers and none is selected, try to use the last selected one
-    if (providers.length > 1 && !selectedProvider) {
-      const lastSelected = getLastSelectedProvider();
-      if (lastSelected && providers.includes(lastSelected)) {
-        setSelectedProvider(lastSelected);
-      }
-    }
-  }, [providers, selectedProvider, getLastSelectedProvider]);
+  }, [providers, selectedProvider]);
 
   // We check for isSuccess because the app might require time to render
   // into the new conversation screen after the conversation is created.
@@ -82,7 +66,6 @@ export function RepositorySelectionForm({
     }
 
     setSelectedProvider(provider);
-    setLastSelectedProvider(provider); // Store the selected provider
     setSelectedRepository(null); // Reset repository selection when provider changes
     setSelectedBranch(null); // Reset branch selection when provider changes
     onRepoSelection(null); // Reset parent component's selected repo

frontend/src/components/features/settings/mcp-settings/__tests__/mcp-server-form.validation.test.tsx

@@ -1,6 +1,6 @@
 import { render, screen, fireEvent } from "@testing-library/react";
 import { describe, it, expect, vi } from "vitest";
-import { MCPServerForm } from "#/components/features/settings/mcp-settings/mcp-server-form";
+import { MCPServerForm } from "../mcp-server-form";
 
 // i18n mock
 vi.mock("react-i18next", () => ({

frontend/src/components/features/settings/mcp-settings/__tests__/mcp-server-list.test.tsx

@@ -1,6 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { describe, it, expect, vi } from "vitest";
-import { MCPServerList } from "#/components/features/settings/mcp-settings/mcp-server-list";
+import { MCPServerList } from "../mcp-server-list";
 
 // Mock react-i18next
 vi.mock("react-i18next", () => ({

frontend/src/components/features/settings/settings-layout.tsx

@@ -1,11 +1,16 @@
 import { useState } from "react";
 import { MobileHeader } from "./mobile-header";
 import { SettingsNavigation } from "./settings-navigation";
-import { SettingsNavItem } from "#/constants/settings-nav";
+
+interface NavigationItem {
+  to: string;
+  icon: React.ReactNode;
+  text: string;
+}
 
 interface SettingsLayoutProps {
   children: React.ReactNode;
-  navigationItems: SettingsNavItem[];
+  navigationItems: NavigationItem[];
 }
 
 export function SettingsLayout({
@@ -14,8 +19,13 @@ export function SettingsLayout({
 }: SettingsLayoutProps) {
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
 
-  const toggleMobileMenu = () => setIsMobileMenuOpen(!isMobileMenuOpen);
-  const closeMobileMenu = () => setIsMobileMenuOpen(false);
+  const toggleMobileMenu = () => {
+    setIsMobileMenuOpen(!isMobileMenuOpen);
+  };
+
+  const closeMobileMenu = () => {
+    setIsMobileMenuOpen(false);
+  };
 
   return (
     <div className="flex flex-col h-full px-[14px] pt-8">
@@ -24,6 +34,7 @@ export function SettingsLayout({
         isMobileMenuOpen={isMobileMenuOpen}
         onToggleMenu={toggleMobileMenu}
       />
+
       {/* Desktop layout with navigation and main content */}
       <div className="flex flex-1 overflow-hidden gap-10">
         {/* Navigation */}
@@ -32,6 +43,7 @@ export function SettingsLayout({
           onCloseMobileMenu={closeMobileMenu}
           navigationItems={navigationItems}
         />
+
         {/* Main content */}
         <main className="flex-1 overflow-auto custom-scrollbar-always">
           {children}

frontend/src/components/features/settings/settings-navigation.tsx

@@ -5,12 +5,17 @@ import { Typography } from "#/ui/typography";
 import { I18nKey } from "#/i18n/declaration";
 import SettingsIcon from "#/icons/settings-gear.svg?react";
 import CloseIcon from "#/icons/close.svg?react";
-import { SettingsNavItem } from "#/constants/settings-nav";
+
+interface NavigationItem {
+  to: string;
+  icon: React.ReactNode;
+  text: string;
+}
 
 interface SettingsNavigationProps {
   isMobileMenuOpen: boolean;
   onCloseMobileMenu: () => void;
-  navigationItems: SettingsNavItem[];
+  navigationItems: NavigationItem[];
 }
 
 export function SettingsNavigation({
@@ -29,6 +34,7 @@ export function SettingsNavigation({
           onClick={onCloseMobileMenu}
         />
       )}
+
       {/* Navigation sidebar */}
       <nav
         data-testid="settings-navbar"

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

@@ -34,7 +34,13 @@ export function Sidebar() {
 
   const { pathname } = useLocation();
 
+  // TODO: Remove HIDE_LLM_SETTINGS check once released
+  const shouldHideLlmSettings =
+    config?.FEATURE_FLAGS.HIDE_LLM_SETTINGS && config?.APP_MODE === "saas";
+
   React.useEffect(() => {
+    if (shouldHideLlmSettings) return;
+
     if (location.pathname === "/settings") {
       setSettingsModalIsOpen(false);
     } else if (
@@ -71,19 +77,19 @@ export function Sidebar() {
               <OpenHandsLogoButton />
             </div>
             <div>
-              <NewProjectButton disabled={settings?.email_verified === false} />
+              <NewProjectButton disabled={settings?.EMAIL_VERIFIED === false} />
             </div>
             <ConversationPanelButton
               isOpen={conversationPanelIsOpen}
               onClick={() =>
-                settings?.email_verified === false
+                settings?.EMAIL_VERIFIED === false
                   ? null
                   : setConversationPanelIsOpen((prev) => !prev)
               }
-              disabled={settings?.email_verified === false}
+              disabled={settings?.EMAIL_VERIFIED === false}
             />
             <MicroagentManagementButton
-              disabled={settings?.email_verified === false}
+              disabled={settings?.EMAIL_VERIFIED === false}
             />
           </div>
 

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

@@ -58,9 +58,6 @@ export function UserActions({ onLogout, user, isLoading }: UserActionsProps) {
           className={cn(
             "opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto",
             showMenu && "opacity-100 pointer-events-auto",
-            // Invisible hover bridge: extends hover zone to create a "safe corridor"
-            // for diagonal mouse movement to the menu (only active when menu is visible)
-            "group-hover:before:absolute group-hover:before:bottom-0 group-hover:before:right-0 group-hover:before:w-[200px] group-hover:before:h-[300px]",
           )}
         >
           <AccountSettingsContextMenu

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

@@ -41,11 +41,11 @@ export function SettingsForm({ settings, models, onClose }: SettingsFormProps) {
         onClose();
 
         posthog.capture("settings_saved", {
-          LLM_MODEL: newSettings.llm_model,
-          LLM_API_KEY_SET: newSettings.llm_api_key_set ? "SET" : "UNSET",
-          SEARCH_API_KEY_SET: newSettings.search_api_key ? "SET" : "UNSET",
+          LLM_MODEL: newSettings.LLM_MODEL,
+          LLM_API_KEY_SET: newSettings.LLM_API_KEY_SET ? "SET" : "UNSET",
+          SEARCH_API_KEY_SET: newSettings.SEARCH_API_KEY ? "SET" : "UNSET",
           REMOTE_RUNTIME_RESOURCE_FACTOR:
-            newSettings.remote_runtime_resource_factor,
+            newSettings.REMOTE_RUNTIME_RESOURCE_FACTOR,
         });
       },
     });
@@ -67,7 +67,7 @@ export function SettingsForm({ settings, models, onClose }: SettingsFormProps) {
     }
   };
 
-  const isLLMKeySet = settings.llm_api_key_set;
+  const isLLMKeySet = settings.LLM_API_KEY_SET;
 
   return (
     <div>
@@ -80,7 +80,7 @@ export function SettingsForm({ settings, models, onClose }: SettingsFormProps) {
         <div className="flex flex-col gap-[17px]">
           <ModelSelector
             models={organizeModelsAndProviders(models)}
-            currentModel={settings.llm_model}
+            currentModel={settings.LLM_MODEL}
             wrapperClassName="!flex-col !gap-[17px]"
             labelClassName={SETTINGS_FORM.LABEL_CLASSNAME}
           />

frontend/src/components/v1/chat/event-content-helpers/get-observation-content.ts

@@ -71,18 +71,7 @@ const getTerminalObservationContent = (
     content = `${content.slice(0, MAX_CONTENT_LENGTH)}...`;
   }
 
-  // Build the output string
-  let output = "";
-
-  // Display the command if available
-  if (observation.command) {
-    output += `Command: \`${observation.command}\`\n\n`;
-  }
-
-  // Display the output
-  output += `Output:\n\`\`\`sh\n${content.trim() || i18n.t("OBSERVATION$COMMAND_NO_OUTPUT")}\n\`\`\``;
-
-  return output;
+  return `Output:\n\`\`\`sh\n${content.trim() || i18n.t("OBSERVATION$COMMAND_NO_OUTPUT")}\n\`\`\``;
 };
 
 // Tool Observations
@@ -98,16 +87,14 @@ const getBrowserObservationContent = (
           .filter((c) => c.type === "text")
           .map((c) => c.text)
           .join("\n")
-      : observation.output || "";
+      : "";
 
   let contentDetails = "";
 
-  if (observation.error) {
-    contentDetails += `**Error:**\n${observation.error}`;
-  } else if (textContent) {
-    contentDetails += `**Output:**\n${textContent}`;
+  if ("is_error" in observation && observation.is_error) {
+    contentDetails += `**Error:**\n${textContent}`;
   } else {
-    contentDetails += "Browser action completed successfully.";
+    contentDetails += `**Output:**\n${textContent}`;
   }
 
   if (contentDetails.length > MAX_CONTENT_LENGTH) {

frontend/src/components/v1/chat/event-message.tsx

@@ -118,7 +118,7 @@ const renderUserMessageWithSkillReady = (
     );
   } catch (error) {
     // If skill ready event creation fails, just render the user message
-    // Failed to create skill ready event, fallback to user message
+    console.error("Failed to create skill ready event:", error);
     return (
       <UserAssistantEventMessage
         event={messageEvent}

frontend/src/components/v1/chat/task-tracking/task-item.tsx

@@ -20,7 +20,9 @@ export function TaskItem({ task }: TaskItemProps) {
       case "todo":
         return <CircleIcon className="w-4 h-4 text-[#ffffff]" />;
       case "in_progress":
-        return <LoadingIcon className="w-4 h-4 text-[#ffffff] animate-spin" />;
+        return (
+          <LoadingIcon className="w-4 h-4 text-[#ffffff]" strokeWidth={0.5} />
+        );
       case "done":
         return <CheckCircleIcon className="w-4 h-4 text-[#A3A3A3]" />;
       default:

frontend/src/contexts/conversation-websocket-context.tsx

@@ -7,7 +7,6 @@ import React, {
   useMemo,
   useRef,
 } from "react";
-import { useTranslation } from "react-i18next";
 import { useQueryClient } from "@tanstack/react-query";
 import { useWebSocket, WebSocketHookOptions } from "#/hooks/use-websocket";
 import { useEventStore } from "#/stores/use-event-store";
@@ -15,7 +14,6 @@ import { useErrorMessageStore } from "#/stores/error-message-store";
 import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
 import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
 import { useCommandStore } from "#/state/command-store";
-import { useBrowserStore } from "#/stores/browser-store";
 import {
   isV1Event,
   isAgentErrorEvent,
@@ -29,8 +27,6 @@ import {
   isExecuteBashObservationEvent,
   isConversationErrorEvent,
   isPlanningFileEditorObservationEvent,
-  isBrowserObservationEvent,
-  isBrowserNavigateActionEvent,
 } from "#/types/v1/type-guards";
 import { ConversationStateUpdateEventStats } from "#/types/v1/core/events/conversation-state-event";
 import { handleActionEventCacheInvalidation } from "#/utils/cache-utils";
@@ -45,7 +41,6 @@ import { isBudgetOrCreditError } from "#/utils/error-handler";
 import { useTracking } from "#/hooks/use-tracking";
 import { useReadConversationFile } from "#/hooks/mutation/use-read-conversation-file";
 import useMetricsStore from "#/stores/metrics-store";
-import { I18nKey } from "#/i18n/declaration";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export type V1_WebSocketConnectionState =
@@ -125,8 +120,6 @@ export function ConversationWebSocketProvider({
     conversationId: string;
   } | null>(null);
 
-  const { t } = useTranslation();
-
   // Helper function to update metrics from stats event
   const updateMetricsFromStats = useCallback(
     (event: ConversationStateUpdateEventStats) => {
@@ -390,22 +383,6 @@ export function ConversationWebSocketProvider({
               .join("\n");
             appendOutput(textContent);
           }
-
-          // Handle BrowserObservation events - update browser store with screenshot
-          if (isBrowserObservationEvent(event)) {
-            const { screenshot_data: screenshotData } = event.observation;
-            if (screenshotData) {
-              const screenshotSrc = screenshotData.startsWith("data:")
-                ? screenshotData
-                : `data:image/png;base64,${screenshotData}`;
-              useBrowserStore.getState().setScreenshotSrc(screenshotSrc);
-            }
-          }
-
-          // Handle BrowserNavigateAction events - update browser store with URL
-          if (isBrowserNavigateActionEvent(event)) {
-            useBrowserStore.getState().setUrl(event.action.url);
-          }
         }
       } catch (error) {
         // eslint-disable-next-line no-console
@@ -582,13 +559,9 @@ export function ConversationWebSocketProvider({
         removeErrorMessage(); // Clear any previous error messages on successful connection
 
         // Fetch expected event count for history loading detection
-        if (conversationId && conversationUrl) {
+        if (conversationId) {
           try {
-            const count = await EventService.getEventCount(
-              conversationId,
-              conversationUrl,
-              sessionApiKey,
-            );
+            const count = await EventService.getEventCount(conversationId);
             setExpectedEventCountMain(count);
 
             // If no events expected, mark as loaded immediately
@@ -607,7 +580,7 @@ export function ConversationWebSocketProvider({
         // This prevents showing errors during initial connection attempts (e.g., when auto-starting a conversation)
         if (event.code !== 1000 && hasConnectedRefMain.current) {
           setErrorMessage(
-            `${t(I18nKey.STATUS$CONNECTION_LOST)}: ${event.reason || t(I18nKey.STATUS$DISCONNECTED_REFRESH_PAGE)}`,
+            `Connection lost: ${event.reason || "Unexpected disconnect"}`,
           );
         }
       },
@@ -626,7 +599,6 @@ export function ConversationWebSocketProvider({
     removeErrorMessage,
     sessionApiKey,
     conversationId,
-    conversationUrl,
   ]);
 
   // Separate WebSocket options for planning agent connection
@@ -651,15 +623,10 @@ export function ConversationWebSocketProvider({
         removeErrorMessage(); // Clear any previous error messages on successful connection
 
         // Fetch expected event count for history loading detection
-        if (
-          planningAgentConversation?.id &&
-          planningAgentConversation.conversation_url
-        ) {
+        if (planningAgentConversation?.id) {
           try {
             const count = await EventService.getEventCount(
               planningAgentConversation.id,
-              planningAgentConversation.conversation_url,
-              planningAgentConversation.session_api_key,
             );
             setExpectedEventCountPlanning(count);
 
@@ -679,7 +646,7 @@ export function ConversationWebSocketProvider({
         // This prevents showing errors during initial connection attempts (e.g., when auto-starting a conversation)
         if (event.code !== 1000 && hasConnectedRefPlanning.current) {
           setErrorMessage(
-            `${t(I18nKey.STATUS$CONNECTION_LOST)}: ${event.reason || t(I18nKey.STATUS$DISCONNECTED_REFRESH_PAGE)}`,
+            `Connection lost: ${event.reason || "Unexpected disconnect"}`,
           );
         }
       },

frontend/src/hooks/mutation/use-add-mcp-server.ts

@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useSettings } from "#/hooks/query/use-settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { MCPSSEServer, MCPStdioServer, MCPSHTTPServer } from "#/types/settings";
 
 type MCPServerType = "sse" | "stdio" | "shttp";
@@ -24,7 +24,7 @@ export function useAddMcpServer() {
     mutationFn: async (server: MCPServerConfig): Promise<void> => {
       if (!settings) return;
 
-      const currentConfig = settings.mcp_config || {
+      const currentConfig = settings.MCP_CONFIG || {
         sse_servers: [],
         stdio_servers: [],
         shttp_servers: [],
@@ -57,7 +57,6 @@ export function useAddMcpServer() {
 
       const apiSettings = {
         mcp_config: newConfig,
-        v1_enabled: settings.v1_enabled,
       };
 
       await SettingsService.saveSettings(apiSettings);

frontend/src/hooks/mutation/use-create-conversation.ts

@@ -4,8 +4,8 @@ import V1ConversationService from "#/api/conversation-service/v1-conversation-se
 import { SuggestedTask } from "#/utils/types";
 import { Provider } from "#/types/settings";
 import { CreateMicroagent, Conversation } from "#/api/open-hands.types";
+import { USE_V1_CONVERSATION_API } from "#/utils/feature-flags";
 import { useTracking } from "#/hooks/use-tracking";
-import { useSettings } from "#/hooks/query/use-settings";
 
 interface CreateConversationVariables {
   query?: string;
@@ -34,7 +34,6 @@ interface CreateConversationResponse extends Partial<Conversation> {
 export const useCreateConversation = () => {
   const queryClient = useQueryClient();
   const { trackConversationCreated } = useTracking();
-  const { data: settings } = useSettings();
 
   return useMutation({
     mutationKey: ["create-conversation"],
@@ -51,7 +50,7 @@ export const useCreateConversation = () => {
         agentType,
       } = variables;
 
-      const useV1 = !!settings?.v1_enabled && !createMicroagent;
+      const useV1 = USE_V1_CONVERSATION_API() && !createMicroagent;
 
       if (useV1) {
         // Use V1 API - creates a conversation start task

frontend/src/hooks/mutation/use-delete-mcp-server.ts

@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useSettings } from "#/hooks/query/use-settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { MCPConfig } from "#/types/settings";
 
 export function useDeleteMcpServer() {
@@ -9,9 +9,9 @@ export function useDeleteMcpServer() {
 
   return useMutation({
     mutationFn: async (serverId: string): Promise<void> => {
-      if (!settings?.mcp_config) return;
+      if (!settings?.MCP_CONFIG) return;
 
-      const newConfig: MCPConfig = { ...settings.mcp_config };
+      const newConfig: MCPConfig = { ...settings.MCP_CONFIG };
       const [serverType, indexStr] = serverId.split("-");
       const index = parseInt(indexStr, 10);
 
@@ -25,7 +25,6 @@ export function useDeleteMcpServer() {
 
       const apiSettings = {
         mcp_config: newConfig,
-        v1_enabled: settings.v1_enabled,
       };
 
       await SettingsService.saveSettings(apiSettings);

frontend/src/hooks/mutation/use-save-settings.ts

@@ -1,29 +1,43 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { usePostHog } from "posthog-js/react";
 import { DEFAULT_SETTINGS } from "#/services/settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
-import { Settings } from "#/types/settings";
+import SettingsService from "#/settings-service/settings-service.api";
+import { PostSettings } from "#/types/settings";
+import { PostApiSettings } from "#/settings-service/settings.types";
 import { useSettings } from "../query/use-settings";
 
-const saveSettingsMutationFn = async (settings: Partial<Settings>) => {
-  const settingsToSave: Partial<Settings> = {
-    ...settings,
-    agent: settings.agent || DEFAULT_SETTINGS.agent,
-    language: settings.language || DEFAULT_SETTINGS.language,
+const saveSettingsMutationFn = async (settings: Partial<PostSettings>) => {
+  const apiSettings: Partial<PostApiSettings> = {
+    llm_model: settings.LLM_MODEL,
+    llm_base_url: settings.LLM_BASE_URL,
+    agent: settings.AGENT || DEFAULT_SETTINGS.AGENT,
+    language: settings.LANGUAGE || DEFAULT_SETTINGS.LANGUAGE,
+    confirmation_mode: settings.CONFIRMATION_MODE,
+    security_analyzer: settings.SECURITY_ANALYZER,
     llm_api_key:
       settings.llm_api_key === ""
         ? ""
         : settings.llm_api_key?.trim() || undefined,
+    remote_runtime_resource_factor: settings.REMOTE_RUNTIME_RESOURCE_FACTOR,
+    enable_default_condenser: settings.ENABLE_DEFAULT_CONDENSER,
     condenser_max_size:
-      settings.condenser_max_size ?? DEFAULT_SETTINGS.condenser_max_size,
-    search_api_key: settings.search_api_key?.trim() || "",
+      settings.CONDENSER_MAX_SIZE ?? DEFAULT_SETTINGS.CONDENSER_MAX_SIZE,
+    enable_sound_notifications: settings.ENABLE_SOUND_NOTIFICATIONS,
+    user_consents_to_analytics: settings.user_consents_to_analytics,
+    provider_tokens_set: settings.PROVIDER_TOKENS_SET,
+    mcp_config: settings.MCP_CONFIG,
+    enable_proactive_conversation_starters:
+      settings.ENABLE_PROACTIVE_CONVERSATION_STARTERS,
+    enable_solvability_analysis: settings.ENABLE_SOLVABILITY_ANALYSIS,
+    search_api_key: settings.SEARCH_API_KEY?.trim() || "",
+    max_budget_per_task: settings.MAX_BUDGET_PER_TASK,
     git_user_name:
-      settings.git_user_name?.trim() || DEFAULT_SETTINGS.git_user_name,
+      settings.GIT_USER_NAME?.trim() || DEFAULT_SETTINGS.GIT_USER_NAME,
     git_user_email:
-      settings.git_user_email?.trim() || DEFAULT_SETTINGS.git_user_email,
+      settings.GIT_USER_EMAIL?.trim() || DEFAULT_SETTINGS.GIT_USER_EMAIL,
   };
 
-  await SettingsService.saveSettings(settingsToSave);
+  await SettingsService.saveSettings(apiSettings);
 };
 
 export const useSaveSettings = () => {
@@ -32,18 +46,18 @@ export const useSaveSettings = () => {
   const { data: currentSettings } = useSettings();
 
   return useMutation({
-    mutationFn: async (settings: Partial<Settings>) => {
+    mutationFn: async (settings: Partial<PostSettings>) => {
       const newSettings = { ...currentSettings, ...settings };
 
       // Track MCP configuration changes
       if (
-        settings.mcp_config &&
-        currentSettings?.mcp_config !== settings.mcp_config
+        settings.MCP_CONFIG &&
+        currentSettings?.MCP_CONFIG !== settings.MCP_CONFIG
       ) {
-        const hasMcpConfig = !!settings.mcp_config;
-        const sseServersCount = settings.mcp_config?.sse_servers?.length || 0;
+        const hasMcpConfig = !!settings.MCP_CONFIG;
+        const sseServersCount = settings.MCP_CONFIG?.sse_servers?.length || 0;
         const stdioServersCount =
-          settings.mcp_config?.stdio_servers?.length || 0;
+          settings.MCP_CONFIG?.stdio_servers?.length || 0;
 
         // Track MCP configuration usage
         posthog.capture("mcp_config_updated", {

frontend/src/hooks/mutation/use-update-mcp-server.ts

@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useSettings } from "#/hooks/query/use-settings";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { MCPSSEServer, MCPStdioServer, MCPSHTTPServer } from "#/types/settings";
 
 type MCPServerType = "sse" | "stdio" | "shttp";
@@ -28,9 +28,9 @@ export function useUpdateMcpServer() {
       serverId: string;
       server: MCPServerConfig;
     }): Promise<void> => {
-      if (!settings?.mcp_config) return;
+      if (!settings?.MCP_CONFIG) return;
 
-      const newConfig = { ...settings.mcp_config };
+      const newConfig = { ...settings.MCP_CONFIG };
       const [serverType, indexStr] = serverId.split("-");
       const index = parseInt(indexStr, 10);
 
@@ -59,7 +59,6 @@ export function useUpdateMcpServer() {
 
       const apiSettings = {
         mcp_config: newConfig,
-        v1_enabled: settings.v1_enabled,
       };
 
       await SettingsService.saveSettings(apiSettings);

frontend/src/hooks/query/use-balance.ts

@@ -13,6 +13,6 @@ export const useBalance = () => {
     enabled:
       !isOnTosPage &&
       config?.APP_MODE === "saas" &&
-      config?.FEATURE_FLAGS?.ENABLE_BILLING,
+      config?.FEATURE_FLAGS.ENABLE_BILLING,
   });
 };

frontend/src/hooks/query/use-settings.ts

@@ -1,23 +1,41 @@
 import { useQuery } from "@tanstack/react-query";
-import SettingsService from "#/api/settings-service/settings-service.api";
+import SettingsService from "#/settings-service/settings-service.api";
 import { DEFAULT_SETTINGS } from "#/services/settings";
 import { useIsOnTosPage } from "#/hooks/use-is-on-tos-page";
 import { Settings } from "#/types/settings";
 import { useIsAuthed } from "./use-is-authed";
 
 const getSettingsQueryFn = async (): Promise<Settings> => {
-  const settings = await SettingsService.getSettings();
+  const apiSettings = await SettingsService.getSettings();
 
   return {
-    ...settings,
-    condenser_max_size:
-      settings.condenser_max_size ?? DEFAULT_SETTINGS.condenser_max_size,
-    search_api_key: settings.search_api_key || "",
-    email: settings.email || "",
-    git_user_name: settings.git_user_name || DEFAULT_SETTINGS.git_user_name,
-    git_user_email: settings.git_user_email || DEFAULT_SETTINGS.git_user_email,
-    is_new_user: false,
-    v1_enabled: settings.v1_enabled ?? DEFAULT_SETTINGS.v1_enabled,
+    LLM_MODEL: apiSettings.llm_model,
+    LLM_BASE_URL: apiSettings.llm_base_url,
+    AGENT: apiSettings.agent,
+    LANGUAGE: apiSettings.language,
+    CONFIRMATION_MODE: apiSettings.confirmation_mode,
+    SECURITY_ANALYZER: apiSettings.security_analyzer,
+    LLM_API_KEY_SET: apiSettings.llm_api_key_set,
+    SEARCH_API_KEY_SET: apiSettings.search_api_key_set,
+    REMOTE_RUNTIME_RESOURCE_FACTOR: apiSettings.remote_runtime_resource_factor,
+    PROVIDER_TOKENS_SET: apiSettings.provider_tokens_set,
+    ENABLE_DEFAULT_CONDENSER: apiSettings.enable_default_condenser,
+    CONDENSER_MAX_SIZE:
+      apiSettings.condenser_max_size ?? DEFAULT_SETTINGS.CONDENSER_MAX_SIZE,
+    ENABLE_SOUND_NOTIFICATIONS: apiSettings.enable_sound_notifications,
+    ENABLE_PROACTIVE_CONVERSATION_STARTERS:
+      apiSettings.enable_proactive_conversation_starters,
+    ENABLE_SOLVABILITY_ANALYSIS: apiSettings.enable_solvability_analysis,
+    USER_CONSENTS_TO_ANALYTICS: apiSettings.user_consents_to_analytics,
+    SEARCH_API_KEY: apiSettings.search_api_key || "",
+    MAX_BUDGET_PER_TASK: apiSettings.max_budget_per_task,
+    EMAIL: apiSettings.email || "",
+    EMAIL_VERIFIED: apiSettings.email_verified,
+    MCP_CONFIG: apiSettings.mcp_config,
+    GIT_USER_NAME: apiSettings.git_user_name || DEFAULT_SETTINGS.GIT_USER_NAME,
+    GIT_USER_EMAIL:
+      apiSettings.git_user_email || DEFAULT_SETTINGS.GIT_USER_EMAIL,
+    IS_NEW_USER: false,
   };
 };
 

frontend/src/hooks/query/use-start-tasks.ts

@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { useSettings } from "#/hooks/query/use-settings";
+import { USE_V1_CONVERSATION_API } from "#/utils/feature-flags";
 
 /**
  * Hook to fetch in-progress V1 conversation start tasks
@@ -13,17 +13,13 @@ import { useSettings } from "#/hooks/query/use-settings";
  * @param limit Maximum number of tasks to return (max 100)
  * @returns Query result with array of in-progress start tasks
  */
-export const useStartTasks = (limit = 10) => {
-  const { data: settings } = useSettings();
-  const isV1Enabled = settings?.v1_enabled;
-
-  return useQuery({
+export const useStartTasks = (limit = 10) =>
+  useQuery({
     queryKey: ["start-tasks", "search", limit],
     queryFn: () => V1ConversationService.searchStartTasks(limit),
-    enabled: isV1Enabled,
+    enabled: USE_V1_CONVERSATION_API(),
     select: (tasks) =>
       tasks.filter(
         (task) => task.status !== "READY" && task.status !== "ERROR",
       ),
   });
-};

frontend/src/hooks/use-send-message.ts

@@ -41,11 +41,13 @@ export function useSendMessage() {
             },
           ];
 
-          // Add images if present - using SDK's ImageContent format
+          // Add images if present
           if (args.image_urls && args.image_urls.length > 0) {
-            content.push({
-              type: "image",
-              image_urls: args.image_urls,
+            args.image_urls.forEach((url) => {
+              content.push({
+                type: "image_url",
+                image_url: { url },
+              });
             });
           }
 

frontend/src/hooks/use-settings-nav-items.ts

@@ -1,15 +0,0 @@
-import { useConfig } from "#/hooks/query/use-config";
-import { SAAS_NAV_ITEMS, OSS_NAV_ITEMS } from "#/constants/settings-nav";
-
-export function useSettingsNavItems() {
-  const { data: config } = useConfig();
-
-  const shouldHideLlmSettings = !!config?.FEATURE_FLAGS?.HIDE_LLM_SETTINGS;
-  const isSaasMode = config?.APP_MODE === "saas";
-
-  const items = isSaasMode ? SAAS_NAV_ITEMS : OSS_NAV_ITEMS;
-
-  return shouldHideLlmSettings
-    ? items.filter((item) => item.to !== "/settings")
-    : items;
-}

frontend/src/hooks/use-sync-posthog-consent.ts

@@ -19,7 +19,7 @@ export const useSyncPostHogConsent = () => {
       return;
     }
 
-    const backendConsent = settings.user_consents_to_analytics;
+    const backendConsent = settings.USER_CONSENTS_TO_ANALYTICS;
 
     // Only sync if there's a backend preference set
     if (backendConsent !== null) {

frontend/src/hooks/use-terminal.ts

@@ -44,7 +44,7 @@ export const useTerminal = () => {
     new Terminal({
       fontFamily: "Menlo, Monaco, 'Courier New', monospace",
       fontSize: 14,
-      scrollback: 10000,
+      scrollback: 1000,
       scrollSensitivity: 1,
       fastScrollModifier: "alt",
       fastScrollSensitivity: 5,
@@ -62,7 +62,6 @@ export const useTerminal = () => {
         terminal.current.open(ref.current);
         // Hide cursor for read-only terminal using ANSI escape sequence
         terminal.current.write("\x1b[?25l");
-        fitAddon.current?.fit();
       }
     }
   };

frontend/src/hooks/use-tracking.ts

@@ -17,7 +17,7 @@ export const useTracking = () => {
     app_surface: config?.APP_MODE || "unknown",
     plan_tier: null,
     current_url: window.location.href,
-    user_email: settings?.email || settings?.git_user_email || null,
+    user_email: settings?.EMAIL || settings?.GIT_USER_EMAIL || null,
   };
 
   const trackLoginButtonClick = ({ provider }: { provider: Provider }) => {

frontend/src/hooks/use-user-providers.ts

@@ -6,8 +6,8 @@ export const useUserProviders = () => {
   const { data: settings, isLoading: isLoadingSettings } = useSettings();
 
   const providers = React.useMemo(
-    () => convertRawProvidersToList(settings?.provider_tokens_set),
-    [settings?.provider_tokens_set],
+    () => convertRawProvidersToList(settings?.PROVIDER_TOKENS_SET),
+    [settings?.PROVIDER_TOKENS_SET],
   );
 
   return {

frontend/src/i18n/declaration.ts

@@ -532,8 +532,6 @@ export enum I18nKey {
   SUGGESTIONS$ADD_DOCS = "SUGGESTIONS$ADD_DOCS",
   SUGGESTIONS$ADD_DOCKERFILE = "SUGGESTIONS$ADD_DOCKERFILE",
   STATUS$CONNECTED = "STATUS$CONNECTED",
-  STATUS$CONNECTION_LOST = "STATUS$CONNECTION_LOST",
-  STATUS$DISCONNECTED_REFRESH_PAGE = "STATUS$DISCONNECTED_REFRESH_PAGE",
   BROWSER$NO_PAGE_LOADED = "BROWSER$NO_PAGE_LOADED",
   USER$AVATAR_PLACEHOLDER = "USER$AVATAR_PLACEHOLDER",
   ACCOUNT_SETTINGS$LOGOUT = "ACCOUNT_SETTINGS$LOGOUT",

frontend/src/i18n/translation.json

@@ -8511,38 +8511,6 @@
     "tr": "Bağlandı",
     "uk": "Підключено"
   },
-  "STATUS$CONNECTION_LOST": {
-    "en": "Connection lost",
-    "ja": "接続が切断されました",
-    "zh-CN": "连接已断开",
-    "zh-TW": "連接已斷開",
-    "ko-KR": "연결이 끊어졌습니다",
-    "de": "Verbindung verloren",
-    "no": "Tilkobling mistet",
-    "it": "Connessione persa",
-    "pt": "Conexão perdida",
-    "es": "Conexión perdida",
-    "ar": "فُقد الاتصال",
-    "fr": "Connexion perdue",
-    "tr": "Bağlantı kesildi",
-    "uk": "Втрачено з'єднання"
-  },
-  "STATUS$DISCONNECTED_REFRESH_PAGE": {
-    "en": "Disconnected. Please refresh the page",
-    "ja": "切断されました。ページを更新してください",
-    "zh-CN": "已断开连接。请刷新页面",
-    "zh-TW": "已斷開連接。請重新整理頁面",
-    "ko-KR": "연결이 끊어졌습니다. 페이지를 새로고침하세요",
-    "de": "Getrennt. Bitte aktualisieren Sie die Seite",
-    "no": "Koblet fra. Vennligst oppdater siden",
-    "it": "Disconnesso. Si prega di aggiornare la pagina",
-    "pt": "Desconectado. Por favor, atualize a página",
-    "es": "Desconectado. Por favor, actualice la página",
-    "ar": "تم قطع الاتصال. يرجى تحديث الصفحة",
-    "fr": "Déconnecté. Veuillez actualiser la page",
-    "tr": "Bağlantı kesildi. Lütfen sayfayı yenileyin",
-    "uk": "Відключено. Будь ласка, оновіть сторінку"
-  },
   "BROWSER$NO_PAGE_LOADED": {
     "en": "No page loaded",
     "ja": "ブラウザは空です",

frontend/src/icons/loading.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-  <path d="M8 0.5C9.74234 0.5 11.4264 1.12774 12.7442 2.26758C14.062 3.40746 14.9259 4.98379 15.1768 6.70801L15.2188 6.99316H13.7061L13.6709 6.78516C13.4431 5.44635 12.7486 4.23161 11.711 3.35547C10.6731 2.47925 9.35827 1.99805 8 1.99805C6.64182 1.99811 5.32782 2.47931 4.29004 3.35547C3.25229 4.23161 2.55792 5.44628 2.33007 6.78516L2.29394 6.99316H0.782227L0.824219 6.70801C1.07515 4.98389 1.9382 3.40745 3.25586 2.26758C4.57357 1.12776 6.25771 0.500069 8 0.5Z" fill="currentColor" stroke="currentColor" stroke-width="0.5"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="7" viewBox="0 0 16 7" fill="none">
+  <path d="M7.50684 0.25C9.24918 0.25 10.9332 0.87774 12.251 2.01758C13.5688 3.15746 14.4327 4.73379 14.6836 6.45801L14.7256 6.74316H13.2129L13.1777 6.53516C12.9499 5.19635 12.2554 3.98161 11.2178 3.10547C10.1799 2.22925 8.86511 1.74805 7.50684 1.74805C6.14866 1.74811 4.83466 2.22931 3.79688 3.10547C2.75913 3.98161 2.06476 5.19628 1.83691 6.53516L1.80078 6.74316H0.289063L0.331055 6.45801C0.581982 4.73389 1.44504 3.15745 2.7627 2.01758C4.08041 0.877757 5.76455 0.250069 7.50684 0.25Z" fill="currentColor" stroke="currentColor" stroke-width="0.5"/>
 </svg>

frontend/src/mocks/analytics-handlers.ts

@@ -1,7 +0,0 @@
-import { http, HttpResponse } from "msw";
-
-export const ANALYTICS_HANDLERS = [
-  http.post("https://us.i.posthog.com/e", async () =>
-    HttpResponse.json(null, { status: 200 }),
-  ),
-];

frontend/src/mocks/auth-handlers.ts

@@ -1,23 +0,0 @@
-import { http, HttpResponse } from "msw";
-import { GitUser } from "#/types/git";
-
-export const AUTH_HANDLERS = [
-  http.get("/api/user/info", () => {
-    const user: GitUser = {
-      id: "1",
-      login: "octocat",
-      avatar_url: "https://avatars.githubusercontent.com/u/583231?v=4",
-      company: "GitHub",
-      email: "placeholder@placeholder.placeholder",
-      name: "monalisa octocat",
-    };
-
-    return HttpResponse.json(user);
-  }),
-
-  http.post("/api/authenticate", async () =>
-    HttpResponse.json({ message: "Authenticated" }),
-  ),
-
-  http.post("/api/logout", () => HttpResponse.json(null, { status: 200 })),
-];

frontend/src/mocks/conversation-handlers.ts

@@ -1,118 +0,0 @@
-import { http, delay, HttpResponse } from "msw";
-import { Conversation, ResultSet } from "#/api/open-hands.types";
-
-const conversations: Conversation[] = [
-  {
-    conversation_id: "1",
-    title: "My New Project",
-    selected_repository: null,
-    git_provider: null,
-    selected_branch: null,
-    last_updated_at: new Date().toISOString(),
-    created_at: new Date().toISOString(),
-    status: "RUNNING",
-    runtime_status: "STATUS$READY",
-    url: null,
-    session_api_key: null,
-  },
-  {
-    conversation_id: "2",
-    title: "Repo Testing",
-    selected_repository: "octocat/hello-world",
-    git_provider: "github",
-    selected_branch: null,
-    last_updated_at: new Date(
-      Date.now() - 2 * 24 * 60 * 60 * 1000,
-    ).toISOString(),
-    created_at: new Date(Date.now() - 2 * 24 * 60 * 60 * 1000).toISOString(),
-    status: "STOPPED",
-    runtime_status: null,
-    url: null,
-    session_api_key: null,
-  },
-  {
-    conversation_id: "3",
-    title: "Another Project",
-    selected_repository: "octocat/earth",
-    git_provider: null,
-    selected_branch: "main",
-    last_updated_at: new Date(
-      Date.now() - 5 * 24 * 60 * 60 * 1000,
-    ).toISOString(),
-    created_at: new Date(Date.now() - 5 * 24 * 60 * 60 * 1000).toISOString(),
-    status: "STOPPED",
-    runtime_status: null,
-    url: null,
-    session_api_key: null,
-  },
-];
-
-const CONVERSATIONS = new Map<string, Conversation>(
-  conversations.map((c) => [c.conversation_id, c]),
-);
-
-export const CONVERSATION_HANDLERS = [
-  http.get("/api/conversations", async () => {
-    const values = Array.from(CONVERSATIONS.values());
-    const results: ResultSet<Conversation> = {
-      results: values,
-      next_page_id: null,
-    };
-    return HttpResponse.json(results);
-  }),
-
-  http.get("/api/conversations/:conversationId", async ({ params }) => {
-    const conversationId = params.conversationId as string;
-    const project = CONVERSATIONS.get(conversationId);
-    if (project) return HttpResponse.json(project);
-    return HttpResponse.json(null, { status: 404 });
-  }),
-
-  http.post("/api/conversations", async () => {
-    await delay();
-    const conversation: Conversation = {
-      conversation_id: (Math.random() * 100).toString(),
-      title: "New Conversation",
-      selected_repository: null,
-      git_provider: null,
-      selected_branch: null,
-      last_updated_at: new Date().toISOString(),
-      created_at: new Date().toISOString(),
-      status: "RUNNING",
-      runtime_status: "STATUS$READY",
-      url: null,
-      session_api_key: null,
-    };
-    CONVERSATIONS.set(conversation.conversation_id, conversation);
-    return HttpResponse.json(conversation, { status: 201 });
-  }),
-
-  http.patch(
-    "/api/conversations/:conversationId",
-    async ({ params, request }) => {
-      const conversationId = params.conversationId as string;
-      const conversation = CONVERSATIONS.get(conversationId);
-
-      if (conversation) {
-        const body = await request.json();
-        if (typeof body === "object" && body?.title) {
-          CONVERSATIONS.set(conversationId, {
-            ...conversation,
-            title: body.title,
-          });
-          return HttpResponse.json(null, { status: 200 });
-        }
-      }
-      return HttpResponse.json(null, { status: 404 });
-    },
-  ),
-
-  http.delete("/api/conversations/:conversationId", async ({ params }) => {
-    const conversationId = params.conversationId as string;
-    if (CONVERSATIONS.has(conversationId)) {
-      CONVERSATIONS.delete(conversationId);
-      return HttpResponse.json(null, { status: 200 });
-    }
-    return HttpResponse.json(null, { status: 404 });
-  }),
-];

frontend/src/mocks/feedback-handlers.ts

@@ -1,15 +0,0 @@
-import { http, delay, HttpResponse } from "msw";
-
-export const FEEDBACK_HANDLERS = [
-  http.post("/api/submit-feedback", async () => {
-    await delay(1200);
-    return HttpResponse.json({
-      statusCode: 200,
-      body: { message: "Success", link: "fake-url.com", password: "abc123" },
-    });
-  }),
-
-  http.post("/api/submit-feedback", async () =>
-    HttpResponse.json({ statusCode: 200 }, { status: 200 }),
-  ),
-];

frontend/src/mocks/handlers.ts

@@ -1,17 +1,146 @@
+import { delay, http, HttpResponse } from "msw";
+import { GetConfigResponse } from "#/api/option-service/option.types";
+import { Conversation, ResultSet } from "#/api/open-hands.types";
+import { DEFAULT_SETTINGS } from "#/services/settings";
 import { STRIPE_BILLING_HANDLERS } from "./billing-handlers";
+import { Provider } from "#/types/settings";
+import {
+  ApiSettings,
+  PostApiSettings,
+} from "#/settings-service/settings.types";
 import { FILE_SERVICE_HANDLERS } from "./file-service-handlers";
+import { GitUser } from "#/types/git";
 import { TASK_SUGGESTIONS_HANDLERS } from "./task-suggestions-handlers";
 import { SECRETS_HANDLERS } from "./secrets-handlers";
 import { GIT_REPOSITORY_HANDLERS } from "./git-repository-handlers";
-import {
-  SETTINGS_HANDLERS,
-  MOCK_DEFAULT_USER_SETTINGS,
-  resetTestHandlersMockSettings,
-} from "./settings-handlers";
-import { CONVERSATION_HANDLERS } from "./conversation-handlers";
-import { AUTH_HANDLERS } from "./auth-handlers";
-import { FEEDBACK_HANDLERS } from "./feedback-handlers";
-import { ANALYTICS_HANDLERS } from "./analytics-handlers";
+
+export const MOCK_DEFAULT_USER_SETTINGS: ApiSettings | PostApiSettings = {
+  llm_model: DEFAULT_SETTINGS.LLM_MODEL,
+  llm_base_url: DEFAULT_SETTINGS.LLM_BASE_URL,
+  llm_api_key: null,
+  llm_api_key_set: DEFAULT_SETTINGS.LLM_API_KEY_SET,
+  search_api_key_set: DEFAULT_SETTINGS.SEARCH_API_KEY_SET,
+  agent: DEFAULT_SETTINGS.AGENT,
+  language: DEFAULT_SETTINGS.LANGUAGE,
+  confirmation_mode: DEFAULT_SETTINGS.CONFIRMATION_MODE,
+  security_analyzer: DEFAULT_SETTINGS.SECURITY_ANALYZER,
+  remote_runtime_resource_factor:
+    DEFAULT_SETTINGS.REMOTE_RUNTIME_RESOURCE_FACTOR,
+  provider_tokens_set: {},
+  enable_default_condenser: DEFAULT_SETTINGS.ENABLE_DEFAULT_CONDENSER,
+  condenser_max_size: DEFAULT_SETTINGS.CONDENSER_MAX_SIZE,
+  enable_sound_notifications: DEFAULT_SETTINGS.ENABLE_SOUND_NOTIFICATIONS,
+  enable_proactive_conversation_starters:
+    DEFAULT_SETTINGS.ENABLE_PROACTIVE_CONVERSATION_STARTERS,
+  enable_solvability_analysis: DEFAULT_SETTINGS.ENABLE_SOLVABILITY_ANALYSIS,
+  user_consents_to_analytics: DEFAULT_SETTINGS.USER_CONSENTS_TO_ANALYTICS,
+  max_budget_per_task: DEFAULT_SETTINGS.MAX_BUDGET_PER_TASK,
+};
+
+const MOCK_USER_PREFERENCES: {
+  settings: ApiSettings | PostApiSettings | null;
+} = {
+  settings: null,
+};
+
+/**
+ * Set the user settings to the default settings
+ *
+ * Useful for resetting the settings in tests
+ */
+export const resetTestHandlersMockSettings = () => {
+  MOCK_USER_PREFERENCES.settings = MOCK_DEFAULT_USER_SETTINGS;
+};
+
+const conversations: Conversation[] = [
+  {
+    conversation_id: "1",
+    title: "My New Project",
+    selected_repository: null,
+    git_provider: null,
+    selected_branch: null,
+    last_updated_at: new Date().toISOString(),
+    created_at: new Date().toISOString(),
+    status: "RUNNING",
+    runtime_status: "STATUS$READY",
+    url: null,
+    session_api_key: null,
+  },
+  {
+    conversation_id: "2",
+    title: "Repo Testing",
+    selected_repository: "octocat/hello-world",
+    git_provider: "github",
+    selected_branch: null,
+    // 2 days ago
+    last_updated_at: new Date(
+      Date.now() - 2 * 24 * 60 * 60 * 1000,
+    ).toISOString(),
+    created_at: new Date(Date.now() - 2 * 24 * 60 * 60 * 1000).toISOString(),
+    status: "STOPPED",
+    runtime_status: null,
+    url: null,
+    session_api_key: null,
+  },
+  {
+    conversation_id: "3",
+    title: "Another Project",
+    selected_repository: "octocat/earth",
+    git_provider: null,
+    selected_branch: "main",
+    // 5 days ago
+    last_updated_at: new Date(
+      Date.now() - 5 * 24 * 60 * 60 * 1000,
+    ).toISOString(),
+    created_at: new Date(Date.now() - 5 * 24 * 60 * 60 * 1000).toISOString(),
+    status: "STOPPED",
+    runtime_status: null,
+    url: null,
+    session_api_key: null,
+  },
+];
+
+const CONVERSATIONS = new Map<string, Conversation>(
+  conversations.map((conversation) => [
+    conversation.conversation_id,
+    conversation,
+  ]),
+);
+
+const openHandsHandlers = [
+  http.get("/api/options/models", async () =>
+    HttpResponse.json([
+      "gpt-3.5-turbo",
+      "gpt-4o",
+      "gpt-4o-mini",
+      "anthropic/claude-3.5",
+      "anthropic/claude-sonnet-4-20250514",
+      "anthropic/claude-sonnet-4-5-20250929",
+      "anthropic/claude-haiku-4-5-20251001",
+      "openhands/claude-sonnet-4-20250514",
+      "openhands/claude-sonnet-4-5-20250929",
+      "openhands/claude-haiku-4-5-20251001",
+      "sambanova/Meta-Llama-3.1-8B-Instruct",
+    ]),
+  ),
+
+  http.get("/api/options/agents", async () =>
+    HttpResponse.json(["CodeActAgent", "CoActAgent"]),
+  ),
+
+  http.get("/api/options/security-analyzers", async () =>
+    HttpResponse.json(["llm", "none"]),
+  ),
+
+  http.post("http://localhost:3001/api/submit-feedback", async () => {
+    await delay(1200);
+
+    return HttpResponse.json({
+      statusCode: 200,
+      body: { message: "Success", link: "fake-url.com", password: "abc123" },
+    });
+  }),
+];
 
 export const handlers = [
   ...STRIPE_BILLING_HANDLERS,
@@ -19,11 +148,192 @@ export const handlers = [
   ...TASK_SUGGESTIONS_HANDLERS,
   ...SECRETS_HANDLERS,
   ...GIT_REPOSITORY_HANDLERS,
-  ...SETTINGS_HANDLERS,
-  ...CONVERSATION_HANDLERS,
-  ...AUTH_HANDLERS,
-  ...FEEDBACK_HANDLERS,
-  ...ANALYTICS_HANDLERS,
-];
+  ...openHandsHandlers,
+  http.get("/api/user/info", () => {
+    const user: GitUser = {
+      id: "1",
+      login: "octocat",
+      avatar_url: "https://avatars.githubusercontent.com/u/583231?v=4",
+      company: "GitHub",
+      email: "placeholder@placeholder.placeholder",
+      name: "monalisa octocat",
+    };
 
-export { MOCK_DEFAULT_USER_SETTINGS, resetTestHandlersMockSettings };
+    return HttpResponse.json(user);
+  }),
+  http.post("http://localhost:3001/api/submit-feedback", async () =>
+    HttpResponse.json({ statusCode: 200 }, { status: 200 }),
+  ),
+  http.post("https://us.i.posthog.com/e", async () =>
+    HttpResponse.json(null, { status: 200 }),
+  ),
+  http.get("/api/options/config", () => {
+    const mockSaas = import.meta.env.VITE_MOCK_SAAS === "true";
+
+    const config: GetConfigResponse = {
+      APP_MODE: mockSaas ? "saas" : "oss",
+      GITHUB_CLIENT_ID: "fake-github-client-id",
+      POSTHOG_CLIENT_KEY: "fake-posthog-client-key",
+      FEATURE_FLAGS: {
+        ENABLE_BILLING: false,
+        HIDE_LLM_SETTINGS: mockSaas,
+        ENABLE_JIRA: false,
+        ENABLE_JIRA_DC: false,
+        ENABLE_LINEAR: false,
+      },
+      // Uncomment the following to test the maintenance banner
+      // MAINTENANCE: {
+      //   startTime: "2024-01-15T10:00:00-05:00", // EST timestamp
+      // },
+    };
+
+    return HttpResponse.json(config);
+  }),
+  http.get("/api/settings", async () => {
+    await delay();
+
+    const { settings } = MOCK_USER_PREFERENCES;
+
+    if (!settings) return HttpResponse.json(null, { status: 404 });
+
+    return HttpResponse.json(settings);
+  }),
+  http.post("/api/settings", async ({ request }) => {
+    await delay();
+    const body = await request.json();
+
+    if (body) {
+      const current = MOCK_USER_PREFERENCES.settings || {
+        ...MOCK_DEFAULT_USER_SETTINGS,
+      };
+      // Persist new values over current/mock defaults
+      MOCK_USER_PREFERENCES.settings = {
+        ...current,
+        ...(body as Partial<ApiSettings>),
+      };
+      return HttpResponse.json(null, { status: 200 });
+    }
+
+    return HttpResponse.json(null, { status: 400 });
+  }),
+
+  http.post("/api/authenticate", async () =>
+    HttpResponse.json({ message: "Authenticated" }),
+  ),
+
+  http.get("/api/conversations", async () => {
+    const values = Array.from(CONVERSATIONS.values());
+    const results: ResultSet<Conversation> = {
+      results: values,
+      next_page_id: null,
+    };
+
+    return HttpResponse.json(results, { status: 200 });
+  }),
+
+  http.delete("/api/conversations/:conversationId", async ({ params }) => {
+    const { conversationId } = params;
+
+    if (typeof conversationId === "string") {
+      CONVERSATIONS.delete(conversationId);
+      return HttpResponse.json(null, { status: 200 });
+    }
+
+    return HttpResponse.json(null, { status: 404 });
+  }),
+
+  http.patch(
+    "/api/conversations/:conversationId",
+    async ({ params, request }) => {
+      const { conversationId } = params;
+
+      if (typeof conversationId === "string") {
+        const conversation = CONVERSATIONS.get(conversationId);
+
+        if (conversation) {
+          const body = await request.json();
+          if (typeof body === "object" && body?.title) {
+            CONVERSATIONS.set(conversationId, {
+              ...conversation,
+              title: body.title,
+            });
+            return HttpResponse.json(null, { status: 200 });
+          }
+        }
+      }
+
+      return HttpResponse.json(null, { status: 404 });
+    },
+  ),
+
+  http.post("/api/conversations", async () => {
+    await delay();
+
+    const conversation: Conversation = {
+      conversation_id: (Math.random() * 100).toString(),
+      title: "New Conversation",
+      selected_repository: null,
+      git_provider: null,
+      selected_branch: null,
+      last_updated_at: new Date().toISOString(),
+      created_at: new Date().toISOString(),
+      status: "RUNNING",
+      runtime_status: "STATUS$READY",
+      url: null,
+      session_api_key: null,
+    };
+
+    CONVERSATIONS.set(conversation.conversation_id, conversation);
+    return HttpResponse.json(conversation, { status: 201 });
+  }),
+
+  http.get("/api/conversations/:conversationId", async ({ params }) => {
+    const { conversationId } = params;
+
+    if (typeof conversationId === "string") {
+      const project = CONVERSATIONS.get(conversationId);
+
+      if (project) {
+        return HttpResponse.json(project, { status: 200 });
+      }
+    }
+
+    return HttpResponse.json(null, { status: 404 });
+  }),
+
+  http.post("/api/logout", () => HttpResponse.json(null, { status: 200 })),
+
+  http.post("/api/reset-settings", async () => {
+    await delay();
+    MOCK_USER_PREFERENCES.settings = { ...MOCK_DEFAULT_USER_SETTINGS };
+    return HttpResponse.json(null, { status: 200 });
+  }),
+
+  http.post("/api/add-git-providers", async ({ request }) => {
+    const body = await request.json();
+
+    if (typeof body === "object" && body?.provider_tokens) {
+      const rawTokens = body.provider_tokens as Record<
+        string,
+        { token?: string }
+      >;
+
+      const providerTokensSet: Partial<Record<Provider, string | null>> =
+        Object.fromEntries(
+          Object.entries(rawTokens)
+            .filter(([, val]) => val && val.token)
+            .map(([provider]) => [provider as Provider, ""]),
+        );
+
+      const newSettings = {
+        ...(MOCK_USER_PREFERENCES.settings ?? MOCK_DEFAULT_USER_SETTINGS),
+        provider_tokens_set: providerTokensSet,
+      };
+      MOCK_USER_PREFERENCES.settings = newSettings;
+
+      return HttpResponse.json(true, { status: 200 });
+    }
+
+    return HttpResponse.json(null, { status: 400 });
+  }),
+];

frontend/src/mocks/mock-ws-helpers.ts

@@ -184,55 +184,3 @@ export const createMockExecuteBashObservationEvent = (
   },
   action_id: "bash-action-123",
 });
-
-/**
- * Creates a mock BrowserObservation event for testing browser state handling
- */
-export const createMockBrowserObservationEvent = (
-  screenshotData: string | null = "base64-screenshot-data",
-  output: string = "Browser action completed",
-  error: string | null = null,
-) => ({
-  id: "browser-obs-123",
-  timestamp: new Date().toISOString(),
-  source: "environment",
-  tool_name: "browser_navigate",
-  tool_call_id: "browser-call-456",
-  observation: {
-    kind: "BrowserObservation",
-    output,
-    error,
-    screenshot_data: screenshotData,
-  },
-  action_id: "browser-action-123",
-});
-
-/**
- * Creates a mock BrowserNavigateAction event for testing browser URL extraction
- */
-export const createMockBrowserNavigateActionEvent = (
-  url: string = "https://example.com",
-) => ({
-  id: "browser-action-123",
-  timestamp: new Date().toISOString(),
-  source: "agent",
-  thought: [{ type: "text", text: "Navigating to URL" }],
-  thinking_blocks: [],
-  action: {
-    kind: "BrowserNavigateAction",
-    url,
-    new_tab: false,
-  },
-  tool_name: "browser_navigate",
-  tool_call_id: "browser-call-456",
-  tool_call: {
-    id: "browser-call-456",
-    type: "function",
-    function: {
-      name: "browser_navigate",
-      arguments: JSON.stringify({ url, new_tab: false }),
-    },
-  },
-  llm_response_id: "llm-response-789",
-  security_risk: { level: "low" },
-});

frontend/src/mocks/settings-handlers.ts

@@ -1,151 +0,0 @@
-import { http, delay, HttpResponse } from "msw";
-import { GetConfigResponse } from "#/api/option-service/option.types";
-import { DEFAULT_SETTINGS } from "#/services/settings";
-import { Provider, Settings } from "#/types/settings";
-
-export const MOCK_DEFAULT_USER_SETTINGS: Settings = {
-  llm_model: DEFAULT_SETTINGS.llm_model,
-  llm_base_url: DEFAULT_SETTINGS.llm_base_url,
-  llm_api_key: null,
-  llm_api_key_set: DEFAULT_SETTINGS.llm_api_key_set,
-  search_api_key_set: DEFAULT_SETTINGS.search_api_key_set,
-  agent: DEFAULT_SETTINGS.agent,
-  language: DEFAULT_SETTINGS.language,
-  confirmation_mode: DEFAULT_SETTINGS.confirmation_mode,
-  security_analyzer: DEFAULT_SETTINGS.security_analyzer,
-  remote_runtime_resource_factor:
-    DEFAULT_SETTINGS.remote_runtime_resource_factor,
-  provider_tokens_set: {},
-  enable_default_condenser: DEFAULT_SETTINGS.enable_default_condenser,
-  condenser_max_size: DEFAULT_SETTINGS.condenser_max_size,
-  enable_sound_notifications: DEFAULT_SETTINGS.enable_sound_notifications,
-  enable_proactive_conversation_starters:
-    DEFAULT_SETTINGS.enable_proactive_conversation_starters,
-  enable_solvability_analysis: DEFAULT_SETTINGS.enable_solvability_analysis,
-  user_consents_to_analytics: DEFAULT_SETTINGS.user_consents_to_analytics,
-  max_budget_per_task: DEFAULT_SETTINGS.max_budget_per_task,
-};
-
-const MOCK_USER_PREFERENCES: {
-  settings: Settings | null;
-} = {
-  settings: null,
-};
-
-// Reset mock
-export const resetTestHandlersMockSettings = () => {
-  MOCK_USER_PREFERENCES.settings = MOCK_DEFAULT_USER_SETTINGS;
-};
-
-// --- Handlers for options/config/settings ---
-
-export const SETTINGS_HANDLERS = [
-  http.get("/api/options/models", async () =>
-    HttpResponse.json([
-      "gpt-3.5-turbo",
-      "gpt-4o",
-      "gpt-4o-mini",
-      "anthropic/claude-3.5",
-      "anthropic/claude-sonnet-4-20250514",
-      "anthropic/claude-sonnet-4-5-20250929",
-      "anthropic/claude-haiku-4-5-20251001",
-      "openhands/claude-sonnet-4-20250514",
-      "openhands/claude-sonnet-4-5-20250929",
-      "openhands/claude-haiku-4-5-20251001",
-      "sambanova/Meta-Llama-3.1-8B-Instruct",
-    ]),
-  ),
-
-  http.get("/api/options/agents", async () =>
-    HttpResponse.json(["CodeActAgent", "CoActAgent"]),
-  ),
-
-  http.get("/api/options/security-analyzers", async () =>
-    HttpResponse.json(["llm", "none"]),
-  ),
-
-  http.get("/api/options/config", () => {
-    const mockSaas = import.meta.env.VITE_MOCK_SAAS === "true";
-
-    const config: GetConfigResponse = {
-      APP_MODE: mockSaas ? "saas" : "oss",
-      GITHUB_CLIENT_ID: "fake-github-client-id",
-      POSTHOG_CLIENT_KEY: "fake-posthog-client-key",
-      FEATURE_FLAGS: {
-        ENABLE_BILLING: false,
-        HIDE_LLM_SETTINGS: mockSaas,
-        ENABLE_JIRA: false,
-        ENABLE_JIRA_DC: false,
-        ENABLE_LINEAR: false,
-      },
-      // Uncomment the following to test the maintenance banner
-      // MAINTENANCE: {
-      //   startTime: "2024-01-15T10:00:00-05:00", // EST timestamp
-      // },
-    };
-
-    return HttpResponse.json(config);
-  }),
-
-  http.get("/api/settings", async () => {
-    await delay();
-    const { settings } = MOCK_USER_PREFERENCES;
-
-    if (!settings) return HttpResponse.json(null, { status: 404 });
-
-    return HttpResponse.json(settings);
-  }),
-
-  http.post("/api/settings", async ({ request }) => {
-    await delay();
-    const body = await request.json();
-
-    if (body) {
-      const current = MOCK_USER_PREFERENCES.settings || {
-        ...MOCK_DEFAULT_USER_SETTINGS,
-      };
-
-      MOCK_USER_PREFERENCES.settings = {
-        ...current,
-        ...(body as Partial<Settings>),
-      };
-
-      return HttpResponse.json(null, { status: 200 });
-    }
-
-    return HttpResponse.json(null, { status: 400 });
-  }),
-
-  http.post("/api/reset-settings", async () => {
-    await delay();
-    MOCK_USER_PREFERENCES.settings = { ...MOCK_DEFAULT_USER_SETTINGS };
-    return HttpResponse.json(null, { status: 200 });
-  }),
-
-  http.post("/api/add-git-providers", async ({ request }) => {
-    const body = await request.json();
-
-    if (typeof body === "object" && body?.provider_tokens) {
-      const rawTokens = body.provider_tokens as Record<
-        string,
-        { token?: string }
-      >;
-
-      const providerTokensSet: Partial<Record<Provider, string | null>> =
-        Object.fromEntries(
-          Object.entries(rawTokens)
-            .filter(([, val]) => val && val.token)
-            .map(([provider]) => [provider as Provider, ""]),
-        );
-
-      MOCK_USER_PREFERENCES.settings = {
-        ...(MOCK_USER_PREFERENCES.settings || MOCK_DEFAULT_USER_SETTINGS),
-        provider_tokens_set: providerTokensSet,
-      };
-
-      return HttpResponse.json(true, { status: 200 });
-    }
-
-    return HttpResponse.json(null, { status: 400 });
-  }),
-];

frontend/src/routes/app-settings.tsx

@@ -56,7 +56,7 @@ function AppSettingsScreen() {
     const languageValue = AvailableLanguages.find(
       ({ label }) => label === languageLabel,
     )?.value;
-    const language = languageValue || DEFAULT_SETTINGS.language;
+    const language = languageValue || DEFAULT_SETTINGS.LANGUAGE;
 
     const enableAnalytics =
       formData.get("enable-analytics-switch")?.toString() === "on";
@@ -77,21 +77,21 @@ function AppSettingsScreen() {
 
     const gitUserName =
       formData.get("git-user-name-input")?.toString() ||
-      DEFAULT_SETTINGS.git_user_name;
+      DEFAULT_SETTINGS.GIT_USER_NAME;
     const gitUserEmail =
       formData.get("git-user-email-input")?.toString() ||
-      DEFAULT_SETTINGS.git_user_email;
+      DEFAULT_SETTINGS.GIT_USER_EMAIL;
 
     saveSettings(
       {
-        language,
+        LANGUAGE: language,
         user_consents_to_analytics: enableAnalytics,
-        enable_sound_notifications: enableSoundNotifications,
-        enable_proactive_conversation_starters: enableProactiveConversations,
-        enable_solvability_analysis: enableSolvabilityAnalysis,
-        max_budget_per_task: maxBudgetPerTask,
-        git_user_name: gitUserName,
-        git_user_email: gitUserEmail,
+        ENABLE_SOUND_NOTIFICATIONS: enableSoundNotifications,
+        ENABLE_PROACTIVE_CONVERSATION_STARTERS: enableProactiveConversations,
+        ENABLE_SOLVABILITY_ANALYSIS: enableSolvabilityAnalysis,
+        MAX_BUDGET_PER_TASK: maxBudgetPerTask,
+        GIT_USER_NAME: gitUserName,
+        GIT_USER_EMAIL: gitUserEmail,
       },
       {
         onSuccess: () => {
@@ -120,7 +120,7 @@ function AppSettingsScreen() {
       ({ label: langValue }) => langValue === value,
     )?.label;
     const currentLanguage = AvailableLanguages.find(
-      ({ value: langValue }) => langValue === settings?.language,
+      ({ value: langValue }) => langValue === settings?.LANGUAGE,
     )?.label;
 
     setLanguageInputHasChanged(selectedLanguage !== currentLanguage);
@@ -128,12 +128,12 @@ function AppSettingsScreen() {
 
   const checkIfAnalyticsSwitchHasChanged = (checked: boolean) => {
     // Treat null as true since analytics is opt-in by default
-    const currentAnalytics = settings?.user_consents_to_analytics ?? true;
+    const currentAnalytics = settings?.USER_CONSENTS_TO_ANALYTICS ?? true;
     setAnalyticsSwitchHasChanged(checked !== currentAnalytics);
   };
 
   const checkIfSoundNotificationsSwitchHasChanged = (checked: boolean) => {
-    const currentSoundNotifications = !!settings?.enable_sound_notifications;
+    const currentSoundNotifications = !!settings?.ENABLE_SOUND_NOTIFICATIONS;
     setSoundNotificationsSwitchHasChanged(
       checked !== currentSoundNotifications,
     );
@@ -141,14 +141,14 @@ function AppSettingsScreen() {
 
   const checkIfProactiveConversationsSwitchHasChanged = (checked: boolean) => {
     const currentProactiveConversations =
-      !!settings?.enable_proactive_conversation_starters;
+      !!settings?.ENABLE_PROACTIVE_CONVERSATION_STARTERS;
     setProactiveConversationsSwitchHasChanged(
       checked !== currentProactiveConversations,
     );
   };
 
   const checkIfSolvabilityAnalysisSwitchHasChanged = (checked: boolean) => {
-    const currentSolvabilityAnalysis = !!settings?.enable_solvability_analysis;
+    const currentSolvabilityAnalysis = !!settings?.ENABLE_SOLVABILITY_ANALYSIS;
     setSolvabilityAnalysisSwitchHasChanged(
       checked !== currentSolvabilityAnalysis,
     );
@@ -156,17 +156,17 @@ function AppSettingsScreen() {
 
   const checkIfMaxBudgetPerTaskHasChanged = (value: string) => {
     const newValue = parseMaxBudgetPerTask(value);
-    const currentValue = settings?.max_budget_per_task;
+    const currentValue = settings?.MAX_BUDGET_PER_TASK;
     setMaxBudgetPerTaskHasChanged(newValue !== currentValue);
   };
 
   const checkIfGitUserNameHasChanged = (value: string) => {
-    const currentValue = settings?.git_user_name;
+    const currentValue = settings?.GIT_USER_NAME;
     setGitUserNameHasChanged(value !== currentValue);
   };
 
   const checkIfGitUserEmailHasChanged = (value: string) => {
-    const currentValue = settings?.git_user_email;
+    const currentValue = settings?.GIT_USER_EMAIL;
     setGitUserEmailHasChanged(value !== currentValue);
   };
 
@@ -193,14 +193,14 @@ function AppSettingsScreen() {
         <div className="flex flex-col gap-6">
           <LanguageInput
             name="language-input"
-            defaultKey={settings.language}
+            defaultKey={settings.LANGUAGE}
             onChange={checkIfLanguageInputHasChanged}
           />
 
           <SettingsSwitch
             testId="enable-analytics-switch"
             name="enable-analytics-switch"
-            defaultIsToggled={settings.user_consents_to_analytics ?? true}
+            defaultIsToggled={settings.USER_CONSENTS_TO_ANALYTICS ?? true}
             onToggle={checkIfAnalyticsSwitchHasChanged}
           >
             {t(I18nKey.ANALYTICS$SEND_ANONYMOUS_DATA)}
@@ -209,7 +209,7 @@ function AppSettingsScreen() {
           <SettingsSwitch
             testId="enable-sound-notifications-switch"
             name="enable-sound-notifications-switch"
-            defaultIsToggled={!!settings.enable_sound_notifications}
+            defaultIsToggled={!!settings.ENABLE_SOUND_NOTIFICATIONS}
             onToggle={checkIfSoundNotificationsSwitchHasChanged}
           >
             {t(I18nKey.SETTINGS$SOUND_NOTIFICATIONS)}
@@ -220,7 +220,7 @@ function AppSettingsScreen() {
               testId="enable-proactive-conversations-switch"
               name="enable-proactive-conversations-switch"
               defaultIsToggled={
-                !!settings.enable_proactive_conversation_starters
+                !!settings.ENABLE_PROACTIVE_CONVERSATION_STARTERS
               }
               onToggle={checkIfProactiveConversationsSwitchHasChanged}
             >
@@ -232,27 +232,25 @@ function AppSettingsScreen() {
             <SettingsSwitch
               testId="enable-solvability-analysis-switch"
               name="enable-solvability-analysis-switch"
-              defaultIsToggled={!!settings.enable_solvability_analysis}
+              defaultIsToggled={!!settings.ENABLE_SOLVABILITY_ANALYSIS}
               onToggle={checkIfSolvabilityAnalysisSwitchHasChanged}
             >
               {t(I18nKey.SETTINGS$SOLVABILITY_ANALYSIS)}
             </SettingsSwitch>
           )}
 
-          {!settings?.v1_enabled && (
-            <SettingsInput
-              testId="max-budget-per-task-input"
-              name="max-budget-per-task-input"
-              type="number"
-              label={t(I18nKey.SETTINGS$MAX_BUDGET_PER_CONVERSATION)}
-              defaultValue={settings.max_budget_per_task?.toString() || ""}
-              onChange={checkIfMaxBudgetPerTaskHasChanged}
-              placeholder={t(I18nKey.SETTINGS$MAXIMUM_BUDGET_USD)}
-              min={1}
-              step={1}
-              className="w-full max-w-[680px]" // Match the width of the language field
-            />
-          )}
+          <SettingsInput
+            testId="max-budget-per-task-input"
+            name="max-budget-per-task-input"
+            type="number"
+            label={t(I18nKey.SETTINGS$MAX_BUDGET_PER_CONVERSATION)}
+            defaultValue={settings.MAX_BUDGET_PER_TASK?.toString() || ""}
+            onChange={checkIfMaxBudgetPerTaskHasChanged}
+            placeholder={t(I18nKey.SETTINGS$MAXIMUM_BUDGET_USD)}
+            min={1}
+            step={1}
+            className="w-full max-w-[680px]" // Match the width of the language field
+          />
 
           <div className="border-t border-t-tertiary pt-6 mt-2">
             <h3 className="text-lg font-medium mb-2">
@@ -267,7 +265,7 @@ function AppSettingsScreen() {
                 name="git-user-name-input"
                 type="text"
                 label={t(I18nKey.SETTINGS$GIT_USERNAME)}
-                defaultValue={settings.git_user_name || ""}
+                defaultValue={settings.GIT_USER_NAME || ""}
                 onChange={checkIfGitUserNameHasChanged}
                 placeholder="Username for git commits"
                 className="w-full max-w-[680px]"
@@ -277,7 +275,7 @@ function AppSettingsScreen() {
                 name="git-user-email-input"
                 type="email"
                 label={t(I18nKey.SETTINGS$GIT_EMAIL)}
-                defaultValue={settings.git_user_email || ""}
+                defaultValue={settings.GIT_USER_EMAIL || ""}
                 onChange={checkIfGitUserEmailHasChanged}
                 placeholder="Email for git commits"
                 className="w-full max-w-[680px]"

frontend/src/routes/billing.tsx

@@ -30,12 +30,11 @@ function BillingSettingsScreen() {
       }
 
       displaySuccessToast(t(I18nKey.PAYMENT$SUCCESS));
-
-      setSearchParams({});
     } else if (checkoutStatus === "cancel") {
       displayErrorToast(t(I18nKey.PAYMENT$CANCELLED));
-      setSearchParams({});
     }
+
+    setSearchParams({});
   }, [checkoutStatus, searchParams, setSearchParams, t, trackCreditsPurchased]);
 
   return <PaymentForm />;

frontend/src/routes/git-settings.tsx

@@ -50,10 +50,10 @@ function GitSettingsScreen() {
   const [azureDevOpsHostInputHasValue, setAzureDevOpsHostInputHasValue] =
     React.useState(false);
 
-  const existingGithubHost = settings?.provider_tokens_set.github;
-  const existingGitlabHost = settings?.provider_tokens_set.gitlab;
-  const existingBitbucketHost = settings?.provider_tokens_set.bitbucket;
-  const existingAzureDevOpsHost = settings?.provider_tokens_set.azure_devops;
+  const existingGithubHost = settings?.PROVIDER_TOKENS_SET.github;
+  const existingGitlabHost = settings?.PROVIDER_TOKENS_SET.gitlab;
+  const existingBitbucketHost = settings?.PROVIDER_TOKENS_SET.bitbucket;
+  const existingAzureDevOpsHost = settings?.PROVIDER_TOKENS_SET.azure_devops;
 
   const isSaas = config?.APP_MODE === "saas";
   const isGitHubTokenSet = providers.includes("github");