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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: susops
-Version: 3.0.0rc4.dev2
+Version: 3.0.0rc6.dev1
 Summary: SusOps — SSH SOCKS5 proxy manager with PAC server, Textual TUI, and system tray apps
 License: MIT
 Requires-Python: >=3.11
@@ -315,7 +315,7 @@ susops
 
 ### Screens
 
-**Dashboard** (default) — split-pane view. Left sidebar shows all connections (status dot, SOCKS port, live throughput), PAC server status, and active file shares. Right panel is tabbed:
+**Dashboard** (default) — split-pane view. Left sidebar shows all connections (status dot — `●` green running, `◐` orange pending, `○` dim stopped — SOCKS port, live throughput), PAC server status, and active file shares. Right panel is tabbed:
 - **Stats** — CPU%, memory, active connections, PID for the selected connection
 - **Bandwidth** — live RX and TX line charts (PlotextPlot, 60-sample rolling window, auto-scaled units)
 - **Forwards** — DataTable of all port forwards (direction, local port, local bind, remote port, remote bind, label)
@@ -436,9 +436,11 @@ susops reset [--force]    # Kill all processes, wipe ~/.susops workspace
 |------|---------|
 | `0` | Success / all running |
 | `1` | Error |
-| `2` | Partial (some services stopped) |
+| `2` | Partial (some services stopped, or any connection pending) |
 | `3` | All stopped |
 
+A connection is **pending** when its SSH master is alive but the ControlMaster socket isn't up yet — typically while ssh-agent is waiting on a key unlock, or between reconnect attempts. `start` returns as soon as the master spawns; auth then completes asynchronously up to 60 s later. Slow agent prompts (Vaultwarden, 1Password, hardware keys) no longer freeze the UI.
+
 ---
 
 ## System Tray
@@ -461,7 +463,35 @@ susops-tray
 
 Requires `rumps`: `pip install "susops[tray-mac]"`
 
-The tray icon reflects the current state (running/partial/stopped). State changes arrive over the daemon's SSE `/events` stream. If the stream drops, the listener reconnects within at most 5 seconds. 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
@@ -552,7 +582,11 @@ Both can be `true` simultaneously — susops will start an SSH slave for TCP and
 
 ### Port assignment
 
-Ports default to `0` (auto-assign). SusOps picks a random free port from the ephemeral range (49152–65535) at start time and saves it back to `config.yaml`. Pass a specific port to `add-connection` or set it in the config to pin it.
+Ports default to `0` (auto-assign). SusOps picks a random free port from the ephemeral range (49152–65535) at start time and saves it back to `config.yaml`. Pass a specific port to `add-connection` or set it in the config to pin it. Ports outside `1–65535` are rejected on `add`.
+
+### Tag format
+
+Connection tags must match `[A-Za-z0-9][A-Za-z0-9._-]{0,63}` (no slashes, no `..`, no leading punctuation). Tags appear in PID-file names, socket paths, log lines, and PAC keys, so the format is intentionally strict.
 
 ### Workspace
 
@@ -668,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:
@@ -860,8 +894,41 @@ susops
 # Run the CLI
 susops ps
 susops ls
+
+# Build local pypi + brew artifacts (mirrors CI, no upload)
+scripts/build-local.sh pypi      # wheel + sdist
+scripts/build-local.sh brew      # SusOps.app + .dmg (macOS only)
+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
 
 ```
@@ -937,7 +1004,7 @@ brew tap mashb1t/susops
 brew install susops
 ```
 
-The formula at `packaging/homebrew/Formula/susops.rb` uses `virtualenv_install_with_resources` to create an isolated Python environment with all dependencies. The cask at `packaging/homebrew/Casks/susops.rb` is for a future `.dmg` distribution of `SusOps.app`.
+The formula at `packaging/homebrew/Formula/susops.rb` uses `virtualenv_install_with_resources` to create an isolated Python environment for the CLI + TUI. The cask at `packaging/homebrew/Casks/susops.rb` installs `SusOps.app` (PyInstaller bundle) for the macOS tray — `brew install --cask susops`.
 
 **Note:** Resource sha256 checksums in the formula must be updated for each release. Generate them with:
 

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

