conduct-cli 0.4.5__tar.gz → 0.4.7__tar.gz

{conduct_cli-0.4.5 → conduct_cli-0.4.7}/PKG-INFO

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

{conduct_cli-0.4.5 → conduct_cli-0.4.7}/pyproject.toml

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

{conduct_cli-0.4.5 → conduct_cli-0.4.7}/src/conduct_cli/guard.py

@@ -125,7 +125,7 @@ def _detect_ai_tool():
     return "unknown"
 
 
-def _post_event(tool_name, tool_input, decision, rule_id=None, message=None, tool_use_id=None):
+def _post_event(tool_name, tool_input, decision, rule_id=None, message=None, session_id=None):
     try:
         cfg = json.loads(CONFIG_PATH.read_text()) if CONFIG_PATH.exists() else {}
     except Exception:
@@ -144,7 +144,7 @@ def _post_event(tool_name, tool_input, decision, rule_id=None, message=None, too
         "decision":      decision,
         "rule_id":       rule_id,
         "rule_message":  message,
-        "tool_use_id":   tool_use_id,
+        "session_id":    session_id,
     })
     api_url = cfg.get("api_url", "https://api.conductai.ai").rstrip("/")
     script = (
@@ -163,18 +163,19 @@ def _post_event(tool_name, tool_input, decision, rule_id=None, message=None, too
     )
 
 
-def _post_usage(tool_use_id, tokens_input, tokens_output, duration_ms, ai_tool):
+def _post_usage(session_id, tool_name, tokens_input, tokens_output, duration_ms):
     """Fire-and-forget POST to /guard/events/usage"""
     try:
         cfg = json.loads(CONFIG_PATH.read_text()) if CONFIG_PATH.exists() else {}
     except Exception:
         return
     workspace_id = cfg.get("workspace_id")
-    if not workspace_id or not tool_use_id:
+    if not workspace_id or not session_id:
         return
     payload = json.dumps({
         "workspace_id": workspace_id,
-        "tool_use_id": tool_use_id,
+        "session_id":   session_id,
+        "tool_name":    tool_name,
         "tokens_input": tokens_input,
         "tokens_output": tokens_output,
         "duration_ms": duration_ms,
@@ -203,12 +204,13 @@ def post_usage_main():
         data = json.load(sys.stdin)
     except Exception:
         sys.exit(0)
-    tool_use_id = data.get("tool_use_id")
+    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(tool_use_id, tokens_input, tokens_output, duration_ms, _detect_ai_tool())
+    _post_usage(session_id, tool_name, tokens_input, tokens_output, duration_ms)
     sys.exit(0)
 
 
@@ -226,15 +228,15 @@ def main():
         print(f"[ConductGuard] {reason or 'Budget hard cap reached. Contact your manager.'}")
         sys.exit(2)
 
+    session_id = data.get("session_id")
     tool_name  = (data.get("tool_name") or "").lower()
     tool_input = data.get("tool_input") or {}
-    tool_use_id = data.get("tool_use_id")
 
     _, action, rule_id, message = _check_policy(tool_name, tool_input)
 
     # Always post an event — "allowed" for normal calls, "blocked"/"warned" for violations
     decision = {"block": "blocked", "warn": "warned", "approval": "blocked"}.get(action, "allowed")
-    _post_event(tool_name, tool_input, decision, rule_id, message, tool_use_id=tool_use_id)
+    _post_event(tool_name, tool_input, decision, rule_id, message, session_id=session_id)
 
     if action == "block":
         print(f"[ConductGuard] {message}")
@@ -246,7 +248,10 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    if len(sys.argv) > 1 and sys.argv[1] == "post":
+        post_usage_main()
+    else:
+        main()
 '''
 
 # ── Guard config helpers ──────────────────────────────────────────────────────
@@ -343,16 +348,27 @@ def _install_codex_hook(hook_path: Path) -> None:
         pre.append({"matcher": ".*", "hooks": [{"type": "command", "command": pre_cmd}]})
         changed = True
 
-    # PostToolUse
-    post_cmd = "conductguard-post"
+    # PostToolUse — self-contained: python3 /path/hook.py post (no PATH dependency)
+    post_cmd = f"python3 {hook_path} post"
     post = hook_section.setdefault("PostToolUse", [])
+    # Remove stale conductguard-post entries registered by older CLI versions
+    stale = "conductguard-post"
+    cleaned = False
+    for h in post:
+        before = len(h.get("hooks", []))
+        h["hooks"] = [e for e in h.get("hooks", []) if e.get("command") != stale]
+        if len(h["hooks"]) < before:
+            cleaned = True
+    post[:] = [h for h in post if h.get("hooks")]
     post_already = any(
         e.get("command") == post_cmd
         for h in post
         for e in h.get("hooks", [])
     )
     if not post_already:
-        post.append({"matcher": "*", "hooks": [{"type": "command", "command": post_cmd}]})
+        post.append({"matcher": ".*", "hooks": [{"type": "command", "command": post_cmd}]})
+        changed = True
+    if cleaned:
         changed = True
 
     if changed:
@@ -360,7 +376,7 @@ def _install_codex_hook(hook_path: Path) -> None:
         codex_hooks.write_text(json.dumps(hooks, indent=2))
         if not pre_already:
             print(f"  {GREEN}Codex PreToolUse hook registered{RESET}")
-        if not post_already:
+        if not post_already or cleaned:
             print(f"  {GREEN}Codex PostToolUse hook registered{RESET}")
     else:
         print(f"  {GRAY}Codex hooks already registered{RESET}")
@@ -439,16 +455,27 @@ def _install_claude_hook(hook_path: Path) -> None:
         pre.append({"matcher": ".*", "hooks": [{"type": "command", "command": pre_cmd}]})
         changed = True
 
-    # PostToolUse — conductguard-post entrypoint
+    # PostToolUse — self-contained: python3 /path/hook.py post (no PATH dependency)
     post = hooks.setdefault("PostToolUse", [])
-    post_cmd = "conductguard-post"
+    post_cmd = f"python3 {hook_path} post"
+    # Remove stale conductguard-post entries registered by older CLI versions
+    stale = "conductguard-post"
+    cleaned = False
+    for h in post:
+        before = len(h.get("hooks", []))
+        h["hooks"] = [e for e in h.get("hooks", []) if e.get("command") != stale]
+        if len(h["hooks"]) < before:
+            cleaned = True
+    post[:] = [h for h in post if h.get("hooks")]
     post_already = any(
         e.get("command") == post_cmd
         for h in post
         for e in h.get("hooks", [])
     )
     if not post_already:
-        post.append({"matcher": "*", "hooks": [{"type": "command", "command": post_cmd}]})
+        post.append({"matcher": ".*", "hooks": [{"type": "command", "command": post_cmd}]})
+        changed = True
+    if cleaned:
         changed = True
 
     if changed:
@@ -456,7 +483,7 @@ def _install_claude_hook(hook_path: Path) -> None:
         claude_settings.write_text(json.dumps(settings, indent=2))
         if not pre_already:
             print(f"  {GREEN}Claude Code PreToolUse hook registered{RESET}")
-        if not post_already:
+        if not post_already or cleaned:
             print(f"  {GREEN}Claude Code PostToolUse hook registered{RESET}")
     else:
         print(f"  {GRAY}Claude Code hooks already registered{RESET}")

{conduct_cli-0.4.5 → conduct_cli-0.4.7}/src/conduct_cli.egg-info/PKG-INFO

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