conduct-cli 0.9.3__tar.gz → 0.9.5__tar.gz

{conduct_cli-0.9.3 → conduct_cli-0.9.5}/PKG-INFO

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

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

{conduct_cli-0.9.3 → conduct_cli-0.9.5}/src/conduct_cli/guard.py

@@ -2374,6 +2374,21 @@ def register_guard_parser(sub):
     session_sub.add_parser("stop", help="End the current goal session")
     p_session.set_defaults(func=cmd_guard_session)
 
+    # conduct guard approvals list|approve|reject — HITL decide from CLI (#1140)
+    approv_p = guard_sub.add_parser("approvals", help="List and decide Guard HITL approval requests")
+    approv_sub = approv_p.add_subparsers(dest="approvals_command")
+    list_p = approv_sub.add_parser("list", help="List approval requests")
+    list_p.add_argument("--status", default="pending",
+                        choices=["pending", "approved", "rejected", "timed_out", "all"],
+                        help="Filter by status (default: pending)")
+    list_p.add_argument("--limit", type=int, default=50, help="Max rows (default: 50)")
+    approve_p = approv_sub.add_parser("approve", help="Approve a pending request by id")
+    approve_p.add_argument("request_id", help="Approval request UUID")
+    approve_p.add_argument("--reason", default=None, help="Optional decision reason")
+    reject_p = approv_sub.add_parser("reject", help="Reject a pending request by id")
+    reject_p.add_argument("request_id", help="Approval request UUID")
+    reject_p.add_argument("--reason", default=None, help="Optional decision reason")
+
     return guard_p, guard_sub
 
 
@@ -3178,6 +3193,60 @@ def cmd_guard_simulate(args):
         print("[simulation] identity   : (none — token did not resolve to an AgentIdentity)")
 
 
+def cmd_guard_approvals(args, guard_p):
+    """List and decide Guard HITL approval requests (#1140)."""
+    sub = getattr(args, "approvals_command", None)
+    if sub not in ("list", "approve", "reject"):
+        guard_p.print_help()
+        sys.exit(1)
+
+    cfg          = _require_guard_config()
+    workspace_id = cfg.get("workspace_id")
+    agent_token  = cfg.get("agent_token", "")
+    base_url     = _api_url(cfg)
+
+    if sub == "list":
+        url = f"{base_url}/guard/approvals?workspace_id={workspace_id}&status={args.status}&limit={args.limit}"
+        resp = _req("GET", url, token=agent_token or None)
+        items = resp.get("items", []) if isinstance(resp, dict) else []
+        if not items:
+            print(f"{GRAY}No approvals with status={args.status}.{RESET}")
+            return
+        id_w, req_w, rule_w, msg_w = 38, 26, 24, 40
+        print()
+        print(f"{BOLD}{'ID':<{id_w}} {'Requester':<{req_w}} {'Rule':<{rule_w}} {'Message':<{msg_w}} Status{RESET}")
+        print("─" * (id_w + req_w + rule_w + msg_w + 12))
+        colors = {"pending": YELLOW, "approved": GREEN, "rejected": RED, "timed_out": GRAY}
+        for it in items:
+            st = it.get("status", "?")
+            print(
+                f"{it.get('id',''):<{id_w}} "
+                f"{(it.get('requester_email') or '—')[:req_w-1]:<{req_w}} "
+                f"{(it.get('rule_id') or '—')[:rule_w-1]:<{rule_w}} "
+                f"{(it.get('rule_message') or '—')[:msg_w-1]:<{msg_w}} "
+                f"{colors.get(st, '')}{st}{RESET}"
+            )
+        return
+
+    # approve / reject share a body shape
+    decision = "approved" if sub == "approve" else "rejected"
+    body = {"decision": decision}
+    if args.reason:
+        body["reason"] = args.reason
+    url = f"{base_url}/guard/approvals/{args.request_id}/decide?workspace_id={workspace_id}"
+    resp = _req("POST", url, body=body, token=agent_token or None)
+    req = resp.get("request") if isinstance(resp, dict) else None
+    if not req:
+        print(f"{RED}Decision failed — no response body.{RESET}")
+        sys.exit(1)
+    color = GREEN if decision == "approved" else RED
+    print(f"{color}{decision.upper()}{RESET} — {req.get('rule_id','')}  "
+          f"by {req.get('decided_by_email','?')}  "
+          f"latency={req.get('latency_ms','?')}ms  "
+          f"run_resumed={resp.get('run_resumed')}")
+
+
+
 def dispatch_guard(args, guard_p):
     """Dispatch to the correct guard handler. Called from main()."""
     guard_command = getattr(args, "guard_command", None)
