gitvow 0.28.2__tar.gz → 0.28.4__tar.gz

{gitvow-0.28.2/src/gitvow.egg-info → gitvow-0.28.4}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitvow"
-version = "0.28.2"
+version = "0.28.4"
 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.28.2 → gitvow-0.28.4}/src/gitvow/default_policy.json

@@ -80,8 +80,7 @@
         "patch",
         "rollout",
         "set",
-        "scale",
-        "exec"
+        "scale"
       ],
       "target": "(?i)prod|live",
       "reason": "cluster mutation in production"
@@ -95,12 +94,33 @@
         "patch",
         "rollout",
         "set",
-        "scale",
-        "exec"
+        "scale"
       ],
       "reason": "cluster mutation",
       "when": "observe"
     },
+    {
+      "program": "kubectl",
+      "verbs": [
+        "exec",
+        "port-forward",
+        "cp",
+        "debug"
+      ],
+      "target": "(?i)prod|live",
+      "reason": "exec into a production workload"
+    },
+    {
+      "program": "kubectl",
+      "verbs": [
+        "exec",
+        "port-forward",
+        "cp",
+        "debug"
+      ],
+      "reason": "exec into a cluster workload",
+      "when": "observe"
+    },
     {
       "program": "helm",
       "verbs": [

{gitvow-0.28.2 → gitvow-0.28.4}/src/gitvow/hooks/__init__.py

@@ -186,17 +186,22 @@ def pre_tool_use(h: dict[str, Any], home: str | None = None) -> tuple[int, str]:
         f = dict(d.findings[0], immediate=True)
         text = redact(f["finding"], rules) if rules is not None else f["finding"]
         prior = dec.session_answer(cwd, text)
-        if session_scope and prior and prior.get("answer") == "accepted" and prior.get("scope") == "session":
-            log_event(cwd, "allowed_by_session_answer", {**payload, "by": prior.get("by")})
-            return 0, ""
-        if prior and prior.get("answer") == "declined":
+        answered = bool(
+            session_scope and prior and prior.get("answer") == "accepted" and prior.get("scope") == "session"
+        )
+        if answered:
+            log_event(cwd, "allowed_by_session_answer", {**payload, "by": prior.get("by")})  # type: ignore[union-attr]
+            # Do not return yet: the same command may also commit (`git commit && git push`), and until 0.28.4 the
+            # early return here skipped the commit bookkeeping below, so the commit lost its session trailer.
+        elif prior and prior.get("answer") == "declined":
             log_event(cwd, "confirm_required", {**payload, "declined_by": prior.get("by")})
             return 2, f"BLOCKED: {text} was declined by {prior.get('by')} this session ({d.reason})."
-        st = load_state(cwd)
-        dec.add(cwd, [f], st.get("steps", 0) + 1, tool, rules)
-        n = next((x["n"] for x in dec.open_findings(cwd) if x["finding"] == text), None)
-        log_event(cwd, "confirm_required", {**payload, "finding": n})
-        return 2, confirm_message(d, n, session_scope)
+        if not answered:
+            st = load_state(cwd)
+            dec.add(cwd, [f], st.get("steps", 0) + 1, tool, rules)
+            n = next((x["n"] for x in dec.open_findings(cwd) if x["finding"] == text), None)
+            log_event(cwd, "confirm_required", {**payload, "finding": n})
+            return 2, confirm_message(d, n, session_scope)
     if d.deferred or d.observed:
         st = load_state(cwd)
         new = dec.add(cwd, list(d.findings), st.get("steps", 0) + 1, tool, rules)

{gitvow-0.28.2 → gitvow-0.28.4}/src/gitvow/install.py

@@ -510,17 +510,70 @@ def _write_git_hook(dirpath: str, root: str | None = None) -> str:
     return os.path.join(dirpath, "prepare-commit-msg")
 
 
+def _default_policy_text() -> str:
+    from .policy import DEFAULT_POLICY_PATH
+
+    with open(DEFAULT_POLICY_PATH) as fh:
+        return fh.read()
+
+
+def _body_digest(data: dict[str, Any]) -> str:
+    """Digest of a policy's content with the marker removed, in the form the copy is written in."""
+    import hashlib
+
+    body = {k: v for k, v in data.items() if k != "_from_default"}
+    return hashlib.sha256((json.dumps(body, indent=2) + "\n").encode()).hexdigest()
+
+
+def stamp_default(text: str) -> str:
+    """The default policy as a copy that knows it is one: `_from_default` is the digest of its own body, so a
+    later install can tell an untouched copy (body digest still equals the marker) from one a person edited."""
+    data = json.loads(text)
+    data["_from_default"] = _body_digest(data)
+    return json.dumps(data, indent=2) + "\n"
+
+
+def place_policy(pol_path: str, root: str | None = None) -> str | None:
+    """Copy the default policy to `pol_path` when absent, or refresh it when it is an untouched copy of an older
+    default. A policy a person edited, or one copied before the marker existed, is never touched.
+
+    Until 0.28.3 the default was copied once and never again, so a repository kept the rules of the version it
+    was installed with: the `git -C … push` fix, the targets and the indirect tier never reached the founder's
+    own repositories, and the stale pattern rule stopped an MCP verification that merely mentioned a push.
+    """
+    text = _default_policy_text()
+    stamped = stamp_default(text)
+    if not os.path.exists(pol_path):
+        write_if_changed(check_target(pol_path, root), stamped)
+        return f"default policy → {pol_path}"
+    try:
+        with open(pol_path) as fh:
+            cur = json.load(fh)
+    except (OSError, json.JSONDecodeError):
+        return None
+    mark = cur.get("_from_default")
+    if mark is None:
+        return (
+            f"policy left as is: {pol_path} predates the marker or was written by hand (compare with `gitvow policy`)"
+        )
+    if mark != _body_digest(cur):
+        return f"policy left as is: {pol_path} was edited after it was copied"
+    with open(pol_path) as fh:
+        if stamped == fh.read():
+            return None
+    write_if_changed(check_target(pol_path, root), stamped)
+    return f"policy refreshed to the current default → {pol_path} (an untouched copy of an older one)"
+
+
 def install_user(home: str, cmd_prefix: str | None = None, agent: str = "claude") -> list[str]:
     base = os.path.join(home, ".gitvow")
     os.makedirs(base, exist_ok=True)
     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
-
-        shutil.copy(DEFAULT_POLICY_PATH, pol)
-        done.append(f"default policy → {pol}")
+    placed = place_policy(pol)
+    if placed:
+        done.append(placed)
     _write_git_hook(os.path.join(base, "git-hooks"))
     ext = None if agent in AGENT_FILES else _external(agent)
     settings_rel = AGENT_FILES[agent][0] if agent in AGENT_FILES else _external_files(ext[1])[0]  # type: ignore[index]
@@ -586,11 +639,8 @@ def _exclude_local_sinks(repo: str) -> None:
 def install_repo(repo: str, cmd_prefix: str = "gitvow", agent: str = "claude") -> list[str]:
     base = os.path.join(repo, ".gitvow")
     os.makedirs(base, exist_ok=True)
-    from .policy import DEFAULT_POLICY_PATH
-
     pol = os.path.join(base, "policy.json")
-    if not os.path.exists(pol):
-        shutil.copy(DEFAULT_POLICY_PATH, pol)
+    placed = place_policy(pol, root=repo)
     _write_git_hook(os.path.join(base, "git-hooks"), root=repo)
     ext = None if agent in AGENT_FILES else _external(agent)
     repo_rel = AGENT_FILES[agent][1] if agent in AGENT_FILES else _external_files(ext[1])[1]  # type: ignore[index]
@@ -604,7 +654,7 @@ def install_repo(repo: str, cmd_prefix: str = "gitvow", agent: str = "claude") -
     _set_notes_config(repo, [])
     _exclude_local_sinks(repo)
     return [
-        f"policy → {pol}",
+        placed or f"policy → {pol}",
         f"hooks merged into {repo_rel}",
         "core.hooksPath → .gitvow/git-hooks",
         f"notes.displayRef / notes.rewriteRef → {NOTES_GLOB}",

{gitvow-0.28.2 → gitvow-0.28.4/src/gitvow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitvow
-Version: 0.28.2
+Version: 0.28.4
 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.28.2 → gitvow-0.28.4}/src/gitvow.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ src/gitvow.egg-info/requires.txt
 src/gitvow.egg-info/top_level.txt
 src/gitvow/hooks/__init__.py
 tests/test_adapters.py
+tests/test_answered_confirm_commit.py
 tests/test_claims.py
 tests/test_collect.py
 tests/test_command_position.py
@@ -57,6 +58,7 @@ tests/test_install_cli.py
 tests/test_pack.py
 tests/test_packaging.py
 tests/test_policy.py
+tests/test_policy_refresh.py
 tests/test_proposals.py
 tests/test_providers.py
 tests/test_recall.py

gitvow-0.28.4/tests/test_answered_confirm_commit.py

@@ -0,0 +1,35 @@
+"""0.28.4: a command that both commits and runs a session-answered confirm still gets its commit bookkeeping.
+
+Found on the founder's machine: after a push to main had been accepted for the session, `git commit … && git push`
+in one command was allowed by the session answer and returned before the commit flag was set, so the commit carried
+no session trailer. Three of four repositories lost the trailer on the same evening the same way.
+"""
+
+import json
+
+from gitvow import decisions as dec
+from gitvow.hooks import pre_tool_use, session_start
+from gitvow.install import _write_git_hook
+from gitvow.policy import load_policy
+from tests.conftest import git
+
+
+def test_session_answered_push_in_the_same_command_as_a_commit_keeps_the_trailer(repo, home, payload):
+    _write_git_hook(str(repo / ".gitvow" / "git-hooks"))
+    git(repo, "config", "core.hooksPath", ".gitvow/git-hooks")
+    git(repo, "remote", "add", "origin", "git@example.com:acme/ledger.git")
+    session_start(payload("SessionStart"), str(home))
+    cmd = {"command": 'git commit -qm "x" && git push origin main'}
+    code, msg = pre_tool_use(payload("PreToolUse", "Bash", cmd), str(home))
+    assert code == 2 and "pushing to a protected branch" in msg
+    dec.decide(str(repo), "1", "accept", load_policy(str(repo), str(home)), scope="session", reason="ok", rules=[])
+    code, msg = pre_tool_use(payload("PreToolUse", "Bash", cmd), str(home))
+    assert code == 0
+    st = json.loads((repo / ".git" / "gitvow-session.json").read_text())
+    assert st.get("pending_commit") and st["steps"] == 1
+    (repo / "a.txt").write_text("y\n")
+    git(repo, "commit", "-qam", "after the answer")
+    body = git(repo, "log", "-1", "--format=%B")
+    assert "Gitvow-Session: sess-1" in body and "Gitvow-Accepted: run git (pushing to a protected branch)" in body
+    log = (repo / ".git" / "gitvow-hooks.log").read_text()
+    assert '"kind": "allowed_by_session_answer"' in log

gitvow-0.28.4/tests/test_policy_refresh.py

@@ -0,0 +1,58 @@
+"""0.28.3: an install refreshes an untouched copy of an older default policy, and leaves an edited one alone."""
+
+import json
+
+from gitvow.install import _body_digest, install_repo, place_policy, stamp_default
+from gitvow.policy import DEFAULT_POLICY_PATH
+
+
+def _default_text():
+    with open(DEFAULT_POLICY_PATH) as fh:
+        return fh.read()
+
+
+def test_fresh_copy_is_stamped_and_a_rerun_changes_nothing(repo):
+    p = repo / ".gitvow" / "policy.json"
+    msg = place_policy(str(p), str(repo))
+    assert msg.startswith("default policy")
+    data = json.loads(p.read_text())
+    assert data["_from_default"] == _body_digest(data)
+    before = p.read_text()
+    assert place_policy(str(p), str(repo)) is None and p.read_text() == before
+
+
+def test_untouched_copy_of_an_older_default_is_refreshed(repo):
+    p = repo / ".gitvow" / "policy.json"
+    p.parent.mkdir()
+    old = json.loads(_default_text())
+    old["bash_confirm"] = old["bash_confirm"][1:]  # an older default: one rule fewer
+    old.pop("_doc_commit_window", None)
+    p.write_text(stamp_default(json.dumps(old)))
+    msg = place_policy(str(p), str(repo))
+    assert msg and "refreshed" in msg
+    now = json.loads(p.read_text())
+    assert len(now["bash_confirm"]) == len(json.loads(_default_text())["bash_confirm"])
+    assert now["_from_default"] == _body_digest(now)
+
+
+def test_edited_copy_and_legacy_copy_are_left_alone(repo):
+    p = repo / ".gitvow" / "policy.json"
+    p.parent.mkdir()
+    edited = json.loads(stamp_default(_default_text()))
+    edited["bash_deny"].append({"pattern": "\\bmy-tool\\s+wipe\\b", "reason": "our own rule"})
+    p.write_text(json.dumps(edited, indent=2) + "\n")
+    msg = place_policy(str(p), str(repo))
+    assert msg and "edited after it was copied" in msg
+    assert any(r.get("reason") == "our own rule" for r in json.loads(p.read_text())["bash_deny"])
+    legacy = json.loads(_default_text())  # a copy from before the marker existed
+    p.write_text(json.dumps(legacy, indent=2) + "\n")
+    msg = place_policy(str(p), str(repo))
+    assert msg and "predates the marker" in msg
+    assert "_from_default" not in json.loads(p.read_text())
+
+
+def test_install_repo_reports_the_policy_outcome(repo, home):
+    lines = install_repo(str(repo))
+    assert any(ln.startswith("default policy") for ln in lines)
+    lines = install_repo(str(repo))
+    assert any(ln.startswith("policy → ") for ln in lines)