sshplex 1.6.1__tar.gz → 1.6.2__tar.gz

{sshplex-1.6.1/sshplex.egg-info → sshplex-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshplex
-Version: 1.6.1
+Version: 1.6.2
 Summary: Multiplex your SSH connections with style
 Author-email: MJAHED Sabri <contact@sabrimjahed.com>
 License: MIT
@@ -61,8 +61,8 @@ SSHplex is a Python-based SSH connection multiplexer with a modern TUI. Connect
 
 - 🖥️ **Modern TUI** - Textual-based host selector with search, sort, and multi-select
 - 🔌 **Multiple Sources** - NetBox, Ansible, Consul, static lists - use them together
-- 📦 **3 Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
-- ✏️ **Config Editor** - Built-in YAML editor with validation (`e` key)
+- 📦 **3 Mux Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
+- ✏️ **Config Editor** - Built-in YAML editor with validation 
 - 🔄 **Broadcast Input** - Sync commands across multiple SSH sessions
 - 🔐 **SSH Security** - Configurable host key checking and retry logic
 - 🚀 **Fast Startup** - Intelligent caching with configurable TTL
@@ -83,24 +83,9 @@ sshplex
 ### Prerequisites
 
 - Python 3.8+
-- tmux (Linux/macOS) or iTerm2 (macOS)
+- tmux (Linux/macOS) and/or iTerm2 (macOS)
 - SSH key configured for target hosts
 
-## Usage
-
-| Key | Action |
-|-----|--------|
-| `Space` | Toggle host selection |
-| `a` / `d` | Select / Deselect all |
-| `Enter` | Connect to selected hosts |
-| `/` | Search/filter hosts |
-| `p` | Toggle panes/tabs mode |
-| `b` | Toggle broadcast mode |
-| `e` | Open config editor |
-| `s` | Open session manager |
-| `h` | Show keyboard shortcuts |
-| `q` | Quit |
-
 ## Multiplexer Backends
 
 | Backend | Platform | Best For |
@@ -109,58 +94,6 @@ sshplex
 | **tmux + iTerm2** | macOS | Native UI + persistence |
 | **iTerm2 native** | macOS | Simple setup, no tmux dependency |
 
-```yaml
-# ~/.config/sshplex/sshplex.yaml
-tmux:
-  backend: "tmux"  # or "iterm2-native" on macOS
-  layout: "tiled"
-  max_panes_per_window: 5
-```
-
-## Sources of Truth
-
-### Static Hosts
-```yaml
-sot:
-  import:
-    - name: "my-servers"
-      type: static
-      hosts:
-        - {name: "web-01", ip: "192.168.1.10", tags: ["web"]}
-```
-
-### NetBox
-```yaml
-sot:
-  import:
-    - name: "prod"
-      type: netbox
-      url: "https://netbox.example.com/"
-      token: "your-api-token"
-```
-
-### Ansible
-```yaml
-sot:
-  import:
-    - name: "inventory"
-      type: ansible
-      inventory_paths: ["/path/to/inventory.yml"]
-```
-
-### Consul
-```bash
-pip install "sshplex[consul]"
-```
-```yaml
-sot:
-  import:
-    - name: "dc1"
-      type: consul
-      config:
-        host: "consul.example.com"
-        token: "your-token"
-```
 
 ## Local Demo (Consul + Ansible)
 
@@ -179,45 +112,12 @@ Demo files:
 - `demo/docker-compose.consul-demo.yml`
 - `demo/sshplex.demo.yaml`
 
-Example config snippet:
-
-```yaml
-sot:
-  providers: ["ansible", "consul"]
-  import:
-    - name: "demo-ansible"
-      type: ansible
-      inventory_paths:
-        - "demo/ansible-inventory-demo.yml"
-
-    - name: "demo-consul"
-      type: consul
-      config:
-        host: "127.0.0.1"
-        port: 8500
-        token: ""
-        scheme: "http"
-        verify: false
-        dc: "dc1"
-```
-
 Run with the bundled demo config:
 
 ```bash
 sshplex --config demo/sshplex.demo.yaml
 ```
 
-## CLI Reference
-
-```bash
-sshplex                        # Launch TUI
-sshplex --onboarding           # Interactive setup wizard
-sshplex --debug                # Test provider connectivity
-sshplex --show-config          # Show config paths
-sshplex --clear-cache          # Clear host cache
-sshplex --config /path/to.yml  # Use custom config
-```
-
 ## Documentation
 
 | Guide | Description |
@@ -232,14 +132,8 @@ sshplex --config /path/to.yml  # Use custom config
 # Basic (tmux only)
 pip install sshplex
 
-# With Consul support
-pip install "sshplex[consul]"
-
-# With iTerm2 native support (macOS)
-pip install "sshplex[iterm2]"
-
-# Development
-pip install -e ".[dev]"
+# With Consul,DEV,Iterm2 support
+pip install "sshplex[dev,consul,iterm2]"
 ```
 
 ## Development

{sshplex-1.6.1 → sshplex-1.6.2}/README.md

@@ -8,8 +8,8 @@ SSHplex is a Python-based SSH connection multiplexer with a modern TUI. Connect
 
 - 🖥️ **Modern TUI** - Textual-based host selector with search, sort, and multi-select
 - 🔌 **Multiple Sources** - NetBox, Ansible, Consul, static lists - use them together
-- 📦 **3 Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
-- ✏️ **Config Editor** - Built-in YAML editor with validation (`e` key)
+- 📦 **3 Mux Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
+- ✏️ **Config Editor** - Built-in YAML editor with validation 
 - 🔄 **Broadcast Input** - Sync commands across multiple SSH sessions
 - 🔐 **SSH Security** - Configurable host key checking and retry logic
 - 🚀 **Fast Startup** - Intelligent caching with configurable TTL
@@ -30,24 +30,9 @@ sshplex
 ### Prerequisites
 
 - Python 3.8+
-- tmux (Linux/macOS) or iTerm2 (macOS)
+- tmux (Linux/macOS) and/or iTerm2 (macOS)
 - SSH key configured for target hosts
 
-## Usage
-
-| Key | Action |
-|-----|--------|
-| `Space` | Toggle host selection |
-| `a` / `d` | Select / Deselect all |
-| `Enter` | Connect to selected hosts |
-| `/` | Search/filter hosts |
-| `p` | Toggle panes/tabs mode |
-| `b` | Toggle broadcast mode |
-| `e` | Open config editor |
-| `s` | Open session manager |
-| `h` | Show keyboard shortcuts |
-| `q` | Quit |
-
 ## Multiplexer Backends
 
 | Backend | Platform | Best For |
@@ -56,58 +41,6 @@ sshplex
 | **tmux + iTerm2** | macOS | Native UI + persistence |
 | **iTerm2 native** | macOS | Simple setup, no tmux dependency |
 
-```yaml
-# ~/.config/sshplex/sshplex.yaml
-tmux:
-  backend: "tmux"  # or "iterm2-native" on macOS
-  layout: "tiled"
-  max_panes_per_window: 5
-```
-
-## Sources of Truth
-
-### Static Hosts
-```yaml
-sot:
-  import:
-    - name: "my-servers"
-      type: static
-      hosts:
-        - {name: "web-01", ip: "192.168.1.10", tags: ["web"]}
-```
-
-### NetBox
-```yaml
-sot:
-  import:
-    - name: "prod"
-      type: netbox
-      url: "https://netbox.example.com/"
-      token: "your-api-token"
-```
-
-### Ansible
-```yaml
-sot:
-  import:
-    - name: "inventory"
-      type: ansible
-      inventory_paths: ["/path/to/inventory.yml"]
-```
-
-### Consul
-```bash
-pip install "sshplex[consul]"
-```
-```yaml
-sot:
-  import:
-    - name: "dc1"
-      type: consul
-      config:
-        host: "consul.example.com"
-        token: "your-token"
-```
 
 ## Local Demo (Consul + Ansible)
 
@@ -126,45 +59,12 @@ Demo files:
 - `demo/docker-compose.consul-demo.yml`
 - `demo/sshplex.demo.yaml`
 
-Example config snippet:
-
-```yaml
-sot:
-  providers: ["ansible", "consul"]
-  import:
-    - name: "demo-ansible"
-      type: ansible
-      inventory_paths:
-        - "demo/ansible-inventory-demo.yml"
-
-    - name: "demo-consul"
-      type: consul
-      config:
-        host: "127.0.0.1"
-        port: 8500
-        token: ""
-        scheme: "http"
-        verify: false
-        dc: "dc1"
-```
-
 Run with the bundled demo config:
 
 ```bash
 sshplex --config demo/sshplex.demo.yaml
 ```
 
-## CLI Reference
-
-```bash
-sshplex                        # Launch TUI
-sshplex --onboarding           # Interactive setup wizard
-sshplex --debug                # Test provider connectivity
-sshplex --show-config          # Show config paths
-sshplex --clear-cache          # Clear host cache
-sshplex --config /path/to.yml  # Use custom config
-```
-
 ## Documentation
 
 | Guide | Description |
@@ -179,14 +79,8 @@ sshplex --config /path/to.yml  # Use custom config
 # Basic (tmux only)
 pip install sshplex
 
-# With Consul support
-pip install "sshplex[consul]"
-
-# With iTerm2 native support (macOS)
-pip install "sshplex[iterm2]"
-
-# Development
-pip install -e ".[dev]"
+# With Consul,DEV,Iterm2 support
+pip install "sshplex[dev,consul,iterm2]"
 ```
 
 ## Development

{sshplex-1.6.1 → sshplex-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sshplex"
-version = "1.6.1"
+version = "1.6.2"
 description = "Multiplex your SSH connections with style"
 authors = [{name = "MJAHED Sabri", email = "contact@sabrimjahed.com"}]
 readme = "README.md"

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/__init__.py

@@ -1,4 +1,4 @@
 """SSHplex - SSH Connection Multiplexer"""
-__version__ = "1.6.1"
+__version__ = "1.6.2"
 __author__ = "MJAHED Sabri"
 __email__ = "contact@sabrimjahed.com"

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/lib/multiplexer/iterm2_native.py

@@ -7,9 +7,11 @@ Backend options:
 - backend: "iterm2-native" - Pure iTerm2 Python API (no tmux dependency)
 """
 
+import contextlib
+import io
 import platform
 import re
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 
 from ..logger import get_logger
 from .base import MultiplexerBase
@@ -544,7 +546,22 @@ class ITerm2NativeManager(MultiplexerBase):
         # Run with iTerm2's run_until_complete to maintain connection
         try:
             print(f"\n🚀 Creating iTerm2 session with {len(sessions_data)} SSH connections...")
-            iterm2.run_until_complete(_create_sessions)
+            noisy_stderr = io.StringIO()
+            with contextlib.redirect_stderr(noisy_stderr):
+                iterm2.run_until_complete(_create_sessions)
+
+            stderr_text = noisy_stderr.getvalue().strip()
+            if stderr_text:
+                benign_markers = [
+                    "ConnectionClosedError",
+                    "CancelledError",
+                    "sent 1000 (OK)",
+                    "no close frame received",
+                ]
+                if any(marker in stderr_text for marker in benign_markers):
+                    self.logger.debug("SSHplex: Suppressed benign iTerm2 websocket shutdown noise")
+                else:
+                    self.logger.warning(f"SSHplex: iTerm2 stderr output: {stderr_text}")
             self.logger.info("SSHplex: iTerm2 session created successfully")
         except Exception as e:
             error_msg = str(e)

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/lib/multiplexer/tmux.py

@@ -87,10 +87,24 @@ class TmuxManager(MultiplexerBase):
     @staticmethod
     def _split_window(window: Any, vertical: bool = True) -> Any:
         """Split tmux window with libtmux version compatibility."""
+        split_window = getattr(window, "split_window", None)
+        if callable(split_window):
+            try:
+                return split_window(vertical=vertical)
+            except Exception as exc:
+                if "deprecated" not in str(exc).lower() and "removed" not in str(exc).lower():
+                    raise
+
         split = getattr(window, "split", None)
         if callable(split):
-            return split(vertical=vertical)
-        return window.split_window(vertical=vertical)
+            try:
+                from libtmux.window import PaneDirection
+                direction = PaneDirection.Below if vertical else PaneDirection.Right
+                return split(direction=direction)
+            except Exception:
+                return split()
+
+        raise RuntimeError("No compatible tmux split method found")
 
     def create_session(self) -> bool:
         """Create a new tmux session with SSHplex branding."""

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/lib/ui/config_editor.py

@@ -1,5 +1,6 @@
 """SSHplex Configuration Editor Screen."""
 
+from pathlib import Path
 from typing import Any, Dict, List
 
 import yaml
@@ -42,6 +43,7 @@ class ConfigEditorScreen(ModalScreen[bool]):
 
     BINDINGS = [
         Binding("escape", "cancel", "Cancel", show=True),
+        Binding("q", "cancel", "Cancel", show=False),
         Binding("ctrl+s", "save", "Save", show=True, priority=True),
     ]
 
@@ -77,15 +79,17 @@ class ConfigEditorScreen(ModalScreen[bool]):
     }
 
     #editor-buttons {
-        height: 3;
+        height: 5;
         dock: bottom;
         align: center middle;
-        margin-top: 1;
+        padding: 1 0;
     }
 
     #editor-buttons Button {
+        height: 3;
         min-width: 18;
         margin: 0 2;
+        content-align: center middle;
     }
 
     TabbedContent {
@@ -153,13 +157,22 @@ class ConfigEditorScreen(ModalScreen[bool]):
     }
     """
 
-    def __init__(self, config: Config) -> None:
+    def __init__(self, config: Config, config_path: str = "") -> None:
         super().__init__()
         self.config = config
+        self.config_path = config_path
         self._proxy_counter = 0
         self._import_counter = 0
         self._import_types: Dict[str, str] = {}  # idx -> current type
         self._mux_backend: str = "tmux"  # current mux backend
+        self._table_column_presets: Dict[str, List[str]] = {
+            "custom": [],
+            "minimal": ["name", "ip"],
+            "standard": ["name", "ip", "cluster", "role", "tags"],
+            "operational": ["name", "ip", "status", "role", "cluster", "source"],
+            "inventory": ["name", "ip", "site", "platform", "env", "role", "status"],
+        }
+        self._table_columns_hint = self._build_table_columns_hint()
 
     @staticmethod
     def _safe_select_initial(value: str, allowed: List[str], default: str) -> str:
@@ -168,6 +181,49 @@ class ConfigEditorScreen(ModalScreen[bool]):
             return value
         return default
 
+    def _detect_table_columns_preset(self) -> str:
+        """Detect which preset matches current table columns."""
+        current = [str(c).strip() for c in self.config.ui.table_columns]
+        for preset, cols in self._table_column_presets.items():
+            if preset == "custom":
+                continue
+            if current == cols:
+                return preset
+        return "custom"
+
+    def _build_table_columns_hint(self) -> str:
+        """Build a user-friendly hint for available table columns."""
+        common = ["name", "ip", "cluster", "role", "tags", "status", "source", "site", "platform", "env"]
+        metadata_keys: List[str] = []
+
+        try:
+            cache_dir = Path(str(getattr(self.config.cache, "cache_dir", "~/cache/sshplex"))).expanduser()
+            cache_file = cache_dir / "hosts.yaml"
+            if cache_file.exists():
+                with open(cache_file) as f:
+                    hosts_data = yaml.safe_load(f) or []
+
+                keys: set[str] = set()
+                for host in hosts_data[:200]:
+                    if not isinstance(host, dict):
+                        continue
+                    metadata = host.get("metadata", {})
+                    if isinstance(metadata, dict):
+                        keys.update(str(k) for k in metadata)
+
+                metadata_keys = sorted(k for k in keys if k not in {"name", "ip", "metadata"})
+        except Exception:
+            metadata_keys = []
+
+        if metadata_keys:
+            sample = ", ".join(metadata_keys[:8])
+            return (
+                "Presets available. Common: " + ", ".join(common) +
+                f" | Cached metadata keys: {sample}"
+            )
+
+        return "Presets available. Common columns: " + ", ".join(common)
+
     def compose(self) -> ComposeResult:
         with Vertical(id="config-editor-dialog"):
             yield Static("SSHplex Configuration Editor", id="editor-title")
@@ -192,11 +248,26 @@ class ConfigEditorScreen(ModalScreen[bool]):
                         "Log Panel Height (%)",
                         Input(value=str(self.config.ui.log_panel_height)),
                     )
+                    yield _form_field(
+                        "cfg-ui-table_columns_preset",
+                        "Table Columns Preset",
+                        Select(
+                            [
+                                ("Custom", "custom"),
+                                ("Minimal", "minimal"),
+                                ("Standard", "standard"),
+                                ("Operational", "operational"),
+                                ("Inventory", "inventory"),
+                            ],
+                            value=self._detect_table_columns_preset(),
+                        ),
+                        "Choose a preset or keep Custom",
+                    )
                     yield _form_field(
                         "cfg-ui-table_columns",
                         "Table Columns",
                         Input(value=", ".join(self.config.ui.table_columns)),
-                        "Comma-separated column names",
+                        self._table_columns_hint,
                     )
                     yield Static("Logging", classes="section-header")
                     yield _form_field(
@@ -343,6 +414,12 @@ class ConfigEditorScreen(ModalScreen[bool]):
                         Switch(value=self.config.tmux.broadcast),
                         "Start with broadcast enabled",
                     )
+                    yield _form_field(
+                        "cfg-mux-register_history",
+                        "Register SSHPlex Commands in Shell History",
+                        Switch(value=not bool(getattr(self.config.tmux, 'iterm2_native_hide_from_history', True))),
+                        "iTerm2-native only. OFF means commands are hidden from history.",
+                    )
                     yield _form_field(
                         "cfg-mux-window_name",
                         "Window Name",
@@ -469,13 +546,6 @@ class ConfigEditorScreen(ModalScreen[bool]):
                 ),
                 "Pane split pattern",
             ))