@@ -3205,6 +3274,8 @@ def dispatch_guard(args, guard_p):
         cmd_guard_session(args)
     elif guard_command == "simulate":
         cmd_guard_simulate(args)
+    elif guard_command == "approvals":
+        cmd_guard_approvals(args, guard_p)
     else:
         guard_p.print_help()
         sys.exit(1)

{conduct_cli-0.9.3 → conduct_cli-0.9.5}/src/conduct_cli/main.py

@@ -343,7 +343,7 @@ def _report_tool_coverage() -> None:
     """Detect AI tools on this machine and POST coverage to Guard API. Silent on failure."""
     try:
         cfg = _load_config()
-        server  = cfg.get("server", "").rstrip("/")
+        server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
         api_key = cfg.get("agent_token", "")
         token   = cfg.get("token", "")
         email   = cfg.get("email", "")
@@ -1354,7 +1354,7 @@ def _atomic_write(path: Path, data: dict) -> None:
 
 def cmd_switch(args):
     cfg = _load_config()
-    server  = cfg.get("server", "").rstrip("/")
+    server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
     api_key = cfg.get("agent_token", "")
     token   = cfg.get("token", "")
 
@@ -1798,7 +1798,7 @@ def _render_table(rows: list[dict]) -> str:
 
 def _fetch_runs(cfg: dict) -> list[dict]:
     """Fetch recent runs from GET /runs."""
-    server  = cfg.get("server", "").rstrip("/")
+    server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
     api_key = cfg.get("agent_token", "")
     ws_id   = cfg.get("workspace", "")
     if not all([server, api_key, ws_id]):
@@ -1814,7 +1814,7 @@ def _fetch_runs(cfg: dict) -> list[dict]:
 
 def _fetch_guard_activity(cfg: dict, guard_cfg: dict) -> list[dict]:
     """Fetch recent Guard events grouped by developer."""
-    server  = cfg.get("server", "").rstrip("/")
+    server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
     api_key = cfg.get("agent_token", "")
     ws_id   = cfg.get("workspace", "")
     if not all([server, api_key, ws_id]):

{conduct_cli-0.9.3 → conduct_cli-0.9.5}/src/conduct_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.9.3
+Version: 0.9.5
 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.9.3 → conduct_cli-0.9.5}/src/conduct_cli.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ tests/test_cmd_run.py
 tests/test_command_word_matcher.py
 tests/test_conductguard_mcp_stdio.py
 tests/test_drain_daemon_health.py
+tests/test_guard_approvals.py
 tests/test_guard_policy.py
 tests/test_guard_savings.py
 tests/test_hook_dispatch.py

conduct_cli-0.9.5/tests/test_guard_approvals.py

