conduct-cli 0.7.46__tar.gz → 0.7.48__tar.gz

{conduct_cli-0.7.46 → conduct_cli-0.7.48}/PKG-INFO

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

{conduct_cli-0.7.46 → conduct_cli-0.7.48}/pyproject.toml

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

{conduct_cli-0.7.46 → conduct_cli-0.7.48}/src/conduct_cli/guard.py

@@ -474,31 +474,51 @@ def _patch_claude_desktop_proxy(api_url: str, agent_token: str) -> None:
 
 
 def _patch_copilot_mcp(agent_token: str, api_url: str) -> None:
-    """Keep ~/.copilot/mcp-config.json in sync with current agent token.
-
-    Copilot's mcp-config.json uses SSE + Bearer — it can't run a local stdio binary
-    the way Claude Code / Cursor can, so we write the SSE entry with a fresh token.
-    """
-    cfg_path = Path.home() / ".copilot" / "mcp-config.json"
-    if not cfg_path.exists():
-        return
-    try:
-        cfg = json.loads(cfg_path.read_text())
-    except (json.JSONDecodeError, OSError):
-        cfg = {}
-    mcp = cfg.setdefault("mcpServers", {})
-    entry = {
+    """Keep ~/.copilot/mcp-config.json and any .mcp.json in cwd in sync with current agent token."""
+    import shutil
+    sse_entry = {
         "type": "sse",
         "url": f"{api_url}/guard/mcp",
         "headers": {"Authorization": f"Bearer {agent_token}"},
         "tools": ["**"],
     }
-    if mcp.get("conduct-guard") == entry:
-        print(f"  {GRAY}conduct-guard MCP already registered in GitHub Copilot{RESET}")
-        return
-    mcp["conduct-guard"] = entry
-    cfg_path.write_text(json.dumps(cfg, indent=2))
-    print(f"  {GREEN}conduct-guard MCP registered in GitHub Copilot (SSE){RESET}")
+    booster_entry = {"command": "booster", "args": ["serve"]} if shutil.which("booster") else None
+
+    # ~/.copilot/mcp-config.json (global Copilot config)
+    global_path = Path.home() / ".copilot" / "mcp-config.json"
+    if global_path.exists():
+        _write_mcp_file(global_path, "conduct-guard", sse_entry, booster_entry, "GitHub Copilot (global)")
+
+    # .mcp.json in cwd (project-level, picked up by VS Code Copilot)
+    local_path = Path.cwd() / ".mcp.json"
+    if local_path.exists():
+        _write_mcp_file(local_path, "conduct-guard", sse_entry, booster_entry, "GitHub Copilot (.mcp.json)")
+
+
+def _write_mcp_file(
+    cfg_path: Path,
+    guard_key: str,
+    sse_entry: dict,
+    booster_entry: dict | None,
+    label: str,
+) -> None:
+    try:
+        cfg = json.loads(cfg_path.read_text())
+    except (json.JSONDecodeError, OSError):
+        cfg = {}
+    mcp = cfg.setdefault("mcpServers", {})
+    changed = False
+    if mcp.get(guard_key) != sse_entry:
+        mcp[guard_key] = sse_entry
+        changed = True
+        print(f"  {GREEN}conduct-guard MCP registered in {label}{RESET}")
+    else:
+        print(f"  {GRAY}conduct-guard MCP already registered in {label}{RESET}")
+    if booster_entry and mcp.get("agent-booster") != booster_entry:
+        mcp["agent-booster"] = booster_entry
+        changed = True
+    if changed:
+        cfg_path.write_text(json.dumps(cfg, indent=2))
 
 
 _GUARD_RULES_TEXT = (
@@ -1084,7 +1104,7 @@ def _detect_ai_tools() -> list[dict]:
     def _check_json_mcp(path: Path) -> bool:
         try:
             d = json.loads(path.read_text()) if path.exists() else {}
-            return "conduct" in d.get("mcpServers", {})
+            return any("conduct" in k for k in d.get("mcpServers", {}))
         except Exception:
             return False
 
@@ -1191,7 +1211,7 @@ def _detect_ai_tools() -> list[dict]:
         vscode_settings = next((p for p in vscode_candidates if p.exists()), None)
         try:
             d = json.loads(vscode_settings.read_text()) if vscode_settings else {}
-            mcp_reg = "conduct" in d.get("mcp", {}).get("servers", {})
+            mcp_reg = any("conduct" in k for k in d.get("mcp", {}).get("servers", {}))
         except Exception:
             mcp_reg = False
         # Also check ~/.copilot/mcp-config.json (SSE entry written by guard sync)
@@ -2321,7 +2341,7 @@ def _discover_config_agents() -> list[tuple]:
                 return "conduct" in text and "mcp_servers" in text
             import json as _j
             d = _j.loads(text)
-            return "conduct" in d.get("mcpServers", {})
+            return any("conduct" in k for k in d.get("mcpServers", {}))
         except Exception:
             return False
 
@@ -2347,6 +2367,7 @@ def _discover_config_agents() -> list[tuple]:
         ("codex",       home / ".codex",   home / ".codex"   / "config.toml",    "mcp"),
         ("cursor",      home / ".cursor",  home / ".cursor"  / "mcp.json",       "mcp"),
         ("windsurf",    home / ".codeium" / "windsurf", home / ".codeium" / "windsurf" / "mcp_config.json", "mcp"),
+        ("copilot",     home / ".copilot", home / ".copilot" / "mcp-config.json", "mcp"),
     ]
     for name, check_dir, config_path, _ in TOOLS:
         if check_dir.exists():

{conduct_cli-0.7.46 → conduct_cli-0.7.48}/src/conduct_cli.egg-info/PKG-INFO

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