@@ -291,7 +291,7 @@ susops
 
 ### Screens
 
-**Dashboard** (default) — split-pane view. Left sidebar shows all connections (status dot, SOCKS port, live throughput), PAC server status, and active file shares. Right panel is tabbed:
+**Dashboard** (default) — split-pane view. Left sidebar shows all connections (status dot — `●` green running, `◐` orange pending, `○` dim stopped — SOCKS port, live throughput), PAC server status, and active file shares. Right panel is tabbed:
 - **Stats** — CPU%, memory, active connections, PID for the selected connection
 - **Bandwidth** — live RX and TX line charts (PlotextPlot, 60-sample rolling window, auto-scaled units)
 - **Forwards** — DataTable of all port forwards (direction, local port, local bind, remote port, remote bind, label)
@@ -412,9 +412,11 @@ susops reset [--force]    # Kill all processes, wipe ~/.susops workspace
 |------|---------|
 | `0` | Success / all running |
 | `1` | Error |
-| `2` | Partial (some services stopped) |
+| `2` | Partial (some services stopped, or any connection pending) |
 | `3` | All stopped |
 
+A connection is **pending** when its SSH master is alive but the ControlMaster socket isn't up yet — typically while ssh-agent is waiting on a key unlock, or between reconnect attempts. `start` returns as soon as the master spawns; auth then completes asynchronously up to 60 s later. Slow agent prompts (Vaultwarden, 1Password, hardware keys) no longer freeze the UI.
+
 ---
 
 ## System Tray
@@ -437,7 +439,35 @@ susops-tray
 
 Requires `rumps`: `pip install "susops[tray-mac]"`
 
-The tray icon reflects the current state (running/partial/stopped). State changes arrive over the daemon's SSE `/events` stream. If the stream drops, the listener reconnects within at most 5 seconds. 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
@@ -528,7 +558,11 @@ Both can be `true` simultaneously — susops will start an SSH slave for TCP and
 
 ### Port assignment
 
-Ports default to `0` (auto-assign). SusOps picks a random free port from the ephemeral range (49152–65535) at start time and saves it back to `config.yaml`. Pass a specific port to `add-connection` or set it in the config to pin it.
+Ports default to `0` (auto-assign). SusOps picks a random free port from the ephemeral range (49152–65535) at start time and saves it back to `config.yaml`. Pass a specific port to `add-connection` or set it in the config to pin it. Ports outside `1–65535` are rejected on `add`.
+
+### Tag format
+
+Connection tags must match `[A-Za-z0-9][A-Za-z0-9._-]{0,63}` (no slashes, no `..`, no leading punctuation). Tags appear in PID-file names, socket paths, log lines, and PAC keys, so the format is intentionally strict.
 
 ### Workspace
 
@@ -644,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:
@@ -836,8 +870,41 @@ susops
 # Run the CLI
 susops ps
 susops ls
+
+# Build local pypi + brew artifacts (mirrors CI, no upload)
+scripts/build-local.sh pypi      # wheel + sdist
+scripts/build-local.sh brew      # SusOps.app + .dmg (macOS only)
+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
 
 ```
@@ -913,7 +980,7 @@ brew tap mashb1t/susops
 brew install susops
 ```
 
-The formula at `packaging/homebrew/Formula/susops.rb` uses `virtualenv_install_with_resources` to create an isolated Python environment with all dependencies. The cask at `packaging/homebrew/Casks/susops.rb` is for a future `.dmg` distribution of `SusOps.app`.
+The formula at `packaging/homebrew/Formula/susops.rb` uses `virtualenv_install_with_resources` to create an isolated Python environment for the CLI + TUI. The cask at `packaging/homebrew/Casks/susops.rb` installs `SusOps.app` (PyInstaller bundle) for the macOS tray — `brew install --cask susops`.
 
 **Note:** Resource sha256 checksums in the formula must be updated for each release. Generate them with:
 

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

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

{susops-3.0.0rc4.dev2 → susops-3.0.0rc6.dev1}/src/susops/client.py

@@ -60,16 +60,38 @@ def _read_port(workspace: Path) -> int | None:
         return None
 
 
