v1.9.25: show server group in --list and --info CLI output

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

tools/skill-ssh.md

@@ -64,7 +64,7 @@ python ~/.server-connections/ssh.py --sql-databases "mariadb-alias"
 
 ## Общие команды
 
-### Список серверов (безопасный — alias, тип, ключ, заметки)
+### Список серверов (безопасный — alias, тип, группа, ключ, заметки)
 ```bash
 python ~/.server-connections/ssh.py --list
 ```

tools/ssh.py

@@ -102,6 +102,11 @@ def load_servers():
     return data, {s["alias"]: s for s in data.get("servers", [])}
 
 
+def _group_map(data: dict) -> dict:
+    """Map group UUID → group name."""
+    return {g["id"]: g.get("name", "") for g in data.get("groups", [])}
+
+
 def save_servers(data):
     servers_file = _get_servers_file()
     text = json.dumps(data, indent=2, ensure_ascii=False)
@@ -779,7 +784,8 @@ def ping_server(server: dict):
 
 
 def list_servers(full=False):
-    _, servers = load_servers()
+    data, servers = load_servers()
+    groups = _group_map(data)
     if full:
         # WARNING: full mode shows sensitive data (IP, port, user)
         # Only for local/manual use, NEVER through AI API
@@ -791,13 +797,14 @@ def list_servers(full=False):
             print(f"{alias:<20} {s['ip']:<20} {s.get('port', 22):<8} {s.get('user', 'root'):<10} {has_key:<6}")
     else:
         # Safe mode: only aliases (no IPs, ports, users)
-        print(f"{'Alias':<20} {'Type':<10} {'Key':<6} {'Notes'}")
-        print("-" * 70)
+        print(f"{'Alias':<20} {'Type':<10} {'Group':<14} {'Key':<6} {'Notes'}")
+        print("-" * 80)
         for alias, s in servers.items():
             has_key = "yes" if os.path.exists(SSH_KEY_PATH) else "no"
             stype = s.get("type", "ssh")
+            group_name = groups.get(s.get("group", ""), "-")
             notes = s.get("notes", "")
-            print(f"{alias:<20} {stype:<10} {has_key:<6} {notes}")
+            print(f"{alias:<20} {stype:<10} {group_name:<14} {has_key:<6} {notes}")
 
 
 def _resolve_alias(alias: str, servers: dict) -> str:
@@ -831,12 +838,16 @@ def _resolve_alias(alias: str, servers: dict) -> str:
 
 def server_info(alias: str):
     """Show server info safe for AI context — NO ip, user, password, port, totp_secret."""
-    _, servers = load_servers()
+    data, servers = load_servers()
+    groups = _group_map(data)
     alias = _resolve_alias(alias, servers)
     s = servers[alias]
     has_key = "yes" if os.path.exists(SSH_KEY_PATH) else "no"
     print(f"Alias:   {s['alias']}")
     print(f"Type:    {s.get('type', 'ssh')}")
+    group_name = groups.get(s.get("group", ""), "")
+    if group_name:
+        print(f"Group:   {group_name}")
     print(f"Key:     {has_key}")
     print(f"Auth:    {s.get('auth', 'password')}")
     print(f"2FA:     {'yes' if s.get('totp_secret') else 'no'}")

version.py

@@ -1,6 +1,6 @@
 """Version info for ServerManager."""
 
-__version__ = "1.9.24"
+__version__ = "1.9.25"
 __app_name__ = "ServerManager"
 __author__ = "aibot777"
 __description__ = "Desktop GUI for managing remote servers"