susops 3.0.0rc5.dev1__tar.gz → 3.0.0rc6.dev2__tar.gz

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: susops
-Version: 3.0.0rc5.dev1
+Version: 3.0.0rc6.dev2
 Summary: SusOps — SSH SOCKS5 proxy manager with PAC server, Textual TUI, and system tray apps
 License: MIT
 Requires-Python: >=3.11
@@ -463,7 +463,35 @@ susops-tray
 
 Requires `rumps`: `pip install "susops[tray-mac]"`
 
-The tray icon reflects the current state (running / partial-or-pending / stopped). State changes arrive over the daemon's SSE `/events` stream. If the stream drops, the listener reconnects within at most 5 seconds. When TUI + tray are both attached to the same daemon, quitting one keeps the other running — `stop_on_quit` is skipped if any other frontend is still connected. Both tray implementations support the same feature set via native dialogs:
+The tray icon reflects the current state (running / partial-or-pending / stopped). State changes arrive over the daemon's SSE `/events` stream. If the stream drops, the listener reconnects within at most 5 seconds. When TUI + tray are both attached to the same daemon, quitting one keeps the other running — `stop_on_quit` is skipped if any other frontend is still connected.
+
+**Note: the macOS and Linux tray apps diverge in their UI structure.** The 3-column config window described below is macOS-only for now; the Linux tray keeps the classic submenu structure.
+
+### macOS tray
+
+The macOS tray has a slim menu with a unified **config window** (open with Settings… ⌘, or from the tray menu):
+
+Slim menu items:
+- **Status line** — shows current connection state
+- **Settings… ⌘,** — opens the unified config window
+- **Start / Stop / Restart Proxy** — bulk lifecycle for all connections
+- **Show Status** — print current state to stdout
+- **Show Logs** — open the log directory
+- **Launch Browser ▸** — submenu: Chrome or Firefox with the PAC URL pre-configured
+- **Reset All** — kill all processes and wipe the workspace
+- **About SusOps**
+- **Quit ⌘Q**
+
+The **config window** is a 3-column Tailscale-style editor (nav / list / detail) with a dark skin and instant-apply settings:
+
+- **Column 1 — nav.** Categories with live counts: **Connections / Domains / Forwards / Shares**, plus **Settings** pinned at the bottom. Selecting a category drives the list.
+- **Column 2 — list.** A search field on top filters the rows for the selected category. Forwards split into **Local** and **Remote** sections (each with a one-line explainer); shares show download counts. Each row carries a colored run-state dot (green active, amber pending, gray stopped/inactive, red error/connection-down) and a connection badge; disabled rows render dimmed. A context-aware add button sits at the bottom (`+ Add Connection`, `+ Add Domain / IP / CIDR`, `+ Add Forward`, or `Share File…` / `Fetch…`).
+- **Column 3 — detail / editor.** A header with the title, a colored status line, and an **Enabled** toggle in the top-right (applies instantly). The body is a card holding the form: forwards, domains, and shares are **edited inline** (change a field and **Save**) — no remove-and-re-enter. The same `+` buttons open inline **create forms** in this column (file/folder pickers still use the native chooser). Shares expose a copyable `http://localhost:PORT` URL and password. Per-item actions live in the action row (**Delete…** on the left, **Test** / **Save** on the right).
+- **Settings** spans columns 2–3: grouped toggles (launch at login, stop on quit, random SSH ports, restore shares, show bandwidth, notifications, logo style) that **apply instantly**, the RPC / SSE / PAC server ports behind a single **Apply** button, and an **Open Config File…** button.
+
+### Linux tray
+
+The Linux tray keeps the classic submenu menu structure:
 
 - **Manage** — toggle connection/PAC host/forward enabled state; start, stop, or restart a specific connection
 - **Start / Stop / Restart All** — bulk lifecycle operations across all connections
