dayhoff-tools 1.8.1__tar.gz → 1.8.3__tar.gz

{dayhoff_tools-1.8.1 → dayhoff_tools-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.8.1
+Version: 1.8.3
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.8.1 → dayhoff_tools-1.8.3}/dayhoff_tools/cli/engine_commands.py

@@ -841,21 +841,56 @@ def engine_status(
         else f"[bold]Started:[/bold]     {launch_time.strftime('%Y-%m-%d %H:%M:%S')} ({format_duration(uptime)} ago)"
     )
 
+    # ---------------- Front-loaded summary ----------------
+    running_state = engine["state"].lower()
+    if running_state == "running":
+        run_disp = "[green]Running[/green]"
+    elif running_state == "pending":
+        run_disp = "[yellow]Starting...[/yellow]"
+    elif running_state == "stopped":
+        run_disp = "[dim]Stopped[/dim]"
+    else:
+        run_disp = engine["state"]
+
+    active_disp = (
+        "[green]Active[/green]"
+        if idle_detector.get("status") == "active"
+        else "[dim]Idle[/dim]"
+    )
+
+    top_lines = [
+        f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}",
+    ]
+
+    # Studios summary next, with studio name in purple/magenta
+    studios_line = None
+    if attached_studios:
+        stu_texts = [
+            f"[magenta]{s.get('user', 'studio')}[/magenta] ({s.get('studio_id', 'unknown')})"
+            for s in attached_studios
+        ]
+        studios_line = "Studios: " + ", ".join(stu_texts)
+        top_lines.append(studios_line)
+
+    # Paragraph break
+    top_lines.append("")
+
+    # ---------------- Details block (white/default) ----------------
     status_lines = [
-        f"[bold]Name:[/bold]        {engine['name']}",
-        f"[bold]Instance:[/bold]    {engine['instance_id']}",
-        f"[bold]Type:[/bold]        {engine['engine_type']} ({engine['instance_type']})",
-        f"[bold]Status:[/bold]      {format_status(engine['state'], engine.get('ready'))}",
-        f"[bold]User:[/bold]        {engine['user']}",
-        f"[bold]IP:[/bold]          {engine.get('public_ip', 'N/A')}",
+        f"Name:        {engine['name']}",
+        f"Instance:    {engine['instance_id']}",
+        f"Type:        {engine['engine_type']} ({engine['instance_type']})",
+        f"Status:      {engine['state']}",
+        f"User:        {engine['user']}",
+        f"IP:          {engine.get('public_ip', 'N/A')}",
         started_line,
-        f"[bold]$/hour:[/bold]     ${hourly_cost:.2f}",
+        f"$/hour:     ${hourly_cost:.2f}",
     ]
 
     # Disk usage (like list --detailed)
     if engine["state"].lower() == "running":
         disk_usage = get_disk_usage_via_ssm(engine["instance_id"]) or "-"
-        status_lines.append(f"[bold]Disk:[/bold]       {disk_usage}")
+        status_lines.append(f"Disk:       {disk_usage}")
 
     # Health report (only if bootstrap finished)
     if stage_val == "finished":
