claude-dev-env 1.25.2 → 1.26.0

package/hooks/validators/test_git_checks.py

@@ -8,7 +8,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from git_checks import (
+from .git_checks import (
     Violation,
     check_single_commit_when_pr_exists,
     check_draft_pr_state,
@@ -22,7 +22,10 @@ class TestSingleCommitWhenPrExists:
     @patch("git_checks.subprocess.run")
     def test_no_pr_returns_empty(self, mock_run: MagicMock) -> None:
         """When no PR exists, check should return empty list."""
-        mock_run.return_value = MagicMock(returncode=0, stdout="[]", stderr="")
+        mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
+            MagicMock(returncode=0, stdout="[]", stderr=""),
+        ]
 
         violations = check_single_commit_when_pr_exists()
 
@@ -32,6 +35,7 @@ class TestSingleCommitWhenPrExists:
     def test_single_commit_ahead_passes(self, mock_run: MagicMock) -> None:
         """Exactly 1 commit ahead should pass."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
             MagicMock(returncode=0, stdout="1", stderr=""),
         ]
@@ -44,6 +48,7 @@ class TestSingleCommitWhenPrExists:
     def test_zero_commits_ahead_fails(self, mock_run: MagicMock) -> None:
         """Zero commits ahead should fail."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
             MagicMock(returncode=0, stdout="0", stderr=""),
         ]
@@ -60,6 +65,7 @@ class TestSingleCommitWhenPrExists:
     def test_multiple_commits_ahead_fails(self, mock_run: MagicMock) -> None:
         """More than 1 commit ahead should fail."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
             MagicMock(returncode=0, stdout="3", stderr=""),
         ]
@@ -73,7 +79,10 @@ class TestSingleCommitWhenPrExists:
     @patch("git_checks.subprocess.run")
     def test_gh_cli_not_available_returns_empty(self, mock_run: MagicMock) -> None:
         """When gh CLI not available, should return empty (warning, not failure)."""
-        mock_run.side_effect = FileNotFoundError("gh not found")
+        mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
+            FileNotFoundError("gh not found"),
+        ]
 
         violations = check_single_commit_when_pr_exists()
 
@@ -83,6 +92,7 @@ class TestSingleCommitWhenPrExists:
     def test_git_not_available_returns_empty(self, mock_run: MagicMock) -> None:
         """When git not available, should return empty."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
             FileNotFoundError("git not found"),
         ]
@@ -93,8 +103,9 @@ class TestSingleCommitWhenPrExists:
 
     @patch("git_checks.subprocess.run")
     def test_extracts_base_branch_from_pr_info(self, mock_run: MagicMock) -> None:
-        """Should extract base branch name from gh pr list JSON output."""
+        """Should extract base branch name from gh pr list JSON output, falling back to main when absent."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "develop", "number": 123}]', stderr=""),
             MagicMock(returncode=0, stdout="2", stderr=""),
         ]
@@ -110,10 +121,30 @@ class TestSingleCommitWhenPrExists:
             timeout=30,
         )
 
+        mock_run.reset_mock()
+        mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
+            MagicMock(returncode=0, stdout='[{"number": 123}]', stderr=""),
+            MagicMock(returncode=0, stdout="2", stderr=""),
+        ]
+
+        fallback_violations = check_single_commit_when_pr_exists()
+
+        assert len(fallback_violations) == 1
+        assert "main" in fallback_violations[0].message
+        mock_run.assert_any_call(
+            ["git", "rev-list", "--count", "main..HEAD"],
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=30,
+        )
+
     @patch("git_checks.subprocess.run")
     def test_non_numeric_commit_count_returns_empty(self, mock_run: MagicMock) -> None:
         """When git rev-list returns non-numeric output, should return empty."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
             MagicMock(returncode=0, stdout="not a number\n", stderr=""),
         ]
@@ -125,7 +156,10 @@ class TestSingleCommitWhenPrExists:
     @patch("git_checks.subprocess.run")
     def test_gh_timeout_returns_empty(self, mock_run: MagicMock) -> None:
         """When gh CLI times out, should return empty (warning, not failure)."""
