v1.9.23: S3 create/delete bucket GUI buttons

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

core/claude_setup.py

@@ -30,17 +30,39 @@ _BLOCK_START = "<!-- server-manager:start -->"
 _BLOCK_END = "<!-- server-manager:end -->"
 
 GLOBAL_CLAUDE_MD_BLOCK = f"""{_BLOCK_START}
-## Server Manager — управление серверами
+## Серверы — ТОЛЬКО через /ssh
 
-**ВСЕГДА** используй server manager для подключения к серверам. Никогда не используй `ssh`, `sshpass` или прямые подключения.
+**НИКОГДА не используй raw `ssh` команды.** НИКОГДА не читай `~/.ssh/config` для поиска серверов.
+Все операции с серверами — **ТОЛЬКО через скилл `/ssh`** или напрямую через `ssh.py`:
 
-- Скилл: `/ssh ALIAS "command"` — выполнить команду на сервере
+```bash
-- Список серверов: `python3 ~/.server-connections/ssh.py --list`
+python ~/.server-connections/ssh.py --list          # список серверов (alias, тип, заметки)
-- Документация: `~/.claude/commands/ssh.md`
+python ~/.server-connections/ssh.py --info ALIAS     # инфо (без creds)
-- Memory bank: проект `global-infrastructure` → `techContext.md`
+python ~/.server-connections/ssh.py --status         # online/offline
-- Инфраструктура: https://git.sensey24.ru/aibot777/infrastructure-docs
+```
 
-**Запрещено:** использовать `ssh`, `sshpass`, читать `~/.server-connections/` напрямую, раскрывать IP/пароли/порты.
+При вопросе о сервере — **СНАЧАЛА `--list`**, найди нужный алиас по заметкам и **ПРОВЕРЬ ТИП**.
+Скрипт `ssh.py` сам читает credentials из зашифрованного хранилища. Claude НЕ видит IP, логины, пароли.
+
+### КРИТИЧНО — команды зависят от типа сервера
+
+**`ALIAS "command"` (shell) — ТОЛЬКО для типов `ssh` и `telnet`!**
+
+| Тип | Команды |
+|-----|---------|
+| `ssh`/`telnet` | `ALIAS "cmd"`, `--upload ALIAS local remote`, `--download ALIAS remote local` |
+| `s3` (MinIO и др.) | `--s3-buckets ALIAS`, `--s3-ls ALIAS bucket/prefix`, `--s3-upload ALIAS local bucket/key`, `--s3-download ALIAS bucket/key local`, `--s3-delete ALIAS bucket/key`, `--s3-url ALIAS bucket/key [SEC]` |
+| `mariadb`/`mssql`/`postgresql` | `--sql ALIAS "SELECT ..."`, `--sql-databases ALIAS`, `--sql-tables ALIAS [db]` |
+| `redis` | `--redis ALIAS "GET key"`, `--redis-info ALIAS`, `--redis-keys ALIAS "pattern"` |
+| `grafana` | `--grafana-dashboards ALIAS`, `--grafana-alerts ALIAS` |
+| `prometheus` | `--prom-query ALIAS "up"`, `--prom-targets ALIAS`, `--prom-alerts ALIAS` |
+| `winrm` | `--ps ALIAS "Get-Process"`, `--cmd ALIAS "dir"` |
+
+**Формат: `python ~/.server-connections/ssh.py КОМАНДА АЛИАС АРГУМЕНТЫ`** — алиас ВСЕГДА второй после команды.
+
+**S3 правило:** перед `--s3-upload/download/delete` — СНАЧАЛА `--s3-buckets ALIAS` и `--s3-ls ALIAS bucket/` чтобы узнать реальные бакеты и пути. НЕ УГАДЫВАЙ имена бакетов!
+
+**Запрещено:** использовать `ssh`/`sshpass`, читать `~/.server-connections/` напрямую, раскрывать IP/пароли/порты.
 {_BLOCK_END}
 """
 

core/i18n.py