-            children.append(_form_field(
-                "cfg-mux-iterm2_native_hide_from_history",
-                "Hide from Shell History",
-                Switch(value=bool(getattr(self.config.tmux, 'iterm2_native_hide_from_history', True))),
-                "Prefix dispatched commands with a leading space",
-            ))
-
         return Vertical(*children, id="mux-backend-fields-container")
 
     # --- Dynamic proxy list ---
@@ -628,6 +698,14 @@ class ConfigEditorScreen(ModalScreen[bool]):
                 self.run_worker(self._rebuild_mux_backend_fields(new_backend))
             return
 
+        # Handle table-column presets
+        if select_id == "cfg-ui-table_columns_preset":
+            preset = str(event.value)
+            if preset in self._table_column_presets and preset != "custom":
+                columns_input = self.query_one("#cfg-ui-table_columns", Input)
+                columns_input.value = ", ".join(self._table_column_presets[preset])
+            return
+
         # Handle import type changes
         if not select_id.startswith("import-") or not select_id.endswith("-type"):
             return
@@ -785,6 +863,7 @@ class ConfigEditorScreen(ModalScreen[bool]):
             "use_panes": self._get_select_value("cfg-mux-use_panes", "panes") == "panes",
             "layout": self._get_select_value("cfg-mux-layout", "tiled"),
             "broadcast": self._get_switch_value("cfg-mux-broadcast"),
