capt-hook 3.3.0__tar.gz → 3.3.2__tar.gz

{capt_hook-3.3.0 → capt_hook-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capt-hook
-Version: 3.3.0
+Version: 3.3.2
 Summary: Declarative hook framework for Claude Code
 Keywords: claude,claude-code,hooks,llm,agents,guardrails,cli
 Author: Yasyf Mohamedali

{capt_hook-3.3.0 → capt_hook-3.3.2}/captain_hook/cli.py

@@ -157,20 +157,33 @@ def is_captain_hook_group(group: dict[str, Any]) -> bool:
     return any("capt-hook" in (h.get("command") or "") for h in group.get("hooks") or [])
 
 
+def capt_hook_events(path: Path) -> set[str]:
+    if not path.exists():
+        return set()
+    return {
+        event
+        for event, groups in (json.loads(path.read_text()).get("hooks") or {}).items()
+        if any(is_captain_hook_group(g) for g in groups)
+    }
+
+
 def merge_settings(
     hooks_dir: str, settings_path: Path, from_source: str = DIST_NAME
 ) -> tuple[dict[str, Any], dict[str, str]]:
     new_hooks: dict[str, list[dict[str, Any]]] = generate_settings(hooks_dir, from_source=from_source)["hooks"]
     existing = json.loads(settings_path.read_text()) if settings_path.exists() else {}
     existing_hooks: dict[str, list[dict[str, Any]]] = existing.get("hooks") or {}
+    committed = capt_hook_events(settings_path.parent / "settings.json")
 
     summary: dict[str, str] = {}
     merged_hooks: dict[str, list[dict[str, Any]]] = {}
     for event in sorted(existing_hooks.keys() | new_hooks.keys()):
         foreign = [g for g in existing_hooks.get(event, []) if not is_captain_hook_group(g)]
         old_own = [g for g in existing_hooks.get(event, []) if is_captain_hook_group(g)]
-        fresh_own = new_hooks.get(event, [])
-        if old_own or fresh_own:
+        fresh_own = [] if event in committed else new_hooks.get(event, [])
+        if event in committed and (old_own or new_hooks.get(event)):
+            summary[event] = "deferred"
+        elif old_own or fresh_own:
             summary[event] = (
                 "unchanged"
                 if old_own == fresh_own
@@ -207,6 +220,8 @@ def print_hook_summary(label: str, summary: dict[str, str]) -> None:
         click.echo(f"  - removed {event}")
     if unchanged := by_status["unchanged"]:
         click.echo(f"  unchanged: {', '.join(unchanged)} (already present)")
+    if deferred := by_status["deferred"]:
+        click.echo(f"  deferred to settings.json: {', '.join(deferred)}")
 
 
 def regenerate_settings(state: CliState) -> None:
@@ -218,16 +233,8 @@ def regenerate_settings(state: CliState) -> None:
 
 
 def settings_drift(root: Path) -> set[str]:
-    settings = [p for name in ("settings.json", "settings.local.json") if (p := root / ".claude" / name).exists()]
-    if not settings:
-        return set()
-    wired = {
-        event
-        for path in settings
-        for event, groups in (json.loads(path.read_text()).get("hooks") or {}).items()
-        if any(is_captain_hook_group(g) for g in groups)
-    }
-    return subscribed_events() - wired
+    paths = [p for name in ("settings.json", "settings.local.json") if (p := root / ".claude" / name).exists()]
+    return subscribed_events() - {event for p in paths for event in capt_hook_events(p)} if paths else set()
 
 
 def warn_settings_drift(

{capt_hook-3.3.0 → capt_hook-3.3.2}/captain_hook/review/cli.py

@@ -60,8 +60,10 @@ def ensure_review_wiring(settings_path: Path) -> bool:
     from captain_hook.cli import write_settings
 
     existing: dict[str, Any] = json.loads(settings_path.read_text()) if settings_path.exists() else {}
+    committed = settings_path.parent / "settings.json"
+    committed_hooks: dict[str, Any] = (json.loads(committed.read_text()).get("hooks") or {}) if committed.exists() else {}
     hooks: dict[str, Any] = existing.get("hooks") or {}
-    if review_wired(hooks):
+    if review_wired(hooks) or review_wired(committed_hooks):
         return False
     group = {"hooks": [{"type": "command", "command": f"uvx {REVIEW_RUN_COMMAND}"}]}
     write_settings(

{capt_hook-3.3.0 → capt_hook-3.3.2}/captain_hook/skills/bootstrapping-hooks/SKILL.md

@@ -29,7 +29,7 @@ Copy this checklist into your response and check off steps as you complete them:
 
 ```
 Bootstrap Progress:
-- [ ] Step 1: Locate + scaffold (init or review enable) + pre-flight
+- [ ] Step 1: Locate + scaffold (init) + pre-flight
 - [ ] Step 2: Survey the repo (docs, CI, lint configs, git log)
 - [ ] Step 3: Mine candidates onto the taxonomy
 - [ ] Step 4: Propose via AskUserQuestion — nothing written before approval
@@ -50,16 +50,12 @@ grep -lq 'capt-hook' .claude/settings.json 2>/dev/null && echo COMMITTED || echo
 ```
 
 Then scaffold up front, so the framework and the session reviewer are live before you propose
-anything — pick the command by what you found:
-
-- **FRESH** (no committed capt-hook wiring) — run `uvx capt-hook init`. It scaffolds
-  `.claude/hooks/`, wires `.claude/settings.local.json`, installs the skills, and **enables the
-  session reviewer** (watching this repo; it mines ended sessions and opens hook PRs —
-  `uvx capt-hook review disable` to stop).
-- **COMMITTED** (a checked-in `.claude/settings.json` already runs `uvx capt-hook run …`) — do
-  **not** run `init`; it would duplicate those hooks into `settings.local.json` and double-fire.
-  Run `uvx capt-hook review enable` instead — it installs the reviewer skills and arms the session
-  reviewer without touching the committed event hooks.
+anything. Run `uvx capt-hook init` in every repo. It scaffolds `.claude/hooks/`,
+wires `.claude/settings.local.json`, installs the skills, and **enables the session reviewer**
+(watching this repo; it mines ended sessions and opens hook PRs — `uvx capt-hook review disable`
+to stop). In a **COMMITTED** repo (a checked-in `.claude/settings.json` already runs
+`uvx capt-hook run …`), `init` defers those events to the committed file instead of re-wiring
+them locally. It prints `deferred to settings.json: …` and never double-fires.
 
 Read `.claude/settings.local.json` and `.claude/settings.json`. If capt-hook hooks already exist,
 switch to **additive mode**: never overwrite existing hook files; new categories go in new files,
@@ -115,8 +111,9 @@ into enforced style rules (runs the translating-styleguides skill)"**.
 ### 5. Clear the demo example.py
 
 Scaffolding already ran in Step 1. If that `init` created the demo `.claude/hooks/example.py`,
-delete it once you've drafted the real hooks (Step 6) — the approved hooks replace it. (In
-**COMMITTED** repos `review enable` writes no `example.py`, so there's nothing to clear.)
+delete it once you've drafted the real hooks (Step 6) — the approved hooks replace it. (In a repo
+that already had its own `.claude/hooks/`, `init` leaves those files untouched and only adds
+`example.py` if it was absent; clear it the same way.)
 
 ### 6. Write hooks
 

{capt_hook-3.3.0 → capt_hook-3.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "capt-hook"
-version = "3.3.0"
+version = "3.3.2"
 description = "Declarative hook framework for Claude Code"
 readme = "README.md"
 license = "PolyForm-Noncommercial-1.0.0"