openhands 1.0.0__tar.gz → 1.0.2__tar.gz

{openhands-1.0.0 → openhands-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands
-Version: 1.0.0
+Version: 1.0.2
 Summary: OpenHands CLI - Terminal User Interface for OpenHands AI Agent
 Author-email: OpenHands Team <contact@all-hands.dev>
 License: MIT
@@ -8,8 +8,8 @@ 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.0a3
+Requires-Dist: openhands-tools==1.0.0a3
 Requires-Dist: prompt-toolkit>=3
 Requires-Dist: typer>=0.17.4
 Description-Content-Type: text/markdown

{openhands-1.0.0 → openhands-1.0.2}/build.py

@@ -164,7 +164,7 @@ def test_executable() -> bool:
         )
 
         # --- Wait for welcome ---
-        deadline = boot_start + 30
+        deadline = boot_start + 60
         saw_welcome = False
         captured = []
 

{openhands-1.0.0 → openhands-1.0.2}/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.2/openhands_cli/__init__.py

@@ -0,0 +1,8 @@
+"""OpenHands package."""
+
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("openhands")
+except PackageNotFoundError:
+    __version__ = "0.0.0"

{openhands-1.0.0 → openhands-1.0.2}/openhands_cli/agent_chat.py

@@ -54,6 +54,7 @@ def _print_exit_hint(conversation_id: str) -> None:
     )
 
 