+            "iterm2_native_hide_from_history": not self._get_switch_value("cfg-mux-register_history", False),
             "window_name": self._get_input_value("cfg-mux-window_name", "sshplex"),
             "max_panes_per_window": int(self._get_input_value("cfg-mux-max_panes_per_window", "5")),
         }
@@ -800,9 +879,6 @@ class ConfigEditorScreen(ModalScreen[bool]):
             mux_data["iterm2_native_target"] = self._get_select_value("cfg-mux-iterm2_native_target", "current-window")
             mux_data["iterm2_profile"] = self._get_input_value("cfg-mux-iterm2_profile", "Default")
             mux_data["iterm2_split_pattern"] = self._get_select_value("cfg-mux-iterm2_split_pattern", "alternate")
-            mux_data["iterm2_native_hide_from_history"] = self._get_switch_value(
-                "cfg-mux-iterm2_native_hide_from_history"
-            )
 
         data["tmux"] = mux_data
 
@@ -946,7 +1022,7 @@ class ConfigEditorScreen(ModalScreen[bool]):
         # Remove None values for cleaner YAML
         yaml_data = _clean_none(yaml_data)
 
-        config_path = get_default_config_path()
+        config_path = get_default_config_path() if not self.config_path else Path(self.config_path)
         config_path.parent.mkdir(parents=True, exist_ok=True)
 
         try:

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/lib/ui/host_selector.py

