launcher: guided first-run flow, server-owned settings, hook-config reconcile

Release-readiness pass on the launcher, driven by the end state "open it,
create an account, launch the game".

Fixes a silent correctness bug. `openfut.cfg` in the game dir is the only
server address the *game* can see, but it was written only by Setup's deploy
and its "Save & Update hook" button. Changing the server anywhere else left
FIFA connecting to the previous host while every panel in the launcher showed
the new one online. Now:

  - `write_hook_config` reconciles the file from the live config, and runs
    fail-closed before every launch, so the file and the UI cannot disagree at
    the moment it matters;
  - saving Settings pushes the address into the hook immediately;
  - a `hook_config` preflight check reads the file back and warns, naming both
    addresses, instead of leaving the drift invisible;
  - Settings shows the same fact inline, and Save is enabled by drift alone —
    a message saying "Save to update it" beside a disabled button is a dead end.

Account creation is now server-authoritative. `account_sync::discover` POSTs
`/openfut/account/sync` with the persona fields *omitted*, which makes the host
answer with the persona it was started with, its club, and the Core coin
balance. The launcher adopts that answer, so it never invents an identity and
the persona the game authenticates with is by construction the one the server
expects. Claiming is gated on the address being valid, NOT on the health pill:
that pill probes the HTTPS port while this talks to the account port, so gating
on it disabled the button on servers that answer it perfectly well.

UX consolidation:

  - new Welcome ("Get started") tab: three numbered steps — connect, claim an
    account, connect FIFA — each showing live state, ending in the launch CTA;
    a fresh install opens on it and it leaves the nav rail once satisfied;
  - Config renamed Settings, and made the single owner of the server address:
    Setup's duplicate editors (same fields, different save semantics) are now a
    read-only summary with actions;
  - the dashboard offers account creation in place instead of naming a tab, and
    the stale "set the host in the Setup tab" pointers are corrected.

Locks move to parking_lot per project rule (already the convention in
openfut-utas-host and openfut-identity); 47 poisoning unwraps go away.

Verified: 58 tests pass, fmt clean, clippy clean apart from one pre-existing
lint. Driven through the real UI under Xvfb as a fresh install — typed a server,
clicked Create my account, and the config on disk came back with persona
33068179/CAGE claimed from the live host; clicking Save rewrote a stale
`openfut.cfg` from host=10.10.0.99 to host=127.0.0.1.

.gitignore

@@ -1 +1,6 @@
 target/
+
+# runtime SQLite DB (created when services run from this dir)
+openfut.db
+openfut.db-shm
+openfut.db-wal

Cargo.toml

@@ -13,3 +13,6 @@ serde_json = "1"
 dirs = "5"
 chrono = { version = "0.4", features = ["serde"] }
 openfut-common = { path = "openfut-common" }
+# parking_lot over std::sync: every lock here is taken and used immediately, so
+# the poisoning unwrap at each call site is pure noise (project rule).
+parking_lot = "0.12"

openfut-hook/Cargo.lock

@@ -2,15 +2,10 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "openfut-common"
-version = "0.1.0"
-
 [[package]]
 name = "openfut-hook"
 version = "0.1.0"
 dependencies = [
- "openfut-common",
  "windows-sys",
 ]
 

openfut-hook/Cargo.toml

@@ -1,3 +1,9 @@
+# Standalone workspace root: this Windows-only version.dll proxy is deliberately
+# NOT a member of the OpenFUT workspace (see that root's `exclude`) so its own
+# [profile.release] below actually applies. An empty [workspace] table stops Cargo
+# from walking up and re-attaching this crate to the parent workspace.
+[workspace]
+
 [package]
 name = "openfut-hook"
 version = "0.1.0"
@@ -6,11 +12,21 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib"]
 
+[features]
+# Build with `--features capture_baseline` to DISABLE the LSX 3216→3217 redirect,
+# so FIFA's LSX goes to anadius's in-process server (for capturing anadius's real
+# responses). Default build keeps the redirect (LSX → our bridge).
+capture_baseline = []
+# Build with `--features probe` to install passive logging detours on FIFA's
+# in-process online-flow functions (GoOnline, GetInternetConnectedState, event
+# deserializers). Writes PROBE lines to C:\openfut_hook.log for RE. See probe.rs.
+probe = []
+# Build with `--features fifa17` for the FIFA 17 injection path. DllMain runs ONLY
+# the minimal FIFA-17-safe logic in fifa17.rs (prove injection, dump module map,
+# patch DirtySDK/ProtoSSL cert-verify) and skips ALL the FIFA-23-specific hooking.
+fifa17 = []
+
 [dependencies]