@@ -674,7 +702,7 @@ sudo apt install socat      # Ubuntu / Debian
 
 ### Enabling UDP on a forward
 
-Set `udp: true` in the forward config, or check "UDP" in the TUI/tray add-forward dialog:
+Set `udp: true` in the forward config, or check "UDP" in the TUI/tray forward form:
 
 ```yaml
 forwards:
@@ -874,6 +902,33 @@ scripts/build-local.sh install-pypi   # install wheel into a throwaway venv
 scripts/build-local.sh install-brew   # copy SusOps.app to /Applications
 ```
 
+### Tray development (macOS)
+
+Run a dev tray instance against an isolated workspace without touching your live `~/.susops` setup:
+
+```bash
+# Isolated workspace (avoids any conflict with a running user tray)
+WS=$(mktemp -d /tmp/susops-dev.XXXX)
+SUSOPS_TRAY_WORKSPACE=$WS SUSOPS_TRAY_DEBUG_PORT=7799 .venv/bin/susops-tray &
+
+# Drive the tray via the debug command server
+.venv/bin/python tools/tray_debug.py 7799 ping
+.venv/bin/python tools/tray_debug.py 7799 dump-menu        # full menu JSON
+.venv/bin/python tools/tray_debug.py 7799 open-config       # open the Settings window
+.venv/bin/python tools/tray_debug.py 7799 screenshot /tmp/tray.png
+.venv/bin/python tools/tray_debug.py 7799 quit
+```
+
+`SUSOPS_TRAY_WORKSPACE` points the tray at a different workspace directory (separate config, PID files, sockets) so it never touches `~/.susops`. `SUSOPS_TRAY_DEBUG_PORT` starts a localhost command server on that port; `tools/tray_debug.py` is the client. Supported commands: `ping`, `dump-menu`, `open-config [gear]`, `select <conn> <section> <index>`, `dump-window`, `screenshot <path>`, `action <name>`, `open-about`, `quit`.
+
+### GUI smoke tests (macOS)
+
+```bash
+SUSOPS_RUN_GUI_TESTS=1 .venv/bin/pytest -m gui -v
+```
+
+Seven smoke tests launch a real tray instance (using `SUSOPS_TRAY_WORKSPACE` + `SUSOPS_TRAY_DEBUG_PORT` internally), drive it through the debug server, and assert menu structure and window content. Skipped automatically on Linux and when `SUSOPS_RUN_GUI_TESTS` is unset.
+
 ### Project layout
 
 ```

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/README.md

@@ -439,7 +439,35 @@ susops-tray
 
 Requires `rumps`: `pip install "susops[tray-mac]"`
 
-The tray icon reflects the current state (running / partial-or-pending / stopped). State changes arrive over the daemon's SSE `/events` stream. If the stream drops, the listener reconnects within at most 5 seconds. When TUI + tray are both attached to the same daemon, quitting one keeps the other running — `stop_on_quit` is skipped if any other frontend is still connected. Both tray implementations support the same feature set via native dialogs:
+The tray icon reflects the current state (running / partial-or-pending / stopped). State changes arrive over the daemon's SSE `/events` stream. If the stream drops, the listener reconnects within at most 5 seconds. When TUI + tray are both attached to the same daemon, quitting one keeps the other running — `stop_on_quit` is skipped if any other frontend is still connected.
+
+**Note: the macOS and Linux tray apps diverge in their UI structure.** The 3-column config window described below is macOS-only for now; the Linux tray keeps the classic submenu structure.
+
+### macOS tray
+
+The macOS tray has a slim menu with a unified **config window** (open with Settings… ⌘, or from the tray menu):
+
+Slim menu items:
+- **Status line** — shows current connection state
+- **Settings… ⌘,** — opens the unified config window
+- **Start / Stop / Restart Proxy** — bulk lifecycle for all connections
+- **Show Status** — print current state to stdout
+- **Show Logs** — open the log directory
+- **Launch Browser ▸** — submenu: Chrome or Firefox with the PAC URL pre-configured
+- **Reset All** — kill all processes and wipe the workspace
+- **About SusOps**
+- **Quit ⌘Q**
+
+The **config window** is a 3-column Tailscale-style editor (nav / list / detail) with a dark skin and instant-apply settings:
+
+- **Column 1 — nav.** Categories with live counts: **Connections / Domains / Forwards / Shares**, plus **Settings** pinned at the bottom. Selecting a category drives the list.
+- **Column 2 — list.** A search field on top filters the rows for the selected category. Forwards split into **Local** and **Remote** sections (each with a one-line explainer); shares show download counts. Each row carries a colored run-state dot (green active, amber pending, gray stopped/inactive, red error/connection-down) and a connection badge; disabled rows render dimmed. A context-aware add button sits at the bottom (`+ Add Connection`, `+ Add Domain / IP / CIDR`, `+ Add Forward`, or `Share File…` / `Fetch…`).
+- **Column 3 — detail / editor.** A header with the title, a colored status line, and an **Enabled** toggle in the top-right (applies instantly). The body is a card holding the form: forwards, domains, and shares are **edited inline** (change a field and **Save**) — no remove-and-re-enter. The same `+` buttons open inline **create forms** in this column (file/folder pickers still use the native chooser). Shares expose a copyable `http://localhost:PORT` URL and password. Per-item actions live in the action row (**Delete…** on the left, **Test** / **Save** on the right).
+- **Settings** spans columns 2–3: grouped toggles (launch at login, stop on quit, random SSH ports, restore shares, show bandwidth, notifications, logo style) that **apply instantly**, the RPC / SSE / PAC server ports behind a single **Apply** button, and an **Open Config File…** button.
+
+### Linux tray
+
+The Linux tray keeps the classic submenu menu structure:
 
 - **Manage** — toggle connection/PAC host/forward enabled state; start, stop, or restart a specific connection
 - **Start / Stop / Restart All** — bulk lifecycle operations across all connections