@@ -235,7 +235,7 @@ class HostSelector(App):
     use_panes: reactive[bool] = reactive(True)  # True for panes, False for tabs
     use_broadcast: reactive[bool] = reactive(False)  # True for broadcast enabled, False for disabled
 
-    def __init__(self, config: Any) -> None:
+    def __init__(self, config: Any, config_path: str = "") -> None:
         """Initialize the host selector.
 
         Args:
@@ -243,6 +243,7 @@ class HostSelector(App):
         """
         super().__init__()
         self.config = config
+        self.config_path = config_path
         self.logger = get_logger()
         self.hosts: List[Host] = []
         self.filtered_hosts: List[Host] = []
@@ -693,8 +694,7 @@ class HostSelector(App):
         control_with_iterm2 = bool(getattr(self.config.tmux, "control_with_iterm2", False))
         if backend == "iterm2-native":
             self.log_message("Opening iTerm2 native session manager...")
-            session_manager = ITerm2SessionManager(self.config, self.latest_native_session_name)
-            self.push_screen(session_manager)
+            self.push_screen(ITerm2SessionManager(self.config, self.latest_native_session_name))
             return
 
         if control_with_iterm2:
@@ -705,8 +705,7 @@ class HostSelector(App):
             return
 
         self.log_message("Opening tmux session manager...")