-# Shared, dependency-free source of truth for the OpenFUT destination
-# (host + ports) and the sockaddr byte-order helpers. Keeps all three hooks
-# consistent and keeps this logic host-testable outside WinSock.
-openfut-common = { path = "../openfut-common" }
 windows-sys = { version = "0.59", features = [
     "Win32_Foundation",
     "Win32_System_LibraryLoader",
@@ -19,6 +35,9 @@ windows-sys = { version = "0.59", features = [
     "Win32_Networking_WinSock",
     "Win32_Security_Cryptography",
     "Win32_System_Threading",
+    "Win32_System_Diagnostics_ToolHelp",
+    "Win32_System_Diagnostics_Debug",
+    "Win32_System_Kernel",
 ] }
 
 [profile.release]

openfut-hook/build.rs

@@ -0,0 +1,17 @@
+use std::env;
+use std::path::PathBuf;
+
+fn main() {
+    println!("cargo:rerun-if-changed=version.def");
+
+    // The proxy's PE export surface is part of its runtime contract.  Feed an
+    // explicit module-definition file to the MinGW linker instead of relying
+    // solely on Rust symbol export attributes and linker retention heuristics.
+    if env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows")
+        && env::var("CARGO_CFG_TARGET_ENV").as_deref() == Ok("gnu")
+    {
+        let definition =
+            PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap()).join("version.def");
+        println!("cargo:rustc-link-arg={}", definition.display());
+    }
+}

openfut-hook/src/config.rs

@@ -1,18 +1,20 @@
-//! Loads `openfut.cfg` (next to this DLL) into a shared [`ServerConfig`].
-//!
-//! There is intentionally **no loopback fallback**: if the file is missing,
-//! empty, or invalid, this returns a [`ConfigError`] and the caller logs it and
-//! declines to redirect. Missing configuration is an error, never `127.0.0.1`.
-use openfut_common::{ConfigError, ServerConfig};
+/// Reads openfut.cfg from the same directory as this DLL.
+///
+/// The file contains a single line: the IP the hook should redirect EA
+/// hostnames to, e.g. "192.168.1.10" or "127.0.0.1".
+/// Falls back to 127.0.0.1 if the file is missing or unreadable.
 use windows_sys::Win32::System::LibraryLoader::GetModuleFileNameA;
 
-/// Read and parse `openfut.cfg` from the same directory as this DLL.
-pub fn load_config(
-    module: windows_sys::Win32::Foundation::HMODULE,
-) -> Result<ServerConfig, ConfigError> {
-    let path = config_path(module).ok_or(ConfigError::ConfigMissing)?;
-    let contents = std::fs::read_to_string(&path).map_err(|_| ConfigError::ConfigMissing)?;
-    ServerConfig::parse(&contents)
+pub fn read_redirect_ip(module: windows_sys::Win32::Foundation::HMODULE) -> String {
+    if let Some(cfg_path) = config_path(module) {
+        if let Ok(content) = std::fs::read_to_string(&cfg_path) {
+            let ip = content.trim().to_string();
+            if !ip.is_empty() {
+                return ip;
+            }
+        }
+    }
+    "127.0.0.1".to_string()
 }
 
 fn config_path(module: windows_sys::Win32::Foundation::HMODULE) -> Option<std::path::PathBuf> {

openfut-hook/src/connect_hook.rs

@@ -1,16 +1,24 @@
 /// Hooks ws2_32!connect via inline detour (no iptables needed).
 /// Uses unhook/rehook pattern: restores original bytes, calls real function, re-installs hook.
 /// This avoids trampoline RIP-relocation issues entirely.
-///
-/// The redirect destination (IP + port) comes entirely from the shared
-/// [`crate::server`] state, which is populated once from `openfut.cfg`. This
-/// hook does NOT choose an address itself — no hardcoded loopback, no per-hook
-/// redirect IP. EA *source* ports are recognised via `openfut-common`'s port
-/// map; the matching OpenFUT *destination* port + configured IP are substituted.
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::OnceLock;
 
 const AF_INET: u16 = 2;
+const PORT_HTTPS_NBO: u16 = 0xBB01; // 443   big-endian
+const PORT_BRIDGE_NBO: u16 = 0xFB20; // 8443  big-endian
+const PORT_BLAZE_REDIRECTOR_NBO: u16 = 0x3927; // 10041 big-endian
+const PORT_BLAZE_MAIN_NBO: u16 = 0x8FA4; // 42127 big-endian
+                                         // EA App LSX. anadius handles :3216 in-process before it reaches the host TCP
+                                         // stack (keyed on port 3216 specifically), so redirecting FIFA's LSX connect to a
+                                         // *different* host port (:3217) slips past that interception and lands on the
+                                         // native openfut-bridge LSX server. This is the load-bearing redirect that routes
+                                         // LSX to our bridge; without it FIFA uses anadius's in-process emu instead.
+#[allow(dead_code)] // unused when built with the `capture_baseline` feature
+const PORT_LSX_NBO: u16 = 0x900C; // 3216  big-endian (EA App LSX)
+#[allow(dead_code)]
+const PORT_LSX_TARGET_NBO: u16 = 0x910C; // 3217  big-endian (bridge LSX target)
+const ADDR_LOOPBACK_NBO: u32 = 0x0100_007F; // 127.0.0.1 big-endian
 
 #[repr(C)]
 struct SockaddrIn {
@@ -20,6 +28,26 @@ struct SockaddrIn {
     sin_zero: [u8; 8],
 }
 
+const AF_INET6: u16 = 23; // Windows AF_INET6 value (we run under the Win ABI in Wine)
+
+/// Win32 `sockaddr_in6`. `sin6_port` is network byte order; `sin6_addr` is 16 raw
+/// address bytes in network order. 28 bytes total.
+#[repr(C)]
+struct SockaddrIn6 {
+    sin6_family: u16,
+    sin6_port: u16,
+    sin6_flowinfo: u32,
+    sin6_addr: [u8; 16],
+    sin6_scope_id: u32,
+}
+
+/// IPv4-mapped IPv6 loopback: `::ffff:127.0.0.1`. An `AF_INET6` socket connecting to
+/// this sends real IPv4 packets to 127.0.0.1, so the connection lands on the bridge's
+/// existing IPv4 listener on :8443 — no separate IPv6 listener needed. The game's own
+/// EA dials already use v4-mapped addresses (`::ffff:x.x.x.x`), so its sockets are not
+/// `IPV6_V6ONLY` and will accept this target.
+const V4MAPPED_LOOPBACK: [u8; 16] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 127, 0, 0, 1];
+
 // Address of ws2_32!connect (set at hook installation)
 static CONNECT_ADDR: AtomicUsize = AtomicUsize::new(0);
 
@@ -57,57 +85,99 @@ unsafe fn restore_original(target: *mut u8) {
     use windows_sys::Win32::System::Memory::{VirtualProtect, PAGE_EXECUTE_READWRITE};
     let mut old: u32 = 0;
     VirtualProtect(target as _, 14, PAGE_EXECUTE_READWRITE, &mut old);
-    core::ptr::copy_nonoverlapping(ORIGINAL_BYTES.as_ptr(), target, 14);
+    core::ptr::copy_nonoverlapping(core::ptr::addr_of!(ORIGINAL_BYTES) as *const u8, target, 14);
     VirtualProtect(target as _, 14, old, &mut old);
 }
 
-unsafe fn redirect_if_ea(name: *const u8, namelen: i32) -> Option<([u8; 16], i32)> {
-    if namelen < 8 {
+/// If `name` is an EA-relevant connect target, return a rewritten sockaddr pointing at
+/// the local bridge (plus its byte length). Handles BOTH `AF_INET` and `AF_INET6`: the
+/// game's Blaze/DirtySDK stack dials EA over IPv6 (v4-mapped) on :443, and the old
+/// IPv4-only path let those slip straight past us to the real (dead) servers.
+///
+/// The returned buffer is 28 bytes (enough for a `sockaddr_in6`); the second value is
+/// how many of those bytes are meaningful (16 for v4, 28 for v6). `pub(crate)` so the
+/// ConnectEx path can share this one implementation.
+pub(crate) unsafe fn redirect_if_ea(name: *const u8, namelen: i32) -> Option<([u8; 28], i32)> {
+    if namelen < 8 || name.is_null() {
         return None;
     }
-    let sa = &*(name as *const SockaddrIn);
-    if sa.sin_family != AF_INET {
-        return None;
+    // The first u16 of any sockaddr is the address family.
+    let family = *(name as *const u16);
+    let mut buf = [0u8; 28];
+
+    match family {
+        AF_INET => {
+            // SAFE: family is AF_INET and namelen >= 8 == the sockaddr_in fields we read.
+            let sa = &*(name as *const SockaddrIn);
+            let new_port_nbo = match sa.sin_port {
+                PORT_HTTPS_NBO => PORT_BRIDGE_NBO,
+                #[cfg(not(feature = "capture_baseline"))]
+                PORT_LSX_NBO => PORT_LSX_TARGET_NBO,
+                PORT_BLAZE_REDIRECTOR_NBO => PORT_BLAZE_REDIRECTOR_NBO,
+                PORT_BLAZE_MAIN_NBO => PORT_BLAZE_MAIN_NBO,
+                _ => return None,
+            };
+            // sin_addr is network order; to_le_bytes gives memory order = the dotted
+            // quad, so b[0].b[1].b[2].b[3] is correct (the old code printed it reversed).
+            let o = sa.sin_addr.to_le_bytes();
+            crate::write_log(&format!(
+                "connect_hook: v4 {}.{}.{}.{}:{} → 127.0.0.1:{}\n",
+                o[0],
+                o[1],
+                o[2],
+                o[3],
+                u16::from_be(sa.sin_port),
+                u16::from_be(new_port_nbo)
+            ));
+            // SAFE: buf is 28 bytes, larger than the 16-byte sockaddr_in we write.
+            let out = &mut *(buf.as_mut_ptr() as *mut SockaddrIn);
+            out.sin_family = AF_INET;
+            out.sin_port = new_port_nbo;
+            out.sin_addr = ADDR_LOOPBACK_NBO;
+            Some((buf, 16))
+        }
+        AF_INET6 => {
+            if namelen < 28 {
+                return None;
+            }
+            // SAFE: family is AF_INET6 and namelen >= 28 == sizeof(sockaddr_in6).
+            let sa6 = &*(name as *const SockaddrIn6);
+            // LSX is IPv4-only (anadius keys on it), so it is intentionally omitted here.
+            let new_port_nbo = match sa6.sin6_port {
+                PORT_HTTPS_NBO => PORT_BRIDGE_NBO,
+                PORT_BLAZE_REDIRECTOR_NBO => PORT_BLAZE_REDIRECTOR_NBO,
+                PORT_BLAZE_MAIN_NBO => PORT_BLAZE_MAIN_NBO,
+                _ => return None,
+            };
+            let a = sa6.sin6_addr;
+            crate::write_log(&format!(
+                "connect_hook: v6 [{:02x}{:02x}:..:{:02x}{:02x}]:{} → ::ffff:127.0.0.1:{}\n",
+                a[0],
+                a[1],
+                a[14],
+                a[15],
+                u16::from_be(sa6.sin6_port),
+                u16::from_be(new_port_nbo)
+            ));
+            // SAFE: buf is exactly 28 bytes == sizeof(sockaddr_in6).
+            let out = &mut *(buf.as_mut_ptr() as *mut SockaddrIn6);
+            out.sin6_family = AF_INET6;
+            out.sin6_port = new_port_nbo;
+            out.sin6_flowinfo = 0;
+            out.sin6_addr = V4MAPPED_LOOPBACK;
+            out.sin6_scope_id = 0;
+            Some((buf, 28))
+        }
+        _ => None,
     }
-
-    let orig = sa.sin_addr.to_le_bytes();
-    let orig_port = u16::from_be(sa.sin_port);
-
-    // Map the EA source port to an OpenFUT destination port from shared config.
-    // Returns None if this port isn't intercepted or no server is configured —
-    // in which case we leave the connection untouched (no loopback fallback).
-    let new_port_nbo = crate::server::dest_port_nbo_from_source_nbo(sa.sin_port)?;
-    // The destination IP is the configured/resolved OpenFUT server — never a
-    // hardcoded address. If unset, dest_port_nbo_from_source_nbo already
-    // returned None above, so this is guaranteed Some here.
-    let new_addr = crate::server::sin_addr()?;
-    let ni = new_addr.to_le_bytes();
-
-    crate::write_log(&format!(
-        "connect_hook: {}.{}.{}.{}:{} → {}.{}.{}.{}:{} (configured OpenFUT server)\n",
-        orig[3],
-        orig[2],
-        orig[1],
-        orig[0],
-        orig_port,
-        ni[0],
-        ni[1],
-        ni[2],
-        ni[3],
-        u16::from_be(new_port_nbo)
-    ));
-
-    let mut buf = [0u8; 16];
-    let out = &mut *(buf.as_mut_ptr() as *mut SockaddrIn);
-    out.sin_family = AF_INET;
-    out.sin_port = new_port_nbo;
-    out.sin_addr = new_addr;
-    Some((buf, 16))
 }
 
 pub unsafe extern "system" fn hooked_connect(s: usize, name: *const u8, namelen: i32) -> i32 {
     let addr = CONNECT_ADDR.load(Ordering::Relaxed) as *mut u8;
 
+    // Milestone-0 transport watch (self-gates on OPENFUT_TRANSPORT_WATCH).
+    crate::transport_watch::note_connect("connect", name, namelen, s);
+
     // Log every call so we can confirm the hook fires at all
     if namelen >= 8 {
         let sa = &*(name as *const SockaddrIn);
@@ -121,7 +191,7 @@ pub unsafe extern "system" fn hooked_connect(s: usize, name: *const u8, namelen:
                 let mut len: i32 = 4;
                 getsockopt(
                     s,
-                    SOL_SOCKET as i32,
+                    SOL_SOCKET,
                     SO_TYPE,
                     &mut ty as *mut i32 as *mut u8,
                     &mut len,
@@ -145,21 +215,7 @@ pub unsafe extern "system" fn hooked_connect(s: usize, name: *const u8, namelen:
                 core::mem::transmute(addr);
             f(s, buf.as_ptr(), len)
         };
-        // connect() communicates nonblocking progress through WSAGetLastError.
-        // Reinstalling the detour calls VirtualProtect, which may overwrite that
-        // thread-local value before FIFA reads it. Preserve the real call's value
-        // across all hook maintenance and logging.
-        let wsa_error = if r != 0 {
-            use windows_sys::Win32::Networking::WinSock::WSAGetLastError;
-            WSAGetLastError()
-        } else {
-            0
-        };
-        write_hook(addr, hooked_connect as u64);
-        if r != 0 {
-            use windows_sys::Win32::Networking::WinSock::WSASetLastError;
-            WSASetLastError(wsa_error);
-        }
+        write_hook(addr, hooked_connect as *const () as u64);
         return r;
     } else {
         (name, namelen)
@@ -170,23 +226,19 @@ pub unsafe extern "system" fn hooked_connect(s: usize, name: *const u8, namelen:
         let f: unsafe extern "system" fn(usize, *const u8, i32) -> i32 = core::mem::transmute(addr);
         f(s, call_name, call_len)
     };
-    let wsa_error = if r != 0 {
-        use windows_sys::Win32::Networking::WinSock::WSAGetLastError;
-        WSAGetLastError()
-    } else {
-        0
-    };
-    write_hook(addr, hooked_connect as u64);
+    write_hook(addr, hooked_connect as *const () as u64);
     if namelen >= 8 {
         let sa = &*(call_name as *const SockaddrIn);
         if sa.sin_family == AF_INET {
-            crate::write_log(&format!("connect_hook: result={r} wsa_err={wsa_error}\n"));
+            let err = if r != 0 {
+                use windows_sys::Win32::Networking::WinSock::WSAGetLastError;
+                WSAGetLastError()
+            } else {
+                0
+            };
+            crate::write_log(&format!("connect_hook: result={r} wsa_err={err}\n"));
         }
     }
-    if r != 0 {
-        use windows_sys::Win32::Networking::WinSock::WSASetLastError;
-        WSASetLastError(wsa_error);
-    }
     r
 }
 
@@ -199,6 +251,8 @@ pub unsafe extern "system" fn hooked_wsa_connect(
     sqos: *const (),
     gqos: *const (),
 ) -> i32 {
+    // Milestone-0 transport watch (self-gates on OPENFUT_TRANSPORT_WATCH).
+    crate::transport_watch::note_connect("WSAConnect", name, namelen, s);
     let real = REAL_WSA.get().copied().unwrap();
     if let Some((buf, len)) = redirect_if_ea(name, namelen) {
         real(s, buf.as_ptr(), len, caller, callee, sqos, gqos)
@@ -211,20 +265,24 @@ pub unsafe extern "system" fn hooked_wsa_connect(
 pub unsafe fn install_inline_connect_hook() -> bool {
     use windows_sys::Win32::System::LibraryLoader::{GetModuleHandleA, GetProcAddress};
 
-    let ws2 = GetModuleHandleA(b"ws2_32.dll\0".as_ptr());
+    let ws2 = GetModuleHandleA(c"ws2_32.dll".as_ptr().cast());
     if ws2.is_null() {
         return false;
     }
-    let connect_fn = match GetProcAddress(ws2, b"connect\0".as_ptr()) {
+    let connect_fn = match GetProcAddress(ws2, c"connect".as_ptr().cast()) {
         Some(f) => f as *mut u8,
         None => return false,
     };
 
     // Save original 14 bytes
-    core::ptr::copy_nonoverlapping(connect_fn, ORIGINAL_BYTES.as_mut_ptr(), 14);
+    core::ptr::copy_nonoverlapping(
+        connect_fn,
+        core::ptr::addr_of_mut!(ORIGINAL_BYTES) as *mut u8,
+        14,
+    );
     CONNECT_ADDR.store(connect_fn as usize, Ordering::Relaxed);
 
     // Overwrite first 14 bytes with absolute indirect JMP to our hook
-    write_hook(connect_fn, hooked_connect as u64);
+    write_hook(connect_fn, hooked_connect as *const () as u64);
     true
 }

openfut-hook/src/connectex_hook.rs

@@ -6,7 +6,8 @@ use core::ffi::c_void;
 /// inline so that when it returns a ConnectEx pointer we swap it for our own wrapper.
 use core::sync::atomic::{AtomicUsize, Ordering};
 
-const AF_INET: u16 = 2;
+// Address rewriting (v4 + v6) is shared from connect_hook::redirect_if_ea, so the port
+// constants and sockaddr structs no longer live here.
 
 // SIO_GET_EXTENSION_FUNCTION_POINTER
 const SIO_GET_EXT_FN: u32 = 0xC8000006;
@@ -16,14 +17,6 @@ const CONNECTEX_GUID: [u8; 16] = [
     0xB9, 0x07, 0xA2, 0x25, 0xF3, 0xDD, 0x60, 0x46, 0x8E, 0xE9, 0x76, 0xE5, 0x8C, 0x74, 0x06, 0x3E,
 ];
 
-#[repr(C)]
-struct SockaddrIn {
-    sin_family: u16,
-    sin_port: u16,
-    sin_addr: u32,
-    sin_zero: [u8; 8],
-}
-
 // The real ConnectEx pointer, saved after WSAIoctl returns it
 static REAL_CONNECTEX: AtomicUsize = AtomicUsize::new(0);
 
@@ -69,11 +62,11 @@ unsafe fn restore_wsaioctl(target: *mut u8) {
     use windows_sys::Win32::System::Memory::{VirtualProtect, PAGE_EXECUTE_READWRITE};
     let mut old: u32 = 0;
     VirtualProtect(target as _, 14, PAGE_EXECUTE_READWRITE, &mut old);
-    core::ptr::copy_nonoverlapping(WSAIOCTL_ORIG.as_ptr(), target, 14);
+    core::ptr::copy_nonoverlapping(core::ptr::addr_of!(WSAIOCTL_ORIG) as *const u8, target, 14);
     VirtualProtect(target as _, 14, old, &mut old);
 }
 
-/// Our ConnectEx wrapper: redirects intercepted EA endpoints to the configured OpenFUT server
+/// Our ConnectEx wrapper: redirects EA ports to 127.0.0.1
 unsafe extern "system" fn hooked_connectex(
     s: usize,
     name: *const u8,
@@ -85,48 +78,21 @@ unsafe extern "system" fn hooked_connectex(
 ) -> i32 {
     let real_fn: ConnectExFn = core::mem::transmute(REAL_CONNECTEX.load(Ordering::Relaxed));
 
-    if namelen >= 8 {
-        let sa = &*(name as *const SockaddrIn);
-        if sa.sin_family == AF_INET {
-            let o = sa.sin_addr.to_le_bytes();
-            let orig_port = u16::from_be(sa.sin_port);
-            // Destination port + IP come from the shared configured server —
-            // never a hardcoded loopback. None => not intercepted / unconfigured,
-            // so the original connection is passed through untouched.
-            if let (Some(new_port_nbo), Some(new_addr)) = (
-                crate::server::dest_port_nbo_from_source_nbo(sa.sin_port),
-                crate::server::sin_addr(),
-            ) {
-                let ni = new_addr.to_le_bytes();
-                crate::write_log(&format!(
-                    "connectex_hook: {}.{}.{}.{}:{} → {}.{}.{}.{}:{} (configured OpenFUT server)\n",
-                    o[3],
-                    o[2],
-                    o[1],
-                    o[0],
-                    orig_port,
-                    ni[0],
-                    ni[1],
-                    ni[2],
-                    ni[3],
-                    u16::from_be(new_port_nbo)
-                ));
-                let mut redirect = [0u8; 16];
-                let out = &mut *(redirect.as_mut_ptr() as *mut SockaddrIn);
-                out.sin_family = AF_INET;
-                out.sin_port = new_port_nbo;
-                out.sin_addr = new_addr;
-                return real_fn(
-                    s,
-                    redirect.as_ptr(),
-                    16,
-                    send_buf,
-                    send_data_len,
-                    bytes_sent,
-                    overlapped,
-                );
-            }
-        }
+    // Milestone-0 transport watch (self-gates on OPENFUT_TRANSPORT_WATCH).
+    crate::transport_watch::note_connect("ConnectEx", name, namelen, s);
+
+    // Share the one redirect implementation (v4 + v6) with connect_hook, so ConnectEx
+    // dials get the same IPv6 handling as plain connect().
+    if let Some((buf, len)) = crate::connect_hook::redirect_if_ea(name, namelen) {
+        return real_fn(
+            s,
+            buf.as_ptr(),
+            len,
+            send_buf,
+            send_data_len,
+            bytes_sent,
+            overlapped,
+        );
     }
     real_fn(
         s,
@@ -161,7 +127,7 @@ pub unsafe extern "system" fn hooked_wsaioctl(
             s, code, in_buf, in_len, out_buf, out_len, bytes_ret, overlapped, completion,
         )
     };
-    write_hook(addr, hooked_wsaioctl as u64);
+    write_hook(addr, hooked_wsaioctl as *const () as u64);
 
     // If this was a ConnectEx request that succeeded, swap the pointer
     if result == 0 && code == SIO_GET_EXT_FN && in_len == 16 && !in_buf.is_null() {
@@ -178,7 +144,7 @@ pub unsafe extern "system" fn hooked_wsaioctl(
                 ));
             }
             // Return our hook instead
-            *out_ptr = hooked_connectex as usize;
+            *out_ptr = hooked_connectex as *const () as usize;
         }
     }
     result
@@ -186,16 +152,20 @@ pub unsafe extern "system" fn hooked_wsaioctl(
 
 pub unsafe fn install_wsaioctl_hook() -> bool {
     use windows_sys::Win32::System::LibraryLoader::{GetModuleHandleA, GetProcAddress};
-    let ws2 = GetModuleHandleA(b"ws2_32.dll\0".as_ptr());
+    let ws2 = GetModuleHandleA(c"ws2_32.dll".as_ptr().cast());
     if ws2.is_null() {
         return false;
     }
-    let fn_ptr = match GetProcAddress(ws2, b"WSAIoctl\0".as_ptr()) {
+    let fn_ptr = match GetProcAddress(ws2, c"WSAIoctl".as_ptr().cast()) {
         Some(f) => f as *mut u8,
         None => return false,
     };
-    core::ptr::copy_nonoverlapping(fn_ptr, WSAIOCTL_ORIG.as_mut_ptr(), 14);
+    core::ptr::copy_nonoverlapping(
+        fn_ptr,
+        core::ptr::addr_of_mut!(WSAIOCTL_ORIG) as *mut u8,
+        14,
+    );
     WSAIOCTL_ADDR.store(fn_ptr as usize, Ordering::Relaxed);
-    write_hook(fn_ptr, hooked_wsaioctl as u64);
+    write_hook(fn_ptr, hooked_wsaioctl as *const () as u64);
     true
 }

openfut-hook/src/dial_notification.rs

@@ -0,0 +1,183 @@
+//! Synthetic "notification" struct for the direct-call dial trigger.
+//!
+//! STATIC ARTIFACT ONLY — this module builds the byte layout the dial handler
+//! (FIFA23.exe+0x4f4d360) expects in its `rdx` argument, plus a do-nothing
+//! completion callback. It does NOT call the game, does NOT install any detour,
+//! and is NOT wired into the hook yet. The invocation phase (later) consumes
+//! `build_notification()` + `completion_stub`.
+//!
+//! Layout contract (from the 2026-07-03 dial-branch RE report on 0x144f4d590):
+//!   [+0x00]  byte   : entry gate — MUST be non-zero (else the error path fires). => 1
+//!   [+0x80]  qword  : completion delegate fn pointer. => &completion_stub
+//!   [+0x88]  qword  : delegate capture #1. => 0
+//!   [+0x90]  qword  : delegate capture #2. => 0
+//!   [+0xa0]  dword  : RpcJob key/priority (copied, never compared on dial path). => 0
+//!   everything else in [0x00..0x100] : 0
+//! The RE confirmed no other offset in this range is read on the success path.
+//! Total size 0x100 (256): the tail 0xa4..0x100 is zero padding — cheap insurance
+//! against a read we might have missed. Any offset here is TODO/CONFIRM against the
+//! RE report; if the game contradicts it at runtime, stop and re-verify.
+
+// This module is deliberately unused for now (the invocation phase will call into
+// it). Silence "never used" warnings until then rather than sprinkle #[allow] on
+// each item. Remove this once the trigger wires the API up.
+#![allow(dead_code)]
+
+use core::sync::atomic::{AtomicU32, Ordering};
+
+/// Size of the notification struct, in bytes. 0x100 = 256.
+const NOTIFICATION_SIZE: usize = 0x100;
+
+// --- field offsets (named so the code reads like the RE contract) -------------
+const OFF_GATE: usize = 0x00; // byte, must be non-zero
+const OFF_DELEGATE_FN: usize = 0x80; // qword, completion fn pointer
+const OFF_DELEGATE_CAP1: usize = 0x88; // qword, capture (0)
+const OFF_DELEGATE_CAP2: usize = 0x90; // qword, capture (0)
+const OFF_KEY: usize = 0xa0; // dword, job key/priority (0)
+
+/// Counts how many times `completion_stub` has been entered.
+///
+/// Why `AtomicU32` and not `static mut u32`: a `static mut` needs `unsafe` to
+/// touch and, worse, gives *undefined behaviour* if two threads write it at once
+/// (a data race). The completion callback may be invoked from an arbitrary game
+/// thread, so a plain counter would race. `AtomicU32` makes increment a single
+/// lock-free hardware instruction with well-defined concurrent semantics, and it
+/// needs no `unsafe`. `Ordering::Relaxed` is enough here: we only care about the
+/// count value, not about ordering it against other memory.
+static COMPLETION_STUB_CALLS: AtomicU32 = AtomicU32::new(0);
+
+/// The completion callback the game may invoke when the RpcJob finishes.
+///
+/// `extern "C"`: on the `x86_64-pc-windows-gnu` target this selects the Microsoft
+/// x64 calling convention — exactly how the game invokes the pointer (`call r10`,
+/// args in rcx/rdx/r8/r9, return in rax, caller cleans the stack). Matching the
+/// convention is what makes it safe for the game to call us.
+///
+/// We declare four pointer-sized params and ignore them. The RE showed the delegate
+/// is called with e.g. an HRESULT in `rdx` and a `this`-like pointer in `rcx`; the
+/// success-path completion may pass different values. Because Win64 is caller-clean
+/// and puts the first four integer args in registers, declaring four ignored args is
+/// safe no matter what the caller actually passes — we simply never read them.
+///
+/// The body does the absolute minimum: bump the atomic counter and return 0. NO
+/// logging, NO allocation, NO calls — a completion callback can fire from any game
+/// context, and even a log write there could be unsafe. Observe from outside via
+/// `completion_stub_call_count()` instead.
+///
+/// Returns `usize` = 0, which reads as an `S_OK`-shaped HRESULT if the caller looks
+/// at the return value. (Returning void would be equally fine; 0 is a safe default.)
+pub extern "C" fn completion_stub(_a: usize, _b: usize, _c: usize, _d: usize) -> usize {
+    // `fetch_add` is a single atomic read-modify-write (lock xadd) — no lock, no
+    // syscall, no allocation. Safe to call from any thread/context.
+    COMPLETION_STUB_CALLS.fetch_add(1, Ordering::Relaxed);
+    0
+}
+
+/// Read how many times `completion_stub` has fired. For an outside observer thread —
+/// keeps all I/O out of the stub itself.
+pub fn completion_stub_call_count() -> u32 {
+    COMPLETION_STUB_CALLS.load(Ordering::Relaxed)
+}
+
+/// Write a little-endian u64 into `buf` starting at `offset`.
+///
+/// Endianness matters because we're hand-laying a memory image the game will read
+/// back as a raw pointer/integer. x86-64 is *little-endian*: the least-significant
+/// byte sits at the lowest address. `value.to_le_bytes()` produces the 8 bytes in
+/// exactly that order, so when the game does `mov rax,[ptr]` it reconstructs the
+/// original `value`. Using the native byte order by hand (or `transmute`) would be
+/// wrong on a big-endian machine; `to_le_bytes` states the intent explicitly.
+///
+/// `buf[offset..offset + 8]` is an 8-byte sub-slice; `copy_from_slice` copies the
+/// 8-byte array into it. Both sides are length 8, so it can't panic here. (This is
+/// the standard, safe way to poke a fixed-width integer into a `[u8]`.)
+fn write_u64_le(buf: &mut [u8], offset: usize, value: u64) {
+    buf[offset..offset + 8].copy_from_slice(&value.to_le_bytes());
+}
+
+/// Write a little-endian u32 into `buf` starting at `offset`. (Same idea as
+/// `write_u64_le`, 4 bytes wide.)
+fn write_u32_le(buf: &mut [u8], offset: usize, value: u32) {
+    buf[offset..offset + 4].copy_from_slice(&value.to_le_bytes());
+}
+
+/// Build the fully-populated notification struct, ready to be passed by pointer to
+/// the dial handler as its `rdx` argument.
+///
+/// Returns a `[u8; 0x100]` by value. Why a byte array and not a `#[repr(C)]` struct:
+/// the layout is a precise *offset* contract recovered by RE, with meaningful data
+/// only at 0x00/0x80/0x88/0x90/0xa0 and zeros elsewhere. A byte array makes every
+/// offset literally visible and immune to any field-ordering/padding surprise. A
+/// `#[repr(C)] struct` with explicit padding fields would work too, but it's easier
+/// to get a padding byte wrong than to index a flat array. (For future reference:
+/// the `bytemuck` crate can safely reinterpret a `#[repr(C)]` struct as `&[u8]`
+/// zero-copy — worth knowing, but overkill here and an extra dependency.)
+pub fn build_notification() -> [u8; NOTIFICATION_SIZE] {
+    // Start fully zeroed. This already satisfies every "= 0" field (caps at +0x88/
+    // +0x90, the key at +0xa0, and all padding); we only need to set the non-zero
+    // fields below.
+    let mut buf = [0u8; NOTIFICATION_SIZE];
+
+    // [+0x00] entry gate: must be non-zero to reach the dial path.
+    buf[OFF_GATE] = 1;
+
+    // [+0x80] completion delegate function pointer = &completion_stub.
+    //
+    // `completion_stub as *const ()`: a *function item* in Rust is a zero-sized,
+    // unique type, not a value. Casting it to a raw pointer coerces it to a function
+    // pointer and then to an untyped code pointer `*const ()` — i.e. the address of
+    // the function's machine code. The intermediate `*const ()` before `as u64` is
+    // the idiomatic form: it says "treat this as an address" and also avoids the
+    // `clippy`/rustc "direct cast of function item into an integer" lint you'd get
+    // from `completion_stub as u64`.
+    let stub_addr = completion_stub as *const () as u64;
+    write_u64_le(&mut buf, OFF_DELEGATE_FN, stub_addr);
+
+    // [+0x88]/[+0x90] delegate captures = 0. Already zero from initialization; write
+    // them explicitly so the layout intent is visible at a glance.
+    write_u64_le(&mut buf, OFF_DELEGATE_CAP1, 0);
+    write_u64_le(&mut buf, OFF_DELEGATE_CAP2, 0);
+
+    // [+0xa0] RpcJob key/priority dword = 0 (copied, never compared on the dial path).
+    write_u32_le(&mut buf, OFF_KEY, 0);
+
+    buf
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn notification_layout() {
+        let n = build_notification();
+
+        // Total size is exactly 0x100.
+        assert_eq!(n.len(), NOTIFICATION_SIZE);
+
+        // [+0x00] gate byte == 1.
+        assert_eq!(n[0x00], 1);
+
+        // [+0xa0..0xa4] as u32 == 0.
+        // `try_into().unwrap()` turns the 4-byte slice into a `[u8; 4]` (it can only
+        // fail if the slice weren't length 4, which it is), and `from_le_bytes`
+        // reads it back the same little-endian way we wrote it.
+        let key = u32::from_le_bytes(n[0xa0..0xa4].try_into().unwrap());
+        assert_eq!(key, 0);
+
+        // [+0x80..0x88] as u64 == address of completion_stub.
+        let stub = u64::from_le_bytes(n[0x80..0x88].try_into().unwrap());
+        assert_eq!(stub, completion_stub as *const () as u64);
+
+        // [+0x88..0x90] and [+0x90..0x98] captures == 0.
+        assert_eq!(u64::from_le_bytes(n[0x88..0x90].try_into().unwrap()), 0);
+        assert_eq!(u64::from_le_bytes(n[0x90..0x98].try_into().unwrap()), 0);
+    }
+
+    #[test]
+    fn stub_counter_increments() {
+        let before = completion_stub_call_count();
+        let _ = completion_stub(0, 0, 0, 0);
+        assert_eq!(completion_stub_call_count(), before + 1);
+    }
+}

openfut-hook/src/fifa17.rs

@@ -0,0 +1,108 @@
+//! FIFA 17 injection path (feature = "fifa17").
+//!
+//! This is a *separate, minimal* entry point from the FIFA-23 `install_hooks`.
+//! FIFA 17 is a different game with different in-memory structures, so we run NONE
+//! of the FIFA-23 connect/LSX/origin_spy/dial logic here — that would at best
+//! no-op and at worst crash. For now this proves the version.dll hijack actually
+//! loads us into FIFA17.exe and dumps the module map, which we need to locate
+//! DirtySDK/ProtoSSL's cert-verify function (the next milestone: patch it so the
+//! secure Blaze redirector's TLS handshake succeeds against our bridge cert).
+//!
+//! Everything here is read-only except the (not-yet-enabled) cert-verify patch.
+
+use crate::write_log;
+use windows_sys::Win32::Foundation::{CloseHandle, INVALID_HANDLE_VALUE};
+use windows_sys::Win32::System::Diagnostics::ToolHelp::{
+    CreateToolhelp32Snapshot, Module32FirstW, Module32NextW, MODULEENTRY32W, TH32CS_SNAPMODULE,
+    TH32CS_SNAPMODULE32,
+};
+use windows_sys::Win32::System::LibraryLoader::GetModuleHandleA;
+
+/// Read the SizeOfImage from a module's in-memory PE headers.
+unsafe fn size_of_image(base: usize) -> u32 {
+    if base == 0 {
+        return 0;
+    }
+    // DOS header -> e_lfanew (i32 @ 0x3c) -> PE header. SizeOfImage is in the
+    // optional header at offset 0x50 from the PE signature (same for PE32/PE32+).
+    let e_lfanew = *((base + 0x3c) as *const i32);
+    let pe = base + e_lfanew as usize;
+    // sanity: 'PE\0\0'
+    if *(pe as *const u32) != 0x0000_4550 {
+        return 0;
+    }
+    *((pe + 24 + 0x38) as *const u32) // opt header +0x38 = SizeOfImage
+}
+
+fn wide_to_string(w: &[u16]) -> String {
+    let end = w.iter().position(|&c| c == 0).unwrap_or(w.len());
+    String::from_utf16_lossy(&w[..end])
+}
+
+/// Enumerate loaded modules (name, base, size) via ToolHelp and log them.
+unsafe fn dump_modules() {
+    let snap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, 0);
+    if snap == INVALID_HANDLE_VALUE {
+        write_log("fifa17: module snapshot FAILED\n");
+        return;
+    }
+    let mut me: MODULEENTRY32W = core::mem::zeroed();
+    me.dwSize = core::mem::size_of::<MODULEENTRY32W>() as u32;
+    if Module32FirstW(snap, &mut me) != 0 {
+        loop {
+            let name = wide_to_string(&me.szModule);
+            let base = me.modBaseAddr as usize;
+            let size = me.modBaseSize;
+            write_log(&format!(
+                "fifa17: module {name:<28} base={base:#018x} size={size:#x}\n"
+            ));
+            me.dwSize = core::mem::size_of::<MODULEENTRY32W>() as u32;
+            if Module32NextW(snap, &mut me) == 0 {
+                break;
+            }
+        }
+    } else {
+        write_log("fifa17: Module32FirstW FAILED\n");
+    }
+    CloseHandle(snap);
+}
+
+/// Worker that runs AFTER DllMain returns (loader lock released). ToolHelp and
+/// other loader-touching calls are unsafe under the loader lock, so we defer them
+/// to this thread. This is what fixed the "game exits right after DllMain" issue.
+unsafe extern "system" fn worker(_: *mut core::ffi::c_void) -> u32 {
+    write_log("=== fifa17 hook: worker thread start ===\n");
+    let main_base = GetModuleHandleA(core::ptr::null()) as usize;
+    let img = size_of_image(main_base);
+    write_log(&format!(
+        "fifa17: main exe base={main_base:#018x} SizeOfImage={img:#x}\n"
+    ));
+    dump_modules();
+    write_log("fifa17: worker complete (injection healthy)\n");
+    // SBC render intervention (inert unless OPENFUT_SBC_HOOK=1). Spawns its own deferred
+    // worker that waits for CardsDLL to load. See sbc_hook.rs / docs/sbc-hook-dll-spec.md.
+    crate::sbc_hook::install();
+    // Passive transaction tracing has a separate kill switch from cache resolution.
+    // It currently fails closed until safe relocating trampolines are proven.
+    crate::sbc_trace::install();
+    crate::sbc_request_trace::install();
+    0
+}
+
+/// Minimal FIFA-17 install. Keep DllMain itself trivial: only spawn a worker
+/// thread and return immediately, so we never touch the loader lock from here.
+pub unsafe fn install() {
+    use windows_sys::Win32::System::Threading::CreateThread;
+    write_log("=== fifa17 hook: DllMain ATTACH (spawning worker) ===\n");
+    let h = CreateThread(
+        core::ptr::null(),
+        0,
+        Some(worker),
+        core::ptr::null(),
+        0,
+        core::ptr::null_mut(),
+    );
+    if h == 0 as _ {
+        write_log("fifa17: CreateThread FAILED\n");
+    }
+}

openfut-hook/src/hooks.rs

@@ -12,12 +12,7 @@ type GetaddrinfoFn =
     unsafe extern "system" fn(*const u8, *const u8, *const ADDRINFOA, *mut *mut ADDRINFOA) -> i32;
 
 static REAL: OnceLock<GetaddrinfoFn> = OnceLock::new();
-// NUL-terminated dotted-quad of the resolved OpenFUT server, built once at init
-// from the SAME shared config the socket hooks use. getaddrinfo redirects EA
-// hostnames here so DNS resolves to the configured server. If configuration was
-// missing/invalid this stays empty and EA hostnames are NOT redirected (no
-// loopback fallback).
-static REDIRECT_HOST: OnceLock<Vec<u8>> = OnceLock::new();
+static REDIRECT_IP: OnceLock<Vec<u8>> = OnceLock::new();
 
 // Flipped to true the first time we successfully apply the runtime cert patch.
 // The patch is deferred to here (rather than DllMain) because EAWebKit.dll may
@@ -28,12 +23,10 @@ pub fn set_real(f: GetaddrinfoFn) {
     let _ = REAL.set(f);
 }
 
-/// Install the resolved redirect IPv4 (dotted-quad) getaddrinfo will hand back
-/// for EA hostnames. Called once at init from the shared resolved server.
-pub fn set_redirect_ip(ip: std::net::Ipv4Addr) {
-    let mut bytes = ip.to_string().into_bytes();
+pub fn set_redirect_ip(ip: String) {
+    let mut bytes = ip.into_bytes();
     bytes.push(0);
-    let _ = REDIRECT_HOST.set(bytes);
+    let _ = REDIRECT_IP.set(bytes);
 }
 
 /// Returns true if `host` is an EA / EA-Sports domain that should be redirected
@@ -57,6 +50,8 @@ pub unsafe extern "system" fn hooked_getaddrinfo(
     if !node_name.is_null() {
         if let Ok(host) = CStr::from_ptr(node_name as *const i8).to_str() {
             crate::write_log(&format!("openfut_hook: getaddrinfo({host})\n"));
+            // Milestone-0 transport watch (self-gates on OPENFUT_TRANSPORT_WATCH).
+            crate::transport_watch::note_getaddrinfo(host);
             if is_ea_host(host) {
                 // Apply the ProtoSSL cert-verify bypass the first time we see an EA
                 // hostname — EAWebKit.dll must be loaded by now because it's calling us.
@@ -73,20 +68,12 @@ pub unsafe extern "system" fn hooked_getaddrinfo(
                     }
                 }
 
-                // Only redirect when a server was configured & resolved. If not,
-                // fall through to the real resolver — we never invent a loopback
-                // destination here.
-                match REDIRECT_HOST.get() {
-                    Some(redirect) => {
-                        let real = REAL.get().copied().unwrap_or(sys_getaddrinfo);
-                        return real(redirect.as_ptr(), service_name, hints, result);
-                    }
-                    None => {
-                        crate::write_log(
-                            "openfut_hook: EA host seen but no OpenFUT server configured — NOT redirecting\n",
-                        );
-                    }
-                }
+                let redirect = REDIRECT_IP
+                    .get()
+                    .map(|v| v.as_ptr())
+                    .unwrap_or(c"127.0.0.1".as_ptr().cast());
+                let real = REAL.get().copied().unwrap_or(sys_getaddrinfo);
+                return real(redirect, service_name, hints, result);
             }
         }
     }

openfut-hook/src/lib.rs

@@ -1,12 +1,35 @@
+// The `fifa17` feature compiles this shared crate but activates only the FIFA-17
+// injection path (fifa17.rs + sbc_*): install_hooks() routes to fifa17::install()
+// and the FIFA-23 hook modules are reached solely via install_hooks_fifa23(), which
+// is itself `#[cfg(not(feature = "fifa17"))]`. Those modules are therefore compiled
+// but unused under `fifa17` (the linker strips them from the cdylib). Scope the
+// resulting dead-code/unused-import lints to that feature so both builds stay
+// `-D warnings` clean without dropping code the default (FIFA-23) build needs.
+#![cfg_attr(feature = "fifa17", allow(dead_code, unused_imports))]
+
 mod config;
 mod connect_hook;
 mod connectex_hook;
+mod dial_notification;
+#[cfg(feature = "fifa17")]
+mod fifa17;
 mod hooks;
 mod iat;
 mod origin_spy;
-mod server;
+#[cfg(feature = "probe")]
+mod probe;
+#[cfg(feature = "capture_baseline")]
+mod recv_hook;
+#[cfg(feature = "fifa17")]
+mod sbc_hook;
+#[cfg(feature = "fifa17")]
+mod sbc_request_trace;
+#[cfg(feature = "fifa17")]
+mod sbc_trace;
 mod ssl_patch;
 mod tls_bypass;
+mod transport_watch;
+mod version_proxy;
 
 use windows_sys::Win32::{
     Foundation::{BOOL, HMODULE, TRUE},
@@ -25,38 +48,60 @@ pub(crate) fn write_log(msg: &str) {
     }
 }
 
+/// Force the log to stable storage. `write_log` already opens+closes the file per line,
+/// so nothing is buffered *inside our process* (a process crash can't lose a written
+/// line). `sync_all` additionally flushes the OS cache to disk, for durability even
+/// across a full system crash. We call this right before the dial trigger's call so the
+/// pre-call log line is guaranteed on disk if the call faults.
+#[allow(dead_code)]
+pub(crate) fn flush_log() {
+    if let Ok(f) = std::fs::OpenOptions::new()
+        .append(true)
+        .open(r"C:\openfut_hook.log")
+    {
+        let _ = f.sync_all();
+    }
+}
+
+/// # Safety
+///
+/// This is the DLL entry point invoked by the Windows loader; it MUST NOT be
+/// called manually. `module` must be the valid `HMODULE` the loader passes for
+/// this DLL. On `DLL_PROCESS_ATTACH` it installs process-wide inline detours
+/// (raw memory patching), so it must run exactly once, on the loader thread,
+/// before any hooked API is used.
 #[no_mangle]
 pub unsafe extern "system" fn DllMain(module: HMODULE, reason: u32, _: *mut ()) -> BOOL {
     if reason == DLL_PROCESS_ATTACH {
-        install_hooks(module);
+        // VERSION forwarding must be ready before DllMain returns. Hook setup
+        // may be deferred, but a caller can use any proxy export immediately.
+        if version_proxy::resolve() {
+            install_hooks(module);
+        }
     }
     TRUE
 }
 
 unsafe fn install_hooks(module: HMODULE) {
-    write_log("openfut_hook: DllMain fired\n");
-
-    // Load the single source of truth for the OpenFUT destination. If it's
-    // missing/invalid we log and install NO redirection — traffic is left alone
-    // rather than silently sent to loopback.
-    match config::load_config(module).and_then(|c| c.resolve()) {
-        Ok(resolved) => {
-            server::set(resolved);
-            hooks::set_redirect_ip(resolved.redirect_ip);
-            let o = resolved.redirect_ip.octets();
-            write_log(&format!(
-                "openfut_hook: OpenFUT server = {}.{}.{}.{} (https={} blaze_redir={} blaze_main={})\n",
-                o[0], o[1], o[2], o[3],
-                resolved.ports.https, resolved.ports.blaze_redirector, resolved.ports.blaze_main
-            ));
-        }
-        Err(e) => {
-            write_log(&format!(
-                "openfut_hook: NO OpenFUT server configured ({e}); redirection DISABLED. \
-                 Configure a server in the launcher and relaunch.\n"
-            ));
-        }
+    // FIFA 17 path: run ONLY the minimal, FIFA-17-safe logic and skip every
+    // FIFA-23-specific hook below (they assume FIFA 23's memory layout).
+    #[cfg(feature = "fifa17")]
+    {
+        let _ = module;
+        fifa17::install();
     }
+    #[cfg(not(feature = "fifa17"))]
+    install_hooks_fifa23(module)
+}
+
+#[cfg(not(feature = "fifa17"))]
+unsafe fn install_hooks_fifa23(module: HMODULE) {
+    write_log("openfut_hook: DllMain fired\n");
+    // Milestone-0 transport watch: arm (or note disarmed) from env once, up front, so
+    // the getaddrinfo/connect/ConnectEx detours below can log Blaze-flavored activity.
+    transport_watch::arm_from_env();
+    let ip = config::read_redirect_ip(module);
+    hooks::set_redirect_ip(ip);
 
     let ga = iat::resolve(b"ws2_32.dll\0", b"getaddrinfo\0");
     if !ga.is_null() {
@@ -114,8 +159,34 @@ unsafe fn install_hooks(module: HMODULE) {
         write_log("connectex: WSAIoctl hook FAILED\n");
     }
 
+    // RE instrumentation: passive logging detours on FIFA's in-process online-flow
+    // functions (GoOnline, GetInternetConnectedState, event deserializers) to see
+    // where FIFA stalls after our pushed LSX events. Deferred until anadius loads.
+    #[cfg(feature = "probe")]
+    {
+        probe::install_probes_deferred();
+        write_log("probe: deferred install scheduled\n");
+    }
+
     // recv/send hooks removed — LSX is now handled by the native openfut-bridge
     // LSX server (port 3216), so in-process interception is no longer needed.
+    //
+    // Except in the `capture_baseline` build: with the LSX redirect off, FIFA talks
+    // to anadius directly, and these hooks log anadius's real LSX request/response
+    // frames (pass-through, no emulation) so we can diff them against our bridge.
+    #[cfg(feature = "capture_baseline")]
+    {
+        if recv_hook::install_recv_hook() {
+            write_log("CAP: recv inline-hooked\n");
+        } else {
+            write_log("CAP: recv hook FAILED\n");
+        }
+        if recv_hook::install_send_hook() {
+            write_log("CAP: send inline-hooked\n");
+        } else {
+            write_log("CAP: send hook FAILED\n");
+        }
+    }
 
     macro_rules! hook_iat {
         ($dll:expr, $sym:expr, $setter:ident, $handler:expr, $ty:ty) => {{

openfut-hook/src/recv_hook.rs

@@ -12,7 +12,8 @@ unsafe fn write_jmp(target: *mut u8, dest: u64) {
     use windows_sys::Win32::System::Memory::{VirtualProtect, PAGE_EXECUTE_READWRITE};
     let mut old: u32 = 0;
     VirtualProtect(target as _, 14, PAGE_EXECUTE_READWRITE, &mut old);
-    target.write(0xFF); target.add(1).write(0x25);
+    target.write(0xFF);
+    target.add(1).write(0x25);
     (target.add(2) as *mut u32).write(0);
     (target.add(6) as *mut u64).write(dest);
     VirtualProtect(target as _, 14, old, &mut old);
@@ -22,32 +23,48 @@ unsafe fn make_trampoline(orig: *mut u8, name: &str) -> Option<usize> {
     use windows_sys::Win32::System::Memory::{
         VirtualAlloc, MEM_COMMIT, MEM_RESERVE, PAGE_EXECUTE_READWRITE,
     };
-    // Log prologue so we can diagnose if trampolines misbehave
-    let bytes: [u8; 14] = core::array::from_fn(|i| *orig.add(i));
-    let hex: String = bytes.iter().map(|b| format!("{b:02x} ")).collect();
+    // Read enough prologue to walk instruction boundaries.
+    let probe: [u8; 24] = core::array::from_fn(|i| *orig.add(i));
+    let hex: String = probe[..14].iter().map(|b| format!("{b:02x} ")).collect();
     crate::write_log(&format!("recv_hook: {name} prologue {hex}\n"));
 
-    // Walk instruction boundaries to find relative branches.
-    // Byte-by-byte scanning mis-identifies immediate operands (e.g. `sub rsp, 0x70`)
-    // as jump opcodes, so we must parse properly.
-    if has_rip_relative_branch(&bytes) {
-        crate::write_log(&format!("recv_hook: {name} has relative branch in prologue, skipping trampoline\n"));
-        return None;
+    // Copy WHOLE instructions until we've covered >= 14 bytes (the size of the JMP
+    // patch), so the trampoline never splits an instruction. Copying a fixed 14
+    // bytes lands mid-instruction on these prologues and crashes on execution.
+    let mut copy_len = 0usize;
+    while copy_len < 14 {
+        let (len, branch) = decode_instr_len(&probe[copy_len..]);
+        if len == 0 || branch {
+            crate::write_log(&format!(
+                "recv_hook: {name} unrelocatable prologue (len={len} branch={branch}), skipping\n"
+            ));
+            return None;
+        }
+        copy_len += len;
     }
 
     let mem = VirtualAlloc(
-        core::ptr::null_mut(), 32,
-        MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE,
+        core::ptr::null_mut(),
+        64,
+        MEM_COMMIT | MEM_RESERVE,
+        PAGE_EXECUTE_READWRITE,
     );
-    if mem.is_null() { crate::write_log("recv_hook: VirtualAlloc failed\n"); return None; }
+    if mem.is_null() {
+        crate::write_log("recv_hook: VirtualAlloc failed\n");
+        return None;
+    }
 
     let t = mem as *mut u8;
-    core::ptr::copy_nonoverlapping(orig, t, 14);
-    // JMP [RIP+0] → orig+14
-    let cont = (orig as u64) + 14;
-    t.add(14).write(0xFF); t.add(15).write(0x25);
-    (t.add(16) as *mut u32).write(0);
-    (t.add(20) as *mut u64).write(cont);
+    core::ptr::copy_nonoverlapping(orig, t, copy_len);
+    // JMP [RIP+0] → orig+copy_len (resume at the next whole instruction)
+    let cont = (orig as u64) + copy_len as u64;
+    t.add(copy_len).write(0xFF);
+    t.add(copy_len + 1).write(0x25);
+    (t.add(copy_len + 2) as *mut u32).write(0);
+    (t.add(copy_len + 6) as *mut u64).write(cont);
+    crate::write_log(&format!(
+        "recv_hook: {name} trampoline copy_len={copy_len}\n"
+    ));
     Some(t as usize)
 }
 
@@ -58,8 +75,12 @@ fn has_rip_relative_branch(bytes: &[u8]) -> bool {
     let mut pos = 0;
     while pos < bytes.len() {
         let (len, branch) = decode_instr_len(&bytes[pos..]);
-        if branch { return true; }
-        if len == 0 { break; } // unknown/truncated — stop safely
+        if branch {
+            return true;
+        }
+        if len == 0 {
+            break;
+        } // unknown/truncated — stop safely
         pos += len;
     }
     false
@@ -69,9 +90,29 @@ fn modrm_extra(modrm: u8) -> usize {
     let md = (modrm >> 6) & 3;
     let rm = modrm & 7;
     match md {
-        0 => if rm == 5 { 4 } else if rm == 4 { 1 } else { 0 },
-        1 => if rm == 4 { 2 } else { 1 },
-        2 => if rm == 4 { 5 } else { 4 },
+        0 => {
+            if rm == 5 {
+                4
+            } else if rm == 4 {
+                1
+            } else {
+                0
+            }
+        }
+        1 => {
+            if rm == 4 {
+                2
+            } else {
+                1
+            }
+        }
+        2 => {
+            if rm == 4 {
+                5
+            } else {
+                4
+            }
+        }
         _ => 0,
     }
 }
@@ -79,16 +120,31 @@ fn modrm_extra(modrm: u8) -> usize {
 /// Returns (instruction_length_in_bytes, is_rip_relative_branch).
 /// Returns (0, false) for unknown/truncated.
 fn decode_instr_len(b: &[u8]) -> (usize, bool) {
-    if b.is_empty() { return (0, false); }
+    if b.is_empty() {
+        return (0, false);
+    }
     let mut i = 0;
     // Legacy prefixes
     while let Some(&p) = b.get(i) {
-        if matches!(p, 0x66 | 0x67 | 0xF0 | 0xF2 | 0xF3) { i += 1; } else { break; }
+        if matches!(p, 0x66 | 0x67 | 0xF0 | 0xF2 | 0xF3) {
+            i += 1;
+        } else {
+            break;
+        }
     }
     // REX prefix (40–4F)
-    if b.get(i).copied().map(|x| (0x40..=0x4F).contains(&x)).unwrap_or(false) { i += 1; }
+    if b.get(i)
+        .copied()
+        .map(|x| (0x40..=0x4F).contains(&x))
+        .unwrap_or(false)
+    {
+        i += 1;
+    }
 
-    let op = match b.get(i) { Some(&x) => x, None => return (0, false) };
+    let op = match b.get(i) {
+        Some(&x) => x,
+        None => return (0, false),
+    };
     i += 1;
 
     match op {
@@ -103,28 +159,45 @@ fn decode_instr_len(b: &[u8]) -> (usize, bool) {
         0xE9 | 0xE8 => (i + 4, true),
         // 0F prefix
         0x0F => {
-            let op2 = match b.get(i) { Some(&x) => x, None => return (0, false) };
+            let op2 = match b.get(i) {
+                Some(&x) => x,
+                None => return (0, false),
+            };
             i += 1;
-            if (0x80..=0x8F).contains(&op2) { return (i + 4, true); } // Jcc rel32
-            // Most 0F XX: ModRM
-            let modrm = match b.get(i) { Some(&x) => x, None => return (0, false) };
+            if (0x80..=0x8F).contains(&op2) {
+                return (i + 4, true);
+            } // Jcc rel32
+              // Most 0F XX: ModRM
+            let modrm = match b.get(i) {
+                Some(&x) => x,
+                None => return (0, false),
+            };
             (i + 1 + modrm_extra(modrm), false)
         }
         // Instructions with ModRM only (no immediate)
-        0x85 | 0x87 | 0x88 | 0x89 | 0x8A | 0x8B | 0x8C | 0x8D | 0x8E | 0x8F |
-        0x01 | 0x03 | 0x09 | 0x0B | 0x11 | 0x13 | 0x21 | 0x23 | 0x29 | 0x2B |
-        0x31 | 0x33 | 0x39 | 0x3B | 0xD3 | 0xFF | 0xF7 => {
-            let modrm = match b.get(i) { Some(&x) => x, None => return (0, false) };
+        0x85 | 0x87 | 0x88 | 0x89 | 0x8A | 0x8B | 0x8C | 0x8D | 0x8E | 0x8F | 0x01 | 0x03
+        | 0x09 | 0x0B | 0x11 | 0x13 | 0x21 | 0x23 | 0x29 | 0x2B | 0x31 | 0x33 | 0x39 | 0x3B
+        | 0xD3 | 0xFF | 0xF7 => {
+            let modrm = match b.get(i) {
+                Some(&x) => x,
+                None => return (0, false),
+            };
             (i + 1 + modrm_extra(modrm), false)
         }
         // ModRM + imm8
         0x6B | 0x80 | 0x83 | 0xC0 | 0xC1 | 0xC6 => {
-            let modrm = match b.get(i) { Some(&x) => x, None => return (0, false) };
+            let modrm = match b.get(i) {
+                Some(&x) => x,
+                None => return (0, false),
+            };
             (i + 1 + modrm_extra(modrm) + 1, false)
         }
         // ModRM + imm32
         0x69 | 0x81 | 0xC7 => {
-            let modrm = match b.get(i) { Some(&x) => x, None => return (0, false) };
+            let modrm = match b.get(i) {
+                Some(&x) => x,
+                None => return (0, false),
+            };
             (i + 1 + modrm_extra(modrm) + 4, false)
         }
         // MOV reg, imm8/imm32
@@ -143,7 +216,9 @@ fn decode_instr_len(b: &[u8]) -> (usize, bool) {
 unsafe fn get_fn(dll: &[u8], sym: &[u8]) -> Option<*mut u8> {
     use windows_sys::Win32::System::LibraryLoader::{GetModuleHandleA, GetProcAddress};
     let h = GetModuleHandleA(dll.as_ptr());
-    if h.is_null() { return None; }
+    if h.is_null() {
+        return None;
+    }
     GetProcAddress(h, sym.as_ptr()).map(|f| f as *mut u8)
 }
 
@@ -151,46 +226,96 @@ unsafe fn get_fn(dll: &[u8], sym: &[u8]) -> Option<*mut u8> {
 
 static RECV_TRAMPOLINE: AtomicUsize = AtomicUsize::new(0);
 
-pub unsafe extern "system" fn hooked_recv(s: usize, buf: *mut u8, len: i32, flags: i32) -> i32 {
-    if crate::lsx::is_lsx(s) {
-        return crate::lsx::on_recv(s, buf, len);
+/// True if socket `s` is connected to the EA App LSX port (127.0.0.1:3216).
+/// Used in capture mode to tap only the LSX conversation.
+unsafe fn peer_is_lsx(s: usize) -> bool {
+    use windows_sys::Win32::Networking::WinSock::getpeername;
+    let mut sa = [0u8; 16];
+    let mut sl: i32 = 16;
+    if getpeername(s, sa.as_mut_ptr() as *mut _, &mut sl) != 0 {
+        return false;
     }
-    let t = RECV_TRAMPOLINE.load(Ordering::Relaxed);
-    if t == 0 { return -1; }
-    let f: unsafe extern "system" fn(usize, *mut u8, i32, i32) -> i32 = core::mem::transmute(t);
-    f(s, buf, len, flags)
+    // sockaddr_in: sa_family (2 bytes) then sin_port (2 bytes, network order).
+    u16::from_be_bytes([sa[2], sa[3]]) == 3216
 }
 
+// IAT-hook approach (no inline trampoline — FIFA's `recv`/`send` prologues have
+// instructions that straddle the 14-byte patch boundary, so an inline trampoline
+// corrupts them and crashes. IAT hooking only swaps import-table pointers and
+// never touches the function body). The real fns are resolved in lib.rs and set
+// here; our hooks call them directly.
+static REAL_RECV: AtomicUsize = AtomicUsize::new(0);
+static REAL_SEND: AtomicUsize = AtomicUsize::new(0);
+
+pub fn set_real_recv(f: unsafe extern "system" fn(usize, *mut u8, i32, i32) -> i32) {
+    REAL_RECV.store(f as usize, Ordering::Relaxed);
+}
+pub fn set_real_send(f: unsafe extern "system" fn(usize, *const u8, i32, i32) -> i32) {
+    REAL_SEND.store(f as usize, Ordering::Relaxed);
+}
+
+/// Inline-hook ws2_32!recv: build a boundary-safe trampoline (the "real" fn our
+/// hook calls) and overwrite the entry with a JMP to `hooked_recv`. Inline hooks
+/// catch calls from every module and dynamically-resolved calls, unlike IAT.
 pub unsafe fn install_recv_hook() -> bool {
-    let ptr = match get_fn(b"ws2_32.dll\0", b"recv\0") { Some(p) => p, None => return false };
+    let ptr = match get_fn(b"ws2_32.dll\0", b"recv\0") {
+        Some(p) => p,
+        None => return false,
+    };
     match make_trampoline(ptr, "recv") {
-        Some(t) => { RECV_TRAMPOLINE.store(t, Ordering::Relaxed); }
-        None    => { crate::write_log("recv_hook: recv trampoline failed, hook skipped\n"); return false; }
+        Some(t) => REAL_RECV.store(t, Ordering::Relaxed),
+        None => return false,
     }
     write_jmp(ptr, hooked_recv as u64);
     true
 }
 
-// ─── send ──────────────────────────────────────────────────────────────────────
-
-static SEND_TRAMPOLINE: AtomicUsize = AtomicUsize::new(0);
-
-pub unsafe extern "system" fn hooked_send(s: usize, buf: *const u8, len: i32, flags: i32) -> i32 {
-    if crate::lsx::is_lsx(s) {
-        return crate::lsx::on_send(s, buf, len);
-    }
-    let t = SEND_TRAMPOLINE.load(Ordering::Relaxed);
-    if t == 0 { return -1; }
-    let f: unsafe extern "system" fn(usize, *const u8, i32, i32) -> i32 = core::mem::transmute(t);
-    f(s, buf, len, flags)
-}
-
 pub unsafe fn install_send_hook() -> bool {
-    let ptr = match get_fn(b"ws2_32.dll\0", b"send\0") { Some(p) => p, None => return false };
+    let ptr = match get_fn(b"ws2_32.dll\0", b"send\0") {
+        Some(p) => p,
+        None => return false,
+    };
     match make_trampoline(ptr, "send") {
-        Some(t) => { SEND_TRAMPOLINE.store(t, Ordering::Relaxed); }
-        None    => { crate::write_log("recv_hook: send trampoline failed, hook skipped\n"); return false; }
+        Some(t) => REAL_SEND.store(t, Ordering::Relaxed),
+        None => return false,
     }
     write_jmp(ptr, hooked_send as u64);
     true
 }
+
+pub unsafe extern "system" fn hooked_recv(s: usize, buf: *mut u8, len: i32, flags: i32) -> i32 {
+    let t = REAL_RECV.load(Ordering::Relaxed);
+    if t == 0 {
+        return -1;
+    }
+    let f: unsafe extern "system" fn(usize, *mut u8, i32, i32) -> i32 = core::mem::transmute(t);
+    // Pass through to anadius's real socket, then log what it sent back
+    // (anadius's LSX response — the ground truth we want to diff against).
+    let n = f(s, buf, len, flags);
+    if n > 0 && peer_is_lsx(s) {
+        let data = core::slice::from_raw_parts(buf, n as usize);
+        let text = core::str::from_utf8(data).unwrap_or("(binary)");
+        crate::write_log(&format!(
+            "CAP recv<-anadius s={s} n={n}: {}\n",
+            &text[..text.len().min(2400)]
+        ));
+    }
+    n
+}
+
+pub unsafe extern "system" fn hooked_send(s: usize, buf: *const u8, len: i32, flags: i32) -> i32 {
+    if len > 0 && peer_is_lsx(s) {
+        let data = core::slice::from_raw_parts(buf, len as usize);
+        let text = core::str::from_utf8(data).unwrap_or("(binary)");
+        crate::write_log(&format!(
+            "CAP send->anadius s={s} len={len}: {}\n",
+            &text[..text.len().min(2400)]
+        ));
+    }
+    let t = REAL_SEND.load(Ordering::Relaxed);
+    if t == 0 {
+        return -1;
+    }
+    let f: unsafe extern "system" fn(usize, *const u8, i32, i32) -> i32 = core::mem::transmute(t);
+    f(s, buf, len, flags)
+}

openfut-hook/src/sbc_hook.rs

@@ -0,0 +1,864 @@
+//! FIFA 17 SBC render intervention (feature = "fifa17").
+//!
+//! Makes the FUT **SBC menu render real data** from inside the process. Full spec
+//! (all addresses, RVA math, call order, crash risks, staged test plan):
+//!   fifa17-recon/docs/sbc-hook-dll-spec.md
+//!
+//! Everything here is **inert by default** and gated by env vars, so shipping the DLL
+//! with this module compiled in changes nothing unless a var is set:
+//!   OPENFUT_SBC_HOOK=1       -> arm the deferred worker (resolve + log; READ-ONLY)
+//!   OPENFUT_SBC_ARM_ONLY=1   -> Tier-0 negative control: write BYTE[B+0x28]=1 (renders EMPTY)
+//!   OPENFUT_SBC_COMMIT=1     -> after proven native parse success, arm populated M
+//!   OPENFUT_SBC_POPULATE=1   -> legacy Tier-1 gate: BLOCKED (logs corrected trace gap, returns)
+//!
+//! CardsDLL_Win64_retail.dll is loaded lazily (only on entering Ultimate Team), so we
+//! defer off the loader lock and poll for it — the same shape as
+//! `probe::install_probes_deferred` polling for anadius64.dll.
+//!
+//! ── Address model (static VAs; PE image base 0x180000000) ────────────────────────
+//! All values below are RVAs (VA_static - 0x180000000); live = cards_base + rva.
+//! See the spec for the verified disassembly behind each one.
+
+use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use windows_sys::Win32::System::Diagnostics::Debug::FlushInstructionCache;
+use windows_sys::Win32::System::LibraryLoader::GetModuleHandleA;
+use windows_sys::Win32::System::Memory::{
+    VirtualProtect, VirtualQuery, MEMORY_BASIC_INFORMATION, MEM_COMMIT, PAGE_EXECUTE_READ,
+    PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY, PAGE_GUARD, PAGE_NOACCESS, PAGE_READWRITE,
+    PAGE_WRITECOPY,
+};
+use windows_sys::Win32::System::Threading::{GetCurrentProcess, GetCurrentThreadId};
+
+// ── RVAs (verified byte-exact against /tmp/fut/cardsdll.dll this pass) ────────────
+const IMAGE_BASE: usize = 0x180000000;
+
+/// FNV prologue used as the slide-proof control (must match the on-disk PE bytes).
+const CTRL_RVA: usize = 0x180d00; // VA 0x180180d00
+const CTRL_BYTES: &[u8] = &[
+    0x48, 0x83, 0xec, 0x28, 0x48, 0x85, 0xc9, 0x74, 0x50, 0x45, 0x33, 0xc0,
+];
+
+const A_SLOT_RVA: usize = 0x2e6398; // *(0x1802e6398) = A (FUT root singleton)
+const A_VTABLE_RVA: usize = 0x21c2a0;
+const B_OFF: usize = 0x1f9d8; //        B = A + 0x1f9d8 (SBC request/ready TTL cache)
+const B_VTABLE_RVA: usize = 0x1fae70;
+const B_READY_OFF: usize = 0x28; //     B+0x28 ready byte (the isValid gate)
+const B_COLL_OFF: usize = 0x08; //      B+0x08 collection ptr (MUST stay 0 — see spec §4/C5)
+const M_CACHE_OFF: usize = 0x20a68; //  M = *(A + 0x20a68) (render source; per-session heap)
+const M_COUNT_OFF: usize = 0x50; //     WORD[M+0x50] category count
+const SBC_CONTROLLER_VTABLE_RVA: usize = 0x20a820;
+const SBC_CONTROLLER_EVENT_VTABLE_RVA: usize = 0x20a888;
+const SBC_CONTROLLER_EVENT_SUBOBJECT_OFF: usize = 0x138;
+const SBC_CONTROLLER_MODEL_OFF: usize = 0x140;
+const SBC_COMPLETION_STATUS_JNE_RVA: usize = 0x0b8962;
+const SBC_COMPLETION_STATUS_JNE: [u8; 2] = [0x75, 0x48];
+const SBC_COMPLETION_STATUS_FALLTHROUGH: [u8; 2] = [0x90, 0x90];
+const B_DTOR_RVA: usize = 0x63040;
+const B_ISVALID_RVA: usize = 0x65d40;
+const B_CLEAR_RVA: usize = 0x65d20;
+const B_READY_EXPECTED_BEFORE_ARM: u8 = 0;
+
+#[allow(dead_code)]
+const AVT_M_GETTER: usize = 0x9b0; //   A.vtable[+0x9b0] = 0x18011b7d0 (M lazy getter)
+#[allow(dead_code)]
+const AVT_B_GETTER: usize = 0x4e8; //   A.vtable[+0x4e8] = 0x18011c1f0 (B getter thunk)
+
+// Callable RVAs (for the Tier-1 populate sequence — see spec §6/§8). Kept for
+// reference/wiring; not invoked while Tier-1 is blocked.
+#[allow(dead_code)]
+mod rva {
+    pub const M_LAZY_GETTER: usize = 0x11b7d0;
+    pub const ISVALID: usize = 0x65d40;
+    pub const DESER_SBS_SETS: usize = 0x17b2b0;
+    pub const SAX_CTX_INIT: usize = 0x1c63e0;
+    pub const REGISTRY_GETTER: usize = 0xd7170;
+    pub const MANAGER_GETTER: usize = 0x9c80;
+    pub const CLEAR_M: usize = 0x15f3a0;
+    pub const CAT_CTOR: usize = 0x159da0;
+    pub const CAT_DESER: usize = 0x17ab80;
+    pub const CAT_FINALIZE: usize = 0x160e50;
+    pub const APPEND: usize = 0x15a770;
+    pub const CAT_DTOR: usize = 0x1105d0;
+    pub const IDX_REBUILD_1: usize = 0x160e00;
+    pub const IDX_REBUILD_2: usize = 0x160f30;
+    pub const IDX_REBUILD_3: usize = 0x161020;
+    pub const REFRESH_DISPATCH: usize = 0x1a4a70; // Scaleform events 0x756c-0x7574
+}
+
+static ARMED: AtomicBool = AtomicBool::new(false);
+static ARM_ONLY: AtomicBool = AtomicBool::new(false);
+static COMMIT: AtomicBool = AtomicBool::new(false);
+static POPULATE: AtomicBool = AtomicBool::new(false);
+static DONE: AtomicBool = AtomicBool::new(false);
+static CARDS_BASE: AtomicUsize = AtomicUsize::new(0);
+static SBC_CONTROLLER: AtomicUsize = AtomicUsize::new(0);
+static STATE: AtomicUsize = AtomicUsize::new(RuntimeState::Disabled as usize);
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(usize)]
+enum RuntimeState {
+    Disabled,
+    Resolved,
+    Intercepted,
+    Parsed,
+    Validated,
+    Committed,
+    Failed,
+}
+
+fn valid_transition(from: RuntimeState, to: RuntimeState) -> bool {
+    matches!(
+        (from, to),
+        (RuntimeState::Disabled, RuntimeState::Resolved)
+            | (RuntimeState::Resolved, RuntimeState::Intercepted)
+            | (RuntimeState::Intercepted, RuntimeState::Parsed)
+            | (RuntimeState::Parsed, RuntimeState::Validated)
+            // Resolve-only/Tier-0 validates without installing an interceptor.
+            | (RuntimeState::Resolved, RuntimeState::Validated)
+            | (RuntimeState::Validated, RuntimeState::Committed)
+            | (_, RuntimeState::Failed)
+    )
+}
+
+fn transition(from: RuntimeState, to: RuntimeState) -> bool {
+    valid_transition(from, to)
+        && STATE
+            .compare_exchange(
+                from as usize,
+                to as usize,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .is_ok()
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+enum ValidationError {
+    AddressOverflow,
+    AUnreadable,
+    AVtableMismatch,
+    AGetterMismatch,
+    BVtableMismatch,
+    BDtorMismatch,
+    BIsValidMismatch,
+    BClearMismatch,
+    MSlotUnreadable,
+    ReadyByteUnexpected,
+    CollectionUnreadable,
+    CollectionNotNull,
+    ReadyByteNotWritable,
+    ModelEmpty,
+    ControllerMissing,
+    ControllerVtableMismatch,
+    ControllerModelMismatch,
+    CompletionBranchMismatch,
+    CompletionBranchProtectFailed,
+    CompletionBranchFlushFailed,
+}
+
+#[derive(Clone, Copy, Debug)]
+struct RuntimeSnapshot {
+    a: usize,
+    a_vtable: usize,
+    a_b_getter: usize,
+    b: usize,
+    b_vtable: usize,
+    b_dtor: usize,
+    b_isvalid: usize,
+    b_clear: usize,
+    b_ready: u8,
+    b_coll: usize,
+    m: usize,
+}
+
+fn expected_va(base: usize, rva: usize) -> Result<usize, ValidationError> {
+    base.checked_add(rva)
+        .ok_or(ValidationError::AddressOverflow)
+}
+
+fn validate_snapshot(base: usize, s: &RuntimeSnapshot) -> Result<(), ValidationError> {
+    if s.a == 0
+        || s.b
+            != s.a
+                .checked_add(B_OFF)
+                .ok_or(ValidationError::AddressOverflow)?
+    {
+        return Err(ValidationError::AUnreadable);
+    }
+    if s.a_vtable != expected_va(base, A_VTABLE_RVA)? {
+        return Err(ValidationError::AVtableMismatch);
+    }
+    if s.a_b_getter != expected_va(base, 0x11c1f0)? {
+        return Err(ValidationError::AGetterMismatch);
+    }
+    if s.b_vtable != expected_va(base, B_VTABLE_RVA)? {
+        return Err(ValidationError::BVtableMismatch);
+    }
+    if s.b_dtor != expected_va(base, B_DTOR_RVA)? {
+        return Err(ValidationError::BDtorMismatch);
+    }
+    if s.b_isvalid != expected_va(base, B_ISVALID_RVA)? {
+        return Err(ValidationError::BIsValidMismatch);
+    }
+    if s.b_clear != expected_va(base, B_CLEAR_RVA)? {
+        return Err(ValidationError::BClearMismatch);
+    }
+    if s.b_ready != B_READY_EXPECTED_BEFORE_ARM {
+        return Err(ValidationError::ReadyByteUnexpected);
+    }
+    if s.b_coll != 0 {
+        return Err(ValidationError::CollectionNotNull);
+    }
+    let _ = s.m; // The guarded snapshot read proves the M slot itself is readable.
+    Ok(())
+}
+
+/// Fault-safe pointer read (mirrors `probe::read_ptr`): returns None unless `ptr` lands
+/// in a committed, readable page and the full 8 bytes fit inside the region.
+unsafe fn read_ptr(ptr: usize) -> Option<usize> {
+    if ptr < 0x10000 || ptr & 7 != 0 {
+        return None;
+    }
+    let mut mbi: MEMORY_BASIC_INFORMATION = core::mem::zeroed();
+    let n = VirtualQuery(
+        ptr as _,
+        &mut mbi,
+        core::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
+    );
+    if n == 0 || mbi.State != MEM_COMMIT {
+        return None;
+    }
+    if mbi.Protect & (PAGE_NOACCESS | PAGE_GUARD) != 0 {
+        return None;
+    }
+    if ptr + 8 > mbi.BaseAddress as usize + mbi.RegionSize {
+        return None;
+    }
+    Some(core::ptr::read_volatile(ptr as *const usize))
+}
+
+/// Guarded byte read.
+unsafe fn read_u8(ptr: usize) -> Option<u8> {
+    if ptr < 0x10000 {
+        return None;
+    }
+    let mut mbi: MEMORY_BASIC_INFORMATION = core::mem::zeroed();
+    let n = VirtualQuery(
+        ptr as _,
+        &mut mbi,
+        core::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
+    );
+    if n == 0 || mbi.State != MEM_COMMIT || mbi.Protect & (PAGE_NOACCESS | PAGE_GUARD) != 0 {
+        return None;
+    }
+    if ptr + 1 > mbi.BaseAddress as usize + mbi.RegionSize {
+        return None;
+    }
+    Some(core::ptr::read_volatile(ptr as *const u8))
+}
+
+/// A Tier-0 write is allowed only when the complete byte lies in a committed,
+/// non-guarded region whose current protection explicitly permits writes.
+unsafe fn writable_u8(ptr: usize) -> bool {
+    if ptr < 0x10000 {
+        return false;
+    }
+    let mut mbi: MEMORY_BASIC_INFORMATION = core::mem::zeroed();
+    let n = VirtualQuery(
+        ptr as _,
+        &mut mbi,
+        core::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
+    );
+    if n == 0 || mbi.State != MEM_COMMIT || mbi.Protect & (PAGE_NOACCESS | PAGE_GUARD) != 0 {
+        return false;
+    }
+    let protection = mbi.Protect & 0xff;
+    let writable = matches!(
+        protection,
+        PAGE_READWRITE | PAGE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY
+    );
+    writable
+        && ptr
+            .checked_add(1)
+            .is_some_and(|end| end <= (mbi.BaseAddress as usize).saturating_add(mbi.RegionSize))
+}
+
+unsafe fn executable_range(ptr: usize, len: usize) -> bool {
+    let Some(end) = ptr.checked_add(len) else {
+        return false;
+    };
+    let mut mbi: MEMORY_BASIC_INFORMATION = core::mem::zeroed();
+    let n = VirtualQuery(
+        ptr as _,
+        &mut mbi,
+        core::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
+    );
+    if n == 0 || mbi.State != MEM_COMMIT || mbi.Protect & (PAGE_NOACCESS | PAGE_GUARD) != 0 {
+        return false;
+    }
+    let protection = mbi.Protect & 0xff;
+    matches!(
+        protection,
+        PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY
+    ) && end <= (mbi.BaseAddress as usize).saturating_add(mbi.RegionSize)
+}
+
+/// Guarded 16-bit read (M category count is a WORD).
+unsafe fn read_u16(ptr: usize) -> Option<u16> {
+    let lo = read_u8(ptr)? as u16;
+    let hi = read_u8(ptr + 1)? as u16;
+    Some(lo | (hi << 8))
+}
+
+/// Resolve CardsDLL's runtime base, or 0. Tries the exact loaded name; the ToolHelp
+/// fallback (name-contains "CardsDLL") lives in the spec — add it if EA ever renames.
+unsafe fn resolve_cards_base() -> usize {
+    let h = GetModuleHandleA(c"CardsDLL_Win64_retail.dll".as_ptr().cast());
+    if !h.is_null() {
+        return h as usize;
+    }
+    // Also try the short form some tooling reports.
+    let h2 = GetModuleHandleA(c"CardsDLL.dll".as_ptr().cast());
+    if !h2.is_null() {
+        return h2 as usize;
+    }
+    0
+}
+
+#[inline]
+fn va(base: usize, rva: usize) -> usize {
+    base + rva
+}
+
+/// Prove the module didn't move: the FNV control prologue must match the on-disk PE.
+unsafe fn control_matches(base: usize) -> bool {
+    let p = va(base, CTRL_RVA);
+    for (i, &want) in CTRL_BYTES.iter().enumerate() {
+        match read_u8(p + i) {
+            Some(got) if got == want => {}
+            _ => return false,
+        }
+    }
+    true
+}
+
+/// Take one guarded identity snapshot. A failure to read any identity-bearing field is
+/// distinct from a value mismatch and aborts before mutation.
+unsafe fn runtime_snapshot(base: usize) -> Result<RuntimeSnapshot, ValidationError> {
+    let a_slot = expected_va(base, A_SLOT_RVA)?;
+    let a = read_ptr(a_slot)
+        .filter(|&value| value != 0)
+        .ok_or(ValidationError::AUnreadable)?;
+    let a_vtable = read_ptr(a).ok_or(ValidationError::AVtableMismatch)?;
+    let a_b_getter = read_ptr(
+        a_vtable
+            .checked_add(AVT_B_GETTER)
+            .ok_or(ValidationError::AddressOverflow)?,
+    )
+    .ok_or(ValidationError::AGetterMismatch)?;
+    let b = a
+        .checked_add(B_OFF)
+        .ok_or(ValidationError::AddressOverflow)?;
+    let b_vtable = read_ptr(b).ok_or(ValidationError::BVtableMismatch)?;
+    let b_dtor = read_ptr(b_vtable).ok_or(ValidationError::BDtorMismatch)?;
+    let b_isvalid = read_ptr(
+        b_vtable
+            .checked_add(8)
+            .ok_or(ValidationError::AddressOverflow)?,
+    )
+    .ok_or(ValidationError::BIsValidMismatch)?;
+    let b_clear = read_ptr(
+        b_vtable
+            .checked_add(16)
+            .ok_or(ValidationError::AddressOverflow)?,
+    )
+    .ok_or(ValidationError::BClearMismatch)?;
+    let b_ready = read_u8(
+        b.checked_add(B_READY_OFF)
+            .ok_or(ValidationError::AddressOverflow)?,
+    )
+    .ok_or(ValidationError::ReadyByteUnexpected)?;
+    let b_coll = read_ptr(
+        b.checked_add(B_COLL_OFF)
+            .ok_or(ValidationError::AddressOverflow)?,
+    )
+    .ok_or(ValidationError::CollectionUnreadable)?;
+    let m = read_ptr(
+        a.checked_add(M_CACHE_OFF)
+            .ok_or(ValidationError::AddressOverflow)?,
+    )
+    .ok_or(ValidationError::MSlotUnreadable)?;
+    Ok(RuntimeSnapshot {
+        a,
+        a_vtable,
+        a_b_getter,
+        b,
+        b_vtable,
+        b_dtor,
+        b_isvalid,
+        b_clear,
+        b_ready,
+        b_coll,
+        m,
+    })
+}
+
+fn set_failed(error: ValidationError) {
+    STATE.store(RuntimeState::Failed as usize, Ordering::Release);
+    crate::write_log(&format!(
+        "SBC_HOOK: runtime validation FAILED: {error:?} -- no write\n"
+    ));
+}
+
+/// Public entry: called from `fifa17::install`. Spawns the deferred worker if
+/// OPENFUT_SBC_HOOK=1; otherwise logs "disabled" and returns (fully inert).
+pub fn install() {
+    let armed = std::env::var("OPENFUT_SBC_HOOK")
+        .map(|v| v == "1")
+        .unwrap_or(false);
+    ARMED.store(armed, Ordering::Relaxed);
+    if !armed {
+        STATE.store(RuntimeState::Disabled as usize, Ordering::Relaxed);
+        crate::write_log("SBC_HOOK: disabled (set OPENFUT_SBC_HOOK=1 to enable)\n");
+        return;
+    }
+    ARM_ONLY.store(
+        std::env::var("OPENFUT_SBC_ARM_ONLY")
+            .map(|v| v == "1")
+            .unwrap_or(false),
+        Ordering::Relaxed,
+    );
+    COMMIT.store(
+        std::env::var("OPENFUT_SBC_COMMIT")
+            .map(|v| v == "1")
+            .unwrap_or(false),
+        Ordering::Relaxed,
+    );
+    POPULATE.store(
+        std::env::var("OPENFUT_SBC_POPULATE")
+            .map(|v| v == "1")
+            .unwrap_or(false),
+        Ordering::Relaxed,
+    );
+    crate::write_log("SBC_HOOK: ARMED (deferred worker spawning)\n");
+    std::thread::spawn(|| unsafe { worker() });
+}
+
+/// Records the concrete SBC controller observed registering FUT_SBS_CATEGORIES.
+/// The registration hook is observational; all structural checks happen again on
+/// the notifier thread before this address is trusted.
+pub(crate) unsafe fn note_sbc_controller(controller: usize) {
+    let base = CARDS_BASE.load(Ordering::Acquire);
+    let valid = base != 0
+        && read_ptr(controller) == base.checked_add(SBC_CONTROLLER_VTABLE_RVA)
+        && controller
+            .checked_add(SBC_CONTROLLER_EVENT_SUBOBJECT_OFF)
+            .and_then(|p| read_ptr(p))
+            == base.checked_add(SBC_CONTROLLER_EVENT_VTABLE_RVA);
+    if valid {
+        SBC_CONTROLLER.store(controller, Ordering::Release);
+        crate::write_log(&format!(
+            "SBC_CONTROLLER_TRACE: captured controller={controller:#x}\n"
+        ));
+    } else {
+        crate::write_log(&format!(
+            "SBC_CONTROLLER_TRACE: rejected controller={controller:#x} (vtable mismatch)\n"
+        ));
+    }
+}
+
+unsafe fn log_controller_model(native_model: usize) {
+    let controller = SBC_CONTROLLER.load(Ordering::Acquire);
+    let controller_model = controller
+        .checked_add(SBC_CONTROLLER_MODEL_OFF)
+        .and_then(|p| read_ptr(p))
+        .unwrap_or(0);
+    let main_vtable = read_ptr(controller).unwrap_or(0);
+    let event_vtable = controller
+        .checked_add(SBC_CONTROLLER_EVENT_SUBOBJECT_OFF)
+        .and_then(|p| read_ptr(p))
+        .unwrap_or(0);
+    crate::write_log(&format!(
+        "SBC_CONTROLLER_TRACE: notifier controller={controller:#x} main_vt={main_vtable:#x} event_vt={event_vtable:#x} controller_M={controller_model:#x} parsed_M={native_model:#x} match={}\n",
+        controller != 0 && controller_model == native_model,
+    ));
+}
+
+unsafe fn validated_sbc_controller(
+    base: usize,
+    native_model: usize,
+) -> Result<usize, ValidationError> {
+    let controller = SBC_CONTROLLER.load(Ordering::Acquire);
+    if controller == 0 {
+        return Err(ValidationError::ControllerMissing);
+    }
+    if read_ptr(controller) != base.checked_add(SBC_CONTROLLER_VTABLE_RVA)
+        || controller
+            .checked_add(SBC_CONTROLLER_EVENT_SUBOBJECT_OFF)
+            .and_then(|p| read_ptr(p))
+            != base.checked_add(SBC_CONTROLLER_EVENT_VTABLE_RVA)
+    {
+        return Err(ValidationError::ControllerVtableMismatch);
+    }
+    if controller
+        .checked_add(SBC_CONTROLLER_MODEL_OFF)
+        .and_then(|p| read_ptr(p))
+        != Some(native_model)
+    {
+        return Err(ValidationError::ControllerModelMismatch);
+    }
+    Ok(controller)
+}
+
+/// Route the already-scheduled category completion through CardsDLL's own success
+/// branch. The original function first rejects a non-zero status with a two-byte
+/// `jne ServerErrSets`; after a separately proven native parse, that status belongs
+/// to the stale scheduler completion rather than the category HTTP transaction.
+unsafe fn arm_native_completion_success(base: usize) -> Result<(), ValidationError> {
+    let target = base
+        .checked_add(SBC_COMPLETION_STATUS_JNE_RVA)
+        .ok_or(ValidationError::AddressOverflow)?;
+    if !executable_range(target, SBC_COMPLETION_STATUS_JNE.len())
+        || core::slice::from_raw_parts(target as *const u8, SBC_COMPLETION_STATUS_JNE.len())
+            != SBC_COMPLETION_STATUS_JNE
+    {
+        return Err(ValidationError::CompletionBranchMismatch);
+    }
+    let mut old = 0u32;
+    if VirtualProtect(
+        target as _,
+        SBC_COMPLETION_STATUS_FALLTHROUGH.len(),
+        PAGE_EXECUTE_READWRITE,
+        &mut old,
+    ) == 0
+    {
+        return Err(ValidationError::CompletionBranchProtectFailed);
+    }
+    core::ptr::copy_nonoverlapping(
+        SBC_COMPLETION_STATUS_FALLTHROUGH.as_ptr(),
+        target as *mut u8,
+        SBC_COMPLETION_STATUS_FALLTHROUGH.len(),
+    );
+    let flushed = FlushInstructionCache(
+        GetCurrentProcess(),
+        target as _,
+        SBC_COMPLETION_STATUS_FALLTHROUGH.len(),
+    ) != 0;
+    let mut ignored = 0u32;
+    let protected = VirtualProtect(
+        target as _,
+        SBC_COMPLETION_STATUS_FALLTHROUGH.len(),
+        old,
+        &mut ignored,
+    ) != 0;
+    if !flushed || !protected {
+        return Err(ValidationError::CompletionBranchFlushFailed);
+    }
+    crate::write_log(&format!(
+        "SBC_HOOK: armed native completion success branch at {target:#x} tid={}\n",
+        GetCurrentThreadId(),
+    ));
+    Ok(())
+}
+
+/// Commit the already-populated native SBC model after the category success notifier.
+///
+/// This is called synchronously by the passive notifier wrapper *after* the original
+/// notifier returns. It never invokes a parser or constructs game objects. The only
+/// mutation is the established cache-ready byte, and only when the normal parser has
+/// produced at least one category and every pointer/vtable invariant still matches.
+pub(crate) unsafe fn commit_after_native_parse() {
+    if !COMMIT.load(Ordering::Acquire) {
+        return;
+    }
+    let base = CARDS_BASE.load(Ordering::Acquire);
+    if base == 0 || !control_matches(base) {
+        set_failed(ValidationError::AUnreadable);
+        return;
+    }
+    let snapshot = match runtime_snapshot(base).and_then(|snapshot| {
+        validate_snapshot(base, &snapshot)?;
+        if snapshot.m == 0
+            || read_u16(snapshot.m + M_COUNT_OFF)
+                .filter(|&count| count > 0)
+                .is_none()
+        {
+            return Err(ValidationError::ModelEmpty);
+        }
+        if !writable_u8(snapshot.b + B_READY_OFF) {
+            return Err(ValidationError::ReadyByteNotWritable);
+        }
+        Ok(snapshot)
+    }) {
+        Ok(snapshot) => snapshot,
+        Err(error) => {
+            set_failed(error);
+            return;
+        }
+    };
+    let count = read_u16(snapshot.m + M_COUNT_OFF).unwrap_or(0);
+    log_controller_model(snapshot.m);
+    if DONE.swap(true, Ordering::AcqRel) {
+        return;
+    }
+    crate::write_log(&format!(
+        "SBC_HOOK: post-parse commit -> M={:#x} categories={} BYTE[{:#x}]=1\n",
+        snapshot.m,
+        count,
+        snapshot.b + B_READY_OFF,
+    ));
+    core::ptr::write_volatile((snapshot.b + B_READY_OFF) as *mut u8, 1);
+    if read_u8(snapshot.b + B_READY_OFF) != Some(1)
+        || !transition(RuntimeState::Validated, RuntimeState::Committed)
+    {
+        set_failed(ValidationError::ReadyByteUnexpected);
+        return;
+    }
+    let _controller = match validated_sbc_controller(base, snapshot.m) {
+        Ok(controller) => controller,
+        Err(error) => {
+            set_failed(error);
+            return;
+        }
+    };
+    if let Err(error) = arm_native_completion_success(base) {
+        set_failed(error);
+        return;
+    }
+    crate::write_log(
+        "SBC_HOOK: post-parse commit DONE; awaiting CardsDLL native completion events\n",
+    );
+}
+
+/// Deferred worker: waits (up to ~5 min) for CardsDLL to load — it only appears when
+/// the user enters Ultimate Team — then runs the resolve/log (+ optional Tier-0 arm)
+/// exactly once.
+unsafe fn worker() {
+    let mut base = 0usize;
+    for _ in 0..600u32 {
+        base = resolve_cards_base();
+        if base != 0 {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(500));
+    }
+    if base == 0 {
+        crate::write_log("SBC_HOOK: CardsDLL_Win64_retail.dll never loaded — giving up\n");
+        return;
+    }
+    CARDS_BASE.store(base, Ordering::Relaxed);
+    let slide = base.wrapping_sub(IMAGE_BASE);
+    let ctrl_ok = control_matches(base);
+    crate::write_log(&format!(
+        "SBC_HOOK: CardsDLL base={base:#x} slide={slide:#x} CONTROL={}\n",
+        if ctrl_ok { "OK" } else { "MISMATCH-ABORT" }
+    ));
+    if !ctrl_ok {
+        STATE.store(RuntimeState::Failed as usize, Ordering::Release);
+        return; // module map moved -> offsets untrustworthy (spec §1)
+    }
+
+    if !transition(RuntimeState::Disabled, RuntimeState::Resolved) {
+        crate::write_log("SBC_HOOK: invalid state transition to Resolved -- no write\n");
+        STATE.store(RuntimeState::Failed as usize, Ordering::Release);
+        return;
+    }
+
+    // Resolve and validate A -> B, M. The vtable method checks make it substantially
+    // harder for a coincidental heap pointer to pass after a binary/layout mismatch.
+    let snapshot = match runtime_snapshot(base).and_then(|snapshot| {
+        validate_snapshot(base, &snapshot)?;
+        Ok(snapshot)
+    }) {
+        Ok(snapshot) => snapshot,
+        Err(error) => {
+            set_failed(error);
+            return;
+        }
+    };
+    if !transition(RuntimeState::Resolved, RuntimeState::Validated) {
+        crate::write_log("SBC_HOOK: invalid state transition to Validated -- no write\n");
+        STATE.store(RuntimeState::Failed as usize, Ordering::Release);
+        return;
+    }
+    let a = snapshot.a;
+    let b = snapshot.b;
+    let m = snapshot.m;
+    let m_count = (m != 0).then(|| read_u16(m + M_COUNT_OFF)).flatten();
+    crate::write_log(&format!(
+        "SBC_HOOK: A={a:#x} B={b:#x} B+0x28(ready)={:?} B+0x08(coll)={:?} M=*(A+0x20a68)={:?} WORD[M+0x50]={:?}\n",
+        Some(snapshot.b_ready), opt_hex(Some(snapshot.b_coll)), opt_hex(Some(m)), m_count,
+    ));
+
+    // Tier-0 — arm-only negative control. Write ONLY BYTE[B+0x28]=1; leave B+0x08=0 so
+    // isValid takes the short-circuit (spec §4). Renders the menu EMPTY (M null/empty) —
+    // this is the baseline, NOT the fix. One-shot.
+    if ARM_ONLY.load(Ordering::Relaxed) {
+        if DONE.swap(true, Ordering::Relaxed) {
+            return;
+        }
+        // Re-snapshot immediately before mutation to reduce the time-of-check/time-of-use
+        // window. In particular, the exact patch byte must still be 0 and B+0x08 null.
+        let write_snapshot = match runtime_snapshot(base).and_then(|snapshot| {
+            validate_snapshot(base, &snapshot)?;
+            if !writable_u8(snapshot.b + B_READY_OFF) {
+                return Err(ValidationError::ReadyByteNotWritable);
+            }
+            Ok(snapshot)
+        }) {
+            Ok(snapshot) => snapshot,
+            Err(error) => {
+                set_failed(error);
+                return;
+            }
+        };
+        crate::write_log(&format!(
+            "SBC_HOOK: Tier-0 arm-only -> writing BYTE[{:#x}]=1 (expect EMPTY render, no modal)\n",
+            write_snapshot.b + B_READY_OFF
+        ));
+        core::ptr::write_volatile((write_snapshot.b + B_READY_OFF) as *mut u8, 1u8);
+        match read_u8(write_snapshot.b + B_READY_OFF) {
+            Some(1) if transition(RuntimeState::Validated, RuntimeState::Committed) => {}
+            _ => {
+                set_failed(ValidationError::ReadyByteUnexpected);
+                return;
+            }
+        }
+        crate::write_log(
+            "SBC_HOOK: Tier-0 arm-only DONE (open the SBC menu; ~2 placeholder tiles expected)\n",
+        );
+        return;
+    }
+
+    // Legacy Tier-1 gate — deliberately blocked. The fresh live exchange proves FIFA
+    // already owns a real response and SAX reader for /sbs/sets. The next milestone is
+    // passive tracing of the native response-to-deserializer dispatch, not construction
+    // of a reader. Cold-calling with a fabricated reader would CLEAR M and/or segfault.
+    if POPULATE.load(Ordering::Relaxed) {
+        crate::write_log(
+            "SBC_HOOK: legacy Tier-1 populate is BLOCKED — capture the genuine response \
+             and reader at the native dispatch boundary first (see client-hook plan M3/M4). \
+             No deser call made; fabricated readers can clear M or crash.\n",
+        );
+    }
+}
+
+fn opt_hex(o: Option<usize>) -> String {
+    match o {
+        Some(v) => format!("{v:#x}"),
+        None => "<unreadable>".to_string(),
+    }
+}
+
+/// Legacy Tier-1 scaffold. **Never call this with a fabricated reader.** The intended
+/// implementation is now a guarded synchronous dispatch repair that borrows the genuine
+/// response and reader from the real HTTP transaction on its native thread.
+///
+/// Sequence once `reader` (a primed SAX reader over canned sbs/sets JSON) exists:
+///   let base = CARDS_BASE.load(Relaxed);
+///   let deser: unsafe extern "system" fn(*mut u8, *mut u8) -> bool =
+///       transmute(va(base, rva::DESER_SBS_SETS));
+///   deser(core::ptr::null_mut(), reader);   // self-locates mgr, clears+appends+finalizes+commits M
+///   // then Tier-0 arm: BYTE[B+0x28]=1, leave B+0x08=0
+///   // then refresh so 0x1800b5eda re-reads WORD[M+0x50]
+#[allow(dead_code)]
+unsafe fn populate_m(_reader: *mut u8) {
+    // Intentionally unimplemented: the passive trace must prove the response/reader
+    // ownership and exact virtual-dispatch boundary before any parser call is enabled.
+    unreachable!(
+        "populate_m requires a proven native dispatch contract; see client-hook plan M3/M4"
+    );
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn valid_snapshot(base: usize) -> RuntimeSnapshot {
+        let a = 0x1000_0000usize;
+        RuntimeSnapshot {
+            a,
+            a_vtable: base + A_VTABLE_RVA,
+            a_b_getter: base + 0x11c1f0,
+            b: a + B_OFF,
+            b_vtable: base + B_VTABLE_RVA,
+            b_dtor: base + B_DTOR_RVA,
+            b_isvalid: base + B_ISVALID_RVA,
+            b_clear: base + B_CLEAR_RVA,
+            b_ready: B_READY_EXPECTED_BEFORE_ARM,
+            b_coll: 0,
+            m: 0,
+        }
+    }
+
+    #[test]
+    fn accepts_exact_runtime_identity_with_null_uninitialized_m() {
+        let base = 0x7fff_0000_0000usize;
+        assert_eq!(validate_snapshot(base, &valid_snapshot(base)), Ok(()));
+    }
+
+    #[test]
+    fn rejects_wrong_a_or_b_class_identity() {
+        let base = 0x7fff_0000_0000usize;
+        let mut snapshot = valid_snapshot(base);
+        snapshot.a_vtable += 8;
+        assert_eq!(
+            validate_snapshot(base, &snapshot),
+            Err(ValidationError::AVtableMismatch)
+        );
+
+        let mut snapshot = valid_snapshot(base);
+        snapshot.b_vtable += 8;
+        assert_eq!(
+            validate_snapshot(base, &snapshot),
+            Err(ValidationError::BVtableMismatch)
+        );
+    }
+
+    #[test]
+    fn rejects_changed_patch_byte_or_live_collection() {
+        let base = 0x7fff_0000_0000usize;
+        let mut snapshot = valid_snapshot(base);
+        snapshot.b_ready = 1;
+        assert_eq!(
+            validate_snapshot(base, &snapshot),
+            Err(ValidationError::ReadyByteUnexpected)
+        );
+
+        let mut snapshot = valid_snapshot(base);
+        snapshot.b_coll = 0x1234_0000;
+        assert_eq!(
+            validate_snapshot(base, &snapshot),
+            Err(ValidationError::CollectionNotNull)
+        );
+    }
+
+    #[test]
+    fn state_machine_is_forward_only_and_fail_closed() {
+        assert!(valid_transition(
+            RuntimeState::Disabled,
+            RuntimeState::Resolved
+        ));
+        assert!(valid_transition(
+            RuntimeState::Resolved,
+            RuntimeState::Validated
+        ));
+        assert!(valid_transition(
+            RuntimeState::Validated,
+            RuntimeState::Committed
+        ));
+        assert!(valid_transition(RuntimeState::Parsed, RuntimeState::Failed));
+        assert!(!valid_transition(
+            RuntimeState::Validated,
+            RuntimeState::Resolved
+        ));
+        assert!(!valid_transition(
+            RuntimeState::Failed,
+            RuntimeState::Resolved
+        ));
+        assert!(!valid_transition(
+            RuntimeState::Resolved,
+            RuntimeState::Committed
+        ));
+    }
+}

openfut-hook/src/sbc_request_trace.rs

@@ -0,0 +1,478 @@
+//! Optional category-request callback tracing through its class-unique vtable.
+//!
+//! Unlike the entry trampolines, these probes atomically replace two aligned
+//! pointer slots. The branchy callback dispatcher at 0x180154830 is never patched.
+
+use core::ffi::c_void;
+use core::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering};
+use windows_sys::Win32::System::LibraryLoader::{
+    GetModuleHandleA, GetModuleHandleExA, GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
+    GET_MODULE_HANDLE_EX_FLAG_PIN,
+};
+use windows_sys::Win32::System::Memory::{
+    VirtualProtect, VirtualQuery, MEMORY_BASIC_INFORMATION, MEM_COMMIT, PAGE_GUARD, PAGE_NOACCESS,
+    PAGE_READWRITE,
+};
+use windows_sys::Win32::System::Threading::GetCurrentThreadId;
+
+const REQUEST_VTABLE_RVA: usize = 0x22e5c0;
+const SLOT_88: usize = 0x88;
+const SLOT_90: usize = 0x90;
+const ORIGINAL_88_RVA: usize = 0x1631e0;
+const ORIGINAL_90_RVA: usize = 0x154830;
+const ORIGINAL_88_SIGNATURE: [u8; 16] = [
+    0x48, 0x89, 0x5c, 0x24, 0x08, 0x48, 0x89, 0x74, 0x24, 0x10, 0x57, 0x48, 0x83, 0xec, 0x20, 0x48,
+];
+const ORIGINAL_90_SIGNATURE: [u8; 16] = [
+    0x4c, 0x8b, 0x81, 0x90, 0x00, 0x00, 0x00, 0x4d, 0x85, 0xc0, 0x74, 0x0a, 0x48, 0x81, 0xc1, 0x90,
+];
+
+type Callback88 = unsafe extern "system" fn(*mut c_void, *mut c_void);
+type Callback90 = unsafe extern "system" fn(*mut c_void, *mut c_void);
+
+static ENABLED: AtomicBool = AtomicBool::new(false);
+static INSTALLED: AtomicBool = AtomicBool::new(false);
+static ORIGINAL_88: AtomicUsize = AtomicUsize::new(0);
+static ORIGINAL_90: AtomicUsize = AtomicUsize::new(0);
+static ENTER_88: AtomicU64 = AtomicU64::new(0);
+static EXIT_88: AtomicU64 = AtomicU64::new(0);
+static ENTER_90: AtomicU64 = AtomicU64::new(0);
+static EXIT_90: AtomicU64 = AtomicU64::new(0);
+static LAST_REQUEST_88: AtomicUsize = AtomicUsize::new(0);
+static LAST_ARGUMENT_88: AtomicUsize = AtomicUsize::new(0);
+static LAST_THREAD_88: AtomicUsize = AtomicUsize::new(0);
+static LAST_REQUEST_90: AtomicUsize = AtomicUsize::new(0);
+static LAST_ARGUMENT_90: AtomicUsize = AtomicUsize::new(0);
+static LAST_THREAD_90: AtomicUsize = AtomicUsize::new(0);
+static CALLBACK_90: AtomicUsize = AtomicUsize::new(0);
+static CALLBACK_98: AtomicUsize = AtomicUsize::new(0);
+static CALLBACK_A0: AtomicUsize = AtomicUsize::new(0);
+static CALLBACK_A8: AtomicUsize = AtomicUsize::new(0);
+static SELECTED_90: AtomicUsize = AtomicUsize::new(0);
+static OWNER_88: AtomicUsize = AtomicUsize::new(0);
+static OWNER_VTABLE_88: AtomicUsize = AtomicUsize::new(0);
+static CONSUMER_88: AtomicUsize = AtomicUsize::new(0);
+static RESPONSE_VTABLE_88: AtomicUsize = AtomicUsize::new(0);
+static OWNER_SLOT_BEFORE_88: AtomicUsize = AtomicUsize::new(0);
+static OWNER_SLOT_AFTER_88: AtomicUsize = AtomicUsize::new(0);
+static OWNER_INNER_88: AtomicUsize = AtomicUsize::new(0);
+static OWNER_STATE_BEFORE_88: AtomicUsize = AtomicUsize::new(usize::MAX);
+static OWNER_STATE_AFTER_88: AtomicUsize = AtomicUsize::new(usize::MAX);
+static OWNER_FLAGS_88: AtomicUsize = AtomicUsize::new(usize::MAX);
+static OWNER_MANAGER_88: AtomicUsize = AtomicUsize::new(0);
+static OWNER_MANAGER_STATE_88: AtomicUsize = AtomicUsize::new(usize::MAX);
+
+fn enabled(value: Option<&str>) -> bool {
+    matches!(value, Some("1"))
+}
+
+fn checked_va(base: usize, rva: usize) -> Option<usize> {
+    base.checked_add(rva)
+}
+
+fn image_range_covered(size: usize, rva: usize, length: usize) -> bool {
+    rva.checked_add(length)
+        .map(|end| end <= size)
+        .unwrap_or(false)
+}
+
+unsafe fn readable_range(address: usize, length: usize) -> bool {
+    let Some(end) = address.checked_add(length) else {
+        return false;
+    };
+    let mut mbi: MEMORY_BASIC_INFORMATION = core::mem::zeroed();
+    VirtualQuery(
+        address as _,
+        &mut mbi,
+        core::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
+    ) != 0
+        && mbi.State == MEM_COMMIT
+        && mbi.Protect & (PAGE_GUARD | PAGE_NOACCESS) == 0
+        && end <= mbi.BaseAddress as usize + mbi.RegionSize
+}
+
+unsafe fn range_in_image_allocation(base: usize, address: usize, length: usize) -> bool {
+    let Some(end) = address.checked_add(length) else {
+        return false;
+    };
+    let mut mbi: MEMORY_BASIC_INFORMATION = core::mem::zeroed();
+    VirtualQuery(
+        address as _,
+        &mut mbi,
+        core::mem::size_of::<MEMORY_BASIC_INFORMATION>(),
+    ) != 0
+        && mbi.AllocationBase as usize == base
+        && mbi.State == MEM_COMMIT
+        && mbi.Protect & (PAGE_GUARD | PAGE_NOACCESS) == 0
+        && end <= mbi.BaseAddress as usize + mbi.RegionSize
+}
+
+unsafe fn image_size(base: usize) -> Option<usize> {
+    if !readable_range(base, 0x1000) || *(base as *const u16) != 0x5a4d {
+        return None;
+    }
+    let pe_offset = *((base + 0x3c) as *const u32) as usize;
+    if pe_offset > 0xf00 {
+        return None;
+    }
+    let pe = base.checked_add(pe_offset)?;
+    if *(pe as *const u32) != 0x0000_4550 {
+        return None;
+    }
+    let size_field = pe.checked_add(24 + 0x38)?;
+    Some(*(size_field as *const u32) as usize)
+}
+
+unsafe fn signature_matches(address: usize, expected: &[u8]) -> bool {
+    readable_range(address, expected.len())
+        && core::slice::from_raw_parts(address as *const u8, expected.len()) == expected
+}
+
+unsafe fn guarded_ptr(address: usize) -> usize {
+    if address & 7 == 0 && readable_range(address, 8) {
+        core::ptr::read_volatile(address as *const usize)
+    } else {
+        0
+    }
+}
+
+unsafe fn guarded_u32(address: usize) -> Option<u32> {
+    if readable_range(address, 4) {
+        Some(core::ptr::read_volatile(address as *const u32))
+    } else {
+        None
+    }
+}
+
+unsafe fn guarded_u8(address: usize) -> Option<u8> {
+    if readable_range(address, 1) {
+        Some(core::ptr::read_volatile(address as *const u8))
+    } else {
+        None
+    }
+}
+
+unsafe fn field_ptr(object: usize, offset: usize) -> usize {
+    object
+        .checked_add(offset)
+        .map(|address| guarded_ptr(address))
+        .unwrap_or(0)
+}
+
+unsafe extern "system" fn wrapper_88(request: *mut c_void, argument: *mut c_void) {
+    ENTER_88.fetch_add(1, Ordering::Relaxed);
+    LAST_REQUEST_88.store(request as usize, Ordering::Relaxed);
+    LAST_ARGUMENT_88.store(argument as usize, Ordering::Relaxed);
+    LAST_THREAD_88.store(GetCurrentThreadId() as usize, Ordering::Relaxed);
+    let request_address = request as usize;
+    let argument_address = argument as usize;
+    let owner = field_ptr(request_address, 8);
+    let owner_vtable = guarded_ptr(owner);
+    let consumer = field_ptr(owner_vtable, 0x18);
+    let owner_slot_before = guarded_ptr(argument_address);
+    let response_vtable = guarded_ptr(owner_slot_before);
+    let owner_inner = field_ptr(owner, 8);
+    let owner_state_before = owner_inner
+        .checked_add(8)
+        .and_then(|p| guarded_u32(p))
+        .map(|v| v as usize)
+        .unwrap_or(usize::MAX);
+    let owner_flags = owner_inner
+        .checked_add(0x0c)
+        .and_then(|p| guarded_u8(p))
+        .map(|v| v as usize)
+        .unwrap_or(usize::MAX);
+    let owner_manager = field_ptr(owner_inner, 0x14d0);
+    let owner_manager_state = owner_manager
+        .checked_add(0x1dc0)
+        .and_then(|p| guarded_u32(p))
+        .map(|v| v as usize)
+        .unwrap_or(usize::MAX);
+    OWNER_88.store(owner, Ordering::Relaxed);
+    OWNER_VTABLE_88.store(owner_vtable, Ordering::Relaxed);
+    CONSUMER_88.store(consumer, Ordering::Relaxed);
+    RESPONSE_VTABLE_88.store(response_vtable, Ordering::Relaxed);
+    OWNER_SLOT_BEFORE_88.store(owner_slot_before, Ordering::Relaxed);
+    OWNER_INNER_88.store(owner_inner, Ordering::Relaxed);
+    OWNER_STATE_BEFORE_88.store(owner_state_before, Ordering::Relaxed);
+    OWNER_FLAGS_88.store(owner_flags, Ordering::Relaxed);
+    OWNER_MANAGER_88.store(owner_manager, Ordering::Relaxed);
+    OWNER_MANAGER_STATE_88.store(owner_manager_state, Ordering::Relaxed);
+    let original: Callback88 = core::mem::transmute(ORIGINAL_88.load(Ordering::Acquire));
+    original(request, argument);
+    OWNER_SLOT_AFTER_88.store(guarded_ptr(argument_address), Ordering::Relaxed);
+    OWNER_STATE_AFTER_88.store(
+        owner_inner
+            .checked_add(8)
+            .and_then(|p| guarded_u32(p))
+            .map(|v| v as usize)
+            .unwrap_or(usize::MAX),
+        Ordering::Relaxed,
+    );
+    EXIT_88.fetch_add(1, Ordering::Release);
+}
+
+unsafe extern "system" fn wrapper_90(request: *mut c_void, argument: *mut c_void) {
+    ENTER_90.fetch_add(1, Ordering::Relaxed);
+    LAST_REQUEST_90.store(request as usize, Ordering::Relaxed);
+    LAST_ARGUMENT_90.store(argument as usize, Ordering::Relaxed);
+    LAST_THREAD_90.store(GetCurrentThreadId() as usize, Ordering::Relaxed);
+    let request_address = request as usize;
+    let callback_90 = field_ptr(request_address, 0x90);
+    let callback_98 = field_ptr(request_address, 0x98);
+    let callback_a0 = field_ptr(request_address, 0xa0);
+    let callback_a8 = field_ptr(request_address, 0xa8);
+    CALLBACK_90.store(callback_90, Ordering::Relaxed);
+    CALLBACK_98.store(callback_98, Ordering::Relaxed);
+    CALLBACK_A0.store(callback_a0, Ordering::Relaxed);
+    CALLBACK_A8.store(callback_a8, Ordering::Relaxed);
+    SELECTED_90.store(
+        if callback_90 != 0 {
+            callback_90
+        } else {
+            callback_a0
+        },
+        Ordering::Relaxed,
+    );
+    let original: Callback90 = core::mem::transmute(ORIGINAL_90.load(Ordering::Acquire));
+    original(request, argument);
+    EXIT_90.fetch_add(1, Ordering::Release);
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+enum SwapOutcome {
+    Installed,
+    CleanFailure,
+    DegradedFirstSlotActive,
+    DegradedProtection,
+}
+
+unsafe fn install_slots(base: usize) -> SwapOutcome {
+    let Some(vtable) = checked_va(base, REQUEST_VTABLE_RVA) else {
+        return SwapOutcome::CleanFailure;
+    };
+    let Some(original_88) = checked_va(base, ORIGINAL_88_RVA) else {
+        return SwapOutcome::CleanFailure;
+    };
+    let Some(original_90) = checked_va(base, ORIGINAL_90_RVA) else {
+        return SwapOutcome::CleanFailure;
+    };
+    let Some(slot_88) = checked_va(vtable, SLOT_88) else {
+        return SwapOutcome::CleanFailure;
+    };
+    let Some(slot_90) = checked_va(vtable, SLOT_90) else {
+        return SwapOutcome::CleanFailure;
+    };
+    let Some(size) = image_size(base) else {
+        return SwapOutcome::CleanFailure;
+    };
+    if !image_range_covered(size, REQUEST_VTABLE_RVA, SLOT_90 + 8)
+        || !image_range_covered(size, ORIGINAL_88_RVA, ORIGINAL_88_SIGNATURE.len())
+        || !image_range_covered(size, ORIGINAL_90_RVA, ORIGINAL_90_SIGNATURE.len())
+        || slot_88 & 7 != 0
+        || slot_90 & 7 != 0
+        || !crate::sbc_trace::validate_cards_build(base)
+        || !range_in_image_allocation(base, vtable, SLOT_90 + 8)
+        || !range_in_image_allocation(base, original_88, ORIGINAL_88_SIGNATURE.len())
+        || !range_in_image_allocation(base, original_90, ORIGINAL_90_SIGNATURE.len())
+        || !signature_matches(original_88, &ORIGINAL_88_SIGNATURE)
+        || !signature_matches(original_90, &ORIGINAL_90_SIGNATURE)
+        || (slot_88 as *const AtomicUsize)
+            .as_ref()
+            .unwrap()
+            .load(Ordering::Acquire)
+            != original_88
+        || (slot_90 as *const AtomicUsize)
+            .as_ref()
+            .unwrap()
+            .load(Ordering::Acquire)
+            != original_90
+    {
+        return SwapOutcome::CleanFailure;
+    }
+
+    let mut pinned = core::ptr::null_mut();
+    if GetModuleHandleExA(
+        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN,
+        vtable as *const u8,
+        &mut pinned,
+    ) == 0
+        || pinned as usize != base
+    {
+        return SwapOutcome::CleanFailure;
+    }
+    ORIGINAL_88.store(original_88, Ordering::Release);
+    ORIGINAL_90.store(original_90, Ordering::Release);
+
+    // Both slots share the same vtable page. Keep it writable only across the two
+    // compare/exchanges and possible rollback.
+    let mut old = 0u32;
+    if VirtualProtect(slot_88 as _, 16, PAGE_READWRITE, &mut old) == 0 {
+        return SwapOutcome::CleanFailure;
+    }
+    let atom_88 = &*(slot_88 as *const AtomicUsize);
+    let atom_90 = &*(slot_90 as *const AtomicUsize);
+    let first = atom_88.compare_exchange(
+        original_88,
+        wrapper_88 as *const () as usize,
+        Ordering::AcqRel,
+        Ordering::Acquire,
+    );
+    let outcome = if first.is_err() {
+        SwapOutcome::CleanFailure
+    } else if atom_90
+        .compare_exchange(
+            original_90,
+            wrapper_90 as *const () as usize,
+            Ordering::AcqRel,
+            Ordering::Acquire,
+        )
+        .is_ok()
+    {
+        SwapOutcome::Installed
+    } else if atom_88
+        .compare_exchange(
+            wrapper_88 as *const () as usize,
+            original_88,
+            Ordering::AcqRel,
+            Ordering::Acquire,
+        )
+        .is_ok()
+    {
+        SwapOutcome::CleanFailure
+    } else {
+        SwapOutcome::DegradedFirstSlotActive
+    };
+    let mut ignored = 0u32;
+    if VirtualProtect(slot_88 as _, 16, old, &mut ignored) == 0 {
+        return if outcome == SwapOutcome::DegradedFirstSlotActive {
+            outcome
+        } else {
+            SwapOutcome::DegradedProtection
+        };
+    }
+    outcome
+}
+
+unsafe fn worker() {
+    for _ in 0..700u32 {
+        if crate::sbc_trace::code_patch_installers_ready() {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(500));
+    }
+    if !crate::sbc_trace::code_patch_installers_ready() {
+        crate::write_log("SBC_REQUEST_TRACE: code-patch readiness timeout; inactive\n");
+        return;
+    }
+    let mut base = 0usize;
+    for _ in 0..600u32 {
+        base = GetModuleHandleA(c"CardsDLL_Win64_retail.dll".as_ptr().cast()) as usize;
+        if base != 0 {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(500));
+    }
+    match if base == 0 { SwapOutcome::CleanFailure } else { install_slots(base) } {
+        SwapOutcome::Installed => {
+            INSTALLED.store(true, Ordering::Release);
+            crate::write_log("SBC_REQUEST_TRACE: category request vtable slots +0x88/+0x90 installed\n");
+            let mut seen_88 = 0u64;
+            let mut seen_90 = 0u64;
+            let mut reports = 0u8;
+            while reports < 32 {
+                std::thread::sleep(std::time::Duration::from_millis(250));
+                let count_88 = ENTER_88.load(Ordering::Acquire);
+                let count_90 = ENTER_90.load(Ordering::Acquire);
+                if count_88 != seen_88 || count_90 != seen_90 {
+                    crate::write_log(&format!(
+                        "SBC_REQUEST_TRACE: +88 entry={} exit={} req={:#x} arg={:#x} tid={} owner={:#x} ovt={:#x} consumer={:#x} rvt={:#x} slot={:#x}->{:#x} inner={:#x} state={}->{} flags={:#x} manager={:#x} manager_state={}; +90 entry={} exit={} req={:#x} arg={:#x} tid={} cb90={:#x} cb98={:#x} cba0={:#x} cba8={:#x} selected={:#x}\n",
+                        count_88,
+                        EXIT_88.load(Ordering::Acquire),
+                        LAST_REQUEST_88.load(Ordering::Relaxed),
+                        LAST_ARGUMENT_88.load(Ordering::Relaxed),
+                        LAST_THREAD_88.load(Ordering::Relaxed),
+                        OWNER_88.load(Ordering::Relaxed),
+                        OWNER_VTABLE_88.load(Ordering::Relaxed),
+                        CONSUMER_88.load(Ordering::Relaxed),
+                        RESPONSE_VTABLE_88.load(Ordering::Relaxed),
+                        OWNER_SLOT_BEFORE_88.load(Ordering::Relaxed),
+                        OWNER_SLOT_AFTER_88.load(Ordering::Relaxed),
+                        OWNER_INNER_88.load(Ordering::Relaxed),
+                        OWNER_STATE_BEFORE_88.load(Ordering::Relaxed),
+                        OWNER_STATE_AFTER_88.load(Ordering::Relaxed),
+                        OWNER_FLAGS_88.load(Ordering::Relaxed),
+                        OWNER_MANAGER_88.load(Ordering::Relaxed),
+                        OWNER_MANAGER_STATE_88.load(Ordering::Relaxed),
+                        count_90,
+                        EXIT_90.load(Ordering::Acquire),
+                        LAST_REQUEST_90.load(Ordering::Relaxed),
+                        LAST_ARGUMENT_90.load(Ordering::Relaxed),
+                        LAST_THREAD_90.load(Ordering::Relaxed),
+                        CALLBACK_90.load(Ordering::Relaxed),
+                        CALLBACK_98.load(Ordering::Relaxed),
+                        CALLBACK_A0.load(Ordering::Relaxed),
+                        CALLBACK_A8.load(Ordering::Relaxed),
+                        SELECTED_90.load(Ordering::Relaxed),
+                    ));
+                    seen_88 = count_88;
+                    seen_90 = count_90;
+                    reports += 1;
+                }
+            }
+            crate::write_log("SBC_REQUEST_TRACE: report cap reached; vtable probes remain passive\n");
+        }
+        SwapOutcome::CleanFailure => crate::write_log("SBC_REQUEST_TRACE: clean install failure; inactive\n"),
+        SwapOutcome::DegradedFirstSlotActive => crate::write_log(
+            "SBC_REQUEST_TRACE: DEGRADED slot +0x88 may remain active; terminate game now\n",
+        ),
+        SwapOutcome::DegradedProtection => crate::write_log(
+            "SBC_REQUEST_TRACE: DEGRADED vtable page protection restore failed; terminate game now\n",
+        ),
+    }
+}
+
+pub(crate) fn install() {
+    let armed = enabled(std::env::var("OPENFUT_SBC_REQUEST_TRACE").ok().as_deref());
+    ENABLED.store(armed, Ordering::Release);
+    if !armed {
+        crate::write_log("SBC_REQUEST_TRACE: disabled\n");
+        return;
+    }
+    crate::write_log("SBC_REQUEST_TRACE: requested; deferred install starting\n");
+    std::thread::spawn(|| unsafe { worker() });
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn gate_is_exact() {
+        assert!(!enabled(None));
+        assert!(!enabled(Some("true")));
+        assert!(enabled(Some("1")));
+    }
+
+    #[test]
+    fn slots_are_aligned_and_class_local() {
+        assert_eq!((REQUEST_VTABLE_RVA + SLOT_88) & 7, 0);
+        assert_eq!((REQUEST_VTABLE_RVA + SLOT_90) & 7, 0);
+        assert_eq!(SLOT_90 - SLOT_88, 8);
+    }
+
+    #[test]
+    fn image_coverage_is_checked_and_overflow_safe() {
+        assert!(image_range_covered(
+            0x230000,
+            REQUEST_VTABLE_RVA,
+            SLOT_90 + 8
+        ));
+        assert!(!image_range_covered(
+            REQUEST_VTABLE_RVA + SLOT_90,
+            REQUEST_VTABLE_RVA,
+            SLOT_90 + 8
+        ));
+        assert!(!image_range_covered(usize::MAX, usize::MAX, 8));
+    }
+}

openfut-hook/src/server.rs

@@ -1,45 +0,0 @@
-//! The single, process-wide resolved OpenFUT destination.
-//!
-//! All three interception layers — `getaddrinfo`, `connect`, and `ConnectEx` —
-//! read the destination from HERE. There is no per-hook redirect state. The
-//! value is set exactly once during DLL init (after `openfut.cfg` is parsed and
-//! the host resolved) and is never mutated afterward.
-//!
-//! If configuration was missing/invalid, this is never populated, and every
-//! hook leaves traffic untouched (no loopback fallback).
-use std::net::Ipv4Addr;
-use std::sync::OnceLock;
-
-use openfut_common::{sin_addr_from_ipv4, sin_port_nbo, ResolvedServer};
-
-static SERVER: OnceLock<ResolvedServer> = OnceLock::new();
-
-/// Install the resolved destination. Called once from DLL init. Ignores
-/// subsequent calls (OnceLock semantics).
-pub fn set(resolved: ResolvedServer) {
-    let _ = SERVER.set(resolved);
-}
-
-/// The resolved destination, if configuration succeeded.
-pub fn get() -> Option<ResolvedServer> {
-    SERVER.get().copied()
-}
-
-/// The resolved redirect IPv4, if configured.
-pub fn redirect_ip() -> Option<Ipv4Addr> {
-    SERVER.get().map(|s| s.redirect_ip)
-}
-
-/// `sockaddr_in.sin_addr` value (native-endian u32) for the configured server.
-pub fn sin_addr() -> Option<u32> {
-    SERVER.get().map(|s| sin_addr_from_ipv4(s.redirect_ip))
-}
-
-/// Given an EA *source* port (network byte order, as seen in `sockaddr_in`),
-/// return the OpenFUT *destination* port in network byte order — or `None` if
-/// this port isn't intercepted or no server is configured.
-pub fn dest_port_nbo_from_source_nbo(source_port_nbo: u16) -> Option<u16> {
-    let s = SERVER.get()?;
-    let source_host = u16::from_be(source_port_nbo);
-    s.ports.map_source_port(source_host).map(sin_port_nbo)
-}

openfut-hook/src/ssl_patch.rs

@@ -67,7 +67,7 @@ fn patch_module(module: isize, scan_bytes: usize) -> bool {
 
 /// Patch ProtoSSL cert-verify in EAWebKit.dll (call when EAWebKit is loaded).
 pub unsafe fn patch_eawebkit_cert_verify() -> bool {
-    let module = GetModuleHandleA(b"EAWebKit.dll\0".as_ptr()) as isize;
+    let module = GetModuleHandleA(c"EAWebKit.dll".as_ptr().cast()) as isize;
     // EAWebKit.dll is ~22 MB
     patch_module(module, 24 * 1024 * 1024)
 }

openfut-hook/src/transport_watch.rs

@@ -0,0 +1,227 @@
+//! Milestone 0 — Blaze transport reachability observation.
+//!
+//! PURE LOGGING, NO NEW DETOURS. This module does not hook anything itself. It is
+//! called from the three Winsock detours the hook ALREADY installs — getaddrinfo
+//! (`hooks.rs`), connect/WSAConnect (`connect_hook.rs`) and ConnectEx
+//! (`connectex_hook.rs`) — and, when armed, emits a single grep-friendly
+//! `TRANSPORT_WATCH:` line per resolution/connect so we can answer one question:
+//!
+//!   Does the FIFA 23 client attempt ANY Blaze-flavored transport activity across a
+//!   full menu+FUT session, or none at all?
+//!
+//! Everything here is READ-ONLY: we parse the hostname / sockaddr the game passed
+//! only to describe it in the log. We never change a resolution result or a
+//! connection target — that redirect logic lives in the detours themselves and is
+//! untouched. The env kill switch `OPENFUT_TRANSPORT_WATCH=1` gates all output;
+//! disarmed (default) this module is inert (each entry point returns immediately).
+//!
+//! Future-reference note (beyond-beginner, deliberately NOT done here): a
+//! types-first design would model a `ConnectTarget` enum (Inet{ip,port} / NonInet /
+//! Short) and a `TransportEvent` and route them through the `tracing` crate with
+//! structured fields, instead of hand-formatting strings into a flat log file. That
+//! buys machine-parseable logs and log levels. For a one-shot observation gate,
+//! flat `write_log` lines that `grep` cleanly are the lower-ceremony choice.
+
+use core::sync::atomic::{AtomicBool, Ordering};
+
+/// Armed once at DLL load from `OPENFUT_TRANSPORT_WATCH`. `AtomicBool` (not a plain
+/// `static mut bool`) because the detours that read it run on arbitrary game threads;
+/// an atomic gives race-free reads with no `unsafe`. `Relaxed` is enough — this is a
+/// standalone flag with no ordering relationship to other memory.
+static ARMED: AtomicBool = AtomicBool::new(false);
+
+/// Read the env var once, at DLL load, and log the arm state. Called from `DllMain`
+/// (`install_hooks`). Reading the env in-process (rather than as a command prefix) is
+/// what makes the switch actually propagate through the umu/Proton launch — the same
+/// gotcha the probe switches hit; it works because the launch script `export`s it.
+pub fn arm_from_env() {
+    let on = std::env::var("OPENFUT_TRANSPORT_WATCH")
+        .map(|v| v == "1")
+        .unwrap_or(false);
+    ARMED.store(on, Ordering::Relaxed);
+    crate::write_log(&format!(
+        "TRANSPORT_WATCH: {} (env OPENFUT_TRANSPORT_WATCH)\n",
+        if on { "ARMED" } else { "disarmed" }
+    ));
+}
+
+fn armed() -> bool {
+    ARMED.load(Ordering::Relaxed)
+}
+
+/// True if `host` looks like EA/Blaze infrastructure. Broad on purpose: this is a log
+/// classifier that makes a hit visually pop (`<-- BLAZE/EA-FLAVORED`), NOT a routing
+/// decision. The actual redirect decision stays in `hooks::is_ea_host`, which is
+/// deliberately narrower and unchanged.
+fn is_blaze_flavored(host: &str) -> bool {
+    let h = host.to_ascii_lowercase();
+    [
+        "redirector",
+        "gosredirector",
+        "blaze",
+        "gosca",
+        "easfc",
+        "utas",
+        "fut",
+        "ea.com",
+        "easports",
+    ]
+    .iter()
+    .any(|k| h.contains(k))
+}
+
+/// Log one getaddrinfo hostname. Self-gates on the arm flag, so the call site can be
+/// unconditional. The existing `openfut_hook: getaddrinfo(...)` line stays; this adds
+/// the tagged, classified line so `grep TRANSPORT_WATCH` sees the full resolution set
+/// and a Blaze host stands out.
+pub fn note_getaddrinfo(host: &str) {
+    if !armed() {
+        return;
+    }
+    let tag = if is_blaze_flavored(host) {
+        "  <-- BLAZE/EA-FLAVORED"
+    } else {
+        ""
+    };
+    crate::write_log(&format!(
+        "TRANSPORT_WATCH: getaddrinfo host=\"{host}\"{tag}\n"
+    ));
+}
+
+const AF_INET: u16 = 2; // IPv4
+const AF_INET6: u16 = 23; // IPv6 (Windows value; Linux uses 10 — we're in Wine/Win ABI)
+
+/// Minimal view of a `sockaddr_in`; the first `u16` is the address family for ANY
+/// sockaddr, so reading this layout is safe enough to classify the family even when
+/// the real struct is a `sockaddr_un` or larger — we only trust the rest once we've
+/// confirmed `sin_family == AF_INET`.
+#[repr(C)]
+struct SockaddrIn {
+    sin_family: u16,
+    sin_port: u16,
+    sin_addr: u32,
+    sin_zero: [u8; 8],
+}
+
+/// Minimal view of a `sockaddr_in6` (Win32 layout). `sin6_port` is network byte order;
+/// `sin6_addr` is the 16 raw address bytes in network order. We ignore flowinfo/scope.
+#[repr(C)]
+struct SockaddrIn6 {
+    sin6_family: u16,
+    sin6_port: u16,
+    sin6_flowinfo: u32,
+    sin6_addr: [u8; 16],
+    sin6_scope_id: u32,
+}
+
+/// Is `port` a known/suspected Blaze port? SHAPE — public general knowledge; the exact
+/// port for FIFA23's Blaze version is UNKNOWN. 42127 main, 10041/10744 redirector
+/// variants, 3659 classic redirector.
+fn is_blaze_port(port: u16) -> bool {
+    matches!(port, 42127 | 10744 | 3659 | 10041)
+}
+
+/// Log one outbound connect attempt. `api` names the call path (`connect` /
+/// `WSAConnect` / `ConnectEx`) so we can tell which Winsock entry the client used.
+///
+/// SAFETY: `name` must point to at least `namelen` readable bytes — it's the sockaddr
+/// the game just handed to a Winsock connect API, so that always holds at the call
+/// sites. We read it read-only and never write through it. `s` is the socket handle,
+/// used only to query `SO_TYPE` (TCP=1 / UDP=2) so a real Blaze TCP dial is
+/// distinguishable from UDP game/voice traffic.
+pub unsafe fn note_connect(api: &str, name: *const u8, namelen: i32, s: usize) {
+    if !armed() {
+        return;
+    }
+    if name.is_null() || namelen < 8 {
+        crate::write_log(&format!(
+            "TRANSPORT_WATCH: {api} (no/short sockaddr, namelen={namelen})\n"
+        ));
+        return;
+    }
+    // SAFE: name is non-null and >= 8 bytes (checked above); the first u16 is the
+    // address family for ANY sockaddr, so reading it is valid regardless of the real
+    // struct type. We only trust family-specific fields after matching the family.
+    let family = *(name as *const u16);
+
+    // SAFE: getsockopt is a read-only Winsock query on a valid socket handle; a bad
+    // handle just leaves ty=-1, which we log verbatim. TCP=1 / UDP=2.
+    let sock_type = {
+        use windows_sys::Win32::Networking::WinSock::{getsockopt, SOL_SOCKET, SO_TYPE};
+        let mut ty: i32 = -1;
+        let mut len: i32 = 4;
+        getsockopt(
+            s,
+            SOL_SOCKET,
+            SO_TYPE,
+            &mut ty as *mut i32 as *mut u8,
+            &mut len,
+        );
+        ty
+    };
+
+    match family {
+        AF_INET => {
+            // SAFE: family is AF_INET and namelen >= 8 == sizeof(sockaddr_in) fields we read.
+            let sa = &*(name as *const SockaddrIn);
+            // sin_addr holds the address in NETWORK byte order; on little-endian x86,
+            // to_le_bytes reproduces those 4 bytes in memory order, which IS the dotted
+            // quad. So b[0].b[1].b[2].b[3] is correct. (The legacy connect_hook log line
+            // prints these reversed — a cosmetic bug there; this M0 line is the correct
+            // one to trust.)
+            let b = sa.sin_addr.to_le_bytes();
+            let port = u16::from_be(sa.sin_port);
+            let is_loopback = b[0] == 127;
+            let is_lsx = matches!(port, 3216 | 3217); // known-good LSX channel; not Blaze
+            let mut tag = String::new();
+            if is_blaze_port(port) {
+                tag.push_str("  <-- BLAZE-PORT");
+            }
+            // A loopback connect on anything other than LSX is the situation-(a) signal.
+            if is_loopback && !is_lsx {
+                tag.push_str("  <-- LOOPBACK non-LSX");
+            }
+            crate::write_log(&format!(
+                "TRANSPORT_WATCH: {api} target={}.{}.{}.{}:{port} sock_type={sock_type}{tag}\n",
+                b[0], b[1], b[2], b[3]
+            ));
+        }
+        AF_INET6 => {
+            if namelen < 28 {
+                crate::write_log(&format!(
+                    "TRANSPORT_WATCH: {api} family=INET6 (short sockaddr, namelen={namelen})\n"
+                ));
+                return;
+            }
+            // SAFE: family is AF_INET6 and namelen >= 28 == sizeof(sockaddr_in6).
+            let sa = &*(name as *const SockaddrIn6);
+            let a = sa.sin6_addr; // 16 bytes, network order
+            let port = u16::from_be(sa.sin6_port);
+            // Format as 8 colon-separated hex groups (not compressed — clarity over
+            // brevity for a log meant to be grepped).
+            let hex = (0..8)
+                .map(|i| format!("{:02x}{:02x}", a[i * 2], a[i * 2 + 1]))
+                .collect::<Vec<_>>()
+                .join(":");
+            // ::1 = loopback: first 15 bytes zero, last byte 1.
+            let is_loopback = a[..15].iter().all(|&x| x == 0) && a[15] == 1;
+            let mut tag = String::new();
+            if is_blaze_port(port) {
+                tag.push_str("  <-- BLAZE-PORT");
+            }
+            if is_loopback {
+                tag.push_str("  <-- IPv6 LOOPBACK (::1)");
+            }
+            crate::write_log(&format!(
+                "TRANSPORT_WATCH: {api} target=[{hex}]:{port} sock_type={sock_type} (IPv6){tag}\n"
+            ));
+        }
+        other => {
+            // AF_UNIX=1 or anything else — where a named-pipe/unix-socket-style local
+            // Blaze transport would surface.
+            crate::write_log(&format!(
+                "TRANSPORT_WATCH: {api} family={other} (non-INET — possible AF_UNIX/pipe-like)\n"
+            ));
+        }
+    }
+}

openfut-hook/src/version_proxy.rs

@@ -0,0 +1,117 @@
+//! Transparent forwarding for the system `version.dll` API.
+//!
+//! The hook is deployed under the `version.dll` filename, so every VERSION API
+//! import must continue to behave exactly as it would without OpenFUT.  Resolve
+//! the genuine system DLL once during process attach, then tail-jump from each
+//! exported stub.  A tail jump preserves the caller's complete Windows x64 ABI
+//! state, including stack arguments whose signatures differ between exports.
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use windows_sys::Win32::System::LibraryLoader::{GetProcAddress, LoadLibraryW};
+
+const EXPORT_COUNT: usize = 16;
+
+/// Keep this list in the same order as the generated stubs below.
+const EXPORTS: [&[u8]; EXPORT_COUNT] = [
+    b"GetFileVersionInfoA\0",
+    b"GetFileVersionInfoExA\0",
+    b"GetFileVersionInfoExW\0",
+    b"GetFileVersionInfoSizeA\0",
+    b"GetFileVersionInfoSizeExA\0",
+    b"GetFileVersionInfoSizeExW\0",
+    b"GetFileVersionInfoSizeW\0",
+    b"GetFileVersionInfoW\0",
+    b"VerFindFileA\0",
+    b"VerFindFileW\0",
+    b"VerInstallFileA\0",
+    b"VerInstallFileW\0",
+    b"VerLanguageNameA\0",
+    b"VerLanguageNameW\0",
+    b"VerQueryValueA\0",
+    b"VerQueryValueW\0",
+];
+
+/// Addresses in the genuine system DLL. Atomic storage gives the assembly
+/// stubs stable, directly addressable pointer-sized slots without `static mut`.
+static REAL: [AtomicUsize; EXPORT_COUNT] = [const { AtomicUsize::new(0) }; EXPORT_COUNT];
+
+macro_rules! proxy_stub {
+    ($index:literal, $name:ident) => {
+        #[unsafe(no_mangle)]
+        #[unsafe(naked)]
+        pub unsafe extern "system" fn $name() {
+            core::arch::naked_asm!(
+                "jmp qword ptr [rip + {base} + {offset}]",
+                base = sym REAL,
+                offset = const $index * size_of::<usize>(),
+            );
+        }
+    };
+}
+
+proxy_stub!(0, GetFileVersionInfoA);
+proxy_stub!(1, GetFileVersionInfoExA);
+proxy_stub!(2, GetFileVersionInfoExW);
+proxy_stub!(3, GetFileVersionInfoSizeA);
+proxy_stub!(4, GetFileVersionInfoSizeExA);
+proxy_stub!(5, GetFileVersionInfoSizeExW);
+proxy_stub!(6, GetFileVersionInfoSizeW);
+proxy_stub!(7, GetFileVersionInfoW);
+proxy_stub!(8, VerFindFileA);
+proxy_stub!(9, VerFindFileW);
+proxy_stub!(10, VerInstallFileA);
+proxy_stub!(11, VerInstallFileW);
+proxy_stub!(12, VerLanguageNameA);
+proxy_stub!(13, VerLanguageNameW);
+proxy_stub!(14, VerQueryValueA);
+proxy_stub!(15, VerQueryValueW);
+
+/// Resolve forwarding targets before returning from `DLL_PROCESS_ATTACH`.
+/// Calls into our exports may happen as soon as the loader releases its lock,
+/// so deferring this operation to the hook worker would create a race.
+pub(crate) unsafe fn resolve() -> bool {
+    // Loading by absolute path prevents this proxy from recursively loading
+    // itself. Proton/Wine exposes the Windows system directory at this path.
+    let path: Vec<u16> = "C:\\Windows\\System32\\version.dll\0"
+        .encode_utf16()
+        .collect();
+    let module = LoadLibraryW(path.as_ptr());
+    if module.is_null() {
+        crate::write_log("version_proxy: FATAL: system version.dll load failed\n");
+        return false;
+    }
+
+    let mut missing = 0;
+    for (slot, name) in REAL.iter().zip(EXPORTS) {
+        let address = GetProcAddress(module, name.as_ptr()).map_or(0, |proc| proc as usize);
+        slot.store(address, Ordering::Release);
+        if address == 0 {
+            missing += 1;
+        }
+    }
+
+    if missing == 0 {
+        crate::write_log("version_proxy: forwarded all 16 exports\n");
+        true
+    } else {
+        crate::write_log(&format!(
+            "version_proxy: FATAL: {missing}/16 system exports missing\n"
+        ));
+        false
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn export_table_is_complete_and_nul_terminated() {
+        assert_eq!(EXPORTS.len(), EXPORT_COUNT);
+        assert!(EXPORTS.iter().all(|name| name.last() == Some(&0)));
+        assert!(EXPORTS
+            .iter()
+            .all(|name| !name[..name.len() - 1].contains(&0)));
+    }
+}

openfut-hook/version.def

@@ -0,0 +1,18 @@
+LIBRARY version
+EXPORTS
+    GetFileVersionInfoA
+    GetFileVersionInfoExA
+    GetFileVersionInfoExW
+    GetFileVersionInfoSizeA
+    GetFileVersionInfoSizeExA
+    GetFileVersionInfoSizeExW
+    GetFileVersionInfoSizeW
+    GetFileVersionInfoW
+    VerFindFileA
+    VerFindFileW
+    VerInstallFileA
+    VerInstallFileW
+    VerLanguageNameA
+    VerLanguageNameW
+    VerQueryValueA
+    VerQueryValueW

src/account_monitor.rs

@@ -0,0 +1,123 @@
+//! Read-only background polling of the OpenFUT account summary.
+//!
+//! The launcher already POSTs `/openfut/account/sync` once at launch time
+//! (see [`crate::account_sync::sync`]) to select the active profile. This
+//! module reuses that request in a background thread so the Dashboard can show
+//! a live "Your Club" card — coins, level, packs — without ever blocking the UI
+//! thread on the network. It mirrors [`crate::health::HealthMonitor`]: a shared
+//! target the UI re-points when the server config changes, and a shared state
+//! snapshot the UI renders each frame.
+
+use parking_lot::Mutex;
+use std::{
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+    thread,
+    time::{Duration, Instant},
+};
+
+use crate::account_sync::{self, AccountSummary};
+use crate::config::LauncherConfig;
+
+const POLL_INTERVAL: Duration = Duration::from_secs(5);
+
+/// A snapshot of the last account fetch, rendered by the dashboard.
+#[derive(Clone, Default)]
+pub struct AccountState {
+    /// The most recently fetched summary, or None while none has succeeded.
+    pub summary: Option<AccountSummary>,
+    /// The error from the latest failed attempt (cleared on success).
+    pub error: Option<String>,
+    /// Whether a server target is currently configured. `false` = idle: the
+    /// launcher has nothing to poll, so the UI shows the "connect" prompt.
+    pub configured: bool,
+    pub last_checked: Option<Instant>,
+}
+
+impl AccountState {
+    /// True when the latest error looks like a connectivity failure (server
+    /// down / unresolvable) rather than a protocol/validation error. Lets the
+    /// UI show the calm "offline" prompt for the common "server not up" case
+    /// and reserve the loud error state for genuinely broken responses.
+    pub fn unreachable(&self) -> bool {
+        self.error.as_deref().is_some_and(|e| {
+            e.contains("cannot connect")
+                || e.contains("cannot resolve")
+                || e.contains("resolved to no addresses")
+        })
+    }
+}
+
+/// Background poller. Holds a shared target config the UI can update when the
+/// user changes the server address/account, and a shared state the UI reads.
+pub struct AccountMonitor {
+    pub state: Arc<Mutex<AccountState>>,
+    target: Arc<Mutex<Option<LauncherConfig>>>,
+    running: Arc<AtomicBool>,
+}
+
+impl AccountMonitor {
+    pub fn new() -> Self {
+        let state = Arc::new(Mutex::new(AccountState::default()));
+        let target: Arc<Mutex<Option<LauncherConfig>>> = Arc::new(Mutex::new(None));
+        let running = Arc::new(AtomicBool::new(true));
+
+        let t_state = Arc::clone(&state);
+        let t_target = Arc::clone(&target);
+        let t_running = Arc::clone(&running);
+        thread::spawn(move || {
+            while t_running.load(Ordering::Relaxed) {
+                let target = t_target.lock().clone();
+                match target {
+                    None => {
+                        // No server configured — reset to the idle prompt state.
+                        *t_state.lock() = AccountState::default();
+                    }
+                    Some(config) => {
+                        let result = account_sync::sync(&config);
+                        let mut state = t_state.lock();
+                        state.configured = true;
+                        state.last_checked = Some(Instant::now());
+                        match result {
+                            Ok(summary) => {
+                                state.summary = Some(summary);
+                                state.error = None;
+                            }
+                            Err(error) => {
+                                // Drop the stale summary so the card never shows
+                                // populated data alongside an error/offline pill.
+                                state.summary = None;
+                                state.error = Some(error);
+                            }
+                        }
+                    }
+                }
+                thread::sleep(POLL_INTERVAL);
+            }
+        });
+
+        Self {
+            state,
+            target,
+            running,
+        }
+    }
+
+    /// Point the monitor at a new server/account. `None` (no server configured)
+    /// puts it back into the idle prompt state.
+    pub fn set_target(&self, target: Option<LauncherConfig>) {
+        *self.target.lock() = target;
+    }
+
+    pub fn snapshot(&self) -> AccountState {
+        self.state.lock().clone()
+    }
+}
+
+impl Drop for AccountMonitor {
+    fn drop(&mut self) {
+        self.running.store(false, Ordering::Relaxed);
+    }
+}

src/account_sync.rs

@@ -7,11 +7,18 @@ use std::time::Duration;
 const ACCOUNT_SYNC_PATH: &str = "/openfut/account/sync";
 const TIMEOUT: Duration = Duration::from_secs(3);
 
+/// The launcher's view of the account, sent on every sync.
+///
+/// `persona_id`/`persona_name` are `Option` because omitting them is meaningful:
+/// the server then answers with the persona *it* is configured for, which is how
+/// first-run account creation learns an identity instead of inventing one.
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 struct AccountSyncRequest<'a> {
-    persona_id: u64,
-    persona_name: &'a str,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    persona_id: Option<u64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    persona_name: Option<&'a str>,
     level: u32,
     experience: u32,
     experience_max: u32,
@@ -24,14 +31,25 @@ pub struct AccountSyncResult {
     pub account: AccountSummary,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AccountSummary {
     pub persona_id: u64,
     pub persona_name: String,
+    /// Club identity for the account bar. Optional in older envelopes.
+    #[serde(default)]
+    pub club_name: String,
+    #[serde(default)]
+    pub club_abbr: String,
     pub level: u32,
     pub experience: u32,
+    /// XP required for the next level. Optional; 0 means "unknown".
+    #[serde(default)]
+    pub experience_max: u32,
     pub account_funds: u32,
+    /// EASFC funds ceiling. Optional; 0 means "unknown".
+    #[serde(default)]
+    pub account_funds_cap: u32,
     pub coins: i64,
     pub unopened_packs: usize,
 }
@@ -43,7 +61,64 @@ pub struct AccountSummary {
 pub fn sync(config: &LauncherConfig) -> Result<AccountSummary, String> {
     config.validate_server()?;
     config.validate_account()?;
+    let account = post(
+        config,
+        &AccountSyncRequest {
+            persona_id: Some(config.fut_persona_id),
+            persona_name: Some(config.fut_persona_name.trim()),
+            level: config.fut_account_level,
+            experience: config.fut_account_experience,
+            experience_max: config.fut_account_experience_max,
+            account_funds: config.fut_account_funds,
+            account_funds_cap: config.fut_account_funds_cap,
+        },
+    )?;
+    // The server echoes the persona it selected. A different one means the two
+    // sides disagree about who is playing, which must never pass silently.
+    if account.persona_id != config.fut_persona_id {
+        return Err(format!(
+            "account server selected persona {} instead of {}",
+            account.persona_id, config.fut_persona_id
+        ));
+    }
+    Ok(account)
+}
 
+/// Ask the server which account it serves, for first-run account creation.
+///
+/// Sending no persona makes the server fall back to the one it was started with
+/// and answer with its real club and Core coin balance. That is the whole reason
+/// the launcher never has to invent a persona id: the identity that matters is
+/// the server's, and this is how it is claimed.
+pub fn discover(config: &LauncherConfig) -> Result<AccountSummary, String> {
+    config.validate_server()?;
+    let account = post(
+        config,
+        &AccountSyncRequest {
+            persona_id: None,
+            persona_name: None,
+            level: config.fut_account_level.max(1),
+            experience: config.fut_account_experience,
+            experience_max: config.fut_account_experience_max.max(1),
+            account_funds: config.fut_account_funds,
+            account_funds_cap: config.fut_account_funds_cap,
+        },
+    )?;
+    if account.persona_id == 0 {
+        return Err(
+            "account server returned no persona — is it configured with \
+                    a persona id?"
+                .to_string(),
+        );
+    }
+    if account.persona_name.trim().is_empty() {
+        return Err("account server returned an empty persona name".to_string());
+    }
+    Ok(account)
+}
+
+/// One bounded POST to `/openfut/account/sync`, returning the account summary.
+fn post(config: &LauncherConfig, body: &AccountSyncRequest<'_>) -> Result<AccountSummary, String> {
     let host = config.openfut_server_host.trim();
     let port = config.openfut_account_sync_port;
     let address = (host, port)
@@ -60,16 +135,8 @@ pub fn sync(config: &LauncherConfig) -> Result<AccountSummary, String> {
         .set_write_timeout(Some(TIMEOUT))
         .map_err(|error| format!("cannot set account sync timeout: {error}"))?;
 
-    let payload = serde_json::to_vec(&AccountSyncRequest {
-        persona_id: config.fut_persona_id,
-        persona_name: config.fut_persona_name.trim(),
-        level: config.fut_account_level,
-        experience: config.fut_account_experience,
-        experience_max: config.fut_account_experience_max,
-        account_funds: config.fut_account_funds,
-        account_funds_cap: config.fut_account_funds_cap,
-    })
-    .map_err(|error| format!("cannot encode account sync request: {error}"))?;
+    let payload = serde_json::to_vec(body)
+        .map_err(|error| format!("cannot encode account sync request: {error}"))?;
 
     let request = format!(
         "POST {ACCOUNT_SYNC_PATH} HTTP/1.1\r\nHost: {host}:{port}\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
@@ -96,21 +163,15 @@ pub fn sync(config: &LauncherConfig) -> Result<AccountSummary, String> {
         .and_then(|line| line.split_whitespace().nth(1))
         .and_then(|value| value.parse::<u16>().ok())
         .ok_or_else(|| "account server returned a malformed status line".to_string())?;
-    let body = &response[separator + 4..];
+    let response_body = &response[separator + 4..];
     if !(200..300).contains(&status) {
-        let detail = String::from_utf8_lossy(body);
+        let detail = String::from_utf8_lossy(response_body);
         return Err(format!(
             "account server rejected sync (HTTP {status}): {detail}"
         ));
     }
-    let envelope: AccountSyncResult = serde_json::from_slice(body)
+    let envelope: AccountSyncResult = serde_json::from_slice(response_body)
         .map_err(|error| format!("account server returned invalid JSON: {error}"))?;
-    if envelope.account.persona_id != config.fut_persona_id {
-        return Err(format!(
-            "account server selected persona {} instead of {}",
-            envelope.account.persona_id, config.fut_persona_id
-        ));
-    }
     Ok(envelope.account)
 }
 
@@ -174,4 +235,108 @@ mod tests {
         assert_eq!(selected.unopened_packs, 1);
         server.join().unwrap();
     }
+
+    /// Serve exactly one `/openfut/account/sync` POST, handing the decoded
+    /// request text to `inspect` and replying with `body`.
+    fn serve_once(
+        inspect: impl FnOnce(&str) + Send + 'static,
+        body: &'static str,
+    ) -> (u16, thread::JoinHandle<()>) {
+        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+        let port = listener.local_addr().unwrap().port();
+        let handle = thread::spawn(move || {
+            let (mut socket, _) = listener.accept().unwrap();
+            let mut request = Vec::new();
+            loop {
+                let mut chunk = [0; 1024];
+                let count = socket.read(&mut chunk).unwrap();
+                assert!(count > 0);
+                request.extend_from_slice(&chunk[..count]);
+                if let Some(separator) = request.windows(4).position(|w| w == b"\r\n\r\n") {
+                    let headers = String::from_utf8_lossy(&request[..separator]);
+                    let length = headers
+                        .lines()
+                        .find_map(|line| line.strip_prefix("Content-Length: "))
+                        .unwrap()
+                        .parse::<usize>()
+                        .unwrap();
+                    if request.len() >= separator + 4 + length {
+                        break;
+                    }
+                }
+            }
+            inspect(&String::from_utf8_lossy(&request));
+            write!(
+                socket,
+                "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
+                body.len(),
+                body
+            )
+            .unwrap();
+        });
+        (port, handle)
+    }
+
+    #[test]
+    fn discover_omits_the_persona_so_the_server_names_its_own() {
+        // The point of first-run discovery: the launcher must not send a guessed
+        // persona, because the server would echo the guess straight back.
+        let (port, server) = serve_once(
+            |request| {
+                assert!(!request.contains("personaId"), "{request}");
+                assert!(!request.contains("personaName"), "{request}");
+            },
+            r#"{"status":"OK","account":{"personaId":33068179,"personaName":"CAGE","clubName":"OpenFUT","clubAbbr":"OFC","level":1,"experience":0,"accountFunds":0,"coins":29876776,"unopenedPacks":0}}"#,
+        );
+        let config = LauncherConfig {
+            openfut_server_host: "127.0.0.1".into(),
+            openfut_account_sync_port: port,
+            ..LauncherConfig::default()
+        };
+        // Deliberately an unconfigured account: discovery must work before one
+        // exists, which is the whole reason it does not call `validate_account`.
+        assert_eq!(config.fut_persona_id, 0);
+        let found = discover(&config).unwrap();
+        assert_eq!(found.persona_id, 33_068_179);
+        assert_eq!(found.persona_name, "CAGE");
+        assert_eq!(found.club_name, "OpenFUT");
+        assert_eq!(found.coins, 29_876_776);
+        server.join().unwrap();
+    }
+
+    #[test]
+    fn discover_rejects_a_server_that_names_no_persona() {
+        // A zero persona would otherwise be written into the config as a real
+        // account and fail much later, at launch, as a mismatch.
+        let (port, server) = serve_once(
+            |_| {},
+            r#"{"status":"OK","account":{"personaId":0,"personaName":"","level":1,"experience":0,"accountFunds":0,"coins":0,"unopenedPacks":0}}"#,
+        );
+        let config = LauncherConfig {
+            openfut_server_host: "127.0.0.1".into(),
+            openfut_account_sync_port: port,
+            ..LauncherConfig::default()
+        };
+        let error = discover(&config).unwrap_err();
+        assert!(error.contains("no persona"), "{error}");
+        server.join().unwrap();
+    }
+
+    #[test]
+    fn sync_refuses_a_server_that_selects_a_different_persona() {
+        let (port, server) = serve_once(
+            |_| {},
+            r#"{"status":"OK","account":{"personaId":999,"personaName":"OTHER","level":1,"experience":0,"accountFunds":0,"coins":0,"unopenedPacks":0}}"#,
+        );
+        let config = LauncherConfig {
+            openfut_server_host: "127.0.0.1".into(),
+            openfut_account_sync_port: port,
+            fut_persona_id: 12345678,
+            fut_persona_name: "TEST_USER".into(),
+            ..LauncherConfig::default()
+        };
+        let error = sync(&config).unwrap_err();
+        assert!(error.contains("999"), "{error}");
+        server.join().unwrap();
+    }
 }

src/arm.rs

@@ -106,14 +106,16 @@ pub(crate) fn arming_summary(
 pub fn arm(cfg: &LauncherConfig) -> anyhow::Result<Vec<String>> {
     let server = cfg.openfut_server_host.trim();
     if server.is_empty() {
-        anyhow::bail!("Set the OpenFUT server host in the Config tab before arming.");
+        anyhow::bail!("Set the OpenFUT server host in Settings before arming.");
     }
     let ea_ip = cfg.ea_redirect_probe_ip.trim();
     if ea_ip.is_empty() {
-        anyhow::bail!("Set the EA redirector IP (Config tab) before arming.");
+        anyhow::bail!("Set the EA redirector IP (Settings) before arming.");
     }
     if cfg.ea_hostnames.is_empty() {
-        anyhow::bail!("Add at least one EA hostname (e.g. easw.easports.com) in the Config tab before arming.");
+        anyhow::bail!(
+            "Add at least one EA hostname (e.g. easw.easports.com) in Settings before arming."
+        );
     }
     let redirector_port = cfg.openfut_blaze_redirector_port;
     let script = arming_script(server, redirector_port, ea_ip, &cfg.ea_hostnames)?;

src/config.rs

@@ -318,6 +318,17 @@ impl LauncherConfig {
         }
     }
 
+    /// The config the account monitor should poll with, or None when no server
+    /// is configured. Returns a clone so the background thread owns its own
+    /// snapshot and never races the UI's live config.
+    pub fn account_target(&self) -> Option<LauncherConfig> {
+        if self.openfut_server_host.trim().is_empty() {
+            None
+        } else {
+            Some(self.clone())
+        }
+    }
+
     /// Build the shared [`ServerConfig`] from the launcher's configured server
     /// host + destination ports. This is the single place the launcher turns UI
     /// fields into the canonical config consumed by the hook.
@@ -348,10 +359,10 @@ impl LauncherConfig {
     /// this ensures required user configuration is never silently invented.
     pub fn validate_local_services(&self) -> Result<(), String> {
         if self.fifa17_tools_dir.trim().is_empty() {
-            return Err("No FIFA 17 tools dir configured. Set it in the Config tab.".into());
+            return Err("No FIFA 17 tools dir configured. Set it in Settings.".into());
         }
         if self.fifa17_python.trim().is_empty() {
-            return Err("No Python interpreter configured. Set it in the Config tab.".into());
+            return Err("No Python interpreter configured. Set it in Settings.".into());
         }
         Ok(())
     }
@@ -369,7 +380,7 @@ impl LauncherConfig {
         } else if self.game_launch_command.trim().is_empty() {
             return Err(
                 "No game configured. Fill in the game profile, or set a launch command, \
-                 in the Config tab."
+                 in Settings."
                     .into(),
             );
         }
@@ -378,10 +389,10 @@ impl LauncherConfig {
 
     pub fn validate_account(&self) -> Result<(), String> {
         if self.fut_persona_id == 0 {
-            return Err("No EA persona ID configured. Set the account in the Config tab.".into());
+            return Err("No account yet. Create one from the Get started tab.".into());
         }
         if self.fut_persona_name.trim().is_empty() {
-            return Err("No EA persona name configured. Set the account in the Config tab.".into());
+            return Err("Account has no persona name. Recreate it from Get started.".into());
         }
         if self.fut_account_level == 0 {
             return Err("EA account level must be at least 1.".into());
@@ -397,6 +408,21 @@ impl LauncherConfig {
         Ok(())
     }
 
+    /// Whether an account has been claimed from the server (see
+    /// [`crate::account_sync::discover`]). Distinct from
+    /// [`Self::validate_account`], which also polices the derived EASFC values:
+    /// this answers only "does this install know who is playing?".
+    pub fn account_configured(&self) -> bool {
+        self.fut_persona_id != 0 && !self.fut_persona_name.trim().is_empty()
+    }
+
+    /// Whether the launcher should open on the guided first-run flow instead of
+    /// the dashboard. Keyed on the two things a new user cannot be expected to
+    /// guess: where the server is, and who they are.
+    pub fn needs_onboarding(&self) -> bool {
+        self.validate_server().is_err() || !self.account_configured()
+    }
+
     /// The exact `openfut.cfg` bytes to write for the hook, or an error if the
     /// server isn't validly configured (never emits a loopback fallback).
     ///
@@ -685,12 +711,38 @@ mod tests {
     #[test]
     fn launch_requires_a_valid_ea_account() {
         let mut c = LauncherConfig::default();
-        assert!(c.validate_account().unwrap_err().contains("persona ID"));
+        // A fresh install has no account, and must say so rather than launching
+        // FIFA as persona 0.
+        assert!(!c.account_configured());
+        assert!(c.validate_account().is_err());
         c.fut_persona_id = 12345678;
+        assert!(
+            !c.account_configured(),
+            "an id without a name is not an account"
+        );
         assert!(c.validate_account().unwrap_err().contains("persona name"));
         c.fut_persona_name = "TEST_USER".into();
+        assert!(c.account_configured());
         assert!(c.validate_account().is_ok());
         c.fut_account_experience = 1001;
         assert!(c.validate_account().unwrap_err().contains("XP"));
     }
+
+    #[test]
+    fn onboarding_is_needed_until_both_server_and_account_are_known() {
+        // Drives which tab the launcher opens on, so the two halves must both
+        // count: a server with no account is still a dead end for a new user.
+        let mut c = LauncherConfig::default();
+        assert!(c.needs_onboarding());
+        c.openfut_server_host = "10.10.0.120".into();
+        assert!(
+            c.needs_onboarding(),
+            "a server alone cannot launch anything"
+        );
+        c.fut_persona_id = 33_068_179;
+        c.fut_persona_name = "CAGE".into();
+        assert!(!c.needs_onboarding());
+        c.openfut_server_host.clear();
+        assert!(c.needs_onboarding(), "losing the server reopens the flow");
+    }
 }

src/game_launch.rs

@@ -23,10 +23,11 @@
 //! `game_launch_command` remains as an escape hatch: an unconfigured profile
 //! falls back to it, so an existing working setup cannot be broken by upgrading.
 
+use parking_lot::Mutex;
 use std::io::{BufRead, BufReader};
 use std::path::{Path, PathBuf};
 use std::process::{Child, Command, Stdio};
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use crate::config::GameProfile;
@@ -35,7 +36,7 @@ use crate::logs::LogBuffer;
 type Log = Arc<Mutex<LogBuffer>>;
 
 fn say(log: &Log, msg: impl Into<String>) {
-    log.lock().unwrap().push(msg.into());
+    log.lock().push(msg.into());
 }
 
 /// Prepare the prefix, satisfy the licence precondition, and start the game.
@@ -226,7 +227,7 @@ pub fn stream(mut child: Child, log: Log, exit_msg: &'static str) {
         let buf = Arc::clone(&log);
         std::thread::spawn(move || {
             for line in BufReader::new(out).lines().map_while(Result::ok) {
-                buf.lock().unwrap().push(line);
+                buf.lock().push(line);
             }
         });
     }
@@ -234,13 +235,13 @@ pub fn stream(mut child: Child, log: Log, exit_msg: &'static str) {
         let buf = Arc::clone(&log);
         std::thread::spawn(move || {
             for line in BufReader::new(err).lines().map_while(Result::ok) {
-                buf.lock().unwrap().push(line);
+                buf.lock().push(line);
             }
         });
     }
     std::thread::spawn(move || {
         let _ = child.wait();
-        log.lock().unwrap().push(exit_msg.to_string());
+        log.lock().push(exit_msg.to_string());
     });
 }
 

src/health.rs

@@ -6,11 +6,12 @@
 //! stops, or assumes anything about how the server is hosted; it only asks
 //! "can the FIFA client reach it right now?".
 
+use parking_lot::Mutex;
 use std::{
     net::{TcpStream, ToSocketAddrs},
     sync::{
         atomic::{AtomicBool, Ordering},
-        Arc, Mutex,
+        Arc,
     },
     thread,
     time::{Duration, Instant},
@@ -57,14 +58,14 @@ impl HealthMonitor {
         let t_running = Arc::clone(&running);
         thread::spawn(move || {
             while t_running.load(Ordering::Relaxed) {
-                let target = t_target.lock().unwrap().clone();
+                let target = t_target.lock().clone();
                 match target {
                     None => {
-                        *t_state.lock().unwrap() = HealthState::default();
+                        *t_state.lock() = HealthState::default();
                     }
                     Some((host, port)) => {
                         let snapshot = probe(&host, port);
-                        *t_state.lock().unwrap() = snapshot;
+                        *t_state.lock() = snapshot;
                     }
                 }
                 thread::sleep(POLL_INTERVAL);
@@ -81,11 +82,11 @@ impl HealthMonitor {
     /// Point the monitor at a new server address (host + bridge port). Passing
     /// None (e.g. no server configured) puts it back into the idle state.
     pub fn set_target(&self, target: Option<(String, u16)>) {
-        *self.target.lock().unwrap() = target;
+        *self.target.lock() = target;
     }
 
     pub fn snapshot(&self) -> HealthState {
-        self.state.lock().unwrap().clone()
+        self.state.lock().clone()
     }
 }
 

src/local_services.rs

@@ -13,11 +13,12 @@
 //! user after host arming sets `ptrace_scope=0`; this avoids an asynchronous
 //! Polkit prompt delaying cert patching until after FIFA's first TLS attempt.
 
+use parking_lot::Mutex;
 use std::{
     net::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpListener},
     path::Path,
     process::{Child, Command, Stdio},
-    sync::{mpsc, Arc, Mutex},
+    sync::{mpsc, Arc},
     time::{Duration, Instant},
 };
 
@@ -138,22 +139,19 @@ impl ManagedService {
         if let Some(result) = self.stopping.as_ref() {
             match result.try_recv() {
                 Ok(Ok(())) => {
-                    log.lock()
-                        .unwrap()
-                        .push(format!("[launcher] {label} stopped."));
+                    log.lock().push(format!("[launcher] {label} stopped."));
                     self.stopping = None;
                     return false;
                 }
                 Ok(Err(error)) => {
                     log.lock()
-                        .unwrap()
                         .push(format!("[launcher] failed to stop {label}: {error}"));
                     self.stopping = None;
                     return false;
                 }
                 Err(mpsc::TryRecvError::Empty) => return true,
                 Err(mpsc::TryRecvError::Disconnected) => {
-                    log.lock().unwrap().push(format!(
+                    log.lock().push(format!(
                         "[launcher] {label} stop worker exited unexpectedly."
                     ));
                     self.stopping = None;
@@ -168,7 +166,6 @@ impl ManagedService {
                 Ok(None) => true,
                 Ok(Some(status)) => {
                     log.lock()
-                        .unwrap()
                         .push(format!("[launcher] {label} exited ({status})."));
                     self.child = None;
                     false
@@ -189,9 +186,7 @@ impl ManagedService {
         }
         if let Some(mut child) = self.child.take() {
             let label = service.label();
-            log.lock()
-                .unwrap()
-                .push(format!("[launcher] stopping {label}…"));
+            log.lock().push(format!("[launcher] stopping {label}…"));
 
             self.stopping = Some(dispatch_stop_work(move || {
                 child
@@ -245,7 +240,7 @@ pub fn spawn(
     let dir = Path::new(tools_dir);
     if !dir.is_dir() {
         anyhow::bail!(
-            "FIFA 17 tools dir not found: {} (set it in the Config tab)",
+            "FIFA 17 tools dir not found: {} (set it in Settings)",
             dir.display()
         );
     }
@@ -283,7 +278,7 @@ pub fn spawn(
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
 
-    log.lock().unwrap().push(format!(
+    log.lock().push(format!(
         "[launcher] starting {label}: {} {}",
         python,
         script_path.display(),
@@ -304,7 +299,7 @@ pub fn spawn(
             let mut registered = false;
             for line in BufReader::new(out).lines().map_while(Result::ok) {
                 // Every raw line is still mirrored into the log, as before.
-                buf.lock().unwrap().push(format!("[{lbl}] {line}"));
+                buf.lock().push(format!("[{lbl}] {line}"));
 
                 let Some(wiring) = cap_wiring.as_ref() else {
                     continue;
@@ -317,9 +312,9 @@ pub fn spawn(
                 };
                 registered = true;
                 let fifa_pid = parse_fifa_pid(&line).unwrap_or(0);
-                wiring.sink.lock().unwrap().empty_mypacks_resolver = Some(version);
+                wiring.sink.lock().empty_mypacks_resolver = Some(version);
                 {
-                    let mut log = buf.lock().unwrap();
+                    let mut log = buf.lock();
                     log.push(format!(
                         "[fifa17] resolver capability verified for FIFA pid {fifa_pid}"
                     ));
@@ -336,11 +331,9 @@ pub fn spawn(
                 ) {
                     Ok(()) => buf
                         .lock()
-                        .unwrap()
                         .push("[fifa17] capability registered with backend".to_string()),
                     Err(error) => buf
                         .lock()
-                        .unwrap()
                         .push(format!("[fifa17] capability registration failed: {error}")),
                 }
             }
@@ -351,7 +344,7 @@ pub fn spawn(
         let lbl = label.to_string();
         std::thread::spawn(move || {
             for line in BufReader::new(err).lines().map_while(Result::ok) {
-                buf.lock().unwrap().push(format!("[{lbl}] {line}"));
+                buf.lock().push(format!("[{lbl}] {line}"));
             }
         });
     }
@@ -364,7 +357,6 @@ pub fn spawn(
             return Err(error);
         }
         log.lock()
-            .unwrap()
             .push("[launcher] LSX ready on 127.0.0.1:4216".to_string());
     }
 

src/main.rs

@@ -1,3 +1,4 @@
+mod account_monitor;
 mod account_sync;
 mod app;
 mod arm;
@@ -10,13 +11,16 @@ mod logs;
 mod netcheck;
 mod preflight;
 mod setup;
+mod theme;
 
 fn main() -> eframe::Result<()> {
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default()
             .with_title("OpenFUT Launcher")
-            .with_inner_size([780.0, 560.0])
-            .with_min_inner_size([600.0, 400.0]),
+            .with_app_id("openfut-launcher")
+            .with_icon(app_icon())
+            .with_inner_size([1040.0, 720.0])
+            .with_min_inner_size([880.0, 600.0]),
         ..Default::default()
     };
 
@@ -26,3 +30,88 @@ fn main() -> eframe::Result<()> {
         Box::new(|cc| Ok(Box::new(app::LauncherApp::new(cc)))),
     )
 }
+
+/// The application / taskbar icon: the same "OF" monogram the header wordmark
+/// shows, drawn white on the signature accent tile. Generated in code (no PNG
+/// dependency) at 4x supersampling and box-downsampled to a crisp 64x64 RGBA —
+/// scales cleanly to the 32x32 the WM typically renders. Colours come from the
+/// theme palette so the icon never drifts from the in-app brand.
+fn app_icon() -> egui::IconData {
+    const SIZE: usize = 64; // output edge
+    const SS: usize = 4; // supersampling factor
+
+    let accent = theme::ACCENT;
+    let fg = theme::ON_ACCENT;
+
+    // Rounded-square background: point inside the [0,SIZE]² square with corners
+    // rounded to `round_r` (transparent outside, so the icon reads as a tile).
+    let round_r = 13.0_f32;
+    let inside_bg = |x: f32, y: f32| -> bool {
+        let s = SIZE as f32;
+        let cx = x.clamp(round_r, s - round_r);
+        let cy = y.clamp(round_r, s - round_r);
+        let (dx, dy) = (x - cx, y - cy);
+        dx * dx + dy * dy <= round_r * round_r
+    };
+
+    // "O" — an elliptical ring on the left.
+    let inside_o = |x: f32, y: f32| -> bool {
+        let (cx, cy) = (21.0_f32, 32.0_f32);
+        let (dx, dy) = (x - cx, y - cy);
+        let outer = (dx / 9.0).powi(2) + (dy / 14.0).powi(2) <= 1.0;
+        let inner = (dx / 4.8).powi(2) + (dy / 9.5).powi(2) < 1.0;
+        outer && !inner
+    };
+
+    // "F" — a stem plus a top and middle bar on the right.
+    let inside_f = |x: f32, y: f32| -> bool {
+        let stem = (34.0..=39.0).contains(&x) && (18.0..=46.0).contains(&y);
+        let top = (34.0..=52.0).contains(&x) && (18.0..=23.0).contains(&y);
+        let mid = (34.0..=48.0).contains(&x) && (29.5..=34.0).contains(&y);
+        stem || top || mid
+    };
+
+    // Premultiplied-alpha accumulation per output pixel so antialiased edges
+    // (both the rounded tile and the letters) never fringe dark.
+    let mut rgba = vec![0u8; SIZE * SIZE * 4];
+    for oy in 0..SIZE {
+        for ox in 0..SIZE {
+            let (mut ar, mut ag, mut ab, mut aa) = (0.0_f32, 0.0_f32, 0.0_f32, 0.0_f32);
+            for sy in 0..SS {
+                for sx in 0..SS {
+                    let x = ox as f32 + (sx as f32 + 0.5) / SS as f32;
+                    let y = oy as f32 + (sy as f32 + 0.5) / SS as f32;
+                    let (r, g, b, a) = if inside_o(x, y) || inside_f(x, y) {
+                        (fg.r(), fg.g(), fg.b(), 255u16)
+                    } else if inside_bg(x, y) {
+                        (accent.r(), accent.g(), accent.b(), 255u16)
+                    } else {
+                        (0, 0, 0, 0)
+                    };
+                    let af = a as f32 / 255.0;
+                    ar += r as f32 * af;
+                    ag += g as f32 * af;
+                    ab += b as f32 * af;
+                    aa += af;
+                }
+            }
+            let samples = (SS * SS) as f32;
+            let idx = (oy * SIZE + ox) * 4;
+            let (r, g, b) = if aa > 0.0 {
+                (ar / aa, ag / aa, ab / aa)
+            } else {
+                (0.0, 0.0, 0.0)
+            };
+            rgba[idx] = r.round() as u8;
+            rgba[idx + 1] = g.round() as u8;
+            rgba[idx + 2] = b.round() as u8;
+            rgba[idx + 3] = (aa / samples * 255.0).round() as u8;
+        }
+    }
+
+    egui::IconData {
+        rgba,
+        width: SIZE as u32,
+        height: SIZE as u32,
+    }
+}

src/preflight.rs

@@ -92,6 +92,7 @@ pub fn run(cfg: &LauncherConfig) -> Vec<Check> {
         ea_redirect(cfg),
         hostname_mapping(cfg),
         backend_reachable(cfg),
+        hook_config(cfg),
     ]
 }
 
@@ -261,6 +262,50 @@ fn backend_reachable(cfg: &LauncherConfig) -> Check {
     }
 }
 
+/// The deployed `openfut.cfg` is the only server address the *game* can see.
+///
+/// Every panel in this launcher reads the in-memory config, so a settings change
+/// that never reached the file produces the worst possible failure: the UI shows
+/// the new server online while FIFA connects to the old one. Compare the two.
+fn hook_config(cfg: &LauncherConfig) -> Check {
+    const NAME: &str = "Hook server address";
+    let game_dir = cfg.fifa_game_dir.trim();
+    if game_dir.is_empty() {
+        return Check::skip(NAME, "no FIFA game dir configured");
+    }
+    let Some(body) = crate::setup::read_hook_config(std::path::Path::new(game_dir)) else {
+        return Check::skip(
+            NAME,
+            format!("no {} deployed yet", crate::setup::HOOK_CFG_FILE),
+        );
+    };
+    let deployed = match openfut_common::ServerConfig::parse(&body) {
+        Ok(parsed) => parsed,
+        // Unparseable means the hook cannot read it either, and nothing else in
+        // the stack recovers from that — so this one is a genuine failure.
+        Err(e) => {
+            return Check::fail(
+                NAME,
+                format!("{} is unreadable: {e}", crate::setup::HOOK_CFG_FILE),
+            )
+        }
+    };
+    let wanted = cfg.server_config();
+    if deployed == wanted {
+        return Check::pass(NAME, format!("hook redirects to {}", wanted.host));
+    }
+    // Warn, not fail: the launch path rewrites this file before starting the
+    // game, so the drift is real but already covered. Naming both addresses is
+    // what makes it actionable.
+    Check::warn(
+        NAME,
+        format!(
+            "deployed hook still points at {} (settings say {}) — launching rewrites it",
+            deployed.host, wanted.host
+        ),
+    )
+}
+
 fn connects(host: &str, port: u16) -> bool {
     match (host, port).to_socket_addrs() {
         Ok(mut addrs) => addrs.any(|a| TcpStream::connect_timeout(&a, PROBE_TIMEOUT).is_ok()),
@@ -289,12 +334,13 @@ mod tests {
 
     #[test]
     fn an_unconfigured_launcher_skips_rather_than_passes() {
-        // The distinction that matters: a fresh config must not display four
-        // green ticks. "Not checked" is not "checked and fine".
+        // The distinction that matters: a fresh config must not display a column
+        // of green ticks. "Not checked" is not "checked and fine".
         let mut c = cfg();
-        // `default()` points this at a conventional path whose existence varies
-        // by machine. Pin it so the assertion is about the code, not this box.
+        // `default()` points these at conventional paths whose existence varies
+        // by machine. Pin them so the assertion is about the code, not this box.
         c.fifa17_tools_dir = "/nonexistent/openfut-tools".into();
+        c.fifa_game_dir = "/nonexistent/fifa-game-dir".into();
         let checks = run(&c);
         assert!(
             checks.iter().all(|k| k.state == State::Skipped),
@@ -395,4 +441,49 @@ mod tests {
         assert_eq!(check.state, State::Fail, "{}", check.detail);
         assert!(check.detail.contains("no answer on"), "{}", check.detail);
     }
+
+    /// A temp game dir holding one `openfut.cfg` body.
+    fn game_dir_with_cfg(tag: &str, body: &str) -> std::path::PathBuf {
+        let dir =
+            std::env::temp_dir().join(format!("openfut-preflight-{tag}-{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        std::fs::write(dir.join(crate::setup::HOOK_CFG_FILE), body).unwrap();
+        dir
+    }
+
+    #[test]
+    fn a_stale_hook_config_is_reported_and_names_both_addresses() {
+        // The silent failure this check exists for: settings changed, the file
+        // the game reads did not.
+        let mut c = cfg();
+        c.openfut_server_host = "10.0.0.2".into();
+        let old = openfut_common::ServerConfig {
+            host: "10.0.0.1".into(),
+            ports: c.server_config().ports,
+        };
+        let dir = game_dir_with_cfg("stale", &old.to_cfg_string());
+        c.fifa_game_dir = dir.to_string_lossy().into_owned();
+        let check = hook_config(&c);
+        assert_eq!(check.state, State::Warn, "{}", check.detail);
+        assert!(check.detail.contains("10.0.0.1"), "{}", check.detail);
+        assert!(check.detail.contains("10.0.0.2"), "{}", check.detail);
+        std::fs::remove_dir_all(dir).ok();
+    }
+
+    #[test]
+    fn a_hook_config_matching_settings_passes() {
+        let mut c = cfg();
+        c.openfut_server_host = "10.0.0.2".into();
+        let dir = game_dir_with_cfg("fresh", &c.server_config().to_cfg_string());
+        c.fifa_game_dir = dir.to_string_lossy().into_owned();
+        assert_eq!(hook_config(&c).state, State::Pass);
+        std::fs::remove_dir_all(dir).ok();
+    }
+
+    #[test]
+    fn a_missing_hook_config_is_skipped_not_passed() {
+        let mut c = cfg();
+        c.fifa_game_dir = "/nonexistent/fifa-game-dir".into();
+        assert_eq!(hook_config(&c).state, State::Skipped);
+    }
 }

src/setup.rs

@@ -67,6 +67,9 @@ pub(crate) fn run_elevated(script: &str) -> anyhow::Result<()> {
 
 // ── DLL hook deployment ───────────────────────────────────────────────────────
 
+/// The file the injected hook reads its server address from, in the game dir.
+pub const HOOK_CFG_FILE: &str = "openfut.cfg";
+
 /// Deploy openfut_hook.dll into the FIFA 23 game directory and write
 /// openfut.cfg with the structured server configuration the hook reads.
 /// `cfg_contents` must be the full `openfut.cfg` body (see
@@ -85,14 +88,14 @@ pub fn deploy_hook_dll(dll_src: &Path, game_dir: &Path, cfg_contents: &str) -> a
     }
     std::fs::create_dir_all(game_dir)?;
     std::fs::copy(dll_src, game_dir.join("version.dll"))?;
-    std::fs::write(game_dir.join("openfut.cfg"), cfg_contents)?;
+    std::fs::write(game_dir.join(HOOK_CFG_FILE), cfg_contents)?;
     Ok(())
 }
 
 /// Update only openfut.cfg without redeploying the DLL. `cfg_contents` is the
 /// full structured `openfut.cfg` body.
 pub fn update_hook_config(game_dir: &Path, cfg_contents: &str) -> anyhow::Result<()> {
-    let cfg = game_dir.join("openfut.cfg");
+    let cfg = game_dir.join(HOOK_CFG_FILE);
     if !cfg.exists() {
         anyhow::bail!("Hook DLL not deployed yet — deploy first.");
     }
@@ -100,6 +103,15 @@ pub fn update_hook_config(game_dir: &Path, cfg_contents: &str) -> anyhow::Result
     Ok(())
 }
 
+/// Read the `openfut.cfg` the hook will actually load, if one is deployed.
+///
+/// The launcher's own health and account requests are built from the in-memory
+/// config, but the *game* only ever sees this file. Reading it back is the only
+/// way to tell whether the two agree.
+pub fn read_hook_config(game_dir: &Path) -> Option<String> {
+    std::fs::read_to_string(game_dir.join(HOOK_CFG_FILE)).ok()
+}
+
 /// Remove the deployed hook DLL from the FIFA game directory.
 pub fn remove_hook_dll(game_dir: &Path) -> anyhow::Result<()> {
     let dest = game_dir.join("version.dll");
@@ -127,13 +139,13 @@ pub const STEAM_LAUNCH_OPTIONS: &str = "WINEDLLOVERRIDES=\"version=n,b\" %comman
 pub fn launch_game(
     command: &str,
     workdir: &str,
-    log_buf: std::sync::Arc<std::sync::Mutex<crate::logs::LogBuffer>>,
+    log_buf: std::sync::Arc<parking_lot::Mutex<crate::logs::LogBuffer>>,
 ) -> anyhow::Result<()> {
     use std::io::{BufRead, BufReader};
     use std::process::{Command, Stdio};
 
     if command.trim().is_empty() {
-        anyhow::bail!("No game launch command configured (set it in the Config tab).");
+        anyhow::bail!("No game launch command configured (set it in Settings).");
     }
 
     let mut cmd = Command::new("sh");
@@ -145,7 +157,6 @@ pub fn launch_game(
 
     log_buf
         .lock()
-        .unwrap()
         .push(format!("[launcher] launching game: {command}"));
 
     let mut child = cmd.spawn()?;
@@ -154,7 +165,7 @@ pub fn launch_game(
         let buf = std::sync::Arc::clone(&log_buf);
         std::thread::spawn(move || {
             for line in BufReader::new(out).lines().map_while(Result::ok) {
-                buf.lock().unwrap().push(line);
+                buf.lock().push(line);
             }
         });
     }
@@ -162,7 +173,7 @@ pub fn launch_game(
         let buf = std::sync::Arc::clone(&log_buf);
         std::thread::spawn(move || {
             for line in BufReader::new(err).lines().map_while(Result::ok) {
-                buf.lock().unwrap().push(line);
+                buf.lock().push(line);
             }
         });
     }
@@ -172,7 +183,6 @@ pub fn launch_game(
         let _ = child.wait();
         log_buf
             .lock()
-            .unwrap()
             .push("[launcher] game process exited.".to_string());
     });
 

src/theme.rs

@@ -0,0 +1,303 @@
+//! OpenFUT launcher visual system.
+//!
+//! A single place that owns the app's look: the semantic colour palette, the
+//! type scale, embedded fonts, and the tuned egui [`Style`]/[`Visuals`]. UI code
+//! composes *with* this system — it never hard-codes `Color32::from_rgb(...)` or
+//! stray pixel radii. The palette is deliberately small: one signature accent
+//! plus four status hues (success / warn / error / idle) and a tinted neutral
+//! ramp. Nothing here changes launcher behaviour; it is presentation only.
+
+use egui::{
+    Color32, Context, FontData, FontDefinitions, FontFamily, FontId, Frame, Margin, Rounding,
+    Stroke, TextStyle,
+};
+
+// ── Semantic palette ────────────────────────────────────────────────────────
+// Neutrals are always *tinted* (a hint of cool blue), never pure #000/#fff.
+
+/// Window backdrop — the deepest surface.
+pub const BG_DEEP: Color32 = Color32::from_rgb(0x10, 0x12, 0x18);
+/// Standard panel fill (nav rail, central body).
+pub const BG: Color32 = Color32::from_rgb(0x15, 0x18, 0x22);
+/// Raised card / group surface.
+pub const SURFACE: Color32 = Color32::from_rgb(0x1c, 0x20, 0x2e);
+/// Hovered / interactive raised surface.
+pub const SURFACE_HOVER: Color32 = Color32::from_rgb(0x24, 0x29, 0x3a);
+/// Inset surface (text fields, console, code).
+pub const INSET: Color32 = Color32::from_rgb(0x0e, 0x10, 0x17);
+
+/// Hairline divider / card border.
+pub const BORDER: Color32 = Color32::from_rgb(0x2a, 0x31, 0x45);
+/// Stronger border for emphasis / hover.
+pub const BORDER_STRONG: Color32 = Color32::from_rgb(0x3a, 0x43, 0x5e);
+
+/// Primary text.
+pub const TEXT: Color32 = Color32::from_rgb(0xe6, 0xe9, 0xf2);
+/// Secondary / supporting text.
+pub const TEXT_WEAK: Color32 = Color32::from_rgb(0x9a, 0xa3, 0xb8);
+/// Tertiary / disabled-ish text.
+pub const TEXT_FAINT: Color32 = Color32::from_rgb(0x6a, 0x73, 0x8a);
+
+/// Signature OpenFUT accent — a confident royal blue used for the wordmark,
+/// active navigation, and primary calls-to-action.
+pub const ACCENT: Color32 = Color32::from_rgb(0x4c, 0x6f, 0xff);
+pub const ACCENT_HOVER: Color32 = Color32::from_rgb(0x6a, 0x87, 0xff);
+pub const ACCENT_PRESSED: Color32 = Color32::from_rgb(0x3b, 0x5b, 0xe0);
+/// Faint accent wash for active-nav backgrounds / selection.
+pub const ACCENT_WASH: Color32 = Color32::from_rgb(0x22, 0x2c, 0x50);
+/// Text drawn on top of the solid accent.
+pub const ON_ACCENT: Color32 = Color32::from_rgb(0xf5, 0xf7, 0xff);
+
+/// Status hues — distinct from the accent so "primary action" never reads as
+/// "healthy" and vice-versa.
+pub const SUCCESS: Color32 = Color32::from_rgb(0x3f, 0xcf, 0x8e);
+pub const WARN: Color32 = Color32::from_rgb(0xf2, 0xb4, 0x4c);
+pub const ERROR: Color32 = Color32::from_rgb(0xf2, 0x6d, 0x6d);
+pub const IDLE: Color32 = Color32::from_rgb(0x7a, 0x83, 0x99);
+/// Informational blue for log lines (lighter than the accent).
+pub const INFO: Color32 = Color32::from_rgb(0x8f, 0xb6, 0xff);
+
+// ── Type scale (custom named text styles) ───────────────────────────────────
+
+/// Large branded wordmark.
+pub const HERO: &str = "Hero";
+/// Card / section titles.
+pub const SUBHEADING: &str = "Subheading";
+/// Small monospace (console meta, launch command).
+pub const MONO_SM: &str = "MonoSm";
+
+fn bold_family() -> FontFamily {
+    FontFamily::Name("openfut-bold".into())
+}
+
+/// A [`TextStyle`] handle for one of our custom scale steps.
+pub fn text_style(name: &str) -> TextStyle {
+    TextStyle::Name(name.into())
+}
+
+// ── Status semantics ────────────────────────────────────────────────────────
+
+/// A coarse health/activity state, mapped to one palette hue + glyph. Using an
+/// enum keeps status rendering consistent everywhere (dashboard, preflight,
+/// services) instead of ad-hoc colour+string pairs.
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum Status {
+    /// Healthy / online / running / passed.
+    Ok,
+    /// Advisory — worth attention, usually not fatal.
+    Warn,
+    /// Broken / unreachable / failed.
+    Error,
+    /// Not running / not configured / not checked.
+    Idle,
+    /// Transient (stopping / working).
+    Busy,
+    /// Unknown / not yet probed.
+    Unknown,
+}
+
+impl Status {
+    pub fn color(self) -> Color32 {
+        match self {
+            Status::Ok => SUCCESS,
+            Status::Warn => WARN,
+            Status::Error => ERROR,
+            Status::Idle => IDLE,
+            Status::Busy => WARN,
+            Status::Unknown => TEXT_FAINT,
+        }
+    }
+
+    /// A consistent status glyph: filled ● for active/terminal states, hollow ○
+    /// for idle/unknown. (Kept to glyphs the bundled fonts render.)
+    pub fn glyph(self) -> &'static str {
+        match self {
+            Status::Ok | Status::Error | Status::Warn | Status::Busy => "●",
+            Status::Idle | Status::Unknown => "○",
+        }
+    }
+}
+
+/// Draw a compact status pill: a tinted, rounded chip with a status dot and
+/// label. Used for the at-a-glance state on each dashboard card.
+pub fn status_pill(ui: &mut egui::Ui, label: &str, status: Status) {
+    let color = status.color();
+    let bg = tint(color, 0.14);
+    Frame::none()
+        .fill(bg)
+        .rounding(Rounding::same(999.0))
+        .inner_margin(Margin::symmetric(10.0, 3.0))
+        .show(ui, |ui| {
+            ui.horizontal(|ui| {
+                ui.spacing_mut().item_spacing.x = 6.0;
+                ui.label(egui::RichText::new(status.glyph()).color(color).size(11.0));
+                ui.label(egui::RichText::new(label).color(color).size(12.0).strong());
+            });
+        });
+}
+
+/// A raised card surface: rounded, hairline-bordered, generously padded. The
+/// building block for the dashboard and setup sections.
+pub fn card() -> Frame {
+    Frame::none()
+        .fill(SURFACE)
+        .stroke(Stroke::new(1.0_f32, BORDER))
+        .rounding(Rounding::same(12.0))
+        .inner_margin(Margin::same(18.0))
+}
+
+/// Blend `color` toward the app background by `bg_weight` (0 = full colour,
+/// 1 = pure background). Used for tinted chips and washes.
+pub fn tint(color: Color32, weight: f32) -> Color32 {
+    let w = weight.clamp(0.0, 1.0);
+    let lerp = |c: u8, b: u8| ((c as f32) * w + (b as f32) * (1.0 - w)).round() as u8;
+    // Chips sit on card surfaces; lerp toward the surface, not the deep bg.
+    Color32::from_rgb(
+        lerp(color.r(), SURFACE.r()),
+        lerp(color.g(), SURFACE.g()),
+        lerp(color.b(), SURFACE.b()),
+    )
+}
+
+// ── Install ─────────────────────────────────────────────────────────────────
+
+/// Embed the bundled fonts and apply the OpenFUT style. Called once at startup.
+pub fn install(ctx: &Context) {
+    install_fonts(ctx);
+    install_style(ctx);
+}
+
+fn install_fonts(ctx: &Context) {
+    let mut fonts = FontDefinitions::default();
+
+    fonts.font_data.insert(
+        "openfut-sans".to_owned(),
+        FontData::from_static(include_bytes!("../assets/fonts/LiberationSans-Regular.ttf")),
+    );
+    fonts.font_data.insert(
+        "openfut-bold".to_owned(),
+        FontData::from_static(include_bytes!("../assets/fonts/LiberationSans-Bold.ttf")),
+    );
+    fonts.font_data.insert(
+        "openfut-mono".to_owned(),
+        FontData::from_static(include_bytes!("../assets/fonts/DejaVuSansMono.ttf")),
+    );
+
+    // Proportional & monospace default to the bundled faces so the UI looks
+    // identical regardless of the host's installed fonts.
+    fonts
+        .families
+        .entry(FontFamily::Proportional)
+        .or_default()
+        .insert(0, "openfut-sans".to_owned());
+    fonts
+        .families
+        .entry(FontFamily::Monospace)
+        .or_default()
+        .insert(0, "openfut-mono".to_owned());
+
+    // A dedicated bold family — egui does not synthesize weight, so headings
+    // reference this explicitly for a real type hierarchy.
+    fonts.families.insert(
+        FontFamily::Name("openfut-bold".into()),
+        vec!["openfut-bold".to_owned(), "openfut-sans".to_owned()],
+    );
+
+    ctx.set_fonts(fonts);
+}
+
+fn install_style(ctx: &Context) {
+    let mut style = (*ctx.style()).clone();
+
+    // ── Type scale ──────────────────────────────────────────────────────────
+    let bold = bold_family();
+    let prop = FontFamily::Proportional;
+    let mono = FontFamily::Monospace;
+    let ts = &mut style.text_styles;
+    ts.insert(text_style(HERO), FontId::new(28.0, bold.clone()));
+    ts.insert(TextStyle::Heading, FontId::new(19.0, bold.clone()));
+    ts.insert(text_style(SUBHEADING), FontId::new(15.0, bold));
+    ts.insert(TextStyle::Body, FontId::new(14.0, prop.clone()));
+    ts.insert(TextStyle::Button, FontId::new(14.0, prop.clone()));
+    ts.insert(TextStyle::Small, FontId::new(12.0, prop));
+    ts.insert(TextStyle::Monospace, FontId::new(13.0, mono.clone()));
+    ts.insert(text_style(MONO_SM), FontId::new(11.5, mono));
+
+    // ── Spacing scale (multiples of 4) ────────────────────────────────────────
+    let sp = &mut style.spacing;
+    sp.item_spacing = egui::vec2(8.0, 8.0);
+    sp.button_padding = egui::vec2(12.0, 7.0);
+    sp.menu_margin = Margin::same(8.0);
+    sp.indent = 18.0;
+    sp.interact_size.y = 30.0;
+    sp.scroll.bar_width = 9.0;
+
+    // ── Visuals ───────────────────────────────────────────────────────────────
+    let mut v = egui::Visuals::dark();
+    v.dark_mode = true;
+    v.override_text_color = Some(TEXT);
+    v.panel_fill = BG;
+    v.window_fill = BG;
+    v.extreme_bg_color = INSET;
+    v.faint_bg_color = SURFACE;
+    v.code_bg_color = INSET;
+    v.hyperlink_color = ACCENT_HOVER;
+
+    v.window_rounding = Rounding::same(12.0);
+    v.window_stroke = Stroke::new(1.0_f32, BORDER);
+    v.menu_rounding = Rounding::same(8.0);
+    v.window_shadow = egui::epaint::Shadow::NONE;
+    v.popup_shadow = egui::epaint::Shadow {
+        offset: egui::vec2(0.0, 6.0),
+        blur: 18.0,
+        spread: 0.0,
+        color: Color32::from_black_alpha(120),
+    };
+
+    // Selection uses the accent wash so highlighted text/nav reads as branded.
+    v.selection.bg_fill = ACCENT_WASH;
+    v.selection.stroke = Stroke::new(1.0_f32, ACCENT_HOVER);
+
+    // Separators / hairlines.
+    let radius = Rounding::same(8.0);
+
+    // Non-interactive widgets (labels, separators).
+    v.widgets.noninteractive.bg_fill = SURFACE;
+    v.widgets.noninteractive.weak_bg_fill = SURFACE;
+    v.widgets.noninteractive.bg_stroke = Stroke::new(1.0_f32, BORDER);
+    v.widgets.noninteractive.fg_stroke = Stroke::new(1.0_f32, TEXT);
+    v.widgets.noninteractive.rounding = radius;
+
+    // Inactive interactive widgets (idle buttons).
+    v.widgets.inactive.bg_fill = SURFACE_HOVER;
+    v.widgets.inactive.weak_bg_fill = SURFACE_HOVER;
+    v.widgets.inactive.bg_stroke = Stroke::new(1.0_f32, BORDER);
+    v.widgets.inactive.fg_stroke = Stroke::new(1.0_f32, TEXT);
+    v.widgets.inactive.rounding = radius;
+
+    // Hovered.
+    v.widgets.hovered.bg_fill = tint(ACCENT, 0.30);
+    v.widgets.hovered.weak_bg_fill = tint(ACCENT, 0.30);
+    v.widgets.hovered.bg_stroke = Stroke::new(1.0_f32, BORDER_STRONG);
+    v.widgets.hovered.fg_stroke = Stroke::new(1.0_f32, TEXT);
+    v.widgets.hovered.rounding = radius;
+    v.widgets.hovered.expansion = 1.0;
+
+    // Active / pressed.
+    v.widgets.active.bg_fill = ACCENT_PRESSED;
+    v.widgets.active.weak_bg_fill = ACCENT_PRESSED;
+    v.widgets.active.bg_stroke = Stroke::new(1.0_f32, ACCENT);
+    v.widgets.active.fg_stroke = Stroke::new(1.0_f32, ON_ACCENT);
+    v.widgets.active.rounding = radius;
+    v.widgets.active.expansion = 1.0;
+
+    // Open (combo boxes / menus).
+    v.widgets.open.bg_fill = SURFACE_HOVER;
+    v.widgets.open.weak_bg_fill = SURFACE_HOVER;
+    v.widgets.open.bg_stroke = Stroke::new(1.0_f32, BORDER_STRONG);
+    v.widgets.open.fg_stroke = Stroke::new(1.0_f32, TEXT);
+    v.widgets.open.rounding = radius;
+
+    style.visuals = v;
+    ctx.set_style(style);
+}