-        mock_run.side_effect = subprocess.TimeoutExpired(cmd=["gh", "pr", "list"], timeout=30)
+        mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
+            subprocess.TimeoutExpired(cmd=["gh", "pr", "list"], timeout=30),
+        ]
 
         violations = check_single_commit_when_pr_exists()
 
@@ -135,6 +169,7 @@ class TestSingleCommitWhenPrExists:
     def test_git_timeout_returns_empty(self, mock_run: MagicMock) -> None:
         """When git times out, should return empty (warning, not failure)."""
         mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
             MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
             subprocess.TimeoutExpired(cmd=["git", "rev-list"], timeout=30),
         ]
@@ -143,6 +178,37 @@ class TestSingleCommitWhenPrExists:
 
         assert violations == []
 
+    @patch("git_checks.subprocess.run")
+    def test_passes_resolved_branch_name_to_gh(self, mock_run: MagicMock) -> None:
+        """gh pr list must receive the resolved branch name, never the literal 'HEAD'."""
+        mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
+            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
+            MagicMock(returncode=0, stdout="1", stderr=""),
+        ]
+
+        check_single_commit_when_pr_exists()
+
+        mock_run.assert_any_call(
+            ["gh", "pr", "list", "--head", "feature/my-branch", "--json", "baseRefName,number"],
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=30,
+        )
+
+    @patch("git_checks.subprocess.run")
+    def test_unresolved_branch_returns_empty(self, mock_run: MagicMock) -> None:
+        """When current branch cannot be resolved, should return empty."""
+        mock_run.side_effect = [
+            MagicMock(returncode=0, stdout="\n", stderr=""),
+        ]
+
+        violations = check_single_commit_when_pr_exists()
+
+        assert violations == []
+        mock_run.assert_called_once()
+
 
 class TestDraftPrState:
     """Test that PR is in draft state when pushing review fixes."""
@@ -208,8 +274,8 @@ class TestDraftPrState:
 class TestMain:
     """Test main function integration."""
 
