conduct-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/PKG-INFO

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

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/pyproject.toml

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

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/src/conduct_cli/guard.py

@@ -199,12 +199,19 @@ _MCP_TARGETS = [
 
 
 def _register_mcp(workspace_id: str, member_token: str, api_url: str) -> None:
-    """Write conductguard MCP entry into every AI tool config found on this machine.
+    """Write conductguard + agent-booster MCP entries into every AI tool config found.
 
     Credentials are NOT stored in the MCP config — the server reads them from
     ~/.conductguard/config.json at startup, which is written by guard sync.
     """
-    entry = {"command": "conductguard-mcp"}
+    import shutil
+    servers: dict[str, dict] = {
+        "conductguard": {"command": "conductguard-mcp"},
+    }
+    # Register agent-booster only if the binary is available
+    if shutil.which("booster"):
+        servers["agent-booster"] = {"command": "booster", "args": ["serve"]}
+
     found_any = False
     for cfg_path, label in _MCP_TARGETS:
         if not cfg_path.exists():
@@ -215,12 +222,16 @@ def _register_mcp(workspace_id: str, member_token: str, api_url: str) -> None:
         except (json.JSONDecodeError, OSError):
             existing = {}
         mcp = existing.setdefault("mcpServers", {})
-        if mcp.get("conductguard") == entry:
-            print(f"  {GRAY}Guard MCP already registered in {label}{RESET}")
-            continue
-        mcp["conductguard"] = entry
-        cfg_path.write_text(json.dumps(existing, indent=2))
-        print(f"  {GREEN}Guard MCP registered in {label}{RESET}")
+        changed = False
+        for name, entry in servers.items():
+            if mcp.get(name) == entry:
+                print(f"  {GRAY}{name} MCP already registered in {label}{RESET}")
+            else:
+                mcp[name] = entry
+                changed = True
+                print(f"  {GREEN}{name} MCP registered in {label}{RESET}")
+        if changed:
+            cfg_path.write_text(json.dumps(existing, indent=2))
     if not found_any:
         print(f"  {GRAY}No AI tool configs found for MCP registration{RESET}")
 
@@ -474,6 +485,7 @@ def cmd_guard_install(args):
         pass
 
     # Persist guard config — include api_key so CLI commands can authenticate
+    import time as _time
     _save_guard_config({
         "workspace_id":          workspace_id,
         "member_token":          member_token,
@@ -482,6 +494,7 @@ def cmd_guard_install(args):
         "api_key":               api_key,
         "api_url":               server,
         "security_emit_enabled": security_emit,
+        "last_synced_at":        _time.time(),
     })
     if security_emit:
         print(f"  {GREEN}Security Loop:{RESET} installed — classifier active")
@@ -545,10 +558,12 @@ def cmd_guard_join(args):
     print(f"  {GREEN}Policy downloaded:{RESET} {rule_count} rule(s)")
 
     # Persist guard config
+    import time as _time
     cfg = {
-        "workspace_id": workspace_id,
-        "user_email":   email,
-        "api_url":      base_url,
+        "workspace_id":   workspace_id,
+        "user_email":     email,
+        "api_url":        base_url,
+        "last_synced_at": _time.time(),
     }
     if member_token:
         cfg["member_token"] = member_token
@@ -878,6 +893,8 @@ def _report_savings(cfg: dict, base_url: str, api_key: str) -> None:
                 "saved_tokens": raw.get("saved_tokens", 0),
                 "savings_pct": raw.get("savings_pct", 0.0),
                 "total_reads": raw.get("total_reads", 0),
+                "crusher": raw.get("crusher", {}),
+                "cache_align": raw.get("cache_align", {}),
             }
     except Exception:
         pass
@@ -929,6 +946,14 @@ def _report_savings(cfg: dict, base_url: str, api_key: str) -> None:
     except Exception:
         pass  # Never fail sync because savings POST failed
 
+    # Push booster symbol index to team workspace (best-effort)
+    try:
+        r = subprocess.run(["booster", "index-push"], capture_output=True, text=True, timeout=30)
+        if r.returncode == 0 and r.stdout.strip():
+            print(f"  {GREEN}Booster index:{RESET} {r.stdout.strip()}")
+    except Exception:
+        pass
+
 
 def cmd_guard_status(args):
     cfg          = _require_guard_config()
@@ -1154,6 +1179,9 @@ def register_guard_parser(sub):
     # conduct guard booster-status
     guard_sub.add_parser("booster-status", help="Verify Agent Booster intercept is active for this project")
 
+    # conduct guard skip-setup
+    guard_sub.add_parser("skip-setup", help="Suppress the Guard setup reminder (does not disable Guard)")
+
     return guard_p, guard_sub
 
 

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/src/conduct_cli/guardmcp.py

@@ -15,7 +15,10 @@ from __future__ import annotations
 import argparse
 import json
 import re
+import subprocess
 import sys
+import threading
+import time
 import uuid
 import urllib.request
 import urllib.error
@@ -136,6 +139,32 @@ def _load_config() -> dict:
     return {}
 
 
+_sync_lock = threading.Lock()
+_SYNC_INTERVAL = 300  # 5 minutes
+
+
+def _maybe_sync() -> None:
+    """If config is stale (>5 min since last sync), run `conduct guard sync` in background."""
+    cfg = _load_config()
+    last_sync = cfg.get("last_synced_at", 0)
+    if time.time() - last_sync < _SYNC_INTERVAL:
+        return
+    if not _sync_lock.acquire(blocking=False):
+        return  # another thread is already syncing
+    def _run():
+        try:
+            subprocess.run(
+                ["conduct", "guard", "sync"],
+                timeout=15,
+                capture_output=True,
+            )
+        except Exception:
+            pass
+        finally:
+            _sync_lock.release()
+    threading.Thread(target=_run, daemon=True, name="guard-auto-sync").start()
+
+
 def _detect_surface(client_info: dict) -> str:
     """Map MCP clientInfo.name → ai_tool label sent to Guard API."""
     name = (client_info.get("name") or "").lower()
@@ -293,6 +322,12 @@ def _handle_guard_sync(workspace_id: str, token: str) -> str:
 
 
 def _dispatch_tool(name: str, arguments: dict, workspace_id: str, token: str, ai_tool: str) -> str:
+    # Always re-read config so workspace_id/token stay fresh between syncs
+    _maybe_sync()
+    cfg = _load_config()
+    workspace_id = cfg.get("workspace_id") or workspace_id
+    token        = cfg.get("member_token") or token
+
     if name == "guard_status":
         return _handle_guard_status(workspace_id)
     if name == "guard_check":

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/src/conduct_cli/hook_template.py

@@ -219,6 +219,8 @@ def _post_event(tool_name, tool_input, decision, rule_id=None, message=None, ses
     if not workspace_id:
         return
 
+    import platform as _platform
+    _os = f"{_platform.system()} {_platform.release()} {_platform.machine()}".strip()
     payload = json.dumps({
         "workspace_id":  workspace_id,
         "clerk_user_id": cfg.get("user_email"),
@@ -228,8 +230,10 @@ def _post_event(tool_name, tool_input, decision, rule_id=None, message=None, ses
         "input_summary": json.dumps(tool_input)[:200],
         "decision":      decision,
         "rule_id":       rule_id,
-        "rule_message":      message,
-        "hook_session_id":   session_id,
+        "rule_message":  message,
+        "hook_session_id": session_id,
+        "os_info":       _os,
+        "hostname":      _platform.node(),
     })
     api_url = cfg.get("api_url", "https://api.conductai.ai").rstrip("/")
     script = (

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/src/conduct_cli/main.py

@@ -2823,6 +2823,30 @@ def cmd_memory(args):
 
 # ── Entry point ───────────────────────────────────────────────────────────────
 
+_GUARD_CONFIG = Path.home() / ".conductguard" / "config.json"
+_GUARD_SKIP   = Path.home() / ".conductguard" / ".setup_skip"
+
+GREEN  = "\033[32m"
+YELLOW = "\033[33m"
+BOLD   = "\033[1m"
+RESET  = "\033[0m"
+
+
+def _check_guard_setup(command: str) -> None:
+    """On first run after install, prompt user to run conduct guard sync."""
+    # Skip if: already set up, user said skip, or running guard sync/login itself
+    if command in ("guard", "login", "whoami", "version"):
+        return
+    if _GUARD_CONFIG.exists() or _GUARD_SKIP.exists():
+        return
+    print(
+        f"\n{YELLOW}{BOLD}⚡ Conduct Guard is not set up on this machine.{RESET}\n"
+        f"   Run {BOLD}conduct guard sync{RESET} to register policy hooks and MCP servers.\n"
+        f"   (This takes ~5 seconds and only needs to happen once per machine.)\n"
+        f"   To skip this reminder: {BOLD}conduct guard skip-setup{RESET}\n"
+    )
+
+
 def main():
     _auto_update()
 
@@ -2983,6 +3007,14 @@ def main():
 
     args = parser.parse_args()
 
+    _check_guard_setup(args.command or "")
+
+    if args.command == "guard" and getattr(args, "guard_command", None) == "skip-setup":
+        _GUARD_SKIP.parent.mkdir(parents=True, exist_ok=True)
+        _GUARD_SKIP.touch()
+        print(f"{GREEN}✓ Setup reminder suppressed.{RESET} Run `conduct guard sync` anytime to enable Guard.")
+        return
+
     if args.command == "login":
         cmd_login(args)
     elif args.command == "agents":

{conduct_cli-0.5.0 → conduct_cli-0.5.2}/src/conduct_cli.egg-info/PKG-INFO

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