feat: correctly describe which hooks are enabled

Author: joshuanapoli

src/python_claude/hooks/session_start_hook.py

@@ -1,9 +1,10 @@
 """Session start hook for Claude Code."""
 
 import json
+from typing import cast
 
 from python_claude.hooks.base import Hook, HookInput
-from python_claude.hooks.state import QualityCheckState
+from python_claude.hooks.state import QualityCheck, QualityCheckState
 
 
 class SessionStartHook(Hook):
@@ -18,25 +19,44 @@ def run(self) -> int:
         """Print the introductory message."""
         state = QualityCheckState(self.project_dir)
 
-        # Check which quality checks are disabled
+        # Check which quality checks are enabled and disabled
+        enabled_checks = []
         disabled_checks = []
-        if not state.is_enabled("pytest"):
-            disabled_checks.append("pytest")
-        if not state.is_enabled("mypy"):
-            disabled_checks.append("mypy")
-        if not state.is_enabled("ruff"):
-            disabled_checks.append("ruff")
-
-        additional_context = (
-            "As you edit files, Claude Code Hooks will automatically run "
-            "ruff, mypy, and pytest after you edit a file. You don't need "
-            "to run these commands manually. You can run these before making "
-            "an edit using:\n"
-            "- poetry run ruff format .\n"
-            "- poetry run ruff check .\n"
-            "- poetry run mypy .\n"
-            "- poetry run pytest"
-        )
+
+        for check_name in ["ruff", "mypy", "pytest"]:
+            check = cast(QualityCheck, check_name)
+            if state.is_enabled(check):
+                enabled_checks.append(check_name)
+            else:
+                disabled_checks.append(check_name)
+
+        # Build the message based on enabled checks
+        if enabled_checks:
+            # Format list with proper grammar: "a, b, and c"
+            if len(enabled_checks) == 1:
+                checks_list = enabled_checks[0]
+            elif len(enabled_checks) == 2:
+                checks_list = f"{enabled_checks[0]} and {enabled_checks[1]}"
+            else:
+                checks_list = (
+                    ", ".join(enabled_checks[:-1]) + f", and {enabled_checks[-1]}"
+                )
+
+            additional_context = (
+                f"As you edit files, Claude Code Hooks will automatically run "
+                f"{checks_list} after you edit a file. You don't need "
+                f"to run these commands manually. You can run these before making "
+                f"an edit using:\n"
+                f"- poetry run ruff format .\n"
+                f"- poetry run ruff check .\n"
+                f"- poetry run mypy .\n"
+                f"- poetry run pytest"
+            )
+        else:
+            additional_context = (
+                "No quality checks are currently enabled. "
+                "Use /pytest, /mypy, or /ruff to enable checks."
+            )
 
         output = {"additionalContext": additional_context}
 

tests/test_session_start_hook.py

@@ -46,8 +46,18 @@ def test_shows_disabled_checks(self, tmp_path: Path, capsys: Any) -> None:
 
             # Parse JSON output
             output = json.loads(captured.out)
+            # Should only mention ruff in the enabled checks
+            assert "will automatically run ruff after" in output["additionalContext"]
+            # Should not mention pytest or mypy as enabled
+            assert "mypy" not in output[
+                "additionalContext"
+            ] or "disabled" in output.get("systemMessage", "")
+            assert "pytest" not in output[
+                "additionalContext"
+            ] or "disabled" in output.get("systemMessage", "")
+
             assert "systemMessage" in output
-            assert "currently disabled: pytest, mypy" in output["systemMessage"]
+            assert "currently disabled: mypy, pytest" in output["systemMessage"]
             assert (
                 "Use /pytest, /mypy, or /ruff to toggle them back on"
                 in output["systemMessage"]
@@ -70,8 +80,12 @@ def test_shows_all_disabled_checks(self, tmp_path: Path, capsys: Any) -> None:
 
             # Parse JSON output
             output = json.loads(captured.out)
+            # When no checks are enabled, should show special message
+            assert (
+                "No quality checks are currently enabled" in output["additionalContext"]
+            )
             assert "systemMessage" in output
-            assert "currently disabled: pytest, mypy, ruff" in output["systemMessage"]
+            assert "currently disabled: ruff, mypy, pytest" in output["systemMessage"]
 
     def test_shows_single_disabled_check(self, tmp_path: Path, capsys: Any) -> None:
         """Test message when only one check is disabled."""
@@ -88,5 +102,33 @@ def test_shows_single_disabled_check(self, tmp_path: Path, capsys: Any) -> None:
 
             # Parse JSON output
             output = json.loads(captured.out)
+            # Should only mention mypy and pytest as enabled (with "and")
+            assert (
+                "will automatically run mypy and pytest after"
+                in output["additionalContext"]
+            )
             assert "systemMessage" in output
             assert "currently disabled: ruff" in output["systemMessage"]
+
+    def test_shows_single_enabled_check(self, tmp_path: Path, capsys: Any) -> None:
+        """Test message when only one check is enabled."""
+        hook_input = HookInput(session_id=None, tool_input={}, raw={})
+        with patch.dict(os.environ, {"CLAUDE_PROJECT_DIR": str(tmp_path)}):
+            # Disable mypy and pytest, leaving only ruff enabled
+            state = QualityCheckState(tmp_path)
+            state.disable("mypy")
+            state.disable("pytest")
+
+            hook = SessionStartHook(hook_input)
+            exit_code = hook.run()
+            assert exit_code == 0
+            captured = capsys.readouterr()
+
+            # Parse JSON output
+            output = json.loads(captured.out)
+            # Should only mention ruff (no "and")
+            assert "will automatically run ruff after" in output["additionalContext"]
+            # Should not have "and" when there's only one
+            assert " and " not in output["additionalContext"]
+            assert "systemMessage" in output
+            assert "currently disabled: mypy, pytest" in output["systemMessage"]