conduct-cli 0.4.31__tar.gz → 0.4.33__tar.gz

{conduct_cli-0.4.31 → conduct_cli-0.4.33}/PKG-INFO

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

{conduct_cli-0.4.31 → conduct_cli-0.4.33}/pyproject.toml

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

{conduct_cli-0.4.31 → conduct_cli-0.4.33}/src/conduct_cli/guard.py

@@ -31,11 +31,44 @@ import time
 import urllib.request
 from pathlib import Path
 
-GUARD_DIR         = Path.home() / ".conductguard"
-POLICY_PATH       = GUARD_DIR / "policy.json"
-CONFIG_PATH       = GUARD_DIR / "config.json"
-BUDGET_CACHE_PATH = GUARD_DIR / "budget_cache.json"
-BUDGET_CACHE_TTL  = 300  # 5 minutes
+GUARD_DIR           = Path.home() / ".conductguard"
+POLICY_PATH         = GUARD_DIR / "policy.json"
+CONFIG_PATH         = GUARD_DIR / "config.json"
+BUDGET_CACHE_PATH   = GUARD_DIR / "budget_cache.json"
+BUDGET_CACHE_TTL    = 300  # 5 minutes
+VERSION_CACHE_PATH  = GUARD_DIR / "version_cache.json"
+VERSION_CACHE_TTL   = 60   # 1 minute — matches server poll window
+
+
+def _maybe_sync_policy():
+    """Check server policy version once per minute; re-download if stale. Never raises."""
+    try:
+        cfg = json.loads(CONFIG_PATH.read_text()) if CONFIG_PATH.exists() else {}
+        workspace_id = cfg.get("workspace_id")
+        api_key      = cfg.get("api_key", "")
+        api_url      = cfg.get("api_url", "https://api.conductai.ai").rstrip("/")
+        if not workspace_id:
+            return
+        # Check cache TTL
+        if VERSION_CACHE_PATH.exists():
+            cache = json.loads(VERSION_CACHE_PATH.read_text())
+            if time.time() - cache.get("ts", 0) < VERSION_CACHE_TTL:
+                return
+        # Fetch current version from server
+        url = f"{api_url}/guard/policies/sync?workspace_id={workspace_id}"
+        req = urllib.request.Request(url, headers={"Authorization": f"Bearer {api_key}"} if api_key else {})
+        with urllib.request.urlopen(req, timeout=2) as resp:
+            remote = json.loads(resp.read())
+        remote_version = remote.get("version", "")
+        # Compare to local
+        local_version = ""
+        if POLICY_PATH.exists():
+            local_version = json.loads(POLICY_PATH.read_text()).get("version", "")
+        if remote_version != local_version:
+            POLICY_PATH.write_text(json.dumps(remote, indent=2))
+        VERSION_CACHE_PATH.write_text(json.dumps({"ts": time.time(), "version": remote_version}))
+    except Exception:
+        pass  # Never block a tool call due to sync failure
 
 
 def _load_budget_cache():
@@ -366,6 +399,9 @@ def main():
     except Exception:
         sys.exit(0)
 
+    # Policy version check (cached 60s) — auto-syncs if server version differs
+    _maybe_sync_policy()
+
     # Hard budget cap (cached 5 min)
     hard_blocked, reason = _load_budget_cache()
     if hard_blocked is None:
@@ -934,15 +970,25 @@ def _report_tools_to_server() -> None:
         if not email:
             return
 
+        # Also pull conduct API key for X-Api-Key auth (member_token is not accepted by this endpoint)
+        conduct_cfg_path = Path.home() / ".conduct" / "config.json"
+        conduct_api_key = ""
+        if conduct_cfg_path.exists():
+            try:
+                conduct_api_key = json.loads(conduct_cfg_path.read_text()).get("api_key", "")
+            except Exception:
+                pass
+
         payload = json.dumps({"email": email, "tools": tools}).encode()
-        auth = token or api_key
+        headers = {"Content-Type": "application/json"}
+        if conduct_api_key and conduct_api_key.startswith("cond_live_"):
+            headers["X-Api-Key"] = conduct_api_key
+        elif token:
+            headers["Authorization"] = f"Bearer {token}"
         req = urllib.request.Request(
             f"{base_url}/guard/developer-tools",
             data=payload,
-            headers={
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {auth}",
-            },
+            headers=headers,
             method="POST",
         )
         urllib.request.urlopen(req, timeout=8)

{conduct_cli-0.4.31 → conduct_cli-0.4.33}/src/conduct_cli/main.py

@@ -218,7 +218,7 @@ def _write_codex_mcp_config() -> bool:
         content = config_path.read_text() if config_path.exists() else ""
         if "conduct-mcp" in content:
             return True
-        mcp_block = '\n[[mcp_servers]]\nname = "conduct"\ncommand = "conduct-mcp"\nargs = []\n'
+        mcp_block = '\n[mcp_servers.conduct]\ncommand = "conduct-mcp"\nargs = []\n'
         config_path.write_text(content + mcp_block)
         return True
     except Exception:
@@ -400,14 +400,15 @@ def _report_tool_coverage() -> None:
             return
 
         payload = json.dumps({"email": email, "tools": tools}).encode()
-        auth = token or api_key
+        headers = {"Content-Type": "application/json"}
+        if api_key and api_key.startswith("cond_live_"):
+            headers["X-Api-Key"] = api_key
+        elif token:
+            headers["Authorization"] = f"Bearer {token}"
         req = urllib.request.Request(
             f"{server}/guard/developer-tools",
             data=payload,
-            headers={
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {auth}",
-            },
+            headers=headers,
             method="POST",
         )
         urllib.request.urlopen(req, timeout=8)

{conduct_cli-0.4.31 → conduct_cli-0.4.33}/src/conduct_cli.egg-info/PKG-INFO

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