Update test_tui.py

Author: beacoder

tests/test_tui.py

@@ -989,7 +989,7 @@ def test_cancelled_current_run_adopts_history(self):
             Message(role="user", content="q2"),
             Message(role="assistant", content="partial answer"),
         ]
-        with mock.patch("python_agent_harness.tui.run_agent_loop", return_value=None):
+        with mock.patch("python_agent_harness.tui.core.run_agent_loop", return_value=None):
             tui._run_agent("q2", tui.run_seq)
         self.assertEqual(
             [m.text() for m in tui.conversation_history],
@@ -2107,12 +2107,12 @@ def test_run_services_pending_question_first(self):
 
     def test_run_shows_llm_log_path(self):
         """With LLM logging enabled the log path is printed at startup."""
-        import python_agent_harness.tui as tui_mod
+        import python_agent_harness.tui.core as tui_core
 
         tui, buf = make_tui()
         tui.session.client.log_path = "/tmp/llm.log"
         with (
-            mock.patch.object(tui_mod.config, "LLM_LOG_ENABLED", True),
+            mock.patch.object(tui_core.config, "LLM_LOG_ENABLED", True),
             mock.patch.object(tui, "_read_multiline", return_value=None),
         ):
             tui.run()
@@ -2212,7 +2212,7 @@ def boom(*a, **k):
             raise RuntimeError("stop")
 
         with (
-            mock.patch("python_agent_harness.tui.run_agent_loop", side_effect=boom),
+            mock.patch("python_agent_harness.tui.core.run_agent_loop", side_effect=boom),
             mock.patch.object(tui, "_run_live", return_value=False) as live,
         ):
             tui._start_agent("hello")
@@ -2233,7 +2233,7 @@ def test_start_agent_dumb_terminal(self):
             file=io.StringIO(),
         )
         with (
-            mock.patch("python_agent_harness.tui.run_agent_loop", side_effect=RuntimeError("stop")),
+            mock.patch("python_agent_harness.tui.core.run_agent_loop", side_effect=RuntimeError("stop")),
             mock.patch.object(tui, "_run_dumb", return_value=False) as dumb,
         ):
             tui._start_agent("hello")
@@ -2249,7 +2249,7 @@ def test_start_agent_keyboard_interrupt(self):
         q = UiQuestion("Approve?")
         tui.question = q
         with (
-            mock.patch("python_agent_harness.tui.run_agent_loop", side_effect=RuntimeError("stop")),
+            mock.patch("python_agent_harness.tui.core.run_agent_loop", side_effect=RuntimeError("stop")),
             mock.patch.object(tui, "_run_live", side_effect=KeyboardInterrupt),
         ):
             tui._start_agent("hello", restore=lambda: released.append(1))