@@ -954,16 +989,8 @@ def engine_status(
         except Exception:
             return None
 
-    # Enrich missing fields or provide full fallback when API lacks details
-    overlay = (
-        _fetch_idle_summary_via_ssm(engine["instance_id"])
-        if not idle_detector.get("available")
-        or not any(
-            k in idle_detector
-            for k in ("ide_connections", "ssh_sessions", "coffee_lock")
-        )
-        else None
-    )
+    # Always try to enrich from on-engine summary (fast, best-effort)
+    overlay = _fetch_idle_summary_via_ssm(engine["instance_id"])
     if overlay:
         # If API didn't indicate availability, replace entirely; otherwise fill gaps
         if not idle_detector.get("available"):
@@ -972,68 +999,37 @@ def engine_status(
             for k, v in overlay.items():
                 idle_detector.setdefault(k, v)
 
-    # Idle detector status (API and/or on-engine fallback)
+    # Activity Sensors (show all with YES/no)
     if idle_detector.get("available"):
         status_lines.append("")
-        status_lines.append("[bold]Idle Detector:[/bold]")
-
-        # Overall status
-        if idle_detector["status"] == "active":
-            status_lines.append("  [green]✓ Engine ACTIVE[/green]")
-        else:
-            idle_seconds = idle_detector.get("idle_seconds", 0)
-            idle_threshold = idle_detector.get("idle_threshold", 1800)
-            idle_minutes = idle_seconds // 60
-            threshold_minutes = idle_threshold // 60
-            status_lines.append(
-                f"  [yellow]⏱ Engine IDLE ({idle_minutes}/{threshold_minutes} minutes)[/yellow]"
-            )
-
-        # Coffee lock
-        if idle_detector.get("coffee_lock"):
-            status_lines.append(
-                f"  • [cyan]☕ Caffeinated for another {idle_detector['coffee_lock']}[/cyan]"
+        status_lines.append("[bold]Activity Sensors:[/bold]")
+        reasons_raw = idle_detector.get("_reasons_raw", []) or []
+        by_sensor: Dict[str, Dict[str, Any]] = {}
+        for r in reasons_raw:
+            nm = r.get("sensor")
+            if nm:
+                by_sensor[nm] = r
+
+        def _sensor_line(label: str, key: str, emoji: str) -> str:
+            r = by_sensor.get(key, {})
+            active = bool(r.get("active"))
+            reason_txt = r.get("reason") or ("" if not active else "active")
+            flag = "[green]YES[/green]" if active else "no"
+            return (
+                f"  {emoji} {label}: {flag} {('- ' + reason_txt) if reason_txt else ''}"
             )
 
-        # SSH sessions
-        ssh_sessions = idle_detector.get("ssh_sessions", [])
-        if ssh_sessions:
-            status_lines.append(f"  • [blue]SSH Sessions ({len(ssh_sessions)}):[/blue]")
-            for session in ssh_sessions:
-                idle_time = session.get("idle_time")
-                if isinstance(idle_time, (int, float)):
-                    idle_disp = f"{int(idle_time)//60}m"
-                else:
-                    idle_disp = str(idle_time) if idle_time else "0m"
-                status_lines.append(
-                    f"    - {session.get('tty', 'pts/?')} (pid {session.get('pid', '?')}, idle {idle_disp}) from {session.get('from_ip', 'unknown')}"
-                )
-
-        # IDE connections
-        ide_conn = idle_detector.get("ide_connections")
-        if ide_conn:
-            status_lines.append(
-                f"  • [magenta]🖥  IDE connected ({ide_conn['connection_count']} connections)[/magenta]"
-            )
-
-        # Sensors contributing to ACTIVE
-        reasons_raw = idle_detector.get("_reasons_raw")
-        if isinstance(reasons_raw, list):
-            active_sensors = [r for r in reasons_raw if r.get("active")]
-            if active_sensors:
-                status_lines.append("")
-                status_lines.append("[bold]Active Sensors:[/bold]")
-                for r in active_sensors:
-                    sensor = r.get("sensor", "Sensor")
-                    reason = r.get("reason") or "active"
-                    status_lines.append(f"  • {sensor}: {reason}")
+        status_lines.append(_sensor_line("Coffee", "CoffeeLockSensor", "☕"))
+        status_lines.append(_sensor_line("Shell", "ActiveLoginSensor", "🐚"))
+        status_lines.append(_sensor_line("IDE", "IDEConnectionSensor", "🖥"))
+        status_lines.append(_sensor_line("Docker", "DockerWorkloadSensor", "🐳"))
 
     # Audit one-liner (best-effort SSM fetch)
     try:
         last_audit = _fetch_last_audit_via_ssm(engine["instance_id"])
         if last_audit:
             status_lines.append("")
-            status_lines.append("[bold]Idle Audit:[/bold]")
+            status_lines.append("[bold]Shutdown Audit:[/bold]")
             status_lines.append(f"  • {_summarize_audit(last_audit)}")
     except Exception:
         pass
@@ -1044,8 +1040,10 @@ def engine_status(
         for studio in attached_studios:
             status_lines.append(f"  • {studio['user']} ({studio['studio_id']})")
 
+    # Combine top summary and details
+    all_lines = top_lines + status_lines
     console.print(
-        Panel("\n".join(status_lines), title="Engine Status", border_style="blue")
+        Panel("\n".join(all_lines), title="Engine Status", border_style="blue")
     )
 
     if show_log:

{dayhoff_tools-1.8.1 → dayhoff_tools-1.8.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.8.1"
+version = "1.8.3"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}