-        session_manager = TmuxSessionManager(self.config)
-        self.push_screen(session_manager)
+        self.push_screen(TmuxSessionManager(self.config))
 
     def action_edit_config(self) -> None:
         """Open the configuration editor modal."""
@@ -716,14 +715,14 @@ class HostSelector(App):
             if saved:
                 self.run_worker(self._reload_config_runtime(), name="reload_config_runtime")
 
-        editor = ConfigEditorScreen(self.config)
+        editor = ConfigEditorScreen(self.config, self.config_path)
         self.push_screen(editor, callback=_on_editor_close)
 
     async def _reload_config_runtime(self) -> None:
         """Reload configuration from disk and apply it live."""
         try:
             old_sot = self.config.sot.model_dump()
-            new_config = load_config()
+            new_config = load_config(self.config_path or None)
             await self._apply_runtime_config(new_config)
             self.log_message("Configuration reloaded successfully")
             if old_sot != new_config.sot.model_dump():

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/lib/ui/session_manager.py

@@ -1,6 +1,8 @@
 """SSHplex TUI tmux session manager widget."""
 
 import asyncio
+import contextlib
+import io
 from typing import Any, List, Optional
 
 import libtmux
@@ -91,16 +93,31 @@ class ConfirmDialog(ModalScreen[bool]):
 class TmuxSession:
     """Simple tmux session data structure."""
 
-    def __init__(self, name: str, session_id: str, created: str, windows: int, attached: bool = False):
+    def __init__(
+        self,
+        name: str,
+        session_id: str,
+        created: str,
+        age: str,
+        windows: int,
+        panes: int,
+        clients: int,
+        active_cmd: str,
+        broadcast: bool = False,
+    ):
         self.name = name
         self.session_id = session_id
         self.created = created
+        self.age = age
         self.windows = windows
-        self.attached = attached
+        self.panes = panes
+        self.clients = clients
+        self.active_cmd = active_cmd
+        self.broadcast = broadcast
 
     def __str__(self) -> str:
-        status = "📎" if self.attached else "💤"
-        return f"{status} {self.name} ({self.windows} windows)"
+        status = "ON" if self.broadcast else "OFF"
+        return f"{self.name} ({self.windows} windows, broadcast {status})"
 
 
 class ITerm2ManagedTab:
@@ -130,20 +147,20 @@ class ITerm2SessionManager(ModalScreen):
     }
 
     #session-dialog {
-        width: 90;
-        height: 22;
+        width: 96%;
+        height: 88%;
         border: thick $primary 60%;
         background: $surface;
     }
 
     #session-table {
         height: 1fr;
-        margin: 1;
+        margin: 0 1;
     }
 
     #session-header {
         height: 3;
-        margin: 1;
+        margin: 1 1 0 1;
         text-align: center;
         background: $primary;
         color: $text;
@@ -151,7 +168,7 @@ class ITerm2SessionManager(ModalScreen):
 
     #session-footer {
         height: 3;
-        margin: 1;
+        margin: 0 1 1 1;
         text-align: center;
         background: $surface;
         color: $text-muted;
@@ -237,7 +254,9 @@ class ITerm2SessionManager(ModalScreen):
                     )
 
         try:
-            iterm2.run_until_complete(_load)
+            noisy_stderr = io.StringIO()
+            with contextlib.redirect_stderr(noisy_stderr):
+                iterm2.run_until_complete(_load)
         except SystemExit as e:
             raise RuntimeError("Failed to connect to iTerm2 API") from e
         return loaded
