claude-dev-env 1.25.1 → 1.26.0

package/hooks/notification/test_claude_notification_handler.py

@@ -0,0 +1,54 @@
+"""Unit tests for claude-notification-handler Discord wiring."""
+
+import importlib.util
+import pathlib
+import types
+from unittest.mock import patch
+
+HOOK_DIRECTORY = pathlib.Path(__file__).parent
+MODULE_PATH = HOOK_DIRECTORY / "claude_notification_handler.py"
+
+FIXTURE_ATTENTION_SECRET_ID = "fixture-attention-id-0001"
+FIXTURE_PROJECT_NAME = "fixture-project"
+FIXTURE_MESSAGE = "attention required"
+FIXTURE_PRIORITY = "default"
+NON_WINDOWS_NON_WSL_PLATFORM = "Darwin"
+
+
+def load_handler_with_environment(
+    environment_overrides: dict[str, str],
+) -> types.ModuleType:
+    module_specification = importlib.util.spec_from_file_location(
+        "claude_notification_handler_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_send_desktop_and_push_notification_forwards_attention_secret_id_to_notify_discord() -> (
+    None
+):
+    module_under_test = load_handler_with_environment(
+        {"BWS_DISCORD_ATTENTION_SECRET_ID": FIXTURE_ATTENTION_SECRET_ID}
+    )
+    with (
+        patch.object(module_under_test, "notify_ntfy"),
+        patch.object(module_under_test, "notify_discord") as discord_spy,
+        patch.object(module_under_test, "platform") as platform_stub,
+    ):
+        platform_stub.system.return_value = NON_WINDOWS_NON_WSL_PLATFORM
+        module_under_test.send_desktop_and_push_notification(
+            project_name=FIXTURE_PROJECT_NAME,
+            notification_message=FIXTURE_MESSAGE,
+            ntfy_priority=FIXTURE_PRIORITY,
+        )
+    assert discord_spy.call_count == 1
+    call_kwargs = discord_spy.call_args.kwargs
+    assert call_kwargs["webhook_secret_id"] == FIXTURE_ATTENTION_SECRET_ID
+    assert call_kwargs["title"] == FIXTURE_PROJECT_NAME
+    assert call_kwargs["message"] == FIXTURE_MESSAGE

package/hooks/notification/test_notification_utils.py

@@ -0,0 +1,91 @@
+"""Unit tests for notification_utils ntfy guard behavior."""
+
+import importlib.util
+import json
+import pathlib
+import subprocess
+import types
+from unittest.mock import patch
+
+HOOK_DIRECTORY = pathlib.Path(__file__).parent
+MODULE_PATH = HOOK_DIRECTORY / "notification_utils.py"
+
+FIXTURE_DISCORD_WEBHOOK_URL = "https://discord.com/api/webhooks/111/aaa-fixture"
+FIXTURE_SECRET_ID = "fixture-secret-id-0000"
+
+
+def load_notification_utils_with_environment(
+    environment_overrides: dict[str, str],
+) -> types.ModuleType:
+    module_specification = importlib.util.spec_from_file_location(
+        "notification_utils_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_should_skip_curl_when_topic_environment_variable_is_unset() -> None:
+    environment_with_topic_removed = {"NTFY_TOPIC": ""}
+    module_under_test = load_notification_utils_with_environment(
+        environment_with_topic_removed
+    )
+    with patch("subprocess.Popen") as popen_spy:
+        module_under_test.notify_ntfy(title="Test", message="payload")
+    assert popen_spy.call_count == 0
+
+
+def test_should_invoke_curl_when_topic_environment_variable_is_set() -> None:
+    environment_with_topic_set = {"NTFY_TOPIC": "private-topic-for-test"}
+    module_under_test = load_notification_utils_with_environment(
+        environment_with_topic_set
+    )
+    with patch("subprocess.Popen") as popen_spy:
+        module_under_test.notify_ntfy(title="Test", message="payload")
+    assert popen_spy.call_count == 1
+    curl_arguments = popen_spy.call_args.args[0]
+    assert "https://ntfy.sh/private-topic-for-test" in curl_arguments
+
+
+def test_fetch_bws_secret_returns_none_when_secret_id_is_empty() -> None:
+    module_under_test = load_notification_utils_with_environment({})
+    with patch("subprocess.run") as run_spy:
+        fetched_value = module_under_test.fetch_bws_secret("")
+    assert fetched_value is None
+    assert run_spy.call_count == 0
+
+
+def test_notify_discord_skips_curl_when_secret_id_is_empty() -> None:
+    module_under_test = load_notification_utils_with_environment({})
+    with patch("subprocess.Popen") as popen_spy:
+        module_under_test.notify_discord(
+            title="Test",
+            message="payload",
+            webhook_secret_id="",
+        )
+    assert popen_spy.call_count == 0
+
+
+def test_notify_discord_invokes_curl_when_bws_returns_url() -> None:
+    module_under_test = load_notification_utils_with_environment({})
+    bws_completed = subprocess.CompletedProcess(
+        args=[],
+        returncode=0,
+        stdout=json.dumps({"value": FIXTURE_DISCORD_WEBHOOK_URL}),
+        stderr="",
+    )
+    with patch("subprocess.run", return_value=bws_completed), patch(
+        "subprocess.Popen"
+    ) as popen_spy:
+        module_under_test.notify_discord(
+            title="Test",
+            message="payload",
+            webhook_secret_id=FIXTURE_SECRET_ID,
+        )
+    assert popen_spy.call_count == 1
+    popen_arguments = popen_spy.call_args.args[0]
+    assert FIXTURE_DISCORD_WEBHOOK_URL in popen_arguments

package/hooks/notification/test_subagent_complete_notify.py

@@ -0,0 +1,72 @@
+"""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_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]: