conduct-cli 0.4.43__tar.gz → 0.4.45__tar.gz

{conduct_cli-0.4.43 → conduct_cli-0.4.45}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conduct-cli"
-version = "0.4.43"
+version = "0.4.45"
 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.43 → conduct_cli-0.4.45}/src/conduct_cli/main.py

@@ -1460,6 +1460,7 @@ def cmd_whoami(args):
 
 _CLAUDE_SESSIONS = Path.home() / ".claude" / "sessions"
 _CLAUDE_PROJECTS = Path.home() / ".claude" / "projects"
+_CODEX_SESSIONS  = Path.home() / ".codex" / "sessions"
 
 # Context window limits by model prefix (tokens)
 _CTX_LIMITS = {
@@ -1539,6 +1540,116 @@ def _session_stats(session_id: str, project_dir: Path) -> dict:
     }
 
 
+def _codex_running_cwds() -> set[str]:
+    """Return cwds of any running codex processes via /proc or ps."""
+    cwds: set[str] = set()
+    try:
+        import subprocess as _sp
+        out = _sp.run(["ps", "aux"], capture_output=True, text=True).stdout
+        for line in out.splitlines():
+            if "codex" in line and "grep" not in line:
+                # Extract cwd from lsof for each codex PID
+                parts = line.split()
+                if parts:
+                    pid = parts[1]
+                    try:
+                        r = _sp.run(["lsof", "-p", pid, "-a", "-d", "cwd", "-Fn"],
+                                    capture_output=True, text=True, timeout=1)
+                        for l in r.stdout.splitlines():
+                            if l.startswith("n"):
+                                cwds.add(l[1:])
+                    except Exception:
+                        pass
+    except Exception:
+        pass
+    return cwds
+
+
+def _codex_session_stats(jsonl_path: Path) -> dict:
+    """Parse a Codex JSONL session file for model, ctx window, and turn count."""
+    model = ""
+    ctx_limit = 0
+    turns = 0
+    cwd = ""
+    try:
+        for raw in jsonl_path.read_bytes().splitlines():
+            try:
+                entry = json.loads(raw)
+            except Exception:
+                continue
+            t = entry.get("type", "")
+            p = entry.get("payload", {})
+            if t == "session_meta":
+                cwd = p.get("cwd", "")
+            if t == "turn_context":
+                model = p.get("model", model)
+                turns += 1
+            if t == "event_msg" and not ctx_limit:
+                ctx_limit = p.get("model_context_window", 0)
+    except Exception:
+        pass
+
+    return {"model": model, "ctx_limit": ctx_limit, "turns": turns, "cwd": cwd}
+
+
+def _load_codex_sessions(active_cwds: set[str]) -> list[dict]:
+    """Find recent Codex sessions from ~/.codex/sessions/YYYY/MM/DD/."""
+    if not _CODEX_SESSIONS.exists():
+        return []
+
+    guard_cfg = Path.home() / ".conductguard" / "config.json"
+    guard_on  = guard_cfg.exists()
+
+    rows = []
+    # Walk the last 2 days of session dirs
+    from datetime import datetime, timedelta
+    today = datetime.now()
+    date_dirs = []
+    for delta in (0, 1):
+        d = today - timedelta(days=delta)
+        date_dirs.append(_CODEX_SESSIONS / str(d.year) / f"{d.month:02d}" / f"{d.day:02d}")
+
+    seen: set[str] = set()
+    for date_dir in date_dirs:
+        if not date_dir.exists():
+            continue
+        for f in sorted(date_dir.iterdir(), reverse=True):
+            if not f.suffix == ".jsonl":
+                continue
+            session_id = f.stem.split("-", 1)[-1] if "-" in f.stem else f.stem
+            if session_id in seen:
+                continue
+            seen.add(session_id)
+
+            stats = _codex_session_stats(f)
+            cwd   = stats.get("cwd", "")
+            alive = cwd in active_cwds
+
+            ctx_limit  = stats.get("ctx_limit", 0) or 200_000
+            # Codex doesn't expose per-turn token counts in JSONL — show turns only
+            ctx_pct    = 0
+
+            rows.append({
+                "pid":        "—",
+                "session_id": session_id[:8],
+                "project":    Path(cwd).name if cwd else "—",
+                "cwd":        cwd,
+                "model":      stats.get("model", "—"),
+                "turns":      stats.get("turns", 0),
+                "ctx_pct":    ctx_pct,
+                "ctx_tokens": 0,
+                "total_in":   0,
+                "total_out":  0,
+                "guard":      guard_on,
+                "alive":      alive,
+                "kind":       "codex",
+                "started_at": int(f.stat().st_mtime * 1000),
+                "ai":         "CD",
+            })
+
+    return rows
+
+
 def _load_sessions() -> list[dict]:
     """Read ~/.claude/sessions/*.json and join with JSONL stats."""
     if not _CLAUDE_SESSIONS.exists():
@@ -1590,8 +1701,13 @@ def _load_sessions() -> list[dict]:
             "alive":      alive,
             "kind":       kind,
             "started_at": started_at,
+            "ai":         "CC",
         })
 
+    # Merge Codex sessions
+    active_cwds = _codex_running_cwds()
+    rows += _load_codex_sessions(active_cwds)
+
     return sorted(rows, key=lambda r: r["started_at"], reverse=True)
 
 
@@ -1616,21 +1732,23 @@ def _render_table(rows: list[dict]) -> str:
 
     lines = []
     header = (
-        f"  {BOLD}{'PROJECT':<18} {'SESSION':<10} {'MODEL':<18} "
+        f"  {BOLD}{'AI':<4} {'PROJECT':<18} {'SESSION':<10} {'MODEL':<18} "
         f"{'CTX':>14}   {'TOKENS IN':>10} {'TURNS':>6} {'GUARD':>6} {'STATUS':>8}{RESET}"
     )
     lines.append(header)
-    lines.append("  " + "─" * 95)
+    lines.append("  " + "─" * 100)
 
     for r in rows:
-        status_str = f"{GREEN}active{RESET}" if r["alive"] else f"{GRAY}idle{RESET}"
-        guard_str  = f"{GREEN}✓{RESET}" if r["guard"] else f"{GRAY}—{RESET}"
-        model_short = r["model"].replace("claude-", "").replace("-20", " 20") if r["model"] != "—" else "—"
+        status_str  = f"{GREEN}active{RESET}" if r["alive"] else f"{GRAY}idle{RESET}"
+        guard_str   = f"{GREEN}✓{RESET}" if r["guard"] else f"{GRAY}—{RESET}"
+        model_short = r["model"].replace("claude-", "").replace("-20", " 20") if r["model"] not in ("—", "") else "—"
         ctx_display = _ctx_bar(r["ctx_pct"]) if r["ctx_pct"] else f"{GRAY}{'—':>14}{RESET}"
         tokens_str  = _fmt_tokens(r["ctx_tokens"]) if r["ctx_tokens"] else "—"
+        ai_label    = r.get("ai", "CC")
+        ai_color    = CYAN if ai_label == "CD" else BLUE
 
         lines.append(
-            f"  {r['project']:<18} {r['session_id']:<10} {model_short:<18} "
+            f"  {ai_color}{ai_label:<4}{RESET} {r['project']:<18} {r['session_id']:<10} {model_short:<18} "
             f"{ctx_display}   {tokens_str:>10} {r['turns']:>6} {guard_str:>6}   {status_str}"
         )
 
@@ -1639,79 +1757,137 @@ def _render_table(rows: list[dict]) -> str:
 
 
 def _render_tui(rows: list[dict]) -> None:
-    """Full-screen TUI with live refresh using ANSI escape codes."""
+    """Full-screen TUI with live refresh. Uses rich.live if available, else ANSI loop."""
+
+    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]conduct 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))
+
+        from rich.console import Group
+        return Group(*panels)
+
+    # Try rich.live first (works without raw TTY)
     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)
-        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.")
+        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
 
-    except Exception as e:
-        # Graceful fallback to table if TUI setup fails
-        print(f"{YELLOW}TUI unavailable ({e}), showing table:{RESET}")
+    # 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.43 → conduct_cli-0.4.45}/src/conduct_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.43
+Version: 0.4.45
 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.43 → conduct_cli-0.4.45}/src/conduct_cli.egg-info/requires.txt

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