gitvow 0.2.1__tar.gz → 0.2.3__tar.gz

{gitvow-0.2.1/src/gitvow.egg-info → gitvow-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitvow
-Version: 0.2.1
+Version: 0.2.3
 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.1 → gitvow-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitvow"
-version = "0.2.1"
+version = "0.2.3"
 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.1 → gitvow-0.2.3}/src/gitvow/hooks/__init__.py

@@ -29,15 +29,17 @@ def notes_ref(session_id: str | None) -> str:
 def session_start(h: dict[str, Any], home: str | None = None) -> tuple[int, str]:
     cwd = h.get("cwd") or os.getcwd()
     st = load_state(cwd)
+    same_session = st.get("session_id") == h.get("session_id")  # a resumed session keeps its counters
     st.update(
         {
             "session_id": h.get("session_id"),
             "transcript_path": h.get("transcript_path"),
-            "started": time.strftime("%Y-%m-%dT%H:%M:%S"),
-            "steps": st.get("steps", 0),
-            "agent_blobs": st.get("agent_blobs", {}) if st.get("session_id") == h.get("session_id") else {},
+            "started": st.get("started") if same_session and st.get("started") else time.strftime("%Y-%m-%dT%H:%M:%S"),
+            "steps": st.get("steps", 0) if same_session else 0,
+            "agent_blobs": st.get("agent_blobs", {}) if same_session else {},
         }
     )
+    st.pop("pending_commit", None)
     save_state(cwd, st)
     log_event(cwd, "session_start", {"session_id": h.get("session_id")})
     return 0, ""
@@ -75,6 +77,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 +165,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.1 → gitvow-0.2.3}/src/gitvow/install.py

@@ -14,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

{gitvow-0.2.1 → gitvow-0.2.3/src/gitvow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitvow
-Version: 0.2.1
+Version: 0.2.3
 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.1 → gitvow-0.2.3}/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")
@@ -193,3 +216,20 @@ def test_invalid_rules_fail_closed_nothing_written(repo, home, payload, transcri
     log = (repo / ".git" / "gitvow-hooks.log").read_text()
     assert '"kind": "redaction_unavailable"' in log
     assert "detail" not in [k for ln in log.splitlines() for k in json.loads(ln) if json.loads(ln)["kind"] == "allowed"]
+
+
+def test_new_session_resets_steps_and_blobs_but_resume_keeps_them(repo, home, payload):
+    session_start(payload("SessionStart"), str(home))
+    pre_tool_use(payload("PreToolUse", "Bash", {"command": "git commit -m x"}), str(home))
+    (repo / "a.txt").write_text("b\n")
+    post_tool_use(payload("PostToolUse", "Edit", {"file_path": "a.txt"}), str(home))
+    st = json.loads((repo / ".git" / "gitvow-session.json").read_text())
+    assert st["steps"] == 1 and st["agent_blobs"] and "pending_commit" in st
+    session_start(payload("SessionStart"), str(home))  # same id: resume
+    st = json.loads((repo / ".git" / "gitvow-session.json").read_text())
+    assert st["steps"] == 1 and st["agent_blobs"] and "pending_commit" not in st
+    p = payload("SessionStart")
+    p["session_id"] = "sess-2"
+    session_start(p, str(home))  # a new session in the same repo starts from zero
+    st = json.loads((repo / ".git" / "gitvow-session.json").read_text())
+    assert st["session_id"] == "sess-2" and st["steps"] == 0 and st["agent_blobs"] == {}