@@ -650,7 +678,7 @@ sudo apt install socat      # Ubuntu / Debian
 
 ### Enabling UDP on a forward
 
-Set `udp: true` in the forward config, or check "UDP" in the TUI/tray add-forward dialog:
+Set `udp: true` in the forward config, or check "UDP" in the TUI/tray forward form:
 
 ```yaml
 forwards:
@@ -850,6 +878,33 @@ scripts/build-local.sh install-pypi   # install wheel into a throwaway venv
 scripts/build-local.sh install-brew   # copy SusOps.app to /Applications
 ```
 
+### Tray development (macOS)
+
+Run a dev tray instance against an isolated workspace without touching your live `~/.susops` setup:
+
+```bash
+# Isolated workspace (avoids any conflict with a running user tray)
+WS=$(mktemp -d /tmp/susops-dev.XXXX)
+SUSOPS_TRAY_WORKSPACE=$WS SUSOPS_TRAY_DEBUG_PORT=7799 .venv/bin/susops-tray &
+
+# Drive the tray via the debug command server
+.venv/bin/python tools/tray_debug.py 7799 ping
+.venv/bin/python tools/tray_debug.py 7799 dump-menu        # full menu JSON
+.venv/bin/python tools/tray_debug.py 7799 open-config       # open the Settings window
+.venv/bin/python tools/tray_debug.py 7799 screenshot /tmp/tray.png
+.venv/bin/python tools/tray_debug.py 7799 quit
+```
+
+`SUSOPS_TRAY_WORKSPACE` points the tray at a different workspace directory (separate config, PID files, sockets) so it never touches `~/.susops`. `SUSOPS_TRAY_DEBUG_PORT` starts a localhost command server on that port; `tools/tray_debug.py` is the client. Supported commands: `ping`, `dump-menu`, `open-config [gear]`, `select <conn> <section> <index>`, `dump-window`, `screenshot <path>`, `action <name>`, `open-about`, `quit`.
+
+### GUI smoke tests (macOS)
+
+```bash
+SUSOPS_RUN_GUI_TESTS=1 .venv/bin/pytest -m gui -v
+```
+
+Seven smoke tests launch a real tray instance (using `SUSOPS_TRAY_WORKSPACE` + `SUSOPS_TRAY_DEBUG_PORT` internally), drive it through the debug server, and assert menu structure and window content. Skipped automatically on Linux and when `SUSOPS_RUN_GUI_TESTS` is unset.
+
 ### Project layout
 
 ```

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "susops"
-version = "3.0.0-rc5.dev1"
+version = "3.0.0-rc6.dev2"
 description = "SusOps — SSH SOCKS5 proxy manager with PAC server, Textual TUI, and system tray apps"
 readme = "README.md"
 license = { text = "MIT" }

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/src/susops/core/config.py

@@ -112,12 +112,14 @@ class AppConfig(BaseModel):
     logo_style: LogoStyle = LogoStyle.COLORED_GLASSES
     restore_shares_on_start: bool = True
     tray_show_bandwidth: bool = False
+    notifications_enabled: bool = True
 
     @field_validator(
         "stop_on_quit",
         "ephemeral_ports",
         "restore_shares_on_start",
         "tray_show_bandwidth",
+        "notifications_enabled",
         mode="before",
     )
     @classmethod

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/src/susops/core/rpc_server.py

@@ -27,6 +27,7 @@ _ALLOWED_METHODS: set[str] = {
     "list_config",
     # Connection CRUD
     "add_connection", "remove_connection", "set_connection_enabled",
+    "update_connection",
     # PAC hosts
     "add_pac_host", "remove_pac_host", "set_pac_host_enabled",
     # Forwards

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/src/susops/facade.py

@@ -659,7 +659,13 @@ class SusOpsManager:
             print(full, file=sys.stderr)
 
     def _notify(self, title: str, body: str) -> None:
-        """Send a desktop notification with the SusOps icon. Best-effort."""
+        """Send a desktop notification with the SusOps icon. Best-effort.
+
+        Suppressed entirely when susops_app.notifications_enabled is False
+        (tray Settings → Notifications toggle).
+        """
+        if not self.config.susops_app.notifications_enabled:
+            return
         import platform
         from pathlib import Path
         icon = Path(__file__).parent / "assets" / "icon.png"
@@ -1118,46 +1124,58 @@ class SusOpsManager:
     def _add_file_share_to_config(
             self, conn_tag: str, file_path: str, password: str, port: int
     ) -> None:
-        conn = get_connection(self.config, conn_tag)
-        if conn is None:
-            return
-        # Update existing entry (clear stopped flag on re-share) or append new
-        existing = [f for f in conn.file_shares if f.file_path == file_path]
-        if existing:
-            new_shares = [
-                fs.model_copy(update={"password": password, "port": port, "stopped": False})
-                if fs.file_path == file_path else fs
-                for fs in conn.file_shares
-            ]
-        else:
-            new_shares = list(conn.file_shares) + [
-                FileShare(file_path=file_path, password=password, port=port)
-            ]
-        self._replace_connection(conn.model_copy(update={"file_shares": new_shares}))
-        self._save()
+        with self._config_lock:
+            self._reload_config()
+            conn = get_connection(self.config, conn_tag)
+            if conn is None:
+                return
+            # Update existing entry (clear stopped flag on re-share) or append new
+            existing = [f for f in conn.file_shares if f.file_path == file_path]
+            if existing:
+                new_shares = [
+                    fs.model_copy(update={"password": password, "port": port, "stopped": False})
+                    if fs.file_path == file_path else fs
+                    for fs in conn.file_shares
+                ]
+            else:
+                new_shares = list(conn.file_shares) + [
+                    FileShare(file_path=file_path, password=password, port=port)
+                ]
+            self._replace_connection(conn.model_copy(update={"file_shares": new_shares}))
+            self._save()
 
     def _remove_file_share_from_config(self, port: int) -> None:
-        new_conns = []
-        for conn in self.config.connections:
-            updated_shares = [f for f in conn.file_shares if f.port != port]
-            if len(updated_shares) != len(conn.file_shares):
-                new_conns.append(conn.model_copy(update={"file_shares": updated_shares}))
-            else:
-                new_conns.append(conn)
-        self.config = self.config.model_copy(update={"connections": new_conns})
-        self._save()
+        with self._config_lock:
+            self._reload_config()
+            new_conns = []
+            for conn in self.config.connections:
+                updated_shares = [f for f in conn.file_shares if f.port != port]
+                if len(updated_shares) != len(conn.file_shares):
+                    new_conns.append(conn.model_copy(update={"file_shares": updated_shares}))
+                else:
+                    new_conns.append(conn)
+            self.config = self.config.model_copy(update={"connections": new_conns})
+            self._save()
 
     def _set_file_share_stopped(self, port: int, stopped: bool) -> None:
-        """Update the stopped flag on a persisted FileShare entry."""
-        new_conns = []
-        for conn in self.config.connections:
-            updated = [
-                fs.model_copy(update={"stopped": stopped}) if fs.port == port else fs
-                for fs in conn.file_shares
-            ]
-            new_conns.append(conn.model_copy(update={"file_shares": updated}))
-        self.config = self.config.model_copy(update={"connections": new_conns})
-        self._save()
+        """Update the stopped flag on a persisted FileShare entry.
+
+        Reads fresh under _config_lock so a concurrent config mutation (the
+        tray poll's list_shares, another frontend) cannot be clobbered by a
+        stale in-memory write. Matches the read-modify-write pattern used by
+        the other config mutators.
+        """
+        with self._config_lock:
+            self._reload_config()
+            new_conns = []
+            for conn in self.config.connections:
+                updated = [
+                    fs.model_copy(update={"stopped": stopped}) if fs.port == port else fs
+                    for fs in conn.file_shares
+                ]
+                new_conns.append(conn.model_copy(update={"file_shares": updated}))
+            self.config = self.config.model_copy(update={"connections": new_conns})
+            self._save()
 
     # ------------------------------------------------------------------ #
     # Lifecycle
@@ -1727,6 +1745,75 @@ class SusOpsManager:
         pid = self._process_mgr.get_pid(f"{SSH_PROCESS_PREFIX}-{tag}") if running else None
         self._emit("state", {"tag": tag, "running": running, "pid": pid})
 
+    def update_connection(
+            self,
+            tag: str,
+            *,
+            new_tag: str | None = None,
+            ssh_host: str | None = None,
+            socks_proxy_port: int | None = None,
+            restart: bool = True,
+    ) -> Connection:
+        """Edit a connection's tag / ssh_host / socks_proxy_port in place.
+
+        Unlike remove + re-add, this preserves the connection's children
+        (forwards, pac_hosts, pac_hosts_disabled, file_shares, enabled) via
+        model_copy — remove_connection cascades and would drop them.
+
+        If the connection was running and restart=True, the tunnel is torn
+        down under the OLD tag and brought back up under the NEW config so a
+        renamed/re-pointed connection picks up the change immediately.
+        """
+        with self._config_lock:
+            self._reload_config()
+            conn = get_connection(self.config, tag)
+            if conn is None:
+                raise ValueError(f"Connection '{tag}' not found")
+
+            target_tag = (new_tag if new_tag is not None else tag).strip()
+            if not target_tag:
+                raise ValueError("Tag must be a non-empty string")
+            if target_tag != tag:
+                _validate_tag(target_tag)
+                if get_connection(self.config, target_tag) is not None:
+                    raise ValueError(f"Connection '{target_tag}' already exists")
+
+            new_host = (ssh_host if ssh_host is not None else conn.ssh_host).strip()
+            if not new_host:
+                raise ValueError("ssh_host must be a non-empty string")
+
+            new_port = conn.socks_proxy_port if socks_proxy_port is None else int(socks_proxy_port)
+            if not validate_port(new_port, allow_zero=True):
+                raise ValueError(f"Invalid socks_proxy_port {new_port}: must be 0 or 1-65535")
+            if new_port != 0 and new_port != conn.socks_proxy_port and not is_port_free(new_port):
+                raise ValueError(f"SOCKS port {new_port} is already in use")
+
+            was_running = (
+                    is_tunnel_running(tag, self._process_mgr)
+                    or is_socket_alive(tag, self.workspace)
+            )
+
+            updated = conn.model_copy(update={
+                "tag": target_tag,
+                "ssh_host": new_host,
+                "socks_proxy_port": new_port,
+            })
+            self.config = self.config.model_copy(update={
+                "connections": [updated if c.tag == tag else c for c in self.config.connections]
+            })
+            self._save()
+
+        self._update_pac()
+        if was_running and restart:
+            # Tear down under the OLD tag (its PID/socket/shares/forwards), then
+            # bring it back up under the NEW config. Outside the config lock —
+            # stop/start acquire their own locks.
+            self.stop(tag=tag)
+            self.start(tag=target_tag)
+        self._log(f"[{tag}] Updated → tag={target_tag} host={new_host} socks={new_port}")
+        self._emit_state(self._compute_state())
+        return updated
+
     def _update_pac(self) -> None:
         """Write the PAC file and reload the in-process server if running."""
         pac_path = write_pac_file(self.config, self.workspace, active_tags=self._active_tags())
@@ -2123,20 +2210,23 @@ class SusOpsManager:
                 failed_count=server.failed_count,
             ))
 
-        # Config-only stopped shares (persisted but server not running in this process)
-        self._reload_config()
-        for conn in self.config.connections:
-            for fs in conn.file_shares:
-                if fs.port not in running_ports:
-                    result.append(ShareInfo(
-                        file_path=fs.file_path,
-                        port=fs.port,
-                        password=fs.password,
-                        url=f"http://localhost:{fs.port}",
-                        conn_tag=conn.tag,
-                        running=False,
-                        stopped=fs.stopped,
-                    ))
+        # Config-only stopped shares (persisted but server not running in this
+        # process). Reload under the lock so a concurrent share/stop_share
+        # config write is not interleaved or clobbered.
+        with self._config_lock:
+            self._reload_config()
+            for conn in self.config.connections:
+                for fs in conn.file_shares:
+                    if fs.port not in running_ports:
+                        result.append(ShareInfo(
+                            file_path=fs.file_path,
+                            port=fs.port,
+                            password=fs.password,
+                            url=f"http://localhost:{fs.port}",
+                            conn_tag=conn.tag,
+                            running=False,
+                            stopped=fs.stopped,
+                        ))
 
         return result
 
@@ -2428,11 +2518,12 @@ class SusOpsManager:
         return self.config.susops_app
 
     def update_app_config(self, **kwargs) -> None:
-        self._reload_config()
-        self.config = self.config.model_copy(
-            update={"susops_app": self.config.susops_app.model_copy(update=kwargs)}
-        )
-        self._save()
+        with self._config_lock:
+            self._reload_config()
+            self.config = self.config.model_copy(
+                update={"susops_app": self.config.susops_app.model_copy(update=kwargs)}
+            )
+            self._save()
 
     def update_config(self, **kwargs) -> None:
         """Update top-level SusOpsConfig fields (e.g. pac_server_port).
@@ -2444,6 +2535,7 @@ class SusOpsManager:
         — needed by RPC clients that can't touch private methods or rebind
         the config attribute directly.
         """
-        self._reload_config()
-        self.config = self.config.model_copy(update=kwargs)
-        self._save()
+        with self._config_lock:
+            self._reload_config()
+            self.config = self.config.model_copy(update=kwargs)
+            self._save()

{susops-3.0.0rc5.dev1 → susops-3.0.0rc6.dev2}/src/susops/tray/base.py

@@ -1,6 +1,7 @@
 """AbstractTrayApp — shared tray app logic for Linux and macOS."""
 from __future__ import annotations
 
+import os
 import re
 from abc import ABC, abstractmethod
 from pathlib import Path
@@ -66,6 +67,15 @@ from susops.client import SusOpsClient
 from susops.core.config import PortForward
 
 
+def _resolve_workspace() -> Path:
+    """Workspace dir for the tray. SUSOPS_TRAY_WORKSPACE overrides ~/.susops
+    so a dev/test instance can run alongside the user's real tray."""
+    env = os.environ.get("SUSOPS_TRAY_WORKSPACE")
+    if env:
+        return Path(env).expanduser()
+    return Path.home() / ".susops"
+
+
 class AbstractTrayApp(ABC):
     """Base class for tray apps. Subclasses implement the platform-specific UI layer.
 
@@ -78,7 +88,7 @@ class AbstractTrayApp(ABC):
     """
 
     def __init__(self) -> None:
-        workspace = Path.home() / ".susops"
+        workspace = _resolve_workspace()
         self.manager = SusOpsClient(workspace=workspace, process_name="susops-tray")
         self.state = ProcessState.INITIAL
 
@@ -391,14 +401,19 @@ class AbstractTrayApp(ABC):
                 cfg = self.manager.list_config()
                 conn = next((c for c in cfg.connections if c.tag == tag), None)
                 if conn is None:
-                    return f"Connection '{tag}' not found."
+                    return f"Connection '{tag}' not found.", False
                 new_state = not conn.enabled
                 self.manager.set_connection_enabled(tag, new_state)
-                return f"Connection '{tag}' {'enabled' if new_state else 'disabled'}."
+                return None, True
             except Exception as e:
-                return f"Error: {e}"
+                return f"Error: {e}", False
+
+        def _done(r):
+            msg, ok = r
+            if not ok:
+                self.show_alert("Toggle Connection", msg)
 
-        self.run_in_background(_run, lambda msg: self.show_alert("Toggle Connection", msg))
+        self.run_in_background(_run, _done)
 
     def do_start_connection(self, tag: str) -> None:
         def _run():
@@ -443,21 +458,31 @@ class AbstractTrayApp(ABC):
                 all_disabled = [h for c in cfg.connections for h in c.pac_hosts_disabled]
                 currently_disabled = host in all_disabled
                 self.manager.set_pac_host_enabled(host, currently_disabled)  # flip
-                return f"Domain '{host}' {'enabled' if currently_disabled else 'disabled'}."
+                return None, True
             except Exception as e:
-                return f"Error: {e}"
+                return f"Error: {e}", False
+
+        def _done(r):
+            msg, ok = r
+            if not ok:
+                self.show_alert("Toggle Domain", msg)
 
-        self.run_in_background(_run, lambda msg: self.show_alert("Toggle Domain", msg))
+        self.run_in_background(_run, _done)
 
     def do_toggle_forward_enabled(self, conn_tag: str, src_port: int, direction: str) -> None:
         def _run():
             try:
                 self.manager.toggle_forward_enabled(conn_tag, src_port, direction)
-                return f"Forward :{src_port} toggled."
+                return None, True
             except Exception as e:
-                return f"Error: {e}"
+                return f"Error: {e}", False
 
-        self.run_in_background(_run, lambda msg: self.show_alert("Toggle Forward", msg))
+        def _done(r):
+            msg, ok = r
+            if not ok:
+                self.show_alert("Toggle Forward", msg)
+
+        self.run_in_background(_run, _done)
 
     def do_test_connection(self, conn_tag: str) -> None:
         def _run():