conduct-cli 0.4.15__tar.gz → 0.4.17__tar.gz

{conduct_cli-0.4.15 → conduct_cli-0.4.17}/PKG-INFO

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

{conduct_cli-0.4.15 → conduct_cli-0.4.17}/pyproject.toml

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

{conduct_cli-0.4.15 → conduct_cli-0.4.17}/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())
@@ -399,6 +402,24 @@ if __name__ == "__main__":
         main()
 '''
 
+# ── Hook write helper ─────────────────────────────────────────────────────────
+
+def _write_hook(path: Path) -> None:
+    """Write _HOOK_SCRIPT to path, then py_compile-validate it.
+    Raises RuntimeError if the written file fails to compile — prevents
+    silently deploying a syntactically broken hook."""
+    import py_compile, tempfile, os
+    path.write_text(_HOOK_SCRIPT)
+    path.chmod(0o755)
+    try:
+        py_compile.compile(str(path), doraise=True)
+    except py_compile.PyCompileError as exc:
+        path.unlink(missing_ok=True)
+        raise RuntimeError(
+            f"hook.py failed syntax check after write — hook NOT installed.\n{exc}"
+        ) from exc
+
+
 # ── Guard config helpers ──────────────────────────────────────────────────────
 
 def _load_guard_config() -> dict:
@@ -666,16 +687,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
@@ -693,8 +716,7 @@ def cmd_guard_install(args):
 
     # Write hook script
     hook_path = GUARD_DIR / "hook.py"
-    hook_path.write_text(_HOOK_SCRIPT)
-    hook_path.chmod(0o755)
+    _write_hook(hook_path)
 
     # Install PreToolUse hooks — Claude Code + Codex (real interception)
     _install_claude_hook(hook_path)
@@ -743,8 +765,7 @@ def cmd_guard_join(args):
 
     # Write hook script
     hook_path = GUARD_DIR / "hook.py"
-    hook_path.write_text(_HOOK_SCRIPT)
-    hook_path.chmod(0o755)
+    _write_hook(hook_path)
     print(f"  {GREEN}Hook script written:{RESET} {hook_path}")
 
     # Install PreToolUse hook in ~/.claude/settings.json
@@ -776,8 +797,7 @@ def cmd_guard_sync(args):
 
     # Refresh hook script + re-register in all tools
     hook_path = GUARD_DIR / "hook.py"
-    hook_path.write_text(_HOOK_SCRIPT)
-    hook_path.chmod(0o755)
+    _write_hook(hook_path)
     _install_claude_hook(hook_path)
     _install_codex_hook(hook_path)
     cfg2 = _load_guard_config()
@@ -794,19 +814,21 @@ 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"
+            _write_hook(hook_path)
         except Exception:
             pass
 

{conduct_cli-0.4.15 → conduct_cli-0.4.17}/src/conduct_cli.egg-info/PKG-INFO

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