Fix manual termination confirmation override behavior

Author: kroxiksut

src/codexsync/app.py

@@ -326,21 +326,34 @@ def _handle_running_codex(
     if not cfg.process_detection.allow_terminate_if_running:
         raise SafetyPreconditionError("Codex process is running and termination is disabled by config.")
 
-    details = ", ".join(f"{proc.name}:{proc.pid}" for proc in snapshot.main_processes)
-    approved = confirm_process_termination(
-        "Codex main process is still running, but codex-windows-sandbox is not detected.\n\n"
-        f"Detected main processes: {details}\n\n"
-        "Terminate Codex processes now and continue sync?",
-        mode=cfg.process_detection.terminate_confirmation_mode,
+    require_manual_confirmation = _resolve_manual_terminate_confirmation(
+        manual_override=manual_override,
+        cfg=cfg,
     )
-    if not approved:
-        raise SafetyPreconditionError("User rejected Codex process termination.")
+    details = ", ".join(f"{proc.name}:{proc.pid}" for proc in snapshot.main_processes)
+    if require_manual_confirmation:
+        approved = confirm_process_termination(
+            "Codex main process is still running, but codex-windows-sandbox is not detected.\n\n"
+            f"Detected main processes: {details}\n\n"
+            "Terminate Codex processes now and continue sync?",
+            mode=cfg.process_detection.terminate_confirmation_mode,
+        )
+        if not approved:
+            raise SafetyPreconditionError("User rejected Codex process termination.")
+    else:
+        LOG.info("Manual termination confirmation disabled; terminating Codex process automatically.")
 
     terminated = detector.terminate(snapshot.main_processes, timeout_seconds=cfg.process_detection.terminate_timeout_seconds)
     if not terminated:
         raise FailSafeError("Failed to terminate Codex processes before timeout.")
 
 
+def _resolve_manual_terminate_confirmation(manual_override: bool | None, cfg: AppConfig) -> bool:
+    if manual_override is not None:
+        return manual_override
+    return bool(cfg.process_detection.manual_terminate_confirmation)
+
+
 def _current_os_background_processes(cfg: AppConfig) -> list[str]:
     os_key = _current_os_key()
     configured = cfg.process_detection.background_process_names.get(os_key, [])

src/codexsync/cli.py

@@ -91,7 +91,7 @@ def main(argv: list[str] | None = None) -> int:
         if args.command == "plan":
             ctx = build_context(
                 config_path,
-                manual_terminate_confirmation_override=args.manual_terminate_confirmation,
+                manual_terminate_confirmation_override=(True if args.manual_terminate_confirmation else None),
                 enforce_safety=False,
             )
             print_plan(ctx.plan)
@@ -100,7 +100,7 @@ def main(argv: list[str] | None = None) -> int:
         if args.command == "sync":
             ctx = build_context(
                 config_path,
-                manual_terminate_confirmation_override=args.manual_terminate_confirmation,
+                manual_terminate_confirmation_override=(True if args.manual_terminate_confirmation else None),
                 enforce_safety=True,
             )
             dry_run = ctx.config.sync.dry_run_default
@@ -124,7 +124,7 @@ def main(argv: list[str] | None = None) -> int:
                 snapshot_name=args.snapshot,
                 target=args.target,
                 dry_run=dry_run,
-                manual_terminate_confirmation_override=args.manual_terminate_confirmation,
+                manual_terminate_confirmation_override=(True if args.manual_terminate_confirmation else None),
             )
             mode = "Dry-run" if dry_run else "Restore"
             print(

tests/test_cli_manual_confirmation.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from types import SimpleNamespace
+from unittest.mock import patch
+import unittest
+
+from codexsync.cli import main
+from codexsync.exceptions import ConfigError
+
+
+def _ctx() -> SimpleNamespace:
+    return SimpleNamespace(
+        config=SimpleNamespace(sync=SimpleNamespace(dry_run_default=True)),
+        plan=SimpleNamespace(conflicts=[]),
+    )
+
+
+class CliManualConfirmationTests(unittest.TestCase):
+    @patch("codexsync.cli.run_sync")
+    @patch("codexsync.cli.build_context", return_value=_ctx())
+    @patch("codexsync.cli.load_config", side_effect=ConfigError("skip verbose config load"))
+    def test_sync_without_flag_passes_none_override(self, _load_cfg, build_ctx, _run_sync) -> None:
+        code = main(["-c", "config.toml", "sync", "--dry-run"])
+        self.assertEqual(code, 0)
+        self.assertEqual(build_ctx.call_args.kwargs["manual_terminate_confirmation_override"], None)
+
+    @patch("codexsync.cli.run_sync")
+    @patch("codexsync.cli.build_context", return_value=_ctx())
+    @patch("codexsync.cli.load_config", side_effect=ConfigError("skip verbose config load"))
+    def test_sync_with_flag_passes_true_override(self, _load_cfg, build_ctx, _run_sync) -> None:
+        code = main(["-c", "config.toml", "--manual-terminate-confirmation", "sync", "--dry-run"])
+        self.assertEqual(code, 0)
+        self.assertEqual(build_ctx.call_args.kwargs["manual_terminate_confirmation_override"], True)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_safety_policy.py

@@ -57,6 +57,23 @@ def _build_cfg() -> AppConfig:
 
 
 class SafetyPolicyTests(unittest.TestCase):
+    @patch("codexsync.app.sys.platform", "win32")
+    @patch("codexsync.app.confirm_process_termination", return_value=True)
+    def test_manual_confirmation_enabled_by_default_prompts(self, confirm_mock) -> None:
+        cfg = _build_cfg()
+        cfg.process_detection.manual_terminate_confirmation = True
+        detector = _DetectorStub()
+        main = [ProcessInfo(pid=10, name="Codex.exe")]
+        snapshot = ProcessSnapshot(
+            main_processes=main,
+            subprocesses=[],
+            sandbox_detected=False,
+        )
+
+        _handle_running_codex(cfg, detector, snapshot, manual_override=None)
+        self.assertEqual(detector.terminated, [main])
+        confirm_mock.assert_called_once()
+
     @patch("codexsync.app.sys.platform", "win32")
     def test_sandbox_detected_blocks_without_terminate(self) -> None:
         cfg = _build_cfg()
@@ -83,6 +100,58 @@ def test_no_sandbox_prompts_and_terminates(self, _confirm_mock) -> None:
         )
         _handle_running_codex(cfg, detector, snapshot, manual_override=None)
         self.assertEqual(detector.terminated, [main])
+        _confirm_mock.assert_called_once()
+
+    @patch("codexsync.app.sys.platform", "win32")
+    @patch("codexsync.app.confirm_process_termination", return_value=True)
+    def test_manual_confirmation_disabled_in_config_skips_prompt(self, confirm_mock) -> None:
+        cfg = _build_cfg()
+        cfg.process_detection.manual_terminate_confirmation = False
+        detector = _DetectorStub()
+        main = [ProcessInfo(pid=10, name="Codex.exe")]
+        snapshot = ProcessSnapshot(
+            main_processes=main,
+            subprocesses=[],
+            sandbox_detected=False,
+        )
+
+        _handle_running_codex(cfg, detector, snapshot, manual_override=None)
+        self.assertEqual(detector.terminated, [main])
+        confirm_mock.assert_not_called()
+
+    @patch("codexsync.app.sys.platform", "win32")
+    @patch("codexsync.app.confirm_process_termination", return_value=True)
+    def test_override_true_forces_prompt_even_if_config_disabled(self, confirm_mock) -> None:
+        cfg = _build_cfg()
+        cfg.process_detection.manual_terminate_confirmation = False
+        detector = _DetectorStub()
+        main = [ProcessInfo(pid=10, name="Codex.exe")]
+        snapshot = ProcessSnapshot(
+            main_processes=main,
+            subprocesses=[],
+            sandbox_detected=False,
+        )
+
+        _handle_running_codex(cfg, detector, snapshot, manual_override=True)
+        self.assertEqual(detector.terminated, [main])
+        confirm_mock.assert_called_once()
+
+    @patch("codexsync.app.sys.platform", "win32")
+    @patch("codexsync.app.confirm_process_termination", return_value=True)
+    def test_override_false_skips_prompt_even_if_config_enabled(self, confirm_mock) -> None:
+        cfg = _build_cfg()
+        cfg.process_detection.manual_terminate_confirmation = True
+        detector = _DetectorStub()
+        main = [ProcessInfo(pid=10, name="Codex.exe")]
+        snapshot = ProcessSnapshot(
+            main_processes=main,
+            subprocesses=[],
+            sandbox_detected=False,
+        )
+
+        _handle_running_codex(cfg, detector, snapshot, manual_override=False)
+        self.assertEqual(detector.terminated, [main])
+        confirm_mock.assert_not_called()
 
     @patch("codexsync.app.sys.platform", "win32")
     @patch("codexsync.app.confirm_process_termination", return_value=True)