sbpp
diff --git a/‎AGENTS.md‎
Lines changed: 1 addition & 1 deletion b/‎AGENTS.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎web/includes/View/AdminGroupsListView.php‎
Lines changed: 12 additions & 1 deletion b/‎web/includes/View/AdminGroupsListView.php‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎web/pages/admin.groups.php‎
Lines changed: 52 additions & 17 deletions b/‎web/pages/admin.groups.php‎
Lines changed: 52 additions & 17 deletions
diff --git a/‎web/tests/e2e/fixtures/db.ts‎
Lines changed: 181 additions & 0 deletions b/‎web/tests/e2e/fixtures/db.ts‎
Lines changed: 181 additions & 0 deletions
diff --git a/‎web/tests/e2e/scripts/delete-server-e2e.php‎
Lines changed: 99 additions & 0 deletions b/‎web/tests/e2e/scripts/delete-server-e2e.php‎
Lines changed: 99 additions & 0 deletions
@@ -52,7 +52,18 @@ final class AdminGroupsListView extends View
      *     (`{type, name, access}`) for the server admin groups.
      * @param list<array<string,mixed>>      $server_list              Server group rows
      *     (`:prefix_groups` WHERE type = 3). Same naming-clash caveat
-     *     as `$server_group_list` above.
+     *     as `$server_group_list` above. Each row carries a `servers`
+     *     key — a `list<array{sid: int, ip: string, port: int, enabled: bool}>`
+     *     of the bound `:prefix_servers` records — that drives the
+     *     per-group `[data-testid="server-tile"]` card stack in
+     *     `page_admin_groups_list.tpl`. The shared hydration helper
+     *     (`web/scripts/server-tile-hydrate.js`) picks up each tile
+     *     and fires `Actions.ServersHostPlayers` to replace the SSR
+     *     `IP:port` fallback with the live hostname. Disabled servers
+     *     stay visible (the bound-but-disabled relationship is the
+     *     useful operator context) but the template gates the
+     *     hydration probe on `enabled` via `data-server-skip="1"`
+     *     (mirror of `page_admin_servers_list.tpl`). #1406.
      * @param list<int>                      $server_counts            Per-group server counts, indexed
      *     parallel to `$server_list`.
      * @param list<array{name: string, value: int, label: string}> $all_flags Web-permission flag
 
@@ -137,31 +137,66 @@
 // ------------------------------------------------------------------
 // Server groups (`:prefix_groups` WHERE type = 3).
 //