@@ -0,0 +1,117 @@
+"""Tests for `conduct guard approvals list|approve|reject` CLI (#1140).
+
+Mocks _req + _require_guard_config so no network. Verifies URL/body shape
+for decide, output for list (populated + empty), and dispatcher routing.
+"""
+from __future__ import annotations
+
+import argparse
+import sys
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+HERE = Path(__file__).resolve()
+CLI_PKG = HERE.parent.parent / "src"
+if str(CLI_PKG) not in sys.path:
+    sys.path.insert(0, str(CLI_PKG))
+
+_FAKE_CFG = {
+    "workspace_id": "ws-abc-123",
+    "agent_token":  "cond_agt_test",
+    "api_url":      "https://api.example.com",
+}
+
+
+@pytest.fixture(autouse=True)
+def patch_config(monkeypatch):
+    import conduct_cli.guard as g
+    monkeypatch.setattr(g, "_require_guard_config", lambda: _FAKE_CFG)
+    monkeypatch.setattr(g, "_api_url", lambda cfg: cfg["api_url"])
+
+
+def _parse(*argv):
+    import conduct_cli.guard as g
+    p = argparse.ArgumentParser()
+    s = p.add_subparsers(dest="command")
+    guard_p, _ = g.register_guard_parser(s)
+    return p.parse_args(list(argv)), guard_p
+
+
+def test_parser_routes_list_approve_reject():
+    args, _ = _parse("guard", "approvals", "list", "--status", "approved", "--limit", "5")
+    assert args.approvals_command == "list"
+    assert args.status == "approved" and args.limit == 5
+
+    args, _ = _parse("guard", "approvals", "approve", "req-1", "--reason", "ok")
+    assert args.approvals_command == "approve" and args.request_id == "req-1" and args.reason == "ok"
+
+    args, _ = _parse("guard", "approvals", "reject", "req-2")
+    assert args.approvals_command == "reject" and args.reason is None
+
+
+def test_list_renders_rows(capsys):
+    import conduct_cli.guard as g
+    resp = {"items": [
+        {"id":"req-1","requester_email":"a@x.io","rule_id":"r.one","rule_message":"m1","status":"pending"},
+        {"id":"req-2","requester_email":"b@x.io","rule_id":"r.two","rule_message":"m2","status":"approved"},
+    ]}
+    args, guard_p = _parse("guard", "approvals", "list")
+    with patch.object(g, "_req", return_value=resp) as mock:
+        g.dispatch_guard(args, guard_p)
+    call_url = mock.call_args.args[1]
+    assert "/guard/approvals" in call_url and "status=pending" in call_url and "workspace_id=ws-abc-123" in call_url
+    out = capsys.readouterr().out
+    assert "req-1" in out and "req-2" in out
+    assert "pending" in out and "approved" in out
+
+
+def test_list_empty_state(capsys):
+    import conduct_cli.guard as g
+    args, guard_p = _parse("guard", "approvals", "list", "--status", "all")
+    with patch.object(g, "_req", return_value={"items": []}):
+        g.dispatch_guard(args, guard_p)
+    out = capsys.readouterr().out
+    assert "No approvals" in out
+
+
+def test_approve_sends_correct_body_and_url(capsys):
+    import conduct_cli.guard as g
+    decision_resp = {
+        "request": {"rule_id":"r.x","decided_by_email":"me@x.io","latency_ms":42,"status":"approved"},
+        "run_resumed": True,
+    }
+    args, guard_p = _parse("guard", "approvals", "approve", "req-9", "--reason", "looks ok")
+    with patch.object(g, "_req", return_value=decision_resp) as mock:
+        g.dispatch_guard(args, guard_p)
+    method, url = mock.call_args.args[0], mock.call_args.args[1]
+    body = mock.call_args.kwargs["body"]
+    assert method == "POST"
+    assert "/guard/approvals/req-9/decide" in url and "workspace_id=ws-abc-123" in url
+    assert body == {"decision": "approved", "reason": "looks ok"}
+    out = capsys.readouterr().out
+    assert "APPROVED" in out and "run_resumed=True" in out and "42ms" in out
+
+
+def test_reject_without_reason_omits_field(capsys):
+    import conduct_cli.guard as g
+    decision_resp = {
+        "request": {"rule_id":"r.x","decided_by_email":"me@x.io","latency_ms":10,"status":"rejected"},
+        "run_resumed": False,
+    }
+    args, guard_p = _parse("guard", "approvals", "reject", "req-9")
+    with patch.object(g, "_req", return_value=decision_resp) as mock:
+        g.dispatch_guard(args, guard_p)
+    body = mock.call_args.kwargs["body"]
+    assert body == {"decision": "rejected"}  # no reason key when None
+    out = capsys.readouterr().out
+    assert "REJECTED" in out
+
+
+def test_bare_approvals_prints_help(capsys):
+    import conduct_cli.guard as g
+    args, guard_p = _parse("guard", "approvals")
+    with pytest.raises(SystemExit) as excinfo:
+        g.dispatch_guard(args, guard_p)
+    assert excinfo.value.code == 1

{conduct_cli-0.9.3 → conduct_cli-0.9.5}/tests/test_switch.py

@@ -197,3 +197,33 @@ def test_whoami_prints_all_sections(tmp_path, capsys):
     assert "sudhi@b2bsphere.com" in out
     assert "3 rules" in out
     assert "Booster" in out
+
+
+# ---------------------------------------------------------------------------
+# Regression: cmd_switch must accept `api_url` when `server` is absent.
+# `conduct login` writes `api_url`; older cmd_switch only read `server`
+# and falsely reported "Not logged in".
+# ---------------------------------------------------------------------------
+
+def test_switch_accepts_api_url_key(tmp_path, capsys):
+    """conduct switch works when config was written by `conduct login` (api_url only)."""
+    from conduct_cli import main as m
+
+    cfg_path = tmp_path / "config.json"
+    cfg_path.write_text(json.dumps({
+        "api_url":     "https://api.conductai.ai",
+        "agent_token": "cond_agt_testkey",
+        "workspace":   "ef0a7e36-0000-0000-0000-000000000001",
+    }))
+
+    args = _make_args(workspace=None)
+
+    with (
+        patch.object(m, "CONFIG_PATH", cfg_path),
+        patch.object(m.api, "req", return_value=_fake_workspaces()),
+    ):
+        m.cmd_switch(args)
+
+    out = capsys.readouterr().out
+    assert "Not logged in" not in out
+    assert "Engineering" in out