+
 def run_cli_entry(resume_conversation_id: str | None = None) -> None:
     """Run the agent chat session using the agent SDK.
 

{openhands-1.0.0 → openhands-1.0.2}/openhands_cli/gui_launcher.py

@@ -113,21 +113,12 @@ def launch_gui_server(mount_cwd: bool = False, gpu: bool = False) -> None:
     pull_cmd = ['docker', 'pull', runtime_image]
     print_formatted_text(HTML(_format_docker_command_for_logging(pull_cmd)))
     try:
-        subprocess.run(
-            pull_cmd,
-            check=True,
-            timeout=300,  # 5 minutes timeout
-        )
+        subprocess.run(pull_cmd, check=True)
     except subprocess.CalledProcessError:
         print_formatted_text(
             HTML('<ansired>❌ Failed to pull runtime image.</ansired>')
         )
         sys.exit(1)
-    except subprocess.TimeoutExpired:
-        print_formatted_text(
-            HTML('<ansired>❌ Timeout while pulling runtime image.</ansired>')
-        )
-        sys.exit(1)
 
     print_formatted_text('')
     print_formatted_text(

{openhands-1.0.0 → openhands-1.0.2}/openhands_cli/tui/tui.py

@@ -57,8 +57,6 @@ def display_banner(conversation_id: str, resume: bool = False) -> None:
         style=DEFAULT_STYLE,
     )
 
-    print_formatted_text(HTML(f'<grey>OpenHands CLI v{__version__}</grey>'))
-
     print_formatted_text('')
     if not resume:
         print_formatted_text(

{openhands-1.0.0 → openhands-1.0.2}/openhands_cli/user_actions/agent_action.py

@@ -1,3 +1,4 @@
+import html
 from prompt_toolkit import HTML, print_formatted_text
 
 from openhands.sdk.security.confirmation_policy import (
@@ -37,14 +38,13 @@ def ask_user_confirmation(
             or '[unknown action]'
         )
         print_formatted_text(
-            HTML(f'<grey>  {i}. {tool_name}: {action_content}...</grey>')
+            HTML(f'<grey>  {i}. {tool_name}: {html.escape(action_content)}...</grey>')
         )
 
     question = 'Choose an option:'
     options = [
         'Yes, proceed',
-        'No, reject (w/o reason)',
-        'No, reject with reason',
+        'Reject',
         "Always proceed (don't ask again)",
     ]
 
@@ -60,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.0 → openhands-1.0.2}/openhands_cli/user_actions/settings_action.py

@@ -123,9 +123,15 @@ def prompt_api_key(
         validator = NonEmptyValueValidator()
 
     question = helper_text + step_counter.next_step(question)
-    return cli_text_input(
+    user_input = cli_text_input(
         question, escapable=escapable, validator=validator, is_password=True
     )
+    
+    # If user pressed ENTER with existing key (empty input), return the existing key
+    if existing_api_key and not user_input.strip():
+        return existing_api_key.get_secret_value()
+    
+    return user_input
 
 
 # Advanced settings functions

{openhands-1.0.0 → openhands-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "hatchling>=1.25" ]
 
 [project]
 name = "openhands"
-version = "1.0.0"
+version = "1.0.2"
 description = "OpenHands CLI - Terminal User Interface for OpenHands AI Agent"
 readme = "README.md"
 license = { text = "MIT" }
@@ -15,15 +15,16 @@ 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.0a3",
+  "openhands-tools==1.0.0a3",
   "prompt-toolkit>=3",
   "typer>=0.17.4",
 ]
 
-# Dev-only tools with uv groups: `uv sync --group dev`
-scripts.openhands = "openhands_cli.simple_main:main"
+scripts = { openhands = "openhands_cli.simple_main:main" }
 
 [dependency-groups]
 # Hatchling wheel target: include the package directory
@@ -42,6 +43,9 @@ dev = [
   "ruff>=0.11.8",
 ]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.hatch.build.targets.wheel]
 packages = [ "openhands_cli" ]
 
@@ -95,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 = "189979a5013751aa86852ab41afe9a79555e62ac" }
-openhands-tools = { git = "https://github.com/All-Hands-AI/agent-sdk.git", subdirectory = "openhands/tools", rev = "189979a5013751aa86852ab41afe9a79555e62ac" }
+# 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.2/tests/settings/test_api_key_preservation.py

@@ -0,0 +1,56 @@
+"""Test for API key preservation bug when updating settings."""
+
+from unittest.mock import patch
+import pytest
+from pydantic import SecretStr
+
+from openhands_cli.user_actions.settings_action import prompt_api_key
+from openhands_cli.tui.utils import StepCounter
+
+
+def test_api_key_preservation_when_user_presses_enter():
+    """Test that API key is preserved when user presses ENTER to keep current key.
+    
+    This test replicates the bug where API keys disappear when updating settings.
+    When a user presses ENTER to keep the current API key, the function should
+    return the existing API key, not an empty string.
+    """
+    step_counter = StepCounter(1)
+    existing_api_key = SecretStr("sk-existing-key-123")
+    
+    # Mock cli_text_input to return empty string (simulating user pressing ENTER)
+    with patch('openhands_cli.user_actions.settings_action.cli_text_input', return_value=''):
+        result = prompt_api_key(
+            step_counter=step_counter,
+            provider='openai',
+            existing_api_key=existing_api_key,
+            escapable=True
+        )
+    
+    # The bug: result is empty string instead of the existing key
+    # This test will fail initially, demonstrating the bug
+    assert result == existing_api_key.get_secret_value(), (
+        f"Expected existing API key '{existing_api_key.get_secret_value()}' "
+        f"but got '{result}'. API key should be preserved when user presses ENTER."
+    )
+
+
+def test_api_key_update_when_user_enters_new_key():
+    """Test that API key is updated when user enters a new key."""
+    step_counter = StepCounter(1)
+    existing_api_key = SecretStr("sk-existing-key-123")
+    new_api_key = "sk-new-key-456"
+    
+    # Mock cli_text_input to return new API key
+    with patch('openhands_cli.user_actions.settings_action.cli_text_input', return_value=new_api_key):
+        result = prompt_api_key(
+            step_counter=step_counter,
+            provider='openai',
+            existing_api_key=existing_api_key,
+            escapable=True
+        )
+    
+    # Should return the new API key
+    assert result == new_api_key
+
+

{openhands-1.0.0 → openhands-1.0.2}/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.0 → openhands-1.0.2}/tests/test_gui_launcher.py

@@ -111,8 +111,6 @@ class TestLaunchGuiServer:
         [
             # Docker pull failure
             (subprocess.CalledProcessError(1, 'docker pull'), None, 1, False, False),
-            # Docker pull timeout
-            (subprocess.TimeoutExpired('docker pull', 300), None, 1, False, False),
             # Docker run failure
             (MagicMock(returncode=0), subprocess.CalledProcessError(1, 'docker run'), 1, False, False),
             # KeyboardInterrupt during run