openhands 1.0.1__tar.gz → 1.0.3__tar.gz

{openhands-1.0.1 → openhands-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands
-Version: 1.0.1
+Version: 1.0.3
 Summary: OpenHands CLI - Terminal User Interface for OpenHands AI Agent
 Author-email: OpenHands Team <contact@all-hands.dev>
 License: MIT
@@ -8,17 +8,17 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.12
-Requires-Dist: openhands-sdk
-Requires-Dist: openhands-tools
+Requires-Dist: openhands-sdk==1.0.0a5
+Requires-Dist: openhands-tools==1.0.0a5
 Requires-Dist: prompt-toolkit>=3
 Requires-Dist: typer>=0.17.4
 Description-Content-Type: text/markdown
 
 # OpenHands V1 CLI
 
-A **lightweight, modern CLI** to interact with the OpenHands agent (powered by [agent-sdk](https://github.com/All-Hands-AI/agent-sdk)). 
+A **lightweight, modern CLI** to interact with the OpenHands agent (powered by [agent-sdk](https://github.com/OpenHands/agent-sdk)). 
 
-The [OpenHands V0 CLI (legacy)](https://github.com/All-Hands-AI/OpenHands/tree/main/openhands/cli) is being deprecated.
+The [OpenHands V0 CLI (legacy)](https://github.com/OpenHands/OpenHands/tree/main/openhands/cli) is being deprecated.
 
 ---
 

{openhands-1.0.1 → openhands-1.0.3}/README.md

@@ -1,8 +1,8 @@
 # OpenHands V1 CLI
 
-A **lightweight, modern CLI** to interact with the OpenHands agent (powered by [agent-sdk](https://github.com/All-Hands-AI/agent-sdk)). 
+A **lightweight, modern CLI** to interact with the OpenHands agent (powered by [agent-sdk](https://github.com/OpenHands/agent-sdk)). 
 
-The [OpenHands V0 CLI (legacy)](https://github.com/All-Hands-AI/OpenHands/tree/main/openhands/cli) is being deprecated.
+The [OpenHands V0 CLI (legacy)](https://github.com/OpenHands/OpenHands/tree/main/openhands/cli) is being deprecated.
 
 ---
 

{openhands-1.0.1 → openhands-1.0.3}/build.py

@@ -15,13 +15,12 @@ import sys
 import time
 from pathlib import Path
 
-from openhands_cli.llm_utils import get_llm_metadata
-from openhands_cli.locations import AGENT_SETTINGS_PATH, PERSISTENCE_DIR, WORK_DIR
+from openhands_cli.utils import get_llm_metadata, get_default_cli_agent
+from openhands_cli.locations import AGENT_SETTINGS_PATH, PERSISTENCE_DIR
 
 from openhands.sdk import LLM
-from openhands.tools.preset.default import get_default_agent
 
-dummy_agent = get_default_agent(
+dummy_agent = get_default_cli_agent(
     llm=LLM(
         model='dummy-model',
         api_key='dummy-key',

{openhands-1.0.1 → openhands-1.0.3}/openhands.spec

@@ -32,8 +32,8 @@ a = Analysis(
         *collect_data_files('litellm'),
         *collect_data_files('fastmcp'),
         *collect_data_files('mcp'),
-        # Include Jinja prompt templates required by the agent SDK
-        *collect_data_files('openhands.sdk.agent', includes=['prompts/*.j2']),
+        # Include all data files from openhands.sdk (templates, configs, etc.)
+        *collect_data_files('openhands.sdk'),
         # Include package metadata for importlib.metadata
         *copy_metadata('fastmcp'),
     ],

{openhands-1.0.1 → openhands-1.0.3}/openhands_cli/gui_launcher.py

@@ -104,8 +104,8 @@ def launch_gui_server(mount_cwd: bool = False, gpu: bool = False) -> None:
 
     # Get the current version for the Docker image
     version = get_openhands_version()
-    runtime_image = f'docker.all-hands.dev/all-hands-ai/runtime:{version}-nikolaik'
-    app_image = f'docker.all-hands.dev/all-hands-ai/openhands:{version}'
+    runtime_image = f'docker.all-hands.dev/openhands/runtime:{version}-nikolaik'
+    app_image = f'docker.all-hands.dev/openhands/openhands:{version}'
 
     print_formatted_text(HTML('<grey>Pulling required Docker images...</grey>'))
 

{openhands-1.0.1 → openhands-1.0.3}/openhands_cli/pt_style.py

@@ -20,7 +20,7 @@ def get_cli_style() -> BaseStyle:
             'prompt': f'{COLOR_GOLD} bold',
             # Ensure good contrast for fuzzy matches on the selected completion row
             # across terminals/themes (e.g., Ubuntu GNOME, Alacritty, Kitty).
-            # See https://github.com/All-Hands-AI/OpenHands/issues/10330
+            # See https://github.com/OpenHands/OpenHands/issues/10330
             'completion-menu.completion.current fuzzymatch.outside': 'fg:#ffffff bg:#888888',
             'selected': COLOR_GOLD,
             'risk-high': '#FF0000 bold',  # Red bold for HIGH risk

{openhands-1.0.1 → openhands-1.0.3}/openhands_cli/runner.py

@@ -120,6 +120,7 @@ class ConversationRunner:
             else:
                 raise Exception('Infinite loop')
 
+
     def _handle_confirmation_request(self) -> UserConfirmation:
         """Handle confirmation request from user.
 

{openhands-1.0.1 → openhands-1.0.3}/openhands_cli/tui/settings/settings_screen.py

@@ -1,13 +1,11 @@
 import os
 
 from openhands.sdk import LLM, BaseConversation, LocalFileStore
-from openhands.sdk.security.confirmation_policy import NeverConfirm
-from openhands.tools.preset.default import get_default_agent
 from prompt_toolkit import HTML, print_formatted_text
 from prompt_toolkit.shortcuts import print_container
 from prompt_toolkit.widgets import Frame, TextArea
 
-from openhands_cli.llm_utils import get_llm_metadata
+from openhands_cli.utils import get_llm_metadata, get_default_cli_agent
 from openhands_cli.locations import AGENT_SETTINGS_PATH, PERSISTENCE_DIR
 from openhands_cli.pt_style import COLOR_GREY
 from openhands_cli.tui.settings.store import AgentStore
@@ -176,13 +174,13 @@ class SettingsScreen:
             model=model,
             api_key=api_key,
             base_url=base_url,
-            service_id='agent',
+            usage_id='agent',
             metadata=get_llm_metadata(model_name=model, llm_type='agent'),
         )
 
         agent = self.agent_store.load()
         if not agent:
-            agent = get_default_agent(llm=llm, cli_mode=True)
+            agent = get_default_cli_agent(llm=llm)
 
         agent = agent.model_copy(update={'llm': llm})
         self.agent_store.save(agent)

{openhands-1.0.1 → openhands-1.0.3}/openhands_cli/tui/settings/store.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Any
 
 from fastmcp.mcp_config import MCPConfig
-from openhands_cli.llm_utils import get_llm_metadata
+from openhands_cli.utils import get_llm_metadata
 from openhands_cli.locations import (
     AGENT_SETTINGS_PATH,
     MCP_CONFIG_FILE,

{openhands-1.0.1 → openhands-1.0.3}/openhands_cli/user_actions/agent_action.py

@@ -44,8 +44,7 @@ def ask_user_confirmation(
     question = 'Choose an option:'
     options = [
         'Yes, proceed',
-        'No, reject (w/o reason)',
-        'No, reject with reason',
+        'Reject',
         "Always proceed (don't ask again)",
     ]
 
@@ -61,32 +60,18 @@ def ask_user_confirmation(
     if index == 0:
         return ConfirmationResult(decision=UserConfirmation.ACCEPT)
     elif index == 1:
-        return ConfirmationResult(decision=UserConfirmation.REJECT)
-    elif index == 2:
+        # Handle "Reject" option with optional reason
         try:
-            reason_result = cli_text_input(
-                'Please enter your reason for rejecting these actions: '
-            )
-        except Exception:
-            return ConfirmationResult(decision=UserConfirmation.DEFER)
-
-        # Support both string return and (reason, cancelled) tuple for tests
-        cancelled = False
-        if isinstance(reason_result, tuple) and len(reason_result) >= 1:
-            reason = reason_result[0] or ''
-            cancelled = bool(reason_result[1]) if len(reason_result) > 1 else False
-        else:
-            reason = str(reason_result or '').strip()
-
-        if cancelled:
+            reason = cli_text_input('Reason (and let OpenHands know why): ').strip()
+        except (EOFError, KeyboardInterrupt):
             return ConfirmationResult(decision=UserConfirmation.DEFER)
 
         return ConfirmationResult(decision=UserConfirmation.REJECT, reason=reason)
-    elif index == 3:
+    elif index == 2:
         return ConfirmationResult(
             decision=UserConfirmation.ACCEPT, policy_change=NeverConfirm()
         )
-    elif index == 4:
+    elif index == 3:
         return ConfirmationResult(
             decision=UserConfirmation.ACCEPT,
             policy_change=ConfirmRisky(threshold=SecurityRisk.HIGH),

openhands-1.0.1/openhands_cli/llm_utils.py → openhands-1.0.3/openhands_cli/utils.py

@@ -2,7 +2,9 @@
 
 import os
 from typing import Any
-
+from openhands.sdk.security.llm_analyzer import LLMSecurityAnalyzer
+from openhands.tools.preset import get_default_agent
+from openhands.sdk import LLM
 
 def get_llm_metadata(
     model_name: str,
@@ -55,3 +57,20 @@ def get_llm_metadata(
     if user_id is not None:
         metadata['trace_user_id'] = user_id
     return metadata
+
+
+def get_default_cli_agent(
+    llm: LLM
+):
+    agent = get_default_agent(
+        llm=llm,
+        cli_mode=True
+    )
+
+    agent = agent.model_copy(
+        update={
+            'security_analyzer': LLMSecurityAnalyzer()
+        }
+    )
+    
+    return agent

{openhands-1.0.1 → openhands-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "hatchling>=1.25" ]
 
 [project]
 name = "openhands"
-version = "1.0.1"
+version = "1.0.3"
 description = "OpenHands CLI - Terminal User Interface for OpenHands AI Agent"
 readme = "README.md"
 license = { text = "MIT" }
@@ -15,9 +15,11 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
 ]
+# Using Git URLs for dependencies so installs from PyPI pull from GitHub
+# TODO: pin package versions once agent-sdk has published PyPI packages
 dependencies = [
-  "openhands-sdk",
-  "openhands-tools",
+  "openhands-sdk==1.0.0a5",
+  "openhands-tools==1.0.0a5",
   "prompt-toolkit>=3",
   "typer>=0.17.4",
 ]
@@ -41,6 +43,9 @@ dev = [
   "ruff>=0.11.8",
 ]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.hatch.build.targets.wheel]
 packages = [ "openhands_cli" ]
 
@@ -94,6 +99,8 @@ warn_unused_configs = true
 disallow_untyped_defs = true
 ignore_missing_imports = true
 
-[tool.uv.sources]
-openhands-sdk = { git = "https://github.com/All-Hands-AI/agent-sdk.git", subdirectory = "openhands/sdk", rev = "50b094a92817e448ec4352d2950df4f19edd5a9f" }
-openhands-tools = { git = "https://github.com/All-Hands-AI/agent-sdk.git", subdirectory = "openhands/tools", rev = "50b094a92817e448ec4352d2950df4f19edd5a9f" }
+# UNCOMMENT TO USE EXACT COMMIT FROM AGENT-SDK
+
+# [tool.uv.sources]
+# openhands-sdk = { git = "https://github.com/All-Hands-AI/agent-sdk.git", subdirectory = "openhands-sdk", rev = "512399d896521aee3131eea4bb59087fb9dfa243" }
+# openhands-tools = { git = "https://github.com/All-Hands-AI/agent-sdk.git", subdirectory = "openhands-tools", rev = "512399d896521aee3131eea4bb59087fb9dfa243" }

openhands-1.0.3/tests/settings/test_default_agent_security_analyzer.py

@@ -0,0 +1,104 @@
+"""Test that first-time settings screen usage creates a default agent with security analyzer."""
+
+from unittest.mock import patch
+import pytest
+from openhands_cli.tui.settings.settings_screen import SettingsScreen
+from openhands_cli.user_actions.settings_action import SettingsType
+from openhands.sdk import LLM
+from pydantic import SecretStr
+
+
+def test_first_time_settings_creates_default_agent_with_security_analyzer():
+    """Test that using the settings screen for the first time creates a default agent with a non-None security analyzer."""
+    
+    # Create a settings screen instance (no conversation initially)
+    screen = SettingsScreen(conversation=None)
+    
+    # Mock all the user interaction steps to simulate first-time setup
+    with (
+        patch(
+            'openhands_cli.tui.settings.settings_screen.settings_type_confirmation',
+            return_value=SettingsType.BASIC,
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.choose_llm_provider',
+            return_value='openai',
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.choose_llm_model',
+            return_value='gpt-4o-mini',
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.prompt_api_key',
+            return_value='sk-test-key-123',
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.save_settings_confirmation',
+            return_value=True,
+        ),
+    ):
+        # Run the settings configuration workflow
+        screen.configure_settings(first_time=True)
+    
+    # Load the saved agent from the store
+    saved_agent = screen.agent_store.load()
+    
+    # Verify that an agent was created and saved
+    assert saved_agent is not None, "Agent should be created and saved after first-time settings configuration"
+    
+    # Verify that the agent has the expected LLM configuration
+    assert saved_agent.llm.model == 'openai/gpt-4o-mini', f"Expected model 'openai/gpt-4o-mini', got '{saved_agent.llm.model}'"
+    assert saved_agent.llm.api_key.get_secret_value() == 'sk-test-key-123', "API key should match the provided value"
+    
+    # Verify that the agent has a security analyzer and it's not None
+    assert hasattr(saved_agent, 'security_analyzer'), "Agent should have a security_analyzer attribute"
+    assert saved_agent.security_analyzer is not None, "Security analyzer should not be None"
+    
+    # Verify the security analyzer has the expected type/kind
+    assert hasattr(saved_agent.security_analyzer, 'kind'), "Security analyzer should have a 'kind' attribute"
+    assert saved_agent.security_analyzer.kind == 'LLMSecurityAnalyzer', f"Expected security analyzer kind 'LLMSecurityAnalyzer', got '{saved_agent.security_analyzer.kind}'"
+
+
+def test_first_time_settings_with_advanced_configuration():
+    """Test that advanced settings also create a default agent with security analyzer."""
+    
+    screen = SettingsScreen(conversation=None)
+    
+    with (
+        patch(
+            'openhands_cli.tui.settings.settings_screen.settings_type_confirmation',
+            return_value=SettingsType.ADVANCED,
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.prompt_custom_model',
+            return_value='anthropic/claude-3-5-sonnet',
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.prompt_base_url',
+            return_value='https://api.anthropic.com',
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.prompt_api_key',
+            return_value='sk-ant-test-key',
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.choose_memory_condensation',
+            return_value=True,
+        ),
+        patch(
+            'openhands_cli.tui.settings.settings_screen.save_settings_confirmation',
+            return_value=True,
+        ),
+    ):
+        screen.configure_settings(first_time=True)
+    
+    saved_agent = screen.agent_store.load()
+    
+    # Verify agent creation and security analyzer
+    assert saved_agent is not None, "Agent should be created with advanced settings"
+    assert saved_agent.security_analyzer is not None, "Security analyzer should not be None in advanced settings"
+    assert saved_agent.security_analyzer.kind == 'LLMSecurityAnalyzer', "Security analyzer should be LLMSecurityAnalyzer"
+    
+    # Verify advanced settings were applied
+    assert saved_agent.llm.model == 'anthropic/claude-3-5-sonnet', "Custom model should be set"
+    assert saved_agent.llm.base_url == 'https://api.anthropic.com', "Base URL should be set"

{openhands-1.0.1 → openhands-1.0.3}/tests/settings/test_settings_workflow.py

@@ -6,10 +6,10 @@ import pytest
 from openhands_cli.tui.settings.settings_screen import SettingsScreen
 from openhands_cli.tui.settings.store import AgentStore
 from openhands_cli.user_actions.settings_action import SettingsType
+from openhands_cli.utils import get_default_cli_agent
 from pydantic import SecretStr
 
 from openhands.sdk import LLM, Conversation, LocalFileStore
-from openhands.tools.preset.default import get_default_agent
 
 
 def read_json(path: Path) -> dict:
@@ -18,7 +18,7 @@ def read_json(path: Path) -> dict:
 
 
 def make_screen_with_conversation(model='openai/gpt-4o-mini', api_key='sk-xyz'):
-    llm = LLM(model=model, api_key=SecretStr(api_key), service_id='test-service')
+    llm = LLM(model=model, api_key=SecretStr(api_key), usage_id='test-service')
     # Conversation(agent) signature may vary across versions; adapt if needed:
     from openhands.sdk.agent import Agent
 
@@ -30,8 +30,8 @@ def make_screen_with_conversation(model='openai/gpt-4o-mini', api_key='sk-xyz'):
 def seed_file(path: Path, model: str = 'openai/gpt-4o-mini', api_key: str = 'sk-old'):
     store = AgentStore()
     store.file_store = LocalFileStore(root=str(path))
-    agent = get_default_agent(
-        llm=LLM(model=model, api_key=SecretStr(api_key), service_id='test-service')
+    agent = get_default_cli_agent(
+        llm=LLM(model=model, api_key=SecretStr(api_key), usage_id='test-service')
     )
     store.save(agent)
 

{openhands-1.0.1 → openhands-1.0.3}/tests/test_confirmation_mode.py

@@ -147,10 +147,12 @@ class TestConfirmationMode:
         assert result.policy_change is None
         assert result.policy_change is None
 
+    @patch('openhands_cli.user_actions.agent_action.cli_text_input')
     @patch('openhands_cli.user_actions.agent_action.cli_confirm')
-    def test_ask_user_confirmation_no(self, mock_cli_confirm: Any) -> None:
-        """Test that ask_user_confirmation returns REJECT when user selects no."""
-        mock_cli_confirm.return_value = 1  # Second option (No, reject)
+    def test_ask_user_confirmation_no(self, mock_cli_confirm: Any, mock_cli_text_input: Any) -> None:
+        """Test that ask_user_confirmation returns REJECT when user selects reject without reason."""
+        mock_cli_confirm.return_value = 1  # Second option (Reject)
+        mock_cli_text_input.return_value = ''  # Empty reason (reject without reason)
 
         mock_action = MagicMock()
         mock_action.tool_name = 'bash'
@@ -163,6 +165,7 @@ class TestConfirmationMode:
         assert result.reason == ''
         assert result.policy_change is None
         assert result.policy_change is None
+        mock_cli_text_input.assert_called_once_with('Reason (and let OpenHands know why): ')
 
     @patch('openhands_cli.user_actions.agent_action.cli_confirm')
     def test_ask_user_confirmation_y_shorthand(self, mock_cli_confirm: Any) -> None:
@@ -179,10 +182,12 @@ class TestConfirmationMode:
         assert result.reason == ''
         assert result.policy_change is None
 
+    @patch('openhands_cli.user_actions.agent_action.cli_text_input')
     @patch('openhands_cli.user_actions.agent_action.cli_confirm')
-    def test_ask_user_confirmation_n_shorthand(self, mock_cli_confirm: Any) -> None:
-        """Test that ask_user_confirmation accepts second option as no."""
-        mock_cli_confirm.return_value = 1  # Second option (No, reject)
+    def test_ask_user_confirmation_n_shorthand(self, mock_cli_confirm: Any, mock_cli_text_input: Any) -> None:
+        """Test that ask_user_confirmation accepts second option as reject."""
+        mock_cli_confirm.return_value = 1  # Second option (Reject)
+        mock_cli_text_input.return_value = ''  # Empty reason (reject without reason)
 
         mock_action = MagicMock()
         mock_action.tool_name = 'bash'
@@ -193,6 +198,7 @@ class TestConfirmationMode:
         assert isinstance(result, ConfirmationResult)
         assert result.reason == ''
         assert result.policy_change is None
+        mock_cli_text_input.assert_called_once_with('Reason (and let OpenHands know why): ')
 
     @patch('openhands_cli.user_actions.agent_action.cli_confirm')
     def test_ask_user_confirmation_invalid_then_yes(
@@ -278,9 +284,9 @@ class TestConfirmationMode:
     def test_ask_user_confirmation_no_with_reason(
         self, mock_cli_confirm: Any, mock_cli_text_input: Any
     ) -> None:
-        """Test that ask_user_confirmation returns REJECT when user selects 'No (with reason)'."""
-        mock_cli_confirm.return_value = 2  # Third option (No, with reason)
-        mock_cli_text_input.return_value = ('This action is too risky', False)
+        """Test that ask_user_confirmation returns REJECT when user selects 'Reject' and provides a reason."""
+        mock_cli_confirm.return_value = 1  # Second option (Reject)
+        mock_cli_text_input.return_value = 'This action is too risky'
 
         mock_action = MagicMock()
         mock_action.tool_name = 'bash'
@@ -291,7 +297,7 @@ class TestConfirmationMode:
         assert result.decision == UserConfirmation.REJECT
         assert result.reason == 'This action is too risky'
         assert result.policy_change is None
-        mock_cli_text_input.assert_called_once()
+        mock_cli_text_input.assert_called_once_with('Reason (and let OpenHands know why): ')
 
     @patch('openhands_cli.user_actions.agent_action.cli_text_input')
     @patch('openhands_cli.user_actions.agent_action.cli_confirm')
@@ -299,8 +305,8 @@ class TestConfirmationMode:
         self, mock_cli_confirm: Any, mock_cli_text_input: Any
     ) -> None:
         """Test that ask_user_confirmation falls back to DEFER when reason input is cancelled."""
-        mock_cli_confirm.return_value = 2  # Third option (No, with reason)
-        mock_cli_text_input.return_value = ('', True)  # User cancelled reason input
+        mock_cli_confirm.return_value = 1  # Second option (Reject)
+        mock_cli_text_input.side_effect = KeyboardInterrupt()  # User cancelled reason input
 
         mock_action = MagicMock()
         mock_action.tool_name = 'bash'
@@ -311,7 +317,27 @@ class TestConfirmationMode:
         assert isinstance(result, ConfirmationResult)
         assert result.reason == ''
         assert result.policy_change is None
-        mock_cli_text_input.assert_called_once()
+        mock_cli_text_input.assert_called_once_with('Reason (and let OpenHands know why): ')
+
+    @patch('openhands_cli.user_actions.agent_action.cli_text_input')
+    @patch('openhands_cli.user_actions.agent_action.cli_confirm')
+    def test_ask_user_confirmation_reject_empty_reason(
+        self, mock_cli_confirm: Any, mock_cli_text_input: Any
+    ) -> None:
+        """Test that ask_user_confirmation handles empty reason input correctly."""
+        mock_cli_confirm.return_value = 1  # Second option (Reject)
+        mock_cli_text_input.return_value = '   '  # Whitespace-only reason (should be treated as empty)
+
+        mock_action = MagicMock()
+        mock_action.tool_name = 'bash'
+        mock_action.action = 'dangerous command'
+
+        result = ask_user_confirmation([mock_action])
+        assert result.decision == UserConfirmation.REJECT
+        assert isinstance(result, ConfirmationResult)
+        assert result.reason == ''  # Should be empty after stripping whitespace
+        assert result.policy_change is None
+        mock_cli_text_input.assert_called_once_with('Reason (and let OpenHands know why): ')
 
     def test_user_confirmation_is_escapable_e2e(
         self, monkeypatch: pytest.MonkeyPatch
@@ -358,8 +384,8 @@ class TestConfirmationMode:
 
     @patch('openhands_cli.user_actions.agent_action.cli_confirm')
     def test_ask_user_confirmation_always_accept(self, mock_cli_confirm: Any) -> None:
-        """Test that ask_user_confirmation returns ACCEPT with NeverConfirm policy when user selects fourth option."""
-        mock_cli_confirm.return_value = 3  # Fourth option (Always proceed)
+        """Test that ask_user_confirmation returns ACCEPT with NeverConfirm policy when user selects third option."""
+        mock_cli_confirm.return_value = 2  # Third option (Always proceed)
 
         mock_action = MagicMock()
         mock_action.tool_name = 'bash'
@@ -408,7 +434,7 @@ class TestConfirmationMode:
                         new_mock_conversation.id = mock_conversation.id
                         new_mock_conversation.is_confirmation_mode_active = False
                         mock_setup.return_value = new_mock_conversation
-                        
+
                         result = runner._handle_confirmation_request()
 
                         # Verify that confirmation mode was disabled
@@ -426,9 +452,9 @@ class TestConfirmationMode:
     def test_ask_user_confirmation_auto_confirm_safe(
         self, mock_cli_confirm: Any
     ) -> None:
-        """Test that ask_user_confirmation returns ACCEPT with policy_change when user selects fifth option."""
+        """Test that ask_user_confirmation returns ACCEPT with policy_change when user selects fourth option."""
         mock_cli_confirm.return_value = (
-            4  # Fifth option (Auto-confirm LOW/MEDIUM, ask for HIGH)
+            3  # Fourth option (Auto-confirm LOW/MEDIUM, ask for HIGH)
         )
 
         mock_action = MagicMock()

{openhands-1.0.1 → openhands-1.0.3}/tests/test_conversation_runner.py

@@ -6,13 +6,13 @@ from openhands_cli.runner import ConversationRunner
 from openhands_cli.user_actions.types import UserConfirmation
 from pydantic import ConfigDict, SecretStr, model_validator
 
-from openhands.sdk import Conversation, ConversationCallbackType
+from openhands.sdk import Conversation, ConversationCallbackType, LocalConversation
 from openhands.sdk.agent.base import AgentBase
 from openhands.sdk.conversation import ConversationState
 from openhands.sdk.conversation.state import AgentExecutionStatus
 from openhands.sdk.llm import LLM
 from openhands.sdk.security.confirmation_policy import AlwaysConfirm, NeverConfirm
-
+from unittest.mock import MagicMock
 
 class FakeLLM(LLM):
     @model_validator(mode='after')
@@ -41,16 +41,16 @@ class FakeAgent(AgentBase):
         pass
 
     def step(
-        self, state: ConversationState, on_event: ConversationCallbackType
+        self, conversation: LocalConversation, on_event: ConversationCallbackType
     ) -> None:
         self.step_count += 1
         if self.step_count == self.finish_on_step:
-            state.agent_status = AgentExecutionStatus.FINISHED
+            conversation.state.agent_status = AgentExecutionStatus.FINISHED
 
 
 @pytest.fixture()
 def agent() -> FakeAgent:
-    llm = LLM(**default_config(), service_id='test-service')
+    llm = LLM(**default_config(), usage_id='test-service')
     return FakeAgent(llm=llm, tools=[])
 
 
@@ -102,15 +102,15 @@ class TestConversationRunner:
         """
         if final_status == AgentExecutionStatus.FINISHED:
             agent.finish_on_step = 1
-        
+
         # Add a mock security analyzer to enable confirmation mode
-        from unittest.mock import MagicMock
         agent.security_analyzer = MagicMock()
-        
+
         convo = Conversation(agent)
         convo.state.agent_status = AgentExecutionStatus.WAITING_FOR_CONFIRMATION
         cr = ConversationRunner(convo)
         cr.set_confirmation_policy(AlwaysConfirm())
+
         with patch.object(
             cr, '_handle_confirmation_request', return_value=confirmation
         ) as mock_confirmation_request:

{openhands-1.0.1 → openhands-1.0.3}/tests/test_directory_separation.py

@@ -37,7 +37,7 @@ class TestToolFix:
         """Test that entire tools list is replaced with default tools when loading agent."""
         # Create a mock agent with different tools and working directories
         mock_agent = Agent(
-            llm=LLM(model='test/model', api_key='test-key', service_id='test-service'),
+            llm=LLM(model='test/model', api_key='test-key', usage_id='test-service'),
             tools=[
                 Tool(name='BashTool'),
                 Tool(name='FileEditorTool'),

{openhands-1.0.1 → openhands-1.0.3}/tests/test_gui_launcher.py

@@ -182,7 +182,7 @@ class TestLaunchGuiServer:
             # Check pull command
             pull_call = mock_run.call_args_list[0]
             pull_cmd = pull_call[0][0]
-            assert pull_cmd[0:3] == ['docker', 'pull', 'docker.all-hands.dev/all-hands-ai/runtime:latest-nikolaik']
+            assert pull_cmd[0:3] == ['docker', 'pull', 'docker.all-hands.dev/openhands/runtime:latest-nikolaik']
 
             # Check run command
             run_call = mock_run.call_args_list[1]

{openhands-1.0.1 → openhands-1.0.3}/tests/test_mcp_config_validation.py

@@ -26,7 +26,7 @@ def _create_agent(mcp_config=None) -> Agent:
     if mcp_config is None:
         mcp_config = {}
     return Agent(
-        llm=LLM(model='test-model', api_key='test-key', service_id='test-service'),
+        llm=LLM(model='test-model', api_key='test-key', usage_id='test-service'),
         tools=[],
         mcp_config=mcp_config,
     )