conduct-cli 0.4.14__tar.gz → 0.4.16__tar.gz

{conduct_cli-0.4.14 → conduct_cli-0.4.16}/PKG-INFO

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

{conduct_cli-0.4.14 → conduct_cli-0.4.16}/pyproject.toml

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

{conduct_cli-0.4.14 → conduct_cli-0.4.16}/src/conduct_cli/guard.py

@@ -55,11 +55,14 @@ def _fetch_budget_status():
         cfg = json.loads(CONFIG_PATH.read_text()) if CONFIG_PATH.exists() else {}
     except Exception:
         return False, None
-    workspace_id = cfg.get("workspace_id")
-    api_url      = cfg.get("api_url", "https://api.conductai.ai").rstrip("/")
+    workspace_id  = cfg.get("workspace_id")
+    clerk_user_id = cfg.get("clerk_user_id") or ""
+    api_url       = cfg.get("api_url", "https://api.conductai.ai").rstrip("/")
     if not workspace_id:
         return False, None
     url = f"{api_url}/guard/spend/budget-check?workspace_id={workspace_id}"
+    if clerk_user_id:
+        url += f"&clerk_user_id={clerk_user_id}"
     try:
         with urllib.request.urlopen(urllib.request.Request(url), timeout=5) as resp:
             data = json.loads(resp.read())
@@ -249,54 +252,111 @@ def _read_tokens_from_transcript(transcript_path, tool_use_id):
     return 0, 0
 
 
-def _read_codex_tokens_from_transcript(transcript_path):
-    """Read last_token_usage from a Codex session JSONL (event_msg/token_count entries)."""
+def _scan_codex_tokens(transcript_path):
+    """Robustly scan a Codex transcript for the last token_count event.
+
+    Reads in 512 KB chunks from the end so it handles arbitrarily large
+    tool-output lines without a fixed cutoff.
+    """
     try:
         path = Path(transcript_path)
         if not path.exists():
             return 0, 0
-        lines = _tail_lines(path)
-        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
+        size = path.stat().st_size
+        chunk_size = 524288  # 512 KB
+        buf = b""
+        pos = size
+        while pos >= 0:
+            read_size = min(chunk_size, pos)
+            pos -= read_size
+            with open(path, "rb") as f:
+                f.seek(pos)
+                buf = f.read(read_size) + buf
+            text = buf.decode("utf-8", errors="ignore")
+            # Split; if we haven't reached the start the first fragment may be partial
+            parts = text.split("\n")
+            start = 1 if pos > 0 else 0
+            for line in reversed(parts[start:]):
+                if "token_count" not in line or not line.strip():
+                    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
+            if pos == 0:
+                break
     except Exception:
         pass
     return 0, 0
 
 
-def post_usage_main():
-    """PostToolUse hook entrypoint — captures token usage and duration."""
+def post_codex_main():
+    """Delayed Codex token reader — spawned as background by post_usage_main.
+
+    Reads args from a pending JSON file, sleeps 2 s to let Codex flush the
+    token_count event, then scans the transcript and POSTs to the API.
+    """
+    import time
+    if len(sys.argv) < 3:
+        sys.exit(0)
+    pending_path = Path(sys.argv[2])
     try:
-        data = json.load(sys.stdin)
+        args = json.loads(pending_path.read_text())
+        pending_path.unlink(missing_ok=True)
     except Exception:
         sys.exit(0)
+    time.sleep(2)
+    transcript_path = args.get("transcript_path", "")
+    tokens_in, tokens_out = _scan_codex_tokens(transcript_path)
+    if tokens_in or tokens_out:
+        _post_usage(args.get("session_id"), args.get("tool_name"),
+                    tokens_in, tokens_out, None)
+    sys.exit(0)
+
+
+def post_usage_main():
+    """PostToolUse hook entrypoint — exits immediately; heavy work is async."""
     try:
-        (GUARD_DIR / "debug_post.json").write_text(json.dumps(data, indent=2))
+        data = json.load(sys.stdin)
     except Exception:
