@@ -191,10 +191,10 @@ Every variable below is consumed by the container entrypoint, so it applies iden
 | `FILES_WAIT_TIMEOUT_SECONDS` | `0` | 0 = wait forever for `WindowsServer/` to appear before launching. Only relevant when `WINDROSE_SERVER_SOURCE=files`. |
 | `PROTON_USE_XALIA` | `0` | Xalia crashes on headless Proton; leave off. |
 
-**Idle-CPU patch**
+**Legacy idle-CPU patch**
 | Env var | Default | Purpose |
 |---|---|---|
-| `WINDROSE_PATCH_IDLE_CPU` | `0` | `1` → entrypoint builds a `WindroseServer-Win64-Shipping.patched.exe` sibling of the Steam-managed original on every start (caching by source md5), and launches that instead. The original is never modified, so SteamCMD's app_update has nothing to revert. **Experimental, no warranty** — see Caveats and the script header. Bare-Linux `install.sh` prompts for confirmation when flipping to `1`; set `WINDROSE_PATCH_ACK_RISK=1` to bypass for headless operators. |
+| `WINDROSE_PATCH_IDLE_CPU` | `0` | Legacy workaround for older/pinned server builds that predate Windrose's official idle-CPU fix. Current SteamCMD builds should leave this `0`. `1` builds a `WindroseServer-Win64-Shipping.patched.exe` sibling of the Steam-managed original and launches that instead. The original is never modified, so SteamCMD's app_update has nothing to revert. **Experimental, no warranty** — see Caveats and the script header. Bare-Linux `install.sh` prompts for confirmation when flipping to `1`; set `WINDROSE_PATCH_ACK_RISK=1` to bypass for headless operators. |
 | `WINDROSE_PATCH_OVERRIDE_FILE` | `$R5_DIR/.idle-patch-override` | Runtime override written by the admin UI's Idle-CPU card. `disabled` forces OFF (patched sibling is removed on next restart, game launches original); `enabled` forces ON regardless of env. Absent = follow `WINDROSE_PATCH_IDLE_CPU`. |
 
 **Admin UI (`windrose-ui` sidecar)**
