add multi browser mode to arragate data from all browsers by tabs list, tabs count, group list, group count and windows list

remove (unnamed) into the group names just leave it a empty string, remove Focused on windows how should the browser know what windows are focused

browser_cli/commands/groups.py

@@ -1,14 +1,14 @@
 import click
-from browser_cli.client import send_command, BrowserNotConnected
+from browser_cli.client import BrowserNotConnected, active_browser_targets, send_command
 from rich.console import Console
 from rich.table import Table
 
 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,24 +17,45 @@ def _handle(command, args=None):
         raise SystemExit(1)
 
 
-def _print_groups(groups: list[dict]) -> None:
+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
+
+
+def _print_groups(groups: list[dict], *, show_browser: bool = False) -> None:
     if not groups:
         console.print("[yellow]No groups found[/yellow]")
         return
     table = Table(show_header=True, header_style="bold cyan")
+    if show_browser:
+        table.add_column("Browser")
     table.add_column("ID", style="dim", no_wrap=True)
     table.add_column("Name")
     table.add_column("Color", width=10)
     table.add_column("Collapsed", width=10)
     table.add_column("Tabs", width=6)
     for g in groups:
-        table.add_row(
+        row = [
+            g.get("browser", "") if show_browser else None,
             str(g.get("id", "")),
-            g.get("title") or "(unnamed)",
+            g.get("title") or "",
             g.get("color") or "",
             "yes" if g.get("collapsed") else "no",
             str(g.get("tabCount", "")),
-        )
+        ]
+        table.add_row(*[value for value in row if value is not None])
     console.print(table)
 
 
@@ -46,6 +67,19 @@ def group_group():
 @group_group.command("list")
 def group_list():
     """List all tab groups."""
+    targets = _multi_browser_targets()
+    if targets:
+        groups = []
+        for target in targets:
+            result = _handle_multi("group.list", profile=target.profile)
+            if result is None:
+                continue
+            groups.extend({**group, "browser": target.display_name} for group in result)
+        if not groups:
+            console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
+            raise SystemExit(1)
+        _print_groups(groups, show_browser=True)
+        return
     groups = _handle("group.list")
     _print_groups(groups or [])
 
@@ -62,6 +96,27 @@ def group_tabs(group_id):
 @group_group.command("count")
 def group_count():
     """Count all tab groups."""
+    targets = _multi_browser_targets()
+    if targets:
+        table = Table(show_header=True, header_style="bold cyan")
+        table.add_column("Browser")
+        table.add_column("Groups", justify="right")
+        total = 0
+        rows = 0
+        for target in targets:
+            count = _handle_multi("group.count", profile=target.profile)
+            if count is None:
+                continue
+            count = int(count or 0)
+            total += count
+            rows += 1
+            table.add_row(target.display_name, str(count))
+        if rows == 0:
+            console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
+            raise SystemExit(1)
+        table.add_row("Total", str(total))
+        console.print(table)
+        return
     count = _handle("group.count")
     console.print(f"[bold]{count}[/bold] group(s)")
 

browser_cli/commands/tabs.py

@@ -1,14 +1,14 @@
 import click
-from browser_cli.client import send_command, BrowserNotConnected
+from browser_cli.client import BrowserNotConnected, active_browser_targets, send_command
 from rich.console import Console
 from rich.table import Table
 
 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,11 +17,30 @@ def _handle(command, args=None):
         raise SystemExit(1)
 
 
-def _print_tabs(tabs: list[dict]) -> None:
+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
+
+
+def _print_tabs(tabs: list[dict], *, show_browser: bool = False) -> None:
     if not tabs:
         console.print("[yellow]No tabs found[/yellow]")
         return
     table = Table(show_header=True, header_style="bold cyan")
+    if show_browser:
+        table.add_column("Browser", no_wrap=True)
     table.add_column("ID", style="dim", no_wrap=True)
     table.add_column("Window", no_wrap=True)
     table.add_column("Active", width=7)
@@ -29,13 +48,15 @@ def _print_tabs(tabs: list[dict]) -> None:
     table.add_column("URL")
     for t in tabs:
         active = "[green]✓[/green]" if t.get("active") else ""