+def _pid_is_susops_daemon(pid: int) -> bool:
+    """True only if PID belongs to a live process whose cmdline matches a
+    services_daemon invocation. Defends against PID reuse: SIGKILLing the
+    daemon under load can let an ssh fork (or any other short-lived child)
+    inherit the freed PID, and a bare `os.kill(pid, 0)` liveness probe
+    would then falsely report the daemon as up.
+    """
+    try:
+        import psutil
+    except ImportError:
+        try:
+            os.kill(pid, 0)
+            return True
+        except (OSError, ValueError):
+            return False
+    try:
+        proc = psutil.Process(pid)
+        cmdline = " ".join(proc.cmdline())
+    except (psutil.NoSuchProcess, psutil.AccessDenied):
+        return False
+    return "susops.core.services_daemon" in cmdline or "susops-services" in cmdline
+
+
 def _is_daemon_alive(workspace: Path) -> bool:
     pid_file = _pid_path(workspace)
     if not pid_file.exists():
         return False
     try:
         pid = int(pid_file.read_text().strip())
-        os.kill(pid, 0)  # signal 0 = liveness probe
-        return True
     except (OSError, ValueError):
         return False
+    return _pid_is_susops_daemon(pid)
 
 
 def ensure_daemon_running(workspace: Path = _WORKSPACE_DEFAULT) -> int:

{susops-3.0.0rc4.dev2 → susops-3.0.0rc6.dev1}/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
@@ -193,39 +195,32 @@ def save_config(config: SusOpsConfig, workspace: Path = WORKSPACE_DEFAULT) -> No
     clicks.
     """
     import os
+    import tempfile
     path = get_config_path(workspace)
     path.parent.mkdir(parents=True, exist_ok=True)
     yaml = YAML()
     yaml.default_flow_style = False
     yaml.indent(mapping=2, sequence=4, offset=2)
-    # Convert to plain dict via model_dump, then save
     data = config.model_dump(mode='python')
-    # Convert enums to their values for serialization
     data['susops_app']['logo_style'] = config.susops_app.logo_style.value
-    # Compute the target mode BEFORE writing: preserve any user-set restrictive
-    # permissions (e.g. chmod 600 on a hardened install) since Path.replace()
-    # would otherwise clobber them with the temp file's umask-derived mode.
-    # New configs default to 0o600 — the file holds share passwords.
     try:
         target_mode = path.stat().st_mode & 0o777
     except OSError:
         target_mode = 0o600
-    # Temp file in the same directory so the rename stays on one filesystem.
-    # Open with O_EXCL so we never overwrite a leftover temp file from a
-    # crashed earlier save (would otherwise inherit its mode).
-    tmp_path = path.with_name(path.name + ".tmp")
+    # Unique tmp file per call so concurrent saves (rapid TUI start/stop runs
+    # each handler in its own executor thread) don't fight over the same name
+    # and crash on tmp.replace(path) after a peer already renamed it away.
+    fd, tmp_name = tempfile.mkstemp(
+        prefix=path.name + ".",
+        suffix=".tmp",
+        dir=str(path.parent),
+    )
+    tmp_path = Path(tmp_name)
     try:
-        fd = os.open(
-            str(tmp_path),
-            os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
-            target_mode,
-        )
         try:
             with os.fdopen(fd, 'w') as f:
                 yaml.dump(data, f)
         except Exception:
-            # fdopen owns fd on success; on failure we may need to close it
-            # if fdopen never took ownership. Best-effort.
             try:
                 os.close(fd)
             except OSError:
@@ -235,7 +230,6 @@ def save_config(config: SusOpsConfig, workspace: Path = WORKSPACE_DEFAULT) -> No
         os.chmod(tmp_path, target_mode)
         tmp_path.replace(path)
     except Exception:
-        # Best-effort cleanup of the temp file if writing failed.
         try:
             tmp_path.unlink(missing_ok=True)
         except Exception:

{susops-3.0.0rc4.dev2 → susops-3.0.0rc6.dev1}/src/susops/core/pac.py

@@ -134,10 +134,20 @@ class PacServer:
     def start(self, port: int, pac_path: Path) -> None:
         """Start the PAC HTTP server on the given port.
 