@@ -322,7 +341,9 @@ class ITerm2SessionManager(ModalScreen):
                         return
 
         try:
-            iterm2.run_until_complete(_kill)
+            noisy_stderr = io.StringIO()
+            with contextlib.redirect_stderr(noisy_stderr):
+                iterm2.run_until_complete(_kill)
         except SystemExit as e:
             raise RuntimeError("Failed to connect to iTerm2 API") from e
 
@@ -381,36 +402,36 @@ class TmuxSessionManager(ModalScreen):
     }
 
     #session-dialog {
-        width: 80;
-        height: 20;
+        width: 96%;
+        height: 88%;
         border: thick $primary 60%;
         background: $surface;
     }
 
     #session-table {
         height: 1fr;
-        margin: 1;
+        margin: 0 1;
     }
 
     #session-header {
-        height: 3;
-        margin: 1;
+        height: 2;
+        margin: 1 1 0 1;
         text-align: center;
         background: $primary;
         color: $text;
     }
 
     #broadcast-status {
-        height: 2;
-        margin: 1;
+        height: 1;
+        margin: 0 1;
         text-align: center;
         background: $secondary;
         color: $text;
     }
 
     #session-footer {
-        height: 3;
-        margin: 1;
+        height: 2;
+        margin: 0 1 1 1;
         text-align: center;
         background: $surface;
         color: $text-muted;
@@ -443,10 +464,24 @@ class TmuxSessionManager(ModalScreen):
     @staticmethod
     def _split_window(window: Any, vertical: bool = True) -> Any:
         """Split tmux window with libtmux version compatibility."""
+        split_window = getattr(window, "split_window", None)
+        if callable(split_window):
+            try:
+                return split_window(vertical=vertical)
+            except Exception as exc:
+                if "deprecated" not in str(exc).lower() and "removed" not in str(exc).lower():
+                    raise
+
         split = getattr(window, "split", None)
         if callable(split):
-            return split(vertical=vertical)
-        return window.split_window(vertical=vertical)
+            try:
+                from libtmux.window import PaneDirection
+                direction = PaneDirection.Below if vertical else PaneDirection.Right
+                return split(direction=direction)
+            except Exception:
+                return split()
+
+        raise RuntimeError("No compatible tmux split method found")
 
     def _find_tmux_session(self, session_name: str) -> Optional[Any]:
         """Find tmux session with libtmux compatibility fallbacks."""
@@ -484,10 +519,14 @@ class TmuxSessionManager(ModalScreen):
         self.table = self.query_one("#session-table", DataTable)
 
         # Setup table columns
-        self.table.add_column("Status", width=8)
-        self.table.add_column("Session Name", width=25)
-        self.table.add_column("Created", width=20)
-        self.table.add_column("Windows", width=8)
+        self.table.add_column("Broadcast", width=9)
+        self.table.add_column("Session Name", width=26)
+        self.table.add_column("Age", width=9)
+        self.table.add_column("Clients", width=8)
+        self.table.add_column("Active Cmd", width=18)
+        self.table.add_column("Created", width=16)
+        self.table.add_column("Windows", width=7)
+        self.table.add_column("Panes", width=6)
 
         # Load sessions first
         self.load_sessions()
@@ -510,22 +549,37 @@ class TmuxSessionManager(ModalScreen):
             self.sessions.clear()
 
             for session in tmux_sessions:
-                # Check if session is attached (use session.attached property or check windows)
-                try:
-                    # libtmux sessions have an 'attached' property or we can check if it has windows
-                    attached = hasattr(session, 'attached') and session.attached
-                    if not hasattr(session, 'attached'):
-                        # Fallback: check if session has active windows/panes
-                        attached = len(session.windows) > 0 and any(len(w.panes) > 0 for w in session.windows)
-                except (AttributeError, RuntimeError):
-                    attached = False
-
                 # Get window count safely
                 try:
                     window_count = len(session.windows) if hasattr(session, 'windows') else 0
                 except (AttributeError, RuntimeError):
                     window_count = 0
 
+                # Get pane count safely
+                try:
+                    pane_count = sum(len(w.panes) for w in session.windows)
+                except (AttributeError, RuntimeError, TypeError):
+                    pane_count = 0
+
+                # Read synchronize-panes state across session windows
+                try:
+                    broadcast_on = any(
+                        bool(window.show_options().get("synchronize-panes"))
+                        for window in session.windows
+                    )
+                except Exception:
+                    broadcast_on = False
+
+                # Get attached client count
+                try:
+                    attached_result = session.cmd('display-message', '-p', '#{session_attached}')
+                    if attached_result and getattr(attached_result, 'stdout', None):
+                        clients = int(attached_result.stdout[0])
+                    else:
+                        clients = 0
+                except Exception:
+                    clients = 0
+
                 # Get creation time - libtmux doesn't provide session.created directly
                 try:
                     # Try to get session creation time from tmux itself
@@ -535,17 +589,54 @@ class TmuxSessionManager(ModalScreen):
                         timestamp = int(result.stdout[0])
                         created_dt = datetime.datetime.fromtimestamp(timestamp)
                         created = created_dt.strftime("%Y-%m-%d %H:%M:%S")
