claude-dev-env 1.25.2 → 1.26.1

package/hooks/notification/test_subagent_complete_notify.py

@@ -0,0 +1,79 @@
+"""Unit tests for subagent-complete-notify Discord wiring."""
+
+import importlib.util
+import pathlib
+import types
+from unittest.mock import patch
+
+HOOK_DIRECTORY = pathlib.Path(__file__).parent
+MODULE_PATH = HOOK_DIRECTORY / "subagent_complete_notify.py"
+
+FIXTURE_ACTIVITY_SECRET_ID = "fixture-activity-id-0003"
+FIXTURE_TASK_DESCRIPTION = "subagent finished research task"
+FIXTURE_PROJECT_NAME = "fixture-project"
+NON_WINDOWS_NON_WSL_PLATFORM = "Darwin"
+
+
+def load_hook_with_environment(
+    environment_overrides: dict[str, str],
+) -> types.ModuleType:
+    module_specification = importlib.util.spec_from_file_location(
+        "subagent_complete_notify_under_test",
+        MODULE_PATH,
+    )
+    assert module_specification is not None
+    assert module_specification.loader is not None
+    module_under_test = importlib.util.module_from_spec(module_specification)
+    with patch.dict("os.environ", environment_overrides, clear=False):
+        module_specification.loader.exec_module(module_under_test)
+    return module_under_test
+
+
+def test_main_forwards_activity_secret_id_to_notify_discord() -> None:
+    module_under_test = load_hook_with_environment(
+        {"BWS_DISCORD_ACTIVITY_SECRET_ID": FIXTURE_ACTIVITY_SECRET_ID}
+    )
+    with (
+        patch.object(
+            module_under_test,
+            "get_task_info_from_stdin",
+            return_value=FIXTURE_TASK_DESCRIPTION,
+        ),
+        patch.object(
+            module_under_test, "get_project_name", return_value=FIXTURE_PROJECT_NAME
+        ),
+        patch.object(module_under_test, "notify_ntfy"),
+        patch.object(module_under_test, "notify_discord") as discord_spy,
+        patch.object(module_under_test, "is_wsl", return_value=False),
+        patch.object(module_under_test, "platform") as platform_stub,
+    ):
+        platform_stub.system.return_value = NON_WINDOWS_NON_WSL_PLATFORM
+        module_under_test.main()
+    assert discord_spy.call_count == 1
+    call_kwargs = discord_spy.call_args.kwargs
+    assert call_kwargs["webhook_secret_id"] == FIXTURE_ACTIVITY_SECRET_ID
+    assert call_kwargs["title"] == FIXTURE_PROJECT_NAME
+    assert call_kwargs["message"] == FIXTURE_TASK_DESCRIPTION
+
+
+def test_notify_ntfy_skips_when_topic_unset() -> None:
+    module_under_test = load_hook_with_environment({"CLAUDE_NTFY_TOPIC": ""})
+    with patch.object(module_under_test.subprocess, "Popen") as popen_spy:
+        module_under_test.notify_ntfy(title="t", message="m")
+    assert popen_spy.call_count == 0
+
+
+def test_main_skips_notify_discord_when_task_description_is_empty() -> None:
+    module_under_test = load_hook_with_environment(
+        {"BWS_DISCORD_ACTIVITY_SECRET_ID": FIXTURE_ACTIVITY_SECRET_ID}
+    )
+    with (
+        patch.object(module_under_test, "get_task_info_from_stdin", return_value=""),
+        patch.object(
+            module_under_test, "get_project_name", return_value=FIXTURE_PROJECT_NAME
+        ),
+        patch.object(module_under_test, "notify_ntfy"),
+        patch.object(module_under_test, "notify_discord") as discord_spy,
+    ):
+        module_under_test.main()
+    assert discord_spy.call_count == 0

package/hooks/validators/README.md

@@ -119,7 +119,11 @@ repos:
     hooks:
       - id: python-style-checks
         name: Python Style Checks