-        pass
+        sys.exit(0)
     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")
     is_codex = (tool_use_id or "").startswith("call_")
-    if transcript_path and is_codex:
-        tokens_input, tokens_output = _read_codex_tokens_from_transcript(transcript_path)
+
+    if is_codex and transcript_path:
+        # Write pending args; spawn delayed background reader so hook exits instantly
+        import uuid as _uuid
+        pending = GUARD_DIR / f"codex_pending_{_uuid.uuid4().hex[:8]}.json"
+        try:
+            pending.write_text(json.dumps({
+                "session_id": session_id,
+                "tool_name": tool_name,
+                "transcript_path": transcript_path,
+            }))
+            hook_path = Path(__file__).resolve()
+            subprocess.Popen(
+                [sys.executable, str(hook_path), "post-codex", str(pending)],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                start_new_session=True,
+            )
+        except Exception:
+            pass
     elif transcript_path:
         tokens_input, tokens_output = _read_tokens_from_transcript(transcript_path, tool_use_id)
-    else:
-        tokens_input, tokens_output = 0, 0
-    _post_usage(session_id, tool_name, tokens_input, tokens_output, None)
+        _post_usage(session_id, tool_name, tokens_input, tokens_output, None)
+
     sys.exit(0)
 
 
@@ -336,6 +396,8 @@ def main():
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "post":
         post_usage_main()
+    elif len(sys.argv) > 1 and sys.argv[1] == "post-codex":
+        post_codex_main()
     else:
         main()
 '''
@@ -607,16 +669,18 @@ def cmd_guard_install(args):
         print(f"  {GRAY}Guard not installed for this workspace — skipping{RESET}")
         return
 
-    member_token = result.get("member_token") or ""
-    user_email   = result.get("user_email") or ""
+    member_token   = result.get("member_token") or ""
+    user_email     = result.get("user_email") or ""
+    clerk_user_id  = result.get("clerk_user_id") or ""
 
     # Persist guard config — include api_key so CLI commands can authenticate
     _save_guard_config({
-        "workspace_id": workspace_id,
-        "member_token": member_token,
-        "user_email":   user_email,
-        "api_key":      api_key,
-        "api_url":      server,
+        "workspace_id":  workspace_id,
+        "member_token":  member_token,
+        "user_email":    user_email,
+        "clerk_user_id": clerk_user_id,
+        "api_key":       api_key,
+        "api_url":       server,
     })
 
     # Download policies
@@ -735,19 +799,22 @@ def cmd_guard_status(args):
     api_key      = cfg.get("api_key", "")
     base_url     = _api_url(cfg)
 
-    # Auto-refresh user_email into config if it was installed before this was wired up
-    if not user_email and api_key:
+    # Auto-refresh user_email + clerk_user_id into config if missing
+    if (not user_email or not cfg.get("clerk_user_id")) and api_key:
         try:
             installed = _req("GET", f"{base_url}/guard/config/installed", api_key=api_key)
             fetched_email = installed.get("user_email") or ""
+            fetched_clerk = installed.get("clerk_user_id") or ""
             if fetched_email:
                 cfg["user_email"] = fetched_email
-                _save_guard_config(cfg)
-                # Rewrite hook script so future events carry the email
-                hook_path = GUARD_DIR / "hook.py"
-                hook_path.write_text(_HOOK_SCRIPT)
-                hook_path.chmod(0o755)
                 user_email = fetched_email
+            if fetched_clerk:
+                cfg["clerk_user_id"] = fetched_clerk
+            _save_guard_config(cfg)
+            # Rewrite hook script so future events carry the email
+            hook_path = GUARD_DIR / "hook.py"
+            hook_path.write_text(_HOOK_SCRIPT)
+            hook_path.chmod(0o755)
         except Exception:
             pass
 

{conduct_cli-0.4.14 → conduct_cli-0.4.16}/src/conduct_cli.egg-info/PKG-INFO

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