conduct-cli 0.6.34__tar.gz → 0.6.35__tar.gz

{conduct_cli-0.6.34 → conduct_cli-0.6.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.6.34
+Version: 0.6.35
 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.6.34 → conduct_cli-0.6.35}/pyproject.toml

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

{conduct_cli-0.6.34 → conduct_cli-0.6.35}/src/conduct_cli/guard.py

@@ -18,35 +18,11 @@ CYAN   = "\033[36m"
 YELLOW = "\033[33m"
 
 GUARD_DIR    = Path.home() / ".conductguard"
-CONFIG_PATH  = GUARD_DIR / "config.json"   # legacy / fallback
-POLICY_PATH  = GUARD_DIR / "policy.json"   # legacy / fallback
-_CONDUCT_CFG = Path.home() / ".conduct" / "config.json"
-
-
-def _active_workspace_id() -> str | None:
-    """Active workspace from conduct switch — updates at runtime."""
-    try:
-        if _CONDUCT_CFG.exists():
-            return json.loads(_CONDUCT_CFG.read_text()).get("workspace")
-    except Exception:
-        pass
-    return None
-
-
-def _ws_config_path(ws_id: str) -> Path:
-    return GUARD_DIR / "workspaces" / f"{ws_id}.json"
-
-
-def _ws_policy_path(ws_id: str) -> Path:
-    return GUARD_DIR / f"policy_{ws_id}.json"
+CONFIG_PATH  = GUARD_DIR / "config.json"
+POLICY_PATH  = GUARD_DIR / "policy.json"
 
 
 def active_policy_path() -> Path:
-    ws_id = _active_workspace_id()
-    if ws_id:
-        p = _ws_policy_path(ws_id)
-        if p.exists():
-            return p
     return POLICY_PATH
 
 # ── Hook templates — loaded from real .py files (no string embedding) ─────────
@@ -331,26 +307,16 @@ def _ensure_persona(workspace_id: str, api_key: str, base_url: str) -> str:
 
 
 def _load_guard_config(workspace_id: str | None = None) -> dict:
-    ws_id = workspace_id or _active_workspace_id()
-    if ws_id:
-        p = _ws_config_path(ws_id)
-        if p.exists():
-            return json.loads(p.read_text())
-    # fallback to legacy single-workspace config
     if CONFIG_PATH.exists():
-        return json.loads(CONFIG_PATH.read_text())
+        try:
+            return json.loads(CONFIG_PATH.read_text())
+        except Exception:
+            pass
     return {}
 
 
 def _save_guard_config(data: dict, workspace_id: str | None = None):
     GUARD_DIR.mkdir(parents=True, exist_ok=True)
-    ws_id = workspace_id or data.get("workspace_id") or _active_workspace_id()
-    if ws_id:
-        p = _ws_config_path(ws_id)
-        p.parent.mkdir(parents=True, exist_ok=True)
-        p.write_text(json.dumps(data, indent=2))
-        p.chmod(0o600)
-    # always write legacy path so old hook versions keep working
     CONFIG_PATH.write_text(json.dumps(data, indent=2))
     CONFIG_PATH.chmod(0o600)
 