+                        now_dt = datetime.datetime.now()
+                        age_delta = max((now_dt - created_dt).total_seconds(), 0)
+                        if age_delta < 60:
+                            age = f"{int(age_delta)}s"
+                        elif age_delta < 3600:
+                            age = f"{int(age_delta // 60)}m"
+                        elif age_delta < 86400:
+                            age = f"{int(age_delta // 3600)}h"
+                        else:
+                            age = f"{int(age_delta // 86400)}d"
                     else:
                         created = "Unknown"
+                        age = "-"
                 except (ValueError, AttributeError, IndexError, OSError):
                     created = "Unknown"
+                    age = "-"
+
+                # Summarize active pane commands in this session
+                cmd_counts: dict[str, int] = {}
+                try:
+                    for window in session.windows:
+                        for pane in window.panes:
+                            try:
+                                pane_cmd = str(getattr(pane, 'pane_current_command', '') or '')
+                            except Exception:
+                                pane_cmd = ''
+                            if not pane_cmd:
+                                pane_cmd = '?'
+                            cmd_counts[pane_cmd] = cmd_counts.get(pane_cmd, 0) + 1
+                except Exception:
+                    pass
+
+                if cmd_counts:
+                    top = sorted(cmd_counts.items(), key=lambda x: x[1], reverse=True)[:2]
+                    active_cmd = ", ".join(f"{name}({count})" for name, count in top)
+                else:
+                    active_cmd = "-"
 
                 tmux_session = TmuxSession(
                     name=session.session_name or "Unknown",
                     session_id=session.session_id or "Unknown",
                     created=created,
+                    age=age,
                     windows=window_count,
-                    attached=attached
+                    panes=pane_count,
+                    clients=clients,
+                    active_cmd=active_cmd,
+                    broadcast=broadcast_on
                 )
                 self.sessions.append(tmux_session)
 
@@ -559,7 +650,7 @@ class TmuxSessionManager(ModalScreen):
             # Show error in table
             if self.table is not None:
                 self.table.clear()
-                self.table.add_row("❌", "tmux error", str(e), "0")
+                self.table.add_row("-", "tmux error", "-", "-", "-", str(e), "0", "0")
 
     def populate_table(self) -> None:
         """Populate the table with session data."""
@@ -570,19 +661,20 @@ class TmuxSessionManager(ModalScreen):
         self.table.clear()
 
         if not self.sessions:
-            self.table.add_row("ℹ️", "No tmux sessions found", "Create one with SSHplex", "0")
+            self.table.add_row("-", "No tmux sessions found", "-", "-", "-", "Create one with SSHplex", "0", "0")
             return
 
         # Add sessions to table
         for session in self.sessions:
-            status_icon = "📎" if session.attached else "💤"
-            status_text = "Active" if session.attached else "Detached"
-
             self.table.add_row(
-                f"{status_icon} {status_text}",
+                "ON" if session.broadcast else "OFF",
                 session.name,
+                session.age,
+                str(session.clients),
+                session.active_cmd,
                 session.created,
                 str(session.windows),
+                str(session.panes),
                 key=session.name
             )
 
@@ -755,8 +847,12 @@ class TmuxSessionManager(ModalScreen):
                     self.logger.error(f"SSHplex: Session '{session.name}' not found")
                     return
 
-                # Toggle broadcast mode
-                self.broadcast_enabled = not self.broadcast_enabled
+                # Toggle from actual current state
+                current_enabled = any(
+                    bool(window.show_options().get("synchronize-panes"))
+                    for window in tmux_session.windows
+                )
+                self.broadcast_enabled = not current_enabled
 
                 if self.broadcast_enabled:
                     # Enable synchronize-panes for all windows in the session
@@ -778,6 +874,9 @@ class TmuxSessionManager(ModalScreen):
                     status_widget = self.query_one("#broadcast-status", Static)
                     status_widget.update("📡 Broadcast: OFF")
 
+                # Refresh table to update per-session broadcast column
+                self.load_sessions()
+
             except Exception as e:
                 self.logger.error(f"SSHplex: Failed to toggle broadcast for session '{session.name}': {e}")
         else:

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/main.py

@@ -108,7 +108,7 @@ Examples:
             return debug_mode(config, logger)
         else:
             # TUI mode - main application
-            return tui_mode(config, logger)
+            return tui_mode(config, logger, args.config)
 
     except FileNotFoundError as e:
         print(f"Error: {e}")
@@ -236,13 +236,13 @@ def debug_mode(config: Any, logger: Any) -> int:
     return 0
 
 
-def tui_mode(config: Any, logger: Any) -> int:
+def tui_mode(config: Any, logger: Any, config_path: Optional[str] = None) -> int:
     """Run in TUI mode for interactive host selection and connection."""
     logger.info("Starting TUI mode - interactive host selection")
 
     try:
         # Start the host selector TUI
-        app = HostSelector(config=config)
+        app = HostSelector(config=config, config_path=config_path or "")
         selected_hosts = app.run()
 
         if not selected_hosts:

{sshplex-1.6.1 → sshplex-1.6.2}/sshplex/sshplex_connector.py

@@ -44,6 +44,7 @@ class SSHplexConnector:
         self.backend = getattr(config.tmux, 'backend', 'tmux') if config else 'tmux'
         self.last_success_count = 0
         self.last_failed_hosts: List[str] = []
