adding better markdown extracting and filter out to not have broken staff, allow that session can list over multiple browsers

browser_cli/commands/session.py

@@ -1,14 +1,13 @@
 import click
-import json
-from browser_cli.client import send_command, BrowserNotConnected
+from browser_cli.client import active_browser_targets, send_command, BrowserNotConnected
 from rich.console import Console
 
 console = Console()
 
 
-def _handle(command, args=None):
+def _handle(command, args=None, profile=None):
     try:
-        return send_command(command, args or {})
+        return send_command(command, args or {}, profile=profile)
     except BrowserNotConnected as e:
         console.print(f"[red]Error:[/red] {e}")
         raise SystemExit(1)
@@ -17,6 +16,23 @@ def _handle(command, args=None):
         raise SystemExit(1)
 
 
+def _handle_multi(command, args=None, profile=None):
+    try:
+        return send_command(command, args or {}, profile=profile)
+    except (BrowserNotConnected, RuntimeError):
+        return None
+
+
+def _multi_browser_targets():
+    root = click.get_current_context().find_root()
+    if root.obj.get("browser_explicit"):
+        return []
+    targets = active_browser_targets()
+    if len(targets) <= 1:
+        return []
+    return targets
+
+
 @click.group("session")
 def session_group():
     """Save and restore browser sessions."""
@@ -71,18 +87,35 @@ def session_diff(name_a, name_b):
 def session_list():
     """List all saved sessions."""
     from rich.table import Table
-    sessions = _handle("session.list")
+    targets = _multi_browser_targets()
+    show_browser = bool(targets)
+    if targets:
+        sessions = []
+        for target in targets:
+            result = _handle_multi("session.list", profile=target.profile)
+            if result is None:
+                continue
+            sessions.extend({**session, "browser": target.display_name} for session in result)
+        if not sessions:
+            console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
+            raise SystemExit(1)
+    else:
+        sessions = _handle("session.list")
     if not sessions:
         console.print("[yellow]No saved sessions[/yellow]")
         return
     table = Table(show_header=True, header_style="bold cyan")
+    if show_browser:
+        table.add_column("Browser")
     table.add_column("Name")
     table.add_column("Tabs", width=6)
     table.add_column("Saved at")
     for s in sessions:
         from datetime import datetime
         saved = datetime.fromtimestamp(s["savedAt"] / 1000).strftime("%Y-%m-%d %H:%M") if s.get("savedAt") else ""
-        table.add_row(s["name"], str(s["tabs"]), saved)
+        row = [s.get("browser", "")] if show_browser else []
+        row.extend([s["name"], str(s["tabs"]), saved])
+        table.add_row(*row)
     console.print(table)