From 8af41b7ae5ece6e81db68b40e10073c5b02eda3e Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Mon, 5 Oct 2026 14:22:59 -0400
Subject: [PATCH] feature: match server select back in the admin menu, winner
 dialogs with each team's map results, a map winner confirm, and skip knife as
 an admin action

---
 components/match/MatchActions.vue             | 148 ++++++--------
 components/match/MatchMaps.vue                |  21 +-
 components/match/MatchSelectMapWinner.vue     | 191 +++++++++++++-----
 components/match/MatchSelectServer.vue        |  81 ++++----
 components/match/MatchSelectWinner.vue        | 180 ++++++++++++++---
 i18n/locales/ar_SA.json                       |  12 +-
 i18n/locales/da_DK.json                       |  12 +-
 i18n/locales/de_DE.json                       |  12 +-
 i18n/locales/en.json                          |  12 +-
 i18n/locales/es_ES.json                       |  12 +-
 i18n/locales/fr_FR.json                       |  12 +-
 i18n/locales/it_IT.json                       |  12 +-
 i18n/locales/ja_JP.json                       |  12 +-
 i18n/locales/ko_KR.json                       |  12 +-
 i18n/locales/pl_PL.json                       |  12 +-
 i18n/locales/pt_BR.json                       |  12 +-
 i18n/locales/ru_RU.json                       |  12 +-
 i18n/locales/sv_SE.json                       |  12 +-
 i18n/locales/tr_TR.json                       |  12 +-
 i18n/locales/uk_UA.json                       |  12 +-
 i18n/locales/zh_Hans.json                     |  12 +-
 i18n/locales/zh_Hant.json                     |  12 +-
 .../match/MatchActionsConfirm.spec.ts         | 111 +++++++++-
 tests/utilities/matchAdminSteps.spec.ts       |  14 ++
 utilities/matchAdminSteps.ts                  |  19 +-
 25 files changed, 661 insertions(+), 308 deletions(-)

diff --git a/components/match/MatchActions.vue b/components/match/MatchActions.vue
index d49e33038..fbee71140 100644
--- a/components/match/MatchActions.vue
+++ b/components/match/MatchActions.vue
@@ -5,6 +5,7 @@ import {
   MoreVertical,
   Pause,
   Play,
+  SkipForward,
   SlidersHorizontal,
   Trash2,
   Trophy,
@@ -118,6 +119,15 @@ const menuLabel =
         <CheckCheck class="h-3 w-3 shrink-0" />
         {{ $t("match.commands.force_ready") }}
       </button>
+      <button
+        v-else-if="primaryAction === 'skip_knife'"
+        type="button"
+        :class="dockPrimary"
+        @click="skipKnife"
+      >
+        <SkipForward class="h-3 w-3 shrink-0" />
+        {{ $t("match.commands.skip_knife") }}
+      </button>
       <button
         v-else-if="primaryAction === 'pause'"
         type="button"
@@ -194,22 +204,16 @@ const menuLabel =
           />
         </template>
 
-        <!-- Settings read as label + current value, so the menu shows what the
-             match is set to before anyone opens a dialog. -->
-        <DropdownMenuItem
-          v-if="match.can_assign_server"
-          @click="openServerDialog"
-        >
-          {{ $t("match.admin_bar.server") }}
-          <span class="ml-auto pl-6 text-xs text-muted-foreground">
-            {{ serverLabel }}
-          </span>
+        <DropdownMenuItem v-if="match.can_assign_server">
+          <MatchSelectServer :match="match"></MatchSelectServer>
         </DropdownMenuItem>
+        <DropdownMenuSeparator
+          v-if="match.can_assign_server && showWinnerItem"
+        />
 
-        <DropdownMenuItem
-          v-if="canSetMatchWinner && primaryAction !== 'winner'"
-          @click="openWinnerDialog"
-        >
+        <!-- The winner reads as label + current value, so the menu shows what
+             the match is set to before anyone opens the dialog. -->
+        <DropdownMenuItem v-if="showWinnerItem" @click="openWinnerDialog">
           {{ $t("match.admin_bar.winner") }}
           <span class="ml-auto pl-6 text-xs text-muted-foreground">
             {{ winnerLabel }}
@@ -379,6 +383,7 @@ const menuLabel =
         <DropdownMenuSeparator
           v-if="
             showForceReadyItem ||
+            showSkipKnifeItem ||
             showStartItem ||
             (!dock && (match.can_cancel || canDeleteMatch))
           "
@@ -390,6 +395,11 @@ const menuLabel =
           {{ $t("match.commands.force_ready") }}
         </DropdownMenuItem>
 
+        <DropdownMenuItem v-if="showSkipKnifeItem" @click="skipKnife">
+          <SkipForward />
+          {{ $t("match.commands.skip_knife") }}
+        </DropdownMenuItem>
+
         <template v-if="showStartItem">
           <DropdownMenuItem
             @click.prevent.stop="startMatch"
@@ -451,13 +461,8 @@ const menuLabel =
             {{ confirming?.description }}
           </AlertDialogDescription>
         </AlertDialogHeader>
-        <MatchSelectServer
-          v-if="confirming?.picker === 'server'"
-          :match="match"
-          @select="(choice) => (confirmChoice = choice)"
-        />
         <MatchSelectWinner
-          v-else-if="confirming?.picker === 'winner'"
+          v-if="confirming?.picker === 'winner'"
           :match="match"
           @select="(choice) => (confirmChoice = choice)"
         />
@@ -523,8 +528,8 @@ type MatchActionConfirm = {
   description: string;
   action: string;
   destructive?: boolean;
-  // Server and winner dialogs carry their picker; the action waits for a pick.
-  picker?: "server" | "winner";
+  // The winner dialog carries its picker; the action waits for a pick.
+  picker?: "winner";
   run: (choice: MatchActionChoice | null) => Promise<void>;
 };
 
@@ -623,19 +628,6 @@ export default {
         run: this.deleteMatch,
       });
     },
-    openServerDialog() {
-      this.ask({
-        title: this.$t("match.server.assign"),
-        description: this.$t("match.server.assign_hint"),
-        action: this.$t("match.server.assign"),
-        picker: "server",
-        run: async (choice) => {
-          if (choice) {
-            await this.assignServer(choice.value);
-          }
-        },
-      });
-    },
     openWinnerDialog() {
       this.ask({
         title: this.$t("match.winner.set"),
@@ -649,34 +641,6 @@ export default {
         },
       });
     },
-    // "0:<region>" is an on-demand server in that region; anything else is a
-    // dedicated server id.
-    async assignServer(value: string) {
-      const [serverId, region] = value.split(":");
-
-      await this.$apollo.mutate({
-        mutation: generateMutation({
-          update_matches_by_pk: [
-            {
-              pk_columns: {
-                id: this.match.id,
-              },
-              _set: {
-                region,
-                server_id: serverId === "0" ? null : value,
-              },
-            },
-            {
-              id: true,
-            },
-          ],
-        }),
-      });
-
-      toast({
-        title: this.$t("match.server.assigned"),
-      });
-    },
     // Goes through setMatchWinner rather than writing winning_lineup_id
     // directly: the action is what enforces organizer permission and blocks a
     // reassignment once a downstream tournament match has already been
@@ -1023,6 +987,26 @@ export default {
         this.$t("match.actions.forced_ready"),
       );
     },
