conduct-cli 0.6.25__tar.gz → 0.6.27__tar.gz

{conduct_cli-0.6.25 → conduct_cli-0.6.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.6.25
+Version: 0.6.27
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0
 Provides-Extra: booster
-Requires-Dist: agent-booster[watch]>=0.2.23; extra == "booster"
+Requires-Dist: agent-booster[watch]>=0.6.6; extra == "booster"
 
 <!-- mcp-name: io.github.sseshachala/conduct-cli -->
 # conduct-cli

{conduct_cli-0.6.25 → conduct_cli-0.6.27}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conduct-cli"
-version = "0.6.25"
+version = "0.6.27"
 description = "CLI for Conduct AI — install agents, manage projects, run tests"
 readme = "README.md"
 license = { text = "MIT" }
@@ -26,7 +26,7 @@ classifiers = [
 dependencies = ["pyyaml>=6.0", "rich>=13.0"]
 
 [project.optional-dependencies]
-booster = ["agent-booster[watch]>=0.2.23"]
+booster = ["agent-booster[watch]>=0.6.6"]
 
 [project.urls]
 Homepage    = "https://conductai.ai"
@@ -44,4 +44,4 @@ where = ["src"]
 include = ["conduct_cli*"]
 
 [tool.setuptools.package-data]
-conduct_cli = ["hook_template.py", "hook_precompact_template.py", "hook_session_start_template.py", "hook_stop_template.py", "paxel.py"]
+conduct_cli = ["paxel.py"]

{conduct_cli-0.6.25 → conduct_cli-0.6.27}/src/conduct_cli/guard.py

@@ -22,11 +22,6 @@ CONFIG_PATH  = GUARD_DIR / "config.json"
 POLICY_PATH  = GUARD_DIR / "policy.json"
 
 # ── Hook templates — loaded from real .py files (no string embedding) ─────────
-_TEMPLATES_DIR = Path(__file__).parent
-
-def _read_template(name: str) -> str:
-    return (_TEMPLATES_DIR / name).read_text()
-
 
 # ── Thin launcher content ─────────────────────────────────────────────────────
 
@@ -195,12 +190,7 @@ def _write_hook(path: Path) -> None:
         backup = path.read_text()
     path.parent.mkdir(parents=True, exist_ok=True)
 
-    # Prefer thin launcher; fall back to full template if package not importable
-    try:
-        import conduct_cli.hooks.pretooluse  # noqa: F401
-        content = _THIN_LAUNCHERS["pretooluse"]
-    except ImportError:
-        content = _read_template("hook_template.py")
+    content = _THIN_LAUNCHERS["pretooluse"]
 
     path.write_text(content)
     path.chmod(0o755)
@@ -216,18 +206,8 @@ def _write_hook(path: Path) -> None:
         ) from exc
 
 
-def _write_session_hook(path: Path, launcher_key: str, template_name: str) -> None:
-    """Write a thin launcher (or legacy template) for a session hook.
-
-    If conduct_cli.hooks is importable, writes the thin launcher.
-    Falls back to the full template so old installs continue to work.
-    Also rewrites old-style (non-thin) hooks to thin launchers on sync.
-    """
-    try:
-        import conduct_cli.hooks  # noqa: F401
-        content = _THIN_LAUNCHERS[launcher_key]
-    except ImportError:
-        content = _read_template(template_name)
+def _write_session_hook(path: Path, launcher_key: str) -> None:
+    content = _THIN_LAUNCHERS[launcher_key]
     path.write_text(content)
     path.chmod(0o755)
 
@@ -240,9 +220,9 @@ def _install_session_hooks() -> None:
     session_start_path = GUARD_DIR / "guard-session-start.py"
     stop_path          = GUARD_DIR / "guard-stop.py"
 
-    _write_session_hook(precompact_path,    "precompact",    "hook_precompact_template.py")
-    _write_session_hook(session_start_path, "session-start", "hook_session_start_template.py")
-    _write_session_hook(stop_path,          "stop",          "hook_stop_template.py")
+    _write_session_hook(precompact_path,    "precompact")
+    _write_session_hook(session_start_path, "session-start")
+    _write_session_hook(stop_path,          "stop")
 
     claude_settings = Path.home() / ".claude" / "settings.json"
     settings: dict = {}
@@ -1508,6 +1488,21 @@ def _ensure_booster(root: Path) -> None:
             pass
         print(f"  {GREEN}Agent Booster:{RESET} {symbols_count} symbols indexed — Read/Grep intercept active")
 
+    # Keep BOOSTER_SECRET in .mcp.json in sync with ~/.booster/.secret
+    secret_file = Path.home() / ".booster" / ".secret"
+    mcp_json = root / ".mcp.json"
+    if secret_file.exists() and mcp_json.exists():
+        try:
+            expected = secret_file.read_text().strip()
+            data = json.loads(mcp_json.read_text())
+            server = data.get("mcpServers", {}).get("agent-booster", {})
+            if server.get("env", {}).get("BOOSTER_SECRET") != expected:
+                server.setdefault("env", {})["BOOSTER_SECRET"] = expected
+                mcp_json.write_text(json.dumps(data, indent=2) + "\n")
+                print(f"  {GREEN}Agent Booster:{RESET} refreshed BOOSTER_SECRET in .mcp.json")
+        except Exception:
+            pass
+
 
 def _report_savings(cfg: dict, base_url: str, api_key: str) -> None:
     import subprocess

{conduct_cli-0.6.25 → conduct_cli-0.6.27}/src/conduct_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.6.25
+Version: 0.6.27
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0
 Provides-Extra: booster
-Requires-Dist: agent-booster[watch]>=0.2.23; extra == "booster"
+Requires-Dist: agent-booster[watch]>=0.6.6; extra == "booster"
 
 <!-- mcp-name: io.github.sseshachala/conduct-cli -->
 # conduct-cli

{conduct_cli-0.6.25 → conduct_cli-0.6.27}/src/conduct_cli.egg-info/SOURCES.txt

@@ -5,10 +5,6 @@ src/conduct_cli/__init__.py
 src/conduct_cli/api.py
 src/conduct_cli/guard.py
 src/conduct_cli/guardmcp.py
-src/conduct_cli/hook_precompact_template.py
-src/conduct_cli/hook_session_start_template.py
-src/conduct_cli/hook_stop_template.py
-src/conduct_cli/hook_template.py
 src/conduct_cli/log_util.py
 src/conduct_cli/main.py
 src/conduct_cli/mcp_server.py

{conduct_cli-0.6.25 → conduct_cli-0.6.27}/src/conduct_cli.egg-info/requires.txt

@@ -2,4 +2,4 @@ pyyaml>=6.0
 rich>=13.0
 
 [booster]
-agent-booster[watch]>=0.2.23
+agent-booster[watch]>=0.6.6

conduct_cli-0.6.25/src/conduct_cli/hook_precompact_template.py

@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-"""ConductGuard PreCompact hook — persists session context before compaction."""
-import json
-import os
-import subprocess
-import sys
-from datetime import datetime, timezone
-from pathlib import Path
-
-GUARD_DIR = Path.home() / ".conductguard"
-SNAPSHOT_PATH = GUARD_DIR / "session_snapshot.json"
-
-
-def _git(cmd):
-    try:
-        return subprocess.check_output(
-            ["git"] + cmd, stderr=subprocess.DEVNULL, text=True, timeout=3
-        ).strip()
-    except Exception:
-        return ""
-
-
-def _guard_status():
-    try:
-        out = subprocess.check_output(
-            ["conductguard", "status", "--json"],
-            stderr=subprocess.DEVNULL, text=True, timeout=3,
-        )
-        return json.loads(out.strip())
-    except Exception:
-        return None
-
-
-def _memory_headline():
-    try:
-        root = Path.cwd()
-        mem_key = str(root).replace("/", "-").lstrip("-")
-        candidates = [
-            Path.home() / ".claude" / "projects" / mem_key / "memory" / "MEMORY.md",
-            Path.home() / ".codex" / "projects" / mem_key / "memory" / "MEMORY.md",
-        ]
-        for mem_path in candidates:
-            if mem_path.exists():
-                return "\n".join(mem_path.read_text().splitlines()[:10])
-    except Exception:
-        pass
-    return ""
-
-
-def main():
-    try:
-        sys.stdin.read()
-    except Exception:
-        pass
-
-    try:
-        GUARD_DIR.mkdir(parents=True, exist_ok=True)
-        snapshot = {
-            "compacted_at": datetime.now(timezone.utc).isoformat(),
-            "tier1": {
-                "git_branch": _git(["branch", "--show-current"]),
-                "recent_commits": _git(["log", "--oneline", "-3"]),
-                "memory_headline": _memory_headline(),
-            },
-            "tier2": {"guard_status": _guard_status()},
-            "tier3": {"cwd": str(Path.cwd()), "python": sys.version.split()[0]},
-        }
-        tmp = GUARD_DIR / "session_snapshot.tmp"
-        tmp.write_text(json.dumps(snapshot, indent=2))
-        tmp.rename(SNAPSHOT_PATH)
-    except Exception:
-        pass
-
-    sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()

conduct_cli-0.6.25/src/conduct_cli/hook_session_start_template.py

@@ -1,161 +0,0 @@
-#!/usr/bin/env python3
-"""ConductGuard SessionStart hook — prints context after compaction."""
-import json
-import sys
-from datetime import datetime, timezone
-from pathlib import Path
-
-SNAPSHOT_PATH = Path.home() / ".conductguard" / "session_snapshot.json"
-MAX_AGE_HOURS = 2
-
-
-CONDUCT_ENV_PATH = Path.home() / ".conduct" / "env"
-GUARD_CONFIG_PATH = Path.home() / ".conductguard" / "config.json"
-
-
-def _check_proxy_token() -> None:
-    """Warn + alert server if the proxy token is missing or malformed.
-
-    Reads ~/.conduct/env directly (not shell env) so this works regardless
-    of whether the user sourced their rc file in this session.
-    """
-    if not CONDUCT_ENV_PATH.exists():
-        return
-    env_text = CONDUCT_ENV_PATH.read_text()
-    # Check if proxy is configured and token is valid
-    has_base_url = 'ANTHROPIC_BASE_URL=' in env_text
-    has_valid_token = 'ANTHROPIC_API_KEY="guard-mt-' in env_text or "ANTHROPIC_API_KEY='guard-mt-" in env_text
-    if not has_base_url:
-        return  # proxy not configured — nothing to check
-    if has_valid_token:
-        return  # all good
-
-    # Token is missing or malformed — warn locally and ping the server
-    print("## ConductGuard: proxy token missing or malformed")
-    print("Run `conduct guard sync` to refresh your token before making LLM calls.\n")
-
-    # Alert the server so the admin can prompt the developer to re-sync
-    try:
-        cfg: dict = {}
-        if GUARD_CONFIG_PATH.exists():
-            cfg = json.loads(GUARD_CONFIG_PATH.read_text())
-        workspace_id = cfg.get("workspace_id", "")
-        clerk_user_id = cfg.get("clerk_user_id", "") or cfg.get("user_email", "")
-        api_url = cfg.get("api_url", "https://api.conductai.ai").rstrip("/")
-        member_token = cfg.get("member_token", "")
-        if workspace_id and member_token:
-            import urllib.request
-            payload = json.dumps({
-                "workspace_id": workspace_id,
-                "clerk_user_id": clerk_user_id,
-                "ai_tool": "claude_code",
-                "tool_call": "session_start",
-                "decision": "warned",
-                "rule_id": "proxy_token_missing",
-                "rule_message": "Developer proxy token missing or malformed — run conduct guard sync",
-                "input_summary": "session_start: proxy token not found in ~/.conduct/env",
-            }).encode()
-            req = urllib.request.Request(
-                f"{api_url}/guard/events",
-                data=payload,
-                headers={"Content-Type": "application/json"},
-                method="POST",
-            )
-            urllib.request.urlopen(req, timeout=3)
-    except Exception:
-        pass  # best-effort — never block the session
-
-
-def main():
-    try:
-        sys.stdin.read()
-    except Exception:
-        pass
-
-    _check_proxy_token()
-
-    if not SNAPSHOT_PATH.exists():
-        sys.exit(0)
-
-    try:
-        snapshot = json.loads(SNAPSHOT_PATH.read_text())
-        compacted_at = datetime.fromisoformat(snapshot.get("compacted_at", ""))
-        age_hours = (datetime.now(timezone.utc) - compacted_at).total_seconds() / 3600
-        if age_hours > MAX_AGE_HOURS:
-            sys.exit(0)
-
-        t1 = snapshot.get("tier1", {})
-        branch = t1.get("git_branch", "")
-        commits = t1.get("recent_commits", "")
-        headline = t1.get("memory_headline", "")
-        t2 = snapshot.get("tier2", {})
-        guard = t2.get("guard_status") or {}
-
-        lines = [f"## Session resumed (snapshot from {compacted_at.strftime('%Y-%m-%d %H:%M')} UTC)"]
-        if branch:
-            last = commits.splitlines()[0] if commits else ""
-            lines.append(f"- Branch: {branch}" + (f" | Last: {last}" if last else ""))
-        budget = guard.get("budget_pct")
-        if budget is not None:
-            lines.append(f"- Guard: {budget}% budget used")
-        else:
-            lines.append("- Guard: state unavailable")
-        if headline:
-            lines.append(f"- Memory index:\n  {headline}")
-        else:
-            lines.append("- Memory index:\n  (none)")
-
-        # Booster intercept status
-        try:
-            import shutil, sqlite3
-            root = Path.cwd()
-            if shutil.which("booster"):
-                db_path = root / ".booster" / "symbols.db"
-                hooks_path = root / ".claude" / "hooks" / "booster-gate.py"
-                if hooks_path.exists() and db_path.exists():
-                    try:
-                        conn = sqlite3.connect(str(db_path))
-                        n = conn.execute("SELECT COUNT(*) FROM symbols").fetchone()[0]
-                        conn.close()
-                        lines.append(f"- Agent Booster: ACTIVE — {n} symbols indexed, Read/Grep intercept ON")
-                    except Exception:
-                        lines.append("- Agent Booster: installed (index unavailable)")
-                elif shutil.which("booster"):
-                    lines.append("- Agent Booster: installed but NOT wired — run: conduct guard sync")
-            else:
-                lines.append("- Agent Booster: not installed (pip install 'conduct-cli[booster]')")
-        except Exception:
-            pass
-
-        # Inject relevant team memories for the current repo
-        try:
-            repo = None
-            try:
-                import subprocess
-                out = subprocess.check_output(["git", "remote", "get-url", "origin"],
-                                               stderr=subprocess.DEVNULL, text=True).strip()
-                if "github.com" in out:
-                    repo = out.split("github.com")[-1].lstrip("/:").rstrip(".git")
-            except Exception:
-                pass
-
-            from conduct_cli.memory import search_team_memory
-            results = search_team_memory("recent learnings patterns bugs", repo=repo, limit=3)
-            if results:
-                lines.append("- Team knowledge:")
-                for r in results[:3]:
-                    dev = r.get("developer_id", "teammate")[:8]
-                    summary = r.get("summary", "")[:120]
-                    lines.append(f"  {dev}: {summary}")
-        except Exception:
-            pass
-
-        print("\n".join(lines))
-    except Exception:
-        pass
-
-    sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()

conduct_cli-0.6.25/src/conduct_cli/hook_stop_template.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-"""ConductGuard Stop hook — captures session transcript for team memory."""
-import json
-import subprocess
-import sys
-from pathlib import Path
-
-
-def _detect_repo():
-    try:
-        out = subprocess.check_output(
-            ["git", "remote", "get-url", "origin"],
-            stderr=subprocess.DEVNULL, text=True,
-        ).strip()
-        if "github.com" in out:
-            return out.split("github.com")[-1].lstrip("/:").rstrip(".git")
-    except Exception:
-        pass
-    return None
-
-
-def main():
-    try:
-        raw = sys.stdin.read()
-        data = json.loads(raw) if raw.strip() else {}
-    except Exception:
-        data = {}
-
-    session_id = data.get("session_id", "")
-    transcript_path = data.get("transcript_path") or data.get("transcriptPath")
-
-    try:
-        from conduct_cli.memory import post_session_to_api
-        post_session_to_api(session_id, transcript_path, _detect_repo())
-    except Exception:
-        pass
-
-    sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()