From f2dfd2544e4a0e674a6af3f58d9cc803f20a3115 Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 10:31:53 -0400
Subject: [PATCH 1/7] Fix the plugin page's install state, config folder and
 mode links

Three things the directory got wrong once a plugin was actually installed:

- Install records intent and the nodes converge on their own, so a rollout
  part-way through is not waiting on anyone -- but the page kept offering a
  primary Install button until every node had it. Once the request is on record
  it reports the state instead, taken from what the nodes report rather than the
  catalog's install_state, which would sit still while the rollout moved. The
  count moves below it and a failed node gets a Retry.
- The configure button opened addons/<runtime>/configs/plugins, which a
  framework only writes once a plugin has run, so a freshly installed plugin
  landed on "this directory doesn't exist yet". It opens the config file the
  catalog names, else where the release unpacks to.
- The guidelines switch is replaced by the fact when 5stack Ranks is on, since
  ranks turns the same setting off and the risk is against the account rather
  than one server.

A mode's plugin list links each plugin to its page in a new tab, so working out
what belongs in a mode does not cost an unsaved selection.
---
 components/game-modes/GameModeForm.vue |  16 ++-
 i18n/locales/en.json                   |  10 +-
 pages/plugins/[slug].vue               | 173 +++++++++++++++++++++++--
 3 files changed, 182 insertions(+), 17 deletions(-)

diff --git a/components/game-modes/GameModeForm.vue b/components/game-modes/GameModeForm.vue
index fe45e5672..e948dd4ea 100644
--- a/components/game-modes/GameModeForm.vue
+++ b/components/game-modes/GameModeForm.vue
@@ -12,7 +12,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import { AlertTriangle, Trash2 } from "lucide-vue-next";
+import { AlertTriangle, Trash2, ExternalLink } from "lucide-vue-next";
 import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
 </script>
 
@@ -112,7 +112,19 @@ import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
       >
         <div class="min-w-0">
           <div class="flex items-center gap-2">
-            <span class="font-medium truncate">{{ plugin.name }}</span>
+            <!-- A new tab rather than a route: deciding what belongs in a mode
+                 means reading what each plugin actually does, and leaving the
+                 form to do it would lose an unsaved selection. -->
+            <a
+              :href="`/plugins/${plugin.slug}`"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="inline-flex min-w-0 items-center gap-1 font-medium hover:underline"
+              :title="$t('game_modes.form.open_plugin')"
+            >
+              <span class="truncate">{{ plugin.name }}</span>
+              <ExternalLink class="h-3 w-3 shrink-0 text-muted-foreground" />
+            </a>
             <Badge variant="outline" v-if="!plugin.hot_swappable">
               {{ $t("game_modes.form.restart_required") }}
             </Badge>
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 24d8e1ab7..6122817d3 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -3658,7 +3658,9 @@
         "off_hint": "Left on, the plugin still installs and loads — the parts that change what a player sees just do nothing.",
         "warning_title": "Warning: this can get your Steam GSLTs banned",
         "warning_description": "Per Valve, running outside their official server guidelines can trigger every Game Server Login Token (GSLT) on the server owner's Steam account to be banned. Enable at your own risk.",
-        "warning_link_label": "Valve's server guidelines"
+        "warning_link_label": "Valve's server guidelines",
+        "already_off": "Already off for this deployment: 5stack Ranks turns Valve's server guidelines off to show ranks in-game, and the risk it carries is against your Steam account rather than one server.",
+        "already_off_link": "5stack Ranks"
       },
       "custom": {
         "add": "Add a plugin",
@@ -3687,7 +3689,8 @@
         "remove": "Remove from catalog",
         "remove_hint": "Uninstall it from your nodes before taking it out of the catalog.",
         "removed": "Removed from the catalog"
-      }
+      },
+      "retry": "Retry"
     },
     "awards": {
       "title": "Awards",
@@ -8281,7 +8284,8 @@
       "archive": "Archive",
       "archived": "Game mode archived",
       "runtime_none": "These plugins have no framework in common, so this mode cannot run anywhere. Remove whichever one targets the other framework.",
-      "runtime_only": "Runs on {runtime} only, because that is the one framework every plugin here ships for."
+      "runtime_only": "Runs on {runtime} only, because that is the one framework every plugin here ships for.",
+      "open_plugin": "Open this plugin's page in a new tab"
     }
   }
 }
