gitvow 0.12.2__tar.gz → 0.12.3__tar.gz

{gitvow-0.12.2/src/gitvow.egg-info → gitvow-0.12.3}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitvow"
-version = "0.12.2"
+version = "0.12.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.12.2 → gitvow-0.12.3}/src/gitvow/transcript.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import json
 import os
+import re
 from collections.abc import Iterable
 from typing import Any
 
@@ -40,8 +41,6 @@ def _text_of(content: Any) -> str:
 
 
 def _patch_files(text: str) -> list[str]:
-    import re
-
     return re.findall(r"^\*\*\* (?:Update|Add|Delete) File: (.+)$", text or "", re.M)
 
 
@@ -167,13 +166,50 @@ def _finish_usage(usage: dict[str, Any]) -> None:
     )
 
 
-def _is_person_text(content: Any) -> bool:
-    """A user message typed by a person, not a tool_result the harness sent back."""
+INJECTED_RE = re.compile(r"^\s*<[a-z_]+>")  # Codex prepends <recommended_plugins>, <environment_context> and the like
+PERSON_TEXT = ("text", "input_text")
+
+
+def _person_text(content: Any) -> str:
     if isinstance(content, str):
-        return bool(content.strip())
+        return content
     if isinstance(content, list):
-        return any(isinstance(c, dict) and c.get("type") == "text" and str(c.get("text", "")).strip() for c in content)
-    return False
+        return "\n".join(
+            str(c.get("text", ""))
+            for c in content
+            if isinstance(c, dict) and c.get("type") in PERSON_TEXT and str(c.get("text", "")).strip()
+        )
+    return ""
+
+
+def _is_person_text(content: Any) -> bool:
+    """A user message typed by a person: not a tool result, and not a block the harness injected."""
+    text = _person_text(content).strip()
+    return bool(text) and not INJECTED_RE.match(text)
+
+
+TOOLS_CALL_RE = re.compile(r"tools\.([A-Za-z_][A-Za-z0-9_]*)\s*\(")
+
+
+def _codex_unwrap(text: str) -> list[tuple[str, Any]]:
+    """Codex 0.15 wraps every tool call in a JavaScript snippet: `await tools.exec_command({...})`.
+
+    Returns (function name, decoded argument) pairs; the argument is whatever JSON follows the bracket.
+    """
+    out: list[tuple[str, Any]] = []
+    dec = json.JSONDecoder()
+    for m in TOOLS_CALL_RE.finditer(text or ""):
+        i = m.end()
+        while i < len(text) and text[i] in " \t\n\r":
+            i += 1
+        arg: Any = ""
+        if i < len(text) and text[i] in '{"[':
+            try:
+                arg, _ = dec.raw_decode(text, i)
+            except ValueError:
+                arg = ""
+        out.append((m.group(1), arg))
+    return out
 
 
 def _add_tool(out: dict[str, Any], tool: str, brief: str, rules: list[tuple[str, str]], max_tools: int) -> None:
@@ -256,9 +292,11 @@ def _codex_event(
         elif pt in ("function_call", "custom_tool_call", "local_shell_call"):
             name = str(p.get("name") or ("local_shell" if pt == "local_shell_call" else ""))
             arguments = p.get("arguments") if pt == "function_call" else (p.get("input") or p.get("action") or "")
-            tool, brief, files = _codex_tool(name, arguments)
-            _add_tool(out, tool, brief, rules, max_tools)
-            written.update(files)
+            inner = _codex_unwrap(arguments) if isinstance(arguments, str) and "tools." in arguments else []
+            for fn, arg in inner or [(name, arguments)]:
+                tool, brief, files = _codex_tool(fn, arg)
+                _add_tool(out, tool, brief, rules, max_tools)
+                written.update(files)
     elif t == "turn_context":
         if p.get("model"):
             out["_codex_model"] = str(p["model"])

{gitvow-0.12.2 → gitvow-0.12.3/src/gitvow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitvow
-Version: 0.12.2
+Version: 0.12.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.12.2 → gitvow-0.12.3}/tests/test_transcript_formats.py

@@ -126,3 +126,62 @@ def test_claude_format_still_default(transcript):
 def test_redaction_applies_to_all_formats(tmp_path):
     s = summarize(_write(tmp_path, "rollout.jsonl", CODEX[:4]))
     assert "[github-token]" in s["last_assistant_text"] and "ghp_" not in s["last_assistant_text"]
+
+
+# Codex 0.15 shape, captured from a real session: one `exec` custom tool whose input is a JavaScript
+# snippet calling tools.exec_command / tools.apply_patch, and user text as input_text parts.
+CODEX_WRAPPED = [
+    {"timestamp": "t", "type": "session_meta", "payload": {"id": "c2", "cwd": "/r"}},
+    {
+        "timestamp": "t",
+        "type": "response_item",
+        "payload": {
+            "type": "message",
+            "role": "user",
+            "content": [{"type": "input_text", "text": "<recommended_plugins>\nAirtable\n</recommended_plugins>"}],
+        },
+    },
+    {
+        "timestamp": "t",
+        "type": "response_item",
+        "payload": {"type": "message", "role": "user", "content": [{"type": "input_text", "text": "fix add"}]},
+    },
+    {
+        "timestamp": "t",
+        "type": "response_item",
+        "payload": {
+            "type": "custom_tool_call",
+            "name": "exec",
+            "input": 'const r = await tools.exec_command({"cmd":"git status","workdir":"/r"});\nconsole.log(r);',
+        },
+    },
+    {
+        "timestamp": "t",
+        "type": "response_item",
+        "payload": {
+            "type": "custom_tool_call",
+            "name": "exec",
+            "input": 'await tools.apply_patch("*** Begin Patch\\n*** Update File: /r/calc.py\\n+a + b\\n*** End Patch\\n");',
+        },
+    },
+    {
+        "timestamp": "t",
+        "type": "response_item",
+        "payload": {"type": "message", "role": "assistant", "content": [{"type": "output_text", "text": "Fixed."}]},
+    },
+    {
+        "timestamp": "t",
+        "type": "response_item",
+        "payload": {"type": "message", "role": "user", "content": [{"type": "input_text", "text": "accept it"}]},
+    },
+]
+
+
+def test_codex_wrapped_tool_calls_and_user_turns(tmp_path):
+    s = summarize(_write(tmp_path, "rollout.jsonl", CODEX_WRAPPED))
+    assert s["format"] == "codex"
+    assert [t["tool"] for t in s["tool_calls"]] == ["Bash", "Edit"]
+    assert s["tool_calls"][0]["arg"] == "git status" and s["tool_calls"][1]["arg"] == "/r/calc.py"
+    assert s["files_written"] == ["/r/calc.py"]
+    # the injected <recommended_plugins> block is not a person speaking; the two real prompts are
+    assert s["user_turns"] == 2