-        entry: python hooks/validators/python_style_checks.py
+        entry: python packages/claude-dev-env/hooks/validators/python_style_checks.py
+        args: []
+        pass_filenames: true
+        # Invokes the script directly via its ``__main__`` block so the
+        # ``validators`` package qualifier does not need PYTHONPATH setup.
         language: system
         types: [python]
 ```

package/hooks/validators/abbreviation_checks.py

@@ -13,7 +13,7 @@ import sys
 from pathlib import Path
 from typing import List, Set
 
-from validator_base import Violation
+from .validator_base import Violation
 
 
 ALLOWED_SINGLE_LETTERS: Set[str] = frozenset({"i", "j", "k", "_"})

package/hooks/validators/code_quality_checks.py

@@ -11,7 +11,7 @@ import sys
 from pathlib import Path
 from typing import List
 
-from validator_base import Violation
+from .validator_base import Violation
 
 
 MAX_FUNCTION_LINES = 30

package/hooks/validators/config.py

@@ -0,0 +1,5 @@
+"""Shared constants for the validators package."""
+
+# pragma: no-tdd-gate
+
+DEFAULT_BASE_BRANCH_WHEN_UNKNOWN = "main"

package/hooks/validators/conftest.py

@@ -0,0 +1,10 @@
+"""Pytest fixture module ensuring validators directory is importable regardless of invocation cwd."""
+
+import sys
+from pathlib import Path
+
+
+VALIDATORS_DIRECTORY = Path(__file__).resolve().parent
+
+if str(VALIDATORS_DIRECTORY) not in sys.path:
+    sys.path.insert(0, str(VALIDATORS_DIRECTORY))

package/hooks/validators/exempt_paths.py

@@ -2,7 +2,7 @@
 
 Single source of truth for CONFIG / TEST / HOOK-INFRASTRUCTURE /
 WORKFLOW-REGISTRY / MIGRATION path pattern sets. Both Pre-Write
-(``code-rules-enforcer.py``) and pre-push (``magic_value_checks.py``)
+(``code_rules_enforcer.py``) and pre-push (``magic_value_checks.py``)
 scanners must short-circuit on the same file categories; drift between
 the two produced the "inconsistent verdicts" bug this module prevents.
 

package/hooks/validators/git_checks.py

@@ -6,6 +6,8 @@ import sys
 from dataclasses import dataclass
 from typing import List
 
+from .config import DEFAULT_BASE_BRANCH_WHEN_UNKNOWN
+
 
 SUBPROCESS_TIMEOUT_SECONDS = 30
 
@@ -33,6 +35,83 @@ def get_current_branch() -> str:
         return ""
 
 
+def check_single_commit_when_pr_exists() -> List[Violation]:
+    """
+    Check that a PR branch has exactly 1 commit ahead of its base.
+
+    Returns empty list if:
+    - No PR exists for current branch
+    - gh CLI or git is not available
+    - gh/git times out
+    - Branch is exactly 1 commit ahead of base
+    - git rev-list output is non-numeric
+
+    Returns violation if:
+    - Branch is 0 commits ahead of base
+    - Branch is more than 1 commit ahead of base
+    """
+    branch = get_current_branch()
+    if not branch:
+        return []
+
+    try:
+        pr_info = subprocess.run(
+            ["gh", "pr", "list", "--head", branch, "--json", "baseRefName,number"],
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=SUBPROCESS_TIMEOUT_SECONDS,
+        )
+    except FileNotFoundError:
+        return []
+    except subprocess.CalledProcessError:
+        return []
+    except subprocess.TimeoutExpired:
+        return []
+
+    try:
+        pr_data = json.loads(pr_info.stdout)
+    except json.JSONDecodeError:
+        return []
+
+    if not pr_data:
+        return []
+
+    base_branch = pr_data[0].get("baseRefName", DEFAULT_BASE_BRANCH_WHEN_UNKNOWN)
+
+    try:
+        rev_list = subprocess.run(
+            ["git", "rev-list", "--count", f"{base_branch}..HEAD"],
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=SUBPROCESS_TIMEOUT_SECONDS,
+        )
+    except FileNotFoundError:
+        return []
+    except subprocess.CalledProcessError:
+        return []
+    except subprocess.TimeoutExpired:
+        return []
+
+    commit_count_text = rev_list.stdout.strip()
+    try:
+        commit_count = int(commit_count_text)
+    except ValueError:
+        return []
+
+    if commit_count == 1:
+        return []
+
+    return [
+        Violation(
+            file="",
+            line=0,
+            message=f"Branch must have exactly 1 commit ahead of {base_branch}, found {commit_count} commits",
+        )
+    ]
+
+
 def check_draft_pr_state() -> List[Violation]:
     """
     Check that PR is in draft state.
@@ -93,6 +172,7 @@ def main() -> None:
     """Run all git checks and exit with appropriate code."""
     violations: List[Violation] = []
 
+    violations.extend(check_single_commit_when_pr_exists())
     violations.extend(check_draft_pr_state())
 
     if violations:

package/hooks/validators/magic_value_checks.py

@@ -12,11 +12,11 @@ import sys
 from pathlib import Path
 from typing import Dict, FrozenSet, List, Set, Tuple, Type
 
-from exempt_paths import (
+from .exempt_paths import (
     is_config_file,
     is_test_file,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 ALLOWED_NUMBERS: FrozenSet[int] = frozenset({-1, 0, 1})

package/hooks/validators/pr_reference_checks.py

@@ -9,7 +9,7 @@ import sys
 from pathlib import Path
 from typing import List
 
-from validator_base import Violation
+from .validator_base import Violation
 
 
 PR_PATTERN = re.compile(r"#.*\bPR\s*#?\d+", re.IGNORECASE)

package/hooks/validators/python_antipattern_checks.py

@@ -11,7 +11,7 @@ import sys
 from pathlib import Path
 from typing import List
 
-from validator_base import Violation
+from .validator_base import Violation
 
 
 def check_mutable_default_args(tree: ast.AST, filename: str) -> List[Violation]:

package/hooks/validators/run_all_validators.py

@@ -3,6 +3,7 @@
 This script orchestrates all automated validators and produces a unified report.
 Exit code 0 = all checks pass, 1 = violations found.
 """
+# pragma: no-tdd-gate
 
 import argparse
 import subprocess
@@ -13,13 +14,31 @@ from datetime import datetime
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
-from health_check import get_validator_version
-from mypy_integration import check_mypy_available, run_mypy_check
-from output_formatter import OutputFormatter, OutputMode, ValidatorResultDict
-from ruff_integration import check_ruff_available, run_ruff_check
+from .health_check import get_system_health, get_validator_version, print_health_report
+from .mypy_integration import check_mypy_available, run_mypy_check
+from .output_formatter import OutputFormatter, OutputMode, ValidatorResultDict
+from .python_style_checks import fix_file
+from .ruff_integration import check_ruff_available, run_ruff_check
 
 
 VALIDATORS_DIR = Path(__file__).parent
+hooks_dir = VALIDATORS_DIR.parent
+package_name = VALIDATORS_DIR.name
+
+
+def invoke_validator_module(module_stem: str, forwarded_file_paths: List[str]) -> subprocess.CompletedProcess[str]:  # pragma: no-tdd-gate
+    """Run a sibling validator as ``python -m validators.<module_stem>``.
+
+    The subprocess is launched with ``cwd`` set to the hooks directory so the
+    ``validators`` package qualifier resolves without requiring PYTHONPATH.
+    """
+    qualified_module = ".".join([package_name, module_stem])
+    return subprocess.run(
+        [sys.executable, "-m", qualified_module, *forwarded_file_paths],
+        capture_output=True,
+        text=True,
+        cwd=str(hooks_dir),
+    )
 
 
 @dataclass(frozen=True)
@@ -169,18 +188,13 @@ def run_python_style_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "python_style_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("python_style_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Python Style",
         checks="1,2,3,4",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -195,18 +209,13 @@ def run_test_safety_checks(files: List[Path]) -> ValidatorResult:
             output="No test files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "test_safety_checks.py")]
-        + [str(f) for f in test_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("test_safety_checks", [str(f) for f in test_files])
 
     return ValidatorResult(
         name="Test Safety",
         checks="11,21",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -235,17 +244,13 @@ def run_file_structure_checks(project_root: Optional[Path] = None) -> ValidatorR
             output="Not in a git repository - skipping",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "file_structure_checks.py"), str(project_root)],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("file_structure_checks", [str(project_root)])
 
     return ValidatorResult(
         name="File Structure",
         checks="14,15",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -260,39 +265,30 @@ def run_react_checks(files: List[Path]) -> ValidatorResult:
             output="No React files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "react_checks.py")]
-        + [str(f) for f in react_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("react_checks", [str(f) for f in react_files])
 
     return ValidatorResult(
         name="React",
         checks="17",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
 def run_git_checks() -> ValidatorResult:
     """Run git/GitHub checks."""
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "git_checks.py")],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("git_checks", [])
 
     return ValidatorResult(
         name="Git/PR Workflow",
         checks="23,24",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
 def run_comment_checks(files: List[Path]) -> ValidatorResult:
-    """Comment preservation is enforced by code-rules-enforcer hook.
+    """Comment preservation is enforced by code_rules_enforcer hook.
 
     The hook compares old vs new content to block NEW comments and
     block DELETION of existing comments. This standalone validator
@@ -303,7 +299,7 @@ def run_comment_checks(files: List[Path]) -> ValidatorResult:
         name="No Comments",
         checks="26",
         passed=True,
-        output="Handled by code-rules-enforcer hook (old vs new comparison)",
+        output="Handled by code_rules_enforcer hook (old vs new comparison)",
     )
 
 
@@ -358,18 +354,13 @@ def run_abbreviation_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "abbreviation_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("abbreviation_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Abbreviations",
         checks="5",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -384,18 +375,13 @@ def run_pr_reference_checks(files: List[Path]) -> ValidatorResult:
             output="No code files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "pr_reference_checks.py")]
-        + [str(f) for f in code_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("pr_reference_checks", [str(f) for f in code_files])
 
     return ValidatorResult(
         name="PR References",
         checks="6",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -410,18 +396,13 @@ def run_magic_value_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "magic_value_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("magic_value_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Magic Values",
         checks="7",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -436,18 +417,13 @@ def run_useless_test_checks(files: List[Path]) -> ValidatorResult:
             output="No test files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "useless_test_checks.py")]
-        + [str(f) for f in test_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("useless_test_checks", [str(f) for f in test_files])
 
     return ValidatorResult(
         name="Useless Tests",
         checks="12",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -462,18 +438,13 @@ def run_security_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "security_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("security_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Security",
         checks="27,28,29",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -488,18 +459,13 @@ def run_code_quality_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "code_quality_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("code_quality_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Code Quality",
         checks="30,31,32",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -514,18 +480,13 @@ def run_python_antipattern_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "python_antipattern_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("python_antipattern_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Python Anti-patterns",
         checks="33,34,35",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -540,18 +501,13 @@ def run_todo_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "todo_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("todo_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="TODO Tracking",
         checks="36",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -566,18 +522,13 @@ def run_type_safety_checks(files: List[Path]) -> ValidatorResult:
             output="No Python files to check",
         )
 
-    result = subprocess.run(
-        [sys.executable, str(VALIDATORS_DIR / "type_safety_checks.py")]
-        + [str(f) for f in py_files],
-        capture_output=True,
-        text=True,
-    )
+    result = invoke_validator_module("type_safety_checks", [str(f) for f in py_files])
 
     return ValidatorResult(
         name="Type Safety",
         checks="39,40",
         passed=result.returncode == 0,
-        output=result.stdout or "All checks passed",
+        output=result.stdout or result.stderr or "All checks passed",
     )
 
 
@@ -590,8 +541,6 @@ def fix_python_style(files: List[Path]) -> List[str]:
     Returns:
         List of files that were fixed
     """
-    from python_style_checks import fix_file
-
     fixed_files: List[str] = []
     py_files = [f for f in files if f.suffix == ".py"]
 
@@ -657,7 +606,6 @@ def main() -> int:
     args = parser.parse_args()
 
     if args.health:
-        from health_check import get_system_health, print_health_report
         health = get_system_health()
         print_health_report(health)
         return 0 if health.all_healthy else 1

package/hooks/validators/security_checks.py

@@ -12,7 +12,7 @@ import sys
 from pathlib import Path
 from typing import List
 
-from validator_base import Violation
+from .validator_base import Violation
 
 
 SECRET_PATTERNS: frozenset[str] = frozenset({

package/hooks/validators/test_abbreviation_checks.py

@@ -5,11 +5,11 @@ from pathlib import Path
 
 import pytest
 
-from abbreviation_checks import (
+from .abbreviation_checks import (
     check_single_letter_variables,
     validate_file,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 GOOD_DESCRIPTIVE_NAMES = '''

package/hooks/validators/test_code_quality_checks.py

@@ -6,12 +6,12 @@ from pathlib import Path
 
 import pytest
 
-from code_quality_checks import (
+from .code_quality_checks import (
     check_function_length,
     check_nesting_depth,
     check_file_length,
 )
-from validator_base import Violation
+from .validator_base import Violation
 
 
 GOOD_SHORT_FUNCTION = '''