@@ -390,6 +390,12 @@ _EN = {
     "s3_uploading_n": "Uploading {count} files...",
     "s3_uploaded_n": "Uploaded {count} files",
     "s3_upload_partial": "Uploaded {ok}/{total} files",
+    "s3_create_bucket": "Create Bucket",
+    "s3_bucket_name_prompt": "Bucket name:",
+    "s3_delete_bucket": "Delete Bucket",
+    "s3_delete_bucket_confirm": "Delete bucket \"{name}\"? It must be empty.",
+    "s3_bucket_created": "Bucket \"{name}\" created",
+    "s3_bucket_deleted": "Bucket \"{name}\" deleted",
     "s3_new_folder": "New Folder",
     "s3_folder_name_prompt": "Folder name:",
     "s3_creating_folder": "Creating folder...",
@@ -907,6 +913,12 @@ _RU = {
     "s3_uploading_n": "Загрузка {count} файлов...",
     "s3_uploaded_n": "Загружено {count} файлов",
     "s3_upload_partial": "Загружено {ok}/{total} файлов",
+    "s3_create_bucket": "Создать бакет",
+    "s3_bucket_name_prompt": "Имя бакета:",
+    "s3_delete_bucket": "Удалить бакет",
+    "s3_delete_bucket_confirm": "Удалить бакет \"{name}\"? Он должен быть пустым.",
+    "s3_bucket_created": "Бакет \"{name}\" создан",
+    "s3_bucket_deleted": "Бакет \"{name}\" удалён",
     "s3_new_folder": "Новая папка",
     "s3_folder_name_prompt": "Имя папки:",
     "s3_creating_folder": "Создание папки...",
@@ -1424,6 +1436,12 @@ _ZH = {
     "s3_uploading_n": "正在上传 {count} 个文件...",
     "s3_uploaded_n": "已上传 {count} 个文件",
     "s3_upload_partial": "已上传 {ok}/{total} 个文件",
+    "s3_create_bucket": "创建存储桶",
+    "s3_bucket_name_prompt": "存储桶名称:",
+    "s3_delete_bucket": "删除存储桶",
+    "s3_delete_bucket_confirm": "删除存储桶 \"{name}\"？必须为空。",
+    "s3_bucket_created": "存储桶 \"{name}\" 已创建",
+    "s3_bucket_deleted": "存储桶 \"{name}\" 已删除",
     "s3_new_folder": "新建文件夹",
     "s3_folder_name_prompt": "文件夹名称:",
     "s3_creating_folder": "创建文件夹中...",

core/s3_client.py

@@ -518,3 +518,29 @@ class S3Client:
             return resp.get("ContentLength", 0)
         except Exception:
             return 0
+
+    def create_bucket(self, bucket_name: str) -> bool:
+        """Create a new S3 bucket."""
+        if not self._ensure_connected():
+            return False
+        try:
+            self._client.create_bucket(Bucket=bucket_name)
+            self._last_ok = time.time()
+            log.info("S3 bucket created: %s", bucket_name)
+            return True
+        except Exception as exc:
+            log.error("S3 create_bucket failed: %s", exc)
+            return False
+
+    def delete_bucket(self, bucket_name: str) -> bool:
+        """Delete an empty S3 bucket."""
+        if not self._ensure_connected():
+            return False
+        try:
+            self._client.delete_bucket(Bucket=bucket_name)
+            self._last_ok = time.time()
+            log.info("S3 bucket deleted: %s", bucket_name)
+            return True
+        except Exception as exc:
+            log.error("S3 delete_bucket failed: %s", exc)
+            return False

gui/about_dialog.py

@@ -15,12 +15,10 @@ class AboutDialog(ctk.CTkToplevel):
         self.geometry("500x480")
         self.resizable(False, False)
         self.transient(master)
+        self.grab_set()
         self.focus_force()
         self.protocol("WM_DELETE_WINDOW", self._on_close)
 
-        self._master_ref = master
-        self._map_bind_id = master.bind("<Map>", self._on_parent_map, add="+")
-
         # ── Header ──
         ctk.CTkLabel(
             self, text=t("about_title"),
@@ -80,20 +78,9 @@ class AboutDialog(ctk.CTkToplevel):
             self, text=t("close"), width=120, command=self._on_close
         ).pack(pady=(10, 20))
 
-    def _on_parent_map(self, event=None):
-        """Restore dialog when parent is un-minimized."""
-        try:
-            if not self.winfo_exists():
-                return
-            self.deiconify()
-            self.lift()
-            self.focus_force()
-        except Exception:
-            pass
-
     def _on_close(self):
         try:
-            self._master_ref.unbind("<Map>", self._map_bind_id)
+            self.grab_release()
         except Exception:
             pass
         self.destroy()

gui/app.py

@@ -2,8 +2,8 @@
 Main application window — sidebar + tabview layout.
 """
 
-import tkinter
 import sys
+import tkinter
 import customtkinter as ctk
 from tkinter import messagebox
 
@@ -92,7 +92,7 @@ class App(ctk.CTk):
 
         # Restore saved window geometry or use default
         saved_geo = self.store._window_geometry
-        if saved_geo:
+        if saved_geo and self._is_valid_geometry(saved_geo):
             self.geometry(saved_geo)
         else:
             self.geometry("1100x700")
@@ -119,28 +119,23 @@ class App(ctk.CTk):
         # Cleanup on close
         self.protocol("WM_DELETE_WINDOW", self._on_close)
 
-        # Fix: restore window after Win+D (Show Desktop)
+        # Win32: restore window when stuck minimized after Win+D
-        self.bind("<Map>", self._on_map, add="+")
+        self._restore_check_id = None
         if sys.platform == "win32":
-            self._setup_win32_restore()
+            self.after(3000, self._start_restore_watchdog)
 
-    def _on_map(self, event=None):
+    def _start_restore_watchdog(self):
-        """Ensure window is fully visible when restored from taskbar."""
+        """Start periodic check for stuck minimized state (Windows only)."""
         try:
-            self.deiconify()
+            import ctypes
-            self.lift()
+            self._user32 = ctypes.windll.user32
+            self._hwnd = int(self.wm_frame(), 16)
+            self._check_restore()
         except Exception:
             pass
 
-    def _setup_win32_restore(self):
+    def _check_restore(self):
-        """Win32 fallback: periodic check for stuck minimized state."""
+        """If window is iconic but user clicked taskbar, force restore."""
-        import ctypes
-        self._user32 = ctypes.windll.user32
-        self._hwnd = int(self.wm_frame(), 16)
-        self._check_minimized()
-
-    def _check_minimized(self):
-        """If window is iconic but should be visible, force restore."""
         try:
             if self._user32.IsIconic(self._hwnd):
                 fg = self._user32.GetForegroundWindow()
@@ -148,7 +143,7 @@ class App(ctk.CTk):
                     self._user32.ShowWindow(self._hwnd, 9)  # SW_RESTORE
         except Exception:
             pass
-        self.after(500, self._check_minimized)
+        self._restore_check_id = self.after(500, self._check_restore)
 
     def _build_layout(self):
         # PanedWindow — resizable sidebar | main area
@@ -699,10 +694,31 @@ class App(ctk.CTk):
         except Exception:
             pass
 
+    @staticmethod
+    def _is_valid_geometry(geo: str) -> bool:
+        """Reject geometry with offscreen coordinates (e.g. minimized -32000)."""
+        try:
+            # format: WxH+X+Y or WxH-X-Y
+            import re
+            m = re.match(r"(\d+)x(\d+)([+-]\d+)([+-]\d+)", geo)
+            if not m:
+                return False
+            x, y = int(m.group(3)), int(m.group(4))
+            return -100 < x < 10000 and -100 < y < 10000
+        except Exception:
+            return False
+
     def _on_close(self):
+        # Cancel restore watchdog
+        try:
+            if self._restore_check_id:
+                self.after_cancel(self._restore_check_id)
+        except Exception:
+            pass
         # Save window geometry (size + position) and sidebar width
         try:
-            self.store._window_geometry = self.geometry()
+            geo = self.geometry()
+            self.store._window_geometry = geo if self._is_valid_geometry(geo) else None
             # Save sidebar width from PanedWindow sash position
             try:
                 sash_pos = self._paned.sash_coord(0)

gui/group_dialog.py

@@ -32,11 +32,7 @@ class GroupDialog(ctk.CTkToplevel):
         self.geometry("340x200")
         self.resizable(False, False)
         self.transient(master)
-        self.focus_force()
+        self.grab_set()
-        self.protocol("WM_DELETE_WINDOW", self._on_close)
-
-        self._master_ref = master
-        self._map_bind_id = master.bind("<Map>", self._on_parent_map, add="+")
 
         # ── Name ──
         ctk.CTkLabel(self, text=t("group_name"), anchor="w").pack(
@@ -75,7 +71,7 @@ class GroupDialog(ctk.CTkToplevel):
         btn_frame.pack(fill="x", padx=20, pady=(15, 10))
 
         ctk.CTkButton(btn_frame, text=t("cancel"), width=80,
-                       fg_color="gray", command=self._on_close).pack(side="left")
+                       fg_color="gray", command=self.destroy).pack(side="left")
         ctk.CTkButton(btn_frame, text=t("save"), width=80,
                        command=self._save).pack(side="right")
 
@@ -94,23 +90,6 @@ class GroupDialog(ctk.CTkToplevel):
             else:
                 btn.configure(border_color=fg)
 
-    def _on_parent_map(self, event=None):
-        try:
-            if not self.winfo_exists():
-                return
-            self.deiconify()
-            self.lift()
-            self.focus_force()
-        except Exception:
-            pass
-
-    def _on_close(self):
-        try:
-            self._master_ref.unbind("<Map>", self._map_bind_id)
-        except Exception:
-            pass
-        self.destroy()
-
     def _save(self):
         name = self._name_var.get().strip()
         if not name:
@@ -128,4 +107,4 @@ class GroupDialog(ctk.CTkToplevel):
             group = self.store.add_group(name, self._selected_color)
             self.result = group
 
-        self._on_close()
+        self.destroy()

gui/server_dialog.py

@@ -54,13 +54,13 @@ class ServerDialog(ctk.CTkToplevel):
         self.geometry("450x720")
         self.resizable(False, False)
 
+        # transient BEFORE grab_set — prevents focus lock on minimize
         self.transient(master)
+        self.grab_set()
         self.focus_force()
-        self.protocol("WM_DELETE_WINDOW", self._on_close)
 
-        # Restore dialog when parent is un-minimized
+        # Release grab on close (prevents stuck app)
-        self._master_ref = master
+        self.protocol("WM_DELETE_WINDOW", self._on_close)
-        self._map_bind_id = master.bind("<Map>", self._on_parent_map, add="+")
 
         self._field_frames: dict[str, ctk.CTkFrame] = {}
         self._build_ui(server)
@@ -485,20 +485,10 @@ class ServerDialog(ctk.CTkToplevel):
         except ValueError as e:
             self._show_error(str(e))
 
-    def _on_parent_map(self, event=None):
-        """Restore dialog when parent window is un-minimized."""
-        try:
-            if not self.winfo_exists():
-                return
-            self.deiconify()
-            self.lift()
-            self.focus_force()
-        except Exception:
-            pass
-
     def _on_close(self):
+        """Release grab and destroy — prevents stuck app on minimize."""
         try:
-            self._master_ref.unbind("<Map>", self._map_bind_id)
+            self.grab_release()
         except Exception:
             pass
         self.destroy()

gui/tabs/s3_tab.py

@@ -153,7 +153,24 @@ class S3Tab(ctk.CTkFrame):
             bucket_frame, variable=self._bucket_var, values=[""],
             width=200, command=self._on_bucket_change,
         )
-        self._bucket_menu.pack(side="left", padx=(0, 15))
+        self._bucket_menu.pack(side="left", padx=(0, 5))
+
+        # Create bucket [+]
+        self._create_bucket_btn = ctk.CTkButton(
+            bucket_frame, text="+", width=28, height=28,
+            corner_radius=6, font=ctk.CTkFont(size=14, weight="bold"),
+            command=self._create_bucket,
+        )
+        self._create_bucket_btn.pack(side="left", padx=(0, 3))
+
+        # Delete bucket [🗑]
+        self._delete_bucket_btn = ctk.CTkButton(
+            bucket_frame, text="\U0001f5d1", width=28, height=28,
+            corner_radius=6, fg_color="#dc2626", hover_color="#b91c1c",
+            font=ctk.CTkFont(size=13),
+            command=self._delete_bucket,
+        )
+        self._delete_bucket_btn.pack(side="left", padx=(0, 15))
 
         # Path display
         self._path_label = ctk.CTkLabel(
@@ -626,6 +643,64 @@ class S3Tab(ctk.CTkFrame):
 
         threading.Thread(target=_do, daemon=True).start()
 
+    def _create_bucket(self):
+        """Prompt for bucket name and create it."""
+        if not self._client:
+            return
+        dialog = ctk.CTkInputDialog(
+            text=t("s3_bucket_name_prompt"),
+            title=t("s3_create_bucket"),
+        )
+        name = dialog.get_input()
+        if not name or not name.strip():
+            return
+        name = name.strip()
+        self._status_label.configure(text="...")
+
+        def _do():
+            ok = self._client.create_bucket(name)
+            self.after(0, lambda: self._on_bucket_created(ok, name))
+
+        threading.Thread(target=_do, daemon=True).start()
+
+    def _on_bucket_created(self, ok: bool, name: str):
+        if ok:
+            self._status_label.configure(
+                text=t("s3_bucket_created").format(name=name))
+            self._current_bucket = name
+            self._load_buckets()
+        else:
+            self._status_label.configure(text=t("s3_folder_failed"))
+
+    def _delete_bucket(self):
+        """Delete the currently selected bucket (must be empty)."""
+        if not self._client or not self._current_bucket:
+            return
+        from tkinter import messagebox
+        ok = messagebox.askyesno(
+            t("s3_delete_bucket"),
+            t("s3_delete_bucket_confirm").format(name=self._current_bucket),
+        )
+        if not ok:
+            return
+        bucket_name = self._current_bucket
+        self._status_label.configure(text="...")
+
+        def _do():
+            ok = self._client.delete_bucket(bucket_name)
+            self.after(0, lambda: self._on_bucket_deleted(ok, bucket_name))
+
+        threading.Thread(target=_do, daemon=True).start()
+
+    def _on_bucket_deleted(self, ok: bool, name: str):
+        if ok:
+            self._status_label.configure(
+                text=t("s3_bucket_deleted").format(name=name))
+            self._current_bucket = ""
+            self._load_buckets()
+        else:
+            self._status_label.configure(text=t("s3_delete_failed"))
+
     def _go_back(self):
         if self._nav_stack:
             self._current_prefix = self._nav_stack.pop()

gui/update_dialog.py

@@ -83,11 +83,7 @@ class UpdateDialog(ctk.CTkToplevel):
         self.geometry("500x420")
         self.resizable(False, False)
         self.transient(parent)
-        self.focus_force()
+        self.grab_set()
-        self.protocol("WM_DELETE_WINDOW", self._on_close)
-
-        self._master_ref = parent
-        self._map_bind_id = parent.bind("<Map>", self._on_parent_map, add="+")
 
         self._info = info
         self._downloaded_path = downloaded_path
@@ -103,23 +99,6 @@ class UpdateDialog(ctk.CTkToplevel):
         py = parent.winfo_y() + (parent.winfo_height() - 420) // 2
         self.geometry(f"+{px}+{py}")
 
-    def _on_parent_map(self, event=None):
-        try:
-            if not self.winfo_exists():
-                return
-            self.deiconify()
-            self.lift()
-            self.focus_force()
-        except Exception:
-            pass
-
-    def _on_close(self):
-        try:
-            self._master_ref.unbind("<Map>", self._map_bind_id)
-        except Exception:
-            pass
-        self.destroy()
-
     def _build_ui(self):
         from version import __version__
 
@@ -215,7 +194,7 @@ class UpdateDialog(ctk.CTkToplevel):
             width=80, height=34, corner_radius=8,
             fg_color="#4b5563", hover_color="#374151",
             font=ctk.CTkFont(size=13),
-            command=self._on_close,
+            command=self.destroy,
         ).pack(side="right", padx=(8, 0))
 
         ctk.CTkButton(
@@ -289,4 +268,4 @@ class UpdateDialog(ctk.CTkToplevel):
     def _on_skip_click(self):
         if self._on_skip:
             self._on_skip(self._info["version"])
-        self._on_close()
+        self.destroy()

tools/ssh.py

@@ -42,6 +42,7 @@ S3 (type: s3):
     python ssh.py --s3-upload ALIAS local bucket/key   # upload file
     python ssh.py --s3-download ALIAS bucket/key local # download file
     python ssh.py --s3-delete ALIAS bucket/key         # delete object
+    python ssh.py --s3-url ALIAS bucket/key [SEC]     # presigned URL (default 3600s)
 
 WinRM (type: winrm):
     python ssh.py --ps ALIAS "Get-Process"             # PowerShell via WinRM
@@ -1459,6 +1460,27 @@ def s3_delete(server: dict, remote_path: str):
         sys.exit(1)
 
 
+def s3_url(server: dict, remote_path: str, expires: int = 3600):
+    """Generate a presigned URL for an S3 object."""
+    client = _get_s3_client(server)
+    parts = remote_path.split("/", 1)
+    bucket = parts[0] if parts else server.get("bucket", "")
+    key = parts[1] if len(parts) > 1 else ""
+    if not bucket or not key:
+        print("ERROR: Usage: --s3-url ALIAS bucket/key [seconds]", file=sys.stderr)
+        sys.exit(1)
+    try:
+        url = client.generate_presigned_url(
+            "get_object",
+            Params={"Bucket": bucket, "Key": key},
+            ExpiresIn=expires,
+        )
+        print(url)
+    except Exception as e:
+        print(f"ERROR: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
 # ── Grafana commands ──────────────────────────────────
 
 def _grafana_request(server: dict, endpoint: str) -> dict:
@@ -1763,6 +1785,12 @@ def main():
         alias = _resolve_alias(sys.argv[2], servers)
         s3_delete(servers[alias], sys.argv[3])
         sys.exit(0)
+    if cmd == "--s3-url" and len(sys.argv) >= 4:
+        _, servers = load_servers()
+        alias = _resolve_alias(sys.argv[2], servers)
+        expires = int(sys.argv[4]) if len(sys.argv) >= 5 else 3600
+        s3_url(servers[alias], sys.argv[3], expires)
+        sys.exit(0)
 
     # ── Grafana commands ──
     if cmd == "--grafana-dashboards" and len(sys.argv) >= 3:

version.py

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