diff --git a/pages/plugins/[slug].vue b/pages/plugins/[slug].vue
index 772d8a96f..aa29a263a 100644
--- a/pages/plugins/[slug].vue
+++ b/pages/plugins/[slug].vue
@@ -37,6 +37,8 @@ import {
   FolderOpen,
   Download,
   Wrench,
+  Loader2,
+  RefreshCw,
 } from "lucide-vue-next";
 
 definePageMeta({
@@ -285,8 +287,13 @@ definePageMeta({
 
               <template v-else>
                 <div class="space-y-2">
+                  <!-- Install records intent, and the nodes converge to it on
+                       their own. Once that is on record there is nothing left
+                       to press, so the button becomes the state instead: a
+                       plugin part-way through a rollout is not waiting on the
+                       operator. -->
                   <Button
-                    v-if="installedNodeCount < nodes.length"
+                    v-if="!isRequested"
                     variant="tactical"
                     class="w-full gap-2"
                     :loading="busy === ALL_NODES"
@@ -296,15 +303,45 @@ definePageMeta({
                     {{ $t("pages.plugins.install") }}
                   </Button>
 
-                  <template v-if="installedNodeCount > 0">
-                    <p class="text-center text-xs text-muted-foreground">
-                      {{
-                        $t("pages.plugins.installed_on", {
-                          installed: installedNodeCount,
-                          total: nodes.length,
-                        })
-                      }}
-                    </p>
+                  <template v-else>
+                    <div
+                      class="flex items-center justify-center gap-2 rounded-md border px-3 py-2.5 text-sm font-medium"
+                      :class="{
+                        'border-[hsl(var(--tac-amber)/0.4)] bg-[hsl(var(--tac-amber)/0.08)] text-[hsl(var(--tac-amber))]':
+                          ['Installed', 'Installing'].includes(rollout.key),
+                        'border-border/60 text-muted-foreground':
+                          rollout.key === 'Pending',
+                        'border-destructive/40 bg-destructive/10 text-destructive':
+                          rollout.key === 'Failed',
+                      }"
+                    >
+                      <Check v-if="rollout.key === 'Installed'" class="h-4 w-4" />
+                      <Loader2
+                        v-else-if="rollout.key === 'Installing'"
+                        class="h-4 w-4 animate-spin"
+                      />
+                      <AlertTriangle
+                        v-else-if="rollout.key === 'Failed'"
+                        class="h-4 w-4"
+                      />
+                      <Download v-else class="h-4 w-4" />
+                      {{ rollout.label }}
+                    </div>
+
+                    <!-- A failed node is the one case where pressing something
+                         again is the right move: it re-seeds the request and
+                         nudges the node to try the download once more. -->
+                    <Button
+                      v-if="rollout.key === 'Failed'"
+                      variant="tactical"
+                      class="w-full gap-2"
+                      :loading="busy === ALL_NODES"
+                      @click="install()"
+                    >
+                      <RefreshCw class="h-4 w-4" />
+                      {{ $t("pages.plugins.retry") }}
+                    </Button>
+
                     <Button
                       variant="outline"
                       class="w-full"
@@ -315,6 +352,18 @@ definePageMeta({
                     </Button>
                   </template>
 
+                  <p
+                    v-if="installedNodeCount > 0"
+                    class="text-center text-xs text-muted-foreground"
+                  >
+                    {{
+                      $t("pages.plugins.installed_on", {
+                        installed: installedNodeCount,
+                        total: nodes.length,
+                      })
+                    }}
+                  </p>
+
                   <!-- Only an entry this deployment authored can be taken out of
                        the catalog; a registry one would come back on the next
                        sync. Removal waits until nothing is installed, so the
@@ -370,8 +419,32 @@ definePageMeta({
                 <!-- Only for a plugin whose catalog entry says it cannot work
                      otherwise. Everything else stays compliant without the
                      operator having to think about it. -->
+                <!-- 5stack Ranks turns the same setting off to render ranks
+                     in-game, and the ban it risks is against the Steam account
+                     rather than one server. Once that is on there is nothing
+                     left to decide here, so the switch is replaced by the fact
+                     rather than left sitting there doing nothing. -->
                 <div
-                  v-if="plugin.requires_server_guidelines_disabled && isRequested"
+                  v-if="
+                    plugin.requires_server_guidelines_disabled &&
+                    isRequested &&
+                    guidelinesOffForRanks
+                  "
+                  class="rounded-md border border-border/60 bg-muted/20 p-3 text-xs text-muted-foreground"
+                >
+                  {{ $t("pages.plugins.guidelines.already_off") }}
+                  <NuxtLink
+                    to="/settings/application/matchmaking#ranks"
+                    class="underline underline-offset-2 hover:text-foreground"
+                  >
+                    {{ $t("pages.plugins.guidelines.already_off_link") }}
+                  </NuxtLink>
+                </div>
+
+                <div
+                  v-else-if="
+                    plugin.requires_server_guidelines_disabled && isRequested
+                  "
                   class="space-y-2 rounded-md border border-border/60 bg-muted/20 p-3"
                 >
                   <div class="flex items-start justify-between gap-3">
@@ -813,6 +886,7 @@ export default {
             hot_swappable: true,
             requires_service: true,
             requires_server_guidelines_disabled: true,
+            config_path: true,
             panel: true,
             pairs_with: true,
             versions: [
@@ -821,6 +895,7 @@ export default {
                 runtime: true,
                 version: true,
                 published_at: true,
+                install_path: true,
               },
             ],
           },
@@ -895,7 +970,7 @@ export default {
       useFilePopout().openFiles({
         scope: "node",
         id: nodeId,
-        path: `addons/${this.runtime}/configs/plugins`,
+        path: this.pluginDirectory,
       });
     },
     labelForRuntime(runtime: string) {
@@ -1225,6 +1300,80 @@ export default {
         )
         .map((entry: Record<string, any>) => entry.game_mode);
     },
+    // A framework only writes addons/<runtime>/configs/plugins once a plugin has
+    // run and put something in it, so opening that straight after an install
+    // landed the operator on "this directory doesn't exist yet" for a plugin
+    // that is very much installed. Prefer somewhere that does exist: the config
+    // file the catalog names, else where the release unpacks to.
+    pluginDirectory(): string {
+      const runtime = this.runtime;
+      const configPath = this.plugin?.config_path;
+
+      if (configPath) {
+        const resolved = configPath.replaceAll("{runtime}", runtime);
+        const directory = resolved.split("/").slice(0, -1).join("/");
+
+        if (directory) {
+          return directory;
+        }
+      }
+
+      const installPath = this.versions.find(
+        (version: Record<string, any>) => version.runtime === runtime,
+      )?.install_path;
+
+      if (installPath) {
+        return installPath.replaceAll("{runtime}", runtime);
+      }
+
+      return `addons/${runtime}/configs/plugins`;
+    },
+    // Derived from what the nodes have reported rather than the catalog's
+    // install_state, which is a query field and would sit still while the
+    // rollout it describes moves underneath it.
+    rollout(): { key: string; label: string } {
+      const failed = this.nodes.filter(
+        (node: Record<string, any>) => this.nodeState(node.id).key === "Failed",
+      ).length;
+
+      if (failed > 0) {
+        return {
+          key: "Failed",
+          label: this.$t("pages.plugins.state_failed") as string,
+        };
+      }
+
+      if (this.installedNodeCount >= this.nodes.length) {
+        return {
+          key: "Installed",
+          label: this.$t("pages.plugins.status.Installed") as string,
+        };
+      }
+
+      if (this.installedNodeCount > 0) {
+        return {
+          key: "Installing",
+          label: this.$t("pages.plugins.status.Installing") as string,
+        };
+      }
+
+      return {
+        key: "Pending",
+        label: this.$t("pages.plugins.status.Pending") as string,
+      };
+    },
+    // Both settings, because either one already flips it for the servers that
+    // match type runs on, and the account-level risk is the same either way.
+    guidelinesOffForRanks(): boolean {
+      const settings = useApplicationSettingsStore().settings ?? [];
+
+      return ["fivestack_ranks_matches", "fivestack_ranks_tournaments"].some(
+        (name) =>
+          settings.find(
+            (setting: Record<string, any>) => setting.name === name,
+          )?.value === "true",
+      );
+    },
     canRemoveFromCatalog(): boolean {
       return (
         this.plugin?.source === "custom" &&

From 2cb66f030d36c5b62e567943471064ee7eea352d Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 10:43:02 -0400
Subject: [PATCH 2/7] wip

---
 components/MatchOptions.vue                 |  11 +-
 components/draft-games/CreateDraftGame.vue  | 139 ++++++++++++----
 components/draft-games/DraftModePicker.vue  |  87 ++--------
 components/draft-games/DraftSettingsBar.vue |   4 +-
 components/game-modes/GameModeForm.vue      |   9 +-
 components/match/LineupOverviewRow.vue      |  17 ++
 components/match/MatchTabs.vue              |  41 +++--
 components/servers/ServerForm.vue           |  77 ++++++++-
 i18n/locales/ar_SA.json                     |   7 +-
 i18n/locales/da_DK.json                     |   7 +-
 i18n/locales/de_DE.json                     |   7 +-
 i18n/locales/en.json                        |  30 ++--
 i18n/locales/es_ES.json                     |   7 +-
 i18n/locales/fr_FR.json                     |   7 +-
 i18n/locales/it_IT.json                     |   7 +-
 i18n/locales/ja_JP.json                     |   7 +-
 i18n/locales/ko_KR.json                     |   7 +-
 i18n/locales/pl_PL.json                     |   7 +-
 i18n/locales/pt_BR.json                     | 143 ++++++++--------
 i18n/locales/ru_RU.json                     |   7 +-
 i18n/locales/sv_SE.json                     |   7 +-
 i18n/locales/tr_TR.json                     |   7 +-
 i18n/locales/uk_UA.json                     |   7 +-
 i18n/locales/zh_Hans.json                   |   7 +-
 i18n/locales/zh_Hant.json                   |   7 +-
 nuxt.config.ts                              |   2 +-
 pages/dedicated-servers/[id].vue            |   1 +
 plugins/app-badge.client.ts                 |  26 +++
 public/sw-push.js                           | 174 ++++++++++++++++----
 stores/DraftGamesStore.ts                   |   1 -
 30 files changed, 534 insertions(+), 333 deletions(-)
 create mode 100644 plugins/app-badge.client.ts

diff --git a/components/MatchOptions.vue b/components/MatchOptions.vue
index 841781e3d..b5a0a4c0b 100644
--- a/components/MatchOptions.vue
+++ b/components/MatchOptions.vue
@@ -995,10 +995,10 @@ import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
                 </FormField>
 
                 <p
-                  v-if="selectedGameMode && !selectedGameMode.competitive_safe"
+                  v-if="selectedGameMode"
                   class="text-sm text-muted-foreground"
                 >
-                  {{ $t("match.options.game_mode.not_competitive_safe") }}
+                  {{ $t("match.options.game_mode.unranked_note") }}
                 </p>
               </div>
             </Card>
@@ -1524,7 +1524,6 @@ export default {
             id: true,
             name: true,
             enabled: true,
-            competitive_safe: true,
             supported_runtimes: [{}, true],
           },
         ],
@@ -1942,9 +1941,9 @@ export default {
       return allowsGameMode();
     },
     // Filtered only by what the server could actually load. competitive_safe is
-    // not a filter here: every match type counts toward ELO, so hiding unsafe
-    // modes by type would hide them everywhere. It drives the warning below
-    // instead, and the hard guarantee lives on servers.type = 'Ranked'.
+    // not a filter here: it curates which modes draft lobbies offer, nothing
+    // more. Any mode makes the match unranked (a DB trigger stamps
+    // counts_toward_ranking at creation), which is what the note below says.
     availableGameModes(): Array<Record<string, any>> {
       return (this.gameModes ?? []).filter((mode: Record<string, any>) => {
         if (!mode.enabled) {
diff --git a/components/draft-games/CreateDraftGame.vue b/components/draft-games/CreateDraftGame.vue
index 1e790264c..0e7120c32 100644
--- a/components/draft-games/CreateDraftGame.vue
+++ b/components/draft-games/CreateDraftGame.vue
@@ -17,9 +17,15 @@ import {
   X,
 } from "lucide-vue-next";
 import { e_player_roles_enum } from "~/generated/zeus";
+import { useQuery } from "@vue/apollo-composable";
 import { toTypedSchema } from "~/utilities/vee-validate-zod";
 import matchOptionsValidator from "~/utilities/match-options-validator";
-import { setupOptions, setupOptionsVariables } from "~/utilities/setupOptions";
+import {
+  canSetGameMode,
+  setupOptions,
+  setupOptionsVariables,
+} from "~/utilities/setupOptions";
+import { generateQuery } from "~/graphql/graphqlGen";
 import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
 import { HeightMorph, HeightSwap, Fold } from "~/components/ui/transitions";
 import { useDraftGamesStore } from "~/stores/DraftGamesStore";
@@ -121,16 +127,62 @@ const team2Selection = computed(() =>
   team2Id.value ? { id: team2Id.value, name: source?.team_2?.name } : null,
 );
 
+// A draft room only offers modes flagged for draft lobbies (competitive_safe
+// curates this list, nothing else -- custom modes never count toward ELO).
+// Otherwise mirrors MatchOptions's "available" rule: enabled, and loadable on
+// the server runtime.
+const applicationSettings = useApplicationSettingsStore();
+const modesQueryEnabled = computed(
+  () => canSetGameMode() && applicationSettings.gamePluginsEnabled,
+);
+const { result: gameModesResult } = useQuery(
+  generateQuery({
+    game_modes: [
+      {},
+      {
+        id: true,
+        name: true,
+        description: true,
+        enabled: true,
+        competitive_safe: true,
+        supported_runtimes: [{}, true],
+      },
+    ],
+  }),
+  null,
+  () => ({ fetchPolicy: "cache-first", enabled: modesQueryEnabled.value }),
+);
+const draftEligibleModes = computed<Array<Record<string, any>>>(() =>
+  ((gameModesResult.value as any)?.game_modes ?? []).filter(
+    (gameMode: Record<string, any>) =>
+      gameMode.enabled &&
+      gameMode.competitive_safe &&
+      (gameMode.supported_runtimes ?? []).includes(
+        applicationSettings.gameServerPluginRuntime,
+      ),
+  ),
+);
+// With nothing but Competitive to pick, the step is a page with one answer --
+// drop it from the flow rather than make the host click through it.
+const hasModeStep = computed(() => draftEligibleModes.value.length > 0);
+
+const STEP_MODE = 2;
+const STEP_FORMAT = 3;
 const step = ref(1);
 const steps = [
-  "draft_games.create.step_settings",
-  "draft_games.create.step_mode",
-  "draft_games.create.step_format",
-  "draft_games.create.step_rules",
+  { id: 1, label: "draft_games.create.step_settings" },
+  { id: STEP_MODE, label: "draft_games.create.step_mode" },
+  { id: STEP_FORMAT, label: "draft_games.create.step_format" },
+  { id: 4, label: "draft_games.create.step_rules" },
 ];
-// Format is the step a 1v1 has nothing to choose in; it moved from 2 to 3 when
-// mode was inserted ahead of it.
-const stepDisabled = (n: number) => n === 3 && isDuel.value;
+const visibleSteps = computed(() =>
+  steps.filter((s) => s.id !== STEP_MODE || hasModeStep.value),
+);
+// Format is the step a 1v1 has nothing to choose in.
+const stepDisabled = (n: number) => n === STEP_FORMAT && isDuel.value;
+const reachableSteps = computed(() =>
+  visibleSteps.value.map((s) => s.id).filter((id) => !stepDisabled(id)),
+);
 
 const goToStep = (n: number) => {
   if (stepDisabled(n)) {
@@ -140,24 +192,26 @@ const goToStep = (n: number) => {
 };
 
 const next = () => {
-  let target = step.value + 1;
-  while (target <= steps.length && stepDisabled(target)) {
-    target++;
-  }
-  if (target <= steps.length) {
+  const target = reachableSteps.value.find((id) => id > step.value);
+  if (target) {
     step.value = target;
   }
 };
 const prev = () => {
-  let target = step.value - 1;
-  while (target >= 1 && stepDisabled(target)) {
-    target--;
-  }
-  if (target >= 1) {
+  const target = [...reachableSteps.value]
+    .reverse()
+    .find((id) => id < step.value);
+  if (target) {
     step.value = target;
   }
 };
 
+watch(hasModeStep, (visible) => {
+  if (!visible && step.value === STEP_MODE) {
+    next();
+  }
+});
+
 const modeOptions = [
   {
     value: "Pug",
@@ -309,6 +363,25 @@ const form = useForm({
 });
 validatorComponent.form = form;
 
+// Once the list has settled, a rehosted/edited room carrying a mode that is no
+// longer offered here (archived, pulled from draft lobbies, role lost) falls
+// back to Competitive instead of silently submitting the stale id.
+const modesSettled = computed(
+  () => !modesQueryEnabled.value || gameModesResult.value !== undefined,
+);
+watch(
+  [modesSettled, draftEligibleModes, () => form.values.game_mode_id],
+  ([settled, modes, selected]) => {
+    if (
+      settled &&
+      selected &&
+      !modes.some((gameMode) => gameMode.id === selected)
+    ) {
+      form.setFieldValue("game_mode_id", "");
+    }
+  },
+);
+
 const editBaseline = ref<string | null>(null);
 const settingsSnapshot = () =>
   JSON.stringify({
@@ -530,8 +603,8 @@ const submit = form.handleSubmit(async (values: any) => {
       title: t("common.error"),
       description: t("draft_games.create.team_1_required_error"),
     });
-    // Step 3 -- where the team selector the message is about actually lives.
-    step.value = 3;
+    // Format -- where the team selector the message is about actually lives.
+    step.value = STEP_FORMAT;
     return;
   }
 
@@ -639,29 +712,27 @@ const submit = form.handleSubmit(async (values: any) => {
     @keydown.capture="interacted = true"
   >
     <div class="flex items-center gap-2">
-      <template v-for="(label, index) in steps" :key="label">
+      <template v-for="({ id, label }, index) in visibleSteps" :key="id">
         <button
           type="button"
-          :disabled="stepDisabled(index + 1)"
-          :title="
-            stepDisabled(index + 1) ? $t('draft_games.create.no_formats') : ''
-          "
+          :disabled="stepDisabled(id)"
+          :title="stepDisabled(id) ? $t('draft_games.create.no_formats') : ''"
           class="step-pill flex flex-1 basis-0 items-center justify-center gap-2 rounded-md border px-3 py-2 text-center transition-colors disabled:cursor-not-allowed disabled:opacity-40"
           :class="
-            stepDisabled(index + 1)
+            stepDisabled(id)
               ? 'border-dashed border-border text-muted-foreground/40'
-              : step === index + 1
+              : step === id
                 ? 'border-[hsl(var(--tac-amber))] bg-[hsl(var(--tac-amber)/0.1)] text-foreground'
-                : step > index + 1
+                : step > id
                   ? 'border-[hsl(var(--tac-amber)/0.4)] text-muted-foreground'
                   : 'border-border text-muted-foreground/60'
           "
-          @click="goToStep(index + 1)"
+          @click="goToStep(id)"
         >
           <span
             class="grid h-5 w-5 shrink-0 place-items-center rounded-full border text-[0.6rem] font-bold"
             :class="
-              step >= index + 1 && !stepDisabled(index + 1)
+              step >= id && !stepDisabled(id)
                 ? 'border-[hsl(var(--tac-amber))] text-[hsl(var(--tac-amber))]'
                 : 'border-border'
             "
@@ -675,7 +746,7 @@ const submit = form.handleSubmit(async (values: any) => {
           </span>
         </button>
         <div
-          v-if="index < steps.length - 1"
+          v-if="index < visibleSteps.length - 1"
           class="h-px w-4 shrink-0 bg-border sm:w-8"
         ></div>
       </template>
@@ -687,7 +758,7 @@ const submit = form.handleSubmit(async (values: any) => {
          state. -->
     <HeightMorph :state="step" class="step-stack">
     <Transition name="step">
-      <div v-show="step === 3" class="space-y-5">
+      <div v-show="step === STEP_FORMAT" class="space-y-5">
         <section v-if="!isDuel">
           <AnimatedFilters
             v-model="mode"
@@ -897,7 +968,7 @@ const submit = form.handleSubmit(async (values: any) => {
     </Transition>
 
     <Transition name="step">
-      <div v-show="step === 2" class="space-y-5">
+      <div v-show="step === STEP_MODE" class="space-y-5">
         <section>
           <div :class="tacticalSectionLabelClasses">
             <span :class="tacticalSectionTickClasses"></span>
@@ -908,7 +979,7 @@ const submit = form.handleSubmit(async (values: any) => {
             {{ $t("draft_games.create.mode_description") }}
           </p>
 
-          <DraftModePicker :form="form" />
+          <DraftModePicker :form="form" :modes="draftEligibleModes" />
         </section>
       </div>
     </Transition>
diff --git a/components/draft-games/DraftModePicker.vue b/components/draft-games/DraftModePicker.vue
index 9bb559214..657e59cf9 100644
--- a/components/draft-games/DraftModePicker.vue
+++ b/components/draft-games/DraftModePicker.vue
@@ -1,6 +1,17 @@
 <script setup lang="ts">
-import { Badge } from "~/components/ui/badge";
-import { Check, Puzzle, ShieldAlert } from "lucide-vue-next";
+import { computed } from "vue";
+import { Check, Puzzle } from "lucide-vue-next";
+
+const props = defineProps<{
+  form: any;
+  modes: Array<Record<string, any>>;
+}>();
+
+const selected = computed<string>(() => props.form.values.game_mode_id ?? "");
+
+const select = (id: string) => {
+  props.form.setFieldValue("game_mode_id", id);
+};
 </script>
 
 <template>
@@ -53,81 +64,11 @@ import { Check, Puzzle, ShieldAlert } from "lucide-vue-next";
       </div>
 
       <div class="min-w-0 flex-1">
-        <div class="flex items-center gap-2">
-          <span class="truncate font-medium">{{ mode.name }}</span>
-          <Badge
-            v-if="!mode.competitive_safe"
-            variant="outline"
-            class="shrink-0 gap-1 text-[0.6rem]"
-          >
-            <ShieldAlert class="h-3 w-3" />
-            {{ $t("draft_games.bar.unranked") }}
-          </Badge>
-        </div>
+        <p class="truncate font-medium">{{ mode.name }}</p>
         <p class="truncate text-xs text-muted-foreground">
           {{ mode.description }}
         </p>
       </div>
     </button>
-
-    <p v-if="modes.length === 0" class="text-sm text-muted-foreground">
-      {{ $t("draft_games.create.mode_empty") }}
-    </p>
   </div>
 </template>
-
-<script lang="ts">
-import { generateQuery } from "~/graphql/graphqlGen";
-
-export default {
-  props: {
-    form: {
-      type: Object,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      gameModes: [] as Array<Record<string, any>>,
-    };
-  },
-  apollo: {
-    gameModes: {
-      fetchPolicy: "cache-first",
-      query: generateQuery({
-        game_modes: [
-          {},
-          {
-            id: true,
-            name: true,
-            description: true,
-            enabled: true,
-            competitive_safe: true,
-          },
-        ],
-      }),
-      update(data: { game_modes: Array<Record<string, any>> }) {
-        return data.game_modes;
-      },
-      skip() {
-        return !useApplicationSettingsStore().gamePluginsEnabled;
-      },
-    },
-  },
-  methods: {
-    select(id: string) {
-      this.form.setFieldValue("game_mode_id", id);
-    },
-  },
-  computed: {
-    selected(): string {
-      return this.form.values.game_mode_id ?? "";
-    },
-    modes(): Array<Record<string, any>> {
-      return (this.gameModes ?? []).filter(
-        (mode: Record<string, any>) => mode.enabled,
-      );
-    },
-  },
-};
-</script>
diff --git a/components/draft-games/DraftSettingsBar.vue b/components/draft-games/DraftSettingsBar.vue
index 4ac7efa80..90952efb9 100644
--- a/components/draft-games/DraftSettingsBar.vue
+++ b/components/draft-games/DraftSettingsBar.vue
@@ -259,7 +259,9 @@ const leave = async () => {
                  list: players decide whether to join off this line. -->
             <span v-if="gameMode" class="gamemode">
               {{ gameMode.name }}
-              <span v-if="!gameMode.competitive_safe" class="gamemode__unranked">
+              <!-- Every custom mode is unranked; the badge states it rather
+                   than depending on any per-mode flag. -->
+              <span class="gamemode__unranked">
                 {{ $t("draft_games.bar.unranked") }}
               </span>
             </span>
diff --git a/components/game-modes/GameModeForm.vue b/components/game-modes/GameModeForm.vue
index e948dd4ea..d9edb9af5 100644
--- a/components/game-modes/GameModeForm.vue
+++ b/components/game-modes/GameModeForm.vue
@@ -12,7 +12,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import { AlertTriangle, Trash2, ExternalLink } from "lucide-vue-next";
+import { Trash2, ExternalLink } from "lucide-vue-next";
 import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
 </script>
 
@@ -67,13 +67,6 @@ import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
         </FormField>
       </div>
 
-      <p
-        v-if="!form.values.competitive_safe"
-        class="flex items-start gap-2 text-sm text-muted-foreground"
-      >
-        <AlertTriangle class="mt-0.5 h-4 w-4 shrink-0" />
-        {{ $t("game_modes.form.competitive_safe_warning") }}
-      </p>
     </div>
 
     <!-- Compatibility is derived from the plugins below, not declared here: a
diff --git a/components/match/LineupOverviewRow.vue b/components/match/LineupOverviewRow.vue
index b56d902e4..3c3cbd48e 100644
--- a/components/match/LineupOverviewRow.vue
+++ b/components/match/LineupOverviewRow.vue
@@ -26,6 +26,8 @@ import {
   UserMinus,
 } from "lucide-vue-next";
 import TimezoneFlag from "~/components/TimezoneFlag.vue";
+import SanctionStatusBadge from "~/components/SanctionStatusBadge.vue";
+import PlayerVacBadge from "~/components/PlayerVacBadge.vue";
 import PlayerElo from "~/components/PlayerElo.vue";
 import PlayerFaceitRank from "~/components/PlayerFaceitRank.vue";
 import RenderHighlightForPlayerDialog from "~/components/match/RenderHighlightForPlayerDialog.vue";
@@ -182,6 +184,12 @@ const DASH = "—";
                     >
                       {{ member.player.name }}
                     </NuxtLink>
+                    <SanctionStatusBadge
+                      v-if="sanctionType(member)"
+                      :type="sanctionType(member)!"
+                      variant="inline"
+                    />
+                    <PlayerVacBadge :player="member.player" />
                   </div>
                   <div
                     class="flex items-center gap-1.5 min-w-0 mt-0.5 text-muted-foreground"
@@ -422,6 +430,15 @@ export default {
     },
   },
   methods: {
+    // Mobile row is hand-rolled (not LineupMember/PlayerDisplay); mirror
+    // PlayerDisplay's activeSanctionType severity order.
+    sanctionType(member: any): "ban" | "mute" | "gag" | null {
+      const player = member?.player;
+      if (player?.is_banned) return "ban";
+      if (player?.is_muted) return "mute";
+      if (player?.is_gagged) return "gag";
+      return null;
+    },
     faceitSkillLevel(member: any): number | null {
       return (
         member?.player?.faceit_rank_history?.[0]?.skill_level ??
diff --git a/components/match/MatchTabs.vue b/components/match/MatchTabs.vue
index f366e95a1..70e83a3e4 100644
--- a/components/match/MatchTabs.vue
+++ b/components/match/MatchTabs.vue
@@ -892,6 +892,32 @@ const allMapsStatsQuery = generateQuery({
   ],
 });
 
+// Layers a stats lineup over the shell lineup (matchLineupsGraphql). A plain
+// spread would replace `lineup_players` wholesale and drop every player field
+// only the shell selects (faceit_rank_history, etc.), so players are merged
+// per steam_id instead.
+function mergeLineup(shell: any, stats: any) {
+  if (!shell) return stats;
+  const shellPlayers = new Map<string, any>(
+    (shell.lineup_players ?? [])
+      .filter((lp: any) => lp?.steam_id)
+      .map((lp: any) => [String(lp.steam_id), lp]),
+  );
+  return {
+    ...shell,
+    ...stats,
+    lineup_players: (stats.lineup_players ?? []).map((lp: any) => {
+      const base = lp?.steam_id ? shellPlayers.get(String(lp.steam_id)) : null;
+      if (!base) return lp;
+      return {
+        ...base,
+        ...lp,
+        player: lp.player ? { ...base.player, ...lp.player } : base.player,
+      };
+    }),
+  };
+}
+
 export default {
   emits: ["clear-active-map", "select-map"],
   props: {
@@ -1048,26 +1074,19 @@ export default {
     },
     activeLineup1() {
       if (this.activeMap && this.mapStats?.lineup_1) {
-        return this.mapStats.lineup_1;
+        return mergeLineup(this.match.lineup_1, this.mapStats.lineup_1);
       }
       if (!this.activeMap && this.allMapsStats?.lineup_1) {
-        // Keep shell fields (team, captain flags, is_ready); add stats players.
-        return {
-          ...this.match.lineup_1,
-          ...this.allMapsStats.lineup_1,
-        };
+        return mergeLineup(this.match.lineup_1, this.allMapsStats.lineup_1);
       }
       return this.match.lineup_1;
     },
     activeLineup2() {
       if (this.activeMap && this.mapStats?.lineup_2) {
-        return this.mapStats.lineup_2;
+        return mergeLineup(this.match.lineup_2, this.mapStats.lineup_2);
       }
       if (!this.activeMap && this.allMapsStats?.lineup_2) {
-        return {
-          ...this.match.lineup_2,
-          ...this.allMapsStats.lineup_2,
-        };
+        return mergeLineup(this.match.lineup_2, this.allMapsStats.lineup_2);
       }
       return this.match.lineup_2;
     },
diff --git a/components/servers/ServerForm.vue b/components/servers/ServerForm.vue
index a108819b6..1181fe7ca 100644
--- a/components/servers/ServerForm.vue
+++ b/components/servers/ServerForm.vue
@@ -17,6 +17,7 @@ import {
   SelectContent,
   SelectGroup,
   SelectItem,
+  SelectLabel,
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
@@ -162,15 +163,20 @@ const showConnectPassword = ref(false);
           name="type"
         >
           <FormItem>
-            <FormLabel>{{ $t("server.form.type") }}</FormLabel>
+            <FormLabel>{{ $t("server.form.game_mode") }}</FormLabel>
             <Select v-bind="componentField">
               <FormControl>
                 <SelectTrigger>
-                  <SelectValue :placeholder="$t('server.form.select_type')" />
+                  <SelectValue
+                    :placeholder="$t('server.form.select_game_mode')"
+                  />
                 </SelectTrigger>
               </FormControl>
               <SelectContent>
                 <SelectGroup>
+                  <SelectLabel v-if="customModes.length">
+                    {{ $t("server.form.valve_preset_group") }}
+                  </SelectLabel>
                   <SelectItem
                     :value="serverType"
                     v-for="serverType in valveModeTypes"
@@ -179,6 +185,18 @@ const showConnectPassword = ref(false);
                     {{ serverType }}
                   </SelectItem>
                 </SelectGroup>
+                <SelectGroup v-if="customModes.length">
+                  <SelectLabel>
+                    {{ $t("server.form.custom_mode_group") }}
+                  </SelectLabel>
+                  <SelectItem
+                    :value="gameMode.id"
+                    v-for="gameMode in customModes"
+                    :key="gameMode.id"
+                  >
+                    {{ gameMode.name }}
+                  </SelectItem>
+                </SelectGroup>
               </SelectContent>
             </Select>
             <FormMessage />
@@ -439,6 +457,7 @@ import { typedGql } from "~/generated/zeus/typedDocumentNode";
 import { order_by } from "~/generated/zeus";
 import { e_server_types_enum } from "~/generated/zeus";
 import { toast } from "@/components/ui/toast";
+import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
 
 export default {
   emits: ["updated"],
@@ -460,6 +479,26 @@ export default {
         ],
       }),
     },
+    gameModes: {
+      fetchPolicy: "cache-first",
+      query: generateQuery({
+        game_modes: [
+          {},
+          {
+            id: true,
+            name: true,
+            enabled: true,
+            supported_runtimes: [{}, true],
+          },
+        ],
+      }),
+      update(data: { game_modes: Array<Record<string, any>> }) {
+        return data.game_modes;
+      },
+      skip() {
+        return !useApplicationSettingsStore().gamePluginsEnabled;
+      },
+    },
     $subscribe: {
       game_server_nodes: {
         query: typedGql("subscription")({
@@ -504,6 +543,7 @@ export default {
       baseline: null as string | null,
       isDirty: false,
       gameServerNodes: [],
+      gameModes: [] as Array<Record<string, any>>,
       form: useForm({
         validationSchema: toTypedSchema(
           z
@@ -631,11 +671,37 @@ export default {
         (t) => t !== e_server_types_enum.Ranked,
       );
     },
+    // Custom game modes share the picker with the Valve presets: both answer
+    // "what does this server play". A preset is stored in servers.type, a mode
+    // in servers.game_mode_id, and the mode's uuid never collides with an enum
+    // value. Modes are CS2 plugin sets, so csgo servers only see presets.
+    customModes(): Array<Record<string, any>> {
+      if (this.form.values.game === "csgo") {
+        return [];
+      }
+      const runtime = useApplicationSettingsStore().gameServerPluginRuntime;
+      return (this.gameModes ?? []).filter(
+        (mode: Record<string, any>) =>
+          mode.enabled && (mode.supported_runtimes ?? []).includes(runtime),
+      );
+    },
     isEditingGameServerNode() {
       return !!(this.server && this.server.game_server_node_id);
     },
   },
   methods: {
+    // The form's `type` field holds either a Valve preset (enum value) or a
+    // custom mode's uuid; this splits it back into the two columns.
+    resolveTypeAndMode(): { type: string; game_mode_id: string | null } {
+      const selected = this.form.values.type;
+      if (
+        selected &&
+        !Object.values(e_server_types_enum).includes(selected)
+      ) {
+        return { type: e_server_types_enum.Custom, game_mode_id: selected };
+      }
+      return { type: selected || "Ranked", game_mode_id: null };
+    },
     populateServer(server) {
       const {
         host,
@@ -646,6 +712,7 @@ export default {
         type,
         connect_password,
         game_server_node_id,
+        game_mode_id,
         max_players,
       } = server;
       this.form.setValues({
@@ -660,7 +727,7 @@ export default {
         game_server_node_id: game_server_node_id
           ? game_server_node_id.toString()
           : undefined,
-        type: type || "Ranked",
+        type: game_mode_id || type || "Ranked",
         connect_password: connect_password || "",
         max_players: max_players || 32,
       });
@@ -712,7 +779,7 @@ export default {
                     id: this.server.id,
                   },
                   _set: {
-                    type: formValues.type,
+                    ...this.resolveTypeAndMode(),
                     label: formValues.label,
                     game: formValues.game || "cs2",
                     rcon_password: formValues.rcon_password,
@@ -747,7 +814,7 @@ export default {
               {
                 object: {
                   enabled: true,
-                  type: formValues.type,
+                  ...this.resolveTypeAndMode(),
                   label: formValues.label,
                   game: formValues.game || "cs2",
                   region: formValues.use_game_server_node
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 4c09be96e..29e2018a3 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "نمط اللعب",
         "none": "Competitive (بلا نمط)",
-        "description": "يحمّل مجموعة من الإضافات ومتغيرات الكونسول على سيرفر المباراة.",
-        "not_competitive_safe": "هذا النمط غير معلَّم كآمن للعب التنافسي. لا يزال يُحتسب في ELO — علّمه آمناً للتنافسي في إعدادات النمط إن كان ذلك مقصوداً."
+        "description": "يحمّل مجموعة من الإضافات ومتغيرات الكونسول على سيرفر المباراة."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "النمط",
       "mode_description": "كيف تُلعب المباراة. اتركه على Competitive لمباراة عادية، أو اختر نمطاً لتحميل إضافاته على السيرفر.",
       "mode_none": "Competitive",
-      "mode_none_hint": "قواعد قياسية. تُحتسب في ELO ولوحات الصدارة.",
-      "mode_empty": "لا توجد أنماط لعب معدّة بعد. يمكن للمسؤول إضافتها من الإعدادات."
+      "mode_none_hint": "قواعد قياسية. تُحتسب في ELO ولوحات الصدارة."
     },
     "host": "المستضيف",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "الوصف",
       "competitive_safe": "آمن للعب التنافسي",
       "competitive_safe_description": "ما إذا كان يمكن استخدام هذا النمط في مباراة مصنّفة أو مباراة توفيق.",
-      "competitive_safe_warning": "سيُعرض هذا النمط في المباريات الودّية فقط. السيرفرات المصنّفة لا ترث أي نمط، لذا يبدأ التوفيق دائماً بمجموعة إضافات نظيفة.",
       "plugins": "الإضافات",
       "plugins_description": "تُحمّل بالترتيب المعروض، بعد أي شيء وُضع يدوياً في custom-plugins.",
       "no_plugins": "لا توجد إضافات لعبة في الدليل بعد. زامن السجل وثبّت واحدة أولاً.",
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 723ca3d7c..0f355914a 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Spiltilstand",
         "none": "Competitive (ingen tilstand)",
-        "description": "Indlæser et sæt plugins og console-variabler på kampserveren.",
-        "not_competitive_safe": "Denne tilstand er ikke markeret som sikker til competitive. Den tæller stadig med i ELO — markér den som sikker til competitive på selve tilstanden, hvis det er meningen."
+        "description": "Indlæser et sæt plugins og console-variabler på kampserveren."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Tilstand",
       "mode_description": "Hvordan kampen spilles. Lad den stå på Competitive for en normal kamp, eller vælg en tilstand for at indlæse dens plugins på serveren.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Standardregler. Tæller med i ELO og ranglister.",
-      "mode_empty": "Der er endnu ingen spiltilstande sat op. En administrator kan tilføje dem under Indstillinger."
+      "mode_none_hint": "Standardregler. Tæller med i ELO og ranglister."
     },
     "host": "Værten",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Beskrivelse",
       "competitive_safe": "Sikker til competitive",
       "competitive_safe_description": "Om denne tilstand må bruges af en ranglet kamp eller en matchmaking-kamp.",
-      "competitive_safe_warning": "Denne tilstand tilbydes kun på casual-kampe. Ranglede servere arver aldrig en tilstand, så matchmaking starter altid med et rent plugin-sæt.",
       "plugins": "Plugins",
       "plugins_description": "Indlæses i den viste rækkefølge, efter alt der er lagt manuelt i custom-plugins.",
       "no_plugins": "Ingen spil-plugins i kataloget endnu. Synkronisér registry og installér et først.",
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index 2df91e5ee..fffe91142 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Spielmodus",
         "none": "Competitive (kein Modus)",
-        "description": "Lädt eine Reihe von Plugins und Console-Variablen auf dem Match-Server.",
-        "not_competitive_safe": "Dieser Modus ist nicht als Competitive-tauglich markiert. Er zählt trotzdem für ELO — markiere ihn im Modus selbst als Competitive-tauglich, wenn das so gewollt ist."
+        "description": "Lädt eine Reihe von Plugins und Console-Variablen auf dem Match-Server."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Modus",
       "mode_description": "Wie das Match gespielt wird. Für ein normales Match auf Competitive lassen, oder einen Modus wählen, damit dessen Plugins auf dem Server geladen werden.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Standardregeln. Zählt für ELO und Bestenlisten.",
-      "mode_empty": "Es sind noch keine Spielmodi eingerichtet. Ein Administrator kann sie unter Einstellungen anlegen."
+      "mode_none_hint": "Standardregeln. Zählt für ELO und Bestenlisten."
     },
     "host": "Der Host",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Beschreibung",
       "competitive_safe": "Für Competitive geeignet",
       "competitive_safe_description": "Ob dieser Modus von Ranked- oder Matchmaking-Matches genutzt werden darf.",
-      "competitive_safe_warning": "Dieser Modus wird nur bei Casual-Matches angeboten. Ranked-Server erben nie einen Modus, Matchmaking startet also immer mit einem sauberen Plugin-Satz.",
       "plugins": "Plugins",
       "plugins_description": "Werden in der gezeigten Reihenfolge geladen, nach allem, was von Hand in custom-plugins liegt.",
       "no_plugins": "Noch keine Spiel-Plugins im Katalog. Synchronisiere die Registry und installiere zuerst eines.",
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 6122817d3..1d70d4e0c 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -2463,7 +2463,7 @@
         "game_modes": {
           "title": "Game Modes",
           "section": "Game Modes",
-          "description": "A mode bundles the plugins, cvars and rules that make a match play differently. Matches and community servers pick one.",
+          "description": "A mode bundles the plugins, cvars and rules that make a match play differently. Matches and community servers pick one; matches with a custom mode never count toward ELO.",
           "create": "New Mode",
           "create_title": "New Game Mode",
           "edit_title": "Edit Game Mode",
@@ -2471,8 +2471,8 @@
           "empty": "No game modes yet. Create one to let matches run something other than competitive.",
           "requires_plugins": "Enable Game Plugins first — a mode has nothing to load without them.",
           "disabled": "Disabled",
-          "competitive": "Competitive safe",
-          "casual_only": "Casual only",
+          "competitive": "In draft lobbies",
+          "casual_only": "Hidden from drafts",
           "plugin_count": "{count} plugins"
         }
       },
@@ -5266,7 +5266,7 @@
         "title": "Game Mode",
         "none": "Competitive (no mode)",
         "description": "Loads a set of plugins and console variables on the match server.",
-        "not_competitive_safe": "This mode is not marked safe for competitive play. It still counts toward ELO — mark it competitive safe on the mode itself if that is intended."
+        "unranked_note": "Matches with a custom game mode never count toward ELO or the leaderboards."
       }
     },
     "schedule": {
@@ -6598,13 +6598,17 @@
       "game_server_node_description": "Select a game server node with CS installed",
       "type": "Server Type",
       "select_type": "Select Server Type",
+      "game_mode": "Game Mode",
+      "select_game_mode": "Select Game Mode",
+      "valve_preset_group": "Valve presets",
+      "custom_mode_group": "Custom modes",
       "game": "Game",
       "csgo_ranked_unavailable_title": "Ranked Not Available",
       "csgo_ranked_unavailable_description": "Ranked mode is not yet available for CS:GO servers.",
       "ranked_server": "Ranked Server",
       "ranked_server_description": "Fully managed ranked experience by 5stack.",
-      "valve_presets": "Valve Presets",
-      "valve_presets_description": "Choose from casual/competitive and other Valve-presets.",
+      "valve_presets": "Valve Presets & Custom Modes",
+      "valve_presets_description": "Run a Valve preset like casual or deathmatch, or a custom game mode with its plugins.",
       "connect_password": "Connect Password",
       "connect_password_description": "Password required to connect to the server (optional)",
       "rcon_password": "RCON Password",
@@ -7113,15 +7117,14 @@
       "clear_team": "Clear team",
       "both_teams_private": "With both teams set the lineup is locked, so this lobby stays private.",
       "step_format": "Draft Mode",
-      "step_settings": "Match Settings",
+      "step_settings": "Game Settings",
       "step_rules": "Lobby Rules",
       "back": "Back",
       "next": "Next",
       "step_mode": "Mode",
-      "mode_description": "How the match plays. Leave it on Competitive for a normal match, or pick a mode to load its plugins on the server.",
+      "mode_description": "How the match plays. Leave it on Competitive for a normal match, or pick a mode to load its plugins on the server. Custom modes never count toward ELO.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Standard rules. Counts toward ELO and leaderboards.",
-      "mode_empty": "No game modes are set up yet. An administrator can add them under Settings."
+      "mode_none_hint": "Standard rules. Counts toward ELO and leaderboards."
     },
     "host": "The host",
     "invite": {
@@ -7255,7 +7258,7 @@
       "kick_confirm_title": "Remove this player?",
       "kick_confirm_description": "They will be removed from the draft room.",
       "load_failed": "Could not load this draft room.",
-      "match_settings": "Match Settings"
+      "match_settings": "Game Settings"
     },
     "bar": {
       "region": "Region",
@@ -8268,9 +8271,8 @@
       "name": "Name",
       "slug": "Slug",
       "description": "Description",
-      "competitive_safe": "Safe for competitive play",
-      "competitive_safe_description": "Whether this mode may be used by a ranked or matchmaking match.",
-      "competitive_safe_warning": "This mode will only be offered on casual matches. Ranked servers never inherit a mode, so matchmaking always comes up on a clean plugin set.",
+      "competitive_safe": "Offer in draft lobbies",
+      "competitive_safe_description": "Lobby hosts can pick this mode when creating a draft room. Matches with any custom mode never count toward ELO or the leaderboards.",
       "plugins": "Plugins",
       "plugins_description": "Loaded in the order shown, after anything placed in custom-plugins by hand.",
       "no_plugins": "No game plugins in the catalog yet. Sync the registry and install one first.",
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 822040a72..75b2e5f0e 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Modo de juego",
         "none": "Competitivo (sin modo)",
-        "description": "Carga un conjunto de plugins y variables de consola en el servidor de la partida.",
-        "not_competitive_safe": "Este modo no está marcado como apto para competitivo. Aun así cuenta para el ELO: márcalo como apto para competitivo en el propio modo si es lo que quieres."
+        "description": "Carga un conjunto de plugins y variables de consola en el servidor de la partida."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Modo",
       "mode_description": "Cómo se juega la partida. Déjalo en Competitivo para una partida normal, o elige un modo para cargar sus plugins en el servidor.",
       "mode_none": "Competitivo",
-      "mode_none_hint": "Reglas estándar. Cuenta para el ELO y las clasificaciones.",
-      "mode_empty": "Todavía no hay modos de juego configurados. Un administrador puede añadirlos en Ajustes."
+      "mode_none_hint": "Reglas estándar. Cuenta para el ELO y las clasificaciones."
     },
     "host": "El anfitrión",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Descripción",
       "competitive_safe": "Apto para juego competitivo",
       "competitive_safe_description": "Si este modo puede usarse en partidas clasificatorias o de emparejamiento.",
-      "competitive_safe_warning": "Este modo solo se ofrecerá en partidas casual. Los servidores clasificatorios nunca heredan un modo, así que el emparejamiento siempre arranca con un conjunto de plugins limpio.",
       "plugins": "Plugins",
       "plugins_description": "Se cargan en el orden mostrado, después de lo que se haya puesto a mano en custom-plugins.",
       "no_plugins": "Todavía no hay plugins de juego en el catálogo. Sincroniza el registro e instala uno primero.",
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index c5c5e1b9d..c74e64d67 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Mode de jeu",
         "none": "Compétitif (aucun mode)",
-        "description": "Charge un ensemble de plugins et de variables de console sur le serveur du match.",
-        "not_competitive_safe": "Ce mode n'est pas marqué comme compatible avec le jeu compétitif. Il compte quand même pour l'ELO — marque-le comme compatible compétitif dans le mode lui-même si c'est voulu."
+        "description": "Charge un ensemble de plugins et de variables de console sur le serveur du match."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Mode",
       "mode_description": "Comment le match se joue. Laisse sur Compétitif pour un match normal, ou choisis un mode pour charger ses plugins sur le serveur.",
       "mode_none": "Compétitif",
-      "mode_none_hint": "Règles standard. Compte pour l'ELO et les classements.",
-      "mode_empty": "Aucun mode de jeu n'est encore configuré. Un administrateur peut en ajouter dans les Paramètres."
+      "mode_none_hint": "Règles standard. Compte pour l'ELO et les classements."
     },
     "host": "L'hôte",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Description",
       "competitive_safe": "Compatible avec le jeu compétitif",
       "competitive_safe_description": "Si ce mode peut être utilisé par un match classé ou de matchmaking.",
-      "competitive_safe_warning": "Ce mode ne sera proposé que sur les matchs casual. Les serveurs classés n'héritent jamais d'un mode, le matchmaking démarre donc toujours avec un jeu de plugins propre.",
       "plugins": "Plugins",
       "plugins_description": "Chargés dans l'ordre affiché, après tout ce qui a été placé à la main dans custom-plugins.",
       "no_plugins": "Aucun plugin de jeu dans le catalogue. Synchronise le registre et installes-en un d'abord.",
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index 2f4d0adca..e9d0c45a7 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Modalità di gioco",
         "none": "Competitive (nessuna modalità)",
-        "description": "Carica un insieme di plugin e variabili di console sul server della partita.",
-        "not_competitive_safe": "Questa modalità non è contrassegnata come adatta al gioco competitivo. Conta comunque per l'ELO — contrassegnala come adatta al competitive nella modalità stessa se è voluto."
+        "description": "Carica un insieme di plugin e variabili di console sul server della partita."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Modalità",
       "mode_description": "Come si gioca la partita. Lascia su Competitive per una partita normale, oppure scegli una modalità per caricarne i plugin sul server.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Regole standard. Conta per l'ELO e le classifiche.",
-      "mode_empty": "Non è ancora configurata alcuna modalità di gioco. Un amministratore può aggiungerle nelle Impostazioni."
+      "mode_none_hint": "Regole standard. Conta per l'ELO e le classifiche."
     },
     "host": "L'host",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Descrizione",
       "competitive_safe": "Adatta al gioco competitivo",
       "competitive_safe_description": "Se questa modalità può essere usata da una partita classificata o di matchmaking.",
-      "competitive_safe_warning": "Questa modalità sarà offerta solo nelle partite casual. I server classificati non ereditano mai una modalità, quindi il matchmaking parte sempre con un set di plugin pulito.",
       "plugins": "Plugin",
       "plugins_description": "Caricati nell'ordine mostrato, dopo tutto ciò che è stato messo a mano in custom-plugins.",
       "no_plugins": "Nessun plugin di gioco nel catalogo. Sincronizza il registry e installane uno prima.",
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 5f8e2ae02..9331e9cde 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "ゲームモード",
         "none": "Competitive（モードなし）",
-        "description": "試合サーバーにプラグインとコンソール変数のセットを読み込みます。",
-        "not_competitive_safe": "このモードは競技用に安全とは設定されていません。それでも ELO には反映されます。意図的であれば、モード側で競技用に安全と設定してください。"
+        "description": "試合サーバーにプラグインとコンソール変数のセットを読み込みます。"
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "モード",
       "mode_description": "試合の進み方です。通常の試合なら Competitive のままにし、モードを選ぶとそのプラグインがサーバーに読み込まれます。",
       "mode_none": "Competitive",
-      "mode_none_hint": "標準ルール。ELO とリーダーボードに反映されます。",
-      "mode_empty": "ゲームモードがまだ設定されていません。管理者が設定から追加できます。"
+      "mode_none_hint": "標準ルール。ELO とリーダーボードに反映されます。"
     },
     "host": "ホスト",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "説明",
       "competitive_safe": "競技プレイに安全",
       "competitive_safe_description": "このモードをランクマッチやマッチメイキングの試合で使用できるかどうか。",
-      "competitive_safe_warning": "このモードはカジュアル試合でのみ選択できます。ランクサーバーはモードを引き継がないため、マッチメイキングは常にクリーンなプラグイン構成で始まります。",
       "plugins": "プラグイン",
       "plugins_description": "表示順に読み込まれます（custom-plugins に手動で置いたものの後）。",
       "no_plugins": "カタログにゲームプラグインがまだありません。まずレジストリを同期してインストールしてください。",
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index 5007e87c4..adced465f 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "게임 모드",
         "none": "컴페티티브 (모드 없음)",
-        "description": "경기 서버에 플러그인과 콘솔 변수 세트를 불러옵니다.",
-        "not_competitive_safe": "이 모드는 컴페티티브에 안전한 것으로 표시되어 있지 않습니다. 그래도 ELO에는 반영됩니다. 의도한 것이라면 모드 자체에서 컴페티티브 가능으로 표시하세요."
+        "description": "경기 서버에 플러그인과 콘솔 변수 세트를 불러옵니다."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "모드",
       "mode_description": "경기 진행 방식입니다. 일반 경기는 컴페티티브로 두고, 모드를 선택하면 해당 플러그인이 서버에 로드됩니다.",
       "mode_none": "컴페티티브",
-      "mode_none_hint": "표준 규칙. ELO와 리더보드에 반영됩니다.",
-      "mode_empty": "설정된 게임 모드가 아직 없습니다. 관리자가 설정에서 추가할 수 있습니다."
+      "mode_none_hint": "표준 규칙. ELO와 리더보드에 반영됩니다."
     },
     "host": "호스트",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "설명",
       "competitive_safe": "컴페티티브 플레이에 안전",
       "competitive_safe_description": "이 모드를 랭크 또는 매치메이킹 경기에서 사용할 수 있는지 여부입니다.",
-      "competitive_safe_warning": "이 모드는 캐주얼 경기에서만 제공됩니다. 랭크 서버는 모드를 물려받지 않으므로 매치메이킹은 항상 깨끗한 플러그인 구성으로 시작합니다.",
       "plugins": "플러그인",
       "plugins_description": "표시된 순서대로, custom-plugins에 수동으로 넣은 것 다음에 로드됩니다.",
       "no_plugins": "카탈로그에 게임 플러그인이 아직 없습니다. 먼저 레지스트리를 동기화하고 하나 설치하세요.",
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index d64256c6a..522988f65 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Tryb gry",
         "none": "Competitive (bez trybu)",
-        "description": "Wczytuje zestaw wtyczek i zmiennych konsoli na serwerze meczowym.",
-        "not_competitive_safe": "Ten tryb nie jest oznaczony jako bezpieczny dla gry competitive. Nadal liczy się do ELO — oznacz go w ustawieniach trybu jako bezpieczny dla competitive, jeśli tak ma być."
+        "description": "Wczytuje zestaw wtyczek i zmiennych konsoli na serwerze meczowym."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Tryb",
       "mode_description": "Jak przebiega mecz. Zostaw Competitive dla zwykłego meczu albo wybierz tryb, aby wczytać jego wtyczki na serwerze.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Standardowe zasady. Liczy się do ELO i rankingów.",
-      "mode_empty": "Nie skonfigurowano jeszcze żadnych trybów gry. Administrator może je dodać w Ustawieniach."
+      "mode_none_hint": "Standardowe zasady. Liczy się do ELO i rankingów."
     },
     "host": "Host",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Opis",
       "competitive_safe": "Bezpieczny dla gry competitive",
       "competitive_safe_description": "Czy ten tryb może być użyty w meczu rankingowym lub matchmakingowym.",
-      "competitive_safe_warning": "Ten tryb będzie oferowany tylko w meczach casual. Serwery rankingowe nigdy nie dziedziczą trybu, więc matchmaking zawsze startuje z czystym zestawem wtyczek.",
       "plugins": "Wtyczki",
       "plugins_description": "Wczytywane w pokazanej kolejności, po wszystkim, co ręcznie umieszczono w custom-plugins.",
       "no_plugins": "Brak wtyczek gry w katalogu. Najpierw zsynchronizuj rejestr i zainstaluj jakąś.",
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index 0d446554c..77d7deec6 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -1239,40 +1239,40 @@
         "total_caption": "painéis distintos já vistos"
       },
       "totals": {
-          "self_reported": "Os painéis são auto-hospedados e reportam essas contagens por conta própria; os valores são validados na chegada, mas não podem ser verificados de forma independente. A infraestrutura é uma contagem pontual a partir do último relatório de cada painel, não um total contínuo.",
-          "game_server_nodes": "Nós de servidores de jogo",
-          "game_server_nodes_caption": "registrados atualmente",
-          "servers": "Servidores",
-          "servers_caption": "registrados atualmente",
-          "public_servers": "Públicos",
-          "public_servers_caption": "servidores não ranqueados",
-          "matches": "Partidas hospedadas",
-          "matches_week": "Hospedadas 7d",
-          "matches_month": "Hospedadas 30d",
-          "matches_year": "Hospedadas 1y",
-          "maps_played": "Mapas jogados",
-          "matches_imported": "Partidas importadas",
-          "matches_imported_month": "Importadas 30d",
-          "players": "Jogadores",
-          "players_played": "Jogaram uma partida",
-          "players_known": "Steam IDs vistos",
-          "players_active": "Jogadores ativos 30d",
-          "teams": "Equipes",
-          "infrastructure": "Infraestrutura",
-          "match_volume": "Volume de partidas",
-          "community": "Comunidade",
-          "matches_caption": "todo o período, em toda a frota",
-          "players_caption": "em uma lineup, últimos 30 dias",
-          "hosted_hint": "Hospedadas contam apenas partidas que um painel rodou por conta própria. Partidas importadas vêm do FACEIT ou do histórico de partidas do CS2 e são listadas separadamente.",
-          "community_hint": "Jogadores contabiliza contas que fizeram login com a Steam pelo menos uma vez. Um painel também armazena uma linha para cada Steam ID que só foi visto em uma lineup, demo ou sanção — esses são contados separadamente como Steam IDs vistos.",
-          "gpu_nodes": "Nós de GPU",
-          "gpu_nodes_caption": "registrados atualmente",
-          "all_time": "todo o período",
-          "last_7d": "últimos 7 dias",
-          "last_30d": "últimos 30 dias",
-          "last_1y": "últimos 365 dias",
-          "signed_in_caption": "logaram pelo menos uma vez",
-          "players_known_caption": "inclui nunca logados"
+        "self_reported": "Os painéis são auto-hospedados e reportam essas contagens por conta própria; os valores são validados na chegada, mas não podem ser verificados de forma independente. A infraestrutura é uma contagem pontual a partir do último relatório de cada painel, não um total contínuo.",
+        "game_server_nodes": "Nós de servidores de jogo",
+        "game_server_nodes_caption": "registrados atualmente",
+        "servers": "Servidores",
+        "servers_caption": "registrados atualmente",
+        "public_servers": "Públicos",
+        "public_servers_caption": "servidores não ranqueados",
+        "matches": "Partidas hospedadas",
+        "matches_week": "Hospedadas 7d",
+        "matches_month": "Hospedadas 30d",
+        "matches_year": "Hospedadas 1y",
+        "maps_played": "Mapas jogados",
+        "matches_imported": "Partidas importadas",
+        "matches_imported_month": "Importadas 30d",
+        "players": "Jogadores",
+        "players_played": "Jogaram uma partida",
+        "players_known": "Steam IDs vistos",
+        "players_active": "Jogadores ativos 30d",
+        "teams": "Equipes",
+        "infrastructure": "Infraestrutura",
+        "match_volume": "Volume de partidas",
+        "community": "Comunidade",
+        "matches_caption": "todo o período, em toda a frota",
+        "players_caption": "em uma lineup, últimos 30 dias",
+        "hosted_hint": "Hospedadas contam apenas partidas que um painel rodou por conta própria. Partidas importadas vêm do FACEIT ou do histórico de partidas do CS2 e são listadas separadamente.",
+        "community_hint": "Jogadores contabiliza contas que fizeram login com a Steam pelo menos uma vez. Um painel também armazena uma linha para cada Steam ID que só foi visto em uma lineup, demo ou sanção — esses são contados separadamente como Steam IDs vistos.",
+        "gpu_nodes": "Nós de GPU",
+        "gpu_nodes_caption": "registrados atualmente",
+        "all_time": "todo o período",
+        "last_7d": "últimos 7 dias",
+        "last_30d": "últimos 30 dias",
+        "last_1y": "últimos 365 dias",
+        "signed_in_caption": "logaram pelo menos uma vez",
+        "players_known_caption": "inclui nunca logados"
       },
       "activity": {
         "matches": "Partidas hospedadas por dia (90d)",
@@ -1546,7 +1546,7 @@
           "title": "Redefinir",
           "description": "Retorna o microfone, saída, modo de entrada, sensibilidade e supressão de ruído ao estado inicial. Os níveis de jogadores permanecem inalterados.",
           "action": "Redefinir para padrões",
-          "done": "Configurações de voz redefinidas neste dispositivo"      
+          "done": "Configurações de voz redefinidas neste dispositivo"
         }
       },
       "notification_preferences": {
@@ -3582,27 +3582,27 @@
       "group_custom_league_awards": "Prêmios de liga personalizados"
     },
     "award_detail": {
-        "not_found_title": "Premiação não encontrada",
-        "not_found": "Esta premiação não existe ou foi excluída.",
-        "holders_section": "Detentores",
-        "no_holders_title": "Nenhum detentor ainda",
-        "no_holders": "Ninguém recebeu esta premiação.",
-        "total_holders": "Concessões",
-        "unique_players": "Jogadores",
-        "unique_teams": "Equipes",
-        "first_granted": "Primeira concessão",
-        "last_granted": "Última concessão",
-        "filter_all": "Todos",
-        "filter_players": "Jogadores",
-        "filter_teams": "Equipes",
-        "granted_by": "Concedido por {name}",
-        "source_manual": "Concedido manualmente",
-        "source_tournament": "Colocação em torneio",
-        "source_season": "Automação de temporada",
-        "revoke": "Revogar",
-        "confirm_revoke": {
-          "title": "Revogar esta premiação?",
-          "description": "{name} não terá mais esta premiação. Isso não pode ser desfeito."
+      "not_found_title": "Premiação não encontrada",
+      "not_found": "Esta premiação não existe ou foi excluída.",
+      "holders_section": "Detentores",
+      "no_holders_title": "Nenhum detentor ainda",
+      "no_holders": "Ninguém recebeu esta premiação.",
+      "total_holders": "Concessões",
+      "unique_players": "Jogadores",
+      "unique_teams": "Equipes",
+      "first_granted": "Primeira concessão",
+      "last_granted": "Última concessão",
+      "filter_all": "Todos",
+      "filter_players": "Jogadores",
+      "filter_teams": "Equipes",
+      "granted_by": "Concedido por {name}",
+      "source_manual": "Concedido manualmente",
+      "source_tournament": "Colocação em torneio",
+      "source_season": "Automação de temporada",
+      "revoke": "Revogar",
+      "confirm_revoke": {
+        "title": "Revogar esta premiação?",
+        "description": "{name} não terá mais esta premiação. Isso não pode ser desfeito."
       }
     },
     "system_media_server": {
@@ -4568,8 +4568,8 @@
       "add_player": "Adicionar jogador",
       "ineligible": {
         "on_this_roster": "Já está neste elenco.",
-      "on_other_team": "Já inscrito na equipe {team} neste torneio.",
-      "invite_pending": "Você já convidou — aguardando resposta."
+        "on_other_team": "Já inscrito na equipe {team} neste torneio.",
+        "invite_pending": "Você já convidou — aguardando resposta."
       },
       "already_in_tournament": "Esse jogador já está em um time neste torneio.",
       "pending_invites": "Convites pendentes",
@@ -5066,8 +5066,7 @@
       "game_mode": {
         "title": "Modo de jogo",
         "none": "Competitivo (sem modo)",
-        "description": "Carrega um conjunto de plugins e variáveis de console no servidor da partida.",
-        "not_competitive_safe": "Este modo não está marcado como seguro para o jogo competitivo. Ele ainda conta para o ELO — marque-o como seguro para competitivo no próprio modo se essa for a intenção."
+        "description": "Carrega um conjunto de plugins e variáveis de console no servidor da partida."
       }
     },
     "schedule": {
@@ -6824,8 +6823,7 @@
       "step_mode": "Modo",
       "mode_description": "Como a partida é jogada. Deixe em Competitivo para uma partida normal, ou escolha um modo para carregar seus plugins no servidor.",
       "mode_none": "Competitivo",
-      "mode_none_hint": "Regras padrão. Conta para o ELO e os rankings.",
-      "mode_empty": "Nenhum modo de jogo foi configurado ainda. Um administrador pode adicioná-los nas Configurações."
+      "mode_none_hint": "Regras padrão. Conta para o ELO e os rankings."
     },
     "host": "O host",
     "invite": {
@@ -7821,16 +7819,16 @@
       "toast_kind": "Voz",
       "toast_joined": "entrou",
       "toast_started_video": "iniciou vídeo em",
-      "floating_title": "Chamada" 
-      }
-    },
-    "media": {
-      "device": {
-        "system_default": "Padrão do sistema",
-        "selected": "Dispositivo selecionado",
-        "following_system": "Segue a configuração do sistema",
-        "device": "Dispositivo",
-        "camera": "Câmera"
+      "floating_title": "Chamada"
+    }
+  },
+  "media": {
+    "device": {
+      "system_default": "Padrão do sistema",
+      "selected": "Dispositivo selecionado",
+      "following_system": "Segue a configuração do sistema",
+      "device": "Dispositivo",
+      "camera": "Câmera"
     }
   },
   "game_modes": {
@@ -7840,7 +7838,6 @@
       "description": "Descrição",
       "competitive_safe": "Seguro para jogo competitivo",
       "competitive_safe_description": "Se este modo pode ser usado por uma partida ranqueada ou de matchmaking.",
-      "competitive_safe_warning": "Este modo só será oferecido em partidas casual. Servidores ranqueados nunca herdam um modo, então o matchmaking sempre começa com um conjunto de plugins limpo.",
       "plugins": "Plugins",
       "plugins_description": "Carregados na ordem exibida, depois de tudo que foi colocado à mão em custom-plugins.",
       "no_plugins": "Nenhum plugin de jogo no catálogo ainda. Sincronize o registro e instale um primeiro.",
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index 2e50bc440..f0683a1f0 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Режим игры",
         "none": "Competitive (без режима)",
-        "description": "Загружает набор плагинов и консольных переменных на сервер матча.",
-        "not_competitive_safe": "Этот режим не отмечен как подходящий для competitive. Он всё равно влияет на ELO — отметь его как подходящий для competitive в самом режиме, если так и задумано."
+        "description": "Загружает набор плагинов и консольных переменных на сервер матча."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Режим",
       "mode_description": "Как проходит матч. Для обычного матча оставь Competitive или выбери режим, чтобы загрузить его плагины на сервер.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Стандартные правила. Влияет на ELO и таблицы лидеров.",
-      "mode_empty": "Режимы игры ещё не настроены. Администратор может добавить их в настройках."
+      "mode_none_hint": "Стандартные правила. Влияет на ELO и таблицы лидеров."
     },
     "host": "Хост",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Описание",
       "competitive_safe": "Подходит для competitive",
       "competitive_safe_description": "Можно ли использовать этот режим в рейтинговых матчах и матчмейкинге.",
-      "competitive_safe_warning": "Этот режим будет предлагаться только в casual-матчах. Рейтинговые серверы никогда не наследуют режим, поэтому матчмейкинг всегда стартует с чистым набором плагинов.",
       "plugins": "Плагины",
       "plugins_description": "Загружаются в показанном порядке, после всего, что вручную положено в custom-plugins.",
       "no_plugins": "В каталоге пока нет игровых плагинов. Сначала синхронизируй реестр и установи хотя бы один.",
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 4a409f1de..6387b395c 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Spelläge",
         "none": "Competitive (inget läge)",
-        "description": "Laddar en uppsättning tillägg och konsolvariabler på matchservern.",
-        "not_competitive_safe": "Det här läget är inte markerat som säkert för competitive. Det räknas ändå mot ELO — markera det som säkert för competitive i själva läget om det är meningen."
+        "description": "Laddar en uppsättning tillägg och konsolvariabler på matchservern."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Läge",
       "mode_description": "Hur matchen spelas. Låt den stå på Competitive för en vanlig match, eller välj ett läge för att ladda dess tillägg på servern.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Standardregler. Räknas mot ELO och topplistor.",
-      "mode_empty": "Inga spellägen är uppsatta än. En administratör kan lägga till dem under Inställningar."
+      "mode_none_hint": "Standardregler. Räknas mot ELO och topplistor."
     },
     "host": "Värden",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Beskrivning",
       "competitive_safe": "Säkert för competitive",
       "competitive_safe_description": "Om det här läget får användas av en rankad match eller matchmaking.",
-      "competitive_safe_warning": "Det här läget erbjuds bara i casual-matcher. Rankade servrar ärver aldrig ett läge, så matchmaking startar alltid med en ren uppsättning tillägg.",
       "plugins": "Tillägg",
       "plugins_description": "Laddas i den ordning som visas, efter allt som lagts för hand i custom-plugins.",
       "no_plugins": "Inga speltillägg i katalogen än. Synka registry och installera ett först.",
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index d5ecb848d..83500db65 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Oyun Modu",
         "none": "Rekabetçi (mod yok)",
-        "description": "Maç sunucusuna bir dizi eklenti ve konsol değişkeni yükler.",
-        "not_competitive_safe": "Bu mod rekabetçi oyuna uygun olarak işaretlenmemiş. Yine de ELO'ya sayılır — böyle olması isteniyorsa modun kendisinde rekabetçiye uygun olarak işaretle."
+        "description": "Maç sunucusuna bir dizi eklenti ve konsol değişkeni yükler."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Mod",
       "mode_description": "Maçın nasıl oynanacağı. Normal bir maç için Rekabetçi'de bırak ya da eklentilerini sunucuya yüklemek için bir mod seç.",
       "mode_none": "Rekabetçi",
-      "mode_none_hint": "Standart kurallar. ELO'ya ve liderlik tablolarına sayılır.",
-      "mode_empty": "Henüz kurulu bir oyun modu yok. Bir yönetici bunları Ayarlar'dan ekleyebilir."
+      "mode_none_hint": "Standart kurallar. ELO'ya ve liderlik tablolarına sayılır."
     },
     "host": "Ev sahibi",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Açıklama",
       "competitive_safe": "Rekabetçi oyuna uygun",
       "competitive_safe_description": "Bu modun dereceli veya eşleştirme maçlarında kullanılıp kullanılamayacağı.",
-      "competitive_safe_warning": "Bu mod yalnızca casual maçlarda sunulur. Dereceli sunucular hiçbir zaman bir modu devralmaz, bu yüzden eşleştirme her zaman temiz bir eklenti setiyle başlar.",
       "plugins": "Eklentiler",
       "plugins_description": "Gösterilen sırayla, custom-plugins içine elle konulanlardan sonra yüklenir.",
       "no_plugins": "Katalogda henüz oyun eklentisi yok. Önce kayıt defterini eşitle ve bir tane kur.",
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index f89da0542..fa5169781 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "Режим гри",
         "none": "Competitive (без режиму)",
-        "description": "Завантажує набір плагінів і консольних змінних на сервер матчу.",
-        "not_competitive_safe": "Цей режим не позначено як придатний для competitive. Він усе одно впливає на ELO — познач його як придатний для competitive у самому режимі, якщо так і задумано."
+        "description": "Завантажує набір плагінів і консольних змінних на сервер матчу."
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "Режим",
       "mode_description": "Як проходить матч. Для звичайного матчу залиш Competitive або обери режим, щоб завантажити його плагіни на сервер.",
       "mode_none": "Competitive",
-      "mode_none_hint": "Стандартні правила. Впливає на ELO і таблиці лідерів.",
-      "mode_empty": "Режими гри ще не налаштовані. Адміністратор може додати їх у налаштуваннях."
+      "mode_none_hint": "Стандартні правила. Впливає на ELO і таблиці лідерів."
     },
     "host": "Хост",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "Опис",
       "competitive_safe": "Підходить для competitive",
       "competitive_safe_description": "Чи можна використовувати цей режим у рейтингових матчах і матчмейкінгу.",
-      "competitive_safe_warning": "Цей режим пропонуватиметься лише в casual-матчах. Рейтингові сервери ніколи не успадковують режим, тож матчмейкінг завжди стартує з чистим набором плагінів.",
       "plugins": "Плагіни",
       "plugins_description": "Завантажуються в показаному порядку, після всього, що вручну покладено в custom-plugins.",
       "no_plugins": "У каталозі ще немає ігрових плагінів. Спочатку синхронізуй реєстр і встанови хоча б один.",
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index 3e3959a9b..129f2eaeb 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "游戏模式",
         "none": "竞技（无模式）",
-        "description": "在比赛服务器上加载一组插件和控制台变量。",
-        "not_competitive_safe": "此模式未标记为可用于竞技。它仍会计入 ELO——如果这是有意为之，请在模式本身中将其标记为可用于竞技。"
+        "description": "在比赛服务器上加载一组插件和控制台变量。"
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "模式",
       "mode_description": "比赛的玩法。普通比赛保持竞技即可，或选择一个模式以在服务器上加载其插件。",
       "mode_none": "竞技",
-      "mode_none_hint": "标准规则。计入 ELO 和排行榜。",
-      "mode_empty": "还没有配置任何游戏模式。管理员可以在设置中添加。"
+      "mode_none_hint": "标准规则。计入 ELO 和排行榜。"
     },
     "host": "房主",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "描述",
       "competitive_safe": "可用于竞技对战",
       "competitive_safe_description": "此模式是否可用于排位或匹配比赛。",
-      "competitive_safe_warning": "此模式只会在休闲比赛中提供。排位服务器不会继承模式，因此匹配始终以干净的插件集启动。",
       "plugins": "插件",
       "plugins_description": "按显示顺序加载，位于手动放入 custom-plugins 的内容之后。",
       "no_plugins": "目录中还没有游戏插件。请先同步插件源并安装一个。",
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 6c20f338d..5f7528218 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -5204,8 +5204,7 @@
       "game_mode": {
         "title": "遊戲模式",
         "none": "競技（無模式）",
-        "description": "在比賽伺服器上載入一組外掛與主控台變數。",
-        "not_competitive_safe": "此模式未標記為可用於競技。它仍會計入 ELO——如果這是有意為之，請在模式本身中將其標記為可用於競技。"
+        "description": "在比賽伺服器上載入一組外掛與主控台變數。"
       }
     },
     "schedule": {
@@ -7056,8 +7055,7 @@
       "step_mode": "模式",
       "mode_description": "比賽的玩法。一般比賽保持競技即可，或選擇一個模式以在伺服器上載入其外掛。",
       "mode_none": "競技",
-      "mode_none_hint": "標準規則。計入 ELO 與排行榜。",
-      "mode_empty": "尚未設定任何遊戲模式。管理員可以在設定中新增。"
+      "mode_none_hint": "標準規則。計入 ELO 與排行榜。"
     },
     "host": "房主",
     "invite": {
@@ -8206,7 +8204,6 @@
       "description": "描述",
       "competitive_safe": "可用於競技對戰",
       "competitive_safe_description": "此模式是否可用於排名或配對比賽。",
-      "competitive_safe_warning": "此模式只會在休閒比賽中提供。排名伺服器不會繼承模式，因此配對永遠以乾淨的外掛組合啟動。",
       "plugins": "外掛",
       "plugins_description": "依顯示順序載入，位於手動放入 custom-plugins 的內容之後。",
       "no_plugins": "目錄中尚無遊戲外掛。請先同步外掛來源並安裝一個。",
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a58c10861..93ccdc4c0 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -217,7 +217,7 @@ export default defineNuxtConfig({
       // Adds `push` / `notificationclick` handlers to the generated service
       // worker without giving up the default generateSW strategy for a custom
       // SW file. Served unhashed from public/, so bump the ?v= on any change.
-      importScripts: ["/sw-push.js?v=3"],
+      importScripts: ["/sw-push.js?v=4"],
       cleanupOutdatedCaches: true,
       maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,
       // Do not precache every Nuxt chunk during service-worker install.
diff --git a/pages/dedicated-servers/[id].vue b/pages/dedicated-servers/[id].vue
index 55ebb6e3b..ddd77c195 100644
--- a/pages/dedicated-servers/[id].vue
+++ b/pages/dedicated-servers/[id].vue
@@ -366,6 +366,7 @@ export default {
               plugin_runtime: true,
               rcon_status: true,
               game_server_node_id: true,
+              game_mode_id: true,
               connection_link: true,
               connection_string: true,
               offline_at: true,
diff --git a/plugins/app-badge.client.ts b/plugins/app-badge.client.ts
new file mode 100644
index 000000000..0d209bfa3
--- /dev/null
+++ b/plugins/app-badge.client.ts
@@ -0,0 +1,26 @@
+import { watch } from "vue";
+
+// The app icon's badge follows the bell while the app is open, and the service
+// worker sets it from the push payload while it is closed -- so catching up
+// in-app clears what a night of pushes put there.
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.hook("app:mounted", () => {
+    if (typeof navigator === "undefined" || !("setAppBadge" in navigator)) {
+      return;
+    }
+
+    const { unreadNotificationCount } = useNotificationBadge();
+
+    watch(
+      unreadNotificationCount,
+      (count) => {
+        void (
+          count > 0 ? navigator.setAppBadge(count) : navigator.clearAppBadge()
+        ).catch(() => {
+          // Best-effort: some platforms refuse badging outside an installed app.
+        });
+      },
+      { immediate: true },
+    );
+  });
+});
diff --git a/public/sw-push.js b/public/sw-push.js
index d347300a8..b1fd210f8 100644
--- a/public/sw-push.js
+++ b/public/sw-push.js
@@ -7,6 +7,68 @@
 // of the build pipeline. Bump the ?v= in nuxt.config.ts when it changes.
 /* eslint-disable no-undef */
 
+// The API says where its GraphQL endpoint is, but the worker only trusts it
+// if it is https and on the same site it is itself served from -- the same
+// site the auth cookie is scoped to, so nowhere else could use it anyway.
+const trustedGraphqlUrl = (candidate) => {
+  if (typeof candidate !== "string") {
+    return null;
+  }
+
+  let url;
+
+  try {
+    url = new URL(candidate);
+  } catch {
+    return null;
+  }
+
+  if (url.protocol !== "https:") {
+    return null;
+  }
+
+  const site = (host) => host.split(".").slice(-2).join(".");
+
+  return site(url.hostname) === site(self.location.hostname) ? url.href : null;
+};
+
+// Notification buttons come with a ready-made operation each; the worker only
+// has to show them and, on a tap, post the one that was tapped.
+const actionsOf = (payload) => {
+  const limit =
+    typeof Notification !== "undefined" &&
+    Number.isInteger(Notification.maxActions)
+      ? Notification.maxActions
+      : 2;
+
+  return (Array.isArray(payload.actions) ? payload.actions : [])
+    .filter(
+      (action) =>
+        action &&
+        typeof action.action === "string" &&
+        typeof action.title === "string" &&
+        action.operation &&
+        typeof action.operation.query === "string",
+    )
+    .slice(0, limit);
+};
+
+const setAppBadge = async (unread) => {
+  if (!("setAppBadge" in navigator) || !Number.isInteger(unread)) {
+    return;
+  }
+
+  try {
+    if (unread > 0) {
+      await navigator.setAppBadge(unread);
+    } else {
+      await navigator.clearAppBadge();
+    }
+  } catch {
+    // Badging is best-effort; a platform that refuses it still got the push.
+  }
+};
+
 self.addEventListener("push", (event) => {
   let payload = {};
 
@@ -16,32 +78,92 @@ self.addEventListener("push", (event) => {
     payload = { title: "5stack", body: event.data ? event.data.text() : "" };
   }
 
+  const actions = actionsOf(payload);
+
   event.waitUntil(
-    self.registration.showNotification(payload.title || "5stack", {
-      body: payload.body || "",
-      icon: payload.icon || "/favicon/192.png",
-      badge: "/favicon/64.png",
-      // Lets the OS replace an earlier notification for the same conversation
-      // or match instead of stacking one per message.
-      tag: payload.tag,
-      // ...and makes that replacement alert again. A tagged notification is
-      // silent by default when it lands on top of one already showing, so
-      // without this the summary that closes a burst arrives unannounced.
-      // Ignored unless `tag` is set, and throws in Chrome without one.
-      renotify: payload.renotify !== false && Boolean(payload.tag),
-      data: {
-        url: payload.url || "/",
-        threadKey: payload.threadKey || payload.tag,
-        count: payload.count || 1,
-      },
-    }),
+    Promise.all([
+      self.registration.showNotification(payload.title || "5stack", {
+        body: payload.body || "",
+        icon: payload.icon || "/favicon/192.png",
+        badge: "/favicon/64.png",
+        // A hero image where the platform draws one (Android, desktop
+        // Chrome); iOS drops it on the floor.
+        image: payload.image || undefined,
+        actions: actions.map(({ action, title }) => ({ action, title })),
+        // Lets the OS replace an earlier notification for the same conversation
+        // or match instead of stacking one per message.
+        tag: payload.tag,
+        // ...and makes that replacement alert again. A tagged notification is
+        // silent by default when it lands on top of one already showing, so
+        // without this the summary that closes a burst arrives unannounced.
+        // Ignored unless `tag` is set, and throws in Chrome without one.
+        renotify: payload.renotify !== false && Boolean(payload.tag),
+        data: {
+          url: payload.url || "/",
+          threadKey: payload.threadKey || payload.tag,
+          count: payload.count || 1,
+          actions,
+          graphqlUrl: trustedGraphqlUrl(payload.graphqlUrl),
+        },
+      }),
+      setAppBadge(payload.unread),
+    ]),
   );
 });
 
+// Runs the tapped button's operation with the player's own cookie -- the same
+// request the bell makes for the same button. Resolves to whether it worked,
+// so a failure can fall back to opening the app where it can be done by hand.
+const runAction = async (notification, actionId) => {
+  const { actions, graphqlUrl } = notification.data || {};
+  const action = (actions || []).find(({ action }) => action === actionId);
+
+  if (!action || !graphqlUrl) {
+    return false;
+  }
+
+  try {
+    const response = await fetch(graphqlUrl, {
+      method: "POST",
+      credentials: "include",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(action.operation),
+    });
+
+    if (!response.ok) {
+      return false;
+    }
+
+    const result = await response.json();
+
+    return !(Array.isArray(result.errors) && result.errors.length > 0);
+  } catch {
+    return false;
+  }
+};
+
 // The type -> route mapping lives in the app's router, so rather than
 // duplicating it here in plain JS with no shared source of truth, the API sends
 // the destination on the payload. An already-open tab is handed the url and
 // navigates client-side; otherwise the app opens straight to it.
+const openApp = async (url) => {
+  const clients = await self.clients.matchAll({
+    type: "window",
+    includeUncontrolled: true,
+  });
+
+  for (const client of clients) {
+    if ("focus" in client) {
+      client.postMessage({ type: "push-notification-click", url });
+      return client.focus();
+    }
+  }
+
+  if (self.clients.openWindow) {
+    return self.clients.openWindow(url);
+  }
+};
+
 self.addEventListener("notificationclick", (event) => {
   event.notification.close();
 
@@ -55,21 +177,11 @@ self.addEventListener("notificationclick", (event) => {
 
   event.waitUntil(
     (async () => {
-      const clients = await self.clients.matchAll({
-        type: "window",
-        includeUncontrolled: true,
-      });
-
-      for (const client of clients) {
-        if ("focus" in client) {
-          client.postMessage({ type: "push-notification-click", url });
-          return client.focus();
-        }
+      if (event.action && (await runAction(event.notification, event.action))) {
+        return;
       }
 
-      if (self.clients.openWindow) {
-        return self.clients.openWindow(url);
-      }
+      return openApp(url);
     })(),
   );
 });
diff --git a/stores/DraftGamesStore.ts b/stores/DraftGamesStore.ts
index 0a8d6c985..881b6a9a6 100644
--- a/stores/DraftGamesStore.ts
+++ b/stores/DraftGamesStore.ts
@@ -97,7 +97,6 @@ export const useDraftGamesStore = defineStore("draft-games", () => {
       game_mode: {
         id: true,
         name: true,
-        competitive_safe: true,
       },
       map_pool: {
         id: true,

From 7a4b43076cca7b7b2c2d75574af38182c3593936 Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 14:29:27 -0400
Subject: [PATCH 3/7] wip

---
 components/MatchOptions.vue                   |   3 +
 components/charts/LastTenWinsAndLosses.vue    |   3 +
 components/draft-games/DraftModePicker.vue    |   6 +-
 components/game-modes/GameModeForm.vue        | 150 ++++++++++++++++--
 components/map-pools/MapForm.vue              |  77 ++++++++-
 components/servers/ServerForm.vue             | 117 ++++++++++++--
 components/team/TeamScrimSettings.vue         |   5 +-
 generated/zeus/const.ts                       |  10 ++
 generated/zeus/index.ts                       |  42 +++++
 i18n/locales/ar_SA.json                       |   1 -
 i18n/locales/da_DK.json                       |   1 -
 i18n/locales/de_DE.json                       |   1 -
 i18n/locales/en.json                          |  31 +++-
 i18n/locales/es_ES.json                       |   1 -
 i18n/locales/fr_FR.json                       |   1 -
 i18n/locales/it_IT.json                       |   1 -
 i18n/locales/ja_JP.json                       |   1 -
 i18n/locales/ko_KR.json                       |   1 -
 i18n/locales/pl_PL.json                       |   1 -
 i18n/locales/pt_BR.json                       |   1 -
 i18n/locales/ru_RU.json                       |   1 -
 i18n/locales/sv_SE.json                       |   1 -
 i18n/locales/tr_TR.json                       |   1 -
 i18n/locales/uk_UA.json                       |   1 -
 i18n/locales/zh_Hans.json                     |   1 -
 i18n/locales/zh_Hant.json                     |   1 -
 pages/settings/application/game-modes.vue     |  19 ++-
 pages/settings/application/map-pools/[id].vue |   3 +
 .../settings/application/map-pools/index.vue  |  98 +++++++++++-
 29 files changed, 519 insertions(+), 61 deletions(-)

diff --git a/components/MatchOptions.vue b/components/MatchOptions.vue
index b5a0a4c0b..55a11723e 100644
--- a/components/MatchOptions.vue
+++ b/components/MatchOptions.vue
@@ -1555,6 +1555,9 @@ export default {
               enabled: {
                 _eq: true,
               },
+              deleted_at: {
+                _is_null: true,
+              },
             },
           },
           mapFields,
diff --git a/components/charts/LastTenWinsAndLosses.vue b/components/charts/LastTenWinsAndLosses.vue
index c230f717c..bcb6da492 100644
--- a/components/charts/LastTenWinsAndLosses.vue
+++ b/components/charts/LastTenWinsAndLosses.vue
@@ -106,6 +106,9 @@ export default {
               type: {
                 _eq: e_map_pool_types_enum.Competitive,
               },
+              deleted_at: {
+                _is_null: true,
+              },
             },
             order_by: [
               {
diff --git a/components/draft-games/DraftModePicker.vue b/components/draft-games/DraftModePicker.vue
index 657e59cf9..f0657f746 100644
--- a/components/draft-games/DraftModePicker.vue
+++ b/components/draft-games/DraftModePicker.vue
@@ -64,8 +64,10 @@ const select = (id: string) => {
       </div>
 
       <div class="min-w-0 flex-1">
-        <p class="truncate font-medium">{{ mode.name }}</p>
-        <p class="truncate text-xs text-muted-foreground">
+        <p class="font-medium">{{ mode.name }}</p>
+        <!-- The description is the whole pitch for picking a mode; it wraps
+             rather than truncating so a long one is still readable. -->
+        <p class="text-xs leading-snug text-muted-foreground">
           {{ mode.description }}
         </p>
       </div>
diff --git a/components/game-modes/GameModeForm.vue b/components/game-modes/GameModeForm.vue
index d9edb9af5..5019f2c26 100644
--- a/components/game-modes/GameModeForm.vue
+++ b/components/game-modes/GameModeForm.vue
@@ -12,7 +12,17 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import { Trash2, ExternalLink } from "lucide-vue-next";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "~/components/ui/alert-dialog";
+import { ArchiveRestore, Trash2, ExternalLink } from "lucide-vue-next";
 import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
 </script>
 
@@ -44,12 +54,31 @@ import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
       <FormItem>
         <FormLabel>{{ $t("game_modes.form.description") }}</FormLabel>
         <FormControl>
-          <Input v-bind="componentField" />
+          <Textarea v-bind="componentField" rows="3" class="min-h-[4.5rem]" />
         </FormControl>
         <FormMessage />
       </FormItem>
     </FormField>
 
+    <!-- An archived mode is disabled by definition; Restore re-enables it. -->
+    <div v-if="!gameMode?.archived_at" class="rounded-md border p-4">
+      <div class="flex items-start justify-between gap-4">
+        <div>
+          <p class="font-medium">{{ $t("game_modes.form.enabled") }}</p>
+          <p class="text-sm text-muted-foreground">
+            {{ $t("game_modes.form.enabled_description") }}
+          </p>
+        </div>
+        <FormField v-slot="{ value, handleChange }" name="enabled">
+          <FormItem>
+            <FormControl>
+              <Switch :model-value="value" @update:model-value="handleChange" />
+            </FormControl>
+          </FormItem>
+        </FormField>
+      </div>
+    </div>
+
     <div class="space-y-3 rounded-md border p-4">
       <div class="flex items-start justify-between gap-4">
         <div>
@@ -166,16 +195,31 @@ import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
     </FormField>
 
     <div class="flex items-center justify-between gap-4">
+      <!-- One retire action. Delete removes a mode nothing has used; a mode
+           some match already ran cannot be deleted (the DB keeps that history),
+           so it is archived -- hidden everywhere -- and the toast says so.
+           Restore undoes an archive. -->
+      <Button
+        v-if="gameMode?.archived_at"
+        type="button"
+        variant="outline"
+        class="gap-2"
+        :loading="deleting"
+        @click="restore"
+      >
+        <ArchiveRestore class="h-4 w-4" />
+        {{ $t("game_modes.form.restore") }}
+      </Button>
       <Button
+        v-else-if="gameMode"
         type="button"
         variant="destructive"
         class="gap-2"
-        v-if="gameMode"
-        :loading="archiving"
-        @click="archive"
+        :loading="deleting"
+        @click="confirmDelete = true"
       >
         <Trash2 class="h-4 w-4" />
-        {{ $t("game_modes.form.archive") }}
+        {{ $t("game_modes.form.delete") }}
       </Button>
       <span v-else />
 
@@ -183,6 +227,25 @@ import { SELECT_NONE, nullableSelectField } from "~/utilities/selectNone";
         {{ $t("game_modes.form.save") }}
       </Button>
     </div>
+
+    <AlertDialog :open="confirmDelete" @update:open="confirmDelete = $event">
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            {{ $t("game_modes.form.delete_confirm_title", { name: gameMode?.name }) }}
+          </AlertDialogTitle>
+          <AlertDialogDescription>
+            {{ $t("game_modes.form.delete_confirm_description") }}
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel>{{ $t("common.cancel") }}</AlertDialogCancel>
+          <AlertDialogAction variant="destructive" @click="remove">
+            {{ $t("game_modes.form.delete") }}
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
   </form>
 </template>
 
@@ -206,7 +269,8 @@ export default {
   data() {
     return {
       submitting: false,
-      archiving: false,
+      deleting: false,
+      confirmDelete: false,
       selected: [] as Array<string>,
       availablePlugins: [] as Array<Record<string, any>>,
       alwaysLoad: [] as Array<string>,
@@ -221,6 +285,7 @@ export default {
                 "lowercase letters, numbers and dashes only",
               ),
             description: z.string().optional().default(""),
+            enabled: z.boolean().default(true),
             competitive_safe: z.boolean().default(false),
             cfg: z.string().optional().default(""),
             extra_game_params: z.string().optional().default(""),
@@ -272,6 +337,7 @@ export default {
           name: mode.name,
           slug: mode.slug,
           description: mode.description ?? "",
+          enabled: mode.enabled,
           competitive_safe: mode.competitive_safe,
           cfg: mode.cfg ?? "",
           extra_game_params: mode.extra_game_params ?? "",
@@ -328,6 +394,7 @@ export default {
           name: values.name,
           slug: values.slug,
           description: values.description || null,
+          ...(this.gameMode?.archived_at ? {} : { enabled: values.enabled }),
           competitive_safe: values.competitive_safe,
           cfg: values.cfg || null,
           extra_game_params: values.extra_game_params || null,
@@ -402,12 +469,12 @@ export default {
         }),
       });
     },
-    async archive() {
-      if (this.archiving) {
+    async restore() {
+      if (this.deleting) {
         return;
       }
 
-      this.archiving = true;
+      this.deleting = true;
 
       try {
         await (this as any).$apollo.mutate({
@@ -415,14 +482,71 @@ export default {
             update_game_modes_by_pk: [
               {
                 pk_columns: { id: this.gameMode.id },
-                _set: { archived_at: new Date().toISOString(), enabled: false },
+                _set: { archived_at: null, enabled: true },
               },
               { id: true },
             ],
           }),
         });
 
-        toast({ title: this.$t("game_modes.form.archived") as string });
+        toast({ title: this.$t("game_modes.form.restored") as string });
+        this.$emit("saved", this.gameMode.id);
+      } catch (error) {
+        toast({
+          title: (error as Error).message,
+          variant: "destructive",
+        });
+      } finally {
+        this.deleting = false;
+      }
+    },
+    // tbd_game_modes refuses to delete a mode any match has used, because the
+    // finished match still points at it. In that case the mode is archived
+    // instead: gone from every picker, history intact, restorable from here.
+    async remove() {
+      if (this.deleting) {
+        return;
+      }
+
+      this.deleting = true;
+
+      try {
+        try {
+          await (this as any).$apollo.mutate({
+            mutation: generateMutation({
+              delete_game_modes_by_pk: [
+                { id: this.gameMode.id },
+                { id: true },
+              ],
+            }),
+          });
+          toast({ title: this.$t("game_modes.form.deleted") as string });
+        } catch (error) {
+          if (!/archive it instead/.test((error as Error).message)) {
+            throw error;
+          }
+          await (this as any).$apollo.mutate({
+            mutation: generateMutation({
+              update_game_modes_by_pk: [
+                {
+                  pk_columns: { id: this.gameMode.id },
+                  _set: {
+                    archived_at: new Date().toISOString(),
+                    enabled: false,
+                  },
+                },
+                { id: true },
+              ],
+            }),
+          });
+          toast({
+            title: this.$t("game_modes.form.archived") as string,
+            description: this.$t(
+              "game_modes.form.archived_instead",
+            ) as string,
+          });
+        }
+
         this.$emit("saved", null);
       } catch (error) {
         toast({
@@ -430,7 +554,7 @@ export default {
           variant: "destructive",
         });
       } finally {
-        this.archiving = false;
+        this.deleting = false;
       }
     },
   },
diff --git a/components/map-pools/MapForm.vue b/components/map-pools/MapForm.vue
index 8bdb129f4..d07d48430 100644
--- a/components/map-pools/MapForm.vue
+++ b/components/map-pools/MapForm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { generateMutation } from "~/graphql/graphqlGen";
+import { generateMutation, generateQuery } from "~/graphql/graphqlGen";
 import { toast } from "@/components/ui/toast";
 import { useForm } from "vee-validate";
 import { toTypedSchema } from "~/utilities/vee-validate-zod";
@@ -334,6 +334,73 @@ export default {
             return;
           }
 
+          const { data } = await this.$apollo.query({
+            fetchPolicy: "network-only",
+            query: generateQuery({
+              maps: [
+                {
+                  where: {
+                    name: {
+                      _eq: values.name,
+                    },
+                  },
+                },
+                {
+                  id: true,
+                  deleted_at: true,
+                },
+              ],
+            }),
+          });
+
+          const existing = data.maps as Array<{
+            id: string;
+            deleted_at: string | null;
+          }>;
+
+          if (existing.some((map) => !map.deleted_at)) {
+            toast({
+              title: this.$t("pages.map_pools.form.error.already_exists"),
+              variant: "destructive",
+            });
+            return;
+          }
+
+          if (existing.length > 0) {
+            await this.$apollo.mutate({
+              mutation: generateMutation({
+                update_maps: [
+                  {
+                    _set: {
+                      deleted_at: null,
+                      label: values.label,
+                      workshop_map_id: values.workshop_map_id,
+                      poster: values.poster,
+                      patch: values.patch,
+                    },
+                    where: {
+                      name: {
+                        _eq: values.name,
+                      },
+                    },
+                  },
+                  {
+                    affected_rows: true,
+                  },
+                ],
+              }),
+            });
+
+            toast({
+              title: this.$t("pages.map_pools.form.success.restore"),
+              description: this.$t(
+                "pages.map_pools.form.success.restore_description",
+              ),
+            });
+            this.$emit("created");
+            return;
+          }
+
           await this.$apollo.mutate({
             mutation: generateMutation({
               insert_maps: [
@@ -361,6 +428,7 @@ export default {
           toast({
             title: this.$t("pages.map_pools.form.success.create"),
           });
+          this.$emit("created");
         } catch (error) {
           toast({
             title: this.map
@@ -377,8 +445,11 @@ export default {
     async deleteMap() {
       await this.$apollo.mutate({
         mutation: generateMutation({
-          delete_maps: [
+          update_maps: [
             {
+              _set: {
+                deleted_at: new Date().toISOString(),
+              },
               where: {
                 name: {
                   _eq: this.map.name,
@@ -386,7 +457,7 @@ export default {
               },
             },
             {
-              __typename: true,
+              affected_rows: true,
             },
           ],
         }),
diff --git a/components/servers/ServerForm.vue b/components/servers/ServerForm.vue
index 1181fe7ca..b7ce87a21 100644
--- a/components/servers/ServerForm.vue
+++ b/components/servers/ServerForm.vue
@@ -18,12 +18,19 @@ import {
   SelectGroup,
   SelectItem,
   SelectLabel,
+  SelectSeparator,
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
+import {
+  SelectItem as RekaSelectItem,
+  SelectItemIndicator as RekaSelectItemIndicator,
+  SelectItemText as RekaSelectItemText,
+} from "reka-ui";
+import { CheckIcon } from "@radix-icons/vue";
 import { Switch } from "~/components/ui/switch";
 import { RadioGroup, RadioGroupItem } from "~/components/ui/radio-group";
-import { Eye, EyeOff } from "lucide-vue-next";
+import { Eye, EyeOff, Lock } from "lucide-vue-next";
 import { Alert, AlertTitle, AlertDescription } from "~/components/ui/alert";
 import SettingsSaveBar from "~/components/settings/SettingsSaveBar.vue";
 
@@ -172,9 +179,17 @@ const showConnectPassword = ref(false);
                   />
                 </SelectTrigger>
               </FormControl>
-              <SelectContent>
+              <!-- Width pinned to the trigger: the popper otherwise grows to
+                   the longest mode description and the text never wraps. -->
+              <SelectContent class="w-[--reka-select-trigger-width]">
                 <SelectGroup>
-                  <SelectLabel v-if="customModes.length">
+                  <!-- Eyebrow headers, not item-styled labels: the groups must
+                       read as section titles or the items under them look
+                       like a second tier of something unselectable. -->
+                  <SelectLabel
+                    v-if="customModes.length"
+                    class="px-2 pb-1 pt-2 font-mono text-[0.62rem] font-normal uppercase tracking-[0.16em] text-muted-foreground"
+                  >
                     {{ $t("server.form.valve_preset_group") }}
                   </SelectLabel>
                   <SelectItem
@@ -185,24 +200,74 @@ const showConnectPassword = ref(false);
                     {{ serverType }}
                   </SelectItem>
                 </SelectGroup>
-                <SelectGroup v-if="customModes.length">
-                  <SelectLabel>
-                    {{ $t("server.form.custom_mode_group") }}
-                  </SelectLabel>
-                  <SelectItem
-                    :value="gameMode.id"
-                    v-for="gameMode in customModes"
-                    :key="gameMode.id"
-                  >
-                    {{ gameMode.name }}
-                  </SelectItem>
-                </SelectGroup>
+                <template v-if="customModes.length">
+                  <SelectSeparator />
+                  <SelectGroup>
+                    <SelectLabel
+                      class="flex items-center gap-2 px-2 pb-1 pt-2 font-mono text-[0.62rem] font-normal uppercase tracking-[0.16em] text-muted-foreground"
+                    >
+                      {{ $t("server.form.custom_mode_group") }}
+                      <span
+                        v-if="!hasGameServerNode"
+                        class="inline-flex items-center gap-1 normal-case tracking-normal"
+                      >
+                        <Lock class="h-3 w-3" />
+                        {{ $t("server.form.custom_mode_group_locked") }}
+                      </span>
+                    </SelectLabel>
+                    <!-- Built from the reka primitives rather than ui/SelectItem
+                         so the description sits outside SelectItemText: the
+                         trigger then echoes only the name. -->
+                    <RekaSelectItem
+                      v-for="gameMode in customModes"
+                      :key="gameMode.id"
+                      :value="gameMode.id"
+                      :disabled="!hasGameServerNode"
+                      class="relative flex w-full cursor-default select-none flex-col items-start rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
+                    >
+                      <span
+                        class="absolute right-2 top-2 flex h-3.5 w-3.5 items-center justify-center"
+                      >
+                        <RekaSelectItemIndicator>
+                          <CheckIcon class="h-4 w-4" />
+                        </RekaSelectItemIndicator>
+                      </span>
+                      <RekaSelectItemText>{{ gameMode.name }}</RekaSelectItemText>
+                      <span
+                        v-if="gameMode.description"
+                        class="mt-0.5 block whitespace-normal text-xs leading-snug text-muted-foreground"
+                      >
+                        {{ gameMode.description }}
+                      </span>
+                    </RekaSelectItem>
+                  </SelectGroup>
+                </template>
               </SelectContent>
             </Select>
             <FormMessage />
           </FormItem>
         </FormField>
         </Fold>
+
+        <!-- A custom mode is plugins the panel installs onto the container it
+             runs; a third-party dedicated server gives it nothing to install
+             into, so the modes stay locked until a node is attached. -->
+        <Fold
+          :open="
+            !!form.values.use_valve_modes &&
+            customModes.length > 0 &&
+            !hasGameServerNode
+          "
+        >
+          <Alert variant="warning">
+            <AlertTitle>{{
+              $t("server.form.custom_modes_need_node_title")
+            }}</AlertTitle>
+            <AlertDescription>{{
+              $t("server.form.custom_modes_need_node_description")
+            }}</AlertDescription>
+          </Alert>
+        </Fold>
       </div>
     </FormSection>
 
@@ -487,6 +552,7 @@ export default {
           {
             id: true,
             name: true,
+            description: true,
             enabled: true,
             supported_runtimes: [{}, true],
           },
@@ -638,6 +704,14 @@ export default {
         }
       },
     },
+    // Detaching the node (or never picking one) leaves a custom mode with
+    // nothing to install into; fall back to a preset rather than save a mode
+    // the server could not boot with.
+    hasGameServerNode(has: boolean) {
+      if (!has && this.isCustomModeSelected) {
+        this.form.setFieldValue("type", this.valveModeTypes[0]);
+      }
+    },
     "form.values.game_server_node_id": {
       handler(newNodeId) {
         if (newNodeId && newNodeId !== "none" && this.useGameServerNode) {
@@ -688,6 +762,19 @@ export default {
     isEditingGameServerNode() {
       return !!(this.server && this.server.game_server_node_id);
     },
+    hasGameServerNode(): boolean {
+      if (this.isEditingGameServerNode) {
+        return true;
+      }
+      const nodeId = this.form.values.game_server_node_id;
+      return (
+        !!this.form.values.use_game_server_node && !!nodeId && nodeId !== "none"
+      );
+    },
+    isCustomModeSelected(): boolean {
+      const selected = this.form.values.type;
+      return !!selected && !Object.values(e_server_types_enum).includes(selected);
+    },
   },
   methods: {
     // The form's `type` field holds either a Valve preset (enum value) or a
diff --git a/components/team/TeamScrimSettings.vue b/components/team/TeamScrimSettings.vue
index 4c17586e5..e73ea6887 100644
--- a/components/team/TeamScrimSettings.vue
+++ b/components/team/TeamScrimSettings.vue
@@ -200,7 +200,10 @@ export default {
         query: typedGql("query")({
           maps: [
             {
-              where: { type: { _eq: "Competitive" } },
+              where: {
+                type: { _eq: "Competitive" },
+                deleted_at: { _is_null: true },
+              },
               order_by: [{ name: order_by.asc }],
             },
             mapFields,
diff --git a/generated/zeus/const.ts b/generated/zeus/const.ts
index b411319ce..dcd5bd0b9 100644
--- a/generated/zeus/const.ts
+++ b/generated/zeus/const.ts
@@ -9451,6 +9451,7 @@ export const AllTypesProps: Record<string,any> = {
 		on_conflict:"maps_on_conflict"
 	},
 	maps_bool_exp:{
+		deleted_at:"timestamptz_comparison_exp",
 		_and:"maps_bool_exp",
 		_not:"maps_bool_exp",
 		_or:"maps_bool_exp",
@@ -9471,6 +9472,7 @@ export const AllTypesProps: Record<string,any> = {
 	},
 	maps_constraint: "enum" as const,
 	maps_insert_input:{
+		deleted_at:"timestamptz",
 		e_match_type:"e_match_types_obj_rel_insert_input",
 		id:"uuid",
 		match_maps:"match_maps_arr_rel_insert_input",
@@ -9478,6 +9480,7 @@ export const AllTypesProps: Record<string,any> = {
 		type:"e_match_types_enum"
 	},
 	maps_max_order_by:{
+		deleted_at:"order_by",
 		id:"order_by",
 		label:"order_by",
 		name:"order_by",
@@ -9486,6 +9489,7 @@ export const AllTypesProps: Record<string,any> = {
 		workshop_map_id:"order_by"
 	},
 	maps_min_order_by:{
+		deleted_at:"order_by",
 		id:"order_by",
 		label:"order_by",
 		name:"order_by",
@@ -9503,6 +9507,7 @@ export const AllTypesProps: Record<string,any> = {
 		where:"maps_bool_exp"
 	},
 	maps_order_by:{
+		deleted_at:"order_by",
 		active_pool:"order_by",
 		e_match_type:"e_match_types_order_by",
 		enabled:"order_by",
@@ -9523,6 +9528,7 @@ export const AllTypesProps: Record<string,any> = {
 	maps_select_column_maps_aggregate_bool_exp_bool_and_arguments_columns: "enum" as const,
 	maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns: "enum" as const,
 	maps_set_input:{
+		deleted_at:"timestamptz",
 		id:"uuid",
 		type:"e_match_types_enum"
 	},
@@ -9531,6 +9537,7 @@ export const AllTypesProps: Record<string,any> = {
 		ordering:"cursor_ordering"
 	},
 	maps_stream_cursor_value_input:{
+		deleted_at:"timestamptz",
 		id:"uuid",
 		type:"e_match_types_enum"
 	},
@@ -45012,6 +45019,7 @@ export const ReturnTypes: Record<string,any> = {
 		returning:"map_pools"
 	},
 	maps:{
+		deleted_at:"timestamptz",
 		active_pool:"Boolean",
 		e_match_type:"e_match_types",
 		enabled:"Boolean",
@@ -45037,6 +45045,7 @@ export const ReturnTypes: Record<string,any> = {
 		min:"maps_min_fields"
 	},
 	maps_max_fields:{
+		deleted_at:"timestamptz",
 		id:"uuid",
 		label:"String",
 		name:"String",
@@ -45045,6 +45054,7 @@ export const ReturnTypes: Record<string,any> = {
 		workshop_map_id:"String"
 	},
 	maps_min_fields:{
+		deleted_at:"timestamptz",
 		id:"uuid",
 		label:"String",
 		name:"String",
diff --git a/generated/zeus/index.ts b/generated/zeus/index.ts
index 7a6040ce9..14ef541d2 100644
--- a/generated/zeus/index.ts
+++ b/generated/zeus/index.ts
@@ -20464,6 +20464,7 @@ count?: [{	columns?: Array<ValueTypes["map_pools_select_column"]> | undefined |
 };
 	/** columns and relationships of "maps" */
 ["maps"]: AliasType<{
+	deleted_at?:boolean | `@${string}`,
 	active_pool?:boolean | `@${string}`,
 	/** An object relationship */
 	e_match_type?:ValueTypes["e_match_types"],
@@ -20551,6 +20552,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
+	deleted_at?: ValueTypes["timestamptz_comparison_exp"] | undefined | null | Variable<any, string>,
 	_and?: Array<ValueTypes["maps_bool_exp"]> | undefined | null | Variable<any, string>,
 	_not?: ValueTypes["maps_bool_exp"] | undefined | null | Variable<any, string>,
 	_or?: Array<ValueTypes["maps_bool_exp"]> | undefined | null | Variable<any, string>,
@@ -20573,6 +20575,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 ["maps_constraint"]:maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
+	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	active_pool?: boolean | undefined | null | Variable<any, string>,
 	e_match_type?: ValueTypes["e_match_types_obj_rel_insert_input"] | undefined | null | Variable<any, string>,
 	enabled?: boolean | undefined | null | Variable<any, string>,
@@ -20588,6 +20591,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** aggregate max on columns */
 ["maps_max_fields"]: AliasType<{
+	deleted_at?:boolean | `@${string}`,
 	id?:boolean | `@${string}`,
 	label?:boolean | `@${string}`,
 	name?:boolean | `@${string}`,
@@ -20598,6 +20602,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 }>;
 	/** order by max() on columns of table "maps" */
 ["maps_max_order_by"]: {
+	deleted_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	id?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	label?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	name?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -20607,6 +20612,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** aggregate min on columns */
 ["maps_min_fields"]: AliasType<{
+	deleted_at?:boolean | `@${string}`,
 	id?:boolean | `@${string}`,
 	label?:boolean | `@${string}`,
 	name?:boolean | `@${string}`,
@@ -20617,6 +20623,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 }>;
 	/** order by min() on columns of table "maps" */
 ["maps_min_order_by"]: {
+	deleted_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	id?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	label?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	name?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -20646,6 +20653,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
+	deleted_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	active_pool?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	e_match_type?: ValueTypes["e_match_types_order_by"] | undefined | null | Variable<any, string>,
 	enabled?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -20671,6 +20679,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 ["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]:maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
+	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	active_pool?: boolean | undefined | null | Variable<any, string>,
 	enabled?: boolean | undefined | null | Variable<any, string>,
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
@@ -20690,6 +20699,7 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
+	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	active_pool?: boolean | undefined | null | Variable<any, string>,
 	enabled?: boolean | undefined | null | Variable<any, string>,
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
@@ -89598,6 +89608,7 @@ count?: [{	columns?: Array<ResolverInputTypes["map_pools_select_column"]> | unde
 };
 	/** columns and relationships of "maps" */
 ["maps"]: AliasType<{
+	deleted_at?:boolean | `@${string}`,
 	active_pool?:boolean | `@${string}`,
 	/** An object relationship */
 	e_match_type?:ResolverInputTypes["e_match_types"],
@@ -89685,6 +89696,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
+	deleted_at?: ResolverInputTypes["timestamptz_comparison_exp"] | undefined | null,
 	_and?: Array<ResolverInputTypes["maps_bool_exp"]> | undefined | null,
 	_not?: ResolverInputTypes["maps_bool_exp"] | undefined | null,
 	_or?: Array<ResolverInputTypes["maps_bool_exp"]> | undefined | null,
@@ -89707,6 +89719,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 ["maps_constraint"]:maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
+	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
 	e_match_type?: ResolverInputTypes["e_match_types_obj_rel_insert_input"] | undefined | null,
 	enabled?: boolean | undefined | null,
@@ -89722,6 +89735,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** aggregate max on columns */
 ["maps_max_fields"]: AliasType<{
+	deleted_at?:boolean | `@${string}`,
 	id?:boolean | `@${string}`,
 	label?:boolean | `@${string}`,
 	name?:boolean | `@${string}`,
@@ -89732,6 +89746,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 }>;
 	/** order by max() on columns of table "maps" */
 ["maps_max_order_by"]: {
+	deleted_at?: ResolverInputTypes["order_by"] | undefined | null,
 	id?: ResolverInputTypes["order_by"] | undefined | null,
 	label?: ResolverInputTypes["order_by"] | undefined | null,
 	name?: ResolverInputTypes["order_by"] | undefined | null,
@@ -89741,6 +89756,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** aggregate min on columns */
 ["maps_min_fields"]: AliasType<{
+	deleted_at?:boolean | `@${string}`,
 	id?:boolean | `@${string}`,
 	label?:boolean | `@${string}`,
 	name?:boolean | `@${string}`,
@@ -89751,6 +89767,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 }>;
 	/** order by min() on columns of table "maps" */
 ["maps_min_order_by"]: {
+	deleted_at?: ResolverInputTypes["order_by"] | undefined | null,
 	id?: ResolverInputTypes["order_by"] | undefined | null,
 	label?: ResolverInputTypes["order_by"] | undefined | null,
 	name?: ResolverInputTypes["order_by"] | undefined | null,
@@ -89780,6 +89797,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
+	deleted_at?: ResolverInputTypes["order_by"] | undefined | null,
 	active_pool?: ResolverInputTypes["order_by"] | undefined | null,
 	e_match_type?: ResolverInputTypes["e_match_types_order_by"] | undefined | null,
 	enabled?: ResolverInputTypes["order_by"] | undefined | null,
@@ -89805,6 +89823,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 ["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]:maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
+	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ResolverInputTypes["uuid"] | undefined | null,
@@ -89824,6 +89843,7 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
+	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ResolverInputTypes["uuid"] | undefined | null,
@@ -157061,6 +157081,7 @@ export type ModelTypes = {
 };
 	/** columns and relationships of "maps" */
 ["maps"]: {
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 		active_pool: boolean,
 	/** An object relationship */
 	e_match_type: ModelTypes["e_match_types"],
@@ -157129,6 +157150,7 @@ export type ModelTypes = {
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
+	deleted_at?: ModelTypes["timestamptz_comparison_exp"] | undefined | null,
 	_and?: Array<ModelTypes["maps_bool_exp"]> | undefined | null,
 	_not?: ModelTypes["maps_bool_exp"] | undefined | null,
 	_or?: Array<ModelTypes["maps_bool_exp"]> | undefined | null,
@@ -157150,6 +157172,7 @@ export type ModelTypes = {
 	["maps_constraint"]:maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
 	e_match_type?: ModelTypes["e_match_types_obj_rel_insert_input"] | undefined | null,
 	enabled?: boolean | undefined | null,
@@ -157165,6 +157188,7 @@ export type ModelTypes = {
 };
 	/** aggregate max on columns */
 ["maps_max_fields"]: {
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 		id?: ModelTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
 	name?: string | undefined | null,
@@ -157174,6 +157198,7 @@ export type ModelTypes = {
 };
 	/** order by max() on columns of table "maps" */
 ["maps_max_order_by"]: {
+	deleted_at?: ModelTypes["order_by"] | undefined | null,
 	id?: ModelTypes["order_by"] | undefined | null,
 	label?: ModelTypes["order_by"] | undefined | null,
 	name?: ModelTypes["order_by"] | undefined | null,
@@ -157183,6 +157208,7 @@ export type ModelTypes = {
 };
 	/** aggregate min on columns */
 ["maps_min_fields"]: {
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 		id?: ModelTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
 	name?: string | undefined | null,
@@ -157192,6 +157218,7 @@ export type ModelTypes = {
 };
 	/** order by min() on columns of table "maps" */
 ["maps_min_order_by"]: {
+	deleted_at?: ModelTypes["order_by"] | undefined | null,
 	id?: ModelTypes["order_by"] | undefined | null,
 	label?: ModelTypes["order_by"] | undefined | null,
 	name?: ModelTypes["order_by"] | undefined | null,
@@ -157220,6 +157247,7 @@ export type ModelTypes = {
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
+	deleted_at?: ModelTypes["order_by"] | undefined | null,
 	active_pool?: ModelTypes["order_by"] | undefined | null,
 	e_match_type?: ModelTypes["e_match_types_order_by"] | undefined | null,
 	enabled?: ModelTypes["order_by"] | undefined | null,
@@ -157242,6 +157270,7 @@ export type ModelTypes = {
 	["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]:maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ModelTypes["uuid"] | undefined | null,
@@ -157261,6 +157290,7 @@ export type ModelTypes = {
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ModelTypes["uuid"] | undefined | null,
@@ -219014,6 +219044,7 @@ export type GraphQLTypes = {
 	/** columns and relationships of "maps" */
 ["maps"]: {
 	__typename: "maps",
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	active_pool: boolean,
 	/** An object relationship */
 	e_match_type: GraphQLTypes["e_match_types"],
@@ -219084,6 +219115,7 @@ export type GraphQLTypes = {
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
+	deleted_at?: GraphQLTypes["timestamptz_comparison_exp"] | undefined | null,
 		_and?: Array<GraphQLTypes["maps_bool_exp"]> | undefined | null,
 	_not?: GraphQLTypes["maps_bool_exp"] | undefined | null,
 	_or?: Array<GraphQLTypes["maps_bool_exp"]> | undefined | null,
@@ -219106,6 +219138,7 @@ export type GraphQLTypes = {
 ["maps_constraint"]: maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 		active_pool?: boolean | undefined | null,
 	e_match_type?: GraphQLTypes["e_match_types_obj_rel_insert_input"] | undefined | null,
 	enabled?: boolean | undefined | null,
@@ -219122,6 +219155,7 @@ export type GraphQLTypes = {
 	/** aggregate max on columns */
 ["maps_max_fields"]: {
 	__typename: "maps_max_fields",
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
 	name?: string | undefined | null,
@@ -219131,6 +219165,7 @@ export type GraphQLTypes = {
 };
 	/** order by max() on columns of table "maps" */
 ["maps_max_order_by"]: {
+	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
 		id?: GraphQLTypes["order_by"] | undefined | null,
 	label?: GraphQLTypes["order_by"] | undefined | null,
 	name?: GraphQLTypes["order_by"] | undefined | null,
@@ -219141,6 +219176,7 @@ export type GraphQLTypes = {
 	/** aggregate min on columns */
 ["maps_min_fields"]: {
 	__typename: "maps_min_fields",
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
 	name?: string | undefined | null,
@@ -219150,6 +219186,7 @@ export type GraphQLTypes = {
 };
 	/** order by min() on columns of table "maps" */
 ["maps_min_order_by"]: {
+	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
 		id?: GraphQLTypes["order_by"] | undefined | null,
 	label?: GraphQLTypes["order_by"] | undefined | null,
 	name?: GraphQLTypes["order_by"] | undefined | null,
@@ -219179,6 +219216,7 @@ export type GraphQLTypes = {
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
+	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
 		active_pool?: GraphQLTypes["order_by"] | undefined | null,
 	e_match_type?: GraphQLTypes["e_match_types_order_by"] | undefined | null,
 	enabled?: GraphQLTypes["order_by"] | undefined | null,
@@ -219204,6 +219242,7 @@ export type GraphQLTypes = {
 ["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]: maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 		active_pool?: boolean | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
@@ -219223,6 +219262,7 @@ export type GraphQLTypes = {
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 		active_pool?: boolean | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
@@ -266053,6 +266093,7 @@ export enum maps_constraint {
 }
 /** select columns of table "maps" */
 export enum maps_select_column {
+	deleted_at = "deleted_at",
 	active_pool = "active_pool",
 	enabled = "enabled",
 	id = "id",
@@ -266075,6 +266116,7 @@ export enum maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns
 }
 /** update columns of table "maps" */
 export enum maps_update_column {
+	deleted_at = "deleted_at",
 	active_pool = "active_pool",
 	enabled = "enabled",
 	id = "id",
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 29e2018a3..daf808cf1 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "تُضاف إلى سطر أوامر السيرفر عند بدئه.",
       "save": "احفظ النمط",
       "saved": "تم حفظ نمط اللعب",
-      "archive": "أرشف",
       "archived": "تمت أرشفة نمط اللعب",
       "runtime_none": "هذه الإضافات لا تشترك في أي إطار عمل، لذا لا يمكن تشغيل هذا النمط في أي مكان. أزل الإضافة التي تستهدف الإطار الآخر.",
       "runtime_only": "يعمل على {runtime} فقط، لأنه الإطار الوحيد الذي تتوفر له كل الإضافات هنا."
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 0f355914a..2be28486f 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Tilføjes til serverens kommandolinje når den starter.",
       "save": "Gem tilstand",
       "saved": "Spiltilstand gemt",
-      "archive": "Arkivér",
       "archived": "Spiltilstand arkiveret",
       "runtime_none": "Disse plugins har intet framework til fælles, så denne tilstand kan ikke køre nogen steder. Fjern det plugin, der er bygget til det andet framework.",
       "runtime_only": "Kører kun på {runtime}, fordi det er det eneste framework alle plugins her findes til."
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index fffe91142..d4c7fdca0 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Wird beim Start an die Kommandozeile des Servers angehängt.",
       "save": "Modus speichern",
       "saved": "Spielmodus gespeichert",
-      "archive": "Archivieren",
       "archived": "Spielmodus archiviert",
       "runtime_none": "Diese Plugins haben kein gemeinsames Framework, dieser Modus kann also nirgends laufen. Entferne das Plugin, das auf das andere Framework zielt.",
       "runtime_only": "Läuft nur auf {runtime}, weil das das einzige Framework ist, für das es hier jedes Plugin gibt."
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 1d70d4e0c..27fae6b4f 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -2473,7 +2473,8 @@
           "disabled": "Disabled",
           "competitive": "In draft lobbies",
           "casual_only": "Hidden from drafts",
-          "plugin_count": "{count} plugins"
+          "plugin_count": "{count} plugins",
+          "archived": "Archived"
         }
       },
       "language": {
@@ -3262,17 +3263,20 @@
         "delete_map": "Delete Map",
         "delete_confirm": {
           "title": "Delete Map",
-          "description": "Are you sure you want to delete this map? This action cannot be undone."
+          "description": "Are you sure you want to delete this map? It is removed from every map pool and picker, but matches already played on it keep their history. You can restore it later, or simply add a map with the same name."
         },
         "success": {
           "create": "Map created successfully",
           "update": "Map updated successfully",
           "delete": "Map deleted successfully",
+          "restore": "Map restored",
+          "restore_description": "A deleted map with this name already existed, so it was restored with its match history intact.",
           "workshop_refresh": "Workshop map details refreshed successfully"
         },
         "error": {
           "create": "Error creating map",
           "update": "Error updating map",
+          "already_exists": "A map with this name already exists",
           "invalid_workshop": "Invalid workshop map ID. Please verify the ID exists on Steam Workshop.",
           "workshop_refresh": "Error refreshing workshop map details"
         },
@@ -3287,7 +3291,11 @@
       "active_duty": "Active Duty",
       "available_modes": "Available In Modes",
       "workshop_id": "Workshop Link",
-      "search": "Search Maps"
+      "search": "Search Maps",
+      "deleted_maps": "Deleted Maps",
+      "deleted_maps_description": "Deleted maps are hidden from every map pool and picker, but matches already played on them keep their history. Restoring brings a map back as it was.",
+      "deleted_on": "Deleted {date}",
+      "restore_map": "Restore"
     },
     "map_pool": {
       "toggle_pool_type": "Updated Map Pools",
@@ -6602,6 +6610,9 @@
       "select_game_mode": "Select Game Mode",
       "valve_preset_group": "Valve presets",
       "custom_mode_group": "Custom modes",
+      "custom_mode_group_locked": "needs a game server node",
+      "custom_modes_need_node_title": "Custom modes need a game server node",
+      "custom_modes_need_node_description": "A custom mode is a set of plugins 5Stack installs onto the server it runs. It cannot install anything on a third-party dedicated server, so attach this server to a game server node under Connection to pick one.",
       "game": "Game",
       "csgo_ranked_unavailable_title": "Ranked Not Available",
       "csgo_ranked_unavailable_description": "Ranked mode is not yet available for CS:GO servers.",
@@ -8271,6 +8282,8 @@
       "name": "Name",
       "slug": "Slug",
       "description": "Description",
+      "enabled": "Enabled",
+      "enabled_description": "Disabled modes are kept but cannot be picked for a match, server or draft room.",
       "competitive_safe": "Offer in draft lobbies",
       "competitive_safe_description": "Lobby hosts can pick this mode when creating a draft room. Matches with any custom mode never count toward ELO or the leaderboards.",
       "plugins": "Plugins",
@@ -8283,11 +8296,17 @@
       "extra_game_params_description": "Appended to the server's command line when it starts.",
       "save": "Save Mode",
       "saved": "Game mode saved",
-      "archive": "Archive",
-      "archived": "Game mode archived",
+      "archived": "Game mode hidden",
+      "restore": "Restore",
+      "restored": "Game mode restored",
+      "delete": "Delete",
+      "deleted": "Game mode deleted",
+      "delete_confirm_title": "Delete {name}?",
+      "delete_confirm_description": "Removes the mode permanently. If any match has already run it, it is hidden instead — that history stays intact and you can restore it later.",
       "runtime_none": "These plugins have no framework in common, so this mode cannot run anywhere. Remove whichever one targets the other framework.",
       "runtime_only": "Runs on {runtime} only, because that is the one framework every plugin here ships for.",
-      "open_plugin": "Open this plugin's page in a new tab"
+      "open_plugin": "Open this plugin's page in a new tab",
+      "archived_instead": "Matches have already run this mode, so it was hidden instead of deleted. You can restore it any time."
     }
   }
 }
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 75b2e5f0e..143f65801 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Se añaden a la línea de comandos del servidor al iniciarse.",
       "save": "Guardar modo",
       "saved": "Modo de juego guardado",
-      "archive": "Archivar",
       "archived": "Modo de juego archivado",
       "runtime_none": "Estos plugins no comparten ningún framework, así que este modo no puede ejecutarse en ningún sitio. Quita el que apunte al otro framework.",
       "runtime_only": "Solo funciona en {runtime}, porque es el único framework para el que existen todos estos plugins."
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index c74e64d67..80f0c53c4 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Ajoutés à la ligne de commande du serveur à son démarrage.",
       "save": "Enregistrer le mode",
       "saved": "Mode de jeu enregistré",
-      "archive": "Archiver",
       "archived": "Mode de jeu archivé",
       "runtime_none": "Ces plugins n'ont aucun framework en commun, ce mode ne peut donc tourner nulle part. Retire celui qui vise l'autre framework.",
       "runtime_only": "Tourne uniquement sur {runtime}, car c'est le seul framework pour lequel tous ces plugins existent."
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index e9d0c45a7..28bb8295a 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Aggiunti alla riga di comando del server all'avvio.",
       "save": "Salva modalità",
       "saved": "Modalità di gioco salvata",
-      "archive": "Archivia",
       "archived": "Modalità di gioco archiviata",
       "runtime_none": "Questi plugin non hanno alcun framework in comune, quindi questa modalità non può girare da nessuna parte. Rimuovi quello destinato all'altro framework.",
       "runtime_only": "Gira solo su {runtime}, perché è l'unico framework per cui esistono tutti questi plugin."
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 9331e9cde..297d3c42f 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "サーバー起動時にコマンドラインへ追加されます。",
       "save": "モードを保存",
       "saved": "ゲームモードを保存しました",
-      "archive": "アーカイブ",
       "archived": "ゲームモードをアーカイブしました",
       "runtime_none": "これらのプラグインには共通するフレームワークがないため、このモードはどこでも動作しません。別のフレームワーク向けのプラグインを削除してください。",
       "runtime_only": "{runtime} でのみ動作します。ここにあるすべてのプラグインが対応している唯一のフレームワークだからです。"
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index adced465f..3652877b5 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "서버가 시작될 때 명령줄에 덧붙습니다.",
       "save": "모드 저장",
       "saved": "게임 모드를 저장했습니다",
-      "archive": "보관",
       "archived": "게임 모드를 보관했습니다",
       "runtime_none": "이 플러그인들은 공통 프레임워크가 없어 이 모드를 어디서도 실행할 수 없습니다. 다른 프레임워크용 플러그인을 제거하세요.",
       "runtime_only": "{runtime}에서만 실행됩니다. 여기 있는 모든 플러그인이 지원하는 유일한 프레임워크이기 때문입니다."
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index 522988f65..f0a9359f4 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Dopisywane do linii poleceń serwera przy starcie.",
       "save": "Zapisz tryb",
       "saved": "Tryb gry zapisany",
-      "archive": "Archiwizuj",
       "archived": "Tryb gry zarchiwizowany",
       "runtime_none": "Te wtyczki nie mają wspólnego frameworka, więc ten tryb nigdzie nie zadziała. Usuń tę, która celuje w drugi framework.",
       "runtime_only": "Działa tylko na {runtime}, bo to jedyny framework, dla którego istnieją wszystkie te wtyczki."
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index 77d7deec6..5f0550bb2 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -7848,7 +7848,6 @@
       "extra_game_params_description": "Anexados à linha de comando do servidor ao iniciar.",
       "save": "Salvar modo",
       "saved": "Modo de jogo salvo",
-      "archive": "Arquivar",
       "archived": "Modo de jogo arquivado",
       "runtime_none": "Estes plugins não têm nenhum framework em comum, então este modo não pode rodar em lugar nenhum. Remova o que for do outro framework.",
       "runtime_only": "Roda apenas em {runtime}, porque é o único framework para o qual todos estes plugins existem."
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index f0683a1f0..fbc1bc5b5 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Добавляются в командную строку сервера при запуске.",
       "save": "Сохранить режим",
       "saved": "Режим игры сохранён",
-      "archive": "В архив",
       "archived": "Режим игры отправлен в архив",
       "runtime_none": "У этих плагинов нет общего фреймворка, поэтому этот режим нигде не запустится. Удали тот, который собран под другой фреймворк.",
       "runtime_only": "Работает только на {runtime} — это единственный фреймворк, под который выпущены все эти плагины."
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 6387b395c..93b219ce7 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Läggs till på serverns kommandorad när den startar.",
       "save": "Spara läge",
       "saved": "Spelläge sparat",
-      "archive": "Arkivera",
       "archived": "Spelläge arkiverat",
       "runtime_none": "De här tilläggen har inget gemensamt ramverk, så det här läget kan inte köras någonstans. Ta bort det som riktar sig mot det andra ramverket.",
       "runtime_only": "Körs bara på {runtime}, eftersom det är det enda ramverk som alla tillägg här finns för."
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index 83500db65..e6517fdf4 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Sunucu başlarken komut satırına eklenir.",
       "save": "Modu Kaydet",
       "saved": "Oyun modu kaydedildi",
-      "archive": "Arşivle",
       "archived": "Oyun modu arşivlendi",
       "runtime_none": "Bu eklentilerin ortak bir framework'ü yok, bu yüzden bu mod hiçbir yerde çalışamaz. Diğer framework'ü hedefleyen eklentiyi kaldır.",
       "runtime_only": "Yalnızca {runtime} üzerinde çalışır, çünkü buradaki tüm eklentilerin çıktığı tek framework o."
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index fa5169781..348e0fc82 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "Додаються до командного рядка сервера під час запуску.",
       "save": "Зберегти режим",
       "saved": "Режим гри збережено",
-      "archive": "В архів",
       "archived": "Режим гри надіслано в архів",
       "runtime_none": "У цих плагінів немає спільного фреймворку, тож цей режим ніде не запуститься. Видали той, що зібраний під інший фреймворк.",
       "runtime_only": "Працює лише на {runtime} — це єдиний фреймворк, під який випущені всі ці плагіни."
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index 129f2eaeb..b25563e01 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "服务器启动时追加到命令行。",
       "save": "保存模式",
       "saved": "游戏模式已保存",
-      "archive": "归档",
       "archived": "游戏模式已归档",
       "runtime_none": "这些插件没有共同的框架，因此该模式无法在任何地方运行。请移除面向另一种框架的那个插件。",
       "runtime_only": "仅在 {runtime} 上运行，因为这是这里所有插件都发布了版本的唯一框架。"
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 5f7528218..020b0cd12 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -8214,7 +8214,6 @@
       "extra_game_params_description": "伺服器啟動時附加到命令列。",
       "save": "儲存模式",
       "saved": "已儲存遊戲模式",
-      "archive": "封存",
       "archived": "已封存遊戲模式",
       "runtime_none": "這些外掛沒有共同的框架，因此此模式無法在任何地方執行。請移除面向另一種框架的那個外掛。",
       "runtime_only": "僅在 {runtime} 上執行，因為這是這裡所有外掛都有推出版本的唯一框架。"
diff --git a/pages/settings/application/game-modes.vue b/pages/settings/application/game-modes.vue
index f61ef52fe..657709fea 100644
--- a/pages/settings/application/game-modes.vue
+++ b/pages/settings/application/game-modes.vue
@@ -12,7 +12,7 @@ import {
   SheetHeader,
   SheetTitle,
 } from "~/components/ui/sheet";
-import { Plus, ShieldCheck, ShieldAlert } from "lucide-vue-next";
+import { Plus, ShieldCheck, ShieldAlert, Archive } from "lucide-vue-next";
 
 definePageMeta({
   middleware: "admin",
@@ -51,16 +51,21 @@ definePageMeta({
 
           <div class="space-y-2" v-else>
             <button
-              v-for="mode in gameModes"
+              v-for="mode in sortedModes"
               :key="mode.id"
               type="button"
               class="flex w-full items-center justify-between gap-4 rounded-md border p-3 text-left transition-colors hover:bg-accent"
+              :class="mode.archived_at ? 'opacity-60' : ''"
               @click="edit(mode)"
             >
               <div class="min-w-0">
                 <div class="flex items-center gap-2">
                   <span class="font-medium truncate">{{ mode.name }}</span>
-                  <Badge variant="outline" v-if="!mode.enabled">
+                  <Badge variant="outline" class="gap-1" v-if="mode.archived_at">
+                    <Archive class="h-3 w-3" />
+                    {{ $t("pages.settings.application.game_modes.archived") }}
+                  </Badge>
+                  <Badge variant="outline" v-else-if="!mode.enabled">
                     {{ $t("pages.settings.application.game_modes.disabled") }}
                   </Badge>
                   <Badge
@@ -144,6 +149,7 @@ export default {
             name: true,
             description: true,
             enabled: true,
+            archived_at: true,
             competitive_safe: true,
             supported_runtimes: true,
             runtime_conflicts: true,
@@ -183,6 +189,13 @@ export default {
     gamePluginsEnabled() {
       return useApplicationSettingsStore().gamePluginsEnabled;
     },
+    // Archived modes stay listed (so they can be restored or deleted) but sink
+    // below the live ones.
+    sortedModes(): Array<Record<string, any>> {
+      return [...this.gameModes].sort(
+        (a, b) => Number(!!a.archived_at) - Number(!!b.archived_at),
+      );
+    },
   },
 };
 </script>
diff --git a/pages/settings/application/map-pools/[id].vue b/pages/settings/application/map-pools/[id].vue
index 00128ee5e..eb9d55039 100644
--- a/pages/settings/application/map-pools/[id].vue
+++ b/pages/settings/application/map-pools/[id].vue
@@ -75,6 +75,9 @@ export default {
               enabled: {
                 _eq: true,
               },
+              deleted_at: {
+                _is_null: true,
+              },
             },
           },
           mapFields,
diff --git a/pages/settings/application/map-pools/index.vue b/pages/settings/application/map-pools/index.vue
index cb11ba826..bf4abcabc 100644
--- a/pages/settings/application/map-pools/index.vue
+++ b/pages/settings/application/map-pools/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Info, PlusCircle } from "lucide-vue-next";
+import { Info, PlusCircle, ArchiveRestore, Trash2 } from "lucide-vue-next";
 import { Separator } from "~/components/ui/separator";
 import {
   Sheet,
@@ -13,6 +13,7 @@ import { Input } from "~/components/ui/input";
 import { Search } from "lucide-vue-next";
 import MapForm from "~/components/map-pools/MapForm.vue";
 import MapPoolRow from "~/components/map-pools/MapPoolRow.vue";
+import MapDisplay from "~/components/MapDisplay.vue";
 import FiveStackToolTip from "~/components/FiveStackToolTip.vue";
 import { useSidebar } from "~/components/ui/sidebar/utils";
 import PageTransition from "~/components/ui/transitions/PageTransition.vue";
@@ -20,12 +21,12 @@ import { Card } from "~/components/ui/card";
 import {
   Table,
   TableBody,
+  TableCell,
   TableHead,
   TableHeader,
   TableRow,
 } from "~/components/ui/table";
 
-
 const { isMobile } = useSidebar();
 </script>
 
@@ -138,6 +139,48 @@ const { isMobile } = useSidebar();
     </Card>
   </PageTransition>
 
+  <PageTransition v-if="deletedMaps.length > 0" :delay="400" class="mt-6">
+    <Card variant="gradient" class="p-4">
+      <div class="flex items-center gap-2 mb-2">
+        <Trash2 class="h-4 w-4 text-muted-foreground" />
+        <h3 class="text-lg font-semibold">
+          {{ $t("pages.map_pools.deleted_maps") }}
+        </h3>
+      </div>
+      <p class="text-sm text-muted-foreground mb-4">
+        {{ $t("pages.map_pools.deleted_maps_description") }}
+      </p>
+      <div class="relative w-full overflow-auto">
+        <Table>
+          <TableBody>
+            <TableRow
+              v-for="map in deletedMaps"
+              :key="map.id"
+              class="border-t opacity-70"
+            >
+              <TableCell class="px-4 py-2 text-sm">
+                <MapDisplay :map="map" style="max-width: 350px" />
+              </TableCell>
+              <TableCell class="px-4 py-2 text-sm text-muted-foreground">
+                {{
+                  $t("pages.map_pools.deleted_on", {
+                    date: formatDeletedAt(map.deleted_at),
+                  })
+                }}
+              </TableCell>
+              <TableCell class="px-4 py-2 text-right">
+                <Button variant="outline" size="sm" @click="restoreMap(map)">
+                  <ArchiveRestore class="h-4 w-4 mr-2" />
+                  {{ $t("pages.map_pools.restore_map") }}
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </Card>
+  </PageTransition>
+
   <Sheet :open="mapFormSheet" @update:open="(open) => (mapFormSheet = open)">
     <SheetContent>
       <SheetHeader>
@@ -158,6 +201,7 @@ import { settings_constraint, settings_update_column } from "~/generated/zeus";
 import { generateMutation } from "~/graphql/graphqlGen";
 import { order_by } from "~/generated/zeus";
 import { toast } from "@/components/ui/toast";
+import { dateLocale } from "~/utilities/dateLocale";
 interface Map {
   id: string;
   name: string;
@@ -169,6 +213,7 @@ interface Map {
   workshop_map_id?: string;
   poolTypes: string[];
   enabled: boolean;
+  deleted_at?: string | null;
 }
 
 interface MapPool {
@@ -212,6 +257,7 @@ export default {
             {
               ...mapFields,
               enabled: true,
+              deleted_at: true,
             },
           ],
         }),
@@ -249,6 +295,36 @@ export default {
     },
   },
   methods: {
+    formatDeletedAt(deletedAt: string) {
+      return new Date(deletedAt).toLocaleDateString(dateLocale(), {
+        dateStyle: "medium",
+      });
+    },
+    async restoreMap(map: Map) {
+      await this.$apollo.mutate({
+        mutation: generateMutation({
+          update_maps: [
+            {
+              _set: {
+                deleted_at: null,
+              },
+              where: {
+                name: {
+                  _eq: map.name,
+                },
+              },
+            },
+            {
+              affected_rows: true,
+            },
+          ],
+        }),
+      });
+
+      toast({
+        title: this.$t("pages.map_pools.form.success.restore") as string,
+      });
+    },
     async toggleUpdateMapPools() {
       await this.$apollo.mutate({
         mutation: generateMutation({
@@ -279,10 +355,28 @@ export default {
     showSeparators() {
       return useApplicationSettingsStore().showSeparators;
     },
+    deletedMaps(): Map[] {
+      const uniqueMapsMap = new Map<string, Map>();
+
+      for (const map of this.maps) {
+        if (!map.deleted_at || uniqueMapsMap.has(map.name)) {
+          continue;
+        }
+        uniqueMapsMap.set(map.name, map);
+      }
+
+      return Array.from(uniqueMapsMap.values()).sort((a, b) => {
+        return a.name.localeCompare(b.name);
+      });
+    },
     availableMaps(): Map[] {
       const uniqueMapsMap = new Map<string, Map>();
 
       for (const map of this.maps) {
+        if (map.deleted_at) {
+          continue;
+        }
+
         if (!uniqueMapsMap.has(map.name)) {
           uniqueMapsMap.set(map.name, {
             ...map,

From 0078eef35bf48690bfb0db15dc83ba1a032a7dce Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 14:33:59 -0400
Subject: [PATCH 4/7] wip

---
 generated/zeus/const.ts |  6 ++--
 generated/zeus/index.ts | 68 ++++++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/generated/zeus/const.ts b/generated/zeus/const.ts
index dcd5bd0b9..95c7ba86d 100644
--- a/generated/zeus/const.ts
+++ b/generated/zeus/const.ts
@@ -9451,11 +9451,11 @@ export const AllTypesProps: Record<string,any> = {
 		on_conflict:"maps_on_conflict"
 	},
 	maps_bool_exp:{
-		deleted_at:"timestamptz_comparison_exp",
 		_and:"maps_bool_exp",
 		_not:"maps_bool_exp",
 		_or:"maps_bool_exp",
 		active_pool:"Boolean_comparison_exp",
+		deleted_at:"timestamptz_comparison_exp",
 		e_match_type:"e_match_types_bool_exp",
 		enabled:"Boolean_comparison_exp",
 		id:"uuid_comparison_exp",
@@ -9507,8 +9507,8 @@ export const AllTypesProps: Record<string,any> = {
 		where:"maps_bool_exp"
 	},
 	maps_order_by:{
-		deleted_at:"order_by",
 		active_pool:"order_by",
+		deleted_at:"order_by",
 		e_match_type:"e_match_types_order_by",
 		enabled:"order_by",
 		id:"order_by",
@@ -45019,8 +45019,8 @@ export const ReturnTypes: Record<string,any> = {
 		returning:"map_pools"
 	},
 	maps:{
-		deleted_at:"timestamptz",
 		active_pool:"Boolean",
+		deleted_at:"timestamptz",
 		e_match_type:"e_match_types",
 		enabled:"Boolean",
 		id:"uuid",
diff --git a/generated/zeus/index.ts b/generated/zeus/index.ts
index 14ef541d2..ad446d840 100644
--- a/generated/zeus/index.ts
+++ b/generated/zeus/index.ts
@@ -20464,8 +20464,8 @@ count?: [{	columns?: Array<ValueTypes["map_pools_select_column"]> | undefined |
 };
 	/** columns and relationships of "maps" */
 ["maps"]: AliasType<{
-	deleted_at?:boolean | `@${string}`,
 	active_pool?:boolean | `@${string}`,
+	deleted_at?:boolean | `@${string}`,
 	/** An object relationship */
 	e_match_type?:ValueTypes["e_match_types"],
 	enabled?:boolean | `@${string}`,
@@ -20552,11 +20552,11 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
-	deleted_at?: ValueTypes["timestamptz_comparison_exp"] | undefined | null | Variable<any, string>,
 	_and?: Array<ValueTypes["maps_bool_exp"]> | undefined | null | Variable<any, string>,
 	_not?: ValueTypes["maps_bool_exp"] | undefined | null | Variable<any, string>,
 	_or?: Array<ValueTypes["maps_bool_exp"]> | undefined | null | Variable<any, string>,
 	active_pool?: ValueTypes["Boolean_comparison_exp"] | undefined | null | Variable<any, string>,
+	deleted_at?: ValueTypes["timestamptz_comparison_exp"] | undefined | null | Variable<any, string>,
 	e_match_type?: ValueTypes["e_match_types_bool_exp"] | undefined | null | Variable<any, string>,
 	enabled?: ValueTypes["Boolean_comparison_exp"] | undefined | null | Variable<any, string>,
 	id?: ValueTypes["uuid_comparison_exp"] | undefined | null | Variable<any, string>,
@@ -20575,8 +20575,8 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 ["maps_constraint"]:maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
-	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	active_pool?: boolean | undefined | null | Variable<any, string>,
+	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	e_match_type?: ValueTypes["e_match_types_obj_rel_insert_input"] | undefined | null | Variable<any, string>,
 	enabled?: boolean | undefined | null | Variable<any, string>,
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
@@ -20653,8 +20653,8 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
-	deleted_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	active_pool?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
+	deleted_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	e_match_type?: ValueTypes["e_match_types_order_by"] | undefined | null | Variable<any, string>,
 	enabled?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	id?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -20679,8 +20679,8 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 ["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]:maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
-	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	active_pool?: boolean | undefined | null | Variable<any, string>,
+	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	enabled?: boolean | undefined | null | Variable<any, string>,
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
 	label?: string | undefined | null | Variable<any, string>,
@@ -20699,8 +20699,8 @@ count?: [{	columns?: Array<ValueTypes["maps_select_column"]> | undefined | null
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
-	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	active_pool?: boolean | undefined | null | Variable<any, string>,
+	deleted_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	enabled?: boolean | undefined | null | Variable<any, string>,
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
 	label?: string | undefined | null | Variable<any, string>,
@@ -89608,8 +89608,8 @@ count?: [{	columns?: Array<ResolverInputTypes["map_pools_select_column"]> | unde
 };
 	/** columns and relationships of "maps" */
 ["maps"]: AliasType<{
-	deleted_at?:boolean | `@${string}`,
 	active_pool?:boolean | `@${string}`,
+	deleted_at?:boolean | `@${string}`,
 	/** An object relationship */
 	e_match_type?:ResolverInputTypes["e_match_types"],
 	enabled?:boolean | `@${string}`,
@@ -89696,11 +89696,11 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
-	deleted_at?: ResolverInputTypes["timestamptz_comparison_exp"] | undefined | null,
 	_and?: Array<ResolverInputTypes["maps_bool_exp"]> | undefined | null,
 	_not?: ResolverInputTypes["maps_bool_exp"] | undefined | null,
 	_or?: Array<ResolverInputTypes["maps_bool_exp"]> | undefined | null,
 	active_pool?: ResolverInputTypes["Boolean_comparison_exp"] | undefined | null,
+	deleted_at?: ResolverInputTypes["timestamptz_comparison_exp"] | undefined | null,
 	e_match_type?: ResolverInputTypes["e_match_types_bool_exp"] | undefined | null,
 	enabled?: ResolverInputTypes["Boolean_comparison_exp"] | undefined | null,
 	id?: ResolverInputTypes["uuid_comparison_exp"] | undefined | null,
@@ -89719,8 +89719,8 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 ["maps_constraint"]:maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
-	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
+	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	e_match_type?: ResolverInputTypes["e_match_types_obj_rel_insert_input"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ResolverInputTypes["uuid"] | undefined | null,
@@ -89797,8 +89797,8 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
-	deleted_at?: ResolverInputTypes["order_by"] | undefined | null,
 	active_pool?: ResolverInputTypes["order_by"] | undefined | null,
+	deleted_at?: ResolverInputTypes["order_by"] | undefined | null,
 	e_match_type?: ResolverInputTypes["e_match_types_order_by"] | undefined | null,
 	enabled?: ResolverInputTypes["order_by"] | undefined | null,
 	id?: ResolverInputTypes["order_by"] | undefined | null,
@@ -89823,8 +89823,8 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 ["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]:maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
-	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
+	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ResolverInputTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
@@ -89843,8 +89843,8 @@ count?: [{	columns?: Array<ResolverInputTypes["maps_select_column"]> | undefined
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
-	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
+	deleted_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ResolverInputTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
@@ -157081,8 +157081,8 @@ export type ModelTypes = {
 };
 	/** columns and relationships of "maps" */
 ["maps"]: {
-	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 		active_pool: boolean,
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	/** An object relationship */
 	e_match_type: ModelTypes["e_match_types"],
 	enabled: boolean,
@@ -157150,11 +157150,11 @@ export type ModelTypes = {
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
-	deleted_at?: ModelTypes["timestamptz_comparison_exp"] | undefined | null,
 	_and?: Array<ModelTypes["maps_bool_exp"]> | undefined | null,
 	_not?: ModelTypes["maps_bool_exp"] | undefined | null,
 	_or?: Array<ModelTypes["maps_bool_exp"]> | undefined | null,
 	active_pool?: ModelTypes["Boolean_comparison_exp"] | undefined | null,
+	deleted_at?: ModelTypes["timestamptz_comparison_exp"] | undefined | null,
 	e_match_type?: ModelTypes["e_match_types_bool_exp"] | undefined | null,
 	enabled?: ModelTypes["Boolean_comparison_exp"] | undefined | null,
 	id?: ModelTypes["uuid_comparison_exp"] | undefined | null,
@@ -157172,8 +157172,8 @@ export type ModelTypes = {
 	["maps_constraint"]:maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
-	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	e_match_type?: ModelTypes["e_match_types_obj_rel_insert_input"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ModelTypes["uuid"] | undefined | null,
@@ -157188,8 +157188,8 @@ export type ModelTypes = {
 };
 	/** aggregate max on columns */
 ["maps_max_fields"]: {
-	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
-		id?: ModelTypes["uuid"] | undefined | null,
+		deleted_at?: ModelTypes["timestamptz"] | undefined | null,
+	id?: ModelTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
 	name?: string | undefined | null,
 	patch?: string | undefined | null,
@@ -157208,8 +157208,8 @@ export type ModelTypes = {
 };
 	/** aggregate min on columns */
 ["maps_min_fields"]: {
-	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
-		id?: ModelTypes["uuid"] | undefined | null,
+		deleted_at?: ModelTypes["timestamptz"] | undefined | null,
+	id?: ModelTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
 	name?: string | undefined | null,
 	patch?: string | undefined | null,
@@ -157247,8 +157247,8 @@ export type ModelTypes = {
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
-	deleted_at?: ModelTypes["order_by"] | undefined | null,
 	active_pool?: ModelTypes["order_by"] | undefined | null,
+	deleted_at?: ModelTypes["order_by"] | undefined | null,
 	e_match_type?: ModelTypes["e_match_types_order_by"] | undefined | null,
 	enabled?: ModelTypes["order_by"] | undefined | null,
 	id?: ModelTypes["order_by"] | undefined | null,
@@ -157270,8 +157270,8 @@ export type ModelTypes = {
 	["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]:maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
-	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ModelTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
@@ -157290,8 +157290,8 @@ export type ModelTypes = {
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
-	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	active_pool?: boolean | undefined | null,
+	deleted_at?: ModelTypes["timestamptz"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: ModelTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
@@ -219044,8 +219044,8 @@ export type GraphQLTypes = {
 	/** columns and relationships of "maps" */
 ["maps"]: {
 	__typename: "maps",
-	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	active_pool: boolean,
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	/** An object relationship */
 	e_match_type: GraphQLTypes["e_match_types"],
 	enabled: boolean,
@@ -219115,11 +219115,11 @@ export type GraphQLTypes = {
 };
 	/** Boolean expression to filter rows from the table "maps". All fields are combined with a logical 'AND'. */
 ["maps_bool_exp"]: {
-	deleted_at?: GraphQLTypes["timestamptz_comparison_exp"] | undefined | null,
 		_and?: Array<GraphQLTypes["maps_bool_exp"]> | undefined | null,
 	_not?: GraphQLTypes["maps_bool_exp"] | undefined | null,
 	_or?: Array<GraphQLTypes["maps_bool_exp"]> | undefined | null,
 	active_pool?: GraphQLTypes["Boolean_comparison_exp"] | undefined | null,
+	deleted_at?: GraphQLTypes["timestamptz_comparison_exp"] | undefined | null,
 	e_match_type?: GraphQLTypes["e_match_types_bool_exp"] | undefined | null,
 	enabled?: GraphQLTypes["Boolean_comparison_exp"] | undefined | null,
 	id?: GraphQLTypes["uuid_comparison_exp"] | undefined | null,
@@ -219138,8 +219138,8 @@ export type GraphQLTypes = {
 ["maps_constraint"]: maps_constraint;
 	/** input type for inserting data into table "maps" */
 ["maps_insert_input"]: {
-	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 		active_pool?: boolean | undefined | null,
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	e_match_type?: GraphQLTypes["e_match_types_obj_rel_insert_input"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
@@ -219165,8 +219165,8 @@ export type GraphQLTypes = {
 };
 	/** order by max() on columns of table "maps" */
 ["maps_max_order_by"]: {
-	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
-		id?: GraphQLTypes["order_by"] | undefined | null,
+		deleted_at?: GraphQLTypes["order_by"] | undefined | null,
+	id?: GraphQLTypes["order_by"] | undefined | null,
 	label?: GraphQLTypes["order_by"] | undefined | null,
 	name?: GraphQLTypes["order_by"] | undefined | null,
 	patch?: GraphQLTypes["order_by"] | undefined | null,
@@ -219186,8 +219186,8 @@ export type GraphQLTypes = {
 };
 	/** order by min() on columns of table "maps" */
 ["maps_min_order_by"]: {
-	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
-		id?: GraphQLTypes["order_by"] | undefined | null,
+		deleted_at?: GraphQLTypes["order_by"] | undefined | null,
+	id?: GraphQLTypes["order_by"] | undefined | null,
 	label?: GraphQLTypes["order_by"] | undefined | null,
 	name?: GraphQLTypes["order_by"] | undefined | null,
 	patch?: GraphQLTypes["order_by"] | undefined | null,
@@ -219216,8 +219216,8 @@ export type GraphQLTypes = {
 };
 	/** Ordering options when selecting data from "maps". */
 ["maps_order_by"]: {
-	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
 		active_pool?: GraphQLTypes["order_by"] | undefined | null,
+	deleted_at?: GraphQLTypes["order_by"] | undefined | null,
 	e_match_type?: GraphQLTypes["e_match_types_order_by"] | undefined | null,
 	enabled?: GraphQLTypes["order_by"] | undefined | null,
 	id?: GraphQLTypes["order_by"] | undefined | null,
@@ -219242,8 +219242,8 @@ export type GraphQLTypes = {
 ["maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns"]: maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns;
 	/** input type for updating data in table "maps" */
 ["maps_set_input"]: {
-	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 		active_pool?: boolean | undefined | null,
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
@@ -219262,8 +219262,8 @@ export type GraphQLTypes = {
 };
 	/** Initial value of the column from where the streaming should start */
 ["maps_stream_cursor_value_input"]: {
-	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 		active_pool?: boolean | undefined | null,
+	deleted_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	enabled?: boolean | undefined | null,
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	label?: string | undefined | null,
@@ -266093,8 +266093,8 @@ export enum maps_constraint {
 }
 /** select columns of table "maps" */
 export enum maps_select_column {
-	deleted_at = "deleted_at",
 	active_pool = "active_pool",
+	deleted_at = "deleted_at",
 	enabled = "enabled",
 	id = "id",
 	label = "label",
@@ -266116,8 +266116,8 @@ export enum maps_select_column_maps_aggregate_bool_exp_bool_or_arguments_columns
 }
 /** update columns of table "maps" */
 export enum maps_update_column {
-	deleted_at = "deleted_at",
 	active_pool = "active_pool",
+	deleted_at = "deleted_at",
 	enabled = "enabled",
 	id = "id",
 	label = "label",

From 1d61df19336baec6e2d225b0461ba15e6a6e55aa Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 14:40:14 -0400
Subject: [PATCH 5/7] wip

---
 generated/zeus/index.ts  |  4 ++++
 pages/plugins/[slug].vue | 23 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/generated/zeus/index.ts b/generated/zeus/index.ts
index ad446d840..0f85587be 100644
--- a/generated/zeus/index.ts
+++ b/generated/zeus/index.ts
@@ -14834,6 +14834,7 @@ count?: [{	columns?: Array<ValueTypes["game_plugins_select_column"]> | undefined
 	id?:boolean | `@${string}`,
 	installed_at?:boolean | `@${string}`,
 	last_error?:boolean | `@${string}`,
+	path?:boolean | `@${string}`,
 	/** An object relationship */
 	plugin?:ValueTypes["game_plugins"],
 	plugin_slug?:boolean | `@${string}`,
@@ -83978,6 +83979,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_plugins_select_column"]> | u
 	id?:boolean | `@${string}`,
 	installed_at?:boolean | `@${string}`,
 	last_error?:boolean | `@${string}`,
+	path?:boolean | `@${string}`,
 	/** An object relationship */
 	plugin?:ResolverInputTypes["game_plugins"],
 	plugin_slug?:boolean | `@${string}`,
@@ -151872,6 +151874,7 @@ export type ModelTypes = {
 	id: ModelTypes["uuid"],
 	installed_at?: ModelTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	/** An object relationship */
 	plugin?: ModelTypes["game_plugins"] | undefined | null,
 	plugin_slug: string,
@@ -213565,6 +213568,7 @@ export type GraphQLTypes = {
 	id: GraphQLTypes["uuid"],
 	installed_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	/** An object relationship */
 	plugin?: GraphQLTypes["game_plugins"] | undefined | null,
 	plugin_slug: string,
diff --git a/pages/plugins/[slug].vue b/pages/plugins/[slug].vue
index aa29a263a..2c0df6ec1 100644
--- a/pages/plugins/[slug].vue
+++ b/pages/plugins/[slug].vue
@@ -857,6 +857,7 @@ export default {
               status: true,
               detected: true,
               last_error: true,
+              path: true,
               updated_at: true,
             },
           ],
@@ -966,11 +967,19 @@ export default {
     },
   },
   methods: {
+    // The node reports where the files actually landed; the catalog-derived
+    // directory is only for a node that has not said yet.
     openConfigFiles(nodeId: string) {
+      const reported = this.installs.find(
+        (entry: Record<string, any>) =>
+          entry.game_server_node_id === nodeId &&
+          entry.plugin_slug === this.$route.params.slug,
+      )?.path;
+
       useFilePopout().openFiles({
         scope: "node",
         id: nodeId,
-        path: this.pluginDirectory,
+        path: reported || this.pluginDirectory,
       });
     },
     labelForRuntime(runtime: string) {
@@ -1300,11 +1309,11 @@ export default {
         )
         .map((entry: Record<string, any>) => entry.game_mode);
     },
-    // A framework only writes addons/<runtime>/configs/plugins once a plugin has
-    // run and put something in it, so opening that straight after an install
-    // landed the operator on "this directory doesn't exist yet" for a plugin
-    // that is very much installed. Prefer somewhere that does exist: the config
-    // file the catalog names, else where the release unpacks to.
+    // Used until the node has reported where the files landed. A framework only
+    // writes addons/<runtime>/configs/plugins once a plugin has run and put
+    // something in it, and a csgo-layout release has no install_path, so the
+    // last resort is the plugins directory itself rather than a configs one
+    // that may never exist.
     pluginDirectory(): string {
       const runtime = this.runtime;
       const configPath = this.plugin?.config_path;
@@ -1326,7 +1335,7 @@ export default {
         return installPath.replaceAll("{runtime}", runtime);
       }
 
-      return `addons/${runtime}/configs/plugins`;
+      return `addons/${runtime}/plugins`;
     },
     // Derived from what the nodes have reported rather than the catalog's
     // install_state, which is a query field and would sit still while the

From 3571845d9aac322fc14934f5569b6276304e37ac Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 14:41:59 -0400
Subject: [PATCH 6/7] wip

---
 generated/zeus/const.ts |  7 +++++++
 generated/zeus/index.ts | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/generated/zeus/const.ts b/generated/zeus/const.ts
index 95c7ba86d..25a3f14f3 100644
--- a/generated/zeus/const.ts
+++ b/generated/zeus/const.ts
@@ -6589,6 +6589,7 @@ export const AllTypesProps: Record<string,any> = {
 		id:"uuid_comparison_exp",
 		installed_at:"timestamptz_comparison_exp",
 		last_error:"String_comparison_exp",
+		path:"String_comparison_exp",
 		plugin:"game_plugins_bool_exp",
 		plugin_slug:"String_comparison_exp",
 		runtime:"e_plugin_runtimes_enum_comparison_exp",
@@ -6616,6 +6617,7 @@ export const AllTypesProps: Record<string,any> = {
 		id:"order_by",
 		installed_at:"order_by",
 		last_error:"order_by",
+		path:"order_by",
 		plugin_slug:"order_by",
 		source:"order_by",
 		updated_at:"order_by",
@@ -6628,6 +6630,7 @@ export const AllTypesProps: Record<string,any> = {
 		id:"order_by",
 		installed_at:"order_by",
 		last_error:"order_by",
+		path:"order_by",
 		plugin_slug:"order_by",
 		source:"order_by",
 		updated_at:"order_by",
@@ -6648,6 +6651,7 @@ export const AllTypesProps: Record<string,any> = {
 		id:"order_by",
 		installed_at:"order_by",
 		last_error:"order_by",
+		path:"order_by",
 		plugin:"game_plugins_order_by",
 		plugin_slug:"order_by",
 		runtime:"order_by",
@@ -43431,6 +43435,7 @@ export const ReturnTypes: Record<string,any> = {
 		id:"uuid",
 		installed_at:"timestamptz",
 		last_error:"String",
+		path:"String",
 		plugin:"game_plugins",
 		plugin_slug:"String",
 		runtime:"e_plugin_runtimes_enum",
@@ -43455,6 +43460,7 @@ export const ReturnTypes: Record<string,any> = {
 		id:"uuid",
 		installed_at:"timestamptz",
 		last_error:"String",
+		path:"String",
 		plugin_slug:"String",
 		source:"String",
 		updated_at:"timestamptz",
@@ -43467,6 +43473,7 @@ export const ReturnTypes: Record<string,any> = {
 		id:"uuid",
 		installed_at:"timestamptz",
 		last_error:"String",
+		path:"String",
 		plugin_slug:"String",
 		source:"String",
 		updated_at:"timestamptz",
diff --git a/generated/zeus/index.ts b/generated/zeus/index.ts
index 0f85587be..ce468e679 100644
--- a/generated/zeus/index.ts
+++ b/generated/zeus/index.ts
@@ -14907,6 +14907,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["uuid_comparison_exp"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["timestamptz_comparison_exp"] | undefined | null | Variable<any, string>,
 	last_error?: ValueTypes["String_comparison_exp"] | undefined | null | Variable<any, string>,
+	path?: ValueTypes["String_comparison_exp"] | undefined | null | Variable<any, string>,
 	plugin?: ValueTypes["game_plugins_bool_exp"] | undefined | null | Variable<any, string>,
 	plugin_slug?: ValueTypes["String_comparison_exp"] | undefined | null | Variable<any, string>,
 	runtime?: ValueTypes["e_plugin_runtimes_enum_comparison_exp"] | undefined | null | Variable<any, string>,
@@ -14928,6 +14929,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	last_error?: string | undefined | null | Variable<any, string>,
+	path?: string | undefined | null | Variable<any, string>,
 	plugin?: ValueTypes["game_plugins_obj_rel_insert_input"] | undefined | null | Variable<any, string>,
 	plugin_slug?: string | undefined | null | Variable<any, string>,
 	runtime?: ValueTypes["e_plugin_runtimes_enum"] | undefined | null | Variable<any, string>,
@@ -14944,6 +14946,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?:boolean | `@${string}`,
 	installed_at?:boolean | `@${string}`,
 	last_error?:boolean | `@${string}`,
+	path?:boolean | `@${string}`,
 	plugin_slug?:boolean | `@${string}`,
 	source?:boolean | `@${string}`,
 	updated_at?:boolean | `@${string}`,
@@ -14958,6 +14961,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	last_error?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
+	path?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	plugin_slug?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	source?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	updated_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -14971,6 +14975,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?:boolean | `@${string}`,
 	installed_at?:boolean | `@${string}`,
 	last_error?:boolean | `@${string}`,
+	path?:boolean | `@${string}`,
 	plugin_slug?:boolean | `@${string}`,
 	source?:boolean | `@${string}`,
 	updated_at?:boolean | `@${string}`,
@@ -14985,6 +14990,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	last_error?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
+	path?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	plugin_slug?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	source?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	updated_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -15015,6 +15021,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	last_error?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
+	path?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	plugin?: ValueTypes["game_plugins_order_by"] | undefined | null | Variable<any, string>,
 	plugin_slug?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
 	runtime?: ValueTypes["order_by"] | undefined | null | Variable<any, string>,
@@ -15043,6 +15050,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	last_error?: string | undefined | null | Variable<any, string>,
+	path?: string | undefined | null | Variable<any, string>,
 	plugin_slug?: string | undefined | null | Variable<any, string>,
 	runtime?: ValueTypes["e_plugin_runtimes_enum"] | undefined | null | Variable<any, string>,
 	source?: string | undefined | null | Variable<any, string>,
@@ -15067,6 +15075,7 @@ count?: [{	columns?: Array<ValueTypes["game_server_node_plugins_select_column"]>
 	id?: ValueTypes["uuid"] | undefined | null | Variable<any, string>,
 	installed_at?: ValueTypes["timestamptz"] | undefined | null | Variable<any, string>,
 	last_error?: string | undefined | null | Variable<any, string>,
+	path?: string | undefined | null | Variable<any, string>,
 	plugin_slug?: string | undefined | null | Variable<any, string>,
 	runtime?: ValueTypes["e_plugin_runtimes_enum"] | undefined | null | Variable<any, string>,
 	source?: string | undefined | null | Variable<any, string>,
@@ -84052,6 +84061,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["uuid_comparison_exp"] | undefined | null,
 	installed_at?: ResolverInputTypes["timestamptz_comparison_exp"] | undefined | null,
 	last_error?: ResolverInputTypes["String_comparison_exp"] | undefined | null,
+	path?: ResolverInputTypes["String_comparison_exp"] | undefined | null,
 	plugin?: ResolverInputTypes["game_plugins_bool_exp"] | undefined | null,
 	plugin_slug?: ResolverInputTypes["String_comparison_exp"] | undefined | null,
 	runtime?: ResolverInputTypes["e_plugin_runtimes_enum_comparison_exp"] | undefined | null,
@@ -84073,6 +84083,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["uuid"] | undefined | null,
 	installed_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin?: ResolverInputTypes["game_plugins_obj_rel_insert_input"] | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: ResolverInputTypes["e_plugin_runtimes_enum"] | undefined | null,
@@ -84089,6 +84100,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?:boolean | `@${string}`,
 	installed_at?:boolean | `@${string}`,
 	last_error?:boolean | `@${string}`,
+	path?:boolean | `@${string}`,
 	plugin_slug?:boolean | `@${string}`,
 	source?:boolean | `@${string}`,
 	updated_at?:boolean | `@${string}`,
@@ -84103,6 +84115,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["order_by"] | undefined | null,
 	installed_at?: ResolverInputTypes["order_by"] | undefined | null,
 	last_error?: ResolverInputTypes["order_by"] | undefined | null,
+	path?: ResolverInputTypes["order_by"] | undefined | null,
 	plugin_slug?: ResolverInputTypes["order_by"] | undefined | null,
 	source?: ResolverInputTypes["order_by"] | undefined | null,
 	updated_at?: ResolverInputTypes["order_by"] | undefined | null,
@@ -84116,6 +84129,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?:boolean | `@${string}`,
 	installed_at?:boolean | `@${string}`,
 	last_error?:boolean | `@${string}`,
+	path?:boolean | `@${string}`,
 	plugin_slug?:boolean | `@${string}`,
 	source?:boolean | `@${string}`,
 	updated_at?:boolean | `@${string}`,
@@ -84130,6 +84144,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["order_by"] | undefined | null,
 	installed_at?: ResolverInputTypes["order_by"] | undefined | null,
 	last_error?: ResolverInputTypes["order_by"] | undefined | null,
+	path?: ResolverInputTypes["order_by"] | undefined | null,
 	plugin_slug?: ResolverInputTypes["order_by"] | undefined | null,
 	source?: ResolverInputTypes["order_by"] | undefined | null,
 	updated_at?: ResolverInputTypes["order_by"] | undefined | null,
@@ -84160,6 +84175,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["order_by"] | undefined | null,
 	installed_at?: ResolverInputTypes["order_by"] | undefined | null,
 	last_error?: ResolverInputTypes["order_by"] | undefined | null,
+	path?: ResolverInputTypes["order_by"] | undefined | null,
 	plugin?: ResolverInputTypes["game_plugins_order_by"] | undefined | null,
 	plugin_slug?: ResolverInputTypes["order_by"] | undefined | null,
 	runtime?: ResolverInputTypes["order_by"] | undefined | null,
@@ -84188,6 +84204,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["uuid"] | undefined | null,
 	installed_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: ResolverInputTypes["e_plugin_runtimes_enum"] | undefined | null,
 	source?: string | undefined | null,
@@ -84212,6 +84229,7 @@ count?: [{	columns?: Array<ResolverInputTypes["game_server_node_plugins_select_c
 	id?: ResolverInputTypes["uuid"] | undefined | null,
 	installed_at?: ResolverInputTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: ResolverInputTypes["e_plugin_runtimes_enum"] | undefined | null,
 	source?: string | undefined | null,
@@ -151944,6 +151962,7 @@ export type ModelTypes = {
 	id?: ModelTypes["uuid_comparison_exp"] | undefined | null,
 	installed_at?: ModelTypes["timestamptz_comparison_exp"] | undefined | null,
 	last_error?: ModelTypes["String_comparison_exp"] | undefined | null,
+	path?: ModelTypes["String_comparison_exp"] | undefined | null,
 	plugin?: ModelTypes["game_plugins_bool_exp"] | undefined | null,
 	plugin_slug?: ModelTypes["String_comparison_exp"] | undefined | null,
 	runtime?: ModelTypes["e_plugin_runtimes_enum_comparison_exp"] | undefined | null,
@@ -151964,6 +151983,7 @@ export type ModelTypes = {
 	id?: ModelTypes["uuid"] | undefined | null,
 	installed_at?: ModelTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin?: ModelTypes["game_plugins_obj_rel_insert_input"] | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: ModelTypes["e_plugin_runtimes_enum"] | undefined | null,
@@ -151980,6 +152000,7 @@ export type ModelTypes = {
 	id?: ModelTypes["uuid"] | undefined | null,
 	installed_at?: ModelTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	source?: string | undefined | null,
 	updated_at?: ModelTypes["timestamptz"] | undefined | null,
@@ -151993,6 +152014,7 @@ export type ModelTypes = {
 	id?: ModelTypes["order_by"] | undefined | null,
 	installed_at?: ModelTypes["order_by"] | undefined | null,
 	last_error?: ModelTypes["order_by"] | undefined | null,
+	path?: ModelTypes["order_by"] | undefined | null,
 	plugin_slug?: ModelTypes["order_by"] | undefined | null,
 	source?: ModelTypes["order_by"] | undefined | null,
 	updated_at?: ModelTypes["order_by"] | undefined | null,
@@ -152006,6 +152028,7 @@ export type ModelTypes = {
 	id?: ModelTypes["uuid"] | undefined | null,
 	installed_at?: ModelTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	source?: string | undefined | null,
 	updated_at?: ModelTypes["timestamptz"] | undefined | null,
@@ -152019,6 +152042,7 @@ export type ModelTypes = {
 	id?: ModelTypes["order_by"] | undefined | null,
 	installed_at?: ModelTypes["order_by"] | undefined | null,
 	last_error?: ModelTypes["order_by"] | undefined | null,
+	path?: ModelTypes["order_by"] | undefined | null,
 	plugin_slug?: ModelTypes["order_by"] | undefined | null,
 	source?: ModelTypes["order_by"] | undefined | null,
 	updated_at?: ModelTypes["order_by"] | undefined | null,
@@ -152048,6 +152072,7 @@ export type ModelTypes = {
 	id?: ModelTypes["order_by"] | undefined | null,
 	installed_at?: ModelTypes["order_by"] | undefined | null,
 	last_error?: ModelTypes["order_by"] | undefined | null,
+	path?: ModelTypes["order_by"] | undefined | null,
 	plugin?: ModelTypes["game_plugins_order_by"] | undefined | null,
 	plugin_slug?: ModelTypes["order_by"] | undefined | null,
 	runtime?: ModelTypes["order_by"] | undefined | null,
@@ -152073,6 +152098,7 @@ export type ModelTypes = {
 	id?: ModelTypes["uuid"] | undefined | null,
 	installed_at?: ModelTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: ModelTypes["e_plugin_runtimes_enum"] | undefined | null,
 	source?: string | undefined | null,
@@ -152097,6 +152123,7 @@ export type ModelTypes = {
 	id?: ModelTypes["uuid"] | undefined | null,
 	installed_at?: ModelTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: ModelTypes["e_plugin_runtimes_enum"] | undefined | null,
 	source?: string | undefined | null,
@@ -213640,6 +213667,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["uuid_comparison_exp"] | undefined | null,
 	installed_at?: GraphQLTypes["timestamptz_comparison_exp"] | undefined | null,
 	last_error?: GraphQLTypes["String_comparison_exp"] | undefined | null,
+	path?: GraphQLTypes["String_comparison_exp"] | undefined | null,
 	plugin?: GraphQLTypes["game_plugins_bool_exp"] | undefined | null,
 	plugin_slug?: GraphQLTypes["String_comparison_exp"] | undefined | null,
 	runtime?: GraphQLTypes["e_plugin_runtimes_enum_comparison_exp"] | undefined | null,
@@ -213661,6 +213689,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	installed_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin?: GraphQLTypes["game_plugins_obj_rel_insert_input"] | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: GraphQLTypes["e_plugin_runtimes_enum"] | undefined | null,
@@ -213678,6 +213707,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	installed_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	source?: string | undefined | null,
 	updated_at?: GraphQLTypes["timestamptz"] | undefined | null,
@@ -213691,6 +213721,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["order_by"] | undefined | null,
 	installed_at?: GraphQLTypes["order_by"] | undefined | null,
 	last_error?: GraphQLTypes["order_by"] | undefined | null,
+	path?: GraphQLTypes["order_by"] | undefined | null,
 	plugin_slug?: GraphQLTypes["order_by"] | undefined | null,
 	source?: GraphQLTypes["order_by"] | undefined | null,
 	updated_at?: GraphQLTypes["order_by"] | undefined | null,
@@ -213705,6 +213736,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	installed_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	source?: string | undefined | null,
 	updated_at?: GraphQLTypes["timestamptz"] | undefined | null,
@@ -213718,6 +213750,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["order_by"] | undefined | null,
 	installed_at?: GraphQLTypes["order_by"] | undefined | null,
 	last_error?: GraphQLTypes["order_by"] | undefined | null,
+	path?: GraphQLTypes["order_by"] | undefined | null,
 	plugin_slug?: GraphQLTypes["order_by"] | undefined | null,
 	source?: GraphQLTypes["order_by"] | undefined | null,
 	updated_at?: GraphQLTypes["order_by"] | undefined | null,
@@ -213748,6 +213781,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["order_by"] | undefined | null,
 	installed_at?: GraphQLTypes["order_by"] | undefined | null,
 	last_error?: GraphQLTypes["order_by"] | undefined | null,
+	path?: GraphQLTypes["order_by"] | undefined | null,
 	plugin?: GraphQLTypes["game_plugins_order_by"] | undefined | null,
 	plugin_slug?: GraphQLTypes["order_by"] | undefined | null,
 	runtime?: GraphQLTypes["order_by"] | undefined | null,
@@ -213776,6 +213810,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	installed_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: GraphQLTypes["e_plugin_runtimes_enum"] | undefined | null,
 	source?: string | undefined | null,
@@ -213800,6 +213835,7 @@ export type GraphQLTypes = {
 	id?: GraphQLTypes["uuid"] | undefined | null,
 	installed_at?: GraphQLTypes["timestamptz"] | undefined | null,
 	last_error?: string | undefined | null,
+	path?: string | undefined | null,
 	plugin_slug?: string | undefined | null,
 	runtime?: GraphQLTypes["e_plugin_runtimes_enum"] | undefined | null,
 	source?: string | undefined | null,
@@ -265519,6 +265555,7 @@ export enum game_server_node_plugins_select_column {
 	id = "id",
 	installed_at = "installed_at",
 	last_error = "last_error",
+	path = "path",
 	plugin_slug = "plugin_slug",
 	runtime = "runtime",
 	source = "source",
@@ -265544,6 +265581,7 @@ export enum game_server_node_plugins_update_column {
 	id = "id",
 	installed_at = "installed_at",
 	last_error = "last_error",
+	path = "path",
 	plugin_slug = "plugin_slug",
 	runtime = "runtime",
 	source = "source",

From 8bfb51ba7983d17bb162fbcf1f74b7def491cd38 Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Wed, 19 Aug 2026 16:16:57 -0400
Subject: [PATCH 7/7] wip

---
 components/draft-games/CreateDraftGame.vue    |  8 +-
 components/game-modes/GameModeForm.vue        | 76 +++++++++----------
 components/servers/ServerForm.vue             | 51 +++++++++++--
 .../ui/alert-dialog/AlertDialogAction.vue     | 11 ++-
 i18n/locales/ar_SA.json                       |  4 +-
 i18n/locales/da_DK.json                       |  4 +-
 i18n/locales/de_DE.json                       |  4 +-
 i18n/locales/en.json                          |  4 +-
 i18n/locales/es_ES.json                       |  4 +-
 i18n/locales/fr_FR.json                       |  4 +-
 i18n/locales/it_IT.json                       |  4 +-
 i18n/locales/ja_JP.json                       |  4 +-
 i18n/locales/ko_KR.json                       |  4 +-
 i18n/locales/pl_PL.json                       |  4 +-
 i18n/locales/pt_BR.json                       |  4 +-
 i18n/locales/ru_RU.json                       |  4 +-
 i18n/locales/sv_SE.json                       |  4 +-
 i18n/locales/tr_TR.json                       |  4 +-
 i18n/locales/uk_UA.json                       |  4 +-
 i18n/locales/zh_Hans.json                     |  4 +-
 i18n/locales/zh_Hant.json                     |  4 +-
 pages/plugins/[slug].vue                      | 11 +--
 pages/settings/application/game-modes.vue     |  1 +
 stores/ApplicationSettings.ts                 |  6 ++
 24 files changed, 140 insertions(+), 92 deletions(-)

diff --git a/components/draft-games/CreateDraftGame.vue b/components/draft-games/CreateDraftGame.vue
index 0e7120c32..09202b237 100644
--- a/components/draft-games/CreateDraftGame.vue
+++ b/components/draft-games/CreateDraftGame.vue
@@ -365,9 +365,13 @@ validatorComponent.form = form;
 
 // Once the list has settled, a rehosted/edited room carrying a mode that is no
 // longer offered here (archived, pulled from draft lobbies, role lost) falls
-// back to Competitive instead of silently submitting the stale id.
+// back to Competitive instead of silently submitting the stale id. Settled
+// means the settings too: the list is filtered on the plugin runtime, which
+// is a default until the settings subscription delivers.
 const modesSettled = computed(
-  () => !modesQueryEnabled.value || gameModesResult.value !== undefined,
+  () =>
+    applicationSettings.settingsLoaded &&
+    (!modesQueryEnabled.value || gameModesResult.value !== undefined),
 );
 watch(
   [modesSettled, draftEligibleModes, () => form.values.game_mode_id],
diff --git a/components/game-modes/GameModeForm.vue b/components/game-modes/GameModeForm.vue
index 5019f2c26..c5435bfc9 100644
--- a/components/game-modes/GameModeForm.vue
+++ b/components/game-modes/GameModeForm.vue
@@ -356,6 +356,11 @@ export default {
     },
   },
   computed: {
+    // Whether any match has run this mode; the parent's query carries one
+    // referencing match_options row as the answer.
+    usedByMatches(): boolean {
+      return (this.gameMode?.match_options?.length ?? 0) > 0;
+    },
     // A plugin set to load on every match is already on every server. Listing
     // it here reads as a choice, and unticking it would not stop it loading.
     selectablePlugins(): Array<Record<string, any>> {
@@ -469,6 +474,23 @@ export default {
         }),
       });
     },
+    // Archived is the one pair of columns both Restore and the used-mode
+    // Delete flip; an archived mode is disabled by definition.
+    async setArchived(archived: boolean) {
+      await (this as any).$apollo.mutate({
+        mutation: generateMutation({
+          update_game_modes_by_pk: [
+            {
+              pk_columns: { id: this.gameMode.id },
+              _set: archived
+                ? { archived_at: new Date().toISOString(), enabled: false }
+                : { archived_at: null, enabled: true },
+            },
+            { id: true },
+          ],
+        }),
+      });
+    },
     async restore() {
       if (this.deleting) {
         return;
@@ -477,17 +499,7 @@ export default {
       this.deleting = true;
 
       try {
-        await (this as any).$apollo.mutate({
-          mutation: generateMutation({
-            update_game_modes_by_pk: [
-              {
-                pk_columns: { id: this.gameMode.id },
-                _set: { archived_at: null, enabled: true },
-              },
-              { id: true },
-            ],
-          }),
-        });
+        await this.setArchived(false);
 
         toast({ title: this.$t("game_modes.form.restored") as string });
         this.$emit("saved", this.gameMode.id);
@@ -501,8 +513,12 @@ export default {
       }
     },
     // tbd_game_modes refuses to delete a mode any match has used, because the
-    // finished match still points at it. In that case the mode is archived
-    // instead: gone from every picker, history intact, restorable from here.
+    // finished match still points at it. Decided here from the match count the
+    // row carries rather than by trying the delete and reading the trigger's
+    // message: the global apollo error hook toasts every rejected mutation, so
+    // the attempt would surface as a red database error before the fallback.
+    // A used mode is archived instead: gone from every picker, history intact,
+    // restorable from here.
     async remove() {
       if (this.deleting) {
         return;
@@ -511,7 +527,15 @@ export default {
       this.deleting = true;
 
       try {
-        try {
+        if (this.usedByMatches) {
+          await this.setArchived(true);
+          toast({
+            title: this.$t("game_modes.form.archived") as string,
+            description: this.$t(
+              "game_modes.form.archived_instead",
+            ) as string,
+          });
+        } else {
           await (this as any).$apollo.mutate({
             mutation: generateMutation({
               delete_game_modes_by_pk: [
@@ -521,30 +545,6 @@ export default {
             }),
           });
           toast({ title: this.$t("game_modes.form.deleted") as string });
-        } catch (error) {
-          if (!/archive it instead/.test((error as Error).message)) {
-            throw error;
-          }
-          await (this as any).$apollo.mutate({
-            mutation: generateMutation({
-              update_game_modes_by_pk: [
-                {
-                  pk_columns: { id: this.gameMode.id },
-                  _set: {
-                    archived_at: new Date().toISOString(),
-                    enabled: false,
-                  },
-                },
-                { id: true },
-              ],
-            }),
-          });
-          toast({
-            title: this.$t("game_modes.form.archived") as string,
-            description: this.$t(
-              "game_modes.form.archived_instead",
-            ) as string,
-          });
         }
 
         this.$emit("saved", null);
diff --git a/components/servers/ServerForm.vue b/components/servers/ServerForm.vue
index b7ce87a21..a3c71c379 100644
--- a/components/servers/ServerForm.vue
+++ b/components/servers/ServerForm.vue
@@ -708,10 +708,20 @@ export default {
     // nothing to install into; fall back to a preset rather than save a mode
     // the server could not boot with.
     hasGameServerNode(has: boolean) {
-      if (!has && this.isCustomModeSelected) {
+      if (!has && this.holdsModeId) {
         this.form.setFieldValue("type", this.valveModeTypes[0]);
       }
     },
+    // A mode the picker does not offer shows as an empty select; put the
+    // preset that would be saved in its place so the form says what it does.
+    // Covers the game flipping to csgo, a mode archived or disabled since the
+    // server was saved, and game plugins being switched off.
+    customModes() {
+      this.dropStaleMode();
+    },
+    modesKnown() {
+      this.dropStaleMode();
+    },
     "form.values.game_server_node_id": {
       handler(newNodeId) {
         if (newNodeId && newNodeId !== "none" && this.useGameServerNode) {
@@ -771,24 +781,50 @@ export default {
         !!this.form.values.use_game_server_node && !!nodeId && nodeId !== "none"
       );
     },
-    isCustomModeSelected(): boolean {
+    // Anything in `type` that is not a preset is a mode id. Whether the mode
+    // is still one this server can run (enabled, this runtime, not csgo) is a
+    // separate question -- see isCustomModeSelected.
+    holdsModeId(): boolean {
       const selected = this.form.values.type;
       return !!selected && !Object.values(e_server_types_enum).includes(selected);
     },
+    isCustomModeSelected(): boolean {
+      const selected = this.form.values.type;
+      return this.customModes.some((mode) => mode.id === selected);
+    },
+    // False until the mode list has been fetched (or the query skipped) and
+    // the settings it is filtered on (plugin runtime) have arrived; a saved
+    // mode must not be judged stale against a list that is not there yet.
+    // Read from $apolloData rather than $apollo.queries: the form populates
+    // from an immediate watcher, which runs before vue-apollo has created the
+    // query, and only the data-backed entry is reactive from nothing.
+    modesKnown(): boolean {
+      return (
+        useApplicationSettingsStore().settingsLoaded &&
+        (this as any).$data.$apolloData?.queries?.gameModes?.loading === false
+      );
+    },
   },
   methods: {
     // The form's `type` field holds either a Valve preset (enum value) or a
-    // custom mode's uuid; this splits it back into the two columns.
+    // custom mode's uuid; this splits it back into the two columns. A mode
+    // the picker no longer offers -- archived, disabled, or the server moved
+    // to csgo -- is not re-saved behind the placeholder it shows as.
     resolveTypeAndMode(): { type: string; game_mode_id: string | null } {
       const selected = this.form.values.type;
-      if (
-        selected &&
-        !Object.values(e_server_types_enum).includes(selected)
-      ) {
+      if (this.isCustomModeSelected || (this.holdsModeId && !this.modesKnown)) {
         return { type: e_server_types_enum.Custom, game_mode_id: selected };
       }
+      if (this.holdsModeId) {
+        return { type: this.valveModeTypes[0], game_mode_id: null };
+      }
       return { type: selected || "Ranked", game_mode_id: null };
     },
+    dropStaleMode() {
+      if (this.modesKnown && this.holdsModeId && !this.isCustomModeSelected) {
+        this.form.setFieldValue("type", this.valveModeTypes[0]);
+      }
+    },
     populateServer(server) {
       const {
         host,
@@ -818,6 +854,7 @@ export default {
         connect_password: connect_password || "",
         max_players: max_players || 32,
       });
+      this.dropStaleMode();
       this.takeSnapshot();
     },
     takeSnapshot() {
diff --git a/components/ui/alert-dialog/AlertDialogAction.vue b/components/ui/alert-dialog/AlertDialogAction.vue
index 09cf6fcbc..63e661ff4 100644
--- a/components/ui/alert-dialog/AlertDialogAction.vue
+++ b/components/ui/alert-dialog/AlertDialogAction.vue
@@ -4,15 +4,18 @@ import type { HTMLAttributes } from "vue"
 import { reactiveOmit } from "@vueuse/core"
 import { AlertDialogAction } from "reka-ui"
 import { cn } from "@/lib/utils"
-import { buttonVariants } from '@/components/ui/button'
+import { buttonVariants, type ButtonVariants } from '@/components/ui/button'
 
-const props = defineProps<AlertDialogActionProps & { class?: HTMLAttributes["class"] }>()
+const props = defineProps<AlertDialogActionProps & {
+  class?: HTMLAttributes["class"]
+  variant?: ButtonVariants["variant"]
+}>()
 
-const delegatedProps = reactiveOmit(props, "class")
+const delegatedProps = reactiveOmit(props, "class", "variant")
 </script>
 
 <template>
-  <AlertDialogAction v-bind="delegatedProps" :class="cn(buttonVariants(), props.class)">
+  <AlertDialogAction v-bind="delegatedProps" :class="cn(buttonVariants({ variant: props.variant }), props.class)">
     <slot />
   </AlertDialogAction>
 </template>
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index daf808cf1..603583def 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "خارج الدليل",
         "modes": "أنماط اللعب",
         "modes_caption": "مُعرّفة",
-        "modes_unranked": "غير مصنّفة",
-        "modes_unranked_caption": "أنماط لا تؤثر في ELO"
+        "modes_unranked": "غير مناسب للدرافت",
+        "modes_unranked_caption": "أوضاع مخفية في ردهات الدرافت"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 2be28486f..419dc0cf3 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "uden for kataloget",
         "modes": "Spiltilstande",
         "modes_caption": "defineret",
-        "modes_unranked": "Uranglerede",
-        "modes_unranked_caption": "tilstande der springer ELO over"
+        "modes_unranked": "Ikke draft-egnet",
+        "modes_unranked_caption": "tilstande skjult i draft-lobbyer"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index d4c7fdca0..bd0bbe84f 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "außerhalb des Katalogs",
         "modes": "Spielmodi",
         "modes_caption": "definiert",
-        "modes_unranked": "Unranked",
-        "modes_unranked_caption": "Modi ohne ELO"
+        "modes_unranked": "Nicht draft-tauglich",
+        "modes_unranked_caption": "Modi, die in Draft-Lobbys ausgeblendet sind"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 27fae6b4f..08dffcc97 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "outside the catalog",
         "modes": "Game modes",
         "modes_caption": "defined",
-        "modes_unranked": "Unranked",
-        "modes_unranked_caption": "modes that skip ELO"
+        "modes_unranked": "Not draft-safe",
+        "modes_unranked_caption": "modes hidden from draft lobbies"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 143f65801..a2ece8054 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "fuera del catálogo",
         "modes": "Modos de juego",
         "modes_caption": "definidos",
-        "modes_unranked": "Sin clasificar",
-        "modes_unranked_caption": "modos que no afectan al ELO"
+        "modes_unranked": "No aptos para draft",
+        "modes_unranked_caption": "modos ocultos en las salas de draft"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index 80f0c53c4..f5fe35a02 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "hors catalogue",
         "modes": "Modes de jeu",
         "modes_caption": "définis",
-        "modes_unranked": "Non classé",
-        "modes_unranked_caption": "modes sans ELO"
+        "modes_unranked": "Non compatible draft",
+        "modes_unranked_caption": "modes masqués dans les lobbys de draft"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index 28bb8295a..81f4e2d1c 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "fuori dal catalogo",
         "modes": "Modalità di gioco",
         "modes_caption": "definite",
-        "modes_unranked": "Non classificate",
-        "modes_unranked_caption": "modalità che ignorano l'ELO"
+        "modes_unranked": "Non adatti al draft",
+        "modes_unranked_caption": "modalità nascoste nelle lobby di draft"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 297d3c42f..6dc4330c5 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "カタログ外",
         "modes": "ゲームモード",
         "modes_caption": "定義済み",
-        "modes_unranked": "アンランク",
-        "modes_unranked_caption": "ELO に影響しないモード"
+        "modes_unranked": "ドラフト非対応",
+        "modes_unranked_caption": "ドラフトロビーに表示されないモード"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index 3652877b5..4a5274911 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "카탈로그 외부",
         "modes": "게임 모드",
         "modes_caption": "정의됨",
-        "modes_unranked": "언랭크",
-        "modes_unranked_caption": "ELO에 반영되지 않는 모드"
+        "modes_unranked": "드래프트 비대응",
+        "modes_unranked_caption": "드래프트 로비에서 숨겨진 모드"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index f0a9359f4..0058e16d2 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "spoza katalogu",
         "modes": "Tryby gry",
         "modes_caption": "zdefiniowane",
-        "modes_unranked": "Nierankingowe",
-        "modes_unranked_caption": "tryby pomijające ELO"
+        "modes_unranked": "Nie do draftu",
+        "modes_unranked_caption": "tryby ukryte w lobby draftu"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index 5f0550bb2..a04320f5d 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -1339,8 +1339,8 @@
         "manual_caption": "fora do catálogo",
         "modes": "Modos de jogo",
         "modes_caption": "definidos",
-        "modes_unranked": "Sem ranque",
-        "modes_unranked_caption": "modos que não contam para o ELO"
+        "modes_unranked": "Não aptos para draft",
+        "modes_unranked_caption": "modos ocultos nos lobbies de draft"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index fbc1bc5b5..98593d317 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "вне каталога",
         "modes": "Режимы игры",
         "modes_caption": "создано",
-        "modes_unranked": "Без рейтинга",
-        "modes_unranked_caption": "режимы без ELO"
+        "modes_unranked": "Не для драфта",
+        "modes_unranked_caption": "режимы, скрытые в драфт-лобби"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 93b219ce7..a8765dd04 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "utanför katalogen",
         "modes": "Spellägen",
         "modes_caption": "definierade",
-        "modes_unranked": "Orankade",
-        "modes_unranked_caption": "lägen som hoppar över ELO"
+        "modes_unranked": "Inte draft-säkra",
+        "modes_unranked_caption": "lägen dolda i draft-lobbyer"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index e6517fdf4..30a90e055 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "dizin dışı",
         "modes": "Oyun modları",
         "modes_caption": "tanımlı",
-        "modes_unranked": "Dereceli değil",
-        "modes_unranked_caption": "ELO'yu atlayan modlar"
+        "modes_unranked": "Draft'a uygun değil",
+        "modes_unranked_caption": "draft lobilerinde gizlenen modlar"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index 348e0fc82..e3b1e6c6a 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "поза каталогом",
         "modes": "Режими гри",
         "modes_caption": "створено",
-        "modes_unranked": "Без рейтингу",
-        "modes_unranked_caption": "режими без ELO"
+        "modes_unranked": "Не для драфту",
+        "modes_unranked_caption": "режими, приховані в драфт-лобі"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index b25563e01..cfef344e3 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "目录之外",
         "modes": "游戏模式",
         "modes_caption": "已定义",
-        "modes_unranked": "非排位",
-        "modes_unranked_caption": "不计入 ELO 的模式"
+        "modes_unranked": "不适用于选人",
+        "modes_unranked_caption": "在选人大厅中隐藏的模式"
       }
     },
     "tournaments": {
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 020b0cd12..b1c420afb 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -1394,8 +1394,8 @@
         "manual_caption": "目錄之外",
         "modes": "遊戲模式",
         "modes_caption": "已定義",
-        "modes_unranked": "非排名",
-        "modes_unranked_caption": "不計入 ELO 的模式"
+        "modes_unranked": "不適用於選人",
+        "modes_unranked_caption": "在選人大廳中隱藏的模式"
       }
     },
     "tournaments": {
diff --git a/pages/plugins/[slug].vue b/pages/plugins/[slug].vue
index 2c0df6ec1..3eff5ff51 100644
--- a/pages/plugins/[slug].vue
+++ b/pages/plugins/[slug].vue
@@ -1143,14 +1143,11 @@ export default {
         error: install.last_error ?? null,
       };
     },
+    // By recorded state, not by whether the row names a version: a node
+    // reports the version it is downloading with its Installing progress, so
+    // "has a version" is true for every node the moment a rollout starts.
     installedOn(nodeId: string) {
-      const install = this.installs.find(
-        (entry) =>
-          entry.game_server_node_id === nodeId &&
-          entry.plugin_slug === this.$route.params.slug,
-      );
-
-      return install?.version ?? null;
+      return this.nodeState(nodeId).key === "Installed";
     },
     async install() {
       await this.run(this.ALL_NODES, () =>
diff --git a/pages/settings/application/game-modes.vue b/pages/settings/application/game-modes.vue
index 657709fea..6e6528c73 100644
--- a/pages/settings/application/game-modes.vue
+++ b/pages/settings/application/game-modes.vue
@@ -155,6 +155,7 @@ export default {
             runtime_conflicts: true,
             cfg: true,
             extra_game_params: true,
+            match_options: [{ limit: 1 }, { id: true }],
             plugins: [
               { order_by: [{ load_order: order_by.asc }] },
               {
diff --git a/stores/ApplicationSettings.ts b/stores/ApplicationSettings.ts
index 37215d70b..e2d33b384 100644
--- a/stores/ApplicationSettings.ts
+++ b/stores/ApplicationSettings.ts
@@ -35,6 +35,10 @@ export const useApplicationSettingsStore = defineStore(
 
     const settings =
       ref<Array<{ name: string; value: string }>>(loadCachedSettings());
+    // Whether `settings` is anything more than the defaults: the cached copy
+    // or a delivery from the subscription. Until then every derived setting
+    // is a guess, and a decision that depends on one should wait.
+    const settingsLoaded = ref(settings.value.length > 0);
 
     const subscribeToSettings = async () => {
       const { subscribe } = useSubscriptionManager();
@@ -55,6 +59,7 @@ export const useApplicationSettingsStore = defineStore(
         subscription.subscribe({
           next: ({ data }) => {
             settings.value = data.settings;
+            settingsLoaded.value = true;
             try {
               localStorage.setItem(
                 SETTINGS_CACHE_KEY,
@@ -724,6 +729,7 @@ export const useApplicationSettingsStore = defineStore(
       canCreateMatch,
       currentPluginVersion,
       gameServerPluginRuntime,
+      settingsLoaded,
       brandName,
       logoUrl,
       faviconUrl,