+        self.multiplexer: Any
 
         # Initialize multiplexer based on backend config
         if self.backend == "iterm2-native":

{sshplex-1.6.1 → sshplex-1.6.2/sshplex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshplex
-Version: 1.6.1
+Version: 1.6.2
 Summary: Multiplex your SSH connections with style
 Author-email: MJAHED Sabri <contact@sabrimjahed.com>
 License: MIT
@@ -61,8 +61,8 @@ SSHplex is a Python-based SSH connection multiplexer with a modern TUI. Connect
 
 - 🖥️ **Modern TUI** - Textual-based host selector with search, sort, and multi-select
 - 🔌 **Multiple Sources** - NetBox, Ansible, Consul, static lists - use them together
-- 📦 **3 Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
-- ✏️ **Config Editor** - Built-in YAML editor with validation (`e` key)
+- 📦 **3 Mux Backends** - tmux standalone, tmux + iTerm2, or iTerm2 native (macOS)
+- ✏️ **Config Editor** - Built-in YAML editor with validation 
 - 🔄 **Broadcast Input** - Sync commands across multiple SSH sessions
 - 🔐 **SSH Security** - Configurable host key checking and retry logic
 - 🚀 **Fast Startup** - Intelligent caching with configurable TTL
@@ -83,24 +83,9 @@ sshplex
 ### Prerequisites
 
 - Python 3.8+
-- tmux (Linux/macOS) or iTerm2 (macOS)
+- tmux (Linux/macOS) and/or iTerm2 (macOS)
 - SSH key configured for target hosts
 
-## Usage
-
-| Key | Action |
-|-----|--------|
-| `Space` | Toggle host selection |
-| `a` / `d` | Select / Deselect all |
-| `Enter` | Connect to selected hosts |
-| `/` | Search/filter hosts |
-| `p` | Toggle panes/tabs mode |
-| `b` | Toggle broadcast mode |
-| `e` | Open config editor |
-| `s` | Open session manager |
-| `h` | Show keyboard shortcuts |
-| `q` | Quit |
-
 ## Multiplexer Backends
 
 | Backend | Platform | Best For |
@@ -109,58 +94,6 @@ sshplex
 | **tmux + iTerm2** | macOS | Native UI + persistence |
 | **iTerm2 native** | macOS | Simple setup, no tmux dependency |
 
-```yaml
-# ~/.config/sshplex/sshplex.yaml
-tmux:
-  backend: "tmux"  # or "iterm2-native" on macOS
-  layout: "tiled"
-  max_panes_per_window: 5
-```
-
-## Sources of Truth
-
-### Static Hosts
-```yaml
-sot:
-  import:
-    - name: "my-servers"
-      type: static
-      hosts:
-        - {name: "web-01", ip: "192.168.1.10", tags: ["web"]}
-```
-
-### NetBox
-```yaml
-sot:
-  import:
-    - name: "prod"
-      type: netbox
-      url: "https://netbox.example.com/"
-      token: "your-api-token"
-```
-
-### Ansible
-```yaml
-sot:
-  import:
-    - name: "inventory"
-      type: ansible
-      inventory_paths: ["/path/to/inventory.yml"]
-```
-
-### Consul
-```bash
-pip install "sshplex[consul]"
-```
-```yaml
-sot:
-  import:
-    - name: "dc1"
-      type: consul
-      config:
-        host: "consul.example.com"
-        token: "your-token"
-```
 
 ## Local Demo (Consul + Ansible)
 
@@ -179,45 +112,12 @@ Demo files:
 - `demo/docker-compose.consul-demo.yml`
 - `demo/sshplex.demo.yaml`
 
-Example config snippet:
-
-```yaml
-sot:
-  providers: ["ansible", "consul"]
-  import:
-    - name: "demo-ansible"
-      type: ansible
-      inventory_paths:
-        - "demo/ansible-inventory-demo.yml"
-
-    - name: "demo-consul"
-      type: consul
-      config:
-        host: "127.0.0.1"
-        port: 8500
-        token: ""
-        scheme: "http"
-        verify: false
-        dc: "dc1"
-```
-
 Run with the bundled demo config:
 
 ```bash
 sshplex --config demo/sshplex.demo.yaml
 ```
 
-## CLI Reference
-
-```bash
-sshplex                        # Launch TUI
-sshplex --onboarding           # Interactive setup wizard
-sshplex --debug                # Test provider connectivity
-sshplex --show-config          # Show config paths
-sshplex --clear-cache          # Clear host cache
-sshplex --config /path/to.yml  # Use custom config
-```
-
 ## Documentation
 
 | Guide | Description |
@@ -232,14 +132,8 @@ sshplex --config /path/to.yml  # Use custom config
 # Basic (tmux only)
 pip install sshplex
 
-# With Consul support
-pip install "sshplex[consul]"
-
-# With iTerm2 native support (macOS)
-pip install "sshplex[iterm2]"
-
-# Development
-pip install -e ".[dev]"
+# With Consul,DEV,Iterm2 support
+pip install "sshplex[dev,consul,iterm2]"
 ```
 
 ## Development