conduct-cli 0.4.9__tar.gz → 0.4.11__tar.gz

{conduct_cli-0.4.9 → conduct_cli-0.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.9
+Version: 0.4.11
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT

{conduct_cli-0.4.9 → conduct_cli-0.4.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conduct-cli"
-version = "0.4.9"
+version = "0.4.11"
 description = "CLI for Conduct AI — install agents, manage projects, run tests"
 readme = "README.md"
 license = { text = "MIT" }

{conduct_cli-0.4.9 → conduct_cli-0.4.11}/src/conduct_cli/guard.py

@@ -198,25 +198,84 @@ def _post_usage(session_id, tool_name, tokens_input, tokens_output, duration_ms)
     )
 
 
+def _read_tokens_from_transcript(transcript_path, tool_use_id):
+    """Read token counts from Claude Code transcript (matched by tool_use_id)."""
+    try:
+        path = Path(transcript_path)
+        if not path.exists() or not tool_use_id:
+            return 0, 0
+        lines = path.read_text(encoding="utf-8", errors="ignore").splitlines()
+        for line in reversed(lines):
+            if not line.strip() or "tool_use" not in line:
+                continue
+            try:
+                entry = json.loads(line)
+            except Exception:
+                continue
+            msg = entry.get("message") or {}
+            usage = msg.get("usage")
+            if not usage:
+                continue
+            content = msg.get("content") or []
+            if any(
+                isinstance(b, dict) and b.get("type") == "tool_use" and b.get("id") == tool_use_id
+                for b in content
+            ):
+                total_in = (
+                    usage.get("input_tokens", 0)
+                    + usage.get("cache_creation_input_tokens", 0)
+                    + usage.get("cache_read_input_tokens", 0)
+                )
+                return total_in, usage.get("output_tokens", 0)
+    except Exception:
+        pass
+    return 0, 0
+
+
+def _read_codex_tokens():
+    """Read last_token_usage from the most recently modified Codex session file."""
+    try:
+        sessions_dir = Path.home() / ".codex" / "sessions"
+        if not sessions_dir.exists():
+            return 0, 0
+        files = sorted(sessions_dir.rglob("*.jsonl"), key=lambda p: p.stat().st_mtime, reverse=True)
+        if not files:
+            return 0, 0
+        lines = files[0].read_text(encoding="utf-8", errors="ignore").splitlines()
+        for line in reversed(lines):
+            if "token_count" not in line:
+                continue
+            try:
+                entry = json.loads(line)
+                if entry.get("type") == "event_msg":
+                    info = entry.get("payload", {}).get("info", {})
+                    usage = info.get("last_token_usage", {})
+                    if usage:
+                        total_in  = usage.get("input_tokens", 0)
+                        total_out = usage.get("output_tokens", 0) + usage.get("reasoning_output_tokens", 0)
+                        return total_in, total_out
+            except Exception:
+                continue
+    except Exception:
+        pass
+    return 0, 0
+
+
 def post_usage_main():
     """PostToolUse hook entrypoint — captures token usage and duration."""
     try:
         data = json.load(sys.stdin)
     except Exception:
         sys.exit(0)
-    # Write full payload to debug file so we can inspect what Claude Code sends
-    try:
-        debug_path = GUARD_DIR / "debug_post.json"
-        debug_path.write_text(json.dumps(data, indent=2))
-    except Exception:
-        pass
-    session_id = data.get("session_id")
-    tool_name  = (data.get("tool_name") or "").lower()
-    usage = data.get("usage") or {}
-    tokens_input  = usage.get("input_tokens", 0)
-    tokens_output = usage.get("output_tokens", 0)
-    duration_ms = data.get("duration_ms")
-    _post_usage(session_id, tool_name, tokens_input, tokens_output, duration_ms)
+    session_id      = data.get("session_id")
+    tool_name       = (data.get("tool_name") or "").lower()
+    tool_use_id     = data.get("tool_use_id")
+    transcript_path = data.get("transcript_path")
+    if transcript_path:
+        tokens_input, tokens_output = _read_tokens_from_transcript(transcript_path, tool_use_id)
+    else:
+        tokens_input, tokens_output = _read_codex_tokens()
+    _post_usage(session_id, tool_name, tokens_input, tokens_output, None)
     sys.exit(0)
 
 

{conduct_cli-0.4.9 → conduct_cli-0.4.11}/src/conduct_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.9
+Version: 0.4.11
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT