conduct-cli 0.4.44__tar.gz → 0.4.46__tar.gz

{conduct_cli-0.4.44 → conduct_cli-0.4.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.44
+Version: 0.4.46
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: pyyaml>=6.0
+Requires-Dist: rich>=13.0
 
 # conduct-cli
 

{conduct_cli-0.4.44 → conduct_cli-0.4.46}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conduct-cli"
-version = "0.4.44"
+version = "0.4.46"
 description = "CLI for Conduct AI — install agents, manage projects, run tests"
 readme = "README.md"
 license = { text = "MIT" }
@@ -23,7 +23,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Topic :: Software Development :: Libraries :: Application Frameworks",
 ]
-dependencies = ["pyyaml>=6.0"]
+dependencies = ["pyyaml>=6.0", "rich>=13.0"]
 
 [project.urls]
 Homepage    = "https://conductai.ai"

{conduct_cli-0.4.44 → conduct_cli-0.4.46}/src/conduct_cli/main.py

@@ -1756,80 +1756,258 @@ def _render_table(rows: list[dict]) -> str:
     return "\n".join(lines)
 
 
-def _render_tui(rows: list[dict]) -> None:
-    """Full-screen TUI with live refresh using ANSI escape codes."""
+def _fetch_runs(cfg: dict) -> list[dict]:
+    """Fetch recent runs from GET /runs."""
+    server  = cfg.get("server", "").rstrip("/")
+    api_key = cfg.get("api_key", "")
+    ws_id   = cfg.get("workspace", "")
+    if not all([server, api_key, ws_id]):
+        return []
     try:
-        import shutil
-        import signal
-
-        stop = False
-        def _sigint(sig, frame):
-            nonlocal stop
-            stop = True
-        signal.signal(signal.SIGINT, _sigint)
-
-        def _clear():
-            sys.stdout.write("\033[2J\033[H")
-            sys.stdout.flush()
-
-        def _render_frame(rows):
-            cols, _ = shutil.get_terminal_size((120, 40))
-            out = []
-
-            # Header bar
-            title = " conduct sessions  (TUI — q or Ctrl+C to quit) "
-            pad   = max(0, cols - len(title))
-            out.append(f"{BOLD}\033[44m{title}{' ' * pad}\033[0m")
-            out.append("")
-
-            # Summary line
-            active = sum(1 for r in rows if r["alive"])
-            guard_on = sum(1 for r in rows if r["guard"])
-            out.append(f"  {BOLD}{active}{RESET} active session(s)  ·  {BOLD}{guard_on}{RESET} with Guard  ·  refreshing every 5s")
-            out.append("")
-
-            # Table
-            out.append(_render_table(rows))
-
-            # Context pressure panel — sessions above 60%
-            high = [r for r in rows if r["ctx_pct"] >= 60 and r["alive"]]
-            if high:
-                out.append(f"  {YELLOW}{BOLD}⚠ Context pressure{RESET}")
-                for r in high:
-                    color = RED if r["ctx_pct"] >= 80 else YELLOW
-                    out.append(f"    {color}{r['project']}{RESET}  ({r['session_id']})  {r['ctx_pct']}% — consider /compact")
-                out.append("")
-
-            sys.stdout.write("\n".join(out))
-            sys.stdout.flush()
-
-        # Use raw terminal input for 'q' detection (non-blocking)
-        import select, tty, termios
-        old = termios.tcgetattr(sys.stdin)
+        hdrs = {"Content-Type": "application/json", "X-Api-Key": api_key}
+        data = api.req("GET", f"{server}/runs?limit=15&workspace_id={ws_id}", hdrs)
+        runs = data if isinstance(data, list) else data.get("runs", data.get("items", []))
+        return runs[:15]
+    except Exception:
+        return []
+
+
+def _fetch_guard_activity(cfg: dict, guard_cfg: dict) -> list[dict]:
+    """Fetch recent Guard events grouped by developer."""
+    server  = cfg.get("server", "").rstrip("/")
+    api_key = cfg.get("api_key", "")
+    ws_id   = cfg.get("workspace", "")
+    if not all([server, api_key, ws_id]):
+        return []
+    try:
+        hdrs = {"Content-Type": "application/json", "X-Api-Key": api_key}
+        data = api.req("GET", f"{server}/guard/events?workspace_id={ws_id}&limit=200", hdrs)
+        events = data if isinstance(data, list) else data.get("events", [])
+        # Group by user_email
+        devs: dict[str, dict] = {}
+        for e in events:
+            email   = e.get("user_email") or e.get("email") or "unknown"
+            blocked = e.get("decision") == "block"
+            tokens  = e.get("tokens_used") or e.get("tokens", 0) or 0
+            if email not in devs:
+                devs[email] = {"email": email, "calls": 0, "blocked": 0, "tokens": 0}
+            devs[email]["calls"]   += 1
+            devs[email]["blocked"] += int(blocked)
+            devs[email]["tokens"]  += tokens
+        return sorted(devs.values(), key=lambda d: d["calls"], reverse=True)
+    except Exception:
+        return []
+
+
+def _render_tui(rows: list[dict]) -> None:
+    """Full-screen TUI with live refresh. Uses rich.live if available, else ANSI loop."""
+
+    cfg       = _load_config()
+    guard_cfg = {}
+    _gp = Path.home() / ".conductguard" / "config.json"
+    if _gp.exists():
         try:
-            tty.setcbreak(sys.stdin.fileno())
-            while not stop:
-                _clear()
-                rows = _load_sessions()
-                _render_frame(rows)
-                # Wait up to 5s, exit on 'q'
-                for _ in range(50):
-                    if select.select([sys.stdin], [], [], 0.1)[0]:
-                        ch = sys.stdin.read(1)
-                        if ch in ("q", "Q"):
-                            stop = True
-                            break
-                    if stop:
-                        break
-        finally:
-            termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old)
-            _clear()
-            print("conduct sessions exited.")
+            guard_cfg = json.loads(_gp.read_text())
+        except Exception:
+            pass
 
-    except Exception as e:
-        # Graceful fallback to table if TUI setup fails
-        print(f"{YELLOW}TUI unavailable ({e}), showing table:{RESET}")
+    def _build_rich_display(rows):
+        from rich.table import Table
+        from rich.panel import Panel
+        from rich.columns import Columns
+        from rich import box
+        from rich.text import Text
+
+        active   = sum(1 for r in rows if r["alive"])
+        guard_on = sum(1 for r in rows if r["guard"])
+        high_ctx = [r for r in rows if r["ctx_pct"] >= 60 and r["alive"]]
+
+        # Main sessions table
+        tbl = Table(box=box.ROUNDED, expand=True, show_header=True, header_style="bold white")
+        tbl.add_column("AI",      width=4,  style="bold")
+        tbl.add_column("Project", min_width=14)
+        tbl.add_column("Session", width=10, style="dim")
+        tbl.add_column("Model",   min_width=14)
+        tbl.add_column("CTX",     width=16)
+        tbl.add_column("Tokens",  width=10, justify="right")
+        tbl.add_column("Turns",   width=6,  justify="right")
+        tbl.add_column("Guard",   width=6,  justify="center")
+        tbl.add_column("Status",  width=8)
+
+        for r in rows:
+            ai_text     = Text(r.get("ai", "CC"), style="bold cyan" if r.get("ai") == "CD" else "bold blue")
+            status_text = Text("active", style="green") if r["alive"] else Text("idle", style="dim")
+            guard_text  = Text("✓", style="green") if r["guard"] else Text("—", style="dim")
+            model_short = r["model"].replace("claude-", "").replace("-20", " 20") if r["model"] not in ("—", "") else "—"
+
+            pct = r["ctx_pct"]
+            if pct:
+                filled = round(pct / 100 * 10)
+                bar    = "█" * filled + "░" * (10 - filled)
+                color  = "red" if pct >= 80 else "yellow" if pct >= 60 else "green"
+                ctx_text = Text(f"{bar} {pct}%", style=color)
+            else:
+                ctx_text = Text("—", style="dim")
+
+            tbl.add_row(
+                ai_text,
+                r["project"],
+                r["session_id"],
+                model_short,
+                ctx_text,
+                _fmt_tokens(r["ctx_tokens"]) if r["ctx_tokens"] else "—",
+                str(r["turns"]),
+                guard_text,
+                status_text,
+            )
+
+        # Summary header
+        summary = f"[bold]{active}[/] active  ·  [bold]{guard_on}[/] with Guard  ·  [dim]refreshing every 5s — Ctrl+C to quit[/]"
+
+        panels = [Panel(tbl, title="[bold blue]● My Sessions[/]", subtitle=summary, expand=True)]
+
+        # Context pressure panel
+        if high_ctx:
+            warnings = "\n".join(
+                f"[{'red' if r['ctx_pct'] >= 80 else 'yellow'}]{r['project']}[/]  "
+                f"[dim]{r['session_id']}[/]  {r['ctx_pct']}% — consider /compact"
+                for r in high_ctx
+            )
+            panels.append(Panel(warnings, title="[yellow bold]⚠ Context pressure[/]", expand=True))
+
+        # Agent Runs panel
+        run_data = _fetch_runs(cfg)
+        runs_tbl = Table(box=box.SIMPLE, expand=True, show_header=True, header_style="bold white")
+        runs_tbl.add_column("Agent",      min_width=22)
+        runs_tbl.add_column("Status",     width=12)
+        runs_tbl.add_column("Duration",   width=10, justify="right")
+        runs_tbl.add_column("Project",    min_width=14)
+        runs_tbl.add_column("Triggered",  width=12)
+
+        if run_data:
+            for r in run_data:
+                status  = r.get("status", "")
+                scolor  = {"running": "green", "succeeded": "dim green", "failed": "red",
+                           "paused": "yellow", "pending": "cyan", "cancelled": "dim"}.get(status, "white")
+                sicon   = {"running": "●", "succeeded": "✓", "failed": "✗",
+                           "paused": "⏸", "pending": "○", "cancelled": "—"}.get(status, "?")
+                # Duration
+                created = r.get("created_at") or r.get("started_at") or 0
+                ended   = r.get("completed_at") or r.get("finished_at") or 0
+                if created and ended:
+                    secs = int(ended - created)
+                    dur  = f"{secs//60}:{secs%60:02d}"
+                elif created and status == "running":
+                    import datetime as _dt
+                    secs = int(time.time() - (created if created > 1e10 else created))
+                    dur  = f"{secs//60}:{secs%60:02d}"
+                else:
+                    dur = "—"
+                agent_name   = r.get("workflow_name") or r.get("name") or "—"
+                project_name = r.get("project_name") or r.get("project") or "—"
+                trigger      = r.get("trigger_type") or r.get("triggered_by") or "manual"
+                runs_tbl.add_row(
+                    agent_name[:28],
+                    Text(f"{sicon} {status}", style=scolor),
+                    dur,
+                    project_name[:18],
+                    trigger[:12],
+                )
+        else:
+            runs_tbl.add_row("[dim]No runs yet or not connected[/]", "", "", "", "")
+
+        panels.append(Panel(runs_tbl, title="[bold green]▶ Agent Runs[/]", expand=True))
+
+        # Team Activity panel (Guard)
+        team_data = _fetch_guard_activity(cfg, guard_cfg)
+        team_tbl  = Table(box=box.SIMPLE, expand=True, show_header=True, header_style="bold white")
+        team_tbl.add_column("Developer",  min_width=28)
+        team_tbl.add_column("Calls",      width=8,  justify="right")
+        team_tbl.add_column("Blocked",    width=8,  justify="right")
+        team_tbl.add_column("Tokens",     width=10, justify="right")
+        team_tbl.add_column("Guard",      width=7,  justify="center")
+
+        if team_data:
+            for d in team_data:
+                blocked_text = Text(str(d["blocked"]), style="red bold" if d["blocked"] else "dim")
+                guard_text   = Text("✓", style="green")
+                team_tbl.add_row(
+                    d["email"][:32],
+                    str(d["calls"]),
+                    blocked_text,
+                    _fmt_tokens(d["tokens"]),
+                    guard_text,
+                )
+        else:
+            team_tbl.add_row("[dim]No team activity or not connected[/]", "", "", "", "")
+
+        panels.append(Panel(team_tbl, title="[bold magenta]👥 Team Activity (Guard)[/]", expand=True))
+
+        from rich.console import Group
+        return Group(*panels)
+
+    # Try rich.live first (works without raw TTY)
+    try:
+        from rich.live import Live
+        from rich.console import Console
+        console = Console()
+        with Live(console=console, refresh_per_second=0.2, screen=True) as live:
+            while True:
+                live.update(_build_rich_display(_load_sessions()))
+                time.sleep(5)
+        return
+    except KeyboardInterrupt:
+        return
+    except ImportError:
+        pass  # fall through to ANSI loop
+
+    # ANSI fallback — requires real TTY
+    if not sys.stdin.isatty():
+        print(f"{YELLOW}TUI requires a real terminal. Run directly in your shell, not via a subprocess.{RESET}")
         print(_render_table(rows))
+        return
+
+    import shutil, signal, select, tty, termios
+    stop = False
+    def _sig(s, f): nonlocal stop; stop = True
+    signal.signal(signal.SIGINT, _sig)
+
+    def _frame(rows):
+        cols, _ = shutil.get_terminal_size((120, 40))
+        title = " conduct sessions  (Ctrl+C or q to quit) "
+        pad   = max(0, cols - len(title))
+        active   = sum(1 for r in rows if r["alive"])
+        guard_on = sum(1 for r in rows if r["guard"])
+        out = [
+            f"{BOLD}\033[44m{title}{' ' * pad}\033[0m",
+            f"\n  {BOLD}{active}{RESET} active  ·  {BOLD}{guard_on}{RESET} with Guard  ·  refreshing every 5s\n",
+            _render_table(rows),
+        ]
+        high = [r for r in rows if r["ctx_pct"] >= 60 and r["alive"]]
+        if high:
+            out.append(f"  {YELLOW}{BOLD}⚠ Context pressure{RESET}")
+            for r in high:
+                c = RED if r["ctx_pct"] >= 80 else YELLOW
+                out.append(f"    {c}{r['project']}{RESET} ({r['session_id']}) {r['ctx_pct']}% — consider /compact")
+        sys.stdout.write("\033[2J\033[H" + "\n".join(out))
+        sys.stdout.flush()
+
+    old = termios.tcgetattr(sys.stdin)
+    try:
+        tty.setcbreak(sys.stdin.fileno())
+        while not stop:
+            _frame(_load_sessions())
+            for _ in range(50):
+                if select.select([sys.stdin], [], [], 0.1)[0]:
+                    if sys.stdin.read(1) in ("q", "Q"):
+                        stop = True
+                        break
+                if stop:
+                    break
+    finally:
+        termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old)
+        sys.stdout.write("\033[2J\033[H")
+        print("conduct sessions exited.")
 
 
 def cmd_sessions(args):

{conduct_cli-0.4.44 → conduct_cli-0.4.46}/src/conduct_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.44
+Version: 0.4.46
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: pyyaml>=6.0
+Requires-Dist: rich>=13.0
 
 # conduct-cli
 

{conduct_cli-0.4.44 → conduct_cli-0.4.46}/src/conduct_cli.egg-info/requires.txt

@@ -1 +1,2 @@
 pyyaml>=6.0
+rich>=13.0