+    skipKnife() {
+      this.sendRcon(
+        RconAction.SkipKnife,
+        this.$t("match.actions.skipped_knife"),
+      );
+    },
+    // Same rule as the console's match commands, narrowed to when one can
+    // act: the current map is in a state that takes it, on a live, reachable
+    // server.
+    canSendMatchCommand(action: RconAction) {
+      return (
+        this.match.is_organizer &&
+        this.isLive &&
+        !!this.match.is_server_online &&
+        useAuthStore().isRoleAbove(e_player_roles_enum.moderator) &&
+        matchCommandsForStatus(this.currentMap?.status).some(
+          (command) => command.action === action,
+        )
+      );
+    },
     async callForOrganizer() {
       await this.$apollo.mutate({
         mutation: generateMutation({
@@ -1075,22 +1059,16 @@ export default {
         case "warmup":
           return this.canForceReady ? "force_ready" : null;
         case "live":
+          // The knife round comes first and cannot be paused.
+          if (this.canSkipKnife) {
+            return "skip_knife";
+          }
           return this.canPauseResume ? "pause" : null;
         case "finished":
           return this.canSetMatchWinner ? "winner" : null;
       }
       return null;
     },
-    serverLabel() {
-      if (this.match.server_id && this.match.server_type !== "On Demand") {
-        return this.$t("match.admin_bar.dedicated");
-      }
-      return (
-        this.match.e_region?.description ||
-        this.match.region ||
-        this.$t("match.admin_bar.not_set")
-      );
-    },
     winnerLabel() {
       const winner = [this.match.lineup_1, this.match.lineup_2].find(
         (lineup) => lineup?.id && lineup.id === this.match.winning_lineup_id,
@@ -1109,6 +1087,12 @@ export default {
     showForceReadyItem() {
       return this.canForceReady && this.primaryAction !== "force_ready";
     },
+    showSkipKnifeItem() {
+      return this.canSkipKnife && this.primaryAction !== "skip_knife";
+    },
+    showWinnerItem() {
+      return this.canSetMatchWinner && this.primaryAction !== "winner";
+    },
     upcoming() {
       return this.dock
         ? upcomingAdminActions(this.match, (role) =>
@@ -1120,10 +1104,11 @@ export default {
     hasMoreItems() {
       return (
         this.match.can_assign_server ||
-        (this.canSetMatchWinner && this.primaryAction !== "winner") ||
+        this.showWinnerItem ||
         (this.match.is_organizer && this.hasOrganizerLiveActions) ||
         this.canReparseDemos ||
         this.showForceReadyItem ||
+        this.showSkipKnifeItem ||
         this.showStartItem ||
         this.upcoming.length > 0
       );
@@ -1283,18 +1268,11 @@ export default {
     isPaused() {
       return this.currentMap?.status === e_match_map_status_enum.Paused;
     },
-    // Same rule as the console's Force Ready, narrowed to when it can act: the
-    // current map is warming up on a live, reachable server.
     canForceReady() {
-      return (
-        this.match.is_organizer &&
-        this.isLive &&
-        !!this.match.is_server_online &&
-        useAuthStore().isRoleAbove(e_player_roles_enum.moderator) &&
-        matchCommandsForStatus(this.currentMap?.status).some(
-          (command) => command.action === RconAction.ForceReady,
-        )
-      );
+      return this.canSendMatchCommand(RconAction.ForceReady);
+    },
+    canSkipKnife() {
+      return this.canSendMatchCommand(RconAction.SkipKnife);
     },
     canPauseResume() {
       if (!this.match.is_organizer) {
diff --git a/components/match/MatchMaps.vue b/components/match/MatchMaps.vue
index 6910b34b3..03675906a 100644
--- a/components/match/MatchMaps.vue
+++ b/components/match/MatchMaps.vue
@@ -9,7 +9,6 @@ import {
   ChevronLeft,
   PlayCircle,
   RefreshCw,
-  MoreVertical,
 } from "lucide-vue-next";
 import { Spinner } from "~/components/ui/spinner";
 import TimeAgo from "~/components/TimeAgo.vue";
@@ -247,21 +246,11 @@ import mapLabel from "~/utilities/mapLabel";
             </a>
           </template>
         </template>
-        <DropdownMenu v-if="canSetMapWinner">
-          <DropdownMenuTrigger as-child>
-            <Button
-              size="xs"
-              variant="ghost"
-              class="h-6 w-6 p-0 text-white/70 hover:text-white"
-              @click.stop
-            >
-              <MoreVertical class="w-4 h-4" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="end" class="w-56">
-            <MatchSelectMapWinner :match="match" :match-map="matchMap" />
-          </DropdownMenuContent>
-        </DropdownMenu>
+        <MatchSelectMapWinner
+          v-if="canSetMapWinner"
+          :match="match"
+          :match-map="matchMap"
+        />
       </div>
     </div>
 
diff --git a/components/match/MatchSelectMapWinner.vue b/components/match/MatchSelectMapWinner.vue
index e610e2de8..a084b4f68 100644
--- a/components/match/MatchSelectMapWinner.vue
+++ b/components/match/MatchSelectMapWinner.vue
@@ -1,27 +1,95 @@
 <script lang="ts" setup>
+import { MoreVertical } from "lucide-vue-next";
+import MatchLineupScoreDisplay from "~/components/match/MatchLineupScoreDisplay.vue";
+import MatchSelectWinner from "~/components/match/MatchSelectWinner.vue";
 import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
   DropdownMenuLabel,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
 } from "~/components/ui/dropdown-menu";
+import mapLabel from "~/utilities/mapLabel";
 </script>
 
 <template>
-  <DropdownMenuLabel class="text-xs">
-    {{ $t("match.map_winner.set") }}
-  </DropdownMenuLabel>
-  <DropdownMenuRadioGroup
-    :model-value="matchMap.winning_lineup_id ?? ''"
-    @update:model-value="updateMapWinner"
+  <DropdownMenu>
+    <DropdownMenuTrigger as-child>
+      <Button
+        size="xs"
+        variant="ghost"
+        class="h-6 w-6 p-0 text-white/70 hover:text-white"
+        @click.stop
+      >
+        <MoreVertical class="w-4 h-4" />
+        <span class="sr-only">{{ $t("match.map_winner.set") }}</span>
+      </Button>
+    </DropdownMenuTrigger>
+    <DropdownMenuContent align="end" class="min-w-56">
+      <DropdownMenuLabel
+        class="px-2 pb-1 pt-1.5 font-mono text-[0.58rem] font-semibold uppercase tracking-[0.16em] text-muted-foreground"
+      >
+        {{ $t("match.map_winner.set") }}
+      </DropdownMenuLabel>
+      <!-- Each team reads as name + its score on this map; picking one opens
+           the confirm below instead of saving straight away. -->
+      <DropdownMenuItem
+        v-for="lineup in lineups"
+        :key="lineup.id"
+        @click="ask(lineup.id)"
+      >
+        <span class="truncate">{{ lineup.name }}</span>
+        <span
+          v-if="lineup.id === matchMap.winning_lineup_id"
+          class="shrink-0 rounded-sm border border-border px-1.5 py-0.5 font-mono text-[0.55rem] font-semibold uppercase leading-none tracking-[0.12em] text-muted-foreground"
+        >
+          {{ $t("match.admin_bar.current") }}
+        </span>
+        <MatchLineupScoreDisplay
+          :match="match"
+          :lineup="lineup"
+          :match-map="matchMap"
+          :halves="false"
+          class="ml-auto pl-6 tabular-nums"
+        />
+      </DropdownMenuItem>
+    </DropdownMenuContent>
+  </DropdownMenu>
+
+  <!-- Outside the menu so it survives the menu closing as the dialog takes
+       focus. -->
+  <AlertDialog
+    :open="open"
+    @update:open="(value) => !value && !busy && (open = false)"
   >
-    <DropdownMenuRadioItem
-      v-for="lineup in availableLineups"
-      :key="lineup.value"
-      :value="lineup.value"
-    >
-      {{ lineup.display }}
-    </DropdownMenuRadioItem>
-  </DropdownMenuRadioGroup>
+    <AlertDialogContent>
+      <AlertDialogHeader>
+        <AlertDialogTitle>{{ $t("match.map_winner.set") }}</AlertDialogTitle>
+        <AlertDialogDescription>
+          {{ $t("match.map_winner.set_hint", { map: mapLabel(matchMap.map) }) }}
+        </AlertDialogDescription>
+      </AlertDialogHeader>
+      <MatchSelectWinner
+        :match="match"
+        :match-map="matchMap"
+        :selected="picked"
+        @select="(choice) => (picked = choice.value)"
+      />
+      <p v-if="matchWinnerNote" class="text-sm text-muted-foreground">
+        {{ matchWinnerNote }}
+      </p>
+      <AlertDialogFooter>
+        <AlertDialogCancel :disabled="busy">
+          {{ $t("common.cancel") }}
+        </AlertDialogCancel>
+        <!-- Plain button: AlertDialogAction closes the dialog before an async
+             click handler gets to run. -->
+        <Button :disabled="busy || !picked" @click="confirm">
+          {{ $t("match.map_winner.set") }}
+        </Button>
+      </AlertDialogFooter>
+    </AlertDialogContent>
+  </AlertDialog>
 </template>
 
 <script lang="ts">
@@ -39,42 +107,73 @@ export default {
       required: true,
     },
   },
+  data() {
+    return {
+      open: false,
+      busy: false,
+      picked: null as string | null,
+    };
+  },
   methods: {
-    async updateMapWinner(lineupId: string) {
-      if (!lineupId) {
+    ask(lineupId: string) {
+      this.picked = lineupId;
+      this.open = true;
+    },
+    async confirm() {
+      if (this.busy || !this.picked) {
         return;
       }
-
-      await this.$apollo.mutate({
-        mutation: generateMutation({
-          setMapWinner: [
-            {
-              match_id: this.match.id,
-              match_map_id: this.matchMap.id,
-              winning_lineup_id: lineupId,
-            },
-            { success: true },
-          ],
-        }),
-      });
-
-      toast({
-        title: this.$t("match.map_winner.set"),
-      });
+      this.busy = true;
+      try {
+        await this.$apollo.mutate({
+          mutation: generateMutation({
+            setMapWinner: [
+              {
+                match_id: this.match.id,
+                match_map_id: this.matchMap.id,
+                winning_lineup_id: this.picked,
+              },
+              { success: true },
+            ],
+          }),
+        });
+        this.open = false;
+        toast({
+          title: this.$t("match.map_winner.set"),
+        });
+      } finally {
+        this.busy = false;
+      }
     },
   },
   computed: {
-    availableLineups() {
-      return [
-        {
-          value: this.match.lineup_1.id,
-          display: this.match.lineup_1.name,
-        },
-        {
-          value: this.match.lineup_2.id,
-          display: this.match.lineup_2.name,
-        },
-      ];
+    lineups() {
+      return [this.match.lineup_1, this.match.lineup_2];
+    },
+    // setMapWinner re-derives the match winner from the maps: a team with
+    // enough of them takes the match, otherwise the match winner is cleared.
+    // Say so when this pick changes it.
+    matchWinnerNote() {
+      if (!this.picked) {
+        return null;
+      }
+      const needed = Math.floor((this.match.options?.best_of ?? 0) / 2) + 1;
+      const winner = this.lineups.find((lineup) => {
+        const wins = (this.match.match_maps ?? []).filter(
+          (map) =>
+            (map.id === this.matchMap.id
+              ? this.picked
+              : map.winning_lineup_id) === lineup.id,
+        ).length;
+        return wins >= needed;
+      });
+
+      if ((winner?.id ?? null) === (this.match.winning_lineup_id ?? null)) {
+        return null;
+      }
+      return winner
+        ? this.$t("match.map_winner.sets_match_winner", { team: winner.name })
+        : this.$t("match.map_winner.clears_match_winner");
     },
   },
 };
diff --git a/components/match/MatchSelectServer.vue b/components/match/MatchSelectServer.vue
index 22546a1fc..eaeb58f49 100644
--- a/components/match/MatchSelectServer.vue
+++ b/components/match/MatchSelectServer.vue
@@ -13,15 +13,17 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
+import SettingHeader from "~/components/match/SettingHeader.vue";
 </script>
 
 <template>
-  <form class="space-y-8">
+  <form class="w-full">
     <FormField v-slot="{ componentField }" name="server_id">
       <FormItem class="space-y-1.5">
-        <Select v-bind="componentField" @update:modelValue="pick">
+        <SettingHeader>{{ $t("match.server.assign") }}</SettingHeader>
+        <Select v-bind="componentField" @update:modelValue="updateMatchServer">
           <FormControl>
-            <SelectTrigger :aria-label="$t('match.server.assign')">
+            <SelectTrigger>
               <SelectValue :placeholder="$t('match.server.select')" />
             </SelectTrigger>
           </FormControl>
@@ -40,11 +42,11 @@ import {
             <SelectGroup>
               <SelectLabel>{{ $t("match.server.on_demand") }}</SelectLabel>
               <SelectItem
-                v-for="region in regionOptions"
+                v-for="region in regions"
                 :key="region.value"
-                :value="region.value"
+                :value="`0:${region.value}`"
               >
-                {{ region.display }}
+                {{ region.description || region.value }}
               </SelectItem>
             </SelectGroup>
           </SelectContent>
@@ -60,6 +62,8 @@ import * as z from "zod";
 import { useForm } from "vee-validate";
 import { toTypedSchema } from "~/utilities/vee-validate-zod";
 import { typedGql } from "~/generated/zeus/typedDocumentNode";
+import { generateMutation } from "~/graphql/graphqlGen";
+import { toast } from "@/components/ui/toast";
 import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
 import { e_server_types_enum } from "~/generated/zeus";
 
@@ -70,8 +74,6 @@ export default {
       required: true,
     },
   },
-  // The parent's dialog assigns the server; this only reports the pick.
-  emits: ["select"],
   apollo: {
     $subscribe: {
       servers: {
@@ -112,43 +114,54 @@ export default {
     };
   },
   watch: {
-    // Only a real server change resets the pick; the match object itself is
-    // replaced on every live update.
-    serverKey: {
+    match: {
       immediate: true,
-      handler() {
-        this.syncFromMatch();
+      handler(match) {
+        if (match) {
+          let server_id = match.server_id;
+
+          if (!server_id || match.server_type === "On Demand") {
+            server_id = `${match.region ? `0:${match.region}` : "0"}`;
+          }
+
+          this.form.setValues({
+            server_id,
+          });
+        }
       },
     },
   },
   methods: {
-    syncFromMatch() {
-      let server_id = this.match.server_id;
+    async updateMatchServer() {
+      const [serverId, region] = this.form.values.server_id?.split(":");
 
-      if (!server_id || this.match.server_type === "On Demand") {
-        server_id = `${this.match.region ? `0:${this.match.region}` : "0"}`;
-      }
+      await this.$apollo.mutate({
+        mutation: generateMutation({
+          update_matches_by_pk: [
+            {
+              pk_columns: {
+                id: this.match.id,
+              },
+              _set: {
+                region,
+                server_id: serverId === "0" ? null : this.form.values.server_id,
+              },
+            },
+            {
+              id: true,
+            },
+          ],
+        }),
+      });
 
-      this.form.setValues({
-        server_id,
+      toast({
+        title: this.$t("match.server.assigned"),
       });
     },
-    pick(value: string) {
-      const option = [...this.availableServers, ...this.regionOptions].find(
-        (option) => option.value === value,
-      );
-      this.$emit("select", { value, label: option?.display ?? value });
-    },
   },
   computed: {
-    serverKey() {
-      return `${this.match.server_id}:${this.match.server_type}:${this.match.region}`;
-    },
-    regionOptions() {
-      return useApplicationSettingsStore().availableRegions.map((region) => ({
-        value: `0:${region.value}`,
-        display: region.description || region.value,
-      }));
+    regions() {
+      return useApplicationSettingsStore().availableRegions;
     },
     canSelectDedicatedServer() {
       const { isAdmin, isMatchOrganizer, isTournamentOrganizer } =
diff --git a/components/match/MatchSelectWinner.vue b/components/match/MatchSelectWinner.vue
index 39599d9d1..dcb36324a 100644
--- a/components/match/MatchSelectWinner.vue
+++ b/components/match/MatchSelectWinner.vue
@@ -1,29 +1,105 @@
+<script lang="ts" setup>
+import MatchLineupScoreDisplay from "~/components/match/MatchLineupScoreDisplay.vue";
+import { e_match_map_status_enum } from "~/generated/zeus";
+import mapLabel from "~/utilities/mapLabel";
+</script>
+
 <template>
-  <!-- Two teams, so two buttons instead of a dropdown; the current winner is
-       marked so the change being made is visible. -->
+  <!-- Two teams, so two cards instead of a dropdown. Each card carries the
+       team's result (the series map by map, or the one map being decided), so
+       the pick is made against the score. The current winner is marked so the
+       change being made is visible. -->
   <div
     class="grid grid-cols-2 gap-2"
     role="radiogroup"
-    :aria-label="$t('match.winner.set')"
+    :aria-label="matchMap ? $t('match.map_winner.set') : $t('match.winner.set')"
   >
     <button
-      v-for="lineup in availableLineups"
-      :key="lineup.value"
+      v-for="team in teams"
+      :key="team.id"
       type="button"
       role="radio"
-      :aria-checked="picked === lineup.value"
-      class="flex min-w-0 items-center justify-between gap-2 rounded-md border px-3 py-2.5 text-left text-sm font-semibold transition-colors duration-200 ease-out"
+      :aria-checked="picked === team.id"
+      class="relative grid min-w-0 content-start gap-2.5 rounded-md border p-3 text-left transition-colors duration-200 ease-out"
       :class="
-        picked === lineup.value
-          ? 'border-[hsl(var(--tac-amber)/0.6)] bg-[hsl(var(--tac-amber)/0.12)] text-foreground'
-          : 'border-border text-muted-foreground hover:bg-muted/40 hover:text-foreground'
+        picked === team.id
+          ? 'border-[hsl(var(--tac-amber)/0.6)] bg-[hsl(var(--tac-amber)/0.12)]'
+          : 'border-border hover:bg-muted/40'
       "
-      @click="pick(lineup.value)"
+      @click="pick(team.id)"
     >
-      <span class="truncate">{{ lineup.display }}</span>
+      <span class="flex min-w-0 items-center gap-2.5">
+        <span
+          aria-hidden="true"
+          class="grid size-9 shrink-0 place-items-center overflow-hidden rounded-md bg-muted text-[0.65rem] font-extrabold tracking-wide text-foreground/85 ring-1 ring-inset ring-white/10"
+        >
+          <img
+            v-if="team.crest"
+            :src="team.crest"
+            alt=""
+            class="size-full object-cover"
+          />
+          <template v-else>{{ team.monogram }}</template>
+        </span>
+        <span class="grid min-w-0 gap-0.5">
+          <span class="truncate text-sm font-semibold">{{ team.name }}</span>
+          <span
+            v-if="!matchMap && isSeries"
+            class="truncate text-xs tabular-nums text-muted-foreground"
+          >
+            {{
+              $t("match.winner.map_record", {
+                won: team.won,
+                lost: team.lost,
+              })
+            }}
+          </span>
+        </span>
+      </span>
+
+      <span v-if="matchMap" class="flex items-baseline gap-1.5 tabular-nums">
+        <MatchLineupScoreDisplay
+          :match="match"
+          :lineup="team.lineup"
+          :match-map="matchMap"
+          :halves="false"
+          class="text-2xl leading-none"
+        />
+        <MatchLineupScoreDisplay
+          :match="match"
+          :lineup="team.lineup"
+          :match-map="matchMap"
+          :score="false"
+          class="text-muted-foreground"
+        />
+      </span>
+      <span
+        v-else-if="maps.length"
+        class="grid gap-1 border-t border-border/60 pt-2 text-xs"
+      >
+        <span
+          v-for="map in maps"
+          :key="map.id"
+          class="flex items-center justify-between gap-2"
+        >
+          <span class="truncate text-muted-foreground">
+            {{ mapLabel(map.map) }}
+          </span>
+          <MatchLineupScoreDisplay
+            v-if="map.status !== e_match_map_status_enum.Scheduled"
+            :match="match"
+            :lineup="team.lineup"
+            :match-map="map"
+            :halves="false"
+            class="tabular-nums"
+          />
+          <span v-else class="text-muted-foreground/60">–</span>
+        </span>
+      </span>
+
       <span
-        v-if="lineup.value === match.winning_lineup_id"
-        class="shrink-0 rounded-sm border border-border px-1.5 py-0.5 font-mono text-[0.55rem] font-semibold uppercase tracking-[0.12em] text-muted-foreground"
+        v-if="team.id === currentWinnerId"
+        class="absolute -top-2 right-2 rounded-sm border border-border bg-background px-1.5 py-0.5 font-mono text-[0.55rem] font-semibold uppercase leading-none tracking-[0.12em] text-muted-foreground"
       >
         {{ $t("match.admin_bar.current") }}
       </span>
@@ -32,12 +108,26 @@
 </template>
 
 <script lang="ts">
+import { resolveAvatarUrl } from "~/utilities/avatarUrl";
+import { teamMonogram } from "~/components/watch/watchTicker";
+
 export default {
   props: {
     match: {
       type: Object,
       required: true,
     },
+    // Set to pick the winner of this one map instead of the match.
+    matchMap: {
+      type: Object,
+      default: null,
+    },
+    // The lineup the parent already has in mind, e.g. from the menu row that
+    // opened the dialog.
+    selected: {
+      type: String,
+      default: null,
+    },
   },
   // The parent's dialog sets the winner; this only reports the pick.
   emits: ["select"],
@@ -49,34 +139,62 @@ export default {
   watch: {
     // Only a real winner change resets the pick; the match object itself is
     // replaced on every live update.
-    "match.winning_lineup_id": {
+    currentWinnerId: {
       immediate: true,
       handler(winningLineupId) {
-        this.picked = winningLineupId;
+        this.picked = this.selected ?? winningLineupId;
       },
     },
   },
   methods: {
     pick(value: string) {
       this.picked = value;
-      const lineup = this.availableLineups.find(
-        (lineup) => lineup.value === value,
-      );
-      this.$emit("select", { value, label: lineup?.display ?? value });
+      const team = this.teams.find((team) => team.id === value);
+      this.$emit("select", { value, label: team?.name ?? value });
     },
   },
   computed: {
-    availableLineups() {
-      return [
-        {
-          value: this.match.lineup_1.id,
-          display: this.match.lineup_1.name,
-        },
-        {
-          value: this.match.lineup_2.id,
-          display: this.match.lineup_2.name,
-        },
-      ];
+    currentWinnerId() {
+      return (this.matchMap ?? this.match).winning_lineup_id ?? null;
+    },
+    maps() {
+      return this.match.match_maps ?? [];
+    },
+    isSeries() {
+      return (this.match.options?.best_of ?? 1) > 1;
+    },
+    teams() {
+      const apiDomain = useRuntimeConfig().public.apiDomain as string;
+      // A pickup game's lineups are named after their captains, so the
+      // captain's face stands in for the missing team crest.
+      const isPug = !this.match.lineup_1.team_id && !this.match.lineup_2.team_id;
+
+      return [this.match.lineup_1, this.match.lineup_2].map((lineup) => {
+        const captain = lineup.lineup_players?.find(
+          (member) => member.captain,
+        )?.player;
+        const decided = this.maps.filter((map) => map.winning_lineup_id);
+        const won = decided.filter(
+          (map) => map.winning_lineup_id === lineup.id,
+        ).length;
+
+        return {
+          id: lineup.id,
+          name: lineup.name,
+          lineup,
+          crest:
+            resolveAvatarUrl(lineup.team?.avatar_url, apiDomain) ??
+            (isPug
+              ? resolveAvatarUrl(
+                  captain?.custom_avatar_url || captain?.avatar_url,
+                  apiDomain,
+                )
+              : null),
+          monogram: teamMonogram(lineup.name ?? ""),
+          won,
+          lost: decided.length - won,
+        };
+      });
     },
   },
 };
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 6eb4afc50..079d8608b 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -8510,10 +8510,14 @@
       "set": "حدّد الفائز بالمباراة",
       "set_hint": "اختر الفريق الفائز في هذه المباراة.",
       "set_failed": "تعذّر تحديد الفائز بالمباراة",
-      "select_lineup": "اختر التشكيلة"
+      "select_lineup": "اختر التشكيلة",
+      "map_record": "{won} فوز · {lost} خسارة"
     },
     "map_winner": {
-      "set": "حدّد الفائز بالخريطة"
+      "set": "حدّد الفائز بالخريطة",
+      "set_hint": "اختر الفريق الفائز في {map}.",
+      "sets_match_winner": "سيجعل هذا {team} الفائز بالمباراة أيضًا.",
+      "clears_match_winner": "سيؤدي هذا أيضًا إلى إزالة الفائز بالمباراة."
     },
     "region_veto": {
       "ban_label": "حظر",
@@ -8585,6 +8589,7 @@
       "match_paused": "تم إيقاف المباراة مؤقتًا",
       "match_resumed": "تم استئناف المباراة",
       "forced_ready": "تم فرض الجاهزية على اللاعبين",
+      "skipped_knife": "تم تخطي جولة السكين",
       "start_live": "ابدأ البث المباشر",
       "pause_highlights_and_start_live": "أوقف أبرز اللقطات وابدأ البث المباشر",
       "start_live_preempt_highlights_hint": "أبرز اللقطات تتوقف بعد الحالية · البث يبدأ فور تفرّغ GPU",
@@ -8879,7 +8884,6 @@
       "dedicated": "السيرفرات المخصصة",
       "on_demand": "عند الطلب",
       "assigned": "سيرفر المباراة المعيّن",
-      "assign_hint": "اختر الخادم الذي ستُلعب عليه هذه المباراة.",
       "reboot_label": "إعادة تشغيل السيرفر",
       "reboot": "أعد تشغيل السيرفر",
       "rebooting": "جارٍ إعادة التشغيل...",
@@ -9054,10 +9058,8 @@
       "veto_override": "تجاوز الاستبعاد",
       "actions": "إجراءات أخرى",
       "coming_up": "قادم",
-      "server": "الخادم",
       "winner": "الفائز",
       "not_set": "غير محدد",
-      "dedicated": "خادم مخصص",
       "current": "الحالي",
       "steps": {
         "label": "مراحل المباراة",
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 60ff8d37c..1fa7508da 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -8510,10 +8510,14 @@
       "set": "Sæt kampvinder",
       "set_hint": "Vælg holdet, der vandt kampen.",
       "set_failed": "Kunne ikke angive kampens vinder",
-      "select_lineup": "Vælg opstilling"
+      "select_lineup": "Vælg opstilling",
+      "map_record": "{won} vundet · {lost} tabt"
     },
     "map_winner": {
-      "set": "Sæt mapvinder"
+      "set": "Sæt mapvinder",
+      "set_hint": "Vælg holdet, der vandt {map}.",
+      "sets_match_winner": "Det gør også {team} til kampvinder.",
+      "clears_match_winner": "Det fjerner også kampvinderen."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "Kampen er sat på pause",
       "match_resumed": "Kampen er genoptaget",
       "forced_ready": "Spillerne er tvunget klar",
+      "skipped_knife": "Knivrunden er sprunget over",
       "start_live": "Start livestream",
       "pause_highlights_and_start_live": "Pause highlights og start livestream",
       "start_live_preempt_highlights_hint": "Highlights pauser efter den aktuelle · live starter når GPU er ledig",
@@ -8879,7 +8884,6 @@
       "dedicated": "Dedikerede servere",
       "on_demand": "On demand",
       "assigned": "Tildelt kampserver",
-      "assign_hint": "Vælg den server, kampen skal køre på.",
       "reboot_label": "Genstart af server",
       "reboot": "Genstart server",
       "rebooting": "Genstarter...",
@@ -9054,10 +9058,8 @@
       "veto_override": "Tilsidesæt veto",
       "actions": "Flere handlinger",
       "coming_up": "Kommer snart",
-      "server": "Server",
       "winner": "Vinder",
       "not_set": "Ikke valgt",
-      "dedicated": "Dedikeret",
       "current": "Nuværende",
       "steps": {
         "label": "Kamptrin",
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index b918f5ff7..1a97cc48d 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -8510,10 +8510,14 @@
       "set": "Match-Sieger festlegen",
       "set_hint": "Wähle das Team, das dieses Match gewonnen hat.",
       "set_failed": "Match-Sieger konnte nicht festgelegt werden",
-      "select_lineup": "Lineup wählen"
+      "select_lineup": "Lineup wählen",
+      "map_record": "{won} gewonnen · {lost} verloren"
     },
     "map_winner": {
-      "set": "Map-Sieger festlegen"
+      "set": "Map-Sieger festlegen",
+      "set_hint": "Wähle das Team, das {map} gewonnen hat.",
+      "sets_match_winner": "Dadurch wird {team} auch Match-Sieger.",
+      "clears_match_winner": "Dadurch wird auch der Match-Sieger entfernt."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "Match pausiert",
       "match_resumed": "Match fortgesetzt",
       "forced_ready": "Spieler zwangsweise bereit gesetzt",
+      "skipped_knife": "Knife-Runde übersprungen",
       "start_live": "Live-Stream starten",
       "pause_highlights_and_start_live": "Highlights pausieren & Live-Stream starten",
       "start_live_preempt_highlights_hint": "Highlights pausieren nach dem aktuellen · Live startet, sobald die GPU frei ist",
@@ -8879,7 +8884,6 @@
       "dedicated": "Dedicated Server",
       "on_demand": "On Demand",
       "assigned": "Zugewiesener Match-Server",
-      "assign_hint": "Wähle den Server, auf dem dieses Match laufen soll.",
       "reboot_label": "Server-Neustart",
       "reboot": "Server neu starten",
       "rebooting": "Startet neu...",
@@ -9054,10 +9058,8 @@
       "veto_override": "Veto überschreiben",
       "actions": "Weitere Aktionen",
       "coming_up": "Demnächst",
-      "server": "Server",
       "winner": "Sieger",
       "not_set": "Nicht festgelegt",
-      "dedicated": "Dediziert",
       "current": "Aktuell",
       "steps": {
         "label": "Match-Schritte",
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 16168b75b..d44b6a103 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -8512,10 +8512,14 @@
       "set": "Set Match Winner",
       "set_hint": "Pick the team that won this match.",
       "set_failed": "Could not set match winner",
-      "select_lineup": "Select Lineup"
+      "select_lineup": "Select Lineup",
+      "map_record": "{won} won · {lost} lost"
     },
     "map_winner": {
-      "set": "Set Map Winner"
+      "set": "Set Map Winner",
+      "set_hint": "Pick the team that won {map}.",
+      "sets_match_winner": "This also makes {team} the match winner.",
+      "clears_match_winner": "This also clears the match winner."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8587,6 +8591,7 @@
       "match_paused": "Match paused",
       "match_resumed": "Match resumed",
       "forced_ready": "Players forced ready",
+      "skipped_knife": "Knife round skipped",
       "start_live": "Start Live Stream",
       "pause_highlights_and_start_live": "Pause Highlights & Start Live Stream",
       "start_live_preempt_highlights_hint": "Highlights pause after current · live goes up once GPU frees",
@@ -8881,7 +8886,6 @@
       "dedicated": "Dedicated Servers",
       "on_demand": "On Demand",
       "assigned": "Assigned Match Server",
-      "assign_hint": "Pick the server this match should run on.",
       "reboot_label": "Server Reboot",
       "reboot": "Reboot Server",
       "rebooting": "Rebooting...",
@@ -9056,10 +9060,8 @@
       "veto_override": "Veto Override",
       "actions": "More actions",
       "coming_up": "Coming up",
-      "server": "Server",
       "winner": "Winner",
       "not_set": "Not set",
-      "dedicated": "Dedicated",
       "current": "Current",
       "steps": {
         "label": "Match steps",
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 4a5e58593..1663cda4c 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -8510,10 +8510,14 @@
       "set": "Definir ganador de la partida",
       "set_hint": "Elige el equipo que ganó esta partida.",
       "set_failed": "No se pudo establecer el ganador de la partida",
-      "select_lineup": "Seleccionar alineación"
+      "select_lineup": "Seleccionar alineación",
+      "map_record": "{won} ganados · {lost} perdidos"
     },
     "map_winner": {
-      "set": "Definir ganador del mapa"
+      "set": "Definir ganador del mapa",
+      "set_hint": "Elige el equipo que ganó {map}.",
+      "sets_match_winner": "Esto también convierte a {team} en ganador de la partida.",
+      "clears_match_winner": "Esto también quita al ganador de la partida."
     },
     "region_veto": {
       "ban_label": "Banear",
@@ -8585,6 +8589,7 @@
       "match_paused": "Partida pausada",
       "match_resumed": "Partida reanudada",
       "forced_ready": "Jugadores forzados a listos",
+      "skipped_knife": "Ronda de cuchillo saltada",
       "start_live": "Iniciar stream en directo",
       "pause_highlights_and_start_live": "Pausar highlights e iniciar stream",
       "start_live_preempt_highlights_hint": "Los highlights se pausan tras el actual · el directo arranca cuando se libere la GPU",
@@ -8879,7 +8884,6 @@
       "dedicated": "Servidores dedicados",
       "on_demand": "Bajo demanda",
       "assigned": "Servidor de partida asignado",
-      "assign_hint": "Elige el servidor en el que se jugará esta partida.",
       "reboot_label": "Reinicio del servidor",
       "reboot": "Reiniciar servidor",
       "rebooting": "Reiniciando...",
@@ -9054,10 +9058,8 @@
       "veto_override": "Anular veto",
       "actions": "Más acciones",
       "coming_up": "Próximamente",
-      "server": "Servidor",
       "winner": "Ganador",
       "not_set": "Sin definir",
-      "dedicated": "Dedicado",
       "current": "Actual",
       "steps": {
         "label": "Pasos de la partida",
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index ce6c09a47..d5aefdb18 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -8510,10 +8510,14 @@
       "set": "Définir le vainqueur du match",
       "set_hint": "Choisissez l'équipe qui a gagné ce match.",
       "set_failed": "Impossible de définir le vainqueur du match",
-      "select_lineup": "Choisir une composition"
+      "select_lineup": "Choisir une composition",
+      "map_record": "{won} gagnées · {lost} perdues"
     },
     "map_winner": {
-      "set": "Définir le vainqueur de la map"
+      "set": "Définir le vainqueur de la map",
+      "set_hint": "Choisissez l'équipe qui a gagné {map}.",
+      "sets_match_winner": "Cela fait aussi de {team} le vainqueur du match.",
+      "clears_match_winner": "Cela retire aussi le vainqueur du match."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "Match en pause",
       "match_resumed": "Match repris",
       "forced_ready": "Joueurs forcés prêts",
+      "skipped_knife": "Knife round passé",
       "start_live": "Lancer le live",
       "pause_highlights_and_start_live": "Mettre les highlights en pause et lancer le live",
       "start_live_preempt_highlights_hint": "Les highlights se mettent en pause après le rendu en cours · le live démarre dès que le GPU se libère",
@@ -8879,7 +8884,6 @@
       "dedicated": "Serveurs dédiés",
       "on_demand": "À la demande",
       "assigned": "Serveur de match assigné",
-      "assign_hint": "Choisissez le serveur sur lequel ce match doit se jouer.",
       "reboot_label": "Redémarrage du serveur",
       "reboot": "Redémarrer le serveur",
       "rebooting": "Redémarrage…",
@@ -9054,10 +9058,8 @@
       "veto_override": "Forcer le veto",
       "actions": "Plus d'actions",
       "coming_up": "À venir",
-      "server": "Serveur",
       "winner": "Vainqueur",
       "not_set": "Non défini",
-      "dedicated": "Dédié",
       "current": "Actuel",
       "steps": {
         "label": "Étapes du match",
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index c9d739786..3fb05cda4 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -8510,10 +8510,14 @@
       "set": "Imposta vincitore del match",
       "set_hint": "Scegli la squadra che ha vinto questo match.",
       "set_failed": "Impossibile impostare il vincitore della partita",
-      "select_lineup": "Seleziona lineup"
+      "select_lineup": "Seleziona lineup",
+      "map_record": "{won} vinte · {lost} perse"
     },
     "map_winner": {
-      "set": "Imposta vincitore della mappa"
+      "set": "Imposta vincitore della mappa",
+      "set_hint": "Scegli la squadra che ha vinto {map}.",
+      "sets_match_winner": "Questo rende anche {team} vincitore del match.",
+      "clears_match_winner": "Questo rimuove anche il vincitore del match."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "Match in pausa",
       "match_resumed": "Match ripreso",
       "forced_ready": "Giocatori forzati pronti",
+      "skipped_knife": "Knife round saltato",
       "start_live": "Avvia live stream",
       "pause_highlights_and_start_live": "Metti in pausa gli highlight e avvia il live stream",
       "start_live_preempt_highlights_hint": "Gli highlight si mettono in pausa dopo quello in corso · il live parte quando la GPU si libera",
@@ -8879,7 +8884,6 @@
       "dedicated": "Server dedicati",
       "on_demand": "On demand",
       "assigned": "Server match assegnato",
-      "assign_hint": "Scegli il server su cui si giocherà questo match.",
       "reboot_label": "Riavvio server",
       "reboot": "Riavvia server",
       "rebooting": "Riavvio in corso…",
@@ -9054,10 +9058,8 @@
       "veto_override": "Forza il veto",
       "actions": "Altre azioni",
       "coming_up": "In arrivo",
-      "server": "Server",
       "winner": "Vincitore",
       "not_set": "Non impostato",
-      "dedicated": "Dedicato",
       "current": "Attuale",
       "steps": {
         "label": "Fasi del match",
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 7ace381e4..9b8270660 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -8510,10 +8510,14 @@
       "set": "試合の勝者を設定",
       "set_hint": "この試合に勝ったチームを選んでください。",
       "set_failed": "試合の勝者を設定できませんでした",
-      "select_lineup": "出場メンバーを選択"
+      "select_lineup": "出場メンバーを選択",
+      "map_record": "{won}勝 · {lost}敗"
     },
     "map_winner": {
-      "set": "マップの勝者を設定"
+      "set": "マップの勝者を設定",
+      "set_hint": "{map}に勝ったチームを選んでください。",
+      "sets_match_winner": "これにより{team}が試合の勝者にもなります。",
+      "clears_match_winner": "これにより試合の勝者も解除されます。"
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "試合を一時停止しました",
       "match_resumed": "試合を再開しました",
       "forced_ready": "プレイヤーを強制的に準備完了にしました",
+      "skipped_knife": "ナイフラウンドをスキップしました",
       "start_live": "ライブ配信を開始",
       "pause_highlights_and_start_live": "ハイライトを一時停止してライブ配信を開始",
       "start_live_preempt_highlights_hint": "現在のハイライト後に一時停止 · GPU が空き次第ライブ開始",
@@ -8879,7 +8884,6 @@
       "dedicated": "専用サーバー",
       "on_demand": "オンデマンド",
       "assigned": "割り当て済みマッチサーバー",
-      "assign_hint": "この試合を行うサーバーを選んでください。",
       "reboot_label": "サーバー再起動",
       "reboot": "サーバーを再起動",
       "rebooting": "再起動中...",
@@ -9054,10 +9058,8 @@
       "veto_override": "拒否を上書き",
       "actions": "その他の操作",
       "coming_up": "この先",
-      "server": "サーバー",
       "winner": "勝者",
       "not_set": "未設定",
-      "dedicated": "専用",
       "current": "現在",
       "steps": {
         "label": "試合の段階",
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index 715a531ce..fce7b35a2 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -8510,10 +8510,14 @@
       "set": "매치 승자 지정",
       "set_hint": "이 매치에서 이긴 팀을 선택하세요.",
       "set_failed": "경기 승자를 설정하지 못했습니다",
-      "select_lineup": "라인업 선택"
+      "select_lineup": "라인업 선택",
+      "map_record": "{won}승 · {lost}패"
     },
     "map_winner": {
-      "set": "맵 승자 지정"
+      "set": "맵 승자 지정",
+      "set_hint": "{map}에서 이긴 팀을 선택하세요.",
+      "sets_match_winner": "이렇게 하면 {team}이(가) 매치 승자로도 지정됩니다.",
+      "clears_match_winner": "이렇게 하면 매치 승자도 해제됩니다."
     },
     "region_veto": {
       "ban_label": "밴",
@@ -8585,6 +8589,7 @@
       "match_paused": "매치가 일시정지되었습니다",
       "match_resumed": "매치가 재개되었습니다",
       "forced_ready": "플레이어를 강제로 준비 완료했습니다",
+      "skipped_knife": "나이프 라운드를 건너뛰었습니다",
       "start_live": "라이브 스트림 시작",
       "pause_highlights_and_start_live": "하이라이트 일시정지 후 라이브 스트림 시작",
       "start_live_preempt_highlights_hint": "현재 작업 후 하이라이트 일시정지 · GPU 확보 시 라이브 시작",
@@ -8879,7 +8884,6 @@
       "dedicated": "데디케이티드 서버",
       "on_demand": "온디맨드",
       "assigned": "지정된 매치 서버",
-      "assign_hint": "이 매치를 진행할 서버를 선택하세요.",
       "reboot_label": "서버 재부팅",
       "reboot": "서버 재부팅",
       "rebooting": "재부팅 중...",
@@ -9054,10 +9058,8 @@
       "veto_override": "거부 재정의",
       "actions": "추가 작업",
       "coming_up": "다음 단계",
-      "server": "서버",
       "winner": "승자",
       "not_set": "설정 안 됨",
-      "dedicated": "전용",
       "current": "현재",
       "steps": {
         "label": "매치 단계",
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index fab347ada..1ad64f5b4 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -8510,10 +8510,14 @@
       "set": "Ustaw zwycięzcę meczu",
       "set_hint": "Wybierz drużynę, która wygrała ten mecz.",
       "set_failed": "Nie udało się ustawić zwycięzcy meczu",
-      "select_lineup": "Wybierz ustawienie"
+      "select_lineup": "Wybierz ustawienie",
+      "map_record": "Wygrane: {won} · Przegrane: {lost}"
     },
     "map_winner": {
-      "set": "Ustaw zwycięzcę mapy"
+      "set": "Ustaw zwycięzcę mapy",
+      "set_hint": "Wybierz drużynę, która wygrała {map}.",
+      "sets_match_winner": "To ustawi też {team} jako zwycięzcę meczu.",
+      "clears_match_winner": "To usunie też zwycięzcę meczu."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "Mecz wstrzymany",
       "match_resumed": "Mecz wznowiony",
       "forced_ready": "Gracze wymuszeni jako gotowi",
+      "skipped_knife": "Knife round pominięty",
       "start_live": "Rozpocznij transmisję na żywo",
       "pause_highlights_and_start_live": "Wstrzymaj highlighty i rozpocznij transmisję na żywo",
       "start_live_preempt_highlights_hint": "Highlighty wstrzymają się po bieżącym · transmisja ruszy po zwolnieniu GPU",
@@ -8879,7 +8884,6 @@
       "dedicated": "Serwery dedykowane",
       "on_demand": "On demand",
       "assigned": "Przypisany serwer meczu",
-      "assign_hint": "Wybierz serwer, na którym ma się odbyć ten mecz.",
       "reboot_label": "Restart serwera",
       "reboot": "Zrestartuj serwer",
       "rebooting": "Restartowanie…",
@@ -9054,10 +9058,8 @@
       "veto_override": "Nadpisz veto",
       "actions": "Więcej akcji",
       "coming_up": "Wkrótce",
-      "server": "Serwer",
       "winner": "Zwycięzca",
       "not_set": "Nie ustawiono",
-      "dedicated": "Dedykowany",
       "current": "Obecny",
       "steps": {
         "label": "Etapy meczu",
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index d2a4a97a4..c406469c8 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -8510,10 +8510,14 @@
       "set": "Definir Vencedor",
       "set_hint": "Escolha o time que venceu esta partida.",
       "set_failed": "Não foi possível definir o vencedor",
-      "select_lineup": "Selecionar escalação"
+      "select_lineup": "Selecionar escalação",
+      "map_record": "{won} vencidos · {lost} perdidos"
     },
     "map_winner": {
-      "set": "Definir Vencedor do Mapa"
+      "set": "Definir Vencedor do Mapa",
+      "set_hint": "Escolha o time que venceu {map}.",
+      "sets_match_winner": "Isso também torna {team} o vencedor da partida.",
+      "clears_match_winner": "Isso também remove o vencedor da partida."
     },
     "region_veto": {
       "ban_label": "Vetando Região/Local",
@@ -8585,6 +8589,7 @@
       "match_paused": "Partida Pausada",
       "match_resumed": "Partida Retomada",
       "forced_ready": "Jogadores forçados como prontos",
+      "skipped_knife": "Rodada de faca pulada",
       "start_live": "Iniciar Live Stream",
       "pause_highlights_and_start_live": "Pausar Highlights & Iniciar Live Stream",
       "start_live_preempt_highlights_hint": "Highlights pausam após o atual · transmissão inicia assim que a GPU estiver livre",
@@ -8879,7 +8884,6 @@
       "dedicated": "Servidores Dedicados",
       "on_demand": "Sob Demanda",
       "assigned": "Servidor de Partida Atribuído",
-      "assign_hint": "Escolha o servidor em que esta partida vai rodar.",
       "reboot_label": "Reiniciar Servidor",
       "reboot": "Reiniciar Servidor",
       "rebooting": "Reiniciando...",
@@ -9054,10 +9058,8 @@
       "veto_override": "Veto Sobrescrito",
       "actions": "Mais ações",
       "coming_up": "Em seguida",
-      "server": "Servidor",
       "winner": "Vencedor",
       "not_set": "Não definido",
-      "dedicated": "Dedicado",
       "current": "Atual",
       "steps": {
         "label": "Etapas da partida",
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index e4e114ec5..0b2f05891 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -8510,10 +8510,14 @@
       "set": "Указать победителя матча",
       "set_hint": "Выберите команду, которая выиграла этот матч.",
       "set_failed": "Не удалось назначить победителя матча",
-      "select_lineup": "Выбрать состав"
+      "select_lineup": "Выбрать состав",
+      "map_record": "Побед: {won} · Поражений: {lost}"
     },
     "map_winner": {
-      "set": "Указать победителя карты"
+      "set": "Указать победителя карты",
+      "set_hint": "Выберите команду, которая выиграла {map}.",
+      "sets_match_winner": "Это также сделает {team} победителем матча.",
+      "clears_match_winner": "Это также сбросит победителя матча."
     },
     "region_veto": {
       "ban_label": "Бан",
@@ -8585,6 +8589,7 @@
       "match_paused": "Матч поставлен на паузу",
       "match_resumed": "Матч возобновлён",
       "forced_ready": "Игроки принудительно готовы",
+      "skipped_knife": "Ножевой раунд пропущен",
       "start_live": "Начать прямую трансляцию",
       "pause_highlights_and_start_live": "Приостановить хайлайты и начать трансляцию",
       "start_live_preempt_highlights_hint": "Хайлайты остановятся после текущего · трансляция начнётся, как только освободится GPU",
@@ -8879,7 +8884,6 @@
       "dedicated": "Выделенные серверы",
       "on_demand": "По требованию",
       "assigned": "Назначенный сервер матча",
-      "assign_hint": "Выберите сервер, на котором будет идти этот матч.",
       "reboot_label": "Перезагрузка сервера",
       "reboot": "Перезагрузить сервер",
       "rebooting": "Перезагрузка…",
@@ -9054,10 +9058,8 @@
       "veto_override": "Переопределить вето",
       "actions": "Другие действия",
       "coming_up": "Далее",
-      "server": "Сервер",
       "winner": "Победитель",
       "not_set": "Не задан",
-      "dedicated": "Выделенный",
       "current": "Текущий",
       "steps": {
         "label": "Этапы матча",
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 85bdd8c84..6a05cf77a 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -8510,10 +8510,14 @@
       "set": "Sätt matchvinnare",
       "set_hint": "Välj laget som vann matchen.",
       "set_failed": "Kunde inte ange matchens vinnare",
-      "select_lineup": "Välj laguppställning"
+      "select_lineup": "Välj laguppställning",
+      "map_record": "{won} vunna · {lost} förlorade"
     },
     "map_winner": {
-      "set": "Sätt kartvinnare"
+      "set": "Sätt kartvinnare",
+      "set_hint": "Välj laget som vann {map}.",
+      "sets_match_winner": "Det gör också {team} till matchvinnare.",
+      "clears_match_winner": "Det tar också bort matchvinnaren."
     },
     "region_veto": {
       "ban_label": "Banna",
@@ -8585,6 +8589,7 @@
       "match_paused": "Matchen pausad",
       "match_resumed": "Matchen återupptagen",
       "forced_ready": "Spelarna tvingades redo",
+      "skipped_knife": "Knivronden hoppades över",
       "start_live": "Starta livesändning",
       "pause_highlights_and_start_live": "Pausa höjdpunkter och starta livesändning",
       "start_live_preempt_highlights_hint": "Höjdpunkter pausar efter aktuell · livesändning startar när GPU:n frigörs",
@@ -8879,7 +8884,6 @@
       "dedicated": "Dedikerade servrar",
       "on_demand": "On demand",
       "assigned": "Tilldelad matchserver",
-      "assign_hint": "Välj servern som matchen ska spelas på.",
       "reboot_label": "Serveromstart",
       "reboot": "Starta om server",
       "rebooting": "Startar om…",
@@ -9054,10 +9058,8 @@
       "veto_override": "Åsidosätt veto",
       "actions": "Fler åtgärder",
       "coming_up": "Kommer härnäst",
-      "server": "Server",
       "winner": "Vinnare",
       "not_set": "Inte vald",
-      "dedicated": "Dedikerad",
       "current": "Nuvarande",
       "steps": {
         "label": "Matchsteg",
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index 610cf4457..d7cf4dff8 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -8510,10 +8510,14 @@
       "set": "Maç Kazananını Belirle",
       "set_hint": "Bu maçı kazanan takımı seç.",
       "set_failed": "Maçın galibi belirlenemedi",
-      "select_lineup": "Diziliş Seç"
+      "select_lineup": "Diziliş Seç",
+      "map_record": "{won} galibiyet · {lost} mağlubiyet"
     },
     "map_winner": {
-      "set": "Harita Kazananını Belirle"
+      "set": "Harita Kazananını Belirle",
+      "set_hint": "{map} haritasını kazanan takımı seç.",
+      "sets_match_winner": "Bu, {team} takımını maçın da kazananı yapar.",
+      "clears_match_winner": "Bu, maçın kazananını da kaldırır."
     },
     "region_veto": {
       "ban_label": "Ban",
@@ -8585,6 +8589,7 @@
       "match_paused": "Maç duraklatıldı",
       "match_resumed": "Maç devam ettirildi",
       "forced_ready": "Oyuncular zorla hazır yapıldı",
+      "skipped_knife": "Bıçak raundu atlandı",
       "start_live": "Canlı Yayını Başlat",
       "pause_highlights_and_start_live": "Öne Çıkan Anları Duraklat ve Canlı Yayını Başlat",
       "start_live_preempt_highlights_hint": "Mevcut render bitince öne çıkan anlar duraklar · GPU boşalınca yayın başlar",
@@ -8879,7 +8884,6 @@
       "dedicated": "Özel sunucular",
       "on_demand": "Talep üzerine",
       "assigned": "Atanan maç sunucusu",
-      "assign_hint": "Bu maçın oynanacağı sunucuyu seç.",
       "reboot_label": "Sunucu yeniden başlatma",
       "reboot": "Sunucuyu yeniden başlat",
       "rebooting": "Yeniden başlatılıyor...",
@@ -9054,10 +9058,8 @@
       "veto_override": "Vetoyu geçersiz kıl",
       "actions": "Diğer işlemler",
       "coming_up": "Sıradaki",
-      "server": "Sunucu",
       "winner": "Kazanan",
       "not_set": "Ayarlanmadı",
-      "dedicated": "Özel",
       "current": "Mevcut",
       "steps": {
         "label": "Maç adımları",
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index 285d75937..c4a3a4ca1 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -8510,10 +8510,14 @@
       "set": "Встановити переможця матчу",
       "set_hint": "Виберіть команду, яка виграла цей матч.",
       "set_failed": "Не вдалося призначити переможця матчу",
-      "select_lineup": "Обрати склад"
+      "select_lineup": "Обрати склад",
+      "map_record": "Перемог: {won} · Поразок: {lost}"
     },
     "map_winner": {
-      "set": "Встановити переможця карти"
+      "set": "Встановити переможця карти",
+      "set_hint": "Виберіть команду, яка виграла {map}.",
+      "sets_match_winner": "Це також зробить {team} переможцем матчу.",
+      "clears_match_winner": "Це також скине переможця матчу."
     },
     "region_veto": {
       "ban_label": "Бан",
@@ -8585,6 +8589,7 @@
       "match_paused": "Матч призупинено",
       "match_resumed": "Матч відновлено",
       "forced_ready": "Гравців примусово позначено готовими",
+      "skipped_knife": "Ножовий раунд пропущено",
       "start_live": "Почати пряму трансляцію",
       "pause_highlights_and_start_live": "Призупинити хайлайти й почати трансляцію",
       "start_live_preempt_highlights_hint": "Хайлайти призупиняться після поточного · трансляція почнеться, коли звільниться GPU",
@@ -8879,7 +8884,6 @@
       "dedicated": "Виділені сервери",
       "on_demand": "На вимогу",
       "assigned": "Призначений сервер матчу",
-      "assign_hint": "Виберіть сервер, на якому відбуватиметься цей матч.",
       "reboot_label": "Перезавантаження сервера",
       "reboot": "Перезавантажити сервер",
       "rebooting": "Перезавантаження...",
@@ -9054,10 +9058,8 @@
       "veto_override": "Перевизначити вето",
       "actions": "Інші дії",
       "coming_up": "Далі",
-      "server": "Сервер",
       "winner": "Переможець",
       "not_set": "Не задано",
-      "dedicated": "Виділений",
       "current": "Поточний",
       "steps": {
         "label": "Етапи матчу",
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index 6eaf7ccdf..82dd88b40 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -8510,10 +8510,14 @@
       "set": "设置比赛胜者",
       "set_hint": "选择赢得这场比赛的队伍。",
       "set_failed": "无法设置比赛胜方",
-      "select_lineup": "选择阵容"
+      "select_lineup": "选择阵容",
+      "map_record": "{won} 胜 · {lost} 负"
     },
     "map_winner": {
-      "set": "设置地图胜者"
+      "set": "设置地图胜者",
+      "set_hint": "选择赢得 {map} 的队伍。",
+      "sets_match_winner": "这也会将 {team} 设为比赛胜者。",
+      "clears_match_winner": "这也会清除比赛胜者。"
     },
     "region_veto": {
       "ban_label": "禁用",
@@ -8585,6 +8589,7 @@
       "match_paused": "比赛已暂停",
       "match_resumed": "比赛已恢复",
       "forced_ready": "已强制所有玩家准备",
+      "skipped_knife": "已跳过刀战",
       "start_live": "开始直播",
       "pause_highlights_and_start_live": "暂停高光并开始直播",
       "start_live_preempt_highlights_hint": "高光渲染在完成后暂停 · GPU 空闲后直播上线",
@@ -8879,7 +8884,6 @@
       "dedicated": "专用服务器",
       "on_demand": "按需",
       "assigned": "已分配比赛服务器",
-      "assign_hint": "选择这场比赛使用的服务器。",
       "reboot_label": "服务器重启",
       "reboot": "重启服务器",
       "rebooting": "重启中...",
@@ -9054,10 +9058,8 @@
       "veto_override": "覆盖否决",
       "actions": "更多操作",
       "coming_up": "即将开放",
-      "server": "服务器",
       "winner": "胜者",
       "not_set": "未设置",
-      "dedicated": "独立服务器",
       "current": "当前",
       "steps": {
         "label": "比赛阶段",
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index ad04771a7..1c267b1ba 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -8510,10 +8510,14 @@
       "set": "設定比賽勝者",
       "set_hint": "選擇贏得這場比賽的隊伍。",
       "set_failed": "無法設定比賽勝方",
-      "select_lineup": "選擇陣容"
+      "select_lineup": "選擇陣容",
+      "map_record": "{won} 勝 · {lost} 負"
     },
     "map_winner": {
-      "set": "設定地圖勝者"
+      "set": "設定地圖勝者",
+      "set_hint": "選擇贏得 {map} 的隊伍。",
+      "sets_match_winner": "這也會將 {team} 設為比賽勝者。",
+      "clears_match_winner": "這也會清除比賽勝者。"
     },
     "region_veto": {
       "ban_label": "禁用",
@@ -8585,6 +8589,7 @@
       "match_paused": "比賽已暫停",
       "match_resumed": "比賽已繼續",
       "forced_ready": "已強制所有玩家準備",
+      "skipped_knife": "已跳過刀戰",
       "start_live": "開始直播",
       "pause_highlights_and_start_live": "暫停精華並開始直播",
       "start_live_preempt_highlights_hint": "精華算繪於目前項目完成後暫停 · GPU 空閒後直播上線",
@@ -8879,7 +8884,6 @@
       "dedicated": "專用伺服器",
       "on_demand": "隨選",
       "assigned": "已指派比賽伺服器",
-      "assign_hint": "選擇這場比賽使用的伺服器。",
       "reboot_label": "伺服器重新啟動",
       "reboot": "重新啟動伺服器",
       "rebooting": "重新啟動中...",
@@ -9054,10 +9058,8 @@
       "veto_override": "覆寫否決",
       "actions": "更多操作",
       "coming_up": "即將開放",
-      "server": "伺服器",
       "winner": "勝者",
       "not_set": "未設定",
-      "dedicated": "獨立伺服器",
       "current": "目前",
       "steps": {
         "label": "比賽階段",
diff --git a/tests/components/match/MatchActionsConfirm.spec.ts b/tests/components/match/MatchActionsConfirm.spec.ts
index 75f5f2540..a581f5832 100644
--- a/tests/components/match/MatchActionsConfirm.spec.ts
+++ b/tests/components/match/MatchActionsConfirm.spec.ts
@@ -3,6 +3,8 @@ import { flushPromises } from "@vue/test-utils";
 import { mountSuspended } from "@nuxt/test-utils/runtime";
 import { print } from "graphql";
 import MatchActions from "~/components/match/MatchActions.vue";
+import MatchSelectMapWinner from "~/components/match/MatchSelectMapWinner.vue";
+import MatchSelectServer from "~/components/match/MatchSelectServer.vue";
 import MatchSelectWinner from "~/components/match/MatchSelectWinner.vue";
 import { useAuthStore } from "~/stores/AuthStore";
 import { e_player_roles_enum } from "~/generated/zeus";
@@ -80,20 +82,19 @@ describe("match actions confirm before acting", () => {
     expect(actions.confirmOpen).toBe(false);
   });
 
-  it("assigns a server only after one is picked and confirmed", async () => {
+  it("assigns a server as soon as one is picked, without a dialog", async () => {
     signIn(e_player_roles_enum.administrator);
-    const actions = await mountActions();
+    const picker = await mountSuspended(MatchSelectServer, {
+      props: { match: match() },
+      global: { mixins: (useNuxtApp().vueApp as any)._context.mixins },
+    });
 
-    actions.openServerDialog();
-    expect(actions.confirming.picker).toBe("server");
+    (picker.vm as any).form.setValues({ server_id: "0:Dallas" });
+    await (picker.vm as any).updateMatchServer();
 
-    await actions.runConfirm();
-    expect(mutate).not.toHaveBeenCalled();
-
-    actions.confirmChoice = { value: "0:Dallas", label: "Dallas" };
-    await actions.runConfirm();
     expect(sent()[0]).toContain("update_matches_by_pk");
     expect(sent()[0]).toContain("Dallas");
+    picker.unmount();
   });
 
   it("leaves the winner picker to report the pick without saving it", async () => {
@@ -113,6 +114,75 @@ describe("match actions confirm before acting", () => {
   });
 });
 
+describe("map winner confirms before saving", () => {
+  const series = (overrides: Record<string, any> = {}) =>
+    match("Live", {
+      options: { type: "Competitive", map_veto: false, best_of: 3 },
+      match_maps: [
+        { id: "map-1", status: "Finished", winning_lineup_id: "l-1" },
+        { id: "map-2", status: "Live", winning_lineup_id: null },
+        { id: "map-3", status: "Scheduled", winning_lineup_id: null },
+      ],
+      ...overrides,
+    });
+
+  async function mountMapWinner(props: Record<string, any>) {
+    wrapper = await mountSuspended(MatchSelectMapWinner, {
+      props,
+      global: { mixins: (useNuxtApp().vueApp as any)._context.mixins },
+    });
+    return wrapper.vm as any;
+  }
+
+  it("opens the confirm on a pick and only saves once confirmed", async () => {
+    const data = series();
+    const picker = await mountMapWinner({
+      match: data,
+      matchMap: data.match_maps[2],
+    });
+
+    picker.ask("l-2");
+    expect(picker.open).toBe(true);
+    expect(mutate).not.toHaveBeenCalled();
+
+    await picker.confirm();
+    expect(sent()[0]).toContain("setMapWinner");
+    expect(sent()[0]).toContain("l-2");
+    expect(picker.open).toBe(false);
+  });
+
+  it("says when the pick also decides the match", async () => {
+    const data = series();
+    const picker = await mountMapWinner({
+      match: data,
+      matchMap: data.match_maps[1],
+    });
+
+    picker.ask("l-1");
+    expect(picker.matchWinnerNote).toContain("Northwind");
+
+    picker.picked = "l-2";
+    expect(picker.matchWinnerNote).toBeNull();
+  });
+
+  it("says when the pick takes the match winner away", async () => {
+    const data = series({ winning_lineup_id: "l-1" });
+    data.match_maps[1].winning_lineup_id = "l-1";
+    const picker = await mountMapWinner({
+      match: data,
+      matchMap: data.match_maps[1],
+    });
+
+    picker.ask("l-1");
+    expect(picker.matchWinnerNote).toBeNull();
+
+    picker.picked = "l-2";
+    expect(picker.matchWinnerNote).toBe(
+      "This also clears the match winner.",
+    );
+  });
+});
+
 describe("match actions force ready", () => {
   it("offers Force Ready to a moderator while the map warms up", async () => {
     signIn(e_player_roles_enum.moderator);
@@ -166,6 +236,21 @@ describe("admin dock main action", () => {
     );
   });
 
+  it("offers Skip Knife during the knife round", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Knife", { dock: true });
+
+    expect(actions.primaryAction).toBe("skip_knife");
+    expect(actions.showSkipKnifeItem).toBe(false);
+  });
+
+  it("keeps Skip Knife from a non-staff organizer", async () => {
+    signIn(e_player_roles_enum.user);
+    const actions = await mountActions("Knife", { dock: true });
+
+    expect(actions.primaryAction).toBeNull();
+  });
+
   it("offers Pause while a map is live", async () => {
     signIn(e_player_roles_enum.moderator);
     const actions = await mountActions("Live", { dock: true });
@@ -180,4 +265,12 @@ describe("admin dock main action", () => {
     expect(actions.primaryAction).toBeNull();
     expect(actions.showForceReadyItem).toBe(true);
   });
+
+  it("lists Skip Knife in the header menu during the knife round", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Knife");
+
+    expect(actions.showSkipKnifeItem).toBe(true);
+    expect(actions.showForceReadyItem).toBe(false);
+  });
 });
diff --git a/tests/utilities/matchAdminSteps.spec.ts b/tests/utilities/matchAdminSteps.spec.ts
index 3b7ccd6af..a8568b9ec 100644
--- a/tests/utilities/matchAdminSteps.spec.ts
+++ b/tests/utilities/matchAdminSteps.spec.ts
@@ -61,6 +61,20 @@ describe("upcomingAdminActions", () => {
     expect(keys).toEqual(["pause", "highlights", "reparse"]);
   });
 
+  it("lists Skip Knife only for a match that plays a knife round", () => {
+    const keys = (knifeRound: boolean) =>
+      upcomingAdminActions(
+        {
+          ...match("Live", "Warmup"),
+          options: { map_veto: true, region_veto: false, knife_round: knifeRound },
+        },
+        roleAtLeast(e_player_roles_enum.moderator),
+      ).map((action) => action.key);
+
+    expect(keys(true)).toEqual(["skip_knife", "pause"]);
+    expect(keys(false)).toEqual(["pause"]);
+  });
+
   it("has nothing left once the match is finished", () => {
     expect(
       upcomingAdminActions(
diff --git a/utilities/matchAdminSteps.ts b/utilities/matchAdminSteps.ts
index e3b45c3bc..2cabb1f45 100644
--- a/utilities/matchAdminSteps.ts
+++ b/utilities/matchAdminSteps.ts
@@ -9,7 +9,11 @@ export type MatchAdminStep =
 
 type StepMatch = {
   status?: string | null;
-  options?: { map_veto?: boolean; region_veto?: boolean } | null;
+  options?: {
+    map_veto?: boolean;
+    region_veto?: boolean;
+    knife_round?: boolean;
+  } | null;
   match_maps?: Array<{ is_current_map?: boolean; status?: string }> | null;
 };
 
@@ -62,6 +66,7 @@ export type UpcomingAdminAction = {
   key:
     | "veto_override"
     | "force_ready"
+    | "skip_knife"
     | "pause"
     | "live_stream"
     | "highlights"
@@ -70,6 +75,8 @@ export type UpcomingAdminAction = {
   label: string;
   // Lowest role that can ever use it; none means any organizer.
   role?: e_player_roles_enum;
+  // Left out of matches it can never come up in.
+  applies?: (match: StepMatch) => boolean;
 };
 
 // What unlocks at each later step, so organizers can see it coming. Actions
@@ -92,6 +99,13 @@ export const UPCOMING_ADMIN_ACTIONS: UpcomingAdminAction[] = [
     step: "warmup",
     label: "match.actions.start_live",
   },
+  {
+    key: "skip_knife",
+    step: "live",
+    label: "match.commands.skip_knife",
+    role: e_player_roles_enum.moderator,
+    applies: (match) => !!match.options?.knife_round,
+  },
   {
     key: "pause",
     step: "live",
@@ -124,6 +138,7 @@ export function upcomingAdminActions(
   return UPCOMING_ADMIN_ACTIONS.filter(
     (action) =>
       steps.indexOf(action.step) > current &&
-      (!action.role || canUseRole(action.role)),
+      (!action.role || canUseRole(action.role)) &&
+      (!action.applies || action.applies(match)),
   );
 }