-        Raises RuntimeError if already running or if port is in use.
+        No-op if already running on the same port (parallel start() callers
+        race here — facade's check-then-act on is_running() can let multiple
+        threads through). Raises RuntimeError if the port is in use by
+        something else.
         """
         if self._server is not None:
-            raise RuntimeError("PAC server is already running")
+            if self._port == port:
+                # Same port + already up: caller's intent is already satisfied.
+                self._pac_path = pac_path
+                return
+            raise RuntimeError(
+                f"PAC server already running on port {self._port}, "
+                f"refusing to also bind {port}"
+            )
 
         self._pac_path = pac_path
 

{susops-3.0.0rc4.dev2 → susops-3.0.0rc6.dev1}/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.0rc4.dev2 → susops-3.0.0rc6.dev1}/src/susops/core/services_daemon.py

@@ -86,17 +86,21 @@ def _preflight(workspace: Path, log: "logging.Logger") -> None:
         # Won the race uncontested.
         pass
     else:
-        # File exists. Is the holder alive?
+        # File exists. Is the holder alive AND actually our daemon?
+        # PID reuse (an ssh fork inheriting the freed PID after we kill -9
+        # the daemon) would otherwise wedge us in a refusal loop until the
+        # impostor exits. Reuse the same identity check the client does.
         pid_file = _pid_path(workspace)
         try:
             existing_pid = int(pid_file.read_text().strip())
-            os.kill(existing_pid, 0)  # liveness probe
         except (OSError, ValueError):
-            # Stale PID file. Remove + retry the atomic claim once.
+            existing_pid = None
+        from susops.client import _pid_is_susops_daemon
+        if existing_pid is None or not _pid_is_susops_daemon(existing_pid):
+            # Stale (or impostor) PID file. Remove + retry the atomic claim.
             pid_file.unlink(missing_ok=True)
             _port_path(workspace).unlink(missing_ok=True)
             if not _claim_pid_file(workspace):
-                # Some other daemon claimed it between our cleanup and retry.
                 log.error(
                     "another susops-services daemon raced us to start. "
                     "Try again — or run "

{susops-3.0.0rc4.dev2 → susops-3.0.0rc6.dev1}/src/susops/core/ssh.py

@@ -8,6 +8,7 @@ Architecture:
 """
 from __future__ import annotations
 
+import os
 import subprocess
 import time
 from pathlib import Path
@@ -249,9 +250,43 @@ def stop_tunnel(
             except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
                 pass
 
+    # Last-resort sweep for orphan masters bound to our socket path.
+    # Under parallel start/stop the PID file can race (start writes PID Y while
+    # stop reads stale PID X, or the reconnect monitor spawns M2 between the
+    # read and the kill), leaving an ssh -N -T -D ... ControlPath=...sock
+    # process alive until its own keepalive timeout fires ~60s later.
+    if workspace is not None:
+        _sweep_orphan_masters(tag, workspace)
+
     return stopped
 
 
+def _sweep_orphan_masters(tag: str, workspace: Path) -> None:
+    """Kill any ssh process whose argv references our ControlPath socket but
+    that ProcessManager isn't tracking. No-op if psutil is unavailable.
+    """
+    try:
+        import psutil
+    except ImportError:
+        return
+    sock_str = str(socket_path(tag, workspace))
+    try:
+        own_pid = os.getpid()
+    except Exception:
+        own_pid = -1
+    for proc in psutil.process_iter(["pid", "name", "cmdline"]):
+        try:
+            if proc.info["pid"] == own_pid:
+                continue
+            if proc.info.get("name") != "ssh":
+                continue
+            cmdline = proc.info.get("cmdline") or []
+            if any(sock_str in arg for arg in cmdline):
+                proc.kill()
+        except (psutil.NoSuchProcess, psutil.AccessDenied):
+            continue
+
+
 def is_tunnel_running(tag: str, process_mgr: ProcessManager) -> bool:
     """Return True if the ControlMaster SSH process for tag is currently running."""
     return process_mgr.is_running(_master_name(tag))