@@ -532,9 +532,9 @@ CI runs these plus JSON validation and YAML lint.
        --from-file=app.js=./ui/app.js
      ```
      Point nginx's `root` or `alias` at the mount and `proxy_pass` the `/api/*` location to the windrose Service.
-- **Unpatched idle CPU is ~2 cores** — a known upstream spin-loop bug in `boost::asio::detail::socket_select_interrupter::reset()`, unreachable from Engine.ini / launch args / Proton env (see `memory/windrose_idle_cpu_known_bug.md`). Optional binary patch at `scripts/patch-idle-cpu.py` injects a `Sleep(1)` into the hot loop; ~97% reduction on the builds measured so far. Opt in via `WINDROSE_PATCH_IDLE_CPU=1` (Helm: `patchIdleCpu: "1"`). The script auto-derives offsets from a unique byte signature so it tolerates Windrose rebuilds — it refuses cleanly if the signature moves. The UI's Idle-CPU card has a runtime override for rollback without redeploying. **Offered as-is with no warranty and no guarantees.** Operators run it against their own SteamCMD-pulled copy; this project does not distribute modified binaries. Applying may conflict with the Windrose EULA or Steam Subscriber Agreement — review the terms before enabling; full risk rests with you.
+- **Legacy idle-CPU patch.** Older Windrose dedicated-server builds had an upstream spin-loop bug in `boost::asio::detail::socket_select_interrupter::reset()` that burned ~2 CPU cores while idle (see `memory/windrose_idle_cpu_known_bug.md`). Windrose's April 30, 2026 server update includes an official CPU fix, so current SteamCMD installs should keep `WINDROSE_PATCH_IDLE_CPU=0` (Helm: `patchIdleCpu: "0"`). The optional binary patch remains only for operators running older/pinned server files that still exhibit the historical spin. It injects a `Sleep(1)` into the old hot loop and refuses cleanly if the signature is not present. **Offered as-is with no warranty and no guarantees.** Operators run it against their own SteamCMD-pulled copy; this project does not distribute modified binaries. Applying may conflict with the Windrose EULA or Steam Subscriber Agreement — review the terms before enabling; full risk rests with you.
 
-  Sizing floors (validated on DigitalOcean bare-Linux droplets 2026-04-18/19, unpatched):
+  Historical sizing floors (validated on DigitalOcean bare-Linux droplets 2026-04-18/19 before the official idle-CPU fix):
   - **1 vCPU / any RAM**: unplayable. Idle bug pegs the core, no headroom for the P2P handshake; client times out in `UePreloginVerified` and Coturn resets after ~180 s.
   - **2 vCPU / 2 GB**: unplayable for a different reason — a delayed ~500 MiB allocation at t≈9 min crashes page reclamation regardless of swap.
   - **2 vCPU / 4 GB, fresh world**: marginal. On slower shared vCPUs (typical DO / Hetzner / Linode small tiers) terrain generation saturates both cores during the first-connect handshake; Coturn times out at ~180 s and the client bounces to menu.
 
@@ -7,13 +7,15 @@ anywhere the [`Dockerfile`](../Dockerfile) deps are available.
 
 ## Sizing
 
-An upstream idle-CPU bug in the dedicated server eats ~1.82 cores
-before any player is connected (UE5 task-worker busy-spin, tracked on
-the [community thread](https://steamcommunity.com/app/3041230/discussions/0/807974232125564069/)).
-The community binary patch at `scripts/patch-idle-cpu.py` (opt in via
-`WINDROSE_PATCH_IDLE_CPU=1` in `/etc/windrose/windrose.env`) drops that
-to ~5% — if you apply it, a 1 vCPU host becomes viable. Without the
-patch the box needs real headroom above the idle floor:
+Windrose's April 30, 2026 dedicated-server update includes an official
+idle-CPU fix. Current SteamCMD installs should leave
+`WINDROSE_PATCH_IDLE_CPU=0`.
+
+The sizing table below is historical, from older server builds where an
+upstream idle-CPU bug ate ~1.82 cores before any player connected. The
+community binary patch at `scripts/patch-idle-cpu.py` remains available
+for older/pinned server files that still show that behavior, but it is
+no longer the default recommendation for current SteamCMD installs.
 
 | Box                | Verdict                                                                 |
 | ------------------ | ----------------------------------------------------------------------- |
 
@@ -88,11 +88,13 @@ if [ "${WINDROSE_PATCH_IDLE_CPU:-}" = "1" ]; then
   if [ "${_prev}" != "1" ] && [ "${WINDROSE_PATCH_ACK_RISK:-}" != "1" ]; then
     cat >&2 <<'EOF'
 
-[install] ⚠️  You are enabling the idle-CPU binary patch.
+[install] ⚠️  You are enabling the legacy idle-CPU binary patch.
 
-  This is an EXPERIMENTAL community workaround that modifies the Windrose
-  dedicated-server binary in place. It is provided AS IS, with NO warranty
-  of any kind:
+  Windrose's current SteamCMD server build includes an official CPU fix.
+  This EXPERIMENTAL community workaround is only for older/pinned server
+  builds that still show the historical idle spin. It modifies the
+  Windrose dedicated-server binary in place and is provided AS IS, with
+  NO warranty of any kind:
 
     * It may break at any time — especially after a Windrose game update.
     * It may conflict with the Windrose EULA or Steam Subscriber Agreement.
@@ -355,7 +357,8 @@ DIRECT_CONNECTION_PROXY_ADDRESS=${DIRECT_CONNECTION_PROXY_ADDRESS:-0.0.0.0}
 NET_SERVER_MAX_TICK_RATE=${NET_SERVER_MAX_TICK_RATE:-60}
 PROTON_USE_XALIA=${PROTON_USE_XALIA:-0}
 FILES_WAIT_TIMEOUT_SECONDS=${FILES_WAIT_TIMEOUT_SECONDS:-0}
-# Opt in to the idle-CPU binary patch (scripts/patch-idle-cpu.py).
+# Legacy idle-CPU binary patch (scripts/patch-idle-cpu.py).
+# Current SteamCMD installs should keep this 0.
 # "1" -> entrypoint patches the EXE on every start (idempotent).
 # The UI Idle-CPU card can flip this per-host without editing this file.
 WINDROSE_PATCH_IDLE_CPU=${WINDROSE_PATCH_IDLE_CPU:-0}
 
@@ -41,11 +41,9 @@ services:
       WINDROSE_LAUNCH_STRATEGY: ${WINDROSE_LAUNCH_STRATEGY:-shipping}
       FILES_WAIT_TIMEOUT_SECONDS: ${FILES_WAIT_TIMEOUT_SECONDS:-0}
       PROTON_USE_XALIA: ${PROTON_USE_XALIA:-0}
-      # Apply the idle-CPU throttle patch at boot. Off by default because
-      # the patch targets a specific Windrose build (md5-checked); leaving
-      # it off means new operators aren't surprised by a no-op after the
-      # game updates. Operators who want the 97% idle-CPU reduction right
-      # now on the shipping 0.10.0 build opt in by setting this to 1.
+      # Legacy idle-CPU workaround for older/pinned server builds before
+      # Windrose's official CPU fix. Current SteamCMD installs should keep
+      # this off.
       # See scripts/patch-idle-cpu.py for derivation and rollback.
       WINDROSE_PATCH_IDLE_CPU: ${WINDROSE_PATCH_IDLE_CPU:-0}
       DISPLAY: ":99"
 
@@ -278,7 +278,7 @@ the chart is a thin wrapper around those vars plus Kubernetes-level knobs
 | `worldConfig.name` | `Default Windrose World` | |
 | `worldConfig.presetType` | `Medium` | `Easy` / `Medium` / `Hard` / `Custom`. |
 | `protonUseXalia` | `"0"` | Keep off; Xalia crashes on headless Proton. |
-| `patchIdleCpu` | `"0"` | **Experimental.** `"1"` enables the idle-CPU binary patch at boot. See [main README § Caveats](../../README.md) for the disclaimer. |
+| `patchIdleCpu` | `"0"` | Legacy workaround for older/pinned server builds before Windrose's official idle-CPU fix. Current SteamCMD installs should keep `"0"`. `"1"` enables the experimental binary patch at boot; see [main README § Caveats](../../README.md). |
 | `filesWaitTimeoutSeconds` | `"0"` | 0 = wait forever. |
 | `xvfb.enabled` | `true` | Keep on; the game container requires a display. |
 | `xvfb.display` | `99` | Canary releases should use a different number (:98, :97…) to avoid hostNetwork collisions. |
 
@@ -266,15 +266,11 @@ worldConfig:
   presetType: Medium
 
 protonUseXalia: "0"
-# Binary-patch the shipping EXE at boot to throttle the idle-CPU busy-
-# loop (boost::asio socket_select_interrupter::reset spinning under
-# Wine). When set to "1", the entrypoint runs `patch-idle-cpu.py`
-# against the game binary before launch. Drops idle CPU from ~200% to
-# ~5%. Safe to leave off for a conservative default — the patch is
-# tied to a specific build md5 and is a no-op on unknown builds, but
-# operators might still prefer to review the script (in
-# scripts/patch-idle-cpu.py) before enabling. See the same file for the
-# reverse-engineering rationale and rollback (--revert).
+# Legacy workaround for older/pinned server builds before Windrose's
+# official idle-CPU fix. Current SteamCMD installs should keep this "0".
+# When set to "1", the entrypoint runs `patch-idle-cpu.py` against the
+# game binary before launch. Read the disclaimer in the main README and
+# scripts/patch-idle-cpu.py before enabling.
 patchIdleCpu: "0"
 filesWaitTimeoutSeconds: "0"
 
@@ -286,9 +282,10 @@ resources:
       memory: 4Gi
     limits:
       memory: 16Gi
-      # Unpatched idle: ~2 cores (upstream spin bug). Mitigate with
-      # patchIdleCpu: "1" (preferred) or a cgroup cap below. Gameplay
-      # CPU scales ~125 mcpu per player (sublinear past the first);
+      # Current SteamCMD builds include Windrose's official idle-CPU fix.
+      # Older/pinned server builds may still need patchIdleCpu: "1" or a
+      # cgroup cap below. Gameplay CPU scales ~125 mcpu per player
+      # (sublinear past the first);
       # budget 300m for solo, 500m for 2-4, 1000m for 10. A CPU cap
       # is safe to layer on top of the patch as belt-and-braces.
       # cpu: 500m
 
@@ -319,15 +319,14 @@ restore_legacy_sentry_plugin() {
   fi
 }
 
-# Optional: maintain a PATCHED COPY of the shipping EXE alongside the
-# original, and launch that instead of the original. This throttles a
-# Boost.Asio drain-loop spin (see scripts/patch-idle-cpu.py for the
-# derivation) that otherwise burns ~2 CPU cores when no client is
-# connected. Sibling-file approach keeps Steam's manifest-managed
+# Optional legacy workaround for older/pinned server builds before
+# Windrose's official idle-CPU fix: maintain a PATCHED COPY of the
+# shipping EXE alongside the original, and launch that instead of the
+# original. The sibling-file approach keeps Steam's manifest-managed
 # original untouched — SteamCMD doesn't revert anything because there's
-# nothing to revert. On each boot we md5 the original and compare to
-# the source md5 recorded alongside the patched sibling; rebuild iff
-# the source changed (Windrose update) or the sibling is missing.
+# nothing to revert. On each boot we md5 the original and compare to the
+# source md5 recorded alongside the patched sibling; rebuild iff the
+# source changed (Windrose update) or the sibling is missing.
 #
 # Off by default. Enable via WINDROSE_PATCH_IDLE_CPU=1. UI override
 # via $WINDROSE_PATCH_OVERRIDE_FILE ("disabled" forces OFF, "enabled"
@@ -1001,11 +1000,9 @@ if [ ! -S "/tmp/.X11-unix/X${display_num}" ]; then
 fi
 
 # Extra launch args for the game binary. Default caps the engine tick to
-# 60 FPS — the patch (scripts/patch-idle-cpu.py) is the real fix for the
-# unpaced-main-loop spin; this cap is belt-and-braces for hosts that
-# don't run the patch. Matches the Helm chart default so compose /
-# plain-manifest / bare-Linux deployments all behave identically. Set
-# empty to uncap, or to "-FPS=30" for the older behavior.
+# 60 FPS. Matches the Helm chart default so compose / plain-manifest /
+# bare-Linux deployments all behave identically. Set empty to uncap, or
+# to "-FPS=30" for the older behavior.
 : "${SERVER_LAUNCH_ARGS:=-FPS=60}"
 read -r -a launch_args <<< "${SERVER_LAUNCH_ARGS}"
 
 
@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: MIT
 """
-Patch `WindroseServer-Win64-Shipping.exe` to throttle the Boost.Asio
-`socket_select_interrupter::reset()` drain loop that busy-spins under
-Wine/Proton and burns ~2 CPU cores on an idle server.
+Legacy patch for older/pinned `WindroseServer-Win64-Shipping.exe` builds
+that predate Windrose's official idle-CPU fix. It throttles the
+Boost.Asio `socket_select_interrupter::reset()` drain loop that
+busy-spins under Wine/Proton and burns ~2 CPU cores on an idle server.
+
+Current SteamCMD server builds should not need this patch.
 
 Inserts a ~43-byte trampoline that calls `KERNEL32!Sleep(1)` on the
 loop-continue tail; the loop exits via its normal branch as soon as
 
@@ -1302,9 +1302,11 @@ backupImportBtn.addEventListener("click", async () => {
 });
 
 const IDLE_PATCH_DISCLAIMER =
-  "You are enabling the EXPERIMENTAL idle-CPU binary patch.\n\n" +
+  "You are enabling the legacy EXPERIMENTAL idle-CPU binary patch.\n\n" +
+  "Current SteamCMD server builds include Windrose's official CPU fix. " +
+  "Only use this for older/pinned builds that still show the historical idle spin.\n\n" +
   "It modifies the Windrose dedicated-server binary in place. NO warranty — " +
-  "it may break at any time (especially after a Windrose update), may conflict " +
+  "it may break at any time, may conflict " +
   "with the Windrose EULA or Steam Subscriber Agreement, may corrupt saves, " +
   "and the authors do not distribute or authorize redistributing modified " +
   "binaries. Full risk rests with you.\n\n" +
 
@@ -363,7 +363,7 @@ <h2>Maintenance mode</h2>
 
     <div class="card admin-only hidden" id="idlePatchCard">
       <h2>Idle CPU patch</h2>
-      <p class="muted">Community binary patch that throttles the Boost.Asio drain-loop spin in <code>socket_select_interrupter::reset()</code>. Drops idle CPU from ~200% to ~5% on a canary. Applied by the entrypoint on next container restart when enabled; revertable byte-for-byte. <strong>See <a href="https://github.com/shipstuff/windrose-self-hosted/blob/main/tools/patch-idle-cpu.py#L24" target="_blank" rel="noopener">the script docstring</a> for disclaimer and derivation details.</strong></p>
+      <p class="muted">Legacy community binary patch for older/pinned server builds that predate Windrose's official idle-CPU fix. Current SteamCMD installs should keep it off. Applied by the entrypoint on next container restart when enabled; revertable byte-for-byte. <strong>See <a href="https://github.com/shipstuff/windrose-self-hosted/blob/main/scripts/patch-idle-cpu.py#L24" target="_blank" rel="noopener">the script docstring</a> for disclaimer and derivation details.</strong></p>
       <dl class="kv">
         <dt>Binary state</dt><dd id="ipBinaryState">-</dd>
         <dt>Binary MD5</dt><dd id="ipBinaryMd5" class="mono">-</dd>