gitvow 0.2.0__tar.gz → 0.2.2__tar.gz

{gitvow-0.2.0/src/gitvow.egg-info → gitvow-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitvow
-Version: 0.2.0
+Version: 0.2.2
 Summary: Provenance and policy gate for AI-agent coding sessions: session trailers on commits, redacted session notes in git, a tool-call gate, and a local ledger. No runtime dependencies.
 Author-email: Nikhil Bora <nikhil@wirevow.com>
 License: Apache-2.0

{gitvow-0.2.0 → gitvow-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitvow"
-version = "0.2.0"
+version = "0.2.2"
 description = "Provenance and policy gate for AI-agent coding sessions: session trailers on commits, redacted session notes in git, a tool-call gate, and a local ledger. No runtime dependencies."
 readme = "README.md"
 license = {text = "Apache-2.0"}

gitvow-0.2.2/src/gitvow/__main__.py

@@ -0,0 +1,7 @@
+"""Allow `python -m gitvow`."""
+
+import sys
+
+from .cli import main
+
+sys.exit(main())

{gitvow-0.2.0 → gitvow-0.2.2}/src/gitvow/hooks/__init__.py

@@ -75,6 +75,7 @@ def pre_tool_use(h: dict[str, Any], home: str | None = None) -> tuple[int, str]:
         st["session_id"] = h.get("session_id") or st.get("session_id")
         st["transcript_path"] = h.get("transcript_path") or st.get("transcript_path")
         st["steps"] = st.get("steps", 0) + 1
+        st["pending_commit"] = time.time()  # the git hook adds trailers only while this is fresh
         save_state(cwd, st)
     if rules is None:
         log_event(cwd, "allowed", {"tool": tool})
@@ -162,14 +163,20 @@ def post_tool_use(h: dict[str, Any], home: str | None = None) -> tuple[int, str]
         return 0, ""
     if tool != "Bash" or not COMMIT_RE.search(inp.get("command", "")):
         return 0, ""
+    st = load_state(cwd)
+    if "pending_commit" in st:
+        del st["pending_commit"]
+        save_state(cwd, st)
     rc, head, _ = git(["rev-parse", "HEAD"], cwd)
     if rc != 0:
         return 0, ""
     rules, warn = _rules_or_none(cwd, home)
     if rules is None:
         return 0, warn
-    st = load_state(cwd)
     summ = summarize(h.get("transcript_path") or st.get("transcript_path"), rules=rules)
+    _, head_msg, _ = git(["log", "-1", "--format=%B", head], cwd)
+    if "Gitvow-Session:" not in head_msg:
+        return 0, ""  # the commit did not go through (or was not the agent's): no note
     _, files, _ = git(["show", "--stat", "--format=", head], cwd)
     attribution = _attribution(cwd, head, st.get("agent_blobs", {}), summ["files_written"])
     session_id = h.get("session_id") or st.get("session_id")

{gitvow-0.2.0 → gitvow-0.2.2}/src/gitvow/install.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import json
 import os
 import shutil
+import sys
 from typing import Any
 
 from .state import git
@@ -13,7 +14,9 @@ GIT_HOOK = """#!/bin/sh
 # gitvow: append session trailers when a session is active in this repo; chain to the repo's own hook if present.
 GD="$(git rev-parse --git-dir)"; STATE="$GD/gitvow-session.json"
 if [ -f "$STATE" ]; then
-  SID=$(python3 -c "import json;print(json.load(open('$STATE')).get('session_id') or '')" 2>/dev/null)
+  # Trailers go only on commits the agent itself runs: the PreToolUse gate sets pending_commit when the
+  # agent invokes git commit and PostToolUse clears it. A human commit in a terminal gets no trailer.
+  SID=$(python3 -c "import json,time;s=json.load(open('$STATE'));p=s.get('pending_commit') or 0;print(s.get('session_id') or '' if time.time()-p<300 else '')" 2>/dev/null)
   STEP=$(python3 -c "import json;print(json.load(open('$STATE')).get('steps') or 0)" 2>/dev/null)
   if [ -n "$SID" ] && ! grep -q "^Gitvow-Session:" "$1"; then printf "\\nGitvow-Session: %s\\nGitvow-Step: %s\\n" "$SID" "$STEP" >> "$1"; fi
 fi
@@ -38,6 +41,21 @@ def _unset_notes_config(cwd: str, scope: list[str]) -> None:
         git(["config", *scope, "--unset", key, "^" + NOTES_GLOB.replace("*", "\\*").replace(".", "\\.") + "$"], cwd)
 
 
+def executable_command() -> str:
+    """The command Claude Code should run for this install of gitvow.
+
+    Hooks run in a shell that may not have a virtualenv or pipx path activated, and a hook that
+    cannot be found exits non-zero without blocking, which would silently switch the gate off.
+    A per-user install therefore records the absolute path of the console script when one exists,
+    falling back to `<python> -m gitvow`; per-repo installs keep the bare name because the settings
+    file is shared by people with different paths.
+    """
+    exe = shutil.which("gitvow", path=os.path.dirname(sys.executable)) or shutil.which("gitvow")
+    if exe:
+        return exe
+    return f"{sys.executable} -m gitvow"
+
+
 def _hook_entries(cmd_prefix: str) -> dict[str, list[dict[str, Any]]]:
     def entry(event: str, matcher: str | None) -> dict[str, Any]:
         e: dict[str, Any] = {"hooks": [{"type": "command", "command": f"{cmd_prefix} hook {event}"}]}
@@ -95,10 +113,11 @@ def _write_git_hook(dirpath: str) -> str:
     return p
 
 
-def install_user(home: str, cmd_prefix: str = "gitvow") -> list[str]:
+def install_user(home: str, cmd_prefix: str | None = None) -> list[str]:
     base = os.path.join(home, ".gitvow")
     os.makedirs(base, exist_ok=True)
-    done = []
+    cmd_prefix = cmd_prefix or executable_command()
+    done = [f"hook command → {cmd_prefix}"]
     pol = os.path.join(base, "policy.json")
     if not os.path.exists(pol):
         from .policy import DEFAULT_POLICY_PATH

{gitvow-0.2.0 → gitvow-0.2.2/src/gitvow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitvow
-Version: 0.2.0
+Version: 0.2.2
 Summary: Provenance and policy gate for AI-agent coding sessions: session trailers on commits, redacted session notes in git, a tool-call gate, and a local ledger. No runtime dependencies.
 Author-email: Nikhil Bora <nikhil@wirevow.com>
 License: Apache-2.0

{gitvow-0.2.0 → gitvow-0.2.2}/src/gitvow.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 src/gitvow/__init__.py
+src/gitvow/__main__.py
 src/gitvow/cli.py
 src/gitvow/collect.py
 src/gitvow/default_policy.json

{gitvow-0.2.0 → gitvow-0.2.2}/tests/test_hooks.py

@@ -1,5 +1,6 @@
 import json
 import os
+import time
 
 from gitvow.hooks import post_tool_use, pre_tool_use, session_start, stop
 from gitvow.install import _write_git_hook
@@ -51,12 +52,32 @@ def test_commit_flow_trailer_note_and_attribution(repo, home, payload, transcrip
     assert att["files"][0]["agent_wrote"] is True and "agent_blob" not in att["files"][0]
 
 
-def test_human_commit_has_no_trailer(repo, home):
+def test_human_commit_has_no_trailer(repo, home, payload):
     _write_git_hook(str(repo / ".gitvow" / "git-hooks"))
     git(repo, "config", "core.hooksPath", ".gitvow/git-hooks")
     (repo / "a.txt").write_text("h\n")
-    git(repo, "commit", "-qam", "human")
+    git(repo, "commit", "-qam", "human, no session at all")
     assert "Gitvow-Session" not in git(repo, "log", "-1", "--format=%B")
+    session_start(payload("SessionStart"), str(home))  # session active, but the agent did not run git commit
+    (repo / "a.txt").write_text("h2\n")
+    git(repo, "commit", "-qam", "human, alongside a live session")
+    assert "Gitvow-Session" not in git(repo, "log", "-1", "--format=%B")
+    st = json.loads((repo / ".git" / "gitvow-session.json").read_text())
+    st["pending_commit"] = 1  # a stale flag from long ago
+    (repo / ".git" / "gitvow-session.json").write_text(json.dumps(st))
+    (repo / "a.txt").write_text("h3\n")
+    git(repo, "commit", "-qam", "human, stale flag")
+    assert "Gitvow-Session" not in git(repo, "log", "-1", "--format=%B")
+
+
+def test_pending_flag_is_cleared_after_note_and_no_note_without_trailer(repo, home, payload):
+    session_start(payload("SessionStart"), str(home))
+    pre_tool_use(payload("PreToolUse", "Bash", {"command": "git commit -m x"}), str(home))
+    assert "pending_commit" in json.loads((repo / ".git" / "gitvow-session.json").read_text())
+    # the agent's commit failed (nothing to commit); PostToolUse still runs
+    code, msg = post_tool_use(payload("PostToolUse", "Bash", {"command": "git commit -m x"}), str(home))
+    assert (code, msg) == (0, "") and git(repo, "for-each-ref", "refs/notes/") == ""
+    assert "pending_commit" not in json.loads((repo / ".git" / "gitvow-session.json").read_text())
 
 
 def test_git_hook_chains_to_repo_hook(repo, home):
@@ -65,7 +86,9 @@ def test_git_hook_chains_to_repo_hook(repo, home):
     local = repo / ".git" / "hooks" / "prepare-commit-msg"
     local.write_text('#!/bin/sh\necho LOCAL >> "$1"\n')
     os.chmod(local, 0o700)
-    (repo / ".git" / "gitvow-session.json").write_text(json.dumps({"session_id": "s", "steps": 2}))
+    (repo / ".git" / "gitvow-session.json").write_text(
+        json.dumps({"session_id": "s", "steps": 2, "pending_commit": time.time()})
+    )
     (repo / "a.txt").write_text("c\n")
     git(repo, "commit", "-qam", "chain")
     body = git(repo, "log", "-1", "--format=%B")

{gitvow-0.2.0 → gitvow-0.2.2}/tests/test_install_cli.py

@@ -139,3 +139,29 @@ def test_default_policy_confirms_edits_to_redaction_rules(monkeypatch, repo, cap
     monkeypatch.chdir(repo)
     assert cli.main(["check", "--path", ".gitvow/redact-rules.json"]) == 2
     assert cli.main(["check", "--path", ".gitvow/git-hooks/prepare-commit-msg"]) == 2
+
+
+def test_user_install_records_absolute_hook_command(home):
+    from gitvow.install import executable_command
+
+    install_user(str(home))
+    s = json.loads((home / ".claude" / "settings.json").read_text())
+    cmd = s["hooks"]["PreToolUse"][0]["hooks"][0]["command"]
+    assert cmd == f"{executable_command()} hook PreToolUse"
+    assert cmd.startswith("/") or " -m gitvow " in cmd  # never a bare name that depends on PATH
+    uninstall_user(str(home))
+    assert not (home / ".claude" / "settings.json").exists()  # marker still recognised with the absolute path
+
+
+def test_repo_install_keeps_bare_name(repo, home):
+    install_repo(str(repo))
+    s = json.loads((repo / ".claude" / "settings.json").read_text())
+    assert s["hooks"]["PreToolUse"][0]["hooks"][0]["command"] == "gitvow hook PreToolUse"
+
+
+def test_python_m_gitvow_entrypoint():
+    import subprocess
+    import sys
+
+    r = subprocess.run([sys.executable, "-m", "gitvow", "--version"], capture_output=True, text=True)
+    assert r.returncode == 0 and r.stdout.startswith("gitvow ")