-    @patch("git_checks.check_single_commit_when_pr_exists")
-    @patch("git_checks.check_draft_pr_state")
+    @patch("validators.git_checks.check_single_commit_when_pr_exists")
+    @patch("validators.git_checks.check_draft_pr_state")
     def test_main_no_violations_exits_zero(
         self,
         mock_draft: MagicMock,
@@ -227,8 +293,8 @@ class TestMain:
         captured = capsys.readouterr()
         assert captured.out == ""
 
-    @patch("git_checks.check_single_commit_when_pr_exists")
-    @patch("git_checks.check_draft_pr_state")
+    @patch("validators.git_checks.check_single_commit_when_pr_exists")
+    @patch("validators.git_checks.check_draft_pr_state")
     def test_main_with_violations_exits_one(
         self,
         mock_draft: MagicMock,
@@ -248,8 +314,8 @@ class TestMain:
         captured = capsys.readouterr()
         assert "Branch has 3 commits ahead" in captured.out
 
-    @patch("git_checks.check_single_commit_when_pr_exists")
-    @patch("git_checks.check_draft_pr_state")
+    @patch("validators.git_checks.check_single_commit_when_pr_exists")
+    @patch("validators.git_checks.check_draft_pr_state")
     def test_main_prints_violations_without_file_line(
         self,
         mock_draft: MagicMock,
@@ -270,8 +336,8 @@ class TestMain:
         assert captured.out == "PR must be in draft state\n"
         assert ":0:" not in captured.out
 
-    @patch("git_checks.check_single_commit_when_pr_exists")
-    @patch("git_checks.check_draft_pr_state")
+    @patch("validators.git_checks.check_single_commit_when_pr_exists")
+    @patch("validators.git_checks.check_draft_pr_state")
     def test_main_prints_all_violations(
         self,
         mock_draft: MagicMock,

package/hooks/validators/test_health_check.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 import pytest
 
-from health_check import (
+from .health_check import (
     ValidatorHealth,
     check_validator_exists,
     check_all_validators,

package/hooks/validators/test_magic_value_checks.py

@@ -6,11 +6,11 @@ from pathlib import Path
 
 import pytest
 
-from magic_value_checks import (
+from .magic_value_checks import (
     check_magic_values,
     validate_file,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 MAGIC_NUMBER_SOURCE = "x = 42\n"

package/hooks/validators/test_mypy_integration.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from unittest.mock import patch
 
-from mypy_integration import MypyResult, check_mypy_available, run_mypy_check
+from .mypy_integration import MypyResult, check_mypy_available, run_mypy_check
 
 
 def test_mypy_result_dataclass() -> None:

package/hooks/validators/test_output_formatter.py

@@ -1,8 +1,10 @@
 """Tests for output formatting."""
 
+import os
+
 import pytest
 
-from output_formatter import (
+from .output_formatter import (
     OutputFormatter,
     OutputMode,
     format_violation_with_context,

package/hooks/validators/test_pr_reference_checks.py

@@ -4,11 +4,11 @@ from pathlib import Path
 
 import pytest
 
-from pr_reference_checks import (
+from .pr_reference_checks import (
     check_pr_references,
     validate_file,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 GOOD_NO_REFERENCES = '''

package/hooks/validators/test_python_antipattern_checks.py

@@ -4,12 +4,12 @@ import ast
 
 import pytest
 
-from python_antipattern_checks import (
+from .python_antipattern_checks import (
     check_mutable_default_args,
     check_bare_except,
     check_print_in_production,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 GOOD_NONE_DEFAULT = '''

package/hooks/validators/test_python_style_checks.py

@@ -7,12 +7,13 @@ from typing import List
 
 import pytest
 
-from python_style_checks import (
+from .python_style_checks import (
     Violation,
     check_imports_at_top,
     check_no_empty_line_after_decorators,
     check_single_empty_line_between_functions,
     check_view_function_naming,
+    fix_file,
     validate_file,
 )
 
@@ -383,7 +384,6 @@ def foo():
             temp_path = Path(temp_file.name)
 
         try:
-            from python_style_checks import fix_file
             fixed = fix_file(temp_path)
             assert fixed is True
             result = temp_path.read_text()
@@ -411,7 +411,6 @@ def bar():
             temp_path = Path(temp_file.name)
 
         try:
-            from python_style_checks import fix_file
             fixed = fix_file(temp_path)
             assert fixed is True
             result = temp_path.read_text()
@@ -432,7 +431,6 @@ def bar():
             temp_path = Path(temp_file.name)
 
         try:
-            from python_style_checks import fix_file
             fixed = fix_file(temp_path)
             assert fixed is False
         finally:

package/hooks/validators/test_react_checks.py

@@ -2,7 +2,7 @@
 
 import pytest
 from pathlib import Path
-from react_checks import check_no_class_components, Violation
+from .react_checks import check_no_class_components, Violation
 
 
 def test_class_component_extends_component_should_fail(tmp_path: Path) -> None:

package/hooks/validators/test_ruff_integration.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from unittest.mock import patch
 
-from ruff_integration import RuffResult, check_ruff_available, run_ruff_check
+from .ruff_integration import RuffResult, check_ruff_available, run_ruff_check
 
 
 def test_ruff_result_dataclass() -> None:

package/hooks/validators/test_run_all_validators.py

@@ -6,15 +6,28 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
+from .run_all_validators import (
+    ValidatorResult,
+    add_timing,
+    build_json_output,
+    create_timing_metrics,
+    format_timing_report,
+    main,
+    print_header,
+    run_git_checks,
+    run_python_style_checks,
+    run_with_fallback,
+)
+
 
 class TestFixFlag:
     """Test --fix flag functionality."""
 
     def test_fix_flag_is_accepted(self) -> None:
         """Verify --fix flag is recognized without error."""
-        with patch("run_all_validators.get_changed_files") as mock_get_files, \
-             patch("run_all_validators.run_file_structure_checks") as mock_file, \
-             patch("run_all_validators.run_git_checks") as mock_git:
+        with patch("validators.run_all_validators.get_changed_files") as mock_get_files, \
+             patch("validators.run_all_validators.run_file_structure_checks") as mock_file, \
+             patch("validators.run_all_validators.run_git_checks") as mock_git:
 
             mock_get_files.return_value = []
 
@@ -27,8 +40,6 @@ class TestFixFlag:
             mock_file.return_value = mock_result
             mock_git.return_value = mock_result
 
-            from run_all_validators import main
-
             original_argv = sys.argv
             try:
                 sys.argv = ["run_all_validators.py", "--fix"]
@@ -39,14 +50,14 @@ class TestFixFlag:
 
     def test_fix_flag_calls_fix_python_style(self) -> None:
         """Verify --fix flag triggers fix_python_style when files exist."""
-        with patch("run_all_validators.get_changed_files") as mock_get_files, \
-             patch("run_all_validators.fix_python_style") as mock_fix, \
-             patch("run_all_validators.run_python_style_checks") as mock_style, \
-             patch("run_all_validators.run_test_safety_checks") as mock_test, \
-             patch("run_all_validators.run_react_checks") as mock_react, \
-             patch("run_all_validators.run_comment_checks") as mock_comment, \
-             patch("run_all_validators.run_file_structure_checks") as mock_file, \
-             patch("run_all_validators.run_git_checks") as mock_git:
+        with patch("validators.run_all_validators.get_changed_files") as mock_get_files, \
+             patch("validators.run_all_validators.fix_python_style") as mock_fix, \
+             patch("validators.run_all_validators.run_python_style_checks") as mock_style, \
+             patch("validators.run_all_validators.run_test_safety_checks") as mock_test, \
+             patch("validators.run_all_validators.run_react_checks") as mock_react, \
+             patch("validators.run_all_validators.run_comment_checks") as mock_comment, \
+             patch("validators.run_all_validators.run_file_structure_checks") as mock_file, \
+             patch("validators.run_all_validators.run_git_checks") as mock_git:
 
             mock_get_files.return_value = [Path("test.py")]
             mock_fix.return_value = ["test.py"]
@@ -64,8 +75,6 @@ class TestFixFlag:
             mock_file.return_value = mock_result
             mock_git.return_value = mock_result
 
-            from run_all_validators import main
-
             original_argv = sys.argv
             try:
                 sys.argv = ["run_all_validators.py", "--fix"]
@@ -77,14 +86,14 @@ class TestFixFlag:
 
     def test_no_fix_flag_skips_fixes(self) -> None:
         """Verify fixes are skipped when --fix flag is not provided."""
-        with patch("run_all_validators.get_changed_files") as mock_get_files, \
-             patch("run_all_validators.fix_python_style") as mock_fix, \
-             patch("run_all_validators.run_python_style_checks") as mock_style, \
-             patch("run_all_validators.run_test_safety_checks") as mock_test, \
-             patch("run_all_validators.run_react_checks") as mock_react, \
-             patch("run_all_validators.run_comment_checks") as mock_comment, \
-             patch("run_all_validators.run_file_structure_checks") as mock_file, \
-             patch("run_all_validators.run_git_checks") as mock_git:
+        with patch("validators.run_all_validators.get_changed_files") as mock_get_files, \
+             patch("validators.run_all_validators.fix_python_style") as mock_fix, \
+             patch("validators.run_all_validators.run_python_style_checks") as mock_style, \
+             patch("validators.run_all_validators.run_test_safety_checks") as mock_test, \
+             patch("validators.run_all_validators.run_react_checks") as mock_react, \
+             patch("validators.run_all_validators.run_comment_checks") as mock_comment, \
+             patch("validators.run_all_validators.run_file_structure_checks") as mock_file, \
+             patch("validators.run_all_validators.run_git_checks") as mock_git:
 
             mock_get_files.return_value = [Path("test.py")]
 
@@ -101,8 +110,6 @@ class TestFixFlag:
             mock_file.return_value = mock_result
             mock_git.return_value = mock_result
 
-            from run_all_validators import main
-
             original_argv = sys.argv
             try:
                 sys.argv = ["run_all_validators.py"]
@@ -115,8 +122,6 @@ class TestFixFlag:
 
 class TestGracefulDegradation:
     def test_missing_validator_returns_skipped_result(self) -> None:
-        from run_all_validators import ValidatorResult, run_with_fallback
-
         def failing_validator() -> ValidatorResult:
             raise FileNotFoundError("validator.py not found")
 
@@ -131,8 +136,6 @@ class TestGracefulDegradation:
         assert result.passed is False
 
     def test_validator_exception_returns_skipped_result(self) -> None:
-        from run_all_validators import ValidatorResult, run_with_fallback
-
         def crashing_validator() -> ValidatorResult:
             raise RuntimeError("Unexpected crash")
 
@@ -146,8 +149,6 @@ class TestGracefulDegradation:
         assert "skipped" in result.output.lower()
 
     def test_successful_validator_returns_normal_result(self) -> None:
-        from run_all_validators import ValidatorResult, run_with_fallback
-
         def working_validator() -> ValidatorResult:
             return ValidatorResult(
                 name="Working",
@@ -166,25 +167,62 @@ class TestGracefulDegradation:
         assert result.passed is True
 
 
+class TestStderrSurfacing:
+    """Verify that validator stderr is surfaced when stdout is empty."""
+
+    def test_python_style_check_surfaces_stderr_when_stdout_empty(self) -> None:
+        """When a validator crashes with no stdout, stderr must appear in output."""
+        with patch("validators.run_all_validators.invoke_validator_module") as mock_invoke:
+            crashed_result = MagicMock()
+            crashed_result.returncode = 1
+            crashed_result.stdout = ""
+            crashed_result.stderr = "ImportError: No module named validators.python_style_checks"
+            mock_invoke.return_value = crashed_result
+
+            validator_result = run_python_style_checks([Path("foo.py")])
+
+            assert "ImportError" in validator_result.output
+
+    def test_git_check_surfaces_stderr_when_stdout_empty(self) -> None:
+        """When git validator crashes with no stdout, stderr must appear in output."""
+        with patch("validators.run_all_validators.invoke_validator_module") as mock_invoke:
+            crashed_result = MagicMock()
+            crashed_result.returncode = 1
+            crashed_result.stdout = ""
+            crashed_result.stderr = "SyntaxError: invalid syntax in git_checks.py"
+            mock_invoke.return_value = crashed_result
+
+            validator_result = run_git_checks()
+
+            assert "SyntaxError" in validator_result.output
+
+    def test_output_falls_back_to_all_checks_passed_when_both_empty(self) -> None:
+        """When both stdout and stderr are empty and returncode is 0, use fallback."""
+        with patch("validators.run_all_validators.invoke_validator_module") as mock_invoke:
+            clean_result = MagicMock()
+            clean_result.returncode = 0
+            clean_result.stdout = ""
+            clean_result.stderr = ""
+            mock_invoke.return_value = clean_result
+
+            validator_result = run_git_checks()
+
+            assert validator_result.output == "All checks passed"
+
+
 class TestTimingMetrics:
     def test_create_timing_metrics_empty(self) -> None:
-        from run_all_validators import create_timing_metrics
-
         metrics = create_timing_metrics({})
         assert metrics.total_seconds == 0.0
         assert metrics.validator_times == {}
 
     def test_create_timing_metrics_with_data(self) -> None:
-        from run_all_validators import create_timing_metrics
-
         timings = {"Validator A": 1.5, "Validator B": 2.0}
         metrics = create_timing_metrics(timings)
         assert metrics.total_seconds == 3.5
         assert metrics.validator_times == timings
 
     def test_add_timing_returns_new_instance(self) -> None:
-        from run_all_validators import add_timing, create_timing_metrics
-
         metrics1 = create_timing_metrics({})
         metrics2 = add_timing(metrics1, "Test", 1.5)
 
@@ -194,8 +232,6 @@ class TestTimingMetrics:
         assert metrics2.validator_times["Test"] == 1.5
 
     def test_format_report_includes_all_timings(self) -> None:
-        from run_all_validators import create_timing_metrics, format_timing_report
-
         metrics = create_timing_metrics({"Fast": 0.1, "Slow": 2.5})
         report = format_timing_report(metrics)
 
@@ -206,8 +242,6 @@ class TestTimingMetrics:
 
 class TestVersionHeader:
     def test_print_header_includes_version(self, capsys) -> None:
-        from run_all_validators import print_header
-
         print_header()
         captured = capsys.readouterr()
 
@@ -215,8 +249,6 @@ class TestVersionHeader:
         assert "(v" in captured.out
 
     def test_build_json_output_includes_version(self) -> None:
-        from run_all_validators import build_json_output, create_timing_metrics
-
         json_output = build_json_output(
             results=[],
             metrics=create_timing_metrics({}),

package/hooks/validators/test_run_all_validators_integration.py

@@ -4,45 +4,22 @@ import subprocess
 import sys
 from pathlib import Path
 
-import pytest
-
-
 VALIDATORS_DIR = Path(__file__).parent
+HOOKS_DIR = VALIDATORS_DIR.parent
+PACKAGE_MODULE = f"{VALIDATORS_DIR.name}.run_all_validators"
 
 
-class TestNewValidatorsIntegration:
-    def test_abbreviation_checks_called(self) -> None:
-        """Verify abbreviation_checks is invoked by run_all_validators."""
-        result = subprocess.run(
-            [sys.executable, str(VALIDATORS_DIR / "run_all_validators.py"), "--help"],
-            capture_output=True,
-            text=True,
-        )
-        assert "Abbreviations" in result.stdout or result.returncode == 0
+def run_validators_help() -> subprocess.CompletedProcess[str]:
+    return subprocess.run(
+        [sys.executable, "-m", PACKAGE_MODULE, "--help"],
+        capture_output=True,
+        text=True,
+        cwd=str(HOOKS_DIR),
+    )
 
-    def test_pr_reference_checks_called(self) -> None:
-        """Verify pr_reference_checks is invoked by run_all_validators."""
-        result = subprocess.run(
-            [sys.executable, str(VALIDATORS_DIR / "run_all_validators.py"), "--help"],
-            capture_output=True,
-            text=True,
-        )
-        assert "PR References" in result.stdout or result.returncode == 0
 
-    def test_magic_value_checks_called(self) -> None:
-        """Verify magic_value_checks is invoked by run_all_validators."""
-        result = subprocess.run(
-            [sys.executable, str(VALIDATORS_DIR / "run_all_validators.py"), "--help"],
-            capture_output=True,
-            text=True,
-        )
-        assert "Magic Values" in result.stdout or result.returncode == 0
-
-    def test_useless_test_checks_called(self) -> None:
-        """Verify useless_test_checks is invoked by run_all_validators."""
-        result = subprocess.run(
-            [sys.executable, str(VALIDATORS_DIR / "run_all_validators.py"), "--help"],
-            capture_output=True,
-            text=True,
-        )
-        assert "Useless Tests" in result.stdout or result.returncode == 0
+class TestNewValidatorsIntegration:
+    def test_help_exits_cleanly(self) -> None:
+        """Verify run_all_validators --help exits with code 0."""
+        result = run_validators_help()
+        assert result.returncode == 0, result.stderr

package/hooks/validators/test_security_checks.py

@@ -4,12 +4,12 @@ import ast
 
 import pytest
 
-from security_checks import (
+from .security_checks import (
     check_hardcoded_secrets,
     check_sql_injection,
     check_xss_risk,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 GOOD_NO_SECRETS = '''

package/hooks/validators/test_test_safety_checks.py

@@ -7,7 +7,7 @@ from typing import List
 
 import pytest
 
-from test_safety_checks import (
+from .test_safety_checks import (
     Violation,
     check_no_skip_decorators,
     check_debug_guard_in_dev_scripts,

package/hooks/validators/test_todo_checks.py

@@ -2,8 +2,8 @@
 
 import pytest
 
-from todo_checks import check_untracked_todos
-from validator_base import Violation
+from .todo_checks import check_untracked_todos
+from .validator_base import Violation
 
 
 GOOD_TODO_WITH_ISSUE = '''