-// #1404 — the pre-fix loop also echoed a per-row
-// `<script>LoadServerHostPlayersList('<sids>', 'id', 'servers_<gid>')</script>`
-// blob meant to async-hydrate the per-group server list into the
-// matching `<div id="servers_{gid}">` slot. The helper was deleted
-// with `sourcebans.js` at #1123 D1, so every page load raised
-// `ReferenceError: LoadServerHostPlayersList is not defined` once
-// per server group AND left the slot showing the literal "Servers
-// populate via the legacy LoadServerHostPlayersList hook." copy
-// admin-facing forever. The echo + the slot + the placeholder copy
-// all went together; the `:prefix_servers_groups` lookup that fed
-// the SID list went too (nothing else read it). Hydration to per-
-// group server cards is the next step — tracked as a follow-up
-// ticket; see AGENTS.md "Anti-patterns" for the matching
-// `LoadServerHostPlayersList` entry.
+// #1404 dropped the pre-fix `<script>LoadServerHostPlayersList(...)`
+// echo + the literal "Servers populate via the legacy ... hook."
+// placeholder + the `<div id="servers_{gid}">` slot. #1406 is the
+// additive replacement: the per-group `servers` array (sid / ip /
+// port) we load here drives a vertical stack of
+// `[data-testid="server-tile"]` cards in the template, hydrated
+// client-side via the shared `web/scripts/server-tile-hydrate.js`
+// helper that already powers the public Server List + admin Server
+// Management + dashboard widget. The bare `IP:port` per row stays
+// as the SSR / cache-cold / no-JS fallback inside
+// `[data-testid="server-host"]`. The hydration helper auto-runs on
+// first paint for every `[data-server-hydrate="auto"]` container
+// and fires `Actions.ServersHostPlayers` per tile, so no new JSON
+// action is registered for this surface.
 // ------------------------------------------------------------------
 $server_group_rows = $GLOBALS['PDO']->query("SELECT * FROM `:prefix_groups` WHERE type = '3'")->resultset();
 $server_list   = [];
 $server_counts = [];
 foreach ($server_group_rows as $row) {
     $row['gid'] = (int) $row['gid'];
 
-    $GLOBALS['PDO']->query("SELECT COUNT(server_id) AS cnt FROM `:prefix_servers_groups` WHERE `group_id` = :gid");
+    // INNER JOIN against `:prefix_servers` so groups that retain
+    // dangling `:prefix_servers_groups` rows from a deleted server
+    // (the schema has no cascade) silently drop those rows from
+    // the card list — there's nothing useful to render for a sid
+    // that no longer exists, and the hydration helper would hit
+    // the "server not found" arm of `api_servers_host_players` on
+    // every page load. ORDER BY S.sid keeps the render order stable
+    // across page loads so a refresh doesn't shuffle the cards.
+    //
+    // `S.enabled` rides the projection (post-review): disabled
+    // servers should STILL surface ("this group is bound to N
+    // servers, here are their addresses" stays useful even when
+    // some are disabled — silently filtering them out would hide
+    // the bound-but-disabled relationship from the admin), but
+    // the template tags each `<li>` with `data-server-skip="1"`
+    // so `server-tile-hydrate.js` short-circuits before firing
+    // `Actions.ServersHostPlayers` against a server the panel
+    // already knows is offline by config. Mirrors the sibling
+    // contract in `page_admin_servers_list.tpl`.
+    $GLOBALS['PDO']->query(
+        "SELECT S.sid, S.ip, S.port, S.enabled
+         FROM `:prefix_servers_groups` AS SG
+         INNER JOIN `:prefix_servers` AS S ON S.sid = SG.server_id
+         WHERE SG.group_id = :gid
+         ORDER BY S.sid ASC"
+    );
     $GLOBALS['PDO']->bind(':gid', $row['gid']);
-    $cnt = $GLOBALS['PDO']->single();
-    $row['server_count'] = (int) $cnt['cnt'];
+    $serverRows = $GLOBALS['PDO']->resultset();
+
+    $row['servers'] = array_map(static fn (array $s): array => [
+        'sid'     => (int)    $s['sid'],
+        'ip'      => (string) $s['ip'],
+        'port'    => (int)    $s['port'],
+        // `:prefix_servers.enabled` is `TINYINT NOT NULL DEFAULT '1'`
+        // — cast to bool here so the template's `{if !$server.enabled}`
+        // gate doesn't have to know the on-disk shape.
+        'enabled' => (bool)   $s['enabled'],
+    ], $serverRows);
+    $row['server_count'] = count($row['servers']);
 
     $server_list[]   = $row;
     $server_counts[] = $row['server_count'];
 
@@ -39,6 +39,10 @@ const SET_SETTING_INSIDE_CONTAINER =
     '/var/www/html/web/tests/e2e/scripts/set-setting-e2e.php';
 const ORPHAN_BAN_AID_INSIDE_CONTAINER =
     '/var/www/html/web/tests/e2e/scripts/orphan-ban-aid-e2e.php';
+const SEED_SERVER_GROUP_INSIDE_CONTAINER =
+    '/var/www/html/web/tests/e2e/scripts/seed-server-group-e2e.php';
+const DELETE_SERVER_INSIDE_CONTAINER =
+    '/var/www/html/web/tests/e2e/scripts/delete-server-e2e.php';
 
 /**
  * Run the PHP shim that drives `Sbpp\Tests\Fixture` against
@@ -399,6 +403,183 @@ export async function orphanBanAidE2e(bid: number, newAid = 99999): Promise<void
     });
 }
 
+/**
+ * Per-server seed row consumed by `seedServerGroupWithServersE2e`.
+ * RFC 5737 documentation IPs (203.0.113.0/24, 198.51.100.0/24,
+ * 192.0.2.0/24) are recommended so a real Source server can't ever
+ * answer the A2S probe; the spec stubs `Actions.ServersHostPlayers`
+ * via `page.route` anyway, but the IPs show up in the SSR fallback.
+ *
+ * `enabled` defaults to `true` (matches the schema's
+ * `:prefix_servers.enabled TINYINT NOT NULL DEFAULT '1'`). Pass
+ * `false` to seed a server the admin Server Groups card stack will
+ * tag with `data-server-skip="1"` + the visible "Disabled" pill so
+ * `server-tile-hydrate.js` short-circuits the per-tile probe
+ * (#1406 post-review).
+ */
+export interface ServerGroupSeedServer {
+    ip: string;
+    port: number;
+    enabled?: boolean;
+}
+
+/**
+ * Shape returned by `seedServerGroupWithServersE2e`. `gid` is the
+ * server-group's `:prefix_groups.gid`; `sids` mirrors the per-server
+ * `:prefix_servers.sid` list in insert order so the spec can keyword
+ * each `page.route` stub by sid. `enabled` flows through verbatim so
+ * specs covering the disabled-server arm can assert against the
+ * canonical value the shim wrote without re-deriving it.
+ */
+export interface ServerGroupSeedResult {
+    gid: number;
+    sids: number[];
+    servers: Array<{ sid: number; ip: string; port: number; enabled: boolean }>;
+}
+
+/**
+ * Seed a `:prefix_groups (type=3)` server group with N bound
+ * `:prefix_servers` rows wired through `:prefix_servers_groups`.
+ * Used by the admin Server Groups card-hydration spec (#1406) because
+ * there is no JSON action that wires a server into a server group's
+ * membership — the legacy master-detail UI write path is the only
+ * existing surface, and driving an HTML form post through Playwright
+ * would couple the spec to the master-detail chrome (unrelated to
+ * what we're verifying: each per-group card carries the hydration
+ * testids + the live hostname patches in over the SSR IP:port).
+ *
+ * Mirrors the `seedCommsRawE2e` / `seedLostpasswordE2e` shape:
+ * shells out to a PHP shim that runs against the e2e DB and refuses
+ * any other.
+ */
+export async function seedServerGroupWithServersE2e(
+    groupName: string,
+    servers: ServerGroupSeedServer[],
+): Promise<ServerGroupSeedResult> {
+    const inContainer = process.env.E2E_IN_CONTAINER === '1';
+    const cmd = inContainer ? 'php' : 'docker';
+    const cmdArgs = inContainer
+        ? [SEED_SERVER_GROUP_INSIDE_CONTAINER]
+        : ['compose', 'exec', '-T', 'web', 'php', SEED_SERVER_GROUP_INSIDE_CONTAINER];
+
+    const child = execFile(cmd, cmdArgs, {
+        maxBuffer: 8 * 1024 * 1024,
+        cwd: inContainer ? undefined : process.cwd(),
+    });
+
+    let stdout = '';
+    let stderr = '';
+    child.stdout?.on('data', (chunk: Buffer) => { stdout += chunk.toString('utf8'); });
+    child.stderr?.on('data', (chunk: Buffer) => { stderr += chunk.toString('utf8'); });
+
+    child.stdin?.write(JSON.stringify({
+        group: { name: groupName },
+        servers,
+    }));
+    child.stdin?.end();
+
+    await new Promise<void>((resolve, reject) => {
+        child.on('error', reject);
+        child.on('exit', (code) => {
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(
+                `seed-server-group-e2e.php exited ${code}\n`
+                + `stdout:\n${stdout}\nstderr:\n${stderr}`,
+            ));
+        });
+    });
+
+    const trimmed = stdout.trim();
+    if (trimmed === '') {
+        throw new Error(`seed-server-group-e2e.php: empty stdout\nstderr:\n${stderr}`);
+    }
+    try {
+        const parsed = JSON.parse(trimmed) as ServerGroupSeedResult;
+        if (typeof parsed.gid !== 'number' || !Array.isArray(parsed.sids) || !Array.isArray(parsed.servers)) {
+            throw new Error('missing gid/sids/servers keys');
+        }
+        return parsed;
+    } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new Error(
+            `seed-server-group-e2e.php: malformed stdout (${msg})\nstdout:\n${trimmed}\nstderr:\n${stderr}`,
+        );
+    }
+}
+
+/**
+ * Delete a `:prefix_servers` row by `sid` via the dedicated e2e shim
+ * that **bypasses `api_servers_remove`**'s cleanup cascade. The
+ * dispatcher action runs a paired
+ * `DELETE FROM :prefix_servers_groups WHERE server_id = ?` (plus
+ * sibling cascades on `:prefix_admins_servers_groups`, etc.) which
+ * defeats the test purpose of the dangling-membership-row spec arm
+ * in `admin-groups-server-cards-hydration.spec.ts`.
+ *
+ * The whole point of that spec arm is to prove the admin Server
+ * Groups page's INNER JOIN (added in #1406) silently drops orphaned
+ * `:prefix_servers_groups` rows; the orphan only exists if the
+ * server delete LEAVES the membership row in place. The raw SQL
+ * shim is the narrow shape that produces the test condition.
+ *
+ * Idempotent: deleting an already-deleted sid is a no-op and the
+ * shim returns `{deleted: 0}` so the caller can sanity-check.
+ */
+export async function deleteServerE2e(sid: number): Promise<{ sid: number; deleted: number }> {
+    const inContainer = process.env.E2E_IN_CONTAINER === '1';
+    const cmd = inContainer ? 'php' : 'docker';
+    const cmdArgs = inContainer
+        ? [DELETE_SERVER_INSIDE_CONTAINER]
+        : ['compose', 'exec', '-T', 'web', 'php', DELETE_SERVER_INSIDE_CONTAINER];
+
+    const child = execFile(cmd, cmdArgs, {
+        maxBuffer: 8 * 1024 * 1024,
+        cwd: inContainer ? undefined : process.cwd(),
+    });
+
+    let stdout = '';
+    let stderr = '';
+    child.stdout?.on('data', (chunk: Buffer) => { stdout += chunk.toString('utf8'); });
+    child.stderr?.on('data', (chunk: Buffer) => { stderr += chunk.toString('utf8'); });
+
+    child.stdin?.write(JSON.stringify({ sid }));
+    child.stdin?.end();
+
+    await new Promise<void>((resolve, reject) => {
+        child.on('error', reject);
+        child.on('exit', (code) => {
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(
+                `delete-server-e2e.php exited ${code}\n`
+                + `stdout:\n${stdout}\nstderr:\n${stderr}`,
+            ));
+        });
+    });
+
+    const trimmed = stdout.trim();
+    if (trimmed === '') {
+        throw new Error(`delete-server-e2e.php: empty stdout\nstderr:\n${stderr}`);
+    }
+    try {
+        const parsed = JSON.parse(trimmed) as { sid: number; deleted: number };
+        if (typeof parsed.sid !== 'number' || typeof parsed.deleted !== 'number') {
+            throw new Error('missing sid/deleted keys');
+        }
+        return parsed;
+    } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new Error(
+            `delete-server-e2e.php: malformed stdout (${msg})\nstdout:\n${trimmed}\nstderr:\n${stderr}`,
+        );
+    }
+}
+
 async function runAnnouncementsHelper(
     stdin: string | null,
     extraArgs: string[],
 
@@ -0,0 +1,99 @@
+<?php
+// SourceBans++ (c) 2014-2026 SourceBans++ Dev Team
+// Licensed under Creative Commons Attribution-NonCommercial-ShareAlike 3.0.
+// See LICENSE.md for the full license text and THIRD-PARTY-NOTICES.txt for attributions.
+/**
+ * E2E server-deletion shim.
+ *
+ * Deletes a single `:prefix_servers` row by `sid`. **Deliberately
+ * bypasses `api_servers_remove`** because that action runs a
+ * cleanup cascade (`DELETE FROM :prefix_servers_groups WHERE
+ * server_id = ?`, `DELETE FROM :prefix_admins_servers_groups WHERE
+ * server_id = ?`, etc.) that defeats the test purpose of the
+ * dangling-membership-row spec arm in
+ * `admin-groups-server-cards-hydration.spec.ts`.
+ *
+ * The whole point of that spec arm is to prove the admin Server
+ * Groups page's INNER JOIN (added in #1406) silently drops orphaned
+ * `:prefix_servers_groups` rows — which means the test setup needs
+ * to LEAVE the orphaned `:prefix_servers_groups` row in place AFTER
+ * the server delete lands. The dispatcher's cleanup cascade would
+ * make the orphan impossible to produce.
+ *
+ * Same e2e-only guardrails as `seed-server-group-e2e.php` /
+ * `seed-comms-e2e.php` / `set-setting-e2e.php`: refuses any DB other
+ * than the e2e schema (default `sourcebans_e2e`).
+ *
+ * Idempotent: deleting an already-deleted sid is a no-op (the
+ * `DELETE` matches zero rows). The shim exits 0 either way and
+ * surfaces the actual rowcount on stdout so the caller can sanity-
+ * check whether the row existed when expected.
+ *
+ * Usage (inside the web container):
+ *
+ *   echo '{"sid":7}' | php delete-server-e2e.php
+ *
+ * Output on stdout (single JSON line):
+ *
+ *   {"sid":7,"deleted":1}
+ */
+
+declare(strict_types=1);
+
+if (PHP_SAPI !== 'cli') {
+    fwrite(STDERR, "delete-server-e2e.php must run on the CLI.\n");
+    exit(2);
+}
+
+if (!getenv('DB_NAME')) {
+    putenv('DB_NAME=sourcebans_e2e');
+    $_ENV['DB_NAME']    = 'sourcebans_e2e';
+    $_SERVER['DB_NAME'] = 'sourcebans_e2e';
+}
+
+if (getenv('DB_NAME') === 'sourcebans_test' || getenv('DB_NAME') === 'sourcebans') {
+    fwrite(STDERR, "refusing to delete server against DB_NAME=" . getenv('DB_NAME')
+        . ": this script must target a dedicated e2e DB (default sourcebans_e2e).\n");
+    exit(2);
+}
+
+require __DIR__ . '/../../bootstrap.php';
+
+if (!isset($GLOBALS['PDO'])) {
+    $GLOBALS['PDO'] = new \Database(DB_HOST, DB_PORT, DB_NAME, DB_USER, DB_PASS, DB_PREFIX, DB_CHARSET);
+}
+
+$payload = stream_get_contents(STDIN);
+if ($payload === false || trim($payload) === '') {
+    fwrite(STDERR, "delete-server-e2e.php: empty stdin payload.\n");
+    exit(2);
+}
+
+$decoded = json_decode($payload, true);
+if (!is_array($decoded)) {
+    fwrite(STDERR, "delete-server-e2e.php: stdin is not a JSON object.\n");
+    exit(2);
+}
+
+$sid = (int)($decoded['sid'] ?? 0);
+if ($sid <= 0) {
+    fwrite(STDERR, "delete-server-e2e.php: missing or invalid `sid` in payload.\n");
+    exit(2);
+}
+
+// Raw DELETE — NO cascade. The whole point of this shim is to
+// produce a `:prefix_servers_groups` row that points at a sid which
+// no longer exists in `:prefix_servers`, so the panel handler's
+// INNER JOIN can be exercised against an actual orphan. Using
+// `api_servers_remove` here would silently clean up the
+// membership row in the same transaction and the spec arm would
+// have nothing to test.
+$GLOBALS['PDO']->query("DELETE FROM `:prefix_servers` WHERE sid = ?");
+$GLOBALS['PDO']->execute([$sid]);
+
+$result = [
+    'sid'     => $sid,
+    'deleted' => $GLOBALS['PDO']->rowCount(),
+];
+
+fwrite(STDOUT, json_encode($result, JSON_UNESCAPED_SLASHES) . "\n");