fix(cli): wire user_skills flag through call chain and fix tests

- Pass user_skills from simple_main to run_cli_entry
- Pass load_user_skills through agent_chat to setup functions
- Update test_main.py to account for user_skills parameter
- Fix formatting issues (trailing whitespace)

Author: antznette1

openhands_cli/agent_chat.py

@@ -83,8 +83,7 @@ def run_cli_entry(resume_conversation_id: str | None = None, user_skills: bool =
             return
 
     try:
-        # Keep backward compatibility with upstream tests by not passing kwargs here
-        initialized_agent = verify_agent_exists_or_setup_agent()
+        initialized_agent = verify_agent_exists_or_setup_agent(load_user_skills=user_skills)
     except MissingAgentSpec:
         print_formatted_text(HTML('\n<yellow>Setup is required to use OpenHands CLI.</yellow>'))
         print_formatted_text(HTML('\n<yellow>Goodbye! 👋</yellow>'))

openhands_cli/argparsers/main_parser.py

@@ -5,7 +5,7 @@
 
 def create_main_parser() -> argparse.ArgumentParser:
     """Create the main argument parser with CLI as default and serve as subcommand.
-    
+
     Returns:
         The configured argument parser
     """
@@ -23,7 +23,7 @@ def create_main_parser() -> argparse.ArgumentParser:
   openhands serve --gpu               # Launch GUI server with GPU support
 """
     )
-    
+
     # CLI arguments at top level (default mode)
     parser.add_argument(
         '--resume',
@@ -44,7 +44,7 @@ def create_main_parser() -> argparse.ArgumentParser:
         help='Disable loading user skills from ~/.openhands'
     )
     parser.set_defaults(user_skills=True)
-    
+
     # Only serve as subcommand
     subparsers = parser.add_subparsers(
         dest='command',
@@ -66,6 +66,5 @@ def create_main_parser() -> argparse.ArgumentParser:
         action='store_true',
         help='Enable GPU support in the Docker container'
     )
-    
+
     return parser
-    

openhands_cli/setup.py

@@ -46,17 +46,15 @@ def verify_agent_exists_or_setup_agent(*, load_user_skills: bool = True) -> Agen
     """
     settings_screen = SettingsScreen()
     try:
-        # Keep backward compatibility with upstream tests by not passing kwargs here
-        agent = load_agent_specs()
+        agent = load_agent_specs(load_user_skills=load_user_skills)
         return agent
     except MissingAgentSpec:
         # For first-time users, show the full settings flow with choice between basic/advanced
         settings_screen.configure_settings(first_time=True)
 
 
     # Try once again after settings setup attempt
-    # Keep backward compatibility with upstream tests by not passing kwargs here
-    return load_agent_specs()
+    return load_agent_specs(load_user_skills=load_user_skills)
 
 
 def setup_conversation(
@@ -104,4 +102,3 @@ def setup_conversation(
         HTML(f'<green>✓ Agent initialized with model: {agent.llm.model}</green>')
     )
     return conversation
-    

openhands_cli/simple_main.py

@@ -43,7 +43,7 @@ def main() -> None:
 
             # Start agent chat
             # Keep call signature backward-compatible for upstream tests
-            run_cli_entry(resume_conversation_id=args.resume)
+            run_cli_entry(resume_conversation_id=args.resume, user_skills=args.user_skills)
     except KeyboardInterrupt:
         print_formatted_text(HTML('\n<yellow>Goodbye! 👋</yellow>'))
     except EOFError:
@@ -58,4 +58,3 @@ def main() -> None:
 
 if __name__ == '__main__':
     main()
-    

tests/test_cli_user_skills_flags.py

@@ -24,4 +24,4 @@ def test_user_skills_disable_then_enable_then_disable_last_wins():
     parser = create_main_parser()
     args = parser.parse_args(['--user-skills', '--no-user-skills'])
     assert args.user_skills is False
-  
+

tests/test_main.py

@@ -25,8 +25,8 @@ def test_main_starts_agent_chat_directly(
         # Should complete without raising an exception (graceful exit)
         simple_main.main()
 
-        # Should call run_cli_entry with no resume conversation ID
-        mock_run_agent_chat.assert_called_once_with(resume_conversation_id=None)
+        # Should call run_cli_entry with no resume conversation ID and default user_skills=True
+        mock_run_agent_chat.assert_called_once_with(resume_conversation_id=None, user_skills=True)
 
     @patch("openhands_cli.agent_chat.run_cli_entry")
     @patch("sys.argv", ["openhands"])
@@ -86,17 +86,19 @@ def test_main_with_resume_argument(self, mock_run_agent_chat: MagicMock) -> None
         # Should complete without raising an exception (graceful exit)
         simple_main.main()
 
-        # Should call run_cli_entry with the provided resume conversation ID
+        # Should call run_cli_entry with the provided resume conversation ID and default user_skills=True
         mock_run_agent_chat.assert_called_once_with(
-            resume_conversation_id="test-conversation-id"
+            resume_conversation_id="test-conversation-id", user_skills=True
         )
 
 
 @pytest.mark.parametrize(
     "argv,expected_kwargs",
     [
-        (["openhands"], {"resume_conversation_id": None}),
-        (["openhands", "--resume", "test-id"], {"resume_conversation_id": "test-id"}),
+        (["openhands"], {"resume_conversation_id": None, "user_skills": True}),
+        (["openhands", "--resume", "test-id"], {"resume_conversation_id": "test-id", "user_skills": True}),
+        (["openhands", "--no-user-skills"], {"resume_conversation_id": None, "user_skills": False}),
+        (["openhands", "--resume", "test-id", "--no-user-skills"], {"resume_conversation_id": "test-id", "user_skills": False}),
     ],
 )
 def test_main_cli_calls_run_cli_entry(monkeypatch, argv, expected_kwargs):