-        table.add_row(
+        row = [
+            t.get("browser", "") if show_browser else None,
             str(t.get("id", "")),
             str(t.get("windowId", "")),
             active,
             (t.get("title") or "")[:60],
             (t.get("url") or "")[:80],
-        )
+        ]
+        table.add_row(*[value for value in row if value is not None])
     console.print(table)
 
 
@@ -47,6 +68,19 @@ def tabs_group():
 @tabs_group.command("list")
 def tabs_list():
     """List all open tabs across all windows."""
+    targets = _multi_browser_targets()
+    if targets:
+        tabs = []
+        for target in targets:
+            result = _handle_multi("tabs.list", profile=target.profile)
+            if result is None:
+                continue
+            tabs.extend({**tab, "browser": target.display_name} for tab in result)
+        if not tabs:
+            console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
+            raise SystemExit(1)
+        _print_tabs(tabs, show_browser=True)
+        return
     tabs = _handle("tabs.list")
     _print_tabs(tabs or [])
 
@@ -98,6 +132,27 @@ def tabs_filter(pattern):
 @click.argument("pattern", required=False)
 def tabs_count(pattern):
     """Count open tabs, optionally filtered by URL PATTERN."""
+    targets = _multi_browser_targets()
+    if targets:
+        table = Table(show_header=True, header_style="bold cyan")
+        table.add_column("Browser")
+        table.add_column("Tabs", justify="right")
+        total = 0
+        rows = 0
+        for target in targets:
+            count = _handle_multi("tabs.count", {"pattern": pattern}, profile=target.profile)
+            if count is None:
+                continue
+            count = int(count or 0)
+            total += count
+            rows += 1
+            table.add_row(target.display_name, str(count))
+        if rows == 0:
+            console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
+            raise SystemExit(1)
+        table.add_row("Total", str(total))
+        console.print(table)
+        return
     count = _handle("tabs.count", {"pattern": pattern})
     label = f" matching '{pattern}'" if pattern else ""
     console.print(f"[bold]{count}[/bold] tab(s){label}")

browser_cli/commands/windows.py

@@ -1,14 +1,14 @@
 import click
-from browser_cli.client import send_command, BrowserNotConnected
+from browser_cli.client import BrowserNotConnected, active_browser_targets, send_command
 from rich.console import Console
 from rich.table import Table
 
 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,25 +17,43 @@ def _handle(command, args=None):
         raise SystemExit(1)
 
 
-def _print_windows(windows: list[dict]) -> None:
+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
+
+
+def _print_windows(windows: list[dict], *, show_browser: bool = False) -> None:
     if not windows:
         console.print("[yellow]No windows found[/yellow]")
         return
     table = Table(show_header=True, header_style="bold cyan")
+    if show_browser:
+        table.add_column("Browser")
     table.add_column("ID", style="dim", no_wrap=True)
     table.add_column("Alias", width=20)
-    table.add_column("Focused", width=8)
     table.add_column("Tabs", width=6)
     table.add_column("State", width=12)
     for w in windows:
-        focused = "[green]✓[/green]" if w.get("focused") else ""
-        table.add_row(
+        row = [
+            w.get("browser", "") if show_browser else None,
             str(w.get("id", "")),
             w.get("alias") or "",
-            focused,
             str(w.get("tabCount", "")),
             w.get("state") or "",
-        )
+        ]
+        table.add_row(*[value for value in row if value is not None])
     console.print(table)
 
 
@@ -47,6 +65,19 @@ def windows_group():
 @windows_group.command("list")
 def windows_list():
     """List all browser windows."""
+    targets = _multi_browser_targets()
+    if targets:
+        windows = []
+        for target in targets:
+            result = _handle_multi("windows.list", profile=target.profile)
+            if result is None:
+                continue
+            windows.extend({**window, "browser": target.display_name} for window in result)
+        if not windows:
+            console.print("[red]Error:[/red] Cannot resolve a browser socket automatically.")
+            raise SystemExit(1)
+        _print_windows(windows, show_browser=True)
+        return
     windows = _handle("windows.list")
     _print_windows(windows or [])