@@ -2318,7 +2318,7 @@ def test_run_agent_error_logged(self):
         status bar."""
         tui, _ = make_tui()
         with mock.patch(
-            "python_agent_harness.tui.run_agent_loop", side_effect=RuntimeError("boom")
+            "python_agent_harness.tui.core.run_agent_loop", side_effect=RuntimeError("boom")
         ):
             tui._run_agent("hi", tui.run_seq)
         self.assertIn("agent error: boom", tui.status)
@@ -2328,7 +2328,7 @@ def test_run_agent_calls_restore(self):
         tui, _ = make_tui()
         restored = []
         with mock.patch(
-            "python_agent_harness.tui.run_agent_loop", side_effect=RuntimeError("boom")
+            "python_agent_harness.tui.core.run_agent_loop", side_effect=RuntimeError("boom")
         ):
             tui._run_agent("hi", tui.run_seq, restore=lambda: restored.append(1))
         self.assertEqual(restored, [1])
@@ -2391,7 +2391,7 @@ def test_command_args_init_invalid_returns_none(self):
     def test_run_slash_command_unknown(self):
         """A slash command with no registered SessionCommand is reported."""
         tui, buf = make_tui()
-        with mock.patch("python_agent_harness.tui.find_command", return_value=None):
+        with mock.patch("python_agent_harness.tui.commands.find_command", return_value=None):
             tui._run_slash_command("bogus", "")
         self.assertIn("unknown command: /bogus", buf.getvalue())
 
@@ -2434,7 +2434,7 @@ def test_conversation_text_empty(self):
 
     def test_run_sessions_empty(self):
         tui, buf = make_tui()
-        with mock.patch("python_agent_harness.tui.SessionStore.list_sessions", return_value=[]):
+        with mock.patch("python_agent_harness.tui.commands.SessionStore.list_sessions", return_value=[]):
             tui._run_sessions()
         self.assertIn("no saved sessions", buf.getvalue())
 
@@ -2450,7 +2450,7 @@ def test_run_sessions_lists_metadata(self):
                     ";; End:\n"
                 )
             with mock.patch(
-                "python_agent_harness.tui.SessionStore.list_sessions",
+                "python_agent_harness.tui.commands.SessionStore.list_sessions",
                 return_value=[path],
             ):
                 tui._run_sessions()
@@ -2462,7 +2462,7 @@ def test_run_sessions_lists_metadata(self):
     def test_run_sessions_skips_unreadable_files(self):
         tui, buf = make_tui()
         with mock.patch(
-            "python_agent_harness.tui.SessionStore.list_sessions",
+            "python_agent_harness.tui.commands.SessionStore.list_sessions",
             return_value=["/nonexistent/session.md"],
         ):
             tui._run_sessions()  # must not raise
@@ -2475,7 +2475,7 @@ def test_restore_no_session_found(self):
         """/restore with nothing to restore prints the yellow hint."""
         tui, buf = make_tui()
         with mock.patch(
-            "python_agent_harness.tui.SessionStore.latest_session",
+            "python_agent_harness.tui.commands.SessionStore.latest_session",
             return_value=None,
         ):
             tui._run_restore("")
@@ -2489,7 +2489,7 @@ def test_restore_latest_session(self):
             with open(path, "w", encoding="utf-8") as f:
                 f.write("**user**: hello\n\n**assistant**: hi")
             with mock.patch(
-                "python_agent_harness.tui.SessionStore.latest_session",
+                "python_agent_harness.tui.commands.SessionStore.latest_session",
                 return_value=path,
             ):
                 tui._run_restore("--latest")
@@ -2506,7 +2506,7 @@ def test_restore_latest_keyword(self):
             with open(path, "w", encoding="utf-8") as f:
                 f.write("**user**: hello\n\n**assistant**: hi")
             with mock.patch(
-                "python_agent_harness.tui.SessionStore.latest_session",
+                "python_agent_harness.tui.commands.SessionStore.latest_session",
                 return_value=path,
             ) as latest:
                 tui._run_restore("latest")
@@ -2520,7 +2520,7 @@ def test_restore_resolved_path_not_a_file(self):
         """A resolved path that is not a file reports an error."""
         tui, buf = make_tui()
         with mock.patch(
-            "python_agent_harness.tui.SessionStore.latest_session",
+            "python_agent_harness.tui.commands.SessionStore.latest_session",
             return_value="/nonexistent/session.md",
         ):
             tui._run_restore("--latest")
@@ -2545,7 +2545,7 @@ def test_restore_by_title_match(self):
             with open(path, "w", encoding="utf-8") as f:
                 f.write("**user**: hello\n\n**assistant**: hi")
             with mock.patch(
-                "python_agent_harness.tui.SessionStore.list_sessions",
+                "python_agent_harness.tui.commands.SessionStore.list_sessions",
                 return_value=[path],
             ):
                 tui._run_restore("MY SESSION")
@@ -2562,7 +2562,7 @@ def test_find_session_by_title(self):
                 open(f, "w", encoding="utf-8").close()
             files = [dash, spaced]
             with mock.patch(
-                "python_agent_harness.tui.SessionStore.list_sessions",
+                "python_agent_harness.tui.commands.SessionStore.list_sessions",
                 return_value=files,
             ):
                 # exact basename match (with and without .md)
@@ -2623,7 +2623,7 @@ def test_model_numbered_selection_matches_list(self):
         tui.session.llm_settings = {"model": "gpt-5-mini", "base_url": "https://default"}
         tui.session.model = "glm-5.2"  # current IS a profile (index 3)
         with mock.patch(
-            "python_agent_harness.tui.config.load_models_config", return_value=profiles
+            "python_agent_harness.tui.commands.config.load_models_config", return_value=profiles
         ):
             # 1 == default: switches back to the original model
             with mock.patch.object(tui, "_model_switch_by_name") as switch:
@@ -2659,7 +2659,7 @@ def test_model_interactive_selection_can_switch_back_to_default(self):
         tui.session.model = "deepseek-chat"
         with (
             mock.patch("builtins.input", return_value="1"),
-            mock.patch("python_agent_harness.tui.config.load_models_config", return_value=profiles),
+            mock.patch("python_agent_harness.tui.commands.config.load_models_config", return_value=profiles),
             mock.patch.object(tui, "_model_switch_by_name") as switch,
         ):
             tui._run_model_command("")
@@ -2671,7 +2671,7 @@ def test_model_switch_by_name(self):
         profiles = {"deepseek": {"model": "deepseek-chat"}}
         tui.session.model_profiles = dict(profiles)
         with (
-            mock.patch("python_agent_harness.tui.config.load_models_config", return_value=profiles),
+            mock.patch("python_agent_harness.tui.commands.config.load_models_config", return_value=profiles),
             mock.patch.object(tui.session, "switch_model", return_value=(True, "switched")) as sw,
         ):
             tui._run_model_command("deepseek")
@@ -2685,7 +2685,7 @@ def test_model_reloads_profiles_from_config_each_call(self):
         tui, buf = make_tui()
         # no profiles configured: default is still listed
         with (
-            mock.patch("python_agent_harness.tui.config.load_models_config", return_value={}),
+            mock.patch("python_agent_harness.tui.commands.config.load_models_config", return_value={}),
             mock.patch("builtins.input", return_value=""),
         ):
             tui._run_model_command("")
@@ -2696,7 +2696,7 @@ def test_model_reloads_profiles_from_config_each_call(self):
         new_profiles = {"new": {"model": "new-model", "base_url": "https://new/v1"}}
         with (
             mock.patch(
-                "python_agent_harness.tui.config.load_models_config", return_value=new_profiles
+                "python_agent_harness.tui.commands.config.load_models_config", return_value=new_profiles
             ),
             mock.patch("builtins.input", return_value=""),
         ):
@@ -2705,7 +2705,7 @@ def test_model_reloads_profiles_from_config_each_call(self):
         buf.truncate(0)
         # and switchable by name immediately
         with mock.patch(
-            "python_agent_harness.tui.config.load_models_config", return_value=new_profiles
+            "python_agent_harness.tui.commands.config.load_models_config", return_value=new_profiles
         ):
             tui._run_model_command("new")
         self.assertEqual(tui.session.model, "new-model")