@@ -612,20 +578,11 @@ def _req(method: str, url: str, body=None, token: str = None, api_key: str = Non
 
 def _save_policy(policy: dict, workspace_id: str | None = None):
     GUARD_DIR.mkdir(parents=True, exist_ok=True)
-    ws_id = workspace_id or _active_workspace_id()
-    if ws_id:
-        _ws_policy_path(ws_id).write_text(json.dumps(policy, indent=2))
-    # always write legacy path for old hook versions
     POLICY_PATH.write_text(json.dumps(policy, indent=2))
 
 
 def _load_policy(workspace_id: str | None = None) -> dict:
     try:
-        ws_id = workspace_id or _active_workspace_id()
-        if ws_id:
-            p = _ws_policy_path(ws_id)
-            if p.exists():
-                return json.loads(p.read_text())
         return json.loads(POLICY_PATH.read_text())
     except Exception:
         return {"rules": []}

{conduct_cli-0.6.34 → conduct_cli-0.6.35}/src/conduct_cli/guardmcp.py

@@ -24,28 +24,9 @@ import urllib.request
 import urllib.error
 from pathlib import Path
 
-GUARD_DIR    = Path.home() / ".conductguard"
-POLICY_PATH  = GUARD_DIR / "policy.json"
-CONFIG_PATH  = GUARD_DIR / "config.json"
-_CONDUCT_CFG = Path.home() / ".conduct" / "config.json"
-
-
-def _active_workspace_id() -> str | None:
-    try:
-        if _CONDUCT_CFG.exists():
-            return json.loads(_CONDUCT_CFG.read_text()).get("workspace")
-    except Exception:
-        pass
-    return None
-
-
-def _active_policy_path() -> Path:
-    ws_id = _active_workspace_id()
-    if ws_id:
-        p = GUARD_DIR / f"policy_{ws_id}.json"
-        if p.exists():
-            return p
-    return POLICY_PATH
+GUARD_DIR   = Path.home() / ".conductguard"
+POLICY_PATH = GUARD_DIR / "policy.json"
+CONFIG_PATH = GUARD_DIR / "config.json"
 
 PROTOCOL_VERSION = "2024-11-05"
 
@@ -141,26 +122,20 @@ _TOOLS = [
 # ── Helpers ───────────────────────────────────────────────────────────────────
 
 def _load_policy() -> dict:
-    p = _active_policy_path()
-    if p.exists():
+    if POLICY_PATH.exists():
         try:
-            return json.loads(p.read_text())
+            return json.loads(POLICY_PATH.read_text())
         except Exception:
             pass
     return {"rules": []}
 
 
 def _load_config() -> dict:
-    try:
-        ws_id = _active_workspace_id()
-        if ws_id:
-            p = GUARD_DIR / "workspaces" / f"{ws_id}.json"
-            if p.exists():
-                return json.loads(p.read_text())
-        if CONFIG_PATH.exists():
+    if CONFIG_PATH.exists():
+        try:
             return json.loads(CONFIG_PATH.read_text())
-    except Exception:
-        pass
+        except Exception:
+            pass
     return {}
 
 
@@ -185,7 +160,7 @@ def _maybe_sync() -> None:
             ws_id = cfg.get("workspace_id", "")
             if ws_id:
                 with urllib.request.urlopen(f"{_DAEMON_URL}/policy?workspace_id={ws_id}", timeout=1) as r:
-                    _active_policy_path().write_text(r.read().decode())
+                    POLICY_PATH.write_text(r.read().decode())
             return
     except Exception:
         pass  # fall through to CLI sync
@@ -362,7 +337,7 @@ def _handle_guard_sync(workspace_id: str, token: str) -> str:
         with urllib.request.urlopen(req, timeout=10) as resp:
             policy = json.loads(resp.read())
         GUARD_DIR.mkdir(parents=True, exist_ok=True)
-        _active_policy_path().write_text(json.dumps(policy, indent=2))
+        POLICY_PATH.write_text(json.dumps(policy, indent=2))
         rule_count = len(policy.get("rules", []))
         return f"Policy synced — {rule_count} rule(s) active (version: {policy.get('version', 'unknown')})."
     except urllib.error.HTTPError as e:

{conduct_cli-0.6.34 → conduct_cli-0.6.35}/src/conduct_cli/hooks/base.py

@@ -17,9 +17,8 @@ from typing import Literal, Optional
 # ── Canonical paths ───────────────────────────────────────────────────────────
 
 GUARD_DIR          = Path.home() / ".conductguard"
-CONFIG_PATH        = GUARD_DIR / "config.json"   # legacy / fallback
-POLICY_PATH        = GUARD_DIR / "policy.json"   # legacy / fallback
-_CONDUCT_CFG       = Path.home() / ".conduct" / "config.json"
+CONFIG_PATH        = GUARD_DIR / "config.json"
+POLICY_PATH        = GUARD_DIR / "policy.json"
 BUDGET_CACHE_PATH  = GUARD_DIR / "budget_cache.json"
 BUDGET_CACHE_TTL   = 300   # seconds
 VERSION_CACHE_PATH = GUARD_DIR / "version_cache.json"
@@ -43,23 +42,9 @@ class HookResult:
 
 # ── Config loading ────────────────────────────────────────────────────────────
 
-def _active_workspace_id() -> str | None:
-    try:
-        if _CONDUCT_CFG.exists():
-            return json.loads(_CONDUCT_CFG.read_text()).get("workspace")
-    except Exception:
-        pass
-    return None
-
-
 def load_config() -> dict:
-    """Load Guard config for the active workspace, falling back to legacy single config."""
+    """Load Guard config from ~/.conductguard/config.json."""
     try:
-        ws_id = _active_workspace_id()
-        if ws_id:
-            p = GUARD_DIR / "workspaces" / f"{ws_id}.json"
-            if p.exists():
-                return json.loads(p.read_text())
         if CONFIG_PATH.exists():
             return json.loads(CONFIG_PATH.read_text())
     except Exception:
@@ -68,12 +53,7 @@ def load_config() -> dict:
 
 
 def active_policy_path() -> Path:
-    """Return per-workspace policy path, or legacy fallback."""
-    ws_id = _active_workspace_id()
-    if ws_id:
-        p = GUARD_DIR / f"policy_{ws_id}.json"
-        if p.exists():
-            return p
+    """Return policy path: ~/.conductguard/policy.json."""
     return POLICY_PATH
 
 

{conduct_cli-0.6.34 → conduct_cli-0.6.35}/src/conduct_cli/mcp_server.py

@@ -97,24 +97,10 @@ def _load_conduct_config() -> dict:
     return {}
 
 
-def _active_guard_policy_path() -> Path:
-    try:
-        cfg = json.loads(CONDUCT_CONFIG_PATH.read_text()) if CONDUCT_CONFIG_PATH.exists() else {}
-        ws_id = cfg.get("workspace")
-        if ws_id:
-            p = GUARD_DIR / f"policy_{ws_id}.json"
-            if p.exists():
-                return p
-    except Exception:
-        pass
-    return GUARD_POLICY_PATH
-
-
 def _load_guard_policy() -> dict:
-    p = _active_guard_policy_path()
-    if p.exists():
+    if GUARD_POLICY_PATH.exists():
         try:
-            return json.loads(p.read_text())
+            return json.loads(GUARD_POLICY_PATH.read_text())
         except Exception:
             pass
     return {"rules": []}

{conduct_cli-0.6.34 → conduct_cli-0.6.35}/src/conduct_